diff --git a/app/adminer/app_config.php b/app/adminer/app_config.php
index 7ac4941f2d..cd8ac161bc 100644
--- a/app/adminer/app_config.php
+++ b/app/adminer/app_config.php
@@ -9,19 +9,19 @@
 		$apps[$x]['url'] = 'http://www.adminer.org/';
 		$apps[$x]['description']['en-us'] = 'Adminer (formerly phpMinAdmin) is a full-featured database management tool written in PHP. Adminer is available for MySQL, PostgreSQL, SQLite, MS SQL and Oracle.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Adminer (précédemment phpMinAdmin) est un outil gestion de base de données complet écrite en php. Adminer est disponible pour MySQL, PostgreSQL, SQLite, MS SQL et Oracle.';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = 'Adminer (anteriormente phpMinAdmin) é uma ferramenta completa para gestão de bases de dados escrita em PHP. O Adminer está disponível para MySQL, PostgreSQL, SQLite, MS SQL e Oracle.';
+		$apps[$x]['description']['pt-pt'] = 'Adminer (anteriormente phpMinAdmin) é uma completa ferramenta de gestão de banco de dados escrito em PHP. Adminer está disponível para MySQL, PostgreSQL, SQLite, MS SQL e Oracle.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Adminer';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Admin BDD';
@@ -37,8 +37,6 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'adminer';
-		//$apps[$x]['permissions'][0]['menu']['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = '1f59d07b-b4f7-4f9e-bde9-312cf491d66e';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
 ?>
diff --git a/app/call_block/app_config.php b/app/call_block/app_config.php
index 2489d6b610..42a93f70b9 100644
--- a/app/call_block/app_config.php
+++ b/app/call_block/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'A tool to block incoming numbers.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = '';
+		$apps[$x]['description']['fr-fr'] = "Outil pour bloque les numéro d'appelant";
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = '';
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Call Block';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = '';
+		$apps[$x]['menu'][0]['title']['fr-fr'] = "Blocage d'appel";
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = '';
@@ -40,7 +40,6 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'call_block_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '29295c90-b1b9-440b-9c7E-c8363c6e8975';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
@@ -79,23 +78,19 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
 		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_name';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'blocked_caller_name';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'blocked_caller_name';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the name.';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_number';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'blocked_caller_number';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'blocked_caller_number';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the full phone number.';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_count';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'blocked_call_count';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'blocked_call_count';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Number of calls.';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_action';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'blocked_call_action';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'blocked_call_action';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Action for call.';
 		$z++;
@@ -103,9 +98,8 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Date/Time number was added.';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'call_block_enabled';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'block_call_enabled';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'block_call_enabled';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enable/disable blocking the call.';
 		$z++;
-?>
\ No newline at end of file
+?>
diff --git a/app/call_block/app_languages.php b/app/call_block/app_languages.php
index 38842934b2..5579412433 100644
--- a/app/call_block/app_languages.php
+++ b/app/call_block/app_languages.php
@@ -2,104 +2,137 @@
 // call_block.php
 	$text['title-call-block']['en-us'] = 'Call Block';
 	$text['title-call-block']['pt-pt'] = '';
-
+	$text['title-call-block']['fr-fr'] = "Bloquage d'appel";
+	
 	$text['description-call-block']['en-us'] = 'A list of numbers from which to block calls.';
 	$text['description-call-block']['pt-pt'] = '';
-
+	$text['description-call-block']['fr-fr'] = "Une liste de numéro dont on veut bloquer les appels";
+	
 	$text['label-number']['en-us'] = 'Number';
 	$text['label-number']['pt-pt'] = '';
-
+	$text['label-number']['fr-fr'] = "Numéro";
+	
 	$text['label-name']['en-us'] = 'Name';
 	$text['label-name']['pt-pt'] = '';
-
+	$text['label-name']['fr-fr'] = "Nom";
+	
 	$text['label-Count']['en-us'] = 'Count';
 	$text['label-Count']['pt-pt'] = '';
-
+	$text['label-Count']['fr-fr'] = "Décompte";
+	
 	$text['label-date-added']['en-us'] = 'Date Added';
 	$text['label-date-added']['pt-pt'] = '';
-
+	$text['label-date-added']['fr-fr'] = "Date Ajoutée";
+	
 	$text['label-action']['en-us'] = 'Action';
 	$text['label-action']['pt-pt'] = '';
+	$text['label-action']['fr-fr'] = "Action";
 
 	$text['label-enabled']['en-us'] = 'Enabled';
 	$text['label-enabled']['pt-pt'] = '';
+	$text['label-enabled']['fr-fr'] = "Actif";
+
 
 	$text['button-edit']['en-us'] = 'Edit';
 	$text['button-edit']['pt-pt'] = '';
+	$text['button-edit']['fr-fr'] = "Editer";
 
 	$text['button-delete']['en-us'] = 'Delete';
 	$text['button-delete']['pt-pt'] = '';
-
+	$text['button-delete']['fr-fr'] = "Supprimer";
+	
 	$text['button-add']['en-us'] = 'Add';
 	$text['button-add']['pt-pt'] = '';
-
+	$text['button-add']['fr-fr'] = "Ajouter";
+	
 	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 	$text['confirm-delete']['pt-pt'] = '';
-
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
+	
 	// call_block_cdr_add.php
 	$text['label-add-complete']['en-us'] = 'Add Complete';
 	$text['label-add-complete']['pt-pt'] = '';
-
+	$text['label-add-complete']['fr-fr'] = "Ajouté";
+	
 	// call_block_delete.php
 	$text['label-message']['en-us'] = 'Message';
 	$text['label-message']['pt-pt'] = '';
-
+	$text['label-message']['fr-fr'] = "Message";
+	
 	$text['label-delete-complete']['en-us'] = 'Delete Complete';
 	$text['label-delete-complete']['pt-pt'] = '';
-
+	$text['label-delete-complete']['fr-fr'] = "Supprimé";
+	
 	// call_block_edit.php
 	$text['label-provide-name']['en-us'] = 'Please provide: Name';
 	$text['label-provide-name']['pt-pt'] = '';
-
+	$text['label-provide-name']['fr-fr'] = "Merci d'indiquer: Nom";
+	
 	$text['label-provide-number']['en-us'] = 'Please provide: Number';
 	$text['label-provide-number']['pt-pt'] = '';
-
+	$text['label-provide-number']['fr-fr'] = "Merci d'indiquer: Numéro";
+	
 	$text['label-provide-enabled']['en-us'] = 'Please provide: Enabled';
 	$text['label-provide-enabled']['pt-pt'] = '';
-
+	$text['label-provide-enabled']['fr-fr'] = "Merci d'indiquer: Actif";
+	
 	$text['label-update-complete']['en-us'] = 'Update Complete';
 	$text['label-update-complete']['pt-pt'] = '';
-
+	$text['label-update-complete']['fr-fr'] = "Mis à jour";
+	
 	$text['label-called-on']['en-us'] = 'Called on';
 	$text['label-called-on']['pt-pt'] = '';
-
+	$text['label-called-on']['fr-fr'] = "Appelé sur";
+	
 	$text['label-edit-add']['en-us'] = 'Call Block Add';
 	$text['label-edit-add']['pt-pt'] = '';
-
+	$text['label-edit-add']['fr-fr'] = "Ajouter bloquage d'appel";
+	
 	$text['label-edit-edit']['en-us'] = 'Call Block Edit';
 	$text['label-edit-edit']['pt-pt'] = '';
-
+	$text['label-edit-edit']['fr-fr'] = "Editer le bloquage d'appel";
+	
 	$text['label-add-note']['en-us'] = 'Block calls from a number. Either select a number from the list above or enter the number, name and enable below.';
 	$text['label-add-note']['pt-pt'] = '';
-
+	$text['label-add-note']['fr-fr'] = "Bloquer les appels à partir d'un numéro. Choisissez un numéro dans liste ou entrez un numéro, nom et activer le.";
+	
 	$text['label-edit-note']['en-us'] = 'Block calls from a number. Edit the name and enable/disable below.';
 	$text['label-edit-note']['pt-pt'] = '';
-
+	$text['label-edit-note']['fr-fr'] = "Bloquer les appels à partir d'un numéro. Editer le nom et activer/désactiver ci-dessous.";
+	
 	$text['label-exact-number']['en-us'] = 'Enter the exact number.';
 	$text['label-exact-number']['pt-pt'] = '';
-
+	$text['label-exact-number']['fr-fr'] = "Entrer le numéro exact.";
+	
 	$text['label-reject']['en-us'] = 'Reject';
 	$text['label-reject']['pt-pt'] = '';
-
+	$text['label-reject']['fr-fr'] = "Rejeter.";
+	
 	$text['label-busy']['en-us'] = 'Busy';
 	$text['label-busy']['pt-pt'] = '';
-
+	$text['label-busy']['fr-fr'] = "Occupé";
+	
 	$text['label-action-message']['en-us'] = 'Set an action for calls from this number.';
 	$text['label-action-message']['pt-pt'] = '';
-
+	$text['label-action-message']['fr-fr'] = "Choisir une action pour les appels venant de ce numéro.";
+	
 	$text['label-true']['en-us'] = 'true';
 	$text['label-true']['pt-pt'] = '';
+	$text['label-true']['fr-fr'] = "Oui";
 
 	$text['label-false']['en-us'] = 'false';
 	$text['label-false']['pt-pt'] = '';
-
+	$text['label-false']['fr-fr'] = "Non";
+	
 	$text['label-enable-message']['en-us'] = 'Set to true to enable call blocking for this number.';
 	$text['label-enable-message']['pt-pt'] = '';
-
+	$text['label-enable-message']['fr-fr'] = "Choisir Oui pour activer le bloquage d'appel. ";
+	
 	$text['button-save']['en-us'] = 'Save';
 	$text['button-save']['pt-pt'] = '';
-
+	$text['button-save']['fr-fr'] = "Sauvegarder";
+	
 	$text['button-back']['en-us'] = 'Back';
-	$text['button-back']['pt-pt'] = ''
-
-?>
\ No newline at end of file
+	$text['button-back']['pt-pt'] = '';
+	$text['button-back']['fr-fr'] = "Retour";
+?>
diff --git a/app/call_broadcast/app_config.php b/app/call_broadcast/app_config.php
index 1fe2e3d557..28e1a948f9 100644
--- a/app/call_broadcast/app_config.php
+++ b/app/call_broadcast/app_config.php
@@ -7,27 +7,27 @@
 		$apps[$x]['version'] = '';
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = "Schedule to immediately make multiple calls to the extension, an IVR Menu, Conference Room, or any other number.";
-		$apps[$x]['description']['es-mx'] = "Realiza llamadas inmediatamente a extensiones, IVR, conferencias o cualquier otro número";
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['en-us'] = 'Schedule to immediately make multiple calls to the extension, an IVR Menu, Conference Room, or any other number.';
+		$apps[$x]['description']['es-mx'] = 'Realiza llamadas inmediatamente a extensiones, IVR, conferencias o cualquier otro número';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Programme des appels multiples vers des extensions, IVR, salles de conferences ou autre.";
-		$apps[$x]['description']['fr-ca'] = "Il fait d' massive appels vers des extensions, IVR, salles de conferences ou quelqu'autre nom.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = "Programação para imediatamente fazer várias chamadas para a extensão de um menu de URA, Sala de Conferência, ou qualquer outro número.";
+		$apps[$x]['description']['pt-pt'] = 'Programação para imediatamente fazer várias chamadas para a extensão de um menu de URA, Sala de Conferência, ou qualquer outro número.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = "Call Broadcast";
-		$apps[$x]['menu'][0]['title']['es-mx'] = "Llamada Masiva (Broadcast)";
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['en-us'] = 'Call Broadcast';
+		$apps[$x]['menu'][0]['title']['es-mx'] = 'Llamada Masiva (Broadcast)';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Appels de masse";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Appels de masse';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Chamada de Broadcast";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Chamada de Broadcast';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = '50153bbf-78c5-b49e-7bd9-4b3e4b1134e6';
 		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
@@ -38,7 +38,6 @@
 	
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'call_broadcast_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = '50153bbf-78c5-b49e-7bd9-4b3e4b1134e6';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
@@ -140,4 +139,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_broadcast/app_languages.php b/app/call_broadcast/app_languages.php
index 8aee57719d..2e4fbca3e2 100644
--- a/app/call_broadcast/app_languages.php
+++ b/app/call_broadcast/app_languages.php
@@ -3,129 +3,129 @@
 	//v_call_broadcast
 	$text['title']['en-us'] = 'Call Broadcasts';
 	$text['title']['pt-pt'] = 'Chamadas Broadcasts';
-	$text['title']['fr'] = 'Appels de Masse';
+	$text['title']['fr-fr'] = 'Appels de Masse';
 
 	$text['label-name']['en-us'] = 'Name';
 	$text['label-name']['pt-pt'] = 'Nome';
-	$text['label-name']['fr'] = 'Nom';
+	$text['label-name']['fr-fr'] = 'Nom';
 
 	$text['label-concurrent-limit']['en-us'] = 'Concurrent Limit';
 	$text['label-concurrent-limit']['pt-pt'] = 'Limite de concorrencia';
-	$text['label-concurrent-limit']['fr'] = 'Limite concurrents';
+	$text['label-concurrent-limit']['fr-fr'] = 'Limite concurrents';
 
 	$text['label-description']['en-us'] = 'Description';
 	$text['label-description']['pt-pt'] = 'Descrição';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 
 	$text['confirm-delete-info']['en-us'] = 'Do you really want to delete this?';
 	$text['confirm-delete-info']['pt-pt'] = 'Deseja realmente eliminar isto?';
-	$text['confirm-delete-info']['fr'] = "Voulez-vous vraiment supprimer cela?";
+	$text['confirm-delete-info']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 	//v_call_broadcast_delete
 	$text['confirm-delete']['en-us'] = 'Delete Complete';
 	$text['confirm-delete']['pt-pt'] = 'Eliminação Completa';
-	$text['confirm-delete']['fr'] = 'Supprimé';
+	$text['confirm-delete']['fr-fr'] = 'Supprimé';
 
 	//v_call_broadcast_edit
 	$text['confirm-name']['en-us'] = 'Please provide: Name';
 	$text['confirm-name']['pt-pt'] = 'Por favor, forneça: Nome';
-	$text['confirm-name']['fr'] = "Merci d'indiquer: Nom";
+	$text['confirm-name']['fr-fr'] = "Merci d'indiquer: Nom";
 
 	$text['confirm-add']['en-us'] = 'Add Complete';
 	$text['confirm-add']['pt-pt'] = 'Adição Completa';
-	$text['confirm-add']['fr'] = "Ajouté";
+	$text['confirm-add']['fr-fr'] = "Ajouté";
 
 	$text['confirm-update']['en-us'] = 'Update Complete';
 	$text['confirm-update']['pt-pt'] = 'Actualização Completa';
-	$text['confirm-update']['fr'] = "Mis à jour";
+	$text['confirm-update']['fr-fr'] = "Mis à jour";
 
 	$text['label-call-broadcasts']['en-us'] = 'Call Broadcasts';
 	$text['label-call-broadcasts']['pt-pt'] = 'Chamada Broadcasts';
-	$text['label-call-broadcasts']['fr'] = "Diffusions d'appels";
+	$text['label-call-broadcasts']['fr-fr'] = "Diffusions d'appels";
 
 	$text['label-call-broadcast']['en-us'] = 'Call Broadcast';
 	$text['label-call-broadcast']['pt-pt'] = 'Chamada Broadcast';
-	$text['label-call-broadcast']['fr'] = "Diffusion d'appels";
+	$text['label-call-broadcast']['fr-fr'] = "Diffusion d'appels";
 
 	$text['button-back']['en-us'] = 'Back';
 	$text['button-back']['pt-pt'] = 'Voltar';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 
 	$text['description-name']['en-us'] = 'Enter the name here.';
 	$text['description-name']['pt-pt'] = 'Insira aqui o nome.';
-	$text['description-name']['fr'] = "Insérer le Nom.";
+	$text['description-name']['fr-fr'] = "Insérer le Nom.";
 
 	$text['label-timeout']['en-us'] = 'Timeout';
 	$text['label-timeout']['pt-pt'] = 'Tempo Limite';
-	$text['label-timeout']['fr'] = 'Timeout';
+	$text['label-timeout']['fr-fr'] = 'Timeout';
 
 	$text['description-timeout']['en-us'] = 'Limit the length of the call. Leave this empty for no limit.';
 	$text['description-timeout']['pt-pt'] = 'Limitar a duração da chamada. Deixe em branco para não ter limite.';
-	$text['description-timeout']['fr'] = "Limiter la durée de l'appel. Laisser vide pour illimité.";
+	$text['description-timeout']['fr-fr'] = "Limiter la durée de l'appel. Laisser vide pour illimité.";
 
 	$text['description-concurrent-limit']['en-us'] = 'Limit the approximate number of concurrent calls. Leave this empty for no limit.';
 	$text['description-concurrent-limit']['pt-pt'] = 'Limitar o número de chamadas simultâneas. Deixe em branco para não ter limite.';
-	$text['description-concurrent-limit']['fr'] = "Limite le nombre d'appels concurrents. Laisser vide pour illimité.";
+	$text['description-concurrent-limit']['fr-fr'] = "Limite le nombre d'appels concurrents. Laisser vide pour illimité.";
 
 	$text['label-caller-id-name']['en-us'] = 'Caller ID Name';
 	$text['label-caller-id-name']['pt-pt'] = 'Nome de Origem';
-	$text['label-caller-id-name']['fr'] = "Nom d'appelant";
+	$text['label-caller-id-name']['fr-fr'] = "Nom d'appelant";
 
 	$text['label-callerid-number']['en-us'] = 'Caller ID Number';
 	$text['label-callerid-number']['pt-pt'] = 'Numero de Origem';
-	$text['label-callerid-number']['fr'] = "Numéro d'appelant";
+	$text['label-callerid-number']['fr-fr'] = "Numéro d'appelant";
 
 	$text['description-caller-id-name']['en-us'] = 'Applicable if the provider allow the Caller ID Name to be set. default: anonymous';
 	$text['description-caller-id-name']['pt-pt'] = 'Aplicável se o provedor permitir o nome de origem para serem enviadas as chamadas. padrão: anonymous';
-	$text['description-caller-id-name']['fr'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du nom d'appelant. Par défaut: anonymous";
+	$text['description-caller-id-name']['fr-fr'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du nom d'appelant. Par défaut: anonymous";
 
 	$text['description-caller-id-number']['en-us'] = 'Applicable if the provider that allow the Caller ID number to be sent. default: 0000000000';
 	$text['description-caller-id-number']['pt-pt'] = 'Aplicável se o provedor permitir o numero de origem para serem eninationviadas as chamadas. padrão: 0000000000';
-	$text['description-caller-id-number']['fr'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du numéro d'appelant. Par défaut: 0000000000";
+	$text['description-caller-id-number']['fr-fr'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du numéro d'appelant. Par défaut: 0000000000";
 
 	$text['label-destination']['en-us'] = 'Destination Number';
 	$text['label-destination']['pt-pt'] = 'Numero de Destino';
-	$text['label-destination']['fr'] = 'Numéro de Destination';
+	$text['label-destination']['fr-fr'] = 'Numéro de Destination';
 
 	$text['description-destination']['en-us'] = 'Send the call to the extension an IVR Menu, Conference Room, or any other number.';
 	$text['description-destination']['pt-pt'] = 'Enviar a chamada para a extensão de um menu de IVR, Sala de Conferência, ou qualquer outro número.';
-	$text['description-destination']['fr'] = "Emettre l'appel vers un SVI, salle de conférence, ou tout autre numéro.";
+	$text['description-destination']['fr-fr'] = "Emettre l'appel vers un SVI, salle de conférence, ou tout autre numéro.";
 
 	$text['label-phone']['en-us'] = 'Phone Number List';
 	$text['label-phone']['pt-pt'] = 'Lista de Números de Telefone';
-	$text['label-phone']['fr'] = "Liste de Numéros de téléphone.";
+	$text['label-phone']['fr-fr'] = "Liste de Numéros de téléphone.";
 
 	$text['description-phone']['en-us'] = 'Optional, set a list of phone numbers one per row in the following format: 123-123-1234|Last Name, First Name';
 	$text['description-phone']['pt-pt'] = 'Opcional, definir uma lista de números de telefone, um por linha no seguinte formato:  123-123-1234 | Sobrenome, Nome';
-	$text['description-phone']['fr'] = "Optionel, Insérer une liste de numéros de téléphone, un par ligne, dans le format suivant ; 0123456789 | Nom, Prénom";
+	$text['description-phone']['fr-fr'] = "Optionel, Insérer une liste de numéros de téléphone, un par ligne, dans le format suivant ; 0123456789 | Nom, Prénom";
 
 	$text['label-description']['en-us'] = 'Description';
 	$text['label-description']['pt-pt'] = 'Descrição';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 
 	$text['description-info']['en-us'] = 'Enter the description here.';
 	$text['description-info']['pt-pt'] = 'Insira aqui a descrição';
-	$text['description-info']['fr'] = "";
+	$text['description-info']['fr-fr'] = "";
 
 	$text['button-send']['en-us'] = 'Send Broadcast';
 	$text['button-send']['pt-pt'] = 'Enviar Broadcast';
-	$text['button-send']['fr'] = "Lancer les appels";
+	$text['button-send']['fr-fr'] = "Lancer les appels";
 
 	$text['button-save']['en-us'] = 'Save';
 	$text['button-save']['pt-pt'] = 'Guardar';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 	//v_call_broadcast_send
 	$text['label-view-calls']['en-us'] = 'View Calls';
 	$text['label-view-calls']['pt-pt'] = 'Ver Chamadas';
-	$text['label-view-calls']['fr'] = "Voir les appels";
+	$text['label-view-calls']['fr-fr'] = "Voir les appels";
 
 	$text['label-message']['en-us'] = 'Message';
 	$text['label-message']['pt-pt'] = 'Mensagem';
-	$text['label-message']['fr'] = 'Message';
+	$text['label-message']['fr-fr'] = 'Message';
 
 	$text['label-has-been']['en-us'] = 'has been started';
 	$text['label-has-been']['pt-pt'] = 'foi iniciada';
-	$text['label-has-been']['fr'] = 'a commencé';
+	$text['label-has-been']['fr-fr'] = 'a commencé';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_center/app_config.php b/app/call_center/app_config.php
index 8f26540db5..192346c099 100644
--- a/app/call_center/app_config.php
+++ b/app/call_center/app_config.php
@@ -7,27 +7,27 @@
 		$apps[$x]['version'] = '';
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = "Queues for managing inbound calls and routing those calls to available agents.";
-		$apps[$x]['description']['es-mx'] = "Colas pra administar las llamadas entrantes y enviarlas a los agentes disponibles";
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['en-us'] = 'Queues for managing inbound calls and routing those calls to available agents.';
+		$apps[$x]['description']['es-mx'] = 'Colas pra administar las llamadas entrantes y enviarlas a los agentes disponibles';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Files d'attente d'appels entrants distribués aux agents disponibles";
-		$apps[$x]['description']['fr-ca'] = "Queues pour envoyer les appels entrants vers les agents disponibles.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = "As filas servem para gerenciamento de chamadas de entrada e encaminhamento das mesmas para os agentes disponíveis.";
+		$apps[$x]['description']['pt-pt'] = 'As filas servem para gerenciamento de chamadas de entrada e encaminhamento das mesmas para os agentes disponíveis.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Call Center';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Centro de Llamadas';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "Centre d'appel";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = "Centre d' appels";
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Centro de Chamadas";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Centro de Chamadas';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = '6c072b29-5b6c-49fc-008e-95e24c77de99';
 		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
@@ -39,13 +39,13 @@
 
 		$apps[$x]['menu'][1]['title']['en-us'] = 'Agent Status';
 		$apps[$x]['menu'][1]['title']['es-mx'] = 'Estado de Agente';
-		$apps[$x]['menu'][1]['title']['de-de'] = '';
+		$apps[$x]['menu'][1]['title']['de'] = '';
 		$apps[$x]['menu'][1]['title']['de-ch'] = '';
 		$apps[$x]['menu'][1]['title']['de-at'] = '';
 		$apps[$x]['menu'][1]['title']['fr-fr'] = "État d'agent";
 		$apps[$x]['menu'][1]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][1]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][1]['title']['pt-pt'] = "Estado do Agente";
+		$apps[$x]['menu'][1]['title']['pt-pt'] = 'Estado do Agente';
 		$apps[$x]['menu'][1]['title']['pt-br'] = '';
 		$apps[$x]['menu'][1]['uuid'] = '597c483a-51a9-f95a-8d54-ea7d87ada2b8';
 		$apps[$x]['menu'][1]['parent_uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
@@ -56,76 +56,56 @@
 		$apps[$x]['menu'][1]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_queue_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '6c072b29-5b6c-49fc-008e-95e24c77de99';
-		$apps[$x]['permissions'][$y]['groups'][] = 'agent';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_queue_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_queue_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_queue_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_agent_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '597c483a-51a9-f95a-8d54-ea7d87ada2b8';
-		$apps[$x]['permissions'][$y]['groups'][] = 'agent';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_agent_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_agent_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_agent_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_tier_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '';
-		$apps[$x]['permissions'][$y]['groups'][] = 'agent';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_tier_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_tier_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_tier_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_log_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_log_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_log_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_center_log_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['name'] = 'call_center_queues_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'agent';
+		$apps[$x]['permissions'][0]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'call_center_queues_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'admin';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'call_center_queues_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'admin';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'call_center_queues_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'admin';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][4]['name'] = 'call_center_agents_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'agent';
+		$apps[$x]['permissions'][4]['groups'][] = 'admin';
+		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][5]['name'] = 'call_center_agents_add';
+		$apps[$x]['permissions'][5]['groups'][] = 'admin';
+		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][6]['name'] = 'call_center_agents_edit';
+		$apps[$x]['permissions'][6]['groups'][] = 'admin';
+		$apps[$x]['permissions'][6]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][7]['name'] = 'call_center_agents_delete';
+		$apps[$x]['permissions'][7]['groups'][] = 'admin';
+		$apps[$x]['permissions'][7]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][8]['name'] = 'call_center_tiers_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'agent';
+		$apps[$x]['permissions'][8]['groups'][] = 'admin';
+		$apps[$x]['permissions'][8]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][9]['name'] = 'call_center_tiers_add';
+		$apps[$x]['permissions'][9]['groups'][] = 'admin';
+		$apps[$x]['permissions'][9]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][10]['name'] = 'call_center_tiers_edit';
+		$apps[$x]['permissions'][10]['groups'][] = 'admin';
+		$apps[$x]['permissions'][10]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][11]['name'] = 'call_center_tiers_delete';
+		$apps[$x]['permissions'][11]['groups'][] = 'admin';
+		$apps[$x]['permissions'][11]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -505,4 +485,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_center/app_languages.php b/app/call_center/app_languages.php
index af79f6b911..07404384cc 100644
--- a/app/call_center/app_languages.php
+++ b/app/call_center/app_languages.php
@@ -1,144 +1,281 @@
-<?php
-
-	$text['title-call_center_queues']['en-us'] = 'Call Center Queues';
-	$text['title-call_center_queue_add']['en-us'] = 'Call Center Queue Add';
-	$text['title-call_center_queue_edit']['en-us'] = 'Call Center Queue Edit';
-	$text['title-call_center_agents']['en-us'] = 'Call Center Agents';
-	$text['title-call_center_agent_add']['en-us'] = 'Call Center Agent Add';
-	$text['title-call_center_agent_edit']['en-us'] = 'Call Center Agent Edit';
-	$text['title-call_center_agent_status']['en-us'] = 'Call Center Agent Status';
-	$text['title-call_center_tiers']['en-us'] = 'Call Center Tiers';
-	$text['title-call_center_tier_add']['en-us'] = 'Call Center Tier Add';
-	$text['title-call_center_tier_edit']['en-us'] = 'Call Center Tier Edit';
-
-	$text['header-call_center_queues']['en-us'] = 'Call Center Queues';
-	$text['header-call_center_queue_add']['en-us'] = 'Call Center Queue Add';
-	$text['header-call_center_queue_edit']['en-us'] = 'Call Center Queue Edit';
-	$text['header-call_center_agents']['en-us'] = 'Call Center Agents';
-	$text['header-call_center_agent_add']['en-us'] = 'Call Center Agent Add';
-	$text['header-call_center_agent_edit']['en-us'] = 'Call Center Agent Edit';
-	$text['header-call_center_agent_status']['en-us'] = 'Call Center Agent Status';
-	$text['header-call_center_tiers']['en-us'] = 'Call Center Tiers';
-	$text['header-call_center_tier_add']['en-us'] = 'Call Center Tier Add';
-	$text['header-call_center_tier_edit']['en-us'] = 'Call Center Tier Edit';
-
-	$text['description-call_center_queues']['en-us'] = 'List of queues for the call center.';
-	$text['description-call_center_agents']['en-us'] = 'List of call center agents.';
-	$text['description-call_center_agent_status']['en-us'] = 'List all the call center agents with the option to change the status of one or more agents.';
-	$text['description-call_center_tiers']['en-us'] = 'List all tiers. Tiers assign agents to queues.';
-
-	$text['label-queue_name']['en-us'] = 'Queue Name';
-	$text['label-extension']['en-us'] = 'Extension';
-	$text['label-strategy']['en-us'] = 'Strategy';
-	$text['label-music_on_hold']['en-us'] = 'Music on Hold';
-	$text['label-record_template']['en-us'] = 'Record Template';
-	$text['label-time_base_score']['en-us'] = 'Time Base Score';
-	$text['label-max_wait_time']['en-us'] = 'Max Wait Time';
-	$text['label-max_wait_time_with_no_agent']['en-us'] = 'Max Wait Time with No Agent';
-	$text['label-max_wait_time_with_no_agent_time_reached']['en-us'] = 'Max Wait Time with No Agent Time Reached';
-	$text['label-timeout_action']['en-us'] = 'Timeout Action';
-	$text['label-tier_rules_apply']['en-us'] = 'Tier Rules Apply';
-	$text['label-tier_rule_wait_second']['en-us'] = 'Tier Rule Wait Second';
-	$text['label-tier_rule_wait_multiply_level']['en-us'] = 'Tier Rule Wait Multiply Level';
-	$text['label-tier_rule_no_agent_no_wait']['en-us'] = 'Tier Rule No Agent No Wait';
-	$text['label-discard_abandoned_after']['en-us'] = 'Discard Abandoned After';
-	$text['label-abandoned_resume_allowed']['en-us'] = 'Abandoned Resume Allowed';
-	$text['label-caller_id_name_prefix']['en-us'] = 'Caller ID Name Prefix';
-	$text['label-description']['en-us'] = 'Description';
-	$text['label-agent_name']['en-us'] = 'Agent Name';
-	$text['label-type']['en-us'] = 'Type';
-	$text['label-call_timeout']['en-us'] = 'Call Timeout';
-	$text['label-contact']['en-us'] = 'Contact';
-	$text['label-status']['en-us'] = 'Status';
-	$text['label-no_answer_delay_time']['en-us'] = 'No Answer Delay Time';
-	$text['label-max_no_answer']['en-us'] = 'Max No Answer';
-	$text['label-wrap_up_time']['en-us'] = 'Wrap Up Time';
-	$text['label-reject_delay_time']['en-us'] = 'Reject Delay Time';
-	$text['label-busy_delay_time']['en-us'] = 'Busy Delay Time';
-	$text['label-agent_logout']['en-us'] = 'Agent Logout';
-	$text['label-agent']['en-us'] = 'Agent';
-	$text['label-options']['en-us'] = 'Options';
-	$text['label-tier_level']['en-us'] = 'Tier Level';
-	$text['label-tier_position']['en-us'] = 'Tier Position';
-
-	$text['description-queue_name']['en-us'] = 'Enter the queue name.';
-	$text['description-extension']['en-us'] = 'Enter the extension number.';
-	$text['description-strategy']['en-us'] = 'Select the queue ring strategy.';
-	$text['description-music_on_hold']['en-us'] = 'Select the desired hold music.';
-	$text['description-record_template']['en-us'] = 'Enter a record template. $${base_dir}/recordings/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.wav';
-	$text['description-time_base_score']['en-us'] = 'Select the time base score.';
-	$text['description-max_wait_time']['en-us'] = 'Enter the max wait time.';
-	$text['description-max_wait_time_with_no_agent']['en-us'] = 'Enter the max wait time with no agent.';
-	$text['description-max_wait_time_with_no_agent_time_reached']['en-us'] = 'Enter the max wait time with no agent time reached.';
-	$text['description-timeout_action']['en-us'] = 'Set the action to perform when the max wait time is reached.';
-	$text['description-tier_rules_apply']['en-us'] = 'Set the tier rule rules apply to true or false.';
-	$text['description-tier_rule_wait_second']['en-us'] = 'Enter the tier rule wait seconds.';
-	$text['description-tier_rule_wait_multiply_level']['en-us'] = 'Set the tier rule wait multiply level to true or false.';
-	$text['description-tier_rule_no_agent_no_wait']['en-us'] = 'Enter the tier rule no agent no wait.';
-	$text['description-discard_abandoned_after']['en-us'] = 'Set the discard abandoned after seconds.';
-	$text['description-abandoned_resume_allowed']['en-us'] = 'Set the abandoned resume allowed to true or false.';
-	$text['description-caller_id_name_prefix']['en-us'] = 'Set a prefix on the caller ID name.';
-	$text['description-description']['en-us'] = 'Enter a description, if desired.';
-	$text['description-agent_name']['en-us'] = 'Select the agents name.';
-	$text['description-type']['en-us'] = 'Enter the agent type.';
-	$text['description-call_timeout']['en-us'] = 'Enter the call timeout.';
-	$text['description-contact']['en-us'] = 'Select the contact number.';
-	$text['description-status']['en-us'] = 'Select the agent status.';
-	$text['description-no_answer_delay_time']['en-us'] = 'Enter the agent no answer delay time in seconds.';
-	$text['description-max_no_answer']['en-us'] = 'Enter max no answer.';
-	$text['description-wrap_up_time']['en-us'] = 'Enter the wrap up time.';
-	$text['description-reject_delay_time']['en-us'] = 'Enter the reject delay time.';
-	$text['description-busy_delay_time']['en-us'] = 'Enter the agent busy delay time.';
-	$text['description-agent_logout']['en-us'] = 'Enter the auto agent logout time in 00:00 format. Requires a service to enforce the logout time.';
-	$text['description-agent']['en-us'] = 'Select the agent name.';
-	$text['description-options']['en-us'] = 'Select the queue name.';
-	$text['description-tier_level']['en-us'] = 'Select the tier level.';
-	$text['description-tier_position']['en-us'] = 'Select the tier position.';
-
-	$text['option-true']['en-us'] = 'True';
-	$text['option-false']['en-us'] = 'False';
-	$text['option-ring_all']['en-us'] = 'Ring All';
-	$text['option-longest_idle_agent']['en-us'] = 'Longest Idle Agent';
-	$text['option-round_robin']['en-us'] = 'Round Robin';
-	$text['option-top_down']['en-us'] = 'Top Down';
-	$text['option-agent_with_least_talk_time']['en-us'] = 'Agent With Least Talk Time';
-	$text['option-agent_with_fewest_calls']['en-us'] = 'Agent With Fewest Calls';
-	$text['option-sequentially_by_agent_order']['en-us'] = 'Sequentially By Agent Order';
-	$text['option-sequentially_by_next_agent_order']['en-us'] = 'Sequentially By Next Agent Order';
-	$text['option-random']['en-us'] = 'Random';
-	$text['option-system']['en-us'] = 'System';
-	$text['option-queue']['en-us'] = 'Queue';
-	$text['option-logged_out']['en-us'] = 'Logged Out';
-	$text['option-available']['en-us'] = 'Available';
-	$text['option-available_on_demand']['en-us'] = 'Available (On Demand)';
-	$text['option-on_break']['en-us'] = 'On Break';
-	$text['option-no_change']['en-us'] = 'No Change';
-	$text['option-do_not_disturb']['en-us'] = 'Do Not Disturb';
-
-	$text['button-add']['en-us'] = 'Add';
-	$text['button-edit']['en-us'] = 'Edit';
-	$text['button-delete']['en-us'] = 'Delete';
-	$text['button-advanced']['en-us'] = 'Advanced';
-	$text['button-back']['en-us'] = 'Back';
-	$text['button-copy']['en-us'] = 'Copy';
-	$text['button-save']['en-us'] = 'Save';
-	$text['button-agents']['en-us'] = 'Agents';
-	$text['button-tiers']['en-us'] = 'Tiers';
-	$text['button-status']['en-us'] = 'Status';
-	$text['button-update_status']['en-us'] = 'Update Status';
-	$text['button-refresh']['en-us'] = 'Refresh';
-	$text['button-view']['en-us'] = 'View';
-	$text['button-load']['en-us'] = 'Load';
-	$text['button-unload']['en-us'] = 'Unload';
-	$text['button-reload']['en-us'] = 'Reload';
-
-	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
-	$text['confirm-copy']['en-us'] = 'Do you really want to copy this?';
-
-	$text['message-add']['en-us'] = 'Add Completed';
-	$text['message-update']['en-us'] = 'Update Completed';
-	$text['message-delete']['en-us'] = 'Delete Completed';
-	$text['message-copy']['en-us'] = 'Copy Completed';
-	$text['message-required']['en-us'] = 'Please provide:';
-
-?>
\ No newline at end of file
+<?php
+
+	$text['title-call_center_queues']['en-us'] = 'Call Center Queues';
+	$text['title-call_center_queues']['fr-fr'] = "Queues du Centre d'appels";
+	$text['title-call_center_queue_add']['en-us'] = 'Call Center Queue Add';
+	$text['title-call_center_queue_add']['fr-fr'] = "Ajouter un Queue";
+	$text['title-call_center_queue_edit']['en-us'] = 'Call Center Queue Edit';
+	$text['title-call_center_queue_edit']['fr-fr'] = "Editer une queue";
+	$text['title-call_center_agents']['en-us'] = 'Call Center Agents';
+	$text['title-call_center_agents']['fr-fr'] = "Agents du Centre d'appels";
+	$text['title-call_center_agent_add']['en-us'] = 'Call Center Agent Add';
+	$text['title-call_center_agent_add']['fr-fr'] = "Ajouter un agent";
+	$text['title-call_center_agent_edit']['en-us'] = 'Call Center Agent Edit';
+	$text['title-call_center_agent_edit']['fr-fr'] = "Editer un agent";
+	$text['title-call_center_agent_status']['en-us'] = 'Call Center Agent Status';
+	$text['title-call_center_agent_status']['fr-fr'] = "Etat de l'agent";
+	$text['title-call_center_tiers']['en-us'] = 'Call Center Tiers';
+	$text['title-call_center_tiers']['fr-fr'] = "Tiers";
+	$text['title-call_center_tier_add']['en-us'] = 'Call Center Tier Add';
+	$text['title-call_center_tier_add']['fr-fr'] = "Ajouter un Tier";
+	$text['title-call_center_tier_edit']['en-us'] = 'Call Center Tier Edit';
+	$text['title-call_center_tier_edit']['fr-fr'] = "Editer un Tier";
+
+	$text['header-call_center_queues']['en-us'] = 'Call Center Queues';
+	$text['header-call_center_queues']['fr-fr'] = "Queues du Centre d'appels";
+	$text['header-call_center_queue_add']['en-us'] = 'Call Center Queue Add';
+	$text['header-call_center_queue_add']['fr-fr'] = "Ajouter un Queue";
+	$text['header-call_center_queue_edit']['en-us'] = 'Call Center Queue Edit';
+	$text['header-call_center_queue_edit']['fr-fr'] = "Editer une queue";
+	$text['header-call_center_agents']['en-us'] = 'Call Center Agents';
+	$text['header-call_center_agents']['fr-fr'] = "Agents du Centre d'appels";
+	$text['header-call_center_agent_add']['en-us'] = 'Call Center Agent Add';
+	$text['header-call_center_agent_add']['fr-fr'] = "Ajouter un agent";
+	$text['header-call_center_agent_edit']['en-us'] = 'Call Center Agent Edit';
+	$text['header-call_center_agent_edit']['fr-fr'] = "Editer un agent";
+	$text['header-call_center_agent_status']['en-us'] = 'Call Center Agent Status';
+	$text['header-call_center_agent_status']['fr-fr'] = "Etat de l'agent";
+	$text['header-call_center_tiers']['en-us'] = 'Call Center Tiers';
+	$text['header-call_center_tiers']['fr-fr'] = "Tiers";
+	$text['header-call_center_tier_add']['en-us'] = 'Call Center Tier Add';
+	$text['header-call_center_tier_add']['fr-fr'] = "Ajouter un Tier";
+	$text['header-call_center_tier_edit']['en-us'] = 'Call Center Tier Edit';
+	$text['header-call_center_tier_edit']['fr-fr'] = "Editer un Tier";
+
+	$text['description-call_center_queues']['en-us'] = 'List of queues for the call center.';
+	$text['description-call_center_queues']['fr-fr'] = "Liste des Queues";
+	$text['description-call_center_agents']['en-us'] = 'List of call center agents.';
+	$text['description-call_center_agents']['fr-fr'] = "Liste des agents du Centre d'appels";
+	$text['description-call_center_agent_status']['en-us'] = 'List all the call center agents with the option to change the status of one or more agents.';
+	$text['description-call_center_agent_status']['fr-fr'] = "Liste tous les agents du centre d'appel avec la possibilité de modifier l'état d'un ou plusieur agent.";
+	$text['description-call_center_tiers']['en-us'] = 'List all tiers. Tiers assign agents to queues.';
+	$text['description-call_center_tiers']['fr-fr'] = "Liste tous les Tiers. Les Tiers permettent d'affecter les agents aux queues.";
+
+
+	$text['label-queue_name']['en-us'] = 'Queue Name';
+	$text['label-queue_name']['fr-fr'] = "Nom de la queue";
+	$text['label-extension']['en-us'] = 'Extension';
+	$text['label-extension']['fr-fr'] = "Extension";
+	$text['label-strategy']['en-us'] = 'Strategy';
+	$text['label-strategy']['fr-fr'] = "Strategie";
+	$text['label-music_on_hold']['en-us'] = 'Music on Hold';
+	$text['label-music_on_hold']['fr-fr'] = "Mise de Garde";
+	$text['label-record_template']['en-us'] = 'Record Template';
+	$text['label-record_template']['fr-fr'] = "Modèle d'enregistrement";
+	$text['label-time_base_score']['en-us'] = 'Time Base Score';
+	$text['label-time_base_score']['fr-fr'] = "Score basé sur le temps";
+	$text['label-max_wait_time']['en-us'] = 'Max Wait Time';
+	$text['label-max_wait_time']['fr-fr'] = "Max attente";
+	$text['label-max_wait_time_with_no_agent']['en-us'] = 'Max Wait Time with No Agent';
+	$text['label-max_wait_time_with_no_agent']['fr-fr'] = "Max attente sans agent";
+	$text['label-max_wait_time_with_no_agent_time_reached']['en-us'] = 'Max Wait Time with No Agent Time Reached';
+	$text['label-max_wait_time_with_no_agent_time_reached']['fr-fr'] = "Max attente sans temps de l'agent atteint ";
+	$text['label-timeout_action']['en-us'] = 'Timeout Action';
+	$text['label-timeout_action']['fr-fr'] = "Action sur Timeout";
+	$text['label-tier_rules_apply']['en-us'] = 'Tier Rules Apply';
+	$text['label-tier_rules_apply']['fr-fr'] = "Appliquer la Règle de Tier";
+	$text['label-tier_rule_wait_second']['en-us'] = 'Tier Rule Wait Second';
+	$text['label-tier_rule_wait_second']['fr-fr'] = "Attente en seconde de la Règle de Tier";
+	$text['label-tier_rule_wait_multiply_level']['en-us'] = 'Tier Rule Wait Multiply Level';
+	$text['label-tier_rule_wait_multiply_level']['fr-fr'] = "Règle du Tier Attente multipliée par niveau";
+	$text['label-tier_rule_no_agent_no_wait']['en-us'] = 'Tier Rule No Agent No Wait';
+	$text['label-tier_rule_no_agent_no_wait']['fr-fr'] = "Règle du Tier Pas d'Agent, Pas d'attente";
+	$text['label-discard_abandoned_after']['en-us'] = 'Discard Abandoned After';
+	$text['label-discard_abandoned_after']['fr-fr'] = "Déclarer abandonné après";
+	$text['label-abandoned_resume_allowed']['en-us'] = 'Abandoned Resume Allowed';
+	$text['label-abandoned_resume_allowed']['fr-fr'] = "Recupération permise des Abandons";
+	$text['label-caller_id_name_prefix']['en-us'] = 'Caller ID Name Prefix';
+	$text['label-caller_id_name_prefix']['fr-fr'] = "Préfixe sur le nom d'appelant";
+	$text['label-description']['en-us'] = 'Description';
+	$text['label-description']['fr-fr'] = "Description";
+	$text['label-agent_name']['en-us'] = 'Agent Name';
+	$text['label-agent_name']['fr-fr'] = "Nom d'agent";
+	$text['label-type']['en-us'] = 'Type';
+	$text['label-type']['fr-fr'] = "Type";
+	$text['label-call_timeout']['en-us'] = 'Call Timeout';
+	$text['label-call_timeout']['fr-fr'] = "Timeout d'appel";
+	$text['label-contact']['en-us'] = 'Contact';
+	$text['label-contact']['fr-fr'] = "Contact";
+	$text['label-status']['en-us'] = 'Status';
+	$text['label-status']['fr-fr'] = "Etat";
+	$text['label-no_answer_delay_time']['en-us'] = 'No Answer Delay Time';
+	$text['label-no_answer_delay_time']['fr-fr'] = "Delais de No Réponse";
+	$text['label-max_no_answer']['en-us'] = 'Max No Answer';
+	$text['label-max_no_answer']['fr-fr'] = "Max non réponses";
+	$text['label-wrap_up_time']['en-us'] = 'Wrap Up Time';
+	$text['label-wrap_up_time']['fr-fr'] = "temps de Wrap Up";
+	$text['label-reject_delay_time']['en-us'] = 'Reject Delay Time';
+	$text['label-reject_delay_time']['fr-fr'] = "Délais pour le rejet";
+	$text['label-busy_delay_time']['en-us'] = 'Busy Delay Time';
+	$text['label-busy_delay_time']['fr-fr'] = "Délais d'occupation";
+	$text['label-agent_logout']['en-us'] = 'Agent Logout';
+	$text['label-agent_logout']['fr-fr'] = "Déconnexion d'agent";
+	$text['label-agent']['en-us'] = 'Agent';
+	$text['label-agent']['fr-fr'] = "Agent";
+	$text['label-options']['en-us'] = 'Options';
+	$text['label-options']['fr-fr'] = "Options";
+	$text['label-tier_level']['en-us'] = 'Tier Level';
+	$text['label-tier_level']['fr-fr'] = "Niveau du Tier";
+	$text['label-tier_position']['en-us'] = 'Tier Position';
+	$text['label-tier_position']['fr-fr'] = "Position du Tier";
+
+
+	$text['description-queue_name']['en-us'] = 'Enter the queue name.';
+	$text['description-queue_name']['fr-fr'] = "";
+	$text['description-extension']['en-us'] = 'Enter the extension number.';
+	$text['description-extension']['fr-fr'] = "";
+	$text['description-strategy']['en-us'] = 'Select the queue ring strategy.';
+	$text['description-strategy']['fr-fr'] = "";
+	$text['description-music_on_hold']['en-us'] = 'Select the desired hold music.';
+	$text['description-music_on_hold']['fr-fr'] = "";
+	$text['description-record_template']['en-us'] = 'Enter a record template. $${base_dir}/recordings/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.wav';
+	$text['description-record_template']['fr-fr'] = 'Entrer un modèle d\'enregistrement. $${base_dir}/recordings/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.wav';
+	$text['description-time_base_score']['en-us'] = 'Select the time base score.';
+	$text['description-time_base_score']['fr-fr'] = "";
+	$text['description-max_wait_time']['en-us'] = 'Enter the max wait time.';
+	$text['description-max_wait_time']['fr-fr'] = "";
+	$text['description-max_wait_time_with_no_agent']['en-us'] = 'Enter the max wait time with no agent.';
+	$text['description-max_wait_time_with_no_agent']['fr-fr'] = "";
+	$text['description-max_wait_time_with_no_agent_time_reached']['en-us'] = 'Enter the max wait time with no agent time reached.';
+	$text['description-max_wait_time_with_no_agent_time_reached']['fr-fr'] = "";
+	$text['description-timeout_action']['en-us'] = 'Set the action to perform when the max wait time is reached.';
+	$text['description-timeout_action']['fr-fr'] = "";
+	$text['description-tier_rules_apply']['en-us'] = 'Set the tier rule rules apply to true or false.';
+	$text['description-tier_rules_apply']['fr-fr'] = "";
+	$text['description-tier_rule_wait_second']['en-us'] = 'Enter the tier rule wait seconds.';
+	$text['description-tier_rule_wait_second']['fr-fr'] = "";
+	$text['description-tier_rule_wait_multiply_level']['en-us'] = 'Set the tier rule wait multiply level to true or false.';
+	$text['description-tier_rule_wait_multiply_level']['fr-fr'] = "";
+	$text['description-tier_rule_no_agent_no_wait']['en-us'] = 'Enter the tier rule no agent no wait.';
+	$text['description-tier_rule_no_agent_no_wait']['fr-fr'] = "";
+	$text['description-discard_abandoned_after']['en-us'] = 'Set the discard abandoned after seconds.';
+	$text['description-discard_abandoned_after']['fr-fr'] = "";
+	$text['description-abandoned_resume_allowed']['en-us'] = 'Set the abandoned resume allowed to true or false.';
+	$text['description-abandoned_resume_allowed']['fr-fr'] = "";
+	$text['description-caller_id_name_prefix']['en-us'] = 'Set a prefix on the caller ID name.';
+	$text['description-caller_id_name_prefix']['fr-fr'] = "";
+	$text['description-description']['en-us'] = 'Enter a description, if desired.';
+	$text['description-description']['fr-fr'] = "";
+	$text['description-agent_name']['en-us'] = 'Select the agents name.';
+	$text['description-agent_name']['fr-fr'] = "";
+	$text['description-type']['en-us'] = 'Enter the agent type.';
+	$text['description-type']['fr-fr'] = "";
+	$text['description-call_timeout']['en-us'] = 'Enter the call timeout.';
+	$text['description-call_timeout']['fr-fr'] = "";
+	$text['description-contact']['en-us'] = 'Select the contact number.';
+	$text['description-contact']['fr-fr'] = "";
+	$text['description-status']['en-us'] = 'Select the agent status.';
+	$text['description-status']['fr-fr'] = "";
+	$text['description-no_answer_delay_time']['en-us'] = 'Enter the agent no answer delay time in seconds.';
+	$text['description-no_answer_delay_time']['fr-fr'] = "";
+	$text['description-max_no_answer']['en-us'] = 'Enter max no answer.';
+	$text['description-max_no_answer']['fr-fr'] = "";
+	$text['description-wrap_up_time']['en-us'] = 'Enter the wrap up time.';
+	$text['description-wrap_up_time']['fr-fr'] = "";
+	$text['description-reject_delay_time']['en-us'] = 'Enter the reject delay time.';
+	$text['description-reject_delay_time']['fr-fr'] = "";
+	$text['description-busy_delay_time']['en-us'] = 'Enter the agent busy delay time.';
+	$text['description-busy_delay_time']['fr-fr'] = "";
+	$text['description-agent_logout']['en-us'] = 'Enter the auto agent logout time in 00:00 format. Requires a service to enforce the logout time.';
+	$text['description-agent_logout']['fr-fr'] = "Entrer l'heure de déconnexion automatique de l'agent au format 00:00. Nécessite un service pour forcer la déconnexion.";
+	$text['description-agent']['en-us'] = 'Select the agent name.';
+	$text['description-agent']['fr-fr'] = "";
+	$text['description-options']['en-us'] = 'Select the queue name.';
+	$text['description-options']['fr-fr'] = "";
+	$text['description-tier_level']['en-us'] = 'Select the tier level.';
+	$text['description-tier_level']['fr-fr'] = "";
+	$text['description-tier_position']['en-us'] = 'Select the tier position.';
+	$text['description-tier_position']['fr-fr'] = "";
+
+
+	$text['option-true']['en-us'] = 'True';
+	$text['option-true']['fr-fr'] = "Oui";
+	$text['option-false']['en-us'] = 'False';
+	$text['option-false']['fr-fr'] = "False";
+	$text['option-ring_all']['en-us'] = 'Ring All';
+	$text['option-ring_all']['fr-fr'] = "Sonner tous";
+	$text['option-longest_idle_agent']['en-us'] = 'Longest Idle Agent';
+	$text['option-longest_idle_agent']['fr-fr'] = "Agent logué depuis le plus lontemps";
+	$text['option-round_robin']['en-us'] = 'Round Robin';
+	$text['option-round_robin']['fr-fr'] = "Round Robin";
+	$text['option-top_down']['en-us'] = 'Top Down';
+	$text['option-top_down']['fr-fr'] = "Haut bas";
+	$text['option-agent_with_least_talk_time']['en-us'] = 'Agent With Least Talk Time';
+	$text['option-agent_with_least_talk_time']['fr-fr'] = "Agent ayant le plus petit temps de parole";
+	$text['option-agent_with_fewest_calls']['en-us'] = 'Agent With Fewest Calls';
+	$text['option-agent_with_fewest_calls']['fr-fr'] = "Agent avec le moins d'appels";
+	$text['option-sequentially_by_agent_order']['en-us'] = 'Sequentially By Agent Order';
+	$text['option-sequentially_by_agent_order']['fr-fr'] = "Séquentiel par ordre d'agent";
+	$text['option-sequentially_by_next_agent_order']['en-us'] = 'Sequentially By Next Agent Order';
+	$text['option-sequentially_by_next_agent_order']['fr-fr'] = "Séquentiel par ordre d'agent suivant";
+	$text['option-random']['en-us'] = 'Random';
+	$text['option-random']['fr-fr'] = "Aléatoire";
+	$text['option-system']['en-us'] = 'System';
+	$text['option-system']['fr-fr'] = "Système";
+	$text['option-queue']['en-us'] = 'Queue';
+	$text['option-queue']['fr-fr'] = "Queue";
+	$text['option-logged_out']['en-us'] = 'Logged Out';
+	$text['option-logged_out']['fr-fr'] = "Déconnecté";
+	$text['option-available']['en-us'] = 'Available';
+	$text['option-available']['fr-fr'] = "Disponible";
+	$text['option-available_on_demand']['en-us'] = 'Available (On Demand)';
+	$text['option-available_on_demand']['fr-fr'] = "Disponible (Sur Demande)";
+	$text['option-on_break']['en-us'] = 'On Break';
+	$text['option-on_break']['fr-fr'] = "En Pause";
+	$text['option-no_change']['en-us'] = 'No Change';
+	$text['option-no_change']['fr-fr'] = "Pas de Changement";
+	$text['option-do_not_disturb']['en-us'] = 'Do Not Disturb';
+	$text['option-do_not_disturb']['fr-fr'] = "Ne Pas Derranger";
+
+
+	$text['button-add']['en-us'] = 'Add';
+	$text['button-add']['fr-fr'] = "ajouter";
+	$text['button-edit']['en-us'] = 'Edit';
+	$text['button-edit']['fr-fr'] = "Editer";
+	$text['button-delete']['en-us'] = 'Delete';
+	$text['button-delete']['fr-fr'] = "Supprimer";
+	$text['button-advanced']['en-us'] = 'Advanced';
+	$text['button-advanced']['fr-fr'] = "Avancé";
+	$text['button-back']['en-us'] = 'Back';
+	$text['button-back']['fr-fr'] = "Retour";
+	$text['button-copy']['en-us'] = 'Copy';
+	$text['button-copy']['fr-fr'] = "Copier";
+	$text['button-save']['en-us'] = 'Save';
+	$text['button-save']['fr-fr'] = "Sauvegarder";
+	$text['button-agents']['en-us'] = 'Agents';
+	$text['button-agents']['fr-fr'] = "Agents";
+	$text['button-tiers']['en-us'] = 'Tiers';
+	$text['button-tiers']['fr-fr'] = "Tiers";
+	$text['button-status']['en-us'] = 'Status';
+	$text['button-status']['fr-fr'] = "Etat";
+	$text['button-update_status']['en-us'] = 'Update Status';
+	$text['button-update_status']['fr-fr'] = "Mis à jour état";
+	$text['button-refresh']['en-us'] = 'Refresh';
+	$text['button-refresh']['fr-fr'] = "Rafraîchir";
+	$text['button-view']['en-us'] = 'View';
+	$text['button-view']['fr-fr'] = "Voir";
+	$text['button-load']['en-us'] = 'Load';
+	$text['button-load']['fr-fr'] = "charger";
+	$text['button-unload']['en-us'] = 'Unload';
+	$text['button-unload']['fr-fr'] = "décharger";
+	$text['button-reload']['en-us'] = 'Reload';
+	$text['button-reload']['fr-fr'] = "recharger";
+
+
+	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
+	$text['confirm-copy']['en-us'] = 'Do you really want to copy this?';
+	$text['confirm-copy']['fr-fr'] = "Voulez-vous vraiment copier cela?";
+
+
+	$text['message-add']['en-us'] = 'Add Completed';
+	$text['message-add']['fr-fr'] = "Ajouté";
+	$text['message-update']['en-us'] = 'Update Completed';
+	$text['message-update']['fr-fr'] = "Mis à jour";
+	$text['message-delete']['en-us'] = 'Delete Completed';
+	$text['message-delete']['fr-fr'] = "Supprimé";
+	$text['message-copy']['en-us'] = 'Copy Completed';
+	$text['message-copy']['fr-fr'] = "Copié";
+	$text['message-required']['en-us'] = 'Please provide:';
+	$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
+?>
diff --git a/app/call_center_active/app_config.php b/app/call_center_active/app_config.php
index d6688cbadb..64c9aa5a83 100644
--- a/app/call_center_active/app_config.php
+++ b/app/call_center_active/app_config.php
@@ -7,25 +7,25 @@
 		$apps[$x]['version'] = '';
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = "Shows active calls, and agents in the call center queue.";
-		$apps[$x]['description']['es-mx'] = "Muestra las llamadas activas y los agentes en la cola del centro de llamadas.";
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['en-us'] = 'Shows active calls, and agents in the call center queue.';
+		$apps[$x]['description']['es-mx'] = 'Muestra las llamadas activas y los agentes en la cola del centro de llamadas.';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Affiche les appels actifs et les agents en file sur le centre d'appels.";
-		$apps[$x]['description']['fr-ca'] = "Il montre les appels actives et des agents en queue du centre d'appels.";
-		$apps[$x]['description']['fr-ch'] = "";
-		$apps[$x]['description']['pt-pt'] = "Mostra as chamadas ativas e agentes na fila do centro de chamadas.";
+		$apps[$x]['description']['fr-ca'] = '';
+		$apps[$x]['description']['fr-ch'] = '';
+		$apps[$x]['description']['pt-pt'] = 'Mostra as chamadas ativas e agentes na fila do centro de chamadas.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Active Call Center';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Centro de Llamada Activo';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "Centre Appels Actifs";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = "Centre d'Appels Active";
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Centro de Chamadas Activo';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -38,8 +38,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'call_center_active_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = '7fb0dd87-e984-9980-c512-2c76b887aeb2';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_center_active/app_languages.php b/app/call_center_active/app_languages.php
index 5385dd1417..330aac8485 100644
--- a/app/call_center_active/app_languages.php
+++ b/app/call_center_active/app_languages.php
@@ -1,55 +1,101 @@
 <?php
 
 	$text['title-active_call_center']['en-us'] = 'Active Call Center';
+	$text['title-active_call_center']['fr-fr'] = "Centre d'appel Actif";
 	$text['title-call_center_queue_activity']['en-us'] = 'Call Center Queue Activity';
+	$text['title-call_center_queue_activity']['fr-fr'] = "Activité des files d'attente du centre d'appel";
 
 	$text['header-active_call_center']['en-us'] = 'Active Call Center';
+	$text['header-active_call_center']['fr-fr'] = "Centre d'appel Actif";
 	$text['header-agents']['en-us'] = 'Agents';
+	$text['header-agents']['fr-fr'] = "Agents";
 
 	$text['description-active_call_center']['en-us'] = 'Select a Call Center Queue from the list below to view its activity.';
+	$text['description-active_call_center']['fr-fr'] = "Choisir une file d'attente dans la liste pour voir son activité.";
 	$text['description-agents']['en-us'] = 'A current list of agents is below.';
+	$text['description-agents']['fr-fr'] = "Liste des agents";
 	$text['description-queue']['en-us'] = 'A current list of callers in the queue is below.';
+	$text['description-queue']['fr-fr'] = "Liste des appelants dans la file.";
 
 	$text['label-queue_name']['en-us'] = 'Queue Name';
+	$text['label-queue_name']['fr-fr'] = " Nom de la file";
 	$text['label-extension']['en-us'] = 'Extension';
+	$text['label-extension']['fr-fr'] = "Extension";
 	$text['label-strategy']['en-us'] = 'Strategy';
+	$text['label-strategy']['fr-fr'] = "Stratégie";
 	$text['label-music_on_hold']['en-us'] = 'Music on Hold';
+	$text['label-music_on_hold']['fr-fr'] = "Musique de Garde";
 	$text['label-record_template']['en-us'] = 'Record Template';
+	$text['label-record_template']['fr-fr'] = "Modèle d'enregistrement";
 	$text['label-time_base_score']['en-us'] = 'Time Base Score';
+	$text['label-time_base_score']['fr-fr'] = "Score basé sur le temps";
 	$text['label-max_wait_time']['en-us'] = 'Max Wait Time';
+	$text['label-max_wait_time']['fr-fr'] = "Max d'attente";
 	$text['label-max_wait_time_with_no_agent']['en-us'] = 'Max Wait Time with No Agent';
+	$text['label-max_wait_time_with_no_agent']['fr-fr'] = "Max d'attente sans Agent";
 	$text['label-tier_rules_apply']['en-us'] = 'Tier Rules Apply';
+	$text['label-tier_rules_apply']['fr-fr'] = "Appliquer les règles de Tier";
 	$text['label-tier_rule_wait_second']['en-us'] = 'Tier Rule Wait Second';
+	$text['label-tier_rule_wait_second']['fr-fr'] = "Attente en secondes de la règle du Tier";
 	$text['label-tier_rule_no_agent_no_wait']['en-us'] = 'Tier Rule No Agent No Wait';
+	$text['label-tier_rule_no_agent_no_wait']['fr-fr'] = "Règle de Tier Pas d'agent, pas d'attente";
 	$text['label-discard_abandoned_after']['en-us'] = 'Discard Abandoned After';
+	$text['label-discard_abandoned_after']['fr-fr'] = "Ecarter les appels abandonnés après";
 	$text['label-abandoned_resume_allowed']['en-us'] = 'Abandoned Resume Allowed';
+	$text['label-abandoned_resume_allowed']['fr-fr'] = "Authoriser la reprise des abandonnés";
 	$text['label-tier_rule_wait_multiply_level']['en-us'] = 'Tier Rule Wait Multiply Level';
+	$text['label-tier_rule_wait_multiply_level']['fr-fr'] = "Niveaux multipliés d'attente des Règle de Tier";
 	$text['label-description']['en-us'] = 'Description';
+	$text['label-description']['fr-fr'] = "Description";
 	$text['label-name']['en-us'] = 'Name';
+	$text['label-name']['fr-fr'] = "Nom";
 	$text['label-extension']['en-us'] = 'Extension';
+	$text['label-extension']['fr-fr'] = "Extension";
 	$text['label-status']['en-us'] = 'Status';
+	$text['label-status']['fr-fr'] = "status";
 	$text['label-state']['en-us'] = 'State';
+	$text['label-state']['fr-fr'] = "Etat";
 	$text['label-status_change']['en-us'] = 'Status Change';
+	$text['label-status_change']['fr-fr'] = "Change Status";
 	$text['label-missed']['en-us'] = 'Missed';
+	$text['label-missed']['fr-fr'] = "Raté";
 	$text['label-answered']['en-us'] = 'Answered';
+	$text['label-answered']['fr-fr'] = "Répondu";
 	$text['label-tier_state']['en-us'] = 'Tier State';
+	$text['label-tier_state']['fr-fr'] = "Etat du Tier";
 	$text['label-tier_level']['en-us'] = 'Tier Level';
+	$text['label-tier_level']['fr-fr'] = "Niveau du Tier";
 	$text['label-tier_position']['en-us'] = 'Tier Position';
+	$text['label-tier_position']['fr-fr'] = "Position Tier";
 	$text['label-options']['en-us'] = 'Options';
+	$text['label-options']['fr-fr'] = "Options";
 	$text['label-eavesdrop']['en-us'] = 'Eavesdrop';
+	$text['label-eavesdrop']['fr-fr'] = "Espionnage";
 	$text['label-transfer']['en-us'] = 'Transfer';
+	$text['label-transfer']['fr-fr'] = "Transfert";
 	$text['label-call']['en-us'] = 'Call';
+	$text['label-call']['fr-fr'] = "Appel";
 	$text['label-queue']['en-us'] = 'Queue';
+	$text['label-queue']['fr-fr'] = "File";
 	$text['label-time']['en-us'] = 'Time';
+	$text['label-time']['fr-fr'] = "Temps";
 	$text['label-system']['en-us'] = 'System';
+	$text['label-system']['fr-fr'] = "Système";
 	$text['label-number']['en-us'] = 'Number';
+	$text['label-number']['fr-fr'] = "Numéro";
 	$text['label-agent']['en-us'] = 'Agent';
+	$text['label-agent']['fr-fr'] = "Agent";
 	$text['label-total_waiting']['en-us'] = 'Total Waiting';
+	$text['label-total_waiting']['fr-fr'] = "Total d'attente";
 	$text['label-total_trying']['en-us'] = 'Total Trying';
+	$text['label-total_trying']['fr-fr'] = "Total d'essais";
 	$text['label-total_answered']['en-us'] = 'Total Answered';
+	$text['label-total_answered']['fr-fr'] = "Total répondu";
 
 	$text['button-edit']['en-us'] = 'Edit';
+	$text['button-edit']['fr-fr'] = "Editer";
 
 	$text['message-confirm']['en-us'] = 'Do you really want to do this?';
+	$text['message-confirm']['fr-fr'] = "Voulez-vous vraiment faire cela?";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_flows/app_config.php b/app/call_flows/app_config.php
index 99530f7c1e..48292fa1e1 100644
--- a/app/call_flows/app_config.php
+++ b/app/call_flows/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = '';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = '';
@@ -19,13 +19,13 @@
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = "Call Flows";
-		$apps[$x]['menu'][0]['title']['es-mx'] = "Flujo de Llamada";
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['en-us'] = 'Call Flows';
+		$apps[$x]['menu'][0]['title']['es-mx'] = 'Flujo de Llamada';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "cinématiques d'Appel";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = "Circulation d'Appel";
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = '';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -39,7 +39,6 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'call_flow_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = 'b0939384-7055-44e8-8b4c-9f72293e1878';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
@@ -135,4 +134,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the description.';
 		$z++;
-?>
\ No newline at end of file
+?>
diff --git a/app/call_flows/app_languages.php b/app/call_flows/app_languages.php
index c90726e90b..5bc0932e0d 100644
--- a/app/call_flows/app_languages.php
+++ b/app/call_flows/app_languages.php
@@ -1,133 +1,183 @@
 <?php
 
 	//Call Flows
+
 		$text['title-call_flows']['en-us'] = 'Call Flows';
 		$text['title-call_flows']['pt-pt'] = '';
+		$text['title-call_flows']['fr-fr'] = "Flux d'appel";
 
 		$text['header-call_flows']['en-us'] = 'Call Flows';
 		$text['header-call_flows']['pt-pt'] = '';
+		$text['header-call_flows']['fr-fr'] = "Flux d'appel";
 
 		$text['description-call_flows']['en-us'] = 'Direct calls between two destinations by calling a feature code.';
 		$text['description-call_flows']['pt-pt'] = '';
+		$text['description-call_flows']['fr-fr'] = "Appels directs entre deux destionation en appelant une fonction via un code. ";
+
+		//------
 
 		$text['title-call_flow-edit']['en-us'] = 'Call Flow Edit';
 		$text['title-call_flow-edit']['pt-pt'] = '';
+		$text['title-call_flow-edit']['fr-fr'] = "Editer le flux";
 
 		$text['header-call_flow-edit']['en-us'] = 'Call Flow Edit';
 		$text['header-call_flow-edit']['pt-pt'] = '';
+		$text['header-call_flow-edit']['fr-fr'] = "Editer le flux";
+
+		//------
 
 		$text['title-call_flow-add']['en-us'] = 'Call Flow Add';
 		$text['title-call_flow-add']['pt-pt'] = '';
+		$text['title-call_flow-add']['fr-fr'] = "Ajouter un flux";
 
 		$text['header-call_flow-add']['en-us'] = 'Call Flow Add';
 		$text['header-call_flow-add']['pt-pt'] = '';
+		$text['header-call_flow-add']['fr-fr'] = "Ajouter un flux";
+
+		//------
 
 		$text['label-name']['en-us'] = 'Name';
 		$text['label-name']['pt-pt'] = '';
+		$text['label-name']['fr-fr'] = "Nom";
 
 		$text['description-name']['en-us'] = 'Enter the name.';
 		$text['description-name']['pt-pt'] = '';
+		$text['description-name']['fr-fr'] = "";
 
 		$text['label-extension']['en-us'] = 'Extension';
 		$text['label-extension']['pt-pt'] = '';
+		$text['label-extension']['fr-fr'] = "Extension";
 
 		$text['description-extension']['en-us'] = 'Enter the extension number.';
 		$text['description-extension']['pt-pt'] = '';
+		$text['description-extension']['fr-fr'] = "";
 
 		$text['label-feature_code']['en-us'] = 'Feature Code';
 		$text['label-feature_code']['pt-pt'] = '';
+		$text['label-feature_code']['fr-fr'] = "Code Fonction";
 
 		$text['description-feature_code']['en-us'] = 'Enter the feature code.';
 		$text['description-feature_code']['pt-pt'] = '';
+		$text['description-feature_code']['fr-fr'] = "";
 
 		$text['label-context']['en-us'] = 'Context';
 		$text['label-context']['pt-pt'] = '';
+		$text['label-context']['fr-fr'] = "Contexte";
 
 		$text['description-context']['en-us'] = 'Enter the context.';
 		$text['description-context']['pt-pt'] = '';
+		$text['description-context']['fr-fr'] = "";
 
 		$text['label-status']['en-us'] = 'Status';
 		$text['label-status']['pt-pt'] = '';
+		$text['label-status']['fr-fr'] = "Etat";
 
 		$text['description-status']['en-us'] = 'Select the status.';
 		$text['description-status']['pt-pt'] = '';
+		$text['description-status']['fr-fr'] = "";
 
 		$text['label-pin_number']['en-us'] = 'PIN Number';
 		$text['label-pin_number']['pt-pt'] = '';
+		$text['label-pin_number']['fr-fr'] = "Code PIN";
 
 		$text['description-pin_number']['en-us'] = 'Enter the pin number.';
 		$text['description-pin_number']['pt-pt'] = '';
+		$text['description-pin_number']['fr-fr'] = "";
 
 		$text['label-destination_label']['en-us'] = 'Destination Label';
 		$text['label-destination_label']['pt-pt'] = '';
+		$text['label-destination_label']['fr-fr'] = "Label de la destination";
 
 		$text['description-destination_label']['en-us'] = 'Enter the destination label.';
 		$text['description-destination_label']['pt-pt'] = '';
+		$text['description-destination_label']['fr-fr'] = "";
 
 		$text['label-destination']['en-us'] = 'Destination';
 		$text['label-destination']['pt-pt'] = '';
+		$text['label-destination']['fr-fr'] = "Destination";
 
 		$text['description-destination']['en-us'] = 'Select the destination.';
 		$text['description-destination']['pt-pt'] = '';
+		$text['description-destination']['fr-fr'] = "";
 
 		$text['label-alternate_label']['en-us'] = 'Alternate Label';
 		$text['label-alternate_label']['pt-pt'] = '';
+		$text['label-alternate_label']['fr-fr'] = "Label alternatif";
 
 		$text['description-alternate_label']['en-us'] = 'Enter the alternate destination label.';
 		$text['description-alternate_label']['pt-pt'] = '';
+		$text['description-alternate_label']['fr-fr'] = "";
 
 		$text['label-alternate_destination']['en-us'] = 'Alternate Destination';
 		$text['label-alternate_destination']['pt-pt'] = '';
+		$text['label-alternate_destination']['fr-fr'] = "Destination alternative";
 
 		$text['description-alternate_destination']['en-us'] = 'Select the alternate destination.';
 		$text['description-alternate_destination']['pt-pt'] = '';
+		$text['description-alternate_destination']['fr-fr'] = "";
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = "Description";
 
 		$text['description-description']['en-us'] = 'Enter a description, if desired.';
 		$text['description-description']['pt-pt'] = '';
+		$text['description-description']['fr-fr'] = "";
 
 		$text['label-true']['en-us'] = 'True';
 		$text['label-true']['pt-pt'] = '';
+		$text['label-true']['fr-fr'] = "Oui";
 
 		$text['label-false']['en-us'] = 'False';
 		$text['label-false']['pt-pt'] = 'falso';
+		$text['label-false']['fr-fr'] = 'Non';
 
 		$text['label-none']['en-us'] = 'None';
 		$text['label-none']['pt-pt'] = '';
+		$text['label-none']['fr-fr'] = "Aucun";
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = "Ajouter";
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = "Editer";
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = "Supprimer";
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vour vraiment supprimer cela?";
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['message-message']['en-us'] = 'Message';
 		$text['message-message']['pt-pt'] = '';
+		$text['message-message']['fr-fr'] = "Message";
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = "Ajouté";
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = "Mis à jour";
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = "Supprimé";
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/calls/app_config.php b/app/calls/app_config.php
index 7166f31586..ac240cf367 100644
--- a/app/calls/app_config.php
+++ b/app/calls/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Call Forward, Follow Me and Do Not Disturb.';
 		$apps[$x]['description']['es-mx'] = 'Reenvio de llamada, Sígueme y No Molestar.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Renvoi d'appel, suis-moi et ne pas deranger.";
@@ -21,7 +21,7 @@
 	//menu details
 		//$apps[$x]['menu'][0]['title']['en-us'] = 'Calls';
 		//$apps[$x]['menu'][0]['title']['es-mx'] = 'Llamadas';
-		//$apps[$x]['menu'][0]['title']['de-de'] = '';
+		//$apps[$x]['menu'][0]['title']['de'] = '';
 		//$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		//$apps[$x]['menu'][0]['title']['de-at'] = '';
 		//$apps[$x]['menu'][0]['title']['fr-fr'] = 'Appels';
@@ -38,19 +38,18 @@
 		//$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][$y]['name'] = 'follow_me';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_forward';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'do_not_disturb';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][1]['name'] = 'follow_me';
+		$apps[$x]['permissions'][1]['groups'][] = 'user';
+		$apps[$x]['permissions'][1]['groups'][] = 'admin';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-?>
\ No newline at end of file
+		$apps[$x]['permissions'][2]['name'] = 'call_forward';
+		$apps[$x]['permissions'][2]['groups'][] = 'user';
+		$apps[$x]['permissions'][2]['groups'][] = 'admin';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'do_not_disturb';
+		$apps[$x]['permissions'][3]['groups'][] = 'user';
+		$apps[$x]['permissions'][3]['groups'][] = 'admin';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+?>
diff --git a/app/calls/app_languages.php b/app/calls/app_languages.php
index bcc86a5a76..372620c457 100644
--- a/app/calls/app_languages.php
+++ b/app/calls/app_languages.php
@@ -2,148 +2,142 @@
 
 	$text['title']['en-us'] = 'Calls';
 	$text['title']['pt-pt'] = 'Chamadas';
-	$text['title']['fr'] = "Appels";
+	$text['title']['fr-fr'] = "Appels";
 
 	$text['description']['en-us'] = 'Directs incoming calls for extension:';
 	$text['description']['pt-pt'] = 'Direciona as chamadas recebidas para a extensão:';
-	$text['description']['fr'] = "Rediriger les appels entrant pour l'extension:";
+	$text['description']['fr-fr'] = "Rediriger les appels entrant pour l'extension:";
 
 	$text['description-2']['en-us'] = 'Use the links to configure call forward follow me, or do no disturb.';
 	$text['description-2']['pt-pt'] = 'Utilizar os links para definir as funcinalidades de encaminhamento de chamada, segue-me, ou de não perturbar.';
-	$text['description-2']['fr'] = "Utiliser les liens afin de configurer le renvoi \"follow me\", ou ne pas derranger.";
+	$text['description-2']['fr-fr'] = "Utiliser les liens afin de configurer le renvoi \"follow me\", ou ne pas derranger.";
 
 	$text['description-3']['en-us'] = 'The following list the extensions that have been assigned to this user account.';
 	$text['description-3']['pt-pt'] = 'A tabela a seguir lista as extensões que foram atribuídas a esta conta de utilizador.';
-	$text['description-3']['fr'] = "Ici la liste des extensions assignées à cet usager.";
+	$text['description-3']['fr-fr'] = "Ici la liste des extensions assignées à cet usager.";
 
 	$text['label-call-forward']['en-us'] = 'Call Forward';
 	$text['label-call-forward']['pt-pt'] = 'Encaminhamento de Chamadas';
-	$text['label-call-forward']['fr'] = "Renvoi d'appel";
+	$text['label-call-forward']['fr-fr'] = "Renvoi d'appel";
 
 	$text['label-enabled']['en-us'] = 'Enabled';
 	$text['label-enabled']['pt-pt'] = 'Activo';
-	$text['label-enabled']['fr'] = 'Actif';
+	$text['label-enabled']['fr-fr'] = 'Actif';
 
 	$text['label-enable']['en-us'] = 'Enable';
 	$text['label-enable']['pt-pt'] = 'Activar';
-	$text['label-enable']['fr'] = 'Activé';
+	$text['label-enable']['fr-fr'] = 'Activé';
 
 	$text['label-disable']['en-us'] = 'Disable';
 	$text['label-disable']['pt-pt'] = 'Desactivo';
-	$text['label-disable']['fr'] = 'Désactiver';
+	$text['label-disable']['fr-fr'] = 'Désactiver';
 
 	$text['label-disabled']['en-us'] = 'Disabled';
 	$text['label-disabled']['pt-pt'] = 'Desactivo';
-	$text['label-disabled']['fr'] = 'Desactivé';
+	$text['label-disabled']['fr-fr'] = 'Desactivé';
 
 	$text['label-number']['en-us'] = 'Number';
 	$text['label-number']['pt-pt'] = 'Número';
-	$text['label-number']['fr'] = 'Numéro';
+	$text['label-number']['fr-fr'] = 'Numéro';
 
 	$text['label-follow-me']['en-us'] = 'Follow Me';
 	$text['label-follow-me']['pt-pt'] = 'Segue-me';
-	$text['label-follow-me']['fr'] = 'Follow Me';
+	$text['label-follow-me']['fr-fr'] = 'Follow Me';
 
 	$text['label-ring-1']['en-us'] = 'Ring 1st Number';
 	$text['label-ring-1']['pt-pt'] = '1º Número a Tocar';
-	$text['label-ring-1']['fr'] = 'Sonner le 1er Numéro';
+	$text['label-ring-1']['fr-fr'] = 'Sonner le 1er Numéro';
 
 	$text['label-ring-2']['en-us'] = 'Ring 2nd Number';
 	$text['label-ring-2']['pt-pt'] = '2º Número a Tocar';
-	$text['label-ring-2']['fr'] = 'Sonner le 2nd Numéro';
+	$text['label-ring-2']['fr-fr'] = 'Sonner le 2nd Numéro';
 
 	$text['label-ring-3']['en-us'] = 'Ring 3rd Number';
 	$text['label-ring-3']['pt-pt'] = '3º Número a Tocar';
-	$text['label-ring-3']['fr'] = 'Sonner le 3ème Numéro';
+	$text['label-ring-3']['fr-fr'] = 'Sonner le 3ème Numéro';
 
 	$text['label-ring-4']['en-us'] = 'Ring 4th Number';
 	$text['label-ring-4']['pt-pt'] = '4º Número a Tocar';
-	$text['label-ring-4']['fr'] = 'Sonner le 4ème Numéro';
+	$text['label-ring-4']['fr-fr'] = 'Sonner le 4ème Numéro';
 
 	$text['label-ring-5']['en-us'] = 'Ring 5th Number';
 	$text['label-ring-5']['pt-pt'] = '5º Número a Tocar';
-	$text['label-ring-5']['fr'] = 'Sonner le 5ème Numéro';
+	$text['label-ring-5']['fr-fr'] = 'Sonner le 5ème Numéro';
 
-	$text['label-cid-name-prefix']['en-us'] = 'Caller ID Name';
+	$text['label-cid-name-prefix']['en-us'] = 'Caller ID Prefix';
 	$text['label-cid-name-prefix']['pt-pt'] = '';
-	$text['label-cid-name-prefix']['fr'] = "Préfixe de l'appelant";
+	$text['label-cid-name-prefix']['fr-fr'] = "Préfixe de l'appelant";
 
 	$text['description-cid-name-prefix']['en-us'] = 'Set the caller ID name prefix.';
 	$text['description-cid-name-prefix']['pt-pt'] = '';
-	$text['description-cid-name-prefix']['fr'] = '';
-
-	$text['label-cid-number-prefix']['en-us'] = 'Caller ID Number';
-	$text['label-cid-number-prefix']['pt-pt'] = '';
-
-	$text['description-cid-number-prefix']['en-us'] = 'Set the caller ID number prefix.';
-	$text['description-cid-number-prefix']['pt-pt'] = '';
+	$text['description-cid-name-prefix']['fr-fr'] = '';
 
 	$text['label-call-prompt']['en-us'] = 'Call Prompt';
 	$text['label-call-prompt']['pt-pt'] = '';
-	$text['label-call-prompt']['fr'] = "Annonce d'appel";
+	$text['label-call-prompt']['fr-fr'] = "Annonce d'appel";
 
 	$text['description-call-prompt']['en-us'] = 'Prompt to accept the call for external destinations.';
 	$text['description-call-prompt']['pt-pt'] = '';
-	$text['description-call-prompt']['fr'] = "Annonce pour accepter l'appel venant de destinations externes.";
+	$text['description-call-prompt']['fr-fr'] = "Annonce pour accepter l'appel venant de destinations externes.";
 
 	$text['label-ring-order']['en-us'] = 'Ring Order';
 	$text['label-ring-order']['pt-pt'] = 'Pedir Chamada';
-	$text['label-ring-order']['fr'] = 'Ordre de sonnerie';
+	$text['label-ring-order']['fr-fr'] = 'Ordre de sonnerie';
 
 	$text['label-ring-delay']['en-us'] = 'Delay';
 	$text['label-ring-delay']['pt-pt'] = '';
-	$text['label-ring-delay']['fr'] = 'Délais';
+	$text['label-ring-delay']['fr-fr'] = 'Délais';
 
 	$text['label-ring-timeout']['en-us'] = 'Timeout';
 	$text['label-ring-timeout']['pt-pt'] = '';
-	$text['label-ring-timeout']['fr'] = 'Timeout';
+	$text['label-ring-timeout']['fr-fr'] = 'Timeout';
 
 	$text['check-sequence']['en-us'] = 'sequence';
 	$text['ckeck-sequence']['pt-pt'] = 'sequêncial';
-	$text['check-sequence']['fr'] = 'sequence';
+	$text['check-sequence']['fr-fr'] = 'sequence';
 
 	$text['check-simultaneous']['en-us'] = 'simultaneous';
 	$text['ckeck-simultaneous']['pt-pt'] = 'simultâneo';
-	$text['check-simultaneous']['fr'] = 'simultanément';
+	$text['check-simultaneous']['fr-fr'] = 'simultanément';
 
 	$text['label-prompt']['en-us'] = 'Prompt to accept the call';
 	$text['label-prompt']['pt-pt'] = 'Perguntar para aceitar a chamada';
-	$text['label-prompt']['fr'] = "Annonce pour accepter l'appel";
+	$text['label-prompt']['fr-fr'] = "Annonce pour accepter l'appel";
 
 	$text['check-true']['en-us'] = 'true';
 	$text['ckeck-true']['pt-pt'] = 'verdadeiro';
-	$text['ckeck-true']['fr'] = 'Oui';
+	$text['ckeck-true']['fr-fr'] = 'Oui';
 
 	$text['check-false']['en-us'] = 'false';
 	$text['ckeck-false']['pt-pt'] = 'falso';
-	$text['ckeck-false']['fr'] = 'Non';
+	$text['ckeck-false']['fr-fr'] = 'Non';
 
 	$text['label-dnd']['en-us'] = 'Do Not Disturb';
 	$text['label-dnd']['pt-pt'] = 'Não Perturbar';
-	$text['label-dnd']['fr'] = "Ne pas derranger";
+	$text['label-dnd']['fr-fr'] = "Ne pas derranger";
 
 	$text['button-back']['en-us'] = 'Back';
 	$text['button-back']['pt-pt'] = 'Voltar';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 
 	$text['button-save']['en-us'] = 'Save';
 	$text['button-save']['pt-pt'] = 'Guardar';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 	$text['confirm-update']['en-us'] = 'Update Complete';
 	$text['confirm-update']['pt-pt'] = 'Actualização Completa';
-	$text['confirm-update']['fr'] = "Mis à jour"; 
+	$text['confirm-update']['fr-fr'] = "Mis à jour"; 
 
 	$text['table-extension']['en-us'] = 'Extension';
 	$text['table-extension']['pt-pt'] = 'Extensão';
-	$text['table-extension']['fr'] = 'Extension';
+	$text['table-extension']['fr-fr'] = 'Extension';
 
 	$text['table-tools']['en-us'] = 'Tools';
 	$text['table-tools']['pt-pt'] = 'Ferramentas';
-	$text['table-tools']['fr'] = 'Outils';
+	$text['table-tools']['fr-fr'] = 'Outils';
 
 	$text['table-description']['en-us'] = 'Description';
 	$text['table-description']['pt-pt'] = 'Descrição';
-	$text['table-description']['fr'] = 'Description';
+	$text['table-description']['fr-fr'] = 'Description';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/calls_active/app_config.php b/app/calls_active/app_config.php
index afa22a449b..7ed899fb70 100644
--- a/app/calls_active/app_config.php
+++ b/app/calls_active/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Active channels on the system.';
 		$apps[$x]['description']['es-mx'] = 'Canales activos en el sistema.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Channels actifs au système';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Active Calls';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Llamadas Activas';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Appels en cours';
@@ -37,7 +37,7 @@
 
 		$apps[$x]['menu'][1]['title']['en-us'] = 'Active Extensions';
 		$apps[$x]['menu'][1]['title']['es-mx'] = 'Extensiones activas';
-		$apps[$x]['menu'][1]['title']['de-de'] = '';
+		$apps[$x]['menu'][1]['title']['de'] = '';
 		$apps[$x]['menu'][1]['title']['de-ch'] = '';
 		$apps[$x]['menu'][1]['title']['de-at'] = '';
 		$apps[$x]['menu'][1]['title']['fr-fr'] = 'Extentions actives';
@@ -54,53 +54,49 @@
 		$apps[$x]['menu'][1]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'call_active_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = 'eba3d07f-dd5c-6b7b-6880-493b44113ade';
+		$apps[$x]['permissions'][0]['name'] = 'calls_active_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'call_active_transfer';
+		$apps[$x]['permissions'][1]['name'] = 'calls_active_transfer';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][2]['name'] = 'call_active_hangup';
+		$apps[$x]['permissions'][2]['name'] = 'calls_active_hangup';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][3]['name'] = 'call_active_park';
+		$apps[$x]['permissions'][3]['name'] = 'calls_active_park';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][4]['name'] = 'call_active_rec';
+		$apps[$x]['permissions'][4]['name'] = 'calls_active_rec';
 		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][5]['name'] = 'extension_active_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = '6dd85c19-cb6b-5cca-bf32-499bbe936f79';
+		$apps[$x]['permissions'][5]['name'] = 'extensions_active_view';
 		//$apps[$x]['permissions'][5]['groups'][] = 'user';
 		$apps[$x]['permissions'][5]['groups'][] = 'admin';
 		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][6]['name'] = 'extension_active_transfer';
+		$apps[$x]['permissions'][6]['name'] = 'extensions_active_transfer';
 		$apps[$x]['permissions'][6]['groups'][] = 'admin';
 		$apps[$x]['permissions'][6]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][7]['name'] = 'extension_active_hangup';
+		$apps[$x]['permissions'][7]['name'] = 'extensions_active_hangup';
 		$apps[$x]['permissions'][7]['groups'][] = 'admin';
 		$apps[$x]['permissions'][7]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][8]['name'] = 'extension_active_park';
+		$apps[$x]['permissions'][8]['name'] = 'extensions_active_park';
 		$apps[$x]['permissions'][8]['groups'][] = 'admin';
 		$apps[$x]['permissions'][8]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][9]['name'] = 'extension_active_rec';
+		$apps[$x]['permissions'][9]['name'] = 'extensions_active_rec';
 		$apps[$x]['permissions'][9]['groups'][] = 'admin';
 		$apps[$x]['permissions'][9]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][10]['name'] = 'extension_active_list_view';
-		$apps[$x]['permissions'][10]['menu']['uuid'] = '';
+		$apps[$x]['permissions'][10]['name'] = 'extensions_active_list_view';
 		//$apps[$x]['permissions'][10]['groups'][] = 'user';
 		$apps[$x]['permissions'][10]['groups'][] = 'admin';
 		$apps[$x]['permissions'][10]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][11]['name'] = 'extension_active_assigned_view';
-		$apps[$x]['permissions'][11]['menu']['uuid'] = '';
+		$apps[$x]['permissions'][11]['name'] = 'extensions_active_assigned_view';
 		//$apps[$x]['permissions'][11]['groups'][] = 'user';
 		$apps[$x]['permissions'][11]['groups'][] = 'admin';
 		$apps[$x]['permissions'][11]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/calls_active/app_languages.php b/app/calls_active/app_languages.php
index a0edb26c44..2f4c309517 100644
--- a/app/calls_active/app_languages.php
+++ b/app/calls_active/app_languages.php
@@ -3,137 +3,137 @@
 	//v_calls_active
 	$text['title']['en-us'] = 'Active Calls';
 	$text['title']['pt-pt'] = 'Chamadas Activas';
-	$text['title']['fr'] = "Communications Actives";
+	$text['title']['fr-fr'] = "Communications Actives";
 
 	$text['description']['en-us'] = 'Use this to monitor and interact with the active calls.';
 	$text['description']['pt-pt'] = 'Utilize este menu para monitorizar e interagir com as chamadas ativas.';
-	$text['description']['fr'] = "Superviser et interagir avec les Communications Actives.";
+	$text['description']['fr-fr'] = "Superviser et interagir avec les Communications Actives.";
 
 	//v_calls_active_extensions
 	$text['title-2']['en-us'] = 'Active Extensions';
 	$text['title-2']['pt-pt'] = 'Extensões Activas';
-	$text['title-2']['fr'] = "Extensions Actives";
+	$text['title-2']['fr-fr'] = "Extensions Actives";
 
 	$text['label-status']['en-us'] = 'Status';
 	$text['label-status']['pt-pt'] = 'Estado';
-	$text['label-status']['fr'] = "Etat";
+	$text['label-status']['fr-fr'] = "Etat";
 
 	$text['label-transfer']['en-us'] = 'Transfer To';
 	$text['label-transfer']['pt-pt'] = 'Transferir para';
-	$text['label-transfer']['fr'] = "Transférer à";
+	$text['label-transfer']['fr-fr'] = "Transférer à";
 
 	$text['description-2']['en-us'] = 'Use this to view all extensions and monitor and interact with active calls.';
 	$text['description-2']['pt-pt'] = 'Utilize este menu para ver todas as extensões, monitorizar e interagir com as chamadas ativas.';
-	$text['description-2']['fr'] = "Voir toutes les extensions, superviser et interagir avec les Communications Actives.";
+	$text['description-2']['fr-fr'] = "Voir toutes les extensions, superviser et interagir avec les Communications Actives.";
 
 	$text['check-available-status']['en-us'] = 'Available';
 	$text['check-available-status']['pt-pt'] = 'Disponível';
-	$text['check-available-status']['fr'] = "Disponible";
+	$text['check-available-status']['fr-fr'] = "Disponible";
 
 	$text['check-available-on-demand-status']['en-us'] = 'Available (On Demand)';
 	$text['check-available-on-demand-status']['pt-pt'] = 'Disponível (A pedido)';
-	$text['check-available-on-demand-status']['fr'] = "Disponible (Sur Demande)";
+	$text['check-available-on-demand-status']['fr-fr'] = "Disponible (Sur Demande)";
 
 	$text['check-loggedout-status']['en-us'] = 'Logged Out';
 	$text['check-loggedout-status']['pt-pt'] = 'Desligado';
-	$text['check-loggedout-status']['fr'] = "Délogué";
+	$text['check-loggedout-status']['fr-fr'] = "Délogué";
 
 	$text['check-onbreak-status']['en-us'] = 'On Break';
 	$text['check-onbreak-status']['pt-pt'] = 'Em Pausa';
-	$text['check-onbreak-status']['fr'] = "En Pause";
+	$text['check-onbreak-status']['fr-fr'] = "En Pause";
 
 	$text['check-do-not-disturb-status']['en-us'] = 'Do Not Disturb';
 	$text['check-do-not-disturb-status']['pt-pt'] = 'Não Perturbar';
-	$text['check-do-not-disturb-status']['fr'] = "Ne Pas Déranger";
+	$text['check-do-not-disturb-status']['fr-fr'] = "Ne Pas Déranger";
 
 	//v_calls_active_assigned_extensions_inc
 	$text['label-time']['en-us'] = 'Time';
 	$text['label-time']['pt-pt'] = 'Tempo';
-	$text['label-time']['fr'] = "Temps";
+	$text['label-time']['fr-fr'] = "Temps";
 
 	$text['label-cid-name']['en-us'] = 'CID Name';
 	$text['label-cid-name']['pt-pt'] = 'Nome CID';
-	$text['label-cid-name']['fr'] = "Nom Appelant";
+	$text['label-cid-name']['fr-fr'] = "Nom Appelant";
 
 	$text['label-cid-number']['en-us'] = 'CID Number';
 	$text['label-cid-number']['pt-pt'] = 'Numero CID';
-	$text['label-cid-number']['fr'] = "Numéro Appelant";
+	$text['label-cid-number']['fr-fr'] = "Numéro Appelant";
 
 	$text['label-destination']['en-us'] = 'Dest';
 	$text['label-destination']['pt-pt'] = 'Destino';
-	$text['label-destination']['fr'] = "Dest";
+	$text['label-destination']['fr-fr'] = "Dest";
 
 	$text['label-app']['en-us'] = 'Application';
 	$text['label-app']['pt-pt'] = 'Aplicação';
-	$text['label-app']['fr'] = "Application";
+	$text['label-app']['fr-fr'] = "Application";
 
 	$text['label-secure']['en-us'] = 'Secure';
 	$text['label-secure']['pt-pt'] = 'Seguro';
-	$text['label-secure']['fr'] = "Securisé";
+	$text['label-secure']['fr-fr'] = "Securisé";
 
 	$text['label-name']['en-us'] = 'Name';
 	$text['label-name']['pt-pt'] = 'Nome';
-	$text['label-name']['fr'] = "Nom";
+	$text['label-name']['fr-fr'] = "Nom";
 
 	$text['label-opt']['en-us'] = 'Options';
 	$text['label-opt']['pt-pt'] = 'Opções';
-	$text['label-opt']['fr'] = "Options";
+	$text['label-opt']['fr-fr'] = "Options";
 
 	$text['label-transfer']['en-us'] = 'Transfer';
 	$text['label-transfer']['pt-pt'] = 'Transferir';
-	$text['label-transfer']['fr'] = "Transfert";
+	$text['label-transfer']['fr-fr'] = "Transfert";
 
 	$text['label-park']['en-us'] = 'park';
 	$text['label-park']['pt-pt'] = 'parquear';
-	$text['label-park']['fr'] = "Parquer";
+	$text['label-park']['fr-fr'] = "Parquer";
 
 	$text['confirm-hangup']['en-us'] = 'Do you really want to hangup this call?';
 	$text['confirm-hangup']['pt-pt'] = 'Quer realmente terminar esta chamada?';
-	$text['confirm-hangup']['fr'] = "Voulez-vous vraiment raccrocher cette communication?";
+	$text['confirm-hangup']['fr-fr'] = "Voulez-vous vraiment raccrocher cette communication?";
 
 	$text['label-hangup']['en-us'] = 'hangup';
 	$text['label-hangup']['pt-pt'] = 'terminar';
-	$text['label-hangup']['fr'] = "raccrocher";
+	$text['label-hangup']['fr-fr'] = "raccrocher";
 
 	$text['label-stop']['en-us'] = 'stop record';
 	$text['label-stop']['pt-pt'] = 'parar de gravar';
-	$text['label-stop']['fr'] = "arrêter l'enregistrement";
+	$text['label-stop']['fr-fr'] = "arrêter l'enregistrement";
 
 	$text['label-start']['en-us'] = 'start record';
 	$text['label-start']['pt-pt'] = 'iniciar a gravação';
-	$text['label-start']['fr'] = "commencer l'enregistrement";
+	$text['label-start']['fr-fr'] = "commencer l'enregistrement";
 
 	//v_calls_active_extensions_inc
 	$text['confirm-socket']['en-us'] = 'Connection to Event Socket failed.';
 	$text['confirm-socket']['pt-pt'] = 'Conexão com socket falhou.';
-	$text['confirm-socket']['fr'] = "la Connexion au Event Socket a échoué.";
+	$text['confirm-socket']['fr-fr'] = "la Connexion au Event Socket a échoué.";
 
 	$text['label-message']['en-us'] = 'Message';
 	$text['label-message']['pt-pt'] = 'Mensagem';
-	$text['label-message']['fr'] = "Message";
+	$text['label-message']['fr-fr'] = "Message";
 
 	$text['label-ext']['en-us'] = 'Ext';
 	$text['label-ext']['pt-pt'] = 'Extensão';
-	$text['label-ext']['fr'] = "extension";
+	$text['label-ext']['fr-fr'] = "extension";
 
 	$text['label-park-extension']['en-us'] = 'Park';
 	$text['label-park-extension']['pt-pt'] = 'Parquear Extensão';
-	$text['label-park-extension']['fr'] = "parquer";
+	$text['label-park-extension']['fr-fr'] = "parquer";
 
 	$text['label-profile']['en-us'] = 'Profile';
 	$text['label-profile']['pt-pt'] = 'Perfil';
-	$text['label-profile']['fr'] = "Profile";
+	$text['label-profile']['fr-fr'] = "Profile";
 
 	$text['label-created']['en-us'] = 'Created';
 	$text['label-created']['pt-pt'] = 'Criado';
-	$text['label-created']['fr'] = "Créé";
+	$text['label-created']['fr-fr'] = "Créé";
 
 	$text['label-number']['en-us'] = 'Number';
 	$text['label-number']['pt-pt'] = 'Numero';
-	$text['label-number']['fr'] = "Numéro";
+	$text['label-number']['fr-fr'] = "Numéro";
 
 	$text['label-codec']['en-us'] = 'Read / Write Codec';
 	$text['label-codec']['pt-pt'] = 'Codec de Leitura / Escrita ';
-	$text['label-codec']['fr'] = "décode/encode";
+	$text['label-codec']['fr-fr'] = "décode/encode";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/click_to_call/app_config.php b/app/click_to_call/app_config.php
index c66523a853..9614eb90e3 100644
--- a/app/click_to_call/app_config.php
+++ b/app/click_to_call/app_config.php
@@ -7,24 +7,24 @@
 		$apps[$x]['version'] = '';
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = "Originate calls with a URL.";
-		$apps[$x]['description']['es-mx'] = "Genera llamadas con un URL.";
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['en-us'] = 'Originate calls with a URL.';
+		$apps[$x]['description']['es-mx'] = 'Genera llamadas con un URL.';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Appeler avec une URL";
-		$apps[$x]['description']['fr-ca'] = "Appeller avec d'URL";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = "Originar chamadas com uma URL.";
+		$apps[$x]['description']['pt-pt'] = 'Originar chamadas com uma URL.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Click to Call';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Pulse para Llamar';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Cliquez pour Appeller';
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Click to Call';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Clicar para Chamadas';
@@ -36,7 +36,6 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'click_to_call_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = 'f862556f-9ddd-2697-fdf4-bed08ec63aa5';
 		$apps[$x]['permissions'][0]['groups'][] = 'user';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
@@ -45,4 +44,4 @@
 		$apps[$x]['permissions'][1]['groups'][] = 'user';
 		$apps[$x]['permissions'][1]['groups'][] = 'admin';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/click_to_call/app_languages.php b/app/click_to_call/app_languages.php
index 45ee420f20..0e52f2210a 100644
--- a/app/click_to_call/app_languages.php
+++ b/app/click_to_call/app_languages.php
@@ -23,64 +23,93 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 	James Rose <james.o.rose@gmail.com>
+	Philippe Rioual <bhouba@gmail.com>
 */
 
 	$text['label-click2call']['en-us'] = 'Click to Call';
+	$text['label-click2call']['fr-fr'] = 'Click to Call';
 
 	$text['desc-click2call']['en-us'] = 'Provide the following information to make a call from the source number to the destination number.';
+	$text['desc-click2call']['fr-fr'] = "Fournissez les informations suivantes afin de lancer un appel d'un numéro vers un autre.";
 
 	$text['label-src-caller-id-nam']['en-us'] = 'Source Caller ID Name';
+	$text['label-src-caller-id-nam']['fr-fr'] = "Nom Caller ID Source";
 
 	$text['desc-src-caller-id-nam']['en-us'] = 'Enter the Caller ID name to send to your phone.';
+	$text['desc-src-caller-id-nam']['fr-fr'] = "Choisir le nom d'appelant à émettre à votre téléphone.";
 
 	$text['label-src-caller-id-num']['en-us'] = 'Source Caller ID Number';
+	$text['label-src-caller-id-num']['fr-fr'] = 'Numéro Caller ID Source';
 
 	$text['desc-src-caller-id-num']['en-us'] = 'Enter the Caller ID number to send to your phone (you probably want this to be the same as the destination number).';
+	$text['desc-src-caller-id-num']['fr-fr'] = "Choisir le numéro d'appelant à émettre à votre téléphone (Il est en général le même que le numéro de destination.)";
 
 	$text['label-dest-caller-id-nam']['en-us'] = 'Destination Caller ID Name';
+	$text['label-dest-caller-id-nam']['fr-fr'] = 'Nom Caller ID Destination';
 
 	$text['desc-dest-caller-id-nam']['en-us'] = 'Enter the Caller ID name to send to the destination number.';
+	$text['desc-dest-caller-id-nam']['fr-fr'] = "Choisir le nom d'appelant à émettre à la destination";
 
 	$text['label-dest-caller-id-num']['en-us'] = 'Destination Caller ID Number';
+	$text['label-dest-caller-id-num']['fr-fr'] = 'Numéro Caller ID Destination';
 
 	$text['desc-dest-caller-id-num']['en-us'] = 'Enter the Caller ID number to send to the destination number (you probably want this to be your phone number).';
+	$text['desc-dest-caller-id-num']['fr-fr'] = "Choisir le numéro d'appelant à émettre au téléphone destination (Il est en général le même que votre numéro.)";
 
 
 
 	$text['label-src-num']['en-us'] = 'Source Number';
+	$text['label-src-num']['fr-fr'] = 'Numéro Source';
 
 	$text['desc-src-num']['en-us'] = 'Enter your phone number.  This can be an extension on the system, or another number (eg: mobile phone).';
+	$text['desc-src-num']['fr-fr'] = "Choisir votre numéro de téléphone. Il peut être une extension du système, ou tout autre numéro (eg: un mobile).";
 
 	$text['label-dest-num']['en-us'] = 'Destination Number';
+	$text['label-dest-num']['fr-fr'] = 'Numéro Destination';
 
 	$text['desc-dest-num']['en-us'] = "Enter the number to call. This can be an extension on the system, another number, or a sip uri.  Sip URI's are of the form 5551234567@voip.example.com:5080 (5080 for freeswitch, or 5060 for other systems).";
+	$text['desc-dest-num']['fr-fr'] = "Choisir un numéro à appeler. Il peut être une extension du système, un autre numéro, une URI SIP. les URI SIP sont de la forme : 5551234567@voip.example.com:5080 (5080 pour freeswitch, ou 5060 pour d'autre système).";
 
 	$text['label-auto-answer']['en-us'] = 'Auto Answer';
+	$text['label-auto-answer']['fr-fr'] = 'Réponse Auto';
 
 	$text['desc-auto-answer']['en-us'] = 'Select whether to enable auto answer.';
+	$text['desc-auto-answer']['fr-fr'] = 'Activer ou non la réponse automatique.';
 
 	$text['label-record']['en-us'] = 'Record';
+	$text['label-record']['fr-fr'] = 'Enregistré';
 
 	$text['label-true']['en-us'] = 'true';
+	$text['label-true']['fr-fr'] = 'oui';
 
 	$text['label-false']['en-us'] = 'false';
+	$text['label-false']['fr-fr'] = 'non';
 
 	$text['desc-record']['en-us'] = 'Select whether to record the call.';
+	$text['desc-record']['fr-fr'] = "Choisir si vous voulez enregistrer l'appel.";
 
 	$text['label-ringback']['en-us'] = 'Ring Back';
+	$text['label-ringback']['fr-fr'] = 'Retoure de sonnerie';
 
 	$text['desc-ringback']['en-us'] = 'Defines what the you will hear while destination is being called. The choices are music (music on hold) ring (ring tone.)';
+	$text['desc-ringback']['fr-fr'] = "Défini ce vous entendrez pendant que la destination sera appelée. Les choix sont musique (musique de garde) sonnerie.";
 
 	$text['opt-usring']['en-us'] = 'us-ring';
+	$text['opt-usring']['fr-fr'] = 'us-ring';
 
 	$text['opt-frring']['en-us'] = 'fr-ring';
+	$text['opt-frring']['fr-fr'] = 'fr-ring';
 
 	$text['opt-ukring']['en-us'] = 'uk-ring';
+	$text['opt-ukring']['fr-fr'] = 'uk-ring';
 
 	$text['opt-rsring']['en-us'] = 'rs-ring';
+	$text['opt-rsring']['fr-fr'] = 'rs-ring';
 
 	$text['opt-moh']['en-us'] = 'music';
+	$text['opt-moh']['fr-fr'] = 'musique';
 
 	$text['button-call']['en-us'] = 'Call';
+	$text['button-call']['fr-fr'] = 'appel';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php
index 888dcb9294..8451359cbd 100644
--- a/app/conference_centers/app_config.php
+++ b/app/conference_centers/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Conferences Centers allows one or more audio and video conference rooms.';
 		$apps[$x]['description']['es-mx'] = 'El Centro de Conferencia permite una o más recámaras de conferencia para audio y video.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Centre de Conférences permet une ou plus conferences audio ou vidéo.";
@@ -22,7 +22,7 @@
 		$y = 0;
 		$apps[$x]['menu'][$y]['title']['en-us'] = 'Conference Center';
 		$apps[$x]['menu'][$y]['title']['es-mx'] = 'Centro de Conferencias';
-		$apps[$x]['menu'][$y]['title']['de-de'] = '';
+		$apps[$x]['menu'][$y]['title']['de'] = '';
 		$apps[$x]['menu'][$y]['title']['de-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['de-at'] = '';
 		$apps[$x]['menu'][$y]['title']['fr-fr'] = 'Centre de Conférences';
@@ -40,7 +40,6 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'conference_center_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '95f88726-4706-43f0-b52b-9504a0b8046f';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
@@ -57,7 +56,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'conference_room_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
@@ -78,7 +76,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'conference_session_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
@@ -132,33 +129,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_session_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_session_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_session_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_session_detail_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_session_detail_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_session_detail_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_session_detail_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 
 	//schema details
 		$y = 0; //table array index
diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php
index 0468e21dfc..47238cbc10 100644
--- a/app/conference_centers/app_languages.php
+++ b/app/conference_centers/app_languages.php
@@ -1,319 +1,319 @@
-<?php
+<?php
 
 	//conference centers
 		$text['title-conference-centers']['en-us'] = 'Conference Centers';
 		$text['title-conference-centers']['pt-pt'] = '';
-		$text['title-conference-centers']['fr'] = "Conférences";
+		$text['title-conference-centers']['fr-fr'] = "Conférences";
 
 		$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']['pt-pt'] = '';
-		$text['description-conference-centers']['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']['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['title-conference-center']['en-us'] = 'Conference Center';
 		$text['title-conference-center']['pt-pt'] = '';
-		$text['title-conference-center']['fr'] = 'Conférence';
+		$text['title-conference-center']['fr-fr'] = 'Conférence';
 
 		$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']['pt-pt'] = '';
-		$text['description-conference-center']['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']['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['label-name']['en-us'] = 'Name';
 		$text['label-name']['pt-pt'] = '';
-		$text['label-name']['fr'] = 'Nom';
+		$text['label-name']['fr-fr'] = 'Nom';
 
 		$text['label-extension']['en-us'] = 'Extension';
 		$text['label-extension']['pt-pt'] = '';
-		$text['label-extension']['fr'] = 'Extension';
+		$text['label-extension']['fr-fr'] = 'Extension';
 
 		$text['label-pin-length']['en-us'] = 'PIN Length';
 		$text['label-pin-length']['pt-pt'] = '';
-		$text['label-pin-length']['fr'] = 'Code Nb digits';
+		$text['label-pin-length']['fr-fr'] = 'Code Nb digits';
 
 		$text['label-delete']['en-us'] = 'Delete';
 		$text['label-delete']['pt-pt'] = '';
-		$text['label-delete']['fr'] = 'Supprimer';
+		$text['label-delete']['fr-fr'] = 'Supprimer';
 
 		$text['label-edit']['en-us'] = 'Edit';
 		$text['label-edit']['pt-pt'] = '';
-		$text['label-edit']['fr'] = 'Editer';
+		$text['label-edit']['fr-fr'] = 'Editer';
 
 		$text['description-name']['en-us'] = 'Enter the conference center name.';
 		$text['description-name']['pt-pt'] = '';
-		$text['description-name']['fr'] = 'Choisir le nom de la conférence.';
+		$text['description-name']['fr-fr'] = 'Choisir le nom de la conférence.';
 
 		$text['description-extension']['en-us'] = 'Enter the conference center extension number.';
 		$text['description-extension']['pt-pt'] = '';
-		$text['description-extension']['fr'] = 'Choisir le numéro de la conférence. ';
+		$text['description-extension']['fr-fr'] = 'Choisir le numéro de la conférence. ';
 
 		$text['description-pin-length']['en-us'] = 'Enter the required PIN length.';
 		$text['description-pin-length']['pt-pt'] = '';
-		$text['description-pin-length']['fr'] = "Choisir la longueur requise pour le code d'authentification.";
+		$text['description-pin-length']['fr-fr'] = "Choisir la longueur requise pour le code d'authentification.";
 
 		$text['description-enabled']['en-us'] = 'Select whether to enable or disable the conference center.';
 		$text['description-enabled']['pt-pt'] = '';
-		$text['description-enabled']['fr'] = "Choisir d'activer ou non la conférence.";
+		$text['description-enabled']['fr-fr'] = "Choisir d'activer ou non la conférence.";
 
 		$text['description-description']['en-us'] = 'Enter the description.';
 		$text['description-description']['pt-pt'] = '';
-		$text['description-description']['fr'] = '';
+		$text['description-description']['fr-fr'] = '';
 
 	//conference rooms
 		$text['title-conference-rooms']['en-us'] = 'Conference Rooms';
 		$text['title-conference-rooms']['pt-pt'] = '';
-		$text['title-conference-rooms']['fr'] = 'Salles de conférence';
+		$text['title-conference-rooms']['fr-fr'] = 'Salles de conférence';
 
 		$text['title-conference-room']['en-us'] = 'Conference Room';
 		$text['title-conference-room']['pt-pt'] = '';
-		$text['title-conference-room']['fr'] = 'Salle de conférence';
+		$text['title-conference-room']['fr-fr'] = 'Salle de conférence';
 
 		$text['label-profile']['en-us'] = 'Profile';
 		$text['label-profile']['pt-pt'] = '';
-		$text['label-profile']['fr'] = 'Profile';
+		$text['label-profile']['fr-fr'] = 'Profile';
 
 		$text['label-record']['en-us'] = 'Record';
 		$text['label-record']['pt-pt'] = '';
-		$text['label-record']['fr'] = 'Enregistrer';
+		$text['label-record']['fr-fr'] = 'Enregistrer';
 
 		$text['label-wait-moderator']['en-us'] = 'Secure';
 		$text['label-wait-moderator']['pt-pt'] = '';
-		$text['label-wait-moderator']['fr'] = 'Assurer';
+		$text['label-wait-moderator']['fr-fr'] = 'Assurer';
 
 		$text['label-announce']['en-us'] = 'Announce';
 		$text['label-announce']['pt-pt'] = '';
-		$text['label-announce']['fr'] = 'Annonce';
+		$text['label-announce']['fr-fr'] = 'Annonce';
 
-		$text['label-mute']['en-us'] = 'Mute';
+		$text['label-mute']['en-us'] = 'Mute on Entry';
 		$text['label-mute']['pt-pt'] = '';
-		$text['label-mute']['fr'] = 'Entrée Micro désactivé';
+		$text['label-mute']['fr-fr'] = 'Entrée Micro désactivé';
 
 		$text['label-enabled']['en-us'] = 'Enabled';
 		$text['label-enabled']['pt-pt'] = 'Activo';
-		$text['label-enabled']['fr'] = 'Actif';
+		$text['label-enabled']['fr-fr'] = 'Actif';
 
 		$text['label-sounds']['en-us'] = 'Sounds';
 		$text['label-sounds']['pt-pt'] = '';
-		$text['label-sounds']['fr'] = 'Sons';
+		$text['label-sounds']['fr-fr'] = 'Sons';
 
-		$text['label-members']['en-us'] = 'Count';
+		$text['label-members']['en-us'] = 'Members';
 		$text['label-members']['pt-pt'] = '';
-		$text['label-members']['fr'] = 'Membres';
+		$text['label-members']['fr-fr'] = 'Membres';
 
 		$text['label-tools']['en-us'] = 'Tools';
 		$text['label-tools']['pt-pt'] = 'Ferramentas';
-		$text['label-tools']['fr'] = 'Outils';
+		$text['label-tools']['fr-fr'] = 'Outils';
 
 		$text['label-view']['en-us'] = 'View';
 		$text['label-view']['pt-pt'] = '';
-		$text['label-view']['fr'] = 'Vue';
+		$text['label-view']['fr-fr'] = 'Vue';
 
 		$text['label-sessions']['en-us'] = 'Sessions';
 		$text['label-sessions']['pt-pt'] = '';
-		$text['label-sessions']['fr'] = 'Sessions';
+		$text['label-sessions']['fr-fr'] = 'Sessions';
 
 		$text['label-true']['en-us'] = 'true';
 		$text['label-true']['pt-pt'] = 'verdadeiro';
-		$text['label-true']['fr'] = 'Oui';
+		$text['label-true']['fr-fr'] = 'Oui';
 
 		$text['label-false']['en-us'] = 'false';
 		$text['label-false']['pt-pt'] = 'falso';
-		$text['label-false']['fr'] = 'Non';
+		$text['label-false']['fr-fr'] = 'Non';
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = 'Descrição';
-		$text['label-description']['fr'] = 'Description';
+		$text['label-description']['fr-fr'] = 'Description';
 
 	//conference room edit
 		$text['button-rooms']['en-us'] = 'Rooms';
 		$text['button-rooms']['pt-pt'] = '';
-		$text['button-rooms']['fr'] = 'Salles';
+		$text['button-rooms']['fr-fr'] = 'Salles';
 
 		$text['button-sessions']['en-us'] = 'Sessions';
 		$text['button-sessions']['pt-pt'] = '';
-		$text['button-sessions']['fr'] = 'Sessions';
+		$text['button-sessions']['fr-fr'] = 'Sessions';
 
 		$text['button-view']['en-us'] = 'View';
 		$text['button-view']['pt-pt'] = '';
-		$text['button-view']['fr'] = 'Vue';
+		$text['button-view']['fr-fr'] = 'Vue';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
-		$text['button-back']['fr'] = 'Retour';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['confirm-update']['en-us'] = 'Update Complete';
 		$text['confirm-update']['pt-pt'] = 'Actualização Completa';
-		$text['confirm-update']['fr'] = "Mis à jour";
+		$text['confirm-update']['fr-fr'] = "Mis à jour";
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
-		$text['confirm-delete']['fr'] = "Voulez-vous vraiment supprimer cela?";
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 		$text['label-conference-name']['en-us'] = 'Conference Name';
 		$text['label-conference-name']['pt-pt'] = '';
-		$text['label-conference-name']['fr'] = "Nom de la Conférence";
+		$text['label-conference-name']['fr-fr'] = "Nom de la Conférence";
 
 		$text['label-users']['en-us'] = 'Users';
 		$text['label-users']['pt-pt'] = '';
-		$text['label-users']['fr'] = 'Utilisateurs';
+		$text['label-users']['fr-fr'] = 'Utilisateurs';
 
 		$text['description-users']['en-us'] = 'Assign additional users as administrators of this conference room.';
 		$text['description-users']['pt-pt'] = '';
-		$text['description-users']['fr'] = "Ajouter des utilisateurs comme administrateurs des cette salle de conférence.";
+		$text['description-users']['fr-fr'] = "Ajouter des utilisateurs comme administrateurs des cette salle de conférence.";
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
-		$text['button-add']['fr'] = 'Ajouter';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
-		$text['label-moderator-pin']['en-us'] = 'Moderator';
+		$text['label-moderator-pin']['en-us'] = 'Moderator PIN';
 		$text['label-moderator-pin']['pt-pt'] = '';
-		$text['label-moderator-pin']['fr'] = 'Code Modérateur';
+		$text['label-moderator-pin']['fr-fr'] = 'Code Modérateur';
 
-		$text['label-participant-pin']['en-us'] = 'Participant';
+		$text['label-participant-pin']['en-us'] = 'Participant PIN';
 		$text['label-participant-pin']['pt-pt'] = '';
-		$text['label-participant-pin']['fr'] = 'Code Participant';
+		$text['label-participant-pin']['fr-fr'] = 'Code Participant';
 
 		$text['label-member-pin']['en-us'] = 'PIN Numbers';
 		$text['label-member-pin']['pt-pt'] = '';
-		$text['label-member-pin']['fr'] = 'Code Membre';
+		$text['label-member-pin']['fr-fr'] = 'Code Membre';
 
 		$text['description-moderator-pin']['en-us'] = 'Pin number for the moderators.';
 		$text['description-moderator-pin']['pt-pt'] = '';
-		$text['description-moderator-pin']['fr'] = "Code PIN des modérateurs.";
+		$text['description-moderator-pin']['fr-fr'] = "Code PIN des modérateurs.";
 
 		$text['description-participant-pin']['en-us'] = 'Pin number for the participants.';
 		$text['description-participant-pin']['pt-pt'] = '';
-		$text['description-participant-pin']['fr'] = "Code PIN des participants.";
+		$text['description-participant-pin']['fr-fr'] = "Code PIN des participants.";
 
 		$text['label-member-type-moderator']['en-us'] = 'moderator';
 		$text['label-member-type-moderator']['pt-pt'] = '';
-		$text['label-member-type-moderator']['fr'] = 'modérateur';
+		$text['label-member-type-moderator']['fr-fr'] = 'modérateur';
 
 		$text['label-member-type-participant']['en-us'] = 'participant';
 		$text['label-member-type-participant']['pt-pt'] = '';
-		$text['label-member-type-participant']['fr'] = 'participant';
+		$text['label-member-type-participant']['fr-fr'] = 'participant';
 
 		$text['description-profile']['en-us'] = 'Conference Profile is a collection of settings for the conference center.';
 		$text['description-profile']['pt-pt'] = '';
-		$text['description-profile']['fr'] = "Le profile de conférence est une liste de configuration pour les conférences. ";
+		$text['description-profile']['fr-fr'] = "Le profile de conférence est une liste de configuration pour les conférences. ";
 
 		$text['label-max-members']['en-us'] = 'Max Members';
 		$text['label-max-members']['pt-pt'] = '';
-		$text['label-max-members']['fr'] = 'Membres Max';
+		$text['label-max-members']['fr-fr'] = 'Membres Max';
 
 		$text['label-wait-for-moderator']['en-us'] = 'Wait for Moderator';
 		$text['label-wait-for-moderator']['pt-pt'] = '';
-		$text['label-wait-for-moderator']['fr'] = 'Attente du Modérateur';
+		$text['label-wait-for-moderator']['fr-fr'] = 'Attente du Modérateur';
 
 		$text['label-enter-sound']['en-us'] = 'Enter Sound';
 		$text['label-enter-sound']['pt-pt'] = '';
-		$text['label-enter-sound']['fr'] = "Sons d'arrivée";
+		$text['label-enter-sound']['fr-fr'] = "Sons d'arrivée";
 
 		$text['label-exit-sound']['en-us'] = 'Exit Sound';
 		$text['label-exit-sound']['pt-pt'] = '';
-		$text['label-exit-sound']['fr'] = "Sons de sortie";
+		$text['label-exit-sound']['fr-fr'] = "Sons de sortie";
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
-		$text['button-save']['fr'] = 'Sauvegarder';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-search']['en-us'] = 'Search';
 		$text['button-search']['pt-pt'] = '';
-		$text['button-save']['fr'] = 'Chercher';
+		$text['button-save']['fr-fr'] = 'Chercher';
 
 	//Conference Sessions
 		$text['title-conference-sessions']['en-us'] = 'Conference Sessions';
 		$text['title-conference-sessions']['pt-pt'] = '';
-		$text['title-conference-sessions']['fr'] = 'Sessions de conférences';
+		$text['title-conference-sessions']['fr-fr'] = 'Sessions de conférences';
 
 		$text['description-conference-sessions']['en-us'] = 'Conference Sessions are log details about the conferences.';
 		$text['description-conference-sessions']['pt-pt'] = '';
-		$text['description-conference-sessions']['fr'] = "Sessions de conférences sont les détails des logs sur les conférences.";
+		$text['description-conference-sessions']['fr-fr'] = "Sessions de conférences sont les détails des logs sur les conférences.";
 
 		$text['label-time']['en-us'] = 'Time';
 		$text['label-time']['pt-pt'] = '';
-		$text['label-time']['fr'] = 'Heure';
+		$text['label-time']['fr-fr'] = 'Heure';
 
 		$text['label-start']['en-us'] = 'Start';
 		$text['label-start']['pt-pt'] = '';
-		$text['label-start']['fr'] = 'Début';
+		$text['label-start']['fr-fr'] = 'Début';
 
 		$text['label-end']['en-us'] = 'End';
 		$text['label-end']['pt-pt'] = '';
-		$text['label-end']['fr'] = 'Fin';
+		$text['label-end']['fr-fr'] = 'Fin';
 
 		$text['label-profile']['en-us'] = 'Profile';
 		$text['label-profile']['pt-pt'] = '';
-		$text['label-profile']['fr'] = 'Profile';
+		$text['label-profile']['fr-fr'] = 'Profile';
 
 		$text['label-recording']['en-us'] = 'Recording';
 		$text['label-recording']['pt-pt'] = '';
-		$text['label-recording']['fr'] = 'Enregistrement';
+		$text['label-recording']['fr-fr'] = 'Enregistrement';
 
 		$text['label-tools']['en-us'] = 'Tools';
 		$text['label-tools']['pt-pt'] = '';
-		$text['label-tools']['fr'] = 'Outils';
+		$text['label-tools']['fr-fr'] = 'Outils';
 
 		$text['label-details']['en-us'] = 'Details';
 		$text['label-details']['pt-pt'] = '';
-		$text['label-details']['fr'] = 'Détails';
+		$text['label-details']['fr-fr'] = 'Détails';
 
 		$text['label-play']['en-us'] = 'Play';
 		$text['label-play']['pt-pt'] = '';
-		$text['label-play']['fr'] = 'Jouer';
+		$text['label-play']['fr-fr'] = 'Jouer';
 
 		$text['label-download']['en-us'] = 'Download';
 		$text['label-download']['pt-pt'] = '';
-		$text['label-download']['fr'] = 'Télécharger';
+		$text['label-download']['fr-fr'] = 'Télécharger';
 
 	//Conference Sessions Details
 		$text['title-conference-session-details']['en-us'] = 'Conference Session Details';
 		$text['title-conference-session-details']['pt-pt'] = '';
-		$text['title-conference-session-details']['fr'] = "Détails de Sessions de Conference";
+		$text['title-conference-session-details']['fr-fr'] = "Détails de Sessions de Conference";
 
 		$text['description-conference-session-details']['en-us'] = 'Conference Sessions are log details of the conferences calls.';
 		$text['description-conference-session-details']['pt-pt'] = '';
-		$text['description-conference-session-details']['fr'] = "Sessions de conférences sont les détails des logs sur les conférences.";
+		$text['description-conference-session-details']['fr-fr'] = "Sessions de conférences sont les détails des logs sur les conférences.";
 
 		$text['label-username']['en-us'] = 'Username';
 		$text['label-username']['pt-pt'] = '';
-		$text['label-username']['fr'] = "Nom d'Utilisateur";
+		$text['label-username']['fr-fr'] = "Nom d'Utilisateur";
 
 		$text['label-uuid']['en-us'] = 'UUID';
 		$text['label-uuid']['pt-pt'] = '';
-		$text['label-uuid']['fr'] = 'UUID';
+		$text['label-uuid']['fr-fr'] = 'UUID';
 
 		$text['label-caller-id-name']['en-us'] = 'Caller ID Name';
 		$text['label-caller-id-name']['pt-pt'] = '';
-		$text['label-caller-id-name']['fr'] = "Nom d'appelant";
+		$text['label-caller-id-name']['fr-fr'] = "Nom d'appelant";
 
 		$text['label-caller-id-number']['en-us'] = 'Caller ID Number';
 		$text['label-caller-id-number']['pt-pt'] = '';
-		$text['label-caller-id-number']['fr'] = "Numéro d'appelant";
+		$text['label-caller-id-number']['fr-fr'] = "Numéro d'appelant";
 
 		$text['label-moderator']['en-us'] = 'Moderator';
 		$text['label-moderator']['pt-pt'] = '';
-		$text['label-moderator']['fr'] = 'Modérateur';
+		$text['label-moderator']['fr-fr'] = 'Modérateur';
 
 		$text['label-network-address']['en-us'] = 'Network Address';
 		$text['label-network-address']['pt-pt'] = '';
-		$text['label-network-address']['fr'] = 'Adresse Réseau';
+		$text['label-network-address']['fr-fr'] = 'Adresse Réseau';
 
 		$text['label-time']['en-us'] = 'Time';
 		$text['label-time']['pt-pt'] = '';
-		$text['label-time']['fr'] = 'Heure';
+		$text['label-time']['fr-fr'] = 'Heure';
 
 		$text['label-start']['en-us'] = 'Start';
 		$text['label-start']['pt-pt'] = '';
-		$text['label-start']['fr'] = 'Début';
+		$text['label-start']['fr-fr'] = 'Début';
 
 		$text['label-end']['en-us'] = 'End';
 		$text['label-end']['pt-pt'] = '';
-		$text['label-end']['fr'] = 'Fin';
+		$text['label-end']['fr-fr'] = 'Fin';
 
 		$text['label-details']['en-us'] = 'Details';
 		$text['label-details']['pt-pt'] = '';
-		$text['label-details']['fr'] = 'Détails';
+		$text['label-details']['fr-fr'] = 'Détails';
 
 		$text['label-cdr']['en-us'] = 'CDR';
 		$text['label-cdr']['pt-pt'] = '';
-		$text['label-cdr']['fr'] = "Historique d'appels";
-?>
\ No newline at end of file
+		$text['label-cdr']['fr-fr'] = "Historique d'appels";
+?>
diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php
index 25e2fa214d..9af0dedc5d 100644
--- a/app/conferences/app_config.php
+++ b/app/conferences/app_config.php
@@ -7,21 +7,21 @@
 		$apps[$x]['version'] = '';
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = "Conferences is used to setup conference rooms with a name, description, and optional pin number.";
-		$apps[$x]['description']['es-mx'] = "Las conferencias son usadas para configurar cuartos con un nombre, descripción y un número de acceso (opcional)";
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['en-us'] = 'Conferences is used to setup conference rooms with a name, description, and optional pin number.';
+		$apps[$x]['description']['es-mx'] = 'Las conferencias son usadas para configurar cuartos con un nombre, descripción y un número de acceso (opcional)';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Les conference sert à configurer des salles avec un nom, une description et un code pin facultatif";
-		$apps[$x]['description']['fr-ca'] = "Les conferences sont utilises pour la configuration de chambres avec un nom, descrption et nom d'access (facultatif)";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = "Conferências é usado para configurar salas de conferências com um nome, descrição e número de pin opcional.";
+		$apps[$x]['description']['pt-pt'] = 'Conferências é usado para configurar salas de conferências com um nome, descrição e número de pin opcional.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Conferences';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Conferencias';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Conférences';
@@ -40,7 +40,6 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'conference_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '9f2a8c08-3e65-c41c-a716-3b53d42bc4d4';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
@@ -58,25 +57,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_user_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';;
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_user_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_user_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'conference_user_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 
 	//schema details
 		$y = 0; //table array index
diff --git a/app/conferences/app_languages.php b/app/conferences/app_languages.php
index ab44ce017b..9ca582856e 100644
--- a/app/conferences/app_languages.php
+++ b/app/conferences/app_languages.php
@@ -3,160 +3,160 @@
 	//conferences
 	$text['title']['en-us'] = 'Conferences';
 	$text['title']['pt-pt'] = 'Conferências';
-	$text['title']['fr'] = 'Conférences';
+	$text['title']['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']['pt-pt'] = 'As conferências são utilizadas para configurar salas de conferências com um nome, descrição e número pin opcional.';
-	$text['description']['fr'] = "Ce menu est utilisé pour créer des salles de conférence avec un nom, une description et en option un code PIN.";
+	$text['description']['fr-fr'] = "Ce menu est utilisé pour créer des salles de conférence avec un nom, une description et en option un code PIN.";
 
 	$text['title-2']['en-us'] = 'Active Conferences';
 	$text['title-2']['pt-pt'] = 'Conferências Activas';
-	$text['title-2']['fr'] = "Conférences actives";
+	$text['title-2']['fr-fr'] = "Conférences actives";
 
 	$text['title-3']['en-us'] = 'Active Conference';
 	$text['title-3']['pt-pt'] = 'Conferência Activa';
-	$text['title-3']['fr'] = "Conférence actives";
+	$text['title-3']['fr-fr'] = "Conférence actives";
 
 	$text['description-2']['en-us'] = 'and then select a conference to monitor and interact with it.';
 	$text['description-2']['pt-pt'] = 'e selecione uma conferência para monitorizar e interagir com ele.';
-	$text['description-2']['fr'] = "et ensuite sélectionner la conférence à superviser et à gérer.";
+	$text['description-2']['fr-fr'] = "et ensuite sélectionner la conférence à superviser et à gérer.";
 
 	$text['table-name']['en-us'] = 'Name';
 	$text['table-name']['pt-pt'] = 'Nome';
-	$text['table-name']['fr'] = 'Nom';
+	$text['table-name']['fr-fr'] = 'Nom';
 
 	$text['table-extension']['en-us'] = 'Extension';
 	$text['table-extension']['pt-pt'] = 'Extensão';
-	$text['table-extension']['fr'] = 'Extension';
+	$text['table-extension']['fr-fr'] = 'Extension';
 
 	$text['table-profile']['en-us'] = 'Profile';
 	$text['table-profile']['pt-pt'] = 'Perfil';
-	$text['table-profile']['fr'] = 'Profile';
+	$text['table-profile']['fr-fr'] = 'Profile';
 
 	$text['table-order']['en-us'] = 'Order';
 	$text['table-order']['pt-pt'] = 'Ordem';
-	$text['table-order']['fr'] = 'Ordre';
+	$text['table-order']['fr-fr'] = 'Ordre';
 
 	$text['table-enabled']['en-us'] = 'Enabled';
 	$text['table-enabled']['pt-pt'] = 'Activo';
-	$text['table-enabled']['fr'] = 'Actif';
+	$text['table-enabled']['fr-fr'] = 'Actif';
 
 	$text['table-description']['en-us'] = 'Description';
 	$text['table-description']['pt-pt'] = 'Descrição';
-	$text['table-description']['fr'] = 'Description';
+	$text['table-description']['fr-fr'] = 'Description';
 
 	//conferences_delete
 	$text['confirm-delete']['en-us'] = 'Delete Complete';
 	$text['confirm-delete']['pt-pt'] = 'Eliminação Completa';
-	$text['confirm-delete']['fr'] = 'Supprimé';
+	$text['confirm-delete']['fr-fr'] = 'Supprimé';
 
 	//conferences_add
 	$text['confirm-add']['en-us'] = 'Add Complete';
 	$text['confirm-add']['pt-pt'] = 'Adição Completa';
-	$text['confirm-add']['fr'] = 'Ajouté';
+	$text['confirm-add']['fr-fr'] = 'Ajouté';
 
 	$text['confirm-update']['en-us'] = 'Update Complete';
 	$text['confirm-update']['pt-pt'] = 'Actualização Completa';
-	$text['confirm-update']['fr'] = 'Mis a jour';
+	$text['confirm-update']['fr-fr'] = 'Mis a jour';
 
 	$text['confirm-name']['en-us'] = 'Please provide: Name';
 	$text['confirm-name']['pt-pt'] = 'Por favor, forneça: Nome';
-	$text['confirm-name']['fr'] = "Merci d'indiquer: Nom";
+	$text['confirm-name']['fr-fr'] = "Merci d'indiquer: Nom";
 
 	$text['confirm-extension']['en-us'] = 'Please provide: Extension';
 	$text['confirm-extension']['pt-pt'] = 'Por favor, forneça: Extensão';
-	$text['confirm-extension']['fr'] = "Merci d'indiquer: Extension";
+	$text['confirm-extension']['fr-fr'] = "Merci d'indiquer: Extension";
 
 	$text['confirm-profile']['en-us'] = 'Please provide: Profile';
 	$text['confirm-profile']['pt-pt'] = 'Por favor, forneça: Perfil';
-	$text['confirm-profile']['fr'] = "Merci d'indiquer: Profile";
+	$text['confirm-profile']['fr-fr'] = "Merci d'indiquer: Profile";
 
 	$text['confirm-enabled']['en-us'] = 'Please provide: Enabled';
 	$text['confirm-enabled']['pt-pt'] = 'Por favor, forneça: Ativado';
-	$text['confirm-enabled']['fr'] = "Merci d'indiquer: Actif";
+	$text['confirm-enabled']['fr-fr'] = "Merci d'indiquer: Actif";
 
 	$text['label-conference-add']['en-us'] = 'Conferences Add';
 	$text['label-conference-add']['pt-pt'] = 'Adição de Conferências';
-	$text['label-conference-add']['fr'] = "Ajouter des conférences";
+	$text['label-conference-add']['fr-fr'] = "Ajouter des conférences";
 
 	$text['label-conference-edit']['en-us'] = 'Conferences Edit';
 	$text['label-conference-edit']['pt-pt'] = 'Edição de Conferências';
-	$text['label-conference-edit']['fr'] = "Editer les conférences";
+	$text['label-conference-edit']['fr-fr'] = "Editer les conférences";
 
 	$text['button-back']['en-us'] = 'Back';
 	$text['button-back']['pt-pt'] = 'Voltar';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 
 	$text['label-extension']['en-us'] = 'Extension';
 	$text['label-extension']['pt-pt'] = 'Extensão';
-	$text['label-extension']['fr'] = 'Extension';
+	$text['label-extension']['fr-fr'] = 'Extension';
 
 	$text['label-name']['en-us'] = 'Name';
 	$text['label-name']['pt-pt'] = 'Nome';
-	$text['label-name']['fr'] = 'Nom';
+	$text['label-name']['fr-fr'] = 'Nom';
 
 	$text['description-name']['en-us'] = 'Enter the conference name.';
 	$text['description-name']['pt-pt'] = 'Insira o nome da conferência.';
-	$text['description-name']['fr'] = "Entrer le nom de la conférence.";
+	$text['description-name']['fr-fr'] = "Entrer le nom de la conférence.";
 
 	$text['description-extension']['en-us'] = 'Enter the conference extension number.';
 	$text['description-extension']['pt-pt'] = 'Insira a extensão da conferência';
-	$text['description-extension']['fr'] = "Entrer le numéro d'extension de la conférence.";
+	$text['description-extension']['fr-fr'] = "Entrer le numéro d'extension de la conférence.";
 
 	$text['description-3']['en-us'] = 'to monitor and interact with the conference room.';
 	$text['description-3']['pt-pt'] = 'para monitorizar e interagir com a sala de conferências.';
-	$text['description-3']['fr'] = "Superviser et interagir avec la salle de conférence.";
+	$text['description-3']['fr-fr'] = "Superviser et interagir avec la salle de conférence.";
 
 	$text['label-pin']['en-us'] = 'Pin Number';
 	$text['label-pin']['pt-pt'] = 'Numero Pin';
-	$text['label-pin']['fr'] = 'Code Pin';
+	$text['label-pin']['fr-fr'] = 'Code Pin';
 
 	$text['description-pin']['en-us'] = 'Optional pin number to secure access to the conference.';
 	$text['description-pin']['pt-pt'] = 'Número de pin opcional para garantir o acesso à conferência.';
-	$text['description-pin']['fr'] = "Numéro d'identifiant pour sécuriser l'accès à la conf. (Optionnel)";
+	$text['description-pin']['fr-fr'] = "Numéro d'identifiant pour sécuriser l'accès à la conf. (Optionnel)";
 
 	$text['confirm-delete-2']['en-us'] = 'Do you really want to delete this?';
 	$text['confirm-delete-2']['pt-pt'] = 'Deseja realmente apagar isto?';
-	$text['confirm-delete-2']['fr'] = "Voulez-vous vraiment supprimer cela?";
+	$text['confirm-delete-2']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 	$text['button-add']['en-us'] = 'Add';
 	$text['button-add']['pt-pt'] = 'Adicionar';
-	$text['button-add']['fr'] = 'Ajouter';
+	$text['button-add']['fr-fr'] = 'Ajouter';
 
 	$text['button-save']['en-us'] = 'Save';
 	$text['button-save']['pt-pt'] = 'Gravar';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 	$text['label-description']['en-us'] = 'Description';
 	$text['label-description']['pt-pt'] = 'Descrição';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 
 	$text['description-info']['en-us'] = 'Enter the description.';
 	$text['description-info']['pt-pt'] = 'Insira a descrição.';
-	$text['description-info']['fr'] = "";
+	$text['description-info']['fr-fr'] = "";
 
 	$text['description-conference-enable']['en-us'] = 'Select whether to enable or disable the conference.';
 	$text['description-conference-enable']['pt-pt'] = 'Selecione se deseja ativar ou desativar a conferência.';
-	$text['description-conference-enable']['fr'] = "Choisir d'activer ou non la conférence.";
+	$text['description-conference-enable']['fr-fr'] = "Choisir d'activer ou non la conférence.";
 
 	$text['description-order']['en-us'] = 'Enter the order number.';
 	$text['description-order']['pt-pt'] = 'Digite o número do pedido.';
-	$text['description-order']['fr'] = "Entrer le numéro d'ordre.";
+	$text['description-order']['fr-fr'] = "Entrer le numéro d'ordre.";
 
 	$text['label-order']['en-us'] = 'Order';
 	$text['label-order']['pt-pt'] = 'Pedido';
-	$text['label-order']['fr'] = 'Ordre';
+	$text['label-order']['fr-fr'] = 'Ordre';
 
 	$text['description-user-add']['en-us'] = 'Assign the users that are can manage this conference extension.';
 	$text['description-user-add']['pt-pt'] = 'Atribuir os utilizadores que podem gerir esta extensão de conferência.';
-	$text['description-user-add']['fr'] = "Selectionner les usagers pouvant gérer cette conférence.";
+	$text['description-user-add']['fr-fr'] = "Selectionner les usagers pouvant gérer cette conférence.";
 
 	$text['description-profile']['en-us'] = 'Conference Profile is a collection of settings for the conference.';
 	$text['description-profile']['pt-pt'] = 'Perfil de conferência é um conjunto de definições para a conferência.';
-	$text['description-profile']['fr'] = "Le profile de la conférence est une liste de paramètres pour la conférence.";
+	$text['description-profile']['fr-fr'] = "Le profile de la conférence est une liste de paramètres pour la conférence.";
 
 	$text['description-flags']['en-us'] = 'Optional conference flags. examples: mute|deaf|waste|moderator';
 	$text['description-flags']['pt-pt'] = 'Flags opcionais de conferências. exemplos: mute|deaf|waste|moderator';
-	$text['description-flags']['fr'] = "Flags Optionnels de la conférence. exemple: mute|deaf|waste|moderator";
+	$text['description-flags']['fr-fr'] = "Flags Optionnels de la conférence. exemple: mute|deaf|waste|moderator";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/conferences_active/app_config.php b/app/conferences_active/app_config.php
index efe658fb33..b935c1af31 100644
--- a/app/conferences_active/app_config.php
+++ b/app/conferences_active/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'AJAX tool to view and manage all active callers in a conference room.';
 		$apps[$x]['description']['es-mx'] = 'Herramient en AJAX para ver y administrar todas las llamadas activas en un cuarto de conferencia.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Outil en AJAX pour voir et gerer toutes les conferences actives.";
-		$apps[$x]['description']['fr-ca'] = "Outil en AJAX pour voir et gerer toutes les conferences actives aux chambres.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'A ferramenta AJAX permite visualizar e gerir todas as chamadas ativas numa sala de conferências.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Active Conferences';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Conferencias Activas';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Conferences en cours';
@@ -38,38 +38,37 @@
 		$apps[$x]['menu'][0]['groups'][] = 'user';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'conference_active_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = '2d857bbb-43b9-b8f7-a138-642868e0453a';
+		$apps[$x]['permissions'][0]['name'] = 'conferences_active_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'user';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][2]['name'] = 'conference_active_lock';
+		$apps[$x]['permissions'][2]['name'] = 'conferences_active_lock';
 		$apps[$x]['permissions'][2]['groups'][] = 'user';
 		$apps[$x]['permissions'][2]['groups'][] = 'admin';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][3]['name'] = 'conference_active_kick';
+		$apps[$x]['permissions'][3]['name'] = 'conferences_active_kick';
 		$apps[$x]['permissions'][3]['groups'][] = 'user';
 		$apps[$x]['permissions'][3]['groups'][] = 'admin';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][4]['name'] = 'conference_active_energy';
+		$apps[$x]['permissions'][4]['name'] = 'conferences_active_energy';
 		//$apps[$x]['permissions'][4]['groups'][] = 'user';
 		//$apps[$x]['permissions'][4]['groups'][] = 'admin';
 		//$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][5]['name'] = 'conference_active_volume';
+		$apps[$x]['permissions'][5]['name'] = 'conferences_active_volume';
 		//$apps[$x]['permissions'][5]['groups'][] = 'user';
 		//$apps[$x]['permissions'][5]['groups'][] = 'admin';
 		//$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][6]['name'] = 'conference_active_gain';
+		$apps[$x]['permissions'][6]['name'] = 'conferences_active_gain';
 		//$apps[$x]['permissions'][6]['groups'][] = 'user';
 		//$apps[$x]['permissions'][6]['groups'][] = 'admin';
 		//$apps[$x]['permissions'][6]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][7]['name'] = 'conference_active_mute';
+		$apps[$x]['permissions'][7]['name'] = 'conferences_active_mute';
 		$apps[$x]['permissions'][7]['groups'][] = 'user';
 		$apps[$x]['permissions'][7]['groups'][] = 'admin';
 		$apps[$x]['permissions'][7]['groups'][] = 'superadmin';
@@ -79,12 +78,12 @@
 		$apps[$x]['permissions'][8]['groups'][] = 'admin';
 		$apps[$x]['permissions'][8]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][8]['name'] = 'conference_active_video';
+		$apps[$x]['permissions'][8]['name'] = 'conferences_active_video';
 		$apps[$x]['permissions'][8]['groups'][] = 'user';
 		$apps[$x]['permissions'][8]['groups'][] = 'admin';
 		$apps[$x]['permissions'][8]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][9]['name'] = 'conference_active_advanced_view';
+		$apps[$x]['permissions'][9]['name'] = 'conferences_active_advanced_view';
 		$apps[$x]['permissions'][9]['groups'][] = 'admin';
 		$apps[$x]['permissions'][9]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/conferences_active/app_languages.php b/app/conferences_active/app_languages.php
index 9e559d81c4..fb199be4d6 100644
--- a/app/conferences_active/app_languages.php
+++ b/app/conferences_active/app_languages.php
@@ -26,132 +26,132 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 	$text['message-denied']['en-us'] = 'access denied';
-	$text['message-denied']['fr'] = "Accès non authorisé";
+	$text['message-denied']['fr-fr'] = "Accès non authorisé";
 
 	$text['label-interactive']['en-us'] = 'Interactive Conference';
-	$text['label-interactive']['fr'] = "Conférence Interactive";
+	$text['label-interactive']['fr-fr'] = "Conférence Interactive";
 
 	$text['description-interactive']['en-us'] = 'Use this to monitor and interact with the members of the conference.';
-	$text['description-interactive']['fr'] = "Superviser et interagir avec les participants de la conférence";
+	$text['description-interactive']['fr-fr'] = "Superviser et interagir avec les participants de la conférence";
 
 	$text['message-connection']['en-us'] = 'Connection to Event Socket failed.';
-	$text['message-connection']['fr'] = "Connexion à l'Event Socket en echec.";
+	$text['message-connection']['fr-fr'] = "Connexion à l'Event Socket en echec.";
 
 	$text['label-message']['en-us'] = 'Message';
-	$text['label-message']['fr'] = "Message";
+	$text['label-message']['fr-fr'] = "Message";
 
 	$text['label-tools']['en-us'] = 'Tools';
-	$text['label-tools']['fr'] = "Outils";
+	$text['label-tools']['fr-fr'] = "Outils";
 
 	$text['button-start-rec']['en-us'] = 'Start Record';
-	$text['button-start-rec']['fr'] = "Commencer l'Enregistrement";
+	$text['button-start-rec']['fr-fr'] = "Commencer l'Enregistrement";
 
 	$text['button-stop-rec']['en-us'] = 'Stop Record';
-	$text['button-stop-rec']['fr'] = "Arrêter l'Enregistrement";
+	$text['button-stop-rec']['fr-fr'] = "Arrêter l'Enregistrement";
 
 	$text['label-recording']['en-us'] = 'Recording';
-	$text['label-recording']['fr'] = "Enregistré";
+	$text['label-recording']['fr-fr'] = "Enregistré";
 
 	$text['label-not-recording']['en-us'] = 'Not Recording';
-	$text['label-not-recording']['fr'] = "Non Enregistré";
+	$text['label-not-recording']['fr-fr'] = "Non Enregistré";
 
 	$text['label-unlock']['en-us'] = 'Unlock';
-	$text['label-unlock']['fr'] = "Débloqué";
+	$text['label-unlock']['fr-fr'] = "Débloqué";
 
 	$text['label-lock']['en-us'] = 'Lock';
-	$text['label-lock']['fr'] = "Bloqué";
+	$text['label-lock']['fr-fr'] = "Bloqué";
 
 	$text['label-id']['en-us'] = 'ID';
-	$text['label-id']['fr'] = "ID";
+	$text['label-id']['fr-fr'] = "ID";
 
 	$text['label-cid-name']['en-us'] = 'Caller ID Name';
-	$text['label-cid-name']['fr'] = "Nom d'appelant";
+	$text['label-cid-name']['fr-fr'] = "Nom d'appelant";
 
 	$text['label-cid-num']['en-us'] = 'Caller ID Number';
-	$text['label-cid-num']['fr'] = "Numéro d'appelant";
+	$text['label-cid-num']['fr-fr'] = "Numéro d'appelant";
 
 	$text['label-moderator']['en-us'] = 'Moderator';
-	$text['label-moderator']['fr'] = "Modérateur";
+	$text['label-moderator']['fr-fr'] = "Modérateur";
 
 	$text['label-joined']['en-us'] = 'Joined';
-	$text['label-joined']['fr'] = "a joint";
+	$text['label-joined']['fr-fr'] = "a joint";
 
 	$text['label-hear']['en-us'] = 'Hear';
-	$text['label-hear']['fr'] = "écouter";
+	$text['label-hear']['fr-fr'] = "écouter";
 
 	$text['label-speak']['en-us'] = 'Speak';
-	$text['label-speak']['fr'] = "parler";
+	$text['label-speak']['fr-fr'] = "parler";
 
 	$text['label-talking']['en-us'] = 'Talking';
-	$text['label-talking']['fr'] = "parle";
+	$text['label-talking']['fr-fr'] = "parle";
 
 	$text['label-last-talk']['en-us'] = 'Last Talked';
-	$text['label-last-talk']['fr'] = "dernier parlant";
+	$text['label-last-talk']['fr-fr'] = "dernier parlant";
 
 	$text['label-video']['en-us'] = 'Video';
-	$text['label-video']['fr'] = "Vidéo";
+	$text['label-video']['fr-fr'] = "Vidéo";
 
 	$text['label-floor']['en-us'] = 'Has Floor';
-	$text['label-floor']['fr'] = "A la parole";
+	$text['label-floor']['fr-fr'] = "A la parole";
 
 	$text['label-tool']['en-us'] = 'Tools';
-	$text['label-tool']['fr'] = "Outils";
+	$text['label-tool']['fr-fr'] = "Outils";
 
 	$text['label-yes']['en-us'] = 'yes';
-	$text['label-yes']['fr'] = "Oui";
+	$text['label-yes']['fr-fr'] = "Oui";
 
 	$text['label-no']['en-us'] = 'no';
-	$text['label-no']['fr'] = "Non";
+	$text['label-no']['fr-fr'] = "Non";
 
 	$text['label-energy']['en-us'] = 'Energy';
-	$text['label-energy']['fr'] = "Energie";
+	$text['label-energy']['fr-fr'] = "Energie";
 
 	$text['label-volume']['en-us'] = 'Vol';
-	$text['label-volume']['fr'] = "Vol";
+	$text['label-volume']['fr-fr'] = "Vol";
 
 	$text['label-gain']['en-us'] = 'Gain';
-	$text['label-gain']['fr'] = "Gain";
+	$text['label-gain']['fr-fr'] = "Gain";
 
 	$text['label-mute']['en-us'] = 'Mute';
-	$text['label-mute']['fr'] = "muet";
+	$text['label-mute']['fr-fr'] = "muet";
 
 	$text['label-unmute']['en-us'] = 'Unmute';
-	$text['label-unmute']['fr'] = "sonore";
+	$text['label-unmute']['fr-fr'] = "sonore";
 
 	$text['label-mute-all']['en-us'] = 'Mute All';
-	$text['label-mute-all']['fr'] = "tous muets";
+	$text['label-mute-all']['fr-fr'] = "tous muets";
 
 	$text['label-mute-all-alt']['en-us'] = 'Mute all but moderator.';
-	$text['label-mute-all-alt']['fr'] = "muets sauf le moderateur.";
+	$text['label-mute-all-alt']['fr-fr'] = "muets sauf le moderateur.";
 
 	$text['label-unmute-all']['en-us'] = 'Unmute All';
-	$text['label-unmute-all']['fr'] = "tous sonore";
+	$text['label-unmute-all']['fr-fr'] = "tous sonore";
 
 	$text['label-end-conference']['en-us'] = 'End Conference';
-	$text['label-end-conference']['fr'] = "finir la conférence";
+	$text['label-end-conference']['fr-fr'] = "finir la conférence";
 
 	$text['label-deaf']['en-us'] = 'Deaf';
-	$text['label-deaf']['fr'] = "sourd";
+	$text['label-deaf']['fr-fr'] = "sourd";
 
 	$text['label-undeaf']['en-us'] = 'Undeaf';
-	$text['label-undeaf']['fr'] = "entandant";
+	$text['label-undeaf']['fr-fr'] = "entandant";
 
 	$text['label-kick']['en-us'] = 'Kick';
-	$text['label-kick']['fr'] = "jeter";
+	$text['label-kick']['fr-fr'] = "jeter";
 
 	$text['label-active']['en-us'] = 'Active Conferences';
-	$text['label-active']['fr'] = "Conférences Avtives";
+	$text['label-active']['fr-fr'] = "Conférences Avtives";
 
 	$text['description-active']['en-us'] = 'List all the conferences that are currently active with one or more members.';
-	$text['description-active']['fr'] = "Liste toutes les conférences actives avec un ou plusieurs participants.";
+	$text['description-active']['fr-fr'] = "Liste toutes les conférences actives avec un ou plusieurs participants.";
 
 	$text['label-name']['en-us'] = 'Name';
-	$text['label-name']['fr'] = "Nom";
+	$text['label-name']['fr-fr'] = "Nom";
 
 	$text['label-member-count']['en-us'] = 'Member Count';
-	$text['label-member-count']['fr'] = "Décompte des participants";
+	$text['label-member-count']['fr-fr'] = "Décompte des participants";
 
 	$text['button-view']['en-us'] = 'view';
-	$text['button-view']['fr'] = "Voir";
+	$text['button-view']['fr-fr'] = "Voir";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php
index e2c846ab2f..74337dd412 100644
--- a/app/contacts/app_config.php
+++ b/app/contacts/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['contact_url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Provides a place to store contact information for individuals and organizations.';
 		$apps[$x]['description']['es-mx'] = 'Provee un lugar para almacenar informacion de los contactos, para individuos u organizaciones';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Place pour stocker les information des contacts, personnes ou organizations.";
-		$apps[$x]['description']['fr-ca'] = "C'est un endroit pour posser information des contacts, personnes ou organizations.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Fornece um local para armazenar informações de contato para indivíduos e organizações.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][$y]['title']['en-us'] = 'Contacts';
 		$apps[$x]['menu'][$y]['title']['es-mx'] = 'Contactos';
-		$apps[$x]['menu'][$y]['title']['de-de'] = '';
+		$apps[$x]['menu'][$y]['title']['de'] = '';
 		$apps[$x]['menu'][$y]['title']['de-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['de-at'] = '';
 		$apps[$x]['menu'][$y]['title']['fr-fr'] = 'Contacts';
@@ -38,87 +38,23 @@
 		$apps[$x]['menu'][$y]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = 'f14e6ab6-6565-d4e6-cbad-a51d2e3e8ec6';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_address_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_address_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_address_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_address_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_phone_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_phone_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_phone_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_phone_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_note_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_note_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_note_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_note_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_group_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_group_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_group_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'contact_group_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['name'] = 'contacts_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][0]['groups'][] = 'user';
+		$apps[$x]['permissions'][0]['groups'][] = 'admin';
+
+		$apps[$x]['permissions'][1]['name'] = 'contacts_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][1]['groups'][] = 'admin';
+
+		$apps[$x]['permissions'][2]['name'] = 'contacts_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][2]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][2]['groups'][] = 'user';
+
+		$apps[$x]['permissions'][3]['name'] = 'contacts_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][3]['groups'][] = 'admin';
 
 	//schema details
 		$y = 0; //table array index
@@ -152,15 +88,6 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'contact_parent_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_contacts';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'contact_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'contact_type';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the type.';
@@ -390,35 +317,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$z++;
-
-		$y = 4; //table array index
-		$apps[$x]['db'][$y]['table'] = 'v_contact_groups';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'contact_groups_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'contact_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_contacts';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'contact_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-?>
\ No newline at end of file
+?>
diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php
index c246da371f..60e92c96e2 100644
--- a/app/contacts/app_languages.php
+++ b/app/contacts/app_languages.php
@@ -4,19 +4,24 @@
 
 		$text['title-contacts']['en-us'] = 'Contacts';
 		$text['title-contacts']['pt-pt'] = '';
+		$text['title-contacts']['fr-fr'] = 'Contacts';
 
 		$text['header-contacts']['en-us'] = 'Contacts';
 		$text['header-contacts']['pt-pt'] = '';
+		$text['header-contacts']['fr-fr'] = 'Contacts';
 
 		$text['description-contacts']['en-us'] = 'The contact is a list of individuals and organizations.';
 		$text['description-contacts']['pt-pt'] = '';
+		$text['description-contacts']['fr-fr'] = "Fourni une liste d'individus et d'organisations.";
 
 
 		$text['button-import']['en-us'] = 'Import';
 		$text['button-import']['pt-pt'] = '';
+		$text['button-import']['fr-fr'] = 'Importer';
 
 		$text['button-search']['en-us'] = 'Search';
 		$text['button-search']['pt-pt'] = '';
+		$text['button-search']['fr-fr'] = 'Chercher';
 
 
 
@@ -24,107 +29,140 @@
 
 		$text['title-contact-add']['en-us'] = 'Contact Add';
 		$text['title-contact-add']['pt-pt'] = '';
+		$text['title-contact-add']['fr-fr'] = 'Ajouter Contact';
 
 		$text['header-contact-add']['en-us'] = 'Contact Add';
 		$text['header-contact-add']['pt-pt'] = '';
+		$text['header-contact-add']['fr-fr'] = 'Ajouter Contact';
 
 		$text['description-contact-add']['en-us'] = 'The contact is a list of individuals and organizations.';
 		$text['description-contact-add']['pt-pt'] = '';
+		$text['description-contact-add']['fr-fr'] = "Fourni une liste d'individus et d'organisations.";
 
 		$text['title-contact-edit']['en-us'] = 'Contact Edit';
 		$text['title-contact-edit']['pt-pt'] = '';
+		$text['title-contact-edit']['fr-fr'] = 'Editer Contact';
 
 		$text['header-contact-edit']['en-us'] = 'Contact Edit';
 		$text['header-contact-edit']['pt-pt'] = '';
+		$text['header-contact-edit']['fr-fr'] = 'Editer Contact';
 
 		$text['description-contact-edit']['en-us'] = 'The contact is a list of individuals and organizations.';
 		$text['description-contact-edit']['pt-pt'] = '';
+		$text['description-contact-edit']['fr-fr'] = "Fourni une liste d'individus et d'organisations.";
 
 
 		$text['label-contact_type']['en-us'] = 'Type';
 		$text['label-contact_type']['pt-pt'] = '';
+		$text['label-contact_type']['fr-fr'] = 'Type';
 
 		$text['description-contact_type']['en-us'] = 'Select the contact type.';
 		$text['description-contact_type']['pt-pt'] = '';
+		$text['description-contact_type']['fr-fr'] = "Choisir le type de contact.";
 
 		$text['label-contact_organization']['en-us'] = 'Organization';
 		$text['label-contact_organization']['pt-pt'] = '';
+		$text['label-contact_organization']['fr-fr'] = 'Organisation';
 
 		$text['description-contact_organization']['en-us'] = 'Enter the organization.';
 		$text['description-contact_organization']['pt-pt'] = '';
+		$text['description-contact_organization']['fr-fr'] = '';
 
 		$text['label-contact_name']['en-us'] = 'Name';
 		$text['label-contact_name']['pt-pt'] = '';
+		$text['label-contact_name']['fr-fr'] = 'Nom';
 
 		$text['label-contact_name_given']['en-us'] = 'First Name';
 		$text['label-contact_name_given']['pt-pt'] = '';
+		$text['label-contact_name_given']['fr-fr'] = 'Prénom';
 
 		$text['description-contact_name_given']['en-us'] = 'Enter the given name.';
 		$text['description-contact_name_given']['pt-pt'] = '';
+		$text['description-contact_name_given']['fr-fr'] = '';
 
 		$text['label-contact_name_family']['en-us'] = 'Last Name';
 		$text['label-contact_name_family']['pt-pt'] = '';
+		$text['label-contact_name_family']['fr-fr'] = 'Nom';
 
 		$text['description-contact_name_family']['en-us'] = 'Enter the family name.';
 		$text['description-contact_name_family']['pt-pt'] = '';
+		$text['description-contact_name_family']['fr-fr'] = '';
 
 		$text['label-contact_nickname']['en-us'] = 'Nickname';
 		$text['label-contact_nickname']['pt-pt'] = '';
+		$text['label-contact_nickname']['fr-fr'] = 'Surnom';
 
 		$text['description-contact_nickname']['en-us'] = 'Enter the nickname.';
 		$text['description-contact_nickname']['pt-pt'] = '';
+		$text['description-contact_nickname']['fr-fr'] = '';
 
 		$text['label-contact_title']['en-us'] = 'Title';
 		$text['label-contact_title']['pt-pt'] = '';
+		$text['label-contact_title']['fr-fr'] = 'Titre';
 
 		$text['description-contact_title']['en-us'] = 'Enter the title.';
 		$text['description-contact_title']['pt-pt'] = '';
+		$text['description-contact_title']['fr-fr'] = '';
 
 		$text['label-contact_category']['en-us'] = 'Category';
 		$text['label-contact_category']['pt-pt'] = '';
+		$text['label-contact_category']['fr-fr'] = 'Catégorie';
 
 		$text['description-contact_category']['en-us'] = 'Enter the category.';
 		$text['description-contact_category']['pt-pt'] = '';
+		$text['description-contact_category']['fr-fr'] = '';
 
 		$text['label-contact_role']['en-us'] = 'Role';
 		$text['label-contact_role']['pt-pt'] = '';
+		$text['label-contact_role']['fr-fr'] = 'Rôle';
 
 		$text['description-contact_role']['en-us'] = 'Enter the role.';
 		$text['description-contact_role']['pt-pt'] = '';
+		$text['description-contact_role']['fr-fr'] = '';
 
 		$text['label-contact_email']['en-us'] = 'Email';
 		$text['label-contact_email']['pt-pt'] = '';
+		$text['label-contact_email']['fr-fr'] = 'Courriel';
 
 		$text['description-contact_email']['en-us'] = 'Enter the email address.';
 		$text['description-contact_email']['pt-pt'] = '';
+		$text['description-contact_email']['fr-fr'] = '';
 
 		$text['label-contact_url']['en-us'] = 'URL';
 		$text['label-contact_url']['pt-pt'] = '';
+		$text['label-contact_url']['fr-fr'] = 'URL';
 
 		$text['description-contact_url']['en-us'] = 'Enter the website address.';
 		$text['description-contact_url']['pt-pt'] = '';
+		$text['description-contact_url']['fr-fr'] = "Entrer l'adresse du site internet.";
 
 		$text['label-contact_time_zone']['en-us'] = 'Time Zone';
 		$text['label-contact_time_zone']['pt-pt'] = '';
+		$text['label-contact_time_zone']['fr-fr'] = "Fuseau Horaire";
 
 		$text['description-contact_time_zone']['en-us'] = 'Enter the time zone.';
 		$text['description-contact_time_zone']['pt-pt'] = '';
+		$text['description-contact_time_zone']['fr-fr'] = '';
 
 		$text['label-contact_note']['en-us'] = 'Note';
 		$text['label-contact_note']['pt-pt'] = '';
+		$text['label-contact_note']['fr-fr'] = 'Note';
 
 		$text['description-contact_note']['en-us'] = 'Enter a note.';
 		$text['description-contact_note']['pt-pt'] = '';
-
+		$text['description-contact_note']['fr-fr'] = '';
 
 		$text['button-qr_code']['en-us'] = 'QR Code';
 		$text['button-qr_code']['pt-pt'] = '';
+		$text['button-qr_code']['fr-fr'] = 'Code QR';
 
 		$text['button-vcard']['en-us'] = 'vCard';
 		$text['button-vcard']['pt-pt'] = '';
+		$text['button-vcard']['fr-fr'] = 'vCard';
 
 		$text['button-invoices']['en-us'] = 'Invoices';
 		$text['button-invoices']['pt-pt'] = '';
+		$text['button-invoices']['fr-fr'] = 'Factures';
 
 
 
@@ -132,138 +170,180 @@
 
 		$text['title-contact_phones-add']['en-us'] = 'Contact Phone Add';
 		$text['title-contact_phones-add']['pt-pt'] = '';
+		$text['title-contact_phones-add']['fr-fr'] = "Ajouter un téléphone au Contact";
 
 		$text['header-contact_phones-add']['en-us'] = 'Contact Phone Add';
 		$text['header-contact_phones-add']['pt-pt'] = '';
+		$text['header-contact_phones-add']['fr-fr'] = "Ajouter un téléphone au Contact";
 
 		$text['title-contact_phones-edit']['en-us'] = 'Contact Phone Edit';
 		$text['title-contact_phones-edit']['pt-pt'] = '';
+		$text['title-contact_phones-edit']['fr-fr'] = "Editer le téléphone du Contact";
 
 		$text['header-contact_phones-edit']['en-us'] = 'Contact Phone Edit';
 		$text['header-contact_phones-edit']['pt-pt'] = '';
+		$text['header-contact_phones-edit']['fr-fr'] = "Editer le téléphone du Contact";
 
 
 		$text['label-phone_numbers']['en-us'] = 'Phone Numbers';
 		$text['label-phone_numbers']['pt-pt'] = '';
+		$text['label-phone_numbers']['fr-fr'] = 'Numéros de téléphone';
 
 		$text['label-phone_type']['en-us'] = 'Type';
 		$text['label-phone_type']['pt-pt'] = '';
+		$text['label-phone_type']['fr-fr'] = 'Type';
 
 		$text['description-phone_type']['en-us'] = 'Select the phone type.';
 		$text['description-phone_type']['pt-pt'] = '';
+		$text['description-phone_type']['fr-fr'] = '';
 
 		$text['label-phone_number']['en-us'] = 'Number';
 		$text['label-phone_number']['pt-pt'] = '';
+		$text['label-phone_number']['fr-fr'] = 'Numéro';
 
 		$text['description-phone_number']['en-us'] = 'Enter the phone number.';
 		$text['description-phone_number']['pt-pt'] = '';
+		$text['description-phone_number']['fr-fr'] = '';
 
 		$text['label-phone_extension']['en-us'] = 'Extension';
 		$text['label-phone_extension']['pt-pt'] = '';
+		$text['label-phone_extension']['fr-fr'] = 'Extension';
 
 		$text['description-phone_extension']['en-us'] = 'Enter the extension.';
 		$text['description-phone_extension']['pt-pt'] = '';
+		$text['description-phone_extension']['fr-fr'] = '';
 
 		$text['label-phone_description']['en-us'] = 'Description';
 		$text['label-phone_description']['pt-pt'] = '';
+		$text['label-phone_description']['fr-fr'] = 'Description';
 
 		$text['description-phone_description']['en-us'] = 'Enter the description.';
 		$text['description-phone_description']['pt-pt'] = '';
+		$text['description-phone_description']['fr-fr'] = '';
 
 		$text['label-phone_tools']['en-us'] = 'Tools';
 		$text['label-phone_tools']['pt-pt'] = '';
+		$text['label-phone_tools']['fr-fr'] = 'Outils';
 
 		$text['label-phone_call']['en-us'] = 'Call';
 		$text['label-phone_call']['pt-pt'] = '';
+		$text['label-phone_call']['fr-fr'] = 'Appel';
 
 
 	// contact addresses
 
 		$text['title-contact_addresses-add']['en-us'] = 'Contact Address Add';
 		$text['title-contact_addresses-add']['pt-pt'] = '';
+		$text['title-contact_addresses-add']['fr-fr'] = "Ajouter une adresse au contact";
 
 		$text['header-contact_addresses-add']['en-us'] = 'Contact Address Add';
 		$text['header-contact_addresses-add']['pt-pt'] = '';
+		$text['header-contact_addresses-add']['fr-fr'] = "Ajouter une adresse au contact";
 
 		$text['description-contact_addresses-add']['en-us'] = 'Contact address information.';
 		$text['description-contact_addresses-add']['pt-pt'] = '';
+		$text['description-contact_addresses-add']['fr-fr'] = "Informations sur l'adresse du contact.";
 
 		$text['title-contact_addresses-edit']['en-us'] = 'Contact Address Edit';
 		$text['title-contact_addresses-edit']['pt-pt'] = '';
+		$text['title-contact_addresses-edit']['fr-fr'] = "Editer l'adresse du contact";
 
 		$text['header-contact_addresses-edit']['en-us'] = 'Contact Address Edit';
 		$text['header-contact_addresses-edit']['pt-pt'] = '';
+		$text['header-contact_addresses-edit']['fr-fr'] = "Editer l'adresse du contact";
 
 		$text['description-contact_addresses-edit']['en-us'] = 'Contact address information.';
 		$text['description-contact_addresses-edit']['pt-pt'] = '';
+		$text['description-contact_addresses-edit']['fr-fr'] = "Informations sur l'adresse du contact.";
 
 
 		$text['label-addresses']['en-us'] = 'Addresses';
 		$text['label-addresses']['pt-pt'] = '';
+		$text['label-addresses']['fr-fr'] = 'Adresses';
 
 		$text['label-address_type']['en-us'] = 'Type';
 		$text['label-address_type']['pt-pt'] = '';
+		$text['label-address_type']['fr-fr'] = 'Type';
 
 		$text['description-address_type']['en-us'] = 'Enter the address type.';
 		$text['description-address_type']['pt-pt'] = '';
+		$text['description-address_type']['fr-fr'] = '';
 
 		$text['label-address_street']['en-us'] = 'Street Address';
 		$text['label-address_street']['pt-pt'] = '';
+		$text['label-address_street']['fr-fr'] = 'Rue';
 
 		$text['description-address_street']['en-us'] = 'Enter the street address.';
 		$text['description-address_street']['pt-pt'] = '';
+		$text['description-address_street']['fr-fr'] = '';
 
 		$text['label-address_extended']['en-us'] = 'Extended Address';
 		$text['label-address_extended']['pt-pt'] = '';
+		$text['label-address_extended']['fr-fr'] = 'Autres infos';
 
 		$text['description-address_extended']['en-us'] = 'Enter the extended address.';
 		$text['description-address_extended']['pt-pt'] = '';
+		$text['description-address_extended']['fr-fr'] = '';
 
 		$text['label-address_locality']['en-us'] = 'City';
 		$text['label-address_locality']['pt-pt'] = '';
+		$text['label-address_locality']['fr-fr'] = 'Ville';
 
 		$text['description-address_locality']['en-us'] = 'Enter the city.';
 		$text['description-address_locality']['pt-pt'] = '';
+		$text['description-address_locality']['fr-fr'] = '';
 
 		$text['label-address_region']['en-us'] = 'Region';
 		$text['label-address_region']['pt-pt'] = '';
+		$text['label-address_region']['fr-fr'] = 'Département';
 
 		$text['description-address_region']['en-us'] = 'Enter the state or province.';
 		$text['description-address_region']['pt-pt'] = '';
+		$text['description-address_region']['fr-fr'] = '';
 
 		$text['label-address_postal_code']['en-us'] = 'Postal Code';
 		$text['label-address_postal_code']['pt-pt'] = '';
+		$text['label-address_postal_code']['fr-fr'] = 'Code Postal';
 
 		$text['description-address_postal_code']['en-us'] = 'Enter the postal code.';
 		$text['description-address_postal_code']['pt-pt'] = '';
+		$text['description-address_postal_code']['fr-fr'] = '';
 
 		$text['label-address_country']['en-us'] = 'Country';
 		$text['label-address_country']['pt-pt'] = '';
+		$text['label-address_country']['fr-fr'] = 'Pays';
 
 		$text['description-address_country']['en-us'] = 'Enter the country.';
 		$text['description-address_country']['pt-pt'] = '';
+		$text['description-address_country']['fr-fr'] = '';
 
 		$text['label-address_latitude']['en-us'] = 'Latitude';
 		$text['label-address_latitude']['pt-pt'] = '';
+		$text['label-address_latitude']['fr-fr'] = 'Latitude';
 
 		$text['description-address_latitude']['en-us'] = 'Enter the latitude.';
 		$text['description-address_latitude']['pt-pt'] = '';
+		$text['description-address_latitude']['fr-fr'] = "Coordonnées GPS: latitude.";
 
 		$text['label-address_longitude']['en-us'] = 'Longitude';
 		$text['label-address_longitude']['pt-pt'] = '';
+		$text['label-address_longitude']['fr-fr'] = 'Longitude';
 
 		$text['description-address_longitude']['en-us'] = 'Enter the longitude.';
 		$text['description-address_longitude']['pt-pt'] = '';
+		$text['description-address_longitude']['fr-fr'] = "Coordonnées GPS: longitude.";
 
 		$text['label-address_description']['en-us'] = 'Description';
 		$text['label-address_description']['pt-pt'] = '';
+		$text['label-address_description']['fr-fr'] = 'Description';
 
 		$text['description-address_description']['en-us'] = 'Enter a description.';
 		$text['description-address_description']['pt-pt'] = '';
-
+		$text['description-address_description']['fr-fr'] = '';
 
 		$text['label-address_tools']['en-us'] = 'Tools';
 		$text['label-address_tools']['pt-pt'] = '';
+		$text['label-address_tools']['fr-fr'] = 'Outils';
 
 
 
@@ -271,31 +351,40 @@
 
 		$text['title-contact_notes-add']['en-us'] = 'Contact Note Add';
 		$text['title-contact_notes-add']['pt-pt'] = '';
+		$text['title-contact_notes-add']['fr-fr'] = "Ajouter une note au contact";
 
 		$text['header-contact_notes-add']['en-us'] = 'Contact Note Add';
 		$text['header-contact_notes-add']['pt-pt'] = '';
+		$text['header-contact_notes-add']['fr-fr'] = "Ajouter une note au contact";
 
 		$text['description-contact_notes-add']['en-us'] = '';
 		$text['description-contact_notes-add']['pt-pt'] = '';
+		$text['description-contact_notes-add']['fr-fr'] = '';
 
 		$text['title-contact_notes-edit']['en-us'] = 'Contact Note Edit';
 		$text['title-contact_notes-edit']['pt-pt'] = '';
+		$text['title-contact_notes-edit']['fr-fr'] = "Editer la note du contact";
 
 		$text['header-contact_notes-edit']['en-us'] = 'Contact Note Edit';
 		$text['header-contact_notes-edit']['pt-pt'] = '';
+		$text['header-contact_notes-edit']['fr-fr'] = "Editer la note du contact";
 
 		$text['description-contact_notes-edit']['en-us'] = '.';
 		$text['description-contact_notes-edit']['pt-pt'] = '';
+		$text['description-contact_notes-edit']['fr-fr'] = '.';
 
 
 		$text['label-contact_notes']['en-us'] = 'Notes';
 		$text['label-contact_notes']['pt-pt'] = '';
+		$text['label-contact_notes']['fr-fr'] = 'Notes';
 
 		$text['label-contact_note']['en-us'] = 'Note';
 		$text['label-contact_note']['pt-pt'] = '';
+		$text['label-contact_note']['fr-fr'] = 'Note';
 
 		$text['description-contact_note']['en-us'] = '';
 		$text['description-contact_note']['pt-pt'] = '';
+		$text['description-contact_note']['fr-fr'] = '';
 
 
 
@@ -303,34 +392,44 @@
 
 		$text['title-contacts_import']['en-us'] = 'Import Contacts';
 		$text['title-contacts_import']['pt-pt'] = '';
+		$text['title-contacts_import']['fr-fr'] = "Importe des Contacts";
 
 		$text['header-contacts_import']['en-us'] = 'Import Contacts';
 		$text['header-contacts_import']['pt-pt'] = '';
+		$text['header-contacts_import']['fr-fr'] = "Importe des Contacts";
 
 		$text['description-contacts_import']['en-us'] = 'Export your contacts from outlook to a comma delimitted csv file. Then use this tool to upload and add the contacts from that file.';
 		$text['description-contacts_import']['pt-pt'] = '';
+		$text['description-contacts_import']['fr-fr'] = "Exporter vos contacts à partir d'outlook vers un fichier CSV. Puis utiliser cet outil pour télécharger et ajouter les contacts à partir de précédent CSV.";
 
 		$text['label-import_delimiter']['en-us'] = 'Delimiter';
 		$text['label-import_delimiter']['pt-pt'] = '';
+		$text['label-import_delimiter']['fr-fr'] = 'Délimiteur de champs';
 
 		$text['description-import_delimiter']['en-us'] = 'Select the delimiter (comma or pipe).';
 		$text['description-import_delimiter']['pt-pt'] = '';
+		$text['description-import_delimiter']['fr-fr'] = 'Choisir le séparateur de champs (virgule ou pipe).';
 
 		$text['label-import_enclosure']['en-us'] = 'Enclosure';
 		$text['label-import_enclosure']['pt-pt'] = '';
+		$text['label-import_enclosure']['fr-fr'] = 'Délimiteur de texte';
 
 		$text['description-import_enclosure']['en-us'] = 'Select the enclosure of text (double-quotes or nothing).';
 		$text['description-import_enclosure']['pt-pt'] = '';
+		$text['description-import_enclosure']['fr-fr'] = "Choisir le séparateur de texte (guillements ou rien).";
 
 		$text['label-import_file_upload']['en-us'] = 'File to Upload';
 		$text['label-import_file_upload']['pt-pt'] = '';
+		$text['label-import_file_upload']['fr-fr'] = 'Fichier à télécharger';
 
 
 		$text['button-upload']['en-us'] = 'Upload';
 		$text['button-upload']['pt-pt'] = '';
+		$text['button-upload']['fr-fr'] = 'Télécharger';
 
 		$text['message-results']['en-us'] = 'The following contacts were successfully imported from the uploaded CSV file:';
 		$text['message-results']['pt-pt'] = '';
+		$text['message-results']['fr-fr'] = 'Les contacts suivants ont été téléchargés correctement à partir di fichier CSV:';
 
 
 
@@ -338,35 +437,45 @@
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = 'Voulez-vous vraiment supprimer cela?';
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = 'Mis à jour';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
 
 
 
-?>
\ No newline at end of file
+?>
diff --git a/app/content/app_config.php b/app/content/app_config.php
index 21dd6a494c..2b530b22f3 100644
--- a/app/content/app_config.php
+++ b/app/content/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Manage Content for any page in the interface.';
 		$apps[$x]['description']['es-mx'] = 'Administra el Contenido de cualquier pagina en la interfaz.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Gerer le contenu des pages de l'interface.";
-		$apps[$x]['description']['fr-ca'] = "Gerer le contenu des pages au interface.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Gerir o conteúdo de qualquer página na interface.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,11 +21,11 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Content Manager';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Administrador de Contenido';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Contenu';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = 'Administrateur';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Gestor de Conteúdo';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -38,81 +38,20 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'content_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = '90397352-395c-40f6-2087-887144abc06d';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
-		$y++;
+
 		$apps[$x]['permissions'][1]['name'] = 'content_add';
 		$apps[$x]['permissions'][1]['groups'][] = 'admin';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
-		$y++;
+
 		$apps[$x]['permissions'][2]['name'] = 'content_edit';
 		$apps[$x]['permissions'][2]['groups'][] = 'admin';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
-		$y++;
+
 		$apps[$x]['permissions'][3]['name'] = 'content_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'admin';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_sub_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_sub_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_sub_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_sub_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_sub_category_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_sub_category_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_sub_category_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'rss_sub_category_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 
 	//schema details
 		$y = 0; //table array index
@@ -427,4 +366,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/content/app_languages.php b/app/content/app_languages.php
index 566ca317bd..c49ef01a68 100644
--- a/app/content/app_languages.php
+++ b/app/content/app_languages.php
@@ -26,123 +26,84 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 	$text['title-rss']['en-us'] = 'RSS Feed';
-	$text['title-rss']['fr'] = 'RSS Feed';
-
+	$text['title-rss']['fr-fr'] = 'RSS Feed';
 	$text['description-rss']['en-us'] = 'Task List for RSS...';
-	$text['description-rss']['fr'] = 'Liste de Tâches pour RSS...';
-
+	$text['description-rss']['fr-fr'] = 'Liste de Tâches pour RSS...';
 	$text['message-add']['en-us'] = 'Add Complete';
-	$text['message-add']['fr'] = 'ajouté';
-
+	$text['message-add']['fr-fr'] = 'ajouté';
 	$text['button-back']['en-us'] = 'Back';
-	$text['button-back']['fr'] = 'Retour';
-
+	$text['button-back']['fr-fr'] = 'Retour';
 	$text['button-public']['en-us'] = 'public';
-	$text['button-public']['fr'] = 'public';
-
+	$text['button-public']['fr-fr'] = 'public';
 	$text['label-order']['en-us'] = 'Order';
-	$text['label-order']['fr'] = 'Ordre';
-
+	$text['label-order']['fr-fr'] = 'Ordre';
 	$text['label-content']['en-us'] = 'Content';
-	$text['label-content']['fr'] = 'Contenu';
-
+	$text['label-content']['fr-fr'] = 'Contenu';
 	$text['button-add-title']['en-us'] = 'Add';
-	$text['button-add-title']['fr'] = 'Ajouter';
-
+	$text['button-add-title']['fr-fr'] = 'Ajouter';
 	$text['message-delete-done']['en-us'] = 'Delete Completed';
-	$text['message-delete-done']['fr'] = 'Supprimé';
-
+	$text['message-delete-done']['fr-fr'] = 'Supprimé';
 	$text['label-list']['en-us'] = 'List';
-	$text['label-list']['fr'] = 'Liste';
-
+	$text['label-list']['fr-fr'] = 'Liste';
 	$text['label-title']['en-us'] = 'Title';
-	$text['label-title']['fr'] = 'Titre';
-
+	$text['label-title']['fr-fr'] = 'Titre';
 	$text['label-link']['en-us'] = 'Link';
-	$text['label-link']['fr'] = 'Lien';
-
+	$text['label-link']['fr-fr'] = 'Lien';
 	$text['label-group']['en-us'] = 'Group';
-	$text['label-group']['fr'] = 'Groupe';
-
+	$text['label-group']['fr-fr'] = 'Groupe';
 	$text['label-order']['en-us'] = 'Order';
-	$text['label-order']['fr'] = 'Ordre';
-
+	$text['label-order']['fr-fr'] = 'Ordre';
 	$text['label-edit']['en-us'] = 'Edit';
-	$text['label-edit']['fr'] = 'Editer';
-
+	$text['label-edit']['fr-fr'] = 'Editer';
 	$text['message-confirm-delete']['en-us'] = 'Do you really want to delete this?';
-	$text['message-confirm-delete']['fr'] = 'Voulez-vous vraiment faire cela?';
-
+	$text['message-confirm-delete']['fr-fr'] = 'Voulez-vous vraiment faire cela?';
 	$text['message-item-down']['en-us'] = 'Item Moved Down';
-	$text['message-item-down']['fr'] = 'Objet descendu';
-
+	$text['message-item-down']['fr-fr'] = 'Objet descendu';
 	$text['message-item-up']['en-us'] = 'Item Moved Up';
-	$text['message-item-up']['fr'] = 'Objet remonté';
-
+	$text['message-item-up']['fr-fr'] = 'Objet remonté';
 	$text['label-search']['en-us'] = 'Search Results';
-	$text['label-search']['fr'] = 'Resultats de la recherche';
-
+	$text['label-search']['fr-fr'] = 'Resultats de la recherche';
 	$text['label-id']['en-us'] = 'ID';
-	$text['label-id']['fr'] = 'ID';
-
+	$text['label-id']['fr-fr'] = 'ID';
 	$text['label-category']['en-us'] = 'Category';
-	$text['label-category']['fr'] = 'Categorie';
-
+	$text['label-category']['fr-fr'] = 'Categorie';
 	$text['label-sub-category']['en-us'] = 'Sub Category';
-	$text['label-sub-category']['fr'] = 'Sous Categorie';
-
+	$text['label-sub-category']['fr-fr'] = 'Sous Categorie';
 	$text['label-description']['en-us'] = 'Description';
-	$text['label-description']['fr'] = 'Description';
-
+	$text['label-description']['fr-fr'] = 'Description';
 	$text['button-search']['en-us'] = 'Search';
-	$text['button-search']['fr'] = 'recherche';
-
+	$text['button-search']['fr-fr'] = 'recherche';
 	$text['label-rss-category']['en-us'] = 'RSS Category';
-	$text['label-rss-category']['fr'] = 'RSS Categorie';
-
+	$text['label-rss-category']['fr-fr'] = 'RSS Categorie';
 	$text['button-update']['en-us'] = 'Update';
-	$text['button-update']['fr'] = 'Mise à Jour';
-
+	$text['button-update']['fr-fr'] = 'Mise à Jour';
 	$text['message-update']['en-us'] = 'Update Complete';
-	$text['message-update']['fr'] = 'Mis à Jour';
-
+	$text['message-update']['fr-fr'] = 'Mis à Jour';
 	$text['label-details']['en-us'] = 'Details';
-	$text['label-details']['fr'] = 'Détails';
-
+	$text['label-details']['fr-fr'] = 'Détails';
 	$text['label-template']['en-us'] = 'Template';
-	$text['label-template']['fr'] = 'Template';
-
+	$text['label-template']['fr-fr'] = 'Template';
 	$text['button-delete']['en-us'] = 'Delete';
-	$text['button-delete']['fr'] = 'Supprimer';
-
+	$text['button-delete']['fr-fr'] = 'Supprimer';
 	$text['label-sub-id']['en-us'] = 'Sub ID';
-	$text['label-sub-id']['fr'] = 'Sous ID';
-
+	$text['label-sub-id']['fr-fr'] = 'Sous ID';
 	$text['label-sub-title']['en-us'] = 'Sub Title';
-	$text['label-sub-title']['fr'] = 'Sous Titre';
-
+	$text['label-sub-title']['fr-fr'] = 'Sous Titre';
 	$text['label-sub-link']['en-us'] = 'Sub Link';
-	$text['label-sub-link']['fr'] = 'Sub Link';
-
+	$text['label-sub-link']['fr-fr'] = 'Sub Link';
 	$text['label-sub-desc']['en-us'] = 'Sub Description';
-	$text['label-sub-desc']['fr'] = 'Sub Description';
-
+	$text['label-sub-desc']['fr-fr'] = 'Sub Description';
 	$text['message-error-missing']['en-us'] = 'Error missing';
-	$text['message-error-missing']['fr'] = 'Erreur missing';
-
+	$text['message-error-missing']['fr-fr'] = 'Erreur missing';
 	$text['message-description']['en-us'] = 'Please provide a description.';
-	$text['message-description']['fr'] = "Merci d'écrire une description.";
-
+	$text['message-description']['fr-fr'] = "Merci d'écrire une description.";
 	$text['label-content-edit']['en-us'] = 'Content Edit';
-	$text['label-content-edit']['fr'] = "Edition du contenu";
-
+	$text['label-content-edit']['fr-fr'] = "Edition du contenu";
 	$text['label-type']['en-us'] = 'Type';
-	$text['label-type']['fr'] = 'Type';
-
+	$text['label-type']['fr-fr'] = 'Type';
 	$text['label-on-off']['en-us'] = 'on/off';
-	$text['label-on-off']['fr'] = 'on/off';
-
+	$text['label-on-off']['fr-fr'] = 'on/off';
 	$text['button-save']['en-us'] = 'Save';
-	$text['button-save']['fr'] = 'Sauvegarde';
+	$text['button-save']['fr-fr'] = 'Sauvegarde';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/destinations/app_config.php b/app/destinations/app_config.php
index f38b328d32..6773fee8a0 100644
--- a/app/destinations/app_config.php
+++ b/app/destinations/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Used to define external destination numbers.';
 		$apps[$x]['description']['es-mx'] = 'Utilizado para definir numeros destinos externos.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Défini les numéros externes.";
-		$apps[$x]['description']['fr-ca'] = "Usé pour définir cibler nombres externe.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Utilizado para definir os números de destino externos.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,11 +21,11 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Destinations';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Destinos';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Destinations';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = 'Cibler';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Destinos';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -39,7 +39,6 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'destination_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = 'fd2a708a-ff03-c707-c19d-5a4194375eba';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
@@ -130,4 +129,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
 		$z++;
-?>
\ No newline at end of file
+?>
diff --git a/app/destinations/app_languages.php b/app/destinations/app_languages.php
index f2e25b1abf..edf89a4d88 100644
--- a/app/destinations/app_languages.php
+++ b/app/destinations/app_languages.php
@@ -4,113 +4,150 @@
 
 		$text['title-destinations']['en-us'] = 'Destinations';
 		$text['title-destinations']['pt-pt'] = '';
+		$text['title-destinations']['fr-fr'] = 'Destinations';
 
 		$text['title-destination-edit']['en-us'] = 'Destination Edit';
 		$text['title-destination-edit']['pt-pt'] = '';
+		$text['title-destination-edit']['fr-fr'] = 'Editer la Destination';
 
 		$text['title-destination-add']['en-us'] = 'Destination Add';
 		$text['title-destination-add']['pt-pt'] = '';
+		$text['title-destination-add']['fr-fr'] = 'Ajouter une Destination';
 
 		$text['header-destinations']['en-us'] = 'Destinations';
 		$text['header-destinations']['pt-pt'] = '';
+		$text['header-destinations']['fr-fr'] = 'Destinations';
 
 		$text['description-destinations']['en-us'] = 'Inbound destinations are the DID/DDI, DNIS or Alias for inbound calls.';
 		$text['description-destinations']['pt-pt'] = '';
+		$text['description-destinations']['fr-fr'] = "Les destinations entrantes sont des SDA/DDI, DNIS ou des Aliases.";
 
 		$text['header-destination-edit']['en-us'] = 'Destination Edit';
 		$text['header-destination-edit']['pt-pt'] = '';
+		$text['header-destination-edit']['fr-fr'] = 'Editer la Destination';
 
 		$text['header-destination-add']['en-us'] = 'Destination Add';
 		$text['header-destination-add']['pt-pt'] = '';
+		$text['header-destination-add']['fr-fr'] = 'Ajouter une Destination';
 
 		$text['label-destination_type']['en-us'] = 'Type';
 		$text['label-destination_type']['pt-pt'] = '';
+		$text['label-destination_type']['fr-fr'] = 'Type';
 
 		$text['description-destination_type']['en-us'] = 'Select the type.';
 		$text['description-destination_type']['pt-pt'] = '';
+		$text['description-destination_type']['fr-fr'] = 'Choisir le type.';
 
 		$text['option-type_inbound']['en-us'] = 'Inbound';
 		$text['option-type_inbound']['pt-pt'] = '';
+		$text['option-type_inbound']['fr-fr'] = 'Entrant';
 
 		$text['option-type_outbound']['en-us'] = 'Outbound';
 		$text['option-type_outbound']['pt-pt'] = '';
+		$text['option-type_outbound']['fr-fr'] = 'Sortant';
 
 		$text['label-destination_number']['en-us'] = 'Destination';
 		$text['label-destination_number']['pt-pt'] = '';
+		$text['label-destination_number']['fr-fr'] = 'Destination';
 
 		$text['description-destination_number']['en-us'] = 'Enter the destination.';
 		$text['description-destination_number']['pt-pt'] = '';
+		$text['description-destination_number']['fr-fr'] = 'Indiquer la destination.';
 
 		$text['label-destination_caller_id_name']['en-us'] = 'Caller ID Name';
 		$text['label-destination_caller_id_name']['pt-pt'] = '';
+		$text['label-destination_caller_id_name']['fr-fr'] = "Caller ID Name";
 
 		$text['description-destination_caller_id_name']['en-us'] = 'Enter the caller ID name.';
 		$text['description-destination_caller_id_name']['pt-pt'] = '';
+		$text['description-destination_caller_id_name']['fr-fr'] = "Insérer le nom d'appelant.";
 
 		$text['label-destination_caller_id_number']['en-us'] = 'Caller ID Number';
 		$text['label-destination_caller_id_number']['pt-pt'] = '';
+		$text['label-destination_caller_id_number']['fr-fr'] = 'Caller ID Number';
 
 		$text['description-destination_caller_id_number']['en-us'] = 'Enter the caller ID number.';
 		$text['description-destination_caller_id_number']['pt-pt'] = '';
+		$text['description-destination_caller_id_number']['fr-fr'] = "Insérer le numéro d'appelant.";
 
 		$text['label-destination_context']['en-us'] = 'Context';
 		$text['label-destination_context']['pt-pt'] = '';
+		$text['label-destination_context']['fr-fr'] = 'Contexte';
 
 		$text['description-destination_context']['en-us'] = 'Enter the context.';
 		$text['description-destination_context']['pt-pt'] = '';
+		$text['description-destination_context']['fr-fr'] = 'Entrer le context.';
 
 		$text['label-fax_uuid']['en-us'] = 'Fax Destination';
 		$text['label-fax_uuid']['pt-pt'] = '';
+		$text['label-fax_uuid']['fr-fr'] = 'Destination Fax';
 
 		$text['description-fax_uuid']['en-us'] = 'Select the fax destination to enable fax detection. ';
 		$text['description-fax_uuid']['pt-pt'] = '';
+		$text['description-fax_uuid']['fr-fr'] = "Insérer la destination Fax afin d'activer la détection de Fax.";
 
 		$text['label-destination_enabled']['en-us'] = 'Enabled';
 		$text['label-destination_enabled']['pt-pt'] = '';
+		$text['label-destination_enabled']['fr-fr'] = 'Actif';
 
 		$text['description-destination_enabled']['en-us'] = 'Set the current status of this destination.';
 		$text['description-destination_enabled']['pt-pt'] = '';
+		$text['description-destination_enabled']['fr-fr'] = "Choisir l'état courant de la destination.";
 
 		$text['label-destination_description']['en-us'] = 'Description';
 		$text['label-destination_description']['pt-pt'] = '';
+		$text['label-destination_description']['fr-fr'] = 'Description';
 
 		$text['description-destination_description']['en-us'] = 'Enter a description for this destination (optional).';
 		$text['description-destination_description']['pt-pt'] = '';
+		$text['description-destination_description']['fr-fr'] = "";
 
 		$text['label-true']['en-us'] = 'True';
 		$text['label-true']['pt-pt'] = '';
+		$text['label-true']['fr-fr'] = 'Oui';
 
 		$text['label-false']['en-us'] = 'False';
 		$text['label-false']['pt-pt'] = 'falso';
+		$text['label-false']['fr-fr'] = 'Non';
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = 'Voulez-vous vraiment supprimer cela?';
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = 'Mis à jour';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index 38e0751721..dfd0cb6453 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Devices for provisioning.';
 		$apps[$x]['description']['es-mx'] = 'Provicionamiento de dispositivos.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Equipements pour provisioning.';
-		$apps[$x]['description']['fr-ca'] = 'Dispositifs pour provisionnement.';
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Lista de provisionamento de Telefone.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,11 +21,11 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Devices';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Dispositivos';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Equipements';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = 'Dispositifs';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Telefones';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -39,7 +39,6 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'device_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = 'f9dce498-b7f9-740f-e592-9e8ff3dac2a0';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
@@ -54,38 +53,6 @@
 		$apps[$x]['permissions'][$y]['name'] = 'device_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'device_extension_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'device_extension_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'device_extension_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'device_extension_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'device_line_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'device_line_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'device_line_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'device_line_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 
 	//schema details
 		$y = 0; //table array index
@@ -270,4 +237,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the password.';
 		$z++;
-?>
\ No newline at end of file
+?>
diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index b2881d1afc..e561c55c03 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -3,182 +3,234 @@
 	//Devices
 		$text['title-devices']['en-us'] = 'Devices';
 		$text['title-devices']['pt-pt'] = '';
+		$text['title-devices']['fr-fr'] = 'Equipements';
 
 		$text['header-devices']['en-us'] = 'Devices';
 		$text['header-devices']['pt-pt'] = '';
+		$text['header-devices']['fr-fr'] = 'Equipements';
 
 		$text['description-devices']['en-us'] = 'Devices are endpoints that register to one or more extensions. They are added to the list manually or automatically when the device requests the provisioning information over HTTP/HTTPS.';
 		$text['description-devices']['pt-pt'] = '';
+		$text['description-devices']['fr-fr'] = "Ce sont les équipements qui enregistrent une ou plusieures extensions. Elles sont ajoutées manuellement ou automatiquement à la liste quand l'équipement fait une demande de provisioning par HTTP/HTTPS";
 
 		$text['header-device']['en-us'] = 'Device';
 		$text['header-device']['pt-pt'] = '';
+		$text['header-device']['fr-fr'] = 'Equipement';
 
 		$text['description-device']['en-us'] = 'The following information is used to provision endpoints.';
 		$text['description-device']['pt-pt'] = '';
+		$text['description-device']['fr-fr'] = 'Les informations suivantes servent à enregistrer les Equipements.';
 
 		$text['label-device_mac_address']['en-us'] = 'MAC Address';
 		$text['label-device_mac_address']['pt-pt'] = '';
+		$text['label-device_mac_address']['fr-fr'] = 'Adresse MAC';
 
 		$text['description-device_mac_address']['en-us'] = 'Enter the MAC address.';
 		$text['description-device_mac_address']['pt-pt'] = '';
+		$text['description-device_mac_address']['fr-fr'] = '';
 
 		$text['label-extension']['en-us'] = 'Extensions';
 		$text['label-extension']['pt-pt'] = '';
+		$text['label-extension']['fr-fr'] = 'Extensions';
 
 		$text['description-extension']['en-us'] = 'Assign the extension and line numbers to the device.';
 		$text['description-extension']['pt-pt'] = '';
+		$text['description-extension']['fr-fr'] = "Assigner l'extension et le nombre de lignes à l'équipement.";
 
 		$text['label-device_label']['en-us'] = 'Label';
 		$text['label-device_label']['pt-pt'] = '';
+		$text['label-device_label']['fr-fr'] = 'Label';
 
 		$text['description-device_label']['en-us'] = 'Enter the device label.';
 		$text['description-device_label']['pt-pt'] = '';
+		$text['description-device_label']['fr-fr'] = "";
 
 		$text['label-device_vendor']['en-us'] = 'Vendor';
 		$text['label-device_vendor']['pt-pt'] = '';
+		$text['label-device_vendor']['fr-fr'] = 'Fabriquant';
 
 		$text['description-device_vendor']['en-us'] = 'Enter the venodr name.';
 		$text['description-device_vendor']['pt-pt'] = '';
+		$text['description-device_vendor']['fr-fr'] = "Entrer le nom du Fabriquant";
 
 		$text['label-device_model']['en-us'] = 'Model';
 		$text['label-device_model']['pt-pt'] = '';
+		$text['label-device_model']['fr-fr'] = 'Modèle';
 
 		$text['description-device_model']['en-us'] = 'Enter the model name or number.';
 		$text['description-device_model']['pt-pt'] = '';
+		$text['description-device_model']['fr-fr'] = 'Entrer le nom ou le numéro du modèle';
 
 		$text['label-device_firmware_version']['en-us'] = 'Firmware Version';
 		$text['label-device_firmware_version']['pt-pt'] = '';
+		$text['label-device_firmware_version']['fr-fr'] = 'Version Firmware';
 
 		$text['description-device_firmware_version']['en-us'] = 'Enter the firmware version.';
 		$text['description-device_firmware_version']['pt-pt'] = '';
+		$text['description-device_firmware_version']['fr-fr'] = 'Entrer la version du firmware.';
 
 		$text['label-device_provision_enable']['en-us'] = 'Enabled';
 		$text['label-device_provision_enable']['pt-pt'] = '';
+		$text['label-device_provision_enable']['fr-fr'] = 'Actif';
 
 		$text['description-device_provision_enable']['en-us'] = 'Enable or disable provisioning for this device.';
 		$text['description-device_provision_enable']['pt-pt'] = '';
+		$text['description-device_provision_enable']['fr-fr'] = '';
 
 		$text['label-device_template']['en-us'] = 'Template';
 		$text['label-device_template']['pt-pt'] = '';
+		$text['label-device_template']['fr-fr'] = 'Template';
 
 		$text['description-device_template']['en-us'] = 'Select a template.';
 		$text['description-device_template']['pt-pt'] = '';
+		$text['description-device_template']['fr-fr'] = '';
 
 		$text['label-lines']['en-us'] = 'Lines';
 		$text['label-lines']['pt-pt'] = '';
+		$text['label-lines']['fr-fr'] = 'Lignes';
 
 		$text['label-line']['en-us'] = 'Line';
 		$text['label-line']['pt-pt'] = '';
+		$text['label-line']['fr-fr'] = 'Ligne';
 
 		$text['label-line_number']['en-us'] = 'Line Number';
 		$text['label-line_number']['pt-pt'] = '';
+		$text['label-line_number']['fr-fr'] = 'Nombre de Lignes';
 
 		$text['description-line_number']['en-us'] = 'Select a line number.';
 		$text['description-line_number']['pt-pt'] = '';
+		$text['description-line_number']['fr-fr'] = "Choisir un numéro de ligne.";
 
 		$text['label-server_address']['en-us'] = 'Server Address';
 		$text['label-server_address']['pt-pt'] = '';
+		$text['label-server_address']['fr-fr'] = 'Adresse du Serveur';
 
 		$text['description-server_address']['en-us'] = 'Select a server address.';
 		$text['description-server_address']['pt-pt'] = '';
-
-		$text['label-server_address']['en-us'] = 'Server Address';
-		$text['label-server_address']['pt-pt'] = '';
-
-		$text['description-server_address']['en-us'] = 'Select a server address.';
-		$text['description-server_address']['pt-pt'] = '';
+		$text['description-server_address']['fr-fr'] = '';
 
 		$text['label-outbound_proxy']['en-us'] = 'Outbound Proxy';
 		$text['label-outbound_proxy']['pt-pt'] = '';
+		$text['label-outbound_proxy']['fr-fr'] = 'Proxy Sortant';
 
 		$text['description-outbound_proxy']['en-us'] = 'Enter the outbound proxy.';
 		$text['description-outbound_proxy']['pt-pt'] = '';
+		$text['description-outbound_proxy']['fr-fr'] = '';
 
 		$text['label-display_name']['en-us'] = 'Display Name';
 		$text['label-display_name']['pt-pt'] = '';
+		$text['label-display_name']['fr-fr'] = 'Nom affiché';
 
 		$text['description-display_name']['en-us'] = 'Enter the display name.';
 		$text['description-display_name']['pt-pt'] = '';
+		$text['description-display_name']['fr-fr'] = '';
 
 		$text['label-user_id']['en-us'] = 'User ID';
 		$text['label-user_id']['pt-pt'] = '';
+		$text['label-user_id']['fr-fr'] = 'Usager ID';
 
 		$text['description-user_id']['en-us'] = 'Enter the user ID.';
 		$text['description-user_id']['pt-pt'] = '';
+		$text['description-user_id']['fr-fr'] = '';
 
 		$text['label-auth_id']['en-us'] = 'Auth ID';
 		$text['label-auth_id']['pt-pt'] = '';
+		$text['label-auth_id']['fr-fr'] = 'Auth ID';
 
 		$text['description-auth_id']['en-us'] = 'Enter the auth ID.';
 		$text['description-auth_id']['pt-pt'] = '';
+		$text['description-auth_id']['fr-fr'] = '';
 
 		$text['label-password']['en-us'] = 'Password';
 		$text['label-password']['pt-pt'] = '';
+		$text['label-password']['fr-fr'] = 'Mot de Passe';
 
 		$text['description-password']['en-us'] = 'Enter the password.';
 		$text['description-password']['pt-pt'] = '';
+		$text['description-password']['fr-fr'] = '';
 
 		//$text['label-device_username']['en-us'] = 'Username';
 		//$text['label-device_username']['pt-pt'] = '';
+		//$text['label-device_username']['fr-fr'] = '';
 
 		//$text['description-device_username']['en-us'] = 'Username';
 		//$text['description-device_username']['pt-pt'] = '';
+		//$text['description-device_username']['fr-fr'] = '';
 
 		//$text['label-device_password']['en-us'] = 'Password';
 		//$text['label-device_password']['pt-pt'] = '';
+		//$text['label-device_password']['fr-fr'] = '';
 
 		//$text['description-device_password']['en-us'] = 'Password';
 		//$text['description-device_password']['pt-pt'] = '';
+		//$text['description-device_password']['fr-fr'] = '';
 
 		$text['label-device_time_zone']['en-us'] = 'Time Zone';
 		$text['label-device_time_zone']['pt-pt'] = '';
+		$text['label-device_time_zone']['fr-fr'] = 'Fuseau Horaire';
 
 		$text['description-device_time_zone']['en-us'] = 'Enter the time zone.';
 		$text['description-device_time_zone']['pt-pt'] = '';
+		$text['description-device_time_zone']['fr-fr'] = '';
 
 		$text['label-device_description']['en-us'] = 'Description';
 		$text['label-device_description']['pt-pt'] = '';
+		$text['label-device_description']['fr-fr'] = 'Description';
 
 		$text['description-device_description']['en-us'] = 'Enter the description.';
 		$text['description-device_description']['pt-pt'] = '';
+		$text['description-device_description']['fr-fr'] = '';
 
 		$text['label-true']['en-us'] = 'true';
 		$text['label-true']['pt-pt'] = '';
+		$text['label-true']['fr-fr'] = 'Oui';
 
 		$text['label-false']['en-us'] = 'false';
 		$text['label-false']['pt-pt'] = 'falso';
+		$text['label-false']['fr-fr'] = 'Non';
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-view']['en-us'] = 'View';
 		$text['button-view']['pt-pt'] = '';
+		$text['button-view']['fr-fr'] = 'Voir';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = 'Voulez-vous vraiment supprimer cela?';
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = 'Ajout Complet';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = 'Mise à Jour Complète';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = 'Suppression Complète';
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplan/app_config.php b/app/dialplan/app_config.php
index e7c1ffa4e0..d3ce104c39 100644
--- a/app/dialplan/app_config.php
+++ b/app/dialplan/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'The dialplan is used to setup call destinations based on conditions and context. You can use the dialplan to send calls to gateways, auto attendants, external numbers, to scripts, or any destination.';
 		$apps[$x]['description']['es-mx'] = 'El plan de marcado es usado para configurar los destinos de llamadas basados en condiciones y contexto. Usted puede usar los planes de marcado para enviar hacia pasarelas, IVR, números externos, scripts o cualquier otro destino.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Les dialplans son utilisés pour configurer les destinations d'appels sélon les conditions et context.  Vous pouvez en utiliser pour diriger les appels vers gateways, IVR, nombres éxterieurs ou quelqu'autre déstination.";
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Dialplan';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Plan de Marcado';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Dialplan';
@@ -39,11 +39,11 @@
 
 		$apps[$x]['menu'][1]['title']['en-us'] = 'Dialplan Manager';
 		$apps[$x]['menu'][1]['title']['es-mx'] = 'Administrador de Planes de Marcado';
-		$apps[$x]['menu'][1]['title']['de-de'] = '';
+		$apps[$x]['menu'][1]['title']['de'] = '';
 		$apps[$x]['menu'][1]['title']['de-ch'] = '';
 		$apps[$x]['menu'][1]['title']['de-at'] = '';
 		$apps[$x]['menu'][1]['title']['fr-fr'] = 'Gestion du Dialplan';
-		$apps[$x]['menu'][1]['title']['fr-ca'] = 'Administrateur de Dialplan';
+		$apps[$x]['menu'][1]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][1]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][1]['title']['pt-pt'] = 'Gestor de Dialplan';
 		$apps[$x]['menu'][1]['title']['pt-br'] = '';
@@ -55,42 +55,24 @@
 		$apps[$x]['menu'][1]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = 'b94e8bd9-9eb5-e427-9c26-ff7a6c21552a';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_advanced_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '52929fee-81d3-4d94-50b7-64842d9393c2';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_advanced_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_detail_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_detail_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_detail_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'dialplan_detail_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['name'] = 'dialplan_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'dialplan_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'dialplan_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'dialplan_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][4]['name'] = 'dialplan_advanced_view';
+		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][5]['name'] = 'dialplan_advanced_edit';
+		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -202,4 +184,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplan/app_languages.php b/app/dialplan/app_languages.php
index d6b28b157a..e6775f7e8c 100644
--- a/app/dialplan/app_languages.php
+++ b/app/dialplan/app_languages.php
@@ -1,112 +1,209 @@
 <?php
 
 	//Dialplan
+
 		$text['title-dialplan_manager']['en-us'] = 'Dialplan Manager';
+		$text['title-dialplan_manager']['fr-fr'] = 'Gestion du plan de numérotation';
 		$text['title-inbound_routes']['en-us'] = 'Inbound Routes';
+		$text['title-inbound_routes']['fr-fr'] = 'Routes Entrantes';
 		$text['title-outbound_routes']['en-us'] = 'Outbound Routes';
+		$text['title-outbound_routes']['fr-fr'] = 'Routes Sortantes';
 		$text['title-time_conditions']['en-us'] = 'Time Conditions';
+		$text['title-time_conditions']['fr-fr'] = 'Conditions Temporelles';
 		$text['title-dialplan_add']['en-us'] = 'Dialplan Add';
+		$text['title-dialplan_add']['fr-fr'] = 'Ajout au plan de num';
 		$text['title-dialplan_edit']['en-us'] = 'Dialplan Edit';
+		$text['title-dialplan_edit']['fr-fr'] = 'Edition du plan de num';
 		$text['title-dialplan_detail']['en-us'] = 'Dialplan Detail';
+		$text['title-dialplan_detail']['fr-fr'] = 'Détail du plan de num';
 		$text['title-default_dialplan']['en-us'] = 'Default Dialplan';
-		$text['title-queues']['en-us'] = 'Queues';
+		$text['title-default_dialplan']['fr-fr'] = 'Plan de num par Défaut';
 
 		$text['header-dialplan_manager']['en-us'] = 'Dialplan Manager';
+		$text['header-dialplan_manager']['fr-fr'] = 'Gestion du plan de numérotation';
 		$text['header-inbound_routes']['en-us'] = 'Inbound Routes';
+		$text['header-inbound_routes']['fr-fr'] = 'Routes Entrantes';
 		$text['header-outbound_routes']['en-us'] = 'Outbound Routes';
+		$text['header-outbound_routes']['fr-fr'] = 'Routes Sortantes';
 		$text['header-time_conditions']['en-us'] = 'Time Conditions';
+		$text['header-time_conditions']['fr-fr'] = 'Conditions Temporelles';
 		$text['header-dialplan-add']['en-us'] = 'Dialplan Add';
+		$text['header-dialplan-add']['fr-fr'] = 'Ajout au plan de num';
 		$text['header-dialplan-edit']['en-us'] = 'Dialplan Edit';
+		$text['header-dialplan-edit']['fr-fr'] = 'Edition du plan de num';
 		$text['header-conditions_and_actions']['en-us'] = 'Conditions and Actions';
+		$text['header-conditions_and_actions']['fr-fr'] = 'Conditions et Actions';
 		$text['header-dialplan_detail']['en-us'] = 'Dialplan Detail';
+		$text['header-dialplan_detail']['fr-fr'] = 'Détail du plan de num';
 		$text['header-default_dialplan']['en-us'] = 'Default Dialplan';
-		$text['header-queues']['en-us'] = 'Queues';
+		$text['header-default_dialplan']['fr-fr'] = 'Plan de num par Défaut';
+
+
 
 		$text['description-dialplan_manager']['en-us'] = 'The dialplan provides a view of some of the feature codes, as well as the IVR Menu, Conferences, Queues and other destinations.';
+		$text['description-dialplan_manager']['fr-fr'] = "Le plan de numérotation donne une vue des services, menus SVI, Conférences, Files d'attente et tout autre destination.";
 		$text['description-dialplan_manager-superadmin']['en-us'] = 'The dialplan is used to setup call destinations based on conditions and context. You can use the dialplan to send calls to gateways, auto attendants, external numbers, to scripts, or any destination.';
+		$text['description-dialplan_manager-superadmin']['fr-fr'] = 'Le plan de numérotation sert à sélectionner des destinations en fonction de différentes conditions et contextes. Le plan de numérotation est utilisé pour acheminer les appels aux passerelles, opératrices auto, numéros externes, scripts ou tout autre destination.';
 		$text['description-inbound_routes']['en-us'] = 'Route incoming calls to destinations based on one or more conditions. It can send incoming calls to an IVR Menu, Call Group, Extension, External Number, Script. Order is important when an anti-action is used or when there are multiple conditions that match.';
+		$text['description-inbound_routes']['fr-fr'] = "Acheminer les appels entrants en fonction d'une ou plusieures conditions. Ces appels peuvent être acheminés à un menu SVI, un groupe d'appel, une extension, un numéro externe, un script. L'ordre est important quand une anti-action est utilisée ou que plusieures conditions sont remplies.";
 		$text['description-outbound_routes']['en-us'] = 'Route outbound calls to gateways, tdm, enum and more. When a call matches the conditions the call to outbound routes.';
+		$text['description-outbound_routes']['fr-fr'] = "Acheminer les appels sortant sur une passerelle, RTC, enum ou autre. Lorsqu'un appel rempli les conditions, l'appel utilise la route sortante.";
 		$text['description-time_conditions']['en-us'] = 'Time conditions route calls based on time conditions. You can use time conditions to send calls to an IVR Menu, External numbers, Scripts, or other destinations.';
+		$text['description-time_conditions']['fr-fr'] = "Achemine les appels en fonction des Conditions Temporelles tels que la date, la jour de la semaine, l'heure, minutes... Ces appels peuvent être acheminés à un menu SVI, un numéro externe, un script ou tout autre numéro.";
 		$text['description-dialplan-edit']['en-us'] = 'Dialplan include general settings.';
+		$text['description-dialplan-edit']['fr-fr'] = "Le Plan de numérotation incluant les configurations générales.";
 		$text['description-conditions_and_actions']['en-us'] = 'The following conditions, actions and anti-actions are used in the dialplan to direct call flow. Each is processed in order that it is given. Use as many conditions, actions or anti-actions as needed.';
+		$text['description-conditions_and_actions']['fr-fr'] = "Les conditions suivantes, actions et anti-actions sont utilisées dans le dialplan pour acheminer les appels. Elles sont traitées dans l'ordre donné. Utiliser autant de conditions, actions ou anti-actions que nécessaire.";
 		$text['description-default_dialplan']['en-us'] = 'The default dialplan is used to setup call destinations based on conditions and context. You can use the dialplan to send calls to gateways, auto attendants, external numbers, to scripts, or any destination.';
-		$text['description-queues']['en-us'] = 'Queues are used to setup waiting lines for callers. Also known as FIFO Queues.';
+		$text['description-default_dialplan']['fr-fr'] = "Le plan de numérotation par défaut est utilisé pour configurer les destinations en fonction de conditions et du contexte. Le plan de numérotation ser à acheminer les appels aux passerelles, opératrices auto, numéros externes, script, ou tout autre destination.";
 
 		$text['label-name']['en-us'] = 'Name';
+		$text['label-name']['fr-fr'] = 'Nom';
 		$text['label-condition_1']['en-us'] = 'Condition 1';
+		$text['label-condition_1']['fr-fr'] = 'Condition 1';
 		$text['label-condition_2']['en-us'] = 'Condition 2';
+		$text['label-condition_2']['fr-fr'] = 'Condition 2';
 		$text['label-field']['en-us'] = 'Field';
+		$text['label-field']['fr-fr'] = 'Champs';
 		$text['label-expression']['en-us'] = 'Expression';
+		$text['label-expression']['fr-fr'] = 'Expression';
 		$text['label-action_1']['en-us'] = 'Action 1';
+		$text['label-action_1']['fr-fr'] = 'Action 1';
 		$text['label-action_2']['en-us'] = 'Action 2';
+		$text['label-action_2']['fr-fr'] = 'Action 2';
 		$text['label-number']['en-us'] = 'Number';
+		$text['label-number']['fr-fr'] = 'Numéro';
 		$text['label-context']['en-us'] = 'Context';
+		$text['label-context']['fr-fr'] = 'Contexte';
 		$text['label-continue']['en-us'] = 'Continue';
+		$text['label-continue']['fr-fr'] = 'Continue';
 		$text['label-order']['en-us'] = 'Order';
+		$text['label-order']['fr-fr'] = 'Ordre';
 		$text['label-enabled']['en-us'] = 'Enabled';
+		$text['label-enabled']['fr-fr'] = 'Activé';
 		$text['label-description']['en-us'] = 'Description';
+		$text['label-description']['fr-fr'] = 'Description';
 		$text['label-tag']['en-us'] = 'Tag';
+		$text['label-tag']['fr-fr'] = 'Tag';
 		$text['label-type']['en-us'] = 'Type';
+		$text['label-type']['fr-fr'] = 'Type';
 		$text['label-data']['en-us'] = 'Data';
+		$text['label-data']['fr-fr'] = 'Donnée';
 		$text['label-group']['en-us'] = 'Group';
+		$text['label-group']['fr-fr'] = 'Groupe';
 		$text['label-break']['en-us'] = 'Break';
+		$text['label-break']['fr-fr'] = 'Pause';
 		$text['label-inline']['en-us'] = 'Inline';
+		$text['label-inline']['fr-fr'] = 'Inline';
 		$text['label-application']['en-us'] = 'Application';
+		$text['label-application']['fr-fr'] = 'Application';
 		$text['label-value']['en-us'] = 'Value';
+		$text['label-value']['fr-fr'] = 'Valeur';
 
 		$text['optgroup-conditions_or_regular_expressions']['en-us'] = 'Conditions or Regular Expressions';
+		$text['optgroup-conditions_or_regular_expressions']['fr-fr'] = "Conditions ou Expressions Régulières";
 		$text['optgroup-applications']['en-us'] = 'Applications';
+		$text['optgroup-applications']['fr-fr'] = 'Applications';
 		$text['option-context']['en-us'] = 'Context';
+		$text['option-context']['fr-fr'] = 'Context';
 		$text['option-username']['en-us'] = 'Username';
+		$text['option-username']['fr-fr'] = 'Username';
 		$text['option-rdnis']['en-us'] = 'RDNIS';
+		$text['option-rdnis']['fr-fr'] = 'RDNIS';
 		$text['option-destination_number']['en-us'] = 'Destination Number';
+		$text['option-destination_number']['fr-fr'] = 'Numéro de Destination';
 		$text['option-dialplan']['en-us'] = 'Dialplan';
+		$text['option-dialplan']['fr-fr'] = 'Plan de Num';
 		$text['option-public']['en-us'] = 'Public';
+		$text['option-public']['fr-fr'] = 'Public';
 		$text['option-caller_id_name']['en-us'] = 'Caller ID Name';
+		$text['option-caller_id_name']['fr-fr'] = 'Caller ID Name';
 		$text['option-caller_id_number']['en-us'] = 'Caller ID Number';
+		$text['option-caller_id_number']['fr-fr'] = 'Caller ID Number';
 		$text['option-ani']['en-us'] = 'ANI';
+		$text['option-ani']['fr-fr'] = 'ANI';
 		$text['option-ani2']['en-us'] = 'ANI2';
+		$text['option-ani2']['fr-fr'] = 'ANI2';
 		$text['option-uuid']['en-us'] = 'UUID';
+		$text['option-uuid']['fr-fr'] = 'UUID';
 		$text['option-source']['en-us'] = 'Source';
+		$text['option-source']['fr-fr'] = 'Source';
 		$text['option-chan_name']['en-us'] = 'Channel Name';
+		$text['option-chan_name']['fr-fr'] = 'Nom du Canal';
 		$text['option-network_addr']['en-us'] = 'Network Address';
+		$text['option-network_addr']['fr-fr'] = 'Adresse Réseau';
 		$text['option-hour']['en-us'] = 'Hour';
+		$text['option-hour']['fr-fr'] = 'Heure';
 		$text['option-minute']['en-us'] = 'Minute';
+		$text['option-minute']['fr-fr'] = 'Minute';
 		$text['option-minute_of_day']['en-us'] = 'Minute of Day';
+		$text['option-minute_of_day']['fr-fr'] = 'Minute de la journée';
 		$text['option-day_of_month']['en-us'] = 'Day of Month';
+		$text['option-day_of_month']['fr-fr'] = 'Jour du Mois';
 		$text['option-week_of_month']['en-us'] = 'Week of Month';
+		$text['option-week_of_month']['fr-fr'] = 'Semaine du Mois';
 		$text['option-month']['en-us'] = 'Month';
+		$text['option-month']['fr-fr'] = 'Mois';
 		$text['option-day_of_year']['en-us'] = 'Day of Year';
+		$text['option-day_of_year']['fr-fr'] = "Jour de l'année";
 		$text['option-year']['en-us'] = 'Year';
+		$text['option-year']['fr-fr'] = 'Année';
 		$text['option-day_of_week']['en-us'] = 'Day of Week';
+		$text['option-day_of_week']['fr-fr'] = 'Jour de la Semaine';
 		$text['option-week']['en-us'] = 'Week';
+		$text['option-week']['fr-fr'] = 'Semaine';
 		$text['option-true']['en-us'] = 'True';
+		$text['option-true']['fr-fr'] = 'Oui';
 		$text['option-false']['en-us'] = 'False';
+		$text['option-false']['fr-fr'] = 'Non';
 		$text['option-condition']['en-us'] = 'Condition';
+		$text['option-condition']['fr-fr'] = 'Condition';
 		$text['option-action']['en-us'] = 'Action';
+		$text['option-action']['fr-fr'] = 'Action';
 		$text['option-anti-action']['en-us'] = 'Anti-Action';
+		$text['option-anti-action']['fr-fr'] = 'Anti-Action';
 		$text['option-regex']['en-us'] = 'Regular Expression';
+		$text['option-regex']['fr-fr'] = 'Expression Régulière';
 		$text['option-on_true']['en-us'] = 'On True';
+		$text['option-on_true']['fr-fr'] = 'On True';
 		$text['option-on_false']['en-us'] = 'On False';
+		$text['option-on_false']['fr-fr'] = 'On False';
 		$text['option-always']['en-us'] = 'Always';
+		$text['option-always']['fr-fr'] = 'Toujours';
 		$text['option-never']['en-us'] = 'Never';
+		$text['option-never']['fr-fr'] = 'Jamais';
 
 		$text['button-add']['en-us'] = 'Add';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 		$text['button-edit']['en-us'] = 'Edit';
+		$text['button-edit']['fr-fr'] = 'Editer';
 		$text['button-delete']['en-us'] = 'Delete';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 		$text['button-advanced']['en-us'] = 'Advanced';
+		$text['button-advanced']['fr-fr'] = 'Avancé';
 		$text['button-back']['en-us'] = 'Back';
+		$text['button-back']['fr-fr'] = 'Retour';
 		$text['button-copy']['en-us'] = 'Copy';
+		$text['button-copy']['fr-fr'] = 'Copier';
 		$text['button-save']['en-us'] = 'Save';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 		$text['button-restore']['en-us'] = 'Restore Default';
+		$text['button-restore']['fr-fr'] = 'Restaurer conf par défaut';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 		$text['confirm-copy']['en-us'] = 'Do you really want to copy this?';
+		$text['confirm-copy']['fr-fr'] = "Voulez-vous vraiment copier cela?";
 
 		$text['message-add']['en-us'] = 'Add Completed';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 		$text['message-update']['en-us'] = 'Update Completed';
+		$text['message-update']['fr-fr'] = 'Mis à jour';
 		$text['message-delete']['en-us'] = 'Delete Completed';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 		$text['message-copy']['en-us'] = 'Copy Completed';
+		$text['message-copy']['fr-fr'] = 'Copié';
 		$text['message-required']['en-us'] = 'Please provide: ';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplan_features/app_config.php b/app/dialplan_features/app_config.php
index ef2e7fcd0d..f8161d638c 100644
--- a/app/dialplan_features/app_config.php
+++ b/app/dialplan_features/app_config.php
@@ -9,13 +9,13 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Provides dialplan context features including in call transfer and attended transfer and more.';
 		$apps[$x]['description']['es-mx'] = 'Provee opciones bajo contexto a los planes de marcado, incluyendo transferencia, espera y más.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Donne des options aux dialplans comme le transfert, transfert supervisé et plus.";
-		$apps[$x]['description']['fr-ca'] = "Il donne quelqu'options aux dialplans comme transfer, appel en attend et plus.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Fornece recursos contexto dialplan inclusive em transferência de chamadas e transferência atendidos e mais.';
 		$apps[$x]['description']['pt-br'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplan_inbound/app_config.php b/app/dialplan_inbound/app_config.php
index 2a7d7daf74..750d49ec95 100644
--- a/app/dialplan_inbound/app_config.php
+++ b/app/dialplan_inbound/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'The public dialplan is used to route incoming calls to destinations based on one or more conditions and context.';
 		$apps[$x]['description']['es-mx'] = 'El plan de marcado público es usado para dirigir llamadas entrantes a destinos basados en una o más condiciones y contexto.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Les dialplans publiques sont utilisés pour diriger les appels entrants en fonction d'une ou plusieurs conditions et context.";
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Inbound Routes';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Rutas de entrada';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "Itinéraire d'entrée";
@@ -38,7 +38,6 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'inbound_route_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = 'b64b2bbf-f99b-b568-13dc-32170515a687';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
@@ -59,4 +58,4 @@
 		$apps[$x]['permissions'][$y]['name'] = 'inbound_route_copy';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplan_inbound/app_languages.php b/app/dialplan_inbound/app_languages.php
index a67ca49706..e9324c0196 100644
--- a/app/dialplan_inbound/app_languages.php
+++ b/app/dialplan_inbound/app_languages.php
@@ -3,182 +3,182 @@
 // main
 	$text['title-dialplan-inbound-add']['en-us'] = 'Inbound Call Routing';
 	$text['title-dialplan-inbound-add']['pt-pt'] = '';
-	$text['title-dialplan-inbound-add']['fr'] = "Routage des appels entrant";
+	$text['title-dialplan-inbound-add']['fr-fr'] = "Routage des appels entrant";
 
 	$text['description-dialplan-inbound-add']['en-us'] = 'The public dialplan is used to route incoming calls to destinations based on one or more conditions and context. It can send incoming calls to an auto attendant, huntgroup, extension, external number, or a script.';
 	$text['description-dialplan-inbound-add']['pt-pt'] = '';
-	$text['description-dialplan-inbound-add']['fr'] = "Le plan de numérotation publique est utilisé pour acheminer les appels aux destinations en se basant sur une ou plusieurs conditions ou contextes. Les appels peuvent être acheminé au opératrices auto, groupements, extensions, numéro externe ou script.";
+	$text['description-dialplan-inbound-add']['fr-fr'] = "Le plan de numérotation publique est utilisé pour acheminer les appels aux destinations en se basant sur une ou plusieurs conditions ou contextes. Les appels peuvent être acheminé au opératrices auto, groupements, extensions, numéro externe ou script.";
 
 	$text['label-access-denied']['en-us'] = 'access denied';
 	$text['label-access-denied']['pt-pt'] = '';
-	$text['label-access-denied']['fr'] = "accès refusé";
+	$text['label-access-denied']['fr-fr'] = "accès refusé";
 
 	$text['button-back']['en-us'] = 'Back';
 	$text['button-back']['pt-pt'] = '';
-	$text['button-back']['fr'] = "Retour";
+	$text['button-back']['fr-fr'] = "Retour";
 
 // basic
 	$text['button-basic']['en-us'] = 'Basic';
 	$text['button-basic']['pt-pt'] = '';
-	$text['button-basic']['fr'] = "Basique";
+	$text['button-basic']['fr-fr'] = "Basique";
 
 	$text['label-name']['en-us'] = 'Name';
 	$text['label-name']['pt-pt'] = '';
-	$text['label-name']['fr'] = "Nom";
+	$text['label-name']['fr-fr'] = "Nom";
 
 	$text['description-name']['en-us'] = 'Please enter an inbound route name.';
 	$text['description-name']['pt-pt'] = '';
-	$text['description-name']['fr'] = "Merci d'entrer le nom d'une route entrante";
+	$text['description-name']['fr-fr'] = "Merci d'entrer le nom d'une route entrante";
 
 	$text['label-destination-number']['en-us'] = 'Destination Number';
 	$text['label-destination-number']['pt-pt'] = '';
-	$text['label-destination-number']['fr'] = "Numéro de Destination";
+	$text['label-destination-number']['fr-fr'] = "Numéro de Destination";
 
 	$text['label-select-inbound-destination-number']['en-us'] = 'Select the inbound destination number.';
 	$text['label-select-inbound-destination-number']['pt-pt'] = '';
-	$text['label-select-inbound-destination-number']['fr'] = "";
+	$text['label-select-inbound-destination-number']['fr-fr'] = "";
 
 	$text['button-add']['en-us'] = 'Add';
 	$text['button-add']['pt-pt'] = '';
-	$text['button-add']['fr'] = "Ajouter";
+	$text['button-add']['fr-fr'] = "Ajouter";
 
 	$text['label-action']['en-us'] = 'Action';
 	$text['label-action']['pt-pt'] = '';
-	$text['label-action']['fr'] = "Action";
+	$text['label-action']['fr-fr'] = "Action";
 
 	$text['label-limit']['en-us'] = 'Limit';
 	$text['label-limit']['pt-pt'] = '';
-	$text['label-limit']['fr'] = "Limite";
+	$text['label-limit']['fr-fr'] = "Limite";
 
 	$text['label-order']['en-us'] = 'Order';
 	$text['label-order']['pt-pt'] = '';
-	$text['label-order']['fr'] = "Ordre";
+	$text['label-order']['fr-fr'] = "Ordre";
 
 	$text['label-enabled']['en-us'] = 'Enabled';
 	$text['label-enabled']['pt-pt'] = '';
-	$text['label-enabled']['fr'] = "Actif";
+	$text['label-enabled']['fr-fr'] = "Actif";
 
 	$text['label-true']['en-us'] = 'True';
 	$text['label-true']['pt-pt'] = '';
-	$text['label-true']['fr'] = "Oui";
+	$text['label-true']['fr-fr'] = "Oui";
 
 	$text['label-false']['en-us'] = 'False';
 	$text['label-false']['pt-pt'] = '';
-	$text['label-false']['fr'] = "Non";
+	$text['label-false']['fr-fr'] = "Non";
 
 	$text['label-description']['en-us'] = 'Description';
 	$text['label-description']['pt-pt'] = '';
-	$text['label-description']['fr'] = "Description";
+	$text['label-description']['fr-fr'] = "Description";
 
 
 // advanced
 	$text['button-advanced']['en-us'] = 'Advanced';
 	$text['button-advanced']['pt-pt'] = '';
-	$text['button-advanced']['fr'] = "Avancé";
+	$text['button-advanced']['fr-fr'] = "Avancé";
 
 	$text['label-condition_1']['en-us'] = 'Condition 1';
 	$text['label-condition_1']['pt-pt'] = '';
-	$text['label-condition_1']['fr'] = "Condition 1";
+	$text['label-condition_1']['fr-fr'] = "Condition 1";
 
 	$text['label-condition_2']['en-us'] = 'Condition 2';
 	$text['label-condition_2']['pt-pt'] = '';
-	$text['label-condition_2']['fr'] = "Condition 2";
+	$text['label-condition_2']['fr-fr'] = "Condition 2";
 
 	$text['label-action_1']['en-us'] = 'Action 1';
 	$text['label-action_1']['pt-pt'] = '';
-	$text['label-action_1']['fr'] = "Action 1";
+	$text['label-action_1']['fr-fr'] = "Action 1";
 
 	$text['label-action_2']['en-us'] = 'Action 2';
 	$text['label-action_2']['pt-pt'] = '';
-	$text['label-action_2']['fr'] = "Action 2";
+	$text['label-action_2']['fr-fr'] = "Action 2";
 
 	$text['label-field']['en-us'] = 'Field';
 	$text['label-field']['pt-pt'] = '';
-	$text['label-field']['fr'] = "Champs";
+	$text['label-field']['fr-fr'] = "Champs";
 
 	$text['label-expression']['en-us'] = 'Expression';
 	$text['label-expression']['pt-pt'] = '';
-	$text['label-expression']['fr'] = "Expression";
+	$text['label-expression']['fr-fr'] = "Expression";
 
 	$text['option-context']['en-us'] = 'Context';
 	$text['option-context']['pt-pt'] = '';
-	$text['option-context']['fr'] = "Contexte";
+	$text['option-context']['fr-fr'] = "Contexte";
 
 	$text['option-username']['en-us'] = 'Username';
 	$text['option-username']['pt-pt'] = '';
-	$text['option-username']['fr'] = "Utilisateur";
+	$text['option-username']['fr-fr'] = "Utilisateur";
 
 	$text['option-rdnis']['en-us'] = 'RDNIS';
 	$text['option-rdnis']['pt-pt'] = '';
-	$text['option-rdnis']['fr'] = "RDNIS";
+	$text['option-rdnis']['fr-fr'] = "RDNIS";
 
 	$text['option-destination_number']['en-us'] = 'Destination Number';
 	$text['option-destination_number']['pt-pt'] = '';
-	$text['option-destination_number']['fr'] = "Numéro de Destination";
+	$text['option-destination_number']['fr-fr'] = "Numéro de Destination";
 
 	$text['option-public']['en-us'] = 'Public';
 	$text['option-public']['pt-pt'] = '';
-	$text['option-public']['fr'] = "";
+	$text['option-public']['fr-fr'] = "";
 
 	$text['option-caller_id_name']['en-us'] = 'Caller ID Name';
 	$text['option-caller_id_name']['pt-pt'] = '';
-	$text['option-caller_id_name']['fr'] = "Nom d'appelant";
+	$text['option-caller_id_name']['fr-fr'] = "Nom d'appelant";
 
 	$text['option-caller_id_number']['en-us'] = 'Caller ID Number';
 	$text['option-caller_id_number']['pt-pt'] = '';
-	$text['option-caller_id_number']['fr'] = "Numéro d'appelant";
+	$text['option-caller_id_number']['fr-fr'] = "Numéro d'appelant";
 
 	$text['option-ani']['en-us'] = 'ANI';
 	$text['option-ani']['pt-pt'] = '';
-	$text['option-ani']['fr'] = "ANI";
+	$text['option-ani']['fr-fr'] = "ANI";
 
 	$text['option-ani2']['en-us'] = 'ANI2';
 	$text['option-ani2']['pt-pt'] = '';
-	$text['option-ani2']['fr'] = "ANI2";
+	$text['option-ani2']['fr-fr'] = "ANI2";
 
 	$text['option-uuid']['en-us'] = 'UUID';
 	$text['option-uuid']['pt-pt'] = '';
-	$text['option-uuid']['fr'] = "UUID";
+	$text['option-uuid']['fr-fr'] = "UUID";
 
 	$text['option-source']['en-us'] = 'Source';
 	$text['option-source']['pt-pt'] = '';
-	$text['option-source']['fr'] = "Source";
+	$text['option-source']['fr-fr'] = "Source";
 
 	$text['option-chan_name']['en-us'] = 'Channel Name';
 	$text['option-chan_name']['pt-pt'] = '';
-	$text['option-chan_name']['fr'] = "Nom de canal";
+	$text['option-chan_name']['fr-fr'] = "Nom de canal";
 
 	$text['option-network_addr']['en-us'] = 'Network Address';
 	$text['option-network_addr']['pt-pt'] = '';
-	$text['option-network_addr']['fr'] = "Adresse Réseau";
+	$text['option-network_addr']['fr-fr'] = "Adresse Réseau";
 
 // general
 	$text['button-save']['en-us'] = 'Save';
 	$text['button-save']['pt-pt'] = '';
-	$text['button-save']['fr'] = "Sauvegarde";
+	$text['button-save']['fr-fr'] = "Sauvegarde";
 
 	$text['label-required-domain_uuid']['en-us'] = 'Please provide: domain_uuid';
 	$text['label-required-domain_uuid']['pt-pt'] = '';
-	$text['label-required-domain_uuid']['fr'] = "Merci d'indiquer: domain_uuid";
+	$text['label-required-domain_uuid']['fr-fr'] = "Merci d'indiquer: domain_uuid";
 
 	$text['label-required-dialplan_name']['en-us'] = 'Please provide: Extension Name';
 	$text['label-required-dialplan_name']['pt-pt'] = '';
-	$text['label-required-dialplan_name']['fr'] = "Merci d'indiquer: Nom d'extension";
+	$text['label-required-dialplan_name']['fr-fr'] = "Merci d'indiquer: Nom d'extension";
 
 	$text['label-required-condition_field_1']['en-us'] = 'Please provide: Condition Field';
 	$text['label-required-condition_field_1']['pt-pt'] = '';
-	$text['label-required-condition_field_1']['fr'] = "Merci d'indiquer: Champs Condition";
+	$text['label-required-condition_field_1']['fr-fr'] = "Merci d'indiquer: Champs Condition";
 
 	$text['label-required-condition_expression_1']['en-us'] = 'Please provide: Condition Expression';
 	$text['label-required-condition_expression_1']['pt-pt'] = '';
-	$text['label-required-condition_expression_1']['fr'] = "Merci d'indiquer: Expression Condition";
+	$text['label-required-condition_expression_1']['fr-fr'] = "Merci d'indiquer: Expression Condition";
 
 	$text['label-required-action_application_1']['en-us'] = 'Please provide: Action Application';
 	$text['label-required-action_application_1']['pt-pt'] = '';
-	$text['label-required-action_application_1']['fr'] = "Merci d'indiquer: Application Action";
+	$text['label-required-action_application_1']['fr-fr'] = "Merci d'indiquer: Application Action";
 
 	$text['confirm-update-complete']['en-us'] = 'Update Complete';
 	$text['confirm-update-complete']['pt-pt'] = '';
-	$text['confirm-update-complete']['fr'] = "Mis à jour";
+	$text['confirm-update-complete']['fr-fr'] = "Mis à jour";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplan_outbound/app_config.php b/app/dialplan_outbound/app_config.php
index 4a2cc5cd49..77fffcf6f3 100644
--- a/app/dialplan_outbound/app_config.php
+++ b/app/dialplan_outbound/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Outbound dialplans have one or more conditions that are matched to attributes of a call. When a call matches the conditions the call is then routed to the gateway.';
 		$apps[$x]['description']['es-mx'] = 'Los planes de marcado de salida tienen una o más condiciones que deben cumplirse.  Cuando las condiciones se cumplen, las llamada es dirigida con la pasarela seleccionada.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Les dialpans sortants attribuent un appel en fonction d'une ou plusieurs conditions. Quand les conditions sont remplies, l'appel est dirigés vers la passarelle séléctionée.";
-		$apps[$x]['description']['fr-ca'] = "Les dialpants sortants ont une ou plus conditions qui devent répondre.  Quand les conditions son tout répondres, l'appel est dirigers vers la passarelle séléctioné.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Dialplans de saída tem uma ou mais condições que são compatíveis com os atributos de uma chamada. Quando uma chamada coincide com as condições da chamada é então encaminhado para o gateway.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Outbound Routes';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Rutas de salida';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Dialplan Sortants';
@@ -37,7 +37,6 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'outbound_route_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = '17e14094-1d57-1106-db2a-a787d34015e9';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
 		$apps[$x]['permissions'][1]['name'] = 'outbound_route_add';
@@ -56,4 +55,4 @@
 		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][5]['description'] = 'Add outbound routes for any gateways on any domain.';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplan_outbound/app_languages.php b/app/dialplan_outbound/app_languages.php
index 226239b9f7..a8a4ef81cb 100644
--- a/app/dialplan_outbound/app_languages.php
+++ b/app/dialplan_outbound/app_languages.php
@@ -27,182 +27,195 @@
 */
 
 	$text['title-dialplan-outbound-add']['en-us'] = 'Outbound Call Routing';
-	$text['title-dialplan-outbound-add']['fr'] = "Routage d'appel sortant";
+	$text['title-dialplan-outbound-add']['fr-fr'] = "Routage d'appel sortant";
 
 	$text['message-provide']['en-us'] = 'Please Provide';
-	$text['message-provide']['fr'] = "Merci d'indiquer";
+	$text['message-provide']['fr-fr'] = "Merci d'indiquer";
 
 	$text['label-gateway-name']['en-us'] = 'Gateway Name';
-	$text['label-gateway-name']['fr'] = "Nom de la passerelle";
+	$text['label-gateway-name']['fr-fr'] = "Nom de la passerelle";
 
 	$text['label-dialplan-expression']['en-us'] = 'Dialplan Expression';
-	$text['label-dialplan-expression']['fr'] = "Expression du Plan de numérotation";
+	$text['label-dialplan-expression']['fr-fr'] = "Expression du Plan de numérotation";
 
 	$text['label-2d']['en-us'] = '2 Digits';
-	$text['label-2d']['fr'] = '2 Digits';
+	$text['label-2d']['fr-fr'] = '2 Digits';
 
 	$text['label-3d']['en-us'] = '3 Digits';
-	$text['label-3d']['fr'] = '3 Digits';
+	$text['label-3d']['fr-fr'] = '3 Digits';
 
 	$text['label-4d']['en-us'] = '4 Digits';
-	$text['label-4d']['fr'] = '4 Digits';
+	$text['label-4d']['fr-fr'] = '4 Digits';
 
 	$text['label-5d']['en-us'] = '5 Digits';
-	$text['label-5d']['fr'] = '5 Digits';
+	$text['label-5d']['fr-fr'] = '5 Digits';
 
 	$text['label-6d']['en-us'] = '6 Digits';
-	$text['label-6d']['fr'] = '6 Digits';
+	$text['label-6d']['fr-fr'] = '6 Digits';
 
 	$text['label-7d']['en-us'] = '7 Digits Local';
-	$text['label-7d']['fr'] = '7 Digits Local';
+	$text['label-7d']['fr-fr'] = '7 Digits Local';
 
 	$text['label-8d']['en-us'] = '8 Digits';
-	$text['label-8d']['fr'] = '8 Digits';
+	$text['label-8d']['fr-fr'] = '8 Digits';
 
 	$text['label-9d']['en-us'] = '9 Digits';
-	$text['label-9d']['fr'] = '9 Digits';
+	$text['label-9d']['fr-fr'] = '9 Digits';
 
 	$text['label-10d']['en-us'] = '10 Digits Long Distance';
-	$text['label-10d']['fr'] = '10 Digits';
+	$text['label-10d']['fr-fr'] = '10 Digits';
 
 	$text['label-11d']['en-us'] = '11 Digits Long Distance';
-	$text['label-11d']['fr'] = '11 Digits';
+	$text['label-11d']['fr-fr'] = '11 Digits';
 
-	$text['label-north-america']['en-us'] = 'North America';
-	$text['label-north-america']['fr'] = 'Amérique du Nord';
+	$text['label-12d']['en-us'] = '12 Digits';
+	$text['label-12d']['fr-fr'] = '12 Digits';
 
-	$text['label-north-america-intl']['en-us'] = 'North America International';
-	$text['label-north-america-intl']['fr'] = 'Amérique du Nord International';
+	$text['label-13d']['en-us'] = '13 Digits';
+	$text['label-13d']['fr-fr'] = '13 Digits';
 
-	$text['label-intl']['en-us'] = 'International';
-	$text['label-intl']['fr'] = 'International';
+	$text['label-14d']['en-us'] = '14 Digits';
+	$text['label-14d']['fr-fr'] = '14 Digits';
+
+	$text['label-int']['en-us'] = '15 Digits International';
+	$text['label-int']['fr-fr'] = '15 Digits';
 
 	$text['label-311']['en-us'] = '311 Information';
-	$text['label-311']['fr'] = '311 Information';
+	$text['label-311']['fr-fr'] = '311 Information';
 
 	$text['label-411']['en-us'] = '411 Information';
-	$text['label-411']['fr'] = '411 Information';
+	$text['label-411']['fr-fr'] = '411 Information';
 
 	$text['label-911']['en-us'] = '911 Emergency';
-	$text['label-911']['fr'] = '911 Emergency';
+	$text['label-911']['fr-fr'] = '911 Emergency';
 
 	$text['label-9d2']['en-us'] = 'Dial 9, then 2 Digits';
-	$text['label-9d2']['fr'] = 'Compose 9, puis 2 Digits';
+	$text['label-9d2']['fr-fr'] = 'Compose 9, puis 2 Digits';
 
 	$text['label-9d3']['en-us'] = 'Dial 9, then 3 Digits';
-	$text['label-9d3']['fr'] = 'Compose 9, puis 3 Digits';
+	$text['label-9d3']['fr-fr'] = 'Compose 9, puis 3 Digits';
 
 	$text['label-9d4']['en-us'] = 'Dial 9, then 4 Digits';
-	$text['label-9d4']['fr'] = 'Compose 9, puis 4 Digits';
+	$text['label-9d4']['fr-fr'] = 'Compose 9, puis 4 Digits';
 
 	$text['label-9d5']['en-us'] = 'Dial 9, then 5 Digits';
-	$text['label-9d5']['fr'] = 'Compose 9, puis 5 Digits';
+	$text['label-9d5']['fr-fr'] = 'Compose 9, puis 5 Digits';
 
 	$text['label-9d6']['en-us'] = 'Dial 9, then 6 Digits';
-	$text['label-9d6']['fr'] = 'Compose 9, puis 6 Digits';
+	$text['label-9d6']['fr-fr'] = 'Compose 9, puis 6 Digits';
 
 	$text['label-9d7']['en-us'] = 'Dial 9, then 7 Digits';
-	$text['label-9d7']['fr'] = 'Compose 9, puis 7 Digits';
+	$text['label-9d7']['fr-fr'] = 'Compose 9, puis 7 Digits';
 
 	$text['label-9d8']['en-us'] = 'Dial 9, then 8 Digits';
-	$text['label-9d8']['fr'] = 'Compose 9, puis 8 Digits';
+	$text['label-9d8']['fr-fr'] = 'Compose 9, puis 8 Digits';
 
 	$text['label-9d9']['en-us'] = 'Dial 9, then 9 Digits';
-	$text['label-9d9']['fr'] = 'Compose 9, puis 9 Digits';
+	$text['label-9d9']['fr-fr'] = 'Compose 9, puis 9 Digits';
 
 	$text['label-9d10']['en-us'] = 'Dial 9, then 10 Digits';
-	$text['label-9d10']['fr'] = 'Compose 9, puis 10 Digits';
+	$text['label-9d10']['fr-fr'] = 'Compose 9, puis 10 Digits';
 
 	$text['label-9d11']['en-us'] = 'Dial 9, then 11 Digits';
-	$text['label-9d11']['fr'] = 'Compose 9, puis 11 Digits';
+	$text['label-9d11']['fr-fr'] = 'Compose 9, puis 11 Digits';
 
-	$text['label-9d.12-20']['en-us'] = 'Dial 9, then International';
-	$text['label-9d.12-20']['fr'] = 'Compose 9, puis International';
+	$text['label-9d12']['en-us'] = 'Dial 9, then 12 Digits';
+	$text['label-9d12']['fr-fr'] = 'Compose 9, puis 12 Digits';
+
+	$text['label-9d13']['en-us'] = 'Dial 9, then 13 Digits';
+	$text['label-9d13']['fr-fr'] = 'Compose 9, puis 13 Digits';
+
+	$text['label-9d14']['en-us'] = 'Dial 9, then 14 Digits';
+	$text['label-9d14']['fr-fr'] = 'Compose 9, puis 14 Digits';
+
+	$text['label-9d15']['en-us'] = 'Dial 9, then International';
+	$text['label-9d15']['fr-fr'] = 'Compose 9, puis International';
 
 	$text['label-800']['en-us'] = 'Toll-Free';
-	$text['label-800']['fr'] = 'Sans Charge';
+	$text['label-800']['fr-fr'] = 'Sans Charge';
 
 	$text['message-update']['en-us'] = 'Update Complete';
-	$text['message-update']['fr'] = "Mis à jour";
+	$text['message-update']['fr-fr'] = "Mis à jour";
 
 	$text['label-outbound-routes']['en-us'] = 'Outbound Routes';
-	$text['label-outbound-routes']['fr'] = 'Routes Sortantes';
+	$text['label-outbound-routes']['fr-fr'] = 'Routes Sortantes';
 
 	$text['button-back']['en-us'] = 'Back';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 
 	$text['description-outbound-routes']['en-us'] = 'Outbound dialplans have one or more conditions that are matched to attributes of a call.  When a call matches the conditions the call is then routed to the gateway.';
-	$text['description-outbound-routes']['fr'] = "les Plan de numérotation sortant doivent remplir une ou plusieures conditions afin d'acheminer un appel. Lorsqu'un appel rempli la ou des conditions, l'appel est alors acheminé à la passerelle.";
+	$text['description-outbound-routes']['fr-fr'] = "les Plan de numérotation sortant doivent remplir une ou plusieures conditions afin d'acheminer un appel. Lorsqu'un appel rempli la ou des conditions, l'appel est alors acheminé à la passerelle.";
 
 	$text['label-gateway']['en-us'] = 'Gateway';
-	$text['label-gateway']['fr'] = 'Passerelle';
+	$text['label-gateway']['fr-fr'] = 'Passerelle';
 
 	$text['label-sip-gateway']['en-us'] = 'SIP Gateways';
-	$text['label-sip-gateway']['fr'] = 'Passerelle SIP';
+	$text['label-sip-gateway']['fr-fr'] = 'Passerelle SIP';
 
 	$text['label-add-options']['en-us'] = 'Additional Options';
-	$text['label-add-options']['fr'] = 'Autres Options';
+	$text['label-add-options']['fr-fr'] = 'Autres Options';
 
 	$text['message-add-options']['en-us'] = 'Select the gateway to use with this outbound route.';
-	$text['message-add-options']['fr'] = "Choisir la passerelle utilisée par cette route sortante.";
+	$text['message-add-options']['fr-fr'] = "Choisir la passerelle utilisée par cette route sortante.";
 
 	$text['label-alt1']['en-us'] = 'Alternate 1';
-	$text['label-alt1']['fr'] = 'Alternative 1';
+	$text['label-alt1']['fr-fr'] = 'Alternative 1';
 
 	$text['message-add-options1']['en-us'] = 'Select another gateway as an alternative to use if the first one fails.';
-	$text['message-add-options1']['fr'] = "Choisir une autre passerelle comme alternative si la première échoue.";
+	$text['message-add-options1']['fr-fr'] = "Choisir une autre passerelle comme alternative si la première échoue.";
 
 	$text['label-alt2']['en-us'] = 'Alternate 2';
-	$text['label-alt2']['fr'] = 'Alternative 2';
+	$text['label-alt2']['fr-fr'] = 'Alternative 2';
 
 	$text['message-add-options2']['en-us'] = 'Select another gateway as an alternative to use if the second one fails.';
-	$text['message-add-options2']['fr'] = "Choisir une autre passerelle comme alternative si la seconde échoue.";
+	$text['message-add-options2']['fr-fr'] = "Choisir une autre passerelle comme alternative si la seconde échoue.";
 
 	$text['description-shortcut']['en-us'] = 'Shortcut to create the outbound dialplan entries for this Gateway.';
-	$text['description-shortcut']['fr'] = "Raccourci pour créer l'entrée de cette passerelle dans le plan de numérotation sortant.";
+	$text['description-shortcut']['fr-fr'] = "Raccourci pour créer l'entrée de cette passerelle dans le plan de numérotation sortant.";
 
 	$text['label-prefix']['en-us'] = 'Prefix';
-	$text['label-prefix']['fr'] = 'Préfixe';
+	$text['label-prefix']['fr-fr'] = 'Préfixe';
 
 	$text['description-enter-prefix']['en-us'] = 'Enter a prefix number to add to the beginning of the destination number.';
-	$text['description-enter-prefix']['fr'] = "Choisir un préfixe à ajouter en début de numérotation pour joindre la destination.";
+	$text['description-enter-prefix']['fr-fr'] = "Choisir un préfixe à ajouter en début de numérotation pour joindre la destination.";
 
 	$text['label-limit']['en-us'] = 'Limit';
-	$text['label-limit']['fr'] = 'Limite';
+	$text['label-limit']['fr-fr'] = 'Limite';
 
 	$text['description-limit']['en-us'] = 'Enter limit to restrict the number of outbound calls.';
-	$text['description-limit']['fr'] = "Choisir une limite afin de limiter le noombre d'appel sortants.";
+	$text['description-limit']['fr-fr'] = "Choisir une limite afin de limiter le noombre d'appel sortants.";
 
 	$text['label-accountcode']['en-us'] = 'Account Code';
+	$text['label-accountcode']['fr-fr'] = 'Centre de Frais';
 
 	$text['description-accountcode']['en-us'] = 'Enter the accountcode.';
+	$text['description-accountcode']['fr-fr'] = '';
 
 	$text['label-order']['en-us'] = 'Order';
-	$text['label-order']['fr'] = 'Ordre';
+	$text['label-order']['fr-fr'] = 'Ordre';
 
 	$text['description-order']['en-us'] = 'Select the order number. The order number determines the order of the outbound routes when there is more than one.';
-	$text['description-order']['fr'] = "Choisir le numéro d'ordre. Ce nombre détermine l'ordre dans le quel cette route sera utilisées si plusieurs routes correspondant aux conditions de l'appel existent.";
+	$text['description-order']['fr-fr'] = "Choisir le numéro d'ordre. Ce nombre détermine l'ordre dans le quel cette route sera utilisées si plusieurs routes correspondant aux conditions de l'appel existent.";
 
 	$text['label-enabled']['en-us'] = 'Enabled';
-	$text['label-enabled']['fr'] = 'Actif';
+	$text['label-enabled']['fr-fr'] = 'Actif';
 
 	$text['label-true']['en-us'] = 'True';
-	$text['label-true']['fr'] = 'Oui';
+	$text['label-true']['fr-fr'] = 'Oui';
 
 	$text['label-false']['en-us'] = 'False';
-	$text['label-false']['fr'] = 'Non';
+	$text['label-false']['fr-fr'] = 'Non';
 
 	$text['description-enabled']['en-us'] = 'Choose to enable or disable the outbound route.';
-	$text['description-enabled']['fr'] = "";
+	$text['description-enabled']['fr-fr'] = "";
 
 	$text['label-description']['en-us'] = 'Description';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 
 	$text['description-description']['en-us'] = 'Enter a description for the outbound route.';
-	$text['description-description']['fr'] = "";
+	$text['description-description']['fr-fr'] = "";
 
 	$text['button-save']['en-us'] = 'Save';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 
-
-?>
\ No newline at end of file
+?>
diff --git a/app/edit/app_config.php b/app/edit/app_config.php
index 01509cae01..9eee368545 100644
--- a/app/edit/app_config.php
+++ b/app/edit/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Script Editor can be used to edit lua, javascript or other scripts.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = '';
+		$apps[$x]['description']['fr-fr'] = "L'éditeur permet d'éditer les scripts lua, javascript ou autres.";
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Editor de script pode ser usado para editar lua, javascript ou outros scripts.';
@@ -22,10 +22,10 @@
 		$y = 0;
 		$apps[$x]['menu'][$y]['title']['en-us'] = 'Script Editor';
 		$apps[$x]['menu'][$y]['title']['es-mx'] = '';
-		$apps[$x]['menu'][$y]['title']['de-de'] = '';
+		$apps[$x]['menu'][$y]['title']['de'] = '';
 		$apps[$x]['menu'][$y]['title']['de-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['de-at'] = '';
-		$apps[$x]['menu'][$y]['title']['fr-fr'] = '';
+		$apps[$x]['menu'][$y]['title']['fr-fr'] = 'Editeur de script';
 		$apps[$x]['menu'][$y]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][$y]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['pt-pt'] = 'Editor de Scripts';
@@ -38,10 +38,10 @@
 		$y++;
 		$apps[$x]['menu'][$y]['title']['en-us'] = 'XML Editor';
 		$apps[$x]['menu'][$y]['title']['es-mx'] = '';
-		$apps[$x]['menu'][$y]['title']['de-de'] = '';
+		$apps[$x]['menu'][$y]['title']['de'] = '';
 		$apps[$x]['menu'][$y]['title']['de-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['de-at'] = '';
-		$apps[$x]['menu'][$y]['title']['fr-fr'] = '';
+		$apps[$x]['menu'][$y]['title']['fr-fr'] = 'Editeur XML';
 		$apps[$x]['menu'][$y]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][$y]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['pt-pt'] = 'Editor XML';
@@ -54,10 +54,10 @@
 		$y++;
 		$apps[$x]['menu'][$y]['title']['en-us'] = 'Provision Editor';
 		$apps[$x]['menu'][$y]['title']['es-mx'] = '';
-		$apps[$x]['menu'][$y]['title']['de-de'] = '';
+		$apps[$x]['menu'][$y]['title']['de'] = '';
 		$apps[$x]['menu'][$y]['title']['de-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['de-at'] = '';
-		$apps[$x]['menu'][$y]['title']['fr-fr'] = '';
+		$apps[$x]['menu'][$y]['title']['fr-fr'] = 'Provisioning';
 		$apps[$x]['menu'][$y]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][$y]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['pt-pt'] = 'Editor de Provisionamento';
@@ -70,10 +70,10 @@
 		$y++;
 		$apps[$x]['menu'][$y]['title']['en-us'] = 'PHP Editor';
 		$apps[$x]['menu'][$y]['title']['es-mx'] = '';
-		$apps[$x]['menu'][$y]['title']['de-de'] = '';
+		$apps[$x]['menu'][$y]['title']['de'] = '';
 		$apps[$x]['menu'][$y]['title']['de-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['de-at'] = '';
-		$apps[$x]['menu'][$y]['title']['fr-fr'] = '';
+		$apps[$x]['menu'][$y]['title']['fr-fr'] = 'Editeur PHP';
 		$apps[$x]['menu'][$y]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][$y]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['pt-pt'] = 'Editor de PHP';
@@ -86,10 +86,10 @@
 		$y++;
 		$apps[$x]['menu'][$y]['title']['en-us'] = 'Grammar Editor';
 		$apps[$x]['menu'][$y]['title']['es-mx'] = 'Editor Gramático';
-		$apps[$x]['menu'][$y]['title']['de-de'] = '';
+		$apps[$x]['menu'][$y]['title']['de'] = '';
 		$apps[$x]['menu'][$y]['title']['de-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['de-at'] = '';
-		$apps[$x]['menu'][$y]['title']['fr-fr'] = "L'éditeur grammairien";
+		$apps[$x]['menu'][$y]['title']['fr-fr'] = "Editeur de Grammaire";
 		$apps[$x]['menu'][$y]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][$y]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][$y]['title']['pt-pt'] = 'Editor Gramático';
@@ -103,53 +103,36 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'script_editor_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = 'f1905fec-0577-daef-6045-59d09b7d3f94';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'script_editor_save';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'provision_editor_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '57773542-a565-1a29-605d-6535da1a0870';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'provision_editor_save';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'xml_editor_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '16013877-606a-2a05-7d6a-c1b215839131';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'xml_editor_save';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'php_editor_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = 'eae1f2d6-789b-807c-cc26-44501e848693';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'php_editor_save';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'grammar_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = 'c3db739e-89f9-0fa2-44ce-0f4c2ff43b1a';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'grammar_save';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'clip_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'clip_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'clip_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'clip_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
diff --git a/app/edit/app_languages.php b/app/edit/app_languages.php
index 212fba75c3..620e1bd1ea 100644
--- a/app/edit/app_languages.php
+++ b/app/edit/app_languages.php
@@ -23,41 +23,77 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 	James Rose <james.o.rose@gmail.com>
+	Philippe Rioual <bhouba@gmail.com>
 */
 	$text['message-add']['en-us'] = 'Add Complete';
+	$text['message-add']['fr-fr'] = 'Ajouté';
 	$text['label-folder']['en-us'] = 'Folder:';
+	$text['label-folder']['fr-fr'] = 'Répertoire:';
 	$text['label-before-selection']['en-us'] = 'Before Selection:';
+	$text['label-before-selection']['fr-fr'] = 'Avant la Selection:';
 	$text['label-after-selection']['en-us'] = 'After Selection:';
+	$text['label-after-selection']['fr-fr'] = 'Après la Selection:';
 	$text['label-notes']['en-us'] = 'Notes:';
+	$text['label-notes']['fr-fr'] = 'Notes:';
 	$text['button-add']['en-us'] = 'Add';
+	$text['button-add']['fr-fr'] = 'Ajouter';
 	$text['message-delete']['en-us'] = 'Delete Complete';
+	$text['message-delete']['fr-fr'] = 'Supprimé';
 	$text['message-give-up']['en-us'] = 'Giving up :( Cannot create an XMLHTTP instance';
+	$text['message-give-up']['fr-fr'] = "Abandon :( Ne peut pas créer un instance XMLHTTP";
 	$text['message-problem']['en-us'] = 'There was a problem with the request.';
+	$text['message-problem']['fr-fr'] = "Il y a une un problème avec la requête.";
 	$text['label-clip-library']['en-us'] = 'Clip Library';
-	$text['button-edit-clip']['en-us'] = 'Edit Clip';
+	$text['label-clip-library']['fr-fr'] = 'Clip Libraries';
+	$text['button-edit-clip']['en-us'] = 'Editer le Clip';
+	$text['button-edit-clip']['fr-fr'] = 'Editer le Clip';
 	$text['button-add-clip']['en-us'] = 'Add Clip';
+	$text['button-add-clip']['fr-fr'] = 'Ajouter un Clip';
 	$text['message-delete-clip']['en-us'] = 'Are you sure you want to delete the selected clip?';
+	$text['message-delete-clip']['fr-fr'] = "Etes-vous sûr de vouloir supprimer le CLIP sélectionné?"; 
 	$text['button-delete']['en-us'] = '  Delete   ';
+	$text['button-delete']['fr-fr'] = '  Supprimé   ';
 	$text['button-close']['en-us'] = '   Close    ';
+	$text['button-close']['fr-fr'] = '   Fermé    ';
 	$text['label-path']['en-us'] = 'Path:';
+	$text['label-path']['fr-fr'] = 'Chemin:';
 	$text['label-file-name']['en-us'] = 'File Name:';
+	$text['label-file-name']['fr-fr'] = 'Nom du Fichier:';
 	$text['button-new-file']['en-us'] = 'New File';
+	$text['button-new-file']['fr-fr'] = 'Nouveau Fichier';
 	$text['label-file-name-orig']['en-us'] = 'Original File Name:';
+	$text['label-file-name-orig']['fr-fr'] = 'Nom du Fichier Original:';
 	$text['label-rename-file-to']['en-us'] = 'Rename File To:';
+	$text['label-rename-file-to']['fr-fr'] = 'Renommer le Fichier en:';
 	$text['label-files']['en-us'] = 'Files';
+	$text['label-files']['fr-fr'] = 'Fichiers';
 	$text['button-add-file']['en-us'] = 'Add File';
+	$text['button-add-file']['fr-fr'] = 'Ajouter Fichier';
 	$text['button-add-dir']['en-us'] = 'Add Dir'; //add directory
+	$text['button-add-dir']['fr-fr'] = 'Ajouter un Répertoire'; //add directory
 	$text['button-rename-file']['en-us'] = 'Rename File';
+	$text['button-rename-file']['fr-fr'] = 'Renommer le Fichier';
 	$text['message-delete-file']['en-us'] = 'Are you sure you want to delete the selected file?';
+	$text['message-delete-file']['fr-fr'] = "Etes-vous sûr de vouloir supprimer le fichier sélectionné?";
 	$text['button-del-file']['en-us'] = 'Delete File';
+	$text['button-del-file']['fr-fr'] = 'Supprimer le Fichier';
 	$text['message-delete-folder']['en-us'] = 'Are you sure you want to delete the selected folder?';
+	$text['message-delete-folder']['fr-fr'] = "Etes-vous sûr de vouloir supprimer le répertoire sélectionné?";
 	$text['button-del-dir']['en-us'] = 'Delete Dir'; //delete directory
+	$text['button-del-dir']['fr-fr'] = 'Supprimer le répertoire'; //delete directory
 	$text['message-error']['en-us'] = 'Error!!';
+	$text['message-error']['fr-fr'] = 'Erreur!!';
 	$text['label-folder-name']['en-us'] = 'Folder Name:';
+	$text['label-folder-name']['fr-fr'] = 'Nom du Répertoire:';
 	$text['button-new-folder']['en-us'] = 'New Folder';
+	$text['button-new-folder']['fr-fr'] = 'Nouveau Répertoire';
 	$text['button-delete-this']['en-us'] = 'Are you sure want to delete this?';
+	$text['button-delete-this']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 	$text['button-search']['en-us'] = 'Search';
+	$text['button-search']['fr-fr'] = 'Chercher';
 	$text['button-add']['en-us'] = 'Add';
+	$text['button-add']['fr-fr'] = 'Ajouter';
 	$text['label-file']['en-us'] = 'File:';
+	$text['label-file']['fr-fr'] = 'Fichier:';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/exec/app_config.php b/app/exec/app_config.php
index 66c304b9c0..d2a15ce909 100644
--- a/app/exec/app_config.php
+++ b/app/exec/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Provides a conventient way to execute system, PHP, and switch commands.';
 		$apps[$x]['description']['es-mx'] = 'Provee un modo conveniente de ejecutar comandos de sistema, PHP o del switch.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Offre un mode pour exécuter des commandes système, PHP ou switch.";
-		$apps[$x]['description']['fr-ca'] = "Il offre un mode d'exécuter des commandes du système, PHP ou switch.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Fornece uma maneira conveniente para executar o sistema, PHP e comandos do switch.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,11 +21,11 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Command';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Comando';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Commande';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = 'Command';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Comando';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -44,4 +44,4 @@
 
 		$apps[$x]['permissions'][2]['name'] = 'exec_switch';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/exec/app_languages.php b/app/exec/app_languages.php
index e771d5666f..c356081338 100644
--- a/app/exec/app_languages.php
+++ b/app/exec/app_languages.php
@@ -28,38 +28,38 @@
 
 	$text['label-execute']['en-us'] = 'Execute Command';
 	$text['label-execute']['pt-pt'] = '';
-	$text['label-execute']['fr'] = 'Executer la Commande';
+	$text['label-execute']['fr-fr'] = 'Executer la Commande';
 
 	$text['description-execute']['en-us'] = 'Provides a conventient way to execute system, PHP, and switch commands.';
 	$text['description-execute']['pt-pt'] = '';
-	$text['description-execute']['fr'] = 'Fournir un moyen pour executer des commandes système, PHP et freeswitch. ';
+	$text['description-execute']['fr-fr'] = 'Fournir un moyen pour executer des commandes système, PHP et freeswitch. ';
 
 	$text['label-shell']['en-us'] = 'Shell command';
 	$text['label-shell']['pt-pt'] = '';
-	$text['label-shell']['fr'] = 'Comamnde Shell';
+	$text['label-shell']['fr-fr'] = 'Comamnde Shell';
 
 	$text['description-shell']['en-us'] = 'System commands.';
 	$text['description-shell']['pt-pt'] = '';
-	$text['description-shell']['fr'] = 'Commande Système';
+	$text['description-shell']['fr-fr'] = 'Commande Système';
 
 	$text['label-php']['en-us'] = 'PHP command';
 	$text['label-php']['pt-pt'] = '';
-	$text['label-php']['fr'] = 'Commande PHP';
+	$text['label-php']['fr-fr'] = 'Commande PHP';
 
 	$text['description-php']['en-us'] = "Use the following link as a reference for PHP: <a href='http://php.net/manual/en/index.php' target='_blank'>PHP Manual";
 	$text['description-php']['pt-pt'] = "";
-	$text['description-php']['fr'] = "Utiliser le lien suivant comme référence pour le PHP: <a href='http://php.net/manual/fr/index.php' target='_blank'>Manuel PHP";
+	$text['description-php']['fr-fr'] = "Utiliser le lien suivant comme référence pour le PHP: <a href='http://php.net/manual/fr/index.php' target='_blank'>Manuel PHP";
 
 	$text['label-switch']['en-us'] = 'Switch Command';
 	$text['label-switch']['pt-pt'] = '';
-	$text['label-switch']['fr'] = 'Commande CLI Freeswitch';
+	$text['label-switch']['fr-fr'] = 'Commande CLI Freeswitch';
 
 	$text['description-switch']['en-us'] = 'For a list of the valid commands use: help';
 	$text['description-switch']['pt-pt'] = '';
-	$text['description-switch']['fr'] = 'Pour la liste des commandes valides, utiliser : help';
+	$text['description-switch']['fr-fr'] = 'Pour la liste des commandes valides, utiliser : help';
 
 	$text['button-execute']['en-us'] = 'Execute';
 	$text['button-execute']['pt-pt'] = '';
-	$text['button-execute']['fr'] = 'Executer';
+	$text['button-execute']['fr-fr'] = 'Executer';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/extensions/app_config.php b/app/extensions/app_config.php
index 226788947b..32b2b6f2b8 100644
--- a/app/extensions/app_config.php
+++ b/app/extensions/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Used Configure SIP extensions.';
 		$apps[$x]['description']['es-mx'] = 'Utilizado para configurar Extensiones SIP.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Utilisé pour configurer des extentions SIP';
-		$apps[$x]['description']['fr-ca'] = 'Utilisé pour configurer des éxtentions SIP';
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Usado para configurar extensões SIP.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,11 +21,11 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Extensions';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Extensiones';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Extensions';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = 'Post téléphonique';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Extensões';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -37,44 +37,28 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][$y]['name'] = 'extension_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'extension_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'extension_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'extension_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'extension_toll';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'outbound_caller_id_select';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'extension_user_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'extension_user_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'extension_user_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'extension_user_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['name'] = 'extension_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'extension_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'admin';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'extension_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'admin';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'extension_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'admin';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][4]['name'] = 'extension_toll';
+		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][5]['name'] = 'outbound_caller_id_select';
+		//$apps[$x]['permissions'][3]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -131,14 +115,14 @@
 		$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'] = 'mailbox';
-		//$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'] = 'vm_password';
-		//$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'] = 'mailbox';
+		$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'] = 'vm_password';
+		$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'] = 'accountcode';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
@@ -183,21 +167,21 @@
 		$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'] = 'vm_enabled';
-		//$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'] = 'vm_mailto';
-		//$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'] = 'vm_attach_file';
-		//$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'] = 'vm_keep_local_after_email';
-		//$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		//$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'vm_enabled';
+		$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'] = 'vm_mailto';
+		$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'] = 'vm_attach_file';
+		$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'] = 'vm_keep_local_after_email';
+		$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'] = 'user_context';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
@@ -345,4 +329,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_users';
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'user_uuid';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-?>
\ No newline at end of file
+?>
diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index b62a3374b2..ca2e3ee2c2 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -4,311 +4,415 @@
 
 		$text['title-extensions']['en-us'] = 'Extensions';
 		$text['title-extensions']['pt-pt'] = '';
+		$text['title-extensions']['fr-fr'] = 'Extensions';
 
 		$text['title-extension-edit']['en-us'] = 'Extension Edit';
 		$text['title-extension-edit']['pt-pt'] = '';
+		$text['title-extension-edit']['fr-fr'] = "Edition de l'Extension";
 
 		$text['title-extension-add']['en-us'] = 'Extension Add';
 		$text['title-extension-add']['pt-pt'] = '';
+		$text['title-extension-add']['fr-fr'] = "Ajout d'une extension";
 
 		$text['header-extensions']['en-us'] = 'Extensions';
 		$text['header-extensions']['pt-pt'] = '';
+		$text['header-extensions']['fr-fr'] = 'Extensions';
 
 		$text['description-extensions']['en-us'] = 'Use this to configure your SIP extensions.';
 		$text['description-extensions']['pt-pt'] = '';
+		$text['description-extensions']['fr-fr'] = "Page de configuration des extensions SIP.";
 
 		$text['header-extension-edit']['en-us'] = 'Extension Edit';
 		$text['header-extension-edit']['pt-pt'] = '';
+		$text['header-extension-edit']['fr-fr'] = "Editer l'extension";
 
 		$text['header-extension-add']['en-us'] = 'Extension Add';
 		$text['header-extension-add']['pt-pt'] = '';
+		$text['header-extension-add']['fr-fr'] = "Ajouter une extension";
 
 		$text['label-extension']['en-us'] = 'Extension';
 		$text['label-extension']['pt-pt'] = '';
+		$text['label-extension']['fr-fr'] = 'Extension';
 
 		$text['description-extension']['en-us'] = 'Enter the alphanumeric extension. The default configuration allows 2 - 7 digit extensions.';
 		$text['description-extension']['pt-pt'] = '';
+		$text['description-extension']['fr-fr'] = "Insérer l'extension au format numéique ou alphanumérique. La configuration par défaut autorise des extension de 2 à 7 digits.";
 
 		$text['label-number_alias']['en-us'] = 'Number Alias';
 		$text['label-number_alias']['pt-pt'] = '';
+		$text['label-number_alias']['fr-fr'] = 'Alias';
 
 		$text['description-number_alias']['en-us'] = 'If the extension is numeric then number alias is optional.';
 		$text['description-number_alias']['pt-pt'] = '';
+		$text['description-number_alias']['fr-fr'] = "Le numéro de l'extension. Optionnel si l'extension est au format numérique.";
 
 		$text['label-password']['en-us'] = 'Password';
 		$text['label-password']['pt-pt'] = '';
+		$text['label-password']['fr-fr'] = 'Mot de passe';
 
 		$text['description-password']['en-us'] = 'Enter the password here.';
 		$text['description-password']['pt-pt'] = '';
+		$text['description-password']['fr-fr'] = '';
 
 		$text['label-range']['en-us'] = 'Range';
 		$text['label-range']['pt-pt'] = '';
+		$text['label-range']['fr-fr'] = 'Nombre';
 
 		$text['description-range']['en-us'] = 'Enter the number of extensions to create. Increments each extension by 1.';
 		$text['description-range']['pt-pt'] = '';
+		$text['description-range']['fr-fr'] = "Choisir le nombre d'extensions à créer. Leur numéro s'incrémentent unitairement.";
 
 		$text['checkbox-range']['en-us'] = 'Auto-generate user with extension as login name';
 		$text['checkbox-range']['pt-pt'] = '';
+                $text['checkbox-range']['fr-fr'] = "Auto-générer l'usager avec l'extension comme ID de login";
 
 		$text['label-user_list']['en-us'] = 'User List';
 		$text['label-user_list']['pt-pt'] = '';
+		$text['label-user_list']['fr-fr'] = 'Liste des utilisateurs';
 
 		$text['description-user_list']['en-us'] = 'Assign the users that are assigned to this extension. ';
 		$text['description-user_list']['pt-pt'] = '';
+		$text['description-user_list']['fr-fr'] = "Assigner cette extension aux utilisateur.";
 
 		$text['label-vm_password']['en-us'] = 'Voicemail Password';
 		$text['label-vm_password']['pt-pt'] = '';
+		$text['label-vm_password']['fr-fr'] = "Mot de passe de la messagerie vocale";
 
 		$text['description-vm_password']['en-us'] = 'Enter the numeric voicemail  password here.';
 		$text['description-vm_password']['pt-pt'] = '';
+		$text['description-vm_password']['fr-fr'] = "Insérer un mot de passe numérique pour la messagerie vocale.";
 
 		$text['label-accountcode']['en-us'] = 'Account Code';
 		$text['label-accountcode']['pt-pt'] = '';
+		$text['label-accountcode']['fr-fr'] = "Centre de frais";
 
 		$text['description-accountcode']['en-us'] = 'Enter the account code here.';
 		$text['description-accountcode']['pt-pt'] = '';
+		$text['description-accountcode']['fr-fr'] = '';
 
 		$text['label-effective_caller_id_name']['en-us'] = 'Effective Caller ID Name';
 		$text['label-effective_caller_id_name']['pt-pt'] = '';
+		$text['label-effective_caller_id_name']['fr-fr'] = 'Nom interne';
 
 		$text['description-effective_caller_id_name']['en-us'] = 'Enter the internal caller ID name here.';
 		$text['description-effective_caller_id_name']['pt-pt'] = '';
+		$text['description-effective_caller_id_name']['fr-fr'] = "Nom d'appelant affiché pour les appels internes";
 
 		$text['label-effective_caller_id_number']['en-us'] = 'Effective Caller ID Number';
 		$text['label-effective_caller_id_number']['pt-pt'] = '';
+		$text['label-effective_caller_id_number']['fr-fr'] = 'Numéro interne';
 
 		$text['description-effective_caller_id_number']['en-us'] = 'Enter the internal caller ID number here.';
 		$text['description-effective_caller_id_number']['pt-pt'] = '';
+		$text['description-effective_caller_id_number']['fr-fr'] = "Numéro d'appelant affiché pour les appels internes";
 
 		$text['label-outbound_caller_id_name']['en-us'] = 'Outbound Caller ID Name';
 		$text['label-outbound_caller_id_name']['pt-pt'] = '';
+		$text['label-outbound_caller_id_name']['fr-fr'] = "Nom publique";
 
 		$text['description-outbound_caller_id_name-select']['en-us'] = 'Select the external (public) caller ID name.';
 		$text['description-outbound_caller_id_name-select']['pt-pt'] = '';
+		$text['description-outbound_caller_id_name-select']['fr-fr'] = "Choisir le nom d'appelant affiché pour les appels externes (public).";
 
 		$text['description-outbound_caller_id_name-custom']['en-us'] = 'Enter the external (public) caller ID name here.';
 		$text['description-outbound_caller_id_name-custom']['pt-pt'] = '';
+		$text['description-outbound_caller_id_name-custom']['fr-fr'] = "Nom d'appelant affiché pour les appels externes (public).";
 
 		$text['label-outbound_caller_id_number']['en-us'] = 'Outbound Caller ID Number';
 		$text['label-outbound_caller_id_number']['pt-pt'] = '';
+		$text['label-outbound_caller_id_number']['fr-fr'] = "Numéro publique";
 
 		$text['description-outbound_caller_id_number-select']['en-us'] = 'Select the external (public) caller ID number.';
 		$text['description-outbound_caller_id_number-select']['pt-pt'] = '';
+		$text['description-outbound_caller_id_number-select']['pt-pt'] = '';
+		$text['description-outbound_caller_id_number-select']['fr-fr'] = "Choisir le numéro d'appelant affiché pour les appels externes (public).";
 
 		$text['description-outbound_caller_id_number-custom']['en-us'] = 'Enter the external (public) caller ID number here.';
 		$text['description-outbound_caller_id_number-custom']['pt-pt'] = '';
+		$text['description-outbound_caller_id_number-custom']['fr-fr'] = "Numéro d'appelant affiché pour les appels externes (public).";
 
 		$text['label-emergency_caller_id_number']['en-us'] = 'Emergency Caller ID Number';
 		$text['label-emergency_caller_id_number']['pt-pt'] = '';
+		$text['label-emergency_caller_id_number']['fr-fr'] = "Numéro d'appelant pour les Urgences";
 
 		$text['description-emergency_caller_id_number']['en-us'] = 'Enter the emergency caller ID number here.';
 		$text['description-emergency_caller_id_number']['pt-pt'] = '';
+		$text['description-emergency_caller_id_number']['fr-fr'] = '';
 
 		$text['label-directory_full_name']['en-us'] = 'Directory Full Name';
 		$text['label-directory_full_name']['pt-pt'] = '';
+		$text['label-directory_full_name']['fr-fr'] = "Nom pour annuaire";
 
 		$text['description-directory_full_name']['en-us'] = 'Enter the first name followed by the last name.';
 		$text['description-directory_full_name']['pt-pt'] = '';
+		$text['description-directory_full_name']['fr-fr'] = "prénom suivi du nom.";
 
 		$text['label-directory_visible']['en-us'] = 'Directory Visible';
 		$text['label-directory_visible']['pt-pt'] = '';
+		$text['label-directory_visible']['fr-fr'] = 'Nom Visible';
 
 		$text['description-directory_visible']['en-us'] = 'Select whether to hide the name from the directory.';
 		$text['description-directory_visible']['pt-pt'] = '';
+		$text['description-directory_visible']['fr-fr'] = "Choisir si le nom sera visible dans l'annuaire.";
 
 		$text['label-directory_exten_visible']['en-us'] = 'Directory Extension Visible';
 		$text['label-directory_exten_visible']['pt-pt'] = '';
+		$text['label-directory_exten_visible']['fr-fr'] = 'Numéro Visible';
 
 		$text['description-directory_exten_visible']['en-us'] = 'Select whether announce the extension when calling the directory.';
 		$text['description-directory_exten_visible']['pt-pt'] = '';
+		$text['description-directory_exten_visible']['fr-fr'] = "Choisir si l'extension sera visible dans l'annuaire.";
 
 		$text['label-limit_max']['en-us'] = 'Limit Max';
 		$text['label-limit_max']['pt-pt'] = '';
+		$text['label-limit_max']['fr-fr'] = 'Limite Max';
 
 		$text['description-limit_max']['en-us'] = 'Enter the max number of outgoing calls for this user.';
 		$text['description-limit_max']['pt-pt'] = '';
+		$text['description-limit_max']['fr-fr'] = "Insérer le maximum d'appel sortants autorisés pour cet utilisateur.";
 
 		$text['label-limit_destination']['en-us'] = 'Limit Destination';
 		$text['label-limit_destination']['pt-pt'] = '';
+		$text['label-limit_destination']['fr-fr'] = 'Limite Destination';
 
 		$text['description-limit_destination']['en-us'] = 'Enter the destination to send the calls when the max number of outgoing calls has been reached.';
 		$text['description-limit_destination']['pt-pt'] = '';
+		$text['description-limit_destination']['fr-fr'] = "Insérer la destination où déborder quand la limite des appels sortant est atteinte.";
 
 		$text['label-provisioning']['en-us'] = 'Phone Provisioning';
 		$text['label-provisioning']['pt-pt'] = '';
+		$text['label-provisioning']['fr-fr'] = 'Provisioning du Téléphone';
 
 		$text['description-provisioning']['en-us'] = 'Select a device and line number to assign to this extension.';
 		$text['description-provisioning']['pt-pt'] = '';
+		$text['description-provisioning']['fr-fr'] = "Choisir un équipement et un nombrede lignes a assigner à cette extension.";
 
 		$text['label-vm_enabled']['en-us'] = 'Voicemail Enabled';
 		$text['label-vm_enabled']['pt-pt'] = '';
+		$text['label-vm_enabled']['fr-fr'] = "Messagerie Vocale Active";
 
 		$text['description-vm_enabled']['en-us'] = 'Enable/disable voicemail for this extension.';
 		$text['description-vm_enabled']['pt-pt'] = '';
+		$text['description-vm_enabled']['fr-fr'] = "Messagerie Vocale disponible ou non pour cette extension.";
 
 		$text['label-vm_mailto']['en-us'] = 'Voicemail Mail To';
 		$text['label-vm_mailto']['pt-pt'] = '';
+		$text['label-vm_mailto']['fr-fr'] = "Courriel destination";
 
 		$text['description-vm_mailto']['en-us'] = 'Enter the email address to send voicemail to (optional).';
 		$text['description-vm_mailto']['pt-pt'] = '';
+		$text['description-vm_mailto']['fr-fr'] = "Insérer le courriel où sera envoyé le message de notification (optionnel).";
 
 		$text['label-vm_attach_file']['en-us'] = 'Voicemail Attach File';
 		$text['label-vm_attach_file']['pt-pt'] = '';
+		$text['label-vm_attach_file']['fr-fr'] = 'Fichier Audio';
 
 		$text['description-vm_attach_file']['en-us'] = 'Choose whether to attach the voicemail to the email as an audio file.';
 		$text['description-vm_attach_file']['pt-pt'] = '';
+		$text['description-vm_attach_file']['fr-fr'] = "Choisir si l'enregistrement audio est attaché au courriel.";
 
 		$text['label-vm_keep_local_after_email']['en-us'] = 'VM Keep Local After Email';
 		$text['label-vm_keep_local_after_email']['pt-pt'] = '';
+		$text['label-vm_keep_local_after_email']['fr-fr'] = "Message gardé en local après courriel";
 
 		$text['description-vm_keep_local_after_email']['en-us'] = 'Keep local file after sending the email.';
 		$text['description-vm_keep_local_after_email']['pt-pt'] = '';
+		$text['description-vm_keep_local_after_email']['fr-fr'] = "Conserver ou non le message sur la messagerie vocale après l'envoi du courriel.";
 
 		$text['label-toll_allow']['en-us'] = 'Toll Allow';
 		$text['label-toll_allow']['pt-pt'] = '';
+		$text['label-toll_allow']['fr-fr'] = 'droits';
 
 		$text['description-toll_allow']['en-us'] = 'Enter the toll allow value here.  (Examples: domestic,international,local)';
 		$text['description-toll_allow']['pt-pt'] = '';
+		$text['description-toll_allow']['fr-fr'] = "Insérer les droits d'accès. (Exemples: domestic,international,local)";
 
 		$text['label-call_timeout']['en-us'] = 'Call Timeout';
 		$text['label-call_timeout']['pt-pt'] = '';
+		$text['label-call_timeout']['fr-fr'] = "Durée max d'appel";
 
 		$text['description-call_timeout']['en-us'] = 'Enter the call timeout.';
 		$text['description-call_timeout']['pt-pt'] = '';
+		$text['description-call_timeout']['fr-fr'] = "Insérer la durée max d'un message vocal.";
 
 		$text['label-call_group']['en-us'] = 'Call Group';
 		$text['label-call_group']['pt-pt'] = '';
+		$text['label-call_group']['fr-fr'] = "Groupe d'appel";
 
 		$text['description-call_group']['en-us'] = 'Enter the user call group here. Groups available by default: sales, support, billing.';
 		$text['description-call_group']['pt-pt'] = '';
+		$text['description-call_group']['fr-fr'] = "Insérer le groupe d'appel de l'utilisateur. Les groupes disponibles par défaut sont: sales, support, billing.";
 
 		$text['label-hold_music']['en-us'] = 'Hold Music';
 		$text['label-hold_music']['pt-pt'] = '';
+		$text['label-hold_music']['fr-fr'] = "Musique de Garde";
 
 		$text['description-hold_music']['en-us'] = 'Select the MOH Category here.';
 		$text['description-hold_music']['pt-pt'] = '';
+		$text['description-hold_music']['fr-fr'] = "Choisir la catégorie de musique de garde.";
 
 		$text['label-user_context']['en-us'] = 'User Context';
 		$text['label-user_context']['pt-pt'] = '';
+		$text['label-user_context']['fr-fr'] = "Contexte Utilisateur";
 
 		$text['description-user_context']['en-us'] = 'Enter the user context here.';
 		$text['description-user_context']['pt-pt'] = '';
+		$text['description-user_context']['fr-fr'] = "Insérer le contexte utilisateur. Surpasse le contexte du domaine. ";
 
 		$text['label-show_advanced']['en-us'] = 'Show Advanced';
 		$text['label-show_advanced']['pt-pt'] = '';
+		$text['label-show_advanced']['fr-fr'] = "Paramètres Avancés";
 
 		$text['button-advanced']['en-us'] = 'Advanced';
 		$text['button-advanced']['pt-pt'] = '';
+		$text['button-advanced']['fr-fr'] = 'Afficher les paramètres avancés';
 
 		$text['label-auth_acl']['en-us'] = 'Auth ACL';
 		$text['label-auth_acl']['pt-pt'] = '';
+		$text['label-auth_acl']['fr-fr'] = 'Auth ACL';
 
 		$text['description-auth_acl']['en-us'] = 'Enter the Auth ACL here.';
 		$text['description-auth_acl']['pt-pt'] = '';
+		$text['description-auth_acl']['fr-fr'] = "ACL authorisée pour l'extension. De la forme abc.def.ghi.jkl/mask ";
 
 		$text['label-cidr']['en-us'] = 'CIDR';
 		$text['label-cidr']['pt-pt'] = '';
+		$text['label-cidr']['fr-fr'] = 'CIDR';
 
 		$text['description-cidr']['en-us'] = 'Enter the CIDR here.';
 		$text['description-cidr']['pt-pt'] = '';
+		$text['description-cidr']['fr-fr'] = "Classless Inter-Domain Routing. De la forme abc.def.ghi.jkl/mask";
 
 		$text['label-sip_force_contact']['en-us'] = 'SIP Force Contact';
 		$text['label-sip_force_contact']['pt-pt'] = '';
+		$text['label-sip_force_contact']['fr-fr'] = 'SIP Force Contact';
 
 		$text['description-sip_force_contact']['en-us'] = 'Choose whether to rewrite the contact port, or rewrite both the contact IP and port.';
 		$text['description-sip_force_contact']['pt-pt'] = '';
+		$text['description-sip_force_contact']['fr-fr'] = "Choisir de ré-écrire le contact ou non.";
 
 		$text['label-sip_force_expires']['en-us'] = 'SIP Force Expires';
 		$text['label-sip_force_expires']['pt-pt'] = '';
+		$text['label-sip_force_expires']['fr-fr'] = 'SIP Force Expires';
 
 		$text['description-sip_force_expires']['en-us'] = 'Choose whether to rewrite the contact port, or rewrite both the contact IP and port.';
 		$text['description-sip_force_expires']['pt-pt'] = '';
+		$text['description-sip_force_expires']['fr-fr'] = "Choisir de forcer l'expiration de l'enregistrement de l'enxtension ou non.";
 
 		$text['label-nibble_account']['en-us'] = 'Nibble Account';
 		$text['label-nibble_account']['pt-pt'] = '';
+		$text['label-nibble_account']['fr-fr'] = 'Compte Nibble';
 
 		$text['description-nibble_account']['en-us'] = 'Enter the account number for nibblebill to use.';
 		$text['description-nibble_account']['pt-pt'] = '';
+		$text['description-nibble_account']['fr-fr'] = "Insérer un compte Nibble pour la facturation. Pour cela Nibble doit être installé.";
 
 		$text['label-mwi_account']['en-us'] = 'MWI Account';
 		$text['label-mwi_account']['pt-pt'] = '';
+		$text['label-mwi_account']['fr-fr'] = 'Compte MWI';
 
 		$text['description-mwi_account']['en-us'] = 'MWI Account with user@domain of the voicemail to monitor.';
 		$text['description-mwi_account']['pt-pt'] = '';
+		$text['description-mwi_account']['fr-fr'] = "Récupérer les informations de message en attente. User@domain de la messagerie vocale à gérer.";
 
 		$text['label-sip_bypass_media']['en-us'] = 'SIP Bypass Media';
 		$text['label-sip_bypass_media']['pt-pt'] = '';
+		$text['label-sip_bypass_media']['fr-fr'] = 'SIP Bypass Media';
 
 		$text['description-sip_bypass_media']['en-us'] = 'Choose whether to send the media stream point to point or in transparent proxy mode.';
 		$text['description-sip_bypass_media']['pt-pt'] = '';
+		$text['description-sip_bypass_media']['fr-fr'] = "Choisir de transferer le flux media en direct (point à point) ou via le proxy en mode transparent (pas de transcodage).";
 
 		$text['label-dial_string']['en-us'] = 'Dial String';
 		$text['label-dial_string']['pt-pt'] = '';
+		$text['label-dial_string']['fr-fr'] = 'Dial String';
 
 		$text['description-dial_string']['en-us'] = 'Location of the endpoint.';
 		$text['description-dial_string']['pt-pt'] = '';
+		$text['description-dial_string']['fr-fr'] = 'Location of the endpoint.';
 
 		$text['label-enabled']['en-us'] = 'Enabled';
 		$text['label-enabled']['pt-pt'] = '';
+		$text['label-enabled']['fr-fr'] = 'Actif';
 
 		$text['description-enabled']['en-us'] = 'Set the status of the extension.';
 		$text['description-enabled']['pt-pt'] = '';
+		$text['description-enabled']['fr-fr'] = "Etat de l'extension.";
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = 'Description';
 
 		$text['description-description']['en-us'] = '';
 		$text['description-description']['pt-pt'] = '';
+		$text['description-description']['fr-fr'] = '';
 
 		$text['label-true']['en-us'] = 'true';
 		$text['label-true']['pt-pt'] = '';
+		$text['label-true']['fr-fr'] = 'Oui';
 
 		$text['label-false']['en-us'] = 'false';
 		$text['label-false']['pt-pt'] = 'falso';
+		$text['label-false']['fr-fr'] = 'Non';
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = 'Voulez-vous vraiment supprimer cela?';
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-copy']['en-us'] = 'Copy';
 		$text['button-copy']['pt-pt'] = '';
+		$text['button-copy']['fr-fr'] = 'Copier';
 
 		$text['confirm-copy']['en-us'] = 'Do you really want to copy this?';
 		$text['confirm-copy']['pt-pt'] = '';
+		$text['confirm-copy']['fr-fr'] = "Voulez-vous vraiment copier cela?";
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['message-message']['en-us'] = 'Message';
 		$text['message-message']['pt-pt'] = '';
+		$text['message-message']['fr-fr'] = 'Message';
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = 'Mis à Jour';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 
 		$text['message-copy']['en-us'] = 'Copy Completed';
 		$text['message-copy']['pt-pt'] = '';
+		$text['message-copy']['fr-fr'] = 'Copié';
 
 		$text['message_extension']['en-us'] = '# Enter the new Extension to use...';
 		$text['message_extension']['pt-pt'] = '';
+		$text['message_extension']['fr-fr'] = "# Insérer la nouvelle Extension à utiliser...";
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index 40ace4e9fd..efb88430be 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'To receive a FAX setup a fax extension and then direct the incoming FAX with a dedicated number or you can detect the FAX tone by using on the Public tab.';
 		$apps[$x]['description']['es-mx'] = 'Para recibir un FAX, configure una extensión y después asigne un número a esta.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Pour recevoir un fax, configurez une extension du FAX et après diriger un numéro vers lui.';
-		$apps[$x]['description']['fr-ca'] = 'Pour recevoir un fax, configurez un éxtension du FAX et après dirigers un nombre vers lui.';
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Para receber uma configuração de fax uma extensão de fax e, em seguida, direcionar o fax com um número dedicado ou você pode detectar o tom de fax, usando na guia Pública.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,11 +21,11 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Fax Server';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Servidor de Fax';
-		$apps[$x]['menu'][0]['title']['de-de'] = 'Faxserver';
+		$apps[$x]['menu'][0]['title']['de'] = 'Faxserver';
 		$apps[$x]['menu'][0]['title']['de-ch'] = 'Faxserver';
 		$apps[$x]['menu'][0]['title']['de-at'] = 'Faxserver';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Serveur Fax';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = 'Serveur du fax';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Servidor de Fax';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -38,97 +38,48 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][$y]['name'] = 'fax_extension_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_extension_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_extension_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_extension_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_inbox_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_inbox_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_sent_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_sent_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_send';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_user_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';;
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_user_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_user_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_user_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_log_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_log_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_log_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'fax_log_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['name'] = 'fax_extension_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'user';
+		$apps[$x]['permissions'][0]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'fax_extension_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'admin';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'fax_extension_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'user';
+		$apps[$x]['permissions'][2]['groups'][] = 'admin';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'fax_extension_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'admin';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][4]['name'] = 'fax_inbox_view';
+		$apps[$x]['permissions'][4]['groups'][] = 'user';
+		$apps[$x]['permissions'][4]['groups'][] = 'admin';
+		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][5]['name'] = 'fax_inbox_delete';
+		$apps[$x]['permissions'][5]['groups'][] = 'user';
+		$apps[$x]['permissions'][5]['groups'][] = 'admin';
+		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][6]['name'] = 'fax_sent_view';
+		$apps[$x]['permissions'][6]['groups'][] = 'user';
+		$apps[$x]['permissions'][6]['groups'][] = 'admin';
+		$apps[$x]['permissions'][6]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][7]['name'] = 'fax_sent_delete';
+		$apps[$x]['permissions'][7]['groups'][] = 'user';
+		$apps[$x]['permissions'][7]['groups'][] = 'admin';
+		$apps[$x]['permissions'][7]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][8]['name'] = 'fax_send';
+		$apps[$x]['permissions'][8]['groups'][] = 'user';
+		$apps[$x]['permissions'][8]['groups'][] = 'admin';
+		$apps[$x]['permissions'][8]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index 8d2590ec23..38639cce6d 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -1,214 +1,206 @@
-<?php
+<?php
 
 	$text['title']['en-us'] = 'Fax Server';
 	$text['title']['pt-pt'] = 'Servidor de Fax';
-	$text['title']['fr'] = "Serveur de Fax";
+	$text['title']['fr-fr'] = "Serveur de Fax";
 
 	$text['description']['en-us'] = 'To receive a FAX setup a fax extension and then direct the incoming to it.';
 	$text['description']['pt-pt'] = 'Para receber um FAX, configure uma extensão de fax e encaminhe o tráfego de entrada para essa extensão.';
-	$text['description']['fr'] = "Afin de recevoir un Fax, configurer une extension et rediriger l'appel sur celle-ci.";
+	$text['description']['fr-fr'] = "Afin de recevoir un Fax, configurer une extension et rediriger l'appel sur celle-ci.";
 
 	$text['confirm-delete']['en-us'] = 'Are you sure you want to delete this?';
 	$text['confirm-delete']['pt-pt'] = 'Tem a certeza que pretende apagar?';
-	$text['confirm-delete']['fr'] = "Voulez-vous vraiment supprimer cela?";
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 	$text['label-extension']['en-us'] = 'Extension';
 	$text['label-extension']['pt-pt'] = 'Extensão';
-	$text['label-extension']['fr'] = "Extension";
+	$text['label-extension']['fr-fr'] = "Extension";
 
 	$text['label-destination-number']['en-us'] = 'Destination Number';
 	$text['label-destination-number']['pt-pt'] = '';
-	$text['label-destination-number']['fr'] = "Numéro d'appelant";
-
-	$text['label-inbox']['en-us'] = 'Inbox';
-	$text['label-inbox']['pt-pt'] = '';
-	$text['label-inbox']['fr'] = '';
-
-	$text['label-sent']['en-us'] = 'Sent';
-	$text['label-sent']['pt-pt'] = '';
-	$text['label-inbox']['fr'] = '';
+	$text['label-destination-number']['fr-fr'] = "Numéro d'appelant";
 
 	$text['label-name']['en-us'] = 'Name';
 	$text['label-name']['pt-pt'] = 'Nome';
-	$text['label-name']['fr'] = "Nom";
+	$text['label-name']['fr-fr'] = "Nom";
 
 	$text['label-email']['en-us'] = 'Email';
 	$text['label-email']['pt-pt'] = 'E-mail';
-	$text['label-email']['fr'] = "Courriel";
+	$text['label-email']['fr-fr'] = "Courriel";
 
 	$text['label-description']['en-us'] = 'Description';
 	$text['label-description']['pt-pt'] = 'Descrição';
-	$text['label-description']['fr'] = "Description";
+	$text['label-description']['fr-fr'] = "Description";
 
 	$text['label-upload']['en-us'] = 'Upload';
 	$text['label-upload']['pt-pt'] = 'Carregar';
-	$text['label-upload']['fr'] = "Télécharegr";
+	$text['label-upload']['fr-fr'] = "Télécharegr";
 
 	$text['description-upload']['en-us'] = 'Select the file to upload and send as a fax.';
 	$text['description-upload']['pt-pt'] = 'Selecione o ficheiro para fazer o upload e enviar por fax.';
-	$text['description-upload']['fr'] = "Choisir un fichier à télécharger pour être émis en tant que Fax.";
+	$text['description-upload']['fr-fr'] = "Choisir un fichier à télécharger pour être émis en tant que Fax.";
 
 	$text['button-back']['en-us'] = 'Back';
 	$text['button-back']['pt-pt'] = 'Voltar';
-	$text['button-back']['fr'] = "Retour";
+	$text['button-back']['fr-fr'] = "Retour";
 
 	$text['button-settings']['en-us'] = 'Settings';
 	$text['button-settings']['pt-pt'] = 'Configurações';
-	$text['button-settings']['fr'] = "Configuration";
+	$text['button-settings']['fr-fr'] = "Configuration";
 
 	$text['button-send']['en-us'] = 'Send';
 	$text['button-send']['pt-pt'] = 'Enviar';
-	$text['button-send']['fr'] = "Envoyer";
+	$text['button-send']['fr-fr'] = "Envoyer";
 
 	$text['button-copy']['en-us'] = 'Copy';
 	$text['button-copy']['pt-pt'] = 'Copiar';
-	$text['button-copy']['fr'] = "Copier";
+	$text['button-copy']['fr-fr'] = "Copier";
 
 	$text['button-save']['en-us'] = 'Save';
 	$text['button-save']['pt-pt'] = 'Guardar';
-	$text['button-save']['fr'] = "Sauvegarder";
+	$text['button-save']['fr-fr'] = "Sauvegarder";
 
 	//fax_copy
 	$text['confirm-copy']['en-us'] = 'Copy Complete';
 	$text['confirm-copy']['pt-pt'] = 'Cópia Completa';
-	$text['confirm-copy']['fr'] = "Copié";
+	$text['confirm-copy']['fr-fr'] = "Copié";
 
 	//fax_delete
 	$text['confirm-delete']['en-us'] = 'Delete Complete';
 	$text['confirm-delete']['pt-pt'] = 'Eliminação Completa';
-	$text['confirm-delete']['fr'] = "Supprimé";
+	$text['confirm-delete']['fr-fr'] = "Supprimé";
 
 	//fax_edit
 	$text['confirm-add']['en-us'] = 'Add Complete';
 	$text['confirm-add']['pt-pt'] = 'Adição Completa';
-	$text['confirm-add']['fr'] = "Ajouté";
+	$text['confirm-add']['fr-fr'] = "Ajouté";
 
 	$text['confirm-update']['en-us'] = 'Update Complete';
 	$text['confirm-update']['pt-pt'] = 'Actualização Completa';        
-	$text['confirm-update']['fr'] = "Mis à jour";
+	$text['confirm-update']['fr-fr'] = "Mis à jour";
 
 	$text['confirm-ext']['en-us'] = 'Please provide: Extension';
 	$text['confirm-ext']['pt-pt'] = 'Por favor, forneça: Extensão';
-	$text['confirm-ext']['fr'] = "Merci d'indiquer: Extension";
+	$text['confirm-ext']['fr-fr'] = "Merci d'indiquer: Extension";
 
 	$text['confirm-fax']['en-us'] = 'Please provide: A file to Fax';
 	$text['confirm-fax']['pt-pt'] = 'Por favor forneça: um ficheiro para enviar Fax';
-	$text['confirm-fax']['fr'] = "Merci d'indiquer: Un Fichier à émettre";
+	$text['confirm-fax']['fr-fr'] = "Merci d'indiquer: Un Fichier à émettre";
 
 	$text['confirm-fax-add']['en-us'] = 'Fax Add';
 	$text['confirm-fax-add']['pt-pt'] = 'Adição de Fax';
-	$text['confirm-fax-add']['fr'] = "Ajout de Fax";
+	$text['confirm-fax-add']['fr-fr'] = "Ajout de Fax";
 
 	$text['confirm-fax-edit']['en-us'] = 'Fax Edit';
 	$text['confirm-fax-edit']['pt-pt'] = 'Edição de Fax'; 
-	$text['confirm-fax-edit']['fr'] = "Editer le Fax";
+	$text['confirm-fax-edit']['fr-fr'] = "Editer le Fax";
 
 	$text['confirm-copy-info']['en-us'] = 'Do you really want to copy this?';
 	$text['confirm-copy-info']['pt-pt'] = 'Deseja realmente copiar isto?';
-	$text['confirm-copy-info']['fr'] = "Voulez-vous vraiment copier cela?";
+	$text['confirm-copy-info']['fr-fr'] = "Voulez-vous vraiment copier cela?";
 
 	$text['description-name']['en-us'] = 'Enter the name here.';
 	$text['description-name']['pt-pt'] = 'Insira aqui o nome.';
-	$text['description-name']['fr'] = "Choisir un nom.";
+	$text['description-name']['fr-fr'] = "Choisir un nom.";
 
 	$text['description-extension']['en-us'] = 'Enter the fax extension here.';
 	$text['description-extension']['pt-pt'] = 'Insira aqui a extensão do fax';
-	$text['description-extension']['fr'] = "Choisir un numéro d'extension.";
+	$text['description-extension']['fr-fr'] = "Choisir un numéro d'extension.";
 
 	$text['description-destination-number']['en-us'] = 'Enter the fax destination number';
 	$text['description-destination-number']['pt-pt'] = 'Insira o número de fax para onde pretende enviar';
-	$text['description-destination-number']['fr'] = "";
+	$text['description-destination-number']['fr-fr'] = "";
 
 	$text['description-email']['en-us'] = 'Enter the email address to send the FAX to.';
 	$text['description-email']['pt-pt'] = 'Insira o endereço de e-mail para enviar o fax.';
-	$text['description-email']['fr'] = "Choisir un courriel où envoyer le Fax.";
+	$text['description-email']['fr-fr'] = "Choisir un courriel où envoyer le Fax.";
 
 	$text['description-info']['en-us'] = 'Enter the description here.';
 	$text['description-info']['pt-pt'] = 'Insira aqui a descrição';
-	$text['description-info']['fr'] = "";
+	$text['description-info']['fr-fr'] = "";
 
 	$text['label-pin']['en-us'] = 'PIN Number';
 	$text['label-pin']['pt-pt'] = 'Numero PIN';
-	$text['label-pin']['fr'] = "Code PIN";
+	$text['label-pin']['fr-fr'] = "Code PIN";
 
 	$text['description-pin']['en-us'] = 'Enter the PIN number here.';
 	$text['description-pin']['pt-pt'] = 'Insira aqui o número do PIN.';
-	$text['description-pin']['fr'] = "Choisir un code d'identification.";
+	$text['description-pin']['fr-fr'] = "Choisir un code d'identification.";
 
 	$text['label-caller-id-name']['en-us'] = 'Caller ID Name';
 	$text['label-caller-id-name']['pt-pt'] = 'Nome de Origem';
-	$text['label-caller-id-name']['fr'] = "Nom affiché";
+	$text['label-caller-id-name']['fr-fr'] = "Nom affiché";
 
 	$text['label-caller-id-number']['en-us'] = 'Caller ID Number';
 	$text['label-caller-id-number']['pt-pt'] = 'Número de Origem';
-	$text['label-caller-id-number']['fr'] = "Numéro affiché";
+	$text['label-caller-id-number']['fr-fr'] = "Numéro affiché";
 
 	$text['description-caller-id-name']['en-us'] = 'Enter the Caller ID name here.';
 	$text['description-caller-id-name']['pt-pt'] = 'Insira aqui o nome de origem.';
-	$text['description-caller-id-name']['fr'] = "Choisir le nom affiché en entête du Fax émis";
+	$text['description-caller-id-name']['fr-fr'] = "Choisir le nom affiché en entête du Fax émis";
 
 	$text['description-caller-id-number']['en-us'] = 'Enter the Caller ID number here.';
 	$text['description-caller-id-number']['pt-pt'] = 'Insira aqui o número de origem.';
-	$text['description-caller-id-number']['fr'] = "Choisir le numéro affiché en entête du Fax émis";
+	$text['description-caller-id-number']['fr-fr'] = "Choisir le numéro affiché en entête du Fax émis";
 
 	$text['label-forward']['en-us'] = 'Forward Number';
 	$text['label-forward']['pt-pt'] = 'Número de Encaminhamento';
-	$text['label-forward']['fr'] = "Numéro de renvoi";
+	$text['label-forward']['fr-fr'] = "Numéro de renvoi";
 
 	$text['description-forward-number']['en-us'] = 'Enter the forward number here. Used to forward the fax to a registered extension or external number.';
 	$text['description-forward-number']['pt-pt'] = 'Insira aqui o número de encaminhamento. Utilizado para encaminhar o fax para uma extensão registada ou número externo.';
-	$text['description-forward-number']['fr'] = "Choisir un numéro de renvoi en cas de besoins. Si inséré, après réception, le Fax sera ré-émis à ce numéro.";
+	$text['description-forward-number']['fr-fr'] = "Choisir un numéro de renvoi en cas de besoins. Si inséré, après réception, le Fax sera ré-émis à ce numéro.";
 
 	$text['label-user-list']['en-us'] = 'User List';
 	$text['label-user-list']['pt-pt'] = 'Lista de utilizadores';
-	$text['label-user-list']['fr'] = "Liste Usagers";
+	$text['label-user-list']['fr-fr'] = "Liste Usagers";
 
 	$text['button-add']['en-us'] = 'Add';
 	$text['button-add']['pt-pt'] = 'Adicionar';
-	$text['button-add']['fr'] = "Ajouter";
+	$text['button-add']['fr-fr'] = "Ajouter";
 
 	$text['description-user-add']['en-us'] = 'Assign the users that can manage this fax extension.';
 	$text['description-user-add']['pt-pt'] = 'Atribuir os utilizadores que podem gerir esta extensão de fax.';
-	$text['description-user-add']['fr'] = "Ajouter les usagers pouvant utiliser ce Fax.";
+	$text['description-user-add']['fr-fr'] = "Ajouter les usagers pouvant utiliser ce Fax.";
 
 	$text['label-file']['en-us'] = 'File not found.';
 	$text['label-file']['pt-pt'] = 'Ficheiro não encontrado.';
-	$text['label-file']['fr'] = "Fichier non trové";
+	$text['label-file']['fr-fr'] = "Fichier non trové";
 
 	$text['description-2']['en-us'] = 'To send a fax you can upload a .tif file or if ghost script has been installed then you can also send a fax by uploading a PDF.';
 	$text['description-2']['pt-pt'] = 'Para enviar um fax, pode carregar um ficheiro .tif ou se o ghost script foi instalado, então também pode enviar um fax, carregando um ficheiro .pdf.';
-	$text['description-2']['fr'] = "Pour envoyer un fax, vous pouvez télécharger un fichier <b>TIF</b>. Si ghost script a été installé, vous pouvez également utiliser un fichier <b>PDF</b>.";
+	$text['description-2']['fr-fr'] = "Pour envoyer un fax, vous pouvez télécharger un fichier <b>TIF</b>. Si ghost script a été installé, vous pouvez également utiliser un fichier <b>PDF</b>.";
 
 	$text['description-3']['en-us'] = 'When sending a fax you can view status of the transmission by viewing the logs from the Status tab or by watching the response from the console.';
 	$text['description-3']['pt-pt'] = 'Ao enviar um fax, pode ver o estado da transmissão, visualizando os logs da tab Status ou assistindo a resposta através da consola.';
-	$text['description-3']['fr'] = "";
+	$text['description-3']['fr-fr'] = "";
 
 	$text['label-fax-number']['en-us'] = 'Fax Number';
 	$text['label-fax-number']['pt-pt'] = 'Número de Fax';
-	$text['label-fax-number']['fr'] = "Numéro de Fax";
+	$text['label-fax-number']['fr-fr'] = "Numéro de Fax";
 
 	$text['description-fax-number']['en-us'] = 'Enter the number here.';
 	$text['description-fax-number']['pt-pt'] = 'Insira aqui o numero.';
-	$text['description-fax-number']['fr'] = "";
+	$text['description-fax-number']['fr-fr'] = "";
 
 	$text['label-location']['en-us'] = 'location';
 	$text['label-location']['pt-pt'] = 'localização';
-	$text['label-location']['fr'] = "Localisation";
+	$text['label-location']['fr-fr'] = "Localisation";
 
 	$text['table-file']['en-us'] = 'File Name (download)';
 	$text['table-file']['pt-pt'] = 'Nome do Ficheiro (descarregado)';
-	$text['table-file']['fr'] = "Nom du fichier (télécharger";
+	$text['table-file']['fr-fr'] = "Nom du fichier (télécharger";
 
 	$text['table-view']['en-us'] = 'View';
 	$text['table-view']['pt-pt'] = 'Visualizar';
-	$text['table-view']['fr'] = "voir";
+	$text['table-view']['fr-fr'] = "voir";
 
 	$text['table-modified']['en-us'] = 'Last Modified';
 	$text['table-modified']['pt-pt'] = 'Última alteração';
-	$text['table-modified']['fr'] = "Dernière modification";
+	$text['table-modified']['fr-fr'] = "Dernière modification";
 
 	$text['table-size']['en-us'] = 'Size';
 	$text['table-size']['pt-pt'] = 'Tamanho';
-	$text['table-size']['fr'] = "Taille";
+	$text['table-size']['fr-fr'] = "Taille";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/fifo/app_config.php b/app/fifo/app_config.php
index 774ec2580c..33b74a4ff7 100644
--- a/app/fifo/app_config.php
+++ b/app/fifo/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Queues are used to setup waiting lines for callers. Also known as FIFO Queues.';
 		$apps[$x]['description']['es-mx'] = 'Las cosas son usadas para configurar líneas de espera.  Son conocidas como colas FIFO.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Les queues sont utilisés pour configurer les salles d'attente (FIFO).";
+		$apps[$x]['description']['fr-fr'] = "Les files sont utilisés pour configurer les salles d'attente (FIFO).";
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'As filas são usados​para configurar as filas de espera para chamadores. Também conhecida como filas FIFO.';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Queues';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Colas';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Queues';
@@ -51,4 +51,4 @@
 		$apps[$x]['permissions'][3]['name'] = 'fifo_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'admin';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/fifo/app_languages.php b/app/fifo/app_languages.php
index a5ee208e34..89d5362a1d 100644
--- a/app/fifo/app_languages.php
+++ b/app/fifo/app_languages.php
@@ -3,68 +3,123 @@
 	// queues
 
 	$text['title-queues']['en-us'] = 'Queues';
+	$text['title-queues']['fr-fr'] = 'Queues';
 	$text['title-queue_add']['en-us'] = 'Queue Add';
+	$text['title-queue_add']['fr-fr'] = 'Ajouter une Queue Add';
 	$text['title-queue_edit']['en-us'] = 'Queue Edit';
+	$text['title-queue_edit']['fr-fr'] = 'Editer la Queue';
 	$text['title-queue_detail_add']['en-us'] = 'Queue Detail Add';
+	$text['title-queue_detail_add']['fr-fr'] = "Ajouter Détails";
 	$text['title-queue_detail_edit']['en-us'] = 'Queue Detail Edit';
+	$text['title-queue_detail_edit']['fr-fr'] = "Editer Détails";
 
 	$text['header-queues']['en-us'] = 'Queues';
+	$text['header-queues']['fr-fr'] = 'Queues';
 	$text['header-queue_add']['en-us'] = 'Queue Add';
+	$text['header-queue_add']['fr-fr'] = 'Ajouter une Queue';
 	$text['header-queue_edit']['en-us'] = 'Queue Edit';
+	$text['header-queue_edit']['fr-fr'] = 'Editer Queue';
 	$text['header-agent_details']['en-us'] = 'Agent Details';
+	$text['header-agent_details']['fr-fr'] = "Détails de l'Agent";
 	$text['header-conditions_and_actions']['en-us'] = 'Conditions and Actions';
+	$text['header-conditions_and_actions']['fr-fr'] = "Conditions et Actions";
 	$text['header-queue_detail_add']['en-us'] = 'Queue Detail Add';
+	$text['header-queue_detail_add']['fr-fr'] = "Ajouter Détails";
 	$text['header-queue_detail_edit']['en-us'] = 'Queue Detail Edit';
+	$text['header-queue_detail_edit']['fr-fr'] = "Editer Détails";
 	$text['header-additional_information']['en-us'] = 'Additional Information';
+	$text['header-additional_information']['fr-fr'] = 'Informations Additionnelles';
 
 
 	$text['description-queues']['en-us'] = 'Queues are used to setup waiting lines for callers. Also known as FIFO Queues.';
+	$text['description-queues']['fr-fr'] = "Les queues sont également appelées files d'attentes ou FIFO queues.";
 	$text['description-queue_add']['en-us'] = 'In simple terms queues are holding patterns for callers to wait until someone is available to take the call. Also known as FIFO Queues.';
+	$text['description-queue_add']['fr-fr'] = "En résumé, ces files d'attente diffusent un média aux appelants en attendant que quelqu'un soit disponible pour traiter cet appel.";
 	$text['description-queue_edit']['en-us'] = 'Queues are used to setup waiting lines for callers. Also known as FIFO Queues.';
+	$text['description-queue_edit']['fr-fr'] = "Les queues sont également appelées files d'attentes ou FIFO queues.";
 	$text['description-conditions_and_actions']['en-us'] = 'The following conditions, actions and anti-actions are used in the dialplan to direct call flow. Each is processed in order until you reach the action dialplan_detail_tag which tells what action to perform. You are not limited to only one condition or action dialplan_detail_tag for a given extension.';
+	$text['description-conditions_and_actions']['fr-fr'] = "Les conditions suivantes, actions et anti-actions sont utilisées par le plan de nuémrotation pour acheminer l'appel. Chaque appel est géré dans l'ordre jusqu'à atteindre l'action \"dialplan_detail_tag\" qui décide de l'action à effectuer. Il n'y a pas de limite sur le nombre de condition ou d'action pour chaque extension.";
 
 	$text['label-name']['en-us'] = 'Name';
+	$text['label-name']['fr-fr'] = 'Nom';
 	$text['label-extension']['en-us'] = 'Extension';
+	$text['label-extension']['fr-fr'] = 'Extension';
 	$text['label-order']['en-us'] = 'Order';
+	$text['label-order']['fr-fr'] = 'Ordre';
 	$text['label-continue']['en-us'] = 'Continue';
+	$text['label-continue']['fr-fr'] = 'Continue';
 	$text['label-enabled']['en-us'] = 'Enabled';
+	$text['label-enabled']['fr-fr'] = 'Actif';
 	$text['label-description']['en-us'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 	$text['label-agent_queue_extension']['en-us'] = 'Queue Extension Number';
+	$text['label-agent_queue_extension']['fr-fr'] = 'Numéro de la file';
 	$text['label-agent_loginout_extension']['en-us'] = 'Login/Logout Extension Number';
+	$text['label-agent_loginout_extension']['fr-fr'] = "Numéro de Login/Logout";
 	$text['label-tag']['en-us'] = 'Tag';
+	$text['label-tag']['fr-fr'] = 'Tag';
 	$text['label-type']['en-us'] = 'Type';
+	$text['label-type']['fr-fr'] = 'Type';
 	$text['label-data']['en-us'] = 'Data';
+	$text['label-data']['fr-fr'] = 'Données';
 	$text['label-order']['en-us'] = 'Order';
+	$text['label-order']['fr-fr'] = 'Ordre';
 	$text['label-field']['en-us'] = 'Field';
+	$text['label-field']['fr-fr'] = 'Champs';
 	$text['label-expression']['en-us'] = 'Expression';
+	$text['label-expression']['fr-fr'] = 'Expression';
 	$text['label-application']['en-us'] = 'Application';
+	$text['label-application']['fr-fr'] = 'Application';
 	$text['label-data']['en-us'] = 'Data';
+	$text['label-data']['fr-fr'] = 'Données';
 	$text['label-value']['en-us'] = 'Value';
+	$text['label-value']['fr-fr'] = 'Valeur';
 
 	$text['description-name']['en-us'] = 'The name the queue will be assigned.';
+	$text['description-name']['fr-fr'] = "Le nom donné à la queue.";
 	$text['description-extension']['en-us'] = 'The number that will be assigned to the queue.';
-	$text['description-agent_queue_extension']['en-us'] = 'The extension number for the Agent FIFO Queue. This is the holding pattern for agents wating to service calls in the caller FIFO queue.';
+	$text['description-extension']['fr-fr'] = "Numéro d'extension pour joindre la queue. ";
+	$text['description-agent_queue_extension']['en-us'] = 'The extension number for the Agent FIFO Queue. This is the holding pattern for agents waiting to service calls in the caller FIFO queue.';
+	$text['description-agent_queue_extension']['fr-fr'] = "Numéro de la queue pour l'agent. Ce sera le numéro entré par l'agent pour souscrire aux appels de cette queue. ";
 	$text['description-agent_loginout_extension']['en-us'] = 'Agents use this extension number to login or logout of the Queue. After logging into the agent will be ready to receive calls from the Queue.';
+	$text['description-agent_loginout_extension']['fr-fr'] = "Numéro utilisé par l'agent pour se connecter/déconnecter de la queue. Après s'être connecté, l'agent sera prêt à recevoir des les appels de la queue.";
 	$text['description-continue']['en-us'] = 'Continue in most cases should be set to false.';
+	$text['description-continue']['fr-fr'] = "Continuer, Dans la plus part des cas à Non.";
 
 	$text['option-true']['en-us'] = 'True';
+	$text['option-true']['fr-fr'] = 'Oui';
 	$text['option-false']['en-us'] = 'False';
+	$text['option-false']['fr-fr'] = 'Non';
 	$text['option-condition']['en-us'] = 'Condition';
+	$text['option-condition']['fr-fr'] = 'Condition';
 	$text['option-action']['en-us'] = 'Action';
+	$text['option-action']['fr-fr'] = 'Action';
 	$text['option-anti-action']['en-us'] = 'Anti-Action';
+	$text['option-anti-action']['fr-fr'] = 'Anti-Action';
 	$text['option-parameter']['en-us'] = 'Parameter';
+	$text['option-parameter']['fr-fr'] = 'Paramètre';
 
 	$text['button-add']['en-us'] = 'Add';
+	$text['button-add']['fr-fr'] = 'Ajouter';
 	$text['button-edit']['en-us'] = 'Edit';
+	$text['button-edit']['fr-fr'] = 'Editer';
 	$text['button-delete']['en-us'] = 'Delete';
+	$text['button-delete']['fr-fr'] = 'Supprimer';
 	$text['button-back']['en-us'] = 'Back';
+	$text['button-back']['fr-fr'] = 'Retour';
 	$text['button-save']['en-us'] = 'Save';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment faire cela?";
 
 	$text['message-add']['en-us'] = 'Add Completed';
+	$text['message-add']['fr-fr'] = 'Ajouté';
 	$text['message-update']['en-us'] = 'Update Completed';
+	$text['message-update']['fr-fr'] = 'Mis à jour';
 	$text['message-delete']['en-us'] = 'Delete Completed';
+	$text['message-delete']['fr-fr'] = 'Supprimé';
 	$text['message-required']['en-us'] = 'Please provide: ';
+	$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/fifo_list/app_config.php b/app/fifo_list/app_config.php
index 8ce6ca3e13..a023b31c6e 100644
--- a/app/fifo_list/app_config.php
+++ b/app/fifo_list/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'List all the queues that are currently active with one or more callers.';
 		$apps[$x]['description']['es-mx'] = 'Lista todas las colas que estan siendo actualmente usadas con una o más personas en espera.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Liste toutes les files d'attente actuellement utilisées avec une ou plus des personnes en attend.";
-		$apps[$x]['description']['fr-ca'] = "Il liste toutes les queues qui sont maintenant utilisés avec une ou plus des personnes en attend.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Liste todas as filas que estão atualmente ativas com um ou mais interlocutores.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,11 +21,11 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Active Queues';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Colas activas';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Queues actives';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = 'Queues actives';
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Files actives';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Filas Activas';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -37,19 +37,19 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'active_queue_view';
+		$apps[$x]['permissions'][0]['name'] = 'active_queues_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'active_queue_add';
+		$apps[$x]['permissions'][1]['name'] = 'active_queues_add';
 		$apps[$x]['permissions'][1]['groups'][] = 'admin';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][2]['name'] = 'active_queue_edit';
+		$apps[$x]['permissions'][2]['name'] = 'active_queues_edit';
 		$apps[$x]['permissions'][2]['groups'][] = 'admin';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][3]['name'] = 'active_queue_delete';
+		$apps[$x]['permissions'][3]['name'] = 'active_queues_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'admin';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/fifo_list/app_languages.php b/app/fifo_list/app_languages.php
index f7f9ef83bf..a5f96eb5b2 100644
--- a/app/fifo_list/app_languages.php
+++ b/app/fifo_list/app_languages.php
@@ -1,28 +1,49 @@
 <?php
 
 	$text['title-active_queues']['en-us'] = 'Active Queues';
+	$text['title-active_queues']['fr-fr'] = 'Files Actives';
 	$text['title-queue']['en-us'] = 'Queue';
+	$text['title-queue']['fr-fr'] = 'File';
 
 	$text['header-active_queues']['en-us'] = 'Active Queues';
+	$text['header-active_queues']['fr-fr'] = 'Files Actives';
 	$text['header-queue']['en-us'] = 'Queue';
+	$text['header-queue']['fr-fr'] = 'File';
 
 	$text['description-active_queues']['en-us'] = 'List all the queues that are currently active with one or more callers.';
+	$text['description-active_queues']['fr-fr'] = "Liste de toutes les files d'attente actuellement actives avec un ou plusieurs appels";
 	$text['description-queue']['en-us'] = 'Use this page to monitor the queue activity.';
+	$text['description-queue']['fr-fr'] = "Utiliser cette page pour superviser l'activité des files d'attente.";
 
 	$text['label-name']['en-us'] = 'Name';
+	$text['label-name']['fr-fr'] = 'Nom';
 	$text['label-consumer_count']['en-us'] = 'Consumer Count';
+	$text['label-consumer_count']['fr-fr'] = 'Décompte Client';
 	$text['label-caller_count']['en-us'] = 'Caller Count';
+	$text['label-caller_count']['fr-fr'] = 'Décompte appelant';
 	$text['label-waiting_count']['en-us'] = 'Waiting Count';
+	$text['label-waiting_count']['fr-fr'] = 'Décompte attente';
 	$text['label-importance']['en-us'] = 'Importance';
+	$text['label-importance']['fr-fr'] = 'Importance';
 	$text['label-view']['en-us'] = 'View';
+	$text['label-view']['fr-fr'] = 'Voir';
 	$text['label-username']['en-us'] = 'Username';
+	$text['label-username']['fr-fr'] = 'Utilisateur';
 	$text['label-caller_id_name']['en-us'] = 'Caller ID Name';
+	$text['label-caller_id_name']['fr-fr'] = "Nom d'appelant";
 	$text['label-caller_id_number']['en-us'] = 'Caller ID Number';
+	$text['label-caller_id_number']['fr-fr'] = "Numéro d'appelant";
 	$text['label-language']['en-us'] = 'Language';
+	$text['label-language']['fr-fr'] = 'Langue';
 	$text['label-destination_number']['en-us'] = 'Destination Number';
+	$text['label-destination_number']['fr-fr'] = 'Numéro Destination';
 	$text['label-position']['en-us'] = 'Position';
+	$text['label-position']['fr-fr'] = 'Position';
 	$text['label-priority']['en-us'] = 'Priority';
+	$text['label-priority']['fr-fr'] = 'Priorité';
 	$text['label-status']['en-us'] = 'Status';
+	$text['label-status']['fr-fr'] = 'Statut';
 	$text['label-duration']['en-us'] = 'Duration';
+	$text['label-duration']['fr-fr'] = 'Durée';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/follow_me/app_config.php b/app/follow_me/app_config.php
index c21259a157..645a4caabe 100644
--- a/app/follow_me/app_config.php
+++ b/app/follow_me/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = '';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = '';
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Follow Me';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Sígueme';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Suis-moi';
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Follow me';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = '';
@@ -47,7 +47,6 @@
 		$apps[$x]['permissions'][$y]['name'] = 'follow_me_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'follow_me_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
@@ -57,31 +56,10 @@
 		$apps[$x]['permissions'][$y]['name'] = 'follow_me_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'follow_me_destination_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'follow_me_destination_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'follow_me_destination_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'follow_me_destination_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$apps[$x]['permissions'][$y]['name'] = 'follow_me_cid_name_prefix';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'follow_me_cid_number_prefix';
-		$y++;
 
 	//schema details
 		$y = 0; //table array index
@@ -158,4 +136,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
 		$z++;
-?>
\ No newline at end of file
+?>
diff --git a/app/gateways/app_config.php b/app/gateways/app_config.php
index d215517485..6b577d8ba8 100644
--- a/app/gateways/app_config.php
+++ b/app/gateways/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Gateways provide access into other voice networks. These can be voice providers or other systems that require SIP registration.';
 		$apps[$x]['description']['es-mx'] = 'Las pasarelas proveen acceso a otras redes de voz.  Pueden ser provedores u otro sistema que requiera registo SIP.';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Les passerelles donnent access autres réseaux vocaux. Ceux-ci peuvent être des opérateurs ou d'autres systèmes reqieérant un enregistrement SIP";
-		$apps[$x]['description']['fr-ca'] = "Les passerelles donnent access autres réseaux vocaux.  Elles pouvent être d'autre furnisseur ou autre système avec la régistration SIP.";
+		$apps[$x]['description']['fr-fr'] = "Les passerelles donnent access autres réseaux vocaux. Ceux-ci peuvent être des opérateurs ou d'autres systèmes reqieérant un enregistrement SIP"; 
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Gateways fornecem acesso em redes de voz outros. Estes podem ser os provedores de voz ou outros sistemas que exigem registro SIP.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Gateways';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Pasarelas';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Passerelles';
@@ -161,14 +161,6 @@
 		$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'] = 'codec_prefs';
-		$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'] = 'channels';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension_in_contact';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php
index 0f872909e7..3dbc23a23f 100644
--- a/app/gateways/app_languages.php
+++ b/app/gateways/app_languages.php
@@ -58,7 +58,7 @@
 
 	$text['label-realm']['en-us'] = 'Realm';
 	$text['label-realm']['pt-pt'] = '';
-	$text['label-realm']['pt-pt'] = 'Royaume';
+	$text['label-realm']['fr-fr'] = 'Royaume';
 
 	$text['description-realm']['en-us'] = 'Enter the realm here.';
 	$text['description-realm']['pt-pt'] = '';
@@ -152,12 +152,6 @@
 	$text['description-ping']['pt-pt'] = '';
 	$text['description-ping']['fr-fr'] = 'Insérer ici la fréquence de ping en secondes.';
 
-	$text['label-channels']['en-us'] = 'Channels:';
-	$text['label-channels']['pt-pt'] = 'Canais:';
-
-	$text['description-channels']['en-us'] = 'Maximum number of simultaneous channels available in the gateway.';
-	$text['description-channels']['pt-pt'] = 'Número máximo de canais simultâneos no gateway.';
-
 	$text['label-caller_id_in_from']['en-us'] = 'Caller Id In From';
 	$text['label-caller_id_in_from']['pt-pt'] = '';
 	$text['label-caller_id_in_from']['fr-fr'] = 'Caller Id In From';
@@ -171,24 +165,17 @@
 	$text['label-supress_cng']['fr-fr'] = 'suppression du silence';
 
 	$text['description-supress_cng']['en-us'] = 'Enter the supress-cng';
+	$text['description-supress_cng']['pt-pt'] = '';
 	$text['description-supress_cng']['fr-fr'] = "Afin de sauvegarder de la bande passante RTP, on n'envoit pas de RTP pour le silence.";
 
 	$text['label-sip_cid_type']['en-us'] = 'Sip CID Type';
 	$text['label-sip_cid_type']['pt-pt'] = '';
-	$text['label-sip_cid_type']['fr-fr'] = "CallerID SIP type";;
+	$text['label-sip_cid_type']['fr-fr'] = "CallerID SIP type";
 
 	$text['description-sip_cid_type']['en-us'] = 'Enter the sip cid type: none, pid, and rpid.';
 	$text['description-sip_cid_type']['pt-pt'] = '';
 	$text['description-sip_cid_type']['fr-fr'] = "Insérer le type d'ID d'appelant : none (utilise le header From) ou pid (P-Asserted-Identity header) ou rpid (remote-Party-ID header).";
 
-	$text['label-codec_prefs']['en-us'] = 'Codec Preferences';
-	$text['label-codec_prefs']['pt-pt'] = 'Lista de Codecs';
-	$text['label-codec_prefs']['fr-fr'] = '';
-
-	$text['description-codec_prefs']['en-us'] = 'Enter the codec preferences as a list. Ex: PCMA,PCMU,G722';
-	$text['description-codec_prefs']['pt-pt'] = 'Introduza os codecs a utilizar no gateway sob a forma de lista. Ex: PCMA,PCMU,G722';
-	$text['description-codec_prefs']['fr-fr'] = "";
-
 	$text['label-extension_in_contact']['en-us'] = 'Extension In Contact';
 	$text['label-extension_in_contact']['pt-pt'] = '';
 	$text['label-extension_in_contact']['fr-fr'] = "L'extension dans Contact";
diff --git a/app/hot_desking/app_config.php b/app/hot_desking/app_config.php
index 518727c544..1b28262c46 100644
--- a/app/hot_desking/app_config.php
+++ b/app/hot_desking/app_config.php
@@ -9,11 +9,11 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Login into hot desking with an ID and your voicemail password to direct your calls to a remote extension. Then make and receive calls as if you were at your extension.';
 		$apps[$x]['description']['es-mx'] = 'Firmarse en un escritorio con un ID y la contaseña para direccionar las llamadas a una extensión remota. Hace y recibe llamadas';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "S'identifier au bureau avec un ID et un mot de passe pour diriger touts les appels vers autre poste. Passer et recevoir appels."; 
-		$apps[$x]['description']['fr-ca'] = "S'identifier au bureau avec un ID et la mot de passe pour diriger touts les appels vers autre bureau lointain.  Faites et recevoyez appels.";
+		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Entrar em desking quente com um ID e sua senha de correio de voz para encaminhar as chamadas para um ramal remoto. Em seguida, fazer e receber ligações como se estivesse em sua extensão.';
 		$apps[$x]['description']['pt-br'] = '';
@@ -21,11 +21,11 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Hot Desking';
 		$apps[$x]['menu'][0]['title']['es-mx'] = 'Escritorio remoto';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Itinérance';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = 'Bureau Lointain';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Hot Desking';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
@@ -48,4 +48,4 @@
 		$apps[$x]['permissions'][3]['name'] = 'hot_desk_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/hot_desking/app_languages.php b/app/hot_desking/app_languages.php
index 756a909df4..fc4ae7c0c6 100644
--- a/app/hot_desking/app_languages.php
+++ b/app/hot_desking/app_languages.php
@@ -3,44 +3,64 @@
 	//Hot Desking
 
 		$text['title-hot_desking']['en-us'] = 'Hot Desking';
+		$text['title-hot_desking']['fr-fr'] = 'Itinérance';
 
 		$text['header-hot_desking']['en-us'] = 'Hot Desking';
-
+		$text['header-hot_desking']['fr-fr'] = 'Itinérance';
 		$text['header-message']['en-us'] = 'Message';
+		$text['header-message']['fr-fr'] = 'Message';
 
 		$text['description-hot_desking']['en-us'] = 'Log in to hot desking with a unique ID and your voicemail password to direct your calls to a remote extension. Then, make and receive calls as if you were at your extension.';
+		$text['description-hot_desking']['fr-fr'] = "Se connecter à l'itinérance avec votre Identifiant et votre mot de passe de messagerie pour rediriger vos appels vers une extensions distante. Alors, passez et recevez des appels comme si vous étiez sur votre extensions. ";
 
 		$text['label-extension']['en-us'] = 'Extension';
-
+		$text['label-extension']['fr-fr'] = 'Extension';
 		$text['label-unique_id']['en-us'] = 'Unique ID';
-
+		$text['label-unique_id']['fr-fr'] = 'Unique ID';
 		$text['label-forward_to']['en-us'] = 'Forward To';
-
+		$text['label-forward_to']['fr-fr'] = "Renvoyé vers";
 		$text['label-description']['en-us'] = 'Description';
-
+		$text['label-description']['fr-fr'] = 'Description';
 		$text['label-voicemail_password']['en-us'] = 'Voicemail Password';
-
+		$text['label-voicemail_password']['fr-fr'] = "Mot de passe de la messagerie";
 		$text['label-dial_string']['en-us'] = 'Dial String';
+		$text['label-dial_string']['fr-fr'] = "numérotation";
 
 		$text['description-extension-add']['en-us'] = 'Select the extension number.';
+		$text['description-extension-add']['fr-fr'] = "Choisir le numéro d'extension.";
 		$text['description-extension-edit']['en-us'] = 'Extension number.';
+		$text['description-extension-edit']['fr-fr'] = "Numéro d'extension.";
 		$text['description-unique_id']['en-us'] = 'A unique NUMERIC ID to identify the extension and domain.';
+		$text['description-unique_id']['fr-fr'] = "Un Identifiant numérique Unique afin d'identifier l'extension et le domaine.";
 		$text['description-voicemail_password']['en-us'] = 'Enter the voicemail password here.';
+		$text['description-voicemail_password']['fr-fr'] = "Insérer le Mot de passe de la messagerie ici.";
 		$text['description-password']['en-us'] = 'Password';
+		$text['description-password']['fr-fr'] = 'Mot de passe';
 		$text['description-dial_string']['en-us'] = 'Location of the endpoint.';
+		$text['description-dial_string']['fr-fr'] = "Localisation de l'équipement.";
 
 		$text['button-add']['en-us'] = 'Add';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 		$text['button-edit']['en-us'] = 'Edit';
+		$text['button-edit']['fr-fr'] = 'Editer';
 		$text['button-delete']['en-us'] = 'Delete';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 		$text['button-back']['en-us'] = 'Back';
+		$text['button-back']['fr-fr'] = 'Retour';
 		$text['button-save']['en-us'] = 'Save';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 		$text['message-add']['en-us'] = 'Add Completed';
+		$text['message-add']['fr-fr'] = "Ajouté";
 		$text['message-update']['en-us'] = 'Update Completed';
+		$text['message-update']['fr-fr'] = "Mis à jour";
 		$text['message-delete']['en-us'] = 'Delete Completed';
+		$text['message-delete']['fr-fr'] = "Supprimé";
 		$text['message-required']['en-us'] = 'Please provide: ';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 		$text['message-unique']['en-us'] = 'The Unique ID is not unique.  Please provide a numeric ID not already in use by a different extension.';
-
-?>
\ No newline at end of file
+		$text['message-unique']['fr-fr'] = "Le \"Unique ID\" n'est pas unique. Merci d'indiquer un identifiant numérique n'étant pas déjà utilisé par une autre extension.";
+?>
diff --git a/app/ivr_menu/app_config.php b/app/ivr_menu/app_config.php
index d43717b48e..6b4103b4be 100644
--- a/app/ivr_menu/app_config.php
+++ b/app/ivr_menu/app_config.php
@@ -7,21 +7,21 @@
 		$apps[$x]['version'] = '';
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = "The IVR Menu plays a recording or a pre-defined phrase that presents the caller with options to choose from. Each option has a corresponding destination. The destinations can be extensions, voicemail, IVR menus, hunt groups, FAX extensions, and more.";
+		$apps[$x]['description']['en-us'] = 'The IVR Menu plays a recording or a pre-defined phrase that presents the caller with options to choose from. Each option has a corresponding destination. The destinations can be extensions, voicemail, IVR menus, hunt groups, FAX extensions, and more.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Le menu SVI joue un enregistrement ou une phrase prédéfinie permettant à l'appelant de faire un choix. Ce choix l'amenant sur une destination spécifique. Cette destination peut être une extension, une messagerie vocale, un IVR, un groupement, un FAX ...";
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = "O menu IVR toca uma gravação ou uma frase pré-definida, que apresenta o chamador com opções para escolher. Cada opção tem um destino correspondente. Os destinos podem ser extensões, correio de voz, menus IVR, grupos de busca, extensões de fax, e muito mais.";
+		$apps[$x]['description']['pt-pt'] = 'O menu IVR toca uma gravação ou uma frase pré-definida, que apresenta o chamador com opções para escolher. Cada opção tem um destino correspondente. Os destinos podem ser extensões, correio de voz, menus IVR, grupos de busca, extensões de fax, e muito mais.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'IVR Menu';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Menu SVI';
@@ -37,39 +37,22 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'ivr_menu_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '72259497-a67b-e5aa-cac2-0f2dcef16308';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ivr_menu_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ivr_menu_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ivr_menu_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ivr_menu_option_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ivr_menu_option_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ivr_menu_option_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ivr_menu_option_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['name'] = 'ivr_menu_view';
+		$apps[$x]['permissions'][0]['menu']['uuid'] = '72259497-a67b-e5aa-cac2-0f2dcef16308';
+		$apps[$x]['permissions'][0]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'ivr_menu_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'admin';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'ivr_menu_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'admin';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'ivr_menu_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'admin';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -280,4 +263,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$z++;
 
-?>
\ No newline at end of file
+?>
diff --git a/app/ivr_menu/app_languages.php b/app/ivr_menu/app_languages.php
index a0e96d9c6e..29ef79359a 100644
--- a/app/ivr_menu/app_languages.php
+++ b/app/ivr_menu/app_languages.php
@@ -1,177 +1,177 @@
 <?php
 
 	$text['title-ivr_menus']['en-us'] = 'IVR Menus';
-	$text['title-ivr_menus']['fr'] = 'Menus SVI';
+	$text['title-ivr_menus']['fr-fr'] = 'Menus SVI';
 	$text['title-ivr_menu']['en-us'] = 'IVR Menu';
-	$text['title-ivr_menu']['fr'] = 'Menu SVI';
+	$text['title-ivr_menu']['fr-fr'] = 'Menu SVI';
 	$text['title-option_add']['en-us'] = 'IVR Menu Option Add';
-	$text['title-option_add']['fr'] = "Menu SVI Ajouter une Option";
+	$text['title-option_add']['fr-fr'] = "Menu SVI Ajouter une Option";
 	$text['title-option_edit']['en-us'] = 'IVR Menu Option Edit';
-	$text['title-option_edit']['fr'] = "Menu SVI Editer un Option";
+	$text['title-option_edit']['fr-fr'] = "Menu SVI Editer un Option";
 
 	$text['header-ivr_menus']['en-us'] = 'IVR Menus';
-	$text['header-ivr_menus']['fr'] = 'Menus SVI';
+	$text['header-ivr_menus']['fr-fr'] = 'Menus SVI';
 	$text['header-ivr_menu']['en-us'] = 'IVR Menu';
-	$text['header-ivr_menu']['fr'] = 'Menu SVI';
+	$text['header-ivr_menu']['fr-fr'] = 'Menu SVI';
 	$text['header-option_list']['en-us'] = 'Option List';
-	$text['header-option_list']['fr'] = "Liste d'Option";
+	$text['header-option_list']['fr-fr'] = "Liste d'Option";
 	$text['header-option_add']['en-us'] = 'IVR Menu Option Add';
-	$text['header-option_add']['fr'] = "Menu SVI Ajouter une Option";
+	$text['header-option_add']['fr-fr'] = "Menu SVI Ajouter une Option";
 	$text['header-option_edit']['en-us'] = 'IVR Menu Option Edit';
-	$text['header-option_edit']['fr'] = "Menu SVI Editer un Option";
+	$text['header-option_edit']['fr-fr'] = "Menu SVI Editer un Option";
 
 	$text['description-ivr_menus']['en-us'] = 'The IVR Menu plays a recording or a pre-defined phrase that presents the caller with options to choose from. Each option has a corresponding destination. The destinations can be extensions, voicemail, other IVR menus, call groups, FAX extensions, and more.';
-	$text['description-ivr_menus']['fr'] = "Le Menu SVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus SVI, groupes d'appel, Fax, ou autres.";
+	$text['description-ivr_menus']['fr-fr'] = "Le Menu SVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus SVI, groupes d'appel, Fax, ou autres.";
 	$text['description-ivr_menu']['en-us'] = 'The IVR Menu plays a recording or a pre-defined phrase that presents the caller with options to choose from. Each option has a corresponding destination. The destinations can be extensions, voicemail, other IVR menus, call groups, FAX extensions, and more.';
-	$text['description-ivr_menu']['fr'] = "Le Menu SVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus SVI, groupes d'appel, Fax, ou autres.";
+	$text['description-ivr_menu']['fr-fr'] = "Le Menu SVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus SVI, groupes d'appel, Fax, ou autres.";
 	$text['description-option_list']['en-us'] = 'The recording presents options to the caller. Options match key presses (DTMF digits) from the caller which directs the call to the destinations.';
-	$text['description-option_list']['fr'] = "Le guide vocal présente les options possibles à l'appelant. Ces options correspondent aux digits (DTMF) émises par l'appelant et lui permettant de choisir une destination.";
+	$text['description-option_list']['fr-fr'] = "Le guide vocal présente les options possibles à l'appelant. Ces options correspondent aux digits (DTMF) émises par l'appelant et lui permettant de choisir une destination.";
 	$text['description-option_add_edit']['en-us'] = 'The recording presents options to the caller. Options match key presses (DTMF digits) from the caller which directs the call to the destinations. ';
-	$text['description-option_add_edit']['fr'] = "Le guide vocal présente les options possibles à l'appelant. Ces options correspondent aux digits (DTMF) émises par l'appelant et lui permettant de choisir une destination.";
+	$text['description-option_add_edit']['fr-fr'] = "Le guide vocal présente les options possibles à l'appelant. Ces options correspondent aux digits (DTMF) émises par l'appelant et lui permettant de choisir une destination.";
 
 	$text['label-name']['en-us'] = 'Name';
-	$text['label-name']['fr'] = 'Nom';
+	$text['label-name']['fr-fr'] = 'Nom';
 	$text['label-extension']['en-us'] = 'Extension';
-	$text['label-extension']['fr'] = 'Extension';
+	$text['label-extension']['fr-fr'] = 'Extension';
 	$text['label-greet_long']['en-us'] = 'Greet Long';
-	$text['label-greet_long']['fr'] = 'Message Long';
+	$text['label-greet_long']['fr-fr'] = 'Message Long';
 	$text['label-greet_short']['en-us'] = 'Greet Short';
-	$text['label-greet_short']['fr'] = 'Message Court';
+	$text['label-greet_short']['fr-fr'] = 'Message Court';
 	$text['label-timeout']['en-us'] = 'Timeout';
-	$text['label-timeout']['fr'] = 'Timeout';
+	$text['label-timeout']['fr-fr'] = 'Timeout';
 	$text['label-exit_action']['en-us'] = 'Exit Action';
-	$text['label-exit_action']['fr'] = 'Action de Sortie';
+	$text['label-exit_action']['fr-fr'] = 'Action de Sortie';
 	$text['label-direct_dial']['en-us'] = 'Direct Dial';
-	$text['label-direct_dial']['fr'] = 'Appel Direct';
+	$text['label-direct_dial']['fr-fr'] = 'Appel Direct';
 	$text['label-ring_back']['en-us'] = 'Ring Back';
-	$text['label-ring_back']['fr'] = 'Retour de Sonnerie';
+	$text['label-ring_back']['fr-fr'] = 'Retour de Sonnerie';
 	$text['label-caller_id_name_prefix']['en-us'] = 'Caller ID Name Prefix';
-	$text['label-caller_id_name_prefix']['fr'] = "Préfixe ajouté au nom de l'appelant";
+	$text['label-caller_id_name_prefix']['fr-fr'] = "Préfixe ajouté au nom de l'appelant";
 	$text['label-invalid_sound']['en-us'] = 'Invalid Sound';
-	$text['label-invalid_sound']['fr'] = 'Audio si Invalide';
+	$text['label-invalid_sound']['fr-fr'] = 'Audio si Invalide';
 	$text['label-exit_sound']['en-us'] = 'Exit Sound';
-	$text['label-exit_sound']['fr'] = "Audio de sortie";
+	$text['label-exit_sound']['fr-fr'] = "Audio de sortie";
 	$text['label-comfirm_macro']['en-us'] = 'Confirm Macro';
-	$text['label-comfirm_macro']['fr'] = 'Macro de Confirmation';
+	$text['label-comfirm_macro']['fr-fr'] = 'Macro de Confirmation';
 	$text['label-comfirm_key']['en-us'] = 'Confirm Key';
-	$text['label-comfirm_key']['fr'] = 'Touche de Confirmation';
+	$text['label-comfirm_key']['fr-fr'] = 'Touche de Confirmation';
 	$text['label-tts_engine']['en-us'] = 'TTS Engine';
-	$text['label-tts_engine']['fr'] = 'Moteur TTS';
+	$text['label-tts_engine']['fr-fr'] = 'Moteur TTS';
 	$text['label-tts_voice']['en-us'] = 'TTS Voice';
-	$text['label-tts_voice']['fr'] = 'Voix TTS';
+	$text['label-tts_voice']['fr-fr'] = 'Voix TTS';
 
 	$text['label-comfirm_attempts']['en-us'] = 'Confirm Attempts';
-	$text['label-comfirm_attempts']['fr'] = 'Essais de Confirmation';
+	$text['label-comfirm_attempts']['fr-fr'] = 'Essais de Confirmation';
 	$text['label-inter-digit_timeout']['en-us'] = 'Inter-Digit Timeout';
-	$text['label-inter-digit_timeout']['fr'] = 'Timeout Inter-Digit';
+	$text['label-inter-digit_timeout']['fr-fr'] = 'Timeout Inter-Digit';
 	$text['label-max_failures']['en-us'] = 'Max Failures';
-	$text['label-max_failures']['fr'] = 'Echecs Max';
+	$text['label-max_failures']['fr-fr'] = 'Echecs Max';
 	$text['label-max_timeouts']['en-us'] = 'Max Timeouts';
-	$text['label-max_timeouts']['fr'] = 'Timeouts Max';
+	$text['label-max_timeouts']['fr-fr'] = 'Timeouts Max';
 	$text['label-digit_length']['en-us'] = 'Digit Length';
-	$text['label-digit_length']['fr'] = 'Nombre de Digits';
+	$text['label-digit_length']['fr-fr'] = 'Nombre de Digits';
 	$text['label-enabled']['en-us'] = 'Enabled';
-	$text['label-enabled']['fr'] = 'Actif';
+	$text['label-enabled']['fr-fr'] = 'Actif';
 	$text['label-description']['en-us'] = 'Description';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 	$text['label-advanced']['en-us'] = 'Show Advanced';
-	$text['label-advanced']['fr'] = 'Paramètres Avancés';
+	$text['label-advanced']['fr-fr'] = 'Paramètres Avancés';
 	$text['label-option']['en-us'] = 'Option';
-	$text['label-option']['fr'] = 'Option';
+	$text['label-option']['fr-fr'] = 'Option';
 	$text['label-options']['en-us'] = 'Options';
-	$text['label-options']['fr'] = 'Options';
+	$text['label-options']['fr-fr'] = 'Options';
 	$text['label-destination']['en-us'] = 'Destination';
-	$text['label-destination']['fr'] = 'Destination';
+	$text['label-destination']['fr-fr'] = 'Destination';
 	$text['label-order']['en-us'] = 'Order';
-	$text['label-order']['fr'] = 'Ordre';
+	$text['label-order']['fr-fr'] = 'Ordre';
 
 	$text['description-name']['en-us'] = 'Enter a name for the IVR menu.';
-	$text['description-name']['fr'] =  "Choisir un nom pour le menu SVI";
+	$text['description-name']['fr-fr'] =  "Choisir un nom pour le menu SVI";
 	$text['description-extension']['en-us'] = 'Enter the extension number.';
-	$text['description-extension']['fr'] = "Choisir le numéro d'extension.";
+	$text['description-extension']['fr-fr'] = "Choisir le numéro d'extension.";
 	$text['description-greet_long']['en-us'] = 'The long greeting is played when entering the menu.';
-	$text['description-greet_long']['fr'] = "Le message long est joué une fois lorsque l'on entre dans le menu.";
+	$text['description-greet_long']['fr-fr'] = "Le message long est joué une fois lorsque l'on entre dans le menu.";
 	$text['description-greet_short']['en-us'] = 'The short greeting is played when returning to the menu.';
-	$text['description-greet_short']['fr'] = "Le message court est joué lors du retour dans le menu, donc à la suite du message long.";
+	$text['description-greet_short']['fr-fr'] = "Le message court est joué lors du retour dans le menu, donc à la suite du message long.";
 	$text['description-timeout']['en-us'] = 'The number of milliseconds to wait after playing the greeting or the confirm macro.';
-	$text['description-timeout']['fr'] = "Le temps en millisecondes à attendre après le message ou la marco de confirmation.";
+	$text['description-timeout']['fr-fr'] = "Le temps en millisecondes à attendre après le message ou la marco de confirmation.";
 	$text['description-exit_action']['en-us'] = 'Select the exit action to be performed if the IVR exits.';
-	$text['description-exit_action']['fr'] = "Choisir l'action à executer en sortie si on sort du SVI par ailleurs qu'un des choix proposé.";
+	$text['description-exit_action']['fr-fr'] = "Choisir l'action à executer en sortie si on sort du SVI par ailleurs qu'un des choix proposé.";
 	$text['description-direct_dial']['en-us'] = 'Define whether callers can dial directly to extensions and feature codes.';
-	$text['description-direct_dial']['fr'] = "Défini si on peut appeler directement le SVI via une extension ou un code.";
+	$text['description-direct_dial']['fr-fr'] = "Défini si on peut appeler directement le SVI via une extension ou un code.";
 	$text['description-ring_back']['en-us'] = 'Defines what the caller will hear while the destination is being called.';
-	$text['description-ring_back']['fr'] = "Défini ce que l'appelant entendra lorsque la destination sera en sonnerie.";
+	$text['description-ring_back']['fr-fr'] = "Défini ce que l'appelant entendra lorsque la destination sera en sonnerie.";
 	$text['description-caller_id_name_prefix']['en-us'] = 'Set a prefix on the caller ID name.';
-	$text['description-caller_id_name_prefix']['fr'] = "Choisie un préfixe à ajouter au nom de l'appelant.";
+	$text['description-caller_id_name_prefix']['fr-fr'] = "Choisie un préfixe à ajouter au nom de l'appelant.";
 	$text['description-invalid_sound']['en-us'] = 'Played when and invalid option is chosen.';
-	$text['description-invalid_sound']['fr'] = "Joué quand une option invalide est choisie.";
+	$text['description-invalid_sound']['fr-fr'] = "Joué quand une option invalide est choisie.";
 	$text['description-exit_sound']['en-us'] = 'Played when leaving the menu.';
-	$text['description-exit_sound']['fr'] = "Joué lorsque l'on quitte ce menu.";
+	$text['description-exit_sound']['fr-fr'] = "Joué lorsque l'on quitte ce menu.";
 	$text['description-comfirm_macro']['en-us'] = 'Enter the confirm macro.';
-	$text['description-comfirm_macro']['fr'] = "Entrer la Macro de Confirmation.";
+	$text['description-comfirm_macro']['fr-fr'] = "Entrer la Macro de Confirmation.";
 	$text['description-comfirm_key']['en-us'] = 'Enter the confirm key.';
-	$text['description-comfirm_key']['fr'] = "Entrer la touche de confirmation.";
+	$text['description-comfirm_key']['fr-fr'] = "Entrer la touche de confirmation.";
 	$text['description-tts_engine']['en-us'] = 'Text to speech engine.';
-	$text['description-tts_engine']['fr'] = "Moteur du Text-To-Speech (texte vers parole)";
+	$text['description-tts_engine']['fr-fr'] = "Moteur du Text-To-Speech (texte vers parole)";
 	$text['description-tts_voice']['en-us'] = 'Text to speech voice.';
-	$text['description-tts_voice']['fr'] = "Voix du Text-To-Speech (texte vers parole)";
+	$text['description-tts_voice']['fr-fr'] = "Voix du Text-To-Speech (texte vers parole)";
 	$text['description-comfirm_attempts']['en-us'] = 'The maximum number of confirm attempts allowed.';
-	$text['description-comfirm_attempts']['fr'] = "Nombre maximum de tentatives de confirmation authorisées.";
+	$text['description-comfirm_attempts']['fr-fr'] = "Nombre maximum de tentatives de confirmation authorisées.";
 	$text['description-inter-digit_timeout']['en-us'] = 'The number of milliseconds to wait between digits.';
-	$text['description-inter-digit_timeout']['fr'] = "Le temps en millisecondes à attendre entre deux digits.";
+	$text['description-inter-digit_timeout']['fr-fr'] = "Le temps en millisecondes à attendre entre deux digits.";
 	$text['description-max_failures']['en-us'] = 'Maximum number of retries before exit.';
-	$text['description-max_failures']['fr'] = "Nombre maximum de tentatives avant de sortir.";
+	$text['description-max_failures']['fr-fr'] = "Nombre maximum de tentatives avant de sortir.";
 	$text['description-max_timeouts']['en-us'] = 'Maximum number of timeouts before exit.';
-	$text['description-max_timeouts']['fr'] = "Nombre maximum de timeouts avant de sortir.";
+	$text['description-max_timeouts']['fr-fr'] = "Nombre maximum de timeouts avant de sortir.";
 	$text['description-digit_length']['en-us'] = 'Maximum number of digits allowed.';
-	$text['description-digit_length']['fr'] = "Nombre maximum ed digits authorisés.";
+	$text['description-digit_length']['fr-fr'] = "Nombre maximum ed digits authorisés.";
 	$text['description-enabled']['en-us'] = 'Set the status of this IVR Menu.';
-	$text['description-enabled']['fr'] = "Choisir l'état de ce menu.";
+	$text['description-enabled']['fr-fr'] = "Choisir l'état de ce menu.";
 	$text['description-description']['en-us'] = 'Enter a description, if desired.';
-	$text['description-description']['fr'] = "";
+	$text['description-description']['fr-fr'] = "";
 	$text['description-option']['en-us'] = 'Any number between 1-5 digits or regular expressions.';
-	$text['description-option']['fr'] = "N'importe quel numéro entre 1 et 5 digits, ou une expression régulière.";
+	$text['description-option']['fr-fr'] = "N'importe quel numéro entre 1 et 5 digits, ou une expression régulière.";
 	$text['description-destination']['en-us'] = 'Select the destination.';
-	$text['description-destination']['fr'] = "Choisir la destination.";
+	$text['description-destination']['fr-fr'] = "Choisir la destination.";
 	$text['description-order']['en-us'] = 'Select the order.';
-	$text['description-order']['fr'] = "Choisir l'ordre.";
+	$text['description-order']['fr-fr'] = "Choisir l'ordre.";
 
 	$text['option-true']['en-us'] = 'True';
-	$text['option-true']['fr'] = 'Oui';
+	$text['option-true']['fr-fr'] = 'Oui';
 	$text['option-false']['en-us'] = 'False';
-	$text['option-false']['fr'] = 'Non';
+	$text['option-false']['fr-fr'] = 'Non';
 
 	$text['button-add']['en-us'] = 'Add';
-	$text['button-add']['fr'] = 'Ajouter';
+	$text['button-add']['fr-fr'] = 'Ajouter';
 	$text['button-edit']['en-us'] = 'Edit';
-	$text['button-edit']['fr'] = 'Editer';
+	$text['button-edit']['fr-fr'] = 'Editer';
 	$text['button-delete']['en-us'] = 'Delete';
-	$text['button-delete']['fr'] = 'Supprimer';
+	$text['button-delete']['fr-fr'] = 'Supprimer';
 	$text['button-advanced']['en-us'] = 'Advanced';
-	$text['button-advanced']['fr'] = 'Afficher les paramètres avancés';
+	$text['button-advanced']['fr-fr'] = 'Afficher les paramètres avancés';
 	$text['button-back']['en-us'] = 'Back';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 	$text['button-copy']['en-us'] = 'Copy';
-	$text['button-copy']['fr'] = 'Copier';
+	$text['button-copy']['fr-fr'] = 'Copier';
 	$text['button-save']['en-us'] = 'Save';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 	$text['button-restore']['en-us'] = 'Restore Default';
-	$text['button-restore']['fr'] = "Restaurer les paramètres par défaut";
+	$text['button-restore']['fr-fr'] = "Restaurer les paramètres par défaut";
 
 	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
-	$text['confirm-delete']['fr'] = "Voulez-vous vraiment supprimer cela?";
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 	$text['confirm-copy']['en-us'] = 'Do you really want to copy this?';
-	$text['confirm-copy']['fr'] = "Voulez-vous vraiment copier cela?";
+	$text['confirm-copy']['fr-fr'] = "Voulez-vous vraiment copier cela?";
 
 	$text['message-add']['en-us'] = 'Add Completed';
-	$text['message-add']['fr'] = 'Ajouté';
+	$text['message-add']['fr-fr'] = 'Ajouté';
 	$text['message-update']['en-us'] = 'Update Completed';
-	$text['message-update']['fr'] = 'Mis à jour';
+	$text['message-update']['fr-fr'] = 'Mis à jour';
 	$text['message-delete']['en-us'] = 'Delete Completed';
-	$text['message-delete']['fr'] = 'Supprimé';
+	$text['message-delete']['fr-fr'] = 'Supprimé';
 	$text['message-copy']['en-us'] = 'Copy Completed';
-	$text['message-copy']['fr'] = 'Copié';
+	$text['message-copy']['fr-fr'] = 'Copié';
 	$text['message-required']['en-us'] = 'Please provide: ';
-	$text['message-required']['fr'] = "Merci d'indiquer: ";
+	$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/log_viewer/app_config.php b/app/log_viewer/app_config.php
index 1dc8037628..5ebe98bf6f 100644
--- a/app/log_viewer/app_config.php
+++ b/app/log_viewer/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Display the switch logs.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Logs du switch.';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Log Viewer';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Voir les Logs';
@@ -42,4 +42,4 @@
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][2]['name'] = 'log_path_view';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/log_viewer/app_languages.php b/app/log_viewer/app_languages.php
index 34d3663601..ec249b19eb 100644
--- a/app/log_viewer/app_languages.php
+++ b/app/log_viewer/app_languages.php
@@ -27,32 +27,32 @@
 */
 
 	$text['label-log-viewer']['en-us'] = 'Log Viewer';
-	$text['label-log-viewer']['fr'] = 'Afficher les Logs';
+	$text['label-log-viewer']['fr-fr'] = 'Afficher les Logs';
 	$text['label-line-num']['en-us'] = 'Show Line Numbers';
-	$text['label-line-num']['fr'] = 'Afficher les numéros de ligne';
+	$text['label-line-num']['fr-fr'] = 'Afficher les numéros de ligne';
 	$text['label-sort']['en-us'] = 'Sort Descending';
-	$text['label-sort']['fr'] = 'Affichage ordre descendant';
+	$text['label-sort']['fr-fr'] = 'Affichage ordre descendant';
 	$text['label-filter']['en-us'] = 'Filter';
-	$text['label-filter']['fr'] = 'Filtre';
+	$text['label-filter']['fr-fr'] = 'Filtre';
 	$text['description-filter']['en-us'] = 'Filtering the log with the text:';
-	$text['description-filter']['fr'] = 'Filtrer les logs avec le texte:';
+	$text['description-filter']['fr-fr'] = 'Filtrer les logs avec le texte:';
 	$text['button-reload']['en-us'] = 'Reload';
-	$text['button-reload']['fr'] = 'Recharger';
+	$text['button-reload']['fr-fr'] = 'Recharger';
 	$text['label-kb']['en-us'] = 'KB'; //KiloBytes
-	$text['label-kb']['fr'] = 'KB'; //KiloBytes
+	$text['label-kb']['fr-fr'] = 'KB'; //KiloBytes
 	$text['button-download']['en-us'] = 'Download Logs';
-	$text['button-download']['fr'] = 'Télécharger les Logs';
+	$text['button-download']['fr-fr'] = 'Télécharger les Logs';
 	$text['label-displaying']['en-us'] = 'Displaying the last';
-	$text['label-displaying']['fr'] = 'Afficher les derniers';
+	$text['label-displaying']['fr-fr'] = 'Afficher les derniers';
 	$text['label-bytes']['en-us'] = 'bytes';
-	$text['label-bytes']['fr'] = 'bytes';
+	$text['label-bytes']['fr-fr'] = 'bytes';
 	$text['label-syntax']['en-us'] = 'Syntax Highlighted';
-	$text['label-syntax']['fr'] = 'Coloration Syntaxique';
+	$text['label-syntax']['fr-fr'] = 'Coloration Syntaxique';
 	$text['label-open-at']['en-us'] = 'opening at';
-	$text['label-open-at']['fr'] = 'Ouvrir à';
+	$text['label-open-at']['fr-fr'] = 'Ouvrir à';
 	$text['label-open-file']['en-us'] = 'opening entire file';
-	$text['label-open-file']['fr'] = 'Ouvrir le fichier entier';
+	$text['label-open-file']['fr-fr'] = 'Ouvrir le fichier entier';
 	$text['error-open-file']['en-us'] = 'Unable to open file!';
-	$text['error-open-file']['fr'] = "Impossible d'ouvrir le fichier!";
+	$text['error-open-file']['fr-fr'] = "Impossible d'ouvrir le fichier!";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/login/app_config.php b/app/login/app_config.php
index fc1317e271..3b3d75b3b4 100644
--- a/app/login/app_config.php
+++ b/app/login/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Used to login to a user account';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Pour connecter un compte usager";
+		$apps[$x]['description']['fr-fr'] = 'Pour connecter un compte usager';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = '';
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Login';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Connection';
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Connexion';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Entrar';
@@ -38,7 +38,7 @@
 
 		$apps[$x]['menu'][1]['title']['en-us'] = 'Logout';
 		$apps[$x]['menu'][1]['title']['es-mx'] = '';
-		$apps[$x]['menu'][1]['title']['de-de'] = '';
+		$apps[$x]['menu'][1]['title']['de'] = '';
 		$apps[$x]['menu'][1]['title']['de-ch'] = '';
 		$apps[$x]['menu'][1]['title']['de-at'] = '';
 		$apps[$x]['menu'][1]['title']['fr-fr'] = 'Déconnexion';
@@ -54,4 +54,4 @@
 		$apps[$x]['menu'][1]['groups'][] = 'admin';
 		$apps[$x]['menu'][1]['groups'][] = 'superadmin';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/meetings/app_config.php b/app/meetings/app_config.php
index 04b98b78ef..1fac0898bf 100644
--- a/app/meetings/app_config.php
+++ b/app/meetings/app_config.php
@@ -8,6 +8,7 @@
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = '';
+		$apps[$x]['description']['fr-fr'] = '';
 
 	//menu details
 		/*
@@ -22,38 +23,27 @@
 		*/
 
 	//permission details
+		/*
 		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'meeting_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'meeting_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'meeting_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'meeting_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'meeting_user_view';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'meeting_user_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'meeting_user_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'meeting_user_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		*/
 
 	//schema details
 		$y = 0; //table array index
@@ -116,4 +106,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'user_uuid';
 		$z++;
 
-?>
\ No newline at end of file
+?>
diff --git a/app/modules/app_config.php b/app/modules/app_config.php
index 5822adb5a1..f648713ec9 100644
--- a/app/modules/app_config.php
+++ b/app/modules/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Modules extend the features of the system. Use this page to enable or disable modules.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Les Modules augmentent les fonctionnalitées du système. Ici il est possible de les activer et de les désactiver.";
+		$apps[$x]['description']['fr-fr'] = 'Les Modules augmentent les fonctionnalitées du système. Ici il est possible de les activer et de les désactiver.';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Módulos estendem as funcionalidades do sistema. Utilize esta página para ativar ou desativar módulos.';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Modules';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Modules';
@@ -36,16 +36,16 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'module_view';
+		$apps[$x]['permissions'][0]['name'] = 'modules_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'module_add';
+		$apps[$x]['permissions'][1]['name'] = 'modules_add';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][2]['name'] = 'module_edit';
+		$apps[$x]['permissions'][2]['name'] = 'modules_edit';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][3]['name'] = 'module_delete';
+		$apps[$x]['permissions'][3]['name'] = 'modules_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
 	//schema details
@@ -102,4 +102,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/modules/app_languages.php b/app/modules/app_languages.php
index dcabdb0cb8..64d153da7c 100644
--- a/app/modules/app_languages.php
+++ b/app/modules/app_languages.php
@@ -1,47 +1,81 @@
-<?php
-
-	//Modules
-
-	$text['title-modules']['en-us'] = 'Modules';
-	$text['title-module_add']['en-us'] = 'Module Add';
-	$text['title-module_edit']['en-us'] = 'Module Edit';
-
-	$text['header-modules']['en-us'] = 'Modules';
-	$text['header-module_add']['en-us'] = 'Module Add';
-	$text['header-module_edit']['en-us'] = 'Module Edit';
-
-	$text['description-modules']['en-us'] = 'Modules extend the features of the system. Use this page to enable or disable modules.';
-
-	$text['label-label']['en-us'] = 'Label';
-	$text['label-module_name']['en-us'] = 'Module Name';
-	$text['label-description']['en-us'] = 'Description';
-	$text['label-module_category']['en-us'] = 'Module Category';
-	$text['label-status']['en-us'] = 'Status';
-	$text['label-action']['en-us'] = 'Action';
-	$text['label-enabled']['en-us'] = 'Enabled';
-	$text['label-default_enabled']['en-us'] = 'Default Enabled';
-	$text['label-stopped']['en-us'] = 'Stopped';
-	$text['label-running']['en-us'] = 'Running';
-	$text['label-start']['en-us'] = 'Start';
-	$text['label-stop']['en-us'] = 'Stop';
-	$text['label-unload_module']['en-us'] = 'Unload Module';
-	$text['label-load_module']['en-us'] = 'Load Module';
-	$text['label-message']['en-us'] = 'Message';
-
-	$text['option-true']['en-us'] = 'True';
-	$text['option-false']['en-us'] = 'False';
-
-	$text['button-add']['en-us'] = 'Add';
-	$text['button-edit']['en-us'] = 'Edit';
-	$text['button-delete']['en-us'] = 'Delete';
-	$text['button-back']['en-us'] = 'Back';
-	$text['button-save']['en-us'] = 'Save';
-
-	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
-
-	$text['message-add']['en-us'] = 'Add Completed';
-	$text['message-update']['en-us'] = 'Update Completed';
-	$text['message-delete']['en-us'] = 'Delete Completed';
-	$text['message-required']['en-us'] = 'Please provide: ';
-
-?>
\ No newline at end of file
+<?php
+
+	//Modules
+
+	$text['title-modules']['en-us'] = 'Modules';
+	$text['title-modules']['fr-fr'] = 'Modules';
+	$text['title-module_add']['en-us'] = 'Module Add';
+	$text['title-module_add']['fr-fr'] = 'Ajouter un Module';
+	$text['title-module_edit']['en-us'] = 'Module Edit';
+	$text['title-module_edit']['fr-fr'] = 'Editer le Module';
+
+	$text['header-modules']['en-us'] = 'Module List';
+	$text['header-modules']['fr-fr'] = 'Liste les Modules';
+	$text['header-module_add']['en-us'] = 'Module Add';
+	$text['header-module_add']['fr-fr'] = 'Ajouter un Module';
+	$text['header-module_edit']['en-us'] = 'Module Edit';
+	$text['header-module_edit']['fr-fr'] = 'Editer le Module';
+
+	$text['description-modules']['en-us'] = 'Modules extend the features of the system. Use this page to enable or disable modules.';
+	$text['description-modules']['fr-fr'] = "Les modules augmentent les fonctionnalités du système. Cette page permet de les activer ou les désactiver.";
+
+	$text['label-label']['en-us'] = 'Label';
+	$text['label-label']['fr-fr'] = 'Label';
+	$text['label-module_name']['en-us'] = 'Module Name';
+	$text['label-module_name']['fr-fr'] = 'Nom du Module';
+	$text['label-description']['en-us'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
+	$text['label-module_category']['en-us'] = 'Module Category';
+	$text['label-module_category']['fr-fr'] = 'Catégorie du Module';
+	$text['label-status']['en-us'] = 'Status';
+	$text['label-status']['fr-fr'] = 'Statut';
+	$text['label-action']['en-us'] = 'Action';
+	$text['label-action']['fr-fr'] = 'Action';
+	$text['label-enabled']['en-us'] = 'Enabled';
+	$text['label-enabled']['fr-fr'] = 'Actif';
+	$text['label-default_enabled']['en-us'] = 'Default Enabled';
+	$text['label-default_enabled']['fr-fr'] = 'Activé par Défaut';
+	$text['label-stopped']['en-us'] = 'Stopped';
+	$text['label-stopped']['fr-fr'] = 'Arrété';
+	$text['label-running']['en-us'] = 'Running';
+	$text['label-running']['fr-fr'] = 'Actif';
+	$text['label-start']['en-us'] = 'Start';
+	$text['label-start']['fr-fr'] = 'Démarrer';
+	$text['label-stop']['en-us'] = 'Stop';
+	$text['label-stop']['fr-fr'] = 'Stop';
+	$text['label-unload_module']['en-us'] = 'Unload Module';
+	$text['label-unload_module']['fr-fr'] = 'Décharger le Module';
+	$text['label-load_module']['en-us'] = 'Load Module';
+	$text['label-load_module']['fr-fr'] = 'charger le Module';
+	$text['label-message']['en-us'] = 'Message';
+	$text['label-message']['fr-fr'] = 'Message';
+
+	$text['option-true']['en-us'] = 'True';
+	$text['option-true']['fr-fr'] = 'Oui';
+	$text['option-false']['en-us'] = 'False';
+	$text['option-false']['fr-fr'] = 'Non';
+
+	$text['button-add']['en-us'] = 'Add';
+	$text['button-add']['fr-fr'] = 'Ajouter';
+	$text['button-edit']['en-us'] = 'Edit';
+	$text['button-edit']['fr-fr'] = 'Editer';
+	$text['button-delete']['en-us'] = 'Delete';
+	$text['button-delete']['fr-fr'] = 'Supprimer';
+	$text['button-back']['en-us'] = 'Back';
+	$text['button-back']['fr-fr'] = 'Retour';
+	$text['button-save']['en-us'] = 'Save';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
+
+	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
+
+	$text['message-add']['en-us'] = 'Add Completed';
+	$text['message-add']['fr-fr'] = 'Ajouté';
+	$text['message-update']['en-us'] = 'Update Completed';
+	$text['message-update']['fr-fr'] = 'Mis à jour';
+	$text['message-delete']['en-us'] = 'Delete Completed';
+	$text['message-delete']['fr-fr'] = 'Supprimé';
+	$text['message-required']['en-us'] = 'Please provide: ';
+	$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
+
+?>
diff --git a/app/music_on_hold/app_config.php b/app/music_on_hold/app_config.php
index 38df023c20..e6813547cb 100644
--- a/app/music_on_hold/app_config.php
+++ b/app/music_on_hold/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Add, Delete, or Play Music on hold files.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = '';
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Music on Hold';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Musique de Garde";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Musique de Garde';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Musica em Espera';
@@ -58,4 +58,4 @@
 		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][5]['groups'][] = 'admin';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/music_on_hold/app_languages.php b/app/music_on_hold/app_languages.php
index d8216b1b36..11b1ddbee9 100644
--- a/app/music_on_hold/app_languages.php
+++ b/app/music_on_hold/app_languages.php
@@ -27,50 +27,50 @@
 */
 
 	$text['label-moh']['en-us'] = 'Music on Hold';
-	$text['label-moh']['fr'] = 'Musique de Garde';
+	$text['label-moh']['fr-fr'] = 'Musique de Garde';
 	$text['desc-moh']['en-us'] = "Music on hold can be in WAV or MP3 format. To play an MP3 file you must have mod_shout enabled on the 'Modules' tab. You can adjust the volume of the MP3 audio from the 'Settings' tab. For best performance upload 16 bit, 8/16/32/48 kHz <i>mono</i> WAV files.";
-	$text['desc-moh']['fr'] = "La Musique de Garde peut être en WAV ou en MP3. Pour le MP3, mod_shout doit être activé dans la partie modules. Le Volume peut être réglé dans la partie configuration. Pour de meilleures performances, utiliser des fichiers WAV 16 bit, 8/16/32/48 kHz <i>mono</i>.";
+	$text['desc-moh']['fr-fr'] = "La Musique de Garde peut être en WAV ou en MP3. Pour le MP3, mod_shout doit être activé dans la partie modules. Le Volume peut être réglé dans la partie configuration. Pour de meilleures performances, utiliser des fichiers WAV 16 bit, 8/16/32/48 kHz <i>mono</i>.";
 	$text['label-upload-moh']['en-us'] = 'Upload Music';
-	$text['label-upload-moh']['fr'] = 'Télécharger de la Musique';
+	$text['label-upload-moh']['fr-fr'] = 'Télécharger de la Musique';
 	$text['label-file-path']['en-us'] = 'File Path';
-	$text['label-file-path']['fr'] = 'Chemin du Fichier';
+	$text['label-file-path']['fr-fr'] = 'Chemin du Fichier';
 	$text['button-clear']['en-us'] = 'Clear';
-	$text['button-clear']['fr'] = 'Nettoyer';
+	$text['button-clear']['fr-fr'] = 'Nettoyer';
 	$text['label-sampling']['en-us'] = 'Sampling';
-	$text['label-sampling']['fr'] = 'échatillage';
+	$text['label-sampling']['fr-fr'] = 'échantillonnage';
 	$text['label-category']['en-us'] = 'Category';
-	$text['label-category']['fr'] = 'Categorie';
+	$text['label-category']['fr-fr'] = 'Categorie';
 	$text['opt-default']['en-us'] = 'Default';
-	$text['opt-default']['en-us'] = 'Défaut';
+	$text['opt-default']['fr-fr'] = 'Défaut';
 	$text['opt-new']['en-us'] = 'New...';
-	$text['opt-new']['fr'] = 'Nouveau...';
+	$text['opt-new']['fr-fr'] = 'Nouveau...';
 	$text['message-click-select']['en-us'] = 'Double-Click to Select an Existing Category';
-	$text['message-click-select']['fr'] = 'Double-Click pour choisir une Catégorie existante';
+	$text['message-click-select']['fr-fr'] = 'Double-Click pour choisir une Catégorie existante';
 	$text['button-upload']['en-us'] = 'Upload';
-	$text['button-upload']['fr'] = 'envoyer';
+	$text['button-upload']['fr-fr'] = 'envoyer';
 	$text['message-available-to-all']['en-us'] = 'Available to All Domains';
-	$text['message-available-to-all']['fr'] = 'Disponible pour tous Domaines';
+	$text['message-available-to-all']['fr-fr'] = 'Disponible pour tous Domaines';
 	$text['label-download']['en-us'] = 'Download';
-	$text['label-download']['fr'] = 'Télécharger';
+	$text['label-download']['fr-fr'] = 'Télécharger';
 	$text['label-play']['en-us'] = 'Play';
-	$text['label-play']['fr'] = 'Jouer';
+	$text['label-play']['fr-fr'] = 'Jouer';
 	$text['label-uploaded']['en-us'] = 'Uploaded';
-	$text['label-uploaded']['fr'] = 'Envoyé';
+	$text['label-uploaded']['fr-fr'] = 'Envoyé';
 	$text['label-file-size']['en-us'] = 'File Size';
-	$text['label-file-size']['fr'] = 'Taille de Fichier';
+	$text['label-file-size']['fr-fr'] = 'Taille de Fichier';
 	$text['label-sampling']['en-us'] = 'Sampling';
-	$text['label-sampling']['fr'] = 'Echantillonage';
+	$text['label-sampling']['fr-fr'] = 'Echantillonage';
 	$text['message-delete']['en-us'] = 'Do you really want to delete this file?';
-	$text['message-delete']['fr'] = 'Voulez-vous vraiment supprimer ce fichier?';
+	$text['message-delete']['fr-fr'] = 'Voulez-vous vraiment supprimer ce fichier?';
 	$text['message-nofiles']['en-us'] = 'No files found.';
-	$text['message-nofiles']['fr'] = 'Pas de fichier trouvé.';
+	$text['message-nofiles']['fr-fr'] = 'Pas de fichier trouvé.';
 	$text['label-delete-category']['en-us'] = 'Delete Category';
-	$text['label-delete-category']['en-us'] = 'Supprimer la Categorie';
+	$text['label-delete-category']['fr-fr'] = 'Supprimer la Categorie';
 	$text['label-location']['en-us'] = 'Location';
-	$text['label-location']['fr'] = 'endroit';
+	$text['label-location']['fr-fr'] = 'endroit';
 	$text['label-default']['en-us'] = 'Default';
-	$text['label-default']['fr'] = 'Défaut';
+	$text['label-default']['fr-fr'] = 'Défaut';
 	$text['message-event-socket']['en-us'] = 'Connection to Event Socket failed.';
-	$text['message-event-socket']['fr'] = 'Connection à Event Socket echoué.';
+	$text['message-event-socket']['fr-fr'] = 'Connexion à Event Socket echoué.';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/provision/app_config.php b/app/provision/app_config.php
index 282ec82de9..e50094b4de 100644
--- a/app/provision/app_config.php
+++ b/app/provision/app_config.php
@@ -8,9 +8,11 @@
 		//$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		//$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		//$apps[$x]['description']['en-us'] = 'Writes the provisioning files from templates.';
+		//$apps[$x]['description']['fr-fr'] = 'Ecrit les fichiers de provisioning à partir des modèles.';
 
 	//menu details
 		//$apps[$x]['menu'][0]['title']['en-us'] = 'Provision';
+		//$apps[$x]['menu'][0]['title']['fr-fr'] = 'Provision';
 		//$apps[$x]['menu'][0]['uuid'] = '';
 		//$apps[$x]['menu'][0]['parent_uuid'] = '';
 		//$apps[$x]['menu'][0]['category'] = 'internal';
@@ -22,4 +24,4 @@
 		//$apps[$x]['permissions'][0]['name'] = 'zzz';
 		//$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		//$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/recordings/app_config.php b/app/recordings/app_config.php
index 72b24c45a8..2ff3bfb388 100644
--- a/app/recordings/app_config.php
+++ b/app/recordings/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Manager recordings primarily used with an IVR.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Gestion des enregistrements principalement utilisé dans les IVR";
+		$apps[$x]['description']['fr-fr'] = 'Gestion des enregistrements principalement utilisé dans les IVR';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Gestor de gravações utilizadas principalmente com um IVR.';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Recordings';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Guides Vocaux';
@@ -37,32 +37,32 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'recording_view';
+		$apps[$x]['permissions'][0]['name'] = 'recordings_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'recording_add';
+		$apps[$x]['permissions'][1]['name'] = 'recordings_add';
 		$apps[$x]['permissions'][1]['groups'][] = 'admin';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][2]['name'] = 'recording_edit';
+		$apps[$x]['permissions'][2]['name'] = 'recordings_edit';
 		$apps[$x]['permissions'][2]['groups'][] = 'admin';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][3]['name'] = 'recording_delete';
+		$apps[$x]['permissions'][3]['name'] = 'recordings_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'admin';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][4]['name'] = 'recording_upload';
+		$apps[$x]['permissions'][4]['name'] = 'recordings_upload';
 		$apps[$x]['permissions'][4]['groups'][] = 'admin';
 		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][5]['name'] = 'recording_play';
+		$apps[$x]['permissions'][5]['name'] = 'recordings_play';
 		$apps[$x]['permissions'][5]['groups'][] = 'user';
 		$apps[$x]['permissions'][5]['groups'][] = 'admin';
 		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][6]['name'] = 'recording_download';
+		$apps[$x]['permissions'][6]['name'] = 'recordings_download';
 		$apps[$x]['permissions'][6]['groups'][] = 'user';
 		$apps[$x]['permissions'][6]['groups'][] = 'admin';
 		$apps[$x]['permissions'][6]['groups'][] = 'superadmin';
@@ -115,4 +115,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/recordings/app_languages.php b/app/recordings/app_languages.php
index 4c57bded6e..0e0ee24562 100644
--- a/app/recordings/app_languages.php
+++ b/app/recordings/app_languages.php
@@ -26,44 +26,44 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 	$text['message-uploaded']['en-us'] = 'Uploaded file to';
-	$text['message-uploaded']['fr'] = "Fichier téléchargé";
+	$text['message-uploaded']['fr-fr'] = "Fichier téléchargé";
 	$text['title']['en-us'] = 'Recordings';
-	$text['title']['fr'] = "Guides Vocaux";
+	$text['title']['fr-fr'] = "Guides Vocaux";
 	$text['description']['en-us'] = 'To make a recording dial *732 or you can make a 16bit 8khz/16khz Mono WAV file then copy it to the following directory then refresh the page to play it back. Click on the \'Filename\' to download it or the \'Recording Name\' to play the audio.';
-	$text['description']['fr'] = "Pour créer un guide vocal, composer le *732 ou créer un fichier audio WAV 16bit 8khz/16khz Mono et ensuite le copier dans le répertoire qui suit. Rafraîchir ensuite cette page pour le voir apparaitre.";
+	$text['description']['fr-fr'] = "Pour créer un guide vocal, composer le *732 ou créer un fichier audio WAV 16bit 8khz/16khz Mono et ensuite le copier dans le répertoire qui suit. Rafraîchir ensuite cette page pour le voir apparaitre.";
 	$text['label-upload']['en-us'] = 'File to upload:';
-	$text['label-upload']['fr'] = 'Fichier à déposer:';
+	$text['label-upload']['fr-fr'] = 'Fichier à déposer:';
 	$text['button-upload']['en-us'] = 'Upload';
-	$text['button-upload']['fr'] = 'déposer';
+	$text['button-upload']['fr-fr'] = 'déposer';
 	$text['label-file']['en-us'] = 'Filename (download)';
-	$text['label-file']['fr'] = 'Nom du fichier (Télécharger)';
+	$text['label-file']['fr-fr'] = 'Nom du fichier (Télécharger)';
 	$text['description-file']['en-us'] = 'Name of the file. example.wav';
-	$text['description-file']['fr'] = "Nom du fichier. exemple.wav";
+	$text['description-file']['fr-fr'] = "Nom du fichier. exemple.wav";
 	$text['label-recording']['en-us'] = 'Recording Name (play)';
-	$text['label-recording']['fr'] = "Nom de l'enregistrement (jouer)";
+	$text['label-recording']['fr-fr'] = "Nom de l'enregistrement (jouer)";
 	$text['description-recording']['en-us'] = 'Recording Name. example: recording_x';
-	$text['description-recording']['fr'] = "Nom de l'enregistrement. exemple: enregistrement_x";
+	$text['description-recording']['fr-fr'] = "Nom de l'enregistrement. exemple: enregistrement_x";
 	$text['label-description']['en-us'] = 'Description';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 	$text['description-description']['en-us'] = 'You may enter a description here for your reference (not parsed).';
-	$text['description-description']['fr'] = '';
+	$text['description-description']['fr-fr'] = '';
 	$text['message-delete']['en-us'] = 'Do you really want to delete this?';
-	$text['message-delete']['fr'] = "Voulez-vous vraiment supprimer cela?";
+	$text['message-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 	$text['label-edit-file']['en-us'] = 'Please provide: Filename (download)';
-	$text['label-edit-file']['fr'] = "Merci d'indiquer: nom de fichier (Télécharger)";
+	$text['label-edit-file']['fr-fr'] = "Merci d'indiquer: nom de fichier (Télécharger)";
 	$text['label-edit-recording']['en-us'] = 'Please provide: Recording Name (play)';
-	$text['label-edit-recording']['fr'] = "Merci d'indiquer: nom de l'enregistrement (jouer)";
+	$text['label-edit-recording']['fr-fr'] = "Merci d'indiquer: nom de l'enregistrement (jouer)";
 	$text['message-add']['en-us'] = 'Add Complete';
-	$text['message-add']['fr'] = "Ajouté";
+	$text['message-add']['fr-fr'] = "Ajouté";
 	$text['message-update']['en-us'] = 'Update Complete';
-	$text['message-update']['fr'] = "Mis à jour";
+	$text['message-update']['fr-fr'] = "Mis à jour";
 	$text['title-add']['en-us'] = 'Add Recording';
-	$text['title-add']['fr'] = "Ajouter un Guide";
+	$text['title-add']['fr-fr'] = "Ajouter un Guide";
 	$text['title-edit']['en-us'] = 'Edit Recording';
-	$text['title-edit']['fr'] = "Editer le Guide";
+	$text['title-edit']['fr-fr'] = "Editer le Guide";
 	$text['button-back']['en-us'] = 'Back';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 	$text['button-save']['en-us'] = 'Save';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/registrations/app_config.php b/app/registrations/app_config.php
index 13e745a67d..87c310adcf 100644
--- a/app/registrations/app_config.php
+++ b/app/registrations/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Displays registrations from endpoints.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Afficher les enregistrements des équipements";
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Registrations';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Connexions';
@@ -37,11 +37,11 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'registration_domain';
+		$apps[$x]['permissions'][0]['name'] = 'registrations_domain';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'registration_all';
+		$apps[$x]['permissions'][1]['name'] = 'registrations_all';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/registrations/app_languages.php b/app/registrations/app_languages.php
index 214c67afc8..07afe94e49 100644
--- a/app/registrations/app_languages.php
+++ b/app/registrations/app_languages.php
@@ -26,24 +26,24 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 	$text['error-event-socket']['en-us'] = 'Connection to Event Socket failed.';
-	$text['error-event-socket']['fr'] = "Connexion a l'Event Socket en echec.";
+	$text['error-event-socket']['fr-fr'] = "Connexion a l'Event Socket en echec.";
 	$text['label-message']['en-us'] = 'Message';
-	$text['label-message']['fr'] = 'Message';
+	$text['label-message']['fr-fr'] = 'Message';
 	$text['label-message']['en-us'] = 'Invalid Profile!';
-	$text['label-message']['fr'] = 'Profile Invalide!';
+	$text['label-message']['fr-fr'] = 'Profile Invalide!';
 	$text['button-back']['en-us'] = 'back';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 	$text['label-domain']['en-us'] = 'Domain';
-	$text['label-domain']['fr'] = 'Domaine';
+	$text['label-domain']['fr-fr'] = 'Domaine';
 	$text['label-user']['en-us'] = 'User';
-	$text['label-user']['fr'] = 'Usager';
+	$text['label-user']['fr-fr'] = 'Usager';
 	$text['label-agent']['en-us'] = 'Agent';
-	$text['label-agent']['fr'] = 'Agent';
+	$text['label-agent']['fr-fr'] = 'Agent';
 	$text['label-ip']['en-us'] = 'IP';
-	$text['label-ip']['fr'] = 'IP';
+	$text['label-ip']['fr-fr'] = 'IP';
 	$text['label-port']['en-us'] = 'Port';
-	$text['label-port']['fr'] = 'Port';
+	$text['label-port']['fr-fr'] = 'Port';
 	$text['label-status']['en-us'] = 'Status';
-	$text['label-status']['fr'] = 'Statut';
+	$text['label-status']['fr-fr'] = 'Statut';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/ring_groups/app_config.php b/app/ring_groups/app_config.php
index 62541d7481..30b2fe55ac 100644
--- a/app/ring_groups/app_config.php
+++ b/app/ring_groups/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'A tool to call multiple extensions.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Outil pour appeler plusieurs extensions";
+		$apps[$x]['description']['fr-fr'] = 'Outil pour appeler plusieurs extensions';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Uma ferramenta para chamar várias extensões.';
@@ -21,13 +21,13 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Ring Groups';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Groupes de sonnerie";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Groupes de sonnerie';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Grupos de Trabalho";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Grupos de Trabalho';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = 'b30f085f-3ec6-2819-7e62-53dfba5cb8d5';
 		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
@@ -61,40 +61,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'ring_group_prompt';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ring_group_destination_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ring_group_destination_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ring_group_destination_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ring_group_destination_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ring_group_user_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ring_group_user_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ring_group_user_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'ring_group_user_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 
 	//schema details
 		$y = 0; //table array index
@@ -247,4 +214,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_users';
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'user_uuid';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-?>
\ No newline at end of file
+?>
diff --git a/app/ring_groups/app_languages.php b/app/ring_groups/app_languages.php
index cdf5d14abc..2d47a40591 100644
--- a/app/ring_groups/app_languages.php
+++ b/app/ring_groups/app_languages.php
@@ -28,266 +28,266 @@
 
 	$text['title']['en-us'] = 'Ring Groups';
 	$text['title']['pt-pt'] = '';
-	$text['title']['fr'] = 'Groupes de Sonnerie';
+	$text['title']['fr-fr'] = 'Groupes de Sonnerie';
 
 	$text['description']['en-us'] = 'A ring group is a set of destinations that can be called with a ring strategy.';
 	$text['description']['pt-pt'] = '';
-	$text['description']['fr'] = "Un groupe de sonnerie est un groupe de destinations pouvant être appelé via une stratégie de sonnerie.";
+	$text['description']['fr-fr'] = "Un groupe de sonnerie est un groupe de destinations pouvant être appelé via une stratégie de sonnerie.";
 
 	$text['label-name']['en-us'] = 'Name';
 	$text['label-name']['pt-pt'] = '';
-	$text['label-name']['fr'] = 'Nom';
+	$text['label-name']['fr-fr'] = 'Nom';
 
 	$text['label-extension']['en-us'] = 'Extension';
 	$text['label-extension']['pt-pt'] = '';
-	$text['label-extension']['fr'] = 'Extension';
+	$text['label-extension']['fr-fr'] = 'Extension';
 
 	$text['label-ring-group-extension']['en-us'] = 'Ring Group Extension';
 	$text['label-ring-group-extension']['pt-pt'] = '';
-	$text['label-ring-group-extension']['fr'] = "Extension du groupe de sonnerie";
+	$text['label-ring-group-extension']['fr-fr'] = "Extension du groupe de sonnerie";
 
 	$text['header-ring-group-forward']['en-us'] = 'Ring Group Forward';
 	$text['header-ring-group-forward']['pt-pt'] = '';
-	$text['header-ring-group-forward']['fr'] = "Renvoi du groupe de sonnerie";
+	$text['header-ring-group-forward']['fr-fr'] = "Renvoi du groupe de sonnerie";
 
 	$text['description-ring-group-forward']['en-us'] = 'Forwards calls to an alternate destination for extension ';
 	$text['description-ring-group-forward']['pt-pt'] = '';
-	$text['description-ring-group-forward']['fr'] = "Renvoyer les appels vers une destination alternative ";
+	$text['description-ring-group-forward']['fr-fr'] = "Renvoyer les appels vers une destination alternative ";
 
 	$text['link-call-forward']['en-us'] = 'Call Forward';
 	$text['link-call-forward']['pt-pt'] = '';
-	$text['link-call-forward']['fr'] = "Renvoi d'Appel";
+	$text['link-call-forward']['fr-fr'] = "Renvoi d'Appel";
 
 	$text['label-call-forward']['en-us'] = 'Call Forward:';
 	$text['label-call-forward']['pt-pt'] = '';
-	$text['label-call-forward']['pt-pt'] = "Renvoi d'Appel:";
+	$text['label-call-forward']['fr-fr'] = "Renvoi d'Appel:";
 
 	$text['label-forward_destination']['en-us'] = 'Number:';
 	$text['label-forward_destination']['pt-pt'] = '';
-	$text['label-forward_destination']['fr'] = "Numéro:";
+	$text['label-forward_destination']['fr-fr'] = "Numéro:";
 
 	$text['label-tools']['en-us'] = 'Tools';
 	$text['label-tools']['pt-pt'] = '';
-	$text['label-tools']['fr'] = 'Outils';
+	$text['label-tools']['fr-fr'] = 'Outils';
 
 	$text['label-enabled']['en-us'] = 'Enabled';
 	$text['label-enabled']['pt-pt'] = '';
-	$text['label-enabled']['fr'] = 'Actif';
+	$text['label-enabled']['fr-fr'] = 'Actif';
 
 	$text['label-description']['en-us'] = 'Description';
 	$text['label-description']['pt-pt'] = '';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 
 	$text['message-delete']['en-us'] = 'Delete Complete';
 	$text['message-delete']['pt-pt'] = '';
-	$text['message-delete']['fr'] = 'Supprimé';
+	$text['message-delete']['fr-fr'] = 'Supprimé';
 
 	$text['message-name']['en-us'] = 'Please provide: Name';
 	$text['message-name']['pt-pt'] = '';
-	$text['message-name']['fr'] = "Merci d'indiquer: Nom";
+	$text['message-name']['fr-fr'] = "Merci d'indiquer: Nom";
 
 	$text['message-strategy']['en-us'] = 'Please provide: Strategy';
 	$text['message-strategy']['pt-pt'] = '';
-	$text['message-strategy']['fr'] = "Merci d'indiquer: Stratégie";
+	$text['message-strategy']['fr-fr'] = "Merci d'indiquer: Stratégie";
 
 	$text['message-timeout']['en-us'] = 'Please provide: Timeout';
 	$text['message-timeout']['pt-pt'] = '';
-	$text['message-timeout']['fr'] = "Merci d'indiquer: Timeout";
+	$text['message-timeout']['fr-fr'] = "Merci d'indiquer: Timeout";
 
 	$text['message-timeout-action']['en-us'] = 'Please provide: Timeout Action';
 	$text['message-timeout-action']['pt-pt'] = '';
-	$text['message-timeout-action']['fr'] = "Merci d'indiquer: Action sur timeout";
+	$text['message-timeout-action']['fr-fr'] = "Merci d'indiquer: Action sur timeout";
 
 	$text['message-enabled']['en-us'] = 'Please provide: Enabled';
 	$text['message-enabled']['pt-pt'] = '';
-	$text['message-enabled']['fr'] = "Merci d'indiquer: Actif";
+	$text['message-enabled']['fr-fr'] = "Merci d'indiquer: Actif";
 
 	$text['message-add']['en-us'] = 'Add Complete';
 	$text['message-add']['pt-pt'] = '';
-	$text['message-add']['fr'] = 'Ajouté';
+	$text['message-add']['fr-fr'] = 'Ajouté';
 
 	$text['message-update']['en-us'] = 'Update Complete';
 	$text['message-update']['pt-pt'] = '';
-	$text['message-update']['fr'] = "Mis à jour";
+	$text['message-update']['fr-fr'] = "Mis à jour";
 
 	$text['label-ring-group']['en-us'] = 'Ring Group';
 	$text['label-ring-group']['pt-pt'] = '';
-	$text['label-ring-group']['fr'] = "Groupe de sonnerie";
+	$text['label-ring-group']['fr-fr'] = "Groupe de sonnerie";
 
 	$text['button-back']['en-us'] = 'Back';
 	$text['button-back']['pt-pt'] = '';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 
 	$text['description-name']['en-us'] = 'Enter a name.';
 	$text['description-name']['pt-pt'] = '';
-	$text['description-name']['fr'] = 'Insérer un nom.';
+	$text['description-name']['fr-fr'] = 'Insérer un nom.';
 
 	$text['label-context']['en-us'] = 'Context';
 	$text['label-context']['pt-pt'] = '';
-	$text['label-context']['fr'] = 'Context';
+	$text['label-context']['fr-fr'] = 'Context';
 
 	$text['description-enter-context']['en-us'] = 'Enter the context.';
 	$text['description-enter-context']['pt-pt'] = '';
-	$text['description-enter-context']['fr'] = '';
+	$text['description-enter-context']['fr-fr'] = '';
 
 	$text['label-strategy']['en-us'] = 'Strategy';
 	$text['label-strategy']['pt-pt'] = '';
-	$text['label-strategy']['fr'] = 'Stratégie';
+	$text['label-strategy']['fr-fr'] = 'Stratégie';
 
 	$text['option-sequence']['en-us'] = 'Sequence';
 	$text['option-sequence']['pt-pt'] = '';
-	$text['option-sequence']['fr'] = 'Séquence';
+	$text['option-sequence']['fr-fr'] = 'Séquence';
 
 	$text['option-simultaneous']['en-us'] = 'Simultaneous';
 	$text['option-simultaneous']['pt-pt'] = '';
-	$text['option-simultaneous']['fr'] = 'Simultané';
+	$text['option-simultaneous']['fr-fr'] = 'Simultané';
 
 	$text['option-enterprise']['en-us'] = 'Enterprise';
 	$text['option-enterprise']['pt-pt'] = '';
-	$text['option-enterprise']['fr'] = 'Entreprise';
+	$text['option-enterprise']['fr-fr'] = 'Entreprise';
 
 	$text['description-strategy']['en-us'] = 'Select the ring strategy.';
 	$text['description-strategy']['pt-pt'] = '';
-	$text['description-strategy']['fr'] = 'Choisir la statégie de sonnerie.';
+	$text['description-strategy']['fr-fr'] = 'Choisir la statégie de sonnerie.';
 
 	$text['label-duration']['en-us'] = 'Duration';
 	$text['label-duration']['pt-pt'] = '';
-	$text['label-duration']['fr'] = 'Durée';
+	$text['label-duration']['fr-fr'] = 'Durée';
 
 	$text['label-call-timeout']['en-us'] = 'Call Timeout';
 	$text['label-call-timeout']['pt-pt'] = '';
-	$text['label-call-timeout']['fr'] = "Timeout d'Appel";
+	$text['label-call-timeout']['fr-fr'] = "Timeout d'Appel";
 
 	$text['description-timeout']['en-us'] = 'Enter the total call timeout in seconds';
 	$text['description-timeout']['pt-pt'] = '';
-	$text['description-timeout']['fr'] = "Temps total du timeout sur l'appel en secondes";
+	$text['description-timeout']['fr-fr'] = "Temps total du timeout sur l'appel en secondes";
 
 	$text['label-timeout_destination']['en-us'] = 'Timeout Destination';
 	$text['label-timeout_destination']['pt-pt'] = '';
-	$text['label-timeout_destination']['fr'] = 'Timeout Destination';
+	$text['label-timeout_destination']['fr-fr'] = 'Timeout Destination';
 
 	$text['description-timeout_destination']['en-us'] = 'Select the timeout destination for this ring group.';
 	$text['description-timeout_destination']['pt-pt'] = '';
-	$text['description-timeout_destination']['fr'] = '';
+	$text['description-timeout_destination']['fr-fr'] = '';
 
 	$text['label-cid-prefix']['en-us'] = 'CID Prefix';
 	$text['label-cid-prefix']['pt-pt'] = '';
-	$text['label-cid-prefix']['fr'] = 'CID Préfixe';
+	$text['label-cid-prefix']['fr-fr'] = 'CID Préfixe';
 
 	$text['description-cid-prefix']['en-us'] = 'Set a prefix on the caller ID name.';
 	$text['description-cid-prefix']['pt-pt'] = '';
-	$text['description-cid-prefix']['fr'] = "Choisir un préfixe pour le nom de l'appelant.";
+	$text['description-cid-prefix']['fr-fr'] = "Choisir un préfixe pour le nom de l'appelant.";
 
 	$text['label-ringback']['en-us'] = 'Ring Back';
 	$text['label-ringback']['pt-pt'] = '';
-	$text['label-ringback']['fr'] = "tonalité en retour d'appel";
+	$text['label-ringback']['fr-fr'] = "tonalité en retour d'appel";
 
 	$text['option-usring']['en-us'] = 'us-ring';
 	$text['option-usring']['pt-pt'] = '';
-	$text['option-usring']['fr'] = 'us-ring';
+	$text['option-usring']['fr-fr'] = 'us-ring';
 
 	$text['option-frring']['en-us'] = 'fr-ring';
 	$text['option-frring']['pt-pt'] = '';
-	$text['option-frring']['fr'] = 'fr-ring';
+	$text['option-frring']['fr-fr'] = 'fr-ring';
 
 	$text['option-ukring']['en-us'] = 'uk-ring';
 	$text['option-ukring']['pt-pt'] = '';
-	$text['option-ukring']['fr'] = 'uk-ring';
+	$text['option-ukring']['fr-fr'] = 'uk-ring';
 
 	$text['option-rsring']['en-us'] = 'rs-ring';
 	$text['option-rsring']['pt-pt'] = '';
-	$text['option-rsring']['fr'] = 'rs-ring';
+	$text['option-rsring']['fr-fr'] = 'rs-ring';
 
 	$text['description-ringback']['en-us'] = 'Defines what the caller will hear while the destination is being called.';
 	$text['description-ringback']['pt-pt'] = '';
-	$text['description-ringback']['fr'] = "Définir le retour de sonnerie entendu par l'appelant tant que la destination est en alerte.";
+	$text['description-ringback']['fr-fr'] = "Définir le retour de sonnerie entendu par l'appelant tant que la destination est en alerte.";
 
 	$text['option-true']['en-us'] = 'True';
 	$text['option-true']['pt-pt'] = '';
-	$text['option-true']['fr'] = 'Oui';
+	$text['option-true']['fr-fr'] = 'Oui';
 
 	$text['option-false']['en-us'] = 'False';
 	$text['option-false']['pt-pt'] = '';
-	$text['option-false']['fr'] = 'Non';
+	$text['option-false']['fr-fr'] = 'Non';
 
 	$text['label-user_list']['en-us'] = 'User List';
 	$text['label-user_list']['pt-pt'] = '';
-	$text['label-user_list']['fr'] = "Liste d'Usagers";
+	$text['label-user_list']['fr-fr'] = "Liste d'Usagers";
 
 	$text['description-user_list']['en-us'] = 'Assign the users that are assigned to this ring group. ';
 	$text['description-user_list']['pt-pt'] = '';
-	$text['description-user_list']['fr'] = 'Associer les utilisateurs à ce groupe de sonnerie. ';
+	$text['description-user_list']['fr-fr'] = 'Associer les utilisateurs à ce groupe de sonnerie. ';
 
 	$text['description-enabled']['en-us'] ='Set the status of this ring group.';
 	$text['description-enabled']['pt-pt'] = '';
-	$text['description-enabled']['fr'] = "Choisir l'état de ce groupe de sonnerie";
+	$text['description-enabled']['fr-fr'] = "Choisir l'état de ce groupe de sonnerie";
 
 	$text['description-description']['en-us'] = 'Enter a description (optional).';
 	$text['description-description']['pt-pt'] = '';
-	$text['description-description']['fr'] = '';
+	$text['description-description']['fr-fr'] = '';
 
 	$text['label-delay']['en-us'] = 'Delay';
 	$text['label-delay']['pt-pt'] = '';
-	$text['label-delay']['fr'] = 'Délais';
+	$text['label-delay']['fr-fr'] = 'Délais';
 
 	$text['label-timeout']['en-us'] = 'Timeout';
 	$text['label-timeout']['pt-pt'] = '';
-	$text['label-timeout']['fr'] = 'Timeout';
+	$text['label-timeout']['fr-fr'] = 'Timeout';
 
 	$text['label-destinations']['en-us'] = 'Destinations';
 	$text['label-destinations']['pt-pt'] = '';
-	$text['label-destinations']['fr'] = 'Destinations';
+	$text['label-destinations']['fr-fr'] = 'Destinations';
 
 	$text['label-destination_number']['en-us'] = 'Destination';
 	$text['label-destination_number']['pt-pt'] = '';
-	$text['label-destination_number']['fr'] = 'Destination';
+	$text['label-destination_number']['fr-fr'] = 'Destination';
 
 	$text['label-destination_delay']['en-us'] = 'Delay';
 	$text['label-destination_delay']['pt-pt'] = '';
-	$text['label-destination_delay']['fr'] = 'Délais';
+	$text['label-destination_delay']['fr-fr'] = 'Délais';
 
 	$text['label-destination_timeout']['en-us'] = 'Timeout';
 	$text['label-destination_timeout']['pt-pt'] = '';
-	$text['label-destination_timeout']['fr'] = 'Timeout';
+	$text['label-destination_timeout']['fr-fr'] = 'Timeout';
 
 	$text['label-destination_prompt']['en-us'] = 'Prompt';
 	$text['label-destination_prompt']['pt-pt'] = '';
-	$text['label-destination_prompt']['fr'] = 'Prompt';
+	$text['label-destination_prompt']['fr-fr'] = 'Prompt';
 
 	$text['label-destination_prompt_confirm']['en-us'] = 'Confirm';
 	$text['label-destination_prompt_confirm']['pt-pt'] = '';
-	$text['label-destination_prompt_confirm']['fr'] = 'Confirmer';
+	$text['label-destination_prompt_confirm']['fr-fr'] = 'Confirmer';
 
 	$text['label-destination_prompt_announce']['en-us'] = 'Announce';
 	$text['label-destination_prompt_announce']['pt-pt'] = '';
-	$text['label-destination_prompt_announce']['fr'] = 'Annonce';
+	$text['label-destination_prompt_announce']['fr-fr'] = 'Annonce';
 
 	$text['description-destinations']['en-us'] = 'Add destinations and parameters to the ring group.';
 	$text['description-destinations']['pt-pt'] = '';
-	$text['description-destinations']['fr'] = "Ajouter des destinations et des paramètres au groupe de sonnerie.";
+	$text['description-destinations']['fr-fr'] = "Ajouter des destinations et des paramètres au groupe de sonnerie.";
 
 	$text['button-add']['en-us'] = 'Add';
 	$text['button-add']['pt-pt'] = '';
-	$text['button-add']['fr'] = 'Ajouter';
+	$text['button-add']['fr-fr'] = 'Ajouter';
 
 	$text['button-save']['en-us'] = 'Save';
 	$text['button-save']['pt-pt'] = '';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 	$text['confirm-delete']['pt-pt'] = '';
-	$text['confirm-delete']['fr'] = "Voulez-vous vraiment supprimer cela?";
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 	$text['confirm-copy']['en-us'] = 'Do you really want to copy this?';
 	$text['confirm-copy']['en-pt'] = '';
-	$text['confirm-copy']['fr'] = "Voulez-vous vraiment copier cela?";
+	$text['confirm-copy']['fr-fr'] = "Voulez-vous vraiment copier cela?";
 
 	$text['option-enabled']['en-us'] = 'Enabled';
 	$text['option-enabled']['pt-pt'] = '';
-	$text['option-enabled']['fr'] = 'Activé';
+	$text['option-enabled']['fr-fr'] = 'Activé';
 
 	$text['option-disabled']['en-us'] = 'Disabled';
 	$text['option-disabled']['pt-pt'] = '';
-	$text['option-disabled']['fr'] = 'Désactivé';
+	$text['option-disabled']['fr-fr'] = 'Désactivé';
 
 ?>
diff --git a/app/schemas/app_config.php b/app/schemas/app_config.php
index 2ba89900b2..125964109a 100644
--- a/app/schemas/app_config.php
+++ b/app/schemas/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Provides the ability to quickly define information to store and dynamically makes tools available to view, add, edit, delete, and search.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Fourni la possibilité de rapidement définir les informations à stocker et dynamiquement rendre disponible des outils pour voir, éditer, supprimer et chercher. ";
@@ -21,69 +21,53 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Schemas';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Schémas";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Schémas';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Tabelas";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Tabelas';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = '6be94b46-2126-947f-2365-0bea23651a6b';
 		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
 		$apps[$x]['menu'][0]['category'] = 'internal';
 		$apps[$x]['menu'][0]['path'] = '/app/schemas/schemas.php';
+		$apps[$x]['menu'][0]['groups'][] = 'admin';
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_data_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_data_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_data_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_data_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_name_value_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_name_value_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_name_value_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_name_value_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_field_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_field_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_field_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'schema_field_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][0]['name'] = 'schema_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'schema_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'admin';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'schema_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'admin';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'schema_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'admin';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][4]['name'] = 'schema_data_view';
+		$apps[$x]['permissions'][4]['groups'][] = 'admin';
+		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][5]['name'] = 'schema_data_add';
+		$apps[$x]['permissions'][5]['groups'][] = 'admin';
+		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][6]['name'] = 'schema_data_edit';
+		$apps[$x]['permissions'][6]['groups'][] = 'admin';
+		$apps[$x]['permissions'][6]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][7]['name'] = 'schema_data_delete';
+		$apps[$x]['permissions'][7]['groups'][] = 'admin';
+		$apps[$x]['permissions'][7]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -453,4 +437,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/schemas/app_languages.php b/app/schemas/app_languages.php
index f361934971..6f52cde61b 100644
--- a/app/schemas/app_languages.php
+++ b/app/schemas/app_languages.php
@@ -1,119 +1,227 @@
 <?php
 
 $text['title-schemas']['en-us'] = 'Schemas';
+$text['title-schemas']['fr-fr'] = 'Schémas';
 $text['title-schema']['en-us'] = 'Schema';
+$text['title-schema']['fr-fr'] = 'Schéma';
 $text['title-field']['en-us'] = 'Field';
+$text['title-field']['fr-fr'] = 'Champs';
 $text['title-name_value']['en-us'] = 'Select Box Option';
+$text['title-name_value']['fr-fr'] = "Choisir l'Option";
 $text['title-data_view']['en-us'] = 'Schema Data View';
+$text['title-data_view']['fr-fr'] = "Affichage des données";
 $text['title-data']['en-us'] = 'Schema Data';
+$text['title-data']['fr-fr'] = 'Données';
 $text['title-import']['en-us'] = 'Schema Import';
+$text['title-import']['fr-fr'] = 'Importer Schéma';
 $text['title-import_results']['en-us'] = 'Schema Import Results';
+$text['title-import_results']['fr-fr'] = "Résultat de l'import";
 
 $text['header-schemas']['en-us'] = 'Schemas';
+$text['header-schemas']['fr-fr'] = 'Schémas';
 $text['header-schema']['en-us'] = 'Schema';
+$text['header-schema']['fr-fr'] = 'Schéma';
 $text['header-fields']['en-us'] = 'Fields';
+$text['header-fields']['fr-fr'] = 'Champs';
 $text['header-field']['en-us'] = 'Field';
+$text['header-field']['fr-fr'] = 'Champs';
 $text['header-name_values']['en-us'] = 'Select Box Options';
+$text['header-name_values']['fr-fr'] = "Choisir l'option";
 $text['header-name_value']['en-us'] = 'Select Box Option';
+$text['header-name_value']['fr-fr'] = "Choisir l'option";
 $text['header-data_view']['en-us'] = 'Schema Data View';
+$text['header-data_view']['fr-fr'] = 'Affichage des données';
 $text['header-data']['en-us'] = 'Schema Data';
+$text['header-data']['fr-fr'] = 'Données';
 $text['header-import']['en-us'] = 'Schema Import';
+$text['header-import']['fr-fr'] = 'Importer Schéma';
 $text['header-import_results']['en-us'] = 'Schema Import Results';
+$text['header-import_results']['fr-fr'] = "Résultat de l'import";
 
 $text['description-schemas']['en-us'] = 'Provides the ability to quickly define information to store and dynamically makes tools available to view, add, edit, delete, and search.';
+$text['description-schemas']['fr-fr'] = "Permet de rapidement de stocker des informations et créer dynamiquement de soutils pour voir, ajouter, éditer, supprimer et chercher.";
 $text['description-schema']['en-us'] = 'Define the properties of the schema below.';
+$text['description-schema']['fr-fr'] = "Définir les propriétés du schéma ci-dessous.";
 $text['description-fields']['en-us'] = 'Lists the fields in the database.';
+$text['description-fields']['fr-fr'] = "Liste les champs de la base de données.";
 $text['description-field']['en-us'] = 'Define the properties of the field below.';
+$text['description-field']['fr-fr'] = "Définir les propriétés des champs ci-dessous";
 $text['description-name_values']['en-us'] = 'Name and value pairs of the Select Box.';
+$text['description-name_values']['fr-fr'] = "Nom et valeur de la sélection.";
 $text['description-name_value']['en-us'] = 'Define a name and value pair for the Select Box.';
+$text['description-name_value']['fr-fr'] = "Définir le nom et la valeur de la sélection.";
 
 $text['label-category']['en-us'] = 'Category';
+$text['label-category']['fr-fr'] = "Catégorie";
 $text['label-label']['en-us'] = 'Label';
+$text['label-label']['fr-fr'] = "Label";
 $text['label-name']['en-us'] = 'Name';
+$text['label-name']['fr-fr'] = "Nom";
 $text['label-schema_name']['en-us'] = 'Schema Name';
+$text['label-schema_name']['fr-fr'] = "Nom du schéma";
 $text['label-authentication']['en-us'] = 'Authentication';
+$text['label-authentication']['fr-fr'] = "Authentification";
 $text['label-parent_schema']['en-us'] = 'Parent Schema';
+$text['label-parent_schema']['fr-fr'] = "Schéma parent";
 $text['label-description']['en-us'] = 'Description';
+$text['label-description']['fr-fr'] = "Description";
 $text['label-field_label']['en-us'] = 'Label';
+$text['label-field_label']['fr-fr'] = "Label";
 $text['label-field_name']['en-us'] = 'Name';
+$text['label-field_name']['fr-fr'] = "Nom";
 $text['label-field_type']['en-us'] = 'Type';
+$text['label-field_type']['fr-fr'] = "Type";
 $text['label-field_value']['en-us'] = 'Value';
+$text['label-field_value']['fr-fr'] = "Valeur";
 $text['label-field_visibility']['en-us'] = 'Visibility';
+$text['label-field_visibility']['fr-fr'] = "Visible";
 $text['label-field_column']['en-us'] = 'Column';
+$text['label-field_column']['fr-fr'] = "Colone";
 $text['label-field_required']['en-us'] = 'Required';
+$text['label-field_required']['fr-fr'] = "Requis";
 $text['label-field_search_by']['en-us'] = 'Search By';
+$text['label-field_search_by']['fr-fr'] = "Rechercher Par";
 $text['label-field_order']['en-us'] = 'Field Order';
+$text['label-field_order']['fr-fr'] = "Ordre des Champs";
 $text['label-field_tab_order']['en-us'] = 'Tab Order';
+$text['label-field_tab_order']['fr-fr'] = "Odre des onglets";
 $text['label-field_description']['en-us'] = 'Description';
+$text['label-field_description']['fr-fr'] = "Description";
 $text['label-name_value_name']['en-us'] = 'Name';
+$text['label-name_value_name']['fr-fr'] = "Nom";
 $text['label-name_value_value']['en-us'] = 'Value';
+$text['label-name_value_value']['fr-fr'] = "Valeur";
 $text['label-import_data']['en-us'] = 'Data';
+$text['label-import_data']['fr-fr'] = "Donnée";
 $text['label-import_delimiter']['en-us'] = 'Delimiter';
+$text['label-import_delimiter']['fr-fr'] = "Séparateur de champs";
 $text['label-import_enclosure']['en-us'] = 'Enclosure';
+$text['label-import_enclosure']['fr-fr'] = "Champs entre";
 
 $text['description-category']['en-us'] = 'Select the category.';
+$text['description-category']['fr-fr'] = "Choisir la catégorie.";
 $text['description-label']['en-us'] = 'Enter the label.';
+$text['description-label']['fr-fr'] = "Choisir le label";
 $text['description-name']['en-us'] = 'Enter the schema name.';
+$text['description-name']['fr-fr'] = "Choisir le nom du schéma.";
 $text['description-authentication']['en-us'] = 'Choose whether to require authentication.';
+$text['description-authentication']['fr-fr'] = "Choisir si l'authentification est nécessaire.";
 $text['description-parent_schema']['en-us'] = 'Select a parent schema.';
+$text['description-parent_schema']['fr-fr'] = "Choisir un schéma parent.";
 $text['description-description']['en-us'] = 'Enter a description (optional).';
+$text['description-description']['fr-fr'] = "";
 $text['description-field_label']['en-us'] = 'Enter the field label.';
+$text['description-field_label']['fr-fr'] = "Choisil un label pour le champs";
 $text['description-field_name']['en-us'] = 'Enter field name.';
+$text['description-field_name']['fr-fr'] = "Choisir un nom pour le champs";
 $text['description-field_type']['en-us'] = 'Select the field type.';
+$text['description-field_type']['fr-fr'] = "Choisir un type de champs";
 $text['description-field_value']['en-us'] = 'Enter the default value.';
+$text['description-field_value']['fr-fr'] = "Choisir la valeur par défaut";
 $text['description-field_visibility']['en-us'] = 'Choose whether the field is hidden from the list.';
+$text['description-field_visibility']['fr-fr'] = "choisir si le champs est caché";
 $text['description-field_search_by']['en-us'] = 'Choose whether the field will be used for searches.';
+$text['description-field_search_by']['fr-fr'] = "Choisir si le champs sera utilisé pour la recherche";
 $text['description-field_column']['en-us'] = 'Determines which column to show the field in.';
+$text['description-field_column']['fr-fr'] = "Déterminer la colonne où afficher le champs";
 $text['description-field_required']['en-us'] = 'Choose whether the field is required.';
+$text['description-field_required']['fr-fr'] = "Choisir sir le champs est obligatoire";
 $text['description-field_order']['en-us'] = 'Enter the order of the field.';
+$text['description-field_order']['fr-fr'] = "Choisir l'ordre des champs";
 $text['description-field_tab_order']['en-us'] = 'Enter the tab order.';
+$text['description-field_tab_order']['fr-fr'] = "Choisir l'ordre des onglets";
 $text['description-field_description']['en-us'] = 'Enter the description (optional).';
+$text['description-field_description']['fr-fr'] = "";
 $text['description-name_value_name']['en-us'] = 'Enter the option text.';
+$text['description-name_value_name']['fr-fr'] = "Choisire le text de l'option.";
 $text['description-name_value_value']['en-us'] = 'Enter the option value.';
+$text['description-name_value_value']['fr-fr'] = "Choisir la valeur de l'option.";
 $text['description-import_data']['en-us'] = 'Copy and paste the comma delimitted data into the text area to begin the import.';
+$text['description-import_data']['fr-fr'] = "Copier et coller les données séparées par une virgule ou un \"pipe\" dans la zone de texte pour commencer l'import.";
 $text['description-import_delimiter']['en-us'] = 'Select the field/column delimiter.';
+$text['description-import_delimiter']['fr-fr'] = "Choisir le séparateur de champs/colonne";
 $text['description-import_enclosure']['en-us'] = 'Select the field/column data enclosure.';
+$text['description-import_enclosure']['fr-fr'] = "Choisir le conteneur de champs/colonne";
 
 $text['option-true']['en-us'] = 'True';
+$text['option-true']['fr-fr'] = "Oui";
 $text['option-false']['en-us'] = 'False';
+$text['option-false']['fr-fr'] = "Non";
 $text['option-fusionpbx']['en-us'] = 'FusionPBX';
+$text['option-fusionpbx']['fr-fr'] = "FusionPX";
 $text['option-other']['en-us'] = 'Other';
+$text['option-other']['fr-fr'] = "Autre";
 $text['option-visible']['en-us'] = 'Visible';
+$text['option-visible']['fr-fr'] = "Visible";
 $text['option-hidden']['en-us'] = 'Hidden';
+$text['option-hidden']['fr-fr'] = "Caché";
 $text['option-text']['en-us'] = 'Text';
+$text['option-text']['fr-fr'] = "Texte";
 $text['option-number']['en-us'] = 'Number';
+$text['option-number']['fr-fr'] = "Numéro";
 $text['option-date']['en-us'] = 'Date';
+$text['option-date']['fr-fr'] = "Date";
 $text['option-email']['en-us'] = 'Email';
+$text['option-email']['fr-fr'] = "Courriel";
 $text['option-label']['en-us'] = 'Label';
+$text['option-label']['fr-fr'] = "Label";
 $text['option-phone']['en-us'] = 'Phone';
+$text['option-phone']['fr-fr'] = "Téléphone";
 $text['option-check_box']['en-us'] = 'Check Box';
+$text['option-check_box']['fr-fr'] = "option";
 $text['option-text_area']['en-us'] = 'Text Area';
+$text['option-text_area']['fr-fr'] = "Zone de Texte";
 $text['option-select']['en-us'] = 'Select';
+$text['option-select']['fr-fr'] = "Choisir";
 $text['option-hidden']['en-us'] = 'Hidden';
+$text['option-hidden']['fr-fr'] = "Caché";
 $text['option-uuid']['en-us'] = 'UUID';
+$text['option-uuid']['fr-fr'] = "UUID";
 $text['option-password']['en-us'] = 'Password';
+$text['option-password']['fr-fr'] = "Mot de Passe";
 $text['option-pin_number']['en-us'] = 'PIN Number';
+$text['option-pin_number']['fr-fr'] = "Code PIN";
 $text['option-image_upload']['en-us'] = 'Image Upload';
+$text['option-image_upload']['fr-fr'] = "Télécharger une Image";
 $text['option-file_upload']['en-us'] = 'File Upload';
+$text['option-file_upload']['fr-fr'] = "Télécharger un Fichier";
 $text['option-url']['en-us'] = 'URL';
+$text['option-url']['fr-fr'] = "URL";
 $text['option-modified_date']['en-us'] = 'Modified Date';
+$text['option-modified_date']['fr-fr'] = "Date de Modification";
 $text['option-modified_user']['en-us'] = 'Modified User';
+$text['option-modified_user']['fr-fr'] = "Usager Modifié";
 
 $text['button-add']['en-us'] = 'Add';
+$text['button-add']['fr-fr'] = "Ajouter";
 $text['button-edit']['en-us'] = 'Edit';
+$text['button-edit']['fr-fr'] = "Editer";
 $text['button-delete']['en-us'] = 'Delete';
+$text['button-delete']['fr-fr'] = "Supprimer";
 $text['button-back']['en-us'] = 'Back';
+$text['button-back']['fr-fr'] = "Retour";
 $text['button-save']['en-us'] = 'Save';
+$text['button-save']['fr-fr'] = "Sauvegarder";
 $text['button-view']['en-us'] = 'View';
+$text['button-view']['fr-fr'] = "Voir";
 $text['button-import']['en-us'] = 'Import';
+$text['button-import']['fr-fr'] = "Importer";
 $text['button-search_all']['en-us'] = 'Search All';
+$text['button-search_all']['fr-fr'] = "Rechercher tout";
 $text['button-prev']['en-us'] = 'Previous';
+$text['button-prev']['fr-fr'] = "Précédent";
 $text['button-next']['en-us'] = 'Next';
+$text['button-next']['fr-fr'] = "Suivant";
 
 $text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
+$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 $text['message-add']['en-us'] = 'Add Completed';
+$text['message-add']['fr-fr'] = "Ajouté";
 $text['message-update']['en-us'] = 'Update Completed';
+$text['message-update']['fr-fr'] = "Télécharger";
 $text['message-delete']['en-us'] = 'Delete Completed';
+$text['message-delete']['fr-fr'] = "Supprimé";
 $text['message-required']['en-us'] = 'Please provide: ';
-?>
\ No newline at end of file
+$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
+?>
diff --git a/app/services/app_config.php b/app/services/app_config.php
index d42630ab14..a108c3c3a8 100644
--- a/app/services/app_config.php
+++ b/app/services/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Monitor System Services.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Contrôler les services du système";
+		$apps[$x]['description']['fr-fr'] = 'Contrôler les services du système';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Monitorizar Serviços do Sistema.';
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Services';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Services";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Services';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Serviços';
@@ -36,16 +36,16 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'service_view';
+		$apps[$x]['permissions'][0]['name'] = 'services_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'service_add';
+		$apps[$x]['permissions'][1]['name'] = 'services_add';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][2]['name'] = 'service_edit';
+		$apps[$x]['permissions'][2]['name'] = 'services_edit';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][3]['name'] = 'service_delete';
+		$apps[$x]['permissions'][3]['name'] = 'services_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
 	//schema details
@@ -116,4 +116,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/services/app_languages.php b/app/services/app_languages.php
index 4b604649e0..d854dd24f8 100644
--- a/app/services/app_languages.php
+++ b/app/services/app_languages.php
@@ -26,39 +26,39 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 	$text['message-delete']['en-us'] = 'Delete Complete';
-	$text['message-delete']['fr'] = "Supprimé";
+	$text['message-delete']['fr-fr'] = "Supprimé";
 	$text['button-back']['en-us'] = 'Back';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 	$text['button-save']['en-us'] = 'Save';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 	$text['title']['en-us'] = 'Service Add';
-	$text['title']['fr'] = 'Ajouter Service';
+	$text['title']['fr-fr'] = 'Ajouter Service';
 
 	$text['description']['en-us'] = 'Shows a list of processes and provides ability to start and stop them.';
-	$text['description']['fr'] = "Affiche la liste des processus et permet de les démarrer et les arrêter.";
+	$text['description']['fr-fr'] = "Affiche la liste des processus et permet de les démarrer et les arrêter.";
 	$text['label-name']['en-us'] = 'Name:';
-	$text['label-name']['fr'] = 'Nom:';
+	$text['label-name']['fr-fr'] = 'Nom:';
 	$text['description-name']['en-us'] = 'Enter the service name.';
-	$text['description-name']['fr'] = 'Entrer le nom du service.';
+	$text['description-name']['fr-fr'] = 'Entrer le nom du service.';
 	$text['label-type']['en-us'] = 'Type:';
-	$text['label-type']['fr'] = 'Type:';
+	$text['label-type']['fr-fr'] = 'Type:';
 	$text['description-type']['en-us'] = 'Select the service type.';
-	$text['description-type']['fr'] = 'Choisir le type de service.';
+	$text['description-type']['fr-fr'] = 'Choisir le type de service.';
 	$text['label-data']['en-us'] =  'Data:';
-	$text['label-data']['fr'] =  'Données:';
+	$text['label-data']['fr-fr'] =  'Données:';
 	$text['description-data']['en-us'] = 'Enter the service data.';
-	$text['description-data']['fr'] = 'Entrer les données du service.';
+	$text['description-data']['fr-fr'] = 'Entrer les données du service.';
 	$text['label-start']['en-us'] = 'Start Command:';
-	$text['label-start']['fr'] = 'Commande démarrage:';
+	$text['label-start']['fr-fr'] = 'Commande démarrage:';
 	$text['description-start']['en-us'] = 'Enter the command to start the service.';
-	$text['description-start']['fr'] = 'Entrer la commande pour démarrer le service.';
+	$text['description-start']['fr-fr'] = 'Entrer la commande pour démarrer le service.';
 	$text['label-stop']['en-us'] = 'Stop Comand';
-	$text['label-stop']['fr'] = "Comande d'arrêt";
+	$text['label-stop']['fr-fr'] = "Comande d'arrêt";
 	$text['description-stop']['en-us'] = 'Enter the command to stop the service.';
-	$text['description-stop']['fr'] = "Entrer la commande pour arrêter le service.";
+	$text['description-stop']['fr-fr'] = "Entrer la commande pour arrêter le service.";
 	$text['label-description']['en-us'] = 'Description:';
-	$text['label-description']['fr'] = 'Description:';
+	$text['label-description']['fr-fr'] = 'Description:';
 	$text['description-description']['en-us'] = 'Enter the service description.';
-	$text['description-description']['fr'] = "Entrer la description du service.";
+	$text['description-description']['fr-fr'] = "Entrer la description du service.";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/settings/app_config.php b/app/settings/app_config.php
index c76992babf..645f81e194 100644
--- a/app/settings/app_config.php
+++ b/app/settings/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'PBX Settings.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Confs PBX';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Settings';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Configuration';
@@ -32,22 +32,15 @@
 		$apps[$x]['menu'][0]['uuid'] = '148ea42a-3711-3d64-181b-07a6a3c3ed60';
 		$apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
 		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/settings/setting_edit.php';
+		$apps[$x]['menu'][0]['path'] = '/app/settings/settings_edit.php';
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-
+	
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'setting_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'setting_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$y++;
-		//$apps[$x]['permissions'][$y]['name'] = 'setting_add';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$y++;
-		//$apps[$x]['permissions'][$y]['name'] = 'setting_delete';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][0]['name'] = 'settings_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'settings_edit';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -145,4 +138,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/settings/app_languages.php b/app/settings/app_languages.php
index 7b1a6fa2d9..fa3b2da216 100644
--- a/app/settings/app_languages.php
+++ b/app/settings/app_languages.php
@@ -26,47 +26,47 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 	$text['title-settings']['en-us'] = 'Setting Update';
-	$text['title-settings']['fr'] = 'Mise à jour de la configuration';
+	$text['title-settings']['fr-fr'] = 'Mise à jour de la configuration';
 
 	$text['label-event-socket-ip']['en-us'] = 'Event Socket IP Address:';
-	$text['label-event-socket-ip']['fr'] = 'Adresse IP pour Event Socket:';
+	$text['label-event-socket-ip']['fr-fr'] = 'Adresse IP pour Event Socket:';
 	$text['description-event-socket-ip']['en-us'] = 'Enter the event socket IP address. default: 127.0.0.1';
-	$text['description-event-socket-ip']['fr'] = "Adresse IP pour le module Event Socket. défaut: 127.0.0.1";
+	$text['description-event-socket-ip']['fr-fr'] = "Adresse IP pour le module Event Socket. défaut: 127.0.0.1";
 
 	$text['label-event-socket-port']['en-us'] = 'Event Socket Port:';
-	$text['label-event-socket-port']['fr'] = 'Event Socket Port:';
+	$text['label-event-socket-port']['fr-fr'] = 'Event Socket Port:';
 	$text['description-event-socket-port']['en-us'] = 'Enter the event socket port. default: 8021';
-	$text['description-event-socket-port']['fr'] = "Port du module Event Socket. défaut: 8021";
+	$text['description-event-socket-port']['fr-fr'] = "Port du module Event Socket. défaut: 8021";
 
 	$text['label-event-socket-pw']['en-us'] = 'Event Socket Password:';
-	$text['label-event-socket-pw']['fr'] = 'Mot de Passe Event Socket:';
+	$text['label-event-socket-pw']['fr-fr'] = 'Mot de Passe Event Socket:';
 	$text['description-event-socket-pw']['en-us'] = 'Enter the event socket password.';
-	$text['description-event-socket-pw']['fr'] = 'Mot de passe pour se connecter au module Event Socket.';
+	$text['description-event-socket-pw']['fr-fr'] = 'Mot de passe pour se connecter au module Event Socket.';
 
 	$text['label-xml-rpc-port']['en-us'] = 'XML RPC HTTP Port:';
-	$text['label-xml-rpc-port']['fr'] = 'XML RPC HTTP Port:';
+	$text['label-xml-rpc-port']['fr-fr'] = 'XML RPC HTTP Port:';
 	$text['description-xml-rpc-port']['en-us'] = 'Enter the XML RPC HTTP Port. default: 8787';
-	$text['description-xml-rpc-port']['fr'] = 'Port pour joindre le service  XML RPC HTTP. défaut: 8787';
+	$text['description-xml-rpc-port']['fr-fr'] = 'Port pour joindre le service  XML RPC HTTP. défaut: 8787';
 	$text['label-xml-rpc-realm']['en-us'] = 'XML RPC Auth Realm:';
-	$text['label-xml-rpc-realm']['fr'] = 'XML RPC Auth Realm:';
+	$text['label-xml-rpc-realm']['fr-fr'] = 'XML RPC Auth Realm:';
 	$text['description-xml-rpc-realm']['en-us'] = 'Enter the XML RPC Auth Realm. default: freeswitch';
-	$text['description-xml-rpc-realm']['fr'] = "Royaume d'authentification XML RPC. défaut: freeswitch";
+	$text['description-xml-rpc-realm']['fr-fr'] = "Royaume d'authentification XML RPC. défaut: freeswitch";
 	$text['label-xml-rpc-user']['en-us'] = 'XML RPC Auth User:';
-	$text['label-xml-rpc-user']['fr'] = 'Auth usager XML RPC:';
+	$text['label-xml-rpc-user']['fr-fr'] = 'Auth usager XML RPC:';
 	$text['description-xml-rpc-user']['en-us'] = 'Enter the XML RPC Auth User. default: xmlrpc';
-	$text['description-xml-rpc-user']['fr'] = 'Usager XML RPC. défaut: xmlrpc';
+	$text['description-xml-rpc-user']['fr-fr'] = 'Usager XML RPC. défaut: xmlrpc';
 	$text['label-xml-rpc-pw']['en-us'] = 'XML RPC Auth Password:';
-	$text['label-xml-rpc-pw']['fr'] = 'Mot de passe XML RPC:';
+	$text['label-xml-rpc-pw']['fr-fr'] = 'Mot de passe XML RPC:';
 	$text['description-xml-rpc-pw']['en-us'] = 'Enter the XML RPC Auth Password.';
-	$text['description-xml-rpc-pw']['fr'] = 'Mot de passe pour XML RPC.';
+	$text['description-xml-rpc-pw']['fr-fr'] = 'Mot de passe pour XML RPC.';
 
 	$text['label-shout-decoder']['en-us'] = 'Mod Shout Decoder:';
-	$text['label-shout-decoder']['fr'] = 'Décodeur Mod Shout (MP3):';
+	$text['label-shout-decoder']['fr-fr'] = 'Décodeur Mod Shout (MP3):';
 	$text['description-shout-decoder']['en-us'] = 'Ender the Decoder. default: i386';
-	$text['description-shout-decoder']['fr'] = 'Type de Decoder. défaut: i386';
+	$text['description-shout-decoder']['fr-fr'] = 'Type de Decoder. défaut: i386';
 	$text['label-shout-volume']['en-us'] = 'Mod Shout Volume:';
-	$text['label-shout-volume']['fr'] = 'Mod Shout Volume:';
+	$text['label-shout-volume']['fr-fr'] = 'Mod Shout Volume:';
 	$text['description-shout-volume']['en-us'] = 'Enter Mod Shout Volume.';
-	$text['description-shout-volume']['fr'] = "Choisir l'amplification du volume pour Mod Shout.";
+	$text['description-shout-volume']['fr-fr'] = "Choisir l'amplification du volume pour Mod Shout.";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/sip_profiles/app_config.php b/app/sip_profiles/app_config.php
index 3cb21ec1e2..62709beb84 100644
--- a/app/sip_profiles/app_config.php
+++ b/app/sip_profiles/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = '';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = '';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'SIP Profiles';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Profiles SIP';
@@ -48,18 +48,6 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'sip_profile_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'sip_profile_setting_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'sip_profile_setting_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'sip_profile_setting_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'sip_profile_setting_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -111,4 +99,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
 		$z++;
-?>
\ No newline at end of file
+?>
diff --git a/app/sip_profiles/app_languages.php b/app/sip_profiles/app_languages.php
index 5787e1535c..96efda0c8b 100644
--- a/app/sip_profiles/app_languages.php
+++ b/app/sip_profiles/app_languages.php
@@ -3,48 +3,84 @@
 	//SIP Profiles
 
 		$text['title-sip_profiles']['en-us'] = 'SIP Profiles';
+		$text['title-sip_profiles']['fr-fr'] = 'Profiles SIP';
 		$text['title-sip_profile']['en-us'] = 'SIP Profile';
+		$text['title-sip_profile']['fr-fr'] = 'Profile SIP';
 		$text['title-setting']['en-us'] = 'Profile Setting';
+		$text['title-setting']['fr-fr'] = 'Paramètres du Profile';
 
 		$text['header-sip_profiles']['en-us'] = 'SIP Profiles';
+		$text['header-sip_profiles']['fr-fr'] = 'Profiles SIP';
 		$text['header-sip_profile']['en-us'] = 'SIP Profile';
+		$text['header-sip_profile']['fr-fr'] = 'Profile SIP';
 		$text['header_settings']['en-us'] = 'Settings';
+		$text['header_settings']['fr-fr'] = 'Paramètres';
 		$text['header-setting']['en-us'] = 'Profile Setting';
+		$text['header-setting']['fr-fr'] = 'Paramètres du Profile';
 
 		$text['description-sip_profiles']['en-us'] = 'Manage settings for SIP profiles.';
+		$text['description-sip_profiles']['fr-fr'] = "Gérer les paramètres du profile SIP";
 		$text['description-sip_profile']['en-us'] = 'Manage settings for the SIP profile.';
+		$text['description-sip_profile']['fr-fr'] = "Gérer les paramètres du profile SIP";
 
 		$text['label-name']['en-us'] = 'Name';
+		$text['label-name']['fr-fr'] = 'Nom';
 		$text['label-description']['en-us'] = 'Description';
+		$text['label-description']['fr-fr'] = 'Description';
 		$text['label-setting_name']['en-us'] = 'Name';
+		$text['label-setting_name']['fr-fr'] = 'Nom';
 		$text['label-setting_value']['en-us'] = 'Value';
+		$text['label-setting_value']['fr-fr'] = 'Valeur';
 		$text['label-setting_enabled']['en-us'] = 'Enabled';
+		$text['label-setting_enabled']['fr-fr'] = 'Actif';
 		$text['label-setting_description']['en-us'] = 'Description';
+		$text['label-setting_description']['fr-fr'] = 'Description';
 
 		$text['description-name']['en-us'] = 'Enter the SIP Profile name.';
+		$text['description-name']['fr-fr'] = "Entrer le nom du Profile SIP.";
 		$text['description-description']['en-us'] = 'Enter the description.';
+		$text['description-description']['fr-fr'] = "Entrer la description.";
 		$text['description-setting_name']['en-us'] = 'Enter the name.';
+		$text['description-setting_name']['fr-fr'] = 'Entrer le nom.';
 		$text['description-setting_value']['en-us'] = 'Enter the value.';
+		$text['description-setting_value']['fr-fr'] = 'Entrer la valeur.';
 		$text['description-setting_enabled']['en-us'] = 'Choose to enable or disable this.';
+		$text['description-setting_enabled']['fr-fr'] = "Choisir si le paramètre sera actif ou non.";
 		$text['description-setting_description']['en-us'] = 'Enter the description.';
+		$text['description-setting_description']['fr-fr'] = 'Entrer la description.';
 
 		$text['option-true']['en-us'] = 'True';
+		$text['option-true']['fr-fr'] = 'Oui';
 		$text['option-false']['en-us'] = 'False';
+		$text['option-false']['fr-fr'] = 'Non';
 
 		$text['button-add']['en-us'] = 'Add';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 		$text['button-edit']['en-us'] = 'Edit';
+		$text['button-edit']['fr-fr'] = 'Editer';
 		$text['button-delete']['en-us'] = 'Delete';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 		$text['button-back']['en-us'] = 'Back';
+		$text['button-back']['fr-fr'] = 'Retour';
 		$text['button-copy']['en-us'] = 'Copy';
+		$text['button-copy']['fr-fr'] = 'Copier';
 		$text['button-save']['en-us'] = 'Save';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 		$text['confirm-copy']['en-us'] = 'Do you really want to copy this?';
+		$text['confirm-copy']['fr-fr'] = "Voulez-vous vraiment copier cela?";
 
 		$text['message-add']['en-us'] = 'Add Completed';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 		$text['message-update']['en-us'] = 'Update Completed';
+		$text['message-update']['fr-fr'] = 'Mis à jour';
 		$text['message-delete']['en-us'] = 'Delete Completed';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 		$text['message-copy']['en-us'] = 'Copy Completed';
+		$text['message-copy']['fr-fr'] = 'Copié';
 		$text['message-required']['en-us'] = 'Please provide: ';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/sip_status/app_config.php b/app/sip_status/app_config.php
index 19cda1f229..a04f68eddd 100644
--- a/app/sip_status/app_config.php
+++ b/app/sip_status/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Displays system information such as RAM, CPU and Hard Drive information.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = '';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'SIP Status';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Etat SIP';
@@ -44,4 +44,4 @@
 
 		$apps[$x]['permissions'][2]['name'] = 'sip_status_switch_status';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/sip_status/app_languages.php b/app/sip_status/app_languages.php
index ee23c1cac1..a8a29ef2a9 100644
--- a/app/sip_status/app_languages.php
+++ b/app/sip_status/app_languages.php
@@ -26,13 +26,13 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 	$text['error-event-socket']['en-us'] = 'Connection to Event Socket failed.';
-	$text['error-event-socket']['fr'] = "Connexion à l'Event Socket en echec.";
+	$text['error-event-socket']['fr-fr'] = "Connexion à l'Event Socket en echec.";
 	$text['label-message']['en-us'] = 'Message';
-	$text['label-message']['fr'] = 'Message';
+	$text['label-message']['fr-fr'] = 'Message';
 	$text['title-sofia-status']['en-us'] = 'sofia status';
-	$text['title-sofia-status']['fr'] = 'sofia statut';
+	$text['title-sofia-status']['fr-fr'] = 'sofia statut';
 	$text['title-sofia-status-profile']['en-us'] = 'sofia status profile';
-	$text['title-sofia-status-profile']['fr'] = 'profile statut sofia';
+	$text['title-sofia-status-profile']['fr-fr'] = 'profile statut sofia';
 	$text['title-status']['en-us'] = 'status';
-	$text['title-status']['fr'] = 'statut';
-?>
\ No newline at end of file
+	$text['title-status']['fr-fr'] = 'statut';
+?>
diff --git a/app/sql_query/app_config.php b/app/sql_query/app_config.php
index 1997077471..176b06b62a 100644
--- a/app/sql_query/app_config.php
+++ b/app/sql_query/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Run Structur Query Language commands.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Lancer de requêtes SQL";
+		$apps[$x]['description']['fr-fr'] = 'Lancer de requêtes SQL';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Executar comandos Língua estruturação de consulta.';
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'SQL Query';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Requête SQL";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Requête SQL';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Consulta SQL';
@@ -41,4 +41,4 @@
 
 		$apps[$x]['permissions'][1]['name'] = 'sql_query_backup';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/sql_query/app_languages.php b/app/sql_query/app_languages.php
index 694d9e0081..1685e64e01 100644
--- a/app/sql_query/app_languages.php
+++ b/app/sql_query/app_languages.php
@@ -3,31 +3,54 @@
 	//SQL Query
 
 		$text['title-sql_query']['en-us'] = 'SQL Query';
+		$text['title-sql_query']['fr-fr'] = 'Requête SQL';
 		$text['title-databases']['en-us'] = 'Databases';
+		$text['title-databases']['fr-fr'] = 'Bases de données';
 
 		$text['header-sql_query']['en-us'] = 'SQL Query';
+		$text['header-sql_query']['fr-fr'] = 'Requêtes SQL';
 		$text['header-databases']['en-us'] = 'Databases';
+		$text['header-databases']['fr-fr'] = 'Bases de données';
 
 		$text['description-databases']['en-us'] = 'Select the database to use with SQL Query.';
+		$text['description-databases']['fr-fr'] = "Choisir la base de données utilisée par la requête SQL.";
 
 		$text['label-sql_query']['en-us'] = 'SQL Query';
+		$text['label-sql_query']['fr-fr'] = 'Requête SQL';
 		$text['label-table']['en-us'] = 'Table';
+		$text['label-table']['fr-fr'] = 'Table';
 		$text['label-result_type']['en-us'] = 'Result';
+		$text['label-result_type']['fr-fr'] = 'Résultat';
 		$text['label-results']['en-us'] = 'Results';
+		$text['label-results']['fr-fr'] = 'Résultats';
 		$text['label-error']['en-us'] = 'Error';
+		$text['label-error']['fr-fr'] = 'Erreur';
 		$text['label-type']['en-us'] = 'Type';
+		$text['label-type']['fr-fr'] = 'Type';
 		$text['label-host']['en-us'] = 'Host';
+		$text['label-host']['fr-fr'] = 'Hôte';
 		$text['label-name']['en-us'] = 'Name';
+		$text['label-name']['fr-fr'] = 'Nom';
 		$text['label-description']['en-us'] = 'Description';
+		$text['label-description']['fr-fr'] = 'Description';
 
 		$text['option-result_type_view']['en-us'] = 'View';
+		$text['option-result_type_view']['fr-fr'] = 'Voir';
 		$text['option-result_type_csv']['en-us'] = 'CSV Download';
+		$text['option-result_type_csv']['fr-fr'] = 'Télécharger le CSV';
 		$text['option-result_type_insert']['en-us'] = 'SQL Inserts';
+		$text['option-result_type_insert']['fr-fr'] = 'Insertion SQL';
 
 		$text['button-edit']['en-us'] = 'Edit';
+		$text['button-edit']['fr-fr'] = 'Editer';
 		$text['button-backup']['en-us'] = 'Backup';
+		$text['button-backup']['fr-fr'] = 'Sauvegarder';
 		$text['button-select_database']['en-us'] = 'Select Database';
+		$text['button-select_database']['fr-fr'] = 'Choisir la Base de données';
 		$text['button-back']['en-us'] = 'Back';
+		$text['button-back']['fr-fr'] = 'Retour';
 		$text['button-execute']['en-us'] = 'Execute';
+		$text['button-execute']['fr-fr'] = 'Exécuter';
 		$text['button-manage']['en-us'] = 'Manage';
-?>
\ No newline at end of file
+		$text['button-manage']['fr-fr'] = 'Gérer';
+?>
diff --git a/app/system/app_config.php b/app/system/app_config.php
index 47fe35bea0..cbd60f9fa7 100644
--- a/app/system/app_config.php
+++ b/app/system/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Displays information for CPU, HDD, RAM and more.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Affiche les information sur le sytème comme les informations sur la RAM, la CPU et le Disque Dur";
+		$apps[$x]['description']['fr-fr'] = 'Affiche les information sur le sytème comme les informations sur la RAM, la CPU et le Disque Dur';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Exibe informações do CPU, disco rígido, memória RAM e muito mais.';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'System Status';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Etat Système';
@@ -36,33 +36,20 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'system_view_info';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'system_view_cpu';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'system_view_hdd';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'system_view_ram';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'system_view_backup';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'software_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'software_add';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'software_edit';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'software_delete';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][0]['name'] = 'system_view_info';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'system_view_cpu';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'system_view_hdd';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'system_view_ram';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][4]['name'] = 'system_view_backup';
+		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -90,4 +77,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/system/app_languages.php b/app/system/app_languages.php
index 389f2b550b..73512a68f6 100644
--- a/app/system/app_languages.php
+++ b/app/system/app_languages.php
@@ -27,25 +27,25 @@
 */
 
 	$text['title-sys-info']['en-us'] = 'System Information';
-	$text['title-sys-info']['fr'] = 'Info Système';
+	$text['title-sys-info']['fr-fr'] = 'Info Système';
 	$text['label-os']['en-us'] = 'Operating System:';
-	$text['label-os']['fr'] = 'Operating System:';
+	$text['label-os']['fr-fr'] = 'Operating System:';
 	$text['title-mem']['en-us'] = 'Memory Information';
-	$text['title-mem']['fr'] = 'Information Mémoire';
+	$text['title-mem']['fr-fr'] = 'Information Mémoire';
 	$text['label-mem']['en-us'] = 'Memory Status:';
-	$text['label-mem']['fr'] = 'Statut Mémoire:';
+	$text['label-mem']['fr-fr'] = 'Statut Mémoire:';
 	$text['title-cpu']['en-us'] = 'CPU Information';
-	$text['title-cpu']['fr'] = 'Info CPU';
+	$text['title-cpu']['fr-fr'] = 'Info CPU';
 	$text['label-cpu']['en-us'] = 'CPU Status:';
-	$text['label-cpu']['fr'] = 'CPU Statut:';
+	$text['label-cpu']['fr-fr'] = 'CPU Statut:';
 	$text['title-drive']['en-us'] = 'Drive Information';
-	$text['title-drive']['fr'] = 'Info Disque';
+	$text['title-drive']['fr-fr'] = 'Info Disque';
 	$text['label-drive']['en-us'] = 'Drive Space:';
-	$text['label-drive']['fr'] = 'Espace Disque:';
+	$text['label-drive']['fr-fr'] = 'Espace Disque:';
 	$text['label-drive-capacity']['en-us'] = 'Capacity:';
-	$text['label-drive-capacity']['fr'] = 'Capacité:';
+	$text['label-drive-capacity']['fr-fr'] = 'Capacité:';
 	$text['label-drive-free']['en-us'] = 'Free Space:';
-	$text['label-drive-free']['fr'] = 'Espace Libre:';
+	$text['label-drive-free']['fr-fr'] = 'Espace Libre:';
 	$text['label-drive-percent']['en-us'] = 'Percent Free:';
-	$text['label-drive-percent']['fr'] = 'Pourcent Libre:';
-?>
\ No newline at end of file
+	$text['label-drive-percent']['fr-fr'] = 'Pourcent Libre:';
+?>
diff --git a/app/time_conditions/app_config.php b/app/time_conditions/app_config.php
index 20d41dcb3f..09dfbf32b9 100644
--- a/app/time_conditions/app_config.php
+++ b/app/time_conditions/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Direct calls based on the time of day.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Redirige les appels en fonction de l'heure";
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Time Conditions';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Conditions Temporelles";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Conditions Temporelles';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Condições de tempo';
@@ -37,19 +37,19 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'time_condition_view';
+		$apps[$x]['permissions'][0]['name'] = 'time_conditions_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'time_condition_add';
+		$apps[$x]['permissions'][1]['name'] = 'time_conditions_add';
 		$apps[$x]['permissions'][1]['groups'][] = 'admin';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][2]['name'] = 'time_condition_edit';
+		$apps[$x]['permissions'][2]['name'] = 'time_conditions_edit';
 		$apps[$x]['permissions'][2]['groups'][] = 'admin';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][3]['name'] = 'time_condition_delete';
+		$apps[$x]['permissions'][3]['name'] = 'time_conditions_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'admin';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/time_conditions/app_languages.php b/app/time_conditions/app_languages.php
index 67b37dcb0c..aa92a116af 100644
--- a/app/time_conditions/app_languages.php
+++ b/app/time_conditions/app_languages.php
@@ -1,148 +1,148 @@
-<?php
+<?php
 
 	$text['title-time-condition-add']['en-us'] = 'Time Conditions';
-	$text['title-time-condition-add']['fr'] = 'Conditions Temporelles';
+	$text['title-time-condition-add']['fr-fr'] = 'Conditions Temporelles';
 	$text['description-time-condition-add']['en-us'] = 'Time conditions route calls based on time conditions. You can use time conditions to send calls to an IVR Menu, External numbers, Scripts, or other destinations.';
-	$text['description-time-condition-add']['fr'] = "Configurer l'acheminement d'apppel en fonction de conditions temporelles. Ces conditions temporelles permettent de diriger les appels vers un menu SVI, un numéro externe, un script, ou tout autre destination.";
+	$text['description-time-condition-add']['fr-fr'] = "Configurer l'acheminement d'apppel en fonction de conditions temporelles. Ces conditions temporelles permettent de diriger les appels vers un menu SVI, un numéro externe, un script, ou tout autre destination.";
 
 	$text['button-back']['en-us'] = 'Back';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 
 	$text['label-name']['en-us'] = 'Name';
-	$text['label-name']['fr'] = 'Nom';
+	$text['label-name']['fr-fr'] = 'Nom';
 	$text['description-name']['en-us'] = 'Enter the name for the time condition.'; 
-	$text['description-name']['fr'] = "Choisir un nom pour cette condition temporelle.";
+	$text['description-name']['fr-fr'] = "Choisir un nom pour cette condition temporelle.";
 
 	$text['label-extension']['en-us'] = 'Extension';
-	$text['label-extension']['fr'] = 'Extension';
+	$text['label-extension']['fr-fr'] = 'Extension';
 	$text['description-extension']['en-us'] = 'Enter the extension number.';
-	$text['description-extension']['fr'] = "Choisir le numéro d'extension.";
+	$text['description-extension']['fr-fr'] = "Choisir le numéro d'extension.";
 
 	$text['label-template']['en-us'] = 'Template';
-	$text['label-template']['fr'] = 'Modèle';
+	$text['label-template']['fr-fr'] = 'Modèle';
 	$text['description-template']['en-us'] = 'The templates provides a list of preset time conditions.';
-	$text['description-template']['fr'] = "Le modèle fourni une liste de présélection.";
+	$text['description-template']['fr-fr'] = "Le modèle fourni une liste de présélection.";
 
 //begin: Template options
 	$text['label-optgroup-office']['en-us'] = 'Office';
-	$text['label-optgroup-office']['en-us'] = 'Bureau';
+	$text['label-optgroup-office']['fr-fr'] = 'Bureau';
 	$text['label-option-office-8am-5pm']['en-us'] = 'Office Hours Mon-Fri 8am-5pm';
-	$text['label-option-office-8am-5pm']['fr'] = 'Heures de Bureau Lun-Ven 8h-17h';
+	$text['label-option-office-8am-5pm']['fr-fr'] = 'Heures de Bureau Lun-Ven 8h-17h';
 	$text['label-option-office-9am-6pm']['en-us'] = 'Office Hours Mon-Fri 9am-6pm';
-	$text['label-option-office-9am-6pm']['fr'] = 'Heures de Bureau Lun-Ven 9h-18h';
+	$text['label-option-office-9am-6pm']['fr-fr'] = 'Heures de Bureau Lun-Ven 9h-18h';
 	
 	$text['label-optgroup-us-holidays']['en-us'] = 'US Holidays';
-	$text['label-optgroup-us-holidays']['fr'] = 'Vacances US';
+	$text['label-optgroup-us-holidays']['fr-fr'] = 'Vacances US';
 	$text['label-option-us-holidays-new-year']['en-us'] = 'New Year\'s Day';
-	$text['label-option-us-holidays-new-year']['fr'] = "Nouvel an";
+	$text['label-option-us-holidays-new-year']['fr-fr'] = "Nouvel an";
 	$text['label-option-us-holidays-martin-luther-king']['en-us'] = 'Martin Luther King Jr Day';
-	$text['label-option-us-holidays-martin-luther-king']['fr'] = 'Martin Luther King Jr Day';
+	$text['label-option-us-holidays-martin-luther-king']['fr-fr'] = 'Martin Luther King Jr Day';
 	$text['label-option-us-holidays-president']['en-us'] = 'Presidents Day';
-	$text['label-option-us-holidays-president']['fr'] = 'Presidents Day';
+	$text['label-option-us-holidays-president']['fr-fr'] = 'Presidents Day';
 	$text['label-option-us-holidays-memorial']['en-us'] = 'Memorial Day';
-	$text['label-option-us-holidays-memorial']['fr'] = 'Memorial Day';
+	$text['label-option-us-holidays-memorial']['fr-fr'] = 'Memorial Day';
 	$text['label-option-us-holidays-independence']['en-us'] = 'Independence Day';
-	$text['label-option-us-holidays-independence']['fr'] = 'Independence Day';
+	$text['label-option-us-holidays-independence']['fr-fr'] = 'Independence Day';
 	$text['label-option-us-holidays-labor']['en-us'] = 'Labor Day';
-	$text['label-option-us-holidays-labor']['fr'] = 'Labor Day';
+	$text['label-option-us-holidays-labor']['fr-fr'] = 'Labor Day';
 	$text['label-option-us-holidays-columbus']['en-us'] = 'Columbus Day';
-	$text['label-option-us-holidays-columbus']['fr'] = 'Columbus Day';
+	$text['label-option-us-holidays-columbus']['fr-fr'] = 'Columbus Day';
 	$text['label-option-us-holidays-veteran']['en-us'] = 'Veteran\'s Day';
-	$text['label-option-us-holidays-veteran']['fr'] = 'Veteran\'s Day';
+	$text['label-option-us-holidays-veteran']['fr-fr'] = 'Veteran\'s Day';
 	$text['label-option-us-holidays-thanksgiving']['en-us'] = 'Thanksgiving';
-	$text['label-option-us-holidays-thanksgiving']['fr'] = 'Thanksgiving';
+	$text['label-option-us-holidays-thanksgiving']['fr-fr'] = 'Thanksgiving';
 	$text['label-option-us-holidays-christmas']['en-us'] = 'Christmas';	
-	$text['label-option-us-holidays-christmas']['fr'] = 'Noël';	
+	$text['label-option-us-holidays-christmas']['fr-fr'] = 'Noël';	
 //end: TemplateOptions
 
 	$text['label-day-of-month']['en-us'] = 'Day of Month';
-	$text['label-day-of-month']['fr'] = "Jour du Mois";
+	$text['label-day-of-month']['fr-fr'] = "Jour du Mois";
 	$text['description-day-of-month']['en-us'] = 'Enter the day of the month.';
-	$text['description-day-of-month']['fr'] = "Choisir le jour du mois.";
+	$text['description-day-of-month']['fr-fr'] = "Choisir le jour du mois.";
 	
 	$text['label-day-of-week']['en-us'] = 'Day of Week';
-	$text['label-day-of-week']['fr'] = "Jour de la semaine";
+	$text['label-day-of-week']['fr-fr'] = "Jour de la semaine";
 	$text['description-day-of-week']['en-us'] = 'Enter the day of the week. 1-7 (Sun=1, Mon=2, Tues=3)';
-	$text['description-day-of-week']['fr'] = "Choisir le jour de la semaine. 1-7 (Dim=1, Lun=2, Mar=3).";
+	$text['description-day-of-week']['fr-fr'] = "Choisir le jour de la semaine. 1-7 (Dim=1, Lun=2, Mar=3).";
 	
 	$text['label-minute-of-day']['en-us'] = 'Minute of Day';
-	$text['label-minute-of-day']['fr'] = "Minute de la journée";
+	$text['label-minute-of-day']['fr-fr'] = "Minute de la journée";
 	$text['description-minute-of-day']['en-us'] = 'Enter the minute of the day. 1-1440 (midnight = 1, 8am=480, 9am=540, 6pm=1080)';
-	$text['description-minute-of-day']['fr'] = "Choisir la minute de la journée. 1-1440 (minuit = 1, 8h=480, 9h=540, 6h=1080)";
+	$text['description-minute-of-day']['fr-fr'] = "Choisir la minute de la journée. 1-1440 (minuit = 1, 8h=480, 9h=540, 6h=1080)";
 	
 	$text['label-month']['en-us'] = 'Month';
-	$text['label-month']['fr'] = 'Mois';
+	$text['label-month']['fr-fr'] = 'Mois';
 	$text['description-month']['en-us'] = 'Enter the month. 1-12 (Jan=1, Feb=2, Mar=3, April=4, May=5, Jun=6, July=7 etc.)';
-	$text['description-month']['fr'] = "Choisir le mois. 1-12 (Jan=1, Fev=2, Mar=3, Avr=4, Mai=5, etc.).";
+	$text['description-month']['fr-fr'] = "Choisir le mois. 1-12 (Jan=1, Fev=2, Mar=3, Avr=4, Mai=5, etc.).";
 	
 	$text['label-week-of-month']['en-us'] = 'Week of Month';
-	$text['label-week-of-month']['fr'] = "Semaine du Mois";
+	$text['label-week-of-month']['fr-fr'] = "Semaine du Mois";
 	$text['description-week-of-month']['en-us'] = 'Enter the week of the month.';
-	$text['description-week-of-month']['fr'] = "Choisir le numéro de la semaine dans le mois";
+	$text['description-week-of-month']['fr-fr'] = "Choisir le numéro de la semaine dans le mois";
 
 //begin: show_advanced	
 	$text['label-show-advanced']['en-us'] = 'Show Advanced';
-	$text['label-show-advanced']['fr'] = "Paramètres avancés";
+	$text['label-show-advanced']['fr-fr'] = "Paramètres avancés";
 	$text['button-advanced']['en-us'] = 'Advanced';
-	$text['button-advanced']['fr'] = "Afficher les paramètres avancés";
+	$text['button-advanced']['fr-fr'] = "Afficher les paramètres avancés";
 	
 	$text['label-day-of-year']['en-us'] = 'Day of Year';
-	$text['label-day-of-year']['fr'] = "Jour de l'année";
+	$text['label-day-of-year']['fr-fr'] = "Jour de l'année";
 	$text['description-day-of-year']['en-us'] = 'Enter the day of the year.';
-	$text['description-day-of-year']['fr'] = "Choisir le numéro du jour de l'année.";
+	$text['description-day-of-year']['fr-fr'] = "Choisir le numéro du jour de l'année.";
 	
 	$text['label-hour']['en-us'] = 'Hour';
-	$text['label-hour']['fr'] = 'Heure';
+	$text['label-hour']['fr-fr'] = 'Heure';
 	$text['description-hour']['en-us'] = 'Enter the hour.';
-	$text['description-hour']['fr'] = "Choisir l'heure.";
+	$text['description-hour']['fr-fr'] = "Choisir l'heure.";
 	
 	$text['label-minute']['en-us'] = 'Minute';
-	$text['label-minute']['fr'] = 'Minute';
+	$text['label-minute']['fr-fr'] = 'Minute';
 	$text['description-minute']['en-us'] = 'Enter the minute.';
-	$text['description-minute']['fr'] = "Choisir la minute.";
+	$text['description-minute']['fr-fr'] = "Choisir la minute.";
 	
 	$text['label-week']['en-us'] = 'Week';
-	$text['label-week']['fr'] = 'Semaine';
+	$text['label-week']['fr-fr'] = 'Semaine';
 	$text['description-week']['en-us'] = 'Enter the week.';
-	$text['description-week']['fr'] = 'Choisir le numéro de la semaine.';
+	$text['description-week']['fr-fr'] = 'Choisir le numéro de la semaine.';
 	
 	$text['label-year']['en-us'] = 'Year';
-	$text['label-year']['fr'] = 'Année';
+	$text['label-year']['fr-fr'] = 'Année';
 	$text['description-year']['en-us'] = 'Enter the year.';
-	$text['description-year']['fr'] = "Choisir l'année.";
+	$text['description-year']['fr-fr'] = "Choisir l'année.";
 //end: show_advanced
 
 	$text['label-true']['en-us'] = 'true';
-	$text['label-true']['fr'] = 'Oui';
+	$text['label-true']['fr-fr'] = 'Oui';
 	
 	$text['label-false']['en-us'] = 'false';
-	$text['label-false']['fr'] = 'Non';
+	$text['label-false']['fr-fr'] = 'Non';
 	
 	$text['label-action-when-true']['en-us'] = 'Action when True';
-	$text['label-action-when-true']['fr'] = 'Action quand Vrai';
+	$text['label-action-when-true']['fr-fr'] = 'Action quand Vrai';
 	
 	$text['label-action-when-false']['en-us'] = 'Action when False';
-	$text['label-action-when-false']['fr'] = 'Action quand Faux';
+	$text['label-action-when-false']['fr-fr'] = 'Action quand Faux';
 	
 	$text['label-order']['en-us'] = 'Order';
-	$text['label-order']['fr'] = 'Ordre';
+	$text['label-order']['fr-fr'] = 'Ordre';
 	
 	$text['label-enabled']['en-us'] = 'Enabled';
-	$text['label-enabled']['fr'] = 'Actif';
+	$text['label-enabled']['fr-fr'] = 'Actif';
 	
 	$text['label-description']['en-us'] = 'Description';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 	
 	$text['button-save']['en-us'] = 'Save';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 	
 	$text['label-required-domain_uuid']['en-us'] = 'Please provide: domain_uuid';
-	$text['label-required-domain_uuid']['fr'] = "Merci d'indiquer: domain_uuid";
+	$text['label-required-domain_uuid']['fr-fr'] = "Merci d'indiquer: domain_uuid";
 	
 	$text['label-required-dialplan_name']['en-us'] = 'Please provide: Extension Name';
-	$text['label-required-dialplan_name']['fr'] = "Merci d'indiquer: Nom de l'extension";
+	$text['label-required-dialplan_name']['fr-fr'] = "Merci d'indiquer: Nom de l'extension";
 	
 	$text['confirm-update-complete']['en-us'] = 'Update Complete';
-	$text['confirm-update-complete']['fr'] = 'Mis à jour';
+	$text['confirm-update-complete']['fr-fr'] = 'Mis à jour';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/traffic_graph/app_config.php b/app/traffic_graph/app_config.php
index d834ac1756..3db97dabbe 100644
--- a/app/traffic_graph/app_config.php
+++ b/app/traffic_graph/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Uses SVG to show the network traffic.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Affiche le traffique Réseau via SVG";
+		$apps[$x]['description']['fr-fr'] = 'Affiche le traffique Réseau via SVG';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Utiliza SVG para mostrar o tráfego de rede.';
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Traffic Graph';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Traffic Graphe";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Traffic Graphe';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Grafico de Trafego';
@@ -38,4 +38,4 @@
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'traffic_graph_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
-?>
\ No newline at end of file
+?>
diff --git a/app/traffic_graph/app_languages.php b/app/traffic_graph/app_languages.php
index e5678728b7..dff24aebb4 100644
--- a/app/traffic_graph/app_languages.php
+++ b/app/traffic_graph/app_languages.php
@@ -4,20 +4,25 @@
 
 		$text['title-traffic_graph']['en-us'] = 'Traffic Graph';
 		$text['title-traffic_graph']['pt-pt'] = '';
+		$text['title-traffic_graph']['fr-fr'] = 'Graphique de Traffic';
 
 		$text['header-traffic_graph']['en-us'] = 'Traffic Graph';
 		$text['header-traffic_graph']['pt-pt'] = '';
+		$text['header-traffic_graph']['fr-fr'] = 'Graphique de Traffic';
 
 		$text['description-traffic_graph']['en-us'] = 'A browser (or plugin) that supports Scalable Vector Graphics (SVG) is required to view the traffic graph below.';
 		$text['description-traffic_graph']['pt-pt'] = '';
+		$text['description-traffic_graph']['fr-fr'] = "Un explorateur (ou plugin) qui support le Graphique Vectoriel Evolutif (SVG) est nécessaire pour afficher les graphique ci-dessous.";
 
 		$text['label-interface']['en-us'] = 'Interface';
 		$text['label-interface']['pt-pt'] = '';
+		$text['label-interface']['fr-fr'] = 'Interface';
 
 		$text['description-no_svg']['en-us'] = 'Unfortunately your browser does not currently support Scalable Vector Graphics (SVG).  To view the traffic graph, please use a browser (or plugin) that supports Scalable Vector Graphics (SVG).';
 		$text['description-no_svg']['pt-pt'] = '';
+		$text['description-no_svg']['fr-fr'] = "Malheureusement votre explorateur ne ssupporte pas le Graphique Vectoriel Evolutif (SVG). Pour voir le graphique, merci d'utiliser un explorateur (ou plugin) qui le supporte.";
 
 
 
 
-?>
\ No newline at end of file
+?>
diff --git a/app/vars/app_config.php b/app/vars/app_config.php
index cb6d7afbfd..990464e2f7 100644
--- a/app/vars/app_config.php
+++ b/app/vars/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Define variables that are used by the switch, provisioning, and more.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Définr les variables utilisées par le switch, le provisioning et plus.";
@@ -21,13 +21,13 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Variables';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Variables";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Variables';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Variaveis";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Variaveis';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = '7a4e9ec5-24b9-7200-89b8-d70bf8afdd8f';
 		$apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
@@ -36,18 +36,17 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'var_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'var_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'var_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'var_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][0]['name'] = 'variables_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'variables_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'variables_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'variables_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
 	//schema details
 		$apps[$x]['db'][$y]['table'] = 'v_vars';
@@ -105,4 +104,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/vars/app_languages.php b/app/vars/app_languages.php
index 557112c96a..a5634b72c6 100644
--- a/app/vars/app_languages.php
+++ b/app/vars/app_languages.php
@@ -1,71 +1,81 @@
-<?php
-
-	//Variables
-
-	$text['title-variables']['en-us'] = 'Switch Variables';
-
-	$text['title-variable_add']['en-us'] = 'Variable Add';
-
-	$text['title-variable_edit']['en-us'] = 'Variable Edit';
-
-	$text['title-variables_advanced']['en-us'] = 'Switch Variables: Advanced';
-
-	$text['header-variables']['en-us'] = 'Switch Variables';
-
-	$text['header-variable_add']['en-us'] = 'Variable Add';
-
-	$text['header-variable_edit']['en-us'] = 'Variable Edit';
-
-	$text['header-variables_advanced']['en-us'] = 'Switch Variables: Advanced';
-
-	$text['description-variables']['en-us'] = 'Define preprocessor variables here.';
-
-	$text['description-variables_advanced']['en-us'] = 'Define preprocessor variables here. Can be accessed in the xml configation with $${var_name}.';
-
-	$text['label-name']['en-us'] = 'Name';
-
-	$text['label-value']['en-us'] = 'Value';
-
-	$text['label-category']['en-us'] = 'Category';
-
-	$text['label-enabled']['en-us'] = 'Enabled';
-
-	$text['label-order']['en-us'] = 'Order';
-
-	$text['label-description']['en-us'] = 'Description';
-
-	$text['label-codec_information']['en-us'] = 'Codec Information';
-
-	$text['description-name']['en-us'] = 'Enter the variable name.';
-
-	$text['description-value']['en-us'] = 'Enter the variable value.';
-
-	$text['description-category']['en-us'] = 'Select the category.';
-
-	$text['option-true']['en-us'] = 'True';
-
-	$text['option-false']['en-us'] = 'False';
-
-	$text['button-add']['en-us'] = 'Add';
-
-	$text['button-edit']['en-us'] = 'Edit';
-
-	$text['button-delete']['en-us'] = 'Delete';
-
-	$text['button-back']['en-us'] = 'Back';
-
-	$text['button-save']['en-us'] = 'Save';
-
-	$text['button-restore']['en-us'] = 'Restore Default';
-
-	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
-
-	$text['message-add']['en-us'] = 'Add Completed';
-
-	$text['message-update']['en-us'] = 'Update Completed';
-
-	$text['message-delete']['en-us'] = 'Delete Completed';
-
-	$text['message-required']['en-us'] = 'Please provide: ';
-
-?>
\ No newline at end of file
+<?php
+
+	//Variables
+
+	$text['title-variables']['en-us'] = 'System Variables';
+	$text['title-variables']['fr-fr'] = 'Variables Système';
+	$text['title-variable_add']['en-us'] = 'Variable Add';
+	$text['title-variable_add']['fr-fr'] = 'Ajouter une Variable';
+	$text['title-variable_edit']['en-us'] = 'Variable Edit';
+	$text['title-variable_edit']['fr-fr'] = 'Editer la Variable';
+	$text['title-variables_advanced']['en-us'] = 'System Variables: Advanced';
+	$text['title-variables_advanced']['fr-fr'] = 'Variables Système: Avancé';
+
+	$text['header-variables']['en-us'] = 'System Variables';
+	$text['header-variables']['fr-fr'] = 'Variables Système';
+	$text['header-variable_add']['en-us'] = 'Variable Add';
+	$text['header-variable_add']['fr-fr'] = 'Ajouter une Variable';
+	$text['header-variable_edit']['en-us'] = 'Variable Edit';
+	$text['header-variable_edit']['fr-fr'] = 'Editer la Variable';
+	$text['header-variables_advanced']['en-us'] = 'System Variables: Advanced';
+	$text['header-variables_advanced']['fr-fr'] = 'Variables Système: Avancé';
+
+	$text['description-variables']['en-us'] = 'Define preprocessor variables here.';
+	$text['description-variables']['fr-fr'] = 'Définir ici les variables préprocessées.';
+	$text['description-variables_advanced']['en-us'] = 'Define preprocessor variables here. Can be accessed in the xml configation with $${var_name}.';
+	$text['description-variables_advanced']['fr-fr'] = 'Définir ici les variables préprocessées. Se retrouve dans la configuration XML avec $${var_name}.'; 
+
+
+	$text['label-name']['en-us'] = 'Name';
+	$text['label-name']['fr-fr'] = 'Nom';
+	$text['label-value']['en-us'] = 'Value';
+	$text['label-value']['fr-fr'] = 'Valeur';
+	$text['label-category']['en-us'] = 'Category';
+	$text['label-category']['fr-fr'] = 'Cateégorie';
+	$text['label-enabled']['en-us'] = 'Enabled';
+	$text['label-enabled']['fr-fr'] = 'Actif';
+	$text['label-order']['en-us'] = 'Order';
+	$text['label-order']['fr-fr'] = 'Ordre';
+	$text['label-description']['en-us'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
+	$text['label-codec_information']['en-us'] = 'Codec Information';
+	$text['label-codec_information']['fr-fr'] = 'Codec Information';
+
+	$text['description-name']['en-us'] = 'Enter the variable name.';
+	$text['description-name']['fr-fr'] = '';
+	$text['description-value']['en-us'] = 'Enter the variable value.';
+	$text['description-value']['fr-fr'] = '';
+	$text['description-category']['en-us'] = 'Select the category.';
+	$text['description-category']['fr-fr'] = '';
+
+	$text['option-true']['en-us'] = 'True';
+	$text['option-true']['fr-fr'] = 'Oui';
+	$text['option-false']['en-us'] = 'False';
+	$text['option-false']['fr-fr'] = 'Non';
+
+	$text['button-add']['en-us'] = 'Add';
+	$text['button-add']['fr-fr'] = 'Ajouter';
+	$text['button-edit']['en-us'] = 'Edit';
+	$text['button-edit']['fr-fr'] = 'Editer';
+	$text['button-delete']['en-us'] = 'Delete';
+	$text['button-delete']['fr-fr'] = 'Supprimer';
+	$text['button-back']['en-us'] = 'Back';
+	$text['button-back']['fr-fr'] = 'Retour';
+	$text['button-save']['en-us'] = 'Save';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
+	$text['button-restore']['en-us'] = 'Restore Default';
+	$text['button-restore']['fr-fr'] = 'Restaurer';
+
+	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
+
+	$text['message-add']['en-us'] = 'Add Completed';
+	$text['message-add']['fr-fr'] = 'Ajouté';
+	$text['message-update']['en-us'] = 'Update Completed';
+	$text['message-update']['fr-fr'] = 'Mis à jour';
+	$text['message-delete']['en-us'] = 'Delete Completed';
+	$text['message-delete']['fr-fr'] = 'Supprimé';
+	$text['message-required']['en-us'] = 'Please provide: ';
+	$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
+
+?>
diff --git a/app/voicemail_greetings/app_config.php b/app/voicemail_greetings/app_config.php
index 0483833179..c782fb3799 100644
--- a/app/voicemail_greetings/app_config.php
+++ b/app/voicemail_greetings/app_config.php
@@ -9,13 +9,13 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Manager voicemail greetings for extensions.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Accueil messagerie Vocale";
+		$apps[$x]['description']['fr-fr'] = 'Accueil messagerie Vocale';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = "Gestor de saudações de correio de voz para extensões.";
+		$apps[$x]['description']['pt-pt'] = 'Gestor de saudações de correio de voz para extensões.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
@@ -28,37 +28,37 @@
 		//$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'voicemail_greeting_view';
+		$apps[$x]['permissions'][0]['name'] = 'voicemail_greetings_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'user';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'voicemail_greeting_add';
+		$apps[$x]['permissions'][1]['name'] = 'voicemail_greetings_add';
 		$apps[$x]['permissions'][1]['groups'][] = 'user';
 		$apps[$x]['permissions'][1]['groups'][] = 'admin';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][2]['name'] = 'voicemail_greeting_edit';
+		$apps[$x]['permissions'][2]['name'] = 'voicemail_greetings_edit';
 		$apps[$x]['permissions'][2]['groups'][] = 'user';
 		$apps[$x]['permissions'][2]['groups'][] = 'admin';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][3]['name'] = 'voicemail_greeting_delete';
+		$apps[$x]['permissions'][3]['name'] = 'voicemail_greetings_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'user';
 		$apps[$x]['permissions'][3]['groups'][] = 'admin';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][4]['name'] = 'voicemail_greeting_upload';
+		$apps[$x]['permissions'][4]['name'] = 'voicemail_greetings_upload';
 		$apps[$x]['permissions'][4]['groups'][] = 'user';
 		$apps[$x]['permissions'][4]['groups'][] = 'admin';
 		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][5]['name'] = 'voicemail_greeting_play';
+		$apps[$x]['permissions'][5]['name'] = 'voicemail_greetings_play';
 		$apps[$x]['permissions'][5]['groups'][] = 'user';
 		$apps[$x]['permissions'][5]['groups'][] = 'admin';
 		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][6]['name'] = 'voicemail_greeting_download';
+		$apps[$x]['permissions'][6]['name'] = 'voicemail_greetings_download';
 		$apps[$x]['permissions'][6]['groups'][] = 'user';
 		$apps[$x]['permissions'][6]['groups'][] = 'admin';
 		$apps[$x]['permissions'][6]['groups'][] = 'superadmin';
@@ -110,4 +110,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/voicemail_greetings/app_languages.php b/app/voicemail_greetings/app_languages.php
index b6e6765e22..69c23cd9b2 100644
--- a/app/voicemail_greetings/app_languages.php
+++ b/app/voicemail_greetings/app_languages.php
@@ -3,84 +3,84 @@
 	//voicemail_greetings
 	$text['title']['en-us'] = 'Voicemail Greetings';
 	$text['title']['pt-pt'] = 'Saudações de correio de voz';
-	$text['title']['fr'] = "Salutations de la messagerie";
+	$text['title']['fr-fr'] = "Salutations de la messagerie";
 
 	$text['description']['en-us'] = 'Select the active greeting message to play for extension:';
 	$text['description']['pt-pt'] = 'Selecione e active mensagem de saudação para executar na extensão:';
-	$text['description']['fr'] = "Choisir le message de salutation à jouer pour l'extension:";
+	$text['description']['fr-fr'] = "Choisir le message de salutation à jouer pour l'extension:";
 
 	$text['label-upload']['en-us'] = 'File to Upload';
 	$text['label-upload']['pt-pt'] = 'Ficheiro a Carregar';
-	$text['label-upload']['fr'] = 'Fichier à télécharger';
+	$text['label-upload']['fr-fr'] = 'Fichier à télécharger';
 
 	$text['table-choose']['en-us'] = 'Choose';
 	$text['table-choose']['pt-pt'] = 'Escolher';
-	$text['table-choose']['fr'] = 'Choisir';
+	$text['table-choose']['fr-fr'] = 'Choisir';
 
 	$text['table-name']['en-us'] = 'Name';
 	$text['table-name']['pt-pt'] = 'Nome';
-	$text['table-name']['fr'] = 'Nom';
+	$text['table-name']['fr-fr'] = 'Nom';
 
 	$text['table-download']['en-us'] = 'Download';
 	$text['table-download']['pt-pt'] = 'Descarregar';
-	$text['table-download']['fr'] = 'Télécharger';
+	$text['table-download']['fr-fr'] = 'Télécharger';
 
 	$text['table-size']['en-us'] = 'Size';
 	$text['table-size']['pt-pt'] = 'Tamanho';
-	$text['table-size']['fr'] = 'Taille';
+	$text['table-size']['fr-fr'] = 'Taille';
 
 	$text['table-description']['en-us'] = 'Description';
 	$text['table-description']['pt-pt'] = 'Descrição';
-	$text['table-description']['fr'] = 'Description';
+	$text['table-description']['fr-fr'] = 'Description';
 
 	$text['button-back']['en-us'] = 'Back';
 	$text['button-back']['pt-pt'] = 'Voltar';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 
 	$text['button-save']['en-us'] = 'Save';
 	$text['button-save']['pt-pt'] = 'Guardar';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 	//voicemail_greeting_delete
 	$text['confirm-delete']['en-us'] = 'Delete Complete';
 	$text['confirm-delete']['pt-pt'] = 'Eliminação Completa';
-	$text['confirm-delete']['fr'] = "Supprimé";
+	$text['confirm-delete']['fr-fr'] = "Supprimé";
 
 	//voicemail_greeting_edit
 	$text['confirm-name']['en-us'] = 'Please provide: Greeting Name (play)';
 	$text['confirm-name']['pt-pt'] = 'Por favor, forneça: Nome da saudação (execução)';
-	$text['confirm-name']['fr'] = "Merci d'indiquer: Nom de salutation (jouer)";
+	$text['confirm-name']['fr-fr'] = "Merci d'indiquer: Nom de salutation (jouer)";
 
 	$text['confirm-add']['en-us'] = 'Add Complete';
 	$text['confirm-add']['pt-pt'] = 'Adição Completa';
-	$text['confirm-add']['fr'] = 'Ajouté';
+	$text['confirm-add']['fr-fr'] = 'Ajouté';
 
 	$text['confirm-update']['en-us'] = 'Update Complete';
 	$text['confirm-update']['pt-pt'] = 'Actualização Completa';
-	$text['confirm-update']['fr'] = 'Mis à jour';
+	$text['confirm-update']['fr-fr'] = 'Mis à jour';
 
 	$text['label-add']['en-us'] = 'Add Greeting';
 	$text['label-add']['pt-pt'] = 'Adição de Saudação';
-	$text['label-add']['fr'] = 'Ajouter salutation';
+	$text['label-add']['fr-fr'] = 'Ajouter salutation';
 
 	$text['label-edit']['en-us'] = 'Edit Greeting';
 	$text['label-edit']['pt-pt'] = 'Edição de Saudação';
-	$text['label-edit']['fr'] = 'Editer Salutation';
+	$text['label-edit']['fr-fr'] = 'Editer Salutation';
 
 	$text['label-name']['en-us'] = 'Greeting Name';
 	$text['label-name']['pt-pt'] = 'Nome da Saudação';
-	$text['label-name']['fr'] = 'Nom de salutation';
+	$text['label-name']['fr-fr'] = 'Nom de salutation';
 
 	$text['description-name']['en-us'] = 'Greeting Name. example: greeting_x';
 	$text['description-name']['pt-pt'] = 'Nome da Saudação. exemplo: saudação_x';
-	$text['description-name']['fr'] = 'Nome da Salutation. exemple: accueil_x';
+	$text['description-name']['fr-fr'] = 'Nome da Salutation. exemple: accueil_x';
 
 	$text['label-description']['en-us'] = 'Description';
 	$text['label-description']['pt-pt'] = 'Descrição';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 
 	$text['description-info']['en-us'] = 'You may enter a description here for your reference (not parsed).';
 	$text['description-info']['pt-pt'] = 'Pode inserir aqui uma descrição para referência.';
-	$text['description-info']['fr'] = '';
+	$text['description-info']['fr-fr'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/voicemails/app_config.php b/app/voicemails/app_config.php
index 9d535eb466..1128a6cac4 100644
--- a/app/voicemails/app_config.php
+++ b/app/voicemails/app_config.php
@@ -12,7 +12,7 @@
 
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Voicemail';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Messagerie Vocale";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Messagerie Vocale';
 		$apps[$x]['menu'][0]['uuid'] = '0347f82a-62a0-49d0-bacd-511d080c46d5';
 		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
 		$apps[$x]['menu'][0]['category'] = 'internal';
@@ -24,7 +24,6 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'voicemail_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = '0347f82a-62a0-49d0-bacd-511d080c46d5';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
@@ -46,19 +45,11 @@
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'voicemail_message_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'voicemail_message_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'voicemail_message_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		$y++;
 
 	//schema details
 		$y = 0; //table array index
@@ -158,4 +149,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Voicemail message priority.';
 		$z++;
-?>
\ No newline at end of file
+?>
diff --git a/app/voicemails/app_languages.php b/app/voicemails/app_languages.php
index efda47481a..4da724539f 100644
--- a/app/voicemails/app_languages.php
+++ b/app/voicemails/app_languages.php
@@ -3,247 +3,248 @@
 	//Voicemails
 		$text['title-voicemails']['en-us'] = 'Voicemails';
 		$text['title-voicemails']['pt-pt'] = '';
-		$text['title-voicemails']['fr'] = 'Messageries Vocales';
+		$text['title-voicemails']['fr-fr'] = 'Messageries Vocales';
 
 		$text['title-voicemail']['en-us'] = 'Voicemail';
 		$text['title-voicemail']['pt-pt'] = '';
-		$text['title-voicemail']['fr'] = 'Messagerie Vocale';
+		$text['title-voicemail']['fr-fr'] = 'Messagerie Vocale';
 
 		$text['description-voicemail']['en-us'] = 'Voicemail settings.';
 		$text['description-voicemail']['pt-pt'] = '';
-		$text['description-voicemail']['fr'] = 'Configuration messagerie.';
+		$text['description-voicemail']['fr-fr'] = 'Configuration messagerie.';
 
 		$text['label-voicemail_id']['en-us'] = 'Voicemail ID';
 		$text['label-voicemail_id']['pt-pt'] = '';
-		$text['label-voicemail_id']['fr'] = 'ID de Messagerie';
+		$text['label-voicemail_id']['fr-fr'] = 'ID de Messagerie';
 
 		$text['description-voicemail_id']['en-us'] = 'Enter the Voicemail ID';
 		$text['description-voicemail_id']['pt-pt'] = '';
-		$text['description-voicemail_id']['fr'] = "Choisir l'indentifiant de la messagerie vocale.";
+		$text['description-voicemail_id']['fr-fr'] = "Choisir l'indentifiant de la messagerie vocale.";
 
 		$text['label-voicemail_password']['en-us'] = 'Password';
 		$text['label-voicemail_password']['pt-pt'] = '';
-		$text['label-voicemail_password']['fr'] = 'Mot de Passe';
+		$text['label-voicemail_password']['fr-fr'] = 'Mot de Passe';
 
 		$text['description-voicemail_password']['en-us'] = 'Enter the Password';
 		$text['description-voicemail_password']['pt-pt'] = '';
-		$text['description-voicemail_password']['fr'] = '';
+		$text['description-voicemail_password']['fr-fr'] = '';
+
 
 		$text['label-greeting_id']['en-us'] = 'Greeting ID';
 		$text['label-greeting_id']['pt-pt'] = '';
-		$text['label-greeting_id']['fr'] = 'ID de Salutation';
+		$text['label-greeting_id']['fr-fr'] = 'ID de Salutation';
 
 		$text['description-greeting_id']['en-us'] = 'Enter the Greeting ID';
 		$text['description-greeting_id']['pt-pt'] = '';
-		$text['description-greeting_id']['fr'] = 'Choisir le numéro de message vocal de salutation.';
+		$text['description-greeting_id']['fr-fr'] = 'Choisir le numéro de message vocal de salutation.';
 
 		$text['label-voicemail_mail_to']['en-us'] = 'Mail To';
 		$text['label-voicemail_mail_to']['pt-pt'] = '';
-		$text['label-voicemail_mail_to']['fr'] = 'Courriel de réception';
+		$text['label-voicemail_mail_to']['fr-fr'] = 'Courriel de réception';
 
 		$text['description-voicemail_mail_to']['en-us'] = 'Enter the email address to send voicemail to. ';
 		$text['description-voicemail_mail_to']['pt-pt'] = '';
-		$text['description-voicemail_mail_to']['fr'] = 'Choisir un courriel lié à cette messagerie vocale.';
+		$text['description-voicemail_mail_to']['fr-fr'] = 'Choisir un courriel lié à cette messagerie vocale.';
 
 		$text['label-voicemail_attach_file']['en-us'] = 'Attach File';
 		$text['label-voicemail_attach_file']['pt-pt'] = '';
-		$text['label-voicemail_attach_file']['fr'] = 'Fichier attaché';
+		$text['label-voicemail_attach_file']['fr-fr'] = 'Fichier attaché';
 
 		$text['description-voicemail_attach_file']['en-us'] = 'Choose whether to attach the file to the email.';
 		$text['description-voicemail_attach_file']['pt-pt'] = '';
-		$text['description-voicemail_attach_file']['fr'] = "Attacher le fichier audio au courriel.";
+		$text['description-voicemail_attach_file']['fr-fr'] = "Attacher le fichier audio au courriel.";
 
 		$text['label-voicemail_local_after_email']['en-us'] = 'Local After Email';
 		$text['label-voicemail_local_after_email']['pt-pt'] = '';
-		$text['label-voicemail_local_after_email']['fr'] = "Conserver le message";
+		$text['label-voicemail_local_after_email']['fr-fr'] = "Conserver le message";
 
 		$text['description-voicemail_local_after_email']['en-us'] = 'Choose to keep the voicemail file after sending the email.';
 		$text['description-voicemail_local_after_email']['pt-pt'] = '';
-		$text['description-voicemail_local_after_email']['fr'] = "Garder le message vocal dans la boite vocale après l'envoi du courriel.";
+		$text['description-voicemail_local_after_email']['fr-fr'] = "Garder le message vocal dans la boite vocale après l'envoi du courriel.";
 
 		$text['label-voicemail_enabled']['en-us'] = 'Enabled';
 		$text['label-voicemail_enabled']['pt-pt'] = '';
-		$text['label-voicemail_enabled']['fr'] = 'Actif';
+		$text['label-voicemail_enabled']['fr-fr'] = 'Actif';
 
 		$text['description-voicemail_enabled']['en-us'] = 'Select to enable or disable this voicemail.';
 		$text['description-voicemail_enabled']['pt-pt'] = '';
-		$text['description-voicemail_enabled']['fr'] ="Messagerie Vocale activée ou non.";
+		$text['description-voicemail_enabled']['fr-fr'] ="Messagerie Vocale activée ou non.";
 
 		$text['label-voicemail_description']['en-us'] = 'Description';
 		$text['label-voicemail_description']['pt-pt'] = '';
-		$text['label-voicemail_description']['fr'] = 'Description';
+		$text['label-voicemail_description']['fr-fr'] = 'Description';
 
 		$text['description-voicemail_description']['en-us'] = 'Enter the description.';
 		$text['description-voicemail_description']['pt-pt'] = '';
-		$text['description-voicemail_description']['fr'] = '';
+		$text['description-voicemail_description']['fr-fr'] = '';
 
 		$text['label-count']['en-us'] = 'Count';
 		$text['label-count']['pt-pt'] = '';
-		$text['label-count']['fr'] = 'Compter';
+		$text['label-count']['fr-fr'] = 'Compter';
 
 		$text['label-tools']['en-us'] = 'Tools';
 		$text['label-tools']['pt-pt'] = 'Ferramentas';
-		$text['label-tools']['fr'] = 'Outils';
+		$text['label-tools']['fr-fr'] = 'Outils';
 
 		$text['label-message_size']['en-us'] = 'Size';
 		$text['label-message_size']['pt-pt'] = '';
-		$text['label-message_size']['fr'] = 'Taille';
+		$text['label-message_size']['fr-fr'] = 'Taille';
 
 		$text['label-play']['en-us'] = 'Play';
 		$text['label-play']['pt-pt'] = '';
-		$text['label-play']['fr'] = 'Jouer';
+		$text['label-play']['fr-fr'] = 'Jouer';
 
 		$text['label-download']['en-us'] = 'Download';
 		$text['label-download']['pt-pt'] = '';
-		$text['label-download']['fr'] = 'Télécharger';
+		$text['label-download']['fr-fr'] = 'Télécharger';
 
 		$text['label-view']['en-us'] = 'View';
 		$text['label-view']['pt-pt'] = '';
-		$text['label-view']['fr'] = 'Voir';
+		$text['label-view']['fr-fr'] = 'Voir';
 
 		$text['label-true']['en-us'] = 'true';
 		$text['label-true']['pt-pt'] = '';
-		$text['label-true']['fr'] = 'Oui';
+		$text['label-true']['fr-fr'] = 'Oui';
 
 		$text['label-false']['en-us'] = 'false';
 		$text['label-false']['pt-pt'] = 'falso';
-		$text['label-false']['fr'] = 'Non';
+		$text['label-false']['fr-fr'] = 'Non';
 
 		$text['label-greetings']['en-us'] = 'Greetings';
 		$text['label-greetings']['pt-pt'] = '';
-		$text['label-greetings']['fr'] = 'Salutations';
+		$text['label-greetings']['fr-fr'] = 'Salutations';
 
 		$text['button-greetings']['en-us'] = 'Greetings';
 		$text['button-greetings']['pt-pt'] = '';
-		$text['button-greetings']['fr'] = 'Salutations';
+		$text['button-greetings']['fr-fr'] = 'Salutations';
 
 		$text['button-settings']['en-us'] = 'Settings';
 		$text['button-settings']['pt-pt'] = '';
-		$text['button-settings']['fr'] = "Configurations";
+		$text['button-settings']['fr-fr'] = "Configurations";
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
-		$text['button-add']['fr'] = 'Ajouter';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
-		$text['button-edit']['fr'] = 'Editer';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
-		$text['button-delete']['fr'] = 'Supprimer';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
-		$text['button-save']['fr'] = 'Sauvegarder';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-view']['en-us'] = 'View';
 		$text['button-view']['pt-pt'] = '';
-		$text['button-view']['fr'] = 'Voir';
+		$text['button-view']['fr-fr'] = 'Voir';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
-		$text['button-back']['fr'] = 'Retour';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
-		$text['confirm-delete']['fr'] = "Voulez-vous vraiment supprimer cela?";
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
-		$text['message-add']['fr'] = 'Ajouté';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
-		$text['message-update']['fr'] = 'Mis à jour';
+		$text['message-update']['fr-fr'] = 'Mis à jour';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
-		$text['message-delete']['fr'] = 'Supprimé';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
-		$text['message-required']['fr'] = "Merci d'indiquer: ";
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
 	//Voicemail Messages
 		$text['title-voicemail_messages']['en-us'] = 'Voicemail Messages';
 		$text['title-voicemail_messages']['pt-pt'] = '';
-		$text['title-voicemail_messages']['fr'] = "Messages vocaux";
+		$text['title-voicemail_messages']['fr-fr'] = "Messages vocaux";
 
 		$text['title-voicemail_message']['en-us'] = 'Voicemail Message';
 		$text['title-voicemail_message']['pt-pt'] = '';
-		$text['title-voicemail_message']['fr'] = 'Message vocal';
+		$text['title-voicemail_message']['fr-fr'] = 'Message vocal';
 
 		$text['description-voicemail_message']['en-us'] = 'A list of recorded voice messages which shows when the message was created, caller ID information, length, file size and download or delete the message.';
 		$text['description-voicemail_message']['pt-pt'] = '';
-		$text['description-voicemail_message']['fr'] = "Liste des messages vocaux et les details tels que la date de création, les informations sur l'appelant, la durée, la taille du fichier et la possibilité de télécharger ou supprimer le message.";
+		$text['description-voicemail_message']['fr-fr'] = "Liste des messages vocaux et les details tels que la date de création, les informations sur l'appelant, la durée, la taille du fichier et la possibilité de télécharger ou supprimer le message.";
 
 		$text['label-mailbox']['en-us'] = 'Mailbox';
 		$text['label-mailbox']['pt-pt'] = '';
-		$text['label-mailbox']['fr'] = 'Boite mail';
+		$text['label-mailbox']['fr-fr'] = 'Boite mail';
 
 		$text['label-voicemail_uuid']['en-us'] = 'Voicemail UUID';
 		$text['label-voicemail_uuid']['pt-pt'] = '';
-		$text['label-voicemail_uuid']['fr'] = 'UUID Messagerie Vocale';
+		$text['label-voicemail_uuid']['fr-fr'] = 'UUID Messagerie Vocale';
 
 		$text['description-voicemail_uuid']['en-us'] = 'Voicemail UUID';
 		$text['description-voicemail_uuid']['pt-pt'] = '';
-		$text['description-voicemail_uuid']['fr'] = '';
+		$text['description-voicemail_uuid']['fr-fr'] = '';
 
 		$text['label-created_epoch']['en-us'] = 'Created';
 		$text['label-created_epoch']['pt-pt'] = '';
-		$text['label-created_epoch']['fr'] = 'créé';
+		$text['label-created_epoch']['fr-fr'] = 'créé';
 
 		$text['description-created_epoch']['en-us'] = 'Created';
 		$text['description-created_epoch']['pt-pt'] = '';
-		$text['description-created_epoch']['fr'] = 'Date de création';
+		$text['description-created_epoch']['fr-fr'] = 'Date de création';
 
 		$text['label-read_epoch']['en-us'] = 'Read';
 		$text['label-read_epoch']['pt-pt'] = '';
-		$text['label-read_epoch']['fr'] = 'Lire';
+		$text['label-read_epoch']['fr-fr'] = 'Lire';
 
 		$text['description-read_epoch']['en-us'] = 'Read';
 		$text['description-read_epoch']['pt-pt'] = '';
-		$text['description-read_epoch']['fr'] = 'Lire';
+		$text['description-read_epoch']['fr-fr'] = 'Lire';
 
 		$text['label-caller_id_name']['en-us'] = 'Caller ID Name';
 		$text['label-caller_id_name']['pt-pt'] = '';
-		$text['label-caller_id_name']['fr'] = "Nom d'appelant";
+		$text['label-caller_id_name']['fr-fr'] = "Nom d'appelant";
 
 		$text['description-caller_id_name']['en-us'] = 'Caller ID Name';
 		$text['description-caller_id_name']['pt-pt'] = '';
-		$text['description-caller_id_name']['fr'] = '';
+		$text['description-caller_id_name']['fr-fr'] = '';
 
 		$text['label-caller_id_number']['en-us'] = 'Caller ID Number';
 		$text['label-caller_id_number']['pt-pt'] = '';
-		$text['label-caller_id_number']['fr'] = "Numéro d'appelant";
+		$text['label-caller_id_number']['fr-fr'] = "Numéro d'appelant";
 
 		$text['description-caller_id_number']['en-us'] = 'Caller ID Number';
 		$text['description-caller_id_number']['pt-pt'] = '';
-		$text['description-caller_id_number']['fr'] = '';
+		$text['description-caller_id_number']['fr-fr'] = '';
 
 		$text['label-message_length']['en-us'] = 'Length';
 		$text['label-message_length']['pt-pt'] = '';
-		$text['label-message_length']['fr'] = 'Durée';
+		$text['label-message_length']['fr-fr'] = 'Durée';
 
 		$text['description-message_length']['en-us'] = 'Length';
 		$text['description-message_length']['pt-pt'] = '';
-		$text['description-message_length']['fr'] = '';
+		$text['description-message_length']['fr-fr'] = '';
 
 		$text['label-message_status']['en-us'] = 'Status';
 		$text['label-message_status']['pt-pt'] = '';
-		$text['label-message_status']['fr'] = 'Etat';
+		$text['label-message_status']['fr-fr'] = 'Etat';
 
 		$text['description-message_status']['en-us'] = 'Status';
-		$text['description-message_status']['pt-pt'] = 'Estado';
-		$text['description-message_status']['fr'] = 'Etat';
+		$text['description-message_status']['pt-pt'] = '';
+		$text['description-message_status']['fr-fr'] = 'Etat';
 
 		$text['label-message_priority']['en-us'] = 'Priority';
 		$text['label-message_priority']['pt-pt'] = '';
-		$text['label-message_priority']['fr'] = 'Priorité';
+		$text['label-message_priority']['fr-fr'] = 'Priorité';
 
 		$text['description-message_priority']['en-us'] = 'Priority';
 		$text['description-message_priority']['pt-pt'] = '';
-		$text['description-message_priority']['fr'] = 'Priorité';
+		$text['description-message_priority']['fr-fr'] = 'Priorité';
 
 ?>
diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index 549e08a99a..c933ee06dd 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -9,25 +9,25 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Call Detail Records with all information about the call.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Historique des Appels complets.";
+		$apps[$x]['description']['fr-fr'] = 'Historique des Appels complets.';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Detalhes das Gravações de Voz com todas as informações sobre a chamada.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = "Apps";
+		$apps[$x]['menu'][0]['title']['en-us'] = 'Apps';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Apps";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Apps';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Aplicações";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Aplicações';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
 		$apps[$x]['menu'][0]['parent_uuid'] = '';
@@ -40,7 +40,7 @@
 
 		$apps[$x]['menu'][1]['title']['en-us'] = 'Call Detail Records';
 		$apps[$x]['menu'][1]['title']['es-mx'] = '';
-		$apps[$x]['menu'][1]['title']['de-de'] = '';
+		$apps[$x]['menu'][1]['title']['de'] = '';
 		$apps[$x]['menu'][1]['title']['de-ch'] = '';
 		$apps[$x]['menu'][1]['title']['de-at'] = '';
 		$apps[$x]['menu'][1]['title']['fr-fr'] = 'Historiques Appels';
@@ -59,8 +59,6 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'xml_cdr_view';
-		$apps[$x]['permissions'][$y]['menu']['uuid'][] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
-		$apps[$x]['permissions'][$y]['menu']['uuid'][] = '8f80e71a-31a5-6432-47a0-7f5a7b271f05';
 		$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
@@ -68,15 +66,6 @@
 		$apps[$x]['permissions'][$y]['name'] = 'xml_cdr_domain';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'xml_cdr_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'xml_cdr_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'xml_cdr_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		//$y++;
 		//$apps[$x]['permissions'][$y]['name'] = 'xml_cdr_all';
 		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
@@ -327,4 +316,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Save who hung up or cancelled the leg.';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php
index a5c78d2941..e5fef74190 100644
--- a/app/xml_cdr/app_languages.php
+++ b/app/xml_cdr/app_languages.php
@@ -1,206 +1,206 @@
-<?php
+<?php
 
 	//xml_cdr
 	$text['title']['en-us'] = 'Call Detail Records';
 	$text['title']['pt-pt'] = 'Detalhes da Gravação de Chamadas';
-	$text['title']['fr'] = 'Historique détaillé des appels';
+	$text['title']['fr-fr'] = 'Historique détaillé des appels';
 
 	$text['description']['en-us'] = 'Call Detail Records (CDRs) are detailed information on the calls.';
 	$text['description']['pt-pt'] = 'Detalhes da Gravação de Chamadas, são informações detalhadas sobre as chamadas.';
-	$text['description']['fr'] = "Ici se trouve l'historique des tous les appels passés sur cette plateforme. En Anglais: Call Detail Records (CDR).";
+	$text['description']['fr-fr'] = "Ici se trouve l'historique des tous les appels passés sur cette plateforme. En Anglais: Call Detail Records (CDR).";
 
 	$text['description-2']['en-us'] = 'The information contains source, destination, duration, and other useful call details.';
 	$text['description-2']['pt-pt'] = 'A informação contém fonte, destino, duração e outros detalhes úteis da chamada.';
-	$text['description-2']['fr'] = "Les informations contiennent la source, la destination, la durée et pleins d'autres informations utiles.";
+	$text['description-2']['fr-fr'] = "Les informations contiennent la source, la destination, la durée et pleins d'autres informations utiles.";
 
 	$text['description-3']['en-us'] = 'Use the fields to filter the information for the specific call records that are desired.';
 	$text['description-3']['pt-pt'] = 'Utilize os campos para filtrar a informação para os registos de chamadas específicas que são desejados.';
-	$text['description-3']['fr'] = "Utiliser les filtres pour afficher les appels désirés. ";
+	$text['description-3']['fr-fr'] = "Utiliser les filtres pour afficher les appels désirés. ";
 
 	$text['description-4']['en-us'] = 'Then view the calls in the list or download them as comma seperated file by using the "csv" button.';
 	$text['description-4']['pt-pt'] = 'Então pode ver as chamadas na lista ou descarrega-las como arquivo separadas por vírgulas usando o botão "csv".';
-	$text['description-4']['fr'] = "Ensuite visualisez les informations dans la liste ci-dessous, ou téléchargez les sous forme d'un fichier CSV.";
+	$text['description-4']['fr-fr'] = "Ensuite visualisez les informations dans la liste ci-dessous, ou téléchargez les sous forme d'un fichier CSV.";
 
 	$text['label-description']['en-us'] = 'Description';
 	$text['label-description']['pt-pt'] = 'Descrição';
-	$text['label-description']['fr'] = 'Description';
+	$text['label-description']['fr-fr'] = 'Description';
 
 	$text['label-cid-name']['en-us'] = 'CID Name';
 	$text['label-cid-name']['pt-pt'] = 'Nome CID';
-	$text['label-cid-name']['fr'] = "Nom de l'Appelant";
+	$text['label-cid-name']['fr-fr'] = "Nom de l'Appelant";
 
 	$text['label-inbound']['en-us'] = 'inbound';
 	$text['label-inbound']['pt-pt'] = 'entrada';
-	$text['label-inbound']['fr'] = 'entrant';
+	$text['label-inbound']['fr-fr'] = 'entrant';
 
 	$text['label-outbound']['en-us'] = 'outbound';
 	$text['label-outbound']['pt-pt'] = 'saida';
-	$text['label-outbound']['fr'] = 'sortant';
+	$text['label-outbound']['fr-fr'] = 'sortant';
 
 	$text['label-local']['en-us'] = 'local';
 	$text['label-local']['pt-pt'] = 'local';
-	$text['label-local']['fr'] = 'local';
+	$text['label-local']['fr-fr'] = 'local';
 
 	$text['label-source']['en-us'] = 'Source';
 	$text['label-source']['pt-pt'] = 'Origem';
-	$text['label-source']['fr'] = 'Origine';
+	$text['label-source']['fr-fr'] = 'Origine';
 
 	$text['label-destination']['en-us'] = 'Destination';
 	$text['label-destination']['pt-pt'] = 'Destino';
-	$text['label-destination']['fr'] = 'Destination';
+	$text['label-destination']['fr-fr'] = 'Destination';
 
 	$text['label-start']['en-us'] = 'Start';
 	$text['label-start']['pt-pt'] = 'Inicio';
-	$text['label-start']['fr'] = 'Début';
+	$text['label-start']['fr-fr'] = 'Début';
 
 	$text['label-status']['en-us'] = 'Status';
 	$text['label-status']['pt-pt'] = 'Estado';
-	$text['label-status']['fr'] = 'Etat';
+	$text['label-status']['fr-fr'] = 'Etat';
 
 	$text['label-name']['en-us'] = 'Name';
 	$text['label-name']['pt-pt'] = 'Nome';
-	$text['label-name']['fr'] = 'Nom';
+	$text['label-name']['fr-fr'] = 'Nom';
 
 	$text['label-number']['en-us'] = 'Number';
 	$text['label-number']['pt-pt'] = 'Numero';
-	$text['label-number']['fr'] = 'Numéro';
+	$text['label-number']['fr-fr'] = 'Numéro';
 
 	$text['label-length']['en-us'] = 'Length';
 	$text['label-length']['pt-pt'] = 'Comprimento';
-	$text['label-length']['fr'] = 'Durée';
+	$text['label-length']['fr-fr'] = 'Durée';
 
 	$text['label-tools']['en-us'] = 'Tools';
 	$text['label-tools']['pt-pt'] = '';
-	$text['label-tools']['fr'] = 'Outils';
+	$text['label-tools']['fr-fr'] = 'Outils';
 
 	$text['label-play']['en-us'] = 'Play';
 	$text['label-play']['pt-pt'] = '';
-	$text['label-play']['fr'] = 'Jouer';
+	$text['label-play']['fr-fr'] = 'Jouer';
 
 	$text['label-download']['en-us'] = 'Download';
 	$text['label-download']['pt-pt'] = '';
-	$text['label-download']['fr'] = 'Télécharger';
+	$text['label-download']['fr-fr'] = 'Télécharger';
 
 	$text['button-statistics']['en-us'] = 'Statistics';
 	$text['button-statistics']['pt-pt'] = 'Estatisticas';
-	$text['button-statistics']['fr'] = 'Statistiques';
+	$text['button-statistics']['fr-fr'] = 'Statistiques';
 
 	$text['button-missed']['en-us'] = 'Missed Calls';
 	$text['button-missed']['pt-pt'] = 'Chamadas Perdidas';
-	$text['button-missed']['fr'] = 'Appels Perdus';
+	$text['button-missed']['fr-fr'] = 'Appels Perdus';
 
 	//xml_cdr_details
 	$text['title2']['en-us'] = 'Call Details';
 	$text['title2']['pt-pt'] = 'Detalhes das Chamadas';
-	$text['title2']['fr'] = "Détail des Appels";
+	$text['title2']['fr-fr'] = "Détail des Appels";
 
 	$text['button-back']['en-us'] = 'Back';
 	$text['button-back']['pt-pt'] = 'Voltar';
-	$text['button-back']['fr'] = 'Retour';
+	$text['button-back']['fr-fr'] = 'Retour';
 
 	$text['description-5']['en-us'] = 'A detailed view of the call and all information regarding it.';
 	$text['description-5']['pt-pt'] = 'Uma visão detalhada da chamada e todas as informações sobre ela.';
-	$text['description-5']['fr'] = "Une vue détaillée de l'appel et toutes les informations en relation.";
+	$text['description-5']['fr-fr'] = "Une vue détaillée de l'appel et toutes les informations en relation.";
 
 	$text['description-6']['en-us'] = 'The information contains caller id name and number, channel data, ';
 	$text['description-6']['pt-pt'] = 'A informação contém o nome e numero de origem, dados do canal, ';
-	$text['description-6']['fr'] = "L'information contient le nom et le numéro d'appelant, données du canal, ";
+	$text['description-6']['fr-fr'] = "L'information contient le nom et le numéro d'appelant, données du canal, ";
 
 	$text['description-7']['en-us'] = 'call variables, call flow, timing information, and other useful call details.';
 	$text['description-7']['pt-pt'] = 'variáveis de chamada, fluxo da chamada, informações de tempo e outros detalhes úteis da chamada.';
-	$text['description-7']['fr'] = "les variables de l'appel, le chemin, les temporisations et d'autres détails.";
+	$text['description-7']['fr-fr'] = "les variables de l'appel, le chemin, les temporisations et d'autres détails.";
 
 	$text['label-summary']['en-us'] = 'Summary';
 	$text['label-summary']['pt-pt'] = 'Sumario';
-	$text['label-summary']['fr'] = 'Résumé';
+	$text['label-summary']['fr-fr'] = 'Résumé';
 
 	$text['table-direction']['en-us'] = 'Direction';
 	$text['table-direction']['pt-pt'] = 'Direcção';
-	$text['table-direction']['fr'] = 'Direction';
+	$text['table-direction']['fr-fr'] = 'Direction';
 
 	$text['table-name']['en-us'] = 'Name (play)';
 	$text['table-name']['pt-pt'] = 'None (executar)';
-	$text['table-name']['fr'] = 'Nom (jouer)';
+	$text['table-name']['fr-fr'] = 'Nom (jouer)';
 
 	$text['table-download']['en-us'] = 'Number (download)';
 	$text['table-download']['pt-pt'] = 'Numero (descarregar)';
-	$text['table-download']['fr'] = 'Numéro (télécharger)';
+	$text['table-download']['fr-fr'] = 'Numéro (télécharger)';
 
 	$text['table-end']['en-us'] = 'End';
 	$text['table-end']['pt-pt'] = 'Final';
-	$text['table-end']['fr'] = 'Fin';
+	$text['table-end']['fr-fr'] = 'Fin';
 
 	$text['label-channel']['en-us'] = 'Channel Data';
 	$text['label-channel']['pt-pt'] = 'Dados de Canal';
-	$text['label-channel']['fr'] = "Données de canal";
+	$text['label-channel']['fr-fr'] = "Données de canal";
 
 	$text['label-value']['en-us'] = 'Value';
 	$text['label-value']['pt-pt'] = 'Valor';
-	$text['label-value']['fr'] = 'Valeur';
+	$text['label-value']['fr-fr'] = 'Valeur';
 
 	$text['label-application-log']['en-us'] = 'Application Log';
 	$text['label-application-log']['pt-pt'] = 'Log de Aplicação';
-	$text['label-application-log']['fr'] = "Log de l'Application Log";
+	$text['label-application-log']['fr-fr'] = "Log de l'Application Log";
 
 	$text['label-data']['en-us'] = 'Data';
 	$text['label-data']['pt-pt'] = 'Dados';
-	$text['label-data']['fr'] = 'Données';
+	$text['label-data']['fr-fr'] = 'Données';
 
 	$text['label-call-flow']['en-us'] = 'Call Flow: Attributes';
 	$text['label-call-flow']['pt-pt'] = 'Fluxos de chamada: Atributos';
-	$text['label-call-flow']['fr'] = "Flux d'appel: Attibuts";
+	$text['label-call-flow']['fr-fr'] = "Flux d'appel: Attibuts";
 
 	$text['label-call-flow-2']['en-us'] = 'Call Flow: Extension: Attributes';
 	$text['label-call-flow-2']['pt-pt'] = 'Fluxos de chamada: Extensão: Atributos';
-	$text['label-call-flow-2']['fr'] = "Flux d'appel: Extension: Attibuts";
+	$text['label-call-flow-2']['fr-fr'] = "Flux d'appel: Extension: Attibuts";
 
 	$text['label-call-flow-3']['en-us'] = 'Call Flow: Extension: Application';
 	$text['label-call-flow-3']['pt-pt'] = 'Fluxos de chamada: Extensão: Aplicação';
-	$text['label-call-flow-3']['fr'] = "Flux d'appel: Extension: Application";
+	$text['label-call-flow-3']['fr-fr'] = "Flux d'appel: Extension: Application";
 
 	$text['label-call-flow-4']['en-us'] = 'Call Flow: Caller Profile';
 	$text['label-call-flow-4']['pt-pt'] = 'Fluxos de chamada: Perfil de chamador';
-	$text['label-call-flow-4']['fr'] = "Flux d'appel: Profile de l'appelant";
+	$text['label-call-flow-4']['fr-fr'] = "Flux d'appel: Profile de l'appelant";
 
 	$text['label-call-flow-5']['en-us'] = 'Call Flow: Times';
 	$text['label-call-flow-5']['pt-pt'] = 'Fluxos de chamada: Tempos';
-	$text['label-call-flow-5']['fr'] = "Flux d'appel: temporisations ";
+	$text['label-call-flow-5']['fr-fr'] = "Flux d'appel: temporisations ";
 
 	//xml_cdr_statistics
 	$text['label-call-statistics']['en-us'] = 'Call Detail Record Statistics';
 	$text['label-call-statistics']['pt-pt'] = 'Estatisticas dos Detalhes da Gravação de Chamadas';
-	$text['label-call-statistics']['fr'] = "Statistiques sur l'historique des appels";
+	$text['label-call-statistics']['fr-fr'] = "Statistiques sur l'historique des appels";
 
 	$text['label-call-statistics-description']['en-us'] = 'Call Detail Records Statics summarize the call information.';
 	$text['label-call-statistics-description']['pt-pt'] = 'As Estatisticas dos Detalhes da Gravação de Chamadas resumem as informações da chamada.';
-	$text['label-call-statistics-description']['fr'] = "Résumé de l'historique des appels.";
+	$text['label-call-statistics-description']['fr-fr'] = "Résumé de l'historique des appels.";
 
 	$text['table-hours']['en-us'] = 'Hours';
 	$text['table-hours']['pt-pt'] = 'Horas';
-	$text['table-hours']['fr'] = 'Heurrs';
+	$text['table-hours']['fr-fr'] = 'Heurrs';
 
 	$text['table-date']['en-us'] = 'Date';
 	$text['table-date']['pt-pt'] = 'Data';
-	$text['table-date']['fr'] = 'Date';
+	$text['table-date']['fr-fr'] = 'Date';
 
 	$text['table-time']['en-us'] = 'Time';
 	$text['table-time']['pt-pt'] = 'Tempo';
-	$text['table-time']['fr'] = 'Temps';
+	$text['table-time']['fr-fr'] = 'Temps';
 
 	$text['table-minutes']['en-us'] = 'Minutes';
 	$text['table-minutes']['pt-pt'] = 'Minutos';
-	$text['table-minutes']['fr'] = 'Minutes';
+	$text['table-minutes']['fr-fr'] = 'Minutes';
 
 	$text['table-calls-per-minute']['en-us'] = 'Calls Per Min';
 	$text['table-calls-per-minute']['pt-pt'] = 'Chamadas por minuto';
-	$text['table-calls-per-minute']['fr'] = "Appels par minute";
+	$text['table-calls-per-minute']['fr-fr'] = "Appels par minute";
 
 	$text['table-missed']['en-us'] = 'Missed';
 	$text['table-missed']['pt-pt'] = 'Perdidas';
-	$text['table-missed']['fr'] = 'Perdus';
+	$text['table-missed']['fr-fr'] = 'Perdus';
 
 	$text['table-days']['en-us'] = 'Days';
 	$text['table-days']['pt-pt'] = 'Dias';
-	$text['table-days']['fr'] = 'Jours';
+	$text['table-days']['fr-fr'] = 'Jours';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/xmpp/app_config.php b/app/xmpp/app_config.php
index 043cef2d60..e76ec766e8 100644
--- a/app/xmpp/app_config.php
+++ b/app/xmpp/app_config.php
@@ -10,7 +10,7 @@
 		$apps[$x]['description']['en-us'] = '';
 		$apps[$x]['description']['en-us'] = 'Allow User to Open a Flash Phone for his Extension.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Permet d'utiliser un téléphone flash comme extension";
@@ -22,13 +22,13 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'XMPP Manager';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Gestion XMPP";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Gestion XMPP';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Gestor de XMPP";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Gestor de XMPP';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = '1808365b-0f7c-7555-89d0-31b3d9a75abb';
 		$apps[$x]['menu'][0]['parent_uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
@@ -38,7 +38,6 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'xmpp_view';
-		$apps[$x]['permissions'][0]['menu']['uuid'] = '1808365b-0f7c-7555-89d0-31b3d9a75abb';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
 		$apps[$x]['permissions'][1]['name'] = 'xmpp_add';
@@ -160,4 +159,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; 
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/xmpp/app_languages.php b/app/xmpp/app_languages.php
index 1375df8a6b..6ba1a9bab6 100644
--- a/app/xmpp/app_languages.php
+++ b/app/xmpp/app_languages.php
@@ -4,185 +4,247 @@
 
 		$text['title-xmpp']['en-us'] = 'XMPP Manager';
 		$text['title-xmpp']['pt-pt'] = '';
+		$text['title-xmpp']['fr-fr'] = 'Gestion XMPP';
 
 		$text['title-xmpp-edit']['en-us'] = 'Profile Edit';
 		$text['title-xmpp-edit']['pt-pt'] = '';
+		$text['title-xmpp-edit']['fr-fr'] = 'Edition du Profile';
 
 		$text['title-xmpp-add']['en-us'] = 'Profile Add';
 		$text['title-xmpp-add']['pt-pt'] = '';
+		$text['title-xmpp-add']['fr-fr'] = 'Ajouter un Profile';
 
 		$text['header-xmpp']['en-us'] = 'XMPP Manager';
 		$text['header-xmpp']['pt-pt'] = '';
+		$text['header-xmpp']['fr-fr'] = 'Gestion XMPP';
 
 		$text['header-xmpp-edit']['en-us'] = 'Profile Edit';
 		$text['header-xmpp-edit']['pt-pt'] = '';
+		$text['header-xmpp-edit']['fr-fr'] = 'Editer le profile';
 
 		$text['header-xmpp-add']['en-us'] = 'Profile Add';
 		$text['header-xmpp-add']['pt-pt'] = '';
+		$text['header-xmpp-add']['fr-fr'] = 'Ajouter un profile';
 
 		$text['description-xmpp-list']['en-us'] = 'Utilizes the Jingle protocol. Jingle is an extension to the Jabber/XMPP protocol.';
 		$text['description-xmpp-list']['pt-pt'] = '';
+		$text['description-xmpp-list']['fr-fr'] = 'Utilise le protocle Jingle. Jingle est une extension du protocol Jabber/ XMPP.';
 
 		$text['description-xmpp-edit-add']['en-us'] = 'Defines a connections to a Jabber, GTalk, or other XMPP Provider server.';
 		$text['description-xmpp-edit-add']['pt-pt'] = '';
+		$text['description-xmpp-edit-add']['fr-fr'] = "Définir une connexion à Jabber, GTalk ou tout autre fournissuer de service XMPP.";
 
 		$text['label-profile_name']['en-us'] = 'Profile Name';
 		$text['label-profile_name']['pt-pt'] = '';
+		$text['label-profile_name']['fr-fr'] = 'Nom du Profile';
 
 		$text['description-profile_name']['en-us'] = 'Enter the profile name here.';
 		$text['description-profile_name']['pt-pt'] = '';
+		$text['description-profile_name']['fr-fr'] = 'Insérer le nom du profile.';
 
 		$text['label-username']['en-us'] = 'Username';
 		$text['label-username']['pt-pt'] = '';
+		$text['label-username']['fr-fr'] = "Nom d'utilisateur";
 
 		$text['description-username']['en-us'] = 'Enter the XMPP username here.';
 		$text['description-username']['pt-pt'] = '';
+		$text['description-username']['fr-fr'] = "Insérer l'utilisateur XMPP.";
 
 		$text['label-password']['en-us'] = 'Password';
 		$text['label-password']['pt-pt'] = '';
+		$text['label-password']['fr-fr'] = 'Mot de Passe';
 
 		$text['description-password']['en-us'] = 'Enter the password here.';
 		$text['description-password']['pt-pt'] = '';
+		$text['description-password']['fr-fr'] = 'Insérer le mot de passe XMPP.';
 
 		$text['label-auto_login']['en-us'] = 'Auto-Login';
 		$text['label-auto_login']['pt-pt'] = '';
+		$text['label-auto_login']['fr-fr'] = 'Login Auto';
 
 		$text['description-auto_login']['en-us'] = 'Choose whether to automatically login.';
 		$text['description-auto_login']['pt-pt'] = '';
+		$text['description-auto_login']['fr-fr'] = "Choisir un mode de connexion automatique ou non.";
 
 		$text['label-xmpp_server']['en-us'] = 'XMPP Server';
 		$text['label-xmpp_server']['pt-pt'] = '';
+		$text['label-xmpp_server']['fr-fr'] = 'Serveur XMPP';
 
 		$text['description-xmpp_server']['en-us'] = 'Enter the alternate XMPP server if not the same as specified in the Username field above (e.g. GoogleTalk is: talk.google.com).';
 		$text['description-xmpp_server']['pt-pt'] = '';
+		$text['description-xmpp_server']['fr-fr'] = "Insérer le serveur XMPP alternatif si ce n'est pas le même que celui renseigné dans le nom d'utilisateur précédent (e.g. GoogleTalk est talk.google.com).";
 
 		$text['label-default_exten']['en-us'] = 'Default Extension';
 		$text['label-default_exten']['pt-pt'] = '';
+		$text['label-default_exten']['fr-fr'] = 'Extension par Défaut';
 
 		$text['description-default_exten']['en-us'] = 'Default extension (if one cannot be determined) .';
 		$text['description-default_exten']['pt-pt'] = '';
+		$text['description-default_exten']['fr-fr'] = "Extension par défaut (si aucune ne peut être déterminé).";
 
 		$text['label-context']['en-us'] = 'Context';
 		$text['label-context']['pt-pt'] = '';
+		$text['label-context']['fr-fr'] = 'Contexte';
 
 		$text['description-context']['en-us'] = 'Enter the context here.';
 		$text['description-context']['pt-pt'] = '';
+		$text['description-context']['fr-fr'] = '';
 
 		$text['label-rtp_ip']['en-us'] = 'RTP IP';
 		$text['label-rtp_ip']['pt-pt'] = '';
+		$text['label-rtp_ip']['fr-fr'] = 'RTP IP';
 
 		$text['description-rtp_ip']['en-us'] = 'IP Address for RTP.';
 		$text['description-rtp_ip']['pt-pt'] = '';
+		$text['description-rtp_ip']['fr-fr'] = 'Adresse IP du proxy RTP.';
 
 		$text['label-ext_rtp_ip']['en-us'] = 'External RTP IP';
 		$text['label-ext_rtp_ip']['pt-pt'] = '';
+		$text['label-ext_rtp_ip']['pt-pt'] = '';
+		$text['label-ext_rtp_ip']['fr-fr'] = 'RTP IP Externe';
 
 		$text['description-ext_rtp_ip']['en-us'] = 'External IP Address for RTP.';
 		$text['description-ext_rtp_ip']['pt-pt'] = '';
+		$text['description-ext_rtp_ip']['fr-fr'] = 'Adresse externe IP du proxy RTP.';
 
 		$text['label-sasl_type']['en-us'] = 'SASL Type';
 		$text['label-sasl_type']['pt-pt'] = '';
+		$text['label-sasl_type']['fr-fr'] = 'Type SASL';
 
 		$text['description-sasl_type']['en-us'] = 'Select an SASL type.';
 		$text['description-sasl_type']['pt-pt'] = '';
+		$text['description-sasl_type']['fr-fr'] = 'Choisir un type de SASL.';
 
 		$text['label-tls_enable']['en-us'] = 'Enable TLS';
 		$text['label-tls_enable']['pt-pt'] = '';
+		$text['label-tls_enable']['fr-fr'] = 'Activer TLS';
 
 		$text['description-tls_enable']['en-us'] = 'Set the status of TLS support.';
 		$text['description-tls_enable']['pt-pt'] = '';
+		$text['description-tls_enable']['fr-fr'] = 'Choisir le statut du support TLS.';
 
 		$text['label-use_rtp_timer']['en-us'] = 'Use RTP Timer';
 		$text['label-use_rtp_timer']['pt-pt'] = '';
+		$text['label-use_rtp_timer']['fr-fr'] = 'Utilise le timer RTP';
 
 		$text['description-use_rtp_timer']['en-us'] = 'Disable to trade async for more calls.';
 		$text['description-use_rtp_timer']['pt-pt'] = '';
+		$text['description-use_rtp_timer']['fr-fr'] = "désactiver la synchronisation pour augmenter le nombre d'appels";
 
 		$text['label-vad']['en-us'] = 'Voice Activity Detection (VAD)';
 		$text['label-vad']['pt-pt'] = '';
+		$text['label-vad']['fr-fr'] = "Dectection d'activité voix (VAD)";
 
 		$text['description-vad']['en-us'] = 'The direction for which VAD should be enabled.';
 		$text['description-vad']['pt-pt'] = '';
+		$text['description-vad']['fr-fr'] = "Choisir la direction pour la quelle la VAD doit être activée.";
 
 		$text['option-vad_none']['en-us'] = 'None';
 		$text['option-vad_none']['pt-pt'] = '';
+		$text['option-vad_none']['fr-fr'] = 'Aucune';
 
 		$text['option-vad_in']['en-us'] = 'In';
 		$text['option-vad_in']['pt-pt'] = '';
+		$text['option-vad_in']['fr-fr'] = 'Entrant';
 
 		$text['option-vad_out']['en-us'] = 'Out';
 		$text['option-vad_out']['pt-pt'] = '';
+		$text['option-vad_out']['fr-fr'] = 'Sortant';
 
 		$text['option-vad_both']['en-us'] = 'Both';
 		$text['option-vad_both']['pt-pt'] = '';
+		$text['option-vad_both']['fr-fr'] = 'Les Deux';
 
 		$text['label-candidate_acl']['en-us'] = 'Candidate ACL';
 		$text['label-candidate_acl']['pt-pt'] = '';
+		$text['label-candidate_acl']['fr-fr'] = 'ACL Candidat';
 
 		$text['description-candidate_acl']['en-us'] = 'Candidate access control list.';
 		$text['description-candidate_acl']['pt-pt'] = '';
+		$text['description-candidate_acl']['fr-fr'] = "Candidat aux listes de contrôle d'accès";
 
 		$text['label-local_network_acl']['en-us'] = 'Local Network ACL';
 		$text['label-local_network_acl']['pt-pt'] = '';
+		$text['label-local_network_acl']['fr-fr'] = "ACL Réseau local";
 
 		$text['description-local_network_acl']['en-us'] = 'Local network access control list.';
 		$text['description-local_network_acl']['pt-pt'] = '';
+		$text['description-local_network_acl']['fr-fr'] = "listes de contrôle d'accès du Réseau local";
 
 		$text['label-enabled']['en-us'] = 'Enabled';
 		$text['label-enabled']['pt-pt'] = '';
+		$text['label-enabled']['fr-fr'] = 'Actif';
 
 		$text['description-enabled']['en-us'] = 'Set the current status of this profile.';
 		$text['description-enabled']['pt-pt'] = '';
+		$text['description-enabled']['fr-fr'] = "Choisir le statut actuel de ce profile.";
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = 'Description';
 
 		$text['description-description']['en-us'] = 'Enter the description for the Profile here (optional).';
 		$text['description-description']['pt-pt'] = '';
+		$text['description-description']['fr-fr'] = "Mettre ici la description du profile (optionnel).";
 
 		$text['label-status']['en-us'] = 'Status';
 		$text['label-status']['pt-pt'] = '';
+		$text['label-status']['fr-fr'] = 'Statut';
 
 		$text['label-true']['en-us'] = 'True';
 		$text['label-true']['pt-pt'] = '';
+		$text['label-true']['fr-fr'] = 'Oui';
 
 		$text['label-false']['en-us'] = 'False';
 		$text['label-false']['pt-pt'] = 'falso';
+		$text['label-false']['fr-fr'] = 'Non';
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['button-advanced']['en-us'] = 'Advanced';
 		$text['button-advanced']['pt-pt'] = '';
+		$text['button-advanced']['fr-fr'] = 'Afficher les paramètres avancés';
 
 		$text['label-advanced']['en-us'] = 'Show Advanced';
 		$text['label-advanced']['pt-pt'] = '';
+		$text['label-advanced']['fr-fr'] = 'Paramètres Avancés';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = 'Mis à Jour';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer:";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/apps/app_config.php b/core/apps/app_config.php
index 233cf0a78a..795f4cd484 100644
--- a/core/apps/app_config.php
+++ b/core/apps/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = '';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = '';
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'App Manager';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Gestion App";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Gestion App';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Gestor de Aplicações';
@@ -73,4 +73,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
 		$z++;
 
-?>
\ No newline at end of file
+?>
diff --git a/core/apps/app_languages.php b/core/apps/app_languages.php
index fb94beaddd..4d87fb2b52 100644
--- a/core/apps/app_languages.php
+++ b/core/apps/app_languages.php
@@ -4,69 +4,90 @@
 
 		$text['title-apps']['en-us'] = 'App Manager';
 		$text['title-apps']['pt-pt'] = '';
+		$text['title-apps']['fr-fr'] = 'Gestionnaire App';
 
 		$text['header-apps']['en-us'] = 'App Manager';
 		$text['header-apps']['pt-pt'] = '';
+		$text['header-apps']['fr-fr'] = 'Gestionnaire App';
 
 		$text['description-apps']['en-us'] = 'Manage the applications that are installed.';
 		$text['description-apps']['pt-pt'] = '';
+		$text['description-apps']['fr-fr'] = 'Gérer les applications installées.';
 
 		//------
 
 		$text['title-app-edit']['en-us'] = 'App Edit';
 		$text['title-app-edit']['pt-pt'] = '';
+		$text['title-app-edit']['fr-fr'] = "Editer l'application";
 
 		$text['header-app-edit']['en-us'] = 'App Edit';
 		$text['header-app-edit']['pt-pt'] = '';
+		$text['header-app-edit']['fr-fr'] = "Editer l'application";
 
 		$text['description-app-edit']['en-us'] = 'Manage the applications that are installed.';
 		$text['description-app-edit']['pt-pt'] = '';
+		$text['description-app-edit']['fr-fr'] = "Gérer les applications installées";
 
 		//------
 
 		$text['label-name']['en-us'] = 'Name';
 		$text['label-name']['pt-pt'] = '';
+		$text['label-name']['fr-fr'] = 'Nom';
 
 		$text['label-category']['en-us'] = 'Category';
 		$text['label-category']['pt-pt'] = '';
+		$text['label-category']['fr-fr'] = 'Catégories';
 
 		$text['label-subcategory']['en-us'] = 'Subcategory';
 		$text['label-subcategory']['pt-pt'] = '';
+		$text['label-subcategory']['fr-fr'] = 'Sous-catégories';
 
 		$text['label-version']['en-us'] = 'Version';
 		$text['label-version']['pt-pt'] = '';
+		$text['label-version']['fr-fr'] = 'Version';
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = 'Description';
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = 'Ajouté';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = 'Supprimé';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['message-message']['en-us'] = 'Message';
 		$text['message-message']['pt-pt'] = '';
+		$text['message-message']['fr-fr'] = 'Message';
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = 'Mis à jour';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 
-?>
\ No newline at end of file
+?>
diff --git a/core/databases/app_config.php b/core/databases/app_config.php
index 87e56d89ad..b378503990 100644
--- a/core/databases/app_config.php
+++ b/core/databases/app_config.php
@@ -7,12 +7,12 @@
 		$apps[$x]['version'] = '';
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = "Storeds database connection information.";
+		$apps[$x]['description']['en-us'] = 'Storeds database connection information.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Information de connexions au BDD";
+		$apps[$x]['description']['fr-fr'] = 'Information de connexions au BDD';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Armazena informações de conexão com a base de dados.';
@@ -21,13 +21,13 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Databases';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "BDD";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'BDD';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Base de Dados";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Base de Dados';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = 'ebbd754d-ca74-d5b1-a77e-9206ba3ecc3f';
 		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
@@ -36,18 +36,17 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'database_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'database_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'database_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'database_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][0]['name'] = 'database_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'database_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'database_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'database_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -118,4 +117,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
 		$z++;
-?>
\ No newline at end of file
+?>
diff --git a/core/databases/app_languages.php b/core/databases/app_languages.php
index 6aeaa1c4b4..de9aeb3539 100644
--- a/core/databases/app_languages.php
+++ b/core/databases/app_languages.php
@@ -4,124 +4,162 @@
 
 		$text['title-databases']['en-us'] = 'Databases';
 		$text['title-databases']['pt-pt'] = '';
+		$text['title-databases']['fr-fr'] = 'Bases de données';
 
 		$text['header-databases']['en-us'] = 'Databases';
 		$text['header-databases']['pt-pt'] = '';
+		$text['header-databases']['fr-fr'] = 'Bases de données';
 
 		$text['description-databases']['en-us'] = 'Database information.';
 		$text['description-databases']['pt-pt'] = '';
+		$text['description-databases']['fr-fr'] = 'Informations sur les bases de données';
 
 		//------
 
 		$text['title-database-edit']['en-us'] = 'Database Edit';
 		$text['title-database-edit']['pt-pt'] = '';
+		$text['title-database-edit']['fr-fr'] = 'Editer la Base de données';
 
 		$text['header-database-edit']['en-us'] = 'Database Edit';
 		$text['header-database-edit']['pt-pt'] = '';
+		$text['header-database-edit']['fr-fr'] = 'Editer la Base de données';
 
 		$text['description-database-edit']['en-us'] = 'Database connection information.';
 		$text['description-database-edit']['pt-pt'] = '';
+		$text['description-database-edit']['fr-fr'] = 'Informations de connexion à la Base';
 
 		//------
 
 		$text['title-database-add']['en-us'] = 'Database Add';
 		$text['title-database-add']['pt-pt'] = '';
+		$text['title-database-add']['fr-fr'] = 'Ajouter une Base de données';
 
 		$text['header-database-add']['en-us'] = 'Database Add';
 		$text['header-database-add']['pt-pt'] = '';
+		$text['header-database-add']['fr-fr'] = 'Ajouter une Base de données';
 
 		$text['description-database-add']['en-us'] = 'Database connection information.';
 		$text['description-database-add']['pt-pt'] = '';
+		$text['description-database-add']['fr-fr'] = 'Informations de connexion à la Base.';
 
 		//------
 
 		$text['label-driver']['en-us'] = 'Driver';
 		$text['label-driver']['pt-pt'] = '';
+		$text['label-driver']['fr-fr'] = 'Driver';
 
 		$text['description-driver']['en-us'] = 'Select the database driver.';
 		$text['description-driver']['pt-pt'] = '';
+		$text['description-driver']['fr-fr'] = 'Choisir le driver de la Base de données.';
 
 		$text['label-type']['en-us'] = 'Type';
 		$text['label-type']['pt-pt'] = '';
+		$text['label-type']['fr-fr'] = 'Type';
 
 		$text['description-type']['en-us'] = 'Select the database type.';
 		$text['description-type']['pt-pt'] = '';
+		$text['description-type']['fr-fr'] = 'Choisir le type de Base de données.';
 
 		$text['label-host']['en-us'] = 'Host';
 		$text['label-host']['pt-pt'] = '';
+		$text['label-host']['fr-fr'] = 'Hôte';
 
 		$text['description-host']['en-us'] = 'Enter the host name.';
 		$text['description-host']['pt-pt'] = '';
+		$text['description-host']['fr-fr'] = "Entrer le nom de l'hôte.";
 
 		$text['label-port']['en-us'] = 'Port';
 		$text['label-port']['pt-pt'] = '';
+		$text['label-port']['fr-fr'] = 'Port';
 
 		$text['description-port']['en-us'] = 'Enter the port number.';
 		$text['description-port']['pt-pt'] = '';
+		$text['description-port']['fr-fr'] = 'Entrer le numéro de port.';
 
 		$text['label-name']['en-us'] = 'Name';
 		$text['label-name']['pt-pt'] = '';
+		$text['label-name']['fr-fr'] = 'Nom';
 
 		$text['description-name']['en-us'] = 'Enter the database name.';
 		$text['description-name']['pt-pt'] = '';
+		$text['description-name']['fr-fr'] = 'Entrer le nom de la Base de données.';
 
 		$text['label-username']['en-us'] = 'Username';
 		$text['label-username']['pt-pt'] = '';
+		$text['label-username']['fr-fr'] = 'Utilisateur';
 
 		$text['description-username']['en-us'] = 'Enter the database username.';
 		$text['description-username']['pt-pt'] = '';
+		$text['description-username']['fr-fr'] = "Entrer le nom d'utilisateur de la Base de données.";
 
 		$text['label-password']['en-us'] = 'Password';
 		$text['label-password']['pt-pt'] = '';
+		$text['label-password']['fr-fr'] = 'Mot de Passe';
 
 		$text['description-password']['en-us'] = 'Enter the database password.';
 		$text['description-password']['pt-pt'] = '';
+		$text['description-password']['fr-fr'] = 'Entrer le mot de passe pour la Base de données.';
 
 		$text['label-path']['en-us'] = 'Path';
 		$text['label-path']['pt-pt'] = '';
+		$text['label-path']['fr-fr'] = 'Chemin';
 
 		$text['description-path']['en-us'] = 'Enter the database file path (SQLite only).';
 		$text['description-path']['pt-pt'] = '';
+		$text['description-path']['fr-fr'] = 'Entrer le chemin du fichier Base de données (Spécifique SQLite).';
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = 'Description';
 
 		$text['description-description']['en-us'] = 'Enter a description for this database, if desired.';
 		$text['description-description']['pt-pt'] = '';
+		$text['description-description']['fr-fr'] = 'Entrer une description pour cette Base de données. (optionnel)';
 
 		//------
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = 'Supprimé';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['message-message']['en-us'] = 'Message';
 		$text['message-message']['pt-pt'] = '';
+		$text['message-message']['fr-fr'] = 'Message';
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = 'Mis à jour';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/default_settings/app_config.php b/core/default_settings/app_config.php
index b7a9b22ec1..dfcfb3de92 100644
--- a/core/default_settings/app_config.php
+++ b/core/default_settings/app_config.php
@@ -9,10 +9,10 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Default settings that apply to all domains.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Configurations par défaut applicable à tous les domaines";
+		$apps[$x]['description']['fr-fr'] = 'Configurations par défaut applicable à tous les domaines';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Configurações padrão que se aplicam a todos os domínios.';
@@ -21,10 +21,10 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Default Settings';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Confs par Défaut";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Confs par Défaut';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
 		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Predefinições';
@@ -83,4 +83,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'default_setting_description';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-?>
\ No newline at end of file
+?>
diff --git a/core/default_settings/app_languages.php b/core/default_settings/app_languages.php
index 1a8afd7f9e..c78039dc47 100644
--- a/core/default_settings/app_languages.php
+++ b/core/default_settings/app_languages.php
@@ -4,113 +4,148 @@
 
 		$text['title-default_settings']['en-us'] = 'Default Settings';
 		$text['title-default_settings']['pt-pt'] = '';
+		$text['title-default_settings']['fr-fr'] = "Configurations par Défaut";
 
 		$text['header-default_settings']['en-us'] = 'Default Settings';
 		$text['header-default_settings']['pt-pt'] = '';
+		$text['header-default_settings']['fr-fr'] = "Configurations par Défaut";
 
 		$text['description-default_settings']['en-us'] = 'Settings used for all domains.';
 		$text['description-default_settings']['pt-pt'] = '';
+		$text['description-default_settings']['fr-fr'] = 'Configurations communes à tous les domaines.';
 
 		//------
 
 		$text['title-default_setting-edit']['en-us'] = 'Default Setting Edit';
 		$text['title-default_setting-edit']['pt-pt'] = '';
+		$text['title-default_setting-edit']['fr-fr'] = 'Editer les Configurations par Défaut';
 
 		$text['header-default_setting-edit']['en-us'] = 'Default Setting Edit';
-		$text['header-default_setting-edit']['pt-pt'] = '';
+		$text['header-default_setting-edit']['pt-pt'] = 'Editer les Configurations par Défaut';
+		$text['header-default_setting-edit']['fr-fr'] = '';
 
 		$text['description-default_setting-edit']['en-us'] = 'Settings used for all domains.';
 		$text['description-default_setting-edit']['pt-pt'] = '';
+		$text['description-default_setting-edit']['fr-fr'] = 'Configurations communes à tous les domaines';
 
 		//------
 
 		$text['title-default_setting-add']['en-us'] = 'Default Setting Add';
 		$text['title-default_setting-add']['pt-pt'] = '';
+		$text['title-default_setting-add']['fr-fr'] = 'Ajouter une configuration per défaut';
 
 		$text['header-default_setting-add']['en-us'] = 'Default Setting Add';
 		$text['header-default_setting-add']['pt-pt'] = '';
+		$text['header-default_setting-add']['fr-fr'] = 'Ajouter une configuration per défaut';
 
 		$text['description-default_setting-add']['en-us'] = 'Settings used for all domains.';
 		$text['description-default_setting-add']['pt-pt'] = '';
+		$text['description-default_setting-add']['fr-fr'] = 'Configurations communes à tous les domaines';
 
 		//------
 
 		$text['label-category']['en-us'] = 'Category';
 		$text['label-category']['pt-pt'] = '';
+		$text['label-category']['fr-fr'] = 'Catégorie';
 
 		$text['description-category']['en-us'] = 'Enter the category.';
 		$text['description-category']['pt-pt'] = '';
+		$text['description-category']['fr-fr'] = 'Entrer la Catégorie.';
 
 		$text['label-subcategory']['en-us'] = 'Subcategory';
 		$text['label-subcategory']['pt-pt'] = '';
+		$text['label-subcategory']['fr-fr'] = 'Sous-Catégorie';
 
 		$text['description-subcategory']['en-us'] = 'Enter the subcategory.';
 		$text['description-subcategory']['pt-pt'] = '';
+		$text['description-subcategory']['fr-fr'] = 'Entrer la Sous-Catégorie.';
 
 		$text['label-type']['en-us'] = 'Type';
 		$text['label-type']['pt-pt'] = '';
+		$text['label-type']['fr-fr'] = 'Type';
 
 		$text['description-type']['en-us'] = 'Enter the setting type (ie. uuid, name, var, dir, etc).';
 		$text['description-type']['pt-pt'] = '';
+		$text['description-type']['fr-fr'] = 'Choisir le type de paramètre (ie. uuid, nom, var, dir, etc).';
 
 		$text['label-value']['en-us'] = 'Value';
 		$text['label-value']['pt-pt'] = '';
+		$text['label-value']['fr-fr'] = 'Valeur';
 
 		$text['description-value']['en-us'] = 'Enter the value of this setting.';
 		$text['description-value']['pt-pt'] = '';
+		$text['description-value']['fr-fr'] = 'Entrer la valeur de ce paramètre.';
 
 		$text['label-enabled']['en-us'] = 'Enabled';
 		$text['label-enabled']['pt-pt'] = '';
+		$text['label-enabled']['fr-fr'] = 'Actif';
 
 		$text['description-enabled']['en-us'] = 'Set the status of this default setting.';
 		$text['description-enabled']['pt-pt'] = '';
+		$text['description-enabled']['fr-fr'] = "Choisir l'état de ce paraètre";
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = 'Description';
 
 		$text['description-description']['en-us'] = 'Enter a description, if desired.';
 		$text['description-description']['pt-pt'] = '';
+		$text['description-description']['fr-fr'] = '';
 
 		$text['label-true']['en-us'] = 'True';
 		$text['label-true']['pt-pt'] = '';
+		$text['label-true']['fr-fr'] = 'Oui';
 
 		$text['label-false']['en-us'] = 'False';
 		$text['label-false']['pt-pt'] = 'falso';
+		$text['label-false']['fr-fr'] = 'Non';
 
 		$text['label-none']['en-us'] = 'None';
 		$text['label-none']['pt-pt'] = '';
+		$text['label-none']['fr-fr'] = 'Aucun';
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['message-message']['en-us'] = 'Message';
 		$text['message-message']['pt-pt'] = '';
+		$text['message-message']['fr-fr'] = 'Message';
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = 'Mis à jour';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/domain_settings/app_config.php b/core/domain_settings/app_config.php
index dec8cdf1e7..87a4ff31f0 100644
--- a/core/domain_settings/app_config.php
+++ b/core/domain_settings/app_config.php
@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Manage a single domain or multiple domains for multi-tenant.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Gestion d'un domaine ou plusieurs dans le cas d'un système multi-parties.";
@@ -21,13 +21,13 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Domains';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "domaines";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'domaines';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Dominios";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Dominios';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = '4fa7e90b-6d6c-12d4-712f-62857402b801';
 		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
@@ -134,4 +134,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_setting_description';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-?>
\ No newline at end of file
+?>
diff --git a/core/domain_settings/app_languages.php b/core/domain_settings/app_languages.php
index 0fb63fa499..56a063b42b 100644
--- a/core/domain_settings/app_languages.php
+++ b/core/domain_settings/app_languages.php
@@ -4,159 +4,207 @@
 
 		$text['title-domains']['en-us'] = 'Domains';
 		$text['title-domains']['pt-pt'] = '';
+		$text['title-domains']['fr-fr'] = "Domaines";
 
 		$text['header-domains']['en-us'] = 'Domains';
 		$text['header-domains']['pt-pt'] = '';
+		$text['header-domains']['fr-fr'] = "Domaines";
 
 		$text['description-domains']['en-us'] = 'Control the list of domains to manage.';
 		$text['description-domains']['pt-pt'] = '';
+		$text['description-domains']['fr-fr'] = "Contrôler la liste des domaines à gérer";
 
 		//------
 
 		$text['title-domain-edit']['en-us'] = 'Domain Edit';
 		$text['title-domain-edit']['pt-pt'] = '';
+		$text['title-domain-edit']['fr-fr'] = "Editer le Domaines";
 
 		$text['header-domain-edit']['en-us'] = 'Domain Edit';
 		$text['header-domain-edit']['pt-pt'] = '';
+		$text['header-domain-edit']['fr-fr'] = "Editer le Domaine";
 
 		$text['description-domain-edit']['en-us'] = 'Edit the details of this domain.';
 		$text['description-domain-edit']['pt-pt'] = '';
+		$text['description-domain-edit']['fr-fr'] = "Editer les détaisl de ce domaine. ";
 
 		$text['header-settings']['en-us'] = 'Settings';
 		$text['header-settings']['pt-pt'] = '';
+		$text['header-settings']['fr-fr'] = "Paramètres";
 
 		//------
 
 		$text['title-domain-add']['en-us'] = 'Domain Add';
 		$text['title-domain-add']['pt-pt'] = '';
+		$text['title-domain-add']['fr-fr'] = "Ajouter un Domaine";
 
 		$text['header-domain-add']['en-us'] = 'Domain Add';
 		$text['header-domain-add']['pt-pt'] = '';
+		$text['header-domain-add']['fr-fr'] = "Ajouter un Domaine";
 
 		$text['description-domain-add']['en-us'] = 'Enter the domain details below.';
 		$text['description-domain-add']['pt-pt'] = '';
+		$text['description-domain-add']['fr-fr'] = "Entrer les détails du domaine ci-dessous.";
 
 		//------
 
 		$text['label-domain']['en-us'] = 'Domain';
 		$text['label-domain']['pt-pt'] = '';
+		$text['label-domain']['fr-fr'] = "Domaine";
 
 		$text['label-name']['en-us'] = 'Name';
 		$text['label-name']['pt-pt'] = '';
+		$text['label-name']['fr-fr'] = "Nom";
 
 		$text['description-name']['en-us'] = 'Enter the name of the domain.';
 		$text['description-name']['pt-pt'] = '';
+		$text['description-name']['fr-fr'] = "Entrer le nom du domaine.";
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = "Description";
 
 		$text['description-description']['en-us'] = 'Enter a description for this domain, if desired.';
 		$text['description-description']['pt-pt'] = '';
+		$text['description-description']['fr-fr'] = "";
 
 		//------ settings
 
 		$text['title-domain_setting-edit']['en-us'] = 'Domain Setting Edit';
 		$text['title-domain_setting-edit']['pt-pt'] = '';
+		$text['title-domain_setting-edit']['fr-fr'] = "Editer les paramètres du domaine";
 
 		$text['header-domain_setting-edit']['en-us'] = 'Domain Setting Edit';
 		$text['header-domain_setting-edit']['pt-pt'] = '';
+		$text['header-domain_setting-edit']['fr-fr'] = "Editer les paramètres du domaine";
 
 		$text['description-domain_setting-edit']['en-us'] = 'Edit a setting for this domain.';
 		$text['description-domain_setting-edit']['pt-pt'] = '';
+		$text['description-domain_setting-edit']['fr-fr'] = "Editer un paramètre du domaine.";
 
 
 		//------
 
 		$text['title-domain_setting-add']['en-us'] = 'Domain Setting Add';
 		$text['title-domain_setting-add']['pt-pt'] = '';
+		$text['title-domain_setting-add']['fr-fr'] = "Ajouter un paramètre au domaine";
 
 		$text['header-domain_setting-add']['en-us'] = 'Domain Setting Add';
 		$text['header-domain_setting-add']['pt-pt'] = '';
+		$text['header-domain_setting-add']['fr-fr'] = "Ajouter un paramètre au domaine";
 
 		$text['description-domain_setting-add']['en-us'] = 'Add a setting for this domain.';
 		$text['description-domain_setting-add']['pt-pt'] = '';
+		$text['description-domain_setting-add']['fr-fr'] = "";
 
 		//------
 
 		$text['label-category']['en-us'] = 'Category';
 		$text['label-category']['pt-pt'] = '';
+		$text['label-category']['fr-fr'] = "Catégorie";
 
 		$text['description-category']['en-us'] = 'Enter the category.';
 		$text['description-category']['pt-pt'] = '';
+		$text['description-category']['fr-fr'] = "";
 
 		$text['label-subcategory']['en-us'] = 'Subcategory';
 		$text['label-subcategory']['pt-pt'] = '';
+		$text['label-subcategory']['fr-fr'] = "Sous-Catégorie";
 
 		$text['description-subcategory']['en-us'] = 'Enter the subcategory.';
 		$text['description-subcategory']['pt-pt'] = '';
+		$text['description-subcategory']['fr-fr'] = "";
 
 		$text['label-type']['en-us'] = 'Type';
 		$text['label-type']['pt-pt'] = '';
+		$text['label-type']['fr-fr'] = "Type";
 
 		$text['description-type']['en-us'] = 'Enter the setting type (ie. uuid, name, var, dir, etc).';
 		$text['description-type']['pt-pt'] = '';
+		$text['description-type']['fr-fr'] = "Entrer le type du paramètre (ie. uuid, nom, var, dir, etc).";
 
 		$text['label-value']['en-us'] = 'Value';
 		$text['label-value']['pt-pt'] = '';
+		$text['label-value']['fr-fr'] = "Valeur";
 
 		$text['description-value']['en-us'] = 'Enter the value of this setting.';
 		$text['description-value']['pt-pt'] = '';
+		$text['description-value']['fr-fr'] = "";
 
 		$text['label-enabled']['en-us'] = 'Enabled';
 		$text['label-enabled']['pt-pt'] = '';
+		$text['label-enabled']['fr-fr'] = "Actif";
 
 		$text['description-enabled']['en-us'] = 'Set the status of this default setting.';
 		$text['description-enabled']['pt-pt'] = '';
+		$text['description-enabled']['fr-fr'] = "Choisir l'état de ce paramètre";
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = "Description";
 
 		$text['description-description']['en-us'] = 'Enter a description, if desired.';
 		$text['description-description']['pt-pt'] = '';
+		$text['description-description']['fr-fr'] = "";
 
 		$text['label-true']['en-us'] = 'True';
 		$text['label-true']['pt-pt'] = '';
+		$text['label-true']['fr-fr'] = "Oui";
 
 		$text['label-false']['en-us'] = 'False';
 		$text['label-false']['pt-pt'] = 'falso';
+		$text['label-false']['fr-fr'] = "Non";
 
 		$text['label-none']['en-us'] = 'None';
 		$text['label-none']['pt-pt'] = '';
+		$text['label-none']['fr-fr'] = "Aucun";
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = "Ajouter";
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = "Editer";
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = "Supprimer";
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = "Sauvegarder";
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = "Retour";
 
 		$text['button-export']['en-us'] = 'Export';
 		$text['button-export']['pt-pt'] = '';
+		$text['button-export']['fr-fr'] = "Exporter";
 
 		$text['message-message']['en-us'] = 'Message';
 		$text['message-message']['pt-pt'] = '';
+		$text['message-message']['fr-fr'] = "Message";
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = "Ajouté";
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = "Mis à jour";
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = "Supprimé";
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/menu/app_config.php b/core/menu/app_config.php
index cd99f70b77..f7919c551d 100644
--- a/core/menu/app_config.php
+++ b/core/menu/app_config.php
@@ -9,35 +9,36 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'The menu can be customized using this tool.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Le menu peut être personnalisé ici";
+		$apps[$x]['description']['fr-fr'] = 'Le menu peut être personnalisé ici';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = "O menu pode ser personalizado usando esta ferramenta.";
+		$apps[$x]['description']['pt-pt'] = 'O menu pode ser personalizado usando esta ferramenta.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = "Menu Manager";
+		$apps[$x]['menu'][0]['title']['en-us'] = 'Menu Manager';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Gestion des Menus";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Gestion des Menus';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Gestor de Menus";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Gestor de Menus';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = 'da3a9ab4-c28e-ea8d-50cc-e8405ac8e76e';
 		$apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
 		$apps[$x]['menu'][0]['category'] = 'internal';
 		$apps[$x]['menu'][0]['path'] = '/core/menu/menu.php';
+
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 		$apps[$x]['menu'][1]['title']['en-us'] = 'System';
 		$apps[$x]['menu'][1]['title']['es-mx'] = '';
-		$apps[$x]['menu'][1]['title']['de-de'] = '';
+		$apps[$x]['menu'][1]['title']['de'] = '';
 		$apps[$x]['menu'][1]['title']['de-ch'] = '';
 		$apps[$x]['menu'][1]['title']['de-at'] = '';
 		$apps[$x]['menu'][1]['title']['fr-fr'] = 'Système';
@@ -56,7 +57,7 @@
 
 		$apps[$x]['menu'][2]['title']['en-us'] = 'Accounts';
 		$apps[$x]['menu'][2]['title']['es-mx'] = '';
-		$apps[$x]['menu'][2]['title']['de-de'] = '';
+		$apps[$x]['menu'][2]['title']['de'] = '';
 		$apps[$x]['menu'][2]['title']['de-ch'] = '';
 		$apps[$x]['menu'][2]['title']['de-at'] = '';
 		$apps[$x]['menu'][2]['title']['fr-fr'] = 'Comptes';
@@ -67,46 +68,42 @@
 		$apps[$x]['menu'][2]['uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
 		$apps[$x]['menu'][2]['parent_uuid'] = '';
 		$apps[$x]['menu'][2]['category'] = 'internal';
-		$apps[$x]['menu'][2]['path'] = '/core/users/index.php';
+		$apps[$x]['menu'][2]['path'] = '/app/extensions/extensions.php';
 		$apps[$x]['menu'][2]['order'] = '10';
 		$apps[$x]['menu'][2]['groups'][] = 'admin';
 		$apps[$x]['menu'][2]['groups'][] = 'superadmin';
 
-		if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/vars/app_config.php")) {
-			$apps[$x]['menu'][3]['title']['en-us'] = 'Dialplan';
-			$apps[$x]['menu'][3]['uuid'] = 'b94e8bd9-9eb5-e427-9c26-ff7a6c21552a';
-			$apps[$x]['menu'][3]['parent_uuid'] = '';
-			$apps[$x]['menu'][3]['category'] = 'internal';
-			$apps[$x]['menu'][3]['path'] = '/app/dialplan/dialplans.php';
-			$apps[$x]['menu'][3]['order'] = '15';
-			$apps[$x]['menu'][3]['groups'][] = 'admin';
-			$apps[$x]['menu'][3]['groups'][] = 'superadmin';
-		}
+		$apps[$x]['menu'][3]['title']['en-us'] = 'Dialplan2';
+		$apps[$x]['menu'][3]['uuid'] = 'b94e8bd9-9eb5-e427-9c26-ff7a6c21552a';
+		$apps[$x]['menu'][3]['parent_uuid'] = '';
+		$apps[$x]['menu'][3]['category'] = 'internal';
+		$apps[$x]['menu'][3]['path'] = '/app/dialplan/dialplans.php';
+		$apps[$x]['menu'][3]['order'] = '15';
+		$apps[$x]['menu'][3]['groups'][] = 'admin';
+		$apps[$x]['menu'][3]['groups'][] = 'superadmin';
 
-		if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/calls_active/calls_active_extensions.php")) {
-			$apps[$x]['menu'][4]['title']['en-us'] = 'Status';
-			$apps[$x]['menu'][4]['title']['es-mx'] = '';
-			$apps[$x]['menu'][4]['title']['de-de'] = '';
-			$apps[$x]['menu'][4]['title']['de-ch'] = '';
-			$apps[$x]['menu'][4]['title']['de-at'] = '';
-			$apps[$x]['menu'][4]['title']['fr-fr'] = 'Etat';
-			$apps[$x]['menu'][4]['title']['fr-ca'] = '';
-			$apps[$x]['menu'][4]['title']['fr-ch'] = '';
-			$apps[$x]['menu'][4]['title']['pt-pt'] = 'Estado';
-			$apps[$x]['menu'][4]['title']['pt-br'] = '';
-			$apps[$x]['menu'][4]['uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
-			$apps[$x]['menu'][4]['parent_uuid'] = '';
-			$apps[$x]['menu'][4]['category'] = 'internal';
-			$apps[$x]['menu'][4]['path'] = '/app/calls_active/calls_active_extensions.php';
-			$apps[$x]['menu'][4]['order'] = '25';
-			$apps[$x]['menu'][4]['groups'][] = 'user';
-			$apps[$x]['menu'][4]['groups'][] = 'admin';
-			$apps[$x]['menu'][4]['groups'][] = 'superadmin';
-		}
+		$apps[$x]['menu'][4]['title']['en-us'] = 'Status';
+		$apps[$x]['menu'][4]['title']['es-mx'] = '';
+		$apps[$x]['menu'][4]['title']['de'] = '';
+		$apps[$x]['menu'][4]['title']['de-ch'] = '';
+		$apps[$x]['menu'][4]['title']['de-at'] = '';
+		$apps[$x]['menu'][4]['title']['fr-fr'] = 'Etat';
+		$apps[$x]['menu'][4]['title']['fr-ca'] = '';
+		$apps[$x]['menu'][4]['title']['fr-ch'] = '';
+		$apps[$x]['menu'][4]['title']['pt-pt'] = 'Estado';
+		$apps[$x]['menu'][4]['title']['pt-br'] = '';
+		$apps[$x]['menu'][4]['uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
+		$apps[$x]['menu'][4]['parent_uuid'] = '';
+		$apps[$x]['menu'][4]['category'] = 'internal';
+		$apps[$x]['menu'][4]['path'] = '/app/calls_active/calls_active_extensions.php';
+		$apps[$x]['menu'][4]['order'] = '25';
+		$apps[$x]['menu'][4]['groups'][] = 'user';
+		$apps[$x]['menu'][4]['groups'][] = 'admin';
+		$apps[$x]['menu'][4]['groups'][] = 'superadmin';
 
 		$apps[$x]['menu'][5]['title']['en-us'] = 'Advanced';
 		$apps[$x]['menu'][5]['title']['es-mx'] = '';
-		$apps[$x]['menu'][5]['title']['de-de'] = '';
+		$apps[$x]['menu'][5]['title']['de'] = '';
 		$apps[$x]['menu'][5]['title']['de-ch'] = '';
 		$apps[$x]['menu'][5]['title']['de-at'] = '';
 		$apps[$x]['menu'][5]['title']['fr-fr'] = 'Avancé';
@@ -117,62 +114,25 @@
 		$apps[$x]['menu'][5]['uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
 		$apps[$x]['menu'][5]['parent_uuid'] = '';
 		$apps[$x]['menu'][5]['category'] = 'internal';
-		$apps[$x]['menu'][5]['path'] = '/core/domain_settings/domains.php';
+		$apps[$x]['menu'][5]['path'] = '/app/exec/exec.php';
 		$apps[$x]['menu'][5]['order'] = '30';
 		$apps[$x]['menu'][5]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_restore';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_group_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_group_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_group_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_group_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_language_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_language_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_language_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_language_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][0]['name'] = 'menu_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'menu_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'menu_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'menu_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][4]['name'] = 'menu_restore';
+		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -321,7 +281,6 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_name';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		
 
 		$y = 3; //table array index
 		$z = 0; //field array index
@@ -361,4 +320,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-?>
\ No newline at end of file
+?>
diff --git a/core/menu/app_languages.php b/core/menu/app_languages.php
index 08797b75f3..8986a36a0d 100644
--- a/core/menu/app_languages.php
+++ b/core/menu/app_languages.php
@@ -4,195 +4,255 @@
 
 		$text['title-menus']['en-us'] = 'Menu Manager';
 		$text['title-menus']['pt-pt'] = '';
+		$text['title-menus']['fr-fr'] = 'Gestion des Menus';
 
 		$text['header-menus']['en-us'] = 'Menu Manager';
 		$text['header-menus']['pt-pt'] = '';
+		$text['header-menus']['fr-fr'] = 'Gestion des Menus';
 
 		$text['description-menus']['en-us'] = 'Used to customize one or more menus.';
 		$text['description-menus']['pt-pt'] = '';
+		$text['description-menus']['fr-fr'] = 'Personnaliser un ou plusieurs menus.';
 
 		//------
 
 		$text['title-menu-edit']['en-us'] = 'Menu Edit';
 		$text['title-menu-edit']['pt-pt'] = '';
+		$text['title-menu-edit']['fr-fr'] = 'Editer le Menu';
 
 		$text['header-menu-edit']['en-us'] = 'Menu Edit';
 		$text['header-menu-edit']['pt-pt'] = '';
+		$text['header-menu-edit']['fr-fr'] = 'Editer le Menu';
 
 		$text['description-menu-edit']['en-us'] = 'Used to customize one or more menus.';
 		$text['description-menu-edit']['pt-pt'] = '';
+		$text['description-menu-edit']['fr-fr'] = 'Personnaliser un ou plusieurs menus.';
 
 		//------
 
 		$text['title-menu-add']['en-us'] = 'Menu Add';
 		$text['title-menu-add']['pt-pt'] = '';
+		$text['title-menu-add']['fr-fr'] = 'Ajouter un menu';
 
 		$text['header-menu-add']['en-us'] = 'Menu Add';
 		$text['header-menu-add']['pt-pt'] = '';
+		$text['header-menu-add']['fr-fr'] = 'Ajouter un menu';
 
 		$text['description-menu-add']['en-us'] = 'Used to customize one or more menus.';
 		$text['description-menu-add']['pt-pt'] = '';
+		$text['description-menu-add']['fr-fr'] = 'Personnaliser un ou plusieurs menus.';
 
 		//------
 
 		$text['label-name']['en-us'] = 'Name';
 		$text['label-name']['pt-pt'] = '';
+		$text['label-name']['fr-fr'] = '';
 
 		$text['description-name']['en-us'] = 'Enter the name of the menu.';
 		$text['description-name']['pt-pt'] = '';
+		$text['description-name']['fr-fr'] = 'Entrer le nom du menu.';
 
 		$text['label-language']['en-us'] = 'Language';
 		$text['label-language']['pt-pt'] = '';
+		$text['label-language']['fr-fr'] = 'Langue';
 
 		$text['description-language']['en-us'] = 'Enter the language.';
 		$text['description-language']['pt-pt'] = '';
+		$text['description-language']['fr-fr'] = 'Entrer la langue.';
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = 'Description';
 
 		$text['description-description']['en-us'] = 'Enter a description for this menu, if desired.';
 		$text['description-description']['pt-pt'] = '';
+		$text['description-description']['fr-fr'] = '';
 
 		//------ items
 
 		$text['title-menu_item-edit']['en-us'] = 'Menu Item Edit';
 		$text['title-menu_item-edit']['pt-pt'] = '';
+		$text['title-menu_item-edit']['fr-fr'] = "Editer l'objet menu";
 
 		$text['header-menu_item-edit']['en-us'] = 'Menu Item Edit';
 		$text['header-menu_item-edit']['pt-pt'] = '';
+		$text['header-menu_item-edit']['fr-fr'] = "Editer l'objet menu";
 
 		$text['description-menu_item-edit']['en-us'] = '';
 		$text['description-menu_item-edit']['pt-pt'] = '';
+		$text['description-menu_item-edit']['fr-fr'] = '';
 
 
 		//------
 
 		$text['title-menu_item-add']['en-us'] = 'Menu Item Add';
 		$text['title-menu_item-add']['pt-pt'] = '';
+		$text['title-menu_item-add']['fr-fr'] = "Ajouter un objet menu";
 
 		$text['header-menu_item-add']['en-us'] = 'Menu Item Add';
 		$text['header-menu_item-add']['pt-pt'] = '';
+		$text['header-menu_item-add']['fr-fr'] = "Ajouter un objet menu";
 
 		$text['description-menu_item-add']['en-us'] = '';
 		$text['description-menu_item-add']['pt-pt'] = '';
+		$text['description-menu_item-add']['fr-fr'] = '';
 
 		//------
 
 		$text['label-title']['en-us'] = 'Title';
 		$text['label-title']['pt-pt'] = '';
+		$text['label-title']['fr-fr'] = 'Titre';
 
 		$text['description-title']['en-us'] = '';
 		$text['description-title']['pt-pt'] = '';
+		$text['description-title']['fr-fr'] = '';
 
 		$text['label-link']['en-us'] = 'Link';
 		$text['label-link']['pt-pt'] = '';
+		$text['label-link']['fr-fr'] = 'Lien';
 
 		$text['description-link']['en-us'] = '';
 		$text['description-link']['pt-pt'] = '';
+		$text['description-link']['fr-fr'] = '';
 
 		$text['label-category']['en-us'] = 'Target';
 		$text['label-category']['pt-pt'] = '';
+		$text['label-category']['fr-fr'] = 'Cible';
 
 		$text['description-category']['en-us'] = '';
 		$text['description-category']['pt-pt'] = '';
+		$text['description-category']['fr-fr'] = '';
 
 		$text['option-internal']['en-us'] = 'Internal';
 		$text['option-internal']['pt-pt'] = '';
+		$text['option-internal']['fr-fr'] = 'Interne';
 
 		$text['option-external']['en-us'] = 'External';
 		$text['option-external']['pt-pt'] = '';
+		$text['option-external']['fr-fr'] = 'Externe';
 
 		$text['option-email']['en-us'] = 'E-mail';
 		$text['option-email']['pt-pt'] = '';
+		$text['option-email']['fr-fr'] = 'Courriel';
 
 		$text['label-parent_menu']['en-us'] = 'Parent Menu';
 		$text['label-parent_menu']['pt-pt'] = '';
+		$text['label-parent_menu']['fr-fr'] = 'Menu Parent';
 
 		$text['description-parent_menu']['en-us'] = '';
 		$text['description-parent_menu']['pt-pt'] = '';
+		$text['description-parent_menu']['fr-fr'] = '';
 
 		$text['label-groups']['en-us'] = 'Groups';
 		$text['label-groups']['pt-pt'] = '';
+		$text['label-groups']['fr-fr'] = 'Groupes';
 
 		$text['description-groups']['en-us'] = '';
 		$text['description-groups']['pt-pt'] = '';
+		$text['description-groups']['fr-fr'] = '';
 
 		$text['button-restore_default']['en-us'] = 'Restore Default';
 		$text['button-restore_default']['pt-pt'] = '';
+		$text['button-restore_default']['fr-fr'] = 'Restaurer';
 
 		$text['button-restore_all']['en-us'] = 'Restore All';
 		$text['button-restore_all']['pt-pt'] = 'Repor Tudo';
+		$text['button-restore_all']['fr-fr'] = 'Tout restaurer';
 
 		$text['label-protected']['en-us'] = 'Protected';
 		$text['label-protected']['pt-pt'] = '';
+		$text['label-protected']['fr-fr'] = 'Proteger';
 
 		$text['description-protected']['en-us'] = "Enable this to protect the menu item from being removed by '".$text['button-restore_default']['en-us']."'.";
 		$text['description-protected']['pt-pt'] = '';
+		$text['description-protected']['fr-fr'] = "# Activer cette fonctionnalité pour protéger cet objet menu par '".$text['button-restore_default']['fr-fr']."'.";
 
 		$text['label-menu_order']['en-us'] = 'Order';
 		$text['label-menu_order']['pt-pt'] = '';
+		$text['label-menu_order']['fr-fr'] = 'Ordre';
 
 		$text['description-menu_order']['en-us'] = '';
 		$text['description-menu_order']['pt-pt'] = '';
+		$text['description-menu_order']['fr-fr'] = '';
 
 		$text['label-description']['en-us'] = 'Description';
 		$text['label-description']['pt-pt'] = '';
+		$text['label-description']['fr-fr'] = 'Description';
 
 		$text['description-description']['en-us'] = 'Enter a description, if desired.';
 		$text['description-description']['pt-pt'] = '';
+		$text['description-description']['fr-fr'] = '';
 
 		$text['label-true']['en-us'] = 'True';
 		$text['label-true']['pt-pt'] = '';
+		$text['label-true']['fr-fr'] = 'Oui';
 
 		$text['label-false']['en-us'] = 'False';
 		$text['label-false']['pt-pt'] = 'falso';
+		$text['label-false']['fr-fr'] = 'Non';
 
 		$text['button-add']['en-us'] = 'Add';
 		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['fr-fr'] = 'Ajouter';
 
 		$text['button-edit']['en-us'] = 'Edit';
 		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['fr-fr'] = 'Editer';
 
 		$text['button-delete']['en-us'] = 'Delete';
 		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['fr-fr'] = 'Supprimer';
 
 		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
 		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 		$text['button-save']['en-us'] = 'Save';
 		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 		$text['button-back']['en-us'] = 'Back';
 		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['fr-fr'] = 'Retour';
 
 		$text['button-move_up']['en-us'] = 'Move Up';
 		$text['button-move_up']['pt-pt'] = '';
+		$text['button-move_up']['fr-fr'] = 'Monter';
 
 		$text['button-move_down']['en-us'] = 'Move Down';
 		$text['button-move_down']['pt-pt'] = '';
+		$text['button-move_down']['fr-fr'] = 'Descendre';
 
 		$text['message-moved_up']['en-us'] = 'Item Moved Up';
 		$text['message-moved_up']['pt-pt'] = '';
+		$text['message-moved_up']['fr-fr'] = "Monter l'objet";
 
 		$text['message-moved_down']['en-us'] = 'Item Moved Down';
 		$text['message-moved_down']['pt-pt'] = '';
+		$text['message-moved_down']['fr-fr'] = "Descendre l'objet";
 
 		$text['message-message']['en-us'] = 'Message';
 		$text['message-message']['pt-pt'] = '';
+		$text['message-message']['fr-fr'] = 'Message';
 
 		$text['message-add']['en-us'] = 'Add Completed';
 		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['fr-fr'] = 'Ajouté';
 
 		$text['message-update']['en-us'] = 'Update Completed';
 		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['fr-fr'] = 'Mis à jour';
 
 		$text['message-delete']['en-us'] = 'Delete Completed';
 		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['fr-fr'] = 'Supprimé';
 
 		$text['message-restore']['en-us'] = 'Restore Completed';
 		$text['message-restore']['pt-pt'] = '';
+		$text['message-restore']['fr-fr'] = 'Restauré';
 
 		$text['message-required']['en-us'] = 'Please provide: ';
 		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 
 ?>
diff --git a/core/upgrade/app_config.php b/core/upgrade/app_config.php
index 1c02cfdaa9..3e18439649 100644
--- a/core/upgrade/app_config.php
+++ b/core/upgrade/app_config.php
@@ -8,25 +8,25 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Upgrade the database schema.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Mise à jour du Schéma de la base de données";
+		$apps[$x]['description']['fr-fr'] = 'Mise à jour du Schéma de la base de données';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = "Atualizar o esquema de base de dados.";
+		$apps[$x]['description']['pt-pt'] = 'Atualizar o esquema de base de dados.';
 		$apps[$x]['description']['pt-br'] = '';
 
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Upgrade Schema';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "MàJ BDD";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'MàJ BDD';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Actualizar BD";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Actualizar BD';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = '8c826e92-be3c-0944-669a-24e5b915d562';
 		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
@@ -86,4 +86,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		*/
-?>
\ No newline at end of file
+?>
diff --git a/core/upgrade/app_languages.php b/core/upgrade/app_languages.php
index 28f01ba456..b8c5e284d5 100644
--- a/core/upgrade/app_languages.php
+++ b/core/upgrade/app_languages.php
@@ -3,23 +3,39 @@
 	// Upgrade Schema
 
 		$text['title-upgrade_schema']['en-us'] = 'Upgrade Schema';
+		$text['title-upgrade_schema']['fr-fr'] = 'Mise à jour du Schéma';
 
 		$text['header-database_type']['en-us'] = 'Database Type';
+		$text['header-database_type']['fr-fr'] = 'Type de base de données';
 		$text['header-message']['en-us'] = 'Message';
+		$text['header-message']['fr-fr'] = 'Message';
 
 		$text['label-sql_changes']['en-us'] = 'SQL Changes';
+		$text['label-sql_changes']['fr-fr'] = 'Modifications SQL';
 		$text['label-table']['en-us'] = 'Table';
+		$text['label-table']['fr-fr'] = 'Table';
 		$text['label-exists']['en-us'] = 'Exists';
+		$text['label-exists']['fr-fr'] = 'Existe';
 		$text['label-details']['en-us'] = 'Details';
+		$text['label-details']['fr-fr'] = 'Détails';
 		$text['label-name']['en-us'] = 'Name';
+		$text['label-name']['fr-fr'] = 'Nom';
 		$text['label-type']['en-us'] = 'Type';
+		$text['label-type']['fr-fr'] = 'Type';
 		$text['label-upgrade']['en-us'] = 'Upgrade';
+		$text['label-upgrade']['fr-fr'] = 'Mise à jour';
 		$text['label-database']['en-us'] = 'Database';
+		$text['label-database']['fr-fr'] = 'Base de Données';
 		$text['label-schema']['en-us'] = 'Schema';
+		$text['label-schema']['fr-fr'] = 'Schéma';
 		$text['label-no_change']['en-us'] = 'No Change';
+		$text['label-no_change']['fr-fr'] = 'Pas de changement';
 
 		$text['option-true']['en-us'] = 'True';
+		$text['option-true']['fr-fr'] = 'Oui';
 		$text['option-false']['en-us'] = 'False';
+		$text['option-false']['fr-fr'] = 'Non';
 
 		$text['message-upgrade']['en-us'] = 'Upgrade Completed';
+		$text['message-upgrade']['fr-fr'] = 'Mis à jour';
 ?>
diff --git a/core/user_settings/app_config.php b/core/user_settings/app_config.php
index aa888453f3..6a1994d87e 100644
--- a/core/user_settings/app_config.php
+++ b/core/user_settings/app_config.php
@@ -7,9 +7,9 @@
 		$apps[$x]['version'] = '';
 		$apps[$x]['license'] = 'Mozilla Public License 1.1';
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = "User account settings can be changed by the user.";
+		$apps[$x]['description']['en-us'] = 'User account settings can be changed by the user.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "L'usager peut modifier la configuration de son compte";
@@ -21,13 +21,13 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Account Settings';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
+		$apps[$x]['menu'][0]['title']['de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Confs du Compte";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Confs du Compte';
 		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Configurações da Conta";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Configurações da Conta';
 		$apps[$x]['menu'][0]['title']['pt-br'] = '';
 		$apps[$x]['menu'][0]['uuid'] = '4d532f0b-c206-c39d-ff33-fc67d668fb69';
 		$apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
@@ -38,14 +38,14 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'user_account_setting_view';
+		$apps[$x]['permissions'][0]['name'] = 'user_account_settings_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'user';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'user_account_setting_edit';
+		$apps[$x]['permissions'][1]['name'] = 'user_account_settings_edit';
 		$apps[$x]['permissions'][1]['groups'][] = 'user';
 		$apps[$x]['permissions'][1]['groups'][] = 'admin';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
 
-?>
\ No newline at end of file
+?>
diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php
index ef73b52605..eaa986d76f 100644
--- a/core/user_settings/app_languages.php
+++ b/core/user_settings/app_languages.php
@@ -2,129 +2,129 @@
 
 	$text['title']['en-us'] = 'Account Settings';
 	$text['title']['pt-pt'] = 'Configurações de Conta';
-	$text['title']['fr'] = 'Personalisation du compte';
+	$text['title']['fr-fr'] = 'Personalisation du compte';
 
 	$text['description']['en-us'] = 'Edit account information.';
 	$text['description']['pt-pt'] = 'Editar informações de conta.';
-	$text['description']['fr'] = 'Editer les informations du compte.';
+	$text['description']['fr-fr'] = 'Editer les informations du compte.';
 
 	$text['button-back']['en-us'] = 'Back';
 	$text['button-back']['pt-pt'] = 'Voltar';
-	$text['button-back']['fr'] = 'retour';
+	$text['button-back']['fr-fr'] = 'retour';
 
 	$text['button-save']['en-us'] = 'Save';
 	$text['button-save']['pt-pt'] = 'Guardar';
-	$text['button-save']['fr'] = 'Sauvegarder';
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 
 	$text['table-title']['en-us'] = 'User Info';
 	$text['table-title']['pt-pt'] = 'Informações de Utilizador';
-	$text['table-title']['fr'] = "Informations de l'usager";
+	$text['table-title']['fr-fr'] = "Informations de l'usager";
 
 	$text['label-username']['en-us'] = 'Username';
 	$text['label-username']['pt-pt'] = 'Nome de Utilizador';
-	$text['label-username']['fr'] = "Nom de l'utilisateur";
+	$text['label-username']['fr-fr'] = "Nom de l'utilisateur";
 
 	$text['label-password']['en-us'] = 'Password';
 	$text['label-password']['pt-pt'] = 'Palavra passe';
-	$text['label-password']['fr'] = 'Mot de passe';
+	$text['label-password']['fr-fr'] = 'Mot de passe';
 
 	$text['label-domain']['en-us'] = 'Domain';
 	$text['label-domain']['pt-pt'] = '';
-	$text['label-domain']['fr'] = 'Domaine';
+	$text['label-domain']['fr-fr'] = 'Domaine';
 
 	$text['button-login']['en-us'] = 'Login';
 	$text['button-login']['pt-pt'] = '';
-	$text['button-login']['fr'] = 'connexion';
+	$text['button-login']['fr-fr'] = 'connexion';
 
 	$text['label-confirm-password']['en-us'] = 'Confirm Password';
 	$text['label-confirm-password']['pt-pt'] = 'Confirme Palavra Chave';
-	$text['label-confirm-password']['fr'] = 'Confirmation du mot de passe';
+	$text['label-confirm-password']['fr-fr'] = 'Confirmation du mot de passe';
 
 	$text['label-extension']['en-us'] = 'Extension';
 	$text['label-extension']['pt-pt'] = 'Extensão';
-	$text['label-extension']['fr'] = 'Extension';
+	$text['label-extension']['fr-fr'] = 'Extension';
 
 	$text['table2-title']['en-us'] = 'Additional Info';
 	$text['table2-title']['pt-pt'] = 'Informações Adicionais';
-	$text['table2-title']['fr'] = 'Informations aditionnelles';
+	$text['table2-title']['fr-fr'] = 'Informations aditionnelles';
 
 	$text['label-status']['en-us'] = 'Status';
 	$text['label-status']['pt-pt'] = 'Estado';
-	$text['label-status']['fr'] = 'Etat';
+	$text['label-status']['fr-fr'] = 'Etat';
 
 	$text['description-status']['en-us'] = 'Select a the user status.';
 	$text['description-status']['pt-pt'] = 'Selecione um estado para o utilizador.';
-	$text['description-status']['fr'] = "Selection de l'état de l'usager.";
+	$text['description-status']['fr-fr'] = "Selection de l'état de l'usager.";
 
 	$text['check-available-status']['en-us'] = 'Available';
 	$text['check-available-status']['pt-pt'] = 'Disponível';
-	$text['check-available-status']['fr'] = 'Disponible';
+	$text['check-available-status']['fr-fr'] = 'Disponible';
 
 	$text['check-available-ondemand-status']['en-us'] = 'Available (On Demand)';
 	$text['check-available-ondemand-status']['pt-pt'] = 'Disponível (A pedido)';
-	$text['check-available-ondemand-status']['fr'] = 'Disponble (sur demande)';
+	$text['check-available-ondemand-status']['fr-fr'] = 'Disponble (sur demande)';
 
 	$text['check-loggedout-status']['en-us'] = 'Logged Out';
 	$text['check-loggedout-status']['pt-pt'] = 'Desligado';
-	$text['check-loggedout-status']['fr'] = 'Déconnexion';
+	$text['check-loggedout-status']['fr-fr'] = 'Déconnexion';
 
 	$text['check-onbreak-status']['en-us'] = 'On Break';
 	$text['check-onbreak-status']['pt-pt'] = 'Em Pausa';
-	$text['check-onbreak-status']['fr'] = 'En Pause';
+	$text['check-onbreak-status']['fr-fr'] = 'En Pause';
 
 	$text['check-do-not-disturb-status']['en-us'] = 'Do Not Disturb';
 	$text['check-do-not-disturb-status']['pt-pt'] = 'Não Perturbar';
-	$text['check-do-not-disturb-status']['fr'] = 'Ne pas déranger';
+	$text['check-do-not-disturb-status']['fr-fr'] = 'Ne pas déranger';
 
 	$text['label-time']['en-us'] = 'Time Zone';
 	$text['label-time']['pt-pt'] = 'Fuso Horário';
-	$text['label-time']['fr'] = 'Fuseau Horaire';
+	$text['label-time']['fr-fr'] = 'Fuseau Horaire';
 
 	$text['description-timezone']['en-us'] = 'Select the default time zone.';
 	$text['description-timezone']['pt-pt'] = 'Selecione o fuso horário padrão.';
-	$text['description-timezone']['fr'] = 'Selection du Fuseau Horaire par défaut.';
+	$text['description-timezone']['fr-fr'] = 'Selection du Fuseau Horaire par défaut.';
 
 	$text['confirm-password']['en-us'] = 'Passwords did not match.';
 	$text['confirm-password']['pt-pt'] = 'As palavras chave não coincidem.';
-	$text['confirm-password']['fr'] = 'Les mots de passe ne sont pas les mêmes.';
+	$text['confirm-password']['fr-fr'] = 'Les mots de passe ne sont pas les mêmes.';
 
 	$text['confirm-update']['en-us'] = 'Update Complete';
 	$text['confirm-update']['pt-pt'] = 'Actualização Completa';
-	$text['confirm-update']['fr'] = 'Mise à jour terminée';
+	$text['confirm-update']['fr-fr'] = 'Mise à jour terminée';
 
 	$text['title-user-settings']['en-us'] = 'User Information';
 	$text['title-user-settings']['pt-pt'] = 'Informação do Utilizador';
-	$text['title-user-settings']['fr'] = "Informations de l'usager";
+	$text['title-user-settings']['fr-fr'] = "Informations de l'usager";
 
 	$text['label-voicemail']['en-us'] = 'Voicemail';
 	$text['label-voicemail']['pt-pt'] = 'Correio de Voz';
-	$text['label-voicemail']['fr'] = 'messagerie vocale';
+	$text['label-voicemail']['fr-fr'] = 'messagerie vocale';
 
 	$text['label-view-messages']['en-us'] = 'View Messages';
 	$text['label-view-messages']['pt-pt'] = 'Ver Mensagens';
-	$text['label-view-messages']['fr'] = 'Voir les messages';
+	$text['label-view-messages']['fr-fr'] = 'Voir les messages';
 
 	$text['table-extension']['en-us'] = 'Extension';
 	$text['table-extension']['pt-pt'] = 'Extensão';
-	$text['table-extension']['fr'] = 'Extension';
+	$text['table-extension']['fr-fr'] = 'Extension';
 
 	$text['table-tools']['en-us'] = 'Tools';
 	$text['table-tools']['pt-pt'] = 'Ferramentas';
-	$text['table-tools']['fr'] = 'Outils';
+	$text['table-tools']['fr-fr'] = 'Outils';
 
 	$text['table-description']['en-us'] = 'Description';
 	$text['table-description']['pt-pt'] = 'Descrição';
-	$text['table-description']['fr'] = 'Description';
+	$text['table-description']['fr-fr'] = 'Description';
 
 	$text['label-callforward']['en-us'] = 'Call Forward';
 	$text['label-callforward']['pt-pt'] = 'Encaminhamento de Chamadas';
-	$text['label-callforward']['fr'] = "Renvoi d'appel";
+	$text['label-callforward']['fr-fr'] = "Renvoi d'appel";
 
 	$text['label-followme']['en-us'] = 'Follow Me';
 	$text['label-followme']['pt-pt'] = 'Segue-me';
-	$text['label-followme']['fr'] = 'Follow Me';
+	$text['label-followme']['fr-fr'] = 'Follow Me';
 
 	$text['label-dnd']['en-us'] = 'Do Not Disturb';
 	$text['label-dnd']['pt-pt'] = 'Não Perturbar';
-	$text['label-dnd']['fr'] = 'Ne Pas Déranger';
+	$text['label-dnd']['fr-fr'] = 'Ne Pas Déranger';
 ?>
diff --git a/core/users/app_config.php b/core/users/app_config.php
index 8d3cb9ce48..d42487a3f6 100644
--- a/core/users/app_config.php
+++ b/core/users/app_config.php
@@ -9,24 +9,24 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Add, edit, delete, and search for users.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
+		$apps[$x]['description']['de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = "Ajouter, Editer, Supprimer et Chercher des Usagers";
+		$apps[$x]['description']['fr-fr'] = 'Ajouter, Editer, Supprimer et Chercher des Usagers';
 		$apps[$x]['description']['fr-ca'] = '';
 		$apps[$x]['description']['fr-ch'] = '';
 		$apps[$x]['description']['pt-pt'] = 'Adicionar, editar, apagar e pesquisa pelos utilizadores.';
 		$apps[$x]['description']['pt-br'] = '';
 
-		$apps[$x]['menu'][2]['title']['en-us'] = "User Manager";
+		$apps[$x]['menu'][2]['title']['en-us'] = 'User Manager';
 		$apps[$x]['menu'][2]['title']['es-mx'] = '';
-		$apps[$x]['menu'][2]['title']['de-de'] = '';
+		$apps[$x]['menu'][2]['title']['de'] = '';
 		$apps[$x]['menu'][2]['title']['de-ch'] = '';
 		$apps[$x]['menu'][2]['title']['de-at'] = '';
-		$apps[$x]['menu'][2]['title']['fr-fr'] = "Gestion Usagers";
+		$apps[$x]['menu'][2]['title']['fr-fr'] = 'Gestion Usagers';
 		$apps[$x]['menu'][2]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][2]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][2]['title']['pt-pt'] = "Gestor de Utilizadores";
+		$apps[$x]['menu'][2]['title']['pt-pt'] = 'Gestor de Utilizadores';
 		$apps[$x]['menu'][2]['title']['pt-br'] = '';
 		$apps[$x]['menu'][2]['uuid'] = '0d57cc1e-1874-47b9-7ddd-fe1f57cec99b';
 		$apps[$x]['menu'][2]['parent_uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
@@ -35,15 +35,15 @@
 		$apps[$x]['menu'][2]['groups'][] = 'admin';
 		$apps[$x]['menu'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['menu'][3]['title']['en-us'] = "Group Manager";
+		$apps[$x]['menu'][3]['title']['en-us'] = 'Group Manager';
 		$apps[$x]['menu'][3]['title']['es-mx'] = '';
-		$apps[$x]['menu'][3]['title']['de-de'] = '';
+		$apps[$x]['menu'][3]['title']['de'] = '';
 		$apps[$x]['menu'][3]['title']['de-ch'] = '';
 		$apps[$x]['menu'][3]['title']['de-at'] = '';
-		$apps[$x]['menu'][3]['title']['fr-fr'] = "Gestion Groupes";
+		$apps[$x]['menu'][3]['title']['fr-fr'] = 'Gestion Groupes';
 		$apps[$x]['menu'][3]['title']['fr-ca'] = '';
 		$apps[$x]['menu'][3]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][3]['title']['pt-pt'] ="'Gestor de Grupos";
+		$apps[$x]['menu'][3]['title']['pt-pt'] = 'Gestor de Grupos';
 		$apps[$x]['menu'][3]['title']['pt-br'] = '';
 		$apps[$x]['menu'][3]['uuid'] = '3b4acc6d-827b-f537-bf21-0093d94ffec7';
 		$apps[$x]['menu'][3]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
@@ -52,101 +52,52 @@
 		$apps[$x]['menu'][3]['groups'][] = 'superadmin';
 
 	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'user_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_member_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_member_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_member_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permissions';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_user_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_user_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_user_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_user_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permission_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permission_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permission_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permission_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_setting_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_setting_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_setting_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_setting_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		$apps[$x]['permissions'][0]['name'] = 'user_view';
+		$apps[$x]['permissions'][0]['groups'][] = 'admin';
+		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][1]['name'] = 'user_add';
+		$apps[$x]['permissions'][1]['groups'][] = 'admin';
+		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][2]['name'] = 'user_edit';
+		$apps[$x]['permissions'][2]['groups'][] = 'admin';
+		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][3]['name'] = 'user_delete';
+		$apps[$x]['permissions'][3]['groups'][] = 'admin';
+		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][4]['name'] = 'group_view';
+		$apps[$x]['permissions'][4]['groups'][] = 'admin';
+		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][5]['name'] = 'group_add';
+		$apps[$x]['permissions'][5]['groups'][] = 'admin';
+		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][6]['name'] = 'group_edit';
+		$apps[$x]['permissions'][6]['groups'][] = 'admin';
+		$apps[$x]['permissions'][6]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][7]['name'] = 'group_delete';
+		$apps[$x]['permissions'][7]['groups'][] = 'admin';
+		$apps[$x]['permissions'][7]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][8]['name'] = 'group_member_view';
+		$apps[$x]['permissions'][8]['groups'][] = 'admin';
+		$apps[$x]['permissions'][8]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][9]['name'] = 'group_member_add';
+		$apps[$x]['permissions'][9]['groups'][] = 'admin';
+		$apps[$x]['permissions'][9]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][10]['name'] = 'group_member_delete';
+		$apps[$x]['permissions'][10]['groups'][] = 'admin';
+		$apps[$x]['permissions'][10]['groups'][] = 'superadmin';
+
+		$apps[$x]['permissions'][11]['name'] = 'group_permissions';
+		$apps[$x]['permissions'][11]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index
@@ -212,22 +163,16 @@
 		$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'] = 'user_enabled';
+		$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']['text'] = 'user_time_zone';
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'usertimezone';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'api_key';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_enabled';
-		$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']['text'] = 'add_user';
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_user';
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'useradduser';
@@ -276,10 +221,6 @@
 		$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'] = 'group_protected';
-		$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']['text'] = 'group_description';
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupdesc';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
@@ -436,4 +377,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_description';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-?>
\ No newline at end of file
+?>
diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index f1c5203fa2..8521ed4836 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -3,163 +3,150 @@
 	// user / group manager
 
 	$text['title-user_manager']['en-us'] = 'User Manager';
-
+	$text['title-user_manager']['fr-fr'] = "Gestion Usagers";
 	$text['title-user_add']['en-us'] = 'User Add';
-
+	$text['title-user_add']['fr-fr'] = "Ajout de l'Usager";
 	$text['title-user_edit']['en-us'] = 'User Edit';
-
+	$text['title-user_edit']['fr-fr'] = "Edition de l'Usager";
 	$text['title-group_manager']['en-us'] = 'Group Manager';
-
+	$text['title-group_manager']['fr-fr'] = 'Gestion de Groupe';
 	$text['title-group_add']['en-us'] = 'Group Add';
-
+	$text['title-group_add']['fr-fr'] = 'Ajout de Groupe';
 	$text['title-group_permissions']['en-us'] = 'Group Permissions';
-
+	$text['title-group_permissions']['fr-fr'] = 'Permissions du Groupe';
 	$text['title-group_members']['en-us'] = 'Group Members';
+	$text['title-group_members']['fr-fr'] = 'Membres du Groupe';
 
 	$text['header-user_manager']['en-us'] = 'User Manager';
-
+	$text['header-user_manager']['fr-fr'] = "Gestion Usagers";
 	$text['header-user_add']['en-us'] = 'User Add';
-
+	$text['header-user_add']['fr-fr'] = "Ajout de l'Usager";
 	$text['header-user_edit']['en-us'] = 'User Edit';
-
+	$text['header-user_edit']['fr-fr'] = "Edition de l'Usager";
 	$text['header-group_manager']['en-us'] = 'Group Manager';
-
+	$text['header-group_manager']['fr-fr'] = 'Gestion de Groupe';
 	$text['header-group_add']['en-us'] = 'Group Add';
-
+	$text['header-group_add']['fr-fr'] = 'Ajout de Groupe';
 	$text['header-group_permissions']['en-us'] = 'Group Permissions: ';
-
-	$text['header-group_members']['en-us'] = 'Group Members: ';
+	$text['header-group_permissions']['fr-fr'] = 'Permissions du Groupe';
+	$text['header-group_members']['en-us'] = 'Group Members';
+	$text['header-group_members']['fr-fr'] = 'Membres du Groupe';
 
 	$text['description-user_manager']['en-us'] = 'Add, edit, delete, and search users. ';
-
+	$text['description-user_manager']['fr-fr'] = 'Ajouter, éditer, supprimer et chercher des utilisateurs. ';
 	$text['description-user_add']['en-us'] = 'To add a user, please fill out this form completely. All fields are required. ';
-
+	$text['description-user_add']['fr-fr'] = "Afin d'ajouter des utilisateurs, remplissez complètement ce formulaire. Tous les champs sont requis. ";
 	$text['description-user_edit']['en-us'] = 'Edit user information and group membership. ';
-
+	$text['description-user_edit']['fr-fr'] = "Editer les informations de l'utilisateur et l'appartenance au groupe.";
 	$text['description-group_add']['en-us'] = 'Please choose a group name.';
-
+	$text['description-group_add']['fr-fr'] = "Choisir un nom pour le groupe."; 
 	$text['description-group_permissions']['en-us'] = 'Assign permissions for this group.';
+	$text['description-group_permissions']['fr-fr'] = "Assigner des permissions à ce groupe.";
 
 	$text['label-search_by']['en-us'] = 'Search by';
-
+	$text['label-search_by']['fr-fr'] = 'Chercher par';
 	$text['label-username']['en-us'] = 'Username';
-
+	$text['label-username']['fr-fr'] = "Nom d'Utilisateur";
 	$text['label-password']['en-us'] = 'Password';
-
+	$text['label-password']['fr-fr'] = "Mot de passe";
 	$text['label-confirm_password']['en-us'] = 'Confirm Password';
-
+	$text['label-confirm_password']['fr-fr'] = "Confirmer le mot de passe";
 	$text['label-email']['en-us'] = 'Email';
-
+	$text['label-email']['fr-fr'] = 'Courriel';
 	$text['label-first_name']['en-us'] = 'First Name';
-
+	$text['label-first_name']['fr-fr'] = "Prénom";
 	$text['label-last_name']['en-us'] = 'Last Name';
-
+	$text['label-last_name']['fr-fr'] = "Nom";
 	$text['label-company_name']['en-us'] = 'Company Name';
-
+	$text['label-company_name']['fr-fr'] = "Compagnie";
 	$text['label-user_info']['en-us'] = 'User Info';
-
+	$text['label-user_info']['fr-fr'] = "Informations sur l'utilisateur";
 	$text['label-groups']['en-us'] = 'Groups';
-
+	$text['label-groups']['fr-fr'] = 'Groupes';
 	$text['label-additional_info']['en-us'] = 'Additional Info';
-
+	$text['label-additional_info']['fr-fr'] = "Informations additionnelles";
 	$text['label-contact']['en-us'] = 'Contact';
-
+	$text['label-contact']['fr-fr'] = 'Contact';
 	$text['label-status']['en-us'] = 'Status';
-
+	$text['label-status']['fr-fr'] = 'Etat';
 	$text['label-time_zone']['en-us'] = 'Time Zone';
-
-	$text['label-api_key']['en-us'] = 'API Key';
-
+	$text['label-time_zone']['fr-fr'] = 'Fuseau Horaire';
 	$text['label-enabled']['en-us'] = 'Enabled';
-
+	$text['label-enabled']['fr-fr'] = 'Actif';
 	$text['label-group_name']['en-us'] = 'Name';
-
-	$text['label-group_check']['en-us'] = 'Protected';
-
+	$text['label-group_name']['fr-fr'] = 'Nom';
 	$text['label-group_description']['en-us'] = 'Description';
-
+	$text['label-group_description']['fr-fr'] = 'Description';
 	$text['label-group_permissions']['en-us'] = 'Permissions';
-
+	$text['label-group_permissions']['fr-fr'] = 'Permissions';
 	$text['label-group_members']['en-us'] = 'Members';
-
+	$text['label-group_members']['fr-fr'] = 'Membres';
 	$text['label-permission_permissions']['en-us'] = 'Permissions';
-
+	$text['label-permission_permissions']['fr-fr'] = 'Permissions';
 	$text['label-permission_description']['en-us'] = 'Description';
+	$text['label-permission_description']['fr-fr'] = 'Description';
 
 	$text['description-contact']['en-us'] = 'Assign a contact to this user account.';
-
+	$text['description-contact']['fr-fr'] = "Attacher un contact à ce compte utilisateur";
 	$text['description-contact_view']['en-us'] = 'View';
-
+	$text['description-contact_view']['fr-fr'] = 'Voir';
 	$text['description-status']['en-us'] = 'Set the user\'s presence.';
-
+	$text['description-status']['fr-fr'] = "Choisir l'état de présence de l'utilisateur.";
 	$text['description-time_zone']['en-us'] = 'Select the default time zone.';
-
-	$text['description-api_key']['en-us'] = 'Set the API key.';
-
+	$text['description-time_zone']['fr-fr'] = "Choisir le fuseau horaire par défaut.";
 	$text['description-enabled']['en-us'] = 'Set the status of this account.';
+	$text['description-enabled']['fr-fr'] = "Choisir le statut de ce compte.";
 
 	$text['option-true']['en-us'] = 'True';
-
+	$text['option-true']['fr-fr'] = 'Oui';
 	$text['option-false']['en-us'] = 'False';
-
+	$text['option-false']['fr-fr'] = 'Non';
 	$text['option-available']['en-us'] = 'Available';
-
+	$text['option-available']['fr-fr'] = 'Disponible';
 	$text['option-available_on_demand']['en-us'] = 'Available (On Demand)';
-
+	$text['option-available_on_demand']['fr-fr'] = "Disponible (sur demande)";
 	$text['option-logged_out']['en-us'] = 'Logged Out';
-
+	$text['option-logged_out']['fr-fr'] = 'Déconnecté';
 	$text['option-on_break']['en-us'] = 'On Break';
-
+	$text['option-on_break']['fr-fr'] = 'En Pause';
 	$text['option-do_not_disturb']['en-us'] = 'Do Not Disturb';
+	$text['option-do_not_disturb']['fr-fr'] = 'Ne pas Déranger';
 
 	$text['button-search']['en-us'] = 'Search';
-
+	$text['button-search']['fr-fr'] = 'Chercher';
 	$text['button-create_account']['en-us'] = 'Create Account';
-
+	$text['button-create_account']['fr-fr'] = 'Créé le Compte';
 	$text['button-add']['en-us'] = 'Add';
-
+	$text['button-add']['fr-fr'] = 'Ajouter';
 	$text['button-edit']['en-us'] = 'Edit';
-
+	$text['button-edit']['fr-fr'] = 'Editer';
 	$text['button-delete']['en-us'] = 'Delete';
-
+	$text['button-delete']['fr-fr'] = 'Supprimer';
 	$text['button-back']['en-us'] = 'Back';
-
+	$text['button-back']['fr-fr'] = 'Retour';
 	$text['button-save']['en-us'] = 'Save';
-
+	$text['button-save']['fr-fr'] = 'Sauvegarder';
 	$text['button-restore']['en-us'] = 'Restore Default';
-
-	$text['button-copy']['en-us'] = 'Copy';
-
+	$text['button-restore']['fr-fr'] = 'Restaurer';
 	$text['button-add_member']['en-us'] = 'Add Member';
-
-	$text['message-copy']['en-us'] = 'Copy Completed';
-	$text['message-copy']['pt-pt'] = '';
-
-	$text['message-message']['en-us'] = 'Message';
-	$text['message-message']['pt-pt'] = '';
+	$text['button-add_member']['fr-fr'] = 'Ajouter un Membre';
 
 	$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
-	$text['confirm-delete']['pt-pt'] = '';
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 	$text['message-add']['en-us'] = 'Add Completed';
-	$text['message-add']['pt-pt'] = '';
-
+	$text['message-add']['fr-fr'] = 'Ajouté';
 	$text['message-update']['en-us'] = 'Update Completed';
-	$text['message-update']['pt-pt'] = '';
-
+	$text['message-update']['fr-fr'] = 'Mis à Jour';
 	$text['message-delete']['en-us'] = 'Delete Completed';
-	$text['message-delete']['pt-pt'] = '';
-
+	$text['message-delete']['fr-fr'] = 'Supprimé';
 	$text['message-restore']['en-us'] = 'Restore Completed';
-	$text['message-restore']['pt-pt'] = '';
-
+	$text['message-restore']['fr-fr'] = 'Restauré';
 	$text['message-required']['en-us'] = 'Please provide: ';
-	$text['message-required']['pt-pt'] = '';
-
+	$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
 	$text['message-password_blank']['en-us'] = 'Password cannot be blank.';
-	$text['message-password_blank']['pt-pt'] = '';
-
+	$text['message-password_blank']['fr-fr'] = "Le mot de passe ne peut pas être vide.";
 	$text['message-password_mismatch']['en-us'] = 'Passwords did not match.';
-	$text['message-password_mismatch']['pt-pt'] = '';
+	$text['message-password_mismatch']['fr-fr'] = "les mots de passe ne correspondent pas";
 
-?>
\ No newline at end of file
+?>