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

[Robert Roth <robertroth src gnome org>]

commit 9432d4a3e777dd8ba4ec8f7900803016bcb14a92
Merge: 74640b2 e7acd6e
Author: Robert Roth <robert roth off gmail com>
Date:   Wed Jul 24 02:12:36 2013 +0300

    Merge remote-tracking branch 'origin' into ubergraph

 Makefile.am                                       |    3 +-
 configure.ac                                      |    2 +-
 data/interface.ui                                 |    3 +-
 data/menus.ui                                     |  111 +++++
 data/popups.ui                                    |   31 --
 help/C/figures/addColumn.png                      |  Bin 4411 -> 0 bytes
 help/C/figures/changePriority.png                 |  Bin 4074 -> 0 bytes
 help/C/figures/colorPanel.png                     |  Bin 28898 -> 0 bytes
 help/C/figures/columnContextMenu.png              |  Bin 7454 -> 0 bytes
 help/C/figures/memoryMaps.png                     |  Bin 55862 -> 0 bytes
 help/C/figures/moreInfo.png                       |  Bin 42522 -> 0 bytes
 help/C/figures/processListing.png                 |  Bin 42476 -> 0 bytes
 help/C/figures/sortButton.png                     |  Bin 3572 -> 0 bytes
 help/C/figures/sortMenu.png                       |  Bin 7490 -> 0 bytes
 help/C/figures/sortMenu2.png                      |  Bin 8793 -> 0 bytes
 help/C/figures/systemMonitor.png                  |  Bin 30459 -> 0 bytes
 help/C/figures/viewMenu.png                       |  Bin 4468 -> 0 bytes
 help/Makefile.am                                  |   14 +-
 help/bg/figures/addColumn.png                     |  Bin 51784 -> 0 bytes
 help/bg/figures/changePriority.png                |  Bin 25281 -> 0 bytes
 help/bg/figures/colorPanel.png                    |  Bin 86478 -> 0 bytes
 help/bg/figures/columnContextMenu.png             |  Bin 19935 -> 0 bytes
 help/bg/figures/memoryMaps.png                    |  Bin 83322 -> 0 bytes
 help/bg/figures/moreInfo.png                      |  Bin 88066 -> 0 bytes
 help/bg/figures/processListing.png                |  Bin 88066 -> 0 bytes
 help/bg/figures/sortButton.png                    |  Bin 19935 -> 0 bytes
 help/bg/figures/sortMenu.png                      |  Bin 19935 -> 0 bytes
 help/bg/figures/sortMenu2.png                     |  Bin 19935 -> 0 bytes
 help/bg/figures/systemMonitor.png                 |  Bin 70822 -> 0 bytes
 help/bg/figures/viewMenu.png                      |  Bin 79778 -> 0 bytes
 help/eu/figures/addColumn.png                     |  Bin 4411 -> 0 bytes
 help/eu/figures/changePriority.png                |  Bin 13205 -> 0 bytes
 help/eu/figures/colorPanel.png                    |  Bin 55010 -> 0 bytes
 help/eu/figures/memoryMaps.png                    |  Bin 46661 -> 0 bytes
 help/eu/figures/processListing.png                |  Bin 67682 -> 0 bytes
 help/eu/figures/systemMonitor.png                 |  Bin 45222 -> 0 bytes
 help/eu/figures/viewMenu.png                      |  Bin 12430 -> 0 bytes
 po/cs.po                                          |  345 ++++++---------
 scripts/Makefile.am                               |    8 +-
 src/Makefile.am                                   |    4 +-
 src/callbacks.cpp                                 |  270 +-----------
 src/callbacks.h                                   |   38 --
 src/gsm.gresource.xml                             |    1 -
 src/interface.cpp                                 |  485 ++++++++++++---------
 src/interface.h                                   |    1 -
 src/org.gnome.gnome-system-monitor.gschema.xml.in |   16 +-
 src/procdialogs.cpp                               |    2 +-
 src/procman-app.cpp                               |   76 ++--
 src/procman-app.h                                 |   25 -
 src/proctable.cpp                                 |   62 ++-
 50 files changed, 610 insertions(+), 887 deletions(-)
---