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 c7dd696 Cleaned up resource files c7dd696 is described below commit c7dd6960361c21e63e95724ec869fe152f9c08c7 Author: mseidel <msei...@apache.org> AuthorDate: Sat Jul 18 22:48:33 2020 +0200 Cleaned up resource files (cherry picked from commit 082db5b6930c114450062da047e2cc045fa9c868) --- main/sfx2/source/dialog/mailwindow.src | 44 +---- main/sfx2/source/dialog/printopt.src | 328 +++++++++++++-------------------- main/sfx2/source/dialog/taskpane.src | 18 +- 3 files changed, 143 insertions(+), 247 deletions(-) diff --git a/main/sfx2/source/dialog/mailwindow.src b/main/sfx2/source/dialog/mailwindow.src index 86d3b84..4c97a1a 100644 --- a/main/sfx2/source/dialog/mailwindow.src +++ b/main/sfx2/source/dialog/mailwindow.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. - * + * *************************************************************/ @@ -34,39 +34,3 @@ ErrorBox RID_ERRBOX_MAIL_CONFIG }; // ------------------------------------------------------------------- EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/main/sfx2/source/dialog/printopt.src b/main/sfx2/source/dialog/printopt.src index 45760cc..50e2a7c 100644 --- a/main/sfx2/source/dialog/printopt.src +++ b/main/sfx2/source/dialog/printopt.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,224 +29,222 @@ #include "helpid.hrc" //**************************************************************************** -// // TabPage -// //**************************************************************************** TabPage TP_COMMONPRINTOPTIONS { - HelpID = HID_TP_COMMONPRINTOPTIONS; + HelpID = HID_TP_COMMONPRINTOPTIONS ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( 260, 185 ) ; Hide = TRUE ; - FixedLine GB_REDUCE + FixedLine GB_REDUCE { - Pos = MAP_APPFONT ( 6, 3 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Reduce print data"; + Pos = MAP_APPFONT ( 6, 3 ) ; + Size = MAP_APPFONT ( 248, 8 ) ; + Text [ en-US ] = "Reduce print data" ; }; FixedText FT_OUTPUTTYPE { - TabStop = TRUE; - Pos = MAP_APPFONT ( 12, 14 ) ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 12, 14 ) ; Size = MAP_APPFONT ( 60, 10 ) ; - Text [ en-US ] = "Settings for"; + Text [ en-US ] = "Settings for" ; }; RadioButton RB_PRINTEROUTPUT { - HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 81, 14 ) ; + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 81, 14 ) ; Size = MAP_APPFONT ( 60, 10 ) ; - Text [ en-US ] = "~Printer"; + Text [ en-US ] = "~Printer" ; }; RadioButton RB_PRINTFILEOUTPUT { - HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 142, 14 ) ; + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 142, 14 ) ; Size = MAP_APPFONT ( 100, 10 ) ; - Text [ en-US ] = "Print to ~file"; + Text [ en-US ] = "Print to ~file" ; }; // ----------- - FixedLine GB_OUTPUT + FixedLine GB_OUTPUT { - Pos = MAP_APPFONT ( 12, 27 ) ; - Size = MAP_APPFONT ( 242 , 8 ) ; + Pos = MAP_APPFONT ( 12, 27 ) ; + Size = MAP_APPFONT ( 242, 8 ) ; }; CheckBox CB_REDUCETRANSPARENCY { - HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 18, 38 ) ; + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 18, 38 ) ; Size = MAP_APPFONT ( 115, 10 ) ; - Text [ en-US ] = "~Reduce transparency"; + Text [ en-US ] = "~Reduce transparency" ; }; RadioButton RB_REDUCETRANSPARENCY_AUTO { - HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 28, 51 ) ; - Size = MAP_APPFONT ( 105, 10 ) ; - Text [ en-US ] = "Auto~matically"; + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 28, 51 ) ; + Size = MAP_APPFONT ( 105, 10 ) ; + Text [ en-US ] = "Auto~matically" ; }; RadioButton RB_REDUCETRANSPARENCY_NONE { - HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 28, 64 ) ; - Size = MAP_APPFONT ( 105, 10 ) ; - Text [ en-US ] = "~No transparency"; + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 28, 64 ) ; + Size = MAP_APPFONT ( 105, 10 ) ; + Text [ en-US ] = "~No transparency" ; }; // ----------- CheckBox CB_REDUCEGRADIENTS { - HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 136, 38 ) ; + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 136, 38 ) ; Size = MAP_APPFONT ( 121, 10 ) ; - Text [ en-US ] = "Reduce ~gradients"; + Text [ en-US ] = "Reduce ~gradients" ; }; RadioButton RB_REDUCEGRADIENTS_STRIPES { - HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 146, 51 ) ; - Size = MAP_APPFONT ( 77, 10 ) ; - Text [ en-US ] = "Gradient ~stripes"; + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 146, 51 ) ; + Size = MAP_APPFONT ( 77, 10 ) ; + Text [ en-US ] = "Gradient ~stripes" ; }; NumericField NF_REDUCEGRADIENTS_STEPCOUNT { - HelpID = "sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT"; - TabStop = TRUE; + HelpID = "sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT" ; + TabStop = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 224, 49 ) ; + Pos = MAP_APPFONT ( 224, 49 ) ; Size = MAP_APPFONT ( 24, 12 ) ; - Minimum = 2; - Maximum = 256; + Minimum = 2 ; + Maximum = 256 ; Spin = TRUE ; Repeat = TRUE ; }; RadioButton RB_REDUCEGRADIENTS_COLOR { - HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 146, 64 ) ; - Size = MAP_APPFONT ( 108, 10 ) ; - Text [ en-US ] = "Intermediate ~color"; + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 146, 64 ) ; + Size = MAP_APPFONT ( 108, 10 ) ; + Text [ en-US ] = "Intermediate ~color" ; }; // ----------- CheckBox CB_REDUCEBITMAPS { - HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 18, 80 ) ; + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 18, 80 ) ; Size = MAP_APPFONT ( 115, 10 ) ; - Text [ en-US ] = "Reduce ~bitmaps"; + Text [ en-US ] = "Reduce ~bitmaps" ; }; RadioButton RB_REDUCEBITMAPS_OPTIMAL { - HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 28, 93 ) ; - Size = MAP_APPFONT ( 226, 10 ) ; - Text [ en-US ] = "~High print quality"; + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 28, 93 ) ; + Size = MAP_APPFONT ( 226, 10 ) ; + Text [ en-US ] = "~High print quality" ; }; RadioButton RB_REDUCEBITMAPS_NORMAL { - HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 28, 106 ) ; - Size = MAP_APPFONT ( 226, 10 ) ; - Text [ en-US ] = "N~ormal print quality"; + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 28, 106 ) ; + Size = MAP_APPFONT ( 226, 10 ) ; + Text [ en-US ] = "N~ormal print quality" ; }; RadioButton RB_REDUCEBITMAPS_RESOLUTION { - HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 28, 119 ) ; - Size = MAP_APPFONT ( 52, 10 ) ; - Text [ en-US ] = "Reso~lution"; + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 28, 119 ) ; + Size = MAP_APPFONT ( 52, 10 ) ; + Text [ en-US ] = "Reso~lution" ; }; ListBox LB_REDUCEBITMAPS_RESOLUTION { - HelpID = "sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION"; - TabStop = TRUE; + HelpID = "sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION" ; + TabStop = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 81, 117 ) ; - Size = MAP_APPFONT ( 60, 100 ) ; - DropDown = TRUE; + Pos = MAP_APPFONT ( 81, 117 ) ; + Size = MAP_APPFONT ( 60, 100 ) ; + DropDown = TRUE ; StringList [ en-US ] = { - < "72 DPI"; 0; > ; - < "96 DPI"; 0; > ; - < "150 DPI (Fax)"; 0; > ; - < "200 DPI (default)"; 0; > ; - < "300 DPI"; 0; > ; - < "600 DPI"; 0; > ; + < "72 DPI" ; 0 ; > ; + < "96 DPI" ; 0 ; > ; + < "150 DPI (Fax)" ; 0 ; > ; + < "200 DPI (default)" ; 0 ; > ; + < "300 DPI" ; 0 ; > ; + < "600 DPI" ; 0 ; > ; }; }; CheckBox CB_REDUCEBITMAPS_TRANSPARENCY { - HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 28, 132 ) ; - Size = MAP_APPFONT ( 226, 10 ) ; - Text [ en-US ] = "Include transparent ob~jects"; + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 28, 132 ) ; + Size = MAP_APPFONT ( 226, 10 ) ; + Text [ en-US ] = "Include transparent ob~jects" ; }; // ----------- CheckBox CB_CONVERTTOGREYSCALES { - HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 136, 80 ) ; + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 136, 80 ) ; Size = MAP_APPFONT ( 123, 10 ) ; - Text [ en-US ] = "Con~vert colors to grayscale"; + Text [ en-US ] = "Con~vert colors to grayscale" ; }; // ----------- - FixedLine GB_PRINT_WARN + FixedLine GB_PRINT_WARN { - Pos = MAP_APPFONT ( 6, 148 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; + Pos = MAP_APPFONT ( 6, 148 ) ; + Size = MAP_APPFONT ( 248, 8 ) ; Text [ en-US ] = "Printer warnings" ; }; CheckBox CB_PAPERSIZE { - HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 12, 159 ) ; + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 12, 159 ) ; Size = MAP_APPFONT ( 123, 10 ) ; Text [ en-US ] = "P~aper size" ; }; CheckBox CB_PAPERORIENTATION { - HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 12, 172 ) ; - Size = MAP_APPFONT ( 123 , 10 ) ; + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 12, 172 ) ; + Size = MAP_APPFONT ( 123, 10 ) ; Text [ en-US ] = "Pap~er orientation" ; }; CheckBox CB_TRANSPARENCY { - HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY"; - TabStop = TRUE; - Pos = MAP_APPFONT ( 136, 159 ) ; + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( 136, 159 ) ; Size = MAP_APPFONT ( 123, 10 ) ; - Text [ en-US ] = "~Transparency"; + Text [ en-US ] = "~Transparency" ; }; }; @@ -256,118 +254,50 @@ TabPage TP_COMMONPRINTOPTIONS ModalDialog RID_WARN_PRINTTRANSPARENCY { - HelpID = "sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY"; + HelpID = "sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY" ; OutputSize = TRUE ; - Size = MAP_APPFONT ( 195 , 85 ) ; + Size = MAP_APPFONT ( 195, 85 ) ; Text [ en-US ] = "Warning" ; Moveable = TRUE ; FixedImage FI_PRINTTRANSWARN { - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 20 , 20 ) ; + Pos = MAP_APPFONT ( 6, 6 ) ; + Size = MAP_APPFONT ( 20, 20 ) ; }; FixedText FT_PRINTTRANSWARN { - Pos = MAP_APPFONT ( 29 , 6 ) ; - Size = MAP_APPFONT ( 163 , 36 ) ; + Pos = MAP_APPFONT ( 29, 6 ) ; + Size = MAP_APPFONT ( 163, 36 ) ; WordBreak = TRUE ; - Text [ en-US ] = "Your document contains transparent objects.\nThis may lead to longer printing time on certain\nprinters. Should the aspect of transparency\nbe reduced?"; + Text [ en-US ] = "Your document contains transparent objects.\nThis may lead to longer printing time on certain\nprinters. Should the aspect of transparency\nbe reduced?" ; }; OKButton BTN_PRINTTRANS_YES { - Pos = MAP_APPFONT ( 12 , 48 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - DefButton = TRUE; + Pos = MAP_APPFONT ( 12, 48 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; + DefButton = TRUE ; Text [ en-US ] = "~Yes" ; }; PushButton BTN_PRINTTRANS_NO { - HelpID = "sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO"; - Pos = MAP_APPFONT ( 68 , 48 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + HelpID = "sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO" ; + Pos = MAP_APPFONT ( 68, 48 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; Text [ en-US ] = "~No" ; }; CancelButton BTN_PRINTTRANS_CANCEL { - Pos = MAP_APPFONT ( 124 , 48 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 124, 48 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; Text [ en-US ] = "~Cancel" ; }; CheckBox CBX_NOPRINTTRANSWARN { - HelpID = "sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN"; - Pos = MAP_APPFONT ( 6 , 68 ) ; - Size = MAP_APPFONT ( 183 , 10 ) ; + HelpID = "sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN" ; + Pos = MAP_APPFONT ( 6, 68 ) ; + Size = MAP_APPFONT ( 183, 10 ) ; Text [ en-US ] = "~Do not show warning again" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +// ******************************************************************* EOF diff --git a/main/sfx2/source/dialog/taskpane.src b/main/sfx2/source/dialog/taskpane.src index ede7c81..4817d3b 100644 --- a/main/sfx2/source/dialog/taskpane.src +++ b/main/sfx2/source/dialog/taskpane.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. - * + * *************************************************************/ @@ -26,19 +26,21 @@ String STR_SFX_DOCK { - Text [ en-US ] = "Dock"; + Text [ en-US ] = "Dock" ; }; String STR_SFX_UNDOCK { - Text [ en-US ] = "Undock"; + Text [ en-US ] = "Undock" ; }; String STR_SFX_TASK_PANE_VIEW { - Text [ en-US ] = "View"; + Text [ en-US ] = "View" ; }; String STR_SFX_TASKS { - Text [ en-US ] = "Tasks"; + Text [ en-US ] = "Tasks" ; }; + +// ******************************************************************* EOF