diff --git a/app/call_broadcast/app_languages.php b/app/call_broadcast/app_languages.php
index 7d30fe3a44..4218b7a959 100644
--- a/app/call_broadcast/app_languages.php
+++ b/app/call_broadcast/app_languages.php
@@ -97,7 +97,7 @@
 
 	$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-fr'] = "Optionnel, 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'] = "Optionnél, 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";
diff --git a/app/call_center_active/app_languages.php b/app/call_center_active/app_languages.php
index a7418b0143..a321778138 100644
--- a/app/call_center_active/app_languages.php
+++ b/app/call_center_active/app_languages.php
@@ -1,101 +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?";
-
-?>
+<?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?";
+
+?>
diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php
index 4eb21bacc4..841f6e5961 100644
--- a/app/conference_centers/app_languages.php
+++ b/app/conference_centers/app_languages.php
@@ -15,7 +15,7 @@
 
 		$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-fr'] = "Utilisé pour configurer une ou plusieures salles de conférence avec un nom, un numéro, une longueur 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'] = "";
diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php
index 106f9f8040..1d8fede168 100644
--- a/app/contacts/app_languages.php
+++ b/app/contacts/app_languages.php
@@ -1,479 +1,479 @@
-<?php
-
-	// Contacts
-
-		$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 de personnes 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";
-
-	// contact
-
-		$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";
-
-
-
-	// contact phones
-
-		$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";
-
-
-
-	// contact notes
-
-		$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'] = "";
-
-
-
-	// contact import
-
-		$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:";
-
-
-
-	// general labels
-
-		$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: ";
-
-
-
-
-?>
+<?php
+
+	// Contacts
+
+		$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";
+
+	// contact
+
+		$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";
+
+
+
+	// contact phones
+
+		$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";
+
+
+
+	// contact notes
+
+		$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'] = "";
+
+
+
+	// contact import
+
+		$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:";
+
+
+
+	// general labels
+
+		$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: ";
+
+
+
+
+?>
diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index 31f13b6a56..b5f1a65555 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -185,7 +185,7 @@
 
 		$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 nombre de ligne à assigner à cette extension.";
+		$text['description-provisioning']['fr-fr'] = "Choisir un équipement et un nombre de lignes a assigner à cette extension.";
 
 		$text['label-vm_enabled']['en-us'] = "Voicemail Enabled";
 		$text['label-vm_enabled']['pt-pt'] = "";
@@ -273,7 +273,7 @@
 
 		$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/masque ";
+		$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'] = "";
@@ -281,7 +281,7 @@
 
 		$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/masque";
+		$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'] = "";
@@ -325,11 +325,11 @@
 
 		$text['label-dial_string']['en-us'] = "Dial String";
 		$text['label-dial_string']['pt-pt'] = "";
-		$text['label-dial_string']['fr-fr'] = "Numéro d'appel";
+		$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'] = "Localisation de l'équipement.";
+		$text['description-dial_string']['fr-fr'] = "Location of the endpoint.";
 
 		$text['label-enabled']['en-us'] = "Enabled";
 		$text['label-enabled']['pt-pt'] = "";
diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index a6bed15c1b..197744f352 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -84,7 +84,7 @@
 	$text['confirm-add']['fr-fr'] = "Ajouté";
 
 	$text['confirm-update']['en-us'] = "Update Complete";
-	$text['confirm-update']['pt-pt'] = "Actualização Completa";        
+	$text['confirm-update']['pt-pt'] = "Actualização Completa";
 	$text['confirm-update']['fr-fr'] = "Mis à jour";
 
 	$text['confirm-ext']['en-us'] = "Please provide: Extension";
@@ -100,7 +100,7 @@
 	$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']['pt-pt'] = "Edição de Fax";
 	$text['confirm-fax-edit']['fr-fr'] = "Editer le Fax";
 
 	$text['confirm-copy-info']['en-us'] = "Do you really want to copy this?";
diff --git a/app/fifo/app_languages.php b/app/fifo/app_languages.php
index 6ae769e7ff..868209bb41 100644
--- a/app/fifo/app_languages.php
+++ b/app/fifo/app_languages.php
@@ -1,124 +1,124 @@
-<?php
-
-	// 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-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: ";
-
-?>
+<?php
+
+	// 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-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: ";
+
+?>
diff --git a/app/fifo_list/app_languages.php b/app/fifo_list/app_languages.php
index 786f964a15..b3fb02a222 100644
--- a/app/fifo_list/app_languages.php
+++ b/app/fifo_list/app_languages.php
@@ -1,49 +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";
-
-?>
+<?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";
+
+?>
diff --git a/app/follow_me/app_config.php b/app/follow_me/app_config.php
index 92a19d13ea..11a9b2720e 100644
--- a/app/follow_me/app_config.php
+++ b/app/follow_me/app_config.php
@@ -24,7 +24,7 @@
 		$apps[$x]['menu'][0]['title']['de-de'] = "";
 		$apps[$x]['menu'][0]['title']['de-ch'] = "";
 		$apps[$x]['menu'][0]['title']['de-at'] = "";
