From 0865a4ed90fa585276902b191a1dff9b929a9147 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Mon, 19 Jan 2015 13:00:33 -0500 Subject: [PATCH] CRM-15812 - Remove linebreaks from within {ts} strings ---------------------------------------- * CRM-15812: Translated strings not shown https://issues.civicrm.org/jira/browse/CRM-15812 --- .../event_offline_receipt_html.tpl | 7 +- .../event_offline_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_offline_receipt_html.tpl | 7 +- .../event_offline_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_offline_receipt_html.tpl | 7 +- .../event_offline_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_offline_receipt_html.tpl | 7 +- .../event_offline_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_offline_receipt_html.tpl | 7 +- .../event_offline_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../contribution_dupalert_html.tpl | 7 +- .../contribution_dupalert_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../event_offline_receipt_html.tpl | 7 +- .../event_offline_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../contribution_invoice_receipt_subject.tpl | 13 +++- .../event_offline_receipt_html.tpl | 7 +- .../event_offline_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../CRM/Admin/Form/Preferences/Address.hlp | 10 +-- .../CRM/Admin/Form/Preferences/Display.tpl | 33 +++------ templates/CRM/Admin/Form/Setting/Smtp.tpl | 8 +-- templates/CRM/Admin/Page/PaymentProcessor.hlp | 8 +-- .../CRM/Campaign/Form/Petition/Signature.tpl | 3 +- .../Campaign/Form/addCampaignToComponent.hlp | 3 +- .../CRM/Contact/Form/Search/Advanced.hlp | 3 +- templates/CRM/Contact/Form/Task/Email.hlp | 6 +- .../CRM/Contact/Import/Form/DataSource.hlp | 12 +--- .../CRM/Contribute/Form/Contribution.tpl | 6 +- .../Form/ContributionPage/Premium.tpl | 12 +--- .../Form/ContributionPage/ThankYou.hlp | 17 ++--- .../CRM/Contribute/Form/Task/Invoice.tpl | 4 +- .../CRM/Contribute/Form/Task/PDFLetter.hlp | 13 +--- templates/CRM/Core/Form/RecurringEntity.hlp | 72 ++++++++----------- templates/CRM/Core/paypalexpress.tpl | 4 +- templates/CRM/Custom/Form/Field.tpl | 3 +- .../CRM/Custom/Import/Form/DataSource.hlp | 5 +- templates/CRM/Export/Form/Select.hlp | 8 +-- templates/CRM/Member/Form/Membership.hlp | 19 +++-- templates/CRM/Member/Page/Tab.hlp | 7 +- templates/CRM/Price/Page/Field.hlp | 13 ++-- templates/CRM/Report/Form/Settings.hlp | 4 +- templates/CRM/UF/Form/Group.hlp | 3 +- .../contribution_dupalert_html.tpl | 7 +- .../contribution_dupalert_text.tpl | 7 +- .../contribution_invoice_receipt_subject.tpl | 13 +++- .../event_offline_receipt_html.tpl | 7 +- .../event_offline_receipt_text.tpl | 7 +- .../event_online_receipt_html.tpl | 7 +- .../event_online_receipt_text.tpl | 7 +- .../pcp_status_change_html.tpl | 6 +- .../pcp_status_change_text.tpl | 6 +- .../pcp_supporter_notify_html.tpl | 3 +- .../pcp_supporter_notify_text.tpl | 3 +- 82 files changed, 222 insertions(+), 462 deletions(-) diff --git a/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl index c2ad87ea6c..1dacb43a6d 100755 --- a/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl index 87d982d7ab..08bbd663c7 100755 --- a/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl +++ b/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $participantCount }===================={/if} @@ -20,9 +19,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $participantCount }===================={/if} diff --git a/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_online_receipt_html.tpl index edda905918..b5280cf7f5 100755 --- a/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_online_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_online_receipt_text.tpl index 6202fae4b9..a0606f0a9d 100755 --- a/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/3.2.alpha1.msg_template/message_templates/event_online_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $participantCount }===================={/if} @@ -19,9 +18,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $participantCount }===================={/if} diff --git a/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_offline_receipt_html.tpl index 7e6c5522b0..9dc50d7f2e 100644 --- a/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_offline_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_offline_receipt_text.tpl index cfc17b293a..32879bb39f 100644 --- a/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_offline_receipt_text.tpl +++ b/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_offline_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -20,9 +19,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_online_receipt_html.tpl index 24e6cf49da..9e07286c93 100644 --- a/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_online_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_online_receipt_text.tpl index 1bfc5b0d35..90bdfe369f 100644 --- a/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/3.3.beta2.msg_template/message_templates/event_online_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -19,9 +18,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/3.4.5.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/3.4.5.msg_template/message_templates/event_online_receipt_html.tpl index 8f6227533f..228da66852 100644 --- a/CRM/Upgrade/3.4.5.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/3.4.5.msg_template/message_templates/event_online_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/3.4.5.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/3.4.5.msg_template/message_templates/event_online_receipt_text.tpl index 5d714f8997..c59a7f3def 100644 --- a/CRM/Upgrade/3.4.5.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/3.4.5.msg_template/message_templates/event_online_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -19,9 +18,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/3.4.beta2.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/3.4.beta2.msg_template/message_templates/event_online_receipt_html.tpl index 4a6b89ed97..96448de0e5 100644 --- a/CRM/Upgrade/3.4.beta2.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/3.4.beta2.msg_template/message_templates/event_online_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/3.4.beta2.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/3.4.beta2.msg_template/message_templates/event_online_receipt_text.tpl index c5bc46f328..376081ece7 100644 --- a/CRM/Upgrade/3.4.beta2.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/3.4.beta2.msg_template/message_templates/event_online_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -19,9 +18,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.1.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.1.alpha1.msg_template/message_templates/event_online_receipt_html.tpl index 331348c83c..98a9422078 100644 --- a/CRM/Upgrade/4.1.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.1.alpha1.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.1.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.1.alpha1.msg_template/message_templates/event_online_receipt_text.tpl index 750dd0b93f..e2f6777899 100644 --- a/CRM/Upgrade/4.1.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.1.alpha1.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.2.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.2.alpha1.msg_template/message_templates/event_online_receipt_html.tpl index 1081ba353e..2ee5f29d08 100644 --- a/CRM/Upgrade/4.2.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.2.alpha1.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.2.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.2.alpha1.msg_template/message_templates/event_online_receipt_text.tpl index 6b0a012826..27c37624d8 100644 --- a/CRM/Upgrade/4.2.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.2.alpha1.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_offline_receipt_html.tpl index 6594f137eb..54d770bf62 100644 --- a/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_offline_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_offline_receipt_text.tpl index cfc17b293a..32879bb39f 100644 --- a/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_offline_receipt_text.tpl +++ b/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_offline_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -20,9 +19,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_online_receipt_html.tpl index b1aa30888d..f48fc26dce 100644 --- a/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_online_receipt_text.tpl index a566174736..8696c6d16b 100644 --- a/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.2.alpha2.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.2.beta3.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.2.beta3.msg_template/message_templates/event_online_receipt_html.tpl index eca14846a1..9b257e55af 100644 --- a/CRM/Upgrade/4.2.beta3.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.2.beta3.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.2.beta3.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.2.beta3.msg_template/message_templates/event_online_receipt_text.tpl index 2a6e11ff7a..56527f51ba 100644 --- a/CRM/Upgrade/4.2.beta3.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.2.beta3.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_html.tpl index d26a95bf4c..6bfa5f5b78 100644 --- a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_text.tpl index 02985ca010..603ad2de4c 100644 --- a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_text.tpl +++ b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -20,9 +19,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl index 704017e841..4e86fbfb2e 100644 --- a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_text.tpl index 2e18deffb4..db5bec9882 100644 --- a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl index da8df90665..38004aa3a0 100644 --- a/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl index 0890ed6e8c..62fb64da11 100644 --- a/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl +++ b/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -20,9 +19,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_online_receipt_html.tpl index badc5163d2..03e938a9df 100644 --- a/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_online_receipt_text.tpl index 885196ce83..5b24cb2c41 100644 --- a/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.3.alpha1.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.3.alpha3.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.3.alpha3.msg_template/message_templates/event_online_receipt_html.tpl index 978e9f6799..94d6b43177 100644 --- a/CRM/Upgrade/4.3.alpha3.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.3.alpha3.msg_template/message_templates/event_online_receipt_html.tpl @@ -34,15 +34,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.3.alpha3.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.3.alpha3.msg_template/message_templates/event_online_receipt_text.tpl index dda94891ef..f7314e7567 100644 --- a/CRM/Upgrade/4.3.alpha3.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.3.alpha3.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_html.tpl index c519669e4c..ca4c608d8a 100644 --- a/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_text.tpl index 726b3f3e7a..ba339e7b85 100644 --- a/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_html.tpl b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_html.tpl index c5ac3109c4..0f782a9c98 100644 --- a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_html.tpl +++ b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_html.tpl @@ -22,8 +22,7 @@

