[Pkg-owncloud-commits] [owncloud-client] 33/115: Updated the about text for the generic ownCloud Theme.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 78e50747e4e2337cf0a6d8159777947481b87c10
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Aug 14 17:07:47 2014 +0200

    Updated the about text for the generic ownCloud Theme.
---
 src/mirall/generalsettings.cpp | 1 +
 src/mirall/owncloudtheme.cpp   | 6 +++++-
 src/mirall/theme.cpp           | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/mirall/generalsettings.cpp b/src/mirall/generalsettings.cpp
index 6c8fe59..0377fbf 100644
--- a/src/mirall/generalsettings.cpp
+++ b/src/mirall/generalsettings.cpp
@@ -46,6 +46,7 @@ GeneralSettings::GeneralSettings(QWidget *parent) :
         _ui->aboutGroupBox->hide();
     } else {
         _ui->aboutLabel->setText(about);
+        _ui->aboutLabel->setWordWrap(true);
         _ui->aboutLabel->setOpenExternalLinks(true);
     }
 
diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp
index f73aa7c..75049ef 100644
--- a/src/mirall/owncloudtheme.cpp
+++ b/src/mirall/owncloudtheme.cpp
@@ -59,8 +59,12 @@ QString ownCloudTheme::about() const
     return  QCoreApplication::translate("ownCloudTheme::about()",
                "<p>Version %2. "
                "For more information visit <a href=\"%3\">%4</a></p>"
-               "<p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>"
+               "<p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br>"
                "Based on Mirall by Duncan Mac-Vicar P.</small></p>"
+               "<p>Copyright ownCloud, Inc.</p>"
+               "<p>Licensed under the GNU Public License (GPL) Version 2.0<br/>"
+               "ownCloud and the ownCloud Logo is a registered trademark of ownCloud,"
+               "Inc. in the United States, other countries, or both</p>"
                "%7"
                )
             .arg(MIRALL_VERSION_STRING)
diff --git a/src/mirall/theme.cpp b/src/mirall/theme.cpp
index cd80494..1643091 100644
--- a/src/mirall/theme.cpp
+++ b/src/mirall/theme.cpp
@@ -217,9 +217,9 @@ QString Theme::updateCheckUrl() const
 QString Theme::about() const
 {
     return tr("<p>Version %1 For more information please visit <a href='%2'>%3</a>.</p>"
-              "<p>Copyright ownCloud, Inc.<p>"
+              "<p>Copyright ownCloud, Inc.</p>"
               "<p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>"
-              "%5 and the %5 logo are registered trademarks of %4 in the<br>"
+              "%5 and the %5 logo are registered trademarks of %4 in the "
               "United States, other countries, or both.</p>")
             .arg(MIRALL_VERSION_STRING).arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
             .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)).arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git