diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2020-07-27 14:11:45 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2020-07-27 22:37:42 +0200 |
| commit | 5794edee8b1e7fc990bb0a41462d4aeb382a976f (patch) | |
| tree | 2602e0c71a18c935ac1e2c22b26eaa839dd23a28 /source/text/shared/optionen | |
| parent | Create help page for submenu Spacing (diff) | |
| download | help-5794edee8b1e7fc990bb0a41462d4aeb382a976f.tar.gz help-5794edee8b1e7fc990bb0a41462d4aeb382a976f.zip | |
Change e-mail to email and E-mail to Email
Change-Id: Ie47ed745f336e44389c8c797967de6af72c9ce8d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99526
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'source/text/shared/optionen')
| -rw-r--r-- | source/text/shared/optionen/01010100.xhp | 4 | ||||
| -rw-r--r-- | source/text/shared/optionen/01020300.xhp | 12 | ||||
| -rw-r--r-- | source/text/shared/optionen/mailmerge.xhp | 24 | ||||
| -rw-r--r-- | source/text/shared/optionen/serverauthentication.xhp | 6 | ||||
| -rw-r--r-- | source/text/shared/optionen/testaccount.xhp | 2 |
5 files changed, 24 insertions, 24 deletions
diff --git a/source/text/shared/optionen/01010100.xhp b/source/text/shared/optionen/01010100.xhp index 9885787c28..f06ad003ea 100644 --- a/source/text/shared/optionen/01010100.xhp +++ b/source/text/shared/optionen/01010100.xhp @@ -128,8 +128,8 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/privateuserpage/email" id="bm_id3149379" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/businessdatapage/email" id="bm_id3145647" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/email" id="bm_id3149410" localize="false"/> -<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3">E-mail</paragraph> -<paragraph role="paragraph" id="par_id3154942" xml-lang="en-US"><ahelp hid=".">Type your e-mail address.</ahelp> For example, my.name@my.provider.com</paragraph> +<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3">Email</paragraph> +<paragraph role="paragraph" id="par_id3154942" xml-lang="en-US"><ahelp hid=".">Type your email address.</ahelp> For example, my.name@my.provider.com</paragraph> </section> <h2 id="hd_id61543592770503">Cryptography</h2> <section id="cryptointro"> diff --git a/source/text/shared/optionen/01020300.xhp b/source/text/shared/optionen/01020300.xhp index 925c709c7a..4f9e014340 100644 --- a/source/text/shared/optionen/01020300.xhp +++ b/source/text/shared/optionen/01020300.xhp @@ -24,23 +24,23 @@ <helpdocument version="1.0"> <meta> <topic id="textsharedoptionen01020300xhp" indexer="exclude" status="PUBLISH"> -<title id="tit" xml-lang="en-US">E-mail</title> +<title id="tit" xml-lang="en-US">Email</title> <filename>/text/shared/optionen/01020300.xhp</filename> </topic> </meta> <body> <section id="email"> -<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link href="text/shared/optionen/01020300.xhp">E-mail</link></paragraph> +<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link href="text/shared/optionen/01020300.xhp">Email</link></paragraph> </section> <bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/OptEmailPage" id="bm_id7723015" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/@@nowidget@@" id="bm_id7723015" localize="false"/> -<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US">On UNIX systems, specifies the e-mail program to use when you send the current document as e-mail.</paragraph> +<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US">On UNIX systems, specifies the email program to use when you send the current document as email.</paragraph> <switch select="sys"> <case select="UNIX"> -<bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/url" id="bm_id7723014" localize="false"/><paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2">E-mail program</paragraph> -<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US"><ahelp hid="cui/ui/optemailpage/url">Enter the e-mail program path and name.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/url" id="bm_id7723014" localize="false"/><paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2">Email program</paragraph> +<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US"><ahelp hid="cui/ui/optemailpage/url">Enter the email program path and name.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/browse" id="bm_id3655507" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2">Browse</paragraph> -<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US"><ahelp hid="cui/ui/optemailpage/browse">Opens a file dialog to select the e-mail program.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US"><ahelp hid="cui/ui/optemailpage/browse">Opens a file dialog to select the email program.</ahelp></paragraph> </case> </switch></body> </helpdocument> diff --git a/source/text/shared/optionen/mailmerge.xhp b/source/text/shared/optionen/mailmerge.xhp index e51a1e2780..d87d18c4f8 100644 --- a/source/text/shared/optionen/mailmerge.xhp +++ b/source/text/shared/optionen/mailmerge.xhp @@ -22,7 +22,7 @@ <helpdocument version="1.0"> <meta> <topic id="textsharedoptionenmailmergexhp" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Mail Merge E-mail</title> +<title id="tit" xml-lang="en-US">Mail Merge Email</title> <filename>/text/shared/optionen/mailmerge.xhp</filename> </topic> <history> @@ -33,28 +33,28 @@ <section id="mailmerge"> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/MailConfigPage" id="bm_id3323771" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/@@nowidget@@" id="@@nowidget@@" localize="false"/> -<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="1"><link href="text/shared/optionen/mailmerge.xhp">Mail Merge E-mail</link></paragraph> -<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Specifies the user information and server settings for when you send form letters as e-mail messages.</ahelp></paragraph> +<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="1"><link href="text/shared/optionen/mailmerge.xhp">Mail Merge Email</link></paragraph> +<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Specifies the user information and server settings for when you send form letters as email messages.</ahelp></paragraph> </section> <section id="howtoget"> <embed href="text/shared/00/00000406.xhp#mailmergeemail"/> </section> <paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2">User information</paragraph> -<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US">Enter the user information to use when you send e-mail.</paragraph> +<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US">Enter the user information to use when you send email.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/displayname" id="bm_id3323770" localize="false"/> <paragraph role="heading" id="par_idN1058A" xml-lang="en-US" level="3">Your name</paragraph> <paragraph role="paragraph" id="par_idN1058E" xml-lang="en-US"><ahelp hid=".">Enter your name.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/address" id="bm_id5569627" localize="false"/> -<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3">E-mail address</paragraph> -<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US"><ahelp hid=".">Enter your e-mail address for replies.</ahelp></paragraph> +<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3">Email address</paragraph> +<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US"><ahelp hid=".">Enter your email address for replies.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/replytocb" id="bm_id8856166" localize="false"/> -<paragraph role="heading" id="par_idN105C0" xml-lang="en-US" level="3">Send replies to different e-mail address</paragraph> -<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US"><ahelp hid=".">Uses the e-mail address that you enter in the Reply address text box as the reply-to e-mail address.</ahelp></paragraph> +<paragraph role="heading" id="par_idN105C0" xml-lang="en-US" level="3">Send replies to different email address</paragraph> +<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US"><ahelp hid=".">Uses the email address that you enter in the Reply address text box as the reply-to email address.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/replyto" id="bm_id2134769" localize="false"/> <paragraph role="heading" id="par_idN105DB" xml-lang="en-US" level="3">Reply address</paragraph> -<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US"><ahelp hid=".">Enter the address to use for e-mail replies.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US"><ahelp hid=".">Enter the address to use for email replies.</ahelp></paragraph> <paragraph role="heading" id="par_idN105EE" xml-lang="en-US" level="2">Outgoing server (SMTP) settings</paragraph> -<paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US">Specify the server settings for outgoing e-mails.</paragraph> +<paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US">Specify the server settings for outgoing emails.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/server" id="bm_id7700735" localize="false"/> <paragraph role="heading" id="par_idN105FD" xml-lang="en-US" level="3">Server name</paragraph> <paragraph role="paragraph" id="par_idN10601" xml-lang="en-US"><ahelp hid=".">Enter the SMTP server name.</ahelp></paragraph> @@ -63,10 +63,10 @@ <paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US"><ahelp hid=".">Enter the SMTP port.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/secure" id="bm_id72634" localize="false"/> <paragraph role="heading" id="par_idN10633" xml-lang="en-US" level="2">Use secure connection</paragraph> -<paragraph role="paragraph" id="par_idN10637" xml-lang="en-US"><ahelp hid=".">When available, uses a secure connection to send e-mails.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10637" xml-lang="en-US"><ahelp hid=".">When available, uses a secure connection to send emails.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/serverauthentication" id="bm_id611896" localize="false"/> <paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="2">Server Authentication</paragraph> -<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link> dialog where you can specify the server authentication settings for secure e-mail.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link> dialog where you can specify the server authentication settings for secure email.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/test" id="bm_id926847" localize="false"/> <paragraph role="heading" id="par_idN10677" xml-lang="en-US" level="2">Test Settings</paragraph> <paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link> dialog to test the current settings.</ahelp></paragraph> diff --git a/source/text/shared/optionen/serverauthentication.xhp b/source/text/shared/optionen/serverauthentication.xhp index 0f061730c3..99f89a9392 100644 --- a/source/text/shared/optionen/serverauthentication.xhp +++ b/source/text/shared/optionen/serverauthentication.xhp @@ -30,10 +30,10 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/AuthenticationSettingsDialog" id="bm_id4849086" localize="false"/> <paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="1"><link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link></paragraph> -<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US">On the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph> +<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US">On the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge Email</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/authentication" id="bm_id4849085" localize="false"/> <paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2">The outgoing mail server (SMTP) requires authentication</paragraph> -<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US"><ahelp hid=".">Enables the authentication that is required to send e-mail by SMTP.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US"><ahelp hid=".">Enables the authentication that is required to send email by SMTP.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/separateauthentication" id="bm_id3792535" localize="false"/> <paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="3">The outgoing mail server (SMTP) requires separate authentication</paragraph> <paragraph role="paragraph" id="par_idN105D2" xml-lang="en-US"><ahelp hid=".">Select if your SMTP server requires a user name and password.</ahelp></paragraph> @@ -45,7 +45,7 @@ <paragraph role="paragraph" id="par_idN10602" xml-lang="en-US"><ahelp hid=".">Enter the password for the user name.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/smtpafterpop" id="bm_id3506881" localize="false"/> <paragraph role="heading" id="par_idN10615" xml-lang="en-US" level="3">The outgoing mail server uses the same authentication as the incoming mail server.</paragraph> -<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"><ahelp hid=".">Select if you are required to first read your e-mail before you can send e-mail.</ahelp> This method is also called "SMTP after POP3".</paragraph> +<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"><ahelp hid=".">Select if you are required to first read your email before you can send email.</ahelp> This method is also called "SMTP after POP3".</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/server" id="bm_id9126255" localize="false"/> <paragraph role="heading" id="par_idN10629" xml-lang="en-US" level="4">Server name</paragraph> <paragraph role="paragraph" id="par_idN1062C" xml-lang="en-US"><ahelp hid=".">Enter the server name of your POP 3 or IMAP mail server.</ahelp></paragraph> diff --git a/source/text/shared/optionen/testaccount.xhp b/source/text/shared/optionen/testaccount.xhp index 9ff89f58ea..9c5cef74a8 100644 --- a/source/text/shared/optionen/testaccount.xhp +++ b/source/text/shared/optionen/testaccount.xhp @@ -30,7 +30,7 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/testmailsettings/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/testmailsettings/TestMailSettings" id="bm_id3895380" localize="false"/> <paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1"><link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link></paragraph> -<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US">When you enter settings on the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph> +<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US">When you enter settings on the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge Email</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph> <paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2">(Results list box)</paragraph> <paragraph role="paragraph" id="par_idN10578" xml-lang="en-US">In the top list box you will see the results of the test session.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/testmailsettings/errors" id="bm_id3895382" localize="false"/> |