openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject [openoffice] branch AOO42X updated: Cleaned up resource file
Date Fri, 20 Dec 2019 23:36:56 GMT
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 8df7e04  Cleaned up resource file
8df7e04 is described below

commit 8df7e04310b6e503631a6de77b8a982a1b18d2e5
Author: mseidel <mseidel@apache.org>
AuthorDate: Sat Dec 21 00:35:23 2019 +0100

    Cleaned up resource file
    
    (cherry picked from commit 7371cc306b59434ae7ef935867b38c844c43b896)
---
 main/sw/source/ui/config/mailconfigpage.src | 132 ++++++++++++++--------------
 1 file changed, 64 insertions(+), 68 deletions(-)

diff --git a/main/sw/source/ui/config/mailconfigpage.src b/main/sw/source/ui/config/mailconfigpage.src
index 13a3ace..377967f 100644
--- a/main/sw/source/ui/config/mailconfigpage.src
+++ b/main/sw/source/ui/config/mailconfigpage.src
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -29,36 +29,35 @@
 
 TabPage TP_MAILCONFIG
 {
-	HelpID = HID_TP_MAILCONFIG;
+	HelpID = HID_TP_MAILCONFIG ;
 	Size = MAP_APPFONT ( 260, 185 ) ;
 	Hide = TRUE ;
-
-	Text[ 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 ] = "User information" ;
+		Text [ en-US ] = "User information" ;
 	};
 	FixedText FT_DISPLAYNAME
 	{
 		Pos = MAP_APPFONT ( 12, 16 ) ;
 		Size = MAP_APPFONT ( 74, 8 ) ;
-		Text[ en-US ] = "~Your name" ;
+		Text [ en-US ] = "~Your name" ;
 	};
 	Edit ED_DISPLAYNAME
 	{
 		HelpID = "sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME" ;
 		Pos = MAP_APPFONT ( 88, 14 ) ;
 		Size = MAP_APPFONT ( 160, 12 ) ;
-		Border = TRUE;
+		Border = TRUE ;
 	};
 	FixedText FT_ADDRESS
 	{
 		Pos = MAP_APPFONT ( 12, 31 ) ;
 		Size = MAP_APPFONT ( 74, 8 ) ;
-		Text[ en-US ] = "~E-Mail address" ;
+		Text [ en-US ] = "~E-Mail address" ;
 	};
 	Edit ED_ADDRESS
 	{
@@ -72,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 ] = "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 ] = "~Reply address" ;
+		Text [ en-US ] = "~Reply address" ;
 	};
 	Edit ED_REPLYTO
 	{
@@ -91,13 +90,13 @@ TabPage TP_MAILCONFIG
 	{
 		Pos = MAP_APPFONT ( 6, 76 ) ;
 		Size = MAP_APPFONT ( 248, 8 ) ;
-		Text[ 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 ] = "~Server name" ;
+		Text [ en-US ] = "~Server name" ;
 	};
 	Edit ED_SERVER
 	{
@@ -110,19 +109,19 @@ TabPage TP_MAILCONFIG
 	{
 		Pos = MAP_APPFONT ( 197, 89 ) ;
 		Size = MAP_APPFONT ( 24, 8 ) ;
-		Right = TRUE;
-		Text[ en-US ] = "~Port" ;
+		Right = TRUE ;
+		Text [ en-US ] = "~Port" ;
 	};
 	NumericField NF_PORT
 	{
 		HelpID = "sw:NumericField:TP_MAILCONFIG:NF_PORT" ;
 		Pos = MAP_APPFONT ( 223, 87 ) ;
 		Size = MAP_APPFONT ( 25, 12 ) ;
-		Border = TRUE;
+		Border = TRUE ;
 		Left = TRUE ;
 		First = 1 ;
 		Minimum = 1 ;
-		Maximum = 65535;
+		Maximum = 65535 ;
 		Repeat = TRUE ;
 		Spin = FALSE ;
 		TabStop = TRUE ;
@@ -132,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 ] = "~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 ] = "Server Au~thentication" ;
+		Text [ en-US ] = "Server Au~thentication" ;
 	};
 	FixedLine FL_SEPARATOR
 	{
@@ -151,24 +150,23 @@ TabPage TP_MAILCONFIG
 		HelpID = "sw:PushButton:TP_MAILCONFIG:PB_TEST" ;
 		Pos = MAP_APPFONT ( 88, 164 ) ;
 		Size = MAP_APPFONT ( 105, 14 ) ;
-		Text[ en-US ] = "Test S~ettings..." ;
+		Text [ en-US ] = "Test S~ettings..." ;
 	};
 };
 ModalDialog DLG_MM_TESTACCOUNTSETTINGS
 {
 	OutputSize = TRUE ;
 	SVLook = TRUE ;
-	HelpID = HID_MM_TESTACCOUNTSETTINGS;
+	HelpID = HID_MM_TESTACCOUNTSETTINGS ;
 	Size = MAP_APPFONT ( 250, 176 ) ;
 	Moveable = TRUE ;
-
 	Text[ en-US ] = "Test Account Settings" ;
 
 	FixedText FI_INFO
 	{
 		Pos = MAP_APPFONT ( 6, 3 ) ;
 		Size = MAP_APPFONT ( 238, 8 ) ;
-		Text[ en-US ] = "%PRODUCTNAME is testing the e-mail account settings..." ;
+		Text [ en-US ] = "%PRODUCTNAME is testing the e-mail account settings..." ;
 	};
 	Control LB_STATUS
 	{
@@ -180,7 +178,7 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
 	{
 		Pos = MAP_APPFONT ( 6, 68 ) ;
 		Size = MAP_APPFONT ( 238, 8 ) ;
-		Text[ en-US ] = "Errors" ;
+		Text [ en-US ] = "Errors" ;
 	};
 	MultiLineEdit ED_ERROR
 	{
@@ -200,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 ] = "~Stop" ;
+		Text [ en-US ] = "~Stop" ;
 	};
 	CancelButton PB_CANCEL
 	{
@@ -215,89 +213,85 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
 	#define IMGLIST_IDS\
 		IdList = \
 		{ \
-			FN_FORMULA_CANCEL	;\
-			FN_FORMULA_APPLY	;\
+			FN_FORMULA_CANCEL ; \
+			FN_FORMULA_APPLY ; \
 		}; \
 		IdCount = 2
-
 	ImageList ILIST
 	{
 		Prefix = "sc" ;
 		MaskColor = IMAGE_MASK_COLOR ;
-		IMGLIST_IDS;
+		IMGLIST_IDS ;
 	};
-
 	ImageList ILIST_HC
 	{
 		Prefix = "sch" ;
 		MaskColor = IMAGE_MASK_COLOR ;
-		IMGLIST_IDS;
+		IMGLIST_IDS ;
 	};
 	String ST_TASK
 	{
-		Text[ en-US ] = "Task" ;
+		Text [ en-US ] = "Task" ;
 	};
 	String ST_STATUS
 	{
-		Text[ en-US ] = "Status" ;
+		Text [ en-US ] = "Status" ;
 	};
 	String ST_ESTABLISH
 	{
-		Text[ en-US ] = "Establish network connection" ;
+		Text [ en-US ] = "Establish network connection" ;
 	};
 	String ST_FINDSERVER
 	{
-		Text[ en-US ] = "Find outgoing mail server" ;
+		Text [ en-US ] = "Find outgoing mail server" ;
 	};
 	String ST_COMPLETED
 	{
-		Text[ en-US ] = "Successful" ;
+		Text [ en-US ] = "Successful" ;
 	};
 	String ST_FAILED
 	{
-		Text[ en-US ] = "Failed" ;
+		Text [ en-US ] = "Failed" ;
 	};
 	String ST_ERROR_SERVER
 	{
-		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" ;
+		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
 {
 	OutputSize = TRUE ;
 	SVLook = TRUE ;
-	HelpID = HID_MM_SERVERAUTHENTICATION;
+	HelpID = HID_MM_SERVERAUTHENTICATION ;
 	Size = MAP_APPFONT ( 250, 211 ) ;
 	Moveable = TRUE ;
-
-	Text[ 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 ] = "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 ] = "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 ] = "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 ] = "~User name" ;
+		Text [ en-US ] = "~User name" ;
 	};
 	Edit ED_USERNAME
 	{
@@ -310,60 +304,60 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
 	{
 		Pos = MAP_APPFONT ( 18, 59 ) ;
 		Size = MAP_APPFONT ( 53, 8 ) ;
-		Text[ en-US ] = "~Password" ;
+		Text [ en-US ] = "~Password" ;
 	};
 	Edit ED_OUTPASSWORD
 	{
 		HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD" ;
 		Pos = MAP_APPFONT ( 78, 57 ) ;
 		Size = MAP_APPFONT ( 115, 12 ) ;
-		Border = TRUE;
-		PassWord = TRUE;
+		Border = TRUE ;
+		PassWord = TRUE ;
 	};
 	RadioButton RB_SMTPAFTERPOP
 	{
 		HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMTPAFTERPOP" ;
 		Pos = MAP_APPFONT ( 12, 73 ) ;
 		Size = MAP_APPFONT ( 232, 20 ) ;
-		WordBreak = TRUE;
-		Text[ en-US ] = "The outgoing mail server uses the same authentication as the ~incoming
mail server. Enter the settings of the incoming mail server." ;
+		WordBreak = TRUE ;
+		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 ] = "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 ] = "Server ~name" ;
+		Text [ en-US ] = "Server ~name" ;
 	};
 	Edit ED_SERVER
 	{
 		HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER" ;
 		Pos = MAP_APPFONT ( 78, 108 ) ;
 		Size = MAP_APPFONT ( 115, 12 ) ;
-		Border = TRUE;
+		Border = TRUE ;
 	};
 	FixedText FT_PORT
 	{
 		Pos = MAP_APPFONT ( 195, 110 ) ;
 		Size = MAP_APPFONT ( 20, 10 ) ;
-		Right = TRUE;
-		Text[ en-US ] = "P~ort" ;
+		Right = TRUE ;
+		Text [ en-US ] = "P~ort" ;
 	};
 	NumericField NF_PORT
 	{
 		HelpID = "sw:NumericField:DLG_MM_SERVERAUTHENTICATION:NF_PORT" ;
 		Pos = MAP_APPFONT ( 219, 108 ) ;
 		Size = MAP_APPFONT ( 25, 12 ) ;
-		Border = TRUE;
+		Border = TRUE ;
 		Left = TRUE ;
 		First = 1 ;
 		Minimum = 1 ;
-		Maximum = 65535;
+		Maximum = 65535 ;
 		Repeat = TRUE ;
 		Spin = FALSE ;
 		TabStop = TRUE ;
@@ -372,48 +366,48 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
 	{
 		Pos = MAP_APPFONT ( 18, 126 ) ;
 		Size = MAP_APPFONT ( 53, 8 ) ;
-		Text[ 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 ] = "~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 ] = "~IMAP" ;
+		Text [ en-US ] = "~IMAP" ;
 	};
 	FixedText FT_INUSERNAME
 	{
 		Pos = MAP_APPFONT ( 18, 152 ) ;
 		Size = MAP_APPFONT ( 53, 8 ) ;
-		Text[ en-US ] = "Us~er name" ;
+		Text [ en-US ] = "Us~er name" ;
 	};
 	Edit ED_INUSERNAME
 	{
 		HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INUSERNAME" ;
 		Pos = MAP_APPFONT ( 78, 150 ) ;
 		Size = MAP_APPFONT ( 115, 12 ) ;
-		Border = TRUE;
+		Border = TRUE ;
 	};
 	FixedText FT_INPASSWORD
 	{
 		Pos = MAP_APPFONT ( 18, 167 ) ;
 		Size = MAP_APPFONT ( 53, 8 ) ;
-		Text[ en-US ] = "Pass~word" ;
+		Text [ en-US ] = "Pass~word" ;
 	};
 	Edit ED_INPASSWORD
 	{
 		HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INPASSWORD" ;
 		Pos = MAP_APPFONT ( 78, 165 ) ;
 		Size = MAP_APPFONT ( 115, 12 ) ;
-		Border = TRUE;
-		PassWord = TRUE;
+		Border = TRUE ;
+		PassWord = TRUE ;
 	};
 	FixedLine FL_SEPARATOR
 	{
@@ -436,3 +430,5 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
 		Size = MAP_APPFONT ( 50, 14 ) ;
 	};
 };
+
+// ********************************************************************** EOF


Mime
View raw message