ka102: rebased to DEV300_m104

6 files changed, 11 insertions, 10 deletions

diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst
index 04d2cfd87a..b07a34aee9 100644
--- a/officecfg/prj/build.lst
+++ b/officecfg/prj/build.lst
@@ -1,4 +1,4 @@
-oc  officecfg   :    l10n soltools solenv LIBXSLT:libxslt NULL
+oc  officecfg   :    L10N:l10n soltools solenv LIBXSLT:libxslt NULL
 oc  officecfg                                                       usr1  -   all oc_mkout NULL
 oc  officecfg\registry\schema                                       nmake -   all oc_reg_schema NULL
 oc  officecfg\registry                                              nmake -   all oc_reg NULL
diff --git a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
index 128a7f18d1..a61ea0af0c 100755
--- a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
@@ -14,6 +14,8 @@
    <value>
     <!-- Matrox G550 - blank display on 2nd head -->
     4139 9511 260313131 1 5 13 1 1320 
+    <!-- Matrox G550 - blank display (single head?) -->
+    4139 9511 255987755 1 6 12 1 1930
     <!-- Matrox G400 - random crashes -->
     4139 1317 54005803 4 5 12 1 1200
     <!-- Mobility Radeon M6 16MB - blank screen 1st slide on internal LCD -->
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 5c72d94843..a30d746d50 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -170,7 +170,7 @@
             </node>
             <node oor:name=".uno:DataPilotFilter" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">DataPilot Filter</value>
+                    <value xml:lang="en-US">Pivot Table Filter</value>
                 </prop>
             </node>
             <node oor:name=".uno:NextPage" oor:op="replace">
@@ -323,10 +323,10 @@
             </node>
             <node oor:name=".uno:DataDataPilotRun" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Start DataPilot...</value>
+                    <value xml:lang="en-US">~Create Pivot Table...</value>
                 </prop>
                 <prop oor:name="ContextLabel" oor:type="xs:string">
-                    <value xml:lang="en-US">~Start...</value>
+                    <value xml:lang="en-US">~Create...</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
@@ -1131,7 +1131,7 @@
             </node>
             <node oor:name=".uno:RecalcPivotTable" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Refresh DataPilot</value>
+                    <value xml:lang="en-US">~Refresh Pivot Table</value>
                 </prop>
                 <prop oor:name="ContextLabel" oor:type="xs:string">
                     <value xml:lang="en-US">~Refresh</value>
@@ -1139,7 +1139,7 @@
             </node>
             <node oor:name=".uno:DeletePivotTable" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Delete DataPilot</value>
+                    <value xml:lang="en-US">~Delete Pivot Table</value>
                 </prop>
                 <prop oor:name="ContextLabel" oor:type="xs:string">
                     <value xml:lang="en-US">~Delete</value>
@@ -1532,7 +1532,7 @@
             </node>
             <node oor:name=".uno:DataPilotMenu" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Data~Pilot</value>
+                    <value xml:lang="en-US">~Pivot Table</value>
                 </prop>
             </node>
             <node oor:name=".uno:EditSheetMenu" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 8e18ca575c..d46e4103f0 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -348,7 +348,7 @@
                     <value >swform</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value>Base: Form Design</value>
+                    <value>Base: Database Form</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryWindowStateConfigRef">
                     <value >WriterFormWindowState</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 913902731f..aeddefb763 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1039,7 +1039,7 @@
                             with no exception.</desc>
                         <label>QuotedFieldAsText</label>
                     </info>
-                    <value>true</value>
+                    <value>false</value>
                 </prop>
                 <prop oor:name="DetectSpecialNumbers" oor:type="xs:boolean">
                     <info>
diff --git a/officecfg/util/makefile.mk b/officecfg/util/makefile.mk
index 332ac90fe2..c1fa542771 100644
--- a/officecfg/util/makefile.mk
+++ b/officecfg/util/makefile.mk
@@ -37,7 +37,6 @@ TARGET=util
 
 $(MISC)$/$(TARGET)_delzip :
     -$(RM) $(BIN)$/registry_{$(alllangiso)}.zip	
-    -$(RM) $(COMMON_OUTPUT)$/bin$/registry_{$(alllangiso)}.zip
 
 $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
     cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*