[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

Chris Cheney ccheney at kemper.freedesktop.org
Fri Feb 19 14:35:15 PST 2010 

 patches/dev300/ubuntu-lpi.diff |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 4ca363d45c6a932dac3664c9aeb87671cd82ecc4
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Fri Feb 19 16:34:08 2010 -0600

    Backport updated Ubuntu Launchpad integration patch from head
    
    * patches/dev300/ubuntu-lpi.diff: Backport updated Ubuntu Launchpad
      integration patch from head

diff --git a/patches/dev300/ubuntu-lpi.diff b/patches/dev300/ubuntu-lpi.diff
index 1e76ac4..202cb0c 100644
--- a/patches/dev300/ubuntu-lpi.diff
+++ b/patches/dev300/ubuntu-lpi.diff
@@ -196,8 +196,8 @@
 +			</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>
++					<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">
@@ -223,7 +223,7 @@
 -   <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: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..."/>
@@ -237,7 +237,7 @@
 -   <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: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..."/>
@@ -251,7 +251,7 @@
 -   <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: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..."/>
@@ -265,7 +265,7 @@
 -   <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: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..."/>
@@ -406,7 +406,7 @@
 +				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/basis3.0/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -i")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
++					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 &) {
@@ -420,7 +420,7 @@
 +				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/basis3.0/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -t")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
++					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 &) {
@@ -433,7 +433,7 @@
 +				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/basis3.0/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -b")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
++					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 &) {
@@ -491,8 +491,8 @@
 +    Identifier = SID_HELP_REPORTPROBLEM ; \
 +	Command = ".uno:HelpReportProblem" ; \
 +    HelpID = SID_HELP_REPORTPROBLEM ; \
-+    Text [ de ] = "Einen ~Fehler melden" ; \
-+    Text [ en-US ] = "R~eport a Problem" ;	\
++    Text [ de ] = "Einen ~Fehler melden..." ; \
++    Text [ en-US ] = "R~eport a Problem..." ;	\
  
  #define ITEM_HELP_ONLINE_REGISTRATION \
      Identifier = SID_ONLINE_REGISTRATION ; \

More information about the ooo-build-commit mailing list