{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}

-

{ts}The information provided matched multiple existing database records based on the configured -Duplicate Matching Rules for your site.{/ts}

+

{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}

@@ -58,9 +57,7 @@ Duplicate Matching Rules for your site.{/ts}

-

{ts}If you think this may be a duplicate contact which should be merged with an existing record - -Go to "Contacts >> Find and Merge Duplicate Contacts". Use the strict -rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}

+

{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to "Contacts >> Find and Merge Duplicate Contacts". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}

{if $receiptMessage} diff --git a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_text.tpl b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_text.tpl index 217c0536a1..28b2a37f22 100644 --- a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_text.tpl +++ b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_text.tpl @@ -1,14 +1,11 @@ {ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts} -{ts}The information provided matched multiple existing database records based on the configured -Duplicate Matching Rules for your site.{/ts} +{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts} {ts}Organization Name{/ts}: {$onBehalfName} {ts}Organization Email{/ts}: {$onBehalfEmail} {ts}Organization Contact ID{/ts}: {$onBehalfID} -{ts}If you think this may be a duplicate contact which should be merged with an existing record - -Go to "Contacts >> Find and Merge Duplicate Contacts". Use the strict -rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts} +{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to "Contacts >> Find and Merge Duplicate Contacts". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts} {if $receiptMessage} ########################################################### diff --git a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_html.tpl index 769a46666d..2c9da1a36c 100644 --- a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_text.tpl index ffc380b196..ce7b1714dc 100644 --- a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl index fb3b957b4f..c346302e59 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl index ba90e1f240..fcc0a43be5 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -20,9 +19,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl index da8a6ec05b..70540857c2 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl index 0694302ee8..d6f5c64535 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl index 6cb6bf1a02..f99fe44750 100644 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl +++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl @@ -1,2 +1,11 @@ -{if $title}{if $component}{if $component == 'event'} {ts}Event Registration Invoice:- {$title}{/ts}{else}{ts}Contribution Invoice : - {$title}{/ts}{/if}{/if} {else} {ts}Invoice {/ts} {/if} +{if $title} + {if $component} + {if $component == 'event'} + {ts 1=$title}Event Registration Invoice: %1{/ts} + {else} + {ts 1=$title}Contribution Invoice: %1{/ts} + {/if} + {/if} +{else} + {ts}Invoice{/ts} +{/if} diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl index ca7d00dd45..357b47897a 100644 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl @@ -29,15 +29,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl index 89eada777d..d1a5a52d74 100644 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl +++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl @@ -8,8 +8,7 @@ {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -20,9 +19,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl index 9cd8aecfa4..d5be9dd8a0 100644 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl @@ -35,15 +35,12 @@ {if $isOnWaitlist}

