From d8f8b40f59fe6bc11b7f73615d138cf87d8f8db4 Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@bidon.ca>
Date: Thu, 5 Mar 2015 20:51:43 -0500
Subject: [PATCH] CRM-16061: translation string fixes.

---
 CRM/Contribute/xml/Menu/Contribute.xml                        | 4 ++--
 CRM/Event/BAO/Query.php                                       | 4 ++--
 CRM/Upgrade/Incremental/php/FourFive.php                      | 4 ++--
 .../message_templates/membership_offline_receipt_html.tpl     | 2 +-
 .../message_templates/membership_online_receipt_html.tpl      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Contribute/xml/Menu/Contribute.xml b/CRM/Contribute/xml/Menu/Contribute.xml
index d3ba01373e..fe2225dfc1 100644
--- a/CRM/Contribute/xml/Menu/Contribute.xml
+++ b/CRM/Contribute/xml/Menu/Contribute.xml
@@ -302,7 +302,7 @@
   </item>
   <item>
     <path>civicrm/contribute/invoice</path>
-    <title>CiviContributePdf</title>
+    <title>CiviContribute PDF</title>
     <page_callback>CRM_Contribute_Form_Task_Invoice::getPrintPDF</page_callback>
     <access_arguments>access CiviContribute</access_arguments>
     <page_type>1</page_type>
@@ -311,7 +311,7 @@
   </item>
   <item>
     <path>civicrm/contribute/invoice/email</path>
-    <title>CiviContributePdf</title>
+    <title>CiviContribute PDF</title>
     <page_callback>CRM_Contribute_Form_Task_Invoice</page_callback>
     <access_arguments>access CiviContribute</access_arguments>
     <page_type>1</page_type>
diff --git a/CRM/Event/BAO/Query.php b/CRM/Event/BAO/Query.php
index d9d0a552a8..63b548b293 100644
--- a/CRM/Event/BAO/Query.php
+++ b/CRM/Event/BAO/Query.php
@@ -292,7 +292,7 @@ class CRM_Event_BAO_Query {
           }
         }
         $query->_where[$grouping][] = "civicrm_event.id $op {$value}";
-        $query->_qill[$grouping][] = ts('Include Repeating Events (If Any) ') . " = TRUE";
+        $query->_qill[$grouping][] = ts('Include Repeating Events');
         $query->_tables['civicrm_event'] = $query->_whereTables['civicrm_event'] = 1;
         return;
 
@@ -560,7 +560,7 @@ class CRM_Event_BAO_Query {
     $form->add('text', 'participant_fee_id', ts('Fee Level'), array('class' => 'big crm-ajax-select'));
 
     CRM_Core_Form_Date::buildDateRange($form, 'event', 1, '_start_date_low', '_end_date_high', ts('From'), FALSE);
-    $eventIncludeRepeatingEvents = &$form->addElement('checkbox', "event_include_repeating_events", NULL, ts(' Include Repeating Events (If Any) ? '));
+    $eventIncludeRepeatingEvents = &$form->addElement('checkbox', "event_include_repeating_events", NULL, ts('Include Repeating Events?'));
 
     $form->addSelect('participant_status_id',
       array('entity' => 'participant', 'label' => ts('Participant Status'), 'multiple' => 'multiple', 'option_url' => NULL, 'placeholder' => ts('- any -'))
diff --git a/CRM/Upgrade/Incremental/php/FourFive.php b/CRM/Upgrade/Incremental/php/FourFive.php
index 02f1e53152..e6dc429142 100644
--- a/CRM/Upgrade/Incremental/php/FourFive.php
+++ b/CRM/Upgrade/Incremental/php/FourFive.php
@@ -90,7 +90,7 @@ class CRM_Upgrade_Incremental_php_FourFive {
   public function upgrade_4_5_alpha1($rev) {
     // task to process sql
     $this->addTask(ts('Migrate honoree information to module_data'), 'migrateHonoreeInfo');
-    $this->addTask(ts('Upgrade DB to 4.5.alpha1: SQL'), 'task_4_5_x_runSql', $rev);
+    $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => '4.5.alpha1')), 'task_4_5_x_runSql', $rev);
     $this->addTask(ts('Set default for Individual name fields configuration'), 'addNameFieldOptions');
 
     // CRM-14522 - The below schema checking is done as foreign key name
@@ -127,7 +127,7 @@ DROP KEY `{$dao->CONSTRAINT_NAME}`";
    * @return bool
    */
   public function upgrade_4_5_beta9($rev) {
-    $this->addTask(ts('Upgrade DB to 4.5.beta9: SQL'), 'task_4_5_x_runSql', $rev);
+    $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => '4.5.beta9')), 'task_4_5_x_runSql', $rev);
 
     $entityTable = array(
       'Participant' => 'civicrm_participant_payment',
diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl
index 8a2c0e1eab..2abdab7c54 100644
--- a/xml/templates/message_templates/membership_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl
@@ -146,7 +146,7 @@
        {if $dataArray}
         <tr>
          <td {$labelStyle}>
-          {ts}Amount Before Tax : {/ts}
+          {ts}Amount Before Tax:{/ts}
          </td>
          <td {$valueStyle}>
           {$formValues.total_amount-$totalTaxAmount|crmMoney}
diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl
index b4d8619b2f..fe5052fb90 100644
--- a/xml/templates/message_templates/membership_online_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_online_receipt_html.tpl
@@ -222,7 +222,7 @@
        {if $dataArray}
         <tr>
          <td {$labelStyle}>
-          {ts} Amount Before Tax : {/ts}
+          {ts}Amount Before Tax:{/ts}
          </td>
          <td {$valueStyle}>
           {$amount-$totalTaxAmount|crmMoney}
-- 
2.25.1