diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 16:45:40 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 16:45:40 +0000 |
| commit | c8dcfef041f9c6cff16c2d85256e5746e3b2da94 (patch) | |
| tree | e5af3b5eb4635edc6d61d627e5f2e65f338ff7b2 /helpcontent2/source/text/swriter/01/mm_seladdblo.xhp | |
| parent | c7327411efc27fb37da2752607d0d4fec7ba82a7 (diff) | |
INTEGRATION: CWS hc680pb2 (1.3.4); FILE MERGED
2005/02/21 16:43:20 fpe 1.3.4.1: regular update
Diffstat (limited to 'helpcontent2/source/text/swriter/01/mm_seladdblo.xhp')
| -rwxr-xr-x | helpcontent2/source/text/swriter/01/mm_seladdblo.xhp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp b/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp index ec72334b93..6681471c3c 100755 --- a/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp +++ b/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,7 +62,7 @@ </topic> <history> <created date="2004-07-08T11:20:08">UFI: Select Address Block dialog for mail merge</created> -<lastedited date="2004-10-04T17:05:02">DEDR: reviewed</lastedited> +<lastedited date="2005-02-16T11:15:54">DEDR: reviewed</lastedited> </history> </meta> <body> @@ -71,13 +71,13 @@ <paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">Select the address block which you want to use</paragraph> <paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the block in the list that you want to use for mail merge addresses, and click <emph>OK</emph>.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_NEVER" id="bm_id6604815" localize="false"/> -<paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2" l10n="NEW">Never include the country/region</paragraph> +<paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2" l10n="NEW">Never include country/region</paragraph> <paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Excludes country or regional information from the address block.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_ALWAYS" id="bm_id2571184" localize="false"/> -<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Always include the country/region</paragraph> +<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Always include country/region</paragraph> <paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes country or regional information in the address block.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_DEPENDENT" id="bm_id6947538" localize="false"/> -<paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">Only include the country/region if different than:</paragraph> +<paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">Only include country/region if it is not:</paragraph> <paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only includes country or regional information in the address block if the value differs from the value that you enter in the text box.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SELECTADDRESSBLOCK_ED_COUNTRY" id="bm_id7257606" localize="false"/> <paragraph role="paragraph" id="par_idN10651" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the country/region string that shall not be printed.</ahelp></paragraph> |