You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/04/26 15:55:34 UTC
svn commit: r1858210 - in /openoffice/branches/AOO42X: ./
main/scripting/workben/installer/Scripting.xcs
main/scripting/workben/installer/sidebar.jpg
Author: mseidel
Date: Fri Apr 26 15:55:33 2019
New Revision: 1858210
URL: http://svn.apache.org/viewvc?rev=1858210&view=rev
Log:
Merged r1858167 and r1858209 from trunk
- Fixed typo
- Updated graphic
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/scripting/workben/installer/Scripting.xcs
openoffice/branches/AOO42X/main/scripting/workben/installer/sidebar.jpg
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 26 15:55:33 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209
Modified: openoffice/branches/AOO42X/main/scripting/workben/installer/Scripting.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/scripting/workben/installer/Scripting.xcs?rev=1858210&r1=1858209&r2=1858210&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/scripting/workben/installer/Scripting.xcs (original)
+++ openoffice/branches/AOO42X/main/scripting/workben/installer/Scripting.xcs Fri Apr 26 15:55:33 2019
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,16 +8,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.
- *
+ *
***********************************************************-->
@@ -25,18 +25,18 @@
<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Scripting" oor:package="org.openoffice.Office" xml:lang="en-US">
<info>
<author>DF</author>
- <desc xml:lang="x-no-translate"></desc>
- <desc xml:lang="en-US">Contains the various settings needed by the Scripting Framework and its runtimes.</desc>
+ <desc xml:lang="x-no-translate"></desc>
+ <desc xml:lang="en-US">Contains the various settings needed by the Scripting Framework and its runtimes.</desc>
</info>
<templates>
<group oor:name="RuntimeNode">
<info>
- <desc xml:lang="x-no-translate"></desc>
- <desc xml:lang="en-US">Specifies the runtimes available to the Scriptying Framework.</desc>
+ <desc xml:lang="x-no-translate"></desc>
+ <desc xml:lang="en-US">Specifies the runtimes available to the Scripting Framework.</desc>
</info>
<prop oor:name="SupportedFileExtensions" oor:type="oor:string-list">
<info>
- <desc xml:lang="x-no-translate"></desc>
+ <desc xml:lang="x-no-translate"></desc>
<desc xml:lang="en-US">Lists the file extensions that are recognized by this runtime.</desc>
</info>
</prop>
@@ -45,7 +45,7 @@
<component>
<set oor:name="ScriptRuntimes" oor:node-type="RuntimeNode">
<info>
- <desc xml:lang="x-no-translate"></desc>
+ <desc xml:lang="x-no-translate"></desc>
<desc xml:lang="en-US">Lists the registered Scripting Framework runtimes.</desc>
</info>
</set>
Modified: openoffice/branches/AOO42X/main/scripting/workben/installer/sidebar.jpg
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/scripting/workben/installer/sidebar.jpg?rev=1858210&r1=1858209&r2=1858210&view=diff
==============================================================================
Binary files - no diff available.