INTEGRATION: CWS scp2officecfg (1.3.14); FILE MERGED

2004/06/17 09:36:16 jb 1.3.14.1: #i18588# Remove localized descriptions and drop xml:lang tag from english <desc> and <label> elements

2 files changed, 18 insertions, 30 deletions

diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
index 3d9967093878..fcec6b9bacaf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
@@ -3,9 +3,9 @@
  *
  *  $RCSfile: Factories.xcs,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-04-27 10:53:19 $
+ *  last change: $Author: obo $ $Date: 2004-07-05 13:44:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,36 +62,31 @@
 <!DOCTYPE oor:component-schema SYSTEM "../../../../../component-schema.dtd">
 <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="Factories" oor:package="org.openoffice.Office.UI" xml:lang="en-US"> <info>
 		<author>CD</author>
-		<desc xml:lang="en-US">Contains implementation of user interface element factories.</desc>
+		<desc >Contains implementation of user interface element factories.</desc>
 	</info>
 	<templates>
 		<group oor:name="FactoryType">
 			<info>
-				<desc xml:lang="en-US">Describes a factory implementation.</desc>
-				<desc xml:lang="zh-CN">Describes a factory implementation.</desc>
+				<desc>Describes a factory implementation.</desc>
 			</info>
 			<prop oor:name="Type" oor:type="xs:string">
 				<info>
-					<desc xml:lang="en-US">Specifies a user interface element type that a factory can create.</desc>
-					<desc xml:lang="zh-CN">Specifies a user interface element type that a factory can create.</desc>
+					<desc>Specifies a user interface element type that a factory can create.</desc>
 				</info>
 			</prop>
 			<prop oor:name="Name" oor:type="xs:string">
 				<info>
-					<desc xml:lang="en-US">Specifies a name of a single user interface element.</desc>
-					<desc xml:lang="zh-CN">Specifies a name of a single user interface element.</desc>
+					<desc>Specifies a name of a single user interface element.</desc>
 				</info>
 			</prop>
 			<prop oor:name="Module" oor:type="xs:string">
 			    <info>
-			        <desc xml:lang="en-US">Specifies a module that the factory is associated with. An empty string means that the factory can be used for every module.</desc>
-			    	<desc xml:lang="zh-CN">Specifies a module that the factory is associated with. An empty string means that the factory can be used for every module.</desc>
+			        <desc>Specifies a module that the factory is associated with. An empty string means that the factory can be used for every module.</desc>
 			    </info>
 			</prop>
 			<prop oor:name="FactoryImplementation" oor:type="xs:string">
 			    <info>
-			        <desc xml:lang="en-US">Specifies the UNO service implementation name to use to create a specified user interface element.</desc>
-                	<desc xml:lang="zh-CN">Specifies the UNO service implementation name to use to create a specified user interface element.</desc>
+			        <desc>Specifies the UNO service implementation name to use to create a specified user interface element.</desc>
                 </info>
             </prop>
 		</group>
@@ -99,13 +94,11 @@
 	<component>
 		<group oor:name="Registered">
 			<info>
-				<desc xml:lang="en-US">Contains all registered factories for user interface elements.</desc>
-				<desc xml:lang="zh-CN">Contains all registered factories for user interface elements.</desc>
+				<desc>Contains all registered factories for user interface elements.</desc>
 			</info>
 			<set oor:name="UIElementFactories" oor:node-type="FactoryType">
 				<info>
-					<desc xml:lang="en-US">Contains UNO component implementation names that implements a user interface element factory service.</desc>
-					<desc xml:lang="zh-CN">Contains UNO component implementation names that implements a user interface element factory service.</desc>
+					<desc>Contains UNO component implementation names that implements a user interface element factory service.</desc>
 				</info>
 			</set>
 		</group>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
index a9a1ff5c6605..dcfbf9afdde8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
@@ -3,9 +3,9 @@
  *
  *  $RCSfile: GenericCommands.xcs,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-04-27 10:53:33 $
+ *  last change: $Author: obo $ $Date: 2004-07-05 13:44:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,18 +62,16 @@
 <!DOCTYPE oor:component-schema SYSTEM "../../../../../component-schema.dtd">
 <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="GenericCommands" oor:package="org.openoffice.Office.UI" xml:lang="en-US"> <info>
 		<author>CD</author>
-		<desc xml:lang="en-US">Contains general information about ~ and rules, and about actions based on office commands.</desc>
+		<desc >Contains general information about ~ and rules, and about actions based on office commands.</desc>
 	</info>
 	<templates>
         <group oor:name="LabelType">
             <info>
-                <desc xml:lang="en-US">Provides a mapping between commands and their textual representation on the user interface.</desc>
-            	<desc xml:lang="zh-CN">Provides a mapping between commands and their textual representation on the user interface.</desc>
+                <desc>Provides a mapping between commands and their textual representation on the user interface.</desc>
             </info>
             <prop oor:name="Label" oor:type="xs:string" oor:localized="true">
                 <info>
-                    <desc xml:lang="en-US">A localized text that describes the command or identifier. Can be used as a label inside a menu or as short tool tip help.</desc>
-                	<desc xml:lang="zh-CN">A localized text that describes the command or identifier. Can be used as a label inside a menu or as short tool tip help.</desc>
+                    <desc>A localized text that describes the command or identifier. Can be used as a label inside a menu or as short tool tip help.</desc>
                 </info>
             </prop>
         </group>
@@ -81,19 +79,16 @@
 	<component>
 		<group oor:name="UserInterface">
 		    <info>
-		        <desc xml:lang="en-US">Contains user interface data for Office commands and identifiers that are used by the user interface."</desc>
-		    	<desc xml:lang="zh-CN">Contains user interface data for Office commands and identifiers that are used by the user interface.&quot;</desc>
+		        <desc>Contains user interface data for Office commands and identifiers that are used by the user interface."</desc>
 		    </info>
 		    <set oor:name="Commands" oor:node-type="LabelType">
 		        <info>
-		            <desc xml:lang="en-US">Contains label text for Office commands and identifiers that are used by the user interface."</desc>
-		        	<desc xml:lang="zh-CN">Contains label text for Office commands and identifiers that are used by the user interface.&quot;</desc>
+		            <desc>Contains label text for Office commands and identifiers that are used by the user interface."</desc>
 		        </info>
             </set>
             <set oor:name="Popups" oor:node-type="LabelType">
                 <info>
-		            <desc xml:lang="en-US">Contains label text for popup menus identifiers that are used by the user interface."</desc>
-                	<desc xml:lang="zh-CN">Contains label text for popup menus identifiers that are used by the user interface.&quot;</desc>
+		            <desc>Contains label text for popup menus identifiers that are used by the user interface."</desc>
                 </info>
             </set>
 		</group>