about: Merge all version info into one section.

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 3507c47203ec1cb92c865d628883d451cce62109..140e7775d2cb73c2d9b575edca9cef9d0af7a141 100644 (file)
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -329,19 +329,13 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 
        s.append("<table>");
 
 
        s.append("<table>");
 

-       /* Application info */
+       /* Version, library, and feature info */

        s.append("<tr><td colspan=\"2\"><b>" +
        s.append("<tr><td colspan=\"2\"><b>" +

-               tr("Application:") + "</b></td></tr>");
+               tr("Versions, libraries and features:") + "</b></td></tr>");

 
        s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                .arg(QApplication::applicationName(),
                QApplication::applicationVersion()));
 
        s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                .arg(QApplication::applicationName(),
                QApplication::applicationVersion()));

-
-       /* Library info */
-       s.append("<tr><td colspan=\"2\"></td></tr>");
-       s.append("<tr><td colspan=\"2\"><b>" +
-               tr("Libraries and features:") + "</b></td></tr>");
-

        s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                .arg(QString("Qt"), qVersion()));
        s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
        s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                .arg(QString("Qt"), qVersion()));
        s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")