INTEGRATION: CWS rc2merge (1.10.12); FILE MERGED

2003/07/03 14:27:00 ihi 1.10.12.1: rc-2 merge all languages

2 files changed, 16 insertions, 9 deletions

diff --git a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
index 504890c259a9..6ced90d9a98d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
@@ -3,9 +3,9 @@
  *
  *  $RCSfile: ProtocolHandler.xcs,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: hr $ $Date: 2003-06-13 14:31:44 $
+ *  last change: $Author: hr $ $Date: 2003-07-03 17:35:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,11 +87,12 @@
 				<desc xml:lang="sv">Specifies the UNO service to use for URL dispatches that handle special URL protocols.</desc>
 				<desc xml:lang="pl">Specifies the UNO service to use for URL dispatches that handle special URL protocols.</desc>
 				<desc xml:lang="pt-BR">Specifies the UNO service to use for URL dispatches that handle special URL protocols.</desc>
-				<desc xml:lang="ja">Specifies the UNO service to use for URL dispatches that handle special URL protocols.</desc>
+				<desc xml:lang="ja">特殊な URL プロトコルを扱う URL ディスパッチ用に、UNO サービスを指定します。</desc>
 				<desc xml:lang="ko">Specifies the UNO service to use for URL dispatches that handle special URL protocols.</desc>
 				<desc xml:lang="tr">Specifies the UNO service to use for URL dispatches that handle special URL protocols.</desc>
 				<desc xml:lang="th">Specifies the UNO service to use for URL dispatches that handle special URL protocols.</desc>
 				<desc xml:lang="hi-IN">Specifies the UNO service to use for URL dispatches that handle special URL protocols.</desc>
+				<desc xml:lang="x-comment">Specifies the UNO service to use for URL dispatches that handle special URL protocols.</desc>
 			</info>
 			<prop oor:name="Protocols" oor:type="oor:string-list">
 				<info>
@@ -114,11 +115,12 @@
 					<desc xml:lang="sv">Lists the URL pattern that can recognized by this service.</desc>
 					<desc xml:lang="pl">Lists the URL pattern that can recognized by this service.</desc>
 					<desc xml:lang="pt-BR">Lists the URL pattern that can recognized by this service.</desc>
-					<desc xml:lang="ja">Lists the URL pattern that can recognized by this service.</desc>
+					<desc xml:lang="ja">このサービスが認識する URL のパターンを一覧表示します。</desc>
 					<desc xml:lang="ko">Lists the URL pattern that can recognized by this service.</desc>
 					<desc xml:lang="tr">Lists the URL pattern that can recognized by this service.</desc>
 					<desc xml:lang="th">Lists the URL pattern that can recognized by this service.</desc>
 					<desc xml:lang="hi-IN">Lists the URL pattern that can recognized by this service.</desc>
+					<desc xml:lang="x-comment">Lists the URL pattern that can recognized by this service.</desc>
 				</info>
 			</prop>
 		</group>
@@ -145,11 +147,12 @@
 				<desc xml:lang="sv">Lists the registered protocol handler services.</desc>
 				<desc xml:lang="pl">Lists the registered protocol handler services.</desc>
 				<desc xml:lang="pt-BR">Lists the registered protocol handler services.</desc>
-				<desc xml:lang="ja">Lists the registered protocol handler services.</desc>
+				<desc xml:lang="ja">プロトコルハンドラのサービスを一覧表示します。</desc>
 				<desc xml:lang="ko">Lists the registered protocol handler services.</desc>
 				<desc xml:lang="tr">Lists the registered protocol handler services.</desc>
 				<desc xml:lang="th">Lists the registered protocol handler services.</desc>
 				<desc xml:lang="hi-IN">Lists the registered protocol handler services.</desc>
+				<desc xml:lang="x-comment">Lists the registered protocol handler services.</desc>
 			</info>
 		</set>
 	</component>
@@ -159,3 +162,4 @@
 
 
 
+
diff --git a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
index 8dbc2a86b08a..1e30433d84a3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
@@ -3,9 +3,9 @@
  *
  *  $RCSfile: SFX.xcs,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: hr $ $Date: 2003-06-13 14:31:55 $
+ *  last change: $Author: hr $ $Date: 2003-07-03 17:35:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,11 +87,12 @@
 				<desc xml:lang="sv">Contains settings which specifies how the help in Office should work.</desc>
 				<desc xml:lang="pl">Contains settings which specifies how the help in Office should work.</desc>
 				<desc xml:lang="pt-BR">Contains settings which specifies how the help in Office should work.</desc>
-				<desc xml:lang="ja">Contains settings which specifies how the help in Office should work.</desc>
+				<desc xml:lang="ja">Office のヘルプ機能の動作方法を指定する設定が含まれます。</desc>
 				<desc xml:lang="ko">Contains settings which specifies how the help in Office should work.</desc>
 				<desc xml:lang="tr">Contains settings which specifies how the help in Office should work.</desc>
 				<desc xml:lang="th">Contains settings which specifies how the help in Office should work.</desc>
 				<desc xml:lang="hi-IN">Contains settings which specifies how the help in Office should work.</desc>
+				<desc xml:lang="x-comment">Contains settings which specifies how the help in Office should work.</desc>
 			</info>
 			<prop oor:name="HelpAgentStarterList" oor:type="xs:string" oor:localized="true">
 				<!-- OldLocation: hlpagent.ini -->
@@ -116,11 +117,12 @@
 					<desc xml:lang="sv">Lists IDs used by SFX to start the help agent.</desc>
 					<desc xml:lang="pl">Lists IDs used by SFX to start the help agent.</desc>
 					<desc xml:lang="pt-BR">Lists IDs used by SFX to start the help agent.</desc>
-					<desc xml:lang="ja">Lists IDs used by SFX to start the help agent.</desc>
+					<desc xml:lang="ja">ヘルプエージェントを開始するために SFX が使用する ID のリストです。</desc>
 					<desc xml:lang="ko">Lists IDs used by SFX to start the help agent.</desc>
 					<desc xml:lang="tr">Lists IDs used by SFX to start the help agent.</desc>
 					<desc xml:lang="th">Lists IDs used by SFX to start the help agent.</desc>
 					<desc xml:lang="hi-IN">Lists IDs used by SFX to start the help agent.</desc>
+					<desc xml:lang="x-comment">Lists IDs used by SFX to start the help agent.</desc>
 				</info>
 				<value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
 			</prop>
@@ -132,3 +134,4 @@
 
 
 
+