diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2013-12-13 15:09:40 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2013-12-13 17:26:30 +0000 |
| commit | 23cc556b5fca757594c9c5d5df16cadd096218bc (patch) | |
| tree | ffce4af6ba75cdc7b809b3ce98d029c7de56d5ff /sfx2 | |
| parent | 7f367c016c32678182b4666f98b204de6a6e882f (diff) | |
Targetted text updates, with seasonable changes before l10n freeze.
Change-Id: If37ef9f68711da3a0aa9a3ba59b111a8a23421df
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 8 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/licensedialog.ui | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 7fc357a4fbd8..4ba407c030aa 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -194,7 +194,7 @@ namespace } } } -/// Find the correct location of the document (LICENSE.odt, etc.), and return +/// Find the correct location of the document (LICENSE.fodt, etc.), and return /// it in rURL if found. static sal_Bool checkURL( const char *pName, const char *pExt, OUString &rURL ) { @@ -223,9 +223,9 @@ static void showDocument( const char* pBaseName ) args[1].Value <<= sal_True; OUString aURL; - if ( checkURL ( pBaseName, ".odt", aURL ) || - checkURL ( pBaseName, ".html", aURL ) || - checkURL ( pBaseName, "", aURL ) ) { + if ( checkURL ( pBaseName, ".fodt", aURL ) || + checkURL ( pBaseName, ".html", aURL ) || + checkURL ( pBaseName, "", aURL ) ) { xDesktop->loadComponentFromURL( aURL, OUString("_blank"), 0, args ); } } catch (const ::com::sun::star::uno::Exception &) { diff --git a/sfx2/uiconfig/ui/licensedialog.ui b/sfx2/uiconfig/ui/licensedialog.ui index aa14f0efd2fc..5c5f2cb1b89e 100644 --- a/sfx2/uiconfig/ui/licensedialog.ui +++ b/sfx2/uiconfig/ui/licensedialog.ui @@ -59,13 +59,13 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">%PRODUCTNAME is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.gnu.org/licenses/lgpl-3.0.html + <property name="label" translatable="yes">%PRODUCTNAME is made available subject to the terms of the Mozilla Public License, v. 2.0. A copy of the MPL can be obtained at http://mozilla.org/MPL/2.0/. Third Party Code Additional copyright notices and license terms applicable to portions of the Software are set forth in the LICENSE.html file; choose Show License to see exact details in English. All trademarks and registered trademarks mentioned herein are the property of their respective owners. -Copyright © 2000, 2013 LibreOffice contributors and/or their affiliates. All rights reserved. +Copyright © 2000, 2014 LibreOffice contributors. All rights reserved. This product was created by %OOOVENDOR, based on OpenOffice.org, which is Copyright 2000, 2011 Oracle and/or its affiliates. %OOOVENDOR acknowledges all community members, please see http://www.libreoffice.org/ for more details.</property> <property name="wrap">True</property> |