From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 17 Mar 2020 15:22:32 +0000 (-0400)
Subject: Fix typos in xml/dao
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d63dedfa6d2e7496b69600fb648d2749743c7ae8;p=civicrm-core.git

Fix typos in xml/dao
---

diff --git a/CRM/Contribute/DAO/Widget.php b/CRM/Contribute/DAO/Widget.php
index 5591ae497d..0705b3e744 100644
--- a/CRM/Contribute/DAO/Widget.php
+++ b/CRM/Contribute/DAO/Widget.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Widget.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4a3f77ad3185fba0d0c083a1000336b7)
+ * (GenCodeChecksum:5623f4ecd23646d12dd4278675006d7a)
  */
 
 /**
@@ -273,7 +273,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO {
         'color_button' => [
           'name' => 'color_button',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Button Colour'),
+          'title' => ts('Button Color'),
           'maxlength' => 10,
           'size' => CRM_Utils_Type::TWELVE,
           'where' => 'civicrm_contribution_widget.color_button',
@@ -309,7 +309,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO {
         'color_main' => [
           'name' => 'color_main',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Main Colour'),
+          'title' => ts('Main Color'),
           'maxlength' => 10,
           'size' => CRM_Utils_Type::TWELVE,
           'where' => 'civicrm_contribution_widget.color_main',
@@ -321,7 +321,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO {
         'color_main_bg' => [
           'name' => 'color_main_bg',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Backgroup Color'),
+          'title' => ts('Background Color'),
           'maxlength' => 10,
           'size' => CRM_Utils_Type::TWELVE,
           'where' => 'civicrm_contribution_widget.color_main_bg',
@@ -333,7 +333,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO {
         'color_bg' => [
           'name' => 'color_bg',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Other Backgroun Colour'),
+          'title' => ts('Other Background Color'),
           'maxlength' => 10,
           'size' => CRM_Utils_Type::TWELVE,
           'where' => 'civicrm_contribution_widget.color_bg',
@@ -345,7 +345,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO {
         'color_about_link' => [
           'name' => 'color_about_link',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('About Link Colour'),
+          'title' => ts('About Link Color'),
           'maxlength' => 10,
           'size' => CRM_Utils_Type::TWELVE,
           'where' => 'civicrm_contribution_widget.color_about_link',
@@ -357,7 +357,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO {
         'color_homepage_link' => [
           'name' => 'color_homepage_link',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Homepage Link Colour'),
+          'title' => ts('Homepage Link Color'),
           'maxlength' => 10,
           'size' => CRM_Utils_Type::TWELVE,
           'where' => 'civicrm_contribution_widget.color_homepage_link',
diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php
index 27bf406064..4895def521 100644
--- a/CRM/Mailing/DAO/Mailing.php
+++ b/CRM/Mailing/DAO/Mailing.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Mailing.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:222c7a4f7e002c8829fc415baf214dbc)
+ * (GenCodeChecksum:5e3229fc70fd87ddb448fcc672e44c3d)
  */
 
 /**
@@ -193,7 +193,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   public $msg_template_id;
 
   /**
-   * Should we overrite VERP address in Reply-To
+   * Overwrite the VERP address in Reply-To
    *
    * @var bool
    */
@@ -709,7 +709,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'name' => 'override_verp',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Override Verp'),
-          'description' => ts('Should we overrite VERP address in Reply-To'),
+          'description' => ts('Overwrite the VERP address in Reply-To'),
           'where' => 'civicrm_mailing.override_verp',
           'default' => '0',
           'table_name' => 'civicrm_mailing',
diff --git a/xml/schema/Contribute/Widget.xml b/xml/schema/Contribute/Widget.xml
index 22ffb11709..f6dd5b3178 100644
--- a/xml/schema/Contribute/Widget.xml
+++ b/xml/schema/Contribute/Widget.xml
@@ -87,7 +87,7 @@
   </field>
   <field>
     <name>color_button</name>
-    <title>Button Colour</title>
+    <title>Button Color</title>
     <type>varchar</type>
     <length>10</length>
     <add>2.0</add>
@@ -108,35 +108,35 @@
   </field>
   <field>
     <name>color_main</name>
-    <title>Main Colour</title>
+    <title>Main Color</title>
     <type>varchar</type>
     <length>10</length>
     <add>2.0</add>
   </field>
   <field>
     <name>color_main_bg</name>
-    <title>Backgroup Color</title>
+    <title>Background Color</title>
     <type>varchar</type>
     <length>10</length>
     <add>2.0</add>
   </field>
   <field>
     <name>color_bg</name>
-    <title>Other Backgroun Colour</title>
+    <title>Other Background Color</title>
     <type>varchar</type>
     <length>10</length>
     <add>2.0</add>
   </field>
   <field>
     <name>color_about_link</name>
-    <title>About Link Colour</title>
+    <title>About Link Color</title>
     <type>varchar</type>
     <length>10</length>
     <add>2.0</add>
   </field>
   <field>
     <name>color_homepage_link</name>
-    <title>Homepage Link Colour</title>
+    <title>Homepage Link Color</title>
     <type>varchar</type>
     <length>10</length>
     <add>2.0</add>
diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml
index 816e244694..975e67d15e 100644
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@ -265,7 +265,7 @@
     <type>boolean</type>
     <default>0</default>
     <add>2.2</add>
-    <comment>Should we overrite VERP address in Reply-To</comment>
+    <comment>Overwrite the VERP address in Reply-To</comment>
     <html>
       <type>CheckBox</type>
     </html>