Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-22-22-01-44

[civicrm-core.git] / CRM / Activity / Import / Form / MapField.php

diff --git a/CRM/Activity/Import/Form/MapField.php b/CRM/Activity/Import/Form/MapField.php
index 543d2a6f00a8ab4dfd014ac35edf256f7c5d177c..70bdfa3e6e86a8008bd671f11595b2e799968324 100644 (file)
--- a/CRM/Activity/Import/Form/MapField.php
+++ b/CRM/Activity/Import/Form/MapField.php
@@ -42,7 +42,7 @@ class CRM_Activity_Import_Form_MapField extends CRM_Import_Form_MapField {
 
 
   /**
-   * Function to set variables up before form is built
+   * Set variables up before form is built
    *
    * @return void
    * @access public
@@ -78,7 +78,7 @@ class CRM_Activity_Import_Form_MapField extends CRM_Import_Form_MapField {
   }
 
   /**
-   * Function to actually build the form
+   * Build the form object
    *
    * @return void
    * @access public
@@ -267,7 +267,7 @@ class CRM_Activity_Import_Form_MapField extends CRM_Import_Form_MapField {
   }
 
   /**
-   * global validation rules for the form
+   * Global validation rules for the form
    *
    * @param array $fields posted values of the form
    *
@@ -291,7 +291,7 @@ class CRM_Activity_Import_Form_MapField extends CRM_Import_Form_MapField {
         'target_contact_id' => ts('Contact ID'),
         'activity_date_time' => ts('Activity Date'),
         'activity_subject' => ts('Activity Subject'),
-        'activity_type_id' => ts('Activity Type Id'),
+        'activity_type_id' => ts('Activity Type ID'),
       );
 
       $params = array(