{ts}You have been added to the WAIT LIST for this event.{/ts}

{if $isPrimary} -

{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts}

+

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

{/if} {elseif $isRequireApproval}

{ts}Your registration has been submitted.{/ts}

{if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts}

+

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

{/if} {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl index 38830ee1e3..ee41487e10 100644 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl @@ -14,8 +14,7 @@ Thank you for your participation. This letter is a confirmation that your regis {ts}You have been added to the WAIT LIST for this event.{/ts} {if $isPrimary} -{ts}If space becomes available you will receive an email with -a link to a web page where you can complete your registration.{/ts} +{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} @@ -25,9 +24,7 @@ a link to a web page where you can complete your registration.{/ts} {ts}Your registration has been submitted.{/ts} {if $isPrimary} -{ts}Once your registration has been reviewed, you will receive -an email with a link to a web page where you can complete the -registration process.{/ts} +{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} {/if} ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/templates/CRM/Admin/Form/Preferences/Address.hlp b/templates/CRM/Admin/Form/Preferences/Address.hlp index 69299fd6a4..f3f128af3c 100644 --- a/templates/CRM/Admin/Form/Preferences/Address.hlp +++ b/templates/CRM/Admin/Form/Preferences/Address.hlp @@ -27,19 +27,15 @@ {ts}Mailing Label Tokens{/ts} {/htxt} {htxt id="label-tokens"} -

{ts}Configure mailing labels for your site using tokens, which are replaced by contact field values when the labels are generated. -Place your cursor within the Mailing Labels box where you want to the token to be inserted. Then click the "Insert Tokens" link -to see a list of available tokens (including custom fields). Insert the token by clicking the desired token name.{/ts}

+{capture assign="example"}{ldelim}contact.custom_12{rdelim}{/capture} +

{ts}Configure mailing labels for your site using tokens, which are replaced by contact field values when the labels are generated. Place your cursor within the Mailing Labels box where you want to the token to be inserted. Then click the "Insert Tokens" link to see a list of available tokens (including custom fields). Insert the token by clicking the desired token name.{/ts}

{/htxt} diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl index cab66a3990..a5219735a5 100644 --- a/templates/CRM/Admin/Form/Preferences/Display.tpl +++ b/templates/CRM/Admin/Form/Preferences/Display.tpl @@ -50,8 +50,7 @@   - {ts}Controls display of the smart groups that a contact is part of in each contact's "Groups" tab. - "Show on Demand" provides the best performance, and is recommended for most sites.{/ts} + {ts}Controls display of the smart groups that a contact is part of in each contact's "Groups" tab. "Show on Demand" provides the best performance, and is recommended for most sites.{/ts} @@ -101,10 +100,7 @@   - {ts}Select the sections that should be included when adding or editing a contact record. - EXAMPLE: If your organization does not record Gender and Birth Date for individuals, then simplify the form - by un-checking this option. Drag interface allows you to change the order of the panes displayed on contact - add/edit screen.{/ts} + {ts}Select the sections that should be included when adding or editing a contact record. EXAMPLE: If your organization does not record Gender and Birth Date for individuals, then simplify the form by un-checking this option. Drag interface allows you to change the order of the panes displayed on contact add/edit screen.{/ts} @@ -113,10 +109,8 @@   - {ts}Select the sections that should be included in the Basic and Advanced Search forms. - EXAMPLE: If you don't track Relationships - then you do not need this section included in the advanced search - form. Simplify the form by un-checking this option.{/ts} + + {ts}Select the sections that should be included in the Basic and Advanced Search forms. EXAMPLE: If you don't track Relationships - then you do not need this section included in the advanced search form. Simplify the form by un-checking this option.{/ts} @@ -125,8 +119,7 @@   - {ts}When enabled, checks for contacts with similar names as the user types values into - the contact form name fields.{/ts} + {ts}When enabled, checks for contacts with similar names as the user types values into the contact form name fields.{/ts} @@ -136,8 +129,7 @@   - {ts}When enabled, contacts who are assigned activities will automatically receive an email notification - with a copy of the activity.{/ts} + {ts}When enabled, contacts who are assigned activities will automatically receive an email notification with a copy of the activity.{/ts} @@ -147,8 +139,7 @@   - {ts}When enabled, the assignee notification sent out above will also include - an ical meeting invite.{/ts} + {ts}When enabled, the assignee notification sent out above will also include an ical meeting invite.{/ts} @@ -159,8 +150,7 @@   - {ts}Select the sections that should be included in the Contact Dashboard. EXAMPLE: If you don't want - constituents to view their own contribution history, un-check that option.{/ts} + {ts}Select the sections that should be included in the Contact Dashboard. EXAMPLE: If you don't want constituents to view their own contribution history, un-check that option.{/ts} @@ -182,8 +172,7 @@ {/literal}
- {ts}You will need to enable and configure several modules if you want to allow users to upload images - while using a Drupal Default Editor.{/ts} + {ts}You will need to enable and configure several modules if you want to allow users to upload images while using a Drupal Default Editor.{/ts} {docURL page="Configuring CiviCRM to Use the Default Drupal Editor" resource="wiki"} @@ -192,9 +181,7 @@   - {ts}Select the HTML WYSIWYG Editor provided for fields that allow HTML formatting. Select 'Textarea' - if you don't want to provide a WYSIWYG Editor (users will type text and / or HTML code into plain text - fields).{/ts} {help id="id-editor_id"} + {ts}Select the HTML WYSIWYG Editor provided for fields that allow HTML formatting. Select 'Textarea' if you don't want to provide a WYSIWYG Editor (users will type text and / or HTML code into plain text fields).{/ts} {help id="id-editor_id"} diff --git a/templates/CRM/Admin/Form/Setting/Smtp.tpl b/templates/CRM/Admin/Form/Setting/Smtp.tpl index 474311e789..ceb2ac8579 100644 --- a/templates/CRM/Admin/Form/Setting/Smtp.tpl +++ b/templates/CRM/Admin/Form/Setting/Smtp.tpl @@ -25,11 +25,9 @@ *}
- {ts}

