[gnome-system-monitor/wip-charts: 4/4] Merge branch 'master' into wip-charts

[Robert Roth <robertroth src gnome org>]

commit b079577cca99f3575271d77042123ec710ad62f6
Merge: 30695f82 271578dc
Author: Robert Roth <robert roth off gmail com>
Date:   Sun Nov 8 02:34:03 2020 +0200

    Merge branch 'master' into wip-charts

 data/preferences.ui                               |  38 ++++++++
 help/ca/ca.po                                     | 104 +++++++++++-----------
 src/application.cpp                               |  39 ++++++++
 src/application.h                                 |   6 +-
 src/org.gnome.gnome-system-monitor.gschema.xml.in |  15 ++++
 src/prefsdialog.cpp                               |  19 ++++
 src/prefsdialog.h                                 |   1 +
 src/settings-keys.h                               |   2 +
 src/util.cpp                                      |   2 +-
 9 files changed, 172 insertions(+), 54 deletions(-)
---