Tag: cws_src680_reportdesign01 User: oj Date: 2007-10-16 05:12:44+0000 Modified: dba/reportdesign/source/ui/dlg/PageNumber.src
Log: merge conflict resoved File Changes: Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: PageNumber.src Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/PageNumber.src?r1=1.2.28.2&r2=1.2.28.3 Delta lines: +3 -55 -------------------- --- PageNumber.src 2007-10-15 07:52:27+0000 1.2.28.2 +++ PageNumber.src 2007-10-16 05:12:41+0000 1.2.28.3 @@ -4,9 +4,9 @@ * * $RCSfile: PageNumber.src,v $ * - * $Revision: 1.2.28.2 $ + * $Revision: 1.2.28.3 $ * - * last change: $Author: oj $ $Date: 2007/10/15 07:52:27 $ + * last change: $Author: oj $ $Date: 2007/10/16 05:12:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,10 +48,6 @@ OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( PAGE_WIDTH , PAGE_HEIGHT ) ; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "Page Numbers" ; HelpId = HID_PAGENUMBERS_DLG; Moveable = TRUE ; @@ -61,10 +57,6 @@ { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "Format"; }; @@ -74,20 +66,12 @@ Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Group = TRUE; Check = TRUE; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "Page N"; }; RadioButton RB_PAGE_N_OF_M { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 3*RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "Page N of M"; }; @@ -95,10 +79,6 @@ { Pos = MAP_APPFONT ( RELATED_CONTROLS , 3*RELATED_CONTROLS + UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "Position"; }; @@ -108,20 +88,12 @@ Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Group = TRUE; Check = TRUE; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "Top of Page (Header)"; }; RadioButton RB_PAGE_BOTTOMPAGE { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 5*RELATED_CONTROLS + UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "Bottom of Page (Footer)"; }; @@ -129,10 +101,6 @@ { Pos = MAP_APPFONT ( RELATED_CONTROLS , 5*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "General"; }; @@ -140,10 +108,6 @@ { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( FIXEDTEXT_WIDTH, FIXEDTEXT_HEIGHT ) ; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "Alignment:"; }; ListBox LST_ALIGNMENT @@ -168,10 +132,6 @@ Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 8*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Check = TRUE; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "Show Number on First Page"; }; FixedLine FL_SEPARATOR1 @@ -197,28 +157,16 @@ TabStop = TRUE ; Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 2*BUTTON_WIDTH , 7*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "~Help"; }; }; String STR_RPT_PN_PAGE { -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = "\"Page \" & #PAGENUMBER#" ; Text [ x-comment ] = "The space after the word is no error. #PAGENUMBER# is a replacement and & must not be translated as well as \""; }; String STR_RPT_PN_PAGE_OF { -<<<<<<< PageNumber.src - -======= ->>>>>>> 1.3 Text [ en-US ] = " & \" of \" & #PAGECOUNT#" ; Text [ x-comment ] = "The space before and after the word is no error. #PAGECOUNT# is a replacement and & must not be translated as well as \""; }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
