You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/03/01 11:23:33 UTC
[openoffice] branch trunk updated: Fixed errors introduced with my
last commit
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 8ae8341 Fixed errors introduced with my last commit
8ae8341 is described below
commit 8ae8341bddf803647906420f4ee7f8578d4f9b3f
Author: mseidel <ms...@apache.org>
AuthorDate: Sun Mar 1 12:23:04 2020 +0100
Fixed errors introduced with my last commit
---
main/sw/source/ui/config/mailconfigpage.src | 74 ++++++++++++++---------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/main/sw/source/ui/config/mailconfigpage.src b/main/sw/source/ui/config/mailconfigpage.src
index 4401f2b..36fd2fb 100644
--- a/main/sw/source/ui/config/mailconfigpage.src
+++ b/main/sw/source/ui/config/mailconfigpage.src
@@ -32,19 +32,19 @@ TabPage TP_MAILCONFIG
HelpID = HID_TP_MAILCONFIG ;
Size = MAP_APPFONT ( 260, 185 ) ;
Hide = TRUE ;
- Text[ en-US ] en-US ] = "Mail Merge E-mail" ;
+ Text[ en-US ] = "Mail Merge E-mail" ;
FixedLine FL_IDENTITY
{
Pos = MAP_APPFONT ( 6, 3 ) ;
Size = MAP_APPFONT ( 248, 8 ) ;
- Text[ en-US ] en-US ] = "User information" ;
+ Text[ en-US ] = "User information" ;
};
FixedText FT_DISPLAYNAME
{
Pos = MAP_APPFONT ( 12, 16 ) ;
Size = MAP_APPFONT ( 74, 8 ) ;
- Text[ en-US ] en-US ] = "~Your name" ;
+ Text[ en-US ] = "~Your name" ;
};
Edit ED_DISPLAYNAME
{
@@ -57,7 +57,7 @@ TabPage TP_MAILCONFIG
{
Pos = MAP_APPFONT ( 12, 31 ) ;
Size = MAP_APPFONT ( 74, 8 ) ;
- Text[ en-US ] en-US ] = "~E-Mail address" ;
+ Text[ en-US ] = "~E-Mail address" ;
};
Edit ED_ADDRESS
{
@@ -71,13 +71,13 @@ TabPage TP_MAILCONFIG
HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO" ;
Pos = MAP_APPFONT ( 12, 45 ) ;
Size = MAP_APPFONT ( 242, 10 ) ;
- Text[ en-US ] en-US ] = "Send replies to ~different e-mail address" ;
+ Text[ en-US ] = "Send replies to ~different e-mail address" ;
};
FixedText FT_REPLYTO
{
Pos = MAP_APPFONT ( 18, 60 ) ;
Size = MAP_APPFONT ( 68, 8 ) ;
- Text[ en-US ] en-US ] = "~Reply address" ;
+ Text[ en-US ] = "~Reply address" ;
};
Edit ED_REPLYTO
{
@@ -90,13 +90,13 @@ TabPage TP_MAILCONFIG
{
Pos = MAP_APPFONT ( 6, 76 ) ;
Size = MAP_APPFONT ( 248, 8 ) ;
- Text[ en-US ] en-US ] = "Outgoing server (SMTP) Settings" ;
+ Text[ en-US ] = "Outgoing server (SMTP) Settings" ;
};
FixedText FT_SERVER
{
Pos = MAP_APPFONT ( 12, 89 ) ;
Size = MAP_APPFONT ( 74, 8 ) ;
- Text[ en-US ] en-US ] = "~Server name" ;
+ Text[ en-US ] = "~Server name" ;
};
Edit ED_SERVER
{
@@ -110,7 +110,7 @@ TabPage TP_MAILCONFIG
Pos = MAP_APPFONT ( 197, 89 ) ;
Size = MAP_APPFONT ( 24, 8 ) ;
Right = TRUE ;
- Text[ en-US ] en-US ] = "~Port" ;
+ Text[ en-US ] = "~Port" ;
};
NumericField NF_PORT
{
@@ -131,14 +131,14 @@ TabPage TP_MAILCONFIG
HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_SECURE" ;
Pos = MAP_APPFONT ( 12, 104 ) ;
Size = MAP_APPFONT ( 242, 10 ) ;
- Text[ en-US ] en-US ] = "~Use secure connection (SSL)" ;
+ Text[ en-US ] = "~Use secure connection (SSL)" ;
};
PushButton PB_AUTHENTICATION
{
HelpID = "sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION" ;
Pos = MAP_APPFONT ( 88, 118 ) ;
Size = MAP_APPFONT ( 105, 14 ) ;
- Text[ en-US ] en-US ] = "Server Au~thentication" ;
+ Text[ en-US ] = "Server Au~thentication" ;
};
FixedLine FL_SEPARATOR
{
@@ -150,7 +150,7 @@ TabPage TP_MAILCONFIG
HelpID = "sw:PushButton:TP_MAILCONFIG:PB_TEST" ;
Pos = MAP_APPFONT ( 88, 164 ) ;
Size = MAP_APPFONT ( 105, 14 ) ;
- Text[ en-US ] en-US ] = "Test S~ettings..." ;
+ Text[ en-US ] = "Test S~ettings..." ;
};
};
ModalDialog DLG_MM_TESTACCOUNTSETTINGS
@@ -166,7 +166,7 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
{
Pos = MAP_APPFONT ( 6, 3 ) ;
Size = MAP_APPFONT ( 238, 8 ) ;
- Text[ en-US ] en-US ] = "%PRODUCTNAME is testing the e-mail account settings..." ;
+ Text[ en-US ] = "%PRODUCTNAME is testing the e-mail account settings..." ;
};
Control LB_STATUS
{
@@ -178,7 +178,7 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
{
Pos = MAP_APPFONT ( 6, 68 ) ;
Size = MAP_APPFONT ( 238, 8 ) ;
- Text[ en-US ] en-US ] = "Errors" ;
+ Text[ en-US ] = "Errors" ;
};
MultiLineEdit ED_ERROR
{
@@ -198,7 +198,7 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
HelpID = "sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP" ;
Pos = MAP_APPFONT ( 85, 156 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
- Text[ en-US ] en-US ] = "~Stop" ;
+ Text[ en-US ] = "~Stop" ;
};
CancelButton PB_CANCEL
{
@@ -231,31 +231,31 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
};
String ST_TASK
{
- Text[ en-US ] en-US ] = "Task" ;
+ Text[ en-US ] = "Task" ;
};
String ST_STATUS
{
- Text[ en-US ] en-US ] = "Status" ;
+ Text[ en-US ] = "Status" ;
};
String ST_ESTABLISH
{
- Text[ en-US ] en-US ] = "Establish network connection" ;
+ Text[ en-US ] = "Establish network connection" ;
};
String ST_FINDSERVER
{
- Text[ en-US ] en-US ] = "Find outgoing mail server" ;
+ Text[ en-US ] = "Find outgoing mail server" ;
};
String ST_COMPLETED
{
- Text[ en-US ] en-US ] = "Successful" ;
+ Text[ en-US ] = "Successful" ;
};
String ST_FAILED
{
- Text[ en-US ] en-US ] = "Failed" ;
+ Text[ en-US ] = "Failed" ;
};
String ST_ERROR_SERVER
{
- Text[ en-US ] en-US ] = "%PRODUCTNAME could not connect to the outgoing mail server. Check your system's settings and the settings in %PRODUCTNAME. Check the server name, the port and the secure connections settings" ;
+ Text[ en-US ] = "%PRODUCTNAME could not connect to the outgoing mail server. Check your system's settings and the settings in %PRODUCTNAME. Check the server name, the port and the secure connections settings" ;
};
};
ModalDialog DLG_MM_SERVERAUTHENTICATION
@@ -265,33 +265,33 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
HelpID = HID_MM_SERVERAUTHENTICATION ;
Size = MAP_APPFONT ( 250, 211 ) ;
Moveable = TRUE ;
- Text[ en-US ] en-US ] = "Server Authentication" ;
+ Text[ en-US ] = "Server Authentication" ;
CheckBox CB_AUTHENTICATION
{
HelpID = "sw:CheckBox:DLG_MM_SERVERAUTHENTICATION:CB_AUTHENTICATION" ;
Pos = MAP_APPFONT ( 6, 3 ) ;
Size = MAP_APPFONT ( 238, 10 ) ;
- Text[ en-US ] en-US ] = "The outgoing mail server (SMTP) requires au~thentication" ;
+ Text[ en-US ] = "The outgoing mail server (SMTP) requires au~thentication" ;
};
RadioButton RB_SEP_AUTHENTICATION
{
HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SEP_AUTHENTICATION" ;
Pos = MAP_APPFONT ( 12, 17 ) ;
Size = MAP_APPFONT ( 232, 10 ) ;
- Text[ en-US ] en-US ] = "The outgoing mail server (SMTP) requires ~separate authentication" ;
+ Text[ en-US ] = "The outgoing mail server (SMTP) requires ~separate authentication" ;
};
FixedText FT_OUTGOINGSERVER
{
Pos = MAP_APPFONT ( 18, 31 ) ;
Size = MAP_APPFONT ( 200, 8 ) ;
- Text[ en-US ] en-US ] = "Outgoing mail server:" ;
+ Text[ en-US ] = "Outgoing mail server:" ;
};
FixedText FT_USERNAME
{
Pos = MAP_APPFONT ( 18, 44 ) ;
Size = MAP_APPFONT ( 53, 8 ) ;
- Text[ en-US ] en-US ] = "~User name" ;
+ Text[ en-US ] = "~User name" ;
};
Edit ED_USERNAME
{
@@ -304,7 +304,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
{
Pos = MAP_APPFONT ( 18, 59 ) ;
Size = MAP_APPFONT ( 53, 8 ) ;
- Text[ en-US ] en-US ] = "~Password" ;
+ Text[ en-US ] = "~Password" ;
};
Edit ED_OUTPASSWORD
{
@@ -320,19 +320,19 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
Pos = MAP_APPFONT ( 12, 73 ) ;
Size = MAP_APPFONT ( 232, 20 ) ;
WordBreak = TRUE ;
- Text[ en-US ] en-US ] = "The outgoing mail server uses the same authentication as the ~incoming mail server. Enter the settings of the incoming mail server." ;
+ Text[ en-US ] = "The outgoing mail server uses the same authentication as the ~incoming mail server. Enter the settings of the incoming mail server." ;
};
FixedText FT_INCOMINGSERVER
{
Pos = MAP_APPFONT ( 18, 97 ) ;
Size = MAP_APPFONT ( 230, 8 ) ;
- Text[ en-US ] en-US ] = "Incoming mail server:" ;
+ Text[ en-US ] = "Incoming mail server:" ;
};
FixedText FT_SERVER
{
Pos = MAP_APPFONT ( 18, 110 ) ;
Size = MAP_APPFONT ( 53, 8 ) ;
- Text[ en-US ] en-US ] = "Server ~name" ;
+ Text[ en-US ] = "Server ~name" ;
};
Edit ED_SERVER
{
@@ -346,7 +346,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
Pos = MAP_APPFONT ( 195, 110 ) ;
Size = MAP_APPFONT ( 20, 10 ) ;
Right = TRUE ;
- Text[ en-US ] en-US ] = "P~ort" ;
+ Text[ en-US ] = "P~ort" ;
};
NumericField NF_PORT
{
@@ -366,27 +366,27 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
{
Pos = MAP_APPFONT ( 18, 126 ) ;
Size = MAP_APPFONT ( 53, 8 ) ;
- Text[ en-US ] en-US ] = "Type" ;
+ Text[ en-US ] = "Type" ;
};
RadioButton RB_POP3
{
HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_POP3" ;
Pos = MAP_APPFONT ( 78, 125 ) ;
Size = MAP_APPFONT ( 115, 10 ) ;
- Text[ en-US ] en-US ] = "~POP3" ;
+ Text[ en-US ] = "~POP3" ;
};
RadioButton RB_IMAP
{
HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_IMAP" ;
Pos = MAP_APPFONT ( 78, 138 ) ;
Size = MAP_APPFONT ( 115, 10 ) ;
- Text[ en-US ] en-US ] = "~IMAP" ;
+ Text[ en-US ] = "~IMAP" ;
};
FixedText FT_INUSERNAME
{
Pos = MAP_APPFONT ( 18, 152 ) ;
Size = MAP_APPFONT ( 53, 8 ) ;
- Text[ en-US ] en-US ] = "Us~er name" ;
+ Text[ en-US ] = "Us~er name" ;
};
Edit ED_INUSERNAME
{
@@ -399,7 +399,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
{
Pos = MAP_APPFONT ( 18, 167 ) ;
Size = MAP_APPFONT ( 53, 8 ) ;
- Text[ en-US ] en-US ] = "Pass~word" ;
+ Text[ en-US ] = "Pass~word" ;
};
Edit ED_INPASSWORD
{