-		$apps[$x]['menu'][0]['title']['fr-fr'] = "Follow Me";
+		$apps[$x]['menu'][0]['title']['fr-fr'] = "Suis-moi";
 		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
 		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
 		$apps[$x]['menu'][0]['title']['pt-pt'] = "";
diff --git a/app/hot_desking/app_languages.php b/app/hot_desking/app_languages.php
index c77f2e1e8d..f6e3b59338 100644
--- a/app/hot_desking/app_languages.php
+++ b/app/hot_desking/app_languages.php
@@ -1,66 +1,66 @@
-<?php
-
-	//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.";
-		$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.";
-?>
+<?php
+
+	//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.";
+		$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/login/app_config.php b/app/login/app_config.php
index 21f526f09b..9603b87ce8 100644
--- a/app/login/app_config.php
+++ b/app/login/app_config.php
@@ -1,57 +1,57 @@
-<?php
-	//application details
-		$apps[$x]['name'] = "Login";
-		$apps[$x]['uuid'] = "c9715076-dfdb-4f41-ab9f-a93f01bd6403";
-		$apps[$x]['category'] = "Core";
-		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "";
-		$apps[$x]['license'] = "Mozilla Public License 1.1";
-		$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-ch'] = "";
-		$apps[$x]['description']['de-at'] = "";
-		$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'] = "";
-		$apps[$x]['description']['pt-br'] = "";
-
-	//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-ch'] = "";
-		$apps[$x]['menu'][0]['title']['de-at'] = "";
-		$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";
-		$apps[$x]['menu'][0]['title']['pt-br'] = "";
-		$apps[$x]['menu'][0]['uuid'] = "c85bf816-b88d-40fa-8634-11b456928afa";
-		$apps[$x]['menu'][0]['parent_uuid'] = "";
-		$apps[$x]['menu'][0]['category'] = "internal";
-		$apps[$x]['menu'][0]['path'] = "/login.php";
-		$apps[$x]['menu'][0]['groups'][] = "public";
-		$apps[$x]['menu'][0]['order'] = "99";
-
-		$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-ch'] = "";
-		$apps[$x]['menu'][1]['title']['de-at'] = "";
-		$apps[$x]['menu'][1]['title']['fr-fr'] = "Déconnexion";
-		$apps[$x]['menu'][1]['title']['fr-ca'] = "";
-		$apps[$x]['menu'][1]['title']['fr-ch'] = "";
-		$apps[$x]['menu'][1]['title']['pt-pt'] = "Sair";
-		$apps[$x]['menu'][1]['title']['pt-br'] = "";
-		$apps[$x]['menu'][1]['uuid'] = "0d29e9f4-0c9b-9d8d-cd2d-454899dc9bc4";
-		$apps[$x]['menu'][1]['parent_uuid'] = "02194288-6d56-6d3e-0b1a-d53a2bc10788";
-		$apps[$x]['menu'][1]['category'] = "internal";
-		$apps[$x]['menu'][1]['path'] = "/logout.php";
-		$apps[$x]['menu'][1]['groups'][] = "user";
-		$apps[$x]['menu'][1]['groups'][] = "admin";
-		$apps[$x]['menu'][1]['groups'][] = "superadmin";
-
-?>
+<?php
+	//application details
+		$apps[$x]['name'] = "Login";
+		$apps[$x]['uuid'] = "c9715076-dfdb-4f41-ab9f-a93f01bd6403";
+		$apps[$x]['category'] = "Core";
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "";
+		$apps[$x]['license'] = "Mozilla Public License 1.1";
+		$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-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
+		$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'] = "";
+		$apps[$x]['description']['pt-br'] = "";
+
+	//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-ch'] = "";
+		$apps[$x]['menu'][0]['title']['de-at'] = "";
+		$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";
+		$apps[$x]['menu'][0]['title']['pt-br'] = "";
+		$apps[$x]['menu'][0]['uuid'] = "c85bf816-b88d-40fa-8634-11b456928afa";
+		$apps[$x]['menu'][0]['parent_uuid'] = "";
+		$apps[$x]['menu'][0]['category'] = "internal";
+		$apps[$x]['menu'][0]['path'] = "/login.php";
+		$apps[$x]['menu'][0]['groups'][] = "public";
+		$apps[$x]['menu'][0]['order'] = "99";
+
+		$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-ch'] = "";
+		$apps[$x]['menu'][1]['title']['de-at'] = "";
+		$apps[$x]['menu'][1]['title']['fr-fr'] = "Déconnexion";
+		$apps[$x]['menu'][1]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][1]['title']['fr-ch'] = "";
+		$apps[$x]['menu'][1]['title']['pt-pt'] = "Sair";
+		$apps[$x]['menu'][1]['title']['pt-br'] = "";
+		$apps[$x]['menu'][1]['uuid'] = "0d29e9f4-0c9b-9d8d-cd2d-454899dc9bc4";
+		$apps[$x]['menu'][1]['parent_uuid'] = "02194288-6d56-6d3e-0b1a-d53a2bc10788";
+		$apps[$x]['menu'][1]['category'] = "internal";
+		$apps[$x]['menu'][1]['path'] = "/logout.php";
+		$apps[$x]['menu'][1]['groups'][] = "user";
+		$apps[$x]['menu'][1]['groups'][] = "admin";
+		$apps[$x]['menu'][1]['groups'][] = "superadmin";
+
+?>
diff --git a/app/schemas/app_languages.php b/app/schemas/app_languages.php
index 311d1d4361..1aaae74f7a 100644
--- a/app/schemas/app_languages.php
+++ b/app/schemas/app_languages.php
@@ -1,227 +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: ";
-$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
-?>
+<?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: ";
+$text['message-required']['fr-fr'] = "Merci d'indiquer: ";
+?>
diff --git a/app/settings/app_languages.php b/app/settings/app_languages.php
index 7d09ee4e09..df069841ca 100644
--- a/app/settings/app_languages.php
+++ b/app/settings/app_languages.php
@@ -63,7 +63,7 @@
 	$text['label-shout-decoder']['en-us'] = "Mod Shout Decoder:";
 	$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-fr'] = "Type de Décodeur. 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-fr'] = "Mod Shout Volume:";
 	$text['description-shout-volume']['en-us'] = "Enter Mod Shout Volume.";
