Эх сурвалжийг харах

added missing french translations and changed fr to fr-fr in all app_languages.php and app_config.php files.

Philippe Rioual 12 жил өмнө
parent
commit
6a0ddd3988

+ 4 - 4
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++;
 
-?>
+?>

+ 22 - 1
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é';
 
-?>
+?>

+ 18 - 19
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++;
-?>
+?>

+ 39 - 1
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: ";
 
-?>
+?>

+ 5 - 5
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'] = '';
-?>
+?>

+ 37 - 2
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: ";
 
-?>
+?>

+ 5 - 5
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'] = '';
-?>
+?>

+ 49 - 1
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: ";
 
-?>
+?>

+ 54 - 95
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'] = '';
 
-?>
+?>

+ 60 - 0
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: ";
 
 ?>

+ 7 - 7
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'] = '';
 		*/
-?>
+?>

+ 16 - 0
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';
 ?>

+ 8 - 8
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';
 
-?>
+?>

+ 32 - 32
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';
 ?>

+ 61 - 120
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,21 +163,15 @@
 		$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]['name'] = 'user_enabled';
 		$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]['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']['text'] = 'add_user';
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_user';
@@ -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'] = '';
-?>
+?>

+ 71 - 84
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";
 
-?>
+?>