Merge pull request #6412 from colemanw/CRM-11369

CRM-11369 - Changed to Pending (pay later) and Pending (incomplete transaction)

diff --cc CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
index 6e83b5981e8362d77d1796dc7de3c4d4be2118a5,51714e9b457edb38fc26828e81cfb224a46b2ccb..37a2a475e8a1ec5df3e7ee8fd4a5f6cea86fce76
--- 1/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
--- 2/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
@@@ -20,8 -20,11 +20,12 @@@ UPDATE civicrm_option_value SET {locali
  UPDATE civicrm_option_value SET {localize field="label"}label = 'Activity Summary Report'{/localize}
    WHERE value = 'activitySummary' AND option_group_id = @option_group_id_report;
  
+ --CRM-11369
+ UPDATE civicrm_participant_status_type SET label = {localize field='label'}label = 'Pending (pay later)'{/localize} WHERE name = 'Pending from pay later';
+ UPDATE civicrm_participant_status_type SET label = {localize field='label'}label = 'Pending (incomplete transaction)'{/localize} WHERE name = 'Pending from incomplete transaction';
+ 
  --CRM-16853 PCP Owner Notification
 +--CRM-16853 Contribution Invoice Receipt Translation
  
  {include file='../CRM/Upgrade/4.7.alpha1.msg_template/civicrm_msg_template.tpl'}
  

diff --cc templates/CRM/Event/Form/EventFees.tpl
Simple merge

diff --cc tests/phpunit/WebTest/Event/AddEventTest.php
Simple merge

diff --cc xml/templates/civicrm_data.tpl
Simple merge