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

Andras Timar timar at kemper.freedesktop.org
Sat Apr 14 14:29:53 PDT 2012


 filter/source/config/cache/constant.hxx                                                  |    2 +-
 filter/source/config/fragments/filters/HTML_MasterDoc.xcu                                |    2 +-
 filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu                             |    2 +-
 filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu                            |    4 ++--
 filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu                          |    4 ++--
 filter/source/config/fragments/filters/Lotus_1_2_3_1_0__DOS___StarWriter_.xcu            |    2 +-
 filter/source/config/fragments/filters/Lotus_1_2_3_1_0__WIN___StarWriter_.xcu            |    2 +-
 filter/source/config/fragments/filters/MS_Excel_4_0__StarWriter_.xcu                     |    2 +-
 filter/source/config/fragments/filters/MS_Excel_5_0__StarWriter_.xcu                     |    2 +-
 filter/source/config/fragments/filters/MS_Excel_95__StarWriter_.xcu                      |    2 +-
 filter/source/config/fragments/filters/Rich_Text_Format__StarCalc_.xcu                   |    2 +-
 filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu         |    4 ++--
 filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu                    |    2 +-
 filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu         |    4 ++--
 filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu                    |    2 +-
 filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu               |    2 +-
 filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu               |    2 +-
 filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu               |    2 +-
 filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu                      |    4 ++--
 filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu |    4 ++--
 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu            |    4 ++--
 filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu                         |    4 ++--
 filter/source/config/fragments/filters/draw_html_Export_ui.xcu                           |    4 ++--
 filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu                |    4 ++--
 filter/source/config/fragments/filters/impress_html_Export_ui.xcu                        |    4 ++--
 filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu           |    4 ++--
 filter/source/config/fragments/filters/writerweb8_writer_ui.xcu                          |    2 +-
 filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu            |    2 +-
 filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu            |    2 +-
 filter/source/config/fragments/types/writer_StarWriter_30.xcu                            |    2 +-
 filter/source/config/fragments/types/writer_StarWriter_40.xcu                            |    2 +-
 filter/source/config/fragments/types/writer_StarWriter_50.xcu                            |    2 +-
 officecfg/registry/data/org/openoffice/Office/Embedding.xcu                              |    4 ----
 33 files changed, 44 insertions(+), 48 deletions(-)

New commits:
commit 2765b0ed7e116f5b1695f86e8401fbb2f1dd4a2e
Author: Andras Timar <atimar at suse.com>
Date:   Sat Apr 14 23:29:08 2012 +0200

    fdo#45159 fix filter names, remove bogus %productname% where it was necessary

diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index 32b9113..7632068 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -199,7 +199,7 @@ extern rtl::OUString pFilterStrings[];
 /** @short  some default values.
  */
 #define  DEFAULT_OFFICELOCALE       _FILTER_CONFIG_FROM_ASCII_("en-US")