CiviCRM offers several options to send emails. The default option should work fine on linux systems. If you are using windows, you probably need to enter settings for your SMTP/Sendmail server. You can send a test email to check your settings by clicking "Save and Send Test Email". If you're unsure of the correct values, check with your system administrator, ISP or hosting provider.

- -

If you do not want users to send outbound mail from CiviCRM, select "Disable Outbound Email". NOTE: If you disable outbound email, and you are using Online Contribution pages or online Event Registration - you will need to disable automated receipts and registration confirmations.

- -

If you choose Redirect to Database, all emails will be recorded as archived mailings instead of being sent out. They can be found in the civicrm_mailing_spool table in the CiviCRM database.

{/ts} +

{ts}CiviCRM offers several options to send emails. The default option should work fine on linux systems. If you are using windows, you probably need to enter settings for your SMTP/Sendmail server. You can send a test email to check your settings by clicking "Save and Send Test Email". If you're unsure of the correct values, check with your system administrator, ISP or hosting provider.{/ts}

+

{ts}If you do not want users to send outbound mail from CiviCRM, select "Disable Outbound Email". NOTE: If you disable outbound email, and you are using Online Contribution pages or online Event Registration - you will need to disable automated receipts and registration confirmations.{/ts}

+

{ts}If you choose Redirect to Database, all emails will be recorded as archived mailings instead of being sent out. They can be found in the civicrm_mailing_spool table in the CiviCRM database.{/ts}

