diff -Nru gnome-system-monitor-3.14.1/aclocal.m4 gnome-system-monitor-3.15.4/aclocal.m4
--- gnome-system-monitor-3.14.1/aclocal.m4	2014-10-13 18:41:30.000000000 +0000
+++ gnome-system-monitor-3.15.4/aclocal.m4	2015-01-19 17:17:24.000000000 +0000
@@ -704,7 +704,7 @@
 EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
 
 distdir: distdir-help-files
-distdir-help-files:
+distdir-help-files: $(_HELP_LC_FILES)
 	@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
 	  $(MKDIR_P) "$(distdir)/$$lc"; \
 	  for file in $(HELP_FILES); do \
@@ -733,7 +733,7 @@
 
 .PHONY: install-help
 install-data-am: $(if $(HELP_ID),install-help)
-install-help:
+install-help: $(_HELP_LC_FILES)
 	@for lc in C $(_HELP_LINGUAS); do \
 	  $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
 	done
diff -Nru gnome-system-monitor-3.14.1/ChangeLog gnome-system-monitor-3.15.4/ChangeLog
--- gnome-system-monitor-3.14.1/ChangeLog	2014-10-13 18:43:38.000000000 +0000
+++ gnome-system-monitor-3.15.4/ChangeLog	2015-01-19 17:18:33.000000000 +0000
@@ -1,3 +1,125 @@
+2015-01-10  Robert Roth  <robert.roth.off@gmail.com>
+
+	Removed iconthemewrapper
+
+2015-01-03  Robert Roth  <robert.roth.off@gmail.com>
+
+	Removed dummy process with 0 PID
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Initialize all MemMapsData members.
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Initialize all members of GUI and make it NonCopyable.
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Initialize all LoadGraph and OptionGroup members.
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Initialize all members of ProcConfig, MutableProcInfo and GsmApplication. And make them NonCopyable.
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Initialize all ProcInfo members.
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Initialize all SmoothRefresh members.
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Make SmoothRefresh non-copyable.
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Make LoadGraph non-copyable.
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Define a helper NonCopyable base class.
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2015-01-03  Benoît Dejean  <bdejean@gmail.com>
+
+	Test & fix for pid=0
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=742070
+
+2014-12-15  Robert Roth  <robert.roth.off@gmail.com>
+
+	Release 3.15.3
+
+2014-12-08  Tim Lunn  <tim@feathertop.org>
+
+	Don't set "titlebar" class when using headerbar widget as a toolbar
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=741236
+
+2014-12-06  Trần Ngọc Quân  <vnwildman@gmail.com>
+
+	Updated Vietnamses translation
+
+	Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com>
+
+2014-12-04  Robert Roth  <robert.roth.off@gmail.com>
+
+	Fixed bogus assignment (bgo #738110)
+
+2014-12-04  Tim Lunn  <tim@feathertop.org>
+
+	Use traditional titlebars on !GNOME DE's
+
+	https://bugzilla.gnome.org/show_bug.cgi?id=741044
+
+2014-11-17  Duarte Loreto  <happyguy_pt@hotmail.com>
+
+	Updated Portuguese translation
+
+2014-11-03  Timo Jyrinki  <timo@debian.org>
+
+	Change Finnish translation team web page to l10n.gnome.org
+
+2014-10-30  Baurzhan Muftakhidinov  <baurthefirst@gmail.com>
+
+	Added Kazakh translation
+
+2014-10-28  Robert Roth  <robert.roth.off@gmail.com>
+
+	Release 3.15.1
+
+2014-10-20  Robert Roth  <robert.roth.off@gmail.com>
+
+	Do not ship executables (bgo #738752)
+
+2014-10-15  Robert Roth  <robert.roth.off@gmail.com>
+
+	Added padding before search button (bgo #735302)
+
+2014-10-14  Kalev Lember  <kalevlember@gmail.com>
+
+	Fix desktop file keywords translation syntax error
+
 2014-10-13  Matthias Clasen  <mclasen@redhat.com>
 
 	Ensure icons are at the right size
@@ -7,17 +129,9 @@
 
 	https://bugzilla.gnome.org/show_bug.cgi?id=738467
 
-2014-10-13  Robert Roth  <robert.roth.off@gmail.com>
-
-	Disable internal polkit agent (bgo #737098)
-
-2014-10-10  Sweta Kothari  <swkothar@redhat.com>
-
-	Updated gujarati translations
+2014-10-13  David King  <amigadave@amigadave.com>
 
-2014-10-10  Sweta Kothari  <swkothar@redhat.com>
-
-	Updated gujarati translations
+	Fix Czech help translation
 
 2014-10-10  Arash Mousavi  <mousavi.arash@gmail.com>
 
@@ -27,22 +141,28 @@
 
 	Updated Bulgarian translation
 
-2014-10-08  Saibal Ray  <sray@redhat.com>
-
-	Updated Bengali (India) translation
-
 2014-10-05  Milo Casagrande  <milo@ubuntu.com>
 
 	Updated Italian translation
 
-2014-09-25  Мирослав Николић  <miroslavnikolic@rocketmail.com>
+2014-09-25  Saibal Ray  <sray@redhat.com>
 
-	Updated Serbian translation
+	Updated Bengali (India) translation
+
+2014-09-24  Robert Roth  <robert.roth.off@gmail.com>
+
+	Disable internal polkit agent (bgo #737098)
 
 2014-09-23  Krishnababu Krothapalli  <k.meetme@gmail.com>
 
 	Updated Telugu translation
 
+2014-09-22  Kalev Lember  <kalevlember@gmail.com>
+
+	Fix Ukrainian translation for desktop file keywords
+
+	It's a string list and must be terminated with a semicolon.
+
 2014-09-22  Robert Roth  <robert.roth.off@gmail.com>
 
 	Release 3.14.0
diff -Nru gnome-system-monitor-3.14.1/configure gnome-system-monitor-3.15.4/configure
--- gnome-system-monitor-3.14.1/configure	2014-10-13 18:41:31.000000000 +0000
+++ gnome-system-monitor-3.15.4/configure	2015-01-19 17:17:25.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-system-monitor 3.14.1.
+# Generated by GNU Autoconf 2.69 for gnome-system-monitor 3.15.4.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnome-system-monitor'
 PACKAGE_TARNAME='gnome-system-monitor'
-PACKAGE_VERSION='3.14.1'
-PACKAGE_STRING='gnome-system-monitor 3.14.1'
+PACKAGE_VERSION='3.15.4'
+PACKAGE_STRING='gnome-system-monitor 3.15.4'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor'
 PACKAGE_URL=''
 
@@ -1417,7 +1417,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gnome-system-monitor 3.14.1 to adapt to many kinds of systems.
+\`configure' configures gnome-system-monitor 3.15.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1488,7 +1488,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-system-monitor 3.14.1:";;
+     short | recursive ) echo "Configuration of gnome-system-monitor 3.15.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1632,7 +1632,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-system-monitor configure 3.14.1
+gnome-system-monitor configure 3.15.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2098,7 +2098,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gnome-system-monitor $as_me 3.14.1, which was
+It was created by gnome-system-monitor $as_me 3.15.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2967,7 +2967,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-system-monitor'
- VERSION='3.14.1'
+ VERSION='3.15.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17300,7 +17300,7 @@
 EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
 
 distdir: distdir-help-files
-distdir-help-files:
+distdir-help-files: $(_HELP_LC_FILES)
 	@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
 	  $(MKDIR_P) "$(distdir)/$$lc"; \
 	  for file in $(HELP_FILES); do \
@@ -17329,7 +17329,7 @@
 
 .PHONY: install-help
 install-data-am: $(if $(HELP_ID),install-help)
-install-help:
+install-help: $(_HELP_LC_FILES)
 	@for lc in C $(_HELP_LINGUAS); do \
 	  $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
 	done
@@ -17946,7 +17946,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnome-system-monitor $as_me 3.14.1, which was
+This file was extended by gnome-system-monitor $as_me 3.15.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18012,7 +18012,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnome-system-monitor config.status 3.14.1
+gnome-system-monitor config.status 3.15.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru gnome-system-monitor-3.14.1/configure.ac gnome-system-monitor-3.15.4/configure.ac
--- gnome-system-monitor-3.14.1/configure.ac	2014-10-13 18:32:32.000000000 +0000
+++ gnome-system-monitor-3.15.4/configure.ac	2015-01-19 17:16:48.000000000 +0000
@@ -2,7 +2,7 @@
 AC_PREREQ([2.63])
 
 AC_INIT([gnome-system-monitor],
-        [3.14.1],
+        [3.15.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor],
         [gnome-system-monitor])
 
diff -Nru gnome-system-monitor-3.14.1/data/interface.ui gnome-system-monitor-3.15.4/data/interface.ui
--- gnome-system-monitor-3.14.1/data/interface.ui	2014-07-21 19:42:00.000000000 +0000
+++ gnome-system-monitor-3.15.4/data/interface.ui	2014-10-20 20:15:40.000000000 +0000
@@ -40,6 +40,7 @@
             <property name="visible">True</property>
             <property name="active">False</property>
             <property name="valign">center</property>
+            <property name="margin_start">6</property>
             <property name="action_name">win.search</property>
             <property name="action_target">@b false</property>
             <style>
diff -Nru gnome-system-monitor-3.14.1/debian/changelog gnome-system-monitor-3.15.4/debian/changelog
--- gnome-system-monitor-3.14.1/debian/changelog	2015-02-02 17:03:04.000000000 +0000
+++ gnome-system-monitor-3.15.4/debian/changelog	2015-02-13 21:19:20.000000000 +0000
@@ -1,3 +1,11 @@
+gnome-system-monitor (3.15.4-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release.
+  * Drop patches, fixed upstream
+  * Change appdata-tools b-dep to appstream-util
+
+ -- Jackson Doak <noskcaj@ubuntu.com>  Wed, 11 Feb 2015 17:15:36 +1100
+
 gnome-system-monitor (3.14.1-1ubuntu1) vivid; urgency=medium
 
   * Cherry-pick upstream patches from Tim Lunn to show the headerbar as a
diff -Nru gnome-system-monitor-3.14.1/debian/control gnome-system-monitor-3.15.4/debian/control
--- gnome-system-monitor-3.14.1/debian/control	2015-02-02 17:03:10.000000000 +0000
+++ gnome-system-monitor-3.15.4/debian/control	2015-02-13 21:20:37.000000000 +0000
@@ -5,9 +5,10 @@
 Source: gnome-system-monitor
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>, Laurent Bigonville <bigon@debian.org>
-Build-Depends: appdata-tools,
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Laurent Bigonville <bigon@debian.org>
+Build-Depends: appstream-util,
                cdbs,
                debhelper (>= 8),
                desktop-file-utils,
diff -Nru gnome-system-monitor-3.14.1/debian/control.in gnome-system-monitor-3.15.4/debian/control.in
--- gnome-system-monitor-3.14.1/debian/control.in	2014-10-18 08:02:42.000000000 +0000
+++ gnome-system-monitor-3.15.4/debian/control.in	2015-02-13 21:18:07.000000000 +0000
@@ -1,9 +1,10 @@
 Source: gnome-system-monitor
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: appdata-tools,
+Build-Depends: appstream-util,
                cdbs,
                debhelper (>= 8),
                desktop-file-utils,
diff -Nru gnome-system-monitor-3.14.1/debian/patches/0001-Don-t-set-titlebar-class-when-using-headerbar-widget.patch gnome-system-monitor-3.15.4/debian/patches/0001-Don-t-set-titlebar-class-when-using-headerbar-widget.patch
--- gnome-system-monitor-3.14.1/debian/patches/0001-Don-t-set-titlebar-class-when-using-headerbar-widget.patch	2015-02-02 16:58:20.000000000 +0000
+++ gnome-system-monitor-3.15.4/debian/patches/0001-Don-t-set-titlebar-class-when-using-headerbar-widget.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-From 1d7839b7b87ad6a1cc3f31f5d96583e5192fc568 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Wed, 3 Dec 2014 07:42:51 +1100
-Subject: [PATCH] Don't set "titlebar" class when using headerbar widget as a
- toolbar
-
-https://bugzilla.gnome.org/show_bug.cgi?id=741236
----
- src/interface.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/interface.cpp b/src/interface.cpp
-index b40676e..582bb80 100644
---- a/src/interface.cpp
-+++ b/src/interface.cpp
-@@ -646,6 +646,7 @@ create_main_window (GsmApplication *app)
- 
-         mainbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_box"));
-         headerbar = GTK_WIDGET (gtk_builder_get_object (builder, "header_bar"));
-+        gtk_style_context_remove_class (gtk_widget_get_style_context (headerbar), "titlebar");
-         gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
-         gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), FALSE);
-         gtk_box_pack_start (GTK_BOX(mainbox), headerbar, FALSE, FALSE, 0);
--- 
-2.1.4
-
diff -Nru gnome-system-monitor-3.14.1/debian/patches/0001-Use-traditional-titlebars-on-GNOME-DE-s.patch gnome-system-monitor-3.15.4/debian/patches/0001-Use-traditional-titlebars-on-GNOME-DE-s.patch
--- gnome-system-monitor-3.14.1/debian/patches/0001-Use-traditional-titlebars-on-GNOME-DE-s.patch	2015-02-02 16:58:20.000000000 +0000
+++ gnome-system-monitor-3.15.4/debian/patches/0001-Use-traditional-titlebars-on-GNOME-DE-s.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-From a486e06d8ff45cc99508a2b82da96fc5225d3e80 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Wed, 3 Dec 2014 07:42:51 +1100
-Subject: [PATCH] Use traditional titlebars on !GNOME DE's
-
-https://bugzilla.gnome.org/show_bug.cgi?id=741044
----
- src/interface.cpp | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/interface.cpp b/src/interface.cpp
-index a9410b3..b40676e 100644
---- a/src/interface.cpp
-+++ b/src/interface.cpp
-@@ -626,6 +626,8 @@ create_main_window (GsmApplication *app)
-     GtkWidget *process_menu_button;
-     GMenuModel *process_menu_model;
- 
-+    const char* session;
-+
-     int width, height, xpos, ypos;
- 
-     GtkBuilder *builder = gtk_builder_new();
-@@ -637,6 +639,18 @@ create_main_window (GsmApplication *app)
-     gtk_widget_set_name (main_window, "gnome-system-monitor");
-     app->main_window = main_window;
- 
-+    session = g_getenv ("XDG_CURRENT_DESKTOP");
-+    if (session && !strstr (session, "GNOME")){
-+        GtkWidget *mainbox;
-+        GtkWidget *headerbar;
-+
-+        mainbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_box"));
-+        headerbar = GTK_WIDGET (gtk_builder_get_object (builder, "header_bar"));
-+        gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
-+        gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), FALSE);
-+        gtk_box_pack_start (GTK_BOX(mainbox), headerbar, FALSE, FALSE, 0);
-+    }
-+
-     g_settings_get (app->settings, GSM_SETTING_WINDOW_STATE, "(iiii)",
-                     &width, &height, &xpos, &ypos);
-     width = CLAMP (width, 50, gdk_screen_width ());
--- 
-2.1.4
-
diff -Nru gnome-system-monitor-3.14.1/debian/patches/series gnome-system-monitor-3.15.4/debian/patches/series
--- gnome-system-monitor-3.14.1/debian/patches/series	2015-02-02 16:58:30.000000000 +0000
+++ gnome-system-monitor-3.15.4/debian/patches/series	2015-02-13 21:17:47.000000000 +0000
@@ -1,2 +0,0 @@
-0001-Use-traditional-titlebars-on-GNOME-DE-s.patch
-0001-Don-t-set-titlebar-class-when-using-headerbar-widget.patch
diff -Nru gnome-system-monitor-3.14.1/gnome-system-monitor.desktop.in gnome-system-monitor-3.15.4/gnome-system-monitor.desktop.in
--- gnome-system-monitor-3.14.1/gnome-system-monitor.desktop.in	2014-10-13 18:41:37.000000000 +0000
+++ gnome-system-monitor-3.15.4/gnome-system-monitor.desktop.in	2015-01-19 17:17:31.000000000 +0000
@@ -12,5 +12,5 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=system-monitor
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.14.1
+X-GNOME-Bugzilla-Version=3.15.4
 _Keywords=Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;Manager;
diff -Nru gnome-system-monitor-3.14.1/gnome-system-monitor-kde.desktop.in gnome-system-monitor-3.15.4/gnome-system-monitor-kde.desktop.in
--- gnome-system-monitor-3.14.1/gnome-system-monitor-kde.desktop.in	2014-10-13 18:41:37.000000000 +0000
+++ gnome-system-monitor-3.15.4/gnome-system-monitor-kde.desktop.in	2015-01-19 17:17:31.000000000 +0000
@@ -12,5 +12,5 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=system-monitor
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.14.1
+X-GNOME-Bugzilla-Version=3.15.4
 _Keywords=Monitor;System;Process;CPU;Memory;Network;History;Usage;
diff -Nru gnome-system-monitor-3.14.1/help/cs/cs.po gnome-system-monitor-3.15.4/help/cs/cs.po
--- gnome-system-monitor-3.14.1/help/cs/cs.po	2014-10-13 18:18:27.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/cs/cs.po	2014-10-20 20:15:40.000000000 +0000
@@ -703,7 +703,7 @@
 #. (itstool) path: license/p
 #: C/legal.xml:4
 msgid "This work is licensed under a <_:link-1/>."
-msgstr "Tato práce je licencována pod <_:link-1>."
+msgstr "Tato práce je licencována pod <_:link-1/>."
 
 #. (itstool) path: credit/years
 #: C/mem-check.page:20 C/mem-swap.page:20 C/memory-map-use.page:21
diff -Nru gnome-system-monitor-3.14.1/help/cs/legal.xml gnome-system-monitor-3.15.4/help/cs/legal.xml
--- gnome-system-monitor-3.14.1/help/cs/legal.xml	2014-10-13 18:23:43.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/cs/legal.xml	2015-01-10 02:14:09.000000000 +0000
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
 
-  <p>This work is licensed under a
-  <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-  Attribution-ShareAlike 3.0 Unported License</link>.</p>
+  <p>Tato práce je licencována pod <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</link>.</p>
 
 </license>
diff -Nru gnome-system-monitor-3.14.1/help/de/commandline.page gnome-system-monitor-3.15.4/help/de/commandline.page
--- gnome-system-monitor-3.14.1/help/de/commandline.page	2014-07-20 04:58:11.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/commandline.page	2015-01-10 02:14:09.000000000 +0000
@@ -34,12 +34,6 @@
 
   <title>So erhalten Sie die selben Informationen von der Befehlszeile</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Briefly list a few useful command line tools which can provide some of
-    the same information as System Monitor. Don't go into too much detail.</p>
-  </comment>
-
   <p>Ein Großteil der in der Systemüberwachung dargestellten Informationen können Sie auch mit diesen Befehlszeilenwerkzeugen erhalten.</p>
 
 <table rules="rows" frame="top bottom">
diff -Nru gnome-system-monitor-3.14.1/help/de/mem-check.page gnome-system-monitor-3.15.4/help/de/mem-check.page
--- gnome-system-monitor-3.14.1/help/de/mem-check.page	2014-07-20 04:58:11.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/mem-check.page	2015-01-10 02:14:10.000000000 +0000
@@ -41,13 +41,6 @@
 
   <title>Wie viel Speicher wird verwendet?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Go to the Resources tab and look at the graph/indicators (short topic).
-    Point to resources about memory problems. Maybe mention how you can find
-    which processes are using the most memory.</p>
-  </comment>
-
    <p>So überprüfen Sie die derzeitige Speicherauslastung Ihres Rechners:</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/de/memory-map-use.page gnome-system-monitor-3.15.4/help/de/memory-map-use.page
--- gnome-system-monitor-3.14.1/help/de/memory-map-use.page	2014-07-20 04:58:11.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/memory-map-use.page	2015-01-10 02:14:10.000000000 +0000
@@ -36,11 +36,6 @@
 
   <title>Verwendung von Speicherfeldern</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to use the Memory Map feature.</p>
-  </comment>
-
   <p><gui>Virtueller Speicher</gui> ist eine Darstellungsform der Kombination von <gui>Physikalischem Arbeitsspeicher</gui> und <link xref="mem-swap">Auslagerungsspeicher</link> eines Systems. Er ermöglicht laufenden Prozessen mit <em>mehr</em> als dem vorhandenen physikalischen Speicher zu arbeiten, indem Teile des physikalischen Speichers in Dateien auf einem Datenträger <gui>abgebildet</gui> werden. Sobald das System mehr Speicherseiten als verfügbar benötigt, werden einige der bestehenden Seiten <em>ausgelagert</em> oder in den Auslagerungsspeicher geschrieben.</p>
 
   <p>Die <gui>Speicherabbildung</gui> zeigt die gesamte virtuelle Speicherbelegung des Prozesses und kann dazu eingesetzt werden, den Speicherverbrauch einer oder mehrere laufender Instanzen eines Programms festzustellen, die korrekte Verwendung von gemeinsam verwendeten Bibliotheken sicherzustellen, die Ergebnisse einer Anpassung verschiedener Geschwindigkeitsoptimierungsparameter eines Programms zu beurteilen und Probleme wie Speicherlecks eines Programms zu diagnostizieren.</p>
diff -Nru gnome-system-monitor-3.14.1/help/de/mem-swap.page gnome-system-monitor-3.15.4/help/de/mem-swap.page
--- gnome-system-monitor-3.14.1/help/de/mem-swap.page	2014-07-20 04:58:11.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/mem-swap.page	2015-01-10 02:14:10.000000000 +0000
@@ -36,12 +36,6 @@
 
   <title>Was ist »Auslagerungsspeicher«?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain what swap is and how it helps. Explain that the computer may run
-    slowly if it's swapping too much.</p>
-  </comment>
-
   <p>Auslagerungsspeicher ist der Teil des virtuellen Speichersystems auf der Festplatte. Der Speicher wird bei der ersten Installation von Linux als <em>Auslagerungspartition</em> oder <em>Auslagerungsdatei</em> eingerichtet, kann aber auch später hinzugefügt werden.</p>
 
   <note>
diff -Nru gnome-system-monitor-3.14.1/help/de/net-bits.page gnome-system-monitor-3.15.4/help/de/net-bits.page
--- gnome-system-monitor-3.14.1/help/de/net-bits.page	2014-07-20 04:58:11.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/net-bits.page	2015-01-10 02:14:10.000000000 +0000
@@ -35,11 +35,6 @@
 
   <title>Die Netzwerkgeschwindigkeit in Bit anstelle von Byte pro Sekunde anzeigen.</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Brief topic. Explain how to do this, and why you might want to do it.</p>
-  </comment>
-
   <p>Die Netzwerkgeschwindigkeit wird oft in Bit pro Sekunde dargestellt anstatt Byte pro Sekunde. Dies wird die <em>Bitrate</em> bzw. <em>Datenrate</em> genannt.</p>
 
   <p>So wird die Netzwerkgeschwindigkeit in Bit angezeigt:</p>
diff -Nru gnome-system-monitor-3.14.1/help/de/process-explain.page gnome-system-monitor-3.15.4/help/de/process-explain.page
--- gnome-system-monitor-3.14.1/help/de/process-explain.page	2014-07-20 04:58:11.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/process-explain.page	2015-01-10 02:14:10.000000000 +0000
@@ -35,13 +35,6 @@
 
   <title>Was ist ein Prozess?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain, in simple terms, what a process is, how they relate to
- applications, how some are 'system processes', and what you can do with a
- process.</p>
-  </comment>
-
   <p>Ein <gui>Prozess</gui> ist ein Programm oder eine Anwendung, die vom System ausgeführt wird. Wenn eine Anwendung gestartet wird, so weist ihr das System eine eindeutige Prozesskennung (PID) zu und die zugehörigen Anweisungen und Daten werden in den Speicher geladen.</p>
 
   <p>Der Reiter <gui>Prozesse</gui> zeigt Informationen über Prozesse und ermöglicht es einen Prozess <gui>anzuhalten</gui>, <gui>fortzusetzen</gui>, <gui>zu beenden</gui>, <gui>abzuwürgen</gui> oder die Priorität zu ändern. Wenn Sie <gui>Alle Prozesse</gui> wählen, dann enthält die Prozessliste <em>Systemprozesse</em>, die im Hintergrund laufen und verschiedene Dienste bereit stellen.</p>
diff -Nru gnome-system-monitor-3.14.1/help/de/process-identify-file.page gnome-system-monitor-3.15.4/help/de/process-identify-file.page
--- gnome-system-monitor-3.14.1/help/de/process-identify-file.page	2014-07-20 04:58:11.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/process-identify-file.page	2015-01-10 02:14:10.000000000 +0000
@@ -35,12 +35,6 @@
 
   <title>Herausfinden, welches Programm eine spezifische Datei verwendet</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how you can search for a file (or part of a filename) and it will
-    show which processes are using it. Explain why this might be useful.</p>
-  </comment>
-
   <p>Gelegentlich wird eine Fehlermeldung mitteilen, dass ein Gerät (z.B. die Sound-Karte oder das DVD-ROM) belegt ist, oder dass die Datei, welche Sie bearbeiten wollen, geöffnet ist. So finden Sie den verantwortlichen Prozess bzw. die verantwortlichen Prozesse:</p>
 
     <steps>
diff -Nru gnome-system-monitor-3.14.1/help/de/process-identify-hog.page gnome-system-monitor-3.15.4/help/de/process-identify-hog.page
--- gnome-system-monitor-3.14.1/help/de/process-identify-hog.page	2014-07-20 04:58:11.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/process-identify-hog.page	2015-01-10 02:14:10.000000000 +0000
@@ -35,13 +35,6 @@
 
   <title>Welches Programm verlangsamt den Rechner?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how the System Monitor can be used to find
-    misbehaving/resource-hogging processes. (A lot of process use 100% CPU or
-    similar if they hang, for example.)</p>
-  </comment>
-
   <p>Ein Programm, dass mehr als seinen Anteil an CPU-Zeit nutzt, kann den ganzen Rechner verlangsamen. So finden Sie heraus, welcher Prozess dies verursachen könnte:</p>
 
   <steps>	
diff -Nru gnome-system-monitor-3.14.1/help/de/process-update-speed.page gnome-system-monitor-3.15.4/help/de/process-update-speed.page
--- gnome-system-monitor-3.14.1/help/de/process-update-speed.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/process-update-speed.page	2015-01-10 02:14:10.000000000 +0000
@@ -35,13 +35,6 @@
 
   <title>Die Informationen häufiger oder seltener aktualisieren lassen</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to make the info update faster (see Preferences dialog).
-    Explain that faster updates mean that the System Monitor will use more
-    CPU.</p>
-  </comment>
-
   <p>So ändern Sie die Aktualisierungsrate der Informationen:</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/de/solaris-mode.page gnome-system-monitor-3.15.4/help/de/solaris-mode.page
--- gnome-system-monitor-3.14.1/help/de/solaris-mode.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/solaris-mode.page	2015-01-10 02:14:10.000000000 +0000
@@ -35,12 +35,6 @@
 
   <title>Was ist der Solaris-Modus?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Very brief topic. Explain what "Solaris mode" in the preferences dialog
- means. The current manual has some information.</p>
-  </comment>
-
   <p>In einem System mit mehreren CPUs oder <link xref="cpu-multicore">Kernen</link> können Prozesse mehr als eine/einen gleichzeitig verwenden. In der Spalte <gui>% CPU</gui> können Werte auftauchen, die in Summe mehr als 100% ergeben (z.B. 400% in einem System mit 4 CPUs). <gui>Solaris-Modus</gui> teilt den Wert <gui>% CPU</gui> für jeden Prozess durch die Anzahl der CPUs im System, so dass die Summe höchstens 100% ergibt.</p>
 
   <p>So wird die Spalte <gui>% CPU</gui> im <gui>Solaris-Modus</gui> angezeigt:</p>
diff -Nru gnome-system-monitor-3.14.1/help/de/units.page gnome-system-monitor-3.15.4/help/de/units.page
--- gnome-system-monitor-3.14.1/help/de/units.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/de/units.page	2015-01-10 02:14:10.000000000 +0000
@@ -35,11 +35,6 @@
 
   <title>Ist GiB das gleiche wie GB (Gigabyte)?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Answer this question, quite briefly.</p>
-  </comment>
-
     <p>Die Statistiken für Arbeitsspeicher und Festplattenspeicher werden mit <em>IEC Binärvorsätzen</em>: KiB, MiB, GiB, TiB für (kibi, mebi, gibi und tebi) angegeben. Damit ist beabsichtigt zwischen den in der Systemüberwachung verwendeten binären Größenangaben (Vielfache von 1024) und den bei Festplatten gewöhnlich genutzten dezimalen Größenangaben (Vielfache von 1000) zu unterscheiden.</p>
 
     <p>Typische binäre Einheiten:</p>
diff -Nru gnome-system-monitor-3.14.1/help/el/commandline.page gnome-system-monitor-3.15.4/help/el/commandline.page
--- gnome-system-monitor-3.14.1/help/el/commandline.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/commandline.page	2015-01-10 02:14:10.000000000 +0000
@@ -28,12 +28,6 @@
 
   <title>Λήψη των ίδιων πληροφοριών από τη γραμμή εντολών</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Briefly list a few useful command line tools which can provide some of
-    the same information as System Monitor. Don't go into too much detail.</p>
-  </comment>
-
   <p>Οι περισσότερες από τις εμφανιζόμενες πληροφορίες από την παρακολούθηση συστήματος μπορούν επίσης να ληφθούν χρησιμοποιώντας αυτά τα εργαλεία της γραμμής εντολών.</p>
 
 <table rules="rows" frame="top bottom">
diff -Nru gnome-system-monitor-3.14.1/help/el/mem-check.page gnome-system-monitor-3.15.4/help/el/mem-check.page
--- gnome-system-monitor-3.14.1/help/el/mem-check.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/mem-check.page	2015-01-10 02:14:11.000000000 +0000
@@ -35,13 +35,6 @@
 
   <title>Πόση μνήμη χρησιμοποιείται;</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Go to the Resources tab and look at the graph/indicators (short topic).
-    Point to resources about memory problems. Maybe mention how you can find
-    which processes are using the most memory.</p>
-  </comment>
-
    <p>Για να ελέγξετε την τρέχουσα χρήση μνήμης του υπολογιστή σας:</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/el/memory-map-use.page gnome-system-monitor-3.15.4/help/el/memory-map-use.page
--- gnome-system-monitor-3.14.1/help/el/memory-map-use.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/memory-map-use.page	2015-01-10 02:14:11.000000000 +0000
@@ -30,11 +30,6 @@
 
   <title>Χρήση απεικονίσεων μνήμης</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to use the Memory Map feature.</p>
-  </comment>
-
   <p>Η <gui>εικονική μνήμη</gui> είναι μια απεικόνιση μιας συνδυασμένης <gui>φυσικής μνήμης</gui> και ενός <link xref="mem-swap">χώρου εναλλαγής</link> σε ένα σύστημα. Ενεργοποιεί την εκτέλεση διεργασιών για να προσπελάσει <em>περισσότερη</em> από την υπάρχουσα φυσική μνήμη <gui>αντιστοιχώντας</gui> θέσεις στη φυσική μνήμη σε αρχεία στον δίσκο. Όταν το σύστημα χρειάζεται περισσότερες σελίδες μνήμης από αυτές που είναι διαθέσιμες, κάποιες από τις υπάρχουσες σελίδες θα <em>εκτοπιστούν</em> ή θα γραφτούν στον χώρος εναλλαγής.</p>
 
   <p>Η <gui>απεικόνιση μνήμης</gui> εμφανίζει τη χρήση της συνολικής εικονικής μνήμης και μπορεί να χρησιμοποιηθεί για να προσδιορίσει το κόστος μνήμης εκτέλεσης ενός απλού ή πολλαπλού στιγμιοτύπου του προγράμματος, για να εξασφαλίσετε τη χρήση των σωστών κοινόχρηστων βιβλιοθηκών, για να δείτε τα αποτελέσματα της ρύθμισης ποικίλων παραμέτρων συντονισμού απόδοσης που μπορεί να έχει το πρόγραμμα, ή να διαγνώσετε θέματα όπως διαρροές μνήμης.</p>
diff -Nru gnome-system-monitor-3.14.1/help/el/mem-swap.page gnome-system-monitor-3.15.4/help/el/mem-swap.page
--- gnome-system-monitor-3.14.1/help/el/mem-swap.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/mem-swap.page	2015-01-10 02:14:11.000000000 +0000
@@ -30,12 +30,6 @@
 
   <title>Τι είναι "εναλλακτική" μνήμη;</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain what swap is and how it helps. Explain that the computer may run
-    slowly if it's swapping too much.</p>
-  </comment>
-
   <p>Εναλλακτική μνήμη ή <em>χώρος εναλλαγής</em> είναι το συστατικό στον δίσκο του εικονικού συστήματος μνήμης. Είναι προρυθμισμένο ως μια <em>κατάτμηση εναλλαγής</em> ή ένα <em>αρχείο εναλλαγής</em> όταν το Λίνουξ πρωτοεγκαθίσταται, αλλά μπορεί επίσης να προστεθεί αργότερα.</p>
 
   <note>
diff -Nru gnome-system-monitor-3.14.1/help/el/net-bits.page gnome-system-monitor-3.15.4/help/el/net-bits.page
--- gnome-system-monitor-3.14.1/help/el/net-bits.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/net-bits.page	2015-01-10 02:14:11.000000000 +0000
@@ -29,11 +29,6 @@
 
   <title>Εμφανίστε την ταχύτητα δικτύου σε δυαδικά αντί για ψηφιολέξεις ανά δευτερόλεπτο</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Brief topic. Explain how to do this, and why you might want to do it.</p>
-  </comment>
-
   <p>Η ταχύτητα δικτύου εμφανίζεται συχνά σε δυαδικά ανά δευτερόλεπτο, αντί για ψηφιολέξεις ανά δευτερόλεπτο. Αυτό λέγεται <em>ρυθμός δυαδικών</em>, ή <em>ρυθμός δεδομένων</em>.</p>
 
   <p>Για να εμφανίσετε την ταχύτητα δικτύου σε δυαδικά:</p>
diff -Nru gnome-system-monitor-3.14.1/help/el/process-explain.page gnome-system-monitor-3.15.4/help/el/process-explain.page
--- gnome-system-monitor-3.14.1/help/el/process-explain.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/process-explain.page	2015-01-10 02:14:11.000000000 +0000
@@ -29,13 +29,6 @@
 
   <title>Τι είναι μια διεργασία;</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain, in simple terms, what a process is, how they relate to
- applications, how some are 'system processes', and what you can do with a
- process.</p>
-  </comment>
-
   <p>Μια <gui>διεργασία</gui> είναι ένα πρόγραμμα ή εφαρμογή που εκτελείται από το σύστημα. Όταν μια εφαρμογή ξεκινήσει, το σύστημα εκχωρεί ένα μοναδικό αναγνωριστικό διεργασίας (PID) και οι εντολές του και τα δεδομένα φορτώνονται στη μνήμη.</p>
 
   <p>Η καρτέλα <gui>Διεργασίες</gui> εμφανίζει πληροφορίες για τις διεργασίες και σας επιτρέπει <gui>διακοπή</gui>, <gui>συνέχιση</gui>, <gui>τέλος</gui>, <gui>τερματισμό</gui> ή αλλαγή προτεραιότητας μιας διεργασίας. Αν διαλέξετε να εμφανίσετε <gui>Όλες τις διεργασίες</gui>, ο κατάλογος διεργασιών θα συμπεριλάβει τις <em>διεργασίες συστήματος</em>, που τρέχουν στο παρασκήνιο δίνοντας ποικίλες υπηρεσίες που διατηρούν την εκτέλεση ενός υπολογιστή.</p>
diff -Nru gnome-system-monitor-3.14.1/help/el/process-identify-file.page gnome-system-monitor-3.15.4/help/el/process-identify-file.page
--- gnome-system-monitor-3.14.1/help/el/process-identify-file.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/process-identify-file.page	2015-01-10 02:14:11.000000000 +0000
@@ -29,12 +29,6 @@
 
   <title>Εύρεση του προγράμματος που χρησιμοποιεί ένα συγκεκριμένο αρχείο</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how you can search for a file (or part of a filename) and it will
-    show which processes are using it. Explain why this might be useful.</p>
-  </comment>
-
   <p>Μερικές φορές ένα μήνυμα σφάλματος θα σας πει ότι μια συσκευή (όπως η συσκευή ήχου ή το DVD ROM) είναι απασχολημένη, ή το αρχείο που θέλετε να επεξεργαστείτε χρησιμοποιείται. Για να βρείτε την υπεύθυνη διεργασία ή διεργασίες:</p>
 
     <steps>
diff -Nru gnome-system-monitor-3.14.1/help/el/process-identify-hog.page gnome-system-monitor-3.15.4/help/el/process-identify-hog.page
--- gnome-system-monitor-3.14.1/help/el/process-identify-hog.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/process-identify-hog.page	2015-01-10 02:14:11.000000000 +0000
@@ -29,13 +29,6 @@
 
   <title>Ποιο πρόγραμμα κάνει τον υπολογιστή να τρέχει αργά;</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how the System Monitor can be used to find
-    misbehaving/resource-hogging processes. (A lot of process use 100% CPU or
-    similar if they hang, for example.)</p>
-  </comment>
-
   <p>Ένα πρόγραμμα που χρησιμοποιεί περισσότερη από το μερίδιο του στην CPU μπορεί να επιβραδύνει όλον τον υπολογιστή. Για να βρείτε ποια διεργασία μπορεί να το κάνει αυτό:</p>
 
   <steps>	
diff -Nru gnome-system-monitor-3.14.1/help/el/process-update-speed.page gnome-system-monitor-3.15.4/help/el/process-update-speed.page
--- gnome-system-monitor-3.14.1/help/el/process-update-speed.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/process-update-speed.page	2015-01-10 02:14:11.000000000 +0000
@@ -29,13 +29,6 @@
 
   <title>Κάντε την ενημέρωση πληροφοριών πιο γρήγορη ή πιο αργή</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to make the info update faster (see Preferences dialog).
-    Explain that faster updates mean that the System Monitor will use more
-    CPU.</p>
-  </comment>
-
   <p>Για να αλλάξετε την ταχύτητα ανανέωσης πληροφοριών:</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/el/solaris-mode.page gnome-system-monitor-3.15.4/help/el/solaris-mode.page
--- gnome-system-monitor-3.14.1/help/el/solaris-mode.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/solaris-mode.page	2015-01-10 02:14:11.000000000 +0000
@@ -29,12 +29,6 @@
 
   <title>Τι είναι η κατάσταση Solaris;</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Very brief topic. Explain what "Solaris mode" in the preferences dialog
- means. The current manual has some information.</p>
-  </comment>
-
   <p>Σε ένα σύστημα που έχει πολλές CPUs ή <link xref="cpu-multicore">πυρήνες</link>, οι διεργασίες μπορεί να χρησιμοποιούν περισσότερες από μία ταυτόχρονα. Είναι δυνατό η στήλη <gui>% CPU</gui> να εμφανίζει τιμές που το άθροισμα είναι μεγαλύτερο από 100%. (δηλαδή 400% σε ένα σύστημα με 4 CPU). Η <gui>κατάσταση Solaris</gui> διαιρεί την <gui>% CPU</gui> για κάθε διεργασία με τον αριθμό των CPUs στο σύστημα, έτσι ώστε το άθροισμα να είναι 100%.</p>
 
   <p>Για να εμφανίσετε τη <gui>% CPU</gui> σε <gui>κατάσταση Solaris</gui>:</p>
diff -Nru gnome-system-monitor-3.14.1/help/el/units.page gnome-system-monitor-3.15.4/help/el/units.page
--- gnome-system-monitor-3.14.1/help/el/units.page	2014-07-20 04:58:12.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/el/units.page	2015-01-10 02:14:11.000000000 +0000
@@ -29,11 +29,6 @@
 
   <title>Είναι το ίδιο GiB με GB (gigabyte);</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Answer this question, quite briefly.</p>
-  </comment>
-
     <p>Τα στατιστικά μνήμης και δίσκου εμφανίζονται χρησιμοποιώντας <em>δυαδικά προθέματα IEC</em>, KiB, MiB, GiB, TiB (για kibi, mebi, gibi and tebi). Αυτά αποσκοπούν στη διάκριση δυαδικών αναφορών μεγεθών που χρησιμοποιούνται στην παρακολούθηση συστήματος (πολλαπλάσια του 1024) από τα δεκαδικά μεγέθη (πολλαπλάσια του 1000) συνήθως χρησιμοποιούμενα, για παράδειγμα, στη συσκευασία σκληρών δίσκων.</p>
 
     <p>Τυπικές μονάδες δυαδικών:</p>
diff -Nru gnome-system-monitor-3.14.1/help/es/commandline.page gnome-system-monitor-3.15.4/help/es/commandline.page
--- gnome-system-monitor-3.14.1/help/es/commandline.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/commandline.page	2015-01-10 02:14:11.000000000 +0000
@@ -28,12 +28,6 @@
 
   <title>Obtener la misma información usando la línea de comandos</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Briefly list a few useful command line tools which can provide some of
-    the same information as System Monitor. Don't go into too much detail.</p>
-  </comment>
-
   <p>La mayor parte de la información mostrada por el Monitor del sistema se puede obtener usando las herramientas de línea de comandos.</p>
 
 <table rules="rows" frame="top bottom">
diff -Nru gnome-system-monitor-3.14.1/help/es/mem-check.page gnome-system-monitor-3.15.4/help/es/mem-check.page
--- gnome-system-monitor-3.14.1/help/es/mem-check.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/mem-check.page	2015-01-10 02:14:12.000000000 +0000
@@ -35,13 +35,6 @@
 
   <title>¿Cuánta memoria se está usando?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Go to the Resources tab and look at the graph/indicators (short topic).
-    Point to resources about memory problems. Maybe mention how you can find
-    which processes are using the most memory.</p>
-  </comment>
-
    <p>Para comprobar el uso actual de memoria del equipo:</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/es/memory-map-use.page gnome-system-monitor-3.15.4/help/es/memory-map-use.page
--- gnome-system-monitor-3.14.1/help/es/memory-map-use.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/memory-map-use.page	2015-01-10 02:14:12.000000000 +0000
@@ -30,11 +30,6 @@
 
   <title>Usar mapas de memoria</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to use the Memory Map feature.</p>
-  </comment>
-
   <p>La <gui>Memoria virtual</gui> es la representación combinada de la <gui>memoria física</gui> y el <link xref="mem-swap">espacio de intercambio</link> en un sistema. Permite ejecutar procesos que puedan acceder a <em>más</em> memoria de la física <gui>mapeando</gui> ubicaciones de la memoria física a archivos en el disco. Cuando el sistema necesita más páginas de memoria de las que hay disponibles, algunas de las páginas existentes se <em>paginarán</em>, es decir, se es escribirán en el espacio de intercambio.</p>
 
   <p>El <gui>mapa de memoria</gui> muestra la memoria virtual total usada por el proceso, y se puede usar para determinar el coste en memoria de ejecutar una o varias instancias del programa, para asegurarse del correcto uso de bibliotecas compartidas, para ver el resultado de ajustar varios parámetros de configuración del rendimiento que el programa pueda tener o para diagnosticar problemas como fugas de memoria.</p>
diff -Nru gnome-system-monitor-3.14.1/help/es/mem-swap.page gnome-system-monitor-3.15.4/help/es/mem-swap.page
--- gnome-system-monitor-3.14.1/help/es/mem-swap.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/mem-swap.page	2015-01-10 02:14:12.000000000 +0000
@@ -30,12 +30,6 @@
 
   <title>¿Qué es la memoria «swap»?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain what swap is and how it helps. Explain that the computer may run
-    slowly if it's swapping too much.</p>
-  </comment>
-
   <p>La memoria «swap» o <em>espacio de intercambio</em> es una parte de la memoria virtual del sistema en disco. Está configurada como una <em>partición de intercambio</em> o un <em>archivo de intercambio</em> donde se ha instalado Linux, pero se puede haber añadido posteriormente.</p>
 
   <note>
diff -Nru gnome-system-monitor-3.14.1/help/es/net-bits.page gnome-system-monitor-3.15.4/help/es/net-bits.page
--- gnome-system-monitor-3.14.1/help/es/net-bits.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/net-bits.page	2015-01-10 02:14:12.000000000 +0000
@@ -29,11 +29,6 @@
 
   <title>Mostrar la velocidad de la red en bits en lugar de en bytes por segundo</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Brief topic. Explain how to do this, and why you might want to do it.</p>
-  </comment>
-
   <p>A menudo, la velocidad de la red se muestra en bits por segundo, en lugar de en bytes por segundo. Esto se llama <em>tasa de bits</em>, o <em>tasa de datos</em>.</p>
 
   <p>Para mostrar la velocidad de la red en bits:</p>
diff -Nru gnome-system-monitor-3.14.1/help/es/process-explain.page gnome-system-monitor-3.15.4/help/es/process-explain.page
--- gnome-system-monitor-3.14.1/help/es/process-explain.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/process-explain.page	2015-01-10 02:14:12.000000000 +0000
@@ -29,13 +29,6 @@
 
   <title>¿Qué es un proceso?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain, in simple terms, what a process is, how they relate to
- applications, how some are 'system processes', and what you can do with a
- process.</p>
-  </comment>
-
   <p>Un <gui>proceso</gui> es un programa o una aplicación que el sistema ejecuta. Cuando se lanza la aplicación, el sistema le asigna un ID de proceso único (PDI) y sus instrucciones y sus datos se cargan en la memoria.</p>
 
   <p>La pestaña <gui>Procesos</gui> muestra información sobre los procesos y le permite <gui>Detener</gui>, <gui>Continuar</gui>, <gui>Finalizar</gui>, <gui>Matar</gui>, o cambiar la prioridad de un proceso. Si elige mostrar <gui>Todos los procesos</gui>, la lista de procesos incluirá los <em>procesos del sistema</em>, que se ejecutan en segundo planto proporcionando varios servicios que mantienen el equipo en ejecución.</p>
diff -Nru gnome-system-monitor-3.14.1/help/es/process-identify-file.page gnome-system-monitor-3.15.4/help/es/process-identify-file.page
--- gnome-system-monitor-3.14.1/help/es/process-identify-file.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/process-identify-file.page	2015-01-10 02:14:12.000000000 +0000
@@ -29,12 +29,6 @@
 
   <title>Saber qué programa está usando un archivo en concreto</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how you can search for a file (or part of a filename) and it will
-    show which processes are using it. Explain why this might be useful.</p>
-  </comment>
-
   <p>A veces un mensaje de error dice que un dispositivo (como la tarjeta de sonido o el DVD) está ocupado, o que el archivo que quiere editar se está usando. Para buscar el proceso o los procesos responsables.</p>
 
     <steps>
diff -Nru gnome-system-monitor-3.14.1/help/es/process-identify-hog.page gnome-system-monitor-3.15.4/help/es/process-identify-hog.page
--- gnome-system-monitor-3.14.1/help/es/process-identify-hog.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/process-identify-hog.page	2015-01-10 02:14:12.000000000 +0000
@@ -29,13 +29,6 @@
 
   <title>¿Qué programa está haciendo que el equipo vaya lento?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how the System Monitor can be used to find
-    misbehaving/resource-hogging processes. (A lot of process use 100% CPU or
-    similar if they hang, for example.)</p>
-  </comment>
-
   <p>Un programa que esté consumiendo más memoria de la que le corresponde puede ralentizar todo el equipo. Para saber qué proceso puede estar haciendo esto:</p>
 
   <steps>	
diff -Nru gnome-system-monitor-3.14.1/help/es/process-update-speed.page gnome-system-monitor-3.15.4/help/es/process-update-speed.page
--- gnome-system-monitor-3.14.1/help/es/process-update-speed.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/process-update-speed.page	2015-01-10 02:14:12.000000000 +0000
@@ -29,13 +29,6 @@
 
   <title>Hacer que la información se actualice con mayor o menor frecuencia</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to make the info update faster (see Preferences dialog).
-    Explain that faster updates mean that the System Monitor will use more
-    CPU.</p>
-  </comment>
-
   <p>Para cambiar la velocidad de actualización de la información.</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/es/solaris-mode.page gnome-system-monitor-3.15.4/help/es/solaris-mode.page
--- gnome-system-monitor-3.14.1/help/es/solaris-mode.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/solaris-mode.page	2015-01-10 02:14:12.000000000 +0000
@@ -29,12 +29,6 @@
 
   <title>¿Qué es el modo Solaris?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Very brief topic. Explain what "Solaris mode" in the preferences dialog
- means. The current manual has some information.</p>
-  </comment>
-
   <p>En sistemas que tienen varias CPU o varios <link xref="cpu-multicore">núcleos</link>, los procesos pueden usar más de uno al mismo tiempo. Es posible que la columna <gui>% CPU</gui> muestre valores superiores al 100% (ej 400% en un sistema de 4 CPU). El <gui>modo Solaris</gui> divide el <gui>% CPU</gui> de cada proceso entre el número de CPU del sistema, por lo que el total será el 100%.</p>
 
   <p>Para mostrar el <gui>% CPU</gui> en el <gui>modo Solaris</gui>:</p>
diff -Nru gnome-system-monitor-3.14.1/help/es/units.page gnome-system-monitor-3.15.4/help/es/units.page
--- gnome-system-monitor-3.14.1/help/es/units.page	2014-07-20 04:58:13.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/es/units.page	2015-01-10 02:14:12.000000000 +0000
@@ -29,11 +29,6 @@
 
   <title>¿Es lo mismo GiB que GB (gigabyte)?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Answer this question, quite briefly.</p>
-  </comment>
-
     <p>Las estadísticas de memoria y de espacio de disco se muestran usando <em>prefijos binarios IEC</em>, KiB, MiB, GiB, TiB (para kibi, mebi, gibi y tebi). Estos es así para distinguir los tamaños en binario usados por el Monitor del sistema (múltiplos de 1024) de los tamaños decimales (múltiplos de 1000) usados frecuentemente, por ejemplo, en las especificaciones de los discos duros.</p>
 
     <p>Unidades binarias típicas</p>
diff -Nru gnome-system-monitor-3.14.1/help/fr/commandline.page gnome-system-monitor-3.15.4/help/fr/commandline.page
--- gnome-system-monitor-3.14.1/help/fr/commandline.page	2014-09-24 19:17:17.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/commandline.page	2015-01-10 02:14:12.000000000 +0000
@@ -40,12 +40,6 @@
 
   <title>Obtention des mêmes informations en ligne de commande</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Briefly list a few useful command line tools which can provide some of
-    the same information as System Monitor. Don't go into too much detail.</p>
-  </comment>
-
   <p>La plupart des informations affichées par le moniteur système peuvent également être obtenues en utilisant ces outils en ligne de commande.</p>
 
 <table rules="rows" frame="top bottom">
diff -Nru gnome-system-monitor-3.14.1/help/fr/mem-check.page gnome-system-monitor-3.15.4/help/fr/mem-check.page
--- gnome-system-monitor-3.14.1/help/fr/mem-check.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/mem-check.page	2015-01-10 02:14:13.000000000 +0000
@@ -47,13 +47,6 @@
 
   <title>Quantité de mémoire utilisée</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Go to the Resources tab and look at the graph/indicators (short topic).
-    Point to resources about memory problems. Maybe mention how you can find
-    which processes are using the most memory.</p>
-  </comment>
-
    <p>Pour connaître l'utilisation actuelle de la mémoire de votre ordinateur :</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/fr/memory-map-use.page gnome-system-monitor-3.15.4/help/fr/memory-map-use.page
--- gnome-system-monitor-3.14.1/help/fr/memory-map-use.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/memory-map-use.page	2015-01-10 02:14:13.000000000 +0000
@@ -42,11 +42,6 @@
 
   <title>Utilisation des cartes de la mémoire</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to use the Memory Map feature.</p>
-  </comment>
-
   <p>La <gui>Mem. virtuelle</gui> est une combinaison de la <gui>Mémoire physique</gui> et de l'<link xref="mem-swap">espace d'échange</link> dans un système. Elle permet aux processus actifs d'accéder à <em>davantage</em> de mémoire que la mémoire existante en <gui>reliant</gui> les localisations dans la mémoire physique aux fichiers sur disque. Quand le système nécessite plus de pages mémoires que disponible, certaines pages sont <em>désindexées</em> ou écrites dans l'espace d'échange.</p>
 
   <p>Les <gui>Cartes de la mémoire</gui> affichent l'utilisation totale de la mémoire virtuelle par un processus. Elles peuvent être utilisées pour déterminer le coût en terme de mémoire lors de l'exécution d'une ou plusieurs instances d'un programme, afin d'assurer l'utilisation correcte des bibliothèques partagées, de savoir comment ajuster les paramètres de performance disponibles dans un programme, ou de diagnostiquer des problèmes comme les fuites de mémoire.</p>
diff -Nru gnome-system-monitor-3.14.1/help/fr/mem-swap.page gnome-system-monitor-3.15.4/help/fr/mem-swap.page
--- gnome-system-monitor-3.14.1/help/fr/mem-swap.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/mem-swap.page	2015-01-10 02:14:13.000000000 +0000
@@ -42,12 +42,6 @@
 
   <title>La mémoire d'échange</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain what swap is and how it helps. Explain that the computer may run
-    slowly if it's swapping too much.</p>
-  </comment>
-
   <p>La mémoire d'échange ou <em>espace d'échange</em> est le composant sur disque du système de mémoire virtuelle. Elle est pré-configurée comme une <em>partition swap</em> ou un <em>fichier swap</em> quand Linux est installé pour la première fois, mais  peut être également ajoutée par la suite.</p>
 
   <note>
diff -Nru gnome-system-monitor-3.14.1/help/fr/net-bits.page gnome-system-monitor-3.15.4/help/fr/net-bits.page
--- gnome-system-monitor-3.14.1/help/fr/net-bits.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/net-bits.page	2015-01-10 02:14:13.000000000 +0000
@@ -41,11 +41,6 @@
 
   <title>Affichage de la vitesse du réseau en bits au lieu d'octets par seconde</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Brief topic. Explain how to do this, and why you might want to do it.</p>
-  </comment>
-
   <p>La vitesse du réseau est souvent affichée en bits par seconde, plutôt qu'en octets par seconde. Cela s'appelle le <em>débit binaire</em> ou le <em>débit de données</em>.</p>
 
   <p>Pour afficher la vitesse du réseau en bits :</p>
diff -Nru gnome-system-monitor-3.14.1/help/fr/process-explain.page gnome-system-monitor-3.15.4/help/fr/process-explain.page
--- gnome-system-monitor-3.14.1/help/fr/process-explain.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/process-explain.page	2015-01-10 02:14:13.000000000 +0000
@@ -41,13 +41,6 @@
 
   <title>Définition d'un processus</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain, in simple terms, what a process is, how they relate to
- applications, how some are 'system processes', and what you can do with a
- process.</p>
-  </comment>
-
   <p>Un <gui>processus</gui> est un programme ou une application qui est exécuté par le système. Quand une application est lancée, le système lui assigne un identifiant unique de processus (PID), et ses instructions et données sont chargées dans la mémoire.</p>
 
   <p>L’onglet <gui>Processus</gui> affiche les informations sur les processus, et vous permet de <gui>Stopper</gui>, de <gui>Continuer</gui>, de <gui>Terminer</gui>, de <gui>Tuer</gui> ou de <gui>Modifier la priorité d'un processus</gui>. Si vous choisissez d'afficher <gui>Tous les processus</gui>, la liste des processus inclut alors les <em>processus systèmes</em>, qui tournent en arrière-plan, fournissant divers services qui permettent à l'ordinateur de continuer à fonctionner. Les processus à afficher sont fixés dans les Préférences à la rubrique <gui>Champs d'information</gui>.</p>
diff -Nru gnome-system-monitor-3.14.1/help/fr/process-identify-file.page gnome-system-monitor-3.15.4/help/fr/process-identify-file.page
--- gnome-system-monitor-3.14.1/help/fr/process-identify-file.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/process-identify-file.page	2015-01-10 02:14:13.000000000 +0000
@@ -41,12 +41,6 @@
 
   <title>Recherche du programme utilisant un fichier spécifique</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how you can search for a file (or part of a filename) and it will
-    show which processes are using it. Explain why this might be useful.</p>
-  </comment>
-
   <p>Parfois un message d'erreur vous indique qu'un périphérique (comme le périphérique son ou le DVD ROM) est occupé, ou que le fichier que vous souhaitez modifier est utilisé. Pour chercher le processus responsable :</p>
 
     <steps>
diff -Nru gnome-system-monitor-3.14.1/help/fr/process-identify-hog.page gnome-system-monitor-3.15.4/help/fr/process-identify-hog.page
--- gnome-system-monitor-3.14.1/help/fr/process-identify-hog.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/process-identify-hog.page	2015-01-10 02:14:13.000000000 +0000
@@ -41,13 +41,6 @@
 
   <title>Recherche du programme qui ralentit l'ordinateur</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how the System Monitor can be used to find
-    misbehaving/resource-hogging processes. (A lot of process use 100% CPU or
-    similar if they hang, for example.)</p>
-  </comment>
-
   <p>Un programme qui utilise plus que sa part du CPU peut ralentir tout l'ordinateur. Pour chercher le processus potentiellement responsable :</p>
 
   <steps>	
diff -Nru gnome-system-monitor-3.14.1/help/fr/process-update-speed.page gnome-system-monitor-3.15.4/help/fr/process-update-speed.page
--- gnome-system-monitor-3.14.1/help/fr/process-update-speed.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/process-update-speed.page	2015-01-10 02:14:13.000000000 +0000
@@ -41,13 +41,6 @@
 
   <title>Modification de la fréquence de mise à jour des informations</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to make the info update faster (see Preferences dialog).
-    Explain that faster updates mean that the System Monitor will use more
-    CPU.</p>
-  </comment>
-
   <p>Pour modifier la fréquence de mise à jour des informations :</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/fr/solaris-mode.page gnome-system-monitor-3.15.4/help/fr/solaris-mode.page
--- gnome-system-monitor-3.14.1/help/fr/solaris-mode.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/solaris-mode.page	2015-01-10 02:14:13.000000000 +0000
@@ -41,12 +41,6 @@
 
   <title>Définition du mode Solaris</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Very brief topic. Explain what "Solaris mode" in the preferences dialog
- means. The current manual has some information.</p>
-  </comment>
-
   <p>Dans un système qui a plusieurs CPU ou <link xref="cpu-multicore">cœurs</link>, les processus peuvent en utiliser plus d'un en même temps. Il est possible que la colonne <gui>% CPU</gui> affiche des valeurs supérieures à 100% (par exemple 400% dans un système à 4 cœurs). Le <gui>Mode Solaris</gui> divise le <gui>% CPU</gui> pour chaque processus par le nombre de CPU du système pour que le total soit 100%.</p>
 
   <p>Pour afficher le <gui>% CPU</gui> en <gui>Mode Solaris</gui> :</p>
diff -Nru gnome-system-monitor-3.14.1/help/fr/units.page gnome-system-monitor-3.15.4/help/fr/units.page
--- gnome-system-monitor-3.14.1/help/fr/units.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/fr/units.page	2015-01-10 02:14:13.000000000 +0000
@@ -41,11 +41,6 @@
 
   <title>Différences entre Gio (gibioctet) et Go (gigaoctet)</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Answer this question, quite briefly.</p>
-  </comment>
-
     <p>Les statistiques de l'espace mémoire et disque sont affichées à l'aide des <em>préfixes binaires de la CEI</em>, Kio, Mio, Gio, Tio (pour kibi, mebi, gibi et tebi). Ceci pour distinguer l'unité de mesure en base binaire utilisée par le moniteur système (multiples de 1024) de l'unité de mesure en base décimale (multiples de 1000) utilisée habituellement, par exemple, sur les boîtes des disques durs.</p>
 
     <p>Unités typiques en base binaire :</p>
diff -Nru gnome-system-monitor-3.14.1/help/hu/commandline.page gnome-system-monitor-3.15.4/help/hu/commandline.page
--- gnome-system-monitor-3.14.1/help/hu/commandline.page	2014-07-20 04:58:14.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/commandline.page	2015-01-10 02:14:14.000000000 +0000
@@ -28,12 +28,6 @@
 
   <title>Ugyanezen információk elérése a parancssorból</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Briefly list a few useful command line tools which can provide some of
-    the same information as System Monitor. Don't go into too much detail.</p>
-  </comment>
-
   <p>A Rendszerfigyelő által megjelenített információk a következő parancssori eszközökkel is beszerezhetők.</p>
 
 <table rules="rows" frame="top bottom">
diff -Nru gnome-system-monitor-3.14.1/help/hu/mem-check.page gnome-system-monitor-3.15.4/help/hu/mem-check.page
--- gnome-system-monitor-3.14.1/help/hu/mem-check.page	2014-07-20 04:58:14.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/mem-check.page	2015-01-10 02:14:14.000000000 +0000
@@ -35,13 +35,6 @@
 
   <title>Mennyi memória van használatban?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Go to the Resources tab and look at the graph/indicators (short topic).
-    Point to resources about memory problems. Maybe mention how you can find
-    which processes are using the most memory.</p>
-  </comment>
-
    <p>A számítógép jelenlegi memóriahasználatának ellenőrzése:</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/hu/memory-map-use.page gnome-system-monitor-3.15.4/help/hu/memory-map-use.page
--- gnome-system-monitor-3.14.1/help/hu/memory-map-use.page	2014-07-20 04:58:15.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/memory-map-use.page	2015-01-10 02:14:14.000000000 +0000
@@ -30,11 +30,6 @@
 
   <title>Memóriatérképek használata</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to use the Memory Map feature.</p>
-  </comment>
-
   <p>A <gui>virtuális memória</gui> a <gui>fizikai memória</gui> és a <link xref="mem-swap">swap terület</link> egyesített ábrázolása a rendszeren. Ez a fizikai memóriában lévő helyek lemezen lévő fájlokra való <gui>leképezésével</gui> lehetővé teszi a folyamatoknak, hogy a meglévő fizikai memóriánál <em>többet</em> érjenek el. Ha a rendszernek az elérhetőnél több memórialapra van szüksége, akkor a meglévő lapok egy része a swap területre kerül kiírásra.</p>
 
   <p>A <gui>memóriatérkép</gui> megjeleníti a folyamat teljes virtuálismemória-használatát, és használatával megállapítható a program egy vagy több példányának memóriaköltsége, ellenőrizhető a megfelelő megosztott programkönyvtárak használata, illetve a program esetlegesen elérhető  teljesítményhangolási paramétereinek hatása, vagy felismerhetők a memóriaszivárgáshoz hasonló problémák.</p>
diff -Nru gnome-system-monitor-3.14.1/help/hu/mem-swap.page gnome-system-monitor-3.15.4/help/hu/mem-swap.page
--- gnome-system-monitor-3.14.1/help/hu/mem-swap.page	2014-07-20 04:58:15.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/mem-swap.page	2015-01-10 02:14:14.000000000 +0000
@@ -30,12 +30,6 @@
 
   <title>Mi az a „swap” memória?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain what swap is and how it helps. Explain that the computer may run
-    slowly if it's swapping too much.</p>
-  </comment>
-
   <p>A swap memória vagy <em>swap terület</em> (csere terület) a virtuálismemória-rendszer lemezen lévő része. A rendszer telepítésekor jön létre <em>swap partícióként</em> vagy <em>swap fájlként</em>, de utólag is hozzáadható.</p>
 
   <note>
diff -Nru gnome-system-monitor-3.14.1/help/hu/net-bits.page gnome-system-monitor-3.15.4/help/hu/net-bits.page
--- gnome-system-monitor-3.14.1/help/hu/net-bits.page	2014-07-20 04:58:15.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/net-bits.page	2015-01-10 02:14:14.000000000 +0000
@@ -29,11 +29,6 @@
 
   <title>A másodpercenkénti hálózati sebesség megjelenítése bitekben bájtok helyett</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Brief topic. Explain how to do this, and why you might want to do it.</p>
-  </comment>
-
   <p>A hálózati sebesség gyakran bit/másodpercben jelenik meg bájt/másodperc helyett. Ezt <em>bitsebességnek</em> vagy <em>adatsebességnek</em> is hívják.</p>
 
   <p>A hálózati sebesség bitekben való megjelenítéséhez:</p>
diff -Nru gnome-system-monitor-3.14.1/help/hu/process-explain.page gnome-system-monitor-3.15.4/help/hu/process-explain.page
--- gnome-system-monitor-3.14.1/help/hu/process-explain.page	2014-07-20 04:58:15.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/process-explain.page	2015-01-10 02:14:14.000000000 +0000
@@ -29,13 +29,6 @@
 
   <title>Mi az a folyamat?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain, in simple terms, what a process is, how they relate to
- applications, how some are 'system processes', and what you can do with a
- process.</p>
-  </comment>
-
   <p>A <gui>folyamat</gui> egy éppen végrehajtás alatt álló program vagy alkalmazás a rendszeren. Egy alkalmazás elindításakor a rendszer egy egyedi folyamatazonosítót (PID) rendel hozzá, és az utasításai és adatai betöltésre kerülnek a memóriába.</p>
 
   <p>A <gui>Folyamatok</gui> lap megjeleníti a folyamatok információit, és lehetővé teszi azok <gui>Leállítását</gui>, <gui>Folytatását</gui>, <gui>Befejezését</gui>, <gui>Kilövését</gui> vagy a prioritásuk megváltoztatását. Ha <gui>Minden folyamat</gui> megjelenítését választja, akkor a folyamatlista tartalmazni fogja a <em>rendszerfolyamatokat</em>, amelyek a háttérben futnak és különböző, a számítógép működéséhez szükséges szolgáltatásokat biztosítanak.</p>
diff -Nru gnome-system-monitor-3.14.1/help/hu/process-identify-file.page gnome-system-monitor-3.15.4/help/hu/process-identify-file.page
--- gnome-system-monitor-3.14.1/help/hu/process-identify-file.page	2014-07-20 04:58:15.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/process-identify-file.page	2015-01-10 02:14:14.000000000 +0000
@@ -29,12 +29,6 @@
 
   <title>Adott fájlt használó program megkeresése</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how you can search for a file (or part of a filename) and it will
-    show which processes are using it. Explain why this might be useful.</p>
-  </comment>
-
   <p>Néha kaphat olyan hibaüzenetet, amely szerint egy eszköz (például hangeszköz vagy a DVD-olvasó) foglalt, vagy a szerkeszteni kívánt fájl használatban van. Az ezért felelős folyamatok megkereséséhez:</p>
 
     <steps>
diff -Nru gnome-system-monitor-3.14.1/help/hu/process-identify-hog.page gnome-system-monitor-3.15.4/help/hu/process-identify-hog.page
--- gnome-system-monitor-3.14.1/help/hu/process-identify-hog.page	2014-07-20 04:58:15.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/process-identify-hog.page	2015-01-10 02:14:14.000000000 +0000
@@ -29,13 +29,6 @@
 
   <title>Melyik program miatt fut lassan a számítógép?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how the System Monitor can be used to find
-    misbehaving/resource-hogging processes. (A lot of process use 100% CPU or
-    similar if they hang, for example.)</p>
-  </comment>
-
   <p>Az a program, amely több CPU-időt használ az átlagosnál, az egész számítógépet lelassíthatja. Az ilyen folyamatok megtalálásához:</p>
 
   <steps>	
diff -Nru gnome-system-monitor-3.14.1/help/hu/process-update-speed.page gnome-system-monitor-3.15.4/help/hu/process-update-speed.page
--- gnome-system-monitor-3.14.1/help/hu/process-update-speed.page	2014-07-20 04:58:15.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/process-update-speed.page	2015-01-10 02:14:14.000000000 +0000
@@ -29,13 +29,6 @@
 
   <title>Az információk gyorsabb vagy lassabb frissítése</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to make the info update faster (see Preferences dialog).
-    Explain that faster updates mean that the System Monitor will use more
-    CPU.</p>
-  </comment>
-
   <p>Az információk frissítési sebességének módosításához:</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/hu/solaris-mode.page gnome-system-monitor-3.15.4/help/hu/solaris-mode.page
--- gnome-system-monitor-3.14.1/help/hu/solaris-mode.page	2014-07-20 04:58:15.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/solaris-mode.page	2015-01-10 02:14:14.000000000 +0000
@@ -29,12 +29,6 @@
 
   <title>Mi az a Solaris mód?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Very brief topic. Explain what "Solaris mode" in the preferences dialog
- means. The current manual has some information.</p>
-  </comment>
-
   <p>Egy több processzorral vagy <link xref="cpu-multicore">maggal</link> rendelkező rendszeren a folyamatok egyszerre több magot is használhatnak. Előfordulhat, hogy a <gui>% CPU</gui> oszlop olyan értékeket jelenít meg, amelyek összesen 100%-nál nagyobbak (például egy 4 magos rendszeren 400%). A <gui>Solaris mód</gui> minden folyamat esetén elosztja a <gui>% CPU</gui> értéket a rendszer CPU-inak számával, így az összeg 100% lesz.</p>
 
   <p>A <gui>% CPU</gui> megjelenítéséhez <gui>Solaris módban</gui>:</p>
diff -Nru gnome-system-monitor-3.14.1/help/hu/units.page gnome-system-monitor-3.15.4/help/hu/units.page
--- gnome-system-monitor-3.14.1/help/hu/units.page	2014-07-20 04:58:15.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/hu/units.page	2015-01-10 02:14:14.000000000 +0000
@@ -29,11 +29,6 @@
 
   <title>A GiB ugyanaz, mint a GB (gigabájt)?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Answer this question, quite briefly.</p>
-  </comment>
-
     <p>A megjelenített memória- és lemezterület-statisztikák <em>IEC bináris előtagokat</em> használnak: KiB, MiB, GiB, TiB (kibi, mebi, gibi és tebi). Ezeket a Rendszerfigyelő által használt bináris méretek (1024 többszörösei) megkülönböztetésére szolgál az általánosan, például háttértárak csomagolásain használt decimális méretektől (1000 többszörösei).</p>
 
     <p>Tipikus bináris egységek:</p>
diff -Nru gnome-system-monitor-3.14.1/help/ro/commandline.page gnome-system-monitor-3.15.4/help/ro/commandline.page
--- gnome-system-monitor-3.14.1/help/ro/commandline.page	2014-09-24 19:17:18.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/commandline.page	2015-01-10 02:14:15.000000000 +0000
@@ -23,12 +23,6 @@
 
   <title>Get the same information from the command line</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Briefly list a few useful command line tools which can provide some of
-    the same information as System Monitor. Don't go into too much detail.</p>
-  </comment>
-
   <p>Most of the information displayed by System Monitor can also be obtained
   using these command line tools.</p>
 
diff -Nru gnome-system-monitor-3.14.1/help/ro/mem-check.page gnome-system-monitor-3.15.4/help/ro/mem-check.page
--- gnome-system-monitor-3.14.1/help/ro/mem-check.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/mem-check.page	2015-01-10 02:14:15.000000000 +0000
@@ -30,13 +30,6 @@
 
   <title>How much memory is being used?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Go to the Resources tab and look at the graph/indicators (short topic).
-    Point to resources about memory problems. Maybe mention how you can find
-    which processes are using the most memory.</p>
-  </comment>
-
    <p>To check the current memory usage of your computer:</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/ro/memory-map-use.page gnome-system-monitor-3.15.4/help/ro/memory-map-use.page
--- gnome-system-monitor-3.14.1/help/ro/memory-map-use.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/memory-map-use.page	2015-01-10 02:14:15.000000000 +0000
@@ -24,11 +24,6 @@
 
   <title>Using memory maps</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to use the Memory Map feature.</p>
-  </comment>
-
   <p><gui>Virtual memory</gui> is a representation of the combined
   <gui>physical memory</gui> and <link xref="mem-swap">swap space</link> in a
   system. It enables running processes to access <em>more</em> than the
diff -Nru gnome-system-monitor-3.14.1/help/ro/mem-swap.page gnome-system-monitor-3.15.4/help/ro/mem-swap.page
--- gnome-system-monitor-3.14.1/help/ro/mem-swap.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/mem-swap.page	2015-01-10 02:14:15.000000000 +0000
@@ -25,12 +25,6 @@
 
   <title>What is "swap" memory?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain what swap is and how it helps. Explain that the computer may run
-    slowly if it's swapping too much.</p>
-  </comment>
-
   <p>Swap memory or <em>swap space</em> is the on-disk component of the virtual
   memory system. It is pre-configured as a <em>swap partition</em> or a
   <em>swap file</em> when Linux is first installed, but can also be added
diff -Nru gnome-system-monitor-3.14.1/help/ro/net-bits.page gnome-system-monitor-3.15.4/help/ro/net-bits.page
--- gnome-system-monitor-3.14.1/help/ro/net-bits.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/net-bits.page	2015-01-10 02:14:15.000000000 +0000
@@ -23,11 +23,6 @@
 
   <title>Show the network speed in bits instead of bytes per second</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Brief topic. Explain how to do this, and why you might want to do it.</p>
-  </comment>
-
   <p>Network speed is often shown in bits per second, rather than bytes per
  second. This is called the <em>bit rate</em>, or <em>data rate</em>.</p>
 
diff -Nru gnome-system-monitor-3.14.1/help/ro/process-explain.page gnome-system-monitor-3.15.4/help/ro/process-explain.page
--- gnome-system-monitor-3.14.1/help/ro/process-explain.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/process-explain.page	2015-01-10 02:14:15.000000000 +0000
@@ -23,13 +23,6 @@
 
   <title>What is a process?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain, in simple terms, what a process is, how they relate to
- applications, how some are 'system processes', and what you can do with a
- process.</p>
-  </comment>
-
   <p>A <gui>process</gui> is a program or application being executed by the
  system. When an application is launched, the system assigns a unique process ID
  (PID), and its instructions and data are loaded into memory.</p>
diff -Nru gnome-system-monitor-3.14.1/help/ro/process-identify-file.page gnome-system-monitor-3.15.4/help/ro/process-identify-file.page
--- gnome-system-monitor-3.14.1/help/ro/process-identify-file.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/process-identify-file.page	2015-01-10 02:14:15.000000000 +0000
@@ -23,12 +23,6 @@
 
   <title>Find which program is using a specific file</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how you can search for a file (or part of a filename) and it will
-    show which processes are using it. Explain why this might be useful.</p>
-  </comment>
-
   <p>Sometimes an error message will tell you a device (like the sound device or
  the DVD ROM) is busy, or the file you want to edit is in use. To find the
  process or processes responsible:</p>
diff -Nru gnome-system-monitor-3.14.1/help/ro/process-identify-hog.page gnome-system-monitor-3.15.4/help/ro/process-identify-hog.page
--- gnome-system-monitor-3.14.1/help/ro/process-identify-hog.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/process-identify-hog.page	2015-01-10 02:14:15.000000000 +0000
@@ -24,13 +24,6 @@
 
   <title>Which program is making the computer run slowly?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how the System Monitor can be used to find
-    misbehaving/resource-hogging processes. (A lot of process use 100% CPU or
-    similar if they hang, for example.)</p>
-  </comment>
-
   <p>A program that is using more than its share of the CPU may slow down the
   whole computer. To find which process could be doing this:</p>
 
diff -Nru gnome-system-monitor-3.14.1/help/ro/process-update-speed.page gnome-system-monitor-3.15.4/help/ro/process-update-speed.page
--- gnome-system-monitor-3.14.1/help/ro/process-update-speed.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/process-update-speed.page	2015-01-10 02:14:15.000000000 +0000
@@ -24,13 +24,6 @@
 
   <title>Make the information update faster or slower</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Explain how to make the info update faster (see Preferences dialog).
-    Explain that faster updates mean that the System Monitor will use more
-    CPU.</p>
-  </comment>
-
   <p>To change the information refresh speed:</p>
 
   <steps>
diff -Nru gnome-system-monitor-3.14.1/help/ro/solaris-mode.page gnome-system-monitor-3.15.4/help/ro/solaris-mode.page
--- gnome-system-monitor-3.14.1/help/ro/solaris-mode.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/solaris-mode.page	2015-01-10 02:14:15.000000000 +0000
@@ -23,12 +23,6 @@
 
   <title>What is Solaris mode?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Very brief topic. Explain what "Solaris mode" in the preferences dialog
- means. The current manual has some information.</p>
-  </comment>
-
   <p>In a system that has multiple CPUs or <link xref="cpu-multicore">cores</link>,
  processes can use more than one at the same time. It is possible for the
  <gui>% CPU</gui> column to display values that total greater than 100% (i.e.
diff -Nru gnome-system-monitor-3.14.1/help/ro/units.page gnome-system-monitor-3.15.4/help/ro/units.page
--- gnome-system-monitor-3.14.1/help/ro/units.page	2014-09-24 19:17:19.000000000 +0000
+++ gnome-system-monitor-3.15.4/help/ro/units.page	2015-01-10 02:14:15.000000000 +0000
@@ -23,11 +23,6 @@
 
   <title>Is GiB the same as GB (gigabyte)?</title>
 
-  <comment>
-    <cite date="2011-06-18" href="mailto:philbull@gmail.com">Phil Bull</cite>
-    <p>Answer this question, quite briefly.</p>
-  </comment>
-
     <p>The memory and disk space statistics are displayed using <em>IEC binary
  prefixes</em>, KiB, MiB, GiB, TiB (for kibi, mebi, gibi and tebi). These are
  intended to distinguish binary reporting of sizes used in System Monitor
diff -Nru gnome-system-monitor-3.14.1/Makefile.am gnome-system-monitor-3.15.4/Makefile.am
--- gnome-system-monitor-3.14.1/Makefile.am	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/Makefile.am	2014-10-20 20:14:53.000000000 +0000
@@ -15,10 +15,6 @@
 	pixmaps/download.svg \
 	pixmaps/upload.svg
 
-runnabledir = $(pkglibexecdir)
-runnable_SCRIPTS = scripts/gsm-renice \
-                   scripts/gsm-kill
-
 org.gnome.gnome-system-monitor.policy.in: org.gnome.gnome-system-monitor.policy.in.in Makefile
 	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
@@ -26,7 +22,6 @@
 	$(ui_files) \
 	$(appdata_in_files) \
 	$(pixmap_files) \
-	$(runnable_SCRIPTS) \
 	org.gnome.gnome-system-monitor.policy.in.in \
 	gnome-system-monitor.desktop.in \
 	gnome-system-monitor-kde.desktop.in \
diff -Nru gnome-system-monitor-3.14.1/Makefile.in gnome-system-monitor-3.15.4/Makefile.in
--- gnome-system-monitor-3.14.1/Makefile.in	2014-10-13 18:41:32.000000000 +0000
+++ gnome-system-monitor-3.15.4/Makefile.in	2015-01-19 17:17:27.000000000 +0000
@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -102,37 +101,6 @@
 CONFIG_CLEAN_FILES = gnome-system-monitor.desktop.in \
 	gnome-system-monitor-kde.desktop.in
 CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(runnabledir)" \
-	"$(DESTDIR)$(Applicationsdir)" "$(DESTDIR)$(appdatadir)" \
-	"$(DESTDIR)$(polkit_policydir)"
-SCRIPTS = $(runnable_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -160,6 +128,35 @@
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(Applicationsdir)" \
+	"$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(polkit_policydir)"
 DATA = $(Applications_DATA) $(appdata_DATA) $(dist_noinst_DATA) \
 	$(polkit_policy_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -410,15 +407,10 @@
 	pixmaps/download.svg \
 	pixmaps/upload.svg
 
-runnabledir = $(pkglibexecdir)
-runnable_SCRIPTS = scripts/gsm-renice \
-                   scripts/gsm-kill
-
 EXTRA_DIST = \
 	$(ui_files) \
 	$(appdata_in_files) \
 	$(pixmap_files) \
-	$(runnable_SCRIPTS) \
 	org.gnome.gnome-system-monitor.policy.in.in \
 	gnome-system-monitor.desktop.in \
 	gnome-system-monitor-kde.desktop.in \
@@ -514,41 +506,6 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 gnome-system-monitor-kde.desktop.in: $(top_builddir)/config.status $(srcdir)/gnome-system-monitor-kde.desktop.in.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-install-runnableSCRIPTS: $(runnable_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(runnable_SCRIPTS)'; test -n "$(runnabledir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(runnabledir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(runnabledir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(runnabledir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(runnabledir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-runnableSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(runnable_SCRIPTS)'; test -n "$(runnabledir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(runnabledir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -921,10 +878,10 @@
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
-all-am: Makefile $(SCRIPTS) $(DATA) config.h
+all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(runnabledir)" "$(DESTDIR)$(Applicationsdir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(polkit_policydir)"; do \
+	for dir in "$(DESTDIR)$(Applicationsdir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(polkit_policydir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -981,7 +938,7 @@
 info-am:
 
 install-data-am: install-ApplicationsDATA install-appdataDATA \
-	install-polkit_policyDATA install-runnableSCRIPTS
+	install-polkit_policyDATA
 
 install-dvi: install-dvi-recursive
 
@@ -1028,7 +985,7 @@
 ps-am:
 
 uninstall-am: uninstall-ApplicationsDATA uninstall-appdataDATA \
-	uninstall-polkit_policyDATA uninstall-runnableSCRIPTS
+	uninstall-polkit_policyDATA
 
 .MAKE: $(am__recursive_targets) all check-am install-am install-strip
 
@@ -1045,13 +1002,12 @@
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
 	install-pdf-am install-polkit_policyDATA install-ps \
-	install-ps-am install-runnableSCRIPTS install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-ApplicationsDATA uninstall-am \
-	uninstall-appdataDATA uninstall-polkit_policyDATA \
-	uninstall-runnableSCRIPTS
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-ApplicationsDATA uninstall-am uninstall-appdataDATA \
+	uninstall-polkit_policyDATA
 
 
 org.gnome.gnome-system-monitor.policy.in: org.gnome.gnome-system-monitor.policy.in.in Makefile
diff -Nru gnome-system-monitor-3.14.1/NEWS gnome-system-monitor-3.15.4/NEWS
--- gnome-system-monitor-3.14.1/NEWS	2014-10-13 18:35:06.000000000 +0000
+++ gnome-system-monitor-3.15.4/NEWS	2015-01-19 17:16:44.000000000 +0000
@@ -1,18 +1,37 @@
-New in 3.14.1 - 13 October 2014
+New in 3.15.4 - 19 January 2015
+
+List of fixed bugs
+  742070 fixed freebsd crasher caused by PID 0
+
+New in 3.15.3 - 15 December 2014
+
+* added/updated translations
+  fi, courtesy of Jiri Grönroos
+  kk, courtesy of Baurzhan Muftakhidinov
+  pt, courtesy of Pedro Albuquerque
+  vi, courtesy of Trần Ngọc Quân
+
+List of fixed bugs
+  738110 fixed bogus assignment
+  741044 Use traditional titlebars on non-gnome
+  741234 Don't set titlebar when using headerbar as toolbar
+
+New in 3.15.1 - 27 October 2014
 
 * added/updated translations
-  bg, courtesy of Krasimir Chonov
+  bg, courtesy of Krasimir Chonov 
   bn_IN, courtesy of Saibal Ray
-  fa, courtesy of Arash Mousavi
-  gu, courtesy of Sweta Kothari
-  it, courtesy of Milo Casagrande
-  sr, courtesy of Мирослав Николић
-  sr@latin, courtesy of Miroslav Nikolić
-  te, courtesy of Krishnababu Krothapalli
+  cs, courtesy of Marek Černocký 
+  fa, courtesy of Arash Mousavi 
+  it, courtesy of Milo Casagrande 
+  te, courtesy of Krishnababu Krothapalli 
+  uk, courtesy of Daniel Korostil
 
 List of fixed bugs
-  737098 polkit console auth agent freezing xsession
-  738467 some icons are enormously large
+  737098 disable internal polkit agent to avoid x freeze
+  738467 ensure icons are at the right size
+  735302 added padding before search buttons
+  738752 do not ship executables in the tarball
 
 New in 3.14.0 - 22 September 2014
 
diff -Nru gnome-system-monitor-3.14.1/po/bg.po gnome-system-monitor-3.15.4/po/bg.po
--- gnome-system-monitor-3.14.1/po/bg.po	2014-10-13 18:18:27.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/bg.po	2014-10-20 20:15:40.000000000 +0000
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-system-monitor gnome-3-14\n"
+"Project-Id-Version: gnome-system-monitor master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-08 14:38+0300\n"
-"PO-Revision-Date: 2014-10-08 14:38+0300\n"
+"POT-Creation-Date: 2014-10-08 14:40+0300\n"
+"PO-Revision-Date: 2014-10-08 14:40+0300\n"
 "Last-Translator: Krasimir Chonov <mk2616@abv.bg>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
diff -Nru gnome-system-monitor-3.14.1/po/bn_IN.po gnome-system-monitor-3.15.4/po/bn_IN.po
--- gnome-system-monitor-3.14.1/po/bn_IN.po	2014-10-12 07:15:52.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/bn_IN.po	2014-10-20 20:14:45.000000000 +0000
@@ -42,7 +42,7 @@
 "Manager;"
 msgstr ""
 "মনিটর;সিস্টেম;প্রক্রিয়া;CPU;মেমরি;নেটওয়ার্ক;ইতিহাস;ব্যবহার;পারফরমেন্স;কাজ;ম্"
-"যানেজার"
+"যানেজার;"
 
 #: ../gnome-system-monitor-kde.desktop.in.in.h:1
 #: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
diff -Nru gnome-system-monitor-3.14.1/po/fi.po gnome-system-monitor-3.15.4/po/fi.po
--- gnome-system-monitor-3.14.1/po/fi.po	2014-09-24 19:16:09.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/fi.po	2014-12-08 19:51:20.000000000 +0000
@@ -1,5 +1,5 @@
 # procman Finnish Translation
-# Suomennos: http://gnome.fi/
+# Suomennos: https://l10n.gnome.org/teams/fi/
 # Copyright (C) 2003-2009 Free Software Foundation, Inc.
 #
 # Gnome 2012-03 Finnish translation sprint participants:
@@ -493,7 +493,7 @@
 "Lauri Nurmi, 2003\n"
 "Tarmo Toikkanen, 2002\n"
 "\n"
-"http://gnome.fi/\n"
+"https://l10n.gnome.org/teams/fi/\n"
 "\n"
 "Launchpad Contributions:\n"
 "  Aleksi Kinnunen https://launchpad.net/~aleksi-kinnunen\n"
diff -Nru gnome-system-monitor-3.14.1/po/gu.po gnome-system-monitor-3.15.4/po/gu.po
--- gnome-system-monitor-3.14.1/po/gu.po	2014-10-13 18:18:27.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/gu.po	2014-10-20 20:15:40.000000000 +0000
@@ -2,14 +2,14 @@
 # Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
 # Ankit Patel <ankit@redhat.com>, 2006, 2007.
 # Sweta Kothari <sweta2782@yahoo.co.in>, 2008.
-# Sweta Kothari <swkothar@redhat.com>, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
+# Sweta Kothari <swkothar@redhat.com>, 2008, 2009, 2010, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=system-monitor&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-08 08:51+0000\n"
-"PO-Revision-Date: 2014-10-10 12:09+0530\n"
+"POT-Creation-Date: 2013-02-25 10:59+0000\n"
+"PO-Revision-Date: 2013-03-13 13:13+0530\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: \n"
@@ -35,87 +35,48 @@
 "\n"
 
 #: ../gnome-system-monitor.desktop.in.in.h:1 ../data/interface.ui.h:1
-#: ../src/application.cpp:268 ../src/interface.cpp:363
+#: ../src/callbacks.cpp:184 ../src/procman-app.cpp:364
 msgid "System Monitor"
 msgstr "સિસ્ટમ મૉનિટર"
 
 #: ../gnome-system-monitor.desktop.in.in.h:2
-#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:364
+#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/callbacks.cpp:185
 msgid "View current processes and monitor system state"
 msgstr "વર્તમાન પ્રક્રિયાને જુઓ અને સિસ્ટમની સ્થિતિનું ધ્યાન રાખો"
 
 #: ../gnome-system-monitor.desktop.in.in.h:3
-#| msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
-msgid ""
-"Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
-"Manager;"
-msgstr "મોનિટર;સિસ્ટમ;પ્રક્રિયા;CPU;મેમરી;નેટવર્ક;ઇતિહાસ;વપરાશ;પ્રભાવ;કાર્ય;સંચાલક;"
-
-#: ../gnome-system-monitor-kde.desktop.in.in.h:1
-#: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
-msgid "GNOME System Monitor"
-msgstr "GNOME સિસ્ટમ મૉનિટર"
-
 #: ../gnome-system-monitor-kde.desktop.in.in.h:3
 msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
 msgstr "મોનિટર;સિસ્ટમ;પ્રક્રિયા;CPU;મેમરી;નેટવર્ક;ઇતિહાસ;વપરાશ;"
 
-#: ../gnome-system-monitor.appdata.xml.in.h:2
-msgid "View and manage system resources"
-msgstr "સિસ્ટમ સ્ત્રોતને સંચાલિત કરો અને જુઓ"
-
-#: ../gnome-system-monitor.appdata.xml.in.h:3
-msgid ""
-"System Monitor is a process viewer and system monitor with an attractive, "
-"easy-to-use interface."
-msgstr ""
-"સિસ્ટમ મોનિટર પ્રક્રિયા દર્શક છે અને આકર્ષક , અને સરળ રીતે વાપરી શકાય તેવાં સિસ્ટમ મોનિટર."
-
-#: ../gnome-system-monitor.appdata.xml.in.h:4
-msgid ""
-"System Monitor can help you find out what applications are using the "
-"processor or the memory of your computer, can manage the running "
-"applications, force stop processes not responding, and change the state or "
-"priority of existing processes."
-msgstr ""
-"સિસ્ટમ મોનિટર શોધવા માટે તમને મદદ કરી શકે છે કે ક્યા કાર્યક્રમો એ તમારાં કમ્પ્યૂટરનાં પ્રોસેસર "
-"અથવા મેમરીને વાપરી રહ્યા છે, ચાલતા કાર્યક્રમોને સંચાલિત કરી શકાય છે, જે જવાબ આપી રહ્યુ નથી "
-"તેવી પ્રક્રિયાઓને બંધ કરવા દબાણ કરો અને હાલની પ્રક્રિયાઓની સ્થિતિ અથવા પ્રાધાન્યને બદલો."
-
-#: ../gnome-system-monitor.appdata.xml.in.h:5
-msgid ""
-"The resource graphs feature shows you a quick overview of what is going on "
-"with your computer displaying recent network, memory and processor usage."
-msgstr ""
-"સ્ત્રોત ગ્રાફ લક્ષણ તમને ઝડપી ઝાંખીને બતાવે છે તે તાજેતરનાં નેટવર્ક, મેમરી અને પ્રોસેસર "
-"વપરાશને દર્શાવવા તમારાં કમ્પ્યૂટર સાથે શું ચાલી રહ્યુ છે."
+#: ../gnome-system-monitor-kde.desktop.in.in.h:1
+msgid "GNOME System Monitor"
+msgstr "GNOME સિસ્ટમ મૉનિટર"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:1
 msgid "Kill process"
 msgstr "પ્રક્રિયા મારી નાખો"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:2
-#| msgid "Privileges are required to renice process"
-msgid "Privileges are required to control other users' processes"
-msgstr "અધિકારો બીજી વપરાશકર્તાની પ્રક્રિયાઓને નિયંત્રણ કરવા માટે જરૂરી છે"
+msgid "Privileges are required to kill process"
+msgstr "પ્રક્રિયાને મારવા માટે અધિકારો જરૂરી છે"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:3
+#| msgid "_Continue Process"
 msgid "Renice process"
 msgstr "Renice પ્રક્રિયા"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:4
-#| msgid "Privileges are required to renice process"
-msgid "Privileges are required to change the priority of processes"
-msgstr "અધિકારો પ્રક્રિયાઓનાં પ્રાધાન્યને બદલના માટે જરૂરી છે"
+msgid "Privileges are required to renice process"
+msgstr "પ્રક્રિયાને renice કરવા માટે અધિકારો જરૂરી છે"
 
 #: ../data/interface.ui.h:2
-msgid "End _Process"
-msgstr "પ્રક્રિયાનો અંત કરો (_P)"
+msgid "View"
+msgstr "દૃશ્ય"
 
 #: ../data/interface.ui.h:3
-#| msgid "Process Properties"
-msgid "Show process properties"
-msgstr "પ્રક્રિયા ગુણધર્મોને બતાવો"
+msgid "End _Process"
+msgstr "પ્રક્રિયાનો અંત કરો (_P)"
 
 #: ../data/interface.ui.h:4 ../data/preferences.ui.h:9
 msgid "Processes"
@@ -129,12 +90,12 @@
 msgid "Memory and Swap History"
 msgstr "મેમરી અને સ્વેપનો ઈતિહાસ"
 
-#: ../data/interface.ui.h:7 ../src/interface.cpp:260
-#: ../src/procproperties.cpp:92 ../src/proctable.cpp:337
+#: ../data/interface.ui.h:7 ../src/interface.cpp:249
+#: ../src/procproperties.cpp:132 ../src/proctable.cpp:212
 msgid "Memory"
 msgstr "મેમરી"
 
-#: ../data/interface.ui.h:8 ../src/interface.cpp:272
+#: ../data/interface.ui.h:8 ../src/interface.cpp:261
 msgid "Swap"
 msgstr "Swap"
 
@@ -142,7 +103,7 @@
 msgid "Network History"
 msgstr "નેટવર્ક ઈતિહાસ"
 
-#: ../data/interface.ui.h:10 ../src/interface.cpp:300
+#: ../data/interface.ui.h:10 ../src/interface.cpp:288
 msgid "Receiving"
 msgstr "મેળવી રહ્યા છે"
 
@@ -150,9 +111,9 @@
 msgid "Total Received"
 msgstr "કુલ મળેલ"
 
-#: ../data/interface.ui.h:12 ../src/interface.cpp:315
-msgid "Sending"
-msgstr "મોકલી રહ્યા છે"
+#: ../data/interface.ui.h:12
+msgid "Sent"
+msgstr "મોકલ્યુ"
 
 #: ../data/interface.ui.h:13
 msgid "Total Sent"
@@ -172,13 +133,20 @@
 msgstr "ખૂલેલી ફાઈલો માટે શોધો"
 
 #: ../data/lsof.ui.h:2
-msgid "Filter files by name"
-msgstr "નામ દ્દારા ફિલ્ટર ફાઇલો"
+msgid "_Name contains:"
+msgstr "નામ સમાવે (_N):"
 
 #: ../data/lsof.ui.h:3
-#| msgid "Case insensitive matching"
-msgid "Case insensitive"
-msgstr "કેસ પ્રત્યે સંવેદનશીલ"
+msgid "Case insensitive matching"
+msgstr "કેસ પ્રત્યે સંવેદનશીલ જોડણી"
+
+#: ../data/lsof.ui.h:4
+msgid "C_lear"
+msgstr "સાફ કરો (_l)"
+
+#: ../data/lsof.ui.h:5
+msgid "S_earch results:"
+msgstr "શોધ પરિણામો (_e):"
 
 #: ../data/menus.ui.h:1
 msgctxt "Menu item to Open 'Search for Open Files' dialog"
@@ -201,85 +169,6 @@
 msgid "Quit"
 msgstr "બહાર નીકળો"
 
-#: ../data/menus.ui.h:6
-msgid "_Refresh"
-msgstr "પુન:તાજુ કરો (_R)"
-
-#: ../data/menus.ui.h:7
-msgid "_Active Processes"
-msgstr "સક્રિય પ્રક્રિયાઓ (_A)"
-
-#: ../data/menus.ui.h:8
-msgid "A_ll Processes"
-msgstr "બધી પ્રક્રિયાઓ (_l)"
-
-#: ../data/menus.ui.h:9
-msgid "M_y Processes"
-msgstr "મારી પ્રક્રિયાઓ (_y)"
-
-#: ../data/menus.ui.h:10
-msgid "_Dependencies"
-msgstr "આધારભૂતો (_D)"
-
-#: ../data/menus.ui.h:11
-#| msgid "Stopped"
-msgid "_Stop"
-msgstr "બંધ કરો (_S)"
-
-#: ../data/menus.ui.h:12
-#| msgid "_Continue Process"
-msgid "_Continue"
-msgstr "ચાલુ રાખો (_C)"
-
-#: ../data/menus.ui.h:13
-msgid "_End"
-msgstr "અંત (_E)"
-
-#: ../data/menus.ui.h:14
-msgid "_Kill"
-msgstr "મારો (_K)"
-
-#: ../data/menus.ui.h:15
-msgid "_Change Priority"
-msgstr "પ્રાધાન્ય બદલો (_C)"
-
-#: ../data/menus.ui.h:16 ../src/util.cpp:215
-msgid "Very High"
-msgstr "વધારે ઊંચુ"
-
-#: ../data/menus.ui.h:17 ../src/util.cpp:217
-msgid "High"
-msgstr "ઊંચુ"
-
-#: ../data/menus.ui.h:18 ../src/util.cpp:219
-msgid "Normal"
-msgstr "સામાન્ય"
-
-#: ../data/menus.ui.h:19 ../src/util.cpp:221
-msgid "Low"
-msgstr "નીચુ"
-
-#: ../data/menus.ui.h:20 ../src/util.cpp:223
-msgid "Very Low"
-msgstr "ઘણુ નીચુ"
-
-#: ../data/menus.ui.h:21
-msgid "Custom"
-msgstr "વૈવિધ્ય"
-
-#: ../data/menus.ui.h:22
-msgid "_Memory Maps"
-msgstr "મેમરીના નક્શા (_M)"
-
-#. Translators: this means 'Files that are open' (open is not a verb here)
-#: ../data/menus.ui.h:24
-msgid "Open _Files"
-msgstr "ફાઈલો ખોલો (_F)"
-
-#: ../data/menus.ui.h:25
-msgid "_Properties"
-msgstr "ગુણધર્મો (_P)"
-
 #: ../data/openfiles.ui.h:1
 msgid "Open Files"
 msgstr "ફાઈલો ખોલો"
@@ -321,13 +210,13 @@
 msgstr "આલેખો"
 
 #: ../data/preferences.ui.h:11
-msgid "_Draw CPU chart as stacked area chart"
-msgstr "સ્ટેક વિસ્તાર આલેખ તરીકે CPU આલેખને દોરો (_D)"
-
-#: ../data/preferences.ui.h:12
 msgid "_Show network speed in bits"
 msgstr "બિટમાં નેટવર્ક ઝડપને બતાવો (_S)"
 
+#: ../data/preferences.ui.h:12
+msgid "_Draw CPU chart as stacked area chart"
+msgstr "સ્ટેક વિસ્તાર આલેખ તરીકે CPU આલેખને દોરો (_D)"
+
 #: ../data/preferences.ui.h:14
 msgid "Show _all file systems"
 msgstr "બધી ફાઈલસિસ્ટમો બતાવો (_a)"
@@ -336,19 +225,15 @@
 msgid "File system i_nformation shown in list:"
 msgstr "યાદીમાં બતાવેલ ફાઇલ સિસ્ટમ જાણકારી:"
 
-#: ../data/renice.ui.h:1 ../src/procdialogs.cpp:123
-msgid "_Cancel"
-msgstr "રદ કરો (_C)"
-
-#: ../data/renice.ui.h:2
+#: ../data/renice.ui.h:1
 msgid "Change _Priority"
 msgstr "પ્રાધાન્ય બદલો (_P)"
 
-#: ../data/renice.ui.h:3
+#: ../data/renice.ui.h:2
 msgid "_Nice value:"
 msgstr "_Nice કિંમત:"
 
-#: ../data/renice.ui.h:4
+#: ../data/renice.ui.h:3
 msgid ""
 "<small><i><b>Note:</b> The priority of a process is given by its nice value. "
 "A lower nice value corresponds to a higher priority.</i></small>"
@@ -356,313 +241,461 @@
 "<small><i><b>નોંધ:</b> પ્રક્રિયાનું પ્રાધાન્ય nice ની કિંમત દ્વારા મળે છે. ઓછી nice ની "
 "કિંમત ઊંચું પ્રાધાન્ય સૂચવે છે.</i></small>"
 
-#: ../src/application.cpp:310
-msgid "A simple process and system monitor."
-msgstr "સાદી પ્રક્રિયા અને સિસ્ટમ મૉનિટર."
-
-#: ../src/argv.cpp:21
+#: ../src/argv.cpp:20
 msgid "Show the Processes tab"
 msgstr "પ્રક્રિયા ટૅબ બતાવો"
 
-#: ../src/argv.cpp:26
+#: ../src/argv.cpp:25
 msgid "Show the Resources tab"
 msgstr "સ્ત્રોત ટૅબ બતાવો"
 
-#: ../src/argv.cpp:31
+#: ../src/argv.cpp:30
 msgid "Show the File Systems tab"
 msgstr "ફાઇલ સિસ્ટમ ટૅબ બતાવો"
 
-#: ../src/argv.cpp:35
-#| msgid "Configure the application"
-msgid "Show the application's version"
-msgstr "કાર્યક્રમની આવૃત્તિને બતાવો"
+#: ../src/callbacks.cpp:195
+msgid "translator-credits"
+msgstr "અંકિત પટેલ <ankit644@yahoo.com>"
 
-#: ../src/disks.cpp:369 ../src/memmaps.cpp:325
+#: ../src/disks.cpp:304 ../src/memmaps.cpp:361
 msgid "Device"
 msgstr "ઉપકરણ"
 
-#: ../src/disks.cpp:370
+#: ../src/disks.cpp:305
 msgid "Directory"
 msgstr "ડિરેક્ટરી"
 
-#: ../src/disks.cpp:371 ../src/gsm_color_button.c:165 ../src/openfiles.cpp:252
+#: ../src/disks.cpp:306 ../src/gsm_color_button.c:223 ../src/openfiles.cpp:251
 msgid "Type"
 msgstr "પ્રકાર"
 
-#: ../src/disks.cpp:372
+#: ../src/disks.cpp:307
 msgid "Total"
 msgstr "કુલ"
 
-#: ../src/disks.cpp:373
+#: ../src/disks.cpp:308
 msgid "Free"
 msgstr "મુક્ત"
 
-#: ../src/disks.cpp:374
+#: ../src/disks.cpp:309
 msgid "Available"
 msgstr "ઉપલબ્ધ"
 
-#: ../src/disks.cpp:375
+#: ../src/disks.cpp:310
 msgid "Used"
 msgstr "ઉપયોગમાં લેવાયેલ"
 
 #. xgettext: ? stands for unknown
-#: ../src/e_date.c:156
+#: ../src/e_date.c:155
 msgid "?"
 msgstr "?"
 
-#: ../src/e_date.c:163
+#: ../src/e_date.c:162
 msgid "Today %l:%M %p"
 msgstr "આજે %l:%M %p"
 
-#: ../src/e_date.c:172
+#: ../src/e_date.c:171
 msgid "Yesterday %l:%M %p"
 msgstr "ગઈકાલે %l:%M %p"
 
-#: ../src/e_date.c:184
+#: ../src/e_date.c:183
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../src/e_date.c:192
+#: ../src/e_date.c:191
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../src/e_date.c:194
+#: ../src/e_date.c:193
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/gsm_color_button.c:141
+#: ../src/gsm_color_button.c:199
 msgid "Fraction"
 msgstr "ભાગ"
 
 #. TRANSLATORS: description of the pie color picker's (mem, swap) filled percentage property
-#: ../src/gsm_color_button.c:143
+#: ../src/gsm_color_button.c:201
 msgid "Percentage full for pie color pickers"
 msgstr "પાઇ રંગ પસંદ કરવા માટે સંપૂર્ણ ટકાવારી"
 
-#: ../src/gsm_color_button.c:150
+#: ../src/gsm_color_button.c:208
 msgid "Title"
 msgstr "શીર્ષક"
 
-#: ../src/gsm_color_button.c:151
+#: ../src/gsm_color_button.c:209
 msgid "The title of the color selection dialog"
 msgstr "રંગ પસંદ કરવાના સંવાદનુ શીર્ષક"
 
-#: ../src/gsm_color_button.c:152 ../src/gsm_color_button.c:512
+#: ../src/gsm_color_button.c:210 ../src/gsm_color_button.c:628
 msgid "Pick a Color"
 msgstr "રંગ પસંદ કરો"
 
-#: ../src/gsm_color_button.c:158
+#: ../src/gsm_color_button.c:216
 msgid "Current Color"
 msgstr "વર્તમાન રંગ"
 
-#: ../src/gsm_color_button.c:159
+#: ../src/gsm_color_button.c:217
 msgid "The selected color"
 msgstr "પસંદિત રંગ"
 
-#: ../src/gsm_color_button.c:166
+#: ../src/gsm_color_button.c:224
 msgid "Type of color picker"
 msgstr "રંગ પસંદ કરનારના પ્રકાર"
 
-#: ../src/gsm_color_button.c:434
+#: ../src/gsm_color_button.c:550
 msgid "Received invalid color data\n"
 msgstr "મળેલ અયોગ્ય રંગ માહિતી\n"
 
-#: ../src/gsm_color_button.c:535
+#: ../src/gsm_color_button.c:651
 msgid "Click to set graph colors"
 msgstr "આલેખ રંગોને સુયોજિત કરવા માટે ક્લિક કરો"
 
+#: ../src/interface.cpp:47
+msgid "_View"
+msgstr "દેખાવ (_V)"
+
+#: ../src/interface.cpp:49
+msgid "_Stop Process"
+msgstr "પ્રક્રિયા અટકાવો (_S)"
+
+#: ../src/interface.cpp:50
+msgid "Stop process"
+msgstr "પ્રક્રિયા અટકાવો"
+
+#: ../src/interface.cpp:51
+msgid "_Continue Process"
+msgstr "પ્રક્રિયા ચાલુ રાખો (_C)"
+
+#: ../src/interface.cpp:52
+msgid "Continue process if stopped"
+msgstr "જો અટકાવાયેલ હોય તો પ્રક્રિયા ચાલુ રાખો"
+
+#: ../src/interface.cpp:54 ../src/procdialogs.cpp:96
+msgid "_End Process"
+msgstr "પ્રક્રિયાનો અંત લાવો (_E)"
+
+#: ../src/interface.cpp:55
+msgid "Force process to finish normally"
+msgstr "પ્રક્રિયાને સામાન્ય રીતે સમાપ્ત કરવા માટે દબાણ કરો"
+
+#: ../src/interface.cpp:56 ../src/procdialogs.cpp:85
+msgid "_Kill Process"
+msgstr "પ્રક્રિયાને મૃત કરો (_K)"
+
+#: ../src/interface.cpp:57
+msgid "Force process to finish immediately"
+msgstr "પ્રક્રિયાને તુરંત જ સમાપ્ત કરવા માટે દબાણ કરો"
+
+#: ../src/interface.cpp:58
+msgid "_Change Priority"
+msgstr "પ્રાધાન્ય બદલો (_C)"
+
+#: ../src/interface.cpp:59
+msgid "Change the order of priority of process"
+msgstr "પ્રક્રિયાઓના પ્રાધાન્યનો ક્રમ બદલો"
+
+#: ../src/interface.cpp:61
+msgid "_Refresh"
+msgstr "પુન:તાજુ કરો (_R)"
+
+#: ../src/interface.cpp:62
+msgid "Refresh the process list"
+msgstr "પ્રક્રિયા યાદીને પુન:તાજી કરો"
+
+#: ../src/interface.cpp:64
+msgid "_Memory Maps"
+msgstr "મેમરીના નક્શા (_M)"
+
+#: ../src/interface.cpp:65
+msgid "Open the memory maps associated with a process"
+msgstr "પ્રક્રિયા સાથે સંકળાયેલ મેમરી નકશાઓ ખોલો"
+
+#. Translators: this means 'Files that are open' (open is no verb here)
+#: ../src/interface.cpp:67
+msgid "Open _Files"
+msgstr "ફાઈલો ખોલો (_F)"
+
+#: ../src/interface.cpp:68
+msgid "View the files opened by a process"
+msgstr "પ્રક્રિયા દ્વારા ખોલાયેલ ફાઈલો જુઓ"
+
+#: ../src/interface.cpp:69
+msgid "_Properties"
+msgstr "ગુણધર્મો (_P)"
+
+#: ../src/interface.cpp:70
+msgid "View additional information about a process"
+msgstr "પ્રક્રિયા વિશે વધારાની જાણકારીને દર્શાવો"
+
+#: ../src/interface.cpp:75
+msgid "_Dependencies"
+msgstr "આધારભૂતો (_D)"
+
+#: ../src/interface.cpp:76
+msgid "Show parent/child relationship between processes"
+msgstr "પ્રક્રિયાઓ વચ્ચે પિતૃ/બાળ સંબંધ બતાવો"
+
+#: ../src/interface.cpp:83
+msgid "_Active Processes"
+msgstr "સક્રિય પ્રક્રિયાઓ (_A)"
+
+#: ../src/interface.cpp:84
+msgid "Show active processes"
+msgstr "સક્રિય પ્રક્રિયાઓ બતાવો"
+
+#: ../src/interface.cpp:85
+msgid "A_ll Processes"
+msgstr "બધી પ્રક્રિયાઓ (_l)"
+
+#: ../src/interface.cpp:86
+msgid "Show all processes"
+msgstr "બધી પ્રક્રિયાઓ બતાવો"
+
+#: ../src/interface.cpp:87
+msgid "M_y Processes"
+msgstr "મારી પ્રક્રિયાઓ (_y)"
+
+#: ../src/interface.cpp:88
+msgid "Show only user-owned processes"
+msgstr "ફક્ત વપરાશકર્તા માલિકી થયેલ પ્રક્રિયાઓને બતાવો"
+
+#: ../src/interface.cpp:93 ../src/util.cpp:217
+msgid "Very High"
+msgstr "વધારે ઊંચુ"
+
+#: ../src/interface.cpp:94
+msgid "Set process priority to very high"
+msgstr "ઘણુ ઊંચુ તરીકે પ્રક્રિયા પ્રાધાન્યને સુયોજિત કરો"
+
+#: ../src/interface.cpp:95 ../src/util.cpp:219
+msgid "High"
+msgstr "ઊંચુ"
+
+#: ../src/interface.cpp:96
+msgid "Set process priority to high"
+msgstr "ઊંચુ તરીકે પ્રક્રિયા પ્રાધાન્યને સુયોજિત કરો"
+
+#: ../src/interface.cpp:97 ../src/util.cpp:221
+msgid "Normal"
+msgstr "સામાન્ય"
+
+#: ../src/interface.cpp:98
+msgid "Set process priority to normal"
+msgstr "સામાન્ય રીતે પ્રાધાન્ય પ્રમાણે પ્રક્રિયાને સુયોજિત કરો"
+
+#: ../src/interface.cpp:99 ../src/util.cpp:223
+msgid "Low"
+msgstr "નીચુ"
+
+#: ../src/interface.cpp:100
+msgid "Set process priority to low"
+msgstr "નીચુ તરીકે પ્રક્રિયા પ્રાધાન્યને સુયોજિત કરો"
+
+#: ../src/interface.cpp:101 ../src/util.cpp:225
+msgid "Very Low"
+msgstr "ઘણુ નીચુ"
+
+#: ../src/interface.cpp:102
+msgid "Set process priority to very low"
+msgstr "ઘણું નીચુ તરીકે પ્રક્રિયા પ્રાધાન્યને સુયોજિત કરો"
+
+#: ../src/interface.cpp:103
+msgid "Custom"
+msgstr "વૈવિધ્ય"
+
+#: ../src/interface.cpp:104
+msgid "Set process priority manually"
+msgstr "જાતેજ પ્રક્રિયાનાં પ્રાધાન્યને સુયોજિત કરો"
+
 #. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
-#: ../src/interface.cpp:187
+#: ../src/interface.cpp:178
 #, c-format
 msgid "Pick a Color for '%s'"
 msgstr "'%s' માટે રંગ પસંદ કરો"
 
-#: ../src/interface.cpp:220 ../src/procproperties.cpp:100
+#: ../src/interface.cpp:214 ../src/procproperties.cpp:138
 msgid "CPU"
 msgstr "CPU"
 
-#: ../src/interface.cpp:222
+#: ../src/interface.cpp:216
 #, c-format
 msgid "CPU%d"
 msgstr "CPU%d"
 
-#: ../src/interface.cpp:374
-msgid "translator-credits"
-msgstr "અંકિત પટેલ <ankit644@yahoo.com>"
+#: ../src/interface.cpp:304
+msgid "Sending"
+msgstr "મોકલી રહ્યા છે"
 
-#: ../src/load-graph.cpp:161
+#: ../src/load-graph.cpp:170
 #, c-format
 msgid "%u second"
 msgid_plural "%u seconds"
 msgstr[0] "%u સેકન્ડ"
 msgstr[1] "%u સેકન્ડો"
 
-#: ../src/load-graph.cpp:370
+#: ../src/load-graph.cpp:365
 msgid "not available"
 msgstr "ઉપલબ્ધ નથી"
 
 #. xgettext: 540MiB (53 %) of 1.0 GiB
-#: ../src/load-graph.cpp:373
+#: ../src/load-graph.cpp:368
 #, c-format
 msgid "%s (%.1f%%) of %s"
 msgstr "%s (%.1f%%) એ %s નું "
 
-#: ../src/lsof.cpp:109
+#: ../src/lsof.cpp:125
 msgid "Error"
 msgstr "ભૂલ"
 
-#: ../src/lsof.cpp:110
+#: ../src/lsof.cpp:126
 #, c-format
 msgid "'%s' is not a valid Perl regular expression."
 msgstr "'%s' એ માન્ય Perl નિયમિત સમીકરણ નથી."
 
-#: ../src/lsof.cpp:128
-#, c-format
-#| msgid "Open Files"
-msgid "%d open file"
-msgid_plural "%d open files"
-msgstr[0] "%d ખુલ્લી ફાઇલ"
-msgstr[1] "%d ખુલ્લી ફાઇલો"
-
-#: ../src/lsof.cpp:130
-#, c-format
-#| msgid "Search for open files"
-msgid "%d matching open file"
-msgid_plural "%d matching open files"
-msgstr[0] "%d બંધબેસતી ખુલ્લી ફાઇલ"
-msgstr[1] "%d બંધબેસતી ખુલ્લી ફાઇલો"
-
-#: ../src/lsof.cpp:246
+#: ../src/lsof.cpp:272
 msgid "Process"
 msgstr "પ્રક્રિયા"
 
 # libgnomeui/gnome-client.c:833
-#: ../src/lsof.cpp:258
+#: ../src/lsof.cpp:284
 msgid "PID"
 msgstr "PID"
 
-#: ../src/lsof.cpp:268 ../src/memmaps.cpp:303
+#: ../src/lsof.cpp:294 ../src/memmaps.cpp:339
 msgid "Filename"
 msgstr "ફાઇલનું નામ"
 
 #. xgettext: virtual memory start
-#: ../src/memmaps.cpp:305
+#: ../src/memmaps.cpp:341
 msgid "VM Start"
 msgstr "VMની શરૂઆત"
 
 #. xgettext: virtual memory end
-#: ../src/memmaps.cpp:307
+#: ../src/memmaps.cpp:343
 msgid "VM End"
 msgstr "VMનો અંત"
 
 #. xgettext: virtual memory syze
-#: ../src/memmaps.cpp:309
+#: ../src/memmaps.cpp:345
 msgid "VM Size"
 msgstr "VMનુ માપ"
 
-#: ../src/memmaps.cpp:310
+#: ../src/memmaps.cpp:346
 msgid "Flags"
 msgstr "નિશાનીઓ"
 
 #. xgettext: virtual memory offset
-#: ../src/memmaps.cpp:312
+#: ../src/memmaps.cpp:348
 msgid "VM Offset"
 msgstr "VM ઓફસેટ"
 
 #. xgettext: memory that has not been modified since
 #. it has been allocated
-#: ../src/memmaps.cpp:315
+#: ../src/memmaps.cpp:351
 msgid "Private clean"
 msgstr "ખાનગી સફાઈ"
 
 #. xgettext: memory that has been modified since it
 #. has been allocated
-#: ../src/memmaps.cpp:318
+#: ../src/memmaps.cpp:354
 msgid "Private dirty"
 msgstr "ખાનગી ગંદકી"
 
 #. xgettext: shared memory that has not been modified
 #. since it has been allocated
-#: ../src/memmaps.cpp:321
+#: ../src/memmaps.cpp:357
 msgid "Shared clean"
 msgstr "સહભાગી સફાઈ"
 
 #. xgettext: shared memory that has been modified
 #. since it has been allocated
-#: ../src/memmaps.cpp:324
+#: ../src/memmaps.cpp:360
 msgid "Shared dirty"
 msgstr "સહભાગી ગંદકી"
 
-#: ../src/memmaps.cpp:326
+#: ../src/memmaps.cpp:362
 msgid "Inode"
 msgstr "આઈનોડ"
 
-#: ../src/memmaps.cpp:436
+#: ../src/memmaps.cpp:467
 msgid "Memory Maps"
 msgstr "મેમરી નક્શાઓ"
 
-#: ../src/memmaps.cpp:448
+#: ../src/memmaps.cpp:479
 #, c-format
 msgid "_Memory maps for process \"%s\" (PID %u):"
 msgstr "પ્રક્રિયા \"%s\" માટે મેમરી નકશા (PID %u) (_M):"
 
-#: ../src/openfiles.cpp:40
+#: ../src/openfiles.cpp:38
 msgid "file"
 msgstr "ફાઈલ"
 
-#: ../src/openfiles.cpp:42
+#: ../src/openfiles.cpp:40
 msgid "pipe"
 msgstr "પાઈપ"
 
-#: ../src/openfiles.cpp:44
+#: ../src/openfiles.cpp:42
 msgid "IPv6 network connection"
 msgstr "IPv6 નેટવર્ક જોડાણ"
 
-#: ../src/openfiles.cpp:46
+#: ../src/openfiles.cpp:44
 msgid "IPv4 network connection"
 msgstr "IPv4 નેટવર્ક જોડાણ"
 
-#: ../src/openfiles.cpp:48
+#: ../src/openfiles.cpp:46
 msgid "local socket"
 msgstr "સ્થાનિક સોકેટ"
 
-#: ../src/openfiles.cpp:50
+#: ../src/openfiles.cpp:48
 msgid "unknown type"
 msgstr "અજ્ઞાત પ્રકાર"
 
 #. Translators: "FD" here means "File Descriptor". Please use
 #. a very short translation if possible, and at most
 #. 2-3 characters for it to be able to fit in the UI.
-#: ../src/openfiles.cpp:251
+#: ../src/openfiles.cpp:250
 msgid "FD"
 msgstr "FD"
 
-#: ../src/openfiles.cpp:253
+#: ../src/openfiles.cpp:252
 msgid "Object"
 msgstr "ઓબ્જેક્ટ"
 
-#: ../src/openfiles.cpp:336
+#: ../src/openfiles.cpp:346
 #, c-format
 msgid "_Files opened by process \"%s\" (PID %u):"
 msgstr "પ્રક્રિયા \"%s\" દ્વારા ખૂલેલી ફાઈલો (PID %u) (_F):"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:1
-msgid "Main window size and position in the form (width, height, xpos, ypos)"
-msgstr "(width, height, xpos, ypos) રૂપમાં મુખ્ય વિન્ડો માપ અને સ્થાન"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:1
+msgid "Main Window width"
+msgstr "મુખ્ય વિન્ડો પહોળાઈ"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:2
+msgid "Main Window height"
+msgstr "મુખ્ય વિન્ડો ઊંચાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:2
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:3
 msgid "Main Window should open maximized"
 msgstr "મુખ્ય વિન્ડોને મહત્તમ તરીકે ખુલ્લી હોવી જોઇએ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:3
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:4
+msgid "Main Window X position"
+msgstr "મુખ્ય વિન્ડો X સ્થાન"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:5
+msgid "Main Window Y position"
+msgstr "મુખ્ય વિન્ડો Y સ્થાન"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:6
 msgid "Show process dependencies in tree form"
 msgstr "પ્રક્રિયાના આધારભૂતોને વૃક્ષ સ્વરૂપમાં બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:4
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:7
 msgid "Solaris mode for CPU percentage"
 msgstr "CPU ટકા માટે Solaris સ્થિતિ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:5
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:8
 msgid ""
 "If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage "
 "is divided by the total number of CPUs. Otherwise, it operates in 'Irix "
@@ -671,39 +704,38 @@
 "જો TRUE હોય, તો system-monitor એ 'Solaris mode' માં કામ કરશે કે જ્યાં ક્રિયાનો cpu "
 "વપરાશ એ કુલ સંખ્યાના CPU દ્વારા વિભાજીત થાય છે. નહિંતર તે 'Irix mode' માં કામ કરે છે."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:6
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:9
 msgid "Show CPU chart as stacked area chart"
 msgstr "સ્ટેક વિસ્તાર આલેખ તરીકે CPU આલેખને બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:7
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:10
 msgid ""
 "If TRUE, system-monitor shows the CPU chart as a stacked area chart instead "
 "of a line chart."
 msgstr ""
-"જો TRUE હોય તો, system-monitor એ સ્ટેક વિસ્તાર તરીકે લાઇન આલેખને બદલે CPU આલેખને બતાવે "
-"છે."
+"જો TRUE હોય તો, system-monitor એ સ્ટેક વિસ્તાર તરીકે લાઇન આલેખને બદલે CPU આલેખને બતાવે છે."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:8
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:11
 msgid "Enable/Disable smooth refresh"
 msgstr "લીસું પુનઃતાજાપણું સક્રિય/નિષ્ક્રિય કરો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:9
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:12
 msgid "Show warning dialog when killing processes"
 msgstr "જ્યારે પ્રક્રિયાઓને મારી રહ્યા હોય ત્યારે ચેતવણી સંવાદ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:10
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:13
 msgid "Time in milliseconds between updates of the process view"
 msgstr "પ્રક્રિયા દેખાવના સુધારાઓ વચ્ચેનો સમય મિલિસેકન્ડોમાં"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:11
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:14
 msgid "Time in milliseconds between updates of the graphs"
 msgstr "ગ્રાફના સુધારાઓ વચ્ચેનો સમય મિલિસેકન્ડોમાં"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:12
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:15
 msgid "Whether information about all file systems should be displayed"
 msgstr "શું બધી ફાઈલ સિસ્ટમો વિશે જાણકારી દર્શાવવી જોઈએ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:13
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:16
 msgid ""
 "Whether to display information about all file systems (including types like "
 "'autofs' and 'procfs'). Useful for getting a list of all currently mounted "
@@ -713,333 +745,353 @@
 "ફાઈલસિસ્ટમોને સમાવીને). તે વર્તમાનમાં માઉન્ટ થયેલ બધી ફાઈલસિસ્ટમોની યાદી મેળવવા માટે "
 "ઉપયોગી છે."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:14
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:17
 msgid "Time in milliseconds between updates of the devices list"
 msgstr "ઉપકરણ યાદીના સુધારાઓ વચ્ચેનો સમય મિલિસેકન્ડોમાં"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:15
-msgid "Determines which processes to show."
-msgstr "નક્કી કરો કે કઇ પ્રક્રિયાઓને બતાવી છે."
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:18
+msgid ""
+"Determines which processes to show by default. 0 is All, 1 is user, and 2 is "
+"active"
+msgstr ""
+"મૂળભુત રીતે કઈ પ્રક્રિયાઓ બતાવવી તે નક્કી કરે છે. ૦ એ બધા માટે, ૧ એ વપરાશકર્તા માટે, અને "
+"૨ એ સક્રિય માટે"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:16
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:19
 msgid "Saves the currently viewed tab"
 msgstr "વર્તમાનમાં જોયેલ ટેબ સંગ્રહે છે"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:17
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:20
+msgid ""
+"0 for the System Info, 1 for the processes list, 2 for the resources and 3 "
+"for the disks list"
+msgstr "સિસ્ટમ જાણકારી માટે ૦, પ્રોસેસર યાદી માટે ૧, સ્રોતો માટે ૨ અને ડિસ્કોની યાદી માટે ૩"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:21
 msgid "CPU colors"
 msgstr "CPU રંગો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:18
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:22
 msgid "Each entry is in the format (CPU#, Hexadecimal color value)"
 msgstr "દરેક નોંધણી બંધારણમાં છે (CPU#, હૅક્ઝાડેસિમલ રંગ કિંમત)"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:19
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:23
 msgid "Default graph memory color"
 msgstr "મૂળભૂત ગ્રાફ મેમરી રંગ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:20
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:24
 msgid "Default graph swap color"
 msgstr "મૂળભુત ગ્રાફ સ્વેપ રંગ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:21
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:25
 msgid "Default graph incoming network traffic color"
 msgstr "આવતા નેટવર્ક ટ્રાફિક રંગનો મૂળભૂત ગ્રાફ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:22
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:26
 msgid "Default graph outgoing network traffic color"
 msgstr "જતા નેટવર્ક ટ્રાફિક રંગનો મૂળભૂત ગ્રાફ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:23
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:27
 msgid "Show network traffic in bits"
 msgstr "બિટમાં નેટવર્ક ટ્રાફિકને બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:24
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:28
 msgid "Process view sort column"
 msgstr "પ્રક્રિયા દેખાવ સ્તંભને ક્રમમાં ગોઠવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:25
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:29
 msgid "Process view columns order"
 msgstr "પ્રક્રિયા દેખાવ સ્તંભો ક્રમ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:26
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:30
 msgid "Process view sort order"
 msgstr "ક્રમમાં પ્રક્રિયા દેખાવ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:27
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:31
 msgid "Width of process 'Name' column"
 msgstr "પ્રક્રિયા 'નામ' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:28
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:32
 msgid "Show process 'Name' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'નામ' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:29
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:33
 msgid "Width of process 'User' column"
 msgstr "પ્રક્રિયા 'વપરાશકર્તા' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:30
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:34
 msgid "Show process 'User' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'વપરાશકર્તા' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:31
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:35
 msgid "Width of process 'Status' column"
 msgstr "પ્રક્રિયા 'પરિસ્થિતિ' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:32
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:36
 msgid "Show process 'Status' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'પરિસ્થિતિ' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:33
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:37
 msgid "Width of process 'Virtual Memory' column"
 msgstr "પ્રક્રિયા 'વર્ચ્યુઅલ મેમરી' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:34
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:38
 msgid "Show process 'Virtual Memory' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'વર્ચ્યુઅલ મેમરી' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:35
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:39
 msgid "Width of process 'Resident Memory' column"
 msgstr "પ્રક્રિયા 'રહેઠાણ મેમરી' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:36
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:40
 msgid "Show process 'Resident Memory' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'રહેઠાણ મેમરી' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:37
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:41
 msgid "Width of process 'Writable Memory' column"
 msgstr "પ્રક્રિયા 'લખી શકાય તેવી મેમરી' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:38
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:42
 msgid "Show process 'Writable Memory' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'લખી શકાય તેવી મેમરી' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:39
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:43
 msgid "Width of process 'Shared Memory' column"
 msgstr "પ્રક્રિયા 'વહેંચાયેલ મેમરી' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:40
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:44
 msgid "Show process 'Shared Memory' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'વહેંચાયેલ મેમરી' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:41
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:45
 msgid "Width of process 'X Server Memory' column"
 msgstr "પ્રક્રિયા 'X સર્વર મેમરી' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:42
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:46
 msgid "Show process 'X Server Memory' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'X સર્વર મેમરી' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:44
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:48
 #, no-c-format
 msgid "Width of process 'CPU %' column"
 msgstr "પ્રક્રિયા 'CPU %' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:46
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:50
 #, no-c-format
 msgid "Show process 'CPU %' column on startup"
 msgstr "શરૂઆત પર પ્રક્રિયા 'CPU %' બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:47
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:51
 msgid "Width of process 'CPU Time' column"
 msgstr "પ્રક્રિયા 'CPU સમય' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:48
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:52
 msgid "Show process 'CPU Time' column on startup"
 msgstr "શરૂઆત પર પ્રક્રિયા 'CPU સમય' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:49
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:53
 msgid "Width of process 'Started' column"
 msgstr "પ્રક્રિયા 'શરૂઆત સમય' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:50
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:54
 msgid "Show process 'Started' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'શરૂઆત સમય' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:51
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:55
 msgid "Width of process 'Nice' column"
 msgstr "પ્રક્રિયા 'Nice' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:52
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:56
 msgid "Show process 'Nice' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'nice' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:53
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:57
 msgid "Width of process 'PID' column"
 msgstr "પ્રક્રિયા 'PID' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:54
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:58
 msgid "Show process 'PID' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'PID' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:55
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:59
 msgid "Width of process 'SELinux Security Context' column"
 msgstr "પ્રક્રિયા 'SELinux સુરક્ષા સંદર્ભ' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:56
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:60
 msgid "Show process 'SELinux Security Context' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'SELinux સુરક્ષા સંદર્ભ' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:57
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:61
 msgid "Width of process 'Command Line' column"
 msgstr "પ્રક્રિયા 'આદેશ વાક્ય' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:58
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:62
 msgid "Show process 'Command Line' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'આદેશ વાક્ય' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:59
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:63
 msgid "Width of process 'Memory' column"
 msgstr "પ્રક્રિયા 'મેમરી' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:60
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:64
 msgid "Show process 'Memory' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'મેમરી' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:61
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:65
 msgid "Width of process 'Waiting Channel' column"
 msgstr "પ્રક્રિયાની 'ચેનલ રાહ જોવી' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:62
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:66
 msgid "Show process 'Waiting Channel' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'ચેનલને રાહ જોવા' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:63
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:67
 msgid "Width of process 'Control Group' column"
 msgstr "પ્રક્રિયા 'નિયંત્રણ જૂથ' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:64
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:68
 msgid "Show process 'Control Group' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'નિયંત્રણ જૂથ' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:65
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:69
 msgid "Width of process 'Unit' column"
 msgstr "પ્રક્રિયા 'એકમ' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:66
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:70
 msgid "Show process 'Unit' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'એકમ' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:67
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:71
 msgid "Width of process 'Session' column"
 msgstr "પ્રક્રિયા 'સત્ર' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:68
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:72
 msgid "Show process 'Session' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'સત્ર' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:69
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:73
 msgid "Width of process 'Seat' column"
 msgstr "પ્રક્રિયા 'Seat' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:70
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:74
 msgid "Show process 'Seat' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'Seat' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:71
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:75
 msgid "Width of process 'Owner' column"
 msgstr "પ્રક્રિયા 'માલિક' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:72
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:76
 msgid "Show process 'Owner' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'માલિક' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:73
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:77
 msgid "Width of process 'Priority' column"
 msgstr "પ્રક્રિયા 'પ્રાધાન્ય' સ્તંભની પહોળાઈ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:74
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:78
 msgid "Show process 'Priority' column on startup"
 msgstr "શરૂઆત કરવા પર પ્રક્રિયા 'પ્રાધાન્ય' સ્તંભ બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:75
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:79
 msgid "Disk view sort column"
 msgstr "ડિસ્ક દેખાવ સ્તંભને ક્રમમાં ગોઠવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:76
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:80
 msgid "Disk view sort order"
 msgstr "ડિસ્ક દેખાવ સ્તંભને ક્રમમાં ગોઠવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:77
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:81
 msgid "Disk view columns order"
 msgstr "ડિસ્ક દેખાવ સ્તંભોનો ક્રમ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:78
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:82
+#| msgid "Width of process 'Nice' column"
 msgid "Width of disk view 'Device' column"
 msgstr "ડિસ્ક દૃશ્ય 'ઉપકરણ' સ્તંભની પહોળાઇ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:79
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:83
+#| msgid "Show process 'Nice' column on startup"
 msgid "Show disk view 'Device' column on startup"
 msgstr "શરૂઆત કરવા પર ડિસ્ક દૃશ્ય 'ઉપકરણ' સ્તંભને બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:80
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:84
+#| msgid "Width of process 'Memory' column"
 msgid "Width of disk view 'Directory' column"
 msgstr "ડિસ્ક દૃશ્ય 'ડિરેક્ટરી' સ્તંભની પહોળાઇ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:81
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:85
+#| msgid "Show process 'Memory' column on startup"
 msgid "Show disk view 'Directory' column on startup"
 msgstr "શરૂઆત કરવા પર ડિસ્ક દૃશ્ય 'ડિરેક્ટરી' સ્તંભને બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:82
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:86
+#| msgid "Width of process 'Name' column"
 msgid "Width of disk view 'Type' column"
 msgstr "ડિસ્ક દૃશ્ય 'પ્રકાર' સ્તંભની પહોળાઇ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:83
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:87
+#| msgid "Show process 'Name' column on startup"
 msgid "Show disk view 'Type' column on startup"
 msgstr "શરૂઆત કરવા પર ડિસ્ક દૃશ્ય 'પ્રકાર' સ્તંભને બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:84
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:88
+#| msgid "Width of process 'Status' column"
 msgid "Width of disk view 'Total' column"
 msgstr "ડિસ્ક દૃશ્ય 'કુલ' સ્તંભની પહોળાઇ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:85
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:89
+#| msgid "Show process 'Status' column on startup"
 msgid "Show disk view 'Total' column on startup"
 msgstr "શરૂઆત કરવા પર ડિસ્ક દૃશ્ય 'કુલ' સ્તંભ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:86
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:90
+#| msgid "Width of process 'Name' column"
 msgid "Width of disk view 'Free' column"
 msgstr "ડિસ્ક દૃશ્ય 'મુક્ત' સ્તંભની પહોળાઇ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:87
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:91
+#| msgid "Show process 'Name' column on startup"
 msgid "Show disk view 'Free' column on startup"
 msgstr "શરૂઆત કરવા પર ડિસ્ક દૃશ્ય 'મુક્ત' સ્તંભ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:88
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:92
+#| msgid "Width of process 'Name' column"
 msgid "Width of disk view 'Available' column"
 msgstr "ડિસ્ક દૃશ્ય 'ઉપલબ્ધ' સ્તંભની પહોળાઇ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:89
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:93
+#| msgid "Show process 'Name' column on startup"
 msgid "Show disk view 'Available' column on startup"
 msgstr "શરૂઆત કરવા પર ડિસ્ક દૃશ્ય 'ઉપલબ્ધ' સ્તંભને બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:90
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:94
+#| msgid "Width of process 'User' column"
 msgid "Width of disk view 'Used' column"
 msgstr "ડિસ્ક દૃશ્ય 'વાપરેલ' સ્તંભની પહોળાઇ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:91
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:95
+#| msgid "Show process 'User' column on startup"
 msgid "Show disk view 'Used' column on startup"
 msgstr "શરૂઆત કરવા પર ડિસ્ક દૃશ્ય 'વાપરેલ' સ્તંભને બતાવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:92
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:96
 msgid "Memory map sort column"
 msgstr "મેમરી મેપ સ્તંભને ક્રમમાં ગોઠવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:93
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:97
 msgid "Memory map sort order"
 msgstr "મેમરી મેપ ક્રમમાં ગોઠવો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:94
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:98
 msgid "Open files sort column"
 msgstr "સ્તંભના ક્રમમાં ફાઇલો ખોલો"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:95
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:99
 msgid "Open files sort order"
 msgstr "ઉતરતા ક્રમમાં ફાઇલો ખોલો"
 
-#: ../src/prefsdialog.cpp:170
-msgid "Icon"
-msgstr "ચિહ્ન"
-
-#: ../src/procactions.cpp:75
+#: ../src/procactions.cpp:76
 #, c-format
 msgid ""
 "Cannot change the priority of process with PID %d to %d.\n"
@@ -1048,7 +1100,7 @@
 "%d માં PID %d સાથે પ્રક્રિયાનાં પ્રાધાન્યને બદલી શકાતુ નથી.\n"
 "%s"
 
-#: ../src/procactions.cpp:153
+#: ../src/procactions.cpp:156
 #, c-format
 msgid ""
 "Cannot kill process with PID %d with signal %d.\n"
@@ -1057,38 +1109,14 @@
 "સંકેત %d સાથે PID %d સાથે પ્રક્રિયાને મારી શકાતી નથી.\n"
 "%s"
 
-#. xgettext: primary alert message for killing single process
-#: ../src/procdialogs.cpp:75
+#. xgettext: primary alert message
+#: ../src/procdialogs.cpp:78
 #, c-format
-#| msgid "Kill the selected process “%s” (PID: %u)?"
-msgid "Are you sure you want to kill the selected process “%s” (PID: %u)?"
-msgstr "શું તમે ખરેખર પસંદ થયેલ પ્રક્રિયા “%s” (PID: %u) ને મારવા માંગો છો?"
-
-#. xgettext: primary alert message for ending single process
-#: ../src/procdialogs.cpp:80
-#, c-format
-#| msgid "End the selected process “%s” (PID: %u)?"
-msgid "Are you sure you want to end the selected process “%s” (PID: %u)?"
-msgstr "શું તમે ખરેખર પસંદ થયેલ પ્રક્રિયા “%s” (PID: %u) નો અંત લાવવા માંગો છો?"
-
-#. xgettext: primary alert message for killing multiple processes
-#: ../src/procdialogs.cpp:87
-#, c-format
-msgid "Are you sure you want to kill the selected process?"
-msgid_plural "Are you sure you want to kill the %d selected processes?"
-msgstr[0] "શું તમે ખરેખર પસંદ થયેલ પ્રક્રિયાને મારવા માંગો છો?"
-msgstr[1] "શું તમે ખરેખર %d પસંદ થયેલ પ્રક્રિયાઓને મારવા માંગો છો?"
-
-#. xgettext: primary alert message for ending multiple processes
-#: ../src/procdialogs.cpp:91
-#, c-format
-msgid "Are you sure you want to end the selected process?"
-msgid_plural "Are you sure you want to end the %d selected processes?"
-msgstr[0] "શું તમે ખરેખર પસંદ થયેલ પ્રક્રિયાનો અંત લાવવા માંગો છો?"
-msgstr[1] "શું તમે ખરેખર %d પસંદ થયેલ પ્રક્રિયાઓનો અંત લાવવા માંગો છો?"
+msgid "Kill the selected process “%s” (PID: %u)?"
+msgstr "પસંદિત પ્રક્રિયા “%s” (PID: %u) મારી નાંખવી છે?"
 
 #. xgettext: secondary alert message
-#: ../src/procdialogs.cpp:98 ../src/procdialogs.cpp:104
+#: ../src/procdialogs.cpp:82
 msgid ""
 "Killing a process may destroy data, break the session or introduce a "
 "security risk. Only unresponsive processes should be killed."
@@ -1096,395 +1124,288 @@
 "પ્રક્રિયાને મારી નાંખવાનું માહિતીનો નાશ કરશે, સત્ર ભાંગશે અથવા સુરક્ષા જોખમનો પરિચય આપશે. "
 "માત્ર નહિં જવાબ આપતી પ્રક્રિયાઓ મારી નાંખવી જોઈએ."
 
-#: ../src/procdialogs.cpp:101
-#| msgid "_Kill Process"
-msgid "_Kill Process"
-msgid_plural "_Kill Processes"
-msgstr[0] "પ્રક્રિયાને મારો (_K)"
-msgstr[1] "પ્રક્રિયાઓને મારો (_K)"
+#. xgettext: primary alert message
+#: ../src/procdialogs.cpp:89
+#, c-format
+msgid "End the selected process “%s” (PID: %u)?"
+msgstr "પસંદિત પ્રક્રિયા “%s” (PID: %u)નો અંત કરવો છે?"
 
-#: ../src/procdialogs.cpp:107
-#| msgid "_End Process"
-msgid "_End Process"
-msgid_plural "_End Processes"
-msgstr[0] "અંતિમ પ્રક્રિયા (_E)"
-msgstr[1] "અંતિમ પ્રક્રિયાઓ (_E)"
+#. xgettext: secondary alert message
+#: ../src/procdialogs.cpp:93
+msgid ""
+"Ending a process may destroy data, break the session or introduce a security "
+"risk. Only unresponsive processes should be ended."
+msgstr ""
+"પ્રક્રિયાનો અંત કરવાનું માહિતીનો નાશ કરશે, સત્ર ભાંગી નાંખશે અથવા સુરક્ષા જોખમનો પરિચય "
+"આપશે. માત્ર નહિં જવાબ આપતી પ્રક્રિયાઓનો અંત થવો જોઈએ."
 
-#: ../src/procdialogs.cpp:188
+#: ../src/procdialogs.cpp:175
 #, c-format
 msgid "Change Priority of Process “%s” (PID: %u)"
 msgstr "પ્રક્રિયા “%s” (PID: %u) નાં પ્રાધાન્યને બદલો"
 
-#: ../src/procdialogs.cpp:191
-#, c-format
-#| msgid "Change the order of priority of process"
-msgid "Change Priority of the selected process"
-msgid_plural "Change Priority of %d selected processes"
-msgstr[0] "પસંદ થયેલ પ્રક્રિયાનાં પ્રાધાન્યને બદલો"
-msgstr[1] "%d પસંદ થયેલ પ્રક્રિયાનાં પ્રાધાન્યને બદલો"
-
-#: ../src/procdialogs.cpp:210
+#: ../src/procdialogs.cpp:193
 msgid "Note:"
 msgstr "નોંધ:"
 
-#: ../src/procdialogs.cpp:211
+#: ../src/procdialogs.cpp:194
 msgid ""
 "The priority of a process is given by its nice value. A lower nice value "
 "corresponds to a higher priority."
 msgstr ""
 "પ્રક્રિયાનું પ્રાધાન્ય nice ની કિંમત દ્વારા મળે છે. ઓછી nice ની કિંમત ઊંચું પ્રાધાન્ય સૂચવે છે."
 
-#: ../src/procproperties.cpp:55 ../src/procproperties.cpp:106
-#: ../src/procproperties.cpp:109 ../src/util.cpp:432
+#: ../src/procdialogs.cpp:366 ../src/procman-app.cpp:466
+msgid "Icon"
+msgstr "ચિહ્ન"
+
+#: ../src/procman-app.cpp:580
+msgid "A simple process and system monitor."
+msgstr "સાદી પ્રક્રિયા અને સિસ્ટમ મૉનિટર."
+
+#: ../src/procproperties.cpp:104 ../src/util.cpp:434
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/procproperties.cpp:89 ../src/proctable.cpp:322
+#: ../src/procproperties.cpp:129 ../src/proctable.cpp:197
 msgid "Process Name"
 msgstr "પ્રક્રિયાનું નામ"
 
-#: ../src/procproperties.cpp:90 ../src/proctable.cpp:323
+#: ../src/procproperties.cpp:130 ../src/proctable.cpp:198
 msgid "User"
 msgstr "વપરાશકર્તા"
 
-#: ../src/procproperties.cpp:91 ../src/proctable.cpp:324
+#: ../src/procproperties.cpp:131 ../src/proctable.cpp:199
 msgid "Status"
 msgstr "સ્થિતિ"
 
-#: ../src/procproperties.cpp:93 ../src/proctable.cpp:325
+#: ../src/procproperties.cpp:133 ../src/proctable.cpp:200
 msgid "Virtual Memory"
 msgstr "વર્ચ્યુઅલ મેમરી"
 
-#: ../src/procproperties.cpp:94 ../src/proctable.cpp:326
+#: ../src/procproperties.cpp:134 ../src/proctable.cpp:201
 msgid "Resident Memory"
 msgstr "રહેવાસી મેમરી"
 
-#: ../src/procproperties.cpp:95 ../src/proctable.cpp:327
+#: ../src/procproperties.cpp:135 ../src/proctable.cpp:202
 msgid "Writable Memory"
 msgstr "લખી શકાય તેવી મેમરી"
 
-#: ../src/procproperties.cpp:96 ../src/proctable.cpp:328
+#: ../src/procproperties.cpp:136 ../src/proctable.cpp:203
 msgid "Shared Memory"
 msgstr "સહભાગી મેમરી"
 
-#: ../src/procproperties.cpp:98 ../src/proctable.cpp:329
+#: ../src/procproperties.cpp:137 ../src/proctable.cpp:204
 msgid "X Server Memory"
 msgstr "X સર્વર મેમરી"
 
-#: ../src/procproperties.cpp:101 ../src/proctable.cpp:331
+#: ../src/procproperties.cpp:139 ../src/proctable.cpp:206
 msgid "CPU Time"
 msgstr "CPU સમય"
 
-#: ../src/procproperties.cpp:101
+#: ../src/procproperties.cpp:139
 #, c-format
 msgid "%lld second"
 msgid_plural "%lld seconds"
 msgstr[0] "%lld સેકંડ"
 msgstr[1] "%lld સેકંડ"
 
-#: ../src/procproperties.cpp:102 ../src/proctable.cpp:332
+#: ../src/procproperties.cpp:140 ../src/proctable.cpp:207
 msgid "Started"
 msgstr "શરૂ થયેલ"
 
-#: ../src/procproperties.cpp:103 ../src/proctable.cpp:333
+#: ../src/procproperties.cpp:141 ../src/proctable.cpp:208
 msgid "Nice"
 msgstr "Nice"
 
-#: ../src/procproperties.cpp:104 ../src/proctable.cpp:347
+#: ../src/procproperties.cpp:142 ../src/proctable.cpp:222
 msgid "Priority"
 msgstr "પ્રાધાન્ય"
 
 # libgnomeui/gnome-client.c:833
-#: ../src/procproperties.cpp:105 ../src/proctable.cpp:334
+#: ../src/procproperties.cpp:143 ../src/proctable.cpp:209
 msgid "ID"
 msgstr "ઓળખ"
 
-#: ../src/procproperties.cpp:106 ../src/proctable.cpp:335
+#: ../src/procproperties.cpp:144 ../src/proctable.cpp:210
 msgid "Security Context"
 msgstr "સુરક્ષા સંદર્ભ"
 
-#: ../src/procproperties.cpp:107 ../src/proctable.cpp:336
+#: ../src/procproperties.cpp:145 ../src/proctable.cpp:211
 msgid "Command Line"
 msgstr "આદેશ વાક્ય"
 
 #. xgettext: combined noun, the function the process is waiting in, see wchan ps(1)
-#: ../src/procproperties.cpp:108 ../src/proctable.cpp:339
+#: ../src/procproperties.cpp:146 ../src/proctable.cpp:214
 msgid "Waiting Channel"
 msgstr "ચેનલ રાહ જોઇ રહી છે"
 
-#: ../src/procproperties.cpp:109 ../src/proctable.cpp:340
+#: ../src/procproperties.cpp:147 ../src/proctable.cpp:215
 msgid "Control Group"
 msgstr "નિયંત્રણ જૂથ"
 
-#: ../src/procproperties.cpp:221
+#: ../src/procproperties.cpp:259
+msgid "Process Properties"
+msgstr "પ્રક્રિયા ગુણધર્મો"
+
+#: ../src/procproperties.cpp:279
 #, c-format
-msgid "%s (PID %u)"
-msgstr "%s (PID %u)"
+msgid "Properties of process \"%s\" (PID %u):"
+msgstr "પ્રક્રિયા \"%s\" (PID %u) નાં ગુણધર્મો:"
 
-#: ../src/proctable.cpp:330
+#: ../src/proctable.cpp:205
 #, no-c-format
 msgid "% CPU"
 msgstr "% CPU"
 
-#: ../src/proctable.cpp:341
+#: ../src/proctable.cpp:216
 msgid "Unit"
 msgstr "એકમ"
 
-#: ../src/proctable.cpp:342
+#: ../src/proctable.cpp:217
 msgid "Session"
 msgstr "સત્ર"
 
 #. TRANSLATORS: Seat = i.e. the physical seat the session of the process belongs to, only
 #. for multi-seat environments. See http://en.wikipedia.org/wiki/Multiseat_configuration
-#: ../src/proctable.cpp:345
+#: ../src/proctable.cpp:220
 msgid "Seat"
 msgstr "Seat"
 
-#: ../src/proctable.cpp:346
+#: ../src/proctable.cpp:221
 msgid "Owner"
 msgstr "માલિક"
 
+#: ../src/proctable.cpp:1030
+#, c-format
+msgid "Load averages for the last 1, 5, 15 minutes: %0.2f, %0.2f, %0.2f"
+msgstr "છેલ્લી ૧, ૫, ૧૫ મિનિટો માટેનો સરેરાશ ભાર: %0.2f, %0.2f, %0.2f"
+
 # gnome-session/gsm-client-row.c:37
-#: ../src/util.cpp:27
+#: ../src/util.cpp:30
 msgid "Running"
 msgstr "ચાલતું"
 
-#: ../src/util.cpp:31
+#: ../src/util.cpp:34
 msgid "Stopped"
 msgstr "અટકેલું"
 
-#: ../src/util.cpp:35
+#: ../src/util.cpp:38
 msgid "Zombie"
 msgstr "ઝોમ્બી"
 
-#: ../src/util.cpp:39
+#: ../src/util.cpp:42
 msgid "Uninterruptible"
 msgstr "ઈન્ટ્રપ્ટ થાય નહિં એવું"
 
-#: ../src/util.cpp:43
+#: ../src/util.cpp:46
 msgid "Sleeping"
 msgstr "નિષ્ક્રિય"
 
 #. xgettext: weeks, days
-#: ../src/util.cpp:98
+#: ../src/util.cpp:101
 #, c-format
 msgid "%uw%ud"
 msgstr "%uw%ud"
 
 #. xgettext: days, hours (0 -> 23)
-#: ../src/util.cpp:102
+#: ../src/util.cpp:105
 #, c-format
 msgid "%ud%02uh"
 msgstr "%ud%02uh"
 
 #. xgettext: hours (0 -> 23), minutes, seconds
-#: ../src/util.cpp:106
+#: ../src/util.cpp:109
 #, c-format
 msgid "%u:%02u:%02u"
 msgstr "%u:%02u:%02u"
 
 #. xgettext: minutes, seconds, centiseconds
-#: ../src/util.cpp:109
+#: ../src/util.cpp:112
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/util.cpp:164
+#: ../src/util.cpp:166
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../src/util.cpp:165
+#: ../src/util.cpp:167
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../src/util.cpp:166
+#: ../src/util.cpp:168
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../src/util.cpp:167
+#: ../src/util.cpp:169
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../src/util.cpp:168
+#: ../src/util.cpp:170
 #, c-format
 msgid "%.3g kbit"
 msgstr "%.3g kbit"
 
-#: ../src/util.cpp:169
+#: ../src/util.cpp:171
 #, c-format
 msgid "%.3g Mbit"
 msgstr "%.3g Mbit"
 
-#: ../src/util.cpp:170
+#: ../src/util.cpp:172
 #, c-format
 msgid "%.3g Gbit"
 msgstr "%.3g Gbit"
 
-#: ../src/util.cpp:171
+#: ../src/util.cpp:173
 #, c-format
 msgid "%.3g Tbit"
 msgstr "%.3g Tbit"
 
-#: ../src/util.cpp:186
+#: ../src/util.cpp:188
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
 msgstr[0] "%u બીટ"
 msgstr[1] "%u બીટો"
 
-#: ../src/util.cpp:187
+#: ../src/util.cpp:189
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u બાઈટ"
 msgstr[1] "%u બાઈટો"
 
-#: ../src/util.cpp:230
+#: ../src/util.cpp:232
 msgid "Very High Priority"
 msgstr "ખૂબ ઊંચી પ્રાથમિકતા"
 
-#: ../src/util.cpp:232
+#: ../src/util.cpp:234
 msgid "High Priority"
 msgstr "ઊંચુ પ્રાધાન્ય"
 
-#: ../src/util.cpp:234
+#: ../src/util.cpp:236
 msgid "Normal Priority"
 msgstr "સામાન્ય પ્રાધાન્ય"
 
-#: ../src/util.cpp:236
+#: ../src/util.cpp:238
 msgid "Low Priority"
 msgstr "નીચી પ્રાથમિકતા"
 
-#: ../src/util.cpp:238
+#: ../src/util.cpp:240
 msgid "Very Low Priority"
 msgstr "ખૂબ નીચી પ્રાથમિકતા"
 
 #. xgettext: rate, 10MiB/s or 10Mbit/s
-#: ../src/util.cpp:630
+#: ../src/util.cpp:632
 #, c-format
 msgid "%s/s"
 msgstr "%s/s"
 
-#~ msgid "Privileges are required to kill process"
-#~ msgstr "પ્રક્રિયાને મારવા માટે અધિકારો જરૂરી છે"
-
-#~ msgid "View"
-#~ msgstr "દૃશ્ય"
-
-#~ msgid "Sent"
-#~ msgstr "મોકલ્યુ"
-
-#~ msgid "_Name contains:"
-#~ msgstr "નામ સમાવે (_N):"
-
-#~ msgid "C_lear"
-#~ msgstr "સાફ કરો (_l)"
-
-#~ msgid "S_earch results:"
-#~ msgstr "શોધ પરિણામો (_e):"
-
-#~ msgid "_View"
-#~ msgstr "દેખાવ (_V)"
-
-#~ msgid "_Stop Process"
-#~ msgstr "પ્રક્રિયા અટકાવો (_S)"
-
-#~ msgid "Stop process"
-#~ msgstr "પ્રક્રિયા અટકાવો"
-
-#~ msgid "Continue process if stopped"
-#~ msgstr "જો અટકાવાયેલ હોય તો પ્રક્રિયા ચાલુ રાખો"
-
-#~ msgid "Force process to finish normally"
-#~ msgstr "પ્રક્રિયાને સામાન્ય રીતે સમાપ્ત કરવા માટે દબાણ કરો"
-
-#~ msgid "Force process to finish immediately"
-#~ msgstr "પ્રક્રિયાને તુરંત જ સમાપ્ત કરવા માટે દબાણ કરો"
-
-#~ msgid "Refresh the process list"
-#~ msgstr "પ્રક્રિયા યાદીને પુન:તાજી કરો"
-
-#~ msgid "Open the memory maps associated with a process"
-#~ msgstr "પ્રક્રિયા સાથે સંકળાયેલ મેમરી નકશાઓ ખોલો"
-
-#~ msgid "View the files opened by a process"
-#~ msgstr "પ્રક્રિયા દ્વારા ખોલાયેલ ફાઈલો જુઓ"
-
-#~ msgid "View additional information about a process"
-#~ msgstr "પ્રક્રિયા વિશે વધારાની જાણકારીને દર્શાવો"
-
-#~ msgid "Show parent/child relationship between processes"
-#~ msgstr "પ્રક્રિયાઓ વચ્ચે પિતૃ/બાળ સંબંધ બતાવો"
-
-#~ msgid "Show active processes"
-#~ msgstr "સક્રિય પ્રક્રિયાઓ બતાવો"
-
-#~ msgid "Show all processes"
-#~ msgstr "બધી પ્રક્રિયાઓ બતાવો"
-
-#~ msgid "Show only user-owned processes"
-#~ msgstr "ફક્ત વપરાશકર્તા માલિકી થયેલ પ્રક્રિયાઓને બતાવો"
-
-#~ msgid "Set process priority to very high"
-#~ msgstr "ઘણુ ઊંચુ તરીકે પ્રક્રિયા પ્રાધાન્યને સુયોજિત કરો"
-
-#~ msgid "Set process priority to high"
-#~ msgstr "ઊંચુ તરીકે પ્રક્રિયા પ્રાધાન્યને સુયોજિત કરો"
-
-#~ msgid "Set process priority to normal"
-#~ msgstr "સામાન્ય રીતે પ્રાધાન્ય પ્રમાણે પ્રક્રિયાને સુયોજિત કરો"
-
-#~ msgid "Set process priority to low"
-#~ msgstr "નીચુ તરીકે પ્રક્રિયા પ્રાધાન્યને સુયોજિત કરો"
-
-#~ msgid "Set process priority to very low"
-#~ msgstr "ઘણું નીચુ તરીકે પ્રક્રિયા પ્રાધાન્યને સુયોજિત કરો"
-
-#~ msgid "Set process priority manually"
-#~ msgstr "જાતેજ પ્રક્રિયાનાં પ્રાધાન્યને સુયોજિત કરો"
-
-#~ msgid "Main Window width"
-#~ msgstr "મુખ્ય વિન્ડો પહોળાઈ"
-
-#~ msgid "Main Window height"
-#~ msgstr "મુખ્ય વિન્ડો ઊંચાઈ"
-
-#~ msgid "Main Window X position"
-#~ msgstr "મુખ્ય વિન્ડો X સ્થાન"
-
-#~ msgid "Main Window Y position"
-#~ msgstr "મુખ્ય વિન્ડો Y સ્થાન"
-
-#~ msgid ""
-#~ "Determines which processes to show by default. 0 is All, 1 is user, and 2 "
-#~ "is active"
-#~ msgstr ""
-#~ "મૂળભુત રીતે કઈ પ્રક્રિયાઓ બતાવવી તે નક્કી કરે છે. ૦ એ બધા માટે, ૧ એ વપરાશકર્તા માટે, "
-#~ "અને ૨ એ સક્રિય માટે"
-
-#~ msgid ""
-#~ "0 for the System Info, 1 for the processes list, 2 for the resources and "
-#~ "3 for the disks list"
-#~ msgstr ""
-#~ "સિસ્ટમ જાણકારી માટે ૦, પ્રોસેસર યાદી માટે ૧, સ્રોતો માટે ૨ અને ડિસ્કોની યાદી માટે ૩"
-
-#~ msgid ""
-#~ "Ending a process may destroy data, break the session or introduce a "
-#~ "security risk. Only unresponsive processes should be ended."
-#~ msgstr ""
-#~ "પ્રક્રિયાનો અંત કરવાનું માહિતીનો નાશ કરશે, સત્ર ભાંગી નાંખશે અથવા સુરક્ષા જોખમનો "
-#~ "પરિચય આપશે. માત્ર નહિં જવાબ આપતી પ્રક્રિયાઓનો અંત થવો જોઈએ."
-
-#~ msgid "Properties of process \"%s\" (PID %u):"
-#~ msgstr "પ્રક્રિયા \"%s\" (PID %u) નાં ગુણધર્મો:"
-
-#~ msgid "Load averages for the last 1, 5, 15 minutes: %0.2f, %0.2f, %0.2f"
-#~ msgstr "છેલ્લી ૧, ૫, ૧૫ મિનિટો માટેનો સરેરાશ ભાર: %0.2f, %0.2f, %0.2f"
-
 #~ msgid "System"
 #~ msgstr "સિસ્ટમ"
 
@@ -1503,9 +1424,15 @@
 #~ msgid "Search for _Open Files"
 #~ msgstr "ખૂલેલી ફાઈલો માટે શોધો (_O)"
 
+#~ msgid "Search for open files"
+#~ msgstr "ખૂલેલી ફાઈલો માટે શોધો"
+
 #~ msgid "Quit the program"
 #~ msgstr "કાર્યક્રમ બંધ કરો"
 
+#~ msgid "Configure the application"
+#~ msgstr "કાર્યક્રમ રૂપરેખાંકિત કરો"
+
 #~ msgid "_Contents"
 #~ msgstr "સમાવિષ્ટો (_C)"
 
diff -Nru gnome-system-monitor-3.14.1/po/kk.po gnome-system-monitor-3.15.4/po/kk.po
--- gnome-system-monitor-3.14.1/po/kk.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/kk.po	2014-12-08 19:51:20.000000000 +0000
@@ -0,0 +1,1309 @@
+# Kazakh translation for gnome-system-monitor.
+# Copyright (C) 2014 gnome-system-monitor's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnome-system-monitor package.
+# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-system-monitor master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=system-"
+"monitor&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-10-29 08:35+0000\n"
+"PO-Revision-Date: 2014-10-30 06:44+0600\n"
+"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
+"Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
+"Language: kk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: ../gnome-system-monitor.desktop.in.in.h:1 ../data/interface.ui.h:1
+#: ../src/application.cpp:268 ../src/interface.cpp:363
+msgid "System Monitor"
+msgstr "Жүйелік бақылаушы"
+
+#: ../gnome-system-monitor.desktop.in.in.h:2
+#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:364
+msgid "View current processes and monitor system state"
+msgstr "Ағымдағы үрдістерді қарау және жүйе қалып-күйін бақылау"
+
+#: ../gnome-system-monitor.desktop.in.in.h:3
+msgid ""
+"Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
+"Manager;"
+msgstr ""
+"Бақылау;Жүйе;Үрдіс;Процессор;Жады;Желі;Тарихы;Қолданылуы;Өнімділік;Тапсырма;"
+"Басқарушы;"
+
+#: ../gnome-system-monitor-kde.desktop.in.in.h:1
+#: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
+msgid "GNOME System Monitor"
+msgstr "GNOME жүйелік бақылаушысы"
+
+#: ../gnome-system-monitor-kde.desktop.in.in.h:3
+msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
+msgstr "Бақылау;Жүйе;Үрдіс;Процессор;Жады;Желі;Тарихы;Қолданылуы;"
+
+#: ../gnome-system-monitor.appdata.xml.in.h:2
+msgid "View and manage system resources"
+msgstr "Жүйелік ресурстарды қарау және басқару"
+
+#: ../gnome-system-monitor.appdata.xml.in.h:3
+msgid ""
+"System Monitor is a process viewer and system monitor with an attractive, "
+"easy-to-use interface."
+msgstr ""
+
+#: ../gnome-system-monitor.appdata.xml.in.h:4
+msgid ""
+"System Monitor can help you find out what applications are using the "
+"processor or the memory of your computer, can manage the running "
+"applications, force stop processes not responding, and change the state or "
+"priority of existing processes."
+msgstr ""
+
+#: ../gnome-system-monitor.appdata.xml.in.h:5
+msgid ""
+"The resource graphs feature shows you a quick overview of what is going on "
+"with your computer displaying recent network, memory and processor usage."
+msgstr ""
+
+#: ../org.gnome.gnome-system-monitor.policy.in.in.h:1
+msgid "Kill process"
+msgstr "Үрдісті өлтіру"
+
+#: ../org.gnome.gnome-system-monitor.policy.in.in.h:2
+msgid "Privileges are required to control other users' processes"
+msgstr ""
+
+#: ../org.gnome.gnome-system-monitor.policy.in.in.h:3
+msgid "Renice process"
+msgstr ""
+
+#: ../org.gnome.gnome-system-monitor.policy.in.in.h:4
+msgid "Privileges are required to change the priority of processes"
+msgstr ""
+
+#: ../data/interface.ui.h:2
+msgid "End _Process"
+msgstr "Үрдіс_ті аяқтау "
+
+#: ../data/interface.ui.h:3
+msgid "Show process properties"
+msgstr "Үрдіс қасиеттерін көрсету"
+
+#: ../data/interface.ui.h:4 ../data/preferences.ui.h:9
+msgid "Processes"
+msgstr "Үрдістер"
+
+#: ../data/interface.ui.h:5
+msgid "CPU History"
+msgstr "Процессор тарихы"
+
+#: ../data/interface.ui.h:6
+msgid "Memory and Swap History"
+msgstr "Жады және своп тарихы"
+
+#: ../data/interface.ui.h:7 ../src/interface.cpp:260
+#: ../src/procproperties.cpp:92 ../src/proctable.cpp:337
+msgid "Memory"
+msgstr "Жады"
+
+#: ../data/interface.ui.h:8 ../src/interface.cpp:272
+msgid "Swap"
+msgstr "Своп"
+
+#: ../data/interface.ui.h:9
+msgid "Network History"
+msgstr "Желі тарихы"
+
+#: ../data/interface.ui.h:10 ../src/interface.cpp:300
+msgid "Receiving"
+msgstr "Қабылдау"
+
+#: ../data/interface.ui.h:11
+msgid "Total Received"
+msgstr "Жалпы қабылданған"
+
+#: ../data/interface.ui.h:12 ../src/interface.cpp:315
+msgid "Sending"
+msgstr "Жіберу"
+
+#: ../data/interface.ui.h:13
+msgid "Total Sent"
+msgstr "Жалпы жіберілген"
+
+#: ../data/interface.ui.h:14 ../data/preferences.ui.h:13
+msgid "Resources"
+msgstr "Ресурстар"
+
+#: ../data/interface.ui.h:15 ../data/preferences.ui.h:16
+msgid "File Systems"
+msgstr "Файлдық жүйелер"
+
+#: ../data/lsof.ui.h:1
+msgctxt "Window title for 'Search for Open Files' dialog"
+msgid "Search for Open Files"
+msgstr "Ашық файлдар ішінен іздеу"
+
+#: ../data/lsof.ui.h:2
+msgid "Filter files by name"
+msgstr "Файлдарды аттары бойынша сүзгілеу"
+
+#: ../data/lsof.ui.h:3
+msgid "Case insensitive"
+msgstr "Регистрге тәуелсіз"
+
+#: ../data/menus.ui.h:1
+msgctxt "Menu item to Open 'Search for Open Files' dialog"
+msgid "Search for Open Files"
+msgstr "Ашық файлдар ішінен іздеу"
+
+#: ../data/menus.ui.h:2
+msgid "Preferences"
+msgstr "Баптаулар"
+
+#: ../data/menus.ui.h:3
+msgid "Help"
+msgstr "Көмек"
+
+#: ../data/menus.ui.h:4
+msgid "About"
+msgstr "Осы туралы"
+
+#: ../data/menus.ui.h:5
+msgid "Quit"
+msgstr "Шығу"
+
+#: ../data/menus.ui.h:6
+msgid "_Refresh"
+msgstr "Жаңар_ту"
+
+#: ../data/menus.ui.h:7
+msgid "_Active Processes"
+msgstr "_Белсенді үрдістер"
+
+#: ../data/menus.ui.h:8
+msgid "A_ll Processes"
+msgstr "Бар_лық үрдістер"
+
+#: ../data/menus.ui.h:9
+msgid "M_y Processes"
+msgstr "М_енің үрдістерім"
+
+#: ../data/menus.ui.h:10
+msgid "_Dependencies"
+msgstr "_Тәуелділіктер"
+
+#: ../data/menus.ui.h:11
+msgid "_Stop"
+msgstr "Тоқ_тату"
+
+#: ../data/menus.ui.h:12
+msgid "_Continue"
+msgstr "Жалға_стыру"
+
+#: ../data/menus.ui.h:13
+msgid "_End"
+msgstr "А_яқтау"
+
+#: ../data/menus.ui.h:14
+msgid "_Kill"
+msgstr "Өл_тіру"
+
+#: ../data/menus.ui.h:15
+msgid "_Change Priority"
+msgstr "_Приоритетті өзгерту"
+
+#: ../data/menus.ui.h:16 ../src/util.cpp:215
+msgid "Very High"
+msgstr "Өте жоғары"
+
+#: ../data/menus.ui.h:17 ../src/util.cpp:217
+msgid "High"
+msgstr "Жоғары"
+
+#: ../data/menus.ui.h:18 ../src/util.cpp:219
+msgid "Normal"
+msgstr "Қалыпты"
+
+#: ../data/menus.ui.h:19 ../src/util.cpp:221
+msgid "Low"
+msgstr "Төмен"
+
+#: ../data/menus.ui.h:20 ../src/util.cpp:223
+msgid "Very Low"
+msgstr "Өте төмен"
+
+#: ../data/menus.ui.h:21
+msgid "Custom"
+msgstr "Таңдауыңызша"
+
+#: ../data/menus.ui.h:22
+msgid "_Memory Maps"
+msgstr "_Жады карталары"
+
+#. Translators: this means 'Files that are open' (open is not a verb here)
+#: ../data/menus.ui.h:24
+msgid "Open _Files"
+msgstr "Ашық _файлдар"
+
+#: ../data/menus.ui.h:25
+msgid "_Properties"
+msgstr "Қас_иеттері"
+
+#: ../data/openfiles.ui.h:1
+msgid "Open Files"
+msgstr "Ашық файлдар"
+
+#: ../data/preferences.ui.h:1
+msgid "System Monitor Preferences"
+msgstr "Жүйелік бақылаушы баптаулары"
+
+#: ../data/preferences.ui.h:2
+msgid "Behavior"
+msgstr "Мінез-құлығы"
+
+#: ../data/preferences.ui.h:3
+msgid "_Update interval in seconds:"
+msgstr "_Жаңарту аралығы, секунд:"
+
+#: ../data/preferences.ui.h:4
+msgid "Enable _smooth refresh"
+msgstr "Тегі_с жаңартуды іске қосу"
+
+#: ../data/preferences.ui.h:5
+msgid "Alert before ending or _killing processes"
+msgstr "Үрдісті үзу не ө_лтіру алдында ескерту"
+
+#: ../data/preferences.ui.h:6
+msgid "_Divide CPU usage by CPU count"
+msgstr "Процессорлар қолданылуын _процессорлар саны бойынша бөлу"
+
+#: ../data/preferences.ui.h:7
+msgid "Information Fields"
+msgstr "Ақпараттық өрістер"
+
+#: ../data/preferences.ui.h:8
+msgid "Process i_nformation shown in list:"
+msgstr "Тізімде көрсетілетін үрдіс ақ_параты:"
+
+#: ../data/preferences.ui.h:10
+msgid "Graphs"
+msgstr "Графиктер"
+
+#: ../data/preferences.ui.h:11
+msgid "_Draw CPU chart as stacked area chart"
+msgstr "_Процессор графигін қабатты аймақтар ретінде салу"
+
+#: ../data/preferences.ui.h:12
+msgid "_Show network speed in bits"
+msgstr "_Желі жылдамдығын битпен көрсету"
+
+#: ../data/preferences.ui.h:14
+msgid "Show _all file systems"
+msgstr "Б_арлық файлдық жүйелерді көрсету"
+
+#: ../data/preferences.ui.h:15
+msgid "File system i_nformation shown in list:"
+msgstr "Тізімде көрсетілген файлдық жүйе ақ_параты:"
+
+#: ../data/renice.ui.h:1 ../src/procdialogs.cpp:123
+msgid "_Cancel"
+msgstr "Ба_с тарту"
+
+#: ../data/renice.ui.h:2
+msgid "Change _Priority"
+msgstr "_Приоритетті өзгерту"
+
+#: ../data/renice.ui.h:3
+msgid "_Nice value:"
+msgstr ""
+
+#: ../data/renice.ui.h:4
+msgid ""
+"<small><i><b>Note:</b> The priority of a process is given by its nice value. "
+"A lower nice value corresponds to a higher priority.</i></small>"
+msgstr ""
+
+#: ../src/application.cpp:310
+msgid "A simple process and system monitor."
+msgstr "Үрдістер және жүйенің қарапайым бақылаушысы."
+
+#: ../src/argv.cpp:21
+msgid "Show the Processes tab"
+msgstr ""
+
+#: ../src/argv.cpp:26
+msgid "Show the Resources tab"
+msgstr ""
+
+#: ../src/argv.cpp:31
+msgid "Show the File Systems tab"
+msgstr ""
+
+#: ../src/argv.cpp:35
+msgid "Show the application's version"
+msgstr "Қолданба нұсқасын көрсету"
+
+#: ../src/disks.cpp:369 ../src/memmaps.cpp:325
+msgid "Device"
+msgstr "Құрылғы"
+
+#: ../src/disks.cpp:370
+msgid "Directory"
+msgstr "Бума"
+
+#: ../src/disks.cpp:371 ../src/gsm_color_button.c:165 ../src/openfiles.cpp:252
+msgid "Type"
+msgstr "Түрі"
+
+#: ../src/disks.cpp:372
+msgid "Total"
+msgstr "Жалпы"
+
+#: ../src/disks.cpp:373
+msgid "Free"
+msgstr "Бос"
+
+#: ../src/disks.cpp:374
+msgid "Available"
+msgstr "Қолжетерлік"
+
+#: ../src/disks.cpp:375
+msgid "Used"
+msgstr "Қолданылуда"
+
+#. xgettext: ? stands for unknown
+#: ../src/e_date.c:156
+msgid "?"
+msgstr "?"
+
+#: ../src/e_date.c:163
+msgid "Today %l:%M %p"
+msgstr "Бүгін %l:%M %p"
+
+#: ../src/e_date.c:172
+msgid "Yesterday %l:%M %p"
+msgstr "Кеше %l:%M %p"
+
+#: ../src/e_date.c:184
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: ../src/e_date.c:192
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: ../src/e_date.c:194
+msgid "%b %d %Y"
+msgstr ""
+
+#: ../src/gsm_color_button.c:141
+msgid "Fraction"
+msgstr ""
+
+#. TRANSLATORS: description of the pie color picker's (mem, swap) filled percentage property
+#: ../src/gsm_color_button.c:143
+msgid "Percentage full for pie color pickers"
+msgstr ""
+
+#: ../src/gsm_color_button.c:150
+msgid "Title"
+msgstr "Атауы"
+
+#: ../src/gsm_color_button.c:151
+msgid "The title of the color selection dialog"
+msgstr ""
+
+#: ../src/gsm_color_button.c:152 ../src/gsm_color_button.c:512
+msgid "Pick a Color"
+msgstr "Түсті таңдаңыз"
+
+#: ../src/gsm_color_button.c:158
+msgid "Current Color"
+msgstr ""
+
+#: ../src/gsm_color_button.c:159
+msgid "The selected color"
+msgstr ""
+
+#: ../src/gsm_color_button.c:166
+msgid "Type of color picker"
+msgstr ""
+
+#: ../src/gsm_color_button.c:434
+msgid "Received invalid color data\n"
+msgstr "Алынған түс мәні қате\n"
+
+#: ../src/gsm_color_button.c:535
+msgid "Click to set graph colors"
+msgstr ""
+
+#. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
+#: ../src/interface.cpp:187
+#, c-format
+msgid "Pick a Color for '%s'"
+msgstr "'%s' үшін түсті таңдаңыз"
+
+#: ../src/interface.cpp:220 ../src/procproperties.cpp:100
+msgid "CPU"
+msgstr "Процессор"
+
+#: ../src/interface.cpp:222
+#, c-format
+msgid "CPU%d"
+msgstr "Процессор%d"
+
+#: ../src/interface.cpp:374
+msgid "translator-credits"
+msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>"
+
+#: ../src/load-graph.cpp:161
+#, c-format
+msgid "%u second"
+msgid_plural "%u seconds"
+msgstr[0] "%u секунд"
+
+#: ../src/load-graph.cpp:370
+msgid "not available"
+msgstr "қолжетерсіз"
+
+#. xgettext: 540MiB (53 %) of 1.0 GiB
+#: ../src/load-graph.cpp:373
+#, c-format
+msgid "%s (%.1f%%) of %s"
+msgstr "%s (%.1f%%), барлығы %s"
+
+#: ../src/lsof.cpp:109
+msgid "Error"
+msgstr "Қате"
+
+#: ../src/lsof.cpp:110
+#, c-format
+msgid "'%s' is not a valid Perl regular expression."
+msgstr "'%s' жарамды Perl тұрақты өрнегі емес."
+
+#: ../src/lsof.cpp:128
+#, c-format
+msgid "%d open file"
+msgid_plural "%d open files"
+msgstr[0] "%d ашық файл"
+
+#: ../src/lsof.cpp:130
+#, c-format
+msgid "%d matching open file"
+msgid_plural "%d matching open files"
+msgstr[0] "%d сәйкес ашық файл"
+
+#: ../src/lsof.cpp:246
+msgid "Process"
+msgstr "Үрдіс"
+
+#: ../src/lsof.cpp:258
+msgid "PID"
+msgstr "PID"
+
+#: ../src/lsof.cpp:268 ../src/memmaps.cpp:303
+msgid "Filename"
+msgstr "Файл аты"
+
+#. xgettext: virtual memory start
+#: ../src/memmaps.cpp:305
+msgid "VM Start"
+msgstr "ВЖ басы"
+
+#. xgettext: virtual memory end
+#: ../src/memmaps.cpp:307
+msgid "VM End"
+msgstr "ВЖ аяғы"
+
+#. xgettext: virtual memory syze
+#: ../src/memmaps.cpp:309
+msgid "VM Size"
+msgstr "ВЖ өлшемі"
+
+#: ../src/memmaps.cpp:310
+msgid "Flags"
+msgstr "Жалаушалар"
+
+#. xgettext: virtual memory offset
+#: ../src/memmaps.cpp:312
+msgid "VM Offset"
+msgstr "ВЖ шегінісі"
+
+#. xgettext: memory that has not been modified since
+#. it has been allocated
+#: ../src/memmaps.cpp:315
+msgid "Private clean"
+msgstr "Жеке таза"
+
+#. xgettext: memory that has been modified since it
+#. has been allocated
+#: ../src/memmaps.cpp:318
+msgid "Private dirty"
+msgstr "Жеке кір"
+
+#. xgettext: shared memory that has not been modified
+#. since it has been allocated
+#: ../src/memmaps.cpp:321
+msgid "Shared clean"
+msgstr "Ортақ таза"
+
+#. xgettext: shared memory that has been modified
+#. since it has been allocated
+#: ../src/memmaps.cpp:324
+msgid "Shared dirty"
+msgstr "Ортақ кір"
+
+#: ../src/memmaps.cpp:326
+msgid "Inode"
+msgstr ""
+
+#: ../src/memmaps.cpp:436
+msgid "Memory Maps"
+msgstr "Жады карталары"
+
+#: ../src/memmaps.cpp:448
+#, c-format
+msgid "_Memory maps for process \"%s\" (PID %u):"
+msgstr "\"%s\" үрдісі үшін жады кар_талары (PID %u):"
+
+#: ../src/openfiles.cpp:40
+msgid "file"
+msgstr "файл"
+
+#: ../src/openfiles.cpp:42
+msgid "pipe"
+msgstr ""
+
+#: ../src/openfiles.cpp:44
+msgid "IPv6 network connection"
+msgstr "IPv6 желілік байланысы"
+
+#: ../src/openfiles.cpp:46
+msgid "IPv4 network connection"
+msgstr "IPv4 желілік байланысы"
+
+#: ../src/openfiles.cpp:48
+msgid "local socket"
+msgstr "жергілікті сокет"
+
+#: ../src/openfiles.cpp:50
+msgid "unknown type"
+msgstr "белгісіз түрі"
+
+#. Translators: "FD" here means "File Descriptor". Please use
+#. a very short translation if possible, and at most
+#. 2-3 characters for it to be able to fit in the UI.
+#: ../src/openfiles.cpp:251
+msgid "FD"
+msgstr "ФД"
+
+#: ../src/openfiles.cpp:253
+msgid "Object"
+msgstr "Объект"
+
+#: ../src/openfiles.cpp:336
+#, c-format
+msgid "_Files opened by process \"%s\" (PID %u):"
+msgstr "\"%s\" үрдісі ашып тұрған _файлдары (PID %u):"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:1
+msgid "Main window size and position in the form (width, height, xpos, ypos)"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:2
+msgid "Main Window should open maximized"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:3
+msgid "Show process dependencies in tree form"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:4
+msgid "Solaris mode for CPU percentage"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:5
+msgid ""
+"If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage "
+"is divided by the total number of CPUs. Otherwise, it operates in 'Irix "
+"mode'."
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:6
+msgid "Show CPU chart as stacked area chart"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:7
+msgid ""
+"If TRUE, system-monitor shows the CPU chart as a stacked area chart instead "
+"of a line chart."
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:8
+msgid "Enable/Disable smooth refresh"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:9
+msgid "Show warning dialog when killing processes"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:10
+msgid "Time in milliseconds between updates of the process view"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:11
+msgid "Time in milliseconds between updates of the graphs"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:12
+msgid "Whether information about all file systems should be displayed"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:13
+msgid ""
+"Whether to display information about all file systems (including types like "
+"'autofs' and 'procfs'). Useful for getting a list of all currently mounted "
+"file systems."
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:14
+msgid "Time in milliseconds between updates of the devices list"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:15
+msgid "Determines which processes to show."
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:16
+msgid "Saves the currently viewed tab"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:17
+msgid "CPU colors"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:18
+msgid "Each entry is in the format (CPU#, Hexadecimal color value)"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:19
+msgid "Default graph memory color"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:20
+msgid "Default graph swap color"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:21
+msgid "Default graph incoming network traffic color"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:22
+msgid "Default graph outgoing network traffic color"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:23
+msgid "Show network traffic in bits"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:24
+msgid "Process view sort column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:25
+msgid "Process view columns order"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:26
+msgid "Process view sort order"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:27
+msgid "Width of process 'Name' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:28
+msgid "Show process 'Name' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:29
+msgid "Width of process 'User' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:30
+msgid "Show process 'User' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:31
+msgid "Width of process 'Status' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:32
+msgid "Show process 'Status' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:33
+msgid "Width of process 'Virtual Memory' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:34
+msgid "Show process 'Virtual Memory' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:35
+msgid "Width of process 'Resident Memory' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:36
+msgid "Show process 'Resident Memory' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:37
+msgid "Width of process 'Writable Memory' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:38
+msgid "Show process 'Writable Memory' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:39
+msgid "Width of process 'Shared Memory' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:40
+msgid "Show process 'Shared Memory' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:41
+msgid "Width of process 'X Server Memory' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:42
+msgid "Show process 'X Server Memory' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:44
+#, no-c-format
+msgid "Width of process 'CPU %' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:46
+#, no-c-format
+msgid "Show process 'CPU %' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:47
+msgid "Width of process 'CPU Time' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:48
+msgid "Show process 'CPU Time' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:49
+msgid "Width of process 'Started' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:50
+msgid "Show process 'Started' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:51
+msgid "Width of process 'Nice' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:52
+msgid "Show process 'Nice' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:53
+msgid "Width of process 'PID' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:54
+msgid "Show process 'PID' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:55
+msgid "Width of process 'SELinux Security Context' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:56
+msgid "Show process 'SELinux Security Context' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:57
+msgid "Width of process 'Command Line' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:58
+msgid "Show process 'Command Line' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:59
+msgid "Width of process 'Memory' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:60
+msgid "Show process 'Memory' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:61
+msgid "Width of process 'Waiting Channel' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:62
+msgid "Show process 'Waiting Channel' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:63
+msgid "Width of process 'Control Group' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:64
+msgid "Show process 'Control Group' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:65
+msgid "Width of process 'Unit' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:66
+msgid "Show process 'Unit' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:67
+msgid "Width of process 'Session' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:68
+msgid "Show process 'Session' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:69
+msgid "Width of process 'Seat' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:70
+msgid "Show process 'Seat' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:71
+msgid "Width of process 'Owner' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:72
+msgid "Show process 'Owner' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:73
+msgid "Width of process 'Priority' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:74
+msgid "Show process 'Priority' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:75
+msgid "Disk view sort column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:76
+msgid "Disk view sort order"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:77
+msgid "Disk view columns order"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:78
+msgid "Width of disk view 'Device' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:79
+msgid "Show disk view 'Device' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:80
+msgid "Width of disk view 'Directory' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:81
+msgid "Show disk view 'Directory' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:82
+msgid "Width of disk view 'Type' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:83
+msgid "Show disk view 'Type' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:84
+msgid "Width of disk view 'Total' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:85
+msgid "Show disk view 'Total' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:86
+msgid "Width of disk view 'Free' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:87
+msgid "Show disk view 'Free' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:88
+msgid "Width of disk view 'Available' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:89
+msgid "Show disk view 'Available' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:90
+msgid "Width of disk view 'Used' column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:91
+msgid "Show disk view 'Used' column on startup"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:92
+msgid "Memory map sort column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:93
+msgid "Memory map sort order"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:94
+msgid "Open files sort column"
+msgstr ""
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:95
+msgid "Open files sort order"
+msgstr ""
+
+#: ../src/prefsdialog.cpp:170
+msgid "Icon"
+msgstr "Таңбаша"
+
+#: ../src/procactions.cpp:75
+#, c-format
+msgid ""
+"Cannot change the priority of process with PID %d to %d.\n"
+"%s"
+msgstr ""
+
+#: ../src/procactions.cpp:153
+#, c-format
+msgid ""
+"Cannot kill process with PID %d with signal %d.\n"
+"%s"
+msgstr ""
+
+#. xgettext: primary alert message for killing single process
+#: ../src/procdialogs.cpp:75
+#, c-format
+msgid "Are you sure you want to kill the selected process “%s” (PID: %u)?"
+msgstr "Таңдалған \"%s\" (PID: %u) үрдісін өлтіруді шынымен қалайсыз ба?"
+
+#. xgettext: primary alert message for ending single process
+#: ../src/procdialogs.cpp:80
+#, c-format
+msgid "Are you sure you want to end the selected process “%s” (PID: %u)?"
+msgstr "Таңдалған \"%s\" (PID: %u) үрдісін аяқтауды шынымен қалайсыз ба?"
+
+#. xgettext: primary alert message for killing multiple processes
+#: ../src/procdialogs.cpp:87
+#, c-format
+msgid "Are you sure you want to kill the selected process?"
+msgid_plural "Are you sure you want to kill the %d selected processes?"
+msgstr[0] "Таңдалған %d үрдісті өлтіруді шынымен қалайсыз ба?"
+
+#. xgettext: primary alert message for ending multiple processes
+#: ../src/procdialogs.cpp:91
+#, c-format
+msgid "Are you sure you want to end the selected process?"
+msgid_plural "Are you sure you want to end the %d selected processes?"
+msgstr[0] "Таңдалған %d үрдісті аяқтауды шынымен қалайсыз ба?"
+
+#. xgettext: secondary alert message
+#: ../src/procdialogs.cpp:98 ../src/procdialogs.cpp:104
+msgid ""
+"Killing a process may destroy data, break the session or introduce a "
+"security risk. Only unresponsive processes should be killed."
+msgstr ""
+"Үрдісті өлтіру деректер жоғалуына, сессияның сынуына немесе қауіпсіздік "
+"мәселесіне әкеп соғуы мүмкін. Тек жауап бермейтін үрдістерді өлтіру керек."
+
+#: ../src/procdialogs.cpp:101
+msgid "_Kill Process"
+msgid_plural "_Kill Processes"
+msgstr[0] "Үрдісті өл_тіру"
+
+#: ../src/procdialogs.cpp:107
+msgid "_End Process"
+msgid_plural "_End Processes"
+msgstr[0] "Үрдіс_т(ерд)і аяқтау "
+
+#: ../src/procdialogs.cpp:188
+#, c-format
+msgid "Change Priority of Process “%s” (PID: %u)"
+msgstr ""
+
+#: ../src/procdialogs.cpp:191
+#, c-format
+msgid "Change Priority of the selected process"
+msgid_plural "Change Priority of %d selected processes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/procdialogs.cpp:210
+msgid "Note:"
+msgstr ""
+
+#: ../src/procdialogs.cpp:211
+msgid ""
+"The priority of a process is given by its nice value. A lower nice value "
+"corresponds to a higher priority."
+msgstr ""
+
+#: ../src/procproperties.cpp:55 ../src/procproperties.cpp:106
+#: ../src/procproperties.cpp:109 ../src/util.cpp:432
+msgid "N/A"
+msgstr "Анықталмаған"
+
+#: ../src/procproperties.cpp:89 ../src/proctable.cpp:322
+msgid "Process Name"
+msgstr "Үрдіс аты"
+
+#: ../src/procproperties.cpp:90 ../src/proctable.cpp:323
+msgid "User"
+msgstr "Пайдаланушы"
+
+#: ../src/procproperties.cpp:91 ../src/proctable.cpp:324
+msgid "Status"
+msgstr "Күйі"
+
+#: ../src/procproperties.cpp:93 ../src/proctable.cpp:325
+msgid "Virtual Memory"
+msgstr "Виртуалды жады"
+
+#: ../src/procproperties.cpp:94 ../src/proctable.cpp:326
+msgid "Resident Memory"
+msgstr "Резидентті жады"
+
+#: ../src/procproperties.cpp:95 ../src/proctable.cpp:327
+msgid "Writable Memory"
+msgstr "Жазылатын жады"
+
+#: ../src/procproperties.cpp:96 ../src/proctable.cpp:328
+msgid "Shared Memory"
+msgstr "Ортақ жады"
+
+#: ../src/procproperties.cpp:98 ../src/proctable.cpp:329
+msgid "X Server Memory"
+msgstr "X сервері жадысы"
+
+#: ../src/procproperties.cpp:101 ../src/proctable.cpp:331
+msgid "CPU Time"
+msgstr "Процессор уақыты"
+
+#: ../src/procproperties.cpp:101
+#, c-format
+msgid "%lld second"
+msgid_plural "%lld seconds"
+msgstr[0] "%lld секунд"
+
+#: ../src/procproperties.cpp:102 ../src/proctable.cpp:332
+msgid "Started"
+msgstr "Іске қосылған"
+
+#: ../src/procproperties.cpp:103 ../src/proctable.cpp:333
+msgid "Nice"
+msgstr ""
+
+#: ../src/procproperties.cpp:104 ../src/proctable.cpp:347
+msgid "Priority"
+msgstr "Приоритеті"
+
+#: ../src/procproperties.cpp:105 ../src/proctable.cpp:334
+msgid "ID"
+msgstr "ID"
+
+#: ../src/procproperties.cpp:106 ../src/proctable.cpp:335
+msgid "Security Context"
+msgstr "Қауіпсіздік контексті"
+
+#: ../src/procproperties.cpp:107 ../src/proctable.cpp:336
+msgid "Command Line"
+msgstr "Командалық жол"
+
+#. xgettext: combined noun, the function the process is waiting in, see wchan ps(1)
+#: ../src/procproperties.cpp:108 ../src/proctable.cpp:339
+msgid "Waiting Channel"
+msgstr "Күтетін арна"
+
+#: ../src/procproperties.cpp:109 ../src/proctable.cpp:340
+msgid "Control Group"
+msgstr "Басқару тобы"
+
+#: ../src/procproperties.cpp:221
+#, c-format
+msgid "%s (PID %u)"
+msgstr "%s (PID %u)"
+
+#: ../src/proctable.cpp:330
+#, no-c-format
+msgid "% CPU"
+msgstr "% процессор"
+
+#: ../src/proctable.cpp:341
+msgid "Unit"
+msgstr "Юнит"
+
+#: ../src/proctable.cpp:342
+msgid "Session"
+msgstr "Сессия"
+
+#. TRANSLATORS: Seat = i.e. the physical seat the session of the process belongs to, only
+#. for multi-seat environments. See http://en.wikipedia.org/wiki/Multiseat_configuration
+#: ../src/proctable.cpp:345
+msgid "Seat"
+msgstr "Отыру орны"
+
+#: ../src/proctable.cpp:346
+msgid "Owner"
+msgstr "Иесі"
+
+#: ../src/util.cpp:27
+msgid "Running"
+msgstr "Орындалуда"
+
+#: ../src/util.cpp:31
+msgid "Stopped"
+msgstr "Тоқтатылған"
+
+#: ../src/util.cpp:35
+msgid "Zombie"
+msgstr "Зомби"
+
+#: ../src/util.cpp:39
+msgid "Uninterruptible"
+msgstr "Үзілмейтін"
+
+#: ../src/util.cpp:43
+msgid "Sleeping"
+msgstr "Ұйықтауда"
+
+#. xgettext: weeks, days
+#: ../src/util.cpp:98
+#, c-format
+msgid "%uw%ud"
+msgstr "%uw%ud"
+
+#. xgettext: days, hours (0 -> 23)
+#: ../src/util.cpp:102
+#, c-format
+msgid "%ud%02uh"
+msgstr "%ud%02uh"
+
+#. xgettext: hours (0 -> 23), minutes, seconds
+#: ../src/util.cpp:106
+#, c-format
+msgid "%u:%02u:%02u"
+msgstr "%u:%02u:%02u"
+
+#. xgettext: minutes, seconds, centiseconds
+#: ../src/util.cpp:109
+#, c-format
+msgid "%u:%02u.%02u"
+msgstr "%u:%02u.%02u"
+
+#: ../src/util.cpp:164
+#, c-format
+msgid "%.1f KiB"
+msgstr "%.1f КиБ"
+
+#: ../src/util.cpp:165
+#, c-format
+msgid "%.1f MiB"
+msgstr "%.1f МиБ"
+
+#: ../src/util.cpp:166
+#, c-format
+msgid "%.1f GiB"
+msgstr "%.1f ГиБ"
+
+#: ../src/util.cpp:167
+#, c-format
+msgid "%.1f TiB"
+msgstr "%.1f ТиБ"
+
+#: ../src/util.cpp:168
+#, c-format
+msgid "%.3g kbit"
+msgstr "%.3g кбит"
+
+#: ../src/util.cpp:169
+#, c-format
+msgid "%.3g Mbit"
+msgstr "%.3g Мбит"
+
+#: ../src/util.cpp:170
+#, c-format
+msgid "%.3g Gbit"
+msgstr "%.3g ГБит"
+
+#: ../src/util.cpp:171
+#, c-format
+msgid "%.3g Tbit"
+msgstr "%.3g ТБит"
+
+#: ../src/util.cpp:186
+#, c-format
+msgid "%u bit"
+msgid_plural "%u bits"
+msgstr[0] "%u бит"
+
+#: ../src/util.cpp:187
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u байт"
+
+#: ../src/util.cpp:230
+msgid "Very High Priority"
+msgstr "Өте жоғары приоритет"
+
+#: ../src/util.cpp:232
+msgid "High Priority"
+msgstr "Жоғары приоритет"
+
+#: ../src/util.cpp:234
+msgid "Normal Priority"
+msgstr "Қалыпты приоритет"
+
+#: ../src/util.cpp:236
+msgid "Low Priority"
+msgstr "Төмен приоритет"
+
+#: ../src/util.cpp:238
+msgid "Very Low Priority"
+msgstr "Өте төмен приоритет"
+
+#. xgettext: rate, 10MiB/s or 10Mbit/s
+#: ../src/util.cpp:630
+#, c-format
+msgid "%s/s"
+msgstr "%s/s"
diff -Nru gnome-system-monitor-3.14.1/po/LINGUAS gnome-system-monitor-3.15.4/po/LINGUAS
--- gnome-system-monitor-3.14.1/po/LINGUAS	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/LINGUAS	2014-12-08 19:51:20.000000000 +0000
@@ -41,6 +41,7 @@
 it
 ja
 ka
+kk
 km
 kn
 ko
diff -Nru gnome-system-monitor-3.14.1/po/pt.po gnome-system-monitor-3.15.4/po/pt.po
--- gnome-system-monitor-3.14.1/po/pt.po	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/pt.po	2014-12-08 19:51:20.000000000 +0000
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-22 23:53+0100\n"
-"PO-Revision-Date: 2013-09-22 19:05-0100\n"
-"Last-Translator: António Lima <amrlima@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=system-"
+"monitor&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-10-06 19:48+0000\n"
+"PO-Revision-Date: 2014-10-07 07:49+0100\n"
+"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +21,9 @@
 "X-Generator: Poedit 1.5.4\n"
 
 #: ../gnome-system-monitor.desktop.in.in.h:1 ../data/interface.ui.h:1
-#: ../src/application.cpp:233 ../src/interface.cpp:363
+#: ../src/application.cpp:268 ../src/interface.cpp:363
 msgid "System Monitor"
-msgstr "Monitor de Sistema"
+msgstr "Monitor de sistema"
 
 #: ../gnome-system-monitor.desktop.in.in.h:2
 #: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:364
@@ -30,14 +31,21 @@
 msgstr "Ver processos atuais e monitorizar o estado do sistema"
 
 #: ../gnome-system-monitor.desktop.in.in.h:3
-#: ../gnome-system-monitor-kde.desktop.in.in.h:3
-msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
-msgstr "Monitor;Sistema;Processo;CPU;Memória;Rede;Histórico;Utilização;"
+msgid ""
+"Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
+"Manager;"
+msgstr ""
+"Monitor;Sistema;Processo;CPU;Memória;Rede;Histórico;Utilização;Desempenho;"
+"Tarefa;Gestor;"
 
 #: ../gnome-system-monitor-kde.desktop.in.in.h:1
-#: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:289
+#: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
 msgid "GNOME System Monitor"
-msgstr "Monitor de Sistema GNOME"
+msgstr "Monitor de sistema GNOME"
+
+#: ../gnome-system-monitor-kde.desktop.in.in.h:3
+msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
+msgstr "Monitor;Sistema;Processo;CPU;Memória;Rede;Histórico;Utilização;"
 
 #: ../gnome-system-monitor.appdata.xml.in.h:2
 msgid "View and manage system resources"
@@ -48,7 +56,7 @@
 "System Monitor is a process viewer and system monitor with an attractive, "
 "easy-to-use interface."
 msgstr ""
-"O Monitor de Sistema é um visualizador de processos e monitor de sistema com "
+"O Monitor de sistema é um visualizador de processos e monitor de sistema com "
 "uma interface apelativa e de fácil utilização."
 
 #: ../gnome-system-monitor.appdata.xml.in.h:4
@@ -91,13 +99,13 @@
 
 #: ../data/interface.ui.h:2
 msgid "End _Process"
-msgstr "Terminar _Processo"
+msgstr "Terminar _processo"
 
 #: ../data/interface.ui.h:3
 msgid "Show process properties"
 msgstr "Apresentar propriedades do processo"
 
-#: ../data/interface.ui.h:4 ../data/preferences.ui.h:11
+#: ../data/interface.ui.h:4 ../data/preferences.ui.h:9
 msgid "Processes"
 msgstr "Processos"
 
@@ -107,10 +115,10 @@
 
 #: ../data/interface.ui.h:6
 msgid "Memory and Swap History"
-msgstr "Histórico de Memória e Swap"
+msgstr "Histórico de memória e Swap"
 
 #: ../data/interface.ui.h:7 ../src/interface.cpp:260
-#: ../src/procproperties.cpp:87 ../src/proctable.cpp:336
+#: ../src/procproperties.cpp:92 ../src/proctable.cpp:337
 msgid "Memory"
 msgstr "Memória"
 
@@ -120,66 +128,49 @@
 
 #: ../data/interface.ui.h:9
 msgid "Network History"
-msgstr "Histórico de Rede"
+msgstr "Histórico de rede"
 
 #: ../data/interface.ui.h:10 ../src/interface.cpp:300
 msgid "Receiving"
-msgstr "A Receber"
+msgstr "A receber"
 
 #: ../data/interface.ui.h:11
 msgid "Total Received"
-msgstr "Total Recebido"
+msgstr "Total recebido"
 
 #: ../data/interface.ui.h:12 ../src/interface.cpp:315
 msgid "Sending"
-msgstr "A Enviar"
+msgstr "A enviar"
 
 #: ../data/interface.ui.h:13
 msgid "Total Sent"
-msgstr "Total Enviado"
+msgstr "Total enviado"
 
-#: ../data/interface.ui.h:14 ../data/preferences.ui.h:15
+#: ../data/interface.ui.h:14 ../data/preferences.ui.h:13
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../data/interface.ui.h:15 ../data/preferences.ui.h:18
+#: ../data/interface.ui.h:15 ../data/preferences.ui.h:16
 msgid "File Systems"
-msgstr "Sistema de Ficheiros"
+msgstr "Sistema de ficheiros"
 
 #: ../data/lsof.ui.h:1
 msgctxt "Window title for 'Search for Open Files' dialog"
 msgid "Search for Open Files"
-msgstr "Procurar por Ficheiros Abertos"
+msgstr "Procurar por ficheiros abertos"
 
 #: ../data/lsof.ui.h:2
-msgid "_Name contains:"
-msgstr "_Nome contém:"
+msgid "Filter files by name"
+msgstr "Filtrar ficheiros por nome"
 
 #: ../data/lsof.ui.h:3
-msgid "_Find"
-msgstr "_Procurar"
-
-#: ../data/lsof.ui.h:4
-msgid "Case insensitive matching"
-msgstr "Equivalência insensível à capitalização"
-
-#: ../data/lsof.ui.h:5
-msgid "C_lear"
-msgstr "_Limpar"
-
-#: ../data/lsof.ui.h:6
-msgid "S_earch results:"
-msgstr "R_esultados da procura:"
-
-#: ../data/lsof.ui.h:7 ../data/openfiles.ui.h:2 ../data/preferences.ui.h:3
-#: ../src/memmaps.cpp:438 ../src/procproperties.cpp:216
-msgid "_Close"
-msgstr "_Fechar"
+msgid "Case insensitive"
+msgstr "Não comparar maiúsculas/minúsculas"
 
 #: ../data/menus.ui.h:1
 msgctxt "Menu item to Open 'Search for Open Files' dialog"
 msgid "Search for Open Files"
-msgstr "Procurar por Ficheiros Abertos"
+msgstr "Procurar por ficheiros abertos"
 
 #: ../data/menus.ui.h:2
 msgid "Preferences"
@@ -203,15 +194,15 @@
 
 #: ../data/menus.ui.h:7
 msgid "_Active Processes"
-msgstr "Processos _Ativos"
+msgstr "Processos _ativos"
 
 #: ../data/menus.ui.h:8
 msgid "A_ll Processes"
-msgstr "_Todos os Processos"
+msgstr "_Todos os processos"
 
 #: ../data/menus.ui.h:9
 msgid "M_y Processes"
-msgstr "Os _Meus Processos"
+msgstr "Os _meus processos"
 
 #: ../data/menus.ui.h:10
 msgid "_Dependencies"
@@ -235,27 +226,27 @@
 
 #: ../data/menus.ui.h:15
 msgid "_Change Priority"
-msgstr "_Alterar Prioridade"
+msgstr "_Alterar prioridade"
 
-#: ../data/menus.ui.h:16 ../src/util.cpp:214
+#: ../data/menus.ui.h:16 ../src/util.cpp:215
 msgid "Very High"
-msgstr "Muito Elevada"
+msgstr "Muito elevada"
 
-#: ../data/menus.ui.h:17 ../src/util.cpp:216
+#: ../data/menus.ui.h:17 ../src/util.cpp:217
 msgid "High"
 msgstr "Alta"
 
-#: ../data/menus.ui.h:18 ../src/util.cpp:218
+#: ../data/menus.ui.h:18 ../src/util.cpp:219
 msgid "Normal"
 msgstr "Normal"
 
-#: ../data/menus.ui.h:19 ../src/util.cpp:220
+#: ../data/menus.ui.h:19 ../src/util.cpp:221
 msgid "Low"
 msgstr "Baixa"
 
-#: ../data/menus.ui.h:20 ../src/util.cpp:222
+#: ../data/menus.ui.h:20 ../src/util.cpp:223
 msgid "Very Low"
-msgstr "Muito Baixa"
+msgstr "Muito baixa"
 
 #: ../data/menus.ui.h:21
 msgid "Custom"
@@ -263,12 +254,12 @@
 
 #: ../data/menus.ui.h:22
 msgid "_Memory Maps"
-msgstr "_Mapas de Memória"
+msgstr "_Mapas de memória"
 
 #. Translators: this means 'Files that are open' (open is not a verb here)
 #: ../data/menus.ui.h:24
 msgid "Open _Files"
-msgstr "_Ficheiros Abertos"
+msgstr "_Ficheiros abertos"
 
 #: ../data/menus.ui.h:25
 msgid "_Properties"
@@ -276,71 +267,67 @@
 
 #: ../data/openfiles.ui.h:1
 msgid "Open Files"
-msgstr "Ficheiros Abertos"
+msgstr "Ficheiros abertos"
 
 #: ../data/preferences.ui.h:1
 msgid "System Monitor Preferences"
-msgstr "Preferências do Monitor de Sistema"
+msgstr "Preferências do Monitor de sistema"
 
 #: ../data/preferences.ui.h:2
-msgid "_Help"
-msgstr "_Ajuda"
-
-#: ../data/preferences.ui.h:4
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../data/preferences.ui.h:5
+#: ../data/preferences.ui.h:3
 msgid "_Update interval in seconds:"
 msgstr "Frequência de _atualização em segundos:"
 
-#: ../data/preferences.ui.h:6
+#: ../data/preferences.ui.h:4
 msgid "Enable _smooth refresh"
 msgstr "Ativar atualização _suave"
 
-#: ../data/preferences.ui.h:7
+#: ../data/preferences.ui.h:5
 msgid "Alert before ending or _killing processes"
 msgstr "Alertar antes de _matar ou terminar processos"
 
-#: ../data/preferences.ui.h:8
+#: ../data/preferences.ui.h:6
 msgid "_Divide CPU usage by CPU count"
 msgstr "_Dividir utilização de CPU pelo número de CPUs"
 
-#: ../data/preferences.ui.h:9
+#: ../data/preferences.ui.h:7
 msgid "Information Fields"
-msgstr "Campos de Informação"
+msgstr "Campos de informação"
 
-#: ../data/preferences.ui.h:10
+#: ../data/preferences.ui.h:8
 msgid "Process i_nformation shown in list:"
 msgstr "I_nformação do processo apresentada na lista:"
 
-#: ../data/preferences.ui.h:12
+#: ../data/preferences.ui.h:10
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: ../data/preferences.ui.h:13
+#: ../data/preferences.ui.h:11
 msgid "_Draw CPU chart as stacked area chart"
 msgstr "_Desenhar o gráfico de CPU como um gráfico de área empilhada"
 
-#: ../data/preferences.ui.h:14
+#: ../data/preferences.ui.h:12
 msgid "_Show network speed in bits"
 msgstr "_Apresentar a velocidade da rede em bits"
 
-#: ../data/preferences.ui.h:16
+#: ../data/preferences.ui.h:14
 msgid "Show _all file systems"
 msgstr "Apresentar _todos os sistemas de ficheiros"
 
-#: ../data/preferences.ui.h:17
+#: ../data/preferences.ui.h:15
 msgid "File system i_nformation shown in list:"
 msgstr "I_nformação do sistema de ficheiros apresentada na lista:"
 
-#: ../data/renice.ui.h:1 ../src/procdialogs.cpp:124
+#: ../data/renice.ui.h:1 ../src/procdialogs.cpp:123
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: ../data/renice.ui.h:2
 msgid "Change _Priority"
-msgstr "Alterar _Prioridade"
+msgstr "Alterar _prioridade"
 
 #: ../data/renice.ui.h:3
 msgid "_Nice value:"
@@ -355,7 +342,7 @@
 "de prioridade. Um valor de prioridade reduzido corresponde a uma prioridade "
 "mais elevada.</i></small>"
 
-#: ../src/application.cpp:275
+#: ../src/application.cpp:310
 msgid "A simple process and system monitor."
 msgstr "Um simples monitor de processos e de sistema."
 
@@ -383,7 +370,7 @@
 msgid "Directory"
 msgstr "Diretório"
 
-#: ../src/disks.cpp:371 ../src/gsm_color_button.c:166 ../src/openfiles.cpp:252
+#: ../src/disks.cpp:371 ../src/gsm_color_button.c:165 ../src/openfiles.cpp:252
 msgid "Type"
 msgstr "Tipo"
 
@@ -428,58 +415,58 @@
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/gsm_color_button.c:142
+#: ../src/gsm_color_button.c:141
 msgid "Fraction"
 msgstr "Fração"
 
 #. TRANSLATORS: description of the pie color picker's (mem, swap) filled percentage property
-#: ../src/gsm_color_button.c:144
+#: ../src/gsm_color_button.c:143
 msgid "Percentage full for pie color pickers"
 msgstr "Percentagem cheio para os seletores de cores de gráficos circulares"
 
-#: ../src/gsm_color_button.c:151
+#: ../src/gsm_color_button.c:150
 msgid "Title"
 msgstr "Título"
 
-#: ../src/gsm_color_button.c:152
+#: ../src/gsm_color_button.c:151
 msgid "The title of the color selection dialog"
 msgstr "O título do diálogo de seleção de cor"
 
-#: ../src/gsm_color_button.c:153 ../src/gsm_color_button.c:513
+#: ../src/gsm_color_button.c:152 ../src/gsm_color_button.c:512
 msgid "Pick a Color"
-msgstr "Selecione uma Cor"
+msgstr "Selecione uma cor"
 
-#: ../src/gsm_color_button.c:159
+#: ../src/gsm_color_button.c:158
 msgid "Current Color"
-msgstr "Cor Atual"
+msgstr "Cor atual"
 
-#: ../src/gsm_color_button.c:160
+#: ../src/gsm_color_button.c:159
 msgid "The selected color"
 msgstr "A cor selecionada"
 
-#: ../src/gsm_color_button.c:167
+#: ../src/gsm_color_button.c:166
 msgid "Type of color picker"
 msgstr "Tipo de seletor de cor"
 
-#: ../src/gsm_color_button.c:435
+#: ../src/gsm_color_button.c:434
 msgid "Received invalid color data\n"
 msgstr "Dado de cor recebido é inválido\n"
 
-#: ../src/gsm_color_button.c:536
+#: ../src/gsm_color_button.c:535
 msgid "Click to set graph colors"
 msgstr "Clique para definir as cores dos gráficos"
 
 #. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
-#: ../src/interface.cpp:188
+#: ../src/interface.cpp:187
 #, c-format
 msgid "Pick a Color for '%s'"
-msgstr "Selecione uma Cor para '%s'"
+msgstr "Selecione uma cor para '%s'"
 
-#: ../src/interface.cpp:221 ../src/procproperties.cpp:95
+#: ../src/interface.cpp:220 ../src/procproperties.cpp:100
 msgid "CPU"
 msgstr "CPU"
 
-#: ../src/interface.cpp:223
+#: ../src/interface.cpp:222
 #, c-format
 msgid "CPU%d"
 msgstr "CPU%d"
@@ -488,41 +475,55 @@
 msgid "translator-credits"
 msgstr "Duarte Loreto <happyguy_pt@hotmail.com>"
 
-#: ../src/load-graph.cpp:160
+#: ../src/load-graph.cpp:161
 #, c-format
 msgid "%u second"
 msgid_plural "%u seconds"
 msgstr[0] "%u segundo"
 msgstr[1] "%u segundos"
 
-#: ../src/load-graph.cpp:375
+#: ../src/load-graph.cpp:370
 msgid "not available"
 msgstr "indisponível"
 
 #. xgettext: 540MiB (53 %) of 1.0 GiB
-#: ../src/load-graph.cpp:378
+#: ../src/load-graph.cpp:373
 #, c-format
 msgid "%s (%.1f%%) of %s"
 msgstr "%s (%.1f%%) de %s"
 
-#: ../src/lsof.cpp:123
+#: ../src/lsof.cpp:109
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/lsof.cpp:124
+#: ../src/lsof.cpp:110
 #, c-format
 msgid "'%s' is not a valid Perl regular expression."
 msgstr "'%s' não é uma expressão regular Perl válida."
 
-#: ../src/lsof.cpp:270
+#: ../src/lsof.cpp:128
+#, c-format
+msgid "%d open file"
+msgid_plural "%d open files"
+msgstr[0] "%d ficheiro aberto"
+msgstr[1] "%d ficheiros abertos"
+
+#: ../src/lsof.cpp:130
+#, c-format
+msgid "%d matching open file"
+msgid_plural "%d matching open files"
+msgstr[0] "%d ficheiro aberto correspondente"
+msgstr[1] "%d ficheiros abertos correspondentes"
+
+#: ../src/lsof.cpp:246
 msgid "Process"
 msgstr "Processo"
 
-#: ../src/lsof.cpp:282
+#: ../src/lsof.cpp:258
 msgid "PID"
 msgstr "PID"
 
-#: ../src/lsof.cpp:292 ../src/memmaps.cpp:303
+#: ../src/lsof.cpp:268 ../src/memmaps.cpp:303
 msgid "Filename"
 msgstr "Nome de ficheiro"
 
@@ -580,7 +581,7 @@
 
 #: ../src/memmaps.cpp:436
 msgid "Memory Maps"
-msgstr "Mapas de Memória"
+msgstr "Mapas de memória"
 
 #: ../src/memmaps.cpp:448
 #, c-format
@@ -622,7 +623,7 @@
 msgid "Object"
 msgstr "Objeto"
 
-#: ../src/openfiles.cpp:337
+#: ../src/openfiles.cpp:336
 #, c-format
 msgid "_Files opened by process \"%s\" (PID %u):"
 msgstr "_Ficheiros abertos pelo processo \"%s\" (PID %u):"
@@ -777,43 +778,43 @@
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:33
 msgid "Width of process 'Virtual Memory' column"
-msgstr "Largura da coluna de 'Memória Virtual' do processo"
+msgstr "Largura da coluna de 'Memória virtual' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:34
 msgid "Show process 'Virtual Memory' column on startup"
-msgstr "Apresentar a coluna de 'Memória Virtual' do processo ao iniciar"
+msgstr "Apresentar a coluna de 'Memória virtual' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:35
 msgid "Width of process 'Resident Memory' column"
-msgstr "Largura da coluna de 'Memória Residente' do processo"
+msgstr "Largura da coluna de 'Memória residente' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:36
 msgid "Show process 'Resident Memory' column on startup"
-msgstr "Apresentar a coluna de 'Memória Residente' do processo ao iniciar"
+msgstr "Apresentar a coluna de 'Memória residente' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:37
 msgid "Width of process 'Writable Memory' column"
-msgstr "Largura da coluna de 'Memória de Escrita' do processo"
+msgstr "Largura da coluna de 'Memória de escrita' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:38
 msgid "Show process 'Writable Memory' column on startup"
-msgstr "Apresentar a coluna de 'Memória de Escrita' do processo ao iniciar"
+msgstr "Apresentar a coluna de 'Memória de escrita' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:39
 msgid "Width of process 'Shared Memory' column"
-msgstr "Largura da coluna de 'Memória Partilhada' do processo"
+msgstr "Largura da coluna de 'Memória partilhada' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:40
 msgid "Show process 'Shared Memory' column on startup"
-msgstr "Apresentar a coluna de 'Memória Partilhada' do processo ao iniciar"
+msgstr "Apresentar a coluna de 'Memória partilhada' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:41
 msgid "Width of process 'X Server Memory' column"
-msgstr "Largura da coluna de 'Memória do Servidor X' do processo"
+msgstr "Largura da coluna de 'Memória do servidor X' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:42
 msgid "Show process 'X Server Memory' column on startup"
-msgstr "Apresentar a coluna de 'Memória do Servidor X' do processo ao iniciar"
+msgstr "Apresentar a coluna de 'Memória do servidor X' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:44
 #, no-c-format
@@ -835,11 +836,11 @@
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:49
 msgid "Width of process 'Started' column"
-msgstr "Largura da coluna de 'Hora de Arranque' do processo"
+msgstr "Largura da coluna de 'Hora de arranque' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:50
 msgid "Show process 'Started' column on startup"
-msgstr "Apresentar a coluna de 'Hora de Arranque' do processo ao iniciar"
+msgstr "Apresentar a coluna de 'Hora de arranque' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:51
 msgid "Width of process 'Nice' column"
@@ -859,20 +860,20 @@
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:55
 msgid "Width of process 'SELinux Security Context' column"
-msgstr "Largura da coluna de 'Contexto de Segurança SELinux' do processo"
+msgstr "Largura da coluna de 'Contexto de segurança SELinux' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:56
 msgid "Show process 'SELinux Security Context' column on startup"
 msgstr ""
-"Apresentar a coluna de 'Contexto de Segurança SELinux' do processo ao iniciar"
+"Apresentar a coluna de 'Contexto de segurança SELinux' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:57
 msgid "Width of process 'Command Line' column"
-msgstr "Largura da coluna de 'Linha de Comando' do processo"
+msgstr "Largura da coluna de 'Linha de comando' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:58
 msgid "Show process 'Command Line' column on startup"
-msgstr "Apresentar a coluna de 'Linha de Comando' do processo ao iniciar"
+msgstr "Apresentar a coluna de 'Linha de comando' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:59
 msgid "Width of process 'Memory' column"
@@ -884,19 +885,19 @@
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:61
 msgid "Width of process 'Waiting Channel' column"
-msgstr "Largura da coluna de 'Canal de Espera' do processo"
+msgstr "Largura da coluna de 'Canal de espera' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:62
 msgid "Show process 'Waiting Channel' column on startup"
-msgstr "Apresentar a coluna de 'Canal de Espera' do processo ao iniciar"
+msgstr "Apresentar a coluna de 'Canal de espera' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:63
 msgid "Width of process 'Control Group' column"
-msgstr "Largura da coluna de 'Grupo de Controlo' do processo"
+msgstr "Largura da coluna de 'Grupo de controlo' do processo"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:64
 msgid "Show process 'Control Group' column on startup"
-msgstr "Apresentar a coluna de 'Grupo de Controlo' do processo ao iniciar"
+msgstr "Apresentar a coluna de 'Grupo de controlo' do processo ao iniciar"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:65
 msgid "Width of process 'Unit' column"
@@ -1022,11 +1023,11 @@
 msgid "Open files sort order"
 msgstr "Ordenação da vista de ficheiros abertos"
 
-#: ../src/prefsdialog.cpp:181
+#: ../src/prefsdialog.cpp:170
 msgid "Icon"
 msgstr "Ícone"
 
-#: ../src/procactions.cpp:76
+#: ../src/procactions.cpp:75
 #, c-format
 msgid ""
 "Cannot change the priority of process with PID %d to %d.\n"
@@ -1035,7 +1036,7 @@
 "Incapaz de alterar a prioridade do processo com o PID %d para %d.\n"
 "%s"
 
-#: ../src/procactions.cpp:154
+#: ../src/procactions.cpp:153
 #, c-format
 msgid ""
 "Cannot kill process with PID %d with signal %d.\n"
@@ -1045,20 +1046,20 @@
 "%s"
 
 #. xgettext: primary alert message for killing single process
-#: ../src/procdialogs.cpp:76
+#: ../src/procdialogs.cpp:75
 #, c-format
 msgid "Are you sure you want to kill the selected process “%s” (PID: %u)?"
 msgstr "Tem a certeza que deseja matar o processo selecionado “%s” (PID: %u)?"
 
 #. xgettext: primary alert message for ending single process
-#: ../src/procdialogs.cpp:81
+#: ../src/procdialogs.cpp:80
 #, c-format
 msgid "Are you sure you want to end the selected process “%s” (PID: %u)?"
 msgstr ""
 "Tem a certeza que deseja terminar o processo selecionado “%s” (PID: %u)?"
 
 #. xgettext: primary alert message for killing multiple processes
-#: ../src/procdialogs.cpp:88
+#: ../src/procdialogs.cpp:87
 #, c-format
 msgid "Are you sure you want to kill the selected process?"
 msgid_plural "Are you sure you want to kill the %d selected processes?"
@@ -1066,7 +1067,7 @@
 msgstr[1] "Tem a certeza que deseja matar os %d processos selecionados?"
 
 #. xgettext: primary alert message for ending multiple processes
-#: ../src/procdialogs.cpp:92
+#: ../src/procdialogs.cpp:91
 #, c-format
 msgid "Are you sure you want to end the selected process?"
 msgid_plural "Are you sure you want to end the %d selected processes?"
@@ -1074,7 +1075,7 @@
 msgstr[1] "Tem a certeza que deseja terminar os %d processos selecionados?"
 
 #. xgettext: secondary alert message
-#: ../src/procdialogs.cpp:99 ../src/procdialogs.cpp:105
+#: ../src/procdialogs.cpp:98 ../src/procdialogs.cpp:104
 msgid ""
 "Killing a process may destroy data, break the session or introduce a "
 "security risk. Only unresponsive processes should be killed."
@@ -1083,35 +1084,35 @@
 "trabalho instável ou criar um risco de segurança. Apenas deverão ser mortos "
 "processos que não estejam a responder."
 
-#: ../src/procdialogs.cpp:102
+#: ../src/procdialogs.cpp:101
 msgid "_Kill Process"
 msgid_plural "_Kill Processes"
-msgstr[0] "_Matar Processos"
-msgstr[1] "_Matar Processos"
+msgstr[0] "_Matar processo"
+msgstr[1] "_Matar processos"
 
-#: ../src/procdialogs.cpp:108
+#: ../src/procdialogs.cpp:107
 msgid "_End Process"
 msgid_plural "_End Processes"
-msgstr[0] "_Terminar Processo"
-msgstr[1] "_Terminar Processos"
+msgstr[0] "_Terminar processo"
+msgstr[1] "_Terminar processos"
 
-#: ../src/procdialogs.cpp:189
+#: ../src/procdialogs.cpp:188
 #, c-format
 msgid "Change Priority of Process “%s” (PID: %u)"
-msgstr "Alterar a Prioridade do Processo “%s” (PID: %u)"
+msgstr "Alterar a prioridade do processo “%s” (PID: %u)"
 
-#: ../src/procdialogs.cpp:192
+#: ../src/procdialogs.cpp:191
 #, c-format
 msgid "Change Priority of the selected process"
 msgid_plural "Change Priority of %d selected processes"
-msgstr[0] "Alterar Prioridade do processo selecionado"
+msgstr[0] "Alterar prioridade do processo selecionado"
 msgstr[1] "Alterar Prioridades dos %d processos selecionados"
 
-#: ../src/procdialogs.cpp:211
+#: ../src/procdialogs.cpp:210
 msgid "Note:"
 msgstr "Nota:"
 
-#: ../src/procdialogs.cpp:212
+#: ../src/procdialogs.cpp:211
 msgid ""
 "The priority of a process is given by its nice value. A lower nice value "
 "corresponds to a higher priority."
@@ -1119,115 +1120,112 @@
 "A prioridade de um processo é indicada pelo seu valor de prioridade. Um "
 "valor de prioridade reduzido corresponde a uma prioridade mais elevada."
 
-#: ../src/procproperties.cpp:56 ../src/util.cpp:431
+#: ../src/procproperties.cpp:55 ../src/procproperties.cpp:106
+#: ../src/procproperties.cpp:109 ../src/util.cpp:432
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/procproperties.cpp:84 ../src/proctable.cpp:321
+#: ../src/procproperties.cpp:89 ../src/proctable.cpp:322
 msgid "Process Name"
-msgstr "Nome de Processo"
+msgstr "Nome de processo"
 
-#: ../src/procproperties.cpp:85 ../src/proctable.cpp:322
+#: ../src/procproperties.cpp:90 ../src/proctable.cpp:323
 msgid "User"
 msgstr "Utilizador"
 
-#: ../src/procproperties.cpp:86 ../src/proctable.cpp:323
+#: ../src/procproperties.cpp:91 ../src/proctable.cpp:324
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/procproperties.cpp:88 ../src/proctable.cpp:324
+#: ../src/procproperties.cpp:93 ../src/proctable.cpp:325
 msgid "Virtual Memory"
-msgstr "Memória Virtual"
+msgstr "Memória virtual"
 
-#: ../src/procproperties.cpp:89 ../src/proctable.cpp:325
+#: ../src/procproperties.cpp:94 ../src/proctable.cpp:326
 msgid "Resident Memory"
-msgstr "Memória Residente"
+msgstr "Memória residente"
 
-#: ../src/procproperties.cpp:90 ../src/proctable.cpp:326
+#: ../src/procproperties.cpp:95 ../src/proctable.cpp:327
 msgid "Writable Memory"
-msgstr "Memória para Escrita"
+msgstr "Memória para escrita"
 
-#: ../src/procproperties.cpp:91 ../src/proctable.cpp:327
+#: ../src/procproperties.cpp:96 ../src/proctable.cpp:328
 msgid "Shared Memory"
-msgstr "Memória Partilhada"
+msgstr "Memória partilhada"
 
-#: ../src/procproperties.cpp:93 ../src/proctable.cpp:328
+#: ../src/procproperties.cpp:98 ../src/proctable.cpp:329
 msgid "X Server Memory"
-msgstr "Memória do Servidor X"
+msgstr "Memória do servidor X"
 
-#: ../src/procproperties.cpp:96 ../src/proctable.cpp:330
+#: ../src/procproperties.cpp:101 ../src/proctable.cpp:331
 msgid "CPU Time"
 msgstr "Tempo de CPU"
 
-#: ../src/procproperties.cpp:96
+#: ../src/procproperties.cpp:101
 #, c-format
 msgid "%lld second"
 msgid_plural "%lld seconds"
 msgstr[0] "%lld segundo"
 msgstr[1] "%lld segundos"
 
-#: ../src/procproperties.cpp:97 ../src/proctable.cpp:331
+#: ../src/procproperties.cpp:102 ../src/proctable.cpp:332
 msgid "Started"
 msgstr "Iniciada"
 
-#: ../src/procproperties.cpp:98 ../src/proctable.cpp:332
+#: ../src/procproperties.cpp:103 ../src/proctable.cpp:333
 msgid "Nice"
 msgstr "Prioridade"
 
-#: ../src/procproperties.cpp:99 ../src/proctable.cpp:346
+#: ../src/procproperties.cpp:104 ../src/proctable.cpp:347
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../src/procproperties.cpp:100 ../src/proctable.cpp:333
+#: ../src/procproperties.cpp:105 ../src/proctable.cpp:334
 msgid "ID"
 msgstr "ID"
 
-#: ../src/procproperties.cpp:101 ../src/proctable.cpp:334
+#: ../src/procproperties.cpp:106 ../src/proctable.cpp:335
 msgid "Security Context"
-msgstr "Contexto de Segurança"
+msgstr "Contexto de segurança"
 
-#: ../src/procproperties.cpp:102 ../src/proctable.cpp:335
+#: ../src/procproperties.cpp:107 ../src/proctable.cpp:336
 msgid "Command Line"
-msgstr "Linha de Comando"
+msgstr "Linha de comando"
 
 #. xgettext: combined noun, the function the process is waiting in, see wchan ps(1)
-#: ../src/procproperties.cpp:103 ../src/proctable.cpp:338
+#: ../src/procproperties.cpp:108 ../src/proctable.cpp:339
 msgid "Waiting Channel"
-msgstr "Canal de Espera"
+msgstr "Canal de espera"
 
-#: ../src/procproperties.cpp:104 ../src/proctable.cpp:339
+#: ../src/procproperties.cpp:109 ../src/proctable.cpp:340
 msgid "Control Group"
-msgstr "Grupo de Controlo"
+msgstr "Grupo de controlo"
 
-#: ../src/procproperties.cpp:214
-msgid "Process Properties"
-msgstr "Propriedades do Processo"
-
-#: ../src/procproperties.cpp:234
+#: ../src/procproperties.cpp:221
 #, c-format
-msgid "Properties of process \"%s\" (PID %u):"
-msgstr "Propriedades do processo \"%s\" (PID %u):"
+msgid "%s (PID %u)"
+msgstr "%s (PID %u)"
 
-#: ../src/proctable.cpp:329
+#: ../src/proctable.cpp:330
 #, no-c-format
 msgid "% CPU"
 msgstr "% CPU"
 
-#: ../src/proctable.cpp:340
+#: ../src/proctable.cpp:341
 msgid "Unit"
 msgstr "Unidade"
 
-#: ../src/proctable.cpp:341
+#: ../src/proctable.cpp:342
 msgid "Session"
 msgstr "Sessão"
 
 #. TRANSLATORS: Seat = i.e. the physical seat the session of the process belongs to, only
 #. for multi-seat environments. See http://en.wikipedia.org/wiki/Multiseat_configuration
-#: ../src/proctable.cpp:344
+#: ../src/proctable.cpp:345
 msgid "Seat"
 msgstr "Lugar"
 
-#: ../src/proctable.cpp:345
+#: ../src/proctable.cpp:346
 msgid "Owner"
 msgstr "Dono"
 
@@ -1249,7 +1247,7 @@
 
 #: ../src/util.cpp:43
 msgid "Sleeping"
-msgstr "A Dormir"
+msgstr "A dormir"
 
 #. xgettext: weeks, days
 #: ../src/util.cpp:98
@@ -1275,86 +1273,110 @@
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/util.cpp:163
+#: ../src/util.cpp:164
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../src/util.cpp:164
+#: ../src/util.cpp:165
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../src/util.cpp:165
+#: ../src/util.cpp:166
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../src/util.cpp:166
+#: ../src/util.cpp:167
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../src/util.cpp:167
+#: ../src/util.cpp:168
 #, c-format
 msgid "%.3g kbit"
 msgstr "%.3g kbit"
 
-#: ../src/util.cpp:168
+#: ../src/util.cpp:169
 #, c-format
 msgid "%.3g Mbit"
 msgstr "%.3g Mbit"
 
-#: ../src/util.cpp:169
+#: ../src/util.cpp:170
 #, c-format
 msgid "%.3g Gbit"
 msgstr "%.3g Gbit"
 
-#: ../src/util.cpp:170
+#: ../src/util.cpp:171
 #, c-format
 msgid "%.3g Tbit"
 msgstr "%.3g Tbit"
 
-#: ../src/util.cpp:185
+#: ../src/util.cpp:186
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
 msgstr[0] "%u bit"
 msgstr[1] "%u bits"
 
-#: ../src/util.cpp:186
+#: ../src/util.cpp:187
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
-#: ../src/util.cpp:229
+#: ../src/util.cpp:230
 msgid "Very High Priority"
-msgstr "Prioridade Muito Elevada"
+msgstr "Prioridade muito elevada"
 
-#: ../src/util.cpp:231
+#: ../src/util.cpp:232
 msgid "High Priority"
-msgstr "Prioridade Elevada"
+msgstr "Prioridade elevada"
 
-#: ../src/util.cpp:233
+#: ../src/util.cpp:234
 msgid "Normal Priority"
-msgstr "Prioridade Normal"
+msgstr "Prioridade normal"
 
-#: ../src/util.cpp:235
+#: ../src/util.cpp:236
 msgid "Low Priority"
-msgstr "Prioridade Reduzida"
+msgstr "Prioridade reduzida"
 
-#: ../src/util.cpp:237
+#: ../src/util.cpp:238
 msgid "Very Low Priority"
-msgstr "Prioridade Muito Reduzida"
+msgstr "Prioridade muito reduzida"
 
 #. xgettext: rate, 10MiB/s or 10Mbit/s
-#: ../src/util.cpp:629
+#: ../src/util.cpp:630
 #, c-format
 msgid "%s/s"
 msgstr "%s/s"
 
+#~ msgid "_Name contains:"
+#~ msgstr "_Nome contém:"
+
+#~ msgid "_Find"
+#~ msgstr "_Procurar"
+
+#~ msgid "C_lear"
+#~ msgstr "_Limpar"
+
+#~ msgid "S_earch results:"
+#~ msgstr "R_esultados da procura:"
+
+#~ msgid "_Close"
+#~ msgstr "_Fechar"
+
+#~ msgid "_Help"
+#~ msgstr "_Ajuda"
+
+#~ msgid "Process Properties"
+#~ msgstr "Propriedades do Processo"
+
+#~ msgid "Properties of process \"%s\" (PID %u):"
+#~ msgstr "Propriedades do processo \"%s\" (PID %u):"
+
 #~ msgid "Privileges are required to kill process"
 #~ msgstr "São necessários privilégios para matar o processo"
 
@@ -1482,9 +1504,6 @@
 #~ msgid "Search for _Open Files"
 #~ msgstr "Procurar por Ficheiros _Abertos"
 
-#~ msgid "Search for open files"
-#~ msgstr "Procurar por ficheiros abertos"
-
 #~ msgid "Quit the program"
 #~ msgstr "Sair da aplicação"
 
diff -Nru gnome-system-monitor-3.14.1/po/sr@latin.po gnome-system-monitor-3.15.4/po/sr@latin.po
--- gnome-system-monitor-3.14.1/po/sr@latin.po	2014-10-13 18:18:27.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/sr@latin.po	2014-10-20 20:15:40.000000000 +0000
@@ -1,16 +1,16 @@
 # Serbian translation of procman
-# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003—2014.
+# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003, 2005, 2006.
 # This file is distributed under the same license as the procman package.
 # Maintainer: Dušan Marjanović <mdfk@root.co.yu>
 # Reviewed on 2005-03-06 by: Danilo Šegan <danilo@prevod.org>
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2014.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-system-monitor\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product"
 "=system-monitor&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-25 19:44+0000\n"
-"PO-Revision-Date: 2014-09-25 22:30+0200\n"
+"POT-Creation-Date: 2013-08-19 19:18+0000\n"
+"PO-Revision-Date: 2013-09-08 14:53+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -22,70 +22,30 @@
 "X-Project-Style: gnome\n"
 
 #: ../gnome-system-monitor.desktop.in.in.h:1 ../data/interface.ui.h:1
-#: ../src/application.cpp:268 ../src/interface.cpp:363
+#: ../src/application.cpp:233 ../src/interface.cpp:362
 msgid "System Monitor"
 msgstr "Praćenje sistema"
 
 #: ../gnome-system-monitor.desktop.in.in.h:2
-#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:364
+#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:363
 msgid "View current processes and monitor system state"
 msgstr "Pregledajte tekuće procese i pratite stanje sistema"
 
 #: ../gnome-system-monitor.desktop.in.in.h:3
-#| msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
-msgid ""
-"Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
-"Manager;"
-msgstr ""
-"praćenje;sistem;proces;procesor;memorija;mreža;istorijat;upotreba;odlike;zada"
-"tak;upravnik;"
-
-#: ../gnome-system-monitor-kde.desktop.in.in.h:1
-#: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
-msgid "GNOME System Monitor"
-msgstr "Gnomov pratilac sistema"
-
 #: ../gnome-system-monitor-kde.desktop.in.in.h:3
 msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
 msgstr "praćenje;sistem;proces;procesor;memorija;mreža;istorijat;upotreba;"
 
-#: ../gnome-system-monitor.appdata.xml.in.h:2
-msgid "View and manage system resources"
-msgstr "Pregledajte i upravljajte izvorištima sistema"
-
-#: ../gnome-system-monitor.appdata.xml.in.h:3
-msgid ""
-"System Monitor is a process viewer and system monitor with an attractive, "
-"easy-to-use interface."
-msgstr ""
-"Pratilac sistema je pregledač procesa i pratilac sistema sa privlačnim, "
-"lakim za upotrebu sučeljem."
-
-#: ../gnome-system-monitor.appdata.xml.in.h:4
-msgid ""
-"System Monitor can help you find out what applications are using the "
-"processor or the memory of your computer, can manage the running "
-"applications, force stop processes not responding, and change the state or "
-"priority of existing processes."
-msgstr ""
-"Pratilac sistema vam može pomoći da saznate koji programi koriste procesor "
-"ili memoriju vašeg računara, može da upravlja pokrenutim programima, da "
-"primora zaustavljanje procesa koji se ne odazivaju, i da izmeni stanje ili "
-"hitnost postojećih procesa."
-
-#: ../gnome-system-monitor.appdata.xml.in.h:5
-msgid ""
-"The resource graphs feature shows you a quick overview of what is going on "
-"with your computer displaying recent network, memory and processor usage."
-msgstr ""
-"Funkcija grafika izvorišta vam daje brz pregled o dešavanjima na vašem "
-"računaru prikazujući nedavno korišćenje mreže, memorije i procesora."
+#: ../gnome-system-monitor-kde.desktop.in.in.h:1 ../src/application.cpp:289
+msgid "GNOME System Monitor"
+msgstr "Gnomov pratilac sistema"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:1
 msgid "Kill process"
 msgstr "Ubij proces"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:2
+#| msgid "Privileges are required to renice process"
 msgid "Privileges are required to control other users' processes"
 msgstr "Potrebna su ovlašćenja za upravljanje procesima drugih korisnika"
 
@@ -94,6 +54,7 @@
 msgstr "Nastavi proces"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:4
+#| msgid "Privileges are required to renice process"
 msgid "Privileges are required to change the priority of processes"
 msgstr "Potrebna su ovlašćenja za promenu važnosti procesa"
 
@@ -102,10 +63,11 @@
 msgstr "_Okončaj proces"
 
 #: ../data/interface.ui.h:3
+#| msgid "Process Properties"
 msgid "Show process properties"
 msgstr "Prikažite svojstva procesa"
 
-#: ../data/interface.ui.h:4 ../data/preferences.ui.h:9
+#: ../data/interface.ui.h:4 ../data/preferences.ui.h:11
 msgid "Processes"
 msgstr "Procesi"
 
@@ -118,7 +80,7 @@
 msgstr "Vremenski dijagram operativne i virtuelne memorije"
 
 #: ../data/interface.ui.h:7 ../src/interface.cpp:260
-#: ../src/procproperties.cpp:92 ../src/proctable.cpp:337
+#: ../src/procproperties.cpp:87 ../src/proctable.cpp:336
 msgid "Memory"
 msgstr "Operativna memorija"
 
@@ -146,11 +108,11 @@
 msgid "Total Sent"
 msgstr "Ukupno poslato"
 
-#: ../data/interface.ui.h:14 ../data/preferences.ui.h:13
+#: ../data/interface.ui.h:14 ../data/preferences.ui.h:15
 msgid "Resources"
 msgstr "Resursi"
 
-#: ../data/interface.ui.h:15 ../data/preferences.ui.h:16
+#: ../data/interface.ui.h:15 ../data/preferences.ui.h:18
 msgid "File Systems"
 msgstr "Sistemi datoteka"
 
@@ -160,13 +122,29 @@
 msgstr "Potražite otvorene datoteke"
 
 #: ../data/lsof.ui.h:2
-msgid "Filter files by name"
-msgstr "Izdvojte datoteke prema nazivu"
+msgid "_Name contains:"
+msgstr "_Naziv sadrži:"
 
 #: ../data/lsof.ui.h:3
-#| msgid "Case insensitive matching"
-msgid "Case insensitive"
-msgstr "Ne razlikuj veličinu slova"
+msgid "_Find"
+msgstr "_Nađi"
+
+#: ../data/lsof.ui.h:4
+msgid "Case insensitive matching"
+msgstr "Zanemari veličinu slova"
+
+#: ../data/lsof.ui.h:5
+msgid "C_lear"
+msgstr "_Očisti"
+
+#: ../data/lsof.ui.h:6
+msgid "S_earch results:"
+msgstr "Rezultati _pretrage:"
+
+#: ../data/lsof.ui.h:7 ../data/openfiles.ui.h:2 ../data/preferences.ui.h:3
+#: ../src/memmaps.cpp:438 ../src/procproperties.cpp:216
+msgid "_Close"
+msgstr "_Zatvori"
 
 #: ../data/menus.ui.h:1
 msgctxt "Menu item to Open 'Search for Open Files' dialog"
@@ -210,10 +188,12 @@
 msgstr "_Međuzavisnosti"
 
 #: ../data/menus.ui.h:11
+#| msgid "Stopped"
 msgid "_Stop"
 msgstr "_Zaustavi"
 
 #: ../data/menus.ui.h:12
+#| msgid "_Continue Process"
 msgid "_Continue"
 msgstr "_Nastavi"
 
@@ -229,23 +209,23 @@
 msgid "_Change Priority"
 msgstr "_Izmeni prioritet"
 
-#: ../data/menus.ui.h:16 ../src/util.cpp:215
+#: ../data/menus.ui.h:16 ../src/util.cpp:214
 msgid "Very High"
 msgstr "Vrlo visok"
 
-#: ../data/menus.ui.h:17 ../src/util.cpp:217
+#: ../data/menus.ui.h:17 ../src/util.cpp:216
 msgid "High"
 msgstr "Visok"
 
-#: ../data/menus.ui.h:18 ../src/util.cpp:219
+#: ../data/menus.ui.h:18 ../src/util.cpp:218
 msgid "Normal"
 msgstr "Normalan"
 
-#: ../data/menus.ui.h:19 ../src/util.cpp:221
+#: ../data/menus.ui.h:19 ../src/util.cpp:220
 msgid "Low"
 msgstr "Nizak"
 
-#: ../data/menus.ui.h:20 ../src/util.cpp:223
+#: ../data/menus.ui.h:20 ../src/util.cpp:222
 msgid "Very Low"
 msgstr "Vrlo nizak"
 
@@ -275,54 +255,59 @@
 msgstr "Postavke praćenja sistema"
 
 #: ../data/preferences.ui.h:2
+#| msgid "Help"
+msgid "_Help"
+msgstr "Po_moć"
+
+#: ../data/preferences.ui.h:4
 msgid "Behavior"
 msgstr "Ponašanje"
 
-#: ../data/preferences.ui.h:3
+#: ../data/preferences.ui.h:5
 msgid "_Update interval in seconds:"
 msgstr "Period _osvežavanja (u sekundama):"
 
-#: ../data/preferences.ui.h:4
+#: ../data/preferences.ui.h:6
 msgid "Enable _smooth refresh"
 msgstr "Uključi precizno, _meko osvežavanje"
 
-#: ../data/preferences.ui.h:5
+#: ../data/preferences.ui.h:7
 msgid "Alert before ending or _killing processes"
 msgstr "Prikaži upozorenje pre _okončavanja ili ubijanja procesa"
 
-#: ../data/preferences.ui.h:6
+#: ../data/preferences.ui.h:8
 msgid "_Divide CPU usage by CPU count"
 msgstr "_Podeli iskorišćenost procesora brojem procesora"
 
-#: ../data/preferences.ui.h:7
+#: ../data/preferences.ui.h:9
 msgid "Information Fields"
 msgstr "Polja sa podacima"
 
-#: ../data/preferences.ui.h:8
+#: ../data/preferences.ui.h:10
 msgid "Process i_nformation shown in list:"
 msgstr "Podaci o _procesima prikazani u spisku:"
 
-#: ../data/preferences.ui.h:10
+#: ../data/preferences.ui.h:12
 msgid "Graphs"
 msgstr "Grafici"
 
-#: ../data/preferences.ui.h:11
+#: ../data/preferences.ui.h:13
 msgid "_Draw CPU chart as stacked area chart"
 msgstr "_Crtaj grafik procesora kao grafik naslagane oblasti"
 
-#: ../data/preferences.ui.h:12
+#: ../data/preferences.ui.h:14
 msgid "_Show network speed in bits"
 msgstr "_Prikaži brzinu mreže u bitovima"
 
-#: ../data/preferences.ui.h:14
+#: ../data/preferences.ui.h:16
 msgid "Show _all file systems"
 msgstr "Prikaži _sve sisteme datoteka"
 
-#: ../data/preferences.ui.h:15
+#: ../data/preferences.ui.h:17
 msgid "File system i_nformation shown in list:"
 msgstr "Podaci o sistemu _datoteka prikazani na spisku:"
 
-#: ../data/renice.ui.h:1 ../src/procdialogs.cpp:123
+#: ../data/renice.ui.h:1 ../src/procdialogs.cpp:124
 msgid "_Cancel"
 msgstr "_Otkaži"
 
@@ -342,7 +327,7 @@
 "<small><i><b>Napomena:</b> Prioritet procesa je zadat vrednošću njegovog "
 "lepog ponašanja. Niža vrednost predstavlja viši prioritet.</i></small>"
 
-#: ../src/application.cpp:310
+#: ../src/application.cpp:275
 msgid "A simple process and system monitor."
 msgstr "Jednostavan program za praćenje sistema i procesa."
 
@@ -370,7 +355,7 @@
 msgid "Directory"
 msgstr "Direktorijum"
 
-#: ../src/disks.cpp:371 ../src/gsm_color_button.c:165 ../src/openfiles.cpp:252
+#: ../src/disks.cpp:371 ../src/gsm_color_button.c:166 ../src/openfiles.cpp:252
 msgid "Type"
 msgstr "Vrsta"
 
@@ -415,63 +400,63 @@
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/gsm_color_button.c:141
+#: ../src/gsm_color_button.c:142
 msgid "Fraction"
 msgstr "Deo"
 
 #. TRANSLATORS: description of the pie color picker's (mem, swap) filled percentage property
-#: ../src/gsm_color_button.c:143
+#: ../src/gsm_color_button.c:144
 msgid "Percentage full for pie color pickers"
 msgstr "Boja za popunjeni deo pite"
 
-#: ../src/gsm_color_button.c:150
+#: ../src/gsm_color_button.c:151
 msgid "Title"
 msgstr "Naslov"
 
-#: ../src/gsm_color_button.c:151
+#: ../src/gsm_color_button.c:152
 msgid "The title of the color selection dialog"
 msgstr "Naslov prozorčeta za izbor boje"
 
-#: ../src/gsm_color_button.c:152 ../src/gsm_color_button.c:512
+#: ../src/gsm_color_button.c:153 ../src/gsm_color_button.c:513
 msgid "Pick a Color"
 msgstr "Izaberite boju"
 
-#: ../src/gsm_color_button.c:158
+#: ../src/gsm_color_button.c:159
 msgid "Current Color"
 msgstr "Trenutna boja"
 
-#: ../src/gsm_color_button.c:159
+#: ../src/gsm_color_button.c:160
 msgid "The selected color"
 msgstr "Izabrana boja"
 
-#: ../src/gsm_color_button.c:166
+#: ../src/gsm_color_button.c:167
 msgid "Type of color picker"
 msgstr "Vrsta izbornika boje"
 
-#: ../src/gsm_color_button.c:434
+#: ../src/gsm_color_button.c:435
 msgid "Received invalid color data\n"
 msgstr "Primljeni su neispravni podaci\n"
 
-#: ../src/gsm_color_button.c:535
+#: ../src/gsm_color_button.c:536
 msgid "Click to set graph colors"
 msgstr "Kliknite da postavite boje grafika"
 
 #. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
-#: ../src/interface.cpp:187
+#: ../src/interface.cpp:188
 #, c-format
 msgid "Pick a Color for '%s'"
 msgstr "Izaberite boju za „%s“"
 
-#: ../src/interface.cpp:220 ../src/procproperties.cpp:100
+#: ../src/interface.cpp:221 ../src/procproperties.cpp:95
 msgid "CPU"
 msgstr "Procesor"
 
-#: ../src/interface.cpp:222
+#: ../src/interface.cpp:223
 #, c-format
 msgid "CPU%d"
 msgstr "Procesor %d"
 
-#: ../src/interface.cpp:374
+#: ../src/interface.cpp:373
 msgid "translator-credits"
 msgstr ""
 "Dušan Marjanović <madafaka@root.co.yu>\n"
@@ -484,7 +469,7 @@
 "Prevod.org — prevod na srpski jezik."
 
 # bug(slobo): Množinski oblici. Danilo — ovaj je tvoj.
-#: ../src/load-graph.cpp:161
+#: ../src/load-graph.cpp:155
 #, c-format
 msgid "%u second"
 msgid_plural "%u seconds"
@@ -503,43 +488,24 @@
 msgid "%s (%.1f%%) of %s"
 msgstr "%s (%.1f%%) od %s"
 
-#: ../src/lsof.cpp:109
+#: ../src/lsof.cpp:123
 msgid "Error"
 msgstr "Greška"
 
-#: ../src/lsof.cpp:110
+#: ../src/lsof.cpp:124
 #, c-format
 msgid "'%s' is not a valid Perl regular expression."
 msgstr "„%s“ nije ispravan regularni izraz u Perlu."
 
-#: ../src/lsof.cpp:128
-#, c-format
-#| msgid "Open Files"
-msgid "%d open file"
-msgid_plural "%d open files"
-msgstr[0] "%d otvorena datoteka"
-msgstr[1] "%d otvorene datoteke"
-msgstr[2] "%d otvorenih datoteka"
-msgstr[3] "Jedna otvorena datoteka"
-
-#: ../src/lsof.cpp:130
-#, c-format
-msgid "%d matching open file"
-msgid_plural "%d matching open files"
-msgstr[0] "%d odgovarajuća otvorena datoteka"
-msgstr[1] "%d odgovarajuće otvorene datoteke"
-msgstr[2] "%d odgovarajućih otvorenih datoteka"
-msgstr[3] "Jedna odgovarajuća otvorena datoteka"
-
-#: ../src/lsof.cpp:246
+#: ../src/lsof.cpp:270
 msgid "Process"
 msgstr "Proces"
 
-#: ../src/lsof.cpp:258
+#: ../src/lsof.cpp:282
 msgid "PID"
 msgstr "PID"
 
-#: ../src/lsof.cpp:268 ../src/memmaps.cpp:303
+#: ../src/lsof.cpp:292 ../src/memmaps.cpp:303
 msgid "Filename"
 msgstr "Naziv datoteke"
 
@@ -639,30 +605,30 @@
 msgid "Object"
 msgstr "Objekat"
 
-#: ../src/openfiles.cpp:336
+#: ../src/openfiles.cpp:337
 #, c-format
 msgid "_Files opened by process \"%s\" (PID %u):"
 msgstr "_Datoteke koje je otvorio proces „%s“ (IB procesa %u):"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:1
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:1
 msgid "Main window size and position in the form (width, height, xpos, ypos)"
 msgstr ""
-"Veličina i položaj glavnog prozora u obliku (širina, visina, x-položaj, y-"
-"položaj)"
+"Veličina i položaj glavnog prozora u obliku (širina, visina, x-položaj, "
+"y-položaj)"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:2
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:2
 msgid "Main Window should open maximized"
 msgstr "Glavni prozor treba da se otvori uvećan"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:3
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:3
 msgid "Show process dependencies in tree form"
 msgstr "Prikazuje međuzavisnost procesa u obliku stabla"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:4
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:4
 msgid "Solaris mode for CPU percentage"
 msgstr "Solaris način rada za procenat procesora"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:5
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:5
 msgid ""
 "If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage "
 "is divided by the total number of CPUs. Otherwise, it operates in 'Irix "
@@ -672,11 +638,11 @@
 "procesorsko vreme zadatka podeljeno sa ukupnim brojem procesora. U suprotnom, "
 "radiće u Iriks režimu."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:6
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:6
 msgid "Show CPU chart as stacked area chart"
 msgstr "Prikazuje grafik procesora kao grafik naslagane oblasti"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:7
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:7
 msgid ""
 "If TRUE, system-monitor shows the CPU chart as a stacked area chart instead "
 "of a line chart."
@@ -684,27 +650,27 @@
 "Ako je izabrano, pratilac sistema će prikazati grafik procesora kao grafik "
 "naslagane oblasti umesto linijskog grafika."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:8
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:8
 msgid "Enable/Disable smooth refresh"
 msgstr "Uključuje/isključuje precizno, meko osvežavanje"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:9
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:9
 msgid "Show warning dialog when killing processes"
 msgstr "Prikazuje upozorenje pre ubijanja procesa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:10
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:10
 msgid "Time in milliseconds between updates of the process view"
 msgstr "Vreme u milisekundama između osvežavanja spiska procesa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:11
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:11
 msgid "Time in milliseconds between updates of the graphs"
 msgstr "Vreme u milisekundama između osvežavanja grafika"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:12
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:12
 msgid "Whether information about all file systems should be displayed"
 msgstr "Da li će biti prikazani podaci o svim sistemima datoteka"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:13
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:13
 msgid ""
 "Whether to display information about all file systems (including types like "
 "'autofs' and 'procfs'). Useful for getting a list of all currently mounted "
@@ -714,333 +680,333 @@
 "sistema datoteka „autofs“ i „procfs“. Korisno je za dobavljanje spiska svih "
 "trenutno priključenih sistema datoteka."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:14
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:14
 msgid "Time in milliseconds between updates of the devices list"
 msgstr "Vreme u milisekundama između osvežavanja spiska uređaja"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:15
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:15
 msgid "Determines which processes to show."
 msgstr "Određuje koji će procesi biti prikazani."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:16
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:16
 msgid "Saves the currently viewed tab"
 msgstr "Čuva trenutno pregledani jezičak"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:17
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:17
 msgid "CPU colors"
 msgstr "Boje procesora"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:18
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:18
 msgid "Each entry is in the format (CPU#, Hexadecimal color value)"
 msgstr "Svaki unos je oblika (Procesor#, Heksadecimalna vrednost boje)"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:19
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:19
 msgid "Default graph memory color"
 msgstr "Podrazumevana boja operativne memorije na grafiku"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:20
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:20
 msgid "Default graph swap color"
 msgstr "Podrazumevana boja virtuelene memorije na grafiku"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:21
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:21
 msgid "Default graph incoming network traffic color"
 msgstr "Podrazumevana boja dolaznog mrežnog saobraćaja na grafiku"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:22
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:22
 msgid "Default graph outgoing network traffic color"
 msgstr "Podrazumevana boja odlaznog mrežnog saobraćaja na grafiku"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:23
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:23
 msgid "Show network traffic in bits"
 msgstr "Prikazuje mrežni saobraćaj u bitima"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:24
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:24
 msgid "Process view sort column"
 msgstr "Kolona poretka u pregledu procesa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:25
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:25
 msgid "Process view columns order"
 msgstr "Poredak kolona u pregledu procesa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:26
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:26
 msgid "Process view sort order"
 msgstr "Redosled ređanja u pregledu procesa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:27
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:27
 msgid "Width of process 'Name' column"
 msgstr "Širina kolone „Naziv“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:28
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:28
 msgid "Show process 'Name' column on startup"
 msgstr "Prikazuje kolonu „Naziv“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:29
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:29
 msgid "Width of process 'User' column"
 msgstr "Širina kolone „Vlasnik“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:30
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:30
 msgid "Show process 'User' column on startup"
 msgstr "Prikazuje kolonu „Korisnik“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:31
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:31
 msgid "Width of process 'Status' column"
 msgstr "Širina kolone „Stanje“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:32
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:32
 msgid "Show process 'Status' column on startup"
 msgstr "Prikazuje kolonu „Stanje“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:33
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:33
 msgid "Width of process 'Virtual Memory' column"
 msgstr "Širina kolone „Virtuelna memorija“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:34
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:34
 msgid "Show process 'Virtual Memory' column on startup"
 msgstr "Prikazuje kolonu „Virtuelna memorija“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:35
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:35
 msgid "Width of process 'Resident Memory' column"
 msgstr "Širina kolone „Rezidentna memorija“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:36
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:36
 msgid "Show process 'Resident Memory' column on startup"
 msgstr "Prikazuje kolonu „Rezidentna memorija“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:37
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:37
 msgid "Width of process 'Writable Memory' column"
 msgstr "Širina kolone „Upisiva memorija“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:38
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:38
 msgid "Show process 'Writable Memory' column on startup"
 msgstr "Prikazuje kolonu „Upisiva memorija“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:39
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:39
 msgid "Width of process 'Shared Memory' column"
 msgstr "Širina kolone „Deljena memorija“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:40
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:40
 msgid "Show process 'Shared Memory' column on startup"
 msgstr "Prikazuje kolonu „Deljena memorija“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:41
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:41
 msgid "Width of process 'X Server Memory' column"
 msgstr "Širina kolone „Memorija Iks servera“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:42
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:42
 msgid "Show process 'X Server Memory' column on startup"
 msgstr "Prikazuje kolonu „Memorija Iks servera“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:44
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:44
 #, no-c-format
 msgid "Width of process 'CPU %' column"
 msgstr "Širina kolone „Procesor %“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:46
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:46
 #, no-c-format
 msgid "Show process 'CPU %' column on startup"
 msgstr "Prikazuje kolonu „Procesor %“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:47
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:47
 msgid "Width of process 'CPU Time' column"
 msgstr "Širina kolone „Procesorsko vreme“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:48
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:48
 msgid "Show process 'CPU Time' column on startup"
 msgstr "Prikazuje kolonu „Procesorsko vreme“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:49
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:49
 msgid "Width of process 'Started' column"
 msgstr "Širina kolone „Započet“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:50
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:50
 msgid "Show process 'Started' column on startup"
 msgstr "Prikazuje kolonu „Započet“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:51
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:51
 msgid "Width of process 'Nice' column"
 msgstr "Širina kolone „Pristojno“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:52
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:52
 msgid "Show process 'Nice' column on startup"
 msgstr "Prikazuje kolonu „Pristojno“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:53
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:53
 msgid "Width of process 'PID' column"
 msgstr "Širina kolone „PIB“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:54
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:54
 msgid "Show process 'PID' column on startup"
 msgstr "Prikazuje kolonu „PIB“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:55
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:55
 msgid "Width of process 'SELinux Security Context' column"
 msgstr "Širina kolone „SELinuks bezbedonosni kontekst“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:56
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:56
 msgid "Show process 'SELinux Security Context' column on startup"
 msgstr "Prikazuje kolonu „SELinuks bezbedonosni kontekst“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:57
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:57
 msgid "Width of process 'Command Line' column"
 msgstr "Širina kolone „Linija naredbi“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:58
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:58
 msgid "Show process 'Command Line' column on startup"
 msgstr "Prikazuje kolonu „Linija naredbi“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:59
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:59
 msgid "Width of process 'Memory' column"
 msgstr "Širina kolone „Memorija“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:60
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:60
 msgid "Show process 'Memory' column on startup"
 msgstr "Prikazuje kolonu „Memorija“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:61
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:61
 msgid "Width of process 'Waiting Channel' column"
 msgstr "Širina kolone „Kanal čekanja“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:62
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:62
 msgid "Show process 'Waiting Channel' column on startup"
 msgstr "Prikazuje kolonu „Kanal čekanja“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:63
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:63
 msgid "Width of process 'Control Group' column"
 msgstr "Širina kolone „Grupa upravljanja“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:64
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:64
 msgid "Show process 'Control Group' column on startup"
 msgstr "Prikazuje kolonu „Grupa upravljanja“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:65
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:65
 msgid "Width of process 'Unit' column"
 msgstr "Širina kolone „Jedinica“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:66
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:66
 msgid "Show process 'Unit' column on startup"
 msgstr "Prikazuje kolonu „Jedinica“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:67
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:67
 msgid "Width of process 'Session' column"
 msgstr "Širina kolone „Sesija“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:68
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:68
 msgid "Show process 'Session' column on startup"
 msgstr "Prikazuje kolonu „Sesija“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:69
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:69
 msgid "Width of process 'Seat' column"
 msgstr "Širina kolone „Smeštaj“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:70
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:70
 msgid "Show process 'Seat' column on startup"
 msgstr "Prikazuje kolonu „Smeštaj“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:71
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:71
 msgid "Width of process 'Owner' column"
 msgstr "Širina kolone „Vlasnik“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:72
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:72
 msgid "Show process 'Owner' column on startup"
 msgstr "Prikazuje kolonu „Korisnik“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:73
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:73
 msgid "Width of process 'Priority' column"
 msgstr "Širina kolone „Prioritet“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:74
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:74
 msgid "Show process 'Priority' column on startup"
 msgstr "Prikazuje kolonu „Prioritet“ po pokretanju"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:75
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:75
 msgid "Disk view sort column"
 msgstr "Kolona poretka u pregledu procesa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:76
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:76
 msgid "Disk view sort order"
 msgstr "Redosled ređanja u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:77
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:77
 msgid "Disk view columns order"
 msgstr "Poredak kolona u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:78
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:78
 msgid "Width of disk view 'Device' column"
 msgstr "Širina kolone „Uređaj“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:79
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:79
 msgid "Show disk view 'Device' column on startup"
 msgstr "Po pokretanju prikazuje kolonu „Uređaj“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:80
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:80
 msgid "Width of disk view 'Directory' column"
 msgstr "Širina kolone „Direktorijum“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:81
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:81
 msgid "Show disk view 'Directory' column on startup"
 msgstr "Po pokretanju prikazuje kolonu „Direktorijum“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:82
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:82
 msgid "Width of disk view 'Type' column"
 msgstr "Širina kolone „Vrsta“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:83
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:83
 msgid "Show disk view 'Type' column on startup"
 msgstr "Po pokretanju prikazuje kolonu „Vrsta“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:84
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:84
 msgid "Width of disk view 'Total' column"
 msgstr "Širina kolone „Ukupno“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:85
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:85
 msgid "Show disk view 'Total' column on startup"
 msgstr "Po pokretanju prikazuje kolonu „Ukupno“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:86
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:86
 msgid "Width of disk view 'Free' column"
 msgstr "Širina kolone „Slobodno“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:87
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:87
 msgid "Show disk view 'Free' column on startup"
 msgstr "Po pokretanju prikazuje kolonu „Slobodno“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:88
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:88
 msgid "Width of disk view 'Available' column"
 msgstr "Širina kolone „Raspoloživo“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:89
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:89
 msgid "Show disk view 'Available' column on startup"
 msgstr "Po pokretanju prikazuje kolonu „Raspoloživo“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:90
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:90
 msgid "Width of disk view 'Used' column"
 msgstr "Širina kolone „Zauzeto“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:91
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:91
 msgid "Show disk view 'Used' column on startup"
 msgstr "Po pokretanju prikazuje kolonu „Zauzeto“ u pregledu diska"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:92
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:92
 msgid "Memory map sort column"
 msgstr "Kolona poretka mape memorije"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:93
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:93
 msgid "Memory map sort order"
 msgstr "Redosled ređanja mape memorije"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:94
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:94
 msgid "Open files sort column"
 msgstr "Kolona poretka otvorenih datoteka"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:95
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:95
 msgid "Open files sort order"
 msgstr "Redosled ređanja otvorenih datoteka"
 
-#: ../src/prefsdialog.cpp:170
+#: ../src/prefsdialog.cpp:181
 msgid "Icon"
 msgstr "Ikonica"
 
-#: ../src/procactions.cpp:75
+#: ../src/procactions.cpp:76
 #, c-format
 msgid ""
 "Cannot change the priority of process with PID %d to %d.\n"
@@ -1049,7 +1015,7 @@
 "Ne mogu da promenim prioritet procesa sa PIB-om %d na %d.\n"
 "%s"
 
-#: ../src/procactions.cpp:153
+#: ../src/procactions.cpp:154
 #, c-format
 msgid ""
 "Cannot kill process with PID %d with signal %d.\n"
@@ -1059,20 +1025,21 @@
 "%s"
 
 #. xgettext: primary alert message for killing single process
-#: ../src/procdialogs.cpp:75
+#: ../src/procdialogs.cpp:76
 #, c-format
+#| msgid "Kill the selected process “%s” (PID: %u)?"
 msgid "Are you sure you want to kill the selected process “%s” (PID: %u)?"
 msgstr "Da li ste sigurni da želite da ubijete izabrani proces „%s“ (PIB: %u)?"
 
 #. xgettext: primary alert message for ending single process
-#: ../src/procdialogs.cpp:80
+#: ../src/procdialogs.cpp:81
 #, c-format
+#| msgid "End the selected process “%s” (PID: %u)?"
 msgid "Are you sure you want to end the selected process “%s” (PID: %u)?"
-msgstr ""
-"Da li ste sigurni da želite da okončate izabrani proces „%s“ (PIB: %u)?"
+msgstr "Da li ste sigurni da želite da okončate izabrani proces „%s“ (PIB: %u)?"
 
 #. xgettext: primary alert message for killing multiple processes
-#: ../src/procdialogs.cpp:87
+#: ../src/procdialogs.cpp:88
 #, c-format
 msgid "Are you sure you want to kill the selected process?"
 msgid_plural "Are you sure you want to kill the %d selected processes?"
@@ -1082,7 +1049,7 @@
 msgstr[3] "Da li ste sigurni da želite da ubijete jedan izabrani proces?"
 
 #. xgettext: primary alert message for ending multiple processes
-#: ../src/procdialogs.cpp:91
+#: ../src/procdialogs.cpp:92
 #, c-format
 msgid "Are you sure you want to end the selected process?"
 msgid_plural "Are you sure you want to end the %d selected processes?"
@@ -1092,7 +1059,7 @@
 msgstr[3] "Da li ste sigurni da želite da okončate jedan izabrani proces?"
 
 #. xgettext: secondary alert message
-#: ../src/procdialogs.cpp:98 ../src/procdialogs.cpp:104
+#: ../src/procdialogs.cpp:99 ../src/procdialogs.cpp:105
 msgid ""
 "Killing a process may destroy data, break the session or introduce a "
 "security risk. Only unresponsive processes should be killed."
@@ -1101,7 +1068,8 @@
 "prouzrokovati bezbednosni propust. Trebalo bi ubijati samo procese koji se "
 "ne odazivaju."
 
-#: ../src/procdialogs.cpp:101
+#: ../src/procdialogs.cpp:102
+#| msgid "_Kill Process"
 msgid "_Kill Process"
 msgid_plural "_Kill Processes"
 msgstr[0] "_Ubij proces"
@@ -1109,7 +1077,8 @@
 msgstr[2] "_Ubij procese"
 msgstr[3] "_Ubij proces"
 
-#: ../src/procdialogs.cpp:107
+#: ../src/procdialogs.cpp:108
+#| msgid "_End Process"
 msgid "_End Process"
 msgid_plural "_End Processes"
 msgstr[0] "_Okončaj proces"
@@ -1117,25 +1086,26 @@
 msgstr[2] "_Okončaj procese"
 msgstr[3] "_Okončaj proces"
 
-#: ../src/procdialogs.cpp:188
+#: ../src/procdialogs.cpp:189
 #, c-format
 msgid "Change Priority of Process “%s” (PID: %u)"
 msgstr "Izmenite prioritet procesa „%s“ (IB procesa %u)"
 
-#: ../src/procdialogs.cpp:191
+#: ../src/procdialogs.cpp:192
 #, c-format
+#| msgid "Change the order of priority of process"
 msgid "Change Priority of the selected process"
 msgid_plural "Change Priority of %d selected processes"
 msgstr[0] "Izmenite važnost %d izabranog procesa"
 msgstr[1] "Izmenite važnost %d izabrana procesa"
 msgstr[2] "Izmenite važnost %d izabranih procesa"
-msgstr[3] "Izmenite važnost izabranog procesa"
+msgstr[3] "Izmenite važnost iyabranog procesa"
 
-#: ../src/procdialogs.cpp:210
+#: ../src/procdialogs.cpp:211
 msgid "Note:"
 msgstr "Obaveštenje:"
 
-#: ../src/procdialogs.cpp:211
+#: ../src/procdialogs.cpp:212
 msgid ""
 "The priority of a process is given by its nice value. A lower nice value "
 "corresponds to a higher priority."
@@ -1143,49 +1113,48 @@
 "Prioritet procesa je zadat vrednošću njegovog lepog ponašanja. Niža vrednost "
 "predstavlja viši prioritet."
 
-#: ../src/procproperties.cpp:55 ../src/procproperties.cpp:106
-#: ../src/procproperties.cpp:109 ../src/util.cpp:432
+#: ../src/procproperties.cpp:56 ../src/util.cpp:431
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/procproperties.cpp:89 ../src/proctable.cpp:322
+#: ../src/procproperties.cpp:84 ../src/proctable.cpp:321
 msgid "Process Name"
 msgstr "Naziv procesa"
 
-#: ../src/procproperties.cpp:90 ../src/proctable.cpp:323
+#: ../src/procproperties.cpp:85 ../src/proctable.cpp:322
 msgid "User"
 msgstr "Korisnik"
 
-#: ../src/procproperties.cpp:91 ../src/proctable.cpp:324
+#: ../src/procproperties.cpp:86 ../src/proctable.cpp:323
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/procproperties.cpp:93 ../src/proctable.cpp:325
+#: ../src/procproperties.cpp:88 ../src/proctable.cpp:324
 msgid "Virtual Memory"
 msgstr "Virtuelna memorija"
 
-#: ../src/procproperties.cpp:94 ../src/proctable.cpp:326
+#: ../src/procproperties.cpp:89 ../src/proctable.cpp:325
 msgid "Resident Memory"
 msgstr "Rezidentna memorija"
 
-#: ../src/procproperties.cpp:95 ../src/proctable.cpp:327
+#: ../src/procproperties.cpp:90 ../src/proctable.cpp:326
 msgid "Writable Memory"
 msgstr "Upisiva memorija"
 
-#: ../src/procproperties.cpp:96 ../src/proctable.cpp:328
+#: ../src/procproperties.cpp:91 ../src/proctable.cpp:327
 msgid "Shared Memory"
 msgstr "Deljena memorija"
 
-#: ../src/procproperties.cpp:98 ../src/proctable.cpp:329
+#: ../src/procproperties.cpp:93 ../src/proctable.cpp:328
 msgid "X Server Memory"
 msgstr "Memorija Iks servera"
 
-#: ../src/procproperties.cpp:101 ../src/proctable.cpp:331
+#: ../src/procproperties.cpp:96 ../src/proctable.cpp:330
 msgid "CPU Time"
 msgstr "Vreme procesora"
 
 # bug(slobo): Množinski oblici. Danilo — ovaj je tvoj.
-#: ../src/procproperties.cpp:101
+#: ../src/procproperties.cpp:96
 #, c-format
 msgid "%lld second"
 msgid_plural "%lld seconds"
@@ -1194,64 +1163,68 @@
 msgstr[2] "%lld sekundi"
 msgstr[3] "Jedna sekunda"
 
-#: ../src/procproperties.cpp:102 ../src/proctable.cpp:332
+#: ../src/procproperties.cpp:97 ../src/proctable.cpp:331
 msgid "Started"
 msgstr "Pokrenut"
 
-#: ../src/procproperties.cpp:103 ../src/proctable.cpp:333
+#: ../src/procproperties.cpp:98 ../src/proctable.cpp:332
 msgid "Nice"
 msgstr "Prioritet"
 
-#: ../src/procproperties.cpp:104 ../src/proctable.cpp:347
+#: ../src/procproperties.cpp:99 ../src/proctable.cpp:346
 msgid "Priority"
 msgstr "Važnost"
 
-#: ../src/procproperties.cpp:105 ../src/proctable.cpp:334
+#: ../src/procproperties.cpp:100 ../src/proctable.cpp:333
 msgid "ID"
 msgstr "IB"
 
-#: ../src/procproperties.cpp:106 ../src/proctable.cpp:335
+#: ../src/procproperties.cpp:101 ../src/proctable.cpp:334
 msgid "Security Context"
 msgstr "Bezbednosni kontekst"
 
-#: ../src/procproperties.cpp:107 ../src/proctable.cpp:336
+#: ../src/procproperties.cpp:102 ../src/proctable.cpp:335
 msgid "Command Line"
 msgstr "Linija naredbi"
 
 #. xgettext: combined noun, the function the process is waiting in, see wchan ps(1)
-#: ../src/procproperties.cpp:108 ../src/proctable.cpp:339
+#: ../src/procproperties.cpp:103 ../src/proctable.cpp:338
 msgid "Waiting Channel"
 msgstr "Kanal čekanja"
 
-#: ../src/procproperties.cpp:109 ../src/proctable.cpp:340
+#: ../src/procproperties.cpp:104 ../src/proctable.cpp:339
 msgid "Control Group"
 msgstr "Grupa upravljanja"
 
-#: ../src/procproperties.cpp:221
+#: ../src/procproperties.cpp:214
+msgid "Process Properties"
+msgstr "Svojstva procesa"
+
+#: ../src/procproperties.cpp:234
 #, c-format
-msgid "%s (PID %u)"
-msgstr "%s (LIB %u)"
+msgid "Properties of process \"%s\" (PID %u):"
+msgstr "Svojstva procesa „%s“ (IB procesa %u):"
 
-#: ../src/proctable.cpp:330
+#: ../src/proctable.cpp:329
 #, no-c-format
 msgid "% CPU"
 msgstr "Procesor — %"
 
-#: ../src/proctable.cpp:341
+#: ../src/proctable.cpp:340
 msgid "Unit"
 msgstr "Jedinica"
 
-#: ../src/proctable.cpp:342
+#: ../src/proctable.cpp:341
 msgid "Session"
 msgstr "Sesija"
 
 #. TRANSLATORS: Seat = i.e. the physical seat the session of the process belongs to, only
 #. for multi-seat environments. See http://en.wikipedia.org/wiki/Multiseat_configuration
-#: ../src/proctable.cpp:345
+#: ../src/proctable.cpp:344
 msgid "Seat"
 msgstr "Smeštaj"
 
-#: ../src/proctable.cpp:346
+#: ../src/proctable.cpp:345
 msgid "Owner"
 msgstr "Vlasnik"
 
@@ -1300,50 +1273,50 @@
 msgstr "%u:%02u.%02u"
 
 # bug(slobo): ovo je određeno u pravopisu. pogledaj da li se ovo može prevoditi
-#: ../src/util.cpp:164
+#: ../src/util.cpp:163
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../src/util.cpp:165
+#: ../src/util.cpp:164
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../src/util.cpp:166
+#: ../src/util.cpp:165
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
 # bug(slobo): ovo je određeno u pravopisu. pogledaj da li se ovo može prevoditi
-#: ../src/util.cpp:167
+#: ../src/util.cpp:166
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
 # bug(slobo): ovo je određeno u pravopisu. pogledaj da li se ovo može prevoditi
-#: ../src/util.cpp:168
+#: ../src/util.cpp:167
 #, c-format
 msgid "%.3g kbit"
 msgstr "%.3g kbit"
 
-#: ../src/util.cpp:169
+#: ../src/util.cpp:168
 #, c-format
 msgid "%.3g Mbit"
 msgstr "%.3g Mbit"
 
-#: ../src/util.cpp:170
+#: ../src/util.cpp:169
 #, c-format
 msgid "%.3g Gbit"
 msgstr "%.3g Gbit"
 
 # bug(slobo): ovo je određeno u pravopisu. pogledaj da li se ovo može prevoditi
-#: ../src/util.cpp:171
+#: ../src/util.cpp:170
 #, c-format
 msgid "%.3g Tbit"
 msgstr "%.3g Tbit"
 
-#: ../src/util.cpp:186
+#: ../src/util.cpp:185
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -1352,7 +1325,7 @@
 msgstr[2] "%u bitova"
 msgstr[3] "Jedan bit"
 
-#: ../src/util.cpp:187
+#: ../src/util.cpp:186
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -1361,53 +1334,28 @@
 msgstr[2] "%u bajtova"
 msgstr[3] "Jedan bajt"
 
-#: ../src/util.cpp:230
+#: ../src/util.cpp:229
 msgid "Very High Priority"
 msgstr "Vrlo visoka važnost"
 
-#: ../src/util.cpp:232
+#: ../src/util.cpp:231
 msgid "High Priority"
 msgstr "Visoka važnost"
 
-#: ../src/util.cpp:234
+#: ../src/util.cpp:233
 msgid "Normal Priority"
 msgstr "Uobičajena važnost"
 
-#: ../src/util.cpp:236
+#: ../src/util.cpp:235
 msgid "Low Priority"
 msgstr "Niska važnost"
 
-#: ../src/util.cpp:238
+#: ../src/util.cpp:237
 msgid "Very Low Priority"
 msgstr "Vrlo niska važnost"
 
 #. xgettext: rate, 10MiB/s or 10Mbit/s
-#: ../src/util.cpp:630
+#: ../src/util.cpp:629
 #, c-format
 msgid "%s/s"
 msgstr "%s/s"
-
-#~ msgid "_Name contains:"
-#~ msgstr "_Naziv sadrži:"
-
-#~ msgid "_Find"
-#~ msgstr "_Nađi"
-
-#~ msgid "C_lear"
-#~ msgstr "_Očisti"
-
-#~ msgid "S_earch results:"
-#~ msgstr "Rezultati _pretrage:"
-
-#~ msgid "_Close"
-#~ msgstr "_Zatvori"
-
-#~| msgid "Help"
-#~ msgid "_Help"
-#~ msgstr "Po_moć"
-
-#~ msgid "Process Properties"
-#~ msgstr "Svojstva procesa"
-
-#~ msgid "Properties of process \"%s\" (PID %u):"
-#~ msgstr "Svojstva procesa „%s“ (IB procesa %u):"
diff -Nru gnome-system-monitor-3.14.1/po/sr.po gnome-system-monitor-3.15.4/po/sr.po
--- gnome-system-monitor-3.14.1/po/sr.po	2014-10-13 18:18:27.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/sr.po	2014-10-20 20:15:40.000000000 +0000
@@ -1,16 +1,16 @@
 # Serbian translation of procman
-# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003—2014.
+# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003, 2005, 2006.
 # This file is distributed under the same license as the procman package.
 # Maintainer: Душан Марјановић <mdfk@root.co.yu>
 # Reviewed on 2005-03-06 by: Данило Шеган <danilo@prevod.org>
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2014.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-system-monitor\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product"
 "=system-monitor&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-25 19:44+0000\n"
-"PO-Revision-Date: 2014-09-25 22:30+0200\n"
+"POT-Creation-Date: 2013-08-19 19:18+0000\n"
+"PO-Revision-Date: 2013-09-08 14:53+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -22,70 +22,30 @@
 "X-Project-Style: gnome\n"
 
 #: ../gnome-system-monitor.desktop.in.in.h:1 ../data/interface.ui.h:1
-#: ../src/application.cpp:268 ../src/interface.cpp:363
+#: ../src/application.cpp:233 ../src/interface.cpp:362
 msgid "System Monitor"
 msgstr "Праћење система"
 
 #: ../gnome-system-monitor.desktop.in.in.h:2
-#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:364
+#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:363
 msgid "View current processes and monitor system state"
 msgstr "Прегледајте текуће процесе и пратите стање система"
 
 #: ../gnome-system-monitor.desktop.in.in.h:3
-#| msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
-msgid ""
-"Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
-"Manager;"
-msgstr ""
-"праћење;систем;процес;процесор;меморија;мрежа;историјат;употреба;одлике;зада"
-"так;управник;"
-
-#: ../gnome-system-monitor-kde.desktop.in.in.h:1
-#: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
-msgid "GNOME System Monitor"
-msgstr "Гномов пратилац система"
-
 #: ../gnome-system-monitor-kde.desktop.in.in.h:3
 msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
 msgstr "праћење;систем;процес;процесор;меморија;мрежа;историјат;употреба;"
 
-#: ../gnome-system-monitor.appdata.xml.in.h:2
-msgid "View and manage system resources"
-msgstr "Прегледајте и управљајте извориштима система"
-
-#: ../gnome-system-monitor.appdata.xml.in.h:3
-msgid ""
-"System Monitor is a process viewer and system monitor with an attractive, "
-"easy-to-use interface."
-msgstr ""
-"Пратилац система је прегледач процеса и пратилац система са привлачним, "
-"лаким за употребу сучељем."
-
-#: ../gnome-system-monitor.appdata.xml.in.h:4
-msgid ""
-"System Monitor can help you find out what applications are using the "
-"processor or the memory of your computer, can manage the running "
-"applications, force stop processes not responding, and change the state or "
-"priority of existing processes."
-msgstr ""
-"Пратилац система вам може помоћи да сазнате који програми користе процесор "
-"или меморију вашег рачунара, може да управља покренутим програмима, да "
-"примора заустављање процеса који се не одазивају, и да измени стање или "
-"хитност постојећих процеса."
-
-#: ../gnome-system-monitor.appdata.xml.in.h:5
-msgid ""
-"The resource graphs feature shows you a quick overview of what is going on "
-"with your computer displaying recent network, memory and processor usage."
-msgstr ""
-"Функција графика изворишта вам даје брз преглед о дешавањима на вашем "
-"рачунару приказујући недавно коришћење мреже, меморије и процесора."
+#: ../gnome-system-monitor-kde.desktop.in.in.h:1 ../src/application.cpp:289
+msgid "GNOME System Monitor"
+msgstr "Гномов пратилац система"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:1
 msgid "Kill process"
 msgstr "Убиј процес"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:2
+#| msgid "Privileges are required to renice process"
 msgid "Privileges are required to control other users' processes"
 msgstr "Потребна су овлашћења за управљање процесима других корисника"
 
@@ -94,6 +54,7 @@
 msgstr "Настави процес"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:4
+#| msgid "Privileges are required to renice process"
 msgid "Privileges are required to change the priority of processes"
 msgstr "Потребна су овлашћења за промену важности процеса"
 
@@ -102,10 +63,11 @@
 msgstr "_Окончај процес"
 
 #: ../data/interface.ui.h:3
+#| msgid "Process Properties"
 msgid "Show process properties"
 msgstr "Прикажите својства процеса"
 
-#: ../data/interface.ui.h:4 ../data/preferences.ui.h:9
+#: ../data/interface.ui.h:4 ../data/preferences.ui.h:11
 msgid "Processes"
 msgstr "Процеси"
 
@@ -118,7 +80,7 @@
 msgstr "Временски дијаграм оперативне и виртуелне меморије"
 
 #: ../data/interface.ui.h:7 ../src/interface.cpp:260
-#: ../src/procproperties.cpp:92 ../src/proctable.cpp:337
+#: ../src/procproperties.cpp:87 ../src/proctable.cpp:336
 msgid "Memory"
 msgstr "Оперативна меморија"
 
@@ -146,11 +108,11 @@
 msgid "Total Sent"
 msgstr "Укупно послато"
 
-#: ../data/interface.ui.h:14 ../data/preferences.ui.h:13
+#: ../data/interface.ui.h:14 ../data/preferences.ui.h:15
 msgid "Resources"
 msgstr "Ресурси"
 
-#: ../data/interface.ui.h:15 ../data/preferences.ui.h:16
+#: ../data/interface.ui.h:15 ../data/preferences.ui.h:18
 msgid "File Systems"
 msgstr "Системи датотека"
 
@@ -160,13 +122,29 @@
 msgstr "Потражите отворене датотеке"
 
 #: ../data/lsof.ui.h:2
-msgid "Filter files by name"
-msgstr "Издвојте датотеке према називу"
+msgid "_Name contains:"
+msgstr "_Назив садржи:"
 
 #: ../data/lsof.ui.h:3
-#| msgid "Case insensitive matching"
-msgid "Case insensitive"
-msgstr "Не разликуј величину слова"
+msgid "_Find"
+msgstr "_Нађи"
+
+#: ../data/lsof.ui.h:4
+msgid "Case insensitive matching"
+msgstr "Занемари величину слова"
+
+#: ../data/lsof.ui.h:5
+msgid "C_lear"
+msgstr "_Очисти"
+
+#: ../data/lsof.ui.h:6
+msgid "S_earch results:"
+msgstr "Резултати _претраге:"
+
+#: ../data/lsof.ui.h:7 ../data/openfiles.ui.h:2 ../data/preferences.ui.h:3
+#: ../src/memmaps.cpp:438 ../src/procproperties.cpp:216
+msgid "_Close"
+msgstr "_Затвори"
 
 #: ../data/menus.ui.h:1
 msgctxt "Menu item to Open 'Search for Open Files' dialog"
@@ -210,10 +188,12 @@
 msgstr "_Међузависности"
 
 #: ../data/menus.ui.h:11
+#| msgid "Stopped"
 msgid "_Stop"
 msgstr "_Заустави"
 
 #: ../data/menus.ui.h:12
+#| msgid "_Continue Process"
 msgid "_Continue"
 msgstr "_Настави"
 
@@ -229,23 +209,23 @@
 msgid "_Change Priority"
 msgstr "_Измени приоритет"
 
-#: ../data/menus.ui.h:16 ../src/util.cpp:215
+#: ../data/menus.ui.h:16 ../src/util.cpp:214
 msgid "Very High"
 msgstr "Врло висок"
 
-#: ../data/menus.ui.h:17 ../src/util.cpp:217
+#: ../data/menus.ui.h:17 ../src/util.cpp:216
 msgid "High"
 msgstr "Висок"
 
-#: ../data/menus.ui.h:18 ../src/util.cpp:219
+#: ../data/menus.ui.h:18 ../src/util.cpp:218
 msgid "Normal"
 msgstr "Нормалан"
 
-#: ../data/menus.ui.h:19 ../src/util.cpp:221
+#: ../data/menus.ui.h:19 ../src/util.cpp:220
 msgid "Low"
 msgstr "Низак"
 
-#: ../data/menus.ui.h:20 ../src/util.cpp:223
+#: ../data/menus.ui.h:20 ../src/util.cpp:222
 msgid "Very Low"
 msgstr "Врло низак"
 
@@ -275,54 +255,59 @@
 msgstr "Поставке праћења система"
 
 #: ../data/preferences.ui.h:2
+#| msgid "Help"
+msgid "_Help"
+msgstr "По_моћ"
+
+#: ../data/preferences.ui.h:4
 msgid "Behavior"
 msgstr "Понашање"
 
-#: ../data/preferences.ui.h:3
+#: ../data/preferences.ui.h:5
 msgid "_Update interval in seconds:"
 msgstr "Период _освежавања (у секундама):"
 
-#: ../data/preferences.ui.h:4
+#: ../data/preferences.ui.h:6
 msgid "Enable _smooth refresh"
 msgstr "Укључи прецизно, _меко освежавање"
 
-#: ../data/preferences.ui.h:5
+#: ../data/preferences.ui.h:7
 msgid "Alert before ending or _killing processes"
 msgstr "Прикажи упозорење пре _окончавања или убијања процеса"
 
-#: ../data/preferences.ui.h:6
+#: ../data/preferences.ui.h:8
 msgid "_Divide CPU usage by CPU count"
 msgstr "_Подели искоришћеност процесора бројем процесора"
 
-#: ../data/preferences.ui.h:7
+#: ../data/preferences.ui.h:9
 msgid "Information Fields"
 msgstr "Поља са подацима"
 
-#: ../data/preferences.ui.h:8
+#: ../data/preferences.ui.h:10
 msgid "Process i_nformation shown in list:"
 msgstr "Подаци о _процесима приказани у списку:"
 
-#: ../data/preferences.ui.h:10
+#: ../data/preferences.ui.h:12
 msgid "Graphs"
 msgstr "Графици"
 
-#: ../data/preferences.ui.h:11
+#: ../data/preferences.ui.h:13
 msgid "_Draw CPU chart as stacked area chart"
 msgstr "_Цртај график процесора као график наслагане области"
 
-#: ../data/preferences.ui.h:12
+#: ../data/preferences.ui.h:14
 msgid "_Show network speed in bits"
 msgstr "_Прикажи брзину мреже у битовима"
 
-#: ../data/preferences.ui.h:14
+#: ../data/preferences.ui.h:16
 msgid "Show _all file systems"
 msgstr "Прикажи _све системе датотека"
 
-#: ../data/preferences.ui.h:15
+#: ../data/preferences.ui.h:17
 msgid "File system i_nformation shown in list:"
 msgstr "Подаци о систему _датотека приказани на списку:"
 
-#: ../data/renice.ui.h:1 ../src/procdialogs.cpp:123
+#: ../data/renice.ui.h:1 ../src/procdialogs.cpp:124
 msgid "_Cancel"
 msgstr "_Откажи"
 
@@ -342,7 +327,7 @@
 "<small><i><b>Напомена:</b> Приоритет процеса је задат вредношћу његовог "
 "лепог понашања. Нижа вредност представља виши приоритет.</i></small>"
 
-#: ../src/application.cpp:310
+#: ../src/application.cpp:275
 msgid "A simple process and system monitor."
 msgstr "Једноставан програм за праћење система и процеса."
 
@@ -370,7 +355,7 @@
 msgid "Directory"
 msgstr "Директоријум"
 
-#: ../src/disks.cpp:371 ../src/gsm_color_button.c:165 ../src/openfiles.cpp:252
+#: ../src/disks.cpp:371 ../src/gsm_color_button.c:166 ../src/openfiles.cpp:252
 msgid "Type"
 msgstr "Врста"
 
@@ -415,63 +400,63 @@
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/gsm_color_button.c:141
+#: ../src/gsm_color_button.c:142
 msgid "Fraction"
 msgstr "Део"
 
 #. TRANSLATORS: description of the pie color picker's (mem, swap) filled percentage property
-#: ../src/gsm_color_button.c:143
+#: ../src/gsm_color_button.c:144
 msgid "Percentage full for pie color pickers"
 msgstr "Боја за попуњени део пите"
 
-#: ../src/gsm_color_button.c:150
+#: ../src/gsm_color_button.c:151
 msgid "Title"
 msgstr "Наслов"
 
-#: ../src/gsm_color_button.c:151
+#: ../src/gsm_color_button.c:152
 msgid "The title of the color selection dialog"
 msgstr "Наслов прозорчета за избор боје"
 
-#: ../src/gsm_color_button.c:152 ../src/gsm_color_button.c:512
+#: ../src/gsm_color_button.c:153 ../src/gsm_color_button.c:513
 msgid "Pick a Color"
 msgstr "Изаберите боју"
 
-#: ../src/gsm_color_button.c:158
+#: ../src/gsm_color_button.c:159
 msgid "Current Color"
 msgstr "Тренутна боја"
 
-#: ../src/gsm_color_button.c:159
+#: ../src/gsm_color_button.c:160
 msgid "The selected color"
 msgstr "Изабрана боја"
 
-#: ../src/gsm_color_button.c:166
+#: ../src/gsm_color_button.c:167
 msgid "Type of color picker"
 msgstr "Врста изборника боје"
 
-#: ../src/gsm_color_button.c:434
+#: ../src/gsm_color_button.c:435
 msgid "Received invalid color data\n"
 msgstr "Примљени су неисправни подаци\n"
 
-#: ../src/gsm_color_button.c:535
+#: ../src/gsm_color_button.c:536
 msgid "Click to set graph colors"
 msgstr "Кликните да поставите боје графика"
 
 #. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
-#: ../src/interface.cpp:187
+#: ../src/interface.cpp:188
 #, c-format
 msgid "Pick a Color for '%s'"
 msgstr "Изаберите боју за „%s“"
 
-#: ../src/interface.cpp:220 ../src/procproperties.cpp:100
+#: ../src/interface.cpp:221 ../src/procproperties.cpp:95
 msgid "CPU"
 msgstr "Процесор"
 
-#: ../src/interface.cpp:222
+#: ../src/interface.cpp:223
 #, c-format
 msgid "CPU%d"
 msgstr "Процесор %d"
 
-#: ../src/interface.cpp:374
+#: ../src/interface.cpp:373
 msgid "translator-credits"
 msgstr ""
 "Душан Марјановић <madafaka@root.co.yu>\n"
@@ -484,7 +469,7 @@
 "Prevod.org — превод на српски језик."
 
 # bug(slobo): Множински облици. Данило — овај је твој.
-#: ../src/load-graph.cpp:161
+#: ../src/load-graph.cpp:155
 #, c-format
 msgid "%u second"
 msgid_plural "%u seconds"
@@ -503,43 +488,24 @@
 msgid "%s (%.1f%%) of %s"
 msgstr "%s (%.1f%%) од %s"
 
-#: ../src/lsof.cpp:109
+#: ../src/lsof.cpp:123
 msgid "Error"
 msgstr "Грeшкa"
 
-#: ../src/lsof.cpp:110
+#: ../src/lsof.cpp:124
 #, c-format
 msgid "'%s' is not a valid Perl regular expression."
 msgstr "„%s“ није исправан регуларни израз у Перлу."
 
-#: ../src/lsof.cpp:128
-#, c-format
-#| msgid "Open Files"
-msgid "%d open file"
-msgid_plural "%d open files"
-msgstr[0] "%d отворена датотека"
-msgstr[1] "%d отворене датотеке"
-msgstr[2] "%d отворених датотека"
-msgstr[3] "Једна отворена датотека"
-
-#: ../src/lsof.cpp:130
-#, c-format
-msgid "%d matching open file"
-msgid_plural "%d matching open files"
-msgstr[0] "%d одговарајућа отворена датотека"
-msgstr[1] "%d одговарајуће отворене датотеке"
-msgstr[2] "%d одговарајућих отворених датотека"
-msgstr[3] "Једна одговарајућа отворена датотека"
-
-#: ../src/lsof.cpp:246
+#: ../src/lsof.cpp:270
 msgid "Process"
 msgstr "Процес"
 
-#: ../src/lsof.cpp:258
+#: ../src/lsof.cpp:282
 msgid "PID"
 msgstr "ПИД"
 
-#: ../src/lsof.cpp:268 ../src/memmaps.cpp:303
+#: ../src/lsof.cpp:292 ../src/memmaps.cpp:303
 msgid "Filename"
 msgstr "Назив датотеке"
 
@@ -639,30 +605,30 @@
 msgid "Object"
 msgstr "Објекат"
 
-#: ../src/openfiles.cpp:336
+#: ../src/openfiles.cpp:337
 #, c-format
 msgid "_Files opened by process \"%s\" (PID %u):"
 msgstr "_Датотеке које је отворио процес „%s“ (ИБ процеса %u):"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:1
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:1
 msgid "Main window size and position in the form (width, height, xpos, ypos)"
 msgstr ""
-"Величина и положај главног прозора у облику (ширина, висина, x-положај, y-"
-"положај)"
+"Величина и положај главног прозора у облику (ширина, висина, x-положај, "
+"y-положај)"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:2
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:2
 msgid "Main Window should open maximized"
 msgstr "Главни прозор треба да се отвори увећан"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:3
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:3
 msgid "Show process dependencies in tree form"
 msgstr "Приказује међузависност процеса у облику стабла"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:4
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:4
 msgid "Solaris mode for CPU percentage"
 msgstr "Соларис начин рада за проценат процесора"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:5
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:5
 msgid ""
 "If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage "
 "is divided by the total number of CPUs. Otherwise, it operates in 'Irix "
@@ -672,11 +638,11 @@
 "процесорско време задатка подељено са укупним бројем процесора. У супротном, "
 "радиће у Ирикс режиму."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:6
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:6
 msgid "Show CPU chart as stacked area chart"
 msgstr "Приказује график процесора као график наслагане области"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:7
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:7
 msgid ""
 "If TRUE, system-monitor shows the CPU chart as a stacked area chart instead "
 "of a line chart."
@@ -684,27 +650,27 @@
 "Ако је изабрано, пратилац система ће приказати график процесора као график "
 "наслагане области уместо линијског графика."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:8
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:8
 msgid "Enable/Disable smooth refresh"
 msgstr "Укључује/искључује прецизно, меко освежавање"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:9
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:9
 msgid "Show warning dialog when killing processes"
 msgstr "Приказује упозорење пре убијања процеса"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:10
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:10
 msgid "Time in milliseconds between updates of the process view"
 msgstr "Време у милисекундама између освежавања списка процеса"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:11
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:11
 msgid "Time in milliseconds between updates of the graphs"
 msgstr "Време у милисекундама између освежавања графика"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:12
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:12
 msgid "Whether information about all file systems should be displayed"
 msgstr "Да ли ће бити приказани подаци о свим системима датотека"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:13
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:13
 msgid ""
 "Whether to display information about all file systems (including types like "
 "'autofs' and 'procfs'). Useful for getting a list of all currently mounted "
@@ -714,333 +680,333 @@
 "система датотека „autofs“ и „procfs“. Корисно је за добављање списка свих "
 "тренутно прикључених система датотека."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:14
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:14
 msgid "Time in milliseconds between updates of the devices list"
 msgstr "Време у милисекундама између освежавања списка уређаја"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:15
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:15
 msgid "Determines which processes to show."
 msgstr "Одређује који ће процеси бити приказани."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:16
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:16
 msgid "Saves the currently viewed tab"
 msgstr "Чува тренутно прегледани језичак"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:17
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:17
 msgid "CPU colors"
 msgstr "Боје процесора"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:18
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:18
 msgid "Each entry is in the format (CPU#, Hexadecimal color value)"
 msgstr "Сваки унос је облика (Процесор#, Хексадецимална вредност боје)"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:19
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:19
 msgid "Default graph memory color"
 msgstr "Подразумевана боја оперативне меморије на графику"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:20
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:20
 msgid "Default graph swap color"
 msgstr "Подразумевана боја виртуелене меморије на графику"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:21
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:21
 msgid "Default graph incoming network traffic color"
 msgstr "Подразумевана боја долазног мрежног саобраћаја на графику"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:22
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:22
 msgid "Default graph outgoing network traffic color"
 msgstr "Подразумевана боја одлазног мрежног саобраћаја на графику"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:23
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:23
 msgid "Show network traffic in bits"
 msgstr "Приказује мрежни саобраћај у битима"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:24
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:24
 msgid "Process view sort column"
 msgstr "Колона поретка у прегледу процеса"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:25
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:25
 msgid "Process view columns order"
 msgstr "Поредак колона у прегледу процеса"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:26
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:26
 msgid "Process view sort order"
 msgstr "Редослед ређања у прегледу процеса"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:27
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:27
 msgid "Width of process 'Name' column"
 msgstr "Ширина колоне „Назив“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:28
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:28
 msgid "Show process 'Name' column on startup"
 msgstr "Приказује колону „Назив“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:29
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:29
 msgid "Width of process 'User' column"
 msgstr "Ширина колоне „Власник“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:30
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:30
 msgid "Show process 'User' column on startup"
 msgstr "Приказује колону „Корисник“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:31
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:31
 msgid "Width of process 'Status' column"
 msgstr "Ширина колоне „Стање“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:32
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:32
 msgid "Show process 'Status' column on startup"
 msgstr "Приказује колону „Стање“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:33
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:33
 msgid "Width of process 'Virtual Memory' column"
 msgstr "Ширина колоне „Виртуелна меморија“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:34
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:34
 msgid "Show process 'Virtual Memory' column on startup"
 msgstr "Приказује колону „Виртуелна меморија“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:35
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:35
 msgid "Width of process 'Resident Memory' column"
 msgstr "Ширина колоне „Резидентна меморија“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:36
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:36
 msgid "Show process 'Resident Memory' column on startup"
 msgstr "Приказује колону „Резидентна меморија“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:37
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:37
 msgid "Width of process 'Writable Memory' column"
 msgstr "Ширина колоне „Уписива меморија“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:38
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:38
 msgid "Show process 'Writable Memory' column on startup"
 msgstr "Приказује колону „Уписива меморија“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:39
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:39
 msgid "Width of process 'Shared Memory' column"
 msgstr "Ширина колоне „Дељена меморија“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:40
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:40
 msgid "Show process 'Shared Memory' column on startup"
 msgstr "Приказује колону „Дељена меморија“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:41
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:41
 msgid "Width of process 'X Server Memory' column"
 msgstr "Ширина колоне „Меморија Икс сервера“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:42
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:42
 msgid "Show process 'X Server Memory' column on startup"
 msgstr "Приказује колону „Меморија Икс сервера“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:44
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:44
 #, no-c-format
 msgid "Width of process 'CPU %' column"
 msgstr "Ширина колоне „Процесор %“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:46
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:46
 #, no-c-format
 msgid "Show process 'CPU %' column on startup"
 msgstr "Приказује колону „Процесор %“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:47
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:47
 msgid "Width of process 'CPU Time' column"
 msgstr "Ширина колоне „Процесорско време“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:48
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:48
 msgid "Show process 'CPU Time' column on startup"
 msgstr "Приказује колону „Процесорско време“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:49
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:49
 msgid "Width of process 'Started' column"
 msgstr "Ширина колоне „Започет“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:50
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:50
 msgid "Show process 'Started' column on startup"
 msgstr "Приказује колону „Започет“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:51
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:51
 msgid "Width of process 'Nice' column"
 msgstr "Ширина колоне „Пристојно“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:52
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:52
 msgid "Show process 'Nice' column on startup"
 msgstr "Приказује колону „Пристојно“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:53
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:53
 msgid "Width of process 'PID' column"
 msgstr "Ширина колоне „ПИБ“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:54
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:54
 msgid "Show process 'PID' column on startup"
 msgstr "Приказује колону „ПИБ“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:55
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:55
 msgid "Width of process 'SELinux Security Context' column"
 msgstr "Ширина колоне „СЕЛинукс безбедоносни контекст“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:56
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:56
 msgid "Show process 'SELinux Security Context' column on startup"
 msgstr "Приказује колону „СЕЛинукс безбедоносни контекст“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:57
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:57
 msgid "Width of process 'Command Line' column"
 msgstr "Ширина колоне „Линија наредби“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:58
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:58
 msgid "Show process 'Command Line' column on startup"
 msgstr "Приказује колону „Линија наредби“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:59
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:59
 msgid "Width of process 'Memory' column"
 msgstr "Ширина колоне „Меморија“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:60
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:60
 msgid "Show process 'Memory' column on startup"
 msgstr "Приказује колону „Меморија“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:61
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:61
 msgid "Width of process 'Waiting Channel' column"
 msgstr "Ширина колоне „Канал чекања“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:62
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:62
 msgid "Show process 'Waiting Channel' column on startup"
 msgstr "Приказује колону „Канал чекања“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:63
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:63
 msgid "Width of process 'Control Group' column"
 msgstr "Ширина колоне „Група управљања“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:64
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:64
 msgid "Show process 'Control Group' column on startup"
 msgstr "Приказује колону „Група управљања“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:65
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:65
 msgid "Width of process 'Unit' column"
 msgstr "Ширина колоне „Јединица“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:66
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:66
 msgid "Show process 'Unit' column on startup"
 msgstr "Приказује колону „Јединица“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:67
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:67
 msgid "Width of process 'Session' column"
 msgstr "Ширина колоне „Сесија“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:68
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:68
 msgid "Show process 'Session' column on startup"
 msgstr "Приказује колону „Сесија“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:69
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:69
 msgid "Width of process 'Seat' column"
 msgstr "Ширина колоне „Смештај“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:70
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:70
 msgid "Show process 'Seat' column on startup"
 msgstr "Приказује колону „Смештај“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:71
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:71
 msgid "Width of process 'Owner' column"
 msgstr "Ширина колоне „Власник“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:72
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:72
 msgid "Show process 'Owner' column on startup"
 msgstr "Приказује колону „Корисник“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:73
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:73
 msgid "Width of process 'Priority' column"
 msgstr "Ширина колоне „Приоритет“"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:74
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:74
 msgid "Show process 'Priority' column on startup"
 msgstr "Приказује колону „Приоритет“ по покретању"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:75
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:75
 msgid "Disk view sort column"
 msgstr "Колона поретка у прегледу процеса"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:76
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:76
 msgid "Disk view sort order"
 msgstr "Редослед ређања у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:77
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:77
 msgid "Disk view columns order"
 msgstr "Поредак колона у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:78
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:78
 msgid "Width of disk view 'Device' column"
 msgstr "Ширина колоне „Уређај“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:79
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:79
 msgid "Show disk view 'Device' column on startup"
 msgstr "По покретању приказује колону „Уређај“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:80
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:80
 msgid "Width of disk view 'Directory' column"
 msgstr "Ширина колоне „Директоријум“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:81
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:81
 msgid "Show disk view 'Directory' column on startup"
 msgstr "По покретању приказује колону „Директоријум“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:82
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:82
 msgid "Width of disk view 'Type' column"
 msgstr "Ширина колоне „Врста“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:83
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:83
 msgid "Show disk view 'Type' column on startup"
 msgstr "По покретању приказује колону „Врста“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:84
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:84
 msgid "Width of disk view 'Total' column"
 msgstr "Ширина колоне „Укупно“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:85
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:85
 msgid "Show disk view 'Total' column on startup"
 msgstr "По покретању приказује колону „Укупно“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:86
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:86
 msgid "Width of disk view 'Free' column"
 msgstr "Ширина колоне „Слободно“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:87
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:87
 msgid "Show disk view 'Free' column on startup"
 msgstr "По покретању приказује колону „Слободно“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:88
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:88
 msgid "Width of disk view 'Available' column"
 msgstr "Ширина колоне „Расположиво“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:89
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:89
 msgid "Show disk view 'Available' column on startup"
 msgstr "По покретању приказује колону „Расположиво“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:90
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:90
 msgid "Width of disk view 'Used' column"
 msgstr "Ширина колоне „Заузето“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:91
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:91
 msgid "Show disk view 'Used' column on startup"
 msgstr "По покретању приказује колону „Заузето“ у прегледу диска"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:92
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:92
 msgid "Memory map sort column"
 msgstr "Колона поретка мапе меморије"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:93
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:93
 msgid "Memory map sort order"
 msgstr "Редослед ређања мапе меморије"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:94
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:94
 msgid "Open files sort column"
 msgstr "Колона поретка отворених датотека"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:95
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:95
 msgid "Open files sort order"
 msgstr "Редослед ређања отворених датотека"
 
-#: ../src/prefsdialog.cpp:170
+#: ../src/prefsdialog.cpp:181
 msgid "Icon"
 msgstr "Иконица"
 
-#: ../src/procactions.cpp:75
+#: ../src/procactions.cpp:76
 #, c-format
 msgid ""
 "Cannot change the priority of process with PID %d to %d.\n"
@@ -1049,7 +1015,7 @@
 "Не могу да променим приоритет процеса са ПИБ-ом %d на %d.\n"
 "%s"
 
-#: ../src/procactions.cpp:153
+#: ../src/procactions.cpp:154
 #, c-format
 msgid ""
 "Cannot kill process with PID %d with signal %d.\n"
@@ -1059,20 +1025,21 @@
 "%s"
 
 #. xgettext: primary alert message for killing single process
-#: ../src/procdialogs.cpp:75
+#: ../src/procdialogs.cpp:76
 #, c-format
+#| msgid "Kill the selected process “%s” (PID: %u)?"
 msgid "Are you sure you want to kill the selected process “%s” (PID: %u)?"
 msgstr "Да ли сте сигурни да желите да убијете изабрани процес „%s“ (ПИБ: %u)?"
 
 #. xgettext: primary alert message for ending single process
-#: ../src/procdialogs.cpp:80
+#: ../src/procdialogs.cpp:81
 #, c-format
+#| msgid "End the selected process “%s” (PID: %u)?"
 msgid "Are you sure you want to end the selected process “%s” (PID: %u)?"
-msgstr ""
-"Да ли сте сигурни да желите да окончате изабрани процес „%s“ (ПИБ: %u)?"
+msgstr "Да ли сте сигурни да желите да окончате изабрани процес „%s“ (ПИБ: %u)?"
 
 #. xgettext: primary alert message for killing multiple processes
-#: ../src/procdialogs.cpp:87
+#: ../src/procdialogs.cpp:88
 #, c-format
 msgid "Are you sure you want to kill the selected process?"
 msgid_plural "Are you sure you want to kill the %d selected processes?"
@@ -1082,7 +1049,7 @@
 msgstr[3] "Да ли сте сигурни да желите да убијете један изабрани процес?"
 
 #. xgettext: primary alert message for ending multiple processes
-#: ../src/procdialogs.cpp:91
+#: ../src/procdialogs.cpp:92
 #, c-format
 msgid "Are you sure you want to end the selected process?"
 msgid_plural "Are you sure you want to end the %d selected processes?"
@@ -1092,7 +1059,7 @@
 msgstr[3] "Да ли сте сигурни да желите да окончате један изабрани процес?"
 
 #. xgettext: secondary alert message
-#: ../src/procdialogs.cpp:98 ../src/procdialogs.cpp:104
+#: ../src/procdialogs.cpp:99 ../src/procdialogs.cpp:105
 msgid ""
 "Killing a process may destroy data, break the session or introduce a "
 "security risk. Only unresponsive processes should be killed."
@@ -1101,7 +1068,8 @@
 "проузроковати безбедносни пропуст. Требало би убијати само процесе који се "
 "не одазивају."
 
-#: ../src/procdialogs.cpp:101
+#: ../src/procdialogs.cpp:102
+#| msgid "_Kill Process"
 msgid "_Kill Process"
 msgid_plural "_Kill Processes"
 msgstr[0] "_Убиј процес"
@@ -1109,7 +1077,8 @@
 msgstr[2] "_Убиј процесе"
 msgstr[3] "_Убиј процес"
 
-#: ../src/procdialogs.cpp:107
+#: ../src/procdialogs.cpp:108
+#| msgid "_End Process"
 msgid "_End Process"
 msgid_plural "_End Processes"
 msgstr[0] "_Окончај процес"
@@ -1117,25 +1086,26 @@
 msgstr[2] "_Окончај процесе"
 msgstr[3] "_Окончај процес"
 
-#: ../src/procdialogs.cpp:188
+#: ../src/procdialogs.cpp:189
 #, c-format
 msgid "Change Priority of Process “%s” (PID: %u)"
 msgstr "Измените приоритет процеса „%s“ (ИБ процеса %u)"
 
-#: ../src/procdialogs.cpp:191
+#: ../src/procdialogs.cpp:192
 #, c-format
+#| msgid "Change the order of priority of process"
 msgid "Change Priority of the selected process"
 msgid_plural "Change Priority of %d selected processes"
 msgstr[0] "Измените важност %d изабраног процеса"
 msgstr[1] "Измените важност %d изабрана процеса"
 msgstr[2] "Измените важност %d изабраних процеса"
-msgstr[3] "Измените важност изабраног процеса"
+msgstr[3] "Измените важност iyabranog процеса"
 
-#: ../src/procdialogs.cpp:210
+#: ../src/procdialogs.cpp:211
 msgid "Note:"
 msgstr "Обавештење:"
 
-#: ../src/procdialogs.cpp:211
+#: ../src/procdialogs.cpp:212
 msgid ""
 "The priority of a process is given by its nice value. A lower nice value "
 "corresponds to a higher priority."
@@ -1143,49 +1113,48 @@
 "Приоритет процеса је задат вредношћу његовог лепог понашања. Нижа вредност "
 "представља виши приоритет."
 
-#: ../src/procproperties.cpp:55 ../src/procproperties.cpp:106
-#: ../src/procproperties.cpp:109 ../src/util.cpp:432
+#: ../src/procproperties.cpp:56 ../src/util.cpp:431
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/procproperties.cpp:89 ../src/proctable.cpp:322
+#: ../src/procproperties.cpp:84 ../src/proctable.cpp:321
 msgid "Process Name"
 msgstr "Назив процеса"
 
-#: ../src/procproperties.cpp:90 ../src/proctable.cpp:323
+#: ../src/procproperties.cpp:85 ../src/proctable.cpp:322
 msgid "User"
 msgstr "Корисник"
 
-#: ../src/procproperties.cpp:91 ../src/proctable.cpp:324
+#: ../src/procproperties.cpp:86 ../src/proctable.cpp:323
 msgid "Status"
 msgstr "Стање"
 
-#: ../src/procproperties.cpp:93 ../src/proctable.cpp:325
+#: ../src/procproperties.cpp:88 ../src/proctable.cpp:324
 msgid "Virtual Memory"
 msgstr "Виртуелна меморија"
 
-#: ../src/procproperties.cpp:94 ../src/proctable.cpp:326
+#: ../src/procproperties.cpp:89 ../src/proctable.cpp:325
 msgid "Resident Memory"
 msgstr "Резидентна меморија"
 
-#: ../src/procproperties.cpp:95 ../src/proctable.cpp:327
+#: ../src/procproperties.cpp:90 ../src/proctable.cpp:326
 msgid "Writable Memory"
 msgstr "Уписива меморија"
 
-#: ../src/procproperties.cpp:96 ../src/proctable.cpp:328
+#: ../src/procproperties.cpp:91 ../src/proctable.cpp:327
 msgid "Shared Memory"
 msgstr "Дељена меморија"
 
-#: ../src/procproperties.cpp:98 ../src/proctable.cpp:329
+#: ../src/procproperties.cpp:93 ../src/proctable.cpp:328
 msgid "X Server Memory"
 msgstr "Меморија Икс сервера"
 
-#: ../src/procproperties.cpp:101 ../src/proctable.cpp:331
+#: ../src/procproperties.cpp:96 ../src/proctable.cpp:330
 msgid "CPU Time"
 msgstr "Време процесора"
 
 # bug(slobo): Множински облици. Данило — овај је твој.
-#: ../src/procproperties.cpp:101
+#: ../src/procproperties.cpp:96
 #, c-format
 msgid "%lld second"
 msgid_plural "%lld seconds"
@@ -1194,64 +1163,68 @@
 msgstr[2] "%lld секунди"
 msgstr[3] "Једна секунда"
 
-#: ../src/procproperties.cpp:102 ../src/proctable.cpp:332
+#: ../src/procproperties.cpp:97 ../src/proctable.cpp:331
 msgid "Started"
 msgstr "Покренут"
 
-#: ../src/procproperties.cpp:103 ../src/proctable.cpp:333
+#: ../src/procproperties.cpp:98 ../src/proctable.cpp:332
 msgid "Nice"
 msgstr "Приоритет"
 
-#: ../src/procproperties.cpp:104 ../src/proctable.cpp:347
+#: ../src/procproperties.cpp:99 ../src/proctable.cpp:346
 msgid "Priority"
 msgstr "Важност"
 
-#: ../src/procproperties.cpp:105 ../src/proctable.cpp:334
+#: ../src/procproperties.cpp:100 ../src/proctable.cpp:333
 msgid "ID"
 msgstr "ИБ"
 
-#: ../src/procproperties.cpp:106 ../src/proctable.cpp:335
+#: ../src/procproperties.cpp:101 ../src/proctable.cpp:334
 msgid "Security Context"
 msgstr "Безбедносни контекст"
 
-#: ../src/procproperties.cpp:107 ../src/proctable.cpp:336
+#: ../src/procproperties.cpp:102 ../src/proctable.cpp:335
 msgid "Command Line"
 msgstr "Линија наредби"
 
 #. xgettext: combined noun, the function the process is waiting in, see wchan ps(1)
-#: ../src/procproperties.cpp:108 ../src/proctable.cpp:339
+#: ../src/procproperties.cpp:103 ../src/proctable.cpp:338
 msgid "Waiting Channel"
 msgstr "Канал чекања"
 
-#: ../src/procproperties.cpp:109 ../src/proctable.cpp:340
+#: ../src/procproperties.cpp:104 ../src/proctable.cpp:339
 msgid "Control Group"
 msgstr "Група управљања"
 
-#: ../src/procproperties.cpp:221
+#: ../src/procproperties.cpp:214
+msgid "Process Properties"
+msgstr "Својства процеса"
+
+#: ../src/procproperties.cpp:234
 #, c-format
-msgid "%s (PID %u)"
-msgstr "%s (ЛИБ %u)"
+msgid "Properties of process \"%s\" (PID %u):"
+msgstr "Својства процеса „%s“ (ИБ процеса %u):"
 
-#: ../src/proctable.cpp:330
+#: ../src/proctable.cpp:329
 #, no-c-format
 msgid "% CPU"
 msgstr "Процесор — %"
 
-#: ../src/proctable.cpp:341
+#: ../src/proctable.cpp:340
 msgid "Unit"
 msgstr "Јединица"
 
-#: ../src/proctable.cpp:342
+#: ../src/proctable.cpp:341
 msgid "Session"
 msgstr "Сесија"
 
 #. TRANSLATORS: Seat = i.e. the physical seat the session of the process belongs to, only
 #. for multi-seat environments. See http://en.wikipedia.org/wiki/Multiseat_configuration
-#: ../src/proctable.cpp:345
+#: ../src/proctable.cpp:344
 msgid "Seat"
 msgstr "Смештај"
 
-#: ../src/proctable.cpp:346
+#: ../src/proctable.cpp:345
 msgid "Owner"
 msgstr "Власник"
 
@@ -1300,50 +1273,50 @@
 msgstr "%u:%02u.%02u"
 
 # bug(slobo): ово је одређено у правопису. погледај да ли се ово може преводити
-#: ../src/util.cpp:164
+#: ../src/util.cpp:163
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../src/util.cpp:165
+#: ../src/util.cpp:164
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../src/util.cpp:166
+#: ../src/util.cpp:165
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
 # bug(slobo): ово је одређено у правопису. погледај да ли се ово може преводити
-#: ../src/util.cpp:167
+#: ../src/util.cpp:166
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
 # bug(slobo): ово је одређено у правопису. погледај да ли се ово може преводити
-#: ../src/util.cpp:168
+#: ../src/util.cpp:167
 #, c-format
 msgid "%.3g kbit"
 msgstr "%.3g kbit"
 
-#: ../src/util.cpp:169
+#: ../src/util.cpp:168
 #, c-format
 msgid "%.3g Mbit"
 msgstr "%.3g Mbit"
 
-#: ../src/util.cpp:170
+#: ../src/util.cpp:169
 #, c-format
 msgid "%.3g Gbit"
 msgstr "%.3g Gbit"
 
 # bug(slobo): ово је одређено у правопису. погледај да ли се ово може преводити
-#: ../src/util.cpp:171
+#: ../src/util.cpp:170
 #, c-format
 msgid "%.3g Tbit"
 msgstr "%.3g Tbit"
 
-#: ../src/util.cpp:186
+#: ../src/util.cpp:185
 #, c-format
 msgid "%u bit"
 msgid_plural "%u bits"
@@ -1352,7 +1325,7 @@
 msgstr[2] "%u битова"
 msgstr[3] "Један бит"
 
-#: ../src/util.cpp:187
+#: ../src/util.cpp:186
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -1361,53 +1334,28 @@
 msgstr[2] "%u бајтова"
 msgstr[3] "Један бајт"
 
-#: ../src/util.cpp:230
+#: ../src/util.cpp:229
 msgid "Very High Priority"
 msgstr "Врло висока важност"
 
-#: ../src/util.cpp:232
+#: ../src/util.cpp:231
 msgid "High Priority"
 msgstr "Висока важност"
 
-#: ../src/util.cpp:234
+#: ../src/util.cpp:233
 msgid "Normal Priority"
 msgstr "Уобичајена важност"
 
-#: ../src/util.cpp:236
+#: ../src/util.cpp:235
 msgid "Low Priority"
 msgstr "Ниска важност"
 
-#: ../src/util.cpp:238
+#: ../src/util.cpp:237
 msgid "Very Low Priority"
 msgstr "Врло ниска важност"
 
 #. xgettext: rate, 10MiB/s or 10Mbit/s
-#: ../src/util.cpp:630
+#: ../src/util.cpp:629
 #, c-format
 msgid "%s/s"
 msgstr "%s/s"
-
-#~ msgid "_Name contains:"
-#~ msgstr "_Назив садржи:"
-
-#~ msgid "_Find"
-#~ msgstr "_Нађи"
-
-#~ msgid "C_lear"
-#~ msgstr "_Очисти"
-
-#~ msgid "S_earch results:"
-#~ msgstr "Резултати _претраге:"
-
-#~ msgid "_Close"
-#~ msgstr "_Затвори"
-
-#~| msgid "Help"
-#~ msgid "_Help"
-#~ msgstr "По_моћ"
-
-#~ msgid "Process Properties"
-#~ msgstr "Својства процеса"
-
-#~ msgid "Properties of process \"%s\" (PID %u):"
-#~ msgstr "Својства процеса „%s“ (ИБ процеса %u):"
diff -Nru gnome-system-monitor-3.14.1/po/te.po gnome-system-monitor-3.15.4/po/te.po
--- gnome-system-monitor-3.14.1/po/te.po	2014-10-13 18:18:27.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/te.po	2014-10-20 20:15:40.000000000 +0000
@@ -14,7 +14,7 @@
 "Project-Id-Version: gnome-system-monitor.master.te\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=system-"
 "monitor&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-23 07:44+0000\n"
+"POT-Creation-Date: 2014-09-23 07:45+0000\n"
 "PO-Revision-Date: 2014-09-23 17:52+0530\n"
 "Last-Translator: Krishnababu Krothapalli <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <kde-i18n-doc@kde.org>\n"
@@ -36,13 +36,10 @@
 msgstr "ప్రస్తుత ప్రోసెస్ దర్శించు మరియు వ్యవస్థ స్థితిని పర్యవేక్షించు"
 
 #: ../gnome-system-monitor.desktop.in.in.h:3
-#| msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
 msgid ""
 "Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
 "Manager;"
-msgstr ""
-"మానిటర్;వ్యవస్థ;ప్రోసెస్;సిపియు;మెమొరీ;నెట్‌వర్క్;చరిత్ర;వాడుక;పనితనం;పని;నిర్"
-"వాహిక;"
+msgstr "మానిటర్;వ్యవస్థ;ప్రోసెస్;సిపియు;మెమొరీ;నెట్‌వర్క్;చరిత్ర;వాడుక;పనితనం;పని;నిర్వాహిక;"
 
 #: ../gnome-system-monitor-kde.desktop.in.in.h:1
 #: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
@@ -62,8 +59,8 @@
 "System Monitor is a process viewer and system monitor with an attractive, "
 "easy-to-use interface."
 msgstr ""
-"వ్యవస్థ పర్యవేక్షకి అనేది ఒక ప్రోసెస్ దర్శించునది మరియు వ్యవస్థ పర్యవేక్షకి "
-"ఆకర్షణీయమైన, సులువుగా-ఉపయోగించగల ఇంటర్ఫేస్ అందించును."
+"వ్యవస్థ పర్యవేక్షకి అనేది ఒక ప్రోసెస్ దర్శించునది మరియు వ్యవస్థ పర్యవేక్షకి ఆకర్షణీయమైన, సులువుగా-"
+"ఉపయోగించగల ఇంటర్ఫేస్ అందించును."
 
 #: ../gnome-system-monitor.appdata.xml.in.h:4
 msgid ""
@@ -72,25 +69,22 @@
 "applications, force stop processes not responding, and change the state or "
 "priority of existing processes."
 msgstr ""
-"సిస్టమ్ పర్యవేక్షకి ఉపయోగించి మీ కంప్యూటర్ యొక్క మెమొరీ లేదా ప్రోసెస్‌ను ఏ "
-"అనువర్తనములు ఉపయోగిస్తున్నాయో కనుగొనవచ్చు, నడుస్తున్న అనువర్తనాలు "
-"నిర్వహించవచ్చు, స్పందిచని ప్రోసెస్‌లు బలవంతంగా ఆపివేయవచ్చు, మరియు "
-"మనుగడలోవున్న ప్రోసెస్ ప్రాముఖ్యతను స్థితిని మార్చవచ్చు."
+"సిస్టమ్ పర్యవేక్షకి ఉపయోగించి మీ కంప్యూటర్ యొక్క మెమొరీ లేదా ప్రోసెస్‌ను ఏ అనువర్తనములు ఉపయోగిస్తున్నాయో "
+"కనుగొనవచ్చు, నడుస్తున్న అనువర్తనాలు నిర్వహించవచ్చు, స్పందిచని ప్రోసెస్‌లు బలవంతంగా ఆపివేయవచ్చు, "
+"మరియు మనుగడలోవున్న ప్రోసెస్ ప్రాముఖ్యతను స్థితిని మార్చవచ్చు."
 
 #: ../gnome-system-monitor.appdata.xml.in.h:5
 msgid ""
 "The resource graphs feature shows you a quick overview of what is going on "
 "with your computer displaying recent network, memory and processor usage."
 msgstr ""
-"ఇటీవలి నెట్వర్క్, మెమొరీ మరియు ప్రోసెసర్ వాడుకను ప్రదర్శిస్తూ ఏమి జరుగుతోందో "
-"రిసోర్స్ గ్రాఫ్ విశేషణం చూపును."
+"ఇటీవలి నెట్వర్క్, మెమొరీ మరియు ప్రోసెసర్ వాడుకను ప్రదర్శిస్తూ ఏమి జరుగుతోందో రిసోర్స్ గ్రాఫ్ విశేషణం చూపును."
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:1
 msgid "Kill process"
 msgstr "ప్రోసెస్ అంతముచేయి"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:2
-#| msgid "Privileges are required to renice process"
 msgid "Privileges are required to control other users' processes"
 msgstr "వాడుకరి ప్రోసెస్‌లు నియంత్రించుటకు అనుమతులు కావాలి"
 
@@ -99,7 +93,6 @@
 msgstr "ప్రోసెస్ను రీనైస్ చేయి"
 
 #: ../org.gnome.gnome-system-monitor.policy.in.in.h:4
-#| msgid "Privileges are required to renice process"
 msgid "Privileges are required to change the priority of processes"
 msgstr "ప్రోసెస్ యొక్క ప్రాముఖ్యతను మార్చుటకు అనుమతులు కావాలి"
 
@@ -108,7 +101,6 @@
 msgstr "‌‌ప్రోసెస్ ముగించు (_P)"
 
 #: ../data/interface.ui.h:3
-#| msgid "Process Properties"
 msgid "Show process properties"
 msgstr "ప్రోసెస్ లక్షణాలు చూపుము"
 
@@ -171,7 +163,6 @@
 msgstr "పేరుతో దస్త్రాలను వడపోయి"
 
 #: ../data/lsof.ui.h:3
-#| msgid "Case insensitive matching"
 msgid "Case insensitive"
 msgstr "చిన్నపెద్ద అక్షరతేడా"
 
@@ -217,12 +208,10 @@
 msgstr "ఆధారములు (_D)"
 
 #: ../data/menus.ui.h:11
-#| msgid "Stopped"
 msgid "_Stop"
 msgstr "ఆపివేయి(_S)"
 
 #: ../data/menus.ui.h:12
-#| msgid "_Continue Process"
 msgid "_Continue"
 msgstr "కొనసాగించు (_C)"
 
@@ -348,8 +337,7 @@
 "<small><i><b>Note:</b> The priority of a process is given by its nice value. "
 "A lower nice value corresponds to a higher priority.</i></small>"
 msgstr ""
-"<small><i><b>గమనిక:</b> ప్రోసెస్ యొక్క ప్రాముఖ్యత దాని నైస్ విలువ ద్వారా "
-"యివ్వబడుతుంది. తక్కువ నైస్ "
+"<small><i><b>గమనిక:</b> ప్రోసెస్ యొక్క ప్రాముఖ్యత దాని నైస్ విలువ ద్వారా యివ్వబడుతుంది. తక్కువ నైస్ "
 "విలువ అధిక ప్రాముఖ్యతను సూచిస్తుంది.</i></small>"
 
 #: ../src/application.cpp:310
@@ -369,7 +357,6 @@
 msgstr "దస్త్ర వ్యవస్థ ట్యాబ్ చూపించు"
 
 #: ../src/argv.cpp:35
-#| msgid "Configure the application"
 msgid "Show the application's version"
 msgstr "కార్యక్షేత్రముల వివరణము చూపుము"
 
@@ -517,7 +504,6 @@
 
 #: ../src/lsof.cpp:128
 #, c-format
-#| msgid "Open Files"
 msgid "%d open file"
 msgid_plural "%d open files"
 msgstr[0] "%d తెరిచిన దస్త్రం"
@@ -525,7 +511,6 @@
 
 #: ../src/lsof.cpp:130
 #, c-format
-#| msgid "Search for open files"
 msgid "%d matching open file"
 msgid_plural "%d matching open files"
 msgstr[0] "%d సరిపోలిన తెరిచిన దస్త్రం"
@@ -666,10 +651,8 @@
 "is divided by the total number of CPUs. Otherwise, it operates in 'Irix "
 "mode'."
 msgstr ""
-"నిజమైతే (TRUE), సిస్టమ్-పర్యవేక్షకి 'సాలారీస్ రీతి' నందు నిర్వహించబడుతుంది "
-"అప్పుడు కర్తవ్యంయొక్క సిపియు "
-"వినియోగం మొత్తం సిపియులచే విభాగించబడుతుంది. లేదంటే అది 'ఐరిక్స్ రీతి'నందు "
-"నిర్వహించ బడుతుంది."
+"నిజమైతే (TRUE), సిస్టమ్-పర్యవేక్షకి 'సాలారీస్ రీతి' నందు నిర్వహించబడుతుంది అప్పుడు కర్తవ్యంయొక్క సిపియు "
+"వినియోగం మొత్తం సిపియులచే విభాగించబడుతుంది. లేదంటే అది 'ఐరిక్స్ రీతి'నందు నిర్వహించ బడుతుంది."
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:6
 msgid "Show CPU chart as stacked area chart"
@@ -680,8 +663,7 @@
 "If TRUE, system-monitor shows the CPU chart as a stacked area chart instead "
 "of a line chart."
 msgstr ""
-"TRUE అయితే, system-monitor అనునది CPU చార్టును లైను చార్టుకు బదులుగా "
-"స్టాక్‌డ్ ఏరియా చార్టువలె "
+"TRUE అయితే, system-monitor అనునది CPU చార్టును లైను చార్టుకు బదులుగా స్టాక్‌డ్ ఏరియా చార్టువలె "
 "చూపును."
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:8
@@ -710,10 +692,8 @@
 "'autofs' and 'procfs'). Useful for getting a list of all currently mounted "
 "file systems."
 msgstr ""
-"అన్ని దస్త్రవ్యవస్థల గురించి సమాచారమును ప్రదర్శించాలా ('autofs' మరియు "
-"'procfs' వంటి రకములతో "
-"కలుపుకొని). ప్రస్తుతం మరల్పైవున్న అన్ని దస్త్రవ్యవస్థల జాబితాను పొందుటకు "
-"వుపయోగకరంగా వుంటుంది."
+"అన్ని దస్త్రవ్యవస్థల గురించి సమాచారమును ప్రదర్శించాలా ('autofs' మరియు 'procfs' వంటి రకములతో "
+"కలుపుకొని). ప్రస్తుతం మరల్పైవున్న అన్ని దస్త్రవ్యవస్థల జాబితాను పొందుటకు వుపయోగకరంగా వుంటుంది."
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:14
 msgid "Time in milliseconds between updates of the devices list"
@@ -879,8 +859,7 @@
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:56
 msgid "Show process 'SELinux Security Context' column on startup"
-msgstr ""
-"ప్రారంభించునపుడు ప్రోసెస్ 'SELinux రక్షణ సందర్భం' నిలువుపట్టీను చూపించు"
+msgstr "ప్రారంభించునపుడు ప్రోసెస్ 'SELinux రక్షణ సందర్భం' నిలువుపట్టీను చూపించు"
 
 #: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:57
 msgid "Width of process 'Command Line' column"
@@ -1063,14 +1042,12 @@
 #. xgettext: primary alert message for killing single process
 #: ../src/procdialogs.cpp:75
 #, c-format
-#| msgid "Kill the selected process “%s” (PID: %u)?"
 msgid "Are you sure you want to kill the selected process “%s” (PID: %u)?"
 msgstr "ఎంపికచేసిన ప్రోసెస్ “%s” (PID: %u) ఖచ్చితంగా అంతంచేయాలా?"
 
 #. xgettext: primary alert message for ending single process
 #: ../src/procdialogs.cpp:80
 #, c-format
-#| msgid "End the selected process “%s” (PID: %u)?"
 msgid "Are you sure you want to end the selected process “%s” (PID: %u)?"
 msgstr "ఎంపికచేసిన ప్రోసెస్ “%s” (PID: %u) ఖచ్చితంగా ముగించాలా?"
 
@@ -1096,19 +1073,16 @@
 "Killing a process may destroy data, break the session or introduce a "
 "security risk. Only unresponsive processes should be killed."
 msgstr ""
-"ఒక ప్రోసెస్ను అంతము చేయుటవలన డాటా నష్టం జరుగవచ్చు, విభాగము(సెషన్) అంతరాయం "
-"కలుగవచ్చు లేదా కొత్త "
+"ఒక ప్రోసెస్ను అంతము చేయుటవలన డాటా నష్టం జరుగవచ్చు, విభాగము(సెషన్) అంతరాయం కలుగవచ్చు లేదా కొత్త "
 "రక్షణా సమస్య లేవనెత్తవచ్చు. స్పందించని ప్రోసెస్లు మాత్రమే అంతమొందించాలి."
 
 #: ../src/procdialogs.cpp:101
-#| msgid "_Kill Process"
 msgid "_Kill Process"
 msgid_plural "_Kill Processes"
 msgstr[0] "ప్రోసెస్ అంతంచేయి (_K)"
 msgstr[1] "ప్రోసెస్‌లు అంతంచేయి (_K)"
 
 #: ../src/procdialogs.cpp:107
-#| msgid "_End Process"
 msgid "_End Process"
 msgid_plural "_End Processes"
 msgstr[0] "ప్రోసెస్ ముగించు (_E)"
@@ -1121,7 +1095,6 @@
 
 #: ../src/procdialogs.cpp:191
 #, c-format
-#| msgid "Change the order of priority of process"
 msgid "Change Priority of the selected process"
 msgid_plural "Change Priority of %d selected processes"
 msgstr[0] "ఎంపికచేసిన ప్రోసెస్ యొక్క ప్రాముఖ్య మార్చు"
@@ -1136,8 +1109,7 @@
 "The priority of a process is given by its nice value. A lower nice value "
 "corresponds to a higher priority."
 msgstr ""
-"ప్రోసెస్ యొక్క ప్రాముఖ్యత దాని నైస్ విలువ ద్వారా యివ్వబడుతుంది. తక్కువ నైస్ "
-"విలువ అధిక ప్రాముఖ్యతను "
+"ప్రోసెస్ యొక్క ప్రాముఖ్యత దాని నైస్ విలువ ద్వారా యివ్వబడుతుంది. తక్కువ నైస్ విలువ అధిక ప్రాముఖ్యతను "
 "సూచిస్తుంది."
 
 #: ../src/procproperties.cpp:55 ../src/procproperties.cpp:106
@@ -1376,7 +1348,6 @@
 #~ msgid "Privileges are required to kill process"
 #~ msgstr "ప్రక్రియను అంతం చేయుటకు అనుమతులు కావాలి"
 
-#~| msgid "_View"
 #~ msgid "View"
 #~ msgstr "దర్శనం"
 
diff -Nru gnome-system-monitor-3.14.1/po/uk.po gnome-system-monitor-3.15.4/po/uk.po
--- gnome-system-monitor-3.14.1/po/uk.po	2014-10-13 18:18:27.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/uk.po	2014-10-20 20:14:45.000000000 +0000
@@ -39,7 +39,7 @@
 "Manager;"
 msgstr ""
 "Монітор;Система;Процес;Процесор;Пам'ять;Мережа;Історія;Використання;Завдання"
-";Менеджер"
+";Менеджер;"
 
 #: ../gnome-system-monitor-kde.desktop.in.in.h:1
 #: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
diff -Nru gnome-system-monitor-3.14.1/po/vi.po gnome-system-monitor-3.15.4/po/vi.po
--- gnome-system-monitor-3.14.1/po/vi.po	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/po/vi.po	2014-12-08 19:51:20.000000000 +0000
@@ -1,17 +1,19 @@
 # Vietnamese translation for GNOME System Monitor.
-# Copyright © 2009 GNOME i18n Project for Vietnamese.
+# Copyright © 2014 GNOME i18n Project for Vietnamese.
+# This file is distributed under the same license as the gnome-system-monitor package.
 # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2002, 2012.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-system-monitor GNOME TRUNK\n"
+"Project-Id-Version: gnome-system-monitor master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=system-"
 "monitor&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-08-07 01:52+0000\n"
-"PO-Revision-Date: 2012-08-25 13:14+0700\n"
-"Last-Translator: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"POT-Creation-Date: 2014-11-27 20:37+0000\n"
+"PO-Revision-Date: 2014-12-06 08:08+0700\n"
+"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
+"Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,54 +22,119 @@
 "X-Generator: LocFactoryEditor 1.8\n"
 
 #: ../gnome-system-monitor.desktop.in.in.h:1 ../data/interface.ui.h:1
-#: ../src/callbacks.cpp:184 ../src/procman.cpp:721
+#: ../src/application.cpp:268 ../src/interface.cpp:363
 msgid "System Monitor"
-msgstr "Bộ theo dõi hệ thống"
+msgstr "Theo dõi hệ thống"
 
-#: ../gnome-system-monitor.desktop.in.in.h:2 ../src/callbacks.cpp:185
+#: ../gnome-system-monitor.desktop.in.in.h:2
+#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:364
 msgid "View current processes and monitor system state"
 msgstr "Xem các tiến trình hiện thời và theo dõi tình trạng hệ thống"
 
 #: ../gnome-system-monitor.desktop.in.in.h:3
+msgid ""
+"Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
+"Manager;"
+msgstr ""
+"Monitor;Theo;dõi;System;Hệ;Thống;he;thong;Process;Tiến;Trình;tien;trinh;CPU;"
+"Memory;Bộ;Nhớ;bo;nho;Network;Mạng;History;Lịch;sử;lich;su;Usage;Sử;dụng;cách;"
+"dùng;dung;Performance;Năng;suất;nang;suat;Task;công;việc;tác;vụ;Manager;quản;"
+"lý;quan;ly;"
+
+#: ../gnome-system-monitor-kde.desktop.in.in.h:1
+#: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:324
+msgid "GNOME System Monitor"
+msgstr "Theo dõi hệ thống GNOME"
+
+#: ../gnome-system-monitor-kde.desktop.in.in.h:3
 msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
 msgstr ""
-"Monitor;Theo;dõi;System;Hệ;Thống;Process;Tiến;Trình;CPU;Memory;Bộ;Nhớ;"
-"Network;Mạng;History;Lịch;sử;Usage;Sử;dụng;"
+"Monitor;Theo;dõi;theo;doi;System;Hệ;Thống;he;thong;Process;Tiến;Trình;tien;"
+"trinh;CPU;Memory;Bộ;Nhớ;bo;nho;Network;Mạng;mang;History;Lịch;sử;lich;su;"
+"Usage;Sử;dụng;tiêu;dùng;"
+
+#: ../gnome-system-monitor.appdata.xml.in.h:2
+msgid "View and manage system resources"
+msgstr "Xem và quản lý tài nguyên hệ thống"
 
-#: ../data/interface.ui.h:2
-msgid "System"
-msgstr "Hệ thống"
+#: ../gnome-system-monitor.appdata.xml.in.h:3
+msgid ""
+"System Monitor is a process viewer and system monitor with an attractive, "
+"easy-to-use interface."
+msgstr ""
+"Ứng dụng theo dõi hệ thống là phần mềm xem và theo dõi các tiến trình hệ "
+"thống với một giao diện hấp dẫn và dễ dùng."
 
-#: ../data/interface.ui.h:3
+#: ../gnome-system-monitor.appdata.xml.in.h:4
+msgid ""
+"System Monitor can help you find out what applications are using the "
+"processor or the memory of your computer, can manage the running "
+"applications, force stop processes not responding, and change the state or "
+"priority of existing processes."
+msgstr ""
+"Ứng dụng theo dõi hệ thống giúp bạn tìm ra ứng dụng nào đang tiêu dùng bộ vi "
+"xử lý hay bộ nhớ của máy tính, có thể quản lý các ứng dụng đang chạy, ép "
+"buộc dừng các tiến trình đang treo, và thay đổi trạng thái hay mức ưu tiên "
+"của một tiến trình sẵn có."
+
+#: ../gnome-system-monitor.appdata.xml.in.h:5
+msgid ""
+"The resource graphs feature shows you a quick overview of what is going on "
+"with your computer displaying recent network, memory and processor usage."
+msgstr ""
+"Tính năng hiển thị tài nguyên bằng đồ thị giúp bạn nhanh chóng hiểu được "
+"những gì đang diễn với mạng, bộ nhớ và bộ vi xử lý trên máy tính của mình."
+
+#: ../org.gnome.gnome-system-monitor.policy.in.in.h:1
+msgid "Kill process"
+msgstr "Buộc kết thúc tiến trình"
+
+#: ../org.gnome.gnome-system-monitor.policy.in.in.h:2
+msgid "Privileges are required to control other users' processes"
+msgstr "Cần đặc quyền để có thể điều khiển tiến trình của người dùng khác"
+
+#: ../org.gnome.gnome-system-monitor.policy.in.in.h:3
+msgid "Renice process"
+msgstr "Đổi mức ưu tiên tiến trình"
+
+#: ../org.gnome.gnome-system-monitor.policy.in.in.h:4
+msgid "Privileges are required to change the priority of processes"
+msgstr "Các đặc quyền yêu cầu phải đổi mức ưu tiên của tiến trình"
+
+#: ../data/interface.ui.h:2
 msgid "End _Process"
 msgstr "Kết thúc tiến t_rình"
 
+#: ../data/interface.ui.h:3
+msgid "Show process properties"
+msgstr "Hiển thị thuộc tính tiến trình"
+
 #: ../data/interface.ui.h:4 ../data/preferences.ui.h:9
 msgid "Processes"
 msgstr "Tiến trình"
 
 #: ../data/interface.ui.h:5
 msgid "CPU History"
-msgstr "Nhật ký CPU"
+msgstr "Lịch sử CPU"
 
 #: ../data/interface.ui.h:6
 msgid "Memory and Swap History"
-msgstr "Lược sử bộ nhớ và trao đổi"
+msgstr "Lịch sử bộ nhớ và tráo đổi"
 
-#: ../data/interface.ui.h:7 ../src/interface.cpp:327
-#: ../src/procproperties.cpp:133 ../src/proctable.cpp:251
+#: ../data/interface.ui.h:7 ../src/interface.cpp:260
+#: ../src/procproperties.cpp:92 ../src/proctable.cpp:337
 msgid "Memory"
 msgstr "Bộ nhớ"
 
-#: ../data/interface.ui.h:8 ../src/interface.cpp:338
+#: ../data/interface.ui.h:8 ../src/interface.cpp:272
 msgid "Swap"
-msgstr "Trao đổi"
+msgstr "Tráo đổi"
 
 #: ../data/interface.ui.h:9
 msgid "Network History"
-msgstr "Lược sử mạng"
+msgstr "Lịch sử mạng"
 
-#: ../data/interface.ui.h:10 ../src/interface.cpp:363
+#: ../data/interface.ui.h:10 ../src/interface.cpp:300
 msgid "Receiving"
 msgstr "Nhận"
 
@@ -75,45 +142,132 @@
 msgid "Total Received"
 msgstr "Nhận tổng"
 
-#: ../data/interface.ui.h:12
-msgid "Sent"
+#: ../data/interface.ui.h:12 ../src/interface.cpp:315
+msgid "Sending"
 msgstr "Gửi"
 
 #: ../data/interface.ui.h:13
 msgid "Total Sent"
 msgstr "Gửi tổng"
 
-#: ../data/interface.ui.h:14
-msgid "\n"
-msgstr "\n"
-
-#: ../data/interface.ui.h:16 ../data/preferences.ui.h:12
+#: ../data/interface.ui.h:14 ../data/preferences.ui.h:13
 msgid "Resources"
 msgstr "Tài nguyên"
 
-#: ../data/interface.ui.h:17 ../data/preferences.ui.h:14
+#: ../data/interface.ui.h:15 ../data/preferences.ui.h:16
 msgid "File Systems"
 msgstr "Hệ thống tập tin"
 
 #: ../data/lsof.ui.h:1
+msgctxt "Window title for 'Search for Open Files' dialog"
 msgid "Search for Open Files"
-msgstr "Tìm tập tin mở"
+msgstr "Tìm tập tin đang mở"
 
 #: ../data/lsof.ui.h:2
-msgid "_Name contains:"
-msgstr "Tê_n chứa:"
+msgid "Filter files by name"
+msgstr "Lọc các tập tin theo tên"
 
 #: ../data/lsof.ui.h:3
-msgid "Case insensitive matching"
-msgstr "Khớp không phân biệt chữ hoa/thường"
+msgid "Case insensitive"
+msgstr "Không phân biệt HOA/thường"
+
+#: ../data/menus.ui.h:1
+msgctxt "Menu item to Open 'Search for Open Files' dialog"
+msgid "Search for Open Files"
+msgstr "Tìm tập tin đang mở"
+
+#: ../data/menus.ui.h:2
+msgid "Preferences"
+msgstr "Tuỳ thích"
+
+#: ../data/menus.ui.h:3
+msgid "Help"
+msgstr "Trợ giúp"
+
+#: ../data/menus.ui.h:4
+msgid "About"
+msgstr "Giới thiệu"
+
+#: ../data/menus.ui.h:5
+msgid "Quit"
+msgstr "Thoát"
+
+#: ../data/menus.ui.h:6
+msgid "_Refresh"
+msgstr "Cậ_p nhật"
+
+#: ../data/menus.ui.h:7
+msgid "_Active Processes"
+msgstr "Tiến trình h_oạt động"
+
+#: ../data/menus.ui.h:8
+msgid "A_ll Processes"
+msgstr "_Mọi tiến trình"
+
+#: ../data/menus.ui.h:9
+msgid "M_y Processes"
+msgstr "Tiến trình của _tôi"
+
+#: ../data/menus.ui.h:10
+msgid "_Dependencies"
+msgstr "_Phụ thuộc"
+
+#: ../data/menus.ui.h:11
+msgid "_Stop"
+msgstr "_Dừng"
+
+#: ../data/menus.ui.h:12
+msgid "_Continue"
+msgstr "Tiếp tụ_c"
+
+#: ../data/menus.ui.h:13
+msgid "_End"
+msgstr "_Kết thúc"
+
+#: ../data/menus.ui.h:14
+msgid "_Kill"
+msgstr "Buộc _kết thúc"
+
+#: ../data/menus.ui.h:15
+msgid "_Change Priority"
+msgstr "Đổ_i độ ưu tiên"
+
+#: ../data/menus.ui.h:16 ../src/util.cpp:215
+msgid "Very High"
+msgstr "Rất cao"
+
+#: ../data/menus.ui.h:17 ../src/util.cpp:217
+msgid "High"
+msgstr "Cao"
+
+#: ../data/menus.ui.h:18 ../src/util.cpp:219
+msgid "Normal"
+msgstr "Bình thường"
+
+#: ../data/menus.ui.h:19 ../src/util.cpp:221
+msgid "Low"
+msgstr "Thấp"
+
+#: ../data/menus.ui.h:20 ../src/util.cpp:223
+msgid "Very Low"
+msgstr "Rất thấp"
+
+#: ../data/menus.ui.h:21
+msgid "Custom"
+msgstr "Tự chọn"
+
+#: ../data/menus.ui.h:22
+msgid "_Memory Maps"
+msgstr "Sơ đồ _bộ nhớ"
+
+#. Translators: this means 'Files that are open' (open is not a verb here)
+#: ../data/menus.ui.h:24
+msgid "Open _Files"
+msgstr "Mở _tập tin"
 
-#: ../data/lsof.ui.h:4
-msgid "C_lear"
-msgstr "_Xoá"
-
-#: ../data/lsof.ui.h:5
-msgid "S_earch results:"
-msgstr "_Kết quả tìm:"
+#: ../data/menus.ui.h:25
+msgid "_Properties"
+msgstr "T_huộc tính"
 
 #: ../data/openfiles.ui.h:1
 msgid "Open Files"
@@ -156,26 +310,34 @@
 msgstr "Đồ thị"
 
 #: ../data/preferences.ui.h:11
+msgid "_Draw CPU chart as stacked area chart"
+msgstr "_Vẽ đồ thị CPU theo kiểu vùng xếp chồng"
+
+#: ../data/preferences.ui.h:12
 msgid "_Show network speed in bits"
 msgstr "_Hiện tốc độ mạng theo bit"
 
-#: ../data/preferences.ui.h:13
-#| msgid "Show _all filesystems"
+#: ../data/preferences.ui.h:14
 msgid "Show _all file systems"
 msgstr "Hiện _mọi hệ thống tập tin"
 
-#: ../data/renice.ui.h:1
+#: ../data/preferences.ui.h:15
+msgid "File system i_nformation shown in list:"
+msgstr "Thô_ng tin hệ thống tập tin được hiển thị trong danh sách:"
+
+#: ../data/renice.ui.h:1 ../src/procdialogs.cpp:123
+msgid "_Cancel"
+msgstr "T_hôi"
+
+#: ../data/renice.ui.h:2
 msgid "Change _Priority"
 msgstr "Đổi độ ư_u tiên"
 
-#: ../data/renice.ui.h:2
+#: ../data/renice.ui.h:3
 msgid "_Nice value:"
-msgstr "Giá trị _nice:"
+msgstr "Giá trị ư_u tiên:"
 
-#: ../data/renice.ui.h:3
-#| msgid ""
-#| "The priority of a process is given by its nice value. A lower nice value "
-#| "corresponds to a higher priority."
+#: ../data/renice.ui.h:4
 msgid ""
 "<small><i><b>Note:</b> The priority of a process is given by its nice value. "
 "A lower nice value corresponds to a higher priority.</i></small>"
@@ -184,898 +346,685 @@
 "trị \"nice\" (dễ thương). Giá trị thấp hơn tương ứng với độ ưu tiên cao hơn."
 "</i></small>"
 
-#: ../src/argv.cpp:21
-msgid "Show the System tab"
-msgstr "Hiện thẻ hệ thống"
+#: ../src/application.cpp:310
+msgid "A simple process and system monitor."
+msgstr "Một công cụ đơn giản để theo dõi hệ thống và các tiến trình đang chạy."
 
-#: ../src/argv.cpp:26
-#| msgid "Show active processes"
+#: ../src/argv.cpp:21
 msgid "Show the Processes tab"
-msgstr "Hiện thẻ tiến trình"
+msgstr "Hiện thẻ “Tiến trình”"
 
-#: ../src/argv.cpp:31
-#| msgid "Show the System tab"
+#: ../src/argv.cpp:26
 msgid "Show the Resources tab"
-msgstr "Hiện thẻ tài nguyên"
+msgstr "Hiện thẻ “Tài nguyên”"
 
-#: ../src/argv.cpp:36
-#| msgid "Show the System tab"
+#: ../src/argv.cpp:31
 msgid "Show the File Systems tab"
-msgstr "Hiện thẻ hệ tập tin"
+msgstr "Hiện thẻ “Hệ thống tập tin”"
 
-#: ../src/callbacks.cpp:195
-msgid "translator-credits"
-msgstr "Nhóm Việt hóa GNOME (http://live.gnome.org/GnomeVi)"
+#: ../src/argv.cpp:35
+msgid "Show the application's version"
+msgstr "Hiện phiên bản của ứng dụng"
 
-#: ../src/disks.cpp:298 ../src/memmaps.cpp:361
+#: ../src/disks.cpp:369 ../src/memmaps.cpp:325
 msgid "Device"
 msgstr "Thiết bị"
 
-#: ../src/disks.cpp:299
+#: ../src/disks.cpp:370
 msgid "Directory"
 msgstr "Thư mục"
 
-#: ../src/disks.cpp:300 ../src/gsm_color_button.c:222 ../src/openfiles.cpp:251
+#: ../src/disks.cpp:371 ../src/gsm_color_button.c:165 ../src/openfiles.cpp:252
 msgid "Type"
 msgstr "Kiểu"
 
-#: ../src/disks.cpp:301
+#: ../src/disks.cpp:372
 msgid "Total"
 msgstr "Tổng"
 
-#: ../src/disks.cpp:302
+#: ../src/disks.cpp:373
 msgid "Free"
-msgstr "Rảnh"
+msgstr "Trống"
 
-#: ../src/disks.cpp:303
+#: ../src/disks.cpp:374
 msgid "Available"
-msgstr "Sẵn sàng"
+msgstr "Sẵn dùng"
 
-#: ../src/disks.cpp:304
+#: ../src/disks.cpp:375
 msgid "Used"
 msgstr "Dùng"
 
 #. xgettext: ? stands for unknown
-#: ../src/e_date.c:155
+#: ../src/e_date.c:156
 msgid "?"
 msgstr "?"
 
-#: ../src/e_date.c:162
+#: ../src/e_date.c:163
 msgid "Today %l:%M %p"
 msgstr "Hôm nay %l:%M %p"
 
-#: ../src/e_date.c:171
+#: ../src/e_date.c:172
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %l:%M %p"
 
-#: ../src/e_date.c:183
+#: ../src/e_date.c:184
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../src/e_date.c:191
+#: ../src/e_date.c:192
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../src/e_date.c:193
+#: ../src/e_date.c:194
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../src/gsm_color_button.c:198
+#: ../src/gsm_color_button.c:141
 msgid "Fraction"
 msgstr "Phân số"
 
 #. TRANSLATORS: description of the pie color picker's (mem, swap) filled percentage property
-#: ../src/gsm_color_button.c:200
-#| msgid "Percentage full for pie colour pickers"
+#: ../src/gsm_color_button.c:143
 msgid "Percentage full for pie color pickers"
 msgstr "Phần trăm đầy cho bảng chọn màu"
 
-#: ../src/gsm_color_button.c:207
+#: ../src/gsm_color_button.c:150
 msgid "Title"
 msgstr "Tựa đề"
 
-#: ../src/gsm_color_button.c:208
+#: ../src/gsm_color_button.c:151
 msgid "The title of the color selection dialog"
 msgstr "Tựa đề của hộp thoại chọn màu"
 
-#: ../src/gsm_color_button.c:209 ../src/gsm_color_button.c:625
+#: ../src/gsm_color_button.c:152 ../src/gsm_color_button.c:512
 msgid "Pick a Color"
 msgstr "Chọn màu"
 
-#: ../src/gsm_color_button.c:215
+#: ../src/gsm_color_button.c:158
 msgid "Current Color"
 msgstr "Màu hiện có"
 
-#: ../src/gsm_color_button.c:216
+#: ../src/gsm_color_button.c:159
 msgid "The selected color"
 msgstr "Màu đã chọn"
 
-#: ../src/gsm_color_button.c:223
+#: ../src/gsm_color_button.c:166
 msgid "Type of color picker"
 msgstr "Kiểu bộ chọn màu"
 
-#: ../src/gsm_color_button.c:548
+#: ../src/gsm_color_button.c:434
 msgid "Received invalid color data\n"
 msgstr "Nhận được dữ liệu màu không hợp lệ\n"
 
-#: ../src/gsm_color_button.c:648
+#: ../src/gsm_color_button.c:535
 msgid "Click to set graph colors"
 msgstr "Nhấn vào để đặt màu sắc đồ thị"
 
-#. xgettext: noun, top level menu.
-#. "File" did not make sense for system-monitor
-#: ../src/interface.cpp:51
-msgid "_Monitor"
-msgstr "Th_eo dõi"
-
-#: ../src/interface.cpp:52
-msgid "_Edit"
-msgstr "_Sửa"
-
-#: ../src/interface.cpp:53
-msgid "_View"
-msgstr "_Xem"
-
-#: ../src/interface.cpp:54
-msgid "_Help"
-msgstr "Trợ g_iúp"
-
-#: ../src/interface.cpp:56
-msgid "Search for _Open Files"
-msgstr "Tìm tập tin _mở"
-
-#: ../src/interface.cpp:57
-msgid "Search for open files"
-msgstr "Tìm kiếm các tập tin được mở"
-
-#: ../src/interface.cpp:59
-msgid "Quit the program"
-msgstr "Thoạt khỏi chương trình"
-
-#: ../src/interface.cpp:62
-msgid "_Stop Process"
-msgstr "_Dừng tiến trình"
-
-#: ../src/interface.cpp:63
-msgid "Stop process"
-msgstr "Dừng tiến trình"
-
-#: ../src/interface.cpp:64
-msgid "_Continue Process"
-msgstr "Tiếp tụ_c tiến trình"
-
-#: ../src/interface.cpp:65
-msgid "Continue process if stopped"
-msgstr "Tiếp tục tiến trình nếu bị dừng."
-
-#: ../src/interface.cpp:67 ../src/procdialogs.cpp:95
-msgid "_End Process"
-msgstr "Kết _thúc tiến trình"
-
-#: ../src/interface.cpp:68
-msgid "Force process to finish normally"
-msgstr "Ép buộc tiến trình kết thúc một cách chuẩn"
-
-#: ../src/interface.cpp:69 ../src/procdialogs.cpp:84
-msgid "_Kill Process"
-msgstr "Buộc _kết thúc tiến trình"
-
-#: ../src/interface.cpp:70
-msgid "Force process to finish immediately"
-msgstr "Ép buộc tiến trình kết thúc ngay"
-
-#: ../src/interface.cpp:71
-#| msgid "Change Priority"
-msgid "_Change Priority"
-msgstr "Đổ_i độ ưu tiên"
-
-#: ../src/interface.cpp:72
-msgid "Change the order of priority of process"
-msgstr "Thay đổi thứ tự độ ưu tiên của tiến trình"
-
-#: ../src/interface.cpp:74
-msgid "Configure the application"
-msgstr "Cấu hình ứng dụng"
-
-#: ../src/interface.cpp:76
-msgid "_Refresh"
-msgstr "Cậ_p nhật"
-
-#: ../src/interface.cpp:77
-msgid "Refresh the process list"
-msgstr "Làm tươi danh sách các tiến trình"
-
-#: ../src/interface.cpp:79
-msgid "_Memory Maps"
-msgstr "Sơ đồ _bộ nhớ"
-
-#: ../src/interface.cpp:80
-msgid "Open the memory maps associated with a process"
-msgstr "Mở các sơ đồ bộ nhớ tượng ứng với một tiến trình nào đó"
-
-#. Translators: this means 'Files that are open' (open is no verb here)
-#: ../src/interface.cpp:82
-msgid "Open _Files"
-msgstr "Mở _tập tin"
-
-#: ../src/interface.cpp:83
-msgid "View the files opened by a process"
-msgstr "Xem các tập tin được mở bởi một tiến trình nào đó"
-
-#: ../src/interface.cpp:84
-msgid "_Properties"
-msgstr "T_huộc tính"
-
-#: ../src/interface.cpp:85
-msgid "View additional information about a process"
-msgstr "Xem thông tin bổ sung về tiến trình"
-
-#: ../src/interface.cpp:88
-msgid "_Contents"
-msgstr "Mục lụ_c"
-
-#: ../src/interface.cpp:89
-msgid "Open the manual"
-msgstr "Mở sổ tay"
-
-#: ../src/interface.cpp:91
-msgid "About this application"
-msgstr "Giới thiệu ứng dụng này"
-
-#: ../src/interface.cpp:96
-msgid "_Dependencies"
-msgstr "_Phụ thuộc"
-
-#: ../src/interface.cpp:97
-msgid "Show parent/child relationship between processes"
-msgstr "Hiển thị quan hệ mẹ/con giữa các tiến trình"
-
-#: ../src/interface.cpp:104
-msgid "_Active Processes"
-msgstr "Tiến trình h_oạt động"
-
-#: ../src/interface.cpp:105
-msgid "Show active processes"
-msgstr "Hiện các tiến trình hoạt động"
-
-#: ../src/interface.cpp:106
-msgid "A_ll Processes"
-msgstr "_Mọi tiến trình"
-
-#: ../src/interface.cpp:107
-msgid "Show all processes"
-msgstr "Hiện mọi tiến trình"
-
-#: ../src/interface.cpp:108
-msgid "M_y Processes"
-msgstr "Tiến trình của _tôi"
-
-#: ../src/interface.cpp:109
-#| msgid "Show user own process"
-msgid "Show only user-owned processes"
-msgstr "Chỉ hiện tiến trình của người dùng"
-
-#: ../src/interface.cpp:114 ../src/util.cpp:217
-#| msgid "(Very High Priority)"
-msgid "Very High"
-msgstr "Rất cao"
-
-#: ../src/interface.cpp:115
-msgid "Set process priority to very high"
-msgstr "Đặt độ ưu tiên tiến trình là rất cao"
-
-#: ../src/interface.cpp:116 ../src/util.cpp:219
-msgid "High"
-msgstr "Cao"
-
-#: ../src/interface.cpp:117
-msgid "Set process priority to high"
-msgstr "Đặt độ ưu tiên tiến trình là cao"
-
-#: ../src/interface.cpp:118 ../src/util.cpp:221
-msgid "Normal"
-msgstr "Bình thường"
-
-#: ../src/interface.cpp:119
-#| msgid "Force process to finish normally"
-msgid "Set process priority to normal"
-msgstr "Đặt độ ưu tiên tiến trình là bình thường"
-
-#: ../src/interface.cpp:120 ../src/util.cpp:223
-msgid "Low"
-msgstr "Thấp"
-
-#: ../src/interface.cpp:121
-msgid "Set process priority to low"
-msgstr "Đặt độ ưu tiên tiến trình là thấp"
-
-#: ../src/interface.cpp:122 ../src/util.cpp:225
-msgid "Very Low"
-msgstr "Rất thấp"
-
-#: ../src/interface.cpp:123
-msgid "Set process priority to very low"
-msgstr "Đặt độ ưu tiên tiến trình là rất thấp"
-
-#: ../src/interface.cpp:124
-msgid "Custom"
-msgstr "Tự chọn"
-
-#: ../src/interface.cpp:125
-msgid "Set process priority manually"
-msgstr "Đặt độ ưu tiên tiến trình thủ công"
-
 #. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
-#: ../src/interface.cpp:256
+#: ../src/interface.cpp:187
 #, c-format
-#| msgid "Pick a Color"
 msgid "Pick a Color for '%s'"
-msgstr "Chọn màu cho '%s'"
+msgstr "Chọn màu cho “%s”"
 
-#: ../src/interface.cpp:292 ../src/procproperties.cpp:139
+#: ../src/interface.cpp:220 ../src/procproperties.cpp:100
 msgid "CPU"
 msgstr "CPU"
 
-#: ../src/interface.cpp:294
+#: ../src/interface.cpp:222
 #, c-format
 msgid "CPU%d"
 msgstr "CPU%d"
 
-#: ../src/interface.cpp:378
-msgid "Sending"
-msgstr "Gửi"
+#: ../src/interface.cpp:374
+msgid "translator-credits"
+msgstr "Nhóm Việt hóa GNOME (http://live.gnome.org/GnomeVi)"
 
-#: ../src/load-graph.cpp:166
+#: ../src/load-graph.cpp:161
 #, c-format
 msgid "%u second"
 msgid_plural "%u seconds"
 msgstr[0] "%u giây"
 
-#: ../src/load-graph.cpp:347
-#| msgid "Available"
+#: ../src/load-graph.cpp:370
 msgid "not available"
 msgstr "không sẵn sàng"
 
 #. xgettext: 540MiB (53 %) of 1.0 GiB
-#: ../src/load-graph.cpp:350
+#: ../src/load-graph.cpp:373
 #, c-format
-#| msgid "%s (%.1f %%) of %s"
 msgid "%s (%.1f%%) of %s"
 msgstr "%s (%.1f%%) trên %s"
 
-#: ../src/lsof.cpp:125
+#: ../src/lsof.cpp:109
 msgid "Error"
 msgstr "Lỗi"
 
-#: ../src/lsof.cpp:126
+#: ../src/lsof.cpp:110
 #, c-format
-#| msgid ""
-#| "<b>Error</b>\n"
-#| "'%s' is not a valid Perl regular expression.\n"
-#| "%s"
 msgid "'%s' is not a valid Perl regular expression."
-msgstr "'%s' không phải là một biểu thức chính quy Perl hợp lệ."
+msgstr "“%s” không phải là một biểu thức chính quy Perl hợp lệ."
+
+#: ../src/lsof.cpp:128
+#, c-format
+msgid "%d open file"
+msgid_plural "%d open files"
+msgstr[0] "Mở %d tập tin"
+
+#: ../src/lsof.cpp:130
+#, c-format
+msgid "%d matching open file"
+msgid_plural "%d matching open files"
+msgstr[0] "Tìm thấy %d tập tin đang mở khớp mẫu"
 
-#: ../src/lsof.cpp:272
+#: ../src/lsof.cpp:246
 msgid "Process"
 msgstr "Tiến trình"
 
-#: ../src/lsof.cpp:284
+#: ../src/lsof.cpp:258
 msgid "PID"
 msgstr "PID"
 
-#: ../src/lsof.cpp:294 ../src/memmaps.cpp:339
+#: ../src/lsof.cpp:268 ../src/memmaps.cpp:303
 msgid "Filename"
 msgstr "Tên tập tin"
 
 #. xgettext: virtual memory start
-#: ../src/memmaps.cpp:341
+#: ../src/memmaps.cpp:305
 msgid "VM Start"
 msgstr "Đầu bộ nhớ ảo"
 
 #. xgettext: virtual memory end
-#: ../src/memmaps.cpp:343
+#: ../src/memmaps.cpp:307
 msgid "VM End"
 msgstr "Cuối bộ nhớ ảo"
 
 #. xgettext: virtual memory syze
-#: ../src/memmaps.cpp:345
+#: ../src/memmaps.cpp:309
 msgid "VM Size"
 msgstr "Cỡ bộ nhớ ảo"
 
-#: ../src/memmaps.cpp:346
+#: ../src/memmaps.cpp:310
 msgid "Flags"
 msgstr "Cờ"
 
 #. xgettext: virtual memory offset
-#: ../src/memmaps.cpp:348
+#: ../src/memmaps.cpp:312
 msgid "VM Offset"
-msgstr "Hiệu bộ nhớ ảo"
+msgstr "Offset bộ nhớ ảo"
 
 #. xgettext: memory that has not been modified since
 #. it has been allocated
-#: ../src/memmaps.cpp:351
+#: ../src/memmaps.cpp:315
 msgid "Private clean"
 msgstr "Riêng sạch"
 
 #. xgettext: memory that has been modified since it
 #. has been allocated
-#: ../src/memmaps.cpp:354
+#: ../src/memmaps.cpp:318
 msgid "Private dirty"
 msgstr "Riêng bẩn"
 
 #. xgettext: shared memory that has not been modified
 #. since it has been allocated
-#: ../src/memmaps.cpp:357
+#: ../src/memmaps.cpp:321
 msgid "Shared clean"
-msgstr "Dùng chung sạch"
+msgstr "Chung sạch"
 
 #. xgettext: shared memory that has been modified
 #. since it has been allocated
-#: ../src/memmaps.cpp:360
+#: ../src/memmaps.cpp:324
 msgid "Shared dirty"
-msgstr "Dùng chung bẩn"
+msgstr "Chung bẩn"
 
-#: ../src/memmaps.cpp:362
+#: ../src/memmaps.cpp:326
 msgid "Inode"
-msgstr "Nút thông tin"
+msgstr "Nút"
 
-#: ../src/memmaps.cpp:467
+#: ../src/memmaps.cpp:436
 msgid "Memory Maps"
 msgstr "Sơ đồ bộ nhớ"
 
-#: ../src/memmaps.cpp:479
+#: ../src/memmaps.cpp:448
 #, c-format
 msgid "_Memory maps for process \"%s\" (PID %u):"
-msgstr "Sơ đồ _bộ nhớ cho tiến trình « %s » (PID %u):"
+msgstr "Sơ đồ _bộ nhớ cho tiến trình “%s” (PID %u):"
 
-#: ../src/openfiles.cpp:38
+#: ../src/openfiles.cpp:40
 msgid "file"
 msgstr "tập tin"
 
-#: ../src/openfiles.cpp:40
+#: ../src/openfiles.cpp:42
 msgid "pipe"
 msgstr "ống dẫn"
 
-#: ../src/openfiles.cpp:42
+#: ../src/openfiles.cpp:44
 msgid "IPv6 network connection"
 msgstr "Kết nối mạng IPv6"
 
-#: ../src/openfiles.cpp:44
+#: ../src/openfiles.cpp:46
 msgid "IPv4 network connection"
 msgstr "Kết nối mạng IPv4"
 
-#: ../src/openfiles.cpp:46
+#: ../src/openfiles.cpp:48
 msgid "local socket"
 msgstr "ổ cắm cục bộ"
 
-#: ../src/openfiles.cpp:48
+#: ../src/openfiles.cpp:50
 msgid "unknown type"
 msgstr "kiểu lạ"
 
 #. Translators: "FD" here means "File Descriptor". Please use
 #. a very short translation if possible, and at most
 #. 2-3 characters for it to be able to fit in the UI.
-#: ../src/openfiles.cpp:250
+#: ../src/openfiles.cpp:251
 msgid "FD"
-msgstr "Tả"
+msgstr "MTả"
 
-#: ../src/openfiles.cpp:252
+#: ../src/openfiles.cpp:253
 msgid "Object"
 msgstr "Đối tượng"
 
-#: ../src/openfiles.cpp:346
+#: ../src/openfiles.cpp:336
 #, c-format
 msgid "_Files opened by process \"%s\" (PID %u):"
-msgstr "Các _tập tin được mở bởi tiến trình « %s » (PID %u):"
+msgstr "Các _tập tin được mở bởi tiến trình “%s” (PID %u):"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:1
+msgid "Main window size and position in the form (width, height, xpos, ypos)"
+msgstr "Kích cỡ cửa sổ chính và vị trí của nó theo dạng (rộng, cao, x, y)"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:1
-msgid "Main Window width"
-msgstr "Độ rộng của sổ chính"
-
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:2
-msgid "Main Window height"
-msgstr "Độ cao cửa sổ chính"
-
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:3
-#| msgid "Main Window width"
-msgid "Main Window X position"
-msgstr "Toạ độ X của sổ chính"
-
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:4
-#| msgid "Main Window width"
-msgid "Main Window Y position"
-msgstr "Toạ độ Y của sổ chính"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:2
+msgid "Main Window should open maximized"
+msgstr "Cửa sổ chính mở ở cỡ tối đa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:5
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:3
 msgid "Show process dependencies in tree form"
 msgstr "Hiển thị cách phụ thuộc vào tiến trình, có dạng cây"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:6
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:4
 msgid "Solaris mode for CPU percentage"
 msgstr "Chế độ Solaris cho phần trăm CPU"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:7
-#| msgid ""
-#| "If TRUE, system-monitor operates in 'Solaris mode' where a task's cpu "
-#| "usage is divided by the total number of CPUs. Else it operates in 'Irix "
-#| "mode'."
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:5
 msgid ""
 "If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage "
 "is divided by the total number of CPUs. Otherwise, it operates in 'Irix "
 "mode'."
 msgstr ""
-"Nếu ĐÚNG thì bộ theo dõi hệ thống chạy trong « chế độ Solaris », trong đó độ "
+"Nếu ĐÚNG thì bộ theo dõi hệ thống chạy trong “chế độ Solaris”, trong đó độ "
 "sử dụng bộ xử lý trung tâm của tác vụ được chia cho tổng số CPU. Không thì "
-"nó chạy trong « chế độ Irix »."
+"nó chạy trong “chế độ Irix”."
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:6
+msgid "Show CPU chart as stacked area chart"
+msgstr "Hiển thị đồ thị CPU là dạng biểu đồ vùng chồng"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:7
+msgid ""
+"If TRUE, system-monitor shows the CPU chart as a stacked area chart instead "
+"of a line chart."
+msgstr ""
+"nếu ĐÚNG, theo dõi hệ thống sẽ hiển thị đồ thị CPU dạng biểu đồ vùng xếp "
+"chồng thay cho kiểu đường."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:8
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:8
 msgid "Enable/Disable smooth refresh"
 msgstr "Bật/tắt cập nhật mịn"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:9
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:9
 msgid "Show warning dialog when killing processes"
 msgstr "Hiện hộp thoại cảnh báo khi buộc kết thúc của tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:10
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:10
 msgid "Time in milliseconds between updates of the process view"
 msgstr "Thời gian theo mili giây, giữa hai lần cập nhật ô xem tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:11
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:11
 msgid "Time in milliseconds between updates of the graphs"
 msgstr "Thời gian theo mili giây, giữa hai lần cập nhật đồ thị"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:12
-#| msgid "Whether information about all filesystems should be displayed"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:12
 msgid "Whether information about all file systems should be displayed"
 msgstr "Có nên hiển thị thông tin về mọi hệ thống tập tin hay không"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:13
-#| msgid ""
-#| "Whether to display information about all filesystems (including types "
-#| "like 'autofs' and 'procfs'). Useful for getting a list of all currently "
-#| "mounted filesystems."
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:13
 msgid ""
 "Whether to display information about all file systems (including types like "
 "'autofs' and 'procfs'). Useful for getting a list of all currently mounted "
 "file systems."
 msgstr ""
-"Có nên hiển thị thông tin vê mọi hệ thống tập tin (gồm kiểu hệ thống tập tin "
-"như « autofs » và « procfs ») hay không. Có ích để lấy một danh sách các hệ "
+"Có nên hiển thị thông tin vê mọi hệ thống tập tin (gồm kiểu tập tin hệ thống "
+"như “autofs” và “procfs”) hay không. Có ích để lấy một danh sách các hệ "
 "thống tập tin được gắn kết hiện thời."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:14
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:14
 msgid "Time in milliseconds between updates of the devices list"
 msgstr "Thời gian theo mili giây, giữa hai lần cập nhật danh sách thiết bị"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:15
-msgid ""
-"Determines which processes to show by default. 0 is All, 1 is user, and 2 is "
-"active"
-msgstr ""
-"Quyết định hiển thị tiến trình nào theo mặc định: 0 là tất cả, 1 là người "
-"dùng và 2 là hoạt động"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:15
+msgid "Determines which processes to show."
+msgstr "Xác định xem tiến trình nào cần hiển thị."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:16
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:16
 msgid "Saves the currently viewed tab"
 msgstr "Lưu thanh đang xem hiện thời"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:17
-msgid ""
-"0 for the System Info, 1 for the processes list, 2 for the resources and 3 "
-"for the disks list"
-msgstr ""
-"0\tthông tin hệ thống\n"
-"1\tdanh sách các tiến trình\n"
-"2\tcác tài nguyên\n"
-"3\tdanh sách các đĩa"
-
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:18
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:17
 msgid "CPU colors"
 msgstr "Màu CPU"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:19
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:18
 msgid "Each entry is in the format (CPU#, Hexadecimal color value)"
 msgstr "Mỗi mục trong định dạng (CPU#, giá trị màu thập lục phân)"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:20
-#| msgid "Default graph mem color"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:19
 msgid "Default graph memory color"
 msgstr "Màu bộ nhớ đồ thị mặc định"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:21
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:20
 msgid "Default graph swap color"
-msgstr "Màu trao đổi đồ thị mặc định"
+msgstr "Màu đồ thị tráo đổi mặc định"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:22
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:21
 msgid "Default graph incoming network traffic color"
-msgstr "Màu dữ liệu vào mạng đồ thị mặc định"
+msgstr "Màu đồ thị dữ liệu vào mạng mặc định"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:23
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:22
 msgid "Default graph outgoing network traffic color"
-msgstr "Màu dữ liệu ra mạng đồ thị mặc định"
+msgstr "Màu đồ thị dữ liệu ra mạng mặc định"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:24
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:23
 msgid "Show network traffic in bits"
 msgstr "Hiện lưu lượng mạng theo bit"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:25
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:24
 msgid "Process view sort column"
 msgstr "Sắp xếp cột ô xem tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:26
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:25
 msgid "Process view columns order"
 msgstr "Thứ tự cột ô xem tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:27
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:26
 msgid "Process view sort order"
 msgstr "Thứ tự sắp xếp ô xem tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:28
-#| msgid "Width of process 'name' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:27
 msgid "Width of process 'Name' column"
 msgstr "Độ rộng của cột tên tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:29
-#| msgid "Show process 'name' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:28
 msgid "Show process 'Name' column on startup"
 msgstr "Hiện cột tên tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:30
-#| msgid "Width of process 'owner' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:29
 msgid "Width of process 'User' column"
-msgstr "Độ rộng của cột người dùng"
+msgstr "Độ rộng của cột “Người dùng”"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:31
-#| msgid "Show process 'owner' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:30
 msgid "Show process 'User' column on startup"
-msgstr "Hiện cột người dùng khi khởi chạy"
+msgstr "Hiện cột “Người dùng” khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:32
-#| msgid "Width of process 'status' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:31
 msgid "Width of process 'Status' column"
-msgstr "Độ rộng của cột trạng thái tiến trình"
+msgstr "Độ rộng của cột “Trạng thái” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:33
-#| msgid "Show process 'status' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:32
 msgid "Show process 'Status' column on startup"
 msgstr "Hiện cột trạng thái tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:34
-#| msgid "Width of process 'virtual memory' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:33
 msgid "Width of process 'Virtual Memory' column"
-msgstr "Độ rộng của cột bộ nhớ ảo của tiến trình"
+msgstr "Độ rộng của cột “Bộ nhớ ảo” của tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:35
-#| msgid "Show process 'virtual memory' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:34
 msgid "Show process 'Virtual Memory' column on startup"
-msgstr "Hiện cột bộ nhớ ảo của tiến trình khi khởi chạy"
+msgstr "Hiện cột “Bộ nhớ ảo” của tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:36
-#| msgid "Width of process 'resident memory' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:35
 msgid "Width of process 'Resident Memory' column"
-msgstr "Độ rộng của cột bộ nhớ ở của tiến trình"
+msgstr "Độ rộng của cột “Bộ nhớ thường trú” của tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:37
-#| msgid "Show process 'resident memory' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:36
 msgid "Show process 'Resident Memory' column on startup"
-msgstr "Hiện cột bộ nhớ ở của tiến trình khi khởi chạy"
+msgstr "Hiện cột “Bộ nhớ thường trú” của tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:38
-#| msgid "Width of process 'writable memory' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:37
 msgid "Width of process 'Writable Memory' column"
-msgstr "Độ rộng của cột bộ nhớ ghi được của tiến trình"
+msgstr "Độ rộng của cột “Bộ nhớ ghi được” của tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:39
-#| msgid "Show process 'writable memory' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:38
 msgid "Show process 'Writable Memory' column on startup"
-msgstr "Hiện cột bộ nhớ ghi được của tiến trình khi khởi chạy"
+msgstr "Hiện cột “Bộ nhớ ghi được” của tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:40
-#| msgid "Width of process 'shared memory' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:39
 msgid "Width of process 'Shared Memory' column"
 msgstr "Độ rộng của cột bộ nhớ dùng chung của tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:41
-#| msgid "Show process 'shared memory' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:40
 msgid "Show process 'Shared Memory' column on startup"
-msgstr "Hiện cột bộ nhớ dùng chung của tiến trình khi khởi chạy"
+msgstr "Hiện cột “Bộ nhớ dùng chung” của tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:42
-#| msgid "Width of process 'X server memory' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:41
 msgid "Width of process 'X Server Memory' column"
-msgstr "Độ rộng của cột bộ nhớ trình phục vụ X tiến trình"
+msgstr "Độ rộng của cột “Bộ nhớ trình phục vụ X” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:43
-#| msgid "Show process 'X server memory' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:42
 msgid "Show process 'X Server Memory' column on startup"
-msgstr "Hiện cột bộ nhớ trình phục vụ X tiến trình khi khởi chạy"
+msgstr "Hiện cột “Bộ nhớ trình phục vụ X” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:45
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:44
 #, no-c-format
 msgid "Width of process 'CPU %' column"
-msgstr "Độ rộng của cột phần tram CPU tiến trình"
+msgstr "Độ rộng của cột “Phần trăm CPU” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:47
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:46
 #, no-c-format
 msgid "Show process 'CPU %' column on startup"
-msgstr "Hiện cột phần tram CPU tiến trình khi khởi chạy"
+msgstr "Hiện cột “Phần trăm CPU” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:48
-#| msgid "Width of process 'CPU time' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:47
 msgid "Width of process 'CPU Time' column"
 msgstr "Độ rộng của cột thời gian CPU tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:49
-#| msgid "Show process 'CPU time' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:48
 msgid "Show process 'CPU Time' column on startup"
 msgstr "Hiện cột thời gian CPU tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:50
-#| msgid "Width of process 'start time' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:49
 msgid "Width of process 'Started' column"
 msgstr "Độ rộng của cột giờ bắt đầu tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:51
-#| msgid "Show process 'start time' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:50
 msgid "Show process 'Started' column on startup"
 msgstr "Hiện cột giờ bắt đầu tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:52
-#| msgid "Width of process 'nice' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:51
 msgid "Width of process 'Nice' column"
 msgstr "Độ rộng của cột ưu tiên tài nguyên tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:53
-#| msgid "Show process 'nice' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:52
 msgid "Show process 'Nice' column on startup"
-msgstr "Hiện cột ưu tiên tài nguyên tiến trình khi khởi chạy"
+msgstr "Hiện cột “Ưu tiên” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:54
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:53
 msgid "Width of process 'PID' column"
-msgstr "Độ rộng của cột PID tiến trình"
+msgstr "Độ rộng của cột “Mã số tiến trình”"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:55
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:54
 msgid "Show process 'PID' column on startup"
-msgstr "Hiện cột PID tiến trình khi khởi chạy"
+msgstr "Hiện cột “Mã số tiến trình” khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:56
-#| msgid "Width of process 'SELinux security context' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:55
 msgid "Width of process 'SELinux Security Context' column"
-msgstr "Độ rộng của cột ngữ cảnh bảo mật SELinux tiến trình"
+msgstr "Độ rộng của cột “Ngữ cảnh bảo mật SELinux” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:57
-#| msgid "Show process 'SELinux security context' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:56
 msgid "Show process 'SELinux Security Context' column on startup"
-msgstr "Hiện cột ngữ cảnh bảo mật SELinux tiến trình khi khởi chạy"
+msgstr "Hiện cột “Ngữ cảnh bảo mật SELinux” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:58
-#| msgid "Width of process 'nice' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:57
 msgid "Width of process 'Command Line' column"
-msgstr "Độ rộng của cột 'Dòng lệnh' tiến trình"
+msgstr "Độ rộng của cột “Dòng lệnh” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:59
-#| msgid "Show process 'nice' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:58
 msgid "Show process 'Command Line' column on startup"
-msgstr "Độ rộng của cột 'Dòng lệnh' tiến trình khi khởi chạy"
+msgstr "Độ rộng của cột “Dòng lệnh” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:60
-#| msgid "Width of process 'owner' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:59
 msgid "Width of process 'Memory' column"
-msgstr "Độ rộng của cột bộ nhớ tiến trình"
+msgstr "Độ rộng của cột “Bộ nhớ” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:61
-#| msgid "Show process 'owner' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:60
 msgid "Show process 'Memory' column on startup"
-msgstr "Hiện cột bộ nhớ tiến trình khi khởi chạy"
+msgstr "Hiện cột “Bộ nhớ” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:62
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:61
 msgid "Width of process 'Waiting Channel' column"
-msgstr "Độ rộng của cột « Kênh đợi » tiến trình"
+msgstr "Độ rộng của cột “Kênh đợi” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:63
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:62
 msgid "Show process 'Waiting Channel' column on startup"
-msgstr "Hiện cột « Kênh đợi » tiến trình khi khởi chạy"
+msgstr "Hiện cột “Kênh đợi” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:64
-#| msgid "Width of process 'owner' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:63
 msgid "Width of process 'Control Group' column"
-msgstr "Độ rộng của cột nhóm điều khiển tiến trình"
+msgstr "Độ rộng của cột “Nhóm điều khiển” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:65
-#| msgid "Show process 'owner' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:64
 msgid "Show process 'Control Group' column on startup"
-msgstr "Hiện cột nhóm điều khiển tiến trình khi khởi chạy"
+msgstr "Hiện cột “Nhóm điều khiển” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:66
-#| msgid "Width of process 'nice' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:65
 msgid "Width of process 'Unit' column"
-msgstr "Độ rộng của cột đơn vị tiến trình"
+msgstr "Độ rộng của cột “Đơn vị” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:67
-#| msgid "Show process 'nice' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:66
 msgid "Show process 'Unit' column on startup"
-msgstr "Hiện cột đơn vị tiến trình khi khởi chạy"
+msgstr "Hiện cột “Đơn vị” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:68
-#| msgid "Width of process 'owner' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:67
 msgid "Width of process 'Session' column"
-msgstr "Độ rộng của cột phiên làm việc tiến trình"
+msgstr "Độ rộng của cột “Phiên làm việc” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:69
-#| msgid "Show process 'owner' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:68
 msgid "Show process 'Session' column on startup"
-msgstr "Hiện cột phiên làm việc tiến trình khi khởi chạy"
+msgstr "Hiện cột “Phiên làm việc” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:70
-#| msgid "Width of process 'status' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:69
 msgid "Width of process 'Seat' column"
-msgstr "Độ rộng của cột ghế tiến trình"
+msgstr "Độ rộng của cột “Ghế” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:71
-#| msgid "Show process 'status' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:70
 msgid "Show process 'Seat' column on startup"
-msgstr "Hiện cột ghế tiến trình khi khởi chạy"
+msgstr "Hiện cột “Ghế” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:72
-#| msgid "Width of process 'owner' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:71
 msgid "Width of process 'Owner' column"
-msgstr "Độ rộng của cột người sở hữu tiến trình"
+msgstr "Độ rộng của cột “Người sở hữu” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:73
-#| msgid "Show process 'owner' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:72
 msgid "Show process 'Owner' column on startup"
-msgstr "Hiện cột người sở hữu tiến trình khi khởi chạy"
+msgstr "Hiện cột “Người sở hữu” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:74
-#| msgid "Width of process 'owner' column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:73
 msgid "Width of process 'Priority' column"
-msgstr "Độ rộng của cột độ ưu tiên tiến trình"
+msgstr "Độ rộng của cột “Độ ưu tiên” tiến trình"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:75
-#| msgid "Show process 'owner' column on startup"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:74
 msgid "Show process 'Priority' column on startup"
-msgstr "Hiện cột độ ưu tiên tiến trình khi khởi chạy"
+msgstr "Hiện cột “Độ ưu tiên” tiến trình khi khởi chạy"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:76
-#| msgid "Process view sort column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:75
 msgid "Disk view sort column"
 msgstr "Sắp xếp cột ô xem đĩa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:77
-#| msgid "Process view sort order"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:76
 msgid "Disk view sort order"
 msgstr "Thứ tự sắp xếp ô xem đĩa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:78
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:77
 msgid "Disk view columns order"
 msgstr "Thứ tự cột ô xem đĩa"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:79
-#| msgid "Process view sort column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:78
+msgid "Width of disk view 'Device' column"
+msgstr "Độ rộng của cột “Thiết bị” đĩa"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:79
+msgid "Show disk view 'Device' column on startup"
+msgstr "Hiện cột xem “Thiết bị” đĩa khi khởi chạy"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:80
+msgid "Width of disk view 'Directory' column"
+msgstr "Độ rộng của cột “Thư mục” đĩa"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:81
+msgid "Show disk view 'Directory' column on startup"
+msgstr "Hiện cột xem “Thư mục” đĩa khi khởi chạy"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:82
+msgid "Width of disk view 'Type' column"
+msgstr "Độ rộng của cột “Kiểu” đĩa"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:83
+msgid "Show disk view 'Type' column on startup"
+msgstr "Hiện cột xem “Kiểu” đĩa khi khởi chạy"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:84
+msgid "Width of disk view 'Total' column"
+msgstr "Độ rộng của cột “Tổng” đĩa"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:85
+msgid "Show disk view 'Total' column on startup"
+msgstr "Hiện cột xem “Tổng cộng” đĩa khi khởi chạy"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:86
+msgid "Width of disk view 'Free' column"
+msgstr "Độ rộng của cột “Chỗ trống” đĩa"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:87
+msgid "Show disk view 'Free' column on startup"
+msgstr "Hiện cột xem “Chỗ trống” đĩa khi khởi chạy"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:88
+msgid "Width of disk view 'Available' column"
+msgstr "Độ rộng của cột “Sẵn dùng” đĩa"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:89
+msgid "Show disk view 'Available' column on startup"
+msgstr "Hiện cột xem “Sẵn dùng” đĩa khi khởi chạy"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:90
+msgid "Width of disk view 'Used' column"
+msgstr "Độ rộng của cột “Dùng” đĩa"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:91
+msgid "Show disk view 'Used' column on startup"
+msgstr "Hiện cột xem “Đã dùng” đĩa khi khởi chạy"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:92
 msgid "Memory map sort column"
 msgstr "Sắp xếp cột ô xem bộ nhớ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:80
-#| msgid "Memory and Swap History"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:93
 msgid "Memory map sort order"
 msgstr "Thứ tự cột ô xem bộ nhớ"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:81
-#| msgid "Process view sort column"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:94
 msgid "Open files sort column"
 msgstr "Cột sắp xếp mở tập tin"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:82
-#| msgid "Process view sort order"
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:95
 msgid "Open files sort order"
 msgstr "Thứ tự sắp xếp mở tập tin"
 
-#: ../src/procactions.cpp:76
+#: ../src/prefsdialog.cpp:170
+msgid "Icon"
+msgstr "Biểu tượng"
+
+#: ../src/procactions.cpp:75
 #, c-format
-#| msgid ""
-#| "Cannot change the priority of process with pid %d to %d.\n"
-#| "%s"
 msgid ""
 "Cannot change the priority of process with PID %d to %d.\n"
 "%s"
@@ -1083,11 +1032,8 @@
 "Không thể thay đổi độ ưu tiên của tiến trình có PID %d thành %d.\n"
 "%s"
 
-#: ../src/procactions.cpp:156
+#: ../src/procactions.cpp:153
 #, c-format
-#| msgid ""
-#| "Cannot kill process with pid %d with signal %d.\n"
-#| "%s"
 msgid ""
 "Cannot kill process with PID %d with signal %d.\n"
 "%s"
@@ -1095,391 +1041,382 @@
 "Không thể buộc kết thúc tiến trình có PID %d với tín hiệu %d.\n"
 "%s"
 
-#. xgettext: primary alert message
-#: ../src/procdialogs.cpp:77
+#. xgettext: primary alert message for killing single process
+#: ../src/procdialogs.cpp:75
+#, c-format
+msgid "Are you sure you want to kill the selected process “%s” (PID: %u)?"
+msgstr ""
+"Bạn có thực sự muốn buộc kết thúc tiến trình đã chọn “%s” (PID: %u) không?"
+
+#. xgettext: primary alert message for ending single process
+#: ../src/procdialogs.cpp:80
+#, c-format
+msgid "Are you sure you want to end the selected process “%s” (PID: %u)?"
+msgstr "Bạn có thực sự muốn kết thúc tiến trình đã chọn “%s” (PID: %u) không?"
+
+#. xgettext: primary alert message for killing multiple processes
+#: ../src/procdialogs.cpp:87
+#, c-format
+msgid "Are you sure you want to kill the selected process?"
+msgid_plural "Are you sure you want to kill the %d selected processes?"
+msgstr[0] "Bạn có thực sự muốn giết  %d tiến trình đã chọn không?"
+
+#. xgettext: primary alert message for ending multiple processes
+#: ../src/procdialogs.cpp:91
 #, c-format
-#| msgid "Kill the selected process?"
-msgid "Kill the selected process »%s« (PID: %u)?"
-msgstr "Ép kết thúc tiến trình đã chọn »%s« (PID: %u) không?"
+msgid "Are you sure you want to end the selected process?"
+msgid_plural "Are you sure you want to end the %d selected processes?"
+msgstr[0] "Bạn có thực sự muốn chấm dứt %d tiến trình đã chọn không?"
 
 #. xgettext: secondary alert message
-#: ../src/procdialogs.cpp:81
-#| msgid ""
-#| "Killing a process may destroy data, break the session or introduce a "
-#| "security risk. Only unresponding processes should be killed."
+#: ../src/procdialogs.cpp:98 ../src/procdialogs.cpp:104
 msgid ""
 "Killing a process may destroy data, break the session or introduce a "
 "security risk. Only unresponsive processes should be killed."
 msgstr ""
 "Việc ép buộc kết thúc tiến trình có thể hủy dữ liệu, hỏng phiên chạy hoặc "
-"rủi ro bảo mật. Chỉ nên buộc kết thúc tiến trình không đáp ứng thôi."
+"rủi ro bảo mật. Chỉ nên buộc kết thúc tiến trình bị treo, không đáp ứng thôi."
 
-#. xgettext: primary alert message
-#: ../src/procdialogs.cpp:88
-#, c-format
-#| msgid "End the selected process?"
-msgid "End the selected process »%s« (PID: %u)?"
-msgstr "Kết thúc tiến trình đã chọn »%s« (PID: %u) không?"
+#: ../src/procdialogs.cpp:101
+msgid "_Kill Process"
+msgid_plural "_Kill Processes"
+msgstr[0] "Buộc _kết thúc tiến trình"
 
-#. xgettext: secondary alert message
-#: ../src/procdialogs.cpp:92
-#| msgid ""
-#| "Ending a process may destroy data, break the session or introduce a "
-#| "security risk. Only unresponding processes should be ended."
-msgid ""
-"Ending a process may destroy data, break the session or introduce a security "
-"risk. Only unresponsive processes should be ended."
-msgstr ""
-"Việc kết thúc tiến trình có thể hủy dữ liệu, hỏng phiên chạy hoặc rủi ro bảo "
-"mật. Chỉ nên kết thúc tiến trình không đáp ứng thôi."
+#: ../src/procdialogs.cpp:107
+msgid "_End Process"
+msgid_plural "_End Processes"
+msgstr[0] "Kết _thúc tiến trình"
 
-#: ../src/procdialogs.cpp:130
+#: ../src/procdialogs.cpp:188
 #, c-format
-#| msgid "(Low Priority)"
-msgid "(%s Priority)"
-msgstr "(Độ ưu tiên %s)"
+msgid "Change Priority of Process “%s” (PID: %u)"
+msgstr "Thay đổi độ ưu tiên của tiến trìn “%s” (PID %u)"
 
-#: ../src/procdialogs.cpp:175
+#: ../src/procdialogs.cpp:191
 #, c-format
-#| msgid "_Memory maps for process \"%s\" (PID %u):"
-msgid "Change Priority of Process »%s« (PID: %u)"
-msgstr "Thay đổi độ ưu tiên của tiến trìn »%s« (PID %u)"
+msgid "Change Priority of the selected process"
+msgid_plural "Change Priority of %d selected processes"
+msgstr[0] "Thay đổi mức ưu tiên của %d tiến trình"
 
-#: ../src/procdialogs.cpp:193
+#: ../src/procdialogs.cpp:210
 msgid "Note:"
 msgstr "Ghi chú:"
 
-#: ../src/procdialogs.cpp:194
+#: ../src/procdialogs.cpp:211
 msgid ""
 "The priority of a process is given by its nice value. A lower nice value "
 "corresponds to a higher priority."
 msgstr ""
-"Độ ưu tiên của tiến trình được thể hiện bởi giá trị « nice » (dễ thương). "
-"Giá trị thấp hơn tương ứng với độ ưu tiên cao hơn."
-
-#: ../src/procdialogs.cpp:418
-msgid "Icon"
-msgstr "Biểu tượng"
-
-#: ../src/procman.cpp:668
-msgid "A simple process and system monitor."
-msgstr "Một công cụ đơn giản để theo dõi hệ thống và các tiến trình đang chạy."
+"Độ ưu tiên của tiến trình được thể hiện bởi giá trị “nice”. Giá trị thấp hơn "
+"tương ứng với độ ưu tiên cao hơn."
 
-#: ../src/procproperties.cpp:104 ../src/util.cpp:420
+#: ../src/procproperties.cpp:55 ../src/procproperties.cpp:106
+#: ../src/procproperties.cpp:109 ../src/util.cpp:432
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/procproperties.cpp:130 ../src/proctable.cpp:236
+#: ../src/procproperties.cpp:89 ../src/proctable.cpp:322
 msgid "Process Name"
 msgstr "Tên tiến trình"
 
-#: ../src/procproperties.cpp:131 ../src/proctable.cpp:237
+#: ../src/procproperties.cpp:90 ../src/proctable.cpp:323
 msgid "User"
 msgstr "Người dùng"
 
-#: ../src/procproperties.cpp:132 ../src/proctable.cpp:238
+#: ../src/procproperties.cpp:91 ../src/proctable.cpp:324
 msgid "Status"
 msgstr "Trạng thái"
 
-#: ../src/procproperties.cpp:134 ../src/proctable.cpp:239
+#: ../src/procproperties.cpp:93 ../src/proctable.cpp:325
 msgid "Virtual Memory"
 msgstr "Bộ nhớ ảo"
 
-#: ../src/procproperties.cpp:135 ../src/proctable.cpp:240
+#: ../src/procproperties.cpp:94 ../src/proctable.cpp:326
 msgid "Resident Memory"
-msgstr "Bộ nhớ ở"
+msgstr "Bộ nhớ thường trú"
 
-#: ../src/procproperties.cpp:136 ../src/proctable.cpp:241
+#: ../src/procproperties.cpp:95 ../src/proctable.cpp:327
 msgid "Writable Memory"
 msgstr "Bộ nhớ ghi được"
 
-#: ../src/procproperties.cpp:137 ../src/proctable.cpp:242
+#: ../src/procproperties.cpp:96 ../src/proctable.cpp:328
 msgid "Shared Memory"
-msgstr "Bộ nhớ dùng chung"
+msgstr "Bộ nhớ chia sẻ"
 
-#: ../src/procproperties.cpp:138 ../src/proctable.cpp:243
+#: ../src/procproperties.cpp:98 ../src/proctable.cpp:329
 msgid "X Server Memory"
 msgstr "Bộ nhớ trình phục vụ X"
 
-#: ../src/procproperties.cpp:140 ../src/proctable.cpp:245
+#: ../src/procproperties.cpp:101 ../src/proctable.cpp:331
 msgid "CPU Time"
 msgstr "Thời gian CPU"
 
-#: ../src/procproperties.cpp:140
+#: ../src/procproperties.cpp:101
 #, c-format
-#| msgid "%u second"
-#| msgid_plural "%u seconds"
 msgid "%lld second"
 msgid_plural "%lld seconds"
 msgstr[0] "%lld giây"
 
-#: ../src/procproperties.cpp:141 ../src/proctable.cpp:246
+#: ../src/procproperties.cpp:102 ../src/proctable.cpp:332
 msgid "Started"
 msgstr "Đã bắt đầu"
 
-# Name: don't translate / Tên: đừng dịch
-#: ../src/procproperties.cpp:142 ../src/proctable.cpp:247
+#: ../src/procproperties.cpp:103 ../src/proctable.cpp:333
 msgid "Nice"
-msgstr "Nice"
+msgstr "Ưu tiên"
 
-#: ../src/procproperties.cpp:143 ../src/proctable.cpp:261
-#| msgid "(Low Priority)"
+#: ../src/procproperties.cpp:104 ../src/proctable.cpp:347
 msgid "Priority"
 msgstr "Độ ưu tiên"
 
-#: ../src/procproperties.cpp:144 ../src/proctable.cpp:248
+#: ../src/procproperties.cpp:105 ../src/proctable.cpp:334
 msgid "ID"
 msgstr "ID"
 
-#: ../src/procproperties.cpp:145 ../src/proctable.cpp:249
+#: ../src/procproperties.cpp:106 ../src/proctable.cpp:335
 msgid "Security Context"
 msgstr "Ngữ cảnh bảo mật"
 
-#: ../src/procproperties.cpp:146 ../src/proctable.cpp:250
+#: ../src/procproperties.cpp:107 ../src/proctable.cpp:336
 msgid "Command Line"
 msgstr "Dòng lệnh"
 
 #. xgettext: combined noun, the function the process is waiting in, see wchan ps(1)
-#: ../src/procproperties.cpp:147 ../src/proctable.cpp:253
+#: ../src/procproperties.cpp:108 ../src/proctable.cpp:339
 msgid "Waiting Channel"
 msgstr "Kênh đợi"
 
-#: ../src/procproperties.cpp:258
-#| msgid "Processes"
-msgid "Process Properties"
-msgstr "Thuộc tính tiến trình"
-
-#: ../src/procproperties.cpp:278
-#, c-format
-#| msgid "_Files opened by process \"%s\" (PID %u):"
-msgid "Properties of process \"%s\" (PID %u):"
-msgstr "Thuộc tính tiến trình \"%s\" (PID %u):"
+#: ../src/procproperties.cpp:109 ../src/proctable.cpp:340
+msgid "Control Group"
+msgstr "Nhóm điều khiển"
+
+#: ../src/procproperties.cpp:221
+#, c-format
+msgid "%s (PID %u)"
+msgstr "%s (PID %u)"
 
-#: ../src/proctable.cpp:244
+#: ../src/proctable.cpp:330
 #, no-c-format
 msgid "% CPU"
 msgstr "% CPU"
 
-#: ../src/proctable.cpp:254
-msgid "Control Group"
-msgstr "Nhóm điều khiển"
-
-#: ../src/proctable.cpp:255
+#: ../src/proctable.cpp:341
 msgid "Unit"
 msgstr "Đơn vị"
 
-#: ../src/proctable.cpp:256
+#: ../src/proctable.cpp:342
 msgid "Session"
 msgstr "Phiên làm việc"
 
 #. TRANSLATORS: Seat = i.e. the physical seat the session of the process belongs to, only
 #. for multi-seat environments. See http://en.wikipedia.org/wiki/Multiseat_configuration
-#: ../src/proctable.cpp:259
+#: ../src/proctable.cpp:345
 msgid "Seat"
 msgstr "Ghế"
 
-#: ../src/proctable.cpp:260
+#: ../src/proctable.cpp:346
 msgid "Owner"
 msgstr "Chủ"
 
-#: ../src/proctable.cpp:1078
-#, c-format
-msgid "Load averages for the last 1, 5, 15 minutes: %0.2f, %0.2f, %0.2f"
-msgstr ""
-"Trọng tải trung bình trong vòng 1, 5, 15 phút trước: %0.2f, %0.2f, %0.2f"
-
-#. Translators: The first string parameter is release version (codename),
-#. * the second one is the architecture, 32 or 64-bit
-#: ../src/sysinfo.cpp:78
-#, c-format
-#| msgid "Release %s"
-msgid "Release %s %s"
-msgstr "Bản phát hành %s %s"
-
-#. translators: This is the type of architecture, for example:
-#. * "64-bit" or "32-bit"
-#: ../src/sysinfo.cpp:115
-#, c-format
-msgid "%d-bit"
-msgstr "%d-bit"
-
-#: ../src/sysinfo.cpp:734
-#, c-format
-msgid "Kernel %s"
-msgstr "Hạt nhân %s"
-
-#: ../src/sysinfo.cpp:746
-#, c-format
-msgid "GNOME %s"
-msgstr "GNOME %s"
-
-#. hardware section
-#: ../src/sysinfo.cpp:759
-#| msgid "<b>Hardware</b>"
-msgid "Hardware"
-msgstr "Phần cứng"
-
-#: ../src/sysinfo.cpp:764
-msgid "Memory:"
-msgstr "Bộ nhớ:"
-
-#: ../src/sysinfo.cpp:769
-msgid "Processor:"
-msgstr "Bộ xử lý:"
-
-#. disk space section
-#: ../src/sysinfo.cpp:778
-#| msgid "<b>System Status</b>"
-msgid "System Status"
-msgstr "Trạng thái hệ thống"
-
-#: ../src/sysinfo.cpp:784
-msgid "Available disk space:"
-msgstr "Chỗ trống trên đĩa:"
-
-#: ../src/util.cpp:30
+#: ../src/util.cpp:27
 msgid "Running"
 msgstr "Đang chạy"
 
-#: ../src/util.cpp:34
+#: ../src/util.cpp:31
 msgid "Stopped"
 msgstr "Bị dừng"
 
-#: ../src/util.cpp:38
+#: ../src/util.cpp:35
 msgid "Zombie"
 msgstr "Ma"
 
-#: ../src/util.cpp:42
+#: ../src/util.cpp:39
 msgid "Uninterruptible"
 msgstr "Không thể ngắt"
 
-#: ../src/util.cpp:46
+#: ../src/util.cpp:43
 msgid "Sleeping"
 msgstr "Ngủ"
 
 #. xgettext: weeks, days
-#: ../src/util.cpp:101
+#: ../src/util.cpp:98
 #, c-format
 msgid "%uw%ud"
 msgstr "%ut%un"
 
 #. xgettext: days, hours (0 -> 23)
-#: ../src/util.cpp:105
+#: ../src/util.cpp:102
 #, c-format
 msgid "%ud%02uh"
 msgstr "%un%02ug"
 
 #. xgettext: hours (0 -> 23), minutes, seconds
-#: ../src/util.cpp:109
+#: ../src/util.cpp:106
 #, c-format
 msgid "%u:%02u:%02u"
 msgstr "%u:%02u:%02u"
 
 #. xgettext: minutes, seconds, centiseconds
-#: ../src/util.cpp:112
+#: ../src/util.cpp:109
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/util.cpp:166
+#: ../src/util.cpp:164
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../src/util.cpp:167
+#: ../src/util.cpp:165
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../src/util.cpp:168
+#: ../src/util.cpp:166
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../src/util.cpp:169
+#: ../src/util.cpp:167
 #, c-format
-#| msgid "%.1f KiB"
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../src/util.cpp:170
+#: ../src/util.cpp:168
 #, c-format
 msgid "%.3g kbit"
 msgstr "%.3g kbit"
 
-#: ../src/util.cpp:171
+#: ../src/util.cpp:169
 #, c-format
 msgid "%.3g Mbit"
 msgstr "%.3g Mbit"
 
-#: ../src/util.cpp:172
+#: ../src/util.cpp:170
 #, c-format
 msgid "%.3g Gbit"
 msgstr "%.3g Gbit"
 
-#: ../src/util.cpp:173
+#: ../src/util.cpp:171
 #, c-format
 msgid "%.3g Tbit"
 msgstr "%.3g Tbit"
 
-#: ../src/util.cpp:188
+#: ../src/util.cpp:186
 #, c-format
-#| msgid "%u byte"
-#| msgid_plural "%u bytes"
 msgid "%u bit"
 msgid_plural "%u bits"
 msgstr[0] "%u bit"
 
-#: ../src/util.cpp:189
+#: ../src/util.cpp:187
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 
+#: ../src/util.cpp:230
+msgid "Very High Priority"
+msgstr "Độ ưu tiên rất cao"
+
+#: ../src/util.cpp:232
+msgid "High Priority"
+msgstr "Độ ưu tiên cao"
+
+#: ../src/util.cpp:234
+msgid "Normal Priority"
+msgstr "Độ ưu tiên thường"
+
+#: ../src/util.cpp:236
+msgid "Low Priority"
+msgstr "Độ ưu tiên thấp"
+
+#: ../src/util.cpp:238
+msgid "Very Low Priority"
+msgstr "Độ ưu tiên rất thấp"
+
 #. xgettext: rate, 10MiB/s or 10Mbit/s
-#: ../src/util.cpp:585
+#: ../src/util.cpp:630
 #, c-format
 msgid "%s/s"
 msgstr "%s/g"
 
-#~ msgid "Default graph cpu color"
-#~ msgstr "Màu CPU đồ thị mặc định"
+#~ msgid "System"
+#~ msgstr "Hệ thống"
+
+#~ msgid "Sent"
+#~ msgstr "Gửi"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "_Name contains:"
+#~ msgstr "Tê_n chứa:"
+
+#~ msgid "C_lear"
+#~ msgstr "_Xoá"
+
+#~ msgid "S_earch results:"
+#~ msgstr "_Kết quả tìm:"
+
+#~ msgid "Show the System tab"
+#~ msgstr "Hiện thẻ hệ thống"
+
+#~ msgid "_Monitor"
+#~ msgstr "Th_eo dõi"
+
+#~ msgid "_Edit"
+#~ msgstr "_Sửa"
+
+#~ msgid "_View"
+#~ msgstr "_Xem"
+
+#~ msgid "Search for _Open Files"
+#~ msgstr "Tìm tập tin _mở"
+
+#~ msgid "Quit the program"
+#~ msgstr "Thoạt khỏi chương trình"
+
+#~ msgid "_Stop Process"
+#~ msgstr "_Dừng tiến trình"
+
+#~ msgid "Stop process"
+#~ msgstr "Dừng tiến trình"
 
-#~ msgid "Show process 'arguments' column on startup"
-#~ msgstr "Hiện cột đối số tiến trình khi khởi chạy"
+#~ msgid "Continue process if stopped"
+#~ msgstr "Tiếp tục tiến trình nếu bị dừng."
 
-#~ msgid "Show process 'estimated memory usage' column on startup"
-#~ msgstr "Hiện cột cách sử dụng bộ nhớ ước lượng khi khởi chạy"
+#~ msgid "Force process to finish normally"
+#~ msgstr "Ép buộc tiến trình kết thúc một cách chuẩn"
 
-#~ msgid "Width of process 'arguments' column"
-#~ msgstr "Độ rộng của cột đối số tiến trình"
+#~ msgid "Force process to finish immediately"
+#~ msgstr "Ép buộc tiến trình kết thúc ngay"
 
-#~ msgid "Width of process 'estimated memory usage' column"
-#~ msgstr "Độ rộng của cột cách sử dụng bộ nhớ ước lượng tiến trình"
+#~ msgid "Refresh the process list"
+#~ msgstr "Làm tươi danh sách các tiến trình"
 
-#~ msgid "_Change Priority..."
-#~ msgstr "Đổi độ ư_u tiên..."
+#~ msgid "Open the memory maps associated with a process"
+#~ msgstr "Mở các sơ đồ bộ nhớ tượng ứng với một tiến trình nào đó"
 
-#~ msgid "(High Priority)"
-#~ msgstr "(Độ ưu tiên cao)"
+#~ msgid "View the files opened by a process"
+#~ msgstr "Xem các tập tin được mở bởi một tiến trình nào đó"
 
-#~ msgid "(Normal Priority)"
-#~ msgstr "(Độ ưu tiên chuẩn)"
+#~ msgid "View additional information about a process"
+#~ msgstr "Xem thông tin bổ sung về tiến trình"
 
-#~ msgid "(Very Low Priority)"
-#~ msgstr "(Độ ưu tiên rất thấp)"
+#~ msgid "_Contents"
+#~ msgstr "Mục lụ_c"
 
-#~ msgid "Solaris mode"
-#~ msgstr "Chế độ Solaris"
+#~ msgid "Open the manual"
+#~ msgstr "Mở sổ tay"
 
-#~ msgid "File system i_nformation shown in list:"
-#~ msgstr "Thô_ng tin hệ thống tập tin được hiển thị trong danh sách:"
+#~ msgid "About this application"
+#~ msgstr "Giới thiệu ứng dụng này"
 
-#~ msgid "Unknown CPU model"
-#~ msgstr "Không biết mô hình CPU"
+#~ msgid "Show parent/child relationship between processes"
+#~ msgstr "Hiển thị quan hệ mẹ/con giữa các tiến trình"
 
-#~ msgid "Processor %d:"
-#~ msgstr "Bộ xử lý %d:"
+#~ msgid "Show active processes"
+#~ msgstr "Hiện các tiến trình hoạt động"
 
-#~ msgid "<i>N/A</i>"
-#~ msgstr "<i>—</i>"
+#~ msgid "Show all processes"
+#~ msgstr "Hiện mọi tiến trình"
Binary files /tmp/aWNcf0o8Aa/gnome-system-monitor-3.14.1/scripts/gsm-kill and /tmp/BW2SffH0Qb/gnome-system-monitor-3.15.4/scripts/gsm-kill differ
Binary files /tmp/aWNcf0o8Aa/gnome-system-monitor-3.14.1/scripts/gsm-renice and /tmp/BW2SffH0Qb/gnome-system-monitor-3.15.4/scripts/gsm-renice differ
diff -Nru gnome-system-monitor-3.14.1/src/application.h gnome-system-monitor-3.15.4/src/application.h
--- gnome-system-monitor-3.14.1/src/application.h	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/application.h	2015-01-06 15:44:07.000000000 +0000
@@ -5,11 +5,14 @@
 #include <gtkmm.h>
 #include <glibtop/cpu.h>
 
+#include <algorithm>
+
 struct ProcInfo;
 struct LoadGraph;
 
 #include "smooth_refresh.h"
 #include "prettytable.h"
+#include "util.h"
 
 static const unsigned MIN_UPDATE_INTERVAL =   1 * 1000;
 static const unsigned MAX_UPDATE_INTERVAL = 100 * 1000;
@@ -24,7 +27,26 @@
 
 
 struct ProcConfig
+  : private procman::NonCopyable
 {
+    ProcConfig()
+      : update_interval(0),
+	graph_update_interval(0),
+	disks_update_interval(0),
+	mem_color(),
+	swap_color(),
+	net_in_color(),
+	net_out_color(),
+	bg_color(),
+	frame_color(),
+	num_cpus(0),
+	solaris_mode(false),
+	draw_stacked(false),
+	network_in_bits(false)
+    {
+      std::fill(&this->cpu_color[0], &this->cpu_color[GLIBTOP_NCPU], GdkRGBA());
+    }
+
     int             update_interval;
     int             graph_update_interval;
     int             disks_update_interval;
@@ -44,10 +66,32 @@
 
 
 struct MutableProcInfo
+  : private procman::NonCopyable
 {
+
 MutableProcInfo()
-: status(0)
-    { }
+  : user(),
+    vmsize(0UL),
+    memres(0UL),
+    memshared(0UL),
+    memwritable(0UL),
+    mem(0UL),
+#ifdef HAVE_WNCK
+    memxserver(0UL),
+#endif
+    start_time(0UL),
+    cpu_time(0ULL),
+    status(0U),
+    pcpu(0U),
+    nice(0),
+    cgroup_name(NULL),
+    unit(NULL),
+    session(NULL),
+    seat(NULL),
+    owner()
+    {
+      wchan[0] = '\0';
+    }
 
     std::string user;
 
@@ -124,8 +168,8 @@
 
     gchar           *security_context;
 
-    const guint     pid;
-    guint           ppid;
+    const pid_t     pid;
+    pid_t           ppid;
     guint           uid;
 
 // private:
@@ -139,7 +183,8 @@
 
 
 
-class GsmApplication : public Gtk::Application
+class GsmApplication : public Gtk::Application, private procman::NonCopyable
+
 {
 private:
     void load_settings();
diff -Nru gnome-system-monitor-3.14.1/src/argv.cpp gnome-system-monitor-3.15.4/src/argv.cpp
--- gnome-system-monitor-3.14.1/src/argv.cpp	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/argv.cpp	2015-01-06 15:44:07.000000000 +0000
@@ -10,6 +10,7 @@
 {
     OptionGroup::OptionGroup()
         : Glib::OptionGroup("", ""),
+          show_system_tab(false),
           show_processes_tab(false),
           show_resources_tab(false),
           show_file_systems_tab(false),
diff -Nru gnome-system-monitor-3.14.1/src/disks.cpp gnome-system-monitor-3.15.4/src/disks.cpp
--- gnome-system-monitor-3.14.1/src/disks.cpp	2014-09-24 19:16:09.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/disks.cpp	2015-01-10 02:07:51.000000000 +0000
@@ -1,8 +1,6 @@
 /* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <config.h>
 
-#include <giomm.h>
-#include <giomm/themedicon.h>
 #include <gtk/gtk.h>
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
@@ -11,7 +9,6 @@
 #include "disks.h"
 #include "application.h"
 #include "util.h"
-#include "iconthemewrapper.h"
 #include "settings-keys.h"
 #include "treeview.h"
 
@@ -65,49 +62,44 @@
     }
 }
 
-
-namespace
+static const char* get_icon_for_path(const char* path)
 {
-    string get_icon_for_path(const std::string& path)
-    {
-        using namespace Glib;
-        using namespace Gio;
-
-        // FIXME: I don't know whether i should use Volume or Mount or UnixMount
-        // all i need an icon name.
-        RefPtr<VolumeMonitor> monitor = VolumeMonitor::get();
-
-        std::vector<RefPtr<Mount> > mounts = monitor->get_mounts();
-
-        for (size_t i = 0; i != mounts.size(); ++i) {
-            if (mounts[i]->get_name() != path)
-                continue;
-
-            RefPtr<Icon> icon = mounts[i]->get_icon();
-            RefPtr<ThemedIcon> themed_icon = RefPtr<ThemedIcon>::cast_dynamic(icon);
+    GVolumeMonitor *monitor;
+    GList *mounts;
+    uint i;
+    GMount *mount;
+    GIcon *icon;
+    const char* name = "";
+
+    monitor = g_volume_monitor_get ();
+    mounts = g_volume_monitor_get_mounts (monitor);
+
+    for (i = 0; i < g_list_length (mounts); i++) {
+        mount = G_MOUNT (g_list_nth_data(mounts, i));
+        if (strcmp(g_mount_get_name(mount), path))
+            continue;
+
+        icon = g_mount_get_icon (mount);
+
+        if (!icon)
+            continue;
+        name = g_icon_to_string (icon);
+        g_object_unref (icon);
+    }
 
-            if (themed_icon) {
-                char* name = 0;
-                // FIXME: not wrapped yet
-                g_object_get(G_OBJECT(themed_icon->gobj()), "name", &name, NULL);
-                return make_string(name);
-            }
-        }
+    g_list_free_full (mounts, g_object_unref);
+    return name;
 
-        return "";
-    }
 }
 
-
-static Glib::RefPtr<Gdk::Pixbuf>
+static GdkPixbuf*
 get_icon_for_device(const char *mountpoint)
 {
-    procman::IconThemeWrapper icon_theme;
-    string icon_name = get_icon_for_path(mountpoint);
-    if (icon_name == "")
+    const char* icon_name = get_icon_for_path(mountpoint);
+    if (!strcmp(icon_name, ""))
         // FIXME: defaults to a safe value
         icon_name = "drive-harddisk"; // get_icon_for_path("/");
-    return icon_theme->load_icon(icon_name, 24, Gtk::ICON_LOOKUP_USE_BUILTIN);
+    return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), icon_name, 24, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
 }
 
 
@@ -184,7 +176,7 @@
 static void
 add_disk(GtkListStore *list, const glibtop_mountentry *entry, bool show_all_fs)
 {
-    Glib::RefPtr<Gdk::Pixbuf> pixbuf;
+    GdkPixbuf* pixbuf;
     GtkTreeIter iter;
     glibtop_fsusage usage;
     guint64 bused, bfree, bavail, btotal;
@@ -209,7 +201,7 @@
         gtk_list_store_append(list, &iter);
 
     gtk_list_store_set(list, &iter,
-                       DISK_ICON, pixbuf->gobj(),
+                       DISK_ICON, pixbuf,
                        DISK_DEVICE, entry->devname,
                        DISK_DIR, entry->mountdir,
                        DISK_TYPE, entry->type,
diff -Nru gnome-system-monitor-3.14.1/src/gsm-resources.c gnome-system-monitor-3.15.4/src/gsm-resources.c
--- gnome-system-monitor-3.14.1/src/gsm-resources.c	2014-07-21 19:51:06.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/gsm-resources.c	2015-01-10 02:11:36.000000000 +0000
@@ -6,7 +6,7 @@
 # define SECTION
 #endif
 
-static const SECTION union { const guint8 data[67503]; const double alignment; void * const ptr;}  gsm_resource_data = { {
+static const SECTION union { const guint8 data[67543]; const double alignment; void * const ptr;}  gsm_resource_data = { {
   0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x18, 0x00, 0x00, 0x00, 0xa8, 0x01, 0x00, 0x00, 
@@ -50,16 +50,16 @@
   0x80, 0x52, 0x00, 0x00, 0x2b, 0xaa, 0x00, 0x00, 
   0x62, 0x94, 0xf7, 0x28, 0x04, 0x00, 0x00, 0x00, 
   0x2b, 0xaa, 0x00, 0x00, 0x0c, 0x00, 0x76, 0x00, 
-  0x38, 0xaa, 0x00, 0x00, 0x08, 0xea, 0x00, 0x00, 
+  0x38, 0xaa, 0x00, 0x00, 0x32, 0xea, 0x00, 0x00, 
   0xb0, 0xb7, 0x24, 0x30, 0x01, 0x00, 0x00, 0x00, 
-  0x08, 0xea, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, 
-  0x10, 0xea, 0x00, 0x00, 0x14, 0xea, 0x00, 0x00, 
+  0x32, 0xea, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, 
+  0x38, 0xea, 0x00, 0x00, 0x3c, 0xea, 0x00, 0x00, 
   0x36, 0x00, 0xd4, 0x22, 0x04, 0x00, 0x00, 0x00, 
-  0x14, 0xea, 0x00, 0x00, 0x0c, 0x00, 0x76, 0x00, 
-  0x20, 0xea, 0x00, 0x00, 0x45, 0xf2, 0x00, 0x00, 
+  0x3c, 0xea, 0x00, 0x00, 0x0c, 0x00, 0x76, 0x00, 
+  0x48, 0xea, 0x00, 0x00, 0x6d, 0xf2, 0x00, 0x00, 
   0x87, 0x3d, 0x93, 0x73, 0x04, 0x00, 0x00, 0x00, 
-  0x45, 0xf2, 0x00, 0x00, 0x09, 0x00, 0x76, 0x00, 
-  0x50, 0xf2, 0x00, 0x00, 0xaf, 0x07, 0x01, 0x00, 
+  0x6d, 0xf2, 0x00, 0x00, 0x09, 0x00, 0x76, 0x00, 
+  0x78, 0xf2, 0x00, 0x00, 0xd7, 0x07, 0x01, 0x00, 
   0x6c, 0x73, 0x6f, 0x66, 0x2e, 0x75, 0x69, 0x00, 
   0xa8, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 
@@ -5454,7 +5454,7 @@
   0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 
   0x61, 0x79, 0x29, 0x69, 0x6e, 0x74, 0x65, 0x72, 
   0x66, 0x61, 0x63, 0x65, 0x2e, 0x75, 0x69, 0x00, 
-  0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0xea, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 
   0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 
   0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, 
@@ -5621,146 +5621,92 @@
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 
-  0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
-  0x77, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x61, 0x72, 
-  0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 
+  0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 
+  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x72, 0x67, 
-  0x65, 0x74, 0x22, 0x3e, 0x40, 0x62, 0x20, 0x66, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 
-  0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 
-  0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 
-  0x61, 0x72, 0x63, 0x68, 0x5f, 0x69, 0x6d, 0x61, 
-  0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 
-  0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
-  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x65, 0x64, 
-  0x69, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x64, 0x2d, 
-  0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 
-  0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 
-  0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 
+  0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 
+  0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x73, 0x65, 
+  0x61, 0x72, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x6d, 0x61, 0x69, 0x6e, 
-  0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 
+  0x72, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x40, 0x62, 
+  0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 
+  0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 
+  0x67, 0x65, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 
+  0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 
+  0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x69, 
+  0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
   0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 
-  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 
-  0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, 0x61, 
-  0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 
+  0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 
+  0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
+  0x65, 0x64, 0x69, 0x74, 0x2d, 0x66, 0x69, 0x6e, 
+  0x64, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 
+  0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 
+  0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x72, 0x6f, 0x63, 0x5f, 0x62, 0x6f, 
-  0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x61, 
+  0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 
-  0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 
-  0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 
-  0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 
-  0x65, 0x61, 0x72, 0x63, 0x68, 0x42, 0x61, 0x72, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 
-  0x6f, 0x63, 0x5f, 0x73, 0x65, 0x61, 0x72, 0x63, 
-  0x68, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 
+  0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 
+  0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x53, 0x74, 0x61, 0x63, 
+  0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
+  0x74, 0x61, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
   0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
@@ -5771,14 +5717,22 @@
   0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
   0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
   0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 
-  0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 
+  0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 
   0x64, 0x3d, 0x22, 0x70, 0x72, 0x6f, 0x63, 0x5f, 
-  0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x65, 0x6e, 
-  0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
   0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
@@ -5787,421 +5741,347 @@
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
   0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x66, 
-  0x69, 0x6c, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
-  0x64, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x71, 0x75, 
-  0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, 0x30, 0x30, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 
-  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 
-  0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 
+  0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x42, 
+  0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x72, 0x6f, 0x63, 0x5f, 0x73, 0x65, 0x61, 
+  0x72, 0x63, 0x68, 0x62, 0x61, 0x72, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
   0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 0x72, 0x6f, 
-  0x6c, 0x6c, 0x65, 0x64, 0x57, 0x69, 0x6e, 0x64, 
-  0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x65, 
-  0x73, 0x5f, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 
-  0x65, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x61, 0x72, 
+  0x63, 0x68, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x6f, 
+  0x63, 0x5f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 
+  0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
-  0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, 
-  0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 
-  0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 
-  0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 
-  0x65, 0x76, 0x65, 0x61, 0x6c, 0x65, 0x72, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x6f, 
-  0x63, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
-  0x62, 0x61, 0x72, 0x5f, 0x72, 0x65, 0x76, 0x65, 
-  0x61, 0x6c, 0x65, 0x72, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 
-  0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x73, 
-  0x6c, 0x69, 0x64, 0x65, 0x2d, 0x75, 0x70, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x6f, 
-  0x6e, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x70, 0x72, 0x6f, 0x63, 0x5f, 0x61, 
-  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x61, 0x72, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 
-  0x6e, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x63, 0x65, 
-  0x73, 0x73, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 0x6e, 0x64, 
-  0x20, 0x5f, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 
-  0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 
-  0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 
-  0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 
-  0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
-  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 
-  0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x73, 0x65, 
-  0x6e, 0x64, 0x2d, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x2d, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 
-  0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x40, 
-  0x69, 0x20, 0x31, 0x35, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
-  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
-  0x22, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x22, 
-  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
-  0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x72, 0x6f, 0x63, 0x5f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 
-  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
-  0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x3e, 0x53, 0x68, 0x6f, 0x77, 0x20, 0x70, 
-  0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x20, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 
-  0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 
-  0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 
-  0x63, 0x65, 0x73, 0x73, 0x2d, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 
-  0x6f, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x69, 0x65, 0x73, 0x5f, 0x69, 0x6d, 
-  0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 
-  0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 
-  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 
-  0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x64, 
-  0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x2d, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 
-  0x65, 0x73, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 
-  0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 
-  0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
+  0x3e, 0x66, 0x69, 0x6c, 0x6c, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x72, 0x65, 
+  0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, 
+  0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
   0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x70, 0x72, 
-  0x6f, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x3e, 0x50, 0x72, 0x6f, 0x63, 
-  0x65, 0x73, 0x73, 0x65, 0x73, 0x3c, 0x2f, 0x70, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x73, 0x5f, 
-  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 
+  0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 
+  0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x57, 0x69, 
+  0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 
+  0x73, 0x65, 0x73, 0x5f, 0x73, 0x63, 0x72, 0x6f, 
+  0x6c, 0x6c, 0x65, 0x64, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 
+  0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 
+  0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 
+  0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x52, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x65, 
+  0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x72, 0x6f, 0x63, 0x5f, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x62, 0x61, 0x72, 0x5f, 0x72, 0x65, 
+  0x76, 0x65, 0x61, 0x6c, 0x65, 0x72, 0x22, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
   0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 
-  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 
-  0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 
-  0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x70, 0x75, 
-  0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 
+  0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 
+  0x3e, 0x73, 0x6c, 0x69, 0x64, 0x65, 0x2d, 0x75, 
+  0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x42, 0x61, 0x72, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x6f, 0x63, 
+  0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x62, 
+  0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x65, 0x6e, 0x64, 0x5f, 0x70, 0x72, 0x6f, 
+  0x63, 0x65, 0x73, 0x73, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 
+  0x6e, 0x64, 0x20, 0x5f, 0x50, 0x72, 0x6f, 0x63, 
+  0x65, 0x73, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
   0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
-  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 
-  0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 0x50, 0x55, 
-  0x20, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 
-  0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 
-  0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
-  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 
+  0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
+  0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 
+  0x6d, 0x65, 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 
+  0x73, 0x65, 0x6e, 0x64, 0x2d, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x2d, 0x65, 0x6e, 0x64, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x63, 0x70, 0x75, 0x5f, 
-  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 
-  0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
-  0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 
+  0x3e, 0x40, 0x69, 0x20, 0x31, 0x35, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
+  0x79, 0x3d, 0x22, 0x44, 0x65, 0x6c, 0x65, 0x74, 
+  0x65, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
   0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
   0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 
-  0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x63, 0x70, 0x75, 0x5f, 0x67, 0x72, 0x61, 0x70, 
-  0x68, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x70, 0x72, 0x6f, 0x63, 0x5f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 
+  0x65, 0x73, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 
+  0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x77, 
+  0x20, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 
+  0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x69, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 
+  0x65, 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x70, 
+  0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x2d, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 
+  0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 
+  0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x72, 0x6f, 0x63, 0x5f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x5f, 
+  0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 
+  0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 
+  0x3e, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
+  0x74, 0x2d, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x69, 0x65, 0x73, 0x2d, 0x73, 0x79, 0x6d, 
+  0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 
+  0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 
+  0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
+  0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x65, 
+  0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 
+  0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x72, 
+  0x6f, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 
+  0x73, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
   0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
@@ -6224,6 +6104,94 @@
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 
+  0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 
+  0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 
+  0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 
+  0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 
+  0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 
+  0x70, 0x75, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 
+  0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 
+  0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 
+  0x50, 0x55, 0x20, 0x48, 0x69, 0x73, 0x74, 0x6f, 
+  0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 
+  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 
+  0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 
+  0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 
+  0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 
+  0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
+  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x70, 
+  0x75, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 
   0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 
   0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 
@@ -6231,65 +6199,95 @@
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 
-  0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 
+  0x67, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x63, 0x70, 0x75, 0x5f, 0x67, 0x72, 
+  0x61, 0x70, 0x68, 0x5f, 0x62, 0x6f, 0x78, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 
+  0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 
+  0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 
+  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x63, 0x70, 0x75, 0x5f, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x63, 0x70, 0x75, 0x5f, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 
+  0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 
+  0x35, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 
+  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 
-  0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x35, 0x37, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 
-  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 
-  0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 
-  0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 
-  0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x72, 0x6f, 0x77, 0x5f, 0x68, 0x6f, 0x6d, 0x6f, 
-  0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x68, 
-  0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 
-  0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 
-  0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 
-  0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 
+  0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 
+  0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 
+  0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x68, 0x6f, 
+  0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 
+  0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x5f, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 
+  0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
   0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 
   0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 
   0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
@@ -6315,161 +6313,141 @@
   0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 
   0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 
   0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
-  0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 
-  0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 
-  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 
   0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 
-  0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 
+  0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
-  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 
+  0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
   0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
   0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x65, 
-  0x6d, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 
+  0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 
+  0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 
+  0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 
-  0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 
-  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
+  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x6d, 0x65, 0x6d, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 
+  0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 
+  0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 
+  0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x20, 0x61, 
+  0x6e, 0x64, 0x20, 0x53, 0x77, 0x61, 0x70, 0x20, 
+  0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 
+  0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
+  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 
+  0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 
+  0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
+  0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4d, 0x65, 
-  0x6d, 0x6f, 0x72, 0x79, 0x20, 0x61, 0x6e, 0x64, 
-  0x20, 0x53, 0x77, 0x61, 0x70, 0x20, 0x48, 0x69, 
-  0x73, 0x74, 0x6f, 0x72, 0x79, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 
-  0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 
-  0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 
-  0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
-  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
-  0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x6d, 0x65, 0x6d, 0x5f, 0x62, 0x6f, 0x78, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 
-  0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 
-  0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 
-  0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 
-  0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x30, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x65, 0x6d, 
-  0x5f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x5f, 0x62, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x6d, 0x65, 0x6d, 0x5f, 0x62, 
   0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
@@ -6482,84 +6460,73 @@
   0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 
   0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 
   0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 
-  0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
-  0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 
-  0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 
-  0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 
-  0x65, 0x6d, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 
-  0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 
-  0x74, 0x22, 0x3e, 0x35, 0x34, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 
-  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
+  0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 
-  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
-  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 
-  0x5f, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 
-  0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
+  0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 
+  0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
   0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
   0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 
+  0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 
+  0x65, 0x6d, 0x5f, 0x67, 0x72, 0x61, 0x70, 0x68, 
+  0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 
+  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 
+  0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 
+  0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 
+  0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x6d, 0x65, 0x6d, 0x5f, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
+  0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 
+  0x61, 0x72, 0x74, 0x22, 0x3e, 0x35, 0x34, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
@@ -6568,46 +6535,27 @@
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
-  0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x3e, 0x4d, 0x65, 0x6d, 0x6f, 
-  0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 
+  0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 
+  0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 
-  0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 
+  0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x77, 0x61, 
-  0x70, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 
+  0x6f, 0x77, 0x5f, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 
+  0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 
+  0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
@@ -6633,60 +6581,86 @@
   0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
   0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
   0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x77, 
-  0x61, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4d, 0x65, 
+  0x6d, 0x6f, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
+  0x77, 0x61, 0x70, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 
-  0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 
+  0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 
+  0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 
+  0x53, 0x77, 0x61, 0x70, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 
-  0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 
-  0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 
-  0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
-  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 
-  0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
   0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
@@ -6694,133 +6668,137 @@
   0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 
   0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 
   0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 
+  0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 
+  0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 
+  0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 
+  0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 
+  0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 
+  0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
   0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
   0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
+  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x6e, 0x65, 0x74, 0x5f, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 
-  0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 
-  0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x33, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x6e, 0x65, 0x74, 0x5f, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 
-  0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
+  0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 
+  0x72, 0x6b, 0x20, 0x48, 0x69, 0x73, 0x74, 0x6f, 
+  0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 
+  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 
+  0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 
+  0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 
+  0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x3e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 
-  0x20, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 
-  0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 
-  0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
-  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 
+  0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
+  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x34, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x6e, 0x65, 0x74, 0x5f, 
-  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 
-  0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
-  0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 
-  0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x6e, 0x65, 0x74, 0x5f, 0x67, 0x72, 0x61, 0x70, 
-  0x68, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 0x65, 
+  0x74, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
   0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
@@ -6833,16 +6811,6 @@
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 
   0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 
   0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 
@@ -6850,34 +6818,24 @@
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 
-  0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x6e, 0x65, 0x74, 0x5f, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x67, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 
-  0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x35, 0x34, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 
-  0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x33, 
-  0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x6e, 0x65, 0x74, 0x5f, 0x67, 0x72, 
+  0x61, 0x70, 0x68, 0x5f, 0x62, 0x6f, 0x78, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 
@@ -6885,172 +6843,102 @@
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 
-  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
-  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 
-  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x72, 0x6f, 0x77, 0x5f, 0x68, 0x6f, 0x6d, 
-  0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x63, 
-  0x65, 0x69, 0x76, 0x69, 0x6e, 0x67, 0x5f, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
-  0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 
+  0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 
+  0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 
+  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x3e, 0x52, 0x65, 0x63, 0x65, 0x69, 
-  0x76, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x6e, 0x65, 0x74, 0x5f, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 
+  0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 
+  0x35, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
-  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 
+  0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 
+  0x3e, 0x33, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 
+  0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 
+  0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 
+  0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x68, 
+  0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 
+  0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
   0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
   0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 
-  0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x63, 
-  0x65, 0x69, 0x76, 0x65, 0x64, 0x5f, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 
+  0x65, 0x63, 0x65, 0x69, 0x76, 0x69, 0x6e, 0x67, 
+  0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
   0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 
-  0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x3e, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x20, 
-  0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
-  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
-  0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
-  0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x64, 0x69, 
-  0x6e, 0x67, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 
-  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 
-  0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 
-  0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 
-  0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 
+  0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, 0x63, 
+  0x65, 0x69, 0x76, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
@@ -7058,7 +6946,7 @@
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
   0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
@@ -7080,43 +6968,44 @@
   0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
   0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
   0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x73, 
-  0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 
-  0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 
-  0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 
-  0x54, 0x6f, 0x74, 0x61, 0x6c, 0x20, 0x53, 0x65, 
-  0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x22, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x72, 
+  0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x5f, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
+  0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x3e, 0x54, 0x6f, 0x74, 0x61, 
+  0x6c, 0x20, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 
+  0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
   0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
   0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 
+  0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
@@ -7132,62 +7021,15 @@
   0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 
   0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x70, 0x61, 
-  0x63, 0x65, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 
-  0x74, 0x68, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 
-  0x73, 0x74, 0x22, 0x3e, 0x33, 0x38, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
-  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
-  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
-  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
-  0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x41, 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, 
-  0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x69, 0x6e, 
-  0x67, 0x5f, 0x70, 0x69, 0x63, 0x6b, 0x65, 0x72, 
-  0x5f, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, 
-  0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x6e, 
+  0x64, 0x69, 0x6e, 0x67, 0x5f, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
   0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
@@ -7199,71 +7041,132 @@
   0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 
-  0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 
-  0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 
+  0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x3e, 0x53, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
+  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
+  0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 
-  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 
-  0x68, 0x74, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 
+  0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x74, 0x6f, 0x74, 0x61, 0x6c, 
+  0x5f, 0x73, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x41, 0x6c, 0x69, 0x67, 0x6e, 
-  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x73, 0x65, 0x6e, 0x64, 0x69, 0x6e, 
-  0x67, 0x5f, 0x70, 0x69, 0x63, 0x6b, 0x65, 0x72, 
-  0x5f, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, 
-  0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 
+  0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x3e, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x20, 
+  0x53, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 
-  0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
+  0x70, 0x61, 0x63, 0x65, 0x72, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 
-  0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
+  0x69, 0x64, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x71, 
+  0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, 0x38, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
   0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
@@ -7282,189 +7185,255 @@
   0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
   0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
   0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 
-  0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 
-  0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 
-  0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x41, 0x6c, 0x69, 0x67, 0x6e, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 
+  0x69, 0x6e, 0x67, 0x5f, 0x70, 0x69, 0x63, 0x6b, 
+  0x65, 0x72, 0x5f, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 
-  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 
-  0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 
+  0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 
+  0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 
-  0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 
-  0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
-  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
+  0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
   0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
   0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 
-  0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
-  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x6c, 0x69, 
+  0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x64, 
+  0x69, 0x6e, 0x67, 0x5f, 0x70, 0x69, 0x63, 0x6b, 
+  0x65, 0x72, 0x5f, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
   0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 
+  0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 
+  0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 
-  0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
+  0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 
+  0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 
+  0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
   0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x72, 0x65, 
-  0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, 0x73, 0x6f, 
-  0x75, 0x72, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x66, 0x73, 0x5f, 0x62, 
-  0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 
+  0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 
+  0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 
+  0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 
+  0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 
+  0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 
-  0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 
-  0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 
-  0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x73, 0x6b, 
-  0x73, 0x5f, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 
-  0x65, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
+  0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 
+  0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 
+  0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, 
+  0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x73, 
+  0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 
-  0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 
-  0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 
-  0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
   0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 
+  0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 
+  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 
+  0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 
+  0x65, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 
+  0x73, 0x6b, 0x73, 0x5f, 0x73, 0x63, 0x72, 0x6f, 
+  0x6c, 0x6c, 0x65, 0x64, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 
-  0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x64, 0x69, 
-  0x73, 0x6b, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 
-  0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 
-  0x46, 0x69, 0x6c, 0x65, 0x20, 0x53, 0x79, 0x73, 
-  0x74, 0x65, 0x6d, 0x73, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 
+  0x79, 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 
+  0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 
   0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
   0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
@@ -7480,23 +7449,59 @@
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 
-  0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 
+  0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
+  0x64, 0x69, 0x73, 0x6b, 0x73, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x3e, 0x46, 0x69, 0x6c, 0x65, 0x20, 0x53, 
+  0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 
-  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 
-  0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 
-  0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 
-  0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
+  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 
+  0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 
+  0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 
+  0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 
+  0x79, 0x29, 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 
   0x03, 0x00, 0x00, 0x00, 0x6f, 0x70, 0x65, 0x6e, 
   0x66, 0x69, 0x6c, 0x65, 0x73, 0x2e, 0x75, 0x69, 
   0x15, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
diff -Nru gnome-system-monitor-3.14.1/src/iconthemewrapper.cpp gnome-system-monitor-3.15.4/src/iconthemewrapper.cpp
--- gnome-system-monitor-3.14.1/src/iconthemewrapper.cpp	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/iconthemewrapper.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include <config.h>
-
-#include <gtkmm/icontheme.h>
-#include <giomm/error.h>
-
-#include "iconthemewrapper.h"
-
-
-Glib::RefPtr<Gdk::Pixbuf>
-procman::IconThemeWrapper::load_icon(const Glib::ustring& icon_name,
-                                     int size, Gtk::IconLookupFlags flags) const
-{
-    try
-    {
-        return Gtk::IconTheme::get_default()->load_icon(icon_name, size, flags);
-    }
-    catch (Gtk::IconThemeError &error)
-    {
-        if (error.code() != Gtk::IconThemeError::ICON_THEME_NOT_FOUND)
-            g_error("Cannot load icon '%s' from theme: %s", icon_name.c_str(), error.what().c_str());
-        return Glib::RefPtr<Gdk::Pixbuf>();
-    }
-    catch (Gio::Error &error)
-    {
-        g_debug("Could not load icon '%s' : %s", icon_name.c_str(), error.what().c_str());
-        return Glib::RefPtr<Gdk::Pixbuf>();
-    }
-}
-
-Glib::RefPtr<Gdk::Pixbuf>
-procman::IconThemeWrapper::load_gicon(const Glib::RefPtr<Gio::Icon>& gicon,
-                                      int size, Gtk::IconLookupFlags flags) const
-{
-    Gtk::IconInfo icon_info;
-    icon_info = Gtk::IconTheme::get_default()->lookup_icon(gicon, size, flags);
-
-    if (!icon_info) {
-        return Glib::RefPtr<Gdk::Pixbuf>();
-    }
-
-    try
-    {
-        return icon_info.load_icon();
-    }
-    catch (Gtk::IconThemeError &error)
-    {
-        if (error.code() != Gtk::IconThemeError::ICON_THEME_NOT_FOUND)
-            g_error("Cannot load gicon from theme: %s", error.what().c_str());
-        return Glib::RefPtr<Gdk::Pixbuf>();
-    }
-    catch (Gio::Error &error)
-    {
-        g_debug("Could not load gicon: %s", error.what().c_str());
-        return Glib::RefPtr<Gdk::Pixbuf>();
-    }
-}
diff -Nru gnome-system-monitor-3.14.1/src/iconthemewrapper.h gnome-system-monitor-3.15.4/src/iconthemewrapper.h
--- gnome-system-monitor-3.14.1/src/iconthemewrapper.h	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/iconthemewrapper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef _GSM_ICON_THEME_WRAPPER_H_
-#define _GSM_ICON_THEME_WRAPPER_H_
-
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <gtkmm/icontheme.h>
-#include <gdkmm/pixbuf.h>
-
-namespace procman
-{
-    class IconThemeWrapper
-    {
-      public:
-        // returns 0 instead of raising an exception
-        Glib::RefPtr<Gdk::Pixbuf>
-            load_icon(const Glib::ustring& icon_name, int size, Gtk::IconLookupFlags flags) const;
-        Glib::RefPtr<Gdk::Pixbuf>
-            load_gicon(const Glib::RefPtr<Gio::Icon>& gicon, int size, Gtk::IconLookupFlags flags) const;
-
-        const IconThemeWrapper* operator->() const
-        { return this; }
-    };
-}
-
-#endif /* _GSM_ICON_THEME_WRAPPER_H_ */
diff -Nru gnome-system-monitor-3.14.1/src/interface.cpp gnome-system-monitor-3.15.4/src/interface.cpp
--- gnome-system-monitor-3.14.1/src/interface.cpp	2014-07-21 19:42:00.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/interface.cpp	2014-12-08 20:15:16.000000000 +0000
@@ -626,6 +626,8 @@
     GtkWidget *process_menu_button;
     GMenuModel *process_menu_model;
 
+    const char* session;
+
     int width, height, xpos, ypos;
 
     GtkBuilder *builder = gtk_builder_new();
@@ -637,6 +639,19 @@
     gtk_widget_set_name (main_window, "gnome-system-monitor");
     app->main_window = main_window;
 
+    session = g_getenv ("XDG_CURRENT_DESKTOP");
+    if (session && !strstr (session, "GNOME")){
+        GtkWidget *mainbox;
+        GtkWidget *headerbar;
+
+        mainbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_box"));
+        headerbar = GTK_WIDGET (gtk_builder_get_object (builder, "header_bar"));
+        gtk_style_context_remove_class (gtk_widget_get_style_context (headerbar), "titlebar");
+        gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
+        gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), FALSE);
+        gtk_box_pack_start (GTK_BOX(mainbox), headerbar, FALSE, FALSE, 0);
+    }
+
     g_settings_get (app->settings, GSM_SETTING_WINDOW_STATE, "(iiii)",
                     &width, &height, &xpos, &ypos);
     width = CLAMP (width, 50, gdk_screen_width ());
diff -Nru gnome-system-monitor-3.14.1/src/load-graph.cpp gnome-system-monitor-3.15.4/src/load-graph.cpp
--- gnome-system-monitor-3.14.1/src/load-graph.cpp	2014-10-12 07:15:11.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/load-graph.cpp	2015-01-06 15:44:07.000000000 +0000
@@ -697,13 +697,18 @@
       real_draw_height(0),
       graph_delx(0.0),
       graph_buffer_offset(0),
+      colors(),
+      data_block(),
       main_widget(NULL),
       disp(NULL),
       background(NULL),
       timer_index(0),
       draw(FALSE),
+      labels(),
       mem_color_picker(NULL),
-      swap_color_picker(NULL)
+      swap_color_picker(NULL),
+      cpu(),
+      net()
 {
     LoadGraph * const graph = this;
 
diff -Nru gnome-system-monitor-3.14.1/src/load-graph.h gnome-system-monitor-3.15.4/src/load-graph.h
--- gnome-system-monitor-3.14.1/src/load-graph.h	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/load-graph.h	2015-01-06 15:44:07.000000000 +0000
@@ -5,6 +5,8 @@
 #include <glib.h>
 #include <glibtop/cpu.h>
 
+#include "util.h"
+
 enum
 {
     LOAD_GRAPH_CPU,
@@ -31,6 +33,7 @@
 };
 
 struct LoadGraph
+  : private procman::NonCopyable
 {
     static const unsigned NUM_POINTS = 60 + 2;
     static const unsigned GRAPH_MIN_HEIGHT = 40;
diff -Nru gnome-system-monitor-3.14.1/src/lsof.cpp gnome-system-monitor-3.15.4/src/lsof.cpp
--- gnome-system-monitor-3.14.1/src/lsof.cpp	2014-09-24 19:16:09.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/lsof.cpp	2015-01-06 15:44:07.000000000 +0000
@@ -81,7 +81,7 @@
     };
 
 
-    struct GUI {
+    struct GUI : private procman::NonCopyable {
 
         GtkListStore *model;
         GtkEntry *entry;
@@ -92,6 +92,12 @@
 
 
         GUI()
+            : model(NULL),
+              entry(NULL),
+              window(NULL),
+              count(NULL),
+              app(NULL),
+              case_insensitive()
         {
             procman_debug("New Lsof GUI %p", this);
         }
diff -Nru gnome-system-monitor-3.14.1/src/Makefile.am gnome-system-monitor-3.15.4/src/Makefile.am
--- gnome-system-monitor-3.14.1/src/Makefile.am	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/Makefile.am	2015-01-10 02:13:59.000000000 +0000
@@ -31,7 +31,6 @@
 	gsm_gksu.cpp \
 	gsm_pkexec.cpp \
 	lsof.cpp \
-	iconthemewrapper.cpp \
 	prefsdialog.cpp \
 	application.cpp
 
diff -Nru gnome-system-monitor-3.14.1/src/Makefile.in gnome-system-monitor-3.15.4/src/Makefile.in
--- gnome-system-monitor-3.14.1/src/Makefile.in	2014-10-13 18:41:33.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/Makefile.in	2015-01-19 17:17:27.000000000 +0000
@@ -106,8 +106,8 @@
 	memmaps.$(OBJEXT) openfiles.$(OBJEXT) procproperties.$(OBJEXT) \
 	smooth_refresh.$(OBJEXT) disks.$(OBJEXT) selinux.$(OBJEXT) \
 	cgroups.$(OBJEXT) gsm_gnomesu.$(OBJEXT) gsm_gksu.$(OBJEXT) \
-	gsm_pkexec.$(OBJEXT) lsof.$(OBJEXT) iconthemewrapper.$(OBJEXT) \
-	prefsdialog.$(OBJEXT) application.$(OBJEXT)
+	gsm_pkexec.$(OBJEXT) lsof.$(OBJEXT) prefsdialog.$(OBJEXT) \
+	application.$(OBJEXT)
 am__objects_5 = e_date.$(OBJEXT) gsm_color_button.$(OBJEXT) \
 	treeview.$(OBJEXT)
 am_gnome_system_monitor_OBJECTS = $(am__objects_1) $(am__objects_3) \
@@ -392,7 +392,6 @@
 	gsm_gksu.cpp \
 	gsm_pkexec.cpp \
 	lsof.cpp \
-	iconthemewrapper.cpp \
 	prefsdialog.cpp \
 	application.cpp
 
@@ -543,7 +542,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_gksu.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_gnomesu.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_pkexec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconthemewrapper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load-graph.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsof.Po@am__quote@
diff -Nru gnome-system-monitor-3.14.1/src/memmaps.cpp gnome-system-monitor-3.15.4/src/memmaps.cpp
--- gnome-system-monitor-3.14.1/src/memmaps.cpp	2014-09-24 19:16:09.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/memmaps.cpp	2015-01-06 15:44:07.000000000 +0000
@@ -129,7 +129,11 @@
         mutable InodeDevices devices;
 
         MemMapsData(GtkWidget *a_tree)
-            : tree(a_tree)
+            : timer(),
+              tree(a_tree),
+              info(NULL),
+              format(),
+              devices()
         {
             gsm_tree_view_load_state (GSM_TREE_VIEW (this->tree));
         }
diff -Nru gnome-system-monitor-3.14.1/src/prettytable.cpp gnome-system-monitor-3.15.4/src/prettytable.cpp
--- gnome-system-monitor-3.14.1/src/prettytable.cpp	2014-10-13 18:20:04.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/prettytable.cpp	2015-01-10 01:33:34.000000000 +0000
@@ -77,7 +77,7 @@
 
   Glib::RefPtr<Gdk::Pixbuf> icon;
 
-  icon = that->theme->load_icon(icon_name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+  icon = Glib::wrap(gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), icon_name, APP_ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL));
 
   if (not icon) {
     icon = Glib::wrap(wnck_application_get_icon(app), /* take_copy */ true);
@@ -156,7 +156,7 @@
 Glib::RefPtr<Gdk::Pixbuf>
 PrettyTable::get_icon_from_theme(const ProcInfo &info)
 {
-  return this->theme->load_icon(info.name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN | Gtk::ICON_LOOKUP_FORCE_SIZE);
+  return Glib::wrap(gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), info.name, APP_ICON_SIZE, (GtkIconLookupFlags)(GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_FORCE_SIZE), NULL));
 }
 
 
@@ -189,7 +189,7 @@
     IconCache::iterator it(this->defaults.find(name));
 
     if (it == this->defaults.end()) {
-      pix = this->theme->load_icon(name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN | Gtk::ICON_LOOKUP_FORCE_SIZE);
+      pix = Glib::wrap(gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), name.c_str(), APP_ICON_SIZE, (GtkIconLookupFlags)(GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_FORCE_SIZE), NULL));
       if (pix)
 	this->defaults[name] = pix;
     } else
@@ -209,12 +209,16 @@
   if (executable) {
     Glib::RefPtr<Gio::AppInfo> app = this->gio_apps[executable];
     Glib::RefPtr<Gio::Icon> gicon;
+    Gtk::IconInfo info;
 
     if (app)
       gicon = app->get_icon();
 
     if (gicon)
-      icon = this->theme->load_gicon(gicon, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN | Gtk::ICON_LOOKUP_FORCE_SIZE);
+      info = Glib::wrap(gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), gicon->gobj(), APP_ICON_SIZE, (GtkIconLookupFlags)(GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_FORCE_SIZE)));
+
+    if (info)
+      icon = Glib::wrap(gtk_icon_info_load_icon (info.gobj(), NULL));
   }
 
   g_strfreev(cmdline);
@@ -240,14 +244,14 @@
 Glib::RefPtr<Gdk::Pixbuf>
 PrettyTable::get_icon_from_name(const ProcInfo &info)
 {
-  return this->theme->load_icon(info.name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN | Gtk::ICON_LOOKUP_FORCE_SIZE);
+return Glib::wrap(gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), info.name, APP_ICON_SIZE, (GtkIconLookupFlags)(GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_FORCE_SIZE), NULL));
 }
 
 
 Glib::RefPtr<Gdk::Pixbuf>
 PrettyTable::get_icon_dummy(const ProcInfo &)
 {
-  return this->theme->load_icon("application-x-executable", APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+    return Glib::wrap(gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "application-x-executable", APP_ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL));
 }
 
 
@@ -273,7 +277,7 @@
 PrettyTable::get_icon_for_kernel(const ProcInfo &info)
 {
   if (is_kthread(info))
-    return this->theme->load_icon("applications-system", APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
+    return Glib::wrap(gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "applications-system", APP_ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL));
 
   return Glib::RefPtr<Gdk::Pixbuf>();
 }
diff -Nru gnome-system-monitor-3.14.1/src/prettytable.h gnome-system-monitor-3.15.4/src/prettytable.h
--- gnome-system-monitor-3.14.1/src/prettytable.h	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/prettytable.h	2015-01-10 01:34:40.000000000 +0000
@@ -19,8 +19,6 @@
 }
 #endif
 
-#include "iconthemewrapper.h"
-
 class ProcInfo;
 
 using std::string;
@@ -70,7 +68,6 @@
     IconCache defaults;
     DesktopDirMonitors monitors;
     AppCache gio_apps;
-    procman::IconThemeWrapper theme;
 };
 
 
diff -Nru gnome-system-monitor-3.14.1/src/proctable.cpp gnome-system-monitor-3.15.4/src/proctable.cpp
--- gnome-system-monitor-3.14.1/src/proctable.cpp	2014-09-24 19:16:09.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/proctable.cpp	2015-01-06 15:44:07.000000000 +0000
@@ -917,7 +917,15 @@
 
     ProcInfo::cpu_times[info->pid] = info->cpu_time = proctime.rtime;
     info->nice = procuid.nice;
-    info->ppid = procuid.ppid;
+
+    // set the ppid only if one can exist
+    // i.e. pid=0 can never have a parent
+    if (info->pid > 0) {
+        info->ppid = procuid.ppid;
+    }
+
+    g_assert(info->pid != info->ppid);
+    g_assert(info->ppid != -1 || info->pid == 0);
 
     /* get cgroup data */
     get_process_cgroup_info(info);
@@ -926,11 +934,14 @@
 }
 
 ProcInfo::ProcInfo(pid_t pid)
-    : tooltip(NULL),
+    : node(),
+      pixbuf(),
+      tooltip(NULL),
       name(NULL),
       arguments(NULL),
       security_context(NULL),
       pid(pid),
+      ppid(-1),
       uid(-1)
 {
     ProcInfo * const info = this;
@@ -1049,6 +1060,8 @@
 
 
                 // inserts the process in the treeview if :
+                // - it has no parent (ppid = -1),
+                //   ie it is for example the [kernel] on FreeBSD
                 // - it is init
                 // - its parent is already in tree
                 // - its parent is unreachable
@@ -1062,7 +1075,7 @@
                 // see proctable_update (ProcData * const procdata)
 
 
-                if ((*it)->ppid == 0 or in_tree.find((*it)->ppid) != in_tree.end()) {
+                if ((*it)->ppid <= 0 or in_tree.find((*it)->ppid) != in_tree.end()) {
                     insert_info_to_tree(*it, app);
                     in_tree.insert((*it)->pid);
                     it = addition.erase(it);
@@ -1122,7 +1135,10 @@
     glibtop_get_cpu (&cpu);
     app->cpu_total_time = MAX(cpu.total - app->cpu_total_time_last, 1);
     app->cpu_total_time_last = cpu.total;
-    
+
+    // FIXME: not sure if glibtop always returns a sorted list of pid
+    // but it is important otherwise refresh_list won't find the parent
+    std::sort(pid_list, pid_list + proclist.number);
     refresh_list (app, pid_list, proclist.number);
 
     // juggling with tree scroll position to fix https://bugzilla.gnome.org/show_bug.cgi?id=92724
diff -Nru gnome-system-monitor-3.14.1/src/smooth_refresh.cpp gnome-system-monitor-3.15.4/src/smooth_refresh.cpp
--- gnome-system-monitor-3.14.1/src/smooth_refresh.cpp	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/smooth_refresh.cpp	2015-01-06 15:44:07.000000000 +0000
@@ -30,12 +30,12 @@
     if (elapsed) { // avoid division by 0
         glibtop_get_proc_time(&proctime, getpid());
         usage = (proctime.rtime - this->last_cpu_time) * 100 / elapsed;
+        this->last_cpu_time = proctime.rtime;
     }
 
     usage = CLAMP(usage, 0, 100);
 
     this->last_total_time = cpu.total;
-    this->last_cpu_time = proctime.rtime;
 
     return usage;
 }
@@ -60,7 +60,13 @@
 
 SmoothRefresh::SmoothRefresh(GSettings *a_settings)
     :
-    settings(a_settings)
+    settings(a_settings),
+    active(false),
+    connection(0),
+    interval(0),
+    last_pcpu(0),
+    last_total_time(0ULL),
+    last_cpu_time(0ULL)
 {
     this->connection = g_signal_connect(G_OBJECT(settings),
                                         "changed::smooth-refresh",
diff -Nru gnome-system-monitor-3.14.1/src/smooth_refresh.h gnome-system-monitor-3.15.4/src/smooth_refresh.h
--- gnome-system-monitor-3.14.1/src/smooth_refresh.h	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/smooth_refresh.h	2015-01-06 15:44:07.000000000 +0000
@@ -6,11 +6,14 @@
 #include <gio/gio.h>
 #include <string>
 
+#include "util.h"
+
 using std::string;
 
 
 
 class SmoothRefresh
+  : private procman::NonCopyable
 {
   public:
 
diff -Nru gnome-system-monitor-3.14.1/src/util.h gnome-system-monitor-3.15.4/src/util.h
--- gnome-system-monitor-3.14.1/src/util.h	2014-07-20 04:42:35.000000000 +0000
+++ gnome-system-monitor-3.15.4/src/util.h	2015-01-06 15:44:07.000000000 +0000
@@ -127,6 +127,17 @@
 
     std::string format_network(guint64 rate, guint64 max_rate = 0);
     std::string format_network_rate(guint64 rate, guint64 max_rate = 0);
+
+    class NonCopyable
+    {
+    protected:
+        NonCopyable() {}  // = default
+        ~NonCopyable() {} // = default
+    private:
+        NonCopyable(const NonCopyable&)            /* = delete */;
+        NonCopyable& operator=(const NonCopyable&) /* = delete */;
+    };
+
 }
 
 #endif /* _GSM_UTIL_H_ */