[gnome-system-monitor/ubergraph: 62/62] Merged from master

[Robert Roth <robertroth src gnome org>]

commit 4aa45892e4fde31a512047bfcb57f0132c8518ee
Merge: 17321da 9d829b8
Author: Robert Roth <robert roth off gmail com>
Date:   Mon Aug 5 00:12:09 2013 +0300

    Merged from master

 .gitignore                                        |   42 +-
 NEWS                                              |   23 +-
 configure.ac                                      |    2 +-
 data/interface.ui                                 |  661 +++++-----
 data/menus.ui                                     |   18 +-
 data/preferences.ui                               |   16 +-
 po/cs.po                                          |  756 ++++++------
 po/de.po                                          | 1012 +++++++--------
 po/es.po                                          |  618 +++++-----
 po/gl.po                                          |  982 ++++++++-------
 po/he.po                                          | 1068 ++++++++--------
 po/lt.po                                          |  800 ++++++-------
 po/nb.po                                          |  830 ++++++-------
 po/tg.po                                          | 1408 +++++++++++----------
 po/zh_HK.po                                       |  990 ++++++++-------
 po/zh_TW.po                                       |  994 ++++++++-------
 src/disks.cpp                                     |   37 +-
 src/gsm_color_button.c                            |   95 +-
 src/gsm_color_button.h                            |    2 +
 src/interface.cpp                                 |  121 ++-
 src/load-graph.cpp                                |   25 +-
 src/org.gnome.gnome-system-monitor.gschema.xml.in |   71 +-
 src/procdialogs.cpp                               |   71 +-
 src/procman-app.cpp                               |   94 +--
 src/procman-app.h                                 |   11 +-
 src/procproperties.cpp                            |    8 +-
 src/proctable.cpp                                 |  322 +++--
 src/proctable.h                                   |    6 +-
 28 files changed, 5685 insertions(+), 5398 deletions(-)
---
diff --cc .gitignore
index f695647,50d04fb..9dff72d
--- a/.gitignore
+++ b/.gitignore
@@@ -51,30 -54,25 +54,35 @@@ po/*.gm
  po/*.pot
  po/*.sed
  po/* * header
- po/insert-header.sin
- po/remove-potcdate.sin
- po/stamp-it
- src/.deps/
- src/.libs/
+ po/.intltool-merge-cache
+ scripts/gsm-kill
+ scripts/gsm-renice
+ scripts/.deps/
  src/Makefile
  src/Makefile.in
- *.o
- *.lo
- *.la
  src/gnome-system-monitor
 +src/nextmon
  src/gsm-resources.c
  src/org.gnome.gnome-system-monitor.enums.xml
  src/org.gnome.gnome-system-monitor.gschema.valid
  src/org.gnome.gnome-system-monitor.gschema.xml
+ src/.deps/
+ src/.libs/
  stamp-h1
  xmldocs.make
+ *.la
+ *.lo
+ *.mo
+ *.o
  *.patch
 +uber/.deps/
 +uber/.libs/
 +scripts/.deps/
 +scripts/gsm-kill
 +scripts/gsm-renice
 +gnome-system-monitor-kde.desktop
 +gnome-system-monitor-kde.desktop.in
 +compile
+ *.tar.bz2
+ *.tar.xz
++