diff --git a/templates/CRM/Admin/Page/PaymentProcessor.hlp b/templates/CRM/Admin/Page/PaymentProcessor.hlp index 979609e83e..7ca4dd326f 100644 --- a/templates/CRM/Admin/Page/PaymentProcessor.hlp +++ b/templates/CRM/Admin/Page/PaymentProcessor.hlp @@ -362,16 +362,12 @@ {ts 1='4111111111111111' 2='76'}The test Credit Card number is %1 - this is the only credit card number that will work on the test gateway. The test Total Amount can be any amount except one that ends in a value of .%2 (e.g. $10.%2) - all amounts ending in .%2 will return a failed response.{/ts} {/htxt} -{htxt id='Payment_Express-test-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. -If you have been given a MAC key please fill in the Mac Key field, and use https://sec.paymentexpress.com/pxpay/pxpay.aspx for the Site URL. -Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt} +{htxt id='Payment_Express-test-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. If you have been given a MAC key please fill in the Mac Key field, and use https://sec.paymentexpress.com/pxpay/pxpay.aspx for the Site URL. Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt} {htxt id='Payment_Express-live-user-name'} {ts}Payment Express UserID (LIVE account):{/ts} {ts}This is the live user name provided to you by DPS/Payment Express.{/ts}{/htxt} -{htxt id='Payment_Express-live-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. -If you have been given a MAC key please fill in the Mac Key field, and use https://sec.paymentexpress.com/pxpay/pxpay.aspx for the Site URL. -Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt} +{htxt id='Payment_Express-live-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. If you have been given a MAC key please fill in the Mac Key field, and use https://sec.paymentexpress.com/pxpay/pxpay.aspx for the Site URL. Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt} {htxt id='Elavon-live-user-name'}

{ts}This is the LIVE Elavon Merchant ID associated with your Elavon account.{/ts}

diff --git a/templates/CRM/Campaign/Form/Petition/Signature.tpl b/templates/CRM/Campaign/Form/Petition/Signature.tpl index 0c867b6593..3c8b3fa0f8 100644 --- a/templates/CRM/Campaign/Form/Petition/Signature.tpl +++ b/templates/CRM/Campaign/Form/Petition/Signature.tpl @@ -41,8 +41,7 @@

{/if} {if $duplicate == "unconfirmed"} -

{ts}You have already signed this petition but you still need to verify your email address.
-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} +

{ts}You have already signed this petition but you still need to verify your email address.
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}

{ts}Thank you for your support.{/ts}

diff --git a/templates/CRM/Campaign/Form/addCampaignToComponent.hlp b/templates/CRM/Campaign/Form/addCampaignToComponent.hlp index eddfb5b0bc..08bafa30fb 100644 --- a/templates/CRM/Campaign/Form/addCampaignToComponent.hlp +++ b/templates/CRM/Campaign/Form/addCampaignToComponent.hlp @@ -27,6 +27,5 @@ {ts}Campaigns{/ts} {/htxt} {htxt id="id-campaign_id"} -{ts}Your organization can use Campaigns to track all constituent interactions related to a particular fund-raising or engagement effort. You can link -activities, contributions, event participation, mailings, membership signups, and pledges to a particular campaign.{/ts} +{ts}Your organization can use Campaigns to track all constituent interactions related to a particular fund-raising or engagement effort. You can link activities, contributions, event participation, mailings, membership signups, and pledges to a particular campaign.{/ts} {/htxt} diff --git a/templates/CRM/Contact/Form/Search/Advanced.hlp b/templates/CRM/Contact/Form/Search/Advanced.hlp index 3c46833b37..6fec966480 100644 --- a/templates/CRM/Contact/Form/Search/Advanced.hlp +++ b/templates/CRM/Contact/Form/Search/Advanced.hlp @@ -78,8 +78,7 @@ {ts}Target Contact Group{/ts} {/htxt} {htxt id="id-relationship-target-group"} -

{ts}Use this filter to limit search results to relationships where the related contacts are part of a specific group or groups. - For example, you might want to find all individuals who are employees ('Employee of' relationship type) of organizations which are in your 'Corporate Sponsors' group.{/ts}

+

{ts}Use this filter to limit search results to relationships where the related contacts are part of a specific group or groups. For example, you might want to find all individuals who are employees ('Employee of' relationship type) of organizations which are in your 'Corporate Sponsors' group.{/ts}

{/htxt} {htxt id="id-all-tags-title"} diff --git a/templates/CRM/Contact/Form/Task/Email.hlp b/templates/CRM/Contact/Form/Task/Email.hlp index cb7e3b4d92..f873edbce1 100644 --- a/templates/CRM/Contact/Form/Task/Email.hlp +++ b/templates/CRM/Contact/Form/Task/Email.hlp @@ -53,8 +53,7 @@ {ts}You will also use tokens to insert Unsubscribe, Opt out and Forwarding links in your message.{/ts}

