CRM-16111: Translation string fixes (4.6 review).

diff --git a/CRM/Admin/Form/LabelFormats.php b/CRM/Admin/Form/LabelFormats.php
index 44675a784b78982534771e0c5b7725e87b7f26a9..27e82cb7bad998968f5eff9a8a88f3b9542ce1f1 100644 (file)
--- a/CRM/Admin/Form/LabelFormats.php
+++ b/CRM/Admin/Form/LabelFormats.php
@@ -139,17 +139,17 @@ class CRM_Admin_Form_LabelFormats extends CRM_Admin_Form {
       'CRM_Core_BAO_LabelFormat',
       $this->_id,
     ));
-    $this->addRule('NX', ts('Must be an integer'), 'integer');
-    $this->addRule('NY', ts('Must be an integer'), 'integer');
-    $this->addRule('tMargin', ts('Must be numeric'), 'numeric');
-    $this->addRule('lMargin', ts('Must be numeric'), 'numeric');
-    $this->addRule('SpaceX', ts('Must be numeric'), 'numeric');
-    $this->addRule('SpaceY', ts('Must be numeric'), 'numeric');
-    $this->addRule('lPadding', ts('Must be numeric'), 'numeric');
-    $this->addRule('tPadding', ts('Must be numeric'), 'numeric');
-    $this->addRule('width', ts('Must be numeric'), 'numeric');
-    $this->addRule('height', ts('Must be numeric'), 'numeric');
-    $this->addRule('weight', ts('Must be integer'), 'integer');
+    $this->addRule('NX', ts('Please enter a valid integer.'), 'integer');
+    $this->addRule('NY', ts('Please enter a valid integer.'), 'integer');
+    $this->addRule('tMargin', ts('Please enter a valid number.'), 'numeric');
+    $this->addRule('lMargin', ts('Please enter a valid number.'), 'numeric');
+    $this->addRule('SpaceX', ts('Please enter a valid number.'), 'numeric');
+    $this->addRule('SpaceY', ts('Please enter a valid number.'), 'numeric');
+    $this->addRule('lPadding', ts('Please enter a valid number.'), 'numeric');
+    $this->addRule('tPadding', ts('Please enter a valid number.'), 'numeric');
+    $this->addRule('width', ts('Please enter a valid number.'), 'numeric');
+    $this->addRule('height', ts('Please enter a valid number.'), 'numeric');
+    $this->addRule('weight', ts('Please enter a valid integer.'), 'integer');
   }
 
   /**

diff --git a/CRM/Admin/Form/Setting/Mail.php b/CRM/Admin/Form/Setting/Mail.php
index be2003c4ba072f6a5590f5464775424ecedb6d38..93154e656901ef3c1128eabdd0381fac52f6f5ac 100644 (file)
--- a/CRM/Admin/Form/Setting/Mail.php
+++ b/CRM/Admin/Form/Setting/Mail.php
@@ -61,10 +61,10 @@ class CRM_Admin_Form_Setting_Mail extends CRM_Admin_Form_Setting {
     $session->pushUserContext(CRM_Utils_System::url('civicrm/admin', 'reset=1'));
 
     $this->addFormRule(array('CRM_Admin_Form_Setting_Mail', 'formRule'));
-    $this->addRule('mailerBatchLimit', ts('Must be an integer'), 'integer');
-    $this->addRule('mailThrottleTime', ts('Must be an integer'), 'integer');
-    $this->addRule('mailerJobSize', ts('Must be an integer'), 'integer');
-    $this->addRule('mailerJobsMax', ts('Must be an integer'), 'integer');
+    $this->addRule('mailerBatchLimit', ts('Please enter a valid integer.'), 'integer');
+    $this->addRule('mailThrottleTime', ts('Please enter a valid integer.'), 'integer');
+    $this->addRule('mailerJobSize', ts('Please enter a valid integer.'), 'integer');
+    $this->addRule('mailerJobsMax', ts('Please enter a valid integer.'), 'integer');
 
     parent::buildQuickForm($check);
   }

diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php
index 60440827d08e1f1aa356afd83099f9b2a447d79f..9600fe27d3a4ec836ae5ff4890da99f3355dc201 100644 (file)
--- a/CRM/Contact/Form/Merge.php
+++ b/CRM/Contact/Form/Merge.php
@@ -264,7 +264,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
   }
 
   public function buildQuickForm() {
-    CRM_Utils_System::setTitle(ts('Merge %1s', array(1 => $this->_contactType)));
+    CRM_Utils_System::setTitle(ts('Merge %1 contacts', array(1 => $this->_contactType)));
     $buttons = array();
 
     $buttons[] = array(

diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl
index 0d4936a4188498406bb5f69b379575c0b6d8d7b1..4f2b0bb261d60461dead7aa8ecaafff1b6c686df 100644 (file)
--- a/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -321,7 +321,7 @@
       </select>
     </td>
     <td>
-      <input style="width: 85%;" class="crm-form-text api-param-value api-input" value="{ldelim}{rdelim}" placeholder="{ts}Api Params{/ts}"/>
+      <input style="width: 85%;" class="crm-form-text api-param-value api-input" value="{ldelim}{rdelim}" placeholder="{ts}API Params{/ts}"/>
       <a class="crm-hover-button api-param-remove" href="#"><span class="icon ui-icon-close"></span></a>
     </td>
   </tr>

diff --git a/templates/CRM/Campaign/Form/Petition/Signature.tpl b/templates/CRM/Campaign/Form/Petition/Signature.tpl
index 3c8b3fa0f8be36fb34e67ca220aa3d95d89889a5..8282bedc36910bc149dd137b3b14d83b2dbe482e 100644 (file)
--- a/templates/CRM/Campaign/Form/Petition/Signature.tpl
+++ b/templates/CRM/Campaign/Form/Petition/Signature.tpl
@@ -41,7 +41,7 @@
 </p>
 {/if}
 {if $duplicate == "unconfirmed"}
-<p>{ts}You have already signed this petition but you still <b>need to verify your email address</b>.</br> Please check your email inbox for the confirmation email. If you don't find it, verify if it isn't in your spam folder.{/ts}
+<p>{ts}You have already signed this petition but you still <b>need to verify your email address</b>.{/ts}</br> {ts}Please check your email inbox for the confirmation email. If you don't find it, verify if it isn't in your spam folder.{/ts}
 {/if}
 {if $duplicate}
 <p>{ts}Thank you for your support.{/ts}</p>

diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 1604565a267e680164746f4e071e242563ecd3ea..b57d99efdec5553e293c5944e5b9069f8ad81f7b 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -56,8 +56,7 @@
       {if $is_email_receipt}
         <div>
           {if $onBehalfEmail AND ($onBehalfEmail neq $email)}
-            {ts 1=$email 2=$onBehalfEmail}An email confirmation with these payment instructions has been sent to %1 and
-              to %2.{/ts}
+            {ts 1=$email 2=$onBehalfEmail}An email confirmation with these payment instructions has been sent to %1 and to %2.{/ts}
           {else}
             {ts 1=$email}An email confirmation with these payment instructions has been sent to %1.{/ts}
           {/if}
@@ -68,8 +67,7 @@
         {if $is_email_receipt}
       <div>
         {if $onBehalfEmail AND ($onBehalfEmail neq $email)}
-          {ts 1=$email 2=$onBehalfEmail}An email receipt will be sent to %1 and to %2 once the transaction is processed
-          successfully.{/ts}
+          {ts 1=$email 2=$onBehalfEmail}An email receipt will be sent to %1 and to %2 once the transaction is processed successfully.{/ts}
         {else}
           {ts 1=$email}An email receipt will be sent to %1 once the transaction is processed successfully.{/ts}
         {/if}

diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl
index 357b47897ab20f683f55562fc2af4a3b87064797..84738868a131a6aaa9447abe4d615c0b08ef003d 100644 (file)
--- a/xml/templates/message_templates/event_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/event_offline_receipt_html.tpl
@@ -231,7 +231,7 @@
        {if $dataArray}
         <tr>
          <td {$labelStyle}>
-          {ts} Amount Before Tax : {/ts}
+          {ts}Amount Before Tax:{/ts}
          </td>
          <td {$valueStyle}>
           {$totalAmount-$totalTaxAmount|crmMoney}