[ooo-build-commit] .: patches/dev300
Chris Cheney
ccheney at kemper.freedesktop.org
Tue Apr 6 15:52:24 PDT 2010
patches/dev300/apply | 3
patches/dev300/ubuntu-lpi-bugs.diff | 470 +++++++++++++++++++++
patches/dev300/ubuntu-lpi-help-translate.diff | 518 +++++++++++++++++++++++
patches/dev300/ubuntu-lpi.diff | 574 --------------------------
4 files changed, 990 insertions(+), 575 deletions(-)
New commits:
commit f33eb966d586e98bc2d16e1dc6de93bba8050e16
Author: Chris Cheney <ccheney at ubuntu.com>
Date: Tue Apr 6 17:49:06 2010 -0500
Split Ubuntu LPI patch and temporarily disable the bug reporting part
* patches/dev300/apply:
* patches/dev300/ubuntu-lpi-bugs.diff:
* patches/dev300/ubuntu-lpi-help-translate.diff: Split the Ubuntu LPI patch
and temporarily disable the bug reporting as per the lucid bug handling
blueprint.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3cf932e..21e12df 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2435,7 +2435,8 @@ SectionOwner => ccheney
ubuntu-palette.diff
ubuntu-dictionary.diff
-ubuntu-lpi.diff, i#64895, mklose
+ubuntu-lpi-help-translate.diff, i#64895, mklose
+#ubuntu-lpi-bugs.diff, i#64895, mklose
ubuntu-sparc-hack.diff, mklose
human-icons-add.diff, mklose
static-libs-use-_pic.diff, rengelha
diff --git a/patches/dev300/ubuntu-lpi-bugs.diff b/patches/dev300/ubuntu-lpi-bugs.diff
new file mode 100644
index 0000000..9045de2
--- /dev/null
+++ b/patches/dev300/ubuntu-lpi-bugs.diff
@@ -0,0 +1,470 @@
+=== modified file 'basctl/uiconfig/basicide/menubar/menubar.xml'
+--- basctl/uiconfig/basicide/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ basctl/uiconfig/basicide/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -83,6 +83,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'chart2/uiconfig/menubar/menubar.xml'
+--- chart2/uiconfig/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ chart2/uiconfig/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -149,6 +149,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbapp/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbapp/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ dbaccess/uiconfig/dbapp/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -135,6 +135,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbquery/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbquery/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ dbaccess/uiconfig/dbquery/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -76,6 +76,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbrelation/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -59,6 +59,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbtable/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbtable/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ dbaccess/uiconfig/dbtable/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -60,6 +60,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbtdata/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -68,6 +68,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml'
+--- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -86,6 +86,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'framework/uiconfig/startmodule/menubar/menubar.xml'
+--- framework/uiconfig/startmodule/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ framework/uiconfig/startmodule/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -76,6 +76,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'helpcontent2/helpers/help_hid.lst'
+--- helpcontent2/helpers/help_hid.lst 2010-04-06 22:13:54 +0000
++++ helpcontent2/helpers/help_hid.lst 2010-04-06 22:14:24 +0000
+@@ -5385,6 +5385,7 @@
+ SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
+ SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
+ SID_HELP_PI,5962,.uno:HelperDialog
++SID_HELP_REPORTPROBLEM,6712,.uno:HelpReportProblem
+ SID_HELP_SEARCH,5412,.uno:HelpSearch
+ SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
+ SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
+
+=== modified file 'helpcontent2/helpers/longnames_commands.csv'
+--- helpcontent2/helpers/longnames_commands.csv 2010-04-06 22:13:54 +0000
++++ helpcontent2/helpers/longnames_commands.csv 2010-04-06 22:14:24 +0000
+@@ -1244,6 +1244,7 @@
+ SID_HELP_DOWNLOAD,.uno:HelpDownload
+ SID_HELP_HELPFILEBOX,.uno:HelpChooseFile
+ SID_HELP_PI,.uno:HelperDialog
++SID_HELP_REPORTPROBLEM,.uno:HelpReportProblem
+ SID_HELP_SEARCH,.uno:HelpSearch
+ SID_HELP_SUPPORTPAGE,.uno:HelpSupport
+ SID_HELP_TRANSLATEPAGE,.uno:HelpTranslate
+
+=== modified file 'helpcontent2/helpers/uno-commands.csv'
+--- helpcontent2/helpers/uno-commands.csv 2010-04-06 22:13:54 +0000
++++ helpcontent2/helpers/uno-commands.csv 2010-04-06 22:14:24 +0000
+@@ -866,6 +866,7 @@
+ .uno:HelpIndex
+ .uno:HelpMenu
+ .uno:HelpOnHelp
++.uno:HelpReportProblem
+ .uno:HelpSupport
+ .uno:HelpTip
+ .uno:HelpTranslate
+
+=== modified file 'helpcontent2/helpers/uno_hid.lst'
+--- helpcontent2/helpers/uno_hid.lst 2010-04-06 22:13:54 +0000
++++ helpcontent2/helpers/uno_hid.lst 2010-04-06 22:14:24 +0000
+@@ -1242,6 +1242,7 @@
+ SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
+ SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
+ SID_HELP_PI,5962,.uno:HelperDialog
++SID_HELP_REPORTPROBLEM,6712,.uno:HelpReportProblem
+ SID_HELP_SEARCH,5412,.uno:HelpSearch
+ SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
+ SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
+
+=== modified file 'helpcontent2/helpers/unocmds.txt'
+--- helpcontent2/helpers/unocmds.txt 2010-04-06 22:13:54 +0000
++++ helpcontent2/helpers/unocmds.txt 2010-04-06 22:14:24 +0000
+@@ -490,6 +490,7 @@
+ .uno:HelpIndex;shared/main0108.xhp
+ .uno:HelpMenu;shared/main0108.xhp
+ .uno:HelpOnHelp;shared/05/00000110.xhp
++.uno:HelpReportProblem;shared/main0108.xhp
+ .uno:HelpSupport;shared/main0108.xhp
+ .uno:HelpTip;shared/00/00000099.xhp
+ .uno:HelpTranslate;shared/main0108.xhp
+
+=== modified file 'officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu'
+--- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2010-04-06 22:13:54 +0000
++++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2010-04-06 22:14:24 +0000
+@@ -4100,6 +4100,12 @@
+ <value xml:lang="en-US">T~ranslate This Application...</value>
+ </prop>
+ </node>
++ <node oor:name=".uno:HelpReportProblem" oor:op="replace">
++ <prop oor:name="Label" oor:type="xs:string">
++ <value xml:lang="de">Einen ~Fehler melden...</value>
++ <value xml:lang="en-US">R~eport a Problem...</value>
++ </prop>
++ </node>
+ <node oor:name=".uno:StatusBarVisible" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Status ~Bar</value>
+
+=== modified file 'reportdesign/uiconfig/dbreport/menubar/menubar.xml'
+--- reportdesign/uiconfig/dbreport/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -415,6 +415,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sc/uiconfig/scalc/menubar/menubar.xml'
+--- sc/uiconfig/scalc/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ sc/uiconfig/scalc/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -444,6 +444,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'scripting/workben/bindings/calcmenubar.xml'
+--- scripting/workben/bindings/calcmenubar.xml 2010-04-06 22:13:54 +0000
++++ scripting/workben/bindings/calcmenubar.xml 2010-04-06 22:14:24 +0000
+@@ -312,6 +312,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
++ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
+
+=== modified file 'scripting/workben/bindings/drawmenubar.xml'
+--- scripting/workben/bindings/drawmenubar.xml 2010-04-06 22:13:54 +0000
++++ scripting/workben/bindings/drawmenubar.xml 2010-04-06 22:14:24 +0000
+@@ -347,6 +347,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
++ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
+
+=== modified file 'scripting/workben/bindings/impressmenubar.xml'
+--- scripting/workben/bindings/impressmenubar.xml 2010-04-06 22:13:54 +0000
++++ scripting/workben/bindings/impressmenubar.xml 2010-04-06 22:14:24 +0000
+@@ -321,6 +321,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
++ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
+
+=== modified file 'scripting/workben/bindings/writermenubar.xml'
+--- scripting/workben/bindings/writermenubar.xml 2010-04-06 22:13:54 +0000
++++ scripting/workben/bindings/writermenubar.xml 2010-04-06 22:14:24 +0000
+@@ -274,6 +274,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
++ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
+
+=== modified file 'sd/uiconfig/sdraw/menubar/menubar.xml'
+--- sd/uiconfig/sdraw/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ sd/uiconfig/sdraw/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -323,6 +323,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sd/uiconfig/simpress/menubar/menubar.xml'
+--- sd/uiconfig/simpress/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ sd/uiconfig/simpress/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -298,6 +298,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sfx2/inc/sfx2/sfxsids.hrc'
+--- sfx2/inc/sfx2/sfxsids.hrc 2010-04-06 22:13:54 +0000
++++ sfx2/inc/sfx2/sfxsids.hrc 2010-04-06 22:14:24 +0000
+@@ -248,6 +248,7 @@
+ #define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420)
+ #define SID_HELP_SUPPORTPAGE (SID_SFX_START + 1683)
+ #define SID_HELP_TRANSLATEPAGE (SID_SFX_START + 1712)
++#define SID_HELP_REPORTPROBLEM (SID_SFX_START + 1713)
+ #define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
+
+ // default-ids for document
+
+=== modified file 'sfx2/sdi/appslots.sdi'
+--- sfx2/sdi/appslots.sdi 2010-04-06 22:13:54 +0000
++++ sfx2/sdi/appslots.sdi 2010-04-06 22:14:24 +0000
+@@ -178,6 +178,10 @@
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
++ SID_HELP_REPORTPROBLEM
++ [
++ ExecMethod = MiscExec_Impl ;
++ ]
+ SID_RECENTFILELIST
+ [
+ ]
+
+=== modified file 'sfx2/sdi/sfx.sdi'
+--- sfx2/sdi/sfx.sdi 2010-04-06 22:13:54 +0000
++++ sfx2/sdi/sfx.sdi 2010-04-06 22:14:24 +0000
+@@ -7994,6 +7994,31 @@
+ ]
+
+ //--------------------------------------------------------------------------
++SfxVoidItem HelpReportProblem SID_HELP_REPORTPROBLEM
++()
++[
++ /* flags: */
++ AutoUpdate = FALSE,
++ Cachable = Cachable,
++ FastCall = FALSE,
++ HasCoreId = FALSE,
++ HasDialog = FALSE,
++ ReadOnlyDoc = TRUE,
++ Toggle = FALSE,
++ Container = FALSE,
++ RecordAbsolute = FALSE,
++ RecordPerSet;
++ Synchron;
++
++ /* config: */
++ AccelConfig = TRUE,
++ MenuConfig = TRUE,
++ StatusBarConfig = FALSE,
++ ToolBoxConfig = TRUE,
++ GroupId = GID_APPLICATION;
++]
++
++//--------------------------------------------------------------------------
+ SfxVoidItem HelpTutorials SID_HELP_TUTORIALS
+ ()
+ [
+
+=== modified file 'sfx2/source/appl/appserv.cxx'
+--- sfx2/source/appl/appserv.cxx 2010-04-06 22:13:54 +0000
++++ sfx2/source/appl/appserv.cxx 2010-04-06 22:14:24 +0000
+@@ -373,6 +373,19 @@
+ }
+ break;
+ }
++ case SID_HELP_REPORTPROBLEM:
++ {
++ try {
++ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
++ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
++ if ( xSystemShell.is())
++ xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -b")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
++
++ break;
++ } catch (const ::com::sun::star::uno::Exception &) {
++ }
++ break;
++ }
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ case SID_HELPINDEX:
+ {
+
+=== modified file 'starmath/uiconfig/smath/menubar/menubar.xml'
+--- starmath/uiconfig/smath/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ starmath/uiconfig/smath/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -112,6 +112,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'svx/inc/globlmn_tmpl.hrc'
+--- svx/inc/globlmn_tmpl.hrc 2010-04-06 22:13:54 +0000
++++ svx/inc/globlmn_tmpl.hrc 2010-04-06 22:14:24 +0000
+@@ -1072,6 +1072,13 @@
+ Text [ de ] = "Diese Anwendung ~übersetzen..." ; \
+ Text [ en-US ] = "T~ranslate This Application..." ; \
+
++#define ITEM_HELP_REPORTPROBLEM \
++ Identifier = SID_HELP_REPORTPROBLEM ; \
++ Command = ".uno:HelpReportProblem" ; \
++ HelpID = SID_HELP_REPORTPROBLEM ; \
++ Text [ de ] = "Einen ~Fehler melden..." ; \
++ Text [ en-US ] = "R~eport a Problem..." ; \
++
+ #define ITEM_HELP_ONLINE_REGISTRATION \
+ Identifier = SID_ONLINE_REGISTRATION ; \
+ Command = ".uno:OnlineRegistrationDlg" ; \
+
+=== modified file 'sw/uiconfig/sglobal/menubar/menubar.xml'
+--- sw/uiconfig/sglobal/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ sw/uiconfig/sglobal/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -450,6 +450,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/sweb/menubar/menubar.xml'
+--- sw/uiconfig/sweb/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ sw/uiconfig/sweb/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -379,6 +379,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/swform/menubar/menubar.xml'
+--- sw/uiconfig/swform/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ sw/uiconfig/swform/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -445,6 +445,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/swreport/menubar/menubar.xml'
+--- sw/uiconfig/swreport/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ sw/uiconfig/swreport/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -445,6 +445,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/swriter/menubar/menubar.xml'
+--- sw/uiconfig/swriter/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ sw/uiconfig/swriter/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -453,6 +453,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/swxform/menubar/menubar.xml'
+--- sw/uiconfig/swxform/menubar/menubar.xml 2010-04-06 22:13:54 +0000
++++ sw/uiconfig/swxform/menubar/menubar.xml 2010-04-06 22:14:24 +0000
+@@ -446,6 +446,7 @@
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
diff --git a/patches/dev300/ubuntu-lpi-help-translate.diff b/patches/dev300/ubuntu-lpi-help-translate.diff
new file mode 100644
index 0000000..40d7aeb
--- /dev/null
+++ b/patches/dev300/ubuntu-lpi-help-translate.diff
@@ -0,0 +1,518 @@
+=== modified file 'basctl/uiconfig/basicide/menubar/menubar.xml'
+--- basctl/uiconfig/basicide/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ basctl/uiconfig/basicide/menubar/menubar.xml 2010-04-06 21:59:44 +0000
+@@ -82,6 +82,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'chart2/uiconfig/menubar/menubar.xml'
+--- chart2/uiconfig/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ chart2/uiconfig/menubar/menubar.xml 2010-04-06 21:59:59 +0000
+@@ -148,6 +148,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbapp/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbapp/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ dbaccess/uiconfig/dbapp/menubar/menubar.xml 2010-04-06 22:00:03 +0000
+@@ -134,6 +134,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbquery/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbquery/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ dbaccess/uiconfig/dbquery/menubar/menubar.xml 2010-04-06 22:00:05 +0000
+@@ -75,6 +75,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbrelation/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2010-04-06 22:00:10 +0000
+@@ -58,6 +58,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbtable/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbtable/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ dbaccess/uiconfig/dbtable/menubar/menubar.xml 2010-04-06 22:00:15 +0000
+@@ -59,6 +59,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'dbaccess/uiconfig/dbtdata/menubar/menubar.xml'
+--- dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2010-04-06 22:00:18 +0000
+@@ -67,7 +67,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml'
+--- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2010-04-06 22:00:21 +0000
+@@ -85,7 +85,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'framework/uiconfig/startmodule/menubar/menubar.xml'
+--- framework/uiconfig/startmodule/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ framework/uiconfig/startmodule/menubar/menubar.xml 2010-04-06 22:00:23 +0000
+@@ -75,6 +75,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'helpcontent2/helpers/help_hid.lst'
+--- helpcontent2/helpers/help_hid.lst 2010-04-06 21:10:42 +0000
++++ helpcontent2/helpers/help_hid.lst 2010-04-06 22:00:30 +0000
+@@ -5387,6 +5387,7 @@
+ SID_HELP_PI,5962,.uno:HelperDialog
+ SID_HELP_SEARCH,5412,.uno:HelpSearch
+ SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
++SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
+ SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
+ SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
+ SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
+
+=== modified file 'helpcontent2/helpers/longnames_commands.csv'
+--- helpcontent2/helpers/longnames_commands.csv 2010-04-06 21:10:42 +0000
++++ helpcontent2/helpers/longnames_commands.csv 2010-04-06 22:00:33 +0000
+@@ -1246,6 +1246,7 @@
+ SID_HELP_PI,.uno:HelperDialog
+ SID_HELP_SEARCH,.uno:HelpSearch
+ SID_HELP_SUPPORTPAGE,.uno:HelpSupport
++SID_HELP_TRANSLATEPAGE,.uno:HelpTranslate
+ SID_HELP_TUTORIALS,.uno:HelpTutorials
+ SID_HELP_ZOOMIN,.uno:HelpZoomIn
+ SID_HELP_ZOOMOUT,.uno:HelpZoomOut
+
+=== modified file 'helpcontent2/helpers/uno-commands.csv'
+--- helpcontent2/helpers/uno-commands.csv 2010-04-06 21:10:42 +0000
++++ helpcontent2/helpers/uno-commands.csv 2010-04-06 22:00:35 +0000
+@@ -868,6 +868,7 @@
+ .uno:HelpOnHelp
+ .uno:HelpSupport
+ .uno:HelpTip
++.uno:HelpTranslate
+ .uno:HelperDialog
+ .uno:HelplinesFront
+ .uno:HelplinesMove
+
+=== modified file 'helpcontent2/helpers/uno_hid.lst'
+--- helpcontent2/helpers/uno_hid.lst 2010-04-06 21:10:42 +0000
++++ helpcontent2/helpers/uno_hid.lst 2010-04-06 22:00:40 +0000
+@@ -1244,6 +1244,7 @@
+ SID_HELP_PI,5962,.uno:HelperDialog
+ SID_HELP_SEARCH,5412,.uno:HelpSearch
+ SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
++SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
+ SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
+ SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
+ SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
+
+=== modified file 'helpcontent2/helpers/unocmds.txt'
+--- helpcontent2/helpers/unocmds.txt 2010-04-06 21:10:42 +0000
++++ helpcontent2/helpers/unocmds.txt 2010-04-06 22:00:43 +0000
+@@ -492,6 +492,7 @@
+ .uno:HelpOnHelp;shared/05/00000110.xhp
+ .uno:HelpSupport;shared/main0108.xhp
+ .uno:HelpTip;shared/00/00000099.xhp
++.uno:HelpTranslate;shared/main0108.xhp
+ .uno:HelperDialog;shared/00/00000099.xhp
+ .uno:HelplinesFront;shared/optionen/01050100.xhp
+ .uno:HelplinesMove;shared/02/01171400.xhp
+
+=== modified file 'officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu'
+--- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2010-04-06 21:10:42 +0000
++++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2010-04-06 22:00:54 +0000
+@@ -4090,7 +4090,14 @@
+ </node>
+ <node oor:name=".uno:HelpSupport" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+- <value xml:lang="en-US">~Support</value>
++ <value xml:lang="de">~Online-Hilfe...</value>
++ <value xml:lang="en-US">~Get Help Online...</value>
++ </prop>
++ </node>
++ <node oor:name=".uno:HelpTranslate" oor:op="replace">
++ <prop oor:name="Label" oor:type="xs:string">
++ <value xml:lang="de">Diese Anwendung ~übersetzen...</value>
++ <value xml:lang="en-US">T~ranslate This Application...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:StatusBarVisible" oor:op="replace">
+
+=== modified file 'reportdesign/uiconfig/dbreport/menubar/menubar.xml'
+--- reportdesign/uiconfig/dbreport/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml 2010-04-06 22:00:57 +0000
+@@ -414,6 +414,7 @@
+ <menu:menuitem menu:id=".uno:HelperDialog"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sc/uiconfig/scalc/menubar/menubar.xml'
+--- sc/uiconfig/scalc/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ sc/uiconfig/scalc/menubar/menubar.xml 2010-04-06 22:00:59 +0000
+@@ -443,6 +443,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'scripting/workben/bindings/calcmenubar.xml'
+--- scripting/workben/bindings/calcmenubar.xml 2010-04-06 21:10:42 +0000
++++ scripting/workben/bindings/calcmenubar.xml 2010-04-06 22:01:20 +0000
+@@ -310,7 +310,8 @@
+ <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
+ <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
+ <menu:menuseparator/>
+- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
++ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
++ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
+
+=== modified file 'scripting/workben/bindings/drawmenubar.xml'
+--- scripting/workben/bindings/drawmenubar.xml 2010-04-06 21:10:42 +0000
++++ scripting/workben/bindings/drawmenubar.xml 2010-04-06 22:01:25 +0000
+@@ -345,7 +345,8 @@
+ <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
+ <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
+ <menu:menuseparator/>
+- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
++ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
++ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
+
+=== modified file 'scripting/workben/bindings/impressmenubar.xml'
+--- scripting/workben/bindings/impressmenubar.xml 2010-04-06 21:10:42 +0000
++++ scripting/workben/bindings/impressmenubar.xml 2010-04-06 22:01:29 +0000
+@@ -319,7 +319,8 @@
+ <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
+ <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
+ <menu:menuseparator/>
+- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
++ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
++ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
+
+=== modified file 'scripting/workben/bindings/writermenubar.xml'
+--- scripting/workben/bindings/writermenubar.xml 2010-04-06 21:10:42 +0000
++++ scripting/workben/bindings/writermenubar.xml 2010-04-06 22:01:31 +0000
+@@ -272,7 +272,8 @@
+ <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
+ <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
+ <menu:menuseparator/>
+- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
++ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
++ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
+
+=== modified file 'sd/uiconfig/sdraw/menubar/menubar.xml'
+--- sd/uiconfig/sdraw/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ sd/uiconfig/sdraw/menubar/menubar.xml 2010-04-06 22:01:34 +0000
+@@ -322,6 +322,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sd/uiconfig/simpress/menubar/menubar.xml'
+--- sd/uiconfig/simpress/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ sd/uiconfig/simpress/menubar/menubar.xml 2010-04-06 22:01:36 +0000
+@@ -297,6 +297,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sfx2/inc/sfx2/sfxsids.hrc'
+--- sfx2/inc/sfx2/sfxsids.hrc 2010-04-06 21:10:42 +0000
++++ sfx2/inc/sfx2/sfxsids.hrc 2010-04-06 22:01:50 +0000
+@@ -247,6 +247,7 @@
+ #define SID_HELP_HELPFILEBOX (SID_SFX_START + 419)
+ #define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420)
+ #define SID_HELP_SUPPORTPAGE (SID_SFX_START + 1683)
++#define SID_HELP_TRANSLATEPAGE (SID_SFX_START + 1712)
+ #define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
+
+ // default-ids for document
+
+=== modified file 'sfx2/sdi/appslots.sdi'
+--- sfx2/sdi/appslots.sdi 2010-04-06 21:10:42 +0000
++++ sfx2/sdi/appslots.sdi 2010-04-06 22:01:59 +0000
+@@ -174,6 +174,10 @@
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
++ SID_HELP_TRANSLATEPAGE
++ [
++ ExecMethod = MiscExec_Impl ;
++ ]
+ SID_RECENTFILELIST
+ [
+ ]
+
+=== modified file 'sfx2/sdi/sfx.sdi'
+--- sfx2/sdi/sfx.sdi 2010-04-06 21:10:42 +0000
++++ sfx2/sdi/sfx.sdi 2010-04-06 22:02:15 +0000
+@@ -7969,6 +7969,31 @@
+ ]
+
+ //--------------------------------------------------------------------------
++SfxVoidItem HelpTranslate SID_HELP_TRANSLATEPAGE
++()
++[
++ /* flags: */
++ AutoUpdate = FALSE,
++ Cachable = Cachable,
++ FastCall = FALSE,
++ HasCoreId = FALSE,
++ HasDialog = FALSE,
++ ReadOnlyDoc = TRUE,
++ Toggle = FALSE,
++ Container = FALSE,
++ RecordAbsolute = FALSE,
++ RecordPerSet;
++ Synchron;
++
++ /* config: */
++ AccelConfig = TRUE,
++ MenuConfig = TRUE,
++ StatusBarConfig = FALSE,
++ ToolBoxConfig = TRUE,
++ GroupId = GID_APPLICATION;
++]
++
++//--------------------------------------------------------------------------
+ SfxVoidItem HelpTutorials SID_HELP_TUTORIALS
+ ()
+ [
+
+=== modified file 'sfx2/source/appl/appserv.cxx'
+--- sfx2/source/appl/appserv.cxx 2010-04-06 21:10:42 +0000
++++ sfx2/source/appl/appserv.cxx 2010-04-06 22:02:26 +0000
+@@ -346,9 +346,35 @@
+ break;
+ }
+
++ case SID_HELP_SUPPORTPAGE:
++ {
++ try {
++ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
++ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
++ if ( xSystemShell.is())
++ xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -i")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
++
++ break;
++ } catch (const ::com::sun::star::uno::Exception &) {
++ }
++ break;
++ }
++
++ case SID_HELP_TRANSLATEPAGE:
++ {
++ try {
++ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
++ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
++ if ( xSystemShell.is())
++ xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -t")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
++
++ break;
++ } catch (const ::com::sun::star::uno::Exception &) {
++ }
++ break;
++ }
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ case SID_HELPINDEX:
+- case SID_HELP_SUPPORTPAGE:
+ {
+ Help* pHelp = Application::GetHelp();
+ if ( pHelp )
+
+=== modified file 'sfx2/source/appl/makefile.mk'
+--- sfx2/source/appl/makefile.mk 2010-04-06 21:10:42 +0000
++++ sfx2/source/appl/makefile.mk 2010-04-06 21:39:50 +0000
+@@ -65,6 +65,7 @@
+ .ELSE
+ CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST)
+ .ENDIF
++CFLAGS+=-DUBUNTU_RELEASE=\"$(shell lsb_release -cs)\"
+
+ # --- Files --------------------------------------------------------
+
+
+=== modified file 'starmath/uiconfig/smath/menubar/menubar.xml'
+--- starmath/uiconfig/smath/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ starmath/uiconfig/smath/menubar/menubar.xml 2010-04-06 22:02:40 +0000
+@@ -111,6 +111,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'svx/inc/globlmn_tmpl.hrc'
+--- svx/inc/globlmn_tmpl.hrc 2010-04-06 21:10:42 +0000
++++ svx/inc/globlmn_tmpl.hrc 2010-04-06 22:02:49 +0000
+@@ -1062,7 +1062,15 @@
+ Identifier = SID_HELP_SUPPORTPAGE ; \
+ Command = ".uno:HelpSupport" ; \
+ HelpID = SID_HELP_SUPPORTPAGE ; \
+- Text [ en-US ] = "~Support" ; \
++ Text [ de ] = "~Online-Hilfe..." ; \
++ Text [ en-US ] = "Get Help ~Online..." ; \
++
++#define ITEM_HELP_TRANSLATEPAGE \
++ Identifier = SID_HELP_TRANSLATEPAGE ; \
++ Command = ".uno:HelpTranslate" ; \
++ HelpID = SID_HELP_TRANSLATEPAGE ; \
++ Text [ de ] = "Diese Anwendung ~übersetzen..." ; \
++ Text [ en-US ] = "T~ranslate This Application..." ; \
+
+ #define ITEM_HELP_ONLINE_REGISTRATION \
+ Identifier = SID_ONLINE_REGISTRATION ; \
+
+=== modified file 'sw/uiconfig/sglobal/menubar/menubar.xml'
+--- sw/uiconfig/sglobal/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ sw/uiconfig/sglobal/menubar/menubar.xml 2010-04-06 22:02:54 +0000
+@@ -449,6 +449,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/sweb/menubar/menubar.xml'
+--- sw/uiconfig/sweb/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ sw/uiconfig/sweb/menubar/menubar.xml 2010-04-06 22:02:57 +0000
+@@ -378,6 +378,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/swform/menubar/menubar.xml'
+--- sw/uiconfig/swform/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ sw/uiconfig/swform/menubar/menubar.xml 2010-04-06 22:03:00 +0000
+@@ -444,7 +444,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/swreport/menubar/menubar.xml'
+--- sw/uiconfig/swreport/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ sw/uiconfig/swreport/menubar/menubar.xml 2010-04-06 22:03:02 +0000
+@@ -444,7 +444,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/swriter/menubar/menubar.xml'
+--- sw/uiconfig/swriter/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ sw/uiconfig/swriter/menubar/menubar.xml 2010-04-06 22:03:04 +0000
+@@ -452,6 +452,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
+=== modified file 'sw/uiconfig/swxform/menubar/menubar.xml'
+--- sw/uiconfig/swxform/menubar/menubar.xml 2010-04-06 21:10:42 +0000
++++ sw/uiconfig/swxform/menubar/menubar.xml 2010-04-06 22:03:06 +0000
+@@ -445,7 +445,7 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+
diff --git a/patches/dev300/ubuntu-lpi.diff b/patches/dev300/ubuntu-lpi.diff
deleted file mode 100644
index 202cb0c..0000000
--- a/patches/dev300/ubuntu-lpi.diff
+++ /dev/null
@@ -1,574 +0,0 @@
---- basctl/uiconfig/basicide/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ basctl/uiconfig/basicide/menubar/menubar.xml 2008-07-30 23:13:05 +0000
-@@ -82,6 +82,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- chart2/uiconfig/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ chart2/uiconfig/menubar/menubar.xml 2008-07-31 03:46:44 +0000
-@@ -148,6 +148,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- dbaccess/uiconfig/dbapp/menubar/menubar.xml 2009-05-03 19:34:18.000000000 -0500
-+++ dbaccess/uiconfig/dbapp/menubar/menubar.xml 2009-05-03 19:42:04.000000000 -0500
-@@ -134,6 +134,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
---- dbaccess/uiconfig/dbquery/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ dbaccess/uiconfig/dbquery/menubar/menubar.xml 2008-07-30 23:13:05 +0000
-@@ -75,6 +75,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2008-07-30 23:13:05 +0000
-@@ -58,6 +58,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- dbaccess/uiconfig/dbtable/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ dbaccess/uiconfig/dbtable/menubar/menubar.xml 2008-07-30 23:15:40 +0000
-@@ -59,6 +59,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2008-07-30 22:20:48 +0000
-+++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2008-07-30 23:16:14 +0000
-@@ -67,7 +67,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2008-07-30 22:20:48 +0000
-+++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2008-07-31 03:56:34 +0000
-@@ -85,7 +85,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- framework/uiconfig/startmodule/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ framework/uiconfig/startmodule/menubar/menubar.xml 2008-07-30 23:13:05 +0000
-@@ -75,6 +75,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- helpcontent2/helpers/help_hid.lst 2008-07-30 22:20:48 +0000
-+++ helpcontent2/helpers/help_hid.lst 2008-07-30 23:13:05 +0000
-@@ -5319,8 +5319,10 @@
- SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
- SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
- SID_HELP_PI,5962,.uno:HelperDialog
-+SID_HELP_REPORTPROBLEM,6712,.uno:HelpReportProblem
- SID_HELP_SEARCH,5412,.uno:HelpSearch
- SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
-+SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
- SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
- SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
- SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
-
---- helpcontent2/helpers/longnames_commands.csv 2008-07-30 22:20:48 +0000
-+++ helpcontent2/helpers/longnames_commands.csv 2008-07-30 23:13:05 +0000
-@@ -1244,8 +1244,10 @@
- SID_HELP_DOWNLOAD,.uno:HelpDownload
- SID_HELP_HELPFILEBOX,.uno:HelpChooseFile
- SID_HELP_PI,.uno:HelperDialog
-+SID_HELP_REPORTPROBLEM,.uno:HelpReportProblem
- SID_HELP_SEARCH,.uno:HelpSearch
- SID_HELP_SUPPORTPAGE,.uno:HelpSupport
-+SID_HELP_TRANSLATEPAGE,.uno:HelpTranslate
- SID_HELP_TUTORIALS,.uno:HelpTutorials
- SID_HELP_ZOOMIN,.uno:HelpZoomIn
- SID_HELP_ZOOMOUT,.uno:HelpZoomOut
-
---- helpcontent2/helpers/unocmds.txt 2008-07-30 22:20:48 +0000
-+++ helpcontent2/helpers/unocmds.txt 2008-07-30 23:13:05 +0000
-@@ -490,8 +490,10 @@
- .uno:HelpIndex;shared/main0108.xhp
- .uno:HelpMenu;shared/main0108.xhp
- .uno:HelpOnHelp;shared/05/00000110.xhp
-+.uno:HelpReportProblem;shared/main0108.xhp
- .uno:HelpSupport;shared/main0108.xhp
- .uno:HelpTip;shared/00/00000099.xhp
-+.uno:HelpTranslate;shared/main0108.xhp
- .uno:HelperDialog;shared/00/00000099.xhp
- .uno:HelplinesFront;shared/optionen/01050100.xhp
- .uno:HelplinesMove;shared/02/01171400.xhp
-
---- helpcontent2/helpers/uno-commands.csv 2008-07-30 22:20:48 +0000
-+++ helpcontent2/helpers/uno-commands.csv 2008-07-30 23:13:05 +0000
-@@ -866,8 +866,10 @@
- .uno:HelpIndex
- .uno:HelpMenu
- .uno:HelpOnHelp
-+.uno:HelpReportProblem
- .uno:HelpSupport
- .uno:HelpTip
-+.uno:HelpTranslate
- .uno:HelperDialog
- .uno:HelplinesFront
- .uno:HelplinesMove
-
---- helpcontent2/helpers/uno_hid.lst 2008-07-30 22:20:48 +0000
-+++ helpcontent2/helpers/uno_hid.lst 2008-07-30 23:13:05 +0000
-@@ -1242,8 +1242,10 @@
- SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
- SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
- SID_HELP_PI,5962,.uno:HelperDialog
-+SID_HELP_REPORTPROBLEM,6712,.uno:HelpReportProblem
- SID_HELP_SEARCH,5412,.uno:HelpSearch
- SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
-+SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
- SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
- SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
- SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
-
---- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2008-07-30 22:20:48 +0000
-+++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2008-07-30 23:13:05 +0000
-@@ -4087,7 +4087,20 @@
- </node>
- <node oor:name=".uno:HelpSupport" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
-- <value xml:lang="en-US">~Support</value>
-+ <value xml:lang="de">~Online-Hilfe...</value>
-+ <value xml:lang="en-US">~Get Help Online...</value>
-+ </prop>
-+ </node>
-+ <node oor:name=".uno:HelpTranslate" oor:op="replace">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="de">Diese Anwendung ~übersetzen...</value>
-+ <value xml:lang="en-US">T~ranslate This Application...</value>
-+ </prop>
-+ </node>
-+ <node oor:name=".uno:HelpReportProblem" oor:op="replace">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="de">Einen ~Fehler melden...</value>
-+ <value xml:lang="en-US">R~eport a Problem...</value>
- </prop>
- </node>
- <node oor:name=".uno:StatusBarVisible" oor:op="replace">
-
---- reportdesign/uiconfig/dbreport/menubar/menubar.xml 2008-07-30 22:20:48 +0000
-+++ reportdesign/uiconfig/dbreport/menubar/menubar.xml 2008-07-31 03:47:45 +0000
-@@ -164,6 +164,8 @@
- <menu:menuitem menu:id=".uno:HelperDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- scripting/workben/bindings/calcmenubar.xml 2008-07-30 22:20:48 +0000
-+++ scripting/workben/bindings/calcmenubar.xml 2008-07-30 23:13:05 +0000
-@@ -310,7 +310,9 @@
- <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
- <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
- <menu:menuseparator/>
-- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
-+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
-+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
-+ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
- <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
- <menu:menuseparator/>
- <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
-
---- scripting/workben/bindings/drawmenubar.xml 2008-07-30 22:20:48 +0000
-+++ scripting/workben/bindings/drawmenubar.xml 2008-07-30 23:13:05 +0000
-@@ -345,7 +345,9 @@
- <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
- <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
- <menu:menuseparator/>
-- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
-+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
-+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
-+ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
- <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
- <menu:menuseparator/>
- <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
-
---- scripting/workben/bindings/impressmenubar.xml 2008-07-30 22:20:48 +0000
-+++ scripting/workben/bindings/impressmenubar.xml 2008-07-30 23:13:05 +0000
-@@ -319,7 +319,9 @@
- <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
- <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
- <menu:menuseparator/>
-- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
-+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
-+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
-+ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
- <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
- <menu:menuseparator/>
- <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
-
---- scripting/workben/bindings/writermenubar.xml 2008-07-30 22:20:48 +0000
-+++ scripting/workben/bindings/writermenubar.xml 2008-07-30 23:13:05 +0000
-@@ -272,7 +272,9 @@
- <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
- <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
- <menu:menuseparator/>
-- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
-+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
-+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
-+ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
- <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
- <menu:menuseparator/>
- <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
-
---- sc/uiconfig/scalc/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ sc/uiconfig/scalc/menubar/menubar.xml 2008-07-30 23:13:05 +0000
-@@ -443,6 +443,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- sd/uiconfig/sdraw/menubar/menubar.xml 2009-05-03 19:34:18.000000000 -0500
-+++ sd/uiconfig/sdraw/menubar/menubar.xml 2009-05-03 19:51:08.000000000 -0500
-+@@ -322,6 +322,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
---- sd/uiconfig/simpress/menubar/menubar.xml 2009-05-03 19:34:18.000000000 -0500
-+++ sd/uiconfig/simpress/menubar/menubar.xml 2009-05-03 19:53:22.000000000 -0500
-@@ -294,6 +294,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
---- sfx2/inc/sfx2/sfxsids.hrc 2008-07-30 22:49:24 +0000
-+++ sfx2/inc/sfx2/sfxsids.hrc 2008-07-30 23:13:05 +0000
-@@ -244,6 +244,8 @@
- #define SID_HELP_HELPFILEBOX (SID_SFX_START + 419)
- #define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420)
- #define SID_HELP_SUPPORTPAGE (SID_SFX_START + 1683)
-+#define SID_HELP_TRANSLATEPAGE (SID_SFX_START + 1712)
-+#define SID_HELP_REPORTPROBLEM (SID_SFX_START + 1713)
- #define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
-
- // default-ids for document
-
---- sfx2/sdi/appslots.sdi 2008-07-30 22:20:48 +0000
-+++ sfx2/sdi/appslots.sdi 2008-07-30 23:13:05 +0000
-@@ -182,6 +182,14 @@
- [
- ExecMethod = MiscExec_Impl ;
- ]
-+ SID_HELP_TRANSLATEPAGE
-+ [
-+ ExecMethod = MiscExec_Impl ;
-+ ]
-+ SID_HELP_REPORTPROBLEM
-+ [
-+ ExecMethod = MiscExec_Impl ;
-+ ]
- SID_RECENTFILELIST
- [
- ]
-
---- sfx2/sdi/sfx.sdi 2008-07-30 22:49:24 +0000
-+++ sfx2/sdi/sfx.sdi 2008-07-30 23:13:05 +0000
-@@ -7945,6 +7945,56 @@
- ]
-
- //--------------------------------------------------------------------------
-+SfxVoidItem HelpTranslate SID_HELP_TRANSLATEPAGE
-+()
-+[
-+ /* flags: */
-+ AutoUpdate = FALSE,
-+ Cachable = Cachable,
-+ FastCall = FALSE,
-+ HasCoreId = FALSE,
-+ HasDialog = FALSE,
-+ ReadOnlyDoc = TRUE,
-+ Toggle = FALSE,
-+ Container = FALSE,
-+ RecordAbsolute = FALSE,
-+ RecordPerSet;
-+ Synchron;
-+
-+ /* config: */
-+ AccelConfig = TRUE,
-+ MenuConfig = TRUE,
-+ StatusBarConfig = FALSE,
-+ ToolBoxConfig = TRUE,
-+ GroupId = GID_APPLICATION;
-+]
-+
-+//--------------------------------------------------------------------------
-+SfxVoidItem HelpReportProblem SID_HELP_REPORTPROBLEM
-+()
-+[
-+ /* flags: */
-+ AutoUpdate = FALSE,
-+ Cachable = Cachable,
-+ FastCall = FALSE,
-+ HasCoreId = FALSE,
-+ HasDialog = FALSE,
-+ ReadOnlyDoc = TRUE,
-+ Toggle = FALSE,
-+ Container = FALSE,
-+ RecordAbsolute = FALSE,
-+ RecordPerSet;
-+ Synchron;
-+
-+ /* config: */
-+ AccelConfig = TRUE,
-+ MenuConfig = TRUE,
-+ StatusBarConfig = FALSE,
-+ ToolBoxConfig = TRUE,
-+ GroupId = GID_APPLICATION;
-+]
-+
-+//--------------------------------------------------------------------------
- SfxVoidItem HelpTutorials SID_HELP_TUTORIALS
- ()
- [
-
---- sfx2/source/appl/appserv.cxx 2008-07-30 22:20:48 +0000
-+++ sfx2/source/appl/appserv.cxx 2008-07-31 03:51:00 +0000
-@@ -345,9 +345,48 @@
- break;
- }
-
-+ case SID_HELP_SUPPORTPAGE:
-+ {
-+ try {
-+ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
-+ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
-+ if ( xSystemShell.is())
-+ xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -i")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-+
-+ break;
-+ } catch (const ::com::sun::star::uno::Exception &) {
-+ }
-+ break;
-+ }
-+
-+ case SID_HELP_TRANSLATEPAGE:
-+ {
-+ try {
-+ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
-+ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
-+ if ( xSystemShell.is())
-+ xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -t")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-+
-+ break;
-+ } catch (const ::com::sun::star::uno::Exception &) {
-+ }
-+ break;
-+ }
-+ case SID_HELP_REPORTPROBLEM:
-+ {
-+ try {
-+ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
-+ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
-+ if ( xSystemShell.is())
-+ xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -b")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-+
-+ break;
-+ } catch (const ::com::sun::star::uno::Exception &) {
-+ }
-+ break;
-+ }
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- case SID_HELPINDEX:
-- case SID_HELP_SUPPORTPAGE:
- {
- Help* pHelp = Application::GetHelp();
- if ( pHelp )
-
---- sfx2/source/appl/makefile.mk 2008-07-30 22:20:48 +0000
-+++ sfx2/source/appl/makefile.mk 2008-07-30 23:13:05 +0000
-@@ -65,6 +65,7 @@
- .ELSE
- CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST)
- .ENDIF
-+CFLAGS+=-DUBUNTU_RELEASE=\"$(shell lsb_release -cs)\"
-
- # --- Files --------------------------------------------------------
-
-
---- starmath/uiconfig/smath/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ starmath/uiconfig/smath/menubar/menubar.xml 2008-07-30 23:13:05 +0000
-@@ -111,6 +111,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- svx/inc/globlmn_tmpl.hrc 2008-07-30 22:49:24 +0000
-+++ svx/inc/globlmn_tmpl.hrc 2008-07-30 23:13:05 +0000
-@@ -1062,7 +1062,22 @@
- Identifier = SID_HELP_SUPPORTPAGE ; \
- Command = ".uno:HelpSupport" ; \
- HelpID = SID_HELP_SUPPORTPAGE ; \
-- Text [ en-US ] = "~Support" ; \
-+ Text [ de ] = "~Online-Hilfe..." ; \
-+ Text [ en-US ] = "Get Help ~Online..." ; \
-+
-+#define ITEM_HELP_TRANSLATEPAGE \
-+ Identifier = SID_HELP_TRANSLATEPAGE ; \
-+ Command = ".uno:HelpTranslate" ; \
-+ HelpID = SID_HELP_TRANSLATEPAGE ; \
-+ Text [ de ] = "Diese Anwendung ~übersetzen..." ; \
-+ Text [ en-US ] = "T~ranslate This Application..." ; \
-+
-+#define ITEM_HELP_REPORTPROBLEM \
-+ Identifier = SID_HELP_REPORTPROBLEM ; \
-+ Command = ".uno:HelpReportProblem" ; \
-+ HelpID = SID_HELP_REPORTPROBLEM ; \
-+ Text [ de ] = "Einen ~Fehler melden..." ; \
-+ Text [ en-US ] = "R~eport a Problem..." ; \
-
- #define ITEM_HELP_ONLINE_REGISTRATION \
- Identifier = SID_ONLINE_REGISTRATION ; \
-
---- sw/uiconfig/sglobal/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ sw/uiconfig/sglobal/menubar/menubar.xml 2008-07-30 23:13:05 +0000
-@@ -449,6 +449,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- sw/uiconfig/sweb/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ sw/uiconfig/sweb/menubar/menubar.xml 2008-07-30 23:13:05 +0000
-@@ -378,6 +378,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- sw/uiconfig/swform/menubar/menubar.xml 2008-07-30 22:20:48 +0000
-+++ sw/uiconfig/swform/menubar/menubar.xml 2008-07-31 03:58:26 +0000
-@@ -446,7 +446,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- sw/uiconfig/swreport/menubar/menubar.xml 2008-07-30 22:20:48 +0000
-+++ sw/uiconfig/swreport/menubar/menubar.xml 2008-07-31 03:58:53 +0000
-@@ -446,7 +446,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- sw/uiconfig/swriter/menubar/menubar.xml 2008-07-30 22:49:24 +0000
-+++ sw/uiconfig/swriter/menubar/menubar.xml 2008-07-30 23:13:06 +0000
-@@ -452,6 +452,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
---- sw/uiconfig/swxform/menubar/menubar.xml 2008-07-30 22:20:48 +0000
-+++ sw/uiconfig/swxform/menubar/menubar.xml 2008-07-31 03:59:24 +0000
-@@ -445,7 +445,8 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
-+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
-+ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-
More information about the ooo-build-commit
mailing list