{/if} -

{ts}Custom tokens (based on custom data) can be added for organizations as well. These tokens will not be displayed in the list of available tokens, -but can be added manually. The format is {literal}{contact.custom_12}{/literal} – where 12 is the ID of the custom data field. To find the custom data field ID, +

{ts}Custom tokens (based on custom data) can be added for organizations as well. These tokens will not be displayed in the list of available tokens, but can be added manually. The format is {literal}{contact.custom_12}{/literal} – where 12 is the ID of the custom data field. To find the custom data field ID, go Administer > Customize Data & Screens > Custom Fields and click ‘edit’ on the field you want to use. Look at the URL. The last part of the URL will be an equal sign and a number (=12). The number (12 in this example) is the id of that custom field.{/ts}

{/htxt} @@ -86,8 +85,7 @@ be an equal sign and a number (=12). The number (12 in this example) is the id o {/if}

{/if} -

{ts}Custom tokens (based on custom data) can be added for organizations as well. These tokens will not be displayed in the list of available tokens, -but can be added manually. The format is {literal}{contact.custom_12}{/literal} – where 12 is the ID of the custom data field. To find the custom data field ID, +

{ts}Custom tokens (based on custom data) can be added for organizations as well. These tokens will not be displayed in the list of available tokens, but can be added manually. The format is {literal}{contact.custom_12}{/literal} – where 12 is the ID of the custom data field. To find the custom data field ID, go Administer > Customize Data & Screens > Custom Fields and click ‘edit’ on the field you want to use. Look at the URL. The last part of the URL will be an equal sign and a number (=12). The number (12 in this example) is the id of that custom field.{/ts}

{/htxt} diff --git a/templates/CRM/Contact/Import/Form/DataSource.hlp b/templates/CRM/Contact/Import/Form/DataSource.hlp index 5b41dff495..ecdcfdd18d 100644 --- a/templates/CRM/Contact/Import/Form/DataSource.hlp +++ b/templates/CRM/Contact/Import/Form/DataSource.hlp @@ -104,19 +104,13 @@ {ts}Dedupe Rule{/ts} {/htxt} {htxt id='id-dedupe_rule'} - {ts}If you have selected one of the dedupe options besides "no duplicate checking," CiviCRM will use a - predefined dedupe rule to determine possible matches for your imported records. Existing dedupe rules - may be reviewed, and new rules created, by visiting Contacts > Find and Merge Duplicate Contacts. When - selecting a dedupe rule, be sure to choose one that includes fields contained in your import file. - Also be aware that the update and fill options could have significant impact on your existing data. - You should define and select a rule that is strict enough to ensure there are no false positive matches.{/ts} + {ts}If you have selected one of the dedupe options besides "no duplicate checking," CiviCRM will use a predefined dedupe rule to determine possible matches for your imported records. Existing dedupe rules may be reviewed, and new rules created, by visiting Contacts > Find and Merge Duplicate Contacts.{/ts} + {ts}When selecting a dedupe rule, be sure to choose one that includes fields contained in your import file. Also be aware that the update and fill options could have significant impact on your existing data. You should define and select a rule that is strict enough to ensure there are no false positive matches.{/ts} {/htxt} {htxt id='id-fieldSeparator-title'} {ts}Field Separator{/ts} {/htxt} {htxt id='id-fieldSeparator'} - {ts}Enter the character used to separate data columns in your import file. By default, the field - will populate with the separator defined in your global settings. Common values include a comma, semicolon, - or pipe character. To import a tab separated file, enter "tab" (without quotes) in the field.{/ts} + {ts}Enter the character used to separate data columns in your import file. By default, the field will populate with the separator defined in your global settings. Common values include a comma, semicolon, or pipe character. To import a tab separated file, enter "tab" (without quotes) in the field.{/ts} {/htxt} diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl index 9ce7f2cca9..1a3bd273cc 100644 --- a/templates/CRM/Contribute/Form/Contribution.tpl +++ b/templates/CRM/Contribute/Form/Contribution.tpl @@ -247,8 +247,7 @@ diff --git a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl index 048fdad64e..4c7cf3b860 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl @@ -67,9 +67,7 @@ @@ -79,9 +77,7 @@ @@ -91,9 +87,7 @@ diff --git a/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp b/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp index 5fd55b6ffd..2e61a48d60 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp @@ -27,10 +27,7 @@ {ts}Thank-you and Receipting{/ts} {/htxt} {htxt id="id_thank"} -

