diff options
author | os <os@openoffice.org> | 2010-11-17 07:23:52 +0100 |
---|---|---|
committer | os <os@openoffice.org> | 2010-11-17 07:23:52 +0100 |
commit | c8bc80cbf7a3cba5ba686e2248052426742ec923 (patch) | |
tree | 63edc18daed506574b8bb22f9818711758e4ca53 /officecfg | |
parent | 106f2a546c9780dc2e52a94a4565c754856373e2 (diff) | |
parent | 35653fbf17e48e3bc87803388f6132f8df0dabc2 (diff) |
merged DEV300:m93
Diffstat (limited to 'officecfg')
3 files changed, 60 insertions, 25 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 2efbaaa703..a2c4898351 100755 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5197,7 +5197,12 @@ <value xml:lang="en-US">Delete All Comments by This Author</value> </prop> </node> - <node oor:name=".uno:DeleteNote" oor:op="replace"> + <node oor:name=".uno:ReplyComment" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Reply Comment</value> + </prop> + </node> + <node oor:name=".uno:DeleteComment" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Delete Comment</value> </prop> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 4fa236666b..465c6b37c0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -166,6 +166,16 @@ <value xml:lang="en-US">~Protect Records...</value> </prop> </node> + <node oor:name=".uno:RejectTracedChange" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Reject Change</value> + </prop> + </node> + <node oor:name=".uno:AcceptTracedChange" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Accept Change</value> + </prop> + </node> <node oor:name=".uno:UpdateAllLinks" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Links</value> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index fa79715054..b26eb2d26c 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -60,6 +60,11 @@ <value>Default</value> </prop> </node> + <node oor:name="WM" oor:op="replace"> + <prop oor:name="ShouldSwitchWorkspace" oor:op="replace" oor:type="xs:string"> + <value></value> + </prop> + </node> </node> <node oor:name="DefaultFonts"> <node oor:name="en" oor:op="replace"> @@ -1423,9 +1428,8 @@ </node> <node oor:name="arial" oor:op="replace"> <prop oor:name="SubstFonts"> - <value>liberationsans;albany;albanyamt;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value> + <value>liberationsans;albany;albanyamt;arimo;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value> </prop> - <prop oor:name="SubstFontsMS"><value></value></prop> <prop oor:name="SubstFontsPS"><value>Helvetica</value></prop> <prop oor:name="SubstFontsHTML"><value>sans-serif</value></prop> <prop oor:name="FontWeight"><value>Normal</value></prop> @@ -1436,24 +1440,9 @@ <prop oor:name="SubstFonts"> <value>arialnarrowmt;liberationsansnarrow;helveticanarrow;helmetcondensed;dejavusanscondensed;nimbussanslcondensed;nimbussanscondensed</value> </prop> - <prop oor:name="SubstFontsMS"> - <value></value> - </prop> - <prop oor:name="SubstFontsPS"> - <value></value> - </prop> - <prop oor:name="SubstFontsHTML"> - <value></value> - </prop> - <prop oor:name="FontWeight"> - <value>Normal</value> - </prop> - <prop oor:name="FontWidth"> - <value>Condensed</value> - </prop> - <prop oor:name="FontType"> - <value>Normal,SansSerif</value> - </prop> + <prop oor:name="FontWeight"><value>Normal</value></prop> + <prop oor:name="FontWidth"><value>Condensed</value></prop> + <prop oor:name="FontType"><value>Normal,SansSerif</value></prop> </node> <node oor:name="arialunicode" oor:op="replace"> <prop oor:name="SubstFonts"> @@ -1478,6 +1467,17 @@ <value>Normal,SansSerif,Full</value> </prop> </node> + <node oor:name="arimo" oor:op="replace"> + <prop oor:name="SubstFonts"> + <value>arial;liberationsans;albany;albanyamt;helvetica;</value> + </prop> + <prop oor:name="SubstFontsMS"><value>arial</value></prop> + <prop oor:name="SubstFontsPS"><value>helvetica</value></prop> + <prop oor:name="SubstFontsHTML"><value>sans-serif</value></prop> + <prop oor:name="FontWeight"><value>Normal</value></prop> + <prop oor:name="FontWidth"><value>Normal</value></prop> + <prop oor:name="FontType"><value>Standard,Normal,SansSerif</value></prop> + </node> <node oor:name="arioso" oor:op="replace"> <prop oor:name="SubstFonts"> <value>palacescript;palacescriptmt;arioso;shelley;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;andymt;comicsansms;andy;kidprint;</value> @@ -2394,7 +2394,7 @@ </node> <node oor:name="courier" oor:op="replace"> <prop oor:name="SubstFonts"> - <value>cumberland;cumberlandamt;liberationmono;couriernew;nimbusmonol;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> + <value>cumberland;cumberlandamt;cousine;liberationmono;couriernew;nimbusmonol;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> </prop> <prop oor:name="SubstFontsMS"><value>Courier New</value></prop> <prop oor:name="SubstFontsPS"><value></value></prop> @@ -2405,9 +2405,19 @@ </node> <node oor:name="couriernew" oor:op="replace"> <prop oor:name="SubstFonts"> - <value>cumberland;cumberlandamt;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> + <value>cumberland;cumberlandamt;cousine;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> + </prop> + <prop oor:name="SubstFontsPS"><value>Courier</value></prop> + <prop oor:name="SubstFontsHTML"><value>monospace</value></prop> + <prop oor:name="FontWeight"><value>Normal</value></prop> + <prop oor:name="FontWidth"><value>Normal</value></prop> + <prop oor:name="FontType"><value>Standard,Normal,Fixed,Typewriter</value></prop> + </node> + <node oor:name="cousine" oor:op="replace"> + <prop oor:name="SubstFonts"> + <value>couriernew;cumberland;cumberlandamt;liberationmono;courier</value> </prop> - <prop oor:name="SubstFontsMS"><value></value></prop> + <prop oor:name="SubstFontsMS"><value>Courier New</value></prop> <prop oor:name="SubstFontsPS"><value>Courier</value></prop> <prop oor:name="SubstFontsHTML"><value>monospace</value></prop> <prop oor:name="FontWeight"><value>Normal</value></prop> @@ -7287,7 +7297,6 @@ <prop oor:name="SubstFonts"> <value>thorndale;thorndaleamt;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value> </prop> - <prop oor:name="SubstFontsMS"><value></value></prop> <prop oor:name="SubstFontsPS"><value>Times</value></prop> <prop oor:name="SubstFontsHTML"><value>serif</value></prop> <prop oor:name="FontWeight"><value>Normal</value></prop> @@ -7316,6 +7325,17 @@ <prop oor:name="FontWidth"><value>Normal</value></prop> <prop oor:name="FontType"><value>Normal,Serif</value></prop> </node> + <node oor:name="timos" oor:op="replace"> + <prop oor:name="SubstFonts"> + <value>timesnewroman;thorndale;thorndaleamt;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons</value> + </prop> + <prop oor:name="SubstFontsMS"><value>Times New Roman</value></prop> + <prop oor:name="SubstFontsPS"><value>Times</value></prop> + <prop oor:name="SubstFontsHTML"><value>serif</value></prop> + <prop oor:name="FontWeight"><value>Normal</value></prop> + <prop oor:name="FontWidth"><value>Normal</value></prop> + <prop oor:name="FontType"><value>Standard,Normal,Serif</value></prop> + </node> <node oor:name="tmsrmn" oor:op="replace"> <prop oor:name="SubstFonts"> <value>thorndaleamt;thorndale;timesnewroman;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value> |