diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-09 17:38:01 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-09 17:38:01 +0100 |
| commit | 45bb18f3f90eb96a2a6a41c028188d5787e8952b (patch) | |
| tree | e996f4556aaa8408a3103389644ab77189b8fb00 /officecfg | |
| parent | a1a2a5a68046e75aba3dfd6ba06083a314f12182 (diff) | |
| parent | 4fba42e5f98fcc0fa9addf41a793c1d7f11602c8 (diff) | |
mav60: merge to m101
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/prj/build.lst | 2 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 12 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 2 | ||||
| -rw-r--r-- | officecfg/util/makefile.mk | 1 |
4 files changed, 8 insertions, 9 deletions
diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst index 04d2cfd87aef..b07a34aee982 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/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/* |