Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-23-22-46-27

[civicrm-core.git] / templates / CRM / Contact / Import / Form / DataSource.hlp

diff --git a/templates/CRM/Contact/Import/Form/DataSource.hlp b/templates/CRM/Contact/Import/Form/DataSource.hlp
index 5b41dff4952a27ee6f55bbf6bf62a056de1d662e..7a03f17936bc26f56e04ecc9a599402cef0fedee 100644 (file)
--- a/templates/CRM/Contact/Import/Form/DataSource.hlp
+++ b/templates/CRM/Contact/Import/Form/DataSource.hlp
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -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}