summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/dialogs/about.cxx4
-rw-r--r--cui/source/dialogs/about.src7
-rw-r--r--solenv/bin/modules/installer/scriptitems.pm2
3 files changed, 8 insertions, 5 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index e1f13b154293..009bcfeca92d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -73,7 +73,6 @@ GetBuildId()
if (!sBuildId.isEmpty() && sBuildId.getLength() > 50)
{
rtl::OUStringBuffer aBuffer;
- aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\t"));
sal_Int32 nIndex = 0;
do
{
@@ -86,7 +85,7 @@ GetBuildId()
if (nIndex % 5)
aBuffer.append(static_cast<sal_Unicode>('-'));
else
- aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\t"));
+ aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n"));
}
}
}
@@ -167,6 +166,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
aCopyrightText.SetControlForeground( aTextColor );
rtl::OUStringBuffer sText(m_aVendorTextStr);
+ sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
sal_uInt32 nCopyrightId =
utl::ConfigManager::getProductName().equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("LibreOffice"))
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index fe06366f7d0a..512d9eb3eea7 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -41,6 +41,9 @@ ModalDialog RID_DEFAULTABOUT
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
AutoVScroll = TRUE ;
+ LEFT = FALSE ;
+ CENTER = TRUE ;
+ RIGHT = FALSE ;
};
MultiLineEdit ABOUT_FTXT_COPYRIGHT
{
@@ -84,11 +87,11 @@ ModalDialog RID_DEFAULTABOUT
};
String ABOUT_STR_VENDOR
{
- Text[ en-US ] = "%PRODUCTNAME is a free and open source office suite developed by %OOOVENDOR. ";
+ Text[ en-US ] = "%PRODUCTNAME is a free and open source office suite. This release was supplied by %OOOVENDOR.";
};
String ABOUT_STR_COPYRIGHT
{
- Text[ en-US ] = "LibreOffice is copyright © 2000, 2012 LibreOffice contributors and/or their affiliates. All rights reserved.";
+ Text[ en-US ] = "Copyright © 2000, 2012 LibreOffice contributors and/or their affiliates. All rights reserved.";
};
String ABOUT_STR_COPYRIGHT_DERIVED
{
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 23e94d75e0c9..4614c3f9a28f 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -815,7 +815,7 @@ sub replace_setup_variables
if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } # using "680" instead of "src680"
- my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h- && git describe --abbrev=0`;
+ my $buildidstring = join( '-', split( ' ', `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:"%h "` ));
if ($? || !$buildidstring) {
$buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
}