This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new 3009d07ac2 Cleaned up resource files 3009d07ac2 is described below commit 3009d07ac22142e3b8e585177ba1d9322c1ea67d Author: mseidel <msei...@apache.org> AuthorDate: Mon May 13 17:29:26 2024 +0200 Cleaned up resource files --- main/cui/source/options/doclinkdialog.src | 78 +++++++++++++++---------------- main/cui/source/options/fontsubs.src | 24 +++++----- main/cui/source/options/optsave.src | 63 ++++++++++++------------- 3 files changed, 81 insertions(+), 84 deletions(-) diff --git a/main/cui/source/options/doclinkdialog.src b/main/cui/source/options/doclinkdialog.src index 8a5753f070..2e8e489cf4 100644 --- a/main/cui/source/options/doclinkdialog.src +++ b/main/cui/source/options/doclinkdialog.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,20 +7,18 @@ * 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 <cuires.hrc> #ifndef _SVX_DOCLINKDIALOG_HRC_ #include "doclinkdialog.hrc" @@ -42,28 +40,28 @@ ModalDialog DLG_DOCUMENTLINK { - HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK"; + HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK" ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ; - + Size = MAP_APPFONT ( DIALOG_SIZE_X, DIALOG_SIZE_Y ) ; + Moveable = TRUE ; Closeable = TRUE ; - + FixedText FT_URL { - + Pos = MAP_APPFONT ( 6, LINE_1_Y ) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 6, HEIGHT_LABEL ) ; - Group = TRUE; + Group = TRUE ; - Text [ en-US ] = "~Database file"; + Text [ en-US ] = "~Database file" ; }; ComboBox CMB_URL { - HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL"; - Pos = MAP_APPFONT ( 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ; + HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL" ; + Pos = MAP_APPFONT ( 6, LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ; + Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X, HEIGHT_EDIT ) ; SVLook = TRUE ; Border = TRUE ; @@ -73,75 +71,75 @@ ModalDialog DLG_DOCUMENTLINK }; PushButton PB_BROWSEFILE { - HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE"; - Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ; - Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); - Text [ en-US ] = "~Browse..."; + HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE" ; + Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6, LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ; + Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ; + Text [ en-US ] = "~Browse..." ; }; FixedText FT_NAME { Pos = MAP_APPFONT ( 6, LINE_1_Y + 2*OFFSET_Y + HEIGHT_LABEL + BUTTON_SIZE_Y - 3) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 6, HEIGHT_LABEL ) ; - Group = TRUE; + Group = TRUE ; - Text [ en-US ] = "Registered ~name"; + Text [ en-US ] = "Registered ~name" ; }; Edit ET_NAME { - HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME"; + HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME" ; Pos = MAP_APPFONT ( 6, LINE_1_Y + 3*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y - 6) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ; + Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X, HEIGHT_EDIT ) ; TabStop = TRUE ; Border = TRUE ; }; - + FixedLine FL_BOTTOM { - Pos = MAP_APPFONT ( 4, LINE_1_Y + 4*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y + HEIGHT_EDIT - 6); - Size = MAP_APPFONT ( DIALOG_SIZE_X - 8, 8 ); + Pos = MAP_APPFONT ( 4, LINE_1_Y + 4*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y + HEIGHT_EDIT - 6) ; + Size = MAP_APPFONT ( DIALOG_SIZE_X - 8, 8 ) ; }; OKButton BTN_OK { - Pos = MAP_APPFONT ( DIALOG_SIZE_X - 3 * ( BUTTON_SIZE_X + 3 ) - 6, DIALOG_SIZE_Y - 6 - BUTTON_SIZE_Y ); - Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); - DefButton = TRUE; + Pos = MAP_APPFONT ( DIALOG_SIZE_X - 3 * ( BUTTON_SIZE_X + 3 ) - 6, DIALOG_SIZE_Y - 6 - BUTTON_SIZE_Y ) ; + Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ; + DefButton = TRUE ; }; CancelButton BTN_CANCEL { - Pos = MAP_APPFONT ( DIALOG_SIZE_X - 2 * ( BUTTON_SIZE_X + 3 ) - 6, DIALOG_SIZE_Y - 6 - BUTTON_SIZE_Y ); - Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); + Pos = MAP_APPFONT ( DIALOG_SIZE_X - 2 * ( BUTTON_SIZE_X + 3 ) - 6, DIALOG_SIZE_Y - 6 - BUTTON_SIZE_Y ) ; + Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ; }; HelpButton BTN_HELP { - Pos = MAP_APPFONT ( DIALOG_SIZE_X - 1 * ( BUTTON_SIZE_X + 3 ) - 3, DIALOG_SIZE_Y - 6 - BUTTON_SIZE_Y ); - Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); + Pos = MAP_APPFONT ( DIALOG_SIZE_X - 1 * ( BUTTON_SIZE_X + 3 ) - 3, DIALOG_SIZE_Y - 6 - BUTTON_SIZE_Y ) ; + Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ; }; String STR_EDIT_LINK { - Text [ en-US ] = "Edit Database Link"; + Text [ en-US ] = "Edit Database Link" ; }; String STR_NEW_LINK { - Text [ en-US ] = "Create Database Link"; + Text [ en-US ] = "Create Database Link" ; }; }; String STR_LINKEDDOC_DOESNOTEXIST { - Text [ en-US ] = "The file\n$file$\ndoes not exist."; + Text [ en-US ] = "The file\n$file$\ndoes not exist." ; }; String STR_LINKEDDOC_NO_SYSTEM_FILE { - Text [ en-US ] = "The file\n$file$\ndoes not exist in the local file system."; + Text [ en-US ] = "The file\n$file$\ndoes not exist in the local file system." ; }; String STR_NAME_CONFLICT { - Text [ en-US ] = "The name '$file$' is already used for another database.\nPlease choose a different name."; + Text [ en-US ] = "The name '$file$' is already used for another database.\nPlease choose a different name." ; }; QueryBox QUERY_DELETE_CONFIRM @@ -149,3 +147,5 @@ QueryBox QUERY_DELETE_CONFIRM Buttons = WB_YES_NO ; Message [ en-US ] = "Do you want to delete the entry?" ; }; + +// ********************************************************************** EOF diff --git a/main/cui/source/options/fontsubs.src b/main/cui/source/options/fontsubs.src index e1f786b086..e7064729ac 100644 --- a/main/cui/source/options/fontsubs.src +++ b/main/cui/source/options/fontsubs.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,20 +7,18 @@ * 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 "fontsubs.hrc" #include "helpid.hrc" @@ -34,7 +32,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION Size = MAP_APPFONT ( 260, 185 ) ; CheckBox CB_USETABLE { - HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE"; + HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE" ; Pos = MAP_APPFONT ( 6, 6 ) ; Size = MAP_APPFONT ( 248, 10 ) ; TabStop = TRUE ; @@ -49,7 +47,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; ComboBox CB_FONT1 { - HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1"; + HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1" ; Border = TRUE ; Pos = MAP_APPFONT ( 6, 33 ) ; Size = MAP_APPFONT ( 100, 100 ) ; @@ -69,7 +67,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; ComboBox CB_FONT2 { - HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2"; + HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2" ; Border = TRUE ; Pos = MAP_APPFONT ( 110, 33 ) ; Size = MAP_APPFONT ( 100, 100 ) ; @@ -82,7 +80,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; ImageList IL_ICON { - Prefix = "nu"; + Prefix = "nu" ; MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; IdList = { @@ -133,7 +131,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; ListBox LB_FONTNAME { - HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME"; + HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME" ; Pos = MAP_APPFONT ( 65, 140 ) ; Size = MAP_APPFONT ( 100, 68 ) ; Border = TRUE ; @@ -142,7 +140,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; CheckBox CB_NONPROP { - HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP"; + HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP" ; Pos = MAP_APPFONT ( 65, 155 ) ; Size = MAP_APPFONT ( 180, 10 ) ; TabStop = TRUE ; @@ -156,7 +154,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; ListBox LB_FONTHEIGHT { - HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT"; + HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT" ; Pos = MAP_APPFONT ( 65, 169 ) ; Size = MAP_APPFONT ( 30, 68 ) ; Border = TRUE ; diff --git a/main/cui/source/options/optsave.src b/main/cui/source/options/optsave.src index ef0aec3d86..d6dbca2a11 100644 --- a/main/cui/source/options/optsave.src +++ b/main/cui/source/options/optsave.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,20 +7,18 @@ * 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 <sfx2/sfx.hrc> #include <cuires.hrc> @@ -47,14 +45,14 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox CB_LOAD_SETTINGS { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS" ; Pos = MAP_APPFONT ( 12, 11 ) ; Size = MAP_APPFONT ( 236, 10 ) ; Text [ en-US ] = "Load user-specific settings with the document" ; }; CheckBox CB_LOAD_DOCPRINTER { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER" ; Pos = MAP_APPFONT ( 12, 22 ) ; Size = MAP_APPFONT ( 236, 10 ) ; Text [ en-US ] = "Load printer settings with the document" ; @@ -67,7 +65,7 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox BTN_DOCINFO { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO" ; Pos = MAP_APPFONT ( 12, 41 ) ; Size = MAP_APPFONT ( 236, 10 ) ; Text [ en-US ] = "~Edit document properties before saving" ; @@ -81,21 +79,21 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox BTN_BACKUP { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP" ; Pos = MAP_APPFONT ( 12, 52 ) ; Size = MAP_APPFONT ( 236, 10 ) ; Text [ en-US ] = "Al~ways create backup copy" ; }; CheckBox BTN_AUTOSAVE { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE" ; Pos = MAP_APPFONT ( 12, 63 ) ; Size = MAP_APPFONT ( 150, 10 ) ; Text [ en-US ] = "Save ~AutoRecovery information every" ; }; NumericField ED_AUTOSAVE { - HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE"; + HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE" ; Border = TRUE ; Pos = MAP_APPFONT ( 180, 62 ) ; Size = MAP_APPFONT ( 21, 12 ) ; @@ -118,14 +116,14 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox BTN_RELATIVE_FSYS { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS" ; Pos = MAP_APPFONT ( 12, 74 ) ; Size = MAP_APPFONT ( 236, 10 ) ; Text [ en-US ] = "Save URLs relative to file system" ; }; CheckBox BTN_RELATIVE_INET { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET" ; Pos = MAP_APPFONT ( 12, 85 ) ; Size = MAP_APPFONT ( 248, 10 ) ; Text [ en-US ] = "Save URLs relative to internet" ; @@ -144,7 +142,7 @@ TabPage RID_SFXPAGE_SAVE }; ListBox LB_ODF_VERSION { - HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_ODF_VERSION"; + HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_ODF_VERSION" ; Pos = MAP_APPFONT ( 136, 105 ) ; Size = MAP_APPFONT ( 108, 58 ) ; Border = TRUE ; @@ -158,21 +156,21 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox BTN_ODFENCRYPTION { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_ODFENCRYPTION"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_ODFENCRYPTION" ; Pos = MAP_APPFONT ( 12, 120 ) ; Size = MAP_APPFONT ( 248, 10 ) ; Text [ en-US ] = "Enable AES-256 encryption (ODF 1.2)" ; }; CheckBox BTN_NOPRETTYPRINTING { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING" ; Pos = MAP_APPFONT ( 12, 131 ) ; Size = MAP_APPFONT ( 248, 10 ) ; Text [ en-US ] = "Size optimization for ODF format" ; }; CheckBox BTN_WARNALIENFORMAT { - HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT"; + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT" ; Pos = MAP_APPFONT ( 12, 142 ) ; Size = MAP_APPFONT ( 248, 10 ) ; Text [ en-US ] = "Warn when not saving in ODF or default format" ; @@ -191,7 +189,7 @@ TabPage RID_SFXPAGE_SAVE }; ListBox LB_APP { - HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_APP"; + HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_APP" ; Pos = MAP_APPFONT ( 12, 164 ) ; Size = MAP_APPFONT ( 108, 58 ) ; Border = TRUE ; @@ -215,7 +213,7 @@ TabPage RID_SFXPAGE_SAVE }; ListBox LB_FILTER { - HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER"; + HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER" ; Pos = MAP_APPFONT ( 136, 164 ) ; Size = MAP_APPFONT ( 108, 58 ) ; Border = TRUE ; @@ -239,51 +237,52 @@ TabPage RID_SFXPAGE_SAVE { ImageBitmap = Bitmap { - File = "odfwarning.png"; + File = "odfwarning.png" ; }; }; Image IMG_ODF_WARNING_HC { ImageBitmap = Bitmap { - File = "odfwarning_h.png"; + File = "odfwarning_h.png" ; }; }; }; ModalDialog RID_SVXDLG_FILTER_WARNING { - HelpID = HID_SVXDLG_FILTER_WARNING; + HelpID = HID_SVXDLG_FILTER_WARNING ; OutputSize = TRUE ; Moveable = TRUE ; Closeable = TRUE ; Sizeable = FALSE ; Border = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT( 175 + 39 + (3 * 6), (4 * 9)+ 12 + (3 * 12) + 6 - 21 ); + Size = MAP_APPFONT ( 175 + 39 + (3 * 6), (4 * 9)+ 12 + (3 * 12) + 6 - 21 ) ; Text = "%PRODUCTNAME %PRODUCTVERSION" ; FixedImage IMG_WARNING { - Pos = MAP_APPFONT( 6, 6 ); - Size = MAP_APPFONT( 30, 30 ); + Pos = MAP_APPFONT ( 6, 6 ) ; + Size = MAP_APPFONT ( 30, 30 ) ; }; FixedText FT_FILTER_WARNING { - Pos = MAP_APPFONT( 39, 6 ); - Size = MAP_APPFONT( 175, 4 * 9 ); + Pos = MAP_APPFONT ( 39, 6 ) ; + Size = MAP_APPFONT ( 175, 4 * 9 ) ; Wordbreak = TRUE ; Text [ en-US ] = "Using \"%1\" as default file format may cause information loss.\n" ; }; OKButton PB_OK { - Pos = MAP_APPFONT( 60, (4 * 9)/*+ 12*/ + 13 ); - Size = MAP_APPFONT( 50, 14 ); + Pos = MAP_APPFONT ( 60, (4 * 9)/*+ 12*/ + 13 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; DefButton = TRUE ; }; CancelButton PB_CANCEL { - Pos = MAP_APPFONT( 120, (4 * 9)/*+ 12*/ + 13 ); - Size = MAP_APPFONT( 50, 14 ); + Pos = MAP_APPFONT ( 120, (4 * 9)/*+ 12*/ + 13 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; }; }; +// ********************************************************************** EOF