{ts}Use this form to configure the thank-you message and receipting options for this online contribution page. Contributors will -see a thank-you page whenever an online contribution is successfully processed. You provide the content and layout of the -thank-you section below. You also control whether an electronic receipt is automatically emailed to each contributor - and can add -a custom message to that receipt.{/ts}

+

{ts}Use this form to configure the thank-you message and receipting options for this online contribution page. Contributors will see a thank-you page whenever an online contribution is successfully processed. You provide the content and layout of the thank-you section below. You also control whether an electronic receipt is automatically emailed to each contributor - and can add a custom message to that receipt.{/ts}

{/htxt} {htxt id="id_thankyou-title-title"} @@ -51,8 +48,7 @@ a custom message to that receipt.{/ts}

{ts}Thank-you Page Footer{/ts} {/htxt} {htxt id="id_footer-text"} -

{ts}Enter link(s) and/or text that you want to appear at the bottom of the thank-you page. You can use this content area to encourage contributors to visit a tell-a-friend - page or take some other action.{/ts}

+

{ts}Enter link(s) and/or text that you want to appear at the bottom of the thank-you page. You can use this content area to encourage contributors to visit a tell-a-friend page or take some other action.{/ts}

{ts}NOTE: Social media links will be automatically included if you have enabled 'Social media sharing' for this page (see the 'Title' tab).{/ts}

{/htxt} @@ -85,8 +81,7 @@ a custom message to that receipt.{/ts}

{ts}Additional Receipt Message{/ts} {/htxt} {htxt id="id_receipt-text"} -

{ts}Enter a message you want included at the beginning of emailed receipts. This message will be inserted at the top of the "Contributions - Receipt (on-line)" - System Workflow Message.{/ts}

+

{ts}Enter a message you want included at the beginning of emailed receipts. This message will be inserted at the top of the "Contributions - Receipt (on-line)" System Workflow Message.{/ts}

{ts}IMPORTANT: Keep in mind that this message will be included in ALL of the following types of receipts related to this online contribution page{/ts}:

diff --git a/templates/CRM/Custom/Import/Form/DataSource.hlp b/templates/CRM/Custom/Import/Form/DataSource.hlp index 4683080a91..3bad5eb23f 100644 --- a/templates/CRM/Custom/Import/Form/DataSource.hlp +++ b/templates/CRM/Custom/Import/Form/DataSource.hlp @@ -27,9 +27,6 @@ {ts}Importing Multi-value Custom Data{/ts} {/htxt} {htxt id="upload"} - {ts}The import file should contain a row for each set of custom data fields. For example, if you are importing employment - history for a group of contacts, each row might contain columns for Employer, Start Date, End Date, and Position. - You will also need a column containing the CiviCRM Internal Contact ID which is used to match each row to the corresponding - (existing) CiviCRM contact record. NOTE: Contact IDs are included by default when exporting contacts from CiviCRM.{/ts} + {ts}The import file should contain a row for each set of custom data fields. For example, if you are importing employment history for a group of contacts, each row might contain columns for Employer, Start Date, End Date, and Position. You will also need a column containing the CiviCRM Internal Contact ID which is used to match each row to the corresponding (existing) CiviCRM contact record. NOTE: Contact IDs are included by default when exporting contacts from CiviCRM.{/ts} {/htxt} diff --git a/templates/CRM/Export/Form/Select.hlp b/templates/CRM/Export/Form/Select.hlp index e9ec5e780b..1d097b3eb4 100644 --- a/templates/CRM/Export/Form/Select.hlp +++ b/templates/CRM/Export/Form/Select.hlp @@ -4,13 +4,9 @@ {ts}Merge Options{/ts} {/htxt} {htxt id="id-export_merge_options"} -

{ts}Use one of the merge contact options when exporting records to reduce your mailing size by sending a single piece of mail to each -address.{/ts}

+

{ts}Use one of the merge contact options when exporting records to reduce your mailing size by sending a single piece of mail to each address.{/ts}

-

{ts}Merge Contacts with the Same Address will combine any records having the same address (street address, city, postal code, country) into -a single record. If a household record already exists in which multiple individuals share an address, the household will be exported as -the combined record. If no household record exists, the records will be combined and the Addressee field will list the contact names, -comma-separated.{/ts}

+

{ts}Merge Contacts with the Same Address will combine any records having the same address (street address, city, postal code, country) into a single record. If a household record already exists in which multiple individuals share an address, the household will be exported as the combined record. If no household record exists, the records will be combined and the Addressee field will list the contact names, comma-separated.{/ts}

{ts}Merge Household Members into their Households will export the household record for any contacts sharing a household address.{/ts}

{/htxt} diff --git a/templates/CRM/Member/Form/Membership.hlp b/templates/CRM/Member/Form/Membership.hlp index 2cd3fc4438..3b2c12aa3d 100644 --- a/templates/CRM/Member/Form/Membership.hlp +++ b/templates/CRM/Member/Form/Membership.hlp @@ -27,15 +27,12 @@ {ts}Auto Renew{/ts} {/htxt} {htxt id="id-auto_renew"} -

