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 1f73b90 Cleaned up resource file, minor changes in Help 1f73b90 is described below commit 1f73b90b3981a148eeb1297d9bc585bddd929647 Author: mseidel <msei...@apache.org> AuthorDate: Thu May 21 10:42:36 2020 +0200 Cleaned up resource file, minor changes in Help (cherry picked from commit 66e89fe63daa1fe684f6cf0da1894e69c60355ed) --- main/dbaccess/source/ui/browser/sbabrw.src | 108 ++++++++++----------- .../helpcontent2/source/text/scalc/01/12010000.xhp | 2 +- .../helpcontent2/source/text/scalc/01/12010100.xhp | 2 +- .../helpcontent2/source/text/scalc/01/12070000.xhp | 2 +- .../helpcontent2/source/text/scalc/01/12070100.xhp | 2 +- .../source/text/swriter/01/05150101.xhp | 2 +- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/main/dbaccess/source/ui/browser/sbabrw.src b/main/dbaccess/source/ui/browser/sbabrw.src index cce005e..188dcc5 100644 --- a/main/dbaccess/source/ui/browser/sbabrw.src +++ b/main/dbaccess/source/ui/browser/sbabrw.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,19 +7,20 @@ * 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. - * + * *************************************************************/ + #ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" #endif @@ -29,7 +30,7 @@ #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" #endif -// #include <sfx2/sfx.hrc> +// #include <sfx2/sfx.hrc> #ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> #endif @@ -39,14 +40,12 @@ QueryBox QUERY_BRW_SAVEMODIFIED { Buttons = WB_YES_NO_CANCEL ; DefButton = WB_DEF_YES ; - /* ### ACHTUNG: Neuer Text in Resource? Soll der ge�nderte Datensatz gespeichert werden? : Soll der ge�nderte Datensatz gespeichert werden? */ Message [ en-US ] = "The current record has been changed.\nDo you want to save the changes?" ; }; QueryBox QUERY_BRW_DELETE_ROWS { Buttons = WB_YES_NO ; - /* ### ACHTUNG: Neuer Text in Resource? Sollen die selektierten Daten gel�scht werden? : Sollen die selektierten Daten gel�scht werden? */ Message [ en-US ] = "Do you want to delete the selected data?" ; }; @@ -57,68 +56,68 @@ String RID_STR_DATABROWSER_FILTERED String SBA_BROWSER_SETTING_ORDER { - Text [ en-US ] = "Error setting the sort criteria"; + Text [ en-US ] = "Error setting the sort criteria" ; }; String SBA_BROWSER_SETTING_FILTER { - Text [ en-US ] = "Error setting the filter criteria"; + Text [ en-US ] = "Error setting the filter criteria" ; }; String RID_STR_CONNECTION_LOST { - Text [ en-US ] = "Connection lost"; + Text [ en-US ] = "Connection lost" ; }; String RID_STR_QUERIES_CONTAINER { - Text [ en-US ] = "Queries"; + Text [ en-US ] = "Queries" ; }; String RID_STR_TABLES_CONTAINER { - Text [ en-US ] = "Tables"; + Text [ en-US ] = "Tables" ; }; -#define MID_EDIT_DATABASE \ - Identifier = ID_TREE_EDIT_DATABASE ; \ - HelpId = HID_BROWSER_EDIT_DATABASE; \ +#define MID_EDIT_DATABASE \ + Identifier = ID_TREE_EDIT_DATABASE ; \ + HelpId = HID_BROWSER_EDIT_DATABASE ; \ Text [ en-US ] = "Edit ~Database File..." ;\ -#define MID_ADMINISTRATE \ - Identifier = ID_TREE_ADMINISTRATE ; \ - HelpId = HID_BROWSER_ADMINISTRATE; \ - Text [ en-US ] = "Registered databases ..." ;\ +#define MID_ADMINISTRATE \ + Identifier = ID_TREE_ADMINISTRATE ; \ + HelpId = HID_BROWSER_ADMINISTRATE ; \ + Text [ en-US ] = "Registered databases..." ;\ -#define MID_CLOSECONN \ - Identifier = ID_TREE_CLOSE_CONN ; \ - HelpId = HID_BROWSER_CLOSECONN ; \ - Text [ en-US ] = "Disco~nnect" ; \ +#define MID_CLOSECONN \ + Identifier = ID_TREE_CLOSE_CONN ; \ + HelpId = HID_BROWSER_CLOSECONN ; \ + Text [ en-US ] = "Disco~nnect" ; \ Menu MENU_BROWSER_DEFAULTCONTEXT { ItemList = { - MenuItem \ - { \ - MID_EDIT_DATABASE \ - }; \ - MenuItem \ - { \ - MID_CLOSECONN \ - }; \ - MenuItem \ - { \ - Separator = TRUE; \ - }; \ - MenuItem { ITEM_EDIT_COPY }; - MenuItem \ - { \ - Separator = TRUE; \ - }; \ - MenuItem \ - { \ - MID_ADMINISTRATE \ - }; + MenuItem \ + { \ + MID_EDIT_DATABASE \ + }; \ + MenuItem \ + { \ + MID_CLOSECONN \ + }; \ + MenuItem \ + { \ + Separator = TRUE ; \ + }; \ + MenuItem { ITEM_EDIT_COPY } ; + MenuItem + { \ + Separator = TRUE ; \ + }; \ + MenuItem \ + { \ + MID_ADMINISTRATE \ + }; }; }; @@ -146,27 +145,27 @@ QueryBox QUERY_CONNECTION_LOST String STR_OPENTABLES_WARNINGS { - Text [ en-US ] = "Warnings encountered"; + Text [ en-US ] = "Warnings encountered" ; }; String STR_OPENTABLES_WARNINGS_DETAILS { - Text [ en-US ] = "While retrieving the tables, warnings were reported by the database connection."; + Text [ en-US ] = "While retrieving the tables, warnings were reported by the database connection." ; }; String STR_CONNECTING_DATASOURCE { - Text [ en-US ] = "Connecting to \"$name$\" ..."; + Text [ en-US ] = "Connecting to \"$name$\"..." ; }; String STR_LOADING_QUERY { - Text [ en-US ] = "Loading query $name$ ..."; + Text [ en-US ] = "Loading query $name$..."; }; String STR_LOADING_TABLE { - Text [ en-US ] = "Loading table $name$ ..."; + Text [ en-US ] = "Loading table $name$..."; }; String STR_NO_TABLE_FORMAT_INSIDE @@ -176,7 +175,7 @@ String STR_NO_TABLE_FORMAT_INSIDE String STR_COULDNOTCONNECT_DATASOURCE { - Text [ en-US ] = "The connection to the data source \"$name$\" could not be established."; + Text [ en-US ] = "The connection to the data source \"$name$\" could not be established." ; }; Menu RID_MENU_REFRESH_DATA @@ -186,14 +185,15 @@ Menu RID_MENU_REFRESH_DATA MenuItem { MID_SBA_QRY_REFRESH - Command = ".uno:Refresh"; + Command = ".uno:Refresh" ; }; MenuItem { - Identifier = ID_BROWSER_REFRESH_REBUILD; - Command = ".uno:DBRebuildData"; - Text [ en-US ] = "Rebuild"; + Identifier = ID_BROWSER_REFRESH_REBUILD ; + Command = ".uno:DBRebuildData" ; + Text [ en-US ] = "Rebuild" ; }; }; }; +// ********************************************************************** EOF diff --git a/main/helpcontent2/source/text/scalc/01/12010000.xhp b/main/helpcontent2/source/text/scalc/01/12010000.xhp index 7775bc8..7a99ff8 100644 --- a/main/helpcontent2/source/text/scalc/01/12010000.xhp +++ b/main/helpcontent2/source/text/scalc/01/12010000.xhp @@ -53,7 +53,7 @@ <paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_ADD">Adds the selected cell range to the database range list, or modifies an existing database range.</ahelp></paragraph> <embed href="text/shared/00/00000001.xhp#loeschen"/> <bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_DBNAMES:BTN_MORE" id="bm_id3152596" localize="false"/> -<paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="2" l10n="U" oldref="12">More >></paragraph> +<paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="2" l10n="U" oldref="12">More</paragraph> <paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_DBNAMES:BTN_MORE">Shows additional <link href="text/scalc/01/12010100.xhp" name="options">options</link>.</ahelp></paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/01/12010100.xhp b/main/helpcontent2/source/text/scalc/01/12010100.xhp index c785945..be32081 100644 --- a/main/helpcontent2/source/text/scalc/01/12010100.xhp +++ b/main/helpcontent2/source/text/scalc/01/12010100.xhp @@ -47,7 +47,7 @@ <paragraph l10n="U" role="paragraph" id="par_id3153363" xml-lang="en-US" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_STRIPDATA" visibility="visible">Only saves a reference to the database, and not the contents of the cells.</ahelp></paragraph> <paragraph role="heading" level="3" id="hd_id3147428" l10n="U" xml-lang="en-US" oldref="11">Source:</paragraph> <paragraph role="paragraph" id="par_id3148576" l10n="U" xml-lang="en-US" oldref="12">Displays information about the current database source and any existing operators.</paragraph> - <paragraph role="heading" level="2" id="hd_id3146976" l10n="U" xml-lang="en-US" oldref="13">More <<</paragraph> + <paragraph role="heading" level="2" id="hd_id3146976" l10n="U" xml-lang="en-US" oldref="13">Less</paragraph> <paragraph role="paragraph" id="par_id3149664" l10n="U" xml-lang="en-US" oldref="14">Hides the additional options.</paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/01/12070000.xhp b/main/helpcontent2/source/text/scalc/01/12070000.xhp index 1efde73..39b9a18 100644 --- a/main/helpcontent2/source/text/scalc/01/12070000.xhp +++ b/main/helpcontent2/source/text/scalc/01/12070000.xhp @@ -60,7 +60,7 @@ <paragraph role="heading" id="hd_id3147345" xml-lang="en-US" level="2" l10n="U" oldref="17">Add</paragraph> <paragraph role="paragraph" id="par_id3155335" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_ADD">Adds the cell range specified in the <emph>Source data range</emph> box to the <emph>Consolidation ranges </emph>box.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_CONSOLIDATE:BTN_MORE" id="bm_id3159102" localize="false"/> -<paragraph role="heading" id="hd_id3148630" xml-lang="en-US" level="2" l10n="U" oldref="19">More >></paragraph> +<paragraph role="heading" id="hd_id3148630" xml-lang="en-US" level="2" l10n="U" oldref="19">More</paragraph> <paragraph role="paragraph" id="par_id3159239" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_CONSOLIDATE:BTN_MORE">Shows additional <link href="text/scalc/01/12070100.xhp" name="options">options</link>.</ahelp></paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/01/12070100.xhp b/main/helpcontent2/source/text/scalc/01/12070100.xhp index 617be06..1784ced 100644 --- a/main/helpcontent2/source/text/scalc/01/12070100.xhp +++ b/main/helpcontent2/source/text/scalc/01/12070100.xhp @@ -46,7 +46,7 @@ <paragraph role="heading" level="2" id="hd_id3153191" l10n="U" xml-lang="en-US" oldref="12">Options</paragraph> <bookmark branch="hid/sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_REFS" xml-lang="en-US" id="bm_id3153954"/><paragraph role="heading" level="3" id="hd_id3159154" l10n="U" xml-lang="en-US" oldref="8">Link to source data</paragraph> <paragraph l10n="U" role="paragraph" id="par_id3146986" xml-lang="en-US" oldref="9"><ahelp hid="SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_REFS" visibility="visible">Links the data in the consolidation range to the source data, and automatically updates the results of the consolidation when the source data is changed.</ahelp></paragraph> - <paragraph role="heading" level="2" id="hd_id3163708" l10n="U" xml-lang="en-US" oldref="10">More <<</paragraph> + <paragraph role="heading" level="2" id="hd_id3163708" l10n="U" xml-lang="en-US" oldref="10">Less</paragraph> <paragraph role="paragraph" id="par_id3151118" l10n="U" xml-lang="en-US" oldref="11">Hides the additional options.</paragraph> </body> diff --git a/main/helpcontent2/source/text/swriter/01/05150101.xhp b/main/helpcontent2/source/text/swriter/01/05150101.xhp index 8c06797..dadde59 100644 --- a/main/helpcontent2/source/text/swriter/01/05150101.xhp +++ b/main/helpcontent2/source/text/swriter/01/05150101.xhp @@ -82,7 +82,7 @@ <paragraph xml-lang="en-US" id="par_id3150707" role="paragraph" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_REMOVE">Deletes the selected table style.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sw:MoreButton:DLG_AUTOFMT_TABLE:BTN_MORE" id="bm_id3154103" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3152946" role="heading" level="2" l10n="U" - oldref="18">More ⏬</paragraph> + oldref="18">More / Less</paragraph> <paragraph xml-lang="en-US" id="par_id3149802" role="paragraph" l10n="U" oldref="19"><ahelp hid="SW:MOREBUTTON:DLG_AUTOFMT_TABLE:BTN_MORE">Displays more formatting options for tables. Click again to hide the options.</ahelp></paragraph> <paragraph xml-lang="en-US" id="hd_id3153534" role="heading" level="2" l10n="U" oldref="31">Formatting</paragraph>