Update to Contacts version 2.0

app_config.php

@@ -5,7 +5,7 @@
 		$apps[$x]['uuid'] = "04481e0e-a478-c559-adad-52bd4174574c";
 		$apps[$x]['category'] = "CRM";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.1";
+		$apps[$x]['version'] = "2.0";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['contact_url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Provides a place to store contact information for individuals and organizations.";
@@ -48,10 +48,17 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "contact_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "contact_upload";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "contact_domain_view";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "contact_address_view";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -455,6 +462,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "contact_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_label";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Custom label for the number";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_type_voice";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for voice calls.";
@@ -471,13 +482,13 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for text messages.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_label";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_speed_dial";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Custom label for the number";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the speed dial.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_primary";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_country_code";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Designate a primary number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the country code.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_number";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
@@ -487,10 +498,11 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the extension.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_speed_dial";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the speed dial.";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_primary";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Designate a primary number.";
 		$z++;
+		
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_description";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
@@ -855,11 +867,15 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "user_uuid";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "time_start";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "timestamp";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "timestamptz";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "date";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "timestamp";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Start";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "time_stop";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "timestamp";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "timestamptz";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "date";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "timestamp";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Stop";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "time_description";
@@ -925,7 +941,6 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_users';
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'user_uuid';
 
-
 	//default settings
 		$y=0;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "38a67445-577d-483d-a176-09549cfdaa69";
@@ -936,5 +951,12 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Define the allowed file attachment extensions and their mime types in a JSON array.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d8998b7f-c27c-43ac-ad1b-a9c66187bb10";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "contact";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "permissions";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 
 ?>

app_defaults.php

@@ -87,7 +87,7 @@ if ($domains_processed == 1) {
 					$database = new database;
 					$database->app_name = 'contacts';
 					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
-					$database->save($array);
+					$database->save($array, false);
 					unset($array);
 
 					$p->delete('contact_email_add', 'temp');
@@ -148,7 +148,7 @@ if ($domains_processed == 1) {
 					$database = new database;
 					$database->app_name = 'contacts';
 					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
-					$database->save($array);
+					$database->save($array, false);
 					unset($array);
 
 					$p->delete('contact_url_add', 'temp');
@@ -213,7 +213,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'contacts';
 				$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 
 				$array['contact_groups'][0]['contact_group_uuid'] = $row["contact_group_uuid"];
@@ -233,4 +233,4 @@ if ($domains_processed == 1) {
 
 }
 
-?>
+?>

app_languages.php

@@ -32,7 +32,7 @@ $text['title-contacts_import']['de-de'] = "Kontakte importieren";
 $text['title-contacts_import']['el-gr'] = "Εισαγωγή Επαφών";
 $text['title-contacts_import']['es-cl'] = "Importar Contactos";
 $text['title-contacts_import']['es-mx'] = "Importar Contactos"; //copied from es-cl
-$text['title-contacts_import']['fr-ca'] = "Importe des Contacts"; //copied from fr-fr
+$text['title-contacts_import']['fr-ca'] = "Importer Contacts";
 $text['title-contacts_import']['fr-fr'] = "Importe des Contacts";
 $text['title-contacts_import']['he-il'] = "ייבא אנשי קשר";
 $text['title-contacts_import']['it-it'] = "Importa Contatti";
@@ -76,8 +76,8 @@ $text['title-contact_properties']['de-de'] = "Contact Properties";
 $text['title-contact_properties']['el-gr'] = "Contact Properties";
 $text['title-contact_properties']['es-cl'] = "Contact Properties";
 $text['title-contact_properties']['es-mx'] = "Contact Properties";
-$text['title-contact_properties']['fr-ca'] = "Contact Properties";
-$text['title-contact_properties']['fr-fr'] = "Contact Properties";
+$text['title-contact_properties']['fr-ca'] = "Propriétés de Contact";
+$text['title-contact_properties']['fr-fr'] = "Propriétés de Contact";
 $text['title-contact_properties']['he-il'] = "Contact Properties";
 $text['title-contact_properties']['it-it'] = "Contact Properties";
 $text['title-contact_properties']['nl-nl'] = "Contact Properties";
@@ -98,7 +98,7 @@ $text['title-contact_email-edit']['de-de'] = "Email des Kontakts bearbeiten";
 $text['title-contact_email-edit']['el-gr'] = "Επεξεργασία e-mail επαφής";
 $text['title-contact_email-edit']['es-cl'] = "Correo electrónico de contacto Editar";
 $text['title-contact_email-edit']['es-mx'] = "Correo electrónico de contacto Editar"; //copied from es-cl
-$text['title-contact_email-edit']['fr-ca'] = "Contact Courriel Modifier"; //copied from fr-fr
+$text['title-contact_email-edit']['fr-ca'] = "Courriel de Contact Modifier";
 $text['title-contact_email-edit']['fr-fr'] = "Contact Courriel Modifier";
 $text['title-contact_email-edit']['he-il'] = "";
 $text['title-contact_email-edit']['it-it'] = "Modifica Email Contatto";
@@ -120,7 +120,7 @@ $text['title-contact_email-add']['de-de'] = "Email zum Kontakt hinzufügen";
 $text['title-contact_email-add']['el-gr'] = "Προσθήκη e-mail επαφής";
 $text['title-contact_email-add']['es-cl'] = "Correo electrónico de contacto Agregar";
 $text['title-contact_email-add']['es-mx'] = "Correo electrónico de contacto Agregar"; //copied from es-cl
-$text['title-contact_email-add']['fr-ca'] = "Contactez-mail Ajouter"; //copied from fr-fr
+$text['title-contact_email-add']['fr-ca'] = "Courriel de Contact Ajouter";
 $text['title-contact_email-add']['fr-fr'] = "Contactez-mail Ajouter";
 $text['title-contact_email-add']['he-il'] = "";
 $text['title-contact_email-add']['it-it'] = "Inserisci Email Contatto";
@@ -142,7 +142,7 @@ $text['title-contact_url-edit']['de-de'] = "URL bearbeiten";
 $text['title-contact_url-edit']['el-gr'] = "Επεξεργασία συνδέσμου URL επαφής";
 $text['title-contact_url-edit']['es-cl'] = "Correo electrónico de contacto Editar";
 $text['title-contact_url-edit']['es-mx'] = "Correo electrónico de contacto Editar"; //copied from es-cl
-$text['title-contact_url-edit']['fr-ca'] = "Contact Courriel Modifier"; //copied from fr-fr
+$text['title-contact_url-edit']['fr-ca'] = "URL de Contact Modifier";
 $text['title-contact_url-edit']['fr-fr'] = "Contact Courriel Modifier";
 $text['title-contact_url-edit']['he-il'] = "";
 $text['title-contact_url-edit']['it-it'] = "Modifica URL Contatto";
@@ -164,7 +164,7 @@ $text['title-contact_url-add']['de-de'] = "URL hinzufügen";
 $text['title-contact_url-add']['el-gr'] = "Προσθήκη συνδέσμου URL επαφής";
 $text['title-contact_url-add']['es-cl'] = "Correo electrónico de contacto Agregar";
 $text['title-contact_url-add']['es-mx'] = "Correo electrónico de contacto Agregar"; //copied from es-cl
-$text['title-contact_url-add']['fr-ca'] = "Contactez-mail Ajouter"; //copied from fr-fr
+$text['title-contact_url-add']['fr-ca'] = "URL de Contact Ajouter";
 $text['title-contact_url-add']['fr-fr'] = "Contactez-mail Ajouter";
 $text['title-contact_url-add']['he-il'] = "";
 $text['title-contact_url-add']['it-it'] = "Inserisci URL Contatto";
@@ -274,7 +274,7 @@ $text['title-contact_relation']['de-de'] = "Beziehung";
 $text['title-contact_relation']['el-gr'] = "Συσχετίσεις Επαφών";
 $text['title-contact_relation']['es-cl'] = "Contacto Relación";
 $text['title-contact_relation']['es-mx'] = "Contacto Relación"; //copied from es-cl
-$text['title-contact_relation']['fr-ca'] = "Contactez Relation"; //copied from fr-fr
+$text['title-contact_relation']['fr-ca'] = "Relation de Contact";
 $text['title-contact_relation']['fr-fr'] = "Contactez Relation";
 $text['title-contact_relation']['he-il'] = "";
 $text['title-contact_relation']['it-it'] = "Relazioni Contatto";
@@ -296,7 +296,7 @@ $text['title-contact_phones-edit']['de-de'] = "Nummer bearbeiten";
 $text['title-contact_phones-edit']['el-gr'] = "Επεξεργασία Αριθμού Επαφής";
 $text['title-contact_phones-edit']['es-cl'] = "Editar Número de Contacto";
 $text['title-contact_phones-edit']['es-mx'] = "Editar Número de Contacto"; //copied from es-cl
-$text['title-contact_phones-edit']['fr-ca'] = "Editer le téléphone du Contact"; //copied from fr-fr
+$text['title-contact_phones-edit']['fr-ca'] = "Numéro de Contact Modifier";
 $text['title-contact_phones-edit']['fr-fr'] = "Editer le téléphone du Contact";
 $text['title-contact_phones-edit']['he-il'] = "";
 $text['title-contact_phones-edit']['it-it'] = "Modifica Numero Contatto";
@@ -318,7 +318,7 @@ $text['title-contact_phones-add']['de-de'] = "Nummer hinzufügen";
 $text['title-contact_phones-add']['el-gr'] = "Προσθήκη Αριθμού Επαφής";
 $text['title-contact_phones-add']['es-cl'] = "Agregar Número de Contacto";
 $text['title-contact_phones-add']['es-mx'] = "Agregar Número de Contacto"; //copied from es-cl
-$text['title-contact_phones-add']['fr-ca'] = "Ajouter un téléphone au Contact"; //copied from fr-fr
+$text['title-contact_phones-add']['fr-ca'] = "Numéro de Contact Ajouter";
 $text['title-contact_phones-add']['fr-fr'] = "Ajouter un téléphone au Contact";
 $text['title-contact_phones-add']['he-il'] = "";
 $text['title-contact_phones-add']['it-it'] = "Inserire Numero Contatto";
@@ -340,7 +340,7 @@ $text['title-contact_notes-edit']['de-de'] = "Notiz bearbeiten";
 $text['title-contact_notes-edit']['el-gr'] = "Επεξεργασία Σημείωσης Επαφής";
 $text['title-contact_notes-edit']['es-cl'] = "Editar Nota de Contactos";
 $text['title-contact_notes-edit']['es-mx'] = "Editar Nota de Contactos"; //copied from es-cl
-$text['title-contact_notes-edit']['fr-ca'] = "Editer la note du contact"; //copied from fr-fr
+$text['title-contact_notes-edit']['fr-ca'] = "Note du Contact Modifier";
 $text['title-contact_notes-edit']['fr-fr'] = "Editer la note du contact";
 $text['title-contact_notes-edit']['he-il'] = "";
 $text['title-contact_notes-edit']['it-it'] = "Modifica Note Contatto";
@@ -384,7 +384,7 @@ $text['title-contact_addresses-edit']['de-de'] = "Adresse bearbeiten";
 $text['title-contact_addresses-edit']['el-gr'] = "Επεξεργασία Διεύθυνσης Επαφής";
 $text['title-contact_addresses-edit']['es-cl'] = "Editar Dirección de Contacto";
 $text['title-contact_addresses-edit']['es-mx'] = "Editar Dirección de Contacto"; //copied from es-cl
-$text['title-contact_addresses-edit']['fr-ca'] = "Editer l'adresse du contact"; //copied from fr-fr
+$text['title-contact_addresses-edit']['fr-ca'] = "Modifier l'adresse du contact";
 $text['title-contact_addresses-edit']['fr-fr'] = "Editer l'adresse du contact";
 $text['title-contact_addresses-edit']['he-il'] = "";
 $text['title-contact_addresses-edit']['it-it'] = "Modifica Indirizzo Contatto";
@@ -428,8 +428,8 @@ $text['title-contact_attachment-edit']['de-de'] = "";
 $text['title-contact_attachment-edit']['el-gr'] = "Επεξεργασία Επισύναψης Επαφής";
 $text['title-contact_attachment-edit']['es-cl'] = "";
 $text['title-contact_attachment-edit']['es-mx'] = "";
-$text['title-contact_attachment-edit']['fr-ca'] = "";
-$text['title-contact_attachment-edit']['fr-fr'] = "";
+$text['title-contact_attachment-edit']['fr-ca'] = "Pièce jointe de Contact Modifier";
+$text['title-contact_attachment-edit']['fr-fr'] = "Pièce jointe de Contact Modifier";
 $text['title-contact_attachment-edit']['he-il'] = "";
 $text['title-contact_attachment-edit']['it-it'] = "";
 $text['title-contact_attachment-edit']['nl-nl'] = "Kontact aanhangsel bewerken";
@@ -450,8 +450,8 @@ $text['title-contact_attachment-add']['de-de'] = "";
 $text['title-contact_attachment-add']['el-gr'] = "Προσθήκη Επισύναψης Επαφής";
 $text['title-contact_attachment-add']['es-cl'] = "";
 $text['title-contact_attachment-add']['es-mx'] = "";
-$text['title-contact_attachment-add']['fr-ca'] = "";
-$text['title-contact_attachment-add']['fr-fr'] = "";
+$text['title-contact_attachment-add']['fr-ca'] = "Pièce jointe de Contact Ajouter";
+$text['title-contact_attachment-add']['fr-fr'] = "Pièce jointe de Contact Ajouter";
 $text['title-contact_attachment-add']['he-il'] = "";
 $text['title-contact_attachment-add']['it-it'] = "";
 $text['title-contact_attachment-add']['nl-nl'] = "Kontact aanhangsel toevoegen";
@@ -516,7 +516,7 @@ $text['option-work']['de-de'] = "Arbeit";
 $text['option-work']['el-gr'] = "Εργασία";
 $text['option-work']['es-cl'] = "Lugar de Trabajo";
 $text['option-work']['es-mx'] = "Lugar de Trabajo"; //copied from es-cl
-$text['option-work']['fr-ca'] = "En Milieu de Travail"; //copied from fr-fr
+$text['option-work']['fr-ca'] = "Travail";
 $text['option-work']['fr-fr'] = "En Milieu de Travail";
 $text['option-work']['he-il'] = "עבודה";
 $text['option-work']['it-it'] = "Lavoro";
@@ -560,7 +560,7 @@ $text['option-true']['de-de'] = "Ein";
 $text['option-true']['el-gr'] = "Ναι";
 $text['option-true']['es-cl'] = "Verdadero";
 $text['option-true']['es-mx'] = "Verdadero"; //copied from es-cl
-$text['option-true']['fr-ca'] = "Oui"; //copied from fr-fr
+$text['option-true']['fr-ca'] = "vrai";
 $text['option-true']['fr-fr'] = "Oui";
 $text['option-true']['he-il'] = "חוקי";
 $text['option-true']['it-it'] = "Vero";
@@ -846,8 +846,8 @@ $text['option-intl']['de-de'] = "International";
 $text['option-intl']['el-gr'] = "Διεθνής";
 $text['option-intl']['es-cl'] = "Internacional";
 $text['option-intl']['es-mx'] = "Internacional"; //copied from es-cl
-$text['option-intl']['fr-ca'] = "international"; //copied from fr-fr
-$text['option-intl']['fr-fr'] = "international";
+$text['option-intl']['fr-ca'] = "International"; //copied from fr-fr
+$text['option-intl']['fr-fr'] = "International";
 $text['option-intl']['he-il'] = "בילאומי";
 $text['option-intl']['it-it'] = "Internazionale";
 $text['option-intl']['nl-nl'] = "Internationaal";
@@ -912,7 +912,7 @@ $text['option-home']['de-de'] = "Privat";
 $text['option-home']['el-gr'] = "Αρχική";
 $text['option-home']['es-cl'] = "Casa";
 $text['option-home']['es-mx'] = "Casa"; //copied from es-cl
-$text['option-home']['fr-ca'] = "Maison"; //copied from fr-fr
+$text['option-home']['fr-ca'] = "Domicile";
 $text['option-home']['fr-fr'] = "Maison";
 $text['option-home']['he-il'] = "בית";
 $text['option-home']['it-it'] = "Casa";
@@ -956,7 +956,7 @@ $text['option-false']['de-de'] = "Aus";
 $text['option-false']['el-gr'] = "Όχι";
 $text['option-false']['es-cl'] = "Falso";
 $text['option-false']['es-mx'] = "Falso"; //copied from es-cl
-$text['option-false']['fr-ca'] = "Non"; //copied from fr-fr
+$text['option-false']['fr-ca'] = "Faux";
 $text['option-false']['fr-fr'] = "Non";
 $text['option-false']['he-il'] = "לא חוקי";
 $text['option-false']['it-it'] = "Falso";
@@ -1616,7 +1616,7 @@ $text['label-url_address']['de-de'] = "Adresse";
 $text['label-url_address']['el-gr'] = "Διεύθυνση";
 $text['label-url_address']['es-cl'] = "Calle";
 $text['label-url_address']['es-mx'] = "Calle"; //copied from es-cl
-$text['label-url_address']['fr-ca'] = "Rue"; //copied from fr-fr
+$text['label-url_address']['fr-ca'] = "Adresse";
 $text['label-url_address']['fr-fr'] = "Rue";
 $text['label-url_address']['he-il'] = "כתובת";
 $text['label-url_address']['it-it'] = "Indirizzo";
@@ -1638,7 +1638,7 @@ $text['label-true']['de-de'] = "Ein";
 $text['label-true']['el-gr'] = "Ναι";
 $text['label-true']['es-cl'] = "Verdadero";
 $text['label-true']['es-mx'] = "Verdadero"; //copied from es-cl
-$text['label-true']['fr-ca'] = "Oui"; //copied from fr-fr
+$text['label-true']['fr-ca'] = "Vrai";
 $text['label-true']['fr-fr'] = "Oui";
 $text['label-true']['he-il'] = "חיובי";
 $text['label-true']['it-it'] = "Vero";
@@ -1682,7 +1682,7 @@ $text['label-time_timer']['de-de'] = "Timer";
 $text['label-time_timer']['el-gr'] = "Χρονοδιακόπτης";
 $text['label-time_timer']['es-cl'] = "Timer";
 $text['label-time_timer']['es-mx'] = "Timer"; //copied from es-cl
-$text['label-time_timer']['fr-ca'] = "Minuteur"; //copied from fr-fr
+$text['label-time_timer']['fr-ca'] = "Minuterie";
 $text['label-time_timer']['fr-fr'] = "Minuteur";
 $text['label-time_timer']['he-il'] = "";
 $text['label-time_timer']['it-it'] = "Timer";
@@ -1726,7 +1726,7 @@ $text['label-time_stop']['de-de'] = "Stopp";
 $text['label-time_stop']['el-gr'] = "Διακοπή";
 $text['label-time_stop']['es-cl'] = "Deténgase";
 $text['label-time_stop']['es-mx'] = "Deténgase"; //copied from es-cl
-$text['label-time_stop']['fr-ca'] = "Stop"; //copied from fr-fr
+$text['label-time_stop']['fr-ca'] = "Arrêt"; //copied from fr-fr
 $text['label-time_stop']['fr-fr'] = "Stop";
 $text['label-time_stop']['he-il'] = "עצור";
 $text['label-time_stop']['it-it'] = "Stop";
@@ -1849,27 +1849,27 @@ $text['label-shared']['ru-ru'] = "Общий";
 $text['label-shared']['sv-se'] = "Delad";
 $text['label-shared']['uk-ua'] = "";
 
-$text['label-primary']['en-us'] = "Primary";
-$text['label-primary']['en-gb'] = "Primary";
-$text['label-primary']['ar-eg'] = "";
-$text['label-primary']['de-at'] = "Primär"; //copied from de-de
-$text['label-primary']['de-ch'] = "Primär"; //copied from de-de
-$text['label-primary']['de-de'] = "Primär";
-$text['label-primary']['el-gr'] = "Κύρια";
-$text['label-primary']['es-cl'] = "Primário";
-$text['label-primary']['es-mx'] = "Primário"; //copied from es-cl
-$text['label-primary']['fr-ca'] = "Primaire"; //copied from fr-fr
-$text['label-primary']['fr-fr'] = "Primaire";
-$text['label-primary']['he-il'] = "ראשי";
-$text['label-primary']['it-it'] = "Primario";
-$text['label-primary']['nl-nl'] = "Primair";
-$text['label-primary']['pl-pl'] = "Główny";
-$text['label-primary']['pt-br'] = "Primário"; //copied from pt-pt
-$text['label-primary']['pt-pt'] = "Primário";
-$text['label-primary']['ro-ro'] = "";
-$text['label-primary']['ru-ru'] = "Основной";
-$text['label-primary']['sv-se'] = "Primär";
-$text['label-primary']['uk-ua'] = "";
+$text['label-phone_label']['en-us'] = "Label";
+$text['label-phone_label']['en-gb'] = "Label";
+$text['label-phone_label']['ar-eg'] = "";
+$text['label-phone_label']['de-at'] = "Kennzeichnung"; //copied from de-de
+$text['label-phone_label']['de-ch'] = "Kennzeichnung"; //copied from de-de
+$text['label-phone_label']['de-de'] = "Kennzeichnung";
+$text['label-phone_label']['el-gr'] = "Ετικέτα";
+$text['label-phone_label']['es-cl'] = "Etiqueta";
+$text['label-phone_label']['es-mx'] = "Etiqueta"; //copied from es-cl
+$text['label-phone_label']['fr-ca'] = "Etiquette"; //copied from fr-fr
+$text['label-phone_label']['fr-fr'] = "Etiquette";
+$text['label-phone_label']['he-il'] = "";
+$text['label-phone_label']['it-it'] = "Etichetta";
+$text['label-phone_label']['nl-nl'] = "Etiket";
+$text['label-phone_label']['pl-pl'] = "Etykieta";
+$text['label-phone_label']['pt-br'] = "Identificador";
+$text['label-phone_label']['pt-pt'] = "Etiqueta";
+$text['label-phone_label']['ro-ro'] = "";
+$text['label-phone_label']['ru-ru'] = "Метка";
+$text['label-phone_label']['sv-se'] = "Etikett";
+$text['label-phone_label']['uk-ua'] = "Назва";
 
 $text['label-phone_type']['en-us'] = "Type";
 $text['label-phone_type']['en-gb'] = "Type";
@@ -1924,8 +1924,8 @@ $text['label-phone_speed_dial']['de-de'] = "Kurzwahl";
 $text['label-phone_speed_dial']['el-gr'] = "Ταχεία κλήση";
 $text['label-phone_speed_dial']['es-cl'] = "";
 $text['label-phone_speed_dial']['es-mx'] = "";
-$text['label-phone_speed_dial']['fr-ca'] = "";
-$text['label-phone_speed_dial']['fr-fr'] = "";
+$text['label-phone_speed_dial']['fr-ca'] = "Numérotation Abrégée";
+$text['label-phone_speed_dial']['fr-fr'] = "Numérotation Abrégée";
 $text['label-phone_speed_dial']['he-il'] = "";
 $text['label-phone_speed_dial']['it-it'] = "Numero Breve";
 $text['label-phone_speed_dial']['nl-nl'] = "Snelkiezen";
@@ -1935,7 +1935,29 @@ $text['label-phone_speed_dial']['pt-pt'] = "";
 $text['label-phone_speed_dial']['ro-ro'] = "";
 $text['label-phone_speed_dial']['ru-ru'] = "Быстрый Набор";
 $text['label-phone_speed_dial']['sv-se'] = "Snabb Nummer";
-$text['label-phone_speed_dial']['uk-ua'] = "";
+$text['label-phone_speed_dial']['uk-ua'] = "";      
+
+$text['label-phone_country_code']['en-us'] = "Country Code";
+$text['label-phone_country_code']['en-gb'] = "Country Code";
+$text['label-phone_country_code']['ar-eg'] = "";
+$text['label-phone_country_code']['de-at'] = ""; //copied from de-de
+$text['label-phone_country_code']['de-ch'] = ""; //copied from de-de
+$text['label-phone_country_code']['de-de'] = "";
+$text['label-phone_country_code']['el-gr'] = "";
+$text['label-phone_country_code']['es-cl'] = "";
+$text['label-phone_country_code']['es-mx'] = "";
+$text['label-phone_country_code']['fr-ca'] = "Indicatif du Pays";
+$text['label-phone_country_code']['fr-fr'] = "Indicatif du Pays";
+$text['label-phone_country_code']['he-il'] = "";
+$text['label-phone_country_code']['it-it'] = "";
+$text['label-phone_country_code']['nl-nl'] = "";
+$text['label-phone_country_code']['pl-pl'] = "";
+$text['label-phone_country_code']['pt-br'] = "";
+$text['label-phone_country_code']['pt-pt'] = "";
+$text['label-phone_country_code']['ro-ro'] = "";
+$text['label-phone_country_code']['ru-ru'] = "";
+$text['label-phone_country_code']['sv-se'] = "";
+$text['label-phone_country_code']['uk-ua'] = "";
 
 $text['label-phone_numbers']['en-us'] = "Numbers";
 $text['label-phone_numbers']['en-gb'] = "Numbers";
@@ -1981,28 +2003,6 @@ $text['label-phone_number']['ru-ru'] = "Номер";
 $text['label-phone_number']['sv-se'] = "Nummer";
 $text['label-phone_number']['uk-ua'] = "Номер";
 
-$text['label-phone_label']['en-us'] = "Label";
-$text['label-phone_label']['en-gb'] = "Label";
-$text['label-phone_label']['ar-eg'] = "";
-$text['label-phone_label']['de-at'] = "Kennzeichnung"; //copied from de-de
-$text['label-phone_label']['de-ch'] = "Kennzeichnung"; //copied from de-de
-$text['label-phone_label']['de-de'] = "Kennzeichnung";
-$text['label-phone_label']['el-gr'] = "Ετικέτα";
-$text['label-phone_label']['es-cl'] = "Etiqueta";
-$text['label-phone_label']['es-mx'] = "Etiqueta"; //copied from es-cl
-$text['label-phone_label']['fr-ca'] = "Etiquette"; //copied from fr-fr
-$text['label-phone_label']['fr-fr'] = "Etiquette";
-$text['label-phone_label']['he-il'] = "";
-$text['label-phone_label']['it-it'] = "Etichetta";
-$text['label-phone_label']['nl-nl'] = "Etiket";
-$text['label-phone_label']['pl-pl'] = "Etykieta";
-$text['label-phone_label']['pt-br'] = "Identificador";
-$text['label-phone_label']['pt-pt'] = "Etiqueta";
-$text['label-phone_label']['ro-ro'] = "";
-$text['label-phone_label']['ru-ru'] = "Метка";
-$text['label-phone_label']['sv-se'] = "Etikett";
-$text['label-phone_label']['uk-ua'] = "Назва";
-
 $text['label-phone_extension']['en-us'] = "Extension";
 $text['label-phone_extension']['en-gb'] = "Extension";
 $text['label-phone_extension']['ar-eg'] = "";
@@ -2025,6 +2025,28 @@ $text['label-phone_extension']['ru-ru'] = "Внутренний Номер";
 $text['label-phone_extension']['sv-se'] = "Anknytning";
 $text['label-phone_extension']['uk-ua'] = "Розширення";
 
+$text['label-primary']['en-us'] = "Primary";
+$text['label-primary']['en-gb'] = "Primary";
+$text['label-primary']['ar-eg'] = "";
+$text['label-primary']['de-at'] = "Primär"; //copied from de-de
+$text['label-primary']['de-ch'] = "Primär"; //copied from de-de
+$text['label-primary']['de-de'] = "Primär";
+$text['label-primary']['el-gr'] = "Κύρια";
+$text['label-primary']['es-cl'] = "Primário";
+$text['label-primary']['es-mx'] = "Primário"; //copied from es-cl
+$text['label-primary']['fr-ca'] = "Primaire"; //copied from fr-fr
+$text['label-primary']['fr-fr'] = "Primaire";
+$text['label-primary']['he-il'] = "ראשי";
+$text['label-primary']['it-it'] = "Primario";
+$text['label-primary']['nl-nl'] = "Primair";
+$text['label-primary']['pl-pl'] = "Główny";
+$text['label-primary']['pt-br'] = "Primário"; //copied from pt-pt
+$text['label-primary']['pt-pt'] = "Primário";
+$text['label-primary']['ro-ro'] = "";
+$text['label-primary']['ru-ru'] = "Основной";
+$text['label-primary']['sv-se'] = "Primär";
+$text['label-primary']['uk-ua'] = "";
+
 $text['label-phone_description']['en-us'] = "Description";
 $text['label-phone_description']['en-gb'] = "Description";
 $text['label-phone_description']['ar-eg'] = "";
@@ -2122,8 +2144,8 @@ $text['label-note_content']['de-de'] = "Inhalt";
 $text['label-note_content']['el-gr'] = "Περιεχόμενο";
 $text['label-note_content']['es-cl'] = "Contenido";
 $text['label-note_content']['es-mx'] = "Contenido"; //copied from es-cl
-$text['label-note_content']['fr-ca'] = "Content"; //copied from fr-fr
-$text['label-note_content']['fr-fr'] = "Content";
+$text['label-note_content']['fr-ca'] = "Contenu";
+$text['label-note_content']['fr-fr'] = "Contenu";
 $text['label-note_content']['he-il'] = "";
 $text['label-note_content']['it-it'] = "Contenuto";
 $text['label-note_content']['nl-nl'] = "Inhoud";
@@ -2166,7 +2188,7 @@ $text['label-import_fields']['de-de'] = "Felder";
 $text['label-import_fields']['el-gr'] = "Πεδία";
 $text['label-import_fields']['es-cl'] = "Campos";
 $text['label-import_fields']['es-mx'] = "Campos"; //copied from es-cl
-$text['label-import_fields']['fr-ca'] = "Les Champs"; //copied from fr-fr
+$text['label-import_fields']['fr-ca'] = "Champs";
 $text['label-import_fields']['fr-fr'] = "Les Champs";
 $text['label-import_fields']['he-il'] = "שדות";
 $text['label-import_fields']['it-it'] = "Campi";
@@ -2386,7 +2408,7 @@ $text['label-false']['de-de'] = "Aus";
 $text['label-false']['el-gr'] = "Όχι";
 $text['label-false']['es-cl'] = "Falso";
 $text['label-false']['es-mx'] = "Falso"; //copied from es-cl
-$text['label-false']['fr-ca'] = "Non"; //copied from fr-fr
+$text['label-false']['fr-ca'] = "Faux";
 $text['label-false']['fr-fr'] = "Non";
 $text['label-false']['he-il'] = "לא חוקי";
 $text['label-false']['it-it'] = "Falso";
@@ -2430,7 +2452,7 @@ $text['label-enabled']['de-de'] = "An";
 $text['label-enabled']['el-gr'] = "Ενεργό";
 $text['label-enabled']['es-cl'] = "Activado";
 $text['label-enabled']['es-mx'] = "Activado"; //copied from es-cl
-$text['label-enabled']['fr-ca'] = "Actif"; //copied from fr-fr
+$text['label-enabled']['fr-ca'] = "Activé";
 $text['label-enabled']['fr-fr'] = "Actif";
 $text['label-enabled']['he-il'] = "מופעל";
 $text['label-enabled']['it-it'] = "Abilitato";
@@ -2452,8 +2474,8 @@ $text['label-emails']['de-de'] = "Emails";
 $text['label-emails']['el-gr'] = "E-mails";
 $text['label-emails']['es-cl'] = "Extensións";
 $text['label-emails']['es-mx'] = "Extensións"; //copied from es-cl
-$text['label-emails']['fr-ca'] = "Extensions"; //copied from fr-fr
-$text['label-emails']['fr-fr'] = "Extensions";
+$text['label-emails']['fr-ca'] = "Courriels";
+$text['label-emails']['fr-fr'] = "Courriels";
 $text['label-emails']['he-il'] = "אימיילים";
 $text['label-emails']['it-it'] = "Emails";
 $text['label-emails']['nl-nl'] = "E-mails";
@@ -2474,8 +2496,8 @@ $text['label-email_label']['de-de'] = "Kennzeichnung";
 $text['label-email_label']['el-gr'] = "Ετικέτα";
 $text['label-email_label']['es-cl'] = "Etiqueta";
 $text['label-email_label']['es-mx'] = "Etiqueta"; //copied from es-cl
-$text['label-email_label']['fr-ca'] = "Etiquette"; //copied from fr-fr
-$text['label-email_label']['fr-fr'] = "Etiquette";
+$text['label-email_label']['fr-ca'] = "Étiquette"; //copied from fr-fr
+$text['label-email_label']['fr-fr'] = "Étiquette";
 $text['label-email_label']['he-il'] = "";
 $text['label-email_label']['it-it'] = "Etichetta";
 $text['label-email_label']['nl-nl'] = "Etiket";
@@ -2518,8 +2540,8 @@ $text['label-email_address']['de-de'] = "Email-Adresse";
 $text['label-email_address']['el-gr'] = "Ηλεκτρονική διεύθυνση";
 $text['label-email_address']['es-cl'] = "Calle";
 $text['label-email_address']['es-mx'] = "Calle"; //copied from es-cl
-$text['label-email_address']['fr-ca'] = "Rue"; //copied from fr-fr
-$text['label-email_address']['fr-fr'] = "Rue";
+$text['label-email_address']['fr-ca'] = "Courriel"; 
+$text['label-email_address']['fr-fr'] = "Courriel";
 $text['label-email_address']['he-il'] = "כתובת מייל";
 $text['label-email_address']['it-it'] = "Indirizzo";
 $text['label-email_address']['nl-nl'] = "E-mail Adres";
@@ -2870,8 +2892,8 @@ $text['label-contact_relation_option_parent']['de-de'] = "Eltern";
 $text['label-contact_relation_option_parent']['el-gr'] = "Γονέας";
 $text['label-contact_relation_option_parent']['es-cl'] = "Padre";
 $text['label-contact_relation_option_parent']['es-mx'] = "Padre"; //copied from es-cl
-$text['label-contact_relation_option_parent']['fr-ca'] = "Mère"; //copied from fr-fr
-$text['label-contact_relation_option_parent']['fr-fr'] = "Mère";
+$text['label-contact_relation_option_parent']['fr-ca'] = "Parent";
+$text['label-contact_relation_option_parent']['fr-fr'] = "Parent";
 $text['label-contact_relation_option_parent']['he-il'] = "";
 $text['label-contact_relation_option_parent']['it-it'] = "Padre";
 $text['label-contact_relation_option_parent']['nl-nl'] = "Ouder";
@@ -3002,8 +3024,8 @@ $text['label-contact_relation_name']['de-de'] = "Name";
 $text['label-contact_relation_name']['el-gr'] = "Όνομα";
 $text['label-contact_relation_name']['es-cl'] = "Nombre";
 $text['label-contact_relation_name']['es-mx'] = "Nombre"; //copied from es-cl
-$text['label-contact_relation_name']['fr-ca'] = "Nome"; //copied from fr-fr
-$text['label-contact_relation_name']['fr-fr'] = "Nome";
+$text['label-contact_relation_name']['fr-ca'] = "Nom"; //copied from fr-fr
+$text['label-contact_relation_name']['fr-fr'] = "Nom";
 $text['label-contact_relation_name']['he-il'] = "שם";
 $text['label-contact_relation_name']['it-it'] = "Nome";
 $text['label-contact_relation_name']['nl-nl'] = "Naam";
@@ -3442,8 +3464,8 @@ $text['label-address_region']['de-de'] = "Region";
 $text['label-address_region']['el-gr'] = "Περιοχή";
 $text['label-address_region']['es-cl'] = "Región";
 $text['label-address_region']['es-mx'] = "Región"; //copied from es-cl
-$text['label-address_region']['fr-ca'] = "Département"; //copied from fr-fr
-$text['label-address_region']['fr-fr'] = "Département";
+$text['label-address_region']['fr-ca'] = "Région"; //copied from fr-fr
+$text['label-address_region']['fr-fr'] = "Région";
 $text['label-address_region']['he-il'] = "";
 $text['label-address_region']['it-it'] = "Regione";
 $text['label-address_region']['nl-nl'] = "Regio";
@@ -3552,8 +3574,8 @@ $text['label-address_label']['de-de'] = "Kennzeichnung";
 $text['label-address_label']['el-gr'] = "Ετικέτα";
 $text['label-address_label']['es-cl'] = "Etiqueta";
 $text['label-address_label']['es-mx'] = "Etiqueta"; //copied from es-cl
-$text['label-address_label']['fr-ca'] = "Etiquette"; //copied from fr-fr
-$text['label-address_label']['fr-fr'] = "Etiquette";
+$text['label-address_label']['fr-ca'] = "Étiquette"; //copied from fr-fr
+$text['label-address_label']['fr-fr'] = "Étiquette";
 $text['label-address_label']['he-il'] = "";
 $text['label-address_label']['it-it'] = "etichetta";
 $text['label-address_label']['nl-nl'] = "Etiket";
@@ -3640,8 +3662,8 @@ $text['label-address_address']['de-de'] = "Adresse";
 $text['label-address_address']['el-gr'] = "Διεύθυνση";
 $text['label-address_address']['es-cl'] = "Calle";
 $text['label-address_address']['es-mx'] = "Calle"; //copied from es-cl
-$text['label-address_address']['fr-ca'] = "Rue"; //copied from fr-fr
-$text['label-address_address']['fr-fr'] = "Rue";
+$text['label-address_address']['fr-ca'] = "Adresse"; //copied from fr-fr
+$text['label-address_address']['fr-fr'] = "Adresse";
 $text['label-address_address']['he-il'] = "כתובת";
 $text['label-address_address']['it-it'] = "Indirizzo";
 $text['label-address_address']['nl-nl'] = "Adres";
@@ -3662,8 +3684,8 @@ $text['label-attachments']['de-de'] = "";
 $text['label-attachments']['el-gr'] = "Επισυνάψεις";
 $text['label-attachments']['es-cl'] = "";
 $text['label-attachments']['es-mx'] = "";
-$text['label-attachments']['fr-ca'] = "";
-$text['label-attachments']['fr-fr'] = "";
+$text['label-attachments']['fr-ca'] = "Pièces Jointes";
+$text['label-attachments']['fr-fr'] = "Pièces Jointes";
 $text['label-attachments']['he-il'] = "";
 $text['label-attachments']['it-it'] = "";
 $text['label-attachments']['nl-nl'] = "Aanhangsels";
@@ -3684,8 +3706,8 @@ $text['label-attachment_filename']['de-de'] = "";
 $text['label-attachment_filename']['el-gr'] = "Όνομα αρχείου";
 $text['label-attachment_filename']['es-cl'] = "";
 $text['label-attachment_filename']['es-mx'] = "";
-$text['label-attachment_filename']['fr-ca'] = "";
-$text['label-attachment_filename']['fr-fr'] = "";
+$text['label-attachment_filename']['fr-ca'] = "Nom du Fichier";
+$text['label-attachment_filename']['fr-fr'] = "Nom du Fichier";
 $text['label-attachment_filename']['he-il'] = "";
 $text['label-attachment_filename']['it-it'] = "";
 $text['label-attachment_filename']['nl-nl'] = "Bestandsnaam";
@@ -3706,8 +3728,8 @@ $text['label-attachment']['de-de'] = "";
 $text['label-attachment']['el-gr'] = "Επισύναψη";
 $text['label-attachment']['es-cl'] = "";
 $text['label-attachment']['es-mx'] = "";
-$text['label-attachment']['fr-ca'] = "";
-$text['label-attachment']['fr-fr'] = "";
+$text['label-attachment']['fr-ca'] = "Pièce Jointe";
+$text['label-attachment']['fr-fr'] = "Pièce Jointe";
 $text['label-attachment']['he-il'] = "";
 $text['label-attachment']['it-it'] = "";
 $text['label-attachment']['nl-nl'] = "Toevoeging";
@@ -3728,8 +3750,8 @@ $text['label-attachment_size']['de-de'] = "";
 $text['label-attachment_size']['el-gr'] = "Μέγεθος";
 $text['label-attachment_size']['es-cl'] = "";
 $text['label-attachment_size']['es-mx'] = "";
-$text['label-attachment_size']['fr-ca'] = "";
-$text['label-attachment_size']['fr-fr'] = "";
+$text['label-attachment_size']['fr-ca'] = "Taille";
+$text['label-attachment_size']['fr-fr'] = "Taille";
 $text['label-attachment_size']['he-il'] = "";
 $text['label-attachment_size']['it-it'] = "";
 $text['label-attachment_size']['nl-nl'] = "Omvang";
@@ -3750,8 +3772,8 @@ $text['label-attachment_description']['de-de'] = "";
 $text['label-attachment_description']['el-gr'] = "Περιγραφή";
 $text['label-attachment_description']['es-cl'] = "";
 $text['label-attachment_description']['es-mx'] = "";
-$text['label-attachment_description']['fr-ca'] = "";
-$text['label-attachment_description']['fr-fr'] = "";
+$text['label-attachment_description']['fr-ca'] = "Description";
+$text['label-attachment_description']['fr-fr'] = "Description";
 $text['label-attachment_description']['he-il'] = "";
 $text['label-attachment_description']['it-it'] = "";
 $text['label-attachment_description']['nl-nl'] = "Omschrijving";
@@ -3816,8 +3838,8 @@ $text['header-contacts_import']['de-de'] = "Kontakte importieren";
 $text['header-contacts_import']['el-gr'] = "Εισαγωγή επαφών";
 $text['header-contacts_import']['es-cl'] = "Importar Contactos";
 $text['header-contacts_import']['es-mx'] = "Importar Contactos"; //copied from es-cl
-$text['header-contacts_import']['fr-ca'] = "Importe des Contacts"; //copied from fr-fr
-$text['header-contacts_import']['fr-fr'] = "Importe des Contacts";
+$text['header-contacts_import']['fr-ca'] = "Importé des Contacts";
+$text['header-contacts_import']['fr-fr'] = "Importé des Contacts";
 $text['header-contacts_import']['he-il'] = "ייבא אנשי קשר";
 $text['header-contacts_import']['it-it'] = "Importa Contatti";
 $text['header-contacts_import']['nl-nl'] = "Importeer kontacten";
@@ -3860,7 +3882,7 @@ $text['header-contact_url-edit']['de-de'] = "URL bearbeiten";
 $text['header-contact_url-edit']['el-gr'] = "Επεξεργασία συνδέσμου URL επαφής";
 $text['header-contact_url-edit']['es-cl'] = "Correo electrónico de contacto Editar";
 $text['header-contact_url-edit']['es-mx'] = "Correo electrónico de contacto Editar"; //copied from es-cl
-$text['header-contact_url-edit']['fr-ca'] = "Contact Courriel Modifier"; //copied from fr-fr
+$text['header-contact_url-edit']['fr-ca'] = "URL de Contact Modifier";
 $text['header-contact_url-edit']['fr-fr'] = "Contact Courriel Modifier";
 $text['header-contact_url-edit']['he-il'] = "";
 $text['header-contact_url-edit']['it-it'] = "Modifica URL Contatto";
@@ -3882,7 +3904,7 @@ $text['header-contact_url-add']['de-de'] = "URL hinzufügen";
 $text['header-contact_url-add']['el-gr'] = "Προσθήκη συνδέσμου URL επαφής";
 $text['header-contact_url-add']['es-cl'] = "Correo electrónico de contacto Agregar";
 $text['header-contact_url-add']['es-mx'] = "Correo electrónico de contacto Agregar"; //copied from es-cl
-$text['header-contact_url-add']['fr-ca'] = "Contactez-mail Ajouter"; //copied from fr-fr
+$text['header-contact_url-add']['fr-ca'] = "URL de Contactez Ajouter";
 $text['header-contact_url-add']['fr-fr'] = "Contactez-mail Ajouter";
 $text['header-contact_url-add']['he-il'] = "";
 $text['header-contact_url-add']['it-it'] = "Inserisci URL Contatto";
@@ -4036,7 +4058,7 @@ $text['header-contact_phones-edit']['de-de'] = "Nummer des Kontakts bearbeiten";
 $text['header-contact_phones-edit']['el-gr'] = "Επεξεργασία αριθμού επαφής";
 $text['header-contact_phones-edit']['es-cl'] = "Editar Número de Contacto";
 $text['header-contact_phones-edit']['es-mx'] = "Editar Número de Contacto"; //copied from es-cl
-$text['header-contact_phones-edit']['fr-ca'] = "Editer le téléphone du Contact"; //copied from fr-fr
+$text['header-contact_phones-edit']['fr-ca'] = "Numéro du Contact Modifier";
 $text['header-contact_phones-edit']['fr-fr'] = "Editer le téléphone du Contact";
 $text['header-contact_phones-edit']['he-il'] = "";
 $text['header-contact_phones-edit']['it-it'] = "Modifica Numero Contatto";
@@ -4058,7 +4080,7 @@ $text['header-contact_phones-add']['de-de'] = "Nummer zum Kontakt hinzufügen";
 $text['header-contact_phones-add']['el-gr'] = "Προσθήκη αριθμού επαφής";
 $text['header-contact_phones-add']['es-cl'] = "Agregar Número de Contacto";
 $text['header-contact_phones-add']['es-mx'] = "Agregar Número de Contacto"; //copied from es-cl
-$text['header-contact_phones-add']['fr-ca'] = "Ajouter un téléphone au Contact"; //copied from fr-fr
+$text['header-contact_phones-add']['fr-ca'] = "Numéro Contact Ajouter";
 $text['header-contact_phones-add']['fr-fr'] = "Ajouter un téléphone au Contact";
 $text['header-contact_phones-add']['he-il'] = "";
 $text['header-contact_phones-add']['it-it'] = "Inserisci Numero Contatto";
@@ -4080,7 +4102,7 @@ $text['header-contact_notes-edit']['de-de'] = "Notiz für Kontakt bearbeiten";
 $text['header-contact_notes-edit']['el-gr'] = "Επεξεργασία σημείωσης επαφής";
 $text['header-contact_notes-edit']['es-cl'] = "Editar Nota de Contactos";
 $text['header-contact_notes-edit']['es-mx'] = "Editar Nota de Contactos"; //copied from es-cl
-$text['header-contact_notes-edit']['fr-ca'] = "Editer la note du contact"; //copied from fr-fr
+$text['header-contact_notes-edit']['fr-ca'] = "Modifier la note du contact";
 $text['header-contact_notes-edit']['fr-fr'] = "Editer la note du contact";
 $text['header-contact_notes-edit']['he-il'] = "";
 $text['header-contact_notes-edit']['it-it'] = "Modifica Note Contatto";
@@ -4124,7 +4146,7 @@ $text['header-contact_email-edit']['de-de'] = "Email des Kontakts bearbeiten";
 $text['header-contact_email-edit']['el-gr'] = "Επεξεργασία e-mail επαφής";
 $text['header-contact_email-edit']['es-cl'] = "Correo electrónico de contacto Editar";
 $text['header-contact_email-edit']['es-mx'] = "Correo electrónico de contacto Editar"; //copied from es-cl
-$text['header-contact_email-edit']['fr-ca'] = "Contact Courriel Modifier"; //copied from fr-fr
+$text['header-contact_email-edit']['fr-ca'] = "Courriel Contact Modifier";
 $text['header-contact_email-edit']['fr-fr'] = "Contact Courriel Modifier";
 $text['header-contact_email-edit']['he-il'] = "";
 $text['header-contact_email-edit']['it-it'] = "Modifica Email Contatto";
@@ -4146,7 +4168,7 @@ $text['header-contact_email-add']['de-de'] = "Email zum Kontakt hinzufügen";
 $text['header-contact_email-add']['el-gr'] = "Προσθήκη e-mail επαφής";
 $text['header-contact_email-add']['es-cl'] = "Correo electrónico de contacto Agregar";
 $text['header-contact_email-add']['es-mx'] = "Correo electrónico de contacto Agregar"; //copied from es-cl
-$text['header-contact_email-add']['fr-ca'] = "Contactez-mail Ajouter"; //copied from fr-fr
+$text['header-contact_email-add']['fr-ca'] = "Courriel Contact Ajouter"; //copied from fr-fr
 $text['header-contact_email-add']['fr-fr'] = "Contactez-mail Ajouter";
 $text['header-contact_email-add']['he-il'] = "";
 $text['header-contact_email-add']['it-it'] = "Inserisci Email Contatto";
@@ -4168,7 +4190,7 @@ $text['header-contact_addresses-edit']['de-de'] = "Adresse des Kontakts bearbeit
 $text['header-contact_addresses-edit']['el-gr'] = "Επεξεργασία διεύθυνσης επαφής";
 $text['header-contact_addresses-edit']['es-cl'] = "Editar Dirección de Contacto";
 $text['header-contact_addresses-edit']['es-mx'] = "Editar Dirección de Contacto"; //copied from es-cl
-$text['header-contact_addresses-edit']['fr-ca'] = "Editer l'adresse du contact"; //copied from fr-fr
+$text['header-contact_addresses-edit']['fr-ca'] = "Adresse Contact Modifier";
 $text['header-contact_addresses-edit']['fr-fr'] = "Editer l'adresse du contact";
 $text['header-contact_addresses-edit']['he-il'] = "";
 $text['header-contact_addresses-edit']['it-it'] = "Modifica Indirizzo Contatto";
@@ -4190,7 +4212,7 @@ $text['header-contact_addresses-add']['de-de'] = "Adresse zum Kontakt hinzufüge
 $text['header-contact_addresses-add']['el-gr'] = "Προσθήκη διεύθυνσης επαφής";
 $text['header-contact_addresses-add']['es-cl'] = "Agregar Dirección de Contacto";
 $text['header-contact_addresses-add']['es-mx'] = "Agregar Dirección de Contacto"; //copied from es-cl
-$text['header-contact_addresses-add']['fr-ca'] = "Ajouter une adresse au contact"; //copied from fr-fr
+$text['header-contact_addresses-add']['fr-ca'] = "Adresse Contact Ajouter";
 $text['header-contact_addresses-add']['fr-fr'] = "Ajouter une adresse au contact";
 $text['header-contact_addresses-add']['he-il'] = "";
 $text['header-contact_addresses-add']['it-it'] = "Inserisci Indirizzo Contatto";
@@ -4212,8 +4234,8 @@ $text['header-contact_attachment-edit']['de-de'] = "";
 $text['header-contact_attachment-edit']['el-gr'] = "Επεξεργασία επισύναψης επαφής";
 $text['header-contact_attachment-edit']['es-cl'] = "";
 $text['header-contact_attachment-edit']['es-mx'] = "";
-$text['header-contact_attachment-edit']['fr-ca'] = "";
-$text['header-contact_attachment-edit']['fr-fr'] = "";
+$text['header-contact_attachment-edit']['fr-ca'] = "Pièce Jointe Contact Modifier";
+$text['header-contact_attachment-edit']['fr-fr'] = "Pièce Jointe Contact Modifier";
 $text['header-contact_attachment-edit']['he-il'] = "";
 $text['header-contact_attachment-edit']['it-it'] = "";
 $text['header-contact_attachment-edit']['nl-nl'] = "Kontact aanhangsel bewerken";
@@ -4234,8 +4256,8 @@ $text['header-contact_attachment-add']['de-de'] = "";
 $text['header-contact_attachment-add']['el-gr'] = "Προσθήκη επισύναψης επαφής";
 $text['header-contact_attachment-add']['es-cl'] = "";
 $text['header-contact_attachment-add']['es-mx'] = "";
-$text['header-contact_attachment-add']['fr-ca'] = "";
-$text['header-contact_attachment-add']['fr-fr'] = "";
+$text['header-contact_attachment-add']['fr-ca'] = "Pièce Jointe Contact Ajouter";
+$text['header-contact_attachment-add']['fr-fr'] = "Pièce Jointe Contact Ajouter";
 $text['header-contact_attachment-add']['he-il'] = "";
 $text['header-contact_attachment-add']['it-it'] = "";
 $text['header-contact_attachment-add']['nl-nl'] = "Kontact aanhangsel toevoegen";
@@ -4300,7 +4322,7 @@ $text['description_timer']['de-de'] = "Den Timer stoppen bevor Sie das Fenster s
 $text['description_timer']['el-gr'] = "Σταματήστε το χρονοδιακόπτη πριν κλείσετε το παράθυρο, εάν το επιθυμείτε.";
 $text['description_timer']['es-cl'] = "Detenga el temporizador antes de cerrar la ventana, si se desea.";
 $text['description_timer']['es-mx'] = "Detenga el temporizador antes de cerrar la ventana, si se desea."; //copied from es-cl
-$text['description_timer']['fr-ca'] = "Arrêter le retardateur avant la fermeture de la fenêtre, si désiré."; //copied from fr-fr
+$text['description_timer']['fr-ca'] = "Arrêter le minuteur avant la fermeture de la fenêtre, si désiré.";
 $text['description_timer']['fr-fr'] = "Arrêter le retardateur avant la fermeture de la fenêtre, si désiré.";
 $text['description_timer']['he-il'] = "";
 $text['description_timer']['it-it'] = "Stoppa il timer prima di chiudere la finestra, se lo desideri.";
@@ -4379,6 +4401,28 @@ $text['description-shared']['ru-ru'] = "Разделите этот контак
 $text['description-shared']['sv-se'] = "Dela denna kontakt med andra användare i domänen.";
 $text['description-shared']['uk-ua'] = "";
 
+$text['description-phone_label']['en-us'] = "Select or enter a custom label.";
+$text['description-phone_label']['en-gb'] = "Select or enter a custom label.";
+$text['description-phone_label']['ar-eg'] = "";
+$text['description-phone_label']['de-at'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de
+$text['description-phone_label']['de-ch'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de
+$text['description-phone_label']['de-de'] = "Wählen Sie eine beliebige Kennzeichnung.";
+$text['description-phone_label']['el-gr'] = "Επιλέξτε ή εισάγετε μια προσωποποιημένη ετικέτα";
+$text['description-phone_label']['es-cl'] = "Seleccione o introduzca una etiqueta personalizada.";
+$text['description-phone_label']['es-mx'] = "Seleccione o introduzca una etiqueta personalizada."; //copied from es-cl
+$text['description-phone_label']['fr-ca'] = "Sélectionnez ou entrez une étiquette personnalisée."; //copied from fr-fr
+$text['description-phone_label']['fr-fr'] = "Sélectionnez ou entrez une étiquette personnalisée.";
+$text['description-phone_label']['he-il'] = "";
+$text['description-phone_label']['it-it'] = "Seleziona o inserisci un'etichetta personalizzata.";
+$text['description-phone_label']['nl-nl'] = "Kies of voer een keuze kenmerk in.";
+$text['description-phone_label']['pl-pl'] = "Wybierz lub wprowadź własną etykietę.";
+$text['description-phone_label']['pt-br'] = "Selecione ou digite um identificador personalizado";
+$text['description-phone_label']['pt-pt'] = "Selecione ou digite um rótulo personalizado.";
+$text['description-phone_label']['ro-ro'] = "";
+$text['description-phone_label']['ru-ru'] = "Выберите или введите настраиваемую метку.";
+$text['description-phone_label']['sv-se'] = "Välj eller ange anpassad etikett.";
+$text['description-phone_label']['uk-ua'] = "";
+
 $text['description-phone_type']['en-us'] = "Define the number type or purpose.";
 $text['description-phone_type']['en-gb'] = "Define the number type or purpose.";
 $text['description-phone_type']['ar-eg'] = "";
@@ -4401,28 +4445,6 @@ $text['description-phone_type']['ru-ru'] = "Определите тип или
 $text['description-phone_type']['sv-se'] = "Definiera nummertypen eller nummerändamålet.";
 $text['description-phone_type']['uk-ua'] = "";
 
-$text['description-phone_primary']['en-us'] = "Set as the primary Number for this contact.";
-$text['description-phone_primary']['en-gb'] = "Set as the primary Number for this contact.";
-$text['description-phone_primary']['ar-eg'] = "";
-$text['description-phone_primary']['de-at'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de
-$text['description-phone_primary']['de-ch'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de
-$text['description-phone_primary']['de-de'] = "Als primäre Nummer für diesen Kontakt setzen.";
-$text['description-phone_primary']['el-gr'] = "Ορίστε τον κύριο αριθμό για αυτή την επαφή";
-$text['description-phone_primary']['es-cl'] = "Establecer como el número primario para este contacto.";
-$text['description-phone_primary']['es-mx'] = "Establecer como el número primario para este contacto."; //copied from es-cl
-$text['description-phone_primary']['fr-ca'] = "Définir comme primaire numéro pour ce contact."; //copied from fr-fr
-$text['description-phone_primary']['fr-fr'] = "Définir comme primaire numéro pour ce contact.";
-$text['description-phone_primary']['he-il'] = "";
-$text['description-phone_primary']['it-it'] = "Imposta come numero principale per questo contatto.";
-$text['description-phone_primary']['nl-nl'] = "Stel nummer in als primair nummer voor dit kontact";
-$text['description-phone_primary']['pl-pl'] = "Ustaw jako podstawowy numer tego kontaktu.";
-$text['description-phone_primary']['pt-br'] = "Defina número principal para este contato";
-$text['description-phone_primary']['pt-pt'] = "Definir como o principal número para este contato.";
-$text['description-phone_primary']['ro-ro'] = "";
-$text['description-phone_primary']['ru-ru'] = "Укажите в качестве основного номера для этого контакта.";
-$text['description-phone_primary']['sv-se'] = "Sätt som primärt Nummer för denna kontakt.";
-$text['description-phone_primary']['uk-ua'] = "";
-
 $text['description-phone_speed_dial']['en-us'] = "Enter the speed dial number.";
 $text['description-phone_speed_dial']['en-gb'] = "Enter the speed dial number.";
 $text['description-phone_speed_dial']['ar-eg'] = "";
@@ -4432,8 +4454,8 @@ $text['description-phone_speed_dial']['de-de'] = "Kurzwahlnummer eingeben";
 $text['description-phone_speed_dial']['el-gr'] = "Εισάγετε τον αριθμό ταχείας κλήσης.";
 $text['description-phone_speed_dial']['es-cl'] = "";
 $text['description-phone_speed_dial']['es-mx'] = "";
-$text['description-phone_speed_dial']['fr-ca'] = "";
-$text['description-phone_speed_dial']['fr-fr'] = "";
+$text['description-phone_speed_dial']['fr-ca'] = "Entrez le numéro de numérotation abrégée";
+$text['description-phone_speed_dial']['fr-fr'] = "Entrez le numéro de numérotation abrégée";
 $text['description-phone_speed_dial']['he-il'] = "";
 $text['description-phone_speed_dial']['it-it'] = "Inserire il numero breve del contatto.";
 $text['description-phone_speed_dial']['nl-nl'] = "Voer snelkies nummer in.";
@@ -4445,6 +4467,28 @@ $text['description-phone_speed_dial']['ru-ru'] = "Введите номер бы
 $text['description-phone_speed_dial']['sv-se'] = "Ange snabbknappens nummer.";
 $text['description-phone_speed_dial']['uk-ua'] = "";
 
+$text['description-phone_country_code']['en-us'] = "Enter the country code.";
+$text['description-phone_country_code']['en-gb'] = "Enter the country code.";
+$text['description-phone_country_code']['ar-eg'] = "";
+$text['description-phone_country_code']['de-at'] = "";
+$text['description-phone_country_code']['de-ch'] = "";
+$text['description-phone_country_code']['de-de'] = "";
+$text['description-phone_country_code']['el-gr'] = "";
+$text['description-phone_country_code']['es-cl'] = "";
+$text['description-phone_country_code']['es-mx'] = "";
+$text['description-phone_country_code']['fr-ca'] = "Entrez l'indicatif du pays";
+$text['description-phone_country_code']['fr-fr'] = "Entrez l'indicatif du pays";
+$text['description-phone_country_code']['he-il'] = "";
+$text['description-phone_country_code']['it-it'] = "";
+$text['description-phone_country_code']['nl-nl'] = "";
+$text['description-phone_country_code']['pl-pl'] = "";
+$text['description-phone_country_code']['pt-br'] = "";
+$text['description-phone_country_code']['pt-pt'] = "";
+$text['description-phone_country_code']['ro-ro'] = "";
+$text['description-phone_country_code']['ru-ru'] = "";
+$text['description-phone_country_code']['sv-se'] = "";
+$text['description-phone_country_code']['uk-ua'] = "";
+
 $text['description-phone_number']['en-us'] = "Enter the phone number.";
 $text['description-phone_number']['en-gb'] = "Enter the phone number.";
 $text['description-phone_number']['ar-eg'] = "";
@@ -4467,28 +4511,6 @@ $text['description-phone_number']['ru-ru'] = "Введите номер теле
 $text['description-phone_number']['sv-se'] = "Ange telefonnummer.";
 $text['description-phone_number']['uk-ua'] = "";
 
-$text['description-phone_label']['en-us'] = "Select or enter a custom label.";
-$text['description-phone_label']['en-gb'] = "Select or enter a custom label.";
-$text['description-phone_label']['ar-eg'] = "";
-$text['description-phone_label']['de-at'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de
-$text['description-phone_label']['de-ch'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de
-$text['description-phone_label']['de-de'] = "Wählen Sie eine beliebige Kennzeichnung.";
-$text['description-phone_label']['el-gr'] = "Επιλέξτε ή εισάγετε μια προσωποποιημένη ετικέτα";
-$text['description-phone_label']['es-cl'] = "Seleccione o introduzca una etiqueta personalizada.";
-$text['description-phone_label']['es-mx'] = "Seleccione o introduzca una etiqueta personalizada."; //copied from es-cl
-$text['description-phone_label']['fr-ca'] = "Sélectionnez ou entrez une étiquette personnalisée."; //copied from fr-fr
-$text['description-phone_label']['fr-fr'] = "Sélectionnez ou entrez une étiquette personnalisée.";
-$text['description-phone_label']['he-il'] = "";
-$text['description-phone_label']['it-it'] = "Seleziona o inserisci un'etichetta personalizzata.";
-$text['description-phone_label']['nl-nl'] = "Kies of voer een keuze kenmerk in.";
-$text['description-phone_label']['pl-pl'] = "Wybierz lub wprowadź własną etykietę.";
-$text['description-phone_label']['pt-br'] = "Selecione ou digite um identificador personalizado";
-$text['description-phone_label']['pt-pt'] = "Selecione ou digite um rótulo personalizado.";
-$text['description-phone_label']['ro-ro'] = "";
-$text['description-phone_label']['ru-ru'] = "Выберите или введите настраиваемую метку.";
-$text['description-phone_label']['sv-se'] = "Välj eller ange anpassad etikett.";
-$text['description-phone_label']['uk-ua'] = "";
-
 $text['description-phone_extension']['en-us'] = "Enter the extension.";
 $text['description-phone_extension']['en-gb'] = "Enter the extension.";
 $text['description-phone_extension']['ar-eg'] = "";
@@ -4511,6 +4533,28 @@ $text['description-phone_extension']['ru-ru'] = "Введите Внутренн
 $text['description-phone_extension']['sv-se'] = "Ange anknytningen.";
 $text['description-phone_extension']['uk-ua'] = "";
 
+$text['description-phone_primary']['en-us'] = "Set as the primary Number for this contact.";
+$text['description-phone_primary']['en-gb'] = "Set as the primary Number for this contact.";
+$text['description-phone_primary']['ar-eg'] = "";
+$text['description-phone_primary']['de-at'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de
+$text['description-phone_primary']['de-ch'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de
+$text['description-phone_primary']['de-de'] = "Als primäre Nummer für diesen Kontakt setzen.";
+$text['description-phone_primary']['el-gr'] = "Ορίστε τον κύριο αριθμό για αυτή την επαφή";
+$text['description-phone_primary']['es-cl'] = "Establecer como el número primario para este contacto.";
+$text['description-phone_primary']['es-mx'] = "Establecer como el número primario para este contacto."; //copied from es-cl
+$text['description-phone_primary']['fr-ca'] = "Définir comme primaire numéro pour ce contact."; //copied from fr-fr
+$text['description-phone_primary']['fr-fr'] = "Définir comme primaire numéro pour ce contact.";
+$text['description-phone_primary']['he-il'] = "";
+$text['description-phone_primary']['it-it'] = "Imposta come numero principale per questo contatto.";
+$text['description-phone_primary']['nl-nl'] = "Stel nummer in als primair nummer voor dit kontact";
+$text['description-phone_primary']['pl-pl'] = "Ustaw jako podstawowy numer tego kontaktu.";
+$text['description-phone_primary']['pt-br'] = "Defina número principal para este contato";
+$text['description-phone_primary']['pt-pt'] = "Definir como o principal número para este contato.";
+$text['description-phone_primary']['ro-ro'] = "";
+$text['description-phone_primary']['ru-ru'] = "Укажите в качестве основного номера для этого контакта.";
+$text['description-phone_primary']['sv-se'] = "Sätt som primärt Nummer för denna kontakt.";
+$text['description-phone_primary']['uk-ua'] = "";
+
 $text['description-phone_description']['en-us'] = "Enter the description.";
 $text['description-phone_description']['en-gb'] = "Enter the description.";
 $text['description-phone_description']['ar-eg'] = "";
@@ -4753,8 +4797,8 @@ $text['description-contacts_import_google']['ru-ru'] = "Выберите нуж
 $text['description-contacts_import_google']['sv-se'] = "Välj de kontakter som skall importeras.";
 $text['description-contacts_import_google']['uk-ua'] = "";
 
-$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']['en-gb'] = "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']['en-us'] = "Submit or upload delimited data to add multiple records.";
+$text['description-contacts_import']['en-gb'] = "Submit or upload delimited data to add multiple records.";
 $text['description-contacts_import']['ar-eg'] = "";
 $text['description-contacts_import']['de-at'] = "Exportieren Sie Ihre Kontakte aus Outlook in eine CSV Datei und benützen Sie diese Funktion um Ihre Kontakte zu importieren."; //copied from de-de
 $text['description-contacts_import']['de-ch'] = "Exportieren Sie Ihre Kontakte aus Outlook in eine CSV Datei und benützen Sie diese Funktion um Ihre Kontakte zu importieren."; //copied from de-de
@@ -5312,8 +5356,8 @@ $text['description-contact_name_given']['de-de'] = "Geben Sie den Vornamen ein."
 $text['description-contact_name_given']['el-gr'] = "Εισάγετε το όνομα.";
 $text['description-contact_name_given']['es-cl'] = "Ingrese el nombre dado.";
 $text['description-contact_name_given']['es-mx'] = "Ingrese el nombre dado."; //copied from es-cl
-$text['description-contact_name_given']['fr-ca'] = "Entrez le nom donné."; //copied from fr-fr
-$text['description-contact_name_given']['fr-fr'] = "Entrez le nom donné.";
+$text['description-contact_name_given']['fr-ca'] = "Entrez le prénom."; //copied from fr-fr
+$text['description-contact_name_given']['fr-fr'] = "Entrez le prénom.";
 $text['description-contact_name_given']['he-il'] = "";
 $text['description-contact_name_given']['it-it'] = "Inserire il nome.";
 $text['description-contact_name_given']['nl-nl'] = "Voer de voornaam in.";
@@ -5356,8 +5400,8 @@ $text['description-contact_email-edit']['de-de'] = "Email-Address Informationen.
 $text['description-contact_email-edit']['el-gr'] = "Πληροφορίες ηλεκτρονικής διεύθυνσης αλληλογραφίας.";
 $text['description-contact_email-edit']['es-cl'] = "Contactar con información de la dirección de correo electrónico.";
 $text['description-contact_email-edit']['es-mx'] = "Contactar con información de la dirección de correo electrónico."; //copied from es-cl
-$text['description-contact_email-edit']['fr-ca'] = "Coordonnées de l'adresse e-mail."; //copied from fr-fr
-$text['description-contact_email-edit']['fr-fr'] = "Coordonnées de l'adresse e-mail.";
+$text['description-contact_email-edit']['fr-ca'] = "Coordonnées de l'adresse courriel.";
+$text['description-contact_email-edit']['fr-fr'] = "Coordonnées de l'adresse courriel.";
 $text['description-contact_email-edit']['he-il'] = "";
 $text['description-contact_email-edit']['it-it'] = "Indirizzo email del contatto.";
 $text['description-contact_email-edit']['nl-nl'] = "Voer het E-mail adres informatie in.";
@@ -5378,8 +5422,8 @@ $text['description-contact_email-add']['de-de'] = "Email-Address Informationen."
 $text['description-contact_email-add']['el-gr'] = "Πληροφορίες ηλεκτρονικής διεύθυνσης αλληλογραφίας.";
 $text['description-contact_email-add']['es-cl'] = "Contactar con información de la dirección de correo electrónico.";
 $text['description-contact_email-add']['es-mx'] = "Contactar con información de la dirección de correo electrónico."; //copied from es-cl
-$text['description-contact_email-add']['fr-ca'] = "Coordonnées de l'adresse e-mail."; //copied from fr-fr
-$text['description-contact_email-add']['fr-fr'] = "Coordonnées de l'adresse e-mail.";
+$text['description-contact_email-add']['fr-ca'] = "Coordonnées de l'adresse courriel.";
+$text['description-contact_email-add']['fr-fr'] = "Coordonnées de l'adresse courriel.";
 $text['description-contact_email-add']['he-il'] = "";
 $text['description-contact_email-add']['it-it'] = "Indirizzo email del contatto.";
 $text['description-contact_email-add']['nl-nl'] = "Kontact E-mail adres informatie.";
@@ -5400,8 +5444,8 @@ $text['description-contact_email']['de-de'] = "Geben Sie die Email Addresse ein.
 $text['description-contact_email']['el-gr'] = "Ορίστε τη διεύθυνση ηλεκτρονικής αλληλογραφίας.";
 $text['description-contact_email']['es-cl'] = "Ingrese la dirección de correo electrónico.";
 $text['description-contact_email']['es-mx'] = "Ingrese la dirección de correo electrónico."; //copied from es-cl
-$text['description-contact_email']['fr-ca'] = "Entrez l'adresse e-mail."; //copied from fr-fr
-$text['description-contact_email']['fr-fr'] = "Entrez l'adresse e-mail.";
+$text['description-contact_email']['fr-ca'] = "Entrez l'adresse courriel.";
+$text['description-contact_email']['fr-fr'] = "Entrez l'adresse courriel.";
 $text['description-contact_email']['he-il'] = "";
 $text['description-contact_email']['it-it'] = "Inserire l'indirizzo email.";
 $text['description-contact_email']['nl-nl'] = "Voer E-mail adres in.";
@@ -5664,7 +5708,7 @@ $text['description-address_locality']['de-de'] = "Geben Sie die Stadt ein.";
 $text['description-address_locality']['el-gr'] = "Εισάγετε την πόλη.";
 $text['description-address_locality']['es-cl'] = "Ingrese la ciudad";
 $text['description-address_locality']['es-mx'] = "Ingrese la ciudad"; //copied from es-cl
-$text['description-address_locality']['fr-ca'] = "Entrez dans la ville."; //copied from fr-fr
+$text['description-address_locality']['fr-ca'] = "Entrez la ville.";
 $text['description-address_locality']['fr-fr'] = "Entrez dans la ville.";
 $text['description-address_locality']['he-il'] = "";
 $text['description-address_locality']['it-it'] = "Inserire la città.";
@@ -6126,7 +6170,7 @@ $text['button-edit']['de-de'] = "Bearbeiten";
 $text['button-edit']['el-gr'] = "Επεξεργασία";
 $text['button-edit']['es-cl'] = "Editar";
 $text['button-edit']['es-mx'] = "Editar"; //copied from es-cl
-$text['button-edit']['fr-ca'] = "Editer"; //copied from fr-fr
+$text['button-edit']['fr-ca'] = "Modifier";
 $text['button-edit']['fr-fr'] = "Editer";
 $text['button-edit']['he-il'] = "";
 $text['button-edit']['it-it'] = "Modifica";
@@ -6380,8 +6424,8 @@ $text['label-properties']['de-ch'] = "Properties";
 $text['label-properties']['de-de'] = "Properties";
 $text['label-properties']['es-cl'] = "Properties";
 $text['label-properties']['es-mx'] = "Properties";
-$text['label-properties']['fr-ca'] = "Properties";
-$text['label-properties']['fr-fr'] = "Properties";
+$text['label-properties']['fr-ca'] = "Propriétés";
+$text['label-properties']['fr-fr'] = "Propriétés";
 $text['label-properties']['he-il'] = "Properties";
 $text['label-properties']['it-it'] = "Properties";
 $text['label-properties']['nl-nl'] = "Properties";
@@ -6412,4 +6456,25 @@ $text['label-contact']['ru-ru'] = "Контакт";
 $text['label-contact']['sv-se'] = "Kontakt";
 $text['label-contact']['uk-ua'] = "Контакт";
 
-?>
+$text['label-permissions']['en-us'] = "Permissions";
+$text['label-permissions']['en-gb'] = "Permissions";
+$text['label-permissions']['ar-eg'] = "";
+$text['label-permissions']['de-at'] = "Berechtigungen"; //copied from de-de
+$text['label-permissions']['de-ch'] = "Berechtigungen"; //copied from de-de
+$text['label-permissions']['de-de'] = "Berechtigungen";
+$text['label-permissions']['es-cl'] = "Permisos";
+$text['label-permissions']['es-mx'] = "Permisos"; //copied from es-cl
+$text['label-permissions']['fr-ca'] = "Permissions"; //copied from fr-fr
+$text['label-permissions']['fr-fr'] = "Permissions";
+$text['label-permissions']['he-il'] = "הרשאות";
+$text['label-permissions']['it-it'] = "Permessi";
+$text['label-permissions']['nl-nl'] = "";
+$text['label-permissions']['pl-pl'] = "Uprawnienia";
+$text['label-permissions']['pt-br'] = "Permissões"; //copied from pt-pt
+$text['label-permissions']['pt-pt'] = "Permissões";
+$text['label-permissions']['ro-ro'] = "";
+$text['label-permissions']['ru-ru'] = "Права";
+$text['label-permissions']['sv-se'] = "Rättigheter";
+$text['label-permissions']['uk-ua'] = "Привілеї";
+
+?>

contact_import.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2008-2020
+	Portions created by the Initial Developer are Copyright (C) 2008-2021
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -55,7 +55,7 @@
 	}
 
 //set the max php execution time
-	ini_set('max_execution_time',7200);
+	ini_set('max_execution_time', 7200);
 
 //get the http get values and set them as php variables
 	$action = $_POST["action"];
@@ -77,7 +77,6 @@
 			move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name']);
 			$save_msg = "Uploaded file to ".$_SESSION['server']['temp']['dir']."/". htmlentities($_FILES['ulfile']['name']);
 			//system('chmod -R 744 '.$_SESSION['server']['temp']['dir'].'*');
-			unset($_POST['txtCommand']);
 			$file = $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name'];
 			$_SESSION['file'] = $file;
 		}
@@ -143,7 +142,7 @@
 			$token = new token;
 			if (!$token->validate($_SERVER['PHP_SELF'])) {
 				message::add($text['message-invalid_token'],'negative');
-				header('Location: extension_imports.php');
+				header('Location: contact_import.php');
 				exit;
 			}
 
@@ -208,7 +207,8 @@
 				foreach($schema as $row) {
 					echo "			<optgroup label='".$row['table']."'>\n";
 					foreach($row['fields'] as $field) {
-						if ($field == 'phone_label') { continue; }
+						//if ($field == 'phone_label') { continue; }
+ 						//if ($field == 'contact_url') { continue; } // can remove this after field is removed from the table
 						$selected = '';
 						if ($field == $line_field) {
 							$selected = "selected='selected'";
@@ -220,9 +220,9 @@
 					echo "			</optgroup>\n";
 				}
 				echo "		</select>\n";
-				echo "		<select class='formfld' style='display: none;' id='labels_$x' name='labels[$x]'>\n";
-				echo 			is_array($label_options) ? implode("\n", $label_options) : null;
-				echo "		</select>\n";
+				//echo "		<select class='formfld' style='display: none;' id='labels_$x' name='labels[$x]'>\n";
+				//echo 			is_array($label_options) ? implode("\n", $label_options) : null;
+				//echo "		</select>\n";
 				echo "	</td>\n";
 				echo "</tr>\n";
 				$x++;
@@ -270,7 +270,7 @@
 			$token = new token;
 			if (!$token->validate($_SERVER['PHP_SELF'])) {
 				message::add($text['message-invalid_token'],'negative');
-				header('Location: extension_imports.php');
+				header('Location: contact_import.php');
 				exit;
 			}
 
@@ -309,7 +309,7 @@
 								foreach ($fields as $key => $value) {
 									//get the line
 									$result = str_getcsv($line, $delimiter, $enclosure);
-									
+
 									//get the table and field name
 									$field_array = explode(".",$value);
 									$table_name = $field_array[0];
@@ -317,15 +317,26 @@
 									//echo "value: $value<br />\n";
 									//echo "table_name: $table_name<br />\n";
 									//echo "field_name: $field_name<br />\n";
-									
+
 									//get the parent table name
 									$parent = get_parent($schema, $table_name);
-	
+
+									//count the field names
+									if (isset($field_count[$table_name][$field_name])) {
+										$field_count[$table_name][$field_name]++;
+									}
+									else {
+										$field_count[$table_name][$field_name] = 0;
+									}
+
+									//set the ordinal ID
+									$id = $field_count[$table_name][$field_name];
+
 									//remove formatting from the phone number
 									if ($field_name == "phone_number") {
 										$result[$key] = preg_replace('{(?!^\+)[\D]}', '', $result[$key]);
 									}
-	
+
 									//build the data array
 									if (strlen($table_name) > 0) {
 										if (strlen($parent) == 0) {
@@ -334,42 +345,44 @@
 										}
 										else {
 											if ($field_name != "username" && $field_name != "group_name") {
-												$array[$parent][$row_id][$table_name][$y]['domain_uuid'] = $domain_uuid;
-												$array[$parent][$row_id][$table_name][$y][$field_name] = $result[$key];
-												if ($field_name == 'phone_number') {
-													$array[$parent][$row_id][$table_name][$y]['phone_label'] = $labels[$key];
-												}
+												$array[$parent][$row_id][$table_name][$id]['domain_uuid'] = $domain_uuid;
+												$array[$parent][$row_id][$table_name][$id][$field_name] = $result[$key];
+												//if ($field_name == 'phone_number') {
+												//	$array[$parent][$row_id][$table_name][$id]['phone_label'] = $labels[$key];
+												//}
 											}
 										}
-	
+
 										if ($field_name == "group_name") {
 											foreach ($groups as $field) {
 												if ($field['group_name'] == $result[$key]) {
 													//$array[$parent][$row_id]['contact_group_uuid'] = uuid();
-													$array[$parent][$row_id]['contact_groups'][$y]['domain_uuid'] = $domain_uuid;
+													$array[$parent][$row_id]['contact_groups'][$id]['domain_uuid'] = $domain_uuid;
 													//$array['contact_groups'][$x]['contact_uuid'] = $row['contact_uuid'];
-													$array[$parent][$row_id]['contact_groups'][$y]['group_uuid'] = $field['group_uuid'];
+													$array[$parent][$row_id]['contact_groups'][$id]['group_uuid'] = $field['group_uuid'];
 												}
 											}
 										}
-	
+
 										if ($field_name == "username") {
 											foreach ($users as $field) {
 												if ($field['username'] == $result[$key]) {
-													//$array[$parent][$row_id]['contact_users'][$y]['contact_group_uuid'] = uuid();
-													$array[$parent][$row_id]['contact_users'][$y]['domain_uuid'] = $domain_uuid;
+													//$array[$parent][$row_id]['contact_users'][$id]['contact_group_uuid'] = uuid();
+													$array[$parent][$row_id]['contact_users'][$id]['domain_uuid'] = $domain_uuid;
 													//$array['contact_groups'][$x]['contact_uuid'] = $row['contact_uuid'];
-													$array[$parent][$row_id]['contact_users'][$y]['user_uuid'] = $field['user_uuid'];
+													$array[$parent][$row_id]['contact_users'][$id]['user_uuid'] = $field['user_uuid'];
 												}
 											}
 										}
 									}
 									if (is_array($array[$parent][$row_id])) { $y++; }
 								}
-	
+
+							//debug information
+								//view_array($field_count);
+
 							//process a chunk of the array
 								if ($row_id === 1000) {
-
 									//save to the data
 										$database = new database;
 										$database->app_name = 'contacts';
@@ -382,14 +395,17 @@
 									//set the row id back to 0
 										$row_id = 0;
 								}
-	
+
 						} //if ($from_row <= $row_number)
+						unset($field_count);
 						$row_number++;
 						$row_id++;
 					} //end while
-
 					fclose($handle);
 
+				//debug information
+					//view_array($array);
+
 				//save to the data
 					if (is_array($array)) {
 						$database = new database;

contact_phone_edit.php

@@ -59,13 +59,14 @@
 
 //get http post variables and set them to php variables
 	if (is_array($_POST) && @sizeof($_POST) != 0) {
+		$phone_label = $_POST["phone_label"];
+		$phone_label_custom = $_POST["phone_label_custom"];
 		$phone_type_voice = $_POST["phone_type_voice"];
 		$phone_type_fax = $_POST["phone_type_fax"];
 		$phone_type_video = $_POST["phone_type_video"];
 		$phone_type_text = $_POST["phone_type_text"];
-		$phone_label = $_POST["phone_label"];
-		$phone_label_custom = $_POST["phone_label_custom"];
 		$phone_speed_dial = $_POST["phone_speed_dial"];
+		$phone_country_code = $_POST["phone_country_code"];
 		$phone_number = $_POST["phone_number"];
 		$phone_extension = $_POST["phone_extension"];
 		$phone_primary = $_POST["phone_primary"];
@@ -160,12 +161,13 @@
 					if (is_array($array) && @sizeof($array) != 0) {
 						$array['contact_phones'][0]['contact_uuid'] = $contact_uuid;
 						$array['contact_phones'][0]['domain_uuid'] = $domain_uuid;
+						$array['contact_phones'][0]['phone_label'] = $phone_label;
 						$array['contact_phones'][0]['phone_type_voice'] = $phone_type_voice ? 1 : null;
 						$array['contact_phones'][0]['phone_type_fax'] = $phone_type_fax ? 1 : null;
 						$array['contact_phones'][0]['phone_type_video'] = $phone_type_video ? 1 : null;
 						$array['contact_phones'][0]['phone_type_text'] = $phone_type_text ? 1 : null;
-						$array['contact_phones'][0]['phone_label'] = $phone_label;
 						$array['contact_phones'][0]['phone_speed_dial'] = $phone_speed_dial;
+						$array['contact_phones'][0]['phone_country_code'] = $phone_country_code;
 						$array['contact_phones'][0]['phone_number'] = $phone_number;
 						$array['contact_phones'][0]['phone_extension'] = $phone_extension;
 						$array['contact_phones'][0]['phone_primary'] = $phone_primary ? 1 : 0;
@@ -196,12 +198,13 @@
 		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
+			$phone_label = $row["phone_label"];
 			$phone_type_voice = $row["phone_type_voice"];
 			$phone_type_fax = $row["phone_type_fax"];
 			$phone_type_video = $row["phone_type_video"];
 			$phone_type_text = $row["phone_type_text"];
-			$phone_label = $row["phone_label"];
 			$phone_speed_dial = $row["phone_speed_dial"];
+			$phone_country_code = $row["phone_country_code"];
 			$phone_number = $row["phone_number"];
 			$phone_extension = $row["phone_extension"];
 			$phone_primary = $row["phone_primary"];
@@ -319,6 +322,17 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-phone_country_code']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='phone_country_code' maxlength='6' min='0' step='1' value=\"".escape($phone_country_code)."\">\n";
+	echo "<br />\n";
+	echo $text['description-phone_country_code']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-phone_number']."\n";
@@ -380,4 +394,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>

contacts.php

@@ -86,7 +86,7 @@
 	$sql .= "and contact_setting_name = 'array' ";
 	$sql .= "and contact_setting_value <> '' ";
 	$sql .= "and contact_setting_value is not null ";
-	if (!(if_group("superadmin") || if_group("admin"))) {
+	if (!permission_exists('contact_domain_view')) {
 		$sql .= "and ( "; //only contacts assigned to current user's group(s) and those not assigned to any group
 		$sql .= "	contact_uuid in ( ";
 		$sql .= "		select contact_uuid from v_contact_groups ";
@@ -186,8 +186,12 @@
 //build query for paging and list
 	$sql = "select count(*) ";
 	$sql .= "from v_contacts as c ";
-	$sql .= "where domain_uuid = :domain_uuid ";
-	if (!(if_group("superadmin") || if_group("admin"))) {
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('contact_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
+	if (!permission_exists('contact_domain_view')) {
 		$sql .= "and ( "; //only contacts assigned to current user's group(s) and those not assigned to any group
 		$sql .= "	contact_uuid in ( ";
 		$sql .= "		select contact_uuid from v_contact_groups ";
@@ -216,13 +220,15 @@
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
 	$sql .= $sql_search;
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('contact_all')) {
+		$param .= "&show=all";
+	}
 	$page = $_GET['page'];
 	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
 	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); //bottom
@@ -283,12 +289,20 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','collapse'=>'hide-sm-dn','link'=>'contact_edit.php']);
 	}
 	if (permission_exists('contact_delete') && $contacts) {
-		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_delete');"]);
+		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
-	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
-	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','collapse'=>'hide-sm-dn','style'=>($search != '' ? 'display: none;' : null)]);
-	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','collapse'=>'hide-sm-dn','link'=>'contacts.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('contact_all')) {
+		if ($_GET['show'] == 'all') {
+			echo "		<input type='hidden' name='show' value='all'>";
+		}
+		else {
+			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]);
+		}
+	}
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','collapse'=>'hide-sm-dn']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','collapse'=>'hide-sm-dn','link'=>'contacts.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -312,9 +326,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('contact_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($contacts ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($contacts ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('contact_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('contact_type', $text['label-contact_type'], $order_by, $order);
 	echo th_order_by('contact_organization', $text['label-contact_organization'], $order_by, $order);
 	echo "<th class='shrink hide-xs'>&nbsp;</th>\n";
@@ -336,10 +353,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('contact_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='contacts[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='contacts[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
 				echo "		<input type='hidden' name='contacts[$x][uuid]' value='".escape($row['contact_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('contact_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>".ucwords(escape($row['contact_type']))."&nbsp;</td>\n";
 			echo "	<td class='overflow'><a href='".$list_row_url."'>".escape($row['contact_organization'])."</a>&nbsp;</td>\n";
 			echo "	<td class='shrink no-link hide-xs center'>";
@@ -395,4 +421,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>