summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorRelease Engineering <releng@openoffice.org>2011-02-18 11:14:19 +0100
committerRelease Engineering <releng@openoffice.org>2011-02-18 11:14:19 +0100
commit818496deb94e1582e355437644ef26ad75116c83 (patch)
treeeade73d93ffe46e0204423dde5e8401095043b74 /officecfg
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
parent74cc209439d9f239f929fed3f5ebbab1ef81439d (diff)
merged DEV300
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu12
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Calc.xcs2
-rw-r--r--officecfg/util/makefile.mk1
3 files changed, 7 insertions, 8 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 5c72d948436f..a30d746d5043 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/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 913902731f29..aeddefb763c2 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 332ac90fe2ea..c1fa54277141 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/*