From 52c373716284ab940cbf521d5e9bafd2a789ed8b Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Mon, 7 Jun 2010 17:03:27 +0200 Subject: jl152 #i77196# fixing merge conflicts --- scp2/source/ooo/common_brand.scp | 6 +++++- scp2/source/ooo/file_ooo.scp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index d3a679008..402252544 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -43,7 +43,6 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_C05_Faq, gid_Brand_Dir_Share_Config, gid_Brand_Dir_Share_Extension, - gid_Brand_Dir_Share_Extension_Install, gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, gid_Brand_Dir_Share_Registry, @@ -297,6 +296,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_It DosName = "dict-it"; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr + ParentID = gid_Brand_Dir_Share_Extensions; + DosName = "dict-ku-TR"; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Lt ParentID = gid_Brand_Dir_Share_Extensions; DosName = "dict-lt"; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index ae5b2d9dd..cc0f0507b 100755 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1999,7 +1999,7 @@ End #ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ku_Tr - Dir = gid_Brand_Dir_Share_Extension_Install; + Dir = gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr; Name = "dict-ku-TR.oxt"; Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE); UnixRights = 444; -- cgit v1.2.3