openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1837382 - in /openoffice/trunk/main: cui/source/options/optgdlg.src cui/source/options/optmemory.src sw/source/ui/config/mailconfigpage.src sw/source/ui/frmdlg/wrap.src
Date Fri, 03 Aug 2018 16:10:51 GMT
Author: mseidel
Date: Fri Aug  3 16:10:50 2018
New Revision: 1837382

URL: http://svn.apache.org/viewvc?rev=1837382&view=rev
Log:
Cleaned up resource files.

Modified:
    openoffice/trunk/main/cui/source/options/optgdlg.src
    openoffice/trunk/main/cui/source/options/optmemory.src
    openoffice/trunk/main/sw/source/ui/config/mailconfigpage.src
    openoffice/trunk/main/sw/source/ui/frmdlg/wrap.src

Modified: openoffice/trunk/main/cui/source/options/optgdlg.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/options/optgdlg.src?rev=1837382&r1=1837381&r2=1837382&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/options/optgdlg.src (original)
+++ openoffice/trunk/main/cui/source/options/optgdlg.src Fri Aug  3 16:10:50 2018
@@ -20,131 +20,132 @@
  *************************************************************/
 
 
- // include ---------------------------------------------------------------
+
+// include ---------------------------------------------------------------
 
 #include <cuires.hrc>
 #include "optgdlg.hrc"
 #include "helpid.hrc"
 
