This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new d8aa022 Fixed typos (SMPT -> SMTP) d8aa022 is described below commit d8aa0220370ab1f327876e9358a326edb43a2702 Author: mseidel <msei...@apache.org> AuthorDate: Fri Dec 20 23:10:15 2019 +0100 Fixed typos (SMPT -> SMTP) --- main/helpcontent2/helpers/help_hid.lst | 2 +- .../helpcontent2/source/text/shared/optionen/serverauthentication.xhp | 2 +- main/sw/source/ui/config/mailconfigpage.cxx | 2 +- main/sw/source/ui/config/mailconfigpage.hrc | 2 +- main/sw/source/ui/config/mailconfigpage.src | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/helpcontent2/helpers/help_hid.lst b/main/helpcontent2/helpers/help_hid.lst index e96ab2a..fd572fb 100644 --- a/main/helpcontent2/helpers/help_hid.lst +++ b/main/helpcontent2/helpers/help_hid.lst @@ -10175,7 +10175,7 @@ sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_NEVER,1435320857, sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_IMAP,1427145284, sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_POP3,1427145283, sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_SEP_AUTHENTICATION,1427145267, -sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_SMPTAFTERPOP,1427145268, +sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_SMTPAFTERPOP,1427145268, sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_LANDSCAPE,1411285528, sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_PORTRAIT,1411285529, sw_RadioButton_DLG_SORTING_RB_COL,1428767247, diff --git a/main/helpcontent2/source/text/shared/optionen/serverauthentication.xhp b/main/helpcontent2/source/text/shared/optionen/serverauthentication.xhp index aa74eba..fe195f7 100644 --- a/main/helpcontent2/source/text/shared/optionen/serverauthentication.xhp +++ b/main/helpcontent2/source/text/shared/optionen/serverauthentication.xhp @@ -46,7 +46,7 @@ <bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD" id="bm_id3897824" localize="false"/> <paragraph role="heading" id="par_idN105FD" xml-lang="en-US" level="4" l10n="NEW">Password</paragraph> <paragraph role="paragraph" id="par_idN10602" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the password for the user name.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP" id="bm_id3506881" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMTPAFTERPOP" id="bm_id3506881" localize="false"/> <paragraph role="heading" id="par_idN10615" xml-lang="en-US" level="3" l10n="NEW">The outgoing mail server uses the same authentication as the incoming mail server.</paragraph> <paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><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> <bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER" id="bm_id9126255" localize="false"/> diff --git a/main/sw/source/ui/config/mailconfigpage.cxx b/main/sw/source/ui/config/mailconfigpage.cxx index a82314f..462b261 100644 --- a/main/sw/source/ui/config/mailconfigpage.cxx +++ b/main/sw/source/ui/config/mailconfigpage.cxx @@ -495,7 +495,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( #endif m_aAuthenticationCB( this, SW_RES( CB_AUTHENTICATION )), m_aSeparateAuthenticationRB( this, SW_RES( RB_SEP_AUTHENTICATION )), - m_aSMTPAfterPOPRB( this, SW_RES( RB_SMPTAFTERPOP )), + m_aSMTPAfterPOPRB( this, SW_RES( RB_SMTPAFTERPOP )), m_aOutgoingServerFT( this, SW_RES( FT_OUTGOINGSERVER )), m_aUserNameFT( this, SW_RES( FT_USERNAME )), m_aUserNameED( this, SW_RES( ED_USERNAME )), diff --git a/main/sw/source/ui/config/mailconfigpage.hrc b/main/sw/source/ui/config/mailconfigpage.hrc index 2a80115..cc97021 100644 --- a/main/sw/source/ui/config/mailconfigpage.hrc +++ b/main/sw/source/ui/config/mailconfigpage.hrc @@ -61,7 +61,7 @@ #define CB_AUTHENTICATION 50 #define RB_SEP_AUTHENTICATION 51 -#define RB_SMPTAFTERPOP 52 +#define RB_SMTPAFTERPOP 52 #define FT_OUTGOINGSERVER 53 #define FT_USERNAME 54 #define ED_USERNAME 55 diff --git a/main/sw/source/ui/config/mailconfigpage.src b/main/sw/source/ui/config/mailconfigpage.src index bff10ff..13a3ace 100644 --- a/main/sw/source/ui/config/mailconfigpage.src +++ b/main/sw/source/ui/config/mailconfigpage.src @@ -320,9 +320,9 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION Border = TRUE; PassWord = TRUE; }; - RadioButton RB_SMPTAFTERPOP + RadioButton RB_SMTPAFTERPOP { - HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP" ; + HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMTPAFTERPOP" ; Pos = MAP_APPFONT ( 12, 73 ) ; Size = MAP_APPFONT ( 232, 20 ) ; WordBreak = TRUE;