-#define  DEFAULT_FORMATNAME         _FILTER_CONFIG_FROM_ASCII_("OpenOffice")
+#define  DEFAULT_FORMATNAME         _FILTER_CONFIG_FROM_ASCII_("LibreOffice")
 #define  DEFAULT_FORMATVERSION      _FILTER_CONFIG_FROM_ASCII_("1.0")
 
 /** @short  used for the queries of the FilterFactory service.
diff --git a/filter/source/config/fragments/filters/HTML_MasterDoc.xcu b/filter/source/config/fragments/filters/HTML_MasterDoc.xcu
index ff18e7c..edcec04 100644
--- a/filter/source/config/fragments/filters/HTML_MasterDoc.xcu
+++ b/filter/source/config/fragments/filters/HTML_MasterDoc.xcu
@@ -7,7 +7,7 @@
         <prop oor:name="FilterService"/>
         <prop oor:name="TemplateName"/>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">HTML Document (%productname% Master Document)</value>
+            <value xml:lang="x-default">HTML Document (Master Document)</value>
         </prop>
         <prop oor:name="Flags"><value>EXPORT INTERNAL NOTINFILEDIALOG NOTINCHOOSER</value></prop>
     </node>
diff --git a/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu b/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu
index ce18cbf..946e7ef 100644
--- a/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu
+++ b/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu
@@ -1,5 +1,5 @@
     <node oor:name="HTML_MasterDoc">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (%productname% Master Document)</value>
+            <value xml:lang="en-US">HTML Document (Master Document)</value>
                     </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu b/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
index ec66d29..f25eee2 100644
--- a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
+++ b/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="HTML (StarCalc)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (%productname% Calc)</value>
-                        <value xml:lang="x-translate">HTML Document (%productname% Calc)</value>
+            <value xml:lang="en-US">HTML Document (Calc)</value>
+            <value xml:lang="x-translate">HTML Document (Calc)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu b/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
index 954ad61..7cddf42 100644
--- a/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
+++ b/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="HTML (StarWriter)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (%productname% Writer)</value>
-                        <value xml:lang="x-translate">HTML Document (%productname% Writer)</value>
+            <value xml:lang="en-US">HTML Document (Writer)</value>
+            <value xml:lang="x-translate">HTML Document (Writer)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Lotus_1_2_3_1_0__DOS___StarWriter_.xcu b/filter/source/config/fragments/filters/Lotus_1_2_3_1_0__DOS___StarWriter_.xcu
index e8c57c2..b300425 100644
--- a/filter/source/config/fragments/filters/Lotus_1_2_3_1_0__DOS___StarWriter_.xcu
+++ b/filter/source/config/fragments/filters/Lotus_1_2_3_1_0__DOS___StarWriter_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value>LOTUSD</value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">Lotus 1-2-3 1.0 DOS (%productname% Writer)</value>
+            <value xml:lang="x-default">Lotus 1-2-3 1.0 DOS (Writer)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>writer_Lotus_1_2_3_10_DOS_StarWriter</value></prop>
diff --git a/filter/source/config/fragments/filters/Lotus_1_2_3_1_0__WIN___StarWriter_.xcu b/filter/source/config/fragments/filters/Lotus_1_2_3_1_0__WIN___StarWriter_.xcu
index 2e1a47f..1bd78f7 100644
--- a/filter/source/config/fragments/filters/Lotus_1_2_3_1_0__WIN___StarWriter_.xcu
+++ b/filter/source/config/fragments/filters/Lotus_1_2_3_1_0__WIN___StarWriter_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value>LOTUSW</value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">Lotus 1-2-3 1.0 WIN (%productname% Writer)</value>
+            <value xml:lang="x-default">Lotus 1-2-3 1.0 WIN (Writer)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>writer_Lotus_1_2_3_10_WIN_StarWriter</value></prop>
diff --git a/filter/source/config/fragments/filters/MS_Excel_4_0__StarWriter_.xcu b/filter/source/config/fragments/filters/MS_Excel_4_0__StarWriter_.xcu
index 611e4a3..47ad47c 100644
--- a/filter/source/config/fragments/filters/MS_Excel_4_0__StarWriter_.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_4_0__StarWriter_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value>EXCEL</value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">Microsoft Excel 4.0 (%productname% Writer)</value>
+            <value xml:lang="x-default">Microsoft Excel 4.0 (Writer)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>calc_MS_Excel_40</value></prop>
diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0__StarWriter_.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0__StarWriter_.xcu
index e1fe503..2138aa9 100644
--- a/filter/source/config/fragments/filters/MS_Excel_5_0__StarWriter_.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_5_0__StarWriter_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value>CEXCEL</value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">Microsoft Excel 5.0 (%productname% Writer)</value>
+            <value xml:lang="x-default">Microsoft Excel 5.0 (Writer)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>calc_MS_Excel_5095</value></prop>
diff --git a/filter/source/config/fragments/filters/MS_Excel_95__StarWriter_.xcu b/filter/source/config/fragments/filters/MS_Excel_95__StarWriter_.xcu
index 35c56cc..766d8b7 100644
--- a/filter/source/config/fragments/filters/MS_Excel_95__StarWriter_.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_95__StarWriter_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value>CEXCEL</value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">Microsoft Excel 95 (%productname% Writer)</value>
+            <value xml:lang="x-default">Microsoft Excel 95 (Writer)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>calc_MS_Excel_95</value></prop>
diff --git a/filter/source/config/fragments/filters/Rich_Text_Format__StarCalc_.xcu b/filter/source/config/fragments/filters/Rich_Text_Format__StarCalc_.xcu
index 48af73d..ae904dc 100644
--- a/filter/source/config/fragments/filters/Rich_Text_Format__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/Rich_Text_Format__StarCalc_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"/>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">Rich Text Format (%productname% Calc)</value>
+            <value xml:lang="x-default">Rich Text Format (Calc)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>writer_Rich_Text_Format</value></prop>
diff --git a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu
index 542736c..0308f2a 100644
--- a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu
+++ b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="StarDraw 3.0 Vorlage (StarImpress)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">StarDraw 3.0 Template (%productname% Impress)</value>
-                        <value xml:lang="x-translate">StarDraw 3.0 Template (%productname% Impress)</value>
+            <value xml:lang="en-US">StarDraw 3.0 Template (Impress)</value>
+            <value xml:lang="x-translate">StarDraw 3.0 Template (Impress)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu
index 1dcce8b..e3bd1bd 100644
--- a/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu
+++ b/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">StarDraw 3.0 (%productname% Impress)</value>
+            <value xml:lang="x-default">StarDraw 3.0 (Impress)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>3450</value></prop>
         <prop oor:name="Type"><value>draw_StarDraw_30</value></prop>
diff --git a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu
index 2ecf87a..64a9216 100644
--- a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu
+++ b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="StarDraw 5.0 Vorlage (StarImpress)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">StarDraw 5.0 Template (%productname% Impress)</value>
-                        <value xml:lang="x-translate">StarDraw 5.0 Template (%productname% Impress)</value>
+            <value xml:lang="en-US">StarDraw 5.0 Template (Impress)</value>
+            <value xml:lang="x-translate">StarDraw 5.0 Template (Impress)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu
index 67d03c7..98961bb 100644
--- a/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu
+++ b/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">StarDraw 5.0 (%productname% Impress)</value>
+            <value xml:lang="x-default">StarDraw 5.0 (Impress)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>5050</value></prop>
         <prop oor:name="Type"><value>draw_StarDraw_50</value></prop>
diff --git a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu
index fd33dc7..7ffdf40 100644
--- a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value>CSW3</value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">StarWriter 3.0 (%productname% Writer/Web)</value>
+            <value xml:lang="x-default">StarWriter 3.0 (Writer/Web)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>3450</value></prop>
         <prop oor:name="Type"><value>writer_StarWriter_30</value></prop>
diff --git a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu
index 1a44d99..7cec0aa 100644
--- a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value>CSW4</value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">StarWriter 4.0 (%productname% Writer/Web)</value>
+            <value xml:lang="x-default">StarWriter 4.0 (Writer/Web)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>3580</value></prop>
         <prop oor:name="Type"><value>writer_StarWriter_40</value></prop>
diff --git a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu
index 076f959..dedbefd 100644
--- a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.office.BF_MigrateFilter</value></prop>
         <prop oor:name="UserData"><value>CSW5</value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">StarWriter 5.0 (%productname% Writer/Web)</value>
+            <value xml:lang="x-default">StarWriter 5.0 (Writer/Web)</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>5050</value></prop>
         <prop oor:name="Type"><value>writer_StarWriter_50</value></prop>
diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
index 98175c3..427f1d9 100644
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
+++ b/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="Text (StarWriter/Web)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">Text (%productname% Writer/Web)</value>
-                        <value xml:lang="x-translate">Text (%productname% Writer/Web)</value>
+            <value xml:lang="en-US">Text (Writer/Web)</value>
+            <value xml:lang="x-translate">Text (Writer/Web)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
index 9d2bd9d..3480d3a 100644
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="Text (encoded) (StarWriter/GlobalDocument)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">Text Encoded (%productname% Master Document)</value>
-                        <value xml:lang="x-translate">Text Encoded (%productname% Master Document)</value>
+            <value xml:lang="en-US">Text Encoded (Master Document)</value>
+            <value xml:lang="x-translate">Text Encoded (Master Document)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
index 83e261a..32f8e86 100644
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="Text (encoded) (StarWriter/Web)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">Text Encoded (%productname% Writer/Web)</value>
-                        <value xml:lang="x-translate">Text Encoded (%productname% Writer/Web)</value>
+            <value xml:lang="en-US">Text Encoded (Writer/Web)</value>
+            <value xml:lang="x-translate">Text Encoded (Writer/Web)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu b/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu
index 828a356..62415c2 100644
--- a/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu
+++ b/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="calc_HTML_WebQuery">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">Web Page Query (%productname% Calc)</value>
-                        <value xml:lang="x-translate">Web Page Query (%productname% Calc)</value>
+            <value xml:lang="en-US">Web Page Query (Calc)</value>
+            <value xml:lang="x-translate">Web Page Query (Calc)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/draw_html_Export_ui.xcu b/filter/source/config/fragments/filters/draw_html_Export_ui.xcu
index 8c35eb9..a1ab775 100644
--- a/filter/source/config/fragments/filters/draw_html_Export_ui.xcu
+++ b/filter/source/config/fragments/filters/draw_html_Export_ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="draw_html_Export">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (%productname% Draw)</value>
-                        <value xml:lang="x-translate">HTML Document (%productname% Draw)</value>
+            <value xml:lang="en-US">HTML Document (Draw)</value>
+            <value xml:lang="x-translate">HTML Document (Draw)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
index a0df30b..5e96d80 100644
--- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
+++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="impress_StarOffice_XML_Draw">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Drawing (%productname% Impress)</value>
-                        <value xml:lang="x-translate">%productname% %formatversion% Drawing (%productname% Impress)</value>
+            <value xml:lang="en-US">%productname% %formatversion% Drawing (Impress)</value>
+            <value xml:lang="x-translate">%productname% %formatversion% Drawing (Impress)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress_html_Export_ui.xcu b/filter/source/config/fragments/filters/impress_html_Export_ui.xcu
index d7392eb..653d0e8 100644
--- a/filter/source/config/fragments/filters/impress_html_Export_ui.xcu
+++ b/filter/source/config/fragments/filters/impress_html_Export_ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="impress_html_Export">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (%productname% Impress)</value>
-                        <value xml:lang="x-translate">HTML Document (%productname% Impress)</value>
+            <value xml:lang="en-US">HTML Document (Impress)</value>
+            <value xml:lang="x-translate">HTML Document (Impress)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
index e7e6524..e286de5 100644
--- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
@@ -1,6 +1,6 @@
     <node oor:name="writer_web_StarOffice_XML_Writer">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Text Document (%productname% Writer/Web)</value>
-                        <value xml:lang="x-translate">%productname% %formatversion% Text Document (%productname% Writer/Web)</value>
+            <value xml:lang="en-US">%productname% %formatversion% Text Document (Writer/Web)</value>
+            <value xml:lang="x-translate">%productname% %formatversion% Text Document (Writer/Web)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu b/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
index 8b823ce..44dec6c 100644
--- a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
+++ b/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
@@ -1,5 +1,5 @@
     <node oor:name="writerweb8_writer">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% Text (%productname% Writer/Web)</value>
+            <value xml:lang="en-US">%productname% Text (Writer/Web)</value>
                     </prop>
     </node>
diff --git a/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu b/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu
index 0fa4e36..31fd169 100644
--- a/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu
+++ b/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu
@@ -6,7 +6,7 @@
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (DOS) (StarWriter)</value></prop>
         <prop oor:name="UIName">
-            <value>Lotus 1-2-3 1.0 (DOS) (%productname% %formatversion% Writer)</value>
+            <value>Lotus 1-2-3 1.0 (DOS) (Writer)</value>
         </prop>
         <prop oor:name="ClipboardFormat"/>
     </node>
diff --git a/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu b/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu
index 285202b..652a700 100644
--- a/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu
+++ b/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu
@@ -6,7 +6,7 @@
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (WIN) (StarWriter)</value></prop>
         <prop oor:name="UIName">
-            <value>Lotus 1-2-3 1.0 (WIN) (%productname% %formatversion% Writer)</value>
+            <value>Lotus 1-2-3 1.0 (WIN) (Writer)</value>
         </prop>
         <prop oor:name="ClipboardFormat"/>
     </node>
diff --git a/filter/source/config/fragments/types/writer_StarWriter_30.xcu b/filter/source/config/fragments/types/writer_StarWriter_30.xcu
index 5b8297f..60aa093 100644
--- a/filter/source/config/fragments/types/writer_StarWriter_30.xcu
+++ b/filter/source/config/fragments/types/writer_StarWriter_30.xcu
@@ -6,7 +6,7 @@
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>StarWriter 3.0</value></prop>
         <prop oor:name="UIName">
-            <value>StarWriter 3.0 (%productname% %formatversion% Globaldokument)</value>
+            <value>StarWriter 3.0 (Master Document)</value>
         </prop>
         <prop oor:name="ClipboardFormat"><value>StarWriter 3.0</value></prop>
     </node>
diff --git a/filter/source/config/fragments/types/writer_StarWriter_40.xcu b/filter/source/config/fragments/types/writer_StarWriter_40.xcu
index cb4148d..9f535e0 100644
--- a/filter/source/config/fragments/types/writer_StarWriter_40.xcu
+++ b/filter/source/config/fragments/types/writer_StarWriter_40.xcu
@@ -6,7 +6,7 @@
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>StarWriter 4.0</value></prop>
         <prop oor:name="UIName">
-            <value>StarWriter 4.0 (%productname% %formatversion% Globaldokument)</value>
+            <value>StarWriter 4.0 (Master Document)</value>
         </prop>
         <prop oor:name="ClipboardFormat"><value>StarWriter 4.0</value></prop>
     </node>
diff --git a/filter/source/config/fragments/types/writer_StarWriter_50.xcu b/filter/source/config/fragments/types/writer_StarWriter_50.xcu
index d8aeeb6..1cc367a 100644
--- a/filter/source/config/fragments/types/writer_StarWriter_50.xcu
+++ b/filter/source/config/fragments/types/writer_StarWriter_50.xcu
@@ -6,7 +6,7 @@
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>StarWriter 5.0</value></prop>
         <prop oor:name="UIName">
-            <value>StarWriter 5.0 (%productname% %formatversion% Globaldokument)</value>
+            <value>StarWriter 5.0 (Master Document)</value>
         </prop>
         <prop oor:name="ClipboardFormat"><value>StarWriter 5.0</value></prop>
     </node>
commit 397e0729e81f2601e76c3e9ede5e14d09c763c7d
Author: Andras Timar <atimar at suse.com>
Date:   Sat Apr 14 23:06:09 2012 +0200

    iremove useless x-comment lines

diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index a73a53e..7c6733d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
@@ -47,7 +47,6 @@
       <prop oor:name="VerbUIName">
 
         <value xml:lang="en-US">~Edit</value>
-        <value xml:lang="x-comment">This strings are copied from resource files in sfx2 project. The translation could be copied as well if it is possible.</value>
       </prop>
       <prop oor:name="VerbID">
         <value>-1</value>
@@ -63,7 +62,6 @@
       <prop oor:name="VerbUIName">
 
         <value xml:lang="en-US">~Open</value>
-        <value xml:lang="x-comment">This strings are copied from resource files in sfx2 project. The translation could be copied as well if it is possible.</value>
       </prop>
       <prop oor:name="VerbID">
         <value>-2</value>
@@ -124,7 +122,6 @@
       <prop oor:name="VerbUIName">
 
         <value xml:lang="en-US">Propert~ies...</value>
-        <value xml:lang="x-comment">This strings are copied from resource files in sfx2 project. The translation could be copied as well if it is possible.</value>
       </prop>
       <prop oor:name="VerbID">
         <value>-7</value>
@@ -140,7 +137,6 @@
       <prop oor:name="VerbUIName">
 
         <value xml:lang="en-US">Save Copy ~as...</value>
-        <value xml:lang="x-comment">This strings are copied from resource files in sfx2 project. The translation could be copied as well if it is possible.</value>
       </prop>
       <prop oor:name="VerbID">
         <value>-8</value>


More information about the Libreoffice-commits mailing list