{ts}A recurring payment (subscription) request will be submitted to the selected payment processor. If the request is -successful, this membership will be automatically renewed on the last day of the membership period until the recurring payment is -cancelled. Membership payment receipt emails will include a link for the member to cancel the auto-renewal.{/ts}

-{if $params.action eq 2} - {ts}To cancel automatic renewal ... - {/ts} -{/if} +

{ts}A recurring payment (subscription) request will be submitted to the selected payment processor. If the request is successful, this membership will be automatically renewed on the last day of the membership period until the recurring payment is cancelled. Membership payment receipt emails will include a link for the member to cancel the auto-renewal.{/ts}

+ {if $params.action eq 2} +

{ts}To cancel automatic renewal:{/ts}

+ + {/if} {/htxt} diff --git a/templates/CRM/Member/Page/Tab.hlp b/templates/CRM/Member/Page/Tab.hlp index ab43f22347..5a2921ebb3 100644 --- a/templates/CRM/Member/Page/Tab.hlp +++ b/templates/CRM/Member/Page/Tab.hlp @@ -35,10 +35,5 @@ {ts}Contributor{/ts} {/htxt} {htxt id="id-contribution_contact"} -

{ts}Check this box if someone other than the member is paying for this -membership (i.e. a gift membership or gift subscription), and you want to link -the payment to the person who is actually paying. You will be able to select -an existing contact or enter a new one. The resulting contribution record will -be linked to the payer, and a soft credit for that contribution will be linked to -this contact (the member).{/ts}

+

{ts}Check this box if someone other than the member is paying for this membership (i.e. a gift membership or gift subscription), and you want to link the payment to the person who is actually paying. You will be able to select an existing contact or enter a new one. The resulting contribution record will be linked to the payer, and a soft credit for that contribution will be linked to this contact (the member).{/ts}

{/htxt} diff --git a/templates/CRM/Price/Page/Field.hlp b/templates/CRM/Price/Page/Field.hlp index 7330aae5bc..9fe3372444 100644 --- a/templates/CRM/Price/Page/Field.hlp +++ b/templates/CRM/Price/Page/Field.hlp @@ -85,15 +85,12 @@
{$form.pcp_made_through_id.label} {$form.pcp_made_through_id.html}   - {ts}Search for the Personal Campaign Page by the fund-raiser's last name or - email address.{/ts} + {ts}Search for the Personal Campaign Page by the fund-raiser's last name or email address.{/ts}
@@ -260,8 +259,7 @@
{$form.pcp_roll_nickname.label} {$form.pcp_roll_nickname.html|crmAddClass:big}
- {ts}Name or nickname contributor wants to be displayed in the Honor - Roll. Enter "Anonymous" for anonymous contributions.{/ts} + {ts}Name or nickname contributor wants to be displayed in the Honor Roll. Enter "Anonymous" for anonymous contributions.{/ts}
{$form.premiums_intro_text.html}
- {ts}Enter content for the introductory message. This will be displayed below the Premiums section title. - You may include HTML formatting tags. You can also include images, as long as they are already - uploaded to a server - reference them using complete URLs.{/ts} + {ts}Enter content for the introductory message. This will be displayed below the Premiums section title. You may include HTML formatting tags. You can also include images, as long as they are already uploaded to a server - reference them using complete URLs.{/ts}
{$form.premiums_contact_email.html}
- {ts}This email address is included in automated contribution receipts if the contributor has selected - a premium. It should be an appropriate contact mailbox for inquiries about premium - fulfillment/shipping.{/ts} + {ts}This email address is included in automated contribution receipts if the contributor has selected a premium. It should be an appropriate contact mailbox for inquiries about premium fulfillment/shipping.{/ts}
{$form.premiums_contact_phone.html}
- {ts}This phone number is included in automated contribution receipts if the contributor has selected - a premium. It should be an appropriate phone number for inquiries about premium - fulfillment/shipping.{/ts} + {ts}This phone number is included in automated contribution receipts if the contributor has selected a premium. It should be an appropriate phone number for inquiries about premium fulfillment/shipping.{/ts}
{$form.is_required.label} {$form.is_required.html} {if $action neq 4} -
{ts}Do not make custom fields required unless you want to force all users to enter a value anytime they add or edit this type of record. - You can always make the field required when used in a specific Profile form.{/ts} +
{ts}Do not make custom fields required unless you want to force all users to enter a value anytime they add or edit this type of record. You can always make the field required when used in a specific Profile form.{/ts} {/if}

- {ts}Auto-renew Memberships - You can offer constituents the option to have their membership renewed automatically AND use the membership price set feature if: -