- //****************************************************************************
- //
- // TabPage Sonstiges
- //
- //****************************************************************************
+//****************************************************************************
+//
+// TabPage General
+//
+//****************************************************************************
 
 TabPage OFA_TP_MISC
 {
 	HelpID = HID_OFA_TP_MISC ;
 	SVLook = TRUE ;
-	Size = MAP_APPFONT ( 260 , 185 ) ;
+	Size = MAP_APPFONT ( 260, 185 ) ;
 	Hide = TRUE ;
-    FixedLine FL_HELP
-    {
-		Pos = MAP_APPFONT( COL0, ROW0 );
-		Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-		Text [ en-US ] = "Help";
+	FixedLine FL_HELP
+	{
+		Pos = MAP_APPFONT ( COL0, ROW0 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "Help" ;
 	};
 	CheckBox CB_TOOLTIP
 	{
-	    HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP";
-		Pos = MAP_APPFONT( COL1, ROW1 );
-		Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-		Text [ en-US ] = "~Tips";
+		HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP" ;
+		Pos = MAP_APPFONT ( COL1, ROW1 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "~Tips" ;
 	};
 	CheckBox CB_EXTHELP
 	{
-	    HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP";
-		Pos = MAP_APPFONT( COL2, ROW2 );
-		Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT );
-		Text [ en-US ] = "~Extended tips";
+		HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP" ;
+		Pos = MAP_APPFONT ( COL2, ROW2 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "~Extended tips" ;
 	};
 	CheckBox CB_HELPAGENT
 	{
-	    HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT";
-		Pos = MAP_APPFONT( COL1, ROW3 );
-		Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-		Text [ en-US ] = "~Help Agent";
-	};
-    PushButton PB_HELPAGENT_RESET
-    {
-        HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET";
-		Pos = MAP_APPFONT( COL2, ROW4 );
-		Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-		Text [ en-US ] = "~Reset Help Agent";
-	};
-    FixedText FT_HELPFORMAT
-    {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) );
-        Size = MAP_APPFONT( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "Help ~formatting";
-	};
-    ListBox LB_HELPFORMAT
-    {
-        HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT";
-        Pos = MAP_APPFONT( COL4, ROW5 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 );
-        DropDown = TRUE ;
+		HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT" ;
+		Pos = MAP_APPFONT ( COL1, ROW3 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "~Help Agent" ;
+	};
+	PushButton PB_HELPAGENT_RESET
+	{
+		HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET" ;
+		Pos = MAP_APPFONT ( COL2, ROW4 ) ;
+		Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ;
+		Text [ en-US ] = "~Reset Help Agent" ;
+	};
+	FixedText FT_HELPFORMAT
+	{
+		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) ) ;
+		Size = MAP_APPFONT ( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "Help ~formatting" ;
+	};
+	ListBox LB_HELPFORMAT
+	{
+		HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT" ;
+		Pos = MAP_APPFONT ( COL4, ROW5 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH - COL4, 50 ) ;
+		DropDown = TRUE ;
 		Border = TRUE ;
 		TabStop = TRUE ;
-        StringList [ en-US ] =
+		StringList [ en-US ] =
 		{
-            < "Default" ; > ;
-            < "High Contrast #1" ; > ;
-            < "High Contrast #2" ; > ;
-            < "High Contrast Black" ; > ;
-            < "High Contrast White" ; > ;
-        };
-	};
-    FixedLine FL_FILEDLG
-    {
-        Pos = MAP_APPFONT( COL0, ROW6 );
-		Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-		Text [ en-US ] = "Open/Save dialogs";
-	};
-    FixedImage FI_FILEDLG_RO
-    {
-        Pos = MAP_APPFONT( COL1 - 7, ROW7 + 2 );
-        Size = MAP_APPFONT( 6, 6 );
-        Hide = TRUE;
-    };
+			< "Default"		; > ;
+			< "High Contrast #1"	; > ;
+			< "High Contrast #2"	; > ;
+			< "High Contrast Black"	; > ;
+			< "High Contrast White"	; > ;
+		};
+	};
+	FixedLine FL_FILEDLG
+	{
+		Pos = MAP_APPFONT ( COL0, ROW6 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "Open/Save dialogs" ;
+	};
+	FixedImage FI_FILEDLG_RO
+	{
+		Pos = MAP_APPFONT ( COL1 - 7, ROW7 + 2 ) ;
+		Size = MAP_APPFONT ( 6, 6 ) ;
+		Hide = TRUE ;
+	};
 	CheckBox CB_FILEDLG
 	{
-	    HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG";
-        Pos = MAP_APPFONT( COL1, ROW7 );
-		Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-		Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
-	};
-    FixedLine FL_DOCSTATUS
-    {
-        Pos = MAP_APPFONT( COL0, ROW8 );
-		Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-    	Text [ en-US ] = "Document status";
-	};
-    CheckBox CB_DOCSTATUS
-	{
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS";
-        Pos = MAP_APPFONT( COL1, ROW9 );
-		Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-    	Text [ en-US ] = "~Printing sets \"document modified\" status";
+		HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG" ;
+		Pos = MAP_APPFONT ( COL1, ROW7 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "~Use %PRODUCTNAME dialogs" ;
+	};
+	FixedLine FL_DOCSTATUS
+	{
+		Pos = MAP_APPFONT ( COL0, ROW8 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "Document status" ;
+	};
+	CheckBox CB_DOCSTATUS
+	{
+		HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS" ;
+		Pos = MAP_APPFONT ( COL1, ROW9 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "~Printing sets \"document modified\" status" ;
 	};
 	FixedLine FL_TWOFIGURE
 	{
-		Pos = MAP_APPFONT( COL0, ROW10 );
-		Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+		Pos = MAP_APPFONT ( COL0, ROW10 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
 		Text [ en-US ] = "Year (two digits)" ;
 	};
 	FixedText FT_INTERPRET
 	{
-		Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW11) );
-		Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT );
-		Text [ en-US ] = "Interpret as years between";
+		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ) ;
+		Size = MAP_APPFONT ( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "Interpret as years between" ;
 	};
 	NumericField NF_YEARVALUE
 	{
-	    HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE";
+		HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT( COL4, ROW11 );
-		Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
+		Pos = MAP_APPFONT ( COL4, ROW11 ) ;
+		Size = MAP_APPFONT ( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ) ;
 		Minimum = 1583 ;
 		Maximum = 9857 ;
 		Spin = TRUE ;
@@ -152,139 +153,139 @@ TabPage OFA_TP_MISC
 	};
 	FixedText FT_TOYEAR
 	{
-		Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) );
-		Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
+		Pos = MAP_APPFONT ( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ) ;
 		Text [ en-US ] = "and " ;
 	};
-    FixedLine FL_PRINTDLG
-    {
-        Pos = MAP_APPFONT( COL0, ROW8 );
-		Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-		Text [ en-US ] = "Print dialogs";
+	FixedLine FL_PRINTDLG
+	{
+		Pos = MAP_APPFONT ( COL0, ROW8 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "Print dialogs" ;
 	};
 	CheckBox CB_PRINTDLG
 	{
-	    HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG";
-        Pos = MAP_APPFONT( COL1, ROW9 );
-		Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-		Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
+		HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG" ;
+		Pos = MAP_APPFONT ( COL1, ROW9 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Use %PRODUCTNAME ~dialogs" ;
 	};
 };
 
- //****************************************************************************
- //
- // TabPage Ansicht
- //
- //****************************************************************************
+//****************************************************************************
+//
+// TabPage View
+//
+//****************************************************************************
 
 TabPage OFA_TP_VIEW
 {
 	HelpID = HID_OFA_TP_VIEW ;
 	SVLook = TRUE ;
-	Size = MAP_APPFONT ( 260 , 185 ) ;
+	Size = MAP_APPFONT ( 260, 185 ) ;
 	Hide = TRUE ;
-    FixedLine FL_USERINTERFACE
+	FixedLine FL_USERINTERFACE
 	{
-		Pos = MAP_APPFONT ( 6 , ROW0 ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text [ en-US ] = "User Interface" ;
-    };
-    FixedText FT_WINDOWSIZE
-	{
-        Pos = MAP_APPFONT ( 12 , OFFS_TEXTBOX_FIXEDTEXT( ROW_MF_SCALING ) ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Text [ en-US ] = "Sc~aling" ;
-    };
-    MetricField MF_WINDOWSIZE
-	{
-        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE";
-        Pos = MAP_APPFONT ( 95 , ROW_MF_SCALING ) ;
-        Size = MAP_APPFONT ( 31 , 12 ) ;
+		Pos = MAP_APPFONT ( 6, ROW0 ) ;
+		Size = MAP_APPFONT ( 120, 8 ) ;
+		Text [ en-US ] = "User Interface" ;
+	};
+	FixedText FT_WINDOWSIZE
+	{
+		Pos = MAP_APPFONT ( 12, OFFS_TEXTBOX_FIXEDTEXT ( ROW_MF_SCALING ) ) ;
+		Size = MAP_APPFONT ( 80, 8 ) ;
+		Text [ en-US ] = "Sc~aling" ;
+	};
+	MetricField MF_WINDOWSIZE
+	{
+		HelpID = "cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE" ;
+		Pos = MAP_APPFONT ( 95, ROW_MF_SCALING ) ;
+		Size = MAP_APPFONT ( 31, 12 ) ;
 		Border = TRUE ;
 		TabStop = TRUE ;
 		Left = TRUE ;
 		Repeat = TRUE ;
 		Spin = TRUE ;
-        Minimum = 80 ;
-        Maximum = 130 ;
+		Minimum = 80 ;
+		Maximum = 130 ;
 		DecimalDigits = 0 ;
-        First = 80 ;
-        Last = 130 ;
+		First = 80 ;
+		Last = 130 ;
 		SpinSize = 1 ;
 		Unit = FUNIT_PERCENT ;
 	};
-    FixedText FT_ICONSIZESTYLE
+	FixedText FT_ICONSIZESTYLE
+	{
+		Pos = MAP_APPFONT ( 12, ROW_FT_ICONSIZESTYLE ) ;
+		Size = MAP_APPFONT ( 114, 8 ) ;
+		Text [ en-US ] = "Icon size and style" ;
+	};
+	String STR_ICONSIZE
+	{
+		Text [ en-US ] = "Icon size" ;
+	};
+	ListBox LB_ICONSIZE
+	{
+		HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE" ;
+		Pos = MAP_APPFONT ( 12, ROW_LB_ICONSIZESTYLE ) ;
+		Size = MAP_APPFONT ( 45, 60 ) ;
+		DropDown = TRUE ;
+		Border = TRUE ;
+		TabStop = TRUE ;
+		StringList [ en-US ] =
+		{
+			< "Automatic" ;	> ;
+			< "Small" ;	> ;
+			< "Large" ;	> ;
+		};
+	};
+	ListBox LB_ICONSTYLE
 	{
-        Pos = MAP_APPFONT ( 12 , ROW_FT_ICONSIZESTYLE  ) ;
-        Size = MAP_APPFONT ( 114 , 8 ) ;
-        Text [ en-US ] = "Icon size and style" ;
-    };
-    String STR_ICONSIZE
-	{
-        Text [ en-US ] = "Icon size" ;
-    };
-    ListBox LB_ICONSIZE
-	{
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE";
-        Pos = MAP_APPFONT ( 12 , ROW_LB_ICONSIZESTYLE ) ;
-        Size = MAP_APPFONT ( 45 , 60 ) ;
+		HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE" ;
+		Pos = MAP_APPFONT ( 61, ROW_LB_ICONSIZESTYLE ) ;
+		Size = MAP_APPFONT ( 65, 70 ) ;
 		DropDown = TRUE ;
 		Border = TRUE ;
 		TabStop = TRUE ;
 		StringList [ en-US ] =
 		{
-            < "Automatic" ; > ;
-			< "Small" ; > ;
-			< "Large" ; > ;
+			< "Automatic" ;		> ;
+			< "Galaxy (default)" ;	> ;
+			< "High Contrast" ;	> ;
+			< "Industrial" ;	> ;
+			< "Classic" ;		> ;
 		};
 	};
-    ListBox LB_ICONSTYLE
-    {
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE";
-        Pos = MAP_APPFONT ( 61 , ROW_LB_ICONSIZESTYLE ) ;
-        Size = MAP_APPFONT ( 65 , 70 ) ;
-        DropDown = TRUE ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Automatic" ; > ;
-            < "Galaxy (default)" ; > ;
-            < "High Contrast" ; > ;
-            < "Industrial" ; > ;
-            < "Classic" ; > ;
-        };
-    };
 	CheckBox CB_SYSTEM_FONT
 	{
-	    HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT";
+		HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT" ;
 		TabStop = TRUE ;
-		Pos = MAP_APPFONT( 12, ROW_CB_SYSTEM_FONT );
-        Size = MAP_APPFONT( 114, 16 );
-        WordBreak = TRUE;
-		Text[ en-US ] = "Use system ~font for user interface";
+		Pos = MAP_APPFONT ( 12, ROW_CB_SYSTEM_FONT ) ;
+		Size = MAP_APPFONT ( 114, 16 ) ;
+		WordBreak = TRUE ;
+		Text[ en-US ] = "Use system ~font for user interface" ;
 	};
 
 	CheckBox CB_FONTANTIALIASING
 	{
-	    HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING";
-        TabStop = TRUE ;
-        Pos = MAP_APPFONT ( 12 , ROW_CB_FONTANTIALIASING ) ;
-		Size = MAP_APPFONT ( 110 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "Screen font antialiasing" ;
+		HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING" ;
+		TabStop = TRUE ;
+		Pos = MAP_APPFONT ( 12, ROW_CB_FONTANTIALIASING ) ;
+		Size = MAP_APPFONT ( 110, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Screen font antialiasing" ;
 	};
 	FixedText FT_POINTLIMIT_LABEL
 	{
-        Pos = MAP_APPFONT ( 23 , OFFS_TEXTBOX_FIXEDTEXT( ROW_NF_AA_POINTLIMIT ) ) ;
-		Size = MAP_APPFONT ( 20 , 8 ) ;
-		Text [ en-US ] = "from";
+		Pos = MAP_APPFONT ( 23, OFFS_TEXTBOX_FIXEDTEXT ( ROW_NF_AA_POINTLIMIT ) ) ;
+		Size = MAP_APPFONT ( 20, 8 ) ;
+		Text [ en-US ] = "from" ;
 	};
-    NumericField NF_AA_POINTLIMIT
+	NumericField NF_AA_POINTLIMIT
 	{
-        HelpID = "cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT";
+		HelpID = "cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 46, ROW_NF_AA_POINTLIMIT ) ;
-		Size = MAP_APPFONT ( 30 , 12 ) ;
+		Pos = MAP_APPFONT ( 46, ROW_NF_AA_POINTLIMIT ) ;
+		Size = MAP_APPFONT ( 30, 12 ) ;
 		Minimum = 1;
 		Maximum = 10000;
 		SpinSize = 1;
@@ -293,373 +294,376 @@ TabPage OFA_TP_VIEW
 	};
 	FixedText FT_POINTLIMIT_UNIT
 	{
-        Pos = MAP_APPFONT ( 79 , OFFS_TEXTBOX_FIXEDTEXT( ROW_NF_AA_POINTLIMIT ) ) ;
-		Size = MAP_APPFONT ( 47 , 8 ) ;
-		Text [ en-US ] = "Pixels";
-	};
-    FixedLine FL_MENU
-    {
-        Pos = MAP_APPFONT ( 6, ROW_FL_MENU ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text [ en-US ] = "Menu" ;
-    };
-    FixedText FT_MENU_ICONS
-	{
-        Pos = MAP_APPFONT ( 12 , ROW_FT_MENU_ICONS ) ;
-        Size = MAP_APPFONT ( 114 , 8 ) ;
-        Text [ en-US ] = "Icons in menus" ;
-    };
-    ListBox LB_MENU_ICONS
-    {
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS";
-        Pos = MAP_APPFONT ( 12 , ROW_LB_MENU_ICONS ) ;
-        Size = MAP_APPFONT ( 114 , 60 ) ;
-        DropDown = TRUE ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Automatic" ; > ;
-            < "Hide" ; > ;
-            < "Show" ; > ;
-        };
-    };
-    FixedLine FL_FONTLISTS
-    {
-        Pos = MAP_APPFONT ( 6, ROW_FL_FONTLISTS ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text [ en-US ] = "Font Lists" ;
-    };
-    CheckBox CB_FONT_SHOW
-    {
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW";
-        Pos = MAP_APPFONT ( 12, ROW_CB_FONT_SHOW ) ;
-        Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "Show p~review of fonts" ;
-    };
-    CheckBox CB_FONT_HISTORY
-	{
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY";
-        Pos = MAP_APPFONT ( 12, ROW_CB_FONT_HISTORY ) ;
-        Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "Show font h~istory" ;
-	};
-    FixedLine FL_RENDERING
-    {
-        Pos = MAP_APPFONT ( 133 , ROW_FL_RENDERING ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-		Text [ en-US ] = "Graphics output";
-	};
-
-    CheckBox CB_USE_HARDACCELL
-	{
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL";
-        Pos = MAP_APPFONT ( 139, ROW_CB_USE_HARDACCELL ) ;
-        Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "Use hardware acceleration" ;
-	};
-
-    CheckBox CB_USE_ANTIALIASE
-	{
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE";
-        Pos = MAP_APPFONT ( 139, ROW_CB_USE_ANTIALIASE ) ;
-        Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "Use Anti-Aliasing" ;
-	};
-
-    FixedLine FL_MOUSE
-	{
-        Pos = MAP_APPFONT ( 133 , ROW_FL_MOUSE ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-    	Text [ en-US ] = "Mouse";
-	};
-    FixedText FT_MOUSEPOS
-    {
-        Pos = MAP_APPFONT ( 139, ROW_FT_MOUSEPOS ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
+		Pos = MAP_APPFONT ( 79, OFFS_TEXTBOX_FIXEDTEXT ( ROW_NF_AA_POINTLIMIT ) ) ;
+		Size = MAP_APPFONT ( 47, 8 ) ;
+		Text [ en-US ] = "Pixels" ;
+	};
+	FixedLine FL_MENU
+	{
+		Pos = MAP_APPFONT ( 6, ROW_FL_MENU ) ;
+		Size = MAP_APPFONT ( 120, 8 ) ;
+		Text [ en-US ] = "Menu" ;
+	};
+	FixedText FT_MENU_ICONS
+	{
+		Pos = MAP_APPFONT ( 12, ROW_FT_MENU_ICONS ) ;
+		Size = MAP_APPFONT ( 114, 8 ) ;
+		Text [ en-US ] = "Icons in menus" ;
+	};
+	ListBox LB_MENU_ICONS
+	{
+		HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS" ;
+		Pos = MAP_APPFONT ( 12, ROW_LB_MENU_ICONS ) ;
+		Size = MAP_APPFONT ( 114, 60 ) ;
+		DropDown = TRUE ;
+		Border = TRUE ;
+		TabStop = TRUE ;
+		StringList [ en-US ] =
+		{
+			< "Automatic" ;	> ;
+			< "Hide" ;	> ;
+			< "Show" ;	> ;
+		};
+	};
+	FixedLine FL_FONTLISTS
+	{
+		Pos = MAP_APPFONT ( 6, ROW_FL_FONTLISTS ) ;
+		Size = MAP_APPFONT ( 120, 8 ) ;
+		Text [ en-US ] = "Font Lists" ;
+	};
+	CheckBox CB_FONT_SHOW
+	{
+		HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW" ;
+		Pos = MAP_APPFONT ( 12, ROW_CB_FONT_SHOW ) ;
+		Size = MAP_APPFONT ( 118, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Show p~review of fonts" ;
+	};
+	CheckBox CB_FONT_HISTORY
+	{
+		HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY" ;
+		Pos = MAP_APPFONT ( 12, ROW_CB_FONT_HISTORY ) ;
+		Size = MAP_APPFONT ( 118, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Show font h~istory" ;
+	};
+	FixedLine FL_RENDERING
+	{
+		Pos = MAP_APPFONT ( 133, ROW_FL_RENDERING ) ;
+		Size = MAP_APPFONT ( 120, 8 ) ;
+		Text [ en-US ] = "Graphics output" ;
+	};
+
+	CheckBox CB_USE_HARDACCELL
+	{
+		HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL" ;
+		Pos = MAP_APPFONT ( 139, ROW_CB_USE_HARDACCELL ) ;
+		Size = MAP_APPFONT ( 118, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Use hardware acceleration" ;
+	};
+
+	CheckBox CB_USE_ANTIALIASE
+	{
+		HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE" ;
+		Pos = MAP_APPFONT ( 139, ROW_CB_USE_ANTIALIASE ) ;
+		Size = MAP_APPFONT ( 118, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Use Anti-Aliasing" ;
+	};
+
+	FixedLine FL_MOUSE
+	{
+		Pos = MAP_APPFONT ( 133, ROW_FL_MOUSE ) ;
+		Size = MAP_APPFONT ( 120, 8 ) ;
+		Text [ en-US ] = "Mouse" ;
+	};
+	FixedText FT_MOUSEPOS
+	{
+		Pos = MAP_APPFONT ( 139, ROW_FT_MOUSEPOS ) ;
+		Size = MAP_APPFONT ( 120, 8 ) ;
 		Text [ en-US ] = "Mouse positioning" ;
 	};
-    ListBox LB_MOUSEPOS
+	ListBox LB_MOUSEPOS
 	{
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS";
-        Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEPOS ) ;
-        Size = MAP_APPFONT ( 114 , 60 ) ;
+		HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS" ;
+		Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEPOS ) ;
+		Size = MAP_APPFONT ( 114, 60 ) ;
 		DropDown = TRUE ;
 		Border = TRUE ;
 		TabStop = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "Default button" ; > ;
-			< "Dialog center" ; > ;
-			< "No automatic positioning" ; > ;
+			< "Default button" ;		> ;
+			< "Dialog center" ;		> ;
+			< "No automatic positioning" ;	> ;
 		};
 	};
-    FixedText FT_MOUSEMIDDLE
-    {
-        Pos = MAP_APPFONT ( 139, ROW_FT_MOUSEMIDDLE ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-    	Text [ en-US ] = "Middle mouse button";
-	};
-    ListBox LB_MOUSEMIDDLE
-    {
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE";
-        Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEMIDDLE ) ;
-        Size = MAP_APPFONT ( 114 , 60 ) ;
+	FixedText FT_MOUSEMIDDLE
+	{
+		Pos = MAP_APPFONT ( 139, ROW_FT_MOUSEMIDDLE ) ;
+		Size = MAP_APPFONT ( 120, 8 ) ;
+		Text [ en-US ] = "Middle mouse button" ;
+	};
+	ListBox LB_MOUSEMIDDLE
+	{
+		HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE" ;
+		Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEMIDDLE ) ;
+		Size = MAP_APPFONT ( 114, 60 ) ;
 		DropDown = TRUE ;
 		Border = TRUE ;
 		TabStop = TRUE ;
-	    StringList [ en-US ] =
-    	{
-	    	< "No function" ; > ;
-    		< "Automatic scrolling" ; > ;
-	    	< "Paste clipboard" ; > ;
+		StringList [ en-US ] =
+		{
+			< "No function" ;		> ;
+			< "Automatic scrolling" ;	> ;
+			< "Paste clipboard" ;		> ;
 		};
 	};
 
 	// #i97672#
-    FixedLine FL_SELECTION
+	FixedLine FL_SELECTION
 	{
-        Pos = MAP_APPFONT ( 133 , ROW_FL_SELECTION ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-    	Text [ en-US ] = "Selection";
+		Pos = MAP_APPFONT ( 133, ROW_FL_SELECTION ) ;
+		Size = MAP_APPFONT ( 120, 8 ) ;
+		Text [ en-US ] = "Selection" ;
 	};
 
-    CheckBox CB_SELECTION
+	CheckBox CB_SELECTION
 	{
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION";
-        Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
-        Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "Transparency" ;
+		HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION" ;
+		Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
+		Size = MAP_APPFONT ( 118 - 34, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Transparency" ;
 	};
 
-    MetricField MF_SELECTION
+	MetricField MF_SELECTION
 	{
-        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_SELECTION";
-        Pos = MAP_APPFONT ( 139 + (95 - 12), ROW_CB_SELECTION ) ;
-        Size = MAP_APPFONT ( 31 , 12 ) ;
+		HelpID = "cui:MetricField:OFA_TP_VIEW:MF_SELECTION" ;
+		Pos = MAP_APPFONT ( 139 + (95 - 12), ROW_CB_SELECTION ) ;
+		Size = MAP_APPFONT ( 31, 12 ) ;
 		Border = TRUE ;
 		TabStop = TRUE ;
 		Repeat = TRUE ;
 		Spin = TRUE ;
-        Minimum = 10 ;
-        Maximum = 90 ;
+		Minimum = 10 ;
+		Maximum = 90 ;
 		DecimalDigits = 0 ;
-        First = 10 ;
-        Last = 90 ;
+		First = 10 ;
+		Last = 90 ;
 		SpinSize = 5 ;
 		Unit = FUNIT_PERCENT ;
 	};
 };
-// *******************************************************************
+
+//****************************************************************************
+//
+// TabPage Languages
+//
+//****************************************************************************
 
 TabPage OFA_TP_LANGUAGES
 {
 	HelpID = HID_OFA_TP_LANGUAGES ;
 	SVLook = TRUE ;
-	Size = MAP_APPFONT ( 260 , 185 ) ;
+	Size = MAP_APPFONT ( 260, 185 ) ;
 	Hide = TRUE ;
-    FixedLine FL_UI_LANG
+	FixedLine FL_UI_LANG
+	{
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+		Size = MAP_APPFONT ( 248, 8 ) ;
+		Text [ en-US ] = "Language of" ;
+	};
+	FixedImage FI_USERINTERFACE
+	{
+		Pos = MAP_APPFONT ( 5, 17 ) ;
+		Size = MAP_APPFONT ( 6, 6 ) ;
+		Hide = TRUE ;
+	};
+	FixedText FT_USERINTERFACE
+	{
+		Pos = MAP_APPFONT ( 12, 16 ) ;
+		Size = MAP_APPFONT ( 108, 8 ) ;
+		Text [ en-US ] = "~User interface" ;
+	};
+	ListBox LB_USERINTERFACE
+	{
+		HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE" ;
+		Pos = MAP_APPFONT ( 123, 14 ) ;
+		Size = MAP_APPFONT ( 125, 60 ) ;
+		DropDown = TRUE ;
+		Border = TRUE ;
+		TabStop = TRUE ;
+		Sort = TRUE ;
+	};
+	FixedImage FI_LOCALESETTING
+	{
+		Pos = MAP_APPFONT ( 5, 32 ) ;
+		Size = MAP_APPFONT ( 6, 6 ) ;
+		Hide = TRUE ;
+	};
+	FixedText FT_LOCALESETTING
+	{
+		Pos = MAP_APPFONT ( 12, 31 ) ;
+		Size = MAP_APPFONT ( 108, 8 ) ;
+		Text [ en-US ] = "Locale setting" ;
+	};
+	ListBox LB_LOCALESETTING
+	{
+		HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING" ;
+		Pos = MAP_APPFONT ( 123, 30 ) ;
+		Size = MAP_APPFONT ( 125, 60 ) ;
+		DropDown = TRUE ;
+		Border = TRUE ;
+		TabStop = TRUE ;
+		Sort = TRUE ;
+	};
+	FixedText FT_DECIMALSEPARATOR
+	{
+		Pos = MAP_APPFONT ( 12, 46 ) ;
+		Size = MAP_APPFONT ( 108, 8 ) ;
+		Text [ en-US ] = "Decimal separator key" ;
+	};
+	CheckBox CB_DECIMALSEPARATOR
+	{
+		HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR" ;
+		Pos = MAP_APPFONT ( 123, 46) ;
+		Size = MAP_APPFONT ( 125, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "~Same as locale setting ( %1 )" ;
+	};
+	FixedImage FI_CURRENCY
+	{
+		Pos = MAP_APPFONT ( 5, 63 ) ;
+		Size = MAP_APPFONT ( 6, 6 ) ;
+		Hide = TRUE ;
+	};
+	FixedText FT_CURRENCY
+	{
+		Pos = MAP_APPFONT ( 12, 61 ) ;
+		Size = MAP_APPFONT ( 108, 8 ) ;
+		Text [ en-US ] = "~Default currency" ;
+	};
+	ListBox LB_CURRENCY
 	{
-		Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-		Text [ en-US ] = "Language of";
-	};
-    FixedImage FI_USERINTERFACE
-    {
-        Pos = MAP_APPFONT ( 5 , 17 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
-    };
-    FixedText FT_USERINTERFACE
-	{
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-		Size = MAP_APPFONT ( 108 , 8 ) ;
-		Text [ en-US ] = "~User interface";
-    };
-    ListBox LB_USERINTERFACE
-	{
-        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE";
-        Pos = MAP_APPFONT ( 123 , 14 ) ;
-		Size = MAP_APPFONT ( 125 , 60 ) ;
-		DropDown = TRUE ;
-		Border = TRUE ;
-		TabStop = TRUE ;
-		Sort = TRUE;
-	};
-    FixedImage FI_LOCALESETTING
-    {
-        Pos = MAP_APPFONT ( 5 , 32 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
-    };
-    FixedText FT_LOCALESETTING
-	{
-        Pos = MAP_APPFONT ( 12 , 31 ) ;
-		Size = MAP_APPFONT ( 108 , 8 ) ;
-		Text [ en-US ] = "Locale setting";
-    };
-    ListBox LB_LOCALESETTING
-	{
-        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING";
-        Pos = MAP_APPFONT ( 123 , 30 ) ;
-		Size = MAP_APPFONT ( 125 , 60 ) ;
-		DropDown = TRUE ;
-		Border = TRUE ;
-		TabStop = TRUE ;
-		Sort = TRUE;
-	};
-    FixedText FT_DECIMALSEPARATOR
-    {
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
-        Size = MAP_APPFONT ( 108 , 8 ) ;
-        Text [ en-US ] = "Decimal separator key";
-    };
-    CheckBox CB_DECIMALSEPARATOR
-    {
-        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR";
-        Pos = MAP_APPFONT ( 123 , 46) ;
-        Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "~Same as locale setting ( %1 )";
-    };
-    FixedImage FI_CURRENCY
-    {
-        Pos = MAP_APPFONT ( 5 , 63 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
-    };
-    FixedText FT_CURRENCY
-	{
-        Pos = MAP_APPFONT ( 12 , 61 ) ;
-		Size = MAP_APPFONT ( 108 , 8 ) ;
-        Text [ en-US ] = "~Default currency";
-    };
-    ListBox LB_CURRENCY
-	{
-        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY";
-        Pos = MAP_APPFONT ( 123 , 59 ) ;
-		Size = MAP_APPFONT ( 125 , 60 ) ;
-		DropDown = TRUE ;
-		Border = TRUE ;
-		TabStop = TRUE ;
-		Sort = TRUE;
-	};
-    FixedLine FL_LINGU_LANG
-	{
-        Pos = MAP_APPFONT ( 6 , 77 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-    	Text [ en-US ] = "Default languages for documents";
-    };
-    FixedImage FI_WEST_LANG
-    {
-        Pos = MAP_APPFONT ( 5 , 92 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
-    };
-    FixedText FT_WEST_LANG
-	{
-        Pos = MAP_APPFONT ( 12 , 90 ) ;
-		Size = MAP_APPFONT ( 108 , 8 ) ;
-		Text [ en-US ] = "Western";
-    };
+		HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY" ;
+		Pos = MAP_APPFONT ( 123, 59 ) ;
+		Size = MAP_APPFONT ( 125, 60 ) ;
+		DropDown = TRUE ;
+		Border = TRUE ;
+		TabStop = TRUE ;
+		Sort = TRUE ;
+	};
+	FixedLine FL_LINGU_LANG
+	{
+		Pos = MAP_APPFONT ( 6, 77 ) ;
+		Size = MAP_APPFONT ( 248, 8 ) ;
+		Text [ en-US ] = "Default languages for documents" ;
+	};
+	FixedImage FI_WEST_LANG
+	{
+		Pos = MAP_APPFONT ( 5, 92 ) ;
+		Size = MAP_APPFONT ( 6, 6 ) ;
+		Hide = TRUE ;
+	};
+	FixedText FT_WEST_LANG
+	{
+		Pos = MAP_APPFONT ( 12, 90 ) ;
+		Size = MAP_APPFONT ( 108, 8 ) ;
+		Text [ en-US ] = "Western" ;
+	};
 
 	ListBox LB_WEST_LANG
 	{
-	    HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG";
-        Pos = MAP_APPFONT ( 123 ,  88 ) ;
-		Size = MAP_APPFONT ( 125 , 60 ) ;
+		HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG" ;
+		Pos = MAP_APPFONT ( 123, 88 ) ;
+		Size = MAP_APPFONT ( 125, 60 ) ;
 		DropDown = TRUE ;
 		Border = TRUE ;
 		TabStop = TRUE ;
-		Sort = TRUE;
-	};
-    FixedImage FI_ASIAN_LANG
-    {
-        Pos = MAP_APPFONT ( 5 , 108 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
-    };
-    FixedText FT_ASIAN_LANG
-	{
-        Pos = MAP_APPFONT ( 12 , 106 ) ;
-		Size = MAP_APPFONT ( 108 , 8 ) ;
-		Text [ en-US ] = "Asian";
-    };
+		Sort = TRUE ;
+	};
+	FixedImage FI_ASIAN_LANG
+	{
+		Pos = MAP_APPFONT ( 5, 108 ) ;
+		Size = MAP_APPFONT ( 6, 6 ) ;
+		Hide = TRUE ;
+	};
+	FixedText FT_ASIAN_LANG
+	{
+		Pos = MAP_APPFONT ( 12, 106 ) ;
+		Size = MAP_APPFONT ( 108, 8 ) ;
+		Text [ en-US ] = "Asian" ;
+	};
 	ListBox LB_ASIAN_LANG
 	{
-	    HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG";
-        Pos = MAP_APPFONT ( 123 , 104 ) ;
-		Size = MAP_APPFONT ( 125 , 60 ) ;
+		HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG" ;
+		Pos = MAP_APPFONT ( 123, 104 ) ;
+		Size = MAP_APPFONT ( 125, 60 ) ;
 		DropDown = TRUE ;
 		Border = TRUE ;
 		TabStop = TRUE ;
-		Sort = TRUE;
-	};
-    FixedImage FI_COMPLEX_LANG
-    {
-        Pos = MAP_APPFONT ( 5 , 124 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
-    };
-    FixedText FT_COMPLEX_LANG
-	{
-        Pos = MAP_APPFONT ( 12 , 122 ) ;
-		Size = MAP_APPFONT ( 108 , 8 ) ;
-		Text [ en-US ] = "C~TL";
-    };
+		Sort = TRUE ;
+	};
+	FixedImage FI_COMPLEX_LANG
+	{
+		Pos = MAP_APPFONT ( 5, 124 ) ;
+		Size = MAP_APPFONT ( 6, 6 ) ;
+		Hide = TRUE ;
+	};
+	FixedText FT_COMPLEX_LANG
+	{
+		Pos = MAP_APPFONT ( 12, 122 ) ;
+		Size = MAP_APPFONT ( 108, 8 ) ;
+		Text [ en-US ] = "C~TL" ;
+	};
 	ListBox LB_COMPLEX_LANG
 	{
-	    HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG";
-        Pos = MAP_APPFONT ( 123 , 120 ) ;
-		Size = MAP_APPFONT ( 125 , 60 ) ;
+		HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG" ;
+		Pos = MAP_APPFONT ( 123, 120 ) ;
+		Size = MAP_APPFONT ( 125, 60 ) ;
 		DropDown = TRUE ;
 		Border = TRUE ;
 		TabStop = TRUE ;
-		Sort = TRUE;
+		Sort = TRUE ;
 	};
 	CheckBox CB_CURRENT_DOC
 	{
-	    HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC";
-        Pos = MAP_APPFONT ( 123 , 135 ) ;
-		Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
-		Text [ en-US ] = "For the current document only";
-    };
-    FixedLine FL_ENHANCED
-    {
-        Pos = MAP_APPFONT ( 6 , 145 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-    	Text [ en-US ] = "Enhanced language support";
-    };
-    FixedImage FI_ASIANSUPPORT
-    {
-        Pos = MAP_APPFONT ( 5 , 160 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
-    };
-    CheckBox CB_ASIANSUPPORT
-    {
-        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT";
-        Pos = MAP_APPFONT ( 12 , 158 ) ;
+		HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC" ;
+		Pos = MAP_APPFONT ( 123, 135 ) ;
+		Size = MAP_APPFONT ( 125, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "For the current document only" ;
+	};
+	FixedLine FL_ENHANCED
+	{
+		Pos = MAP_APPFONT ( 6, 145 ) ;
+		Size = MAP_APPFONT ( 248, 8 ) ;
+		Text [ en-US ] = "Enhanced language support" ;
+	};
+	FixedImage FI_ASIANSUPPORT
+	{
+		Pos = MAP_APPFONT ( 5, 160 ) ;
+		Size = MAP_APPFONT ( 6, 6 ) ;
+		Hide = TRUE ;
+	};
+	CheckBox CB_ASIANSUPPORT
+	{
+		HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT" ;
+		Pos = MAP_APPFONT ( 12, 158 ) ;
 		Size = MAP_APPFONT ( 236 ,RSC_CD_CHECKBOX_HEIGHT ) ;
-    	Text [ en-US ] = "Show UI elements for East Asia~n writings";
-    };
-    FixedImage FI_CTLSUPPORT
-    {
-        Pos = MAP_APPFONT ( 5 , 175 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
-    };
-    CheckBox CB_CTLSUPPORT
-    {
-        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT";
-        Pos = MAP_APPFONT ( 12 , 173 ) ;
-		Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
-    	Text [ en-US ] = "Show UI elements for B~i-Directional writing";
-    };
+		Text [ en-US ] = "Show UI elements for East Asia~n writings" ;
+	};
+	FixedImage FI_CTLSUPPORT
+	{
+		Pos = MAP_APPFONT ( 5, 175 ) ;
+		Size = MAP_APPFONT ( 6, 6 ) ;
+		Hide = TRUE ;
+	};
+	CheckBox CB_CTLSUPPORT
+	{
+		HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT" ;
+		Pos = MAP_APPFONT ( 12, 173 ) ;
+		Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Show UI elements for B~i-Directional writing" ;
+	};
 };
 
 InfoBox RID_SVX_MSGBOX_LANGUAGE_RESTART
 {
-    Message [ en-US ] = "The language setting of the user interface has been updated and will take effect the next time you start %PRODUCTNAME %PRODUCTVERSION";
+	Message [ en-US ] = "The language setting of the user interface has been updated and will take effect the next time you start %PRODUCTNAME %PRODUCTVERSION" ;
 };
-
-

Modified: openoffice/trunk/main/cui/source/options/optmemory.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/options/optmemory.src?rev=1837382&r1=1837381&r2=1837382&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/options/optmemory.src (original)
+++ openoffice/trunk/main/cui/source/options/optmemory.src Fri Aug  3 16:10:50 2018
@@ -31,26 +31,26 @@ TabPage OFA_TP_MEMORY
 {
 	HelpID = HID_OFA_TP_MEMORY ;
 	SVLook = TRUE ;
-	Size = MAP_APPFONT ( 260 , 185 ) ;
+	Size = MAP_APPFONT ( 260, 185 ) ;
 	Hide = TRUE ;
-    FixedLine GB_UNDO
+	FixedLine GB_UNDO
 	{
-        Pos = MAP_APPFONT( COL0, ROW0 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+		Pos = MAP_APPFONT ( COL0, ROW0 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
 		Text [ en-US ] = "Undo" ;
 	};
 	FixedText FT_UNDO
 	{
-		Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW1 ) );
-		Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
-		Text [ en-US ] = "Number of steps";
+		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW1 ) ) ;
+		Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "Number of steps" ;
 	};
 	NumericField ED_UNDO
 	{
-	    HelpID = "cui:NumericField:OFA_TP_MEMORY:ED_UNDO";
+		HelpID = "cui:NumericField:OFA_TP_MEMORY:ED_UNDO" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT( COL3, ROW1 );
-		Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+		Pos = MAP_APPFONT ( COL3, ROW1 ) ;
+		Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
 		TabStop = TRUE ;
 		Left = TRUE ;
 		Repeat = TRUE ;
@@ -61,50 +61,50 @@ TabPage OFA_TP_MEMORY
 		Value = 100 ;
 		Last = 100 ;
 		SpinSize = 1 ;
-        MaxTextLength = 4;
+		MaxTextLength = 4;
 	};
-    FixedLine GB_GRAPHICCACHE
+	FixedLine GB_GRAPHICCACHE
 	{
-		Pos = MAP_APPFONT( COL0, ROW2 );
-		Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-		Text [ en-US ] = "Graphics cache";
+		Pos = MAP_APPFONT ( COL0, ROW2 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "Graphics cache" ;
 	};
-    FixedText FT_GRAPHICCACHE
+	FixedText FT_GRAPHICCACHE
 	{
-		Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW3 ) );
-		Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
-		Text [ en-US ] = "Use for %PRODUCTNAME";
+		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW3 ) ) ;
+		Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "Use for %PRODUCTNAME" ;
 	};
-    NumericField NF_GRAPHICCACHE
+	NumericField NF_GRAPHICCACHE
 	{
-        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE";
+		HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT( COL3, ROW3 );
-		Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+		Pos = MAP_APPFONT ( COL3, ROW3 ) ;
+		Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
 		Minimum = 1;
 		Maximum = 256;
 		SpinSize = 1;
 		Spin = TRUE ;
 		Repeat = TRUE ;
 	};
-    FixedText FT_GRAPHICCACHE_UNIT
+	FixedText FT_GRAPHICCACHE_UNIT
 	{
-		Pos = MAP_APPFONT( COL5, OFFS_TEXTBOX_FIXEDTEXT( ROW3 ) );
-		Size = MAP_APPFONT( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT );
-		Text [ en-US ] = "MB";
+		Pos = MAP_APPFONT ( COL5, OFFS_TEXTBOX_FIXEDTEXT ( ROW3 ) ) ;
+		Size = MAP_APPFONT ( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "MB" ;
 	};
-    FixedText FT_GRAPHICOBJECTCACHE
+	FixedText FT_GRAPHICOBJECTCACHE
 	{
-		Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW4 ) );
-		Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
+		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW4 ) ) ;
+		Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
 		Text [ en-US ] = "Memory per object" ;
 	};
-    NumericField NF_GRAPHICOBJECTCACHE
+	NumericField NF_GRAPHICOBJECTCACHE
 	{
-        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE";
+		HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT( COL3, ROW4 );
-		Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+		Pos = MAP_APPFONT ( COL3, ROW4 ) ;
+		Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
 		Minimum = 10;
 		Maximum = 2560;
 		SpinSize = 1;
@@ -112,34 +112,34 @@ TabPage OFA_TP_MEMORY
 		Repeat = TRUE ;
 		DecimalDigits = 1;
 	};
-    FixedText FT_GRAPHICOBJECTCACHE_UNIT
-    {
-		Pos = MAP_APPFONT( COL5, OFFS_TEXTBOX_FIXEDTEXT( ROW4 ) );
-		Size = MAP_APPFONT( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT );
-		Text [ en-US ] = "MB";
+	FixedText FT_GRAPHICOBJECTCACHE_UNIT
+	{
+		Pos = MAP_APPFONT ( COL5, OFFS_TEXTBOX_FIXEDTEXT ( ROW4 ) ) ;
+		Size = MAP_APPFONT ( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "MB" ;
 	};
-    FixedText FT_GRAPHICOBJECTTIME
+	FixedText FT_GRAPHICOBJECTTIME
 	{
-		Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW5 ) );
-		Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
-		Text [ en-US ] = "Remove from memory after";
+		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW5 ) ) ;
+		Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "Remove from memory after" ;
 	};
-    TimeField TF_GRAPHICOBJECTTIME
+	TimeField TF_GRAPHICOBJECTTIME
 	{
-        HelpID = "cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME";
+		HelpID = "cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT( COL3, ROW5 );
-		Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+		Pos = MAP_APPFONT ( COL3, ROW5 ) ;
+		Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
 		TabStop = TRUE ;
 		Repeat = TRUE ;
 		Spin = TRUE ;
 		Value = Time
 		{
-			Minute = 10;
+			Minute = 10 ;
 		};
 		Minimum = Time
 		{
-			Minute = 1;
+			Minute = 1 ;
 		};
 		Maximum = Time
 		{
@@ -148,7 +148,7 @@ TabPage OFA_TP_MEMORY
 		};
 		First = Time
 		{
-			Minute = 10;
+			Minute = 10 ;
 		};
 		Last = Time
 		{
@@ -159,51 +159,50 @@ TabPage OFA_TP_MEMORY
 		Duration = TRUE ;
 		StrictFormat = TRUE ;
 	};
-    FixedText FT_GRAPHICOBJECTTIME_UNIT
-    {
-		Pos = MAP_APPFONT( COL5, OFFS_TEXTBOX_FIXEDTEXT( ROW5 ) );
-		Size = MAP_APPFONT( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT );
-		Text [ en-US ] = "hh:mm";
+	FixedText FT_GRAPHICOBJECTTIME_UNIT
+	{
+		Pos = MAP_APPFONT ( COL5, OFFS_TEXTBOX_FIXEDTEXT ( ROW5 ) ) ;
+		Size = MAP_APPFONT ( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "hh:mm" ;
 	};
-    FixedLine GB_OLECACHE
+	FixedLine GB_OLECACHE
 	{
-		Pos = MAP_APPFONT( COL0, ROW6 );
-		Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-		Text [ en-US ] = "Cache for inserted objects";
+		Pos = MAP_APPFONT ( COL0, ROW6 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "Cache for inserted objects" ;
 	};
-    FixedText FT_OLECACHE
+	FixedText FT_OLECACHE
 	{
-		Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW7 ) );
-		Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
-		Text [ en-US ] = "Number of objects";
+		Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW7 ) ) ;
+		Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+		Text [ en-US ] = "Number of objects" ;
 	};
-    NumericField NF_OLECACHE
+	NumericField NF_OLECACHE
 	{
-        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE";
+		HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT( COL3, ROW7 );
-		Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+		Pos = MAP_APPFONT ( COL3, ROW7 ) ;
+		Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
 		Minimum = 1;
 		Maximum = 1024;
 		Spin = TRUE ;
 		Repeat = TRUE ;
 	};
-    FixedLine FL_QUICKLAUNCH
-    {
-		Pos = MAP_APPFONT( COL0, ROW8 );
-		Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-		Text [ en-US ] = "%PRODUCTNAME Quickstarter";
-	};
-    CheckBox CB_QUICKLAUNCH
-    {
-        HelpID = "cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH";
-        Pos = MAP_APPFONT( COL1, ROW9 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-		Text [ en-US ] = "Load %PRODUCTNAME during system start-up";
-	};
-    String STR_QUICKLAUNCH_UNX
-    {
-	Text[ en-US ] = "Enable systray Quickstarter";
-    };
+	FixedLine FL_QUICKLAUNCH
+	{
+		Pos = MAP_APPFONT ( COL0, ROW8 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+		Text [ en-US ] = "%PRODUCTNAME Quickstarter" ;
+	};
+	CheckBox CB_QUICKLAUNCH
+	{
+		HelpID = "cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH" ;
+		Pos = MAP_APPFONT ( COL1, ROW9 ) ;
+		Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+		Text [ en-US ] = "Load %PRODUCTNAME during system start-up" ;
+	};
+	String STR_QUICKLAUNCH_UNX
+	{
+		Text [ en-US ] = "Enable systray Quickstarter" ;
+	};
 };
-

Modified: openoffice/trunk/main/sw/source/ui/config/mailconfigpage.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/config/mailconfigpage.src?rev=1837382&r1=1837381&r2=1837382&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/config/mailconfigpage.src (original)
+++ openoffice/trunk/main/sw/source/ui/config/mailconfigpage.src Fri Aug  3 16:10:50 2018
@@ -29,411 +29,408 @@
 
 TabPage TP_MAILCONFIG
 {
-    HelpID = HID_TP_MAILCONFIG;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
-    Hide = TRUE ;
-
-    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";
-    };
-    FixedText       FT_DISPLAYNAME
-    {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 74 , 8 ) ;
-        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;
-    };
-    FixedText       FT_ADDRESS
-    {
-        Pos = MAP_APPFONT ( 12 , 31 ) ;
-        Size = MAP_APPFONT ( 74 , 8 ) ;
-        Text[ en-US ] = "~E-Mail address";
-    };
-    Edit   ED_ADDRESS
-    {
-        HelpID = "sw:Edit:TP_MAILCONFIG:ED_ADDRESS";
-        Pos = MAP_APPFONT ( 88 , 29 ) ;
-        Size = MAP_APPFONT ( 160 , 12 ) ;
-        Border = TRUE;
-    };
-    CheckBox        CB_REPLYTO
-    {
-        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";
-    };
-    FixedText       FT_REPLYTO
-    {
-        Pos = MAP_APPFONT ( 18 , 60 ) ;
-        Size = MAP_APPFONT ( 68 , 8 ) ;
-        Text[ en-US ] = "~Reply address";
-    };
-    Edit ED_REPLYTO
-    {
-        HelpID = "sw:Edit:TP_MAILCONFIG:ED_REPLYTO";
-        Pos = MAP_APPFONT ( 88 , 58 ) ;
-        Size = MAP_APPFONT ( 160 , 12 ) ;
-        Border = TRUE;
-    };
-    FixedLine       FL_SMTP
-    {
-        Pos = MAP_APPFONT ( 6 , 76 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        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";
-    };
-    Edit ED_SERVER
-    {
-        HelpID = "sw:Edit:TP_MAILCONFIG:ED_SERVER";
-        Pos = MAP_APPFONT ( 88 , 87 ) ;
-        Size = MAP_APPFONT ( 105 , 12 ) ;
-        Border = TRUE;
-    };
-    FixedText       FT_PORT
-    {
-        Pos = MAP_APPFONT ( 197 , 89 ) ;
-        Size = MAP_APPFONT ( 24 , 8 ) ;
-        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;
-        Left = TRUE ;
-        First = 1 ;
-        Minimum = 1 ;
-        Maximum = 65535;
-        Repeat = TRUE ;
-        Spin = FALSE ;
-        TabStop = TRUE ;
-    };
-    CheckBox        CB_SECURE
-    {
-        HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_SECURE";
-        Pos = MAP_APPFONT ( 12 , 104 ) ;
-        Size = MAP_APPFONT ( 242 , 10 ) ;
-        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";
-    };
-    FixedLine FL_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( 6 , 156 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-    };
-    PushButton      PB_TEST
-    {
-        HelpID = "sw:PushButton:TP_MAILCONFIG:PB_TEST";
-        Pos = MAP_APPFONT ( 88 , 164 ) ;
-        Size = MAP_APPFONT ( 105 , 14 ) ;
-        Text[ en-US ] = "Test S~ettings...";
-    };
+	HelpID = HID_TP_MAILCONFIG;
+	Size = MAP_APPFONT ( 260, 185 ) ;
+	Hide = TRUE ;
+
+	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" ;
+	};
+	FixedText FT_DISPLAYNAME
+	{
+		Pos = MAP_APPFONT ( 12, 16 ) ;
+		Size = MAP_APPFONT ( 74, 8 ) ;
+		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;
+	};
+	FixedText FT_ADDRESS
+	{
+		Pos = MAP_APPFONT ( 12, 31 ) ;
+		Size = MAP_APPFONT ( 74, 8 ) ;
+		Text[ en-US ] = "~E-Mail address" ;
+	};
+	Edit ED_ADDRESS
+	{
+		HelpID = "sw:Edit:TP_MAILCONFIG:ED_ADDRESS" ;
+		Pos = MAP_APPFONT ( 88, 29 ) ;
+		Size = MAP_APPFONT ( 160, 12 ) ;
+		Border = TRUE;
+	};
+	CheckBox CB_REPLYTO
+	{
+		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" ;
+	};
+	FixedText FT_REPLYTO
+	{
+		Pos = MAP_APPFONT ( 18, 60 ) ;
+		Size = MAP_APPFONT ( 68, 8 ) ;
+		Text[ en-US ] = "~Reply address" ;
+	};
+	Edit ED_REPLYTO
+	{
+		HelpID = "sw:Edit:TP_MAILCONFIG:ED_REPLYTO" ;
+		Pos = MAP_APPFONT ( 88, 58 ) ;
+		Size = MAP_APPFONT ( 160, 12 ) ;
+		Border = TRUE;
+	};
+	FixedLine FL_SMTP
+	{
+		Pos = MAP_APPFONT ( 6, 76 ) ;
+		Size = MAP_APPFONT ( 248, 8 ) ;
+		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" ;
+	};
+	Edit ED_SERVER
+	{
+		HelpID = "sw:Edit:TP_MAILCONFIG:ED_SERVER" ;
+		Pos = MAP_APPFONT ( 88, 87 ) ;
+		Size = MAP_APPFONT ( 105, 12 ) ;
+		Border = TRUE;
+	};
+	FixedText FT_PORT
+	{
+		Pos = MAP_APPFONT ( 197, 89 ) ;
+		Size = MAP_APPFONT ( 24, 8 ) ;
+		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;
+		Left = TRUE ;
+		First = 1 ;
+		Minimum = 1 ;
+		Maximum = 65535;
+		Repeat = TRUE ;
+		Spin = FALSE ;
+		TabStop = TRUE ;
+	};
+	CheckBox CB_SECURE
+	{
+		HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_SECURE" ;
+		Pos = MAP_APPFONT ( 12, 104 ) ;
+		Size = MAP_APPFONT ( 242, 10 ) ;
+		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" ;
+	};
+	FixedLine FL_SEPARATOR
+	{
+		Pos = MAP_APPFONT ( 6, 156 ) ;
+		Size = MAP_APPFONT ( 248, 8 ) ;
+	};
+	PushButton PB_TEST
+	{
+		HelpID = "sw:PushButton:TP_MAILCONFIG:PB_TEST" ;
+		Pos = MAP_APPFONT ( 88, 164 ) ;
+		Size = MAP_APPFONT ( 105, 14 ) ;
+		Text[ en-US ] = "Test S~ettings..." ;
+	};
 };
 ModalDialog DLG_MM_TESTACCOUNTSETTINGS
 {
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    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...";
-    };
-    Control        LB_STATUS
-    {
-        Pos = MAP_APPFONT ( 6, 14 ) ;
-        Size = MAP_APPFONT ( 238 , 50 ) ;
-        Border = TRUE;
-    };
-    FixedText           FI_ERROR
-    {
-        Pos = MAP_APPFONT ( 6 , 68 ) ;
-        Size = MAP_APPFONT ( 238 , 8 ) ;
-        Text[ en-US ] = "Errors";
-    };
-    MultiLineEdit       ED_ERROR
-    {
-        HelpID = "sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR";
-        Pos = MAP_APPFONT ( 6 , 79 ) ;
-        Size = MAP_APPFONT ( 238 , 60 ) ;
-        Border = TRUE;
-        Readonly = TRUE;
-    };
-    FixedLine   FL_SEPAPARATOR
-    {
-        Pos = MAP_APPFONT ( 0 , 145 ) ;
-        Size = MAP_APPFONT ( 250 , 8 ) ;
-    };
-    PushButton          PB_STOP
-    {
-        HelpID = "sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP";
-        Pos = MAP_APPFONT ( 85 , 156 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text[ en-US ] = "~Stop";
-    };
-    CancelButton        PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( 138 , 156 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton          PB_HELP
-    {
-        Pos = MAP_APPFONT ( 194 , 156 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    #define IMGLIST_IDS\
-        IdList = \
-        { \
-            FN_FORMULA_CANCEL ;\
-            FN_FORMULA_APPLY     ;\
-        }; \
-        IdCount = 2
-
-    ImageList ILIST
-    {
-        Prefix = "sc";
-        MaskColor = IMAGE_MASK_COLOR;
-        IMGLIST_IDS;
-    };
-
-    ImageList ILIST_HC
-    {
-        Prefix = "sch";
-        MaskColor = IMAGE_MASK_COLOR ;
-        IMGLIST_IDS;
-    };
-    String ST_TASK
-    {
-        Text[ en-US ] = "Task";
-    };
-    String ST_STATUS
-    {
-        Text[ en-US ] = "Status";
-    };
-    String ST_ESTABLISH
-    {
-        Text[ en-US ] = "Establish network connection";
-    };
-    String ST_FINDSERVER
-    {
-        Text[ en-US ] = "Find outgoing mail server";
-    };
-    String ST_COMPLETED
-    {
-        Text[ en-US ] = "Successful";
-    };
-    String ST_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";
-    };
+	OutputSize = TRUE ;
+	SVLook = TRUE ;
+	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..." ;
+	};
+	Control LB_STATUS
+	{
+		Pos = MAP_APPFONT ( 6, 14 ) ;
+		Size = MAP_APPFONT ( 238, 50 ) ;
+		Border = TRUE;
+	};
+	FixedText FI_ERROR
+	{
+		Pos = MAP_APPFONT ( 6, 68 ) ;
+		Size = MAP_APPFONT ( 238, 8 ) ;
+		Text[ en-US ] = "Errors" ;
+	};
+	MultiLineEdit ED_ERROR
+	{
+		HelpID = "sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR" ;
+		Pos = MAP_APPFONT ( 6, 79 ) ;
+		Size = MAP_APPFONT ( 238, 60 ) ;
+		Border = TRUE;
+		Readonly = TRUE;
+	};
+	FixedLine FL_SEPAPARATOR
+	{
+		Pos = MAP_APPFONT ( 0, 145 ) ;
+		Size = MAP_APPFONT ( 250, 8 ) ;
+	};
+	PushButton PB_STOP
+	{
+		HelpID = "sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP" ;
+		Pos = MAP_APPFONT ( 85, 156 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		Text[ en-US ] = "~Stop" ;
+	};
+	CancelButton PB_CANCEL
+	{
+		Pos = MAP_APPFONT ( 138, 156 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+	};
+	HelpButton PB_HELP
+	{
+		Pos = MAP_APPFONT ( 194, 156 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+	};
+	#define IMGLIST_IDS\
+		IdList = \
+		{ \
+			FN_FORMULA_CANCEL	;\
+			FN_FORMULA_APPLY	;\
+		}; \
+		IdCount = 2
+
+	ImageList ILIST
+	{
+		Prefix = "sc" ;
+		IMGLIST_IDS;
+	};
+
+	ImageList ILIST_HC
+	{
+		Prefix = "sch" ;
+		IMGLIST_IDS;
+	};
+	String ST_TASK
+	{
+		Text[ en-US ] = "Task" ;
+	};
+	String ST_STATUS
+	{
+		Text[ en-US ] = "Status" ;
+	};
+	String ST_ESTABLISH
+	{
+		Text[ en-US ] = "Establish network connection" ;
+	};
+	String ST_FINDSERVER
+	{
+		Text[ en-US ] = "Find outgoing mail server" ;
+	};
+	String ST_COMPLETED
+	{
+		Text[ en-US ] = "Successful" ;
+	};
+	String ST_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" ;
+	};
 
 };
 ModalDialog DLG_MM_SERVERAUTHENTICATION
 {
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_MM_SERVERAUTHENTICATION;
-    Size = MAP_APPFONT ( 250 , 211 ) ;
-    Moveable = TRUE ;
-
-    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";
-    };
-    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";
-    };
-    FixedText FT_OUTGOINGSERVER
-    {
-        Pos = MAP_APPFONT ( 18 , 31 ) ;
-        Size = MAP_APPFONT ( 200 , 8 ) ;
-        Text[ en-US ] = "Outgoing mail server:";
-    };
-    FixedText       FT_USERNAME
-    {
-        Pos = MAP_APPFONT ( 18 , 44 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        Text[ en-US ] = "~User name";
-    };
-    Edit  ED_USERNAME
-    {
-        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME";
-        Pos = MAP_APPFONT ( 78 , 42 ) ;
-        Size = MAP_APPFONT ( 115 , 12 ) ;
-        Border = TRUE;
-    };
-    FixedText       FT_OUTPASSWORD
-    {
-        Pos = MAP_APPFONT ( 18 , 59 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        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;
-    };
-    RadioButton RB_SMPTAFTERPOP
-    {
-        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP";
-        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.";
-    };
-    FixedText FT_INCOMINGSERVER
-    {
-        Pos = MAP_APPFONT ( 18 ,  97 ) ;
-        Size = MAP_APPFONT ( 230 , 8 ) ;
-        Text[ en-US ] = "Incoming mail server:";
-    };
-    FixedText FT_SERVER
-    {
-        Pos = MAP_APPFONT ( 18 , 110 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        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;
-    };
-    FixedText FT_PORT
-    {
-        Pos = MAP_APPFONT ( 195 , 110 ) ;
-        Size = MAP_APPFONT ( 20 , 10 ) ;
-        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;
-        Left = TRUE ;
-        First = 1 ;
-        Minimum = 1 ;
-        Maximum = 65535;
-        Repeat = TRUE ;
-        Spin = FALSE ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_PROTOCOL
-    {
-        Pos = MAP_APPFONT ( 18 , 126 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        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 ] = "~POP 3";
-    };
-    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";
-    };
-    FixedText FT_INUSERNAME
-    {
-        Pos = MAP_APPFONT ( 18 , 152 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        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;
-    };
-    FixedText FT_INPASSWORD
-    {
-        Pos = MAP_APPFONT ( 18 , 167 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        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;
-    };
-    FixedLine FL_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( 0 , 183 ) ;
-        Size = MAP_APPFONT ( 250 , 8 ) ;
-    };
-    OKButton PB_OK
-    {
-        Pos = MAP_APPFONT ( 85 , 191 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    CancelButton PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( 138 , 191 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton PB_HELP
-    {
-        Pos = MAP_APPFONT ( 194 , 191 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
+	OutputSize = TRUE ;
+	SVLook = TRUE ;
+	HelpID = HID_MM_SERVERAUTHENTICATION;
+	Size = MAP_APPFONT ( 250, 211 ) ;
+	Moveable = TRUE ;
+
+	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" ;
+	};
+	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" ;
+	};
+	FixedText FT_OUTGOINGSERVER
+	{
+		Pos = MAP_APPFONT ( 18, 31 ) ;
+		Size = MAP_APPFONT ( 200, 8 ) ;
+		Text[ en-US ] = "Outgoing mail server:" ;
+	};
+	FixedText FT_USERNAME
+	{
+		Pos = MAP_APPFONT ( 18, 44 ) ;
+		Size = MAP_APPFONT ( 53, 8 ) ;
+		Text[ en-US ] = "~User name" ;
+	};
+	Edit ED_USERNAME
+	{
+		HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME" ;
+		Pos = MAP_APPFONT ( 78, 42 ) ;
+		Size = MAP_APPFONT ( 115, 12 ) ;
+		Border = TRUE;
+	};
+	FixedText FT_OUTPASSWORD
+	{
+		Pos = MAP_APPFONT ( 18, 59 ) ;
+		Size = MAP_APPFONT ( 53, 8 ) ;
+		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;
+	};
+	RadioButton RB_SMPTAFTERPOP
+	{
+		HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP" ;
+		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." ;
+	};
+	FixedText FT_INCOMINGSERVER
+	{
+		Pos = MAP_APPFONT ( 18, 97 ) ;
+		Size = MAP_APPFONT ( 230, 8 ) ;
+		Text[ en-US ] = "Incoming mail server:" ;
+	};
+	FixedText FT_SERVER
+	{
+		Pos = MAP_APPFONT ( 18, 110 ) ;
+		Size = MAP_APPFONT ( 53, 8 ) ;
+		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;
+	};
+	FixedText FT_PORT
+	{
+		Pos = MAP_APPFONT ( 195, 110 ) ;
+		Size = MAP_APPFONT ( 20, 10 ) ;
+		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;
+		Left = TRUE ;
+		First = 1 ;
+		Minimum = 1 ;
+		Maximum = 65535;
+		Repeat = TRUE ;
+		Spin = FALSE ;
+		TabStop = TRUE ;
+	};
+	FixedText FT_PROTOCOL
+	{
+		Pos = MAP_APPFONT ( 18, 126 ) ;
+		Size = MAP_APPFONT ( 53, 8 ) ;
+		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" ;
+	};
+	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" ;
+	};
+	FixedText FT_INUSERNAME
+	{
+		Pos = MAP_APPFONT ( 18, 152 ) ;
+		Size = MAP_APPFONT ( 53, 8 ) ;
+		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;
+	};
+	FixedText FT_INPASSWORD
+	{
+		Pos = MAP_APPFONT ( 18, 167 ) ;
+		Size = MAP_APPFONT ( 53, 8 ) ;
+		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;
+	};
+	FixedLine FL_SEPARATOR
+	{
+		Pos = MAP_APPFONT ( 0, 183 ) ;
+		Size = MAP_APPFONT ( 250, 8 ) ;
+	};
+	OKButton PB_OK
+	{
+		Pos = MAP_APPFONT ( 85, 191 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+	};
+	CancelButton PB_CANCEL
+	{
+		Pos = MAP_APPFONT ( 138, 191 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+	};
+	HelpButton PB_HELP
+	{
+		Pos = MAP_APPFONT ( 194, 191 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+	};
 };
-

Modified: openoffice/trunk/main/sw/source/ui/frmdlg/wrap.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/frmdlg/wrap.src?rev=1837382&r1=1837381&r2=1837382&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/frmdlg/wrap.src (original)
+++ openoffice/trunk/main/sw/source/ui/frmdlg/wrap.src Fri Aug  3 16:10:50 2018
@@ -25,129 +25,130 @@
 #include "wrap.hrc"
 #include "globals.hrc"
 #include "helpid.h"
+
 TabPage TP_FRM_WRAP
 {
 	SVLook = TRUE ;
 	HelpID = HID_FRM_EXT ;
-	Pos = MAP_APPFONT ( 0 , 0 ) ;
-	Size = MAP_APPFONT ( 260 , 185 ) ;
+	Pos = MAP_APPFONT ( 0, 0 ) ;
+	Size = MAP_APPFONT ( 260, 185 ) ;
 	Hide = TRUE;
-    FixedLine C_WRAP_FL
+	FixedLine C_WRAP_FL
 	{
-		Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-		Text [ en-US ] = "Settings";
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+		Size = MAP_APPFONT ( 248, 8 ) ;
+		Text [ en-US ] = "Settings" ;
 	};
 	ImageRadioButton RB_NO_WRAP
 	{
-	    HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP";
-        Pos = MAP_APPFONT ( 6 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
-        WordBreak = TRUE;
+		HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP" ;
+		Pos = MAP_APPFONT ( 6, 14 ) ;
+		Size = MAP_APPFONT ( 40, 37 ) ;
+		WordBreak = TRUE;
 		Text [ en-US ] = "~None" ;
 		TopImage = True ;
 	};
 	ImageRadioButton RB_WRAP_LEFT
 	{
-	    HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT";
-        Pos = MAP_APPFONT ( 65 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
-        WordBreak = TRUE;
-        TopImage = True ;
-        Text [ en-US ] = "Before" ;
+		HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT" ;
+		Pos = MAP_APPFONT ( 65, 14 ) ;
+		Size = MAP_APPFONT ( 40, 37 ) ;
+		WordBreak = TRUE;
+		TopImage = True ;
+		Text [ en-US ] = "Before" ;
 	};
 	ImageRadioButton RB_WRAP_RIGHT
 	{
-	    HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT";
-        Pos = MAP_APPFONT ( 121 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
-        WordBreak = TRUE;
-        TopImage = True ;
-        Text [ en-US ] = "After" ;
+		HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT" ;
+		Pos = MAP_APPFONT ( 121, 14 ) ;
+		Size = MAP_APPFONT ( 40, 37 ) ;
+		WordBreak = TRUE;
+		TopImage = True ;
+		Text [ en-US ] = "After" ;
 	};
 	ImageRadioButton RB_WRAP_PARALLEL
 	{
-	    HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL";
-        Pos = MAP_APPFONT ( 177 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
-        WordBreak = TRUE;
+		HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL" ;
+		Pos = MAP_APPFONT ( 177, 14 ) ;
+		Size = MAP_APPFONT ( 40, 37 ) ;
+		WordBreak = TRUE;
 		Text [ en-US ] = "~Parallel" ;
 		TopImage = True ;
 	};
 	ImageRadioButton RB_WRAP_THROUGH
 	{
-	    HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH";
-        Pos = MAP_APPFONT ( 6 , 57 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
-        WordBreak = TRUE;
+		HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH" ;
+		Pos = MAP_APPFONT ( 6, 57 ) ;
+		Size = MAP_APPFONT ( 40, 37 ) ;
+		WordBreak = TRUE;
 		Text [ en-US ] = "Thro~ugh" ;
 		TopImage = True ;
 	};
 	ImageRadioButton RB_WRAP_IDEAL
 	{
-	    HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL";
-        Pos = MAP_APPFONT ( 65 , 57 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
-        WordBreak = TRUE;
+		HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL" ;
+		Pos = MAP_APPFONT ( 65, 57 ) ;
+		Size = MAP_APPFONT ( 40, 37 ) ;
+		WordBreak = TRUE;
 		TopImage = True ;
 		Text [ en-US ] = "~Optimal" ;
 	};
 
 	CheckBox CB_ANCHOR_ONLY
 	{
-	    HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY";
-        Pos = MAP_APPFONT ( 139 , 111 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
+		HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY" ;
+		Pos = MAP_APPFONT ( 139, 111 ) ;
+		Size = MAP_APPFONT ( 109, 10 ) ;
 		Text [ en-US ] = "~First paragraph" ;
 	};
 	CheckBox CB_TRANSPARENT
 	{
-	    HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT";
-        Pos = MAP_APPFONT ( 139 , 125 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
+		HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT" ;
+		Pos = MAP_APPFONT ( 139, 125 ) ;
+		Size = MAP_APPFONT ( 109, 10 ) ;
 		Text [ en-US ] = "In bac~kground" ;
 	};
 	CheckBox CB_OUTLINE
 	{
-	    HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE";
-        Pos = MAP_APPFONT ( 139 , 139 ) ;
-		Size = MAP_APPFONT ( 109 , 10 ) ;
+		HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE" ;
+		Pos = MAP_APPFONT ( 139, 139 ) ;
+		Size = MAP_APPFONT ( 109, 10 ) ;
 		Hide = TRUE ;
 		Text [ en-US ] = "~Contour" ;
 	};
 	CheckBox CB_ONLYOUTSIDE
 	{
-	    HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE";
-        Pos = MAP_APPFONT ( 139 , 153 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
+		HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE" ;
+		Pos = MAP_APPFONT ( 139, 153 ) ;
+		Size = MAP_APPFONT ( 109, 10 ) ;
 		Hide = TRUE ;
-        Text [ en-US ] = "Outside only" ;
+		Text [ en-US ] = "Outside only" ;
 	};
-    FixedLine FL_OPTION
+	FixedLine FL_OPTION
 	{
-        Pos = MAP_APPFONT ( 133 , 100 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
+		Pos = MAP_APPFONT ( 133, 100 ) ;
+		Size = MAP_APPFONT ( 121, 8 ) ;
 		Text [ en-US ] = "Options" ;
 	};
-    FixedLine FL_OPTION_SEP
+	FixedLine FL_OPTION_SEP
 	{
-        Pos = MAP_APPFONT ( 128 , 111 ) ;
-        Size = MAP_APPFONT ( 4 , 60 ) ;
-        Vert = TRUE;
-    };
-    FixedText FT_LEFT_MARGIN
+		Pos = MAP_APPFONT ( 128, 111 ) ;
+		Size = MAP_APPFONT ( 4, 60 ) ;
+		Vert = TRUE;
+	};
+	FixedText FT_LEFT_MARGIN
 	{
-        Pos = MAP_APPFONT ( 12 , 113 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+		Pos = MAP_APPFONT ( 12, 113 ) ;
+		Size = MAP_APPFONT ( 60, 8 ) ;
 		Text [ en-US ] = "L~eft" ;
 		Left = TRUE ;
 	};
 	MetricField ED_LEFT_MARGIN
 	{
-	    HelpID = "sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN";
+		HelpID = "sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 81 , 111 ) ;
-		Size = MAP_APPFONT ( 40 , 12 ) ;
+		Pos = MAP_APPFONT ( 81, 111 ) ;
+		Size = MAP_APPFONT ( 40, 12 ) ;
 		TabStop = TRUE ;
 		Left = TRUE ;
 		Repeat = TRUE ;
@@ -160,17 +161,17 @@ TabPage TP_FRM_WRAP
 	};
 	FixedText FT_RIGHT_MARGIN
 	{
-        Pos = MAP_APPFONT ( 12 , 129 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "~Right" ;
+		Pos = MAP_APPFONT ( 12, 129 ) ;
+		Size = MAP_APPFONT ( 60, 8 ) ;
+		Text [ en-US ] = "~Right" ;
 		Left = TRUE ;
 	};
 	MetricField ED_RIGHT_MARGIN
 	{
-	    HelpID = "sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN";
+		HelpID = "sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 81 , 127 ) ;
-		Size = MAP_APPFONT ( 40 , 12 ) ;
+		Pos = MAP_APPFONT ( 81, 127 ) ;
+		Size = MAP_APPFONT ( 40, 12 ) ;
 		TabStop = TRUE ;
 		Left = TRUE ;
 		Repeat = TRUE ;
@@ -183,17 +184,17 @@ TabPage TP_FRM_WRAP
 	};
 	FixedText FT_TOP_MARGIN
 	{
-        Pos = MAP_APPFONT ( 12 , 145 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+		Pos = MAP_APPFONT ( 12, 145 ) ;
+		Size = MAP_APPFONT ( 60, 8 ) ;
 		Text [ en-US ] = "~Top" ;
 		Left = TRUE ;
 	};
 	MetricField ED_TOP_MARGIN
 	{
-	    HelpID = "sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN";
+		HelpID = "sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 81 , 143 ) ;
-		Size = MAP_APPFONT ( 40 , 12 ) ;
+		Pos = MAP_APPFONT ( 81, 143 ) ;
+		Size = MAP_APPFONT ( 40, 12 ) ;
 		TabStop = TRUE ;
 		Left = TRUE ;
 		Repeat = TRUE ;
@@ -206,17 +207,17 @@ TabPage TP_FRM_WRAP
 	};
 	FixedText FT_BOTTOM_MARGIN
 	{
-        Pos = MAP_APPFONT ( 12 , 161 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+		Pos = MAP_APPFONT ( 12, 161 ) ;
+		Size = MAP_APPFONT ( 60, 8 ) ;
 		Text [ en-US ] = "~Bottom" ;
 		Left = TRUE ;
 	};
 	MetricField ED_BOTTOM_MARGIN
 	{
-	    HelpID = "sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN";
+		HelpID = "sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN" ;
 		Border = TRUE ;
-        Pos = MAP_APPFONT ( 81 , 159 ) ;
-		Size = MAP_APPFONT ( 40 , 12 ) ;
+		Pos = MAP_APPFONT ( 81, 159 ) ;
+		Size = MAP_APPFONT ( 40, 12 ) ;
 		TabStop = TRUE ;
 		Left = TRUE ;
 		Repeat = TRUE ;
@@ -227,41 +228,37 @@ TabPage TP_FRM_WRAP
 		Last = 9999 ;
 		SpinSize = 10 ;
 	};
-    FixedLine FL_MARGIN
+	FixedLine FL_MARGIN
 	{
-        Pos = MAP_APPFONT ( 6 , 100 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
+		Pos = MAP_APPFONT ( 6, 100 ) ;
+		Size = MAP_APPFONT ( 121, 8 ) ;
 		Text [ en-US ] = "Spacing" ;
 	};
-#define WRAP_IDLIST \
-        IdList =            \
-        {                   \
-            IMG_NONE ;      \
-            IMG_LEFT ;      \
-            IMG_RIGHT ;     \
-            IMG_PARALLEL ;  \
-            IMG_THROUGH ;   \
-            IMG_IDEAL ;     \
-            IMG_KON_NONE ;  \
-            IMG_KON_LEFT ;  \
-            IMG_KON_RIGHT ; \
-            IMG_KON_PARALLEL ;\
-            IMG_KON_IDEAL ;\
-        };                 \
-        IdCount = { 11 ; };
+#define WRAP_IDLIST			\
+	IdList =			\
+	{				\
+		IMG_NONE ;		\
+		IMG_LEFT ;		\
+		IMG_RIGHT ;		\
+		IMG_PARALLEL ;		\
+		IMG_THROUGH ;		\
+		IMG_IDEAL ;		\
+		IMG_KON_NONE ;		\
+		IMG_KON_LEFT ;		\
+		IMG_KON_RIGHT ;		\
+		IMG_KON_PARALLEL;	\
+		IMG_KON_IDEAL ;		\
+	};				\
+	IdCount = { 11 ; };
 
 	ImageList IL_WRAP
 	{
-        Prefix = "wr";
-        MaskColor = IMAGE_MASK_COLOR ;
-        WRAP_IDLIST
-    };
-    ImageList ILH_WRAP
-	{
-        Prefix = "wrh";
-        MaskColor = IMAGE_MASK_COLOR ;
-        WRAP_IDLIST
-    };
-
+		Prefix = "wr" ;
+		WRAP_IDLIST
+	};
+	ImageList ILH_WRAP
+	{
+		Prefix = "wrh" ;
+		WRAP_IDLIST
+	};
 };
-



Mime
View raw message