[Libreoffice-commits] .: 2 commits - connectivity/source officecfg/registry

[Andras Timar]

 connectivity/source/resource/conn_shared_res.src               |    2 +-
 officecfg/registry/data/org/openoffice/Office/Paths.xcu        |    2 +-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs     |    2 +-
 officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4f8fa401f2d8481f0fd6dba2b9d03b1d1c3cf353
Author: Andras Timar <atimar at novell.com>
Date:   Tue Apr 26 20:39:35 2011 +0200

    modify/delete wordbook files for good
    
    * extras/source/wordbook/lang/*/soffice.dic: deleted
      These files were in old binary format and almost all
      language files were replicas of the en-US file. There
      were two exceptions: German and Slovenian. André Schnabel
      checked the German word list and he said that they can be
      deleted. Martin Srebotnjak checked the Slovenian word list
      and he asked me to keep those words -> sl.dic
    * extras/source/wordbook/oracle.dic: deleted
      It was not used in the build. It contained Oracle brand
      names, etc.
    * extras/source/wordbook/standard.dic: deleted
      It was built and delivered, but not packaged. It was an
      empty dictionary file which would be created anyway when
      the user creates a new empty dictionary.
    * extras/source/wordbook/technical.dic:
      Entries were sorted so it will be easier to add new words.
      Some entries were added from lang/en-US/soffice.dic.
    * extras/source/wordbook/sl.dic: added Slovenian words
    * extras/source/wordbook/en-US.dic: added English words
    * extras/source/wordbook/en-GB.dic: added English words
    * scp2/source/ooo/ :
      These wordbook files should not depend on the UI language.
      They should not be in language packs but they all should
      be installed for every language like spell checker
      dictionaries.
    * officecfg/registry/ :
      Paths adjusted, so application looks for wordbook files
      in the right directory.
      I enabled all dictionaries by default in Linguistic.xcs.

diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 686682f..f473996 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -142,7 +142,7 @@
         
         <node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true">
             <node oor:name="InternalPaths">
-                <node oor:name="$(insturl)/share/wordbook/$(vlang)" oor:op="fuse"/>
+                <node oor:name="$(insturl)/share/wordbook" oor:op="fuse"/>
             </node>
             <prop oor:name="WritePath">
                 <value>$(userurl)/wordbook</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 668e740..ec73e01 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1625,7 +1625,7 @@
 						<author>TL</author>
 						<desc>Contains the provided dictionaries.</desc>
 					</info>
-					<value>$(insturl)/share/wordbook/$(vlang)</value>
+					<value>$(insturl)/share/wordbook</value>
 				</prop>
 				<prop oor:name="Favorite" oor:type="xs:string">
 					<info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 42d0f54..c1db417 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -221,7 +221,7 @@
 						<desc>Specifies the custom dictionaries to be used. The Ignore list (IgnoreAllList (All)) is administered in the RAM only for the current spellcheck.</desc>
 						<label>Custom dictionaries</label>
 					</info>
-					<value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;technical.dic</value>
+					<value oor:separator=";">IgnoreAllList;en-US.dic;en-GB.dic;sl.dic;technical.dic</value>
 				</prop>
 				<prop oor:name="IsUseDictionaryList" oor:type="xs:boolean">
 					<!-- OldLocation: NEW -->
commit ce91ad85c475686c888f95fd992e1ff0152785d2
Author: Andras Timar <atimar at novell.com>
Date:   Tue Apr 26 09:31:06 2011 +0200

    remove double space from en-US message

diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index 9772787..fb0d80f 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -611,7 +611,7 @@ String STR_COMMAND_NOT_FOUND
 };
 String STR_DATABASE_NEEDS_CONVERTING
 {
-    Text [ en-US ] = "The current database need to be converted. Please insert control user  and password.";
+    Text [ en-US ] = "The current database need to be converted. Please insert control user and password.";
 };
 String STR_USER_NO_DELETE
 {