diff --git a/app/sip_profiles/app_languages.php b/app/sip_profiles/app_languages.php
index c95c7c450b..5943a59325 100644
--- a/app/sip_profiles/app_languages.php
+++ b/app/sip_profiles/app_languages.php
@@ -1,86 +1,86 @@
-<?php
-
-	//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: ";
-
-?>
+<?php
+
+	//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: ";
+
+?>
diff --git a/app/sql_query/app_languages.php b/app/sql_query/app_languages.php
index 1eacf2bce2..84a0d7d1fa 100644
--- a/app/sql_query/app_languages.php
+++ b/app/sql_query/app_languages.php
@@ -1,56 +1,56 @@
-<?php
-
-	//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";
-		$text['button-manage']['fr-fr'] = "Gérer";
-?>
+<?php
+
+	//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";
+		$text['button-manage']['fr-fr'] = "Gérer";
+?>
diff --git a/app/time_conditions/app_languages.php b/app/time_conditions/app_languages.php
index e7802aed7e..718f220f7b 100644
--- a/app/time_conditions/app_languages.php
+++ b/app/time_conditions/app_languages.php
@@ -3,14 +3,14 @@
 	$text['title-time-condition-add']['en-us'] = "Time Conditions";
 	$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-fr'] = "Configurer l'acheminement d'appel 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-fr'] = "Retour";
 
 	$text['label-name']['en-us'] = "Name";
 	$text['label-name']['fr-fr'] = "Nom";
-	$text['description-name']['en-us'] = "Enter the name for the time condition."; 
+	$text['description-name']['en-us'] = "Enter the name for the time condition.";
 	$text['description-name']['fr-fr'] = "Choisir un nom pour cette condition temporelle.";
 
 	$text['label-extension']['en-us'] = "Extension";
@@ -30,7 +30,7 @@
 	$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-fr'] = "Heures de Bureau Lun-Ven 9h-18h";
-	
+
 	$text['label-optgroup-us-holidays']['en-us'] = "US Holidays";
 	$text['label-optgroup-us-holidays']['fr-fr'] = "Vacances US";
 	$text['label-option-us-holidays-new-year']['en-us'] = "New Year\'s Day";
@@ -51,8 +51,8 @@
 	$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-fr'] = "Thanksgiving";
-	$text['label-option-us-holidays-christmas']['en-us'] = "Christmas";	
-	$text['label-option-us-holidays-christmas']['fr-fr'] = "Noël";	
+	$text['label-option-us-holidays-christmas']['en-us'] = "Christmas";
+	$text['label-option-us-holidays-christmas']['fr-fr'] = "Noël";
 //end: TemplateOptions
 
 	$text['label-day-of-month']['en-us'] = "Day of Month";
diff --git a/app/vars/app_languages.php b/app/vars/app_languages.php
index e05178f470..46d8ac16d9 100644
--- a/app/vars/app_languages.php
+++ b/app/vars/app_languages.php
@@ -23,7 +23,7 @@
 	$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['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";
diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index b7427895a2..e949fdc668 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -59,8 +59,8 @@
 	//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]['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";
@@ -69,14 +69,14 @@
 		$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"; 		
+		$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"; 		
+		$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";		
+		$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";
diff --git a/app/xmpp/app_config.php b/app/xmpp/app_config.php
index 03cf75fd52..ea7b5244ee 100644
--- a/app/xmpp/app_config.php
+++ b/app/xmpp/app_config.php
@@ -84,80 +84,80 @@
 		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "profile_name";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "username";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "password";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "dialplan";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "context";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "rtp_ip";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "ext_rtp_ip";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "auto_login";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "sasl_type";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "xmpp_server";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "tls_enable";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "use_rtp_timer";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "usr_rtp_timer";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "default_exten";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "vad";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "in/out/both";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "avatar";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "example: /path/to/tiny.jpg";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "candidate_acl";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "local_network_acl";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "enabled";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$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'] = "description";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; 
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 ?>