[gnome-system-monitor/ubergraph: 19/21] Merge remote-tracking branch 'origin' into ubergraph

[Robert Roth <robertroth src gnome org>]

commit 53399952a17b93c4c9fef3acc82554be9683813d
Merge: 9432d4a 6da63ee
Author: Robert Roth <robert roth off gmail com>
Date:   Fri Jul 26 01:30:43 2013 +0300

    Merge remote-tracking branch 'origin' into ubergraph

 HACKING                                           |   34 ++
 data/interface.ui                                 |  197 +++++------
 data/menus.ui                                     |   16 +-
 po/POTFILES.in                                    |    1 -
 po/es.po                                          |  415 ++++++++++-----------
 src/Makefile.am                                   |    1 -
 src/argv.cpp                                      |    1 +
 src/argv.h                                        |    1 +
 src/callbacks.cpp                                 |  302 ---------------
 src/callbacks.h                                   |   50 ---
 src/cgroups.cpp                                   |    1 +
 src/cgroups.h                                     |    1 +
 src/defaulttable.h                                |    1 +
 src/disks.cpp                                     |   64 +++-
 src/disks.h                                       |   11 +-
 src/e_date.c                                      |    1 +
 src/e_date.h                                      |    1 +
 src/gsm_color_button.c                            |    1 +
 src/gsm_color_button.h                            |    1 +
 src/iconthemewrapper.cpp                          |    1 +
 src/iconthemewrapper.h                            |    1 +
 src/interface.cpp                                 |  271 +++++++++-----
 src/interface.h                                   |    1 +
 src/load-graph.cpp                                |   14 +-
 src/load-graph.h                                  |    1 +
 src/lsof.cpp                                      |    1 +
 src/lsof.h                                        |    1 +
 src/memmaps.cpp                                   |    1 +
 src/memmaps.h                                     |    1 +
 src/openfiles.cpp                                 |    1 +
 src/openfiles.h                                   |    1 +
 src/org.gnome.gnome-system-monitor.gschema.xml.in |   13 +-
 src/prettytable.cpp                               |    1 +
 src/prettytable.h                                 |    1 +
 src/procactions.cpp                               |   15 +-
 src/procactions.h                                 |    1 +
 src/procdialogs.cpp                               |   20 +-
 src/procdialogs.h                                 |    1 +
 src/procman-app.cpp                               |  116 +++----
 src/procman-app.h                                 |    6 +-
 src/procman.cpp                                   |    1 +
 src/procman_gksu.cpp                              |    1 +
 src/procman_gksu.h                                |    1 +
 src/procman_gnomesu.cpp                           |    1 +
 src/procman_gnomesu.h                             |    1 +
 src/procman_pkexec.cpp                            |    1 +
 src/procman_pkexec.h                              |    1 +
 src/procproperties.cpp                            |    1 +
 src/procproperties.h                              |    1 +
 src/proctable.cpp                                 |  112 ++++++-
 src/proctable.h                                   |    4 +
 src/selinux.cpp                                   |    1 +
 src/selinux.h                                     |    1 +
 src/settings-keys.cpp                             |    1 +
 src/settings-keys.h                               |    1 +
 src/smooth_refresh.cpp                            |    1 +
 src/smooth_refresh.h                              |    1 +
 src/util.cpp                                      |   15 +-
 src/util.h                                        |   40 +--
 59 files changed, 824 insertions(+), 931 deletions(-)
---