diff --git a/about-this-computer.desktop b/about-this-computer.desktop index 59aa557..a892d03 100644 --- a/about-this-computer.desktop +++ b/about-this-computer.desktop @@ -1,8 +1,30 @@ [Desktop Entry] Name=About This Computer -Name[en_US]=About This Computer -Comment=Get some basic information about this computer -Comment[en_US]=Get some basic information about this computer +Name[en]=About This Computer +Name[cs]=O tomto počítači +Name[el]=Σχετικά με τον υπολογιστή +Name[fi]=Tietoja tästä tietokoneesta +Name[de]=Über diesen Computer +Name[pl]=Informacje o komputerze +Name[sr]=О овом рачунару +Name[sr@latin]=O ovom računaru +Name[nl]=Over Deze Computer +Name[sv]=Om den här datorn +Name[es]=Acerca de esta Computadora +Name[zh_CN]=关于本计算机 +Comment=Get some basic information about this computer +Comment[en]=Get some basic information about this computer +Comment[cs]=Základní informace o tomto počítači +Comment[el]=Δείτε βασικές πληροφορίες για αυτόν τον υπολογιστή +Comment[fi]=Perustietoja tästä tietokoneesta +Comment[de]=Erhalten Sie Basis-Informationen über dieses System +Comment[pl]=Więcej informacji o komputerze +Comment[sr]=Сазнајте основне информације о овом рачунару +Comment[sr@latin]=Saznajte osnovne informacije o ovom računaru +Comment[nl]=Geef basis informatie weer over deze computer +Comment[sv]=Få grundläggande information om den här datorn +Comment[es]=Obten información básica sobre esta computadora +Comment[zh_CN]=获取本计算机的一些基本信息 Exec=gnome-system-monitor --show-system-tab Icon=computer Terminal=false diff --git a/gnome-system-monitor-2.21.92-system-tab-arg.patch b/gnome-system-monitor-2.22.0-system-tab-arg.patch similarity index 69% rename from gnome-system-monitor-2.21.92-system-tab-arg.patch rename to gnome-system-monitor-2.22.0-system-tab-arg.patch index 020d383..52335cf 100644 --- a/gnome-system-monitor-2.21.92-system-tab-arg.patch +++ b/gnome-system-monitor-2.22.0-system-tab-arg.patch @@ -1,6 +1,6 @@ -diff -up gnome-system-monitor-2.21.92/src/procman.h.system-tab-arg gnome-system-monitor-2.21.92/src/procman.h ---- gnome-system-monitor-2.21.92/src/procman.h.system-tab-arg 2008-03-08 10:18:31.000000000 -0500 -+++ gnome-system-monitor-2.21.92/src/procman.h 2008-03-08 10:18:31.000000000 -0500 +diff -up gnome-system-monitor-2.22.0/src/procman.h.system-tab-arg gnome-system-monitor-2.22.0/src/procman.h +--- gnome-system-monitor-2.22.0/src/procman.h.system-tab-arg 2008-04-01 17:09:29.000000000 -0400 ++++ gnome-system-monitor-2.22.0/src/procman.h 2008-04-01 17:09:29.000000000 -0400 @@ -58,6 +58,7 @@ enum static const unsigned MIN_UPDATE_INTERVAL = 1 * 1000; static const unsigned MAX_UPDATE_INTERVAL = 100 * 1000; @@ -9,10 +9,10 @@ diff -up gnome-system-monitor-2.21.92/src/procman.h.system-tab-arg gnome-system- enum ProcmanTab { -diff -up gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg gnome-system-monitor-2.21.92/src/procman.cpp ---- gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg 2008-03-08 10:18:31.000000000 -0500 -+++ gnome-system-monitor-2.21.92/src/procman.cpp 2008-03-08 10:36:19.000000000 -0500 -@@ -626,14 +626,20 @@ cb_server (const gchar *msg, gpointer us +diff -up gnome-system-monitor-2.22.0/src/procman.cpp.system-tab-arg gnome-system-monitor-2.22.0/src/procman.cpp +--- gnome-system-monitor-2.22.0/src/procman.cpp.system-tab-arg 2008-04-01 17:09:29.000000000 -0400 ++++ gnome-system-monitor-2.22.0/src/procman.cpp 2008-04-01 17:10:20.000000000 -0400 +@@ -626,14 +626,19 @@ cb_server (const gchar *msg, gpointer us { GdkWindow *window; ProcData *procdata; @@ -29,13 +29,12 @@ diff -up gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg gnome-syste + if (msg != NULL && strcmp(SHOW_SYSTEM_TAB_CMD, msg) == 0) { + procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message"); + gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO); -+ cb_change_current_page (GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata); + } else + timestamp = strtoul(msg, NULL, 0); if (timestamp == 0) { -@@ -669,12 +675,28 @@ main (int argc, char *argv[]) +@@ -669,12 +674,28 @@ main (int argc, char *argv[]) ProcData *procdata; BaconMessageConnection *conn; @@ -64,7 +63,7 @@ diff -up gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg gnome-syste Gtk::Main kit(&argc, &argv); procman_debug("post gtk_init"); -@@ -691,6 +713,9 @@ main (int argc, char *argv[]) +@@ -691,6 +712,9 @@ main (int argc, char *argv[]) timestamp = g_strdup_printf ("%" G_GUINT32_FORMAT, startup_timestamp); @@ -74,14 +73,13 @@ diff -up gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg gnome-syste bacon_message_connection_send (conn, timestamp); gdk_notify_startup_complete (); -@@ -727,6 +752,12 @@ main (int argc, char *argv[]) +@@ -727,6 +751,11 @@ main (int argc, char *argv[]) g_assert(procdata->app); + if (show_system_tab) { + procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request"); + gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO); -+ cb_change_current_page (GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata); + } + gtk_widget_show(procdata->app); diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index 684711e..738cb75 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -13,7 +13,7 @@ Summary: Simple process monitor Name: gnome-system-monitor Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.gnome.org/ @@ -43,8 +43,8 @@ BuildRequires: autoconf, automake, libtool # send upstream: http://bugzilla.gnome.org/show_bug.cgi?id=491462 Patch0: gnome-system-monitor-2.21.92-polkit.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=522988 -Patch1: gnome-system-monitor-2.21.92-system-tab-arg.patch +# Upstreamed. See http://bugzilla.gnome.org/show_bug.cgi?id=522988 +Patch1: gnome-system-monitor-2.22.0-system-tab-arg.patch Requires: PolicyKit-gnome >= %{polkit_gnome_version} Requires(pre): GConf2 >= %{gconf_version} @@ -124,6 +124,9 @@ scrollkeeper-update -q %changelog +* Fri Apr 4 2008 Will Woods - 2.22.0-2 +- Update translations in about-this-computer.desktop + * Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 - Update to 2.22.0