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 9dba16d Cleaned up resource files - This hopefully fixes Issue 128296 9dba16d is described below commit 9dba16da017cfef1f2152bcb3ed358d3f66fde6d Author: mseidel <msei...@apache.org> AuthorDate: Thu Feb 20 20:47:28 2020 +0100 Cleaned up resource files - This hopefully fixes Issue 128296 (cherry picked from commit 943347cda5673631c0bff5f4d680d94ae0933622) --- main/cui/source/dialogs/SpellDialog.src | 402 +++++++++++++++----------------- main/cui/source/options/optspell.src | 96 +++----- 2 files changed, 222 insertions(+), 276 deletions(-) diff --git a/main/cui/source/dialogs/SpellDialog.src b/main/cui/source/dialogs/SpellDialog.src index 8367203..7d73c12 100644 --- a/main/cui/source/dialogs/SpellDialog.src +++ b/main/cui/source/dialogs/SpellDialog.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,247 +7,227 @@ * 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. - * + * *************************************************************/ - // include --------------------------------------------------------------- + +// include --------------------------------------------------------------- #include <cuires.hrc> #include "helpid.hrc" #include "SpellDialog.hrc" - // pragma ---------------------------------------------------------------- +// pragma ---------------------------------------------------------------- // RID_SVXDLG_SPELLCHECK ------------------------------------------------- -#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; } - ModelessDialog RID_SVXDLG_SPELLCHECK { HelpId = HID_SPELLCHECK ; - Size = MAP_APPFONT( 270, 188 ); - OutputSize = TRUE; + Size = MAP_APPFONT ( 270, 188 ) ; + OutputSize = TRUE ; Closeable = TRUE ; - SVLook = TRUE; - Hide = TRUE; - Text [ en-US ] = "Spellcheck: " ; + SVLook = TRUE ; + Hide = TRUE ; + Text [ en-US ] = "Spellcheck: " ; Moveable = TRUE ; - FixedImage IMG_VENDOR - { - Pos = MAP_APPFONT ( 0, 0 ) ; - Size = MAP_APPFONT ( 270, 21 ) ; - Hide = TRUE; - }; - - FixedText FT_LANGUAGE - { - Pos = MAP_APPFONT( 6, 8 ); - Size = MAP_APPFONT( 100, 8 ); - Text [ en-US ] = "Text languag~e" ; - }; - ListBox LB_LANGUAGE - { - HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE"; - Pos = MAP_APPFONT( 110, 6 ); - Size = MAP_APPFONT( 93, 55 ); - Border = TRUE; - Sort = TRUE; - DropDown = TRUE; - }; - FixedText FT_NOTINDICT - { - Pos = MAP_APPFONT( 6, 26 ); - Size = MAP_APPFONT( 120, 8 ); - Text [ en-US ] = "~Not in dictionary" ; - }; - - MultiLineEdit ED_NEWWORD - { - HelpID = "cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD"; - Pos = MAP_APPFONT( 6, 37 ); - Size = MAP_APPFONT( 197, 48 ); - Border = TRUE; - VScroll = TRUE; - IgnoreTab = TRUE; - }; - - FixedText FT_SUGGESTION - { - Pos = MAP_APPFONT( 6, 88 ); - Size = MAP_APPFONT( 120, 8 ); - Text [ en-US ] = "~Suggestions" ; - }; - ListBox LB_SUGGESTION - { - HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION"; - Pos = MAP_APPFONT( 6, 99 ); - Size = MAP_APPFONT( 197, 48 ); - Border = TRUE; - }; - - CheckBox CB_CHECK_GRAMMAR - { - HelpID = "cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR"; - Pos = MAP_APPFONT( 6, 153 ); - Size = MAP_APPFONT( 100, 10 ); - Text [ en-US ] = "Check ~grammar" ; - Hide = TRUE; - }; - - PushButton PB_IGNORE - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORE"; - Pos = MAP_APPFONT( 209, 37 ); - Size = MAP_APPFONT( 55, 14 ); - Text [ en-US ] = "~Ignore Once" ; - }; - - PushButton PB_IGNOREALL - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNOREALL"; - Pos = MAP_APPFONT( 209, 54 ); - Size = MAP_APPFONT( 55, 14 ); - Text [ en-US ] = "I~gnore All" ; - }; - PushButton PB_IGNORERULE - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORERULE"; - Pos = MAP_APPFONT( 209, 54 ); - Size = MAP_APPFONT( 55, 14 ); - Text [ en-US ] = "I~gnore Rule" ; - Hide = TRUE; - }; - MenuButton MB_ADDTODICT - { - HelpID = "cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT"; - Pos = MAP_APPFONT( 209, 71 ); - Size = MAP_APPFONT( 55, 14 ); - Text [ en-US ] = "~Add" ; - }; - - PushButton PB_CHANGE - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGE"; - Pos = MAP_APPFONT( 209, 99 ); - Size = MAP_APPFONT( 55, 14 ); - Text [ en-US ] = "~Change" ; - DefButton = TRUE ; - }; - - PushButton PB_CHANGEALL - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGEALL"; - Pos = MAP_APPFONT( 209, 117 ); - Size = MAP_APPFONT( 55, 14 ); - Text [ en-US ] = "Change A~ll" ; - }; - PushButton PB_EXPLAIN - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_EXPLAIN"; - Pos = MAP_APPFONT( 209, 117 ); - Size = MAP_APPFONT( 55, 14 ); - Hide = TRUE; - Text [ en-US ] = "~Explain..." ; - }; - PushButton PB_AUTOCORR - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR"; - Pos = MAP_APPFONT( 209, 134 ); - Size = MAP_APPFONT( 55, 14 ); - Text [ en-US ] = "AutoCor~rect" ; - }; - GroupBox GB_BACKGROUND - { - Pos = MAP_APPFONT( 1, 21 ); - Size = MAP_APPFONT( 268, 146 ); - Hide=TRUE; - }; - - HelpButton PB_HELP - { - Pos = MAP_APPFONT( 6, 170 ); - Size = MAP_APPFONT( 55, 14 ); - }; - PushButton PB_OPTIONS - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS"; - Pos = MAP_APPFONT( 87, 170 ); - Size = MAP_APPFONT( 55, 14 ); - Text [ en-US ] = "O~ptions..." ; - }; - PushButton PB_UNDO - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO"; - Pos = MAP_APPFONT( 148, 170 ); - Size = MAP_APPFONT( 55, 14 ); - Text [ en-US ] = "~Undo" ; - }; - - PushButton PB_CLOSE - { - HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CLOSE"; - Pos = MAP_APPFONT ( 209 , 170 ) ; - Size = MAP_APPFONT ( 55 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Cl~ose" ; - }; - String ST_RESUME - { - Text[ en-US ] = "Resu~me"; - }; - String ST_NOSUGGESTIONS - { - Text [en-US] = "(no suggestions)"; - }; - String ST_SPELLING - { - Text[ en-US ] = "Spelling: $LANGUAGE ($LOCATION)"; - }; - String ST_SPELLING_AND_GRAMMAR - { - Text[ en-US ] = "Spelling and Grammar: $LANGUAGE ($LOCATION)"; - }; - String ST_SPELLING_AND_GRAMMAR_VENDORNAME - { - Text[ en-US ] = "Spelling and Grammar: $LANGUAGE ($LOCATION) [$VendorName]"; - }; - Image IMG_DEFAULT_VENDOR - { - ImageBitmap = Bitmap { File = "vendor01.png"; }; - }; - Image IMG_DEFAULT_VENDOR_HC - { - ImageBitmap = Bitmap { File = "vendor01h.png"; }; - }; - -}; - // ********************************************************************** EOF - - - - - - - - + FixedImage IMG_VENDOR + { + Pos = MAP_APPFONT ( 0, 0 ) ; + Size = MAP_APPFONT ( 270, 21 ) ; + Hide = TRUE ; + }; + FixedText FT_LANGUAGE + { + Pos = MAP_APPFONT ( 6, 8 ) ; + Size = MAP_APPFONT ( 100, 8 ) ; + Text [ en-US ] = "Text languag~e" ; + }; + ListBox LB_LANGUAGE + { + HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE" ; + Pos = MAP_APPFONT ( 110, 6 ) ; + Size = MAP_APPFONT ( 93, 55 ) ; + Border = TRUE ; + Sort = TRUE ; + DropDown = TRUE ; + }; + FixedText FT_NOTINDICT + { + Pos = MAP_APPFONT ( 6, 26 ) ; + Size = MAP_APPFONT ( 120, 8 ) ; + Text [ en-US ] = "~Not in dictionary" ; + }; + MultiLineEdit ED_NEWWORD + { + HelpID = "cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD" ; + Pos = MAP_APPFONT ( 6, 37 ) ; + Size = MAP_APPFONT ( 197, 48 ) ; + Border = TRUE ; + VScroll = TRUE ; + IgnoreTab = TRUE ; + }; + FixedText FT_SUGGESTION + { + Pos = MAP_APPFONT ( 6, 88 ) ; + Size = MAP_APPFONT ( 120, 8 ) ; + Text [ en-US ] = "~Suggestions" ; + }; + ListBox LB_SUGGESTION + { + HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION" ; + Pos = MAP_APPFONT ( 6, 99 ) ; + Size = MAP_APPFONT ( 197, 48 ) ; + Border = TRUE ; + }; + CheckBox CB_CHECK_GRAMMAR + { + HelpID = "cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR" ; + Pos = MAP_APPFONT ( 6, 153 ) ; + Size = MAP_APPFONT ( 100, 10 ) ; + Text [ en-US ] = "Check ~grammar" ; + Hide = TRUE ; + }; + PushButton PB_IGNORE + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORE" ; + Pos = MAP_APPFONT ( 209, 37 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Text [ en-US ] = "~Ignore Once" ; + }; + PushButton PB_IGNOREALL + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNOREALL" ; + Pos = MAP_APPFONT ( 209, 54 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Text [ en-US ] = "I~gnore All" ; + }; + PushButton PB_IGNORERULE + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORERULE" ; + Pos = MAP_APPFONT ( 209, 54 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Text [ en-US ] = "I~gnore Rule" ; + Hide = TRUE ; + }; + MenuButton MB_ADDTODICT + { + HelpID = "cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT" ; + Pos = MAP_APPFONT ( 209, 71 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Text [ en-US ] = "~Add" ; + }; + PushButton PB_CHANGE + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGE" ; + Pos = MAP_APPFONT ( 209, 99 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Text [ en-US ] = "~Change" ; + DefButton = TRUE ; + }; + PushButton PB_CHANGEALL + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGEALL" ; + Pos = MAP_APPFONT ( 209, 117 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Text [ en-US ] = "Change A~ll" ; + }; + PushButton PB_EXPLAIN + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_EXPLAIN" ; + Pos = MAP_APPFONT ( 209, 117 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Hide = TRUE ; + Text [ en-US ] = "~Explain..." ; + }; + PushButton PB_AUTOCORR + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR" ; + Pos = MAP_APPFONT ( 209, 134 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Text [ en-US ] = "AutoCor~rect" ; + }; + GroupBox GB_BACKGROUND + { + Pos = MAP_APPFONT ( 1, 21 ) ; + Size = MAP_APPFONT ( 268, 146 ) ; + Hide = FALSE ; + }; + HelpButton PB_HELP + { + Pos = MAP_APPFONT ( 6, 170 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + }; + PushButton PB_OPTIONS + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS" ; + Pos = MAP_APPFONT ( 87, 170 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Text [ en-US ] = "O~ptions..." ; + }; + PushButton PB_UNDO + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO" ; + Pos = MAP_APPFONT ( 148, 170 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + Text [ en-US ] = "~Undo" ; + }; + PushButton PB_CLOSE + { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CLOSE" ; + Pos = MAP_APPFONT ( 209, 170 ) ; + Size = MAP_APPFONT ( 55, 14 ) ; + TabStop = TRUE ; + Text [ en-US ] = "Cl~ose" ; + }; + String ST_RESUME + { + Text [ en-US ] = "Resu~me" ; + }; + String ST_NOSUGGESTIONS + { + Text [en-US] = "(no suggestions)" ; + }; + String ST_SPELLING + { + Text [ en-US ] = "Spelling: $LANGUAGE ($LOCATION)" ; + }; + String ST_SPELLING_AND_GRAMMAR + { + Text [ en-US ] = "Spelling and Grammar: $LANGUAGE ($LOCATION)" ; + }; + String ST_SPELLING_AND_GRAMMAR_VENDORNAME + { + Text [ en-US ] = "Spelling and Grammar: $LANGUAGE ($LOCATION) [$VendorName]" ; + }; + Image IMG_DEFAULT_VENDOR + { + ImageBitmap = Bitmap {File = "vendor01.png" ;} ; + }; + Image IMG_DEFAULT_VENDOR_HC + { + ImageBitmap = Bitmap {File = "vendor01h.png" ;} ; + }; +}; +// ********************************************************************** EOF diff --git a/main/cui/source/options/optspell.src b/main/cui/source/options/optspell.src index 50afcb4..2efc95c 100644 --- a/main/cui/source/options/optspell.src +++ b/main/cui/source/options/optspell.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,120 +7,86 @@ * 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. - * + * *************************************************************/ - // include ------------------------------------------------------------------ + +// include ------------------------------------------------------------------ #include <sfx2/sfx.hrc> #include "helpid.hrc" #include "optspell.hrc" - // pragma ------------------------------------------------------------------- +// pragma ------------------------------------------------------------------- - // RID_SFXPAGE_SPELL -------------------------------------------------------- +// RID_SFXPAGE_SPELL -------------------------------------------------------- TabPage RID_SFXPAGE_SPELL { HelpId = HID_OPTIONS_SPELL ; SVLook = TRUE ; - Size = MAP_APPFONT ( 221 , 185 ) ; + Size = MAP_APPFONT ( 221, 185 ) ; Text [ en-US ] = "Spellcheck" ; PushButton BTN_BOOK { - HelpID = "cui:PushButton:RID_SFXPAGE_SPELL:BTN_BOOK"; - Pos = MAP_APPFONT ( 128 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + HelpID = "cui:PushButton:RID_SFXPAGE_SPELL:BTN_BOOK" ; + Pos = MAP_APPFONT ( 128, 6 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; Text [ en-US ] = "~Edit..." ; TabStop = TRUE ; }; MultiListBox LB_BOOK { - HelpID = "cui:MultiListBox:RID_SFXPAGE_SPELL:LB_BOOK"; + HelpID = "cui:MultiListBox:RID_SFXPAGE_SPELL:LB_BOOK" ; Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 103 , 47 ) ; + Pos = MAP_APPFONT ( 12, 14 ) ; + Size = MAP_APPFONT ( 103, 47 ) ; TabStop = TRUE ; AutoHScroll = TRUE ; }; - FixedLine GB_BOOK + FixedLine GB_BOOK { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 115 , 66 ) ; - /* ### ACHTUNG: Neuer Text in Resource? W�rterb�cher : W�rterb�cher */ - /* ### ACHTUNG: Neuer Text in Resource? W�rterb�cher : W�rterb�cher */ + Pos = MAP_APPFONT ( 6, 3 ) ; + Size = MAP_APPFONT ( 115, 66 ) ; Text [ en-US ] = "Dictionaries" ; }; CheckBox BTN_CAPS { - HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_CAPS"; - Pos = MAP_APPFONT ( 12 , 82 ) ; - Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Gro�geschriebene W�rter : ~Gro�geschriebene W�rter */ - /* ### ACHTUNG: Neuer Text in Resource? ~Gro�geschriebene W�rter : ~Gro�geschriebene W�rter */ + HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_CAPS" ; + Pos = MAP_APPFONT ( 12, 82 ) ; + Size = MAP_APPFONT ( 103, 10 ) ; Text [ en-US ] = "~Capital words" ; TabStop = TRUE ; }; CheckBox BTN_NUMS { - HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_NUMS"; - Pos = MAP_APPFONT ( 12 , 95 ) ; - Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~W�rter mit Ziffern : ~W�rter mit Ziffern */ - /* ### ACHTUNG: Neuer Text in Resource? ~W�rter mit Ziffern : ~W�rter mit Ziffern */ + HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_NUMS" ; + Pos = MAP_APPFONT ( 12, 95 ) ; + Size = MAP_APPFONT ( 103, 10 ) ; Text [ en-US ] = "~Words with numbers " ; TabStop = TRUE ; }; CheckBox BTN_UPLOW { - HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_UPLOW"; - Pos = MAP_APPFONT ( 12 , 108 ) ; - Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Gro�- u. ~Kleinschreibung : Gro�- u. ~Kleinschreibung */ - /* ### ACHTUNG: Neuer Text in Resource? Gro�- u. ~Kleinschreibung : Gro�- u. ~Kleinschreibung */ + HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_UPLOW" ; + Pos = MAP_APPFONT ( 12, 108 ) ; + Size = MAP_APPFONT ( 103, 10 ) ; Text [ en-US ] = "~Case sensitive " ; TabStop = TRUE ; }; - FixedLine GB_AUDIT + FixedLine GB_AUDIT { - Pos = MAP_APPFONT ( 6 , 71 ) ; - Size = MAP_APPFONT ( 115 , 53 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Pr�fen : Pr�fen */ - /* ### ACHTUNG: Neuer Text in Resource? Pr�fen : Pr�fen */ + Pos = MAP_APPFONT ( 6, 71 ) ; + Size = MAP_APPFONT ( 115, 53 ) ; Text [ en-US ] = "Check" ; }; }; - // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - +// ********************************************************************** EOF