14 files changed, 414 insertions, 550 deletions

diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 2938e741bd35..a72930dd143b 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomenetstatus
-PORTVERSION=	0.13
-PORTREVISION=	1
+PORTVERSION=	2.6.0.1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-netstatus/0.13
+MASTER_SITE_SUBDIR=	sources/gnome-netstatus/2.6
 DISTNAME=	gnome-netstatus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
index 3b36ccde4426..27edbd022e7a 100644
--- a/net/gnome-netstatus/distinfo
+++ b/net/gnome-netstatus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-netstatus-0.13.tar.bz2) = fcaa1e625c4edf66bd447046563b566f
-SIZE (gnome2/gnome-netstatus-0.13.tar.bz2) = 323702
+MD5 (gnome2/gnome-netstatus-2.6.0.1.tar.bz2) = 8236eec5a7174375f28ec05bcc628aaf
+SIZE (gnome2/gnome-netstatus-2.6.0.1.tar.bz2) = 417230
diff --git a/net/gnome-netstatus/files/patch-icons_Makefile.in b/net/gnome-netstatus/files/patch-icons_Makefile.in
new file mode 100644
index 000000000000..a47c7f9e2715
--- /dev/null
+++ b/net/gnome-netstatus/files/patch-icons_Makefile.in
@@ -0,0 +1,11 @@
+--- icons/Makefile.in.orig	Mon Mar  8 22:22:36 2004
++++ icons/Makefile.in	Mon Mar  8 22:22:53 2004
+@@ -133,7 +133,7 @@
+ 
+ iconsize = 48x48
+ category = apps
+-iconsdir = $(datadir)/icons/hicolor/$(iconsize)/$(category)
++iconsdir = $(prefix)/share/icons/hicolor/$(iconsize)/$(category)
+ icons_DATA = \
+ 	gnome-netstatus-disconn.png	\
+ 	gnome-netstatus-idle.png	\
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c
index f332699155bc..1ffae4384ecb 100644
--- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c
+++ b/net/gnome-netstatus/files/patch-src_netstatus-iface.c
@@ -1,114 +1,19 @@
---- src/netstatus-iface.c.orig	Fri Oct 31 08:49:51 2003
-+++ src/netstatus-iface.c	Fri Jan  2 23:29:27 2004
-@@ -32,9 +32,12 @@
+--- src/netstatus-iface.c.orig	Mon Mar 22 17:49:17 2004
++++ src/netstatus-iface.c	Mon Mar 22 17:50:12 2004
+@@ -32,6 +32,8 @@
  
  #include <libgnome/gnome-i18n.h>
  
 +#include <sys/types.h>
 +#include <sys/socket.h>
  #include <sys/ioctl.h>
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include <sys/sockio.h>
+@@ -39,6 +41,7 @@
+ #include <sys/param.h>
  #include <net/if.h>
  #include <net/if_arp.h>
 +#include <netinet/in.h>
  #include <arpa/inet.h>
  #include <errno.h>
  #include <unistd.h>
-@@ -577,6 +580,7 @@
- 					       iface);
- 
-       netstatus_iface_monitor_timeout (iface);
-+
-     }
- }
- 
-@@ -646,7 +650,11 @@
-   strncpy (if_req.ifr_name, iface->priv->name, IF_NAMESIZE - 1);
-   if_req.ifr_name [IF_NAMESIZE - 1] = '\0';
-   if (mask && ioctl (fd, SIOCGIFNETMASK, &if_req) == 0)
-+#if !defined(__FreeBSD__)
-     *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_netmask)->sin_addr));
-+#else
-+    *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_addr)->sin_addr));
-+#endif
- 
-   close (fd);
- 
-@@ -925,6 +933,7 @@
- 				char           **hw_addr)
- 				
- {
-+#ifdef SIOCGIFHWADDR
-   static struct HwType *hw_type = NULL;
-   struct ifreq          if_req;
-   int                   fd;
-@@ -973,6 +982,9 @@
-     *hw_addr = hw_type->print_hw_addr (if_req.ifr_hwaddr.sa_data);
- 
-   return hw_type;
-+#else
-+  return NULL;
-+#endif
- }
- 
- gboolean
-@@ -1083,8 +1095,11 @@
-   struct ifconf *if_conf;
-   GList         *interfaces;
-   GList         *loopbacks;
-+  gchar         *ptr;
-   int            fd;
--  int            i;
-+  struct ifreq  *if_req;
-+  int            len;
-+  gboolean       loopback;
-   
-   if ((fd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
-     {
-@@ -1105,12 +1120,25 @@
-   interfaces = NULL;
-   loopbacks  = NULL;
- 
--  for (i = 0; i < if_conf->ifc_len / sizeof (struct ifreq); i++)
-+  for (ptr = if_conf->ifc_buf; ptr < if_conf->ifc_buf + if_conf->ifc_len;)
-     {
--      struct ifreq if_req = if_conf->ifc_req [i];
--      gboolean     loopback = FALSE;
-+      if_req = (struct ifreq *) ptr;
-+      loopback = FALSE;
-+      len      = sizeof(struct sockaddr);
-+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
-+      if (if_req->ifr_addr.sa_len > len)
-+	len = if_req->ifr_addr.sa_len;
-+#endif
-+
-+      ptr += sizeof(if_req->ifr_name) + len;
-+ 
-+      if (g_list_find_custom (interfaces, if_req->ifr_name, 
-+		  (GCompareFunc) g_ascii_strcasecmp) != NULL
-+	      || g_list_find_custom (loopbacks, if_req->ifr_name,
-+		  (GCompareFunc) g_ascii_strcasecmp) != NULL)
-+	continue;
- 
--      if (ioctl (fd, SIOCGIFFLAGS, &if_req) < 0)
-+      if (ioctl (fd, SIOCGIFFLAGS, if_req) < 0)
- 	{
- 	  if (error)
- 	    *error = g_error_new (NETSTATUS_ERROR,
-@@ -1120,13 +1148,14 @@
- 	}
-       else
- 	{
--	  loopback = (if_req.ifr_flags & IFF_LOOPBACK);
-+	  loopback = (if_req->ifr_flags & IFF_LOOPBACK);
- 	}
- 
-       if (!loopback)
--	interfaces = g_list_prepend (interfaces, g_strdup (if_req.ifr_name));
-+	interfaces = g_list_prepend (interfaces, g_strdup (if_req->ifr_name));
-       else
--	loopbacks  = g_list_prepend (loopbacks,  g_strdup (if_req.ifr_name));
-+	loopbacks  = g_list_prepend (loopbacks,  g_strdup (if_req->ifr_name));
-+
-     }
- 
-   interfaces = g_list_concat (interfaces, loopbacks);
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
index 3598a24e696d..218948f7600c 100644
--- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
+++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
@@ -1,160 +1,10 @@
---- src/netstatus-sysdeps.c.orig	Mon Jun  9 13:18:04 2003
-+++ src/netstatus-sysdeps.c	Fri Jan  2 23:29:16 2004
-@@ -27,10 +27,13 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- #include <errno.h>
- #include <glib.h>
- #include <libgnome/gnome-i18n.h>
- 
-+#if !defined(__FreeBSD__)
-+
- static inline char *
- parse_iface_name (const char *buf)
- {
-@@ -90,6 +93,7 @@
- 	}
+--- src/netstatus-sysdeps.c.orig	Wed Mar 24 14:23:47 2004
++++ src/netstatus-sysdeps.c	Wed Mar 24 14:25:19 2004
+@@ -331,7 +331,6 @@
+ 
+     error_shutdown:
+       g_io_channel_unref (channel);
+-      g_io_channel_shutdown (channel, TRUE, NULL);
+       close (pipe_out);
      }
- }
-+#endif
- 
- static inline int
- parse_stats (char  *buf,
-@@ -124,6 +128,8 @@
-   return TRUE;
- }
- 
-+#if !defined(__FreeBSD__)
-+
- static inline FILE *
- get_proc_net_dev_fh (void)
- {
-@@ -206,3 +212,126 @@
- 
-   return error_message;
- }
-+
-+#else
-+
-+static inline void
-+parse_header (char *buf,
-+	      int  *prx_idx,
-+	      int  *ptx_idx,
-+	      int  *brx_idx,
-+	      int  *btx_idx)
-+{
-+   char *p;
-+   int   i;
-+
-+   *prx_idx = *ptx_idx = -1;
-+   *brx_idx = *btx_idx = -1;
-+
-+   p = strtok (buf, " \n\t");
-+   for (i = 0; p; i++, p = strtok (NULL, " \t\n"))
-+     {
-+        if (!strcmp (p, "Ipkts"))
-+	  {
-+	     *prx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Ibytes"))
-+	  {
-+	     *brx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Opkts"))
-+	  {
-+	     *ptx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Obytes"))
-+	  {
-+	     *btx_idx = i;
-+	  }
-+     }
-+}
-+
-+char *
-+netstatus_sysdeps_read_iface_statistics (const char *iface,
-+					 long       *in_packets,
-+					 long       *out_packets,
-+					 long       *in_bytes,
-+					 long       *out_bytes)
-+{
-+   gchar *buf;
-+   gchar *cmd = NULL;
-+   gchar **command_line;
-+   int prx_idx, ptx_idx;
-+   int brx_idx, btx_idx;
-+   char *error_message = NULL;
-+   gchar *dir = g_get_current_dir ();
-+   gint pout;
-+   GIOChannel *channel;
-+   GError *err = NULL;
-+
-+   *in_packets = -1;
-+   *out_packets = -1;
-+   *in_bytes = -1;
-+   *out_bytes = -1;
-+
-+   cmd = g_strdup_printf ("/usr/bin/netstat netstat -n -I %s -b -f inet", iface);
-+   command_line = g_strsplit (cmd, " ", -1);
-+   g_free (cmd);
-+
-+   if (g_spawn_async_with_pipes (dir, command_line, NULL,
-+	       			 G_SPAWN_FILE_AND_ARGV_ZERO, NULL,
-+				 NULL, NULL, NULL, &pout,
-+				 NULL, &err)) {
-+       g_strfreev (command_line);
-+       channel = g_io_channel_unix_new (pout);
-+       g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-+
-+       parse_header (buf, &prx_idx, &ptx_idx, &brx_idx, &btx_idx);
-+       if (prx_idx == -1 || ptx_idx == -1 ||
-+	   brx_idx == -1 || btx_idx == -1)
-+         {
-+	   if (buf)
-+	     g_free (buf);
-+	   g_io_channel_unref (channel);
-+	   g_io_channel_shutdown (channel, TRUE, NULL);
-+	   close (pout);
-+	   return g_strdup ("Could not parse netstat output.  Unknown format");
-+	 }
-+
-+       if (buf)
-+          g_free (buf);
-+       g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-+
-+       if (!parse_stats (buf, prx_idx, ptx_idx, in_packets, out_packets,
-+	       	    brx_idx, btx_idx, in_bytes, out_bytes))
-+       {
-+	  if (error_message)
-+	     g_free (error_message);
-+	  error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. "
-+		      	     "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"),
-+		  	     buf, prx_idx, ptx_idx, brx_idx, btx_idx);
-+       }
-+
-+       if (buf)
-+	 g_free (buf);
-+
-+       if ((*in_packets == -1 || *out_packets == -1 || *in_bytes == -1 || *out_bytes == -1) && !error_message)
-+	   error_message = g_strdup_printf ("Could not obtain information on interface '%s' from netstat", iface);
-+
-+       g_io_channel_unref (channel);
-+       g_io_channel_shutdown (channel, TRUE, NULL);
-+       close (pout);
-+   }
-+   else {
-+      g_strfreev (command_line);
-+      if (error_message)
-+        g_free (error_message);
-+      error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", 
-+	iface, err->message);
-+      g_error_free (err);
-+   }
-+
-+   g_free (dir);
-+
-+   return error_message;
-+}
-+#endif
+   else
diff --git a/net/gnome-netstatus/pkg-descr b/net/gnome-netstatus/pkg-descr
index 85e70885cf36..0848cf01ffc2 100644
--- a/net/gnome-netstatus/pkg-descr
+++ b/net/gnome-netstatus/pkg-descr
@@ -1,2 +1,2 @@
-Gnome-netstatus is an applet which provides information about a network 
-interface on your panel.
+Gnome-netstatus is a panel applet which provides information about 
+network interfaces.
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index 75f6a0c128fc..c4e0a7b62327 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -6,36 +6,203 @@ libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
 libexec/gnome-netstatus-applet
 share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml
 share/gnome/gnome-netstatus/gnome-netstatus.glade
-share/gnome/icons/gnome-netstatus/gnome-netstatus-disconn.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-error.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-idle.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-rx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-tx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/C/legal.xml
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/de/legal.xml
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/es/legal.xml
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/fr/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/fr/legal.xml
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/it/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/it/legal.xml
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/ja/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/ja/legal.xml
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/ko/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/ko/legal.xml
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/sv/legal.xml
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/zh_CN/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/zh_CN/legal.xml
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/zh_HK/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/zh_HK/legal.xml
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/zh_TW/legal.xml
+share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-netstatus-tx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-error.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png
+share/locale/ar/LC_MESSAGES/gnome-netstatus.mo
 share/locale/az/LC_MESSAGES/gnome-netstatus.mo
+share/locale/bn/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ca/LC_MESSAGES/gnome-netstatus.mo
 share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
+share/locale/cy/LC_MESSAGES/gnome-netstatus.mo
+share/locale/da/LC_MESSAGES/gnome-netstatus.mo
 share/locale/de/LC_MESSAGES/gnome-netstatus.mo
 share/locale/el/LC_MESSAGES/gnome-netstatus.mo
+share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo
+share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo
 share/locale/es/LC_MESSAGES/gnome-netstatus.mo
+share/locale/fi/LC_MESSAGES/gnome-netstatus.mo
 share/locale/fr/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ga/LC_MESSAGES/gnome-netstatus.mo
+share/locale/hi/LC_MESSAGES/gnome-netstatus.mo
+share/locale/hr/LC_MESSAGES/gnome-netstatus.mo
+share/locale/hu/LC_MESSAGES/gnome-netstatus.mo
 share/locale/it/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ja/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ko/LC_MESSAGES/gnome-netstatus.mo
+share/locale/lt/LC_MESSAGES/gnome-netstatus.mo
 share/locale/mn/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ms/LC_MESSAGES/gnome-netstatus.mo
 share/locale/nl/LC_MESSAGES/gnome-netstatus.mo
+share/locale/nn/LC_MESSAGES/gnome-netstatus.mo
+share/locale/no/LC_MESSAGES/gnome-netstatus.mo
+share/locale/pa/LC_MESSAGES/gnome-netstatus.mo
 share/locale/pl/LC_MESSAGES/gnome-netstatus.mo
 share/locale/pt/LC_MESSAGES/gnome-netstatus.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ro/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ru/LC_MESSAGES/gnome-netstatus.mo
+share/locale/sk/LC_MESSAGES/gnome-netstatus.mo
+share/locale/sq/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sv/LC_MESSAGES/gnome-netstatus.mo
+share/locale/th/LC_MESSAGES/gnome-netstatus.mo
 share/locale/tr/LC_MESSAGES/gnome-netstatus.mo
+share/locale/uk/LC_MESSAGES/gnome-netstatus.mo
 share/locale/vi/LC_MESSAGES/gnome-netstatus.mo
 share/locale/wa/LC_MESSAGES/gnome-netstatus.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
-@dirrm share/gnome/icons/gnome-netstatus
+@dirrm share/gnome/omf/gnome-netstatus
+@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures
+@dirrm share/gnome/help/gnome-netstatus/zh_TW
+@dirrm share/gnome/help/gnome-netstatus/zh_HK/figures
+@dirrm share/gnome/help/gnome-netstatus/zh_HK
+@dirrm share/gnome/help/gnome-netstatus/zh_CN/figures
+@dirrm share/gnome/help/gnome-netstatus/zh_CN
+@dirrm share/gnome/help/gnome-netstatus/sv/figures
+@dirrm share/gnome/help/gnome-netstatus/sv
+@dirrm share/gnome/help/gnome-netstatus/ko/figures
+@dirrm share/gnome/help/gnome-netstatus/ko
+@dirrm share/gnome/help/gnome-netstatus/ja/figures
+@dirrm share/gnome/help/gnome-netstatus/ja
+@dirrm share/gnome/help/gnome-netstatus/it/figures
+@dirrm share/gnome/help/gnome-netstatus/it
+@dirrm share/gnome/help/gnome-netstatus/fr/figures
+@dirrm share/gnome/help/gnome-netstatus/fr
+@dirrm share/gnome/help/gnome-netstatus/es/figures
+@dirrm share/gnome/help/gnome-netstatus/es
+@dirrm share/gnome/help/gnome-netstatus/de/figures
+@dirrm share/gnome/help/gnome-netstatus/de
+@dirrm share/gnome/help/gnome-netstatus/C/figures
+@dirrm share/gnome/help/gnome-netstatus/C
+@dirrm share/gnome/help/gnome-netstatus
 @dirrm share/gnome/gnome-netstatus
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet
 @dirrm etc/gconf/gconf.xml.defaults/apps/netstatus_applet
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile
index 2938e741bd35..a72930dd143b 100644
--- a/net/gnomenetstatus/Makefile
+++ b/net/gnomenetstatus/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomenetstatus
-PORTVERSION=	0.13
-PORTREVISION=	1
+PORTVERSION=	2.6.0.1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-netstatus/0.13
+MASTER_SITE_SUBDIR=	sources/gnome-netstatus/2.6
 DISTNAME=	gnome-netstatus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo
index 3b36ccde4426..27edbd022e7a 100644
--- a/net/gnomenetstatus/distinfo
+++ b/net/gnomenetstatus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-netstatus-0.13.tar.bz2) = fcaa1e625c4edf66bd447046563b566f
-SIZE (gnome2/gnome-netstatus-0.13.tar.bz2) = 323702
+MD5 (gnome2/gnome-netstatus-2.6.0.1.tar.bz2) = 8236eec5a7174375f28ec05bcc628aaf
+SIZE (gnome2/gnome-netstatus-2.6.0.1.tar.bz2) = 417230
diff --git a/net/gnomenetstatus/files/patch-icons_Makefile.in b/net/gnomenetstatus/files/patch-icons_Makefile.in
new file mode 100644
index 000000000000..a47c7f9e2715
--- /dev/null
+++ b/net/gnomenetstatus/files/patch-icons_Makefile.in
@@ -0,0 +1,11 @@
+--- icons/Makefile.in.orig	Mon Mar  8 22:22:36 2004
++++ icons/Makefile.in	Mon Mar  8 22:22:53 2004
+@@ -133,7 +133,7 @@
+ 
+ iconsize = 48x48
+ category = apps
+-iconsdir = $(datadir)/icons/hicolor/$(iconsize)/$(category)
++iconsdir = $(prefix)/share/icons/hicolor/$(iconsize)/$(category)
+ icons_DATA = \
+ 	gnome-netstatus-disconn.png	\
+ 	gnome-netstatus-idle.png	\
diff --git a/net/gnomenetstatus/files/patch-src_netstatus-iface.c b/net/gnomenetstatus/files/patch-src_netstatus-iface.c
index f332699155bc..1ffae4384ecb 100644
--- a/net/gnomenetstatus/files/patch-src_netstatus-iface.c
+++ b/net/gnomenetstatus/files/patch-src_netstatus-iface.c
@@ -1,114 +1,19 @@
---- src/netstatus-iface.c.orig	Fri Oct 31 08:49:51 2003
-+++ src/netstatus-iface.c	Fri Jan  2 23:29:27 2004
-@@ -32,9 +32,12 @@
+--- src/netstatus-iface.c.orig	Mon Mar 22 17:49:17 2004
++++ src/netstatus-iface.c	Mon Mar 22 17:50:12 2004
+@@ -32,6 +32,8 @@
  
  #include <libgnome/gnome-i18n.h>
  
 +#include <sys/types.h>
 +#include <sys/socket.h>
  #include <sys/ioctl.h>
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include <sys/sockio.h>
+@@ -39,6 +41,7 @@
+ #include <sys/param.h>
  #include <net/if.h>
  #include <net/if_arp.h>
 +#include <netinet/in.h>
  #include <arpa/inet.h>
  #include <errno.h>
  #include <unistd.h>
-@@ -577,6 +580,7 @@
- 					       iface);
- 
-       netstatus_iface_monitor_timeout (iface);
-+
-     }
- }
- 
-@@ -646,7 +650,11 @@
-   strncpy (if_req.ifr_name, iface->priv->name, IF_NAMESIZE - 1);
-   if_req.ifr_name [IF_NAMESIZE - 1] = '\0';
-   if (mask && ioctl (fd, SIOCGIFNETMASK, &if_req) == 0)
-+#if !defined(__FreeBSD__)
-     *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_netmask)->sin_addr));
-+#else
-+    *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_addr)->sin_addr));
-+#endif
- 
-   close (fd);
- 
-@@ -925,6 +933,7 @@
- 				char           **hw_addr)
- 				
- {
-+#ifdef SIOCGIFHWADDR
-   static struct HwType *hw_type = NULL;
-   struct ifreq          if_req;
-   int                   fd;
-@@ -973,6 +982,9 @@
-     *hw_addr = hw_type->print_hw_addr (if_req.ifr_hwaddr.sa_data);
- 
-   return hw_type;
-+#else
-+  return NULL;
-+#endif
- }
- 
- gboolean
-@@ -1083,8 +1095,11 @@
-   struct ifconf *if_conf;
-   GList         *interfaces;
-   GList         *loopbacks;
-+  gchar         *ptr;
-   int            fd;
--  int            i;
-+  struct ifreq  *if_req;
-+  int            len;
-+  gboolean       loopback;
-   
-   if ((fd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
-     {
-@@ -1105,12 +1120,25 @@
-   interfaces = NULL;
-   loopbacks  = NULL;
- 
--  for (i = 0; i < if_conf->ifc_len / sizeof (struct ifreq); i++)
-+  for (ptr = if_conf->ifc_buf; ptr < if_conf->ifc_buf + if_conf->ifc_len;)
-     {
--      struct ifreq if_req = if_conf->ifc_req [i];
--      gboolean     loopback = FALSE;
-+      if_req = (struct ifreq *) ptr;
-+      loopback = FALSE;
-+      len      = sizeof(struct sockaddr);
-+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
-+      if (if_req->ifr_addr.sa_len > len)
-+	len = if_req->ifr_addr.sa_len;
-+#endif
-+
-+      ptr += sizeof(if_req->ifr_name) + len;
-+ 
-+      if (g_list_find_custom (interfaces, if_req->ifr_name, 
-+		  (GCompareFunc) g_ascii_strcasecmp) != NULL
-+	      || g_list_find_custom (loopbacks, if_req->ifr_name,
-+		  (GCompareFunc) g_ascii_strcasecmp) != NULL)
-+	continue;
- 
--      if (ioctl (fd, SIOCGIFFLAGS, &if_req) < 0)
-+      if (ioctl (fd, SIOCGIFFLAGS, if_req) < 0)
- 	{
- 	  if (error)
- 	    *error = g_error_new (NETSTATUS_ERROR,
-@@ -1120,13 +1148,14 @@
- 	}
-       else
- 	{
--	  loopback = (if_req.ifr_flags & IFF_LOOPBACK);
-+	  loopback = (if_req->ifr_flags & IFF_LOOPBACK);
- 	}
- 
-       if (!loopback)
--	interfaces = g_list_prepend (interfaces, g_strdup (if_req.ifr_name));
-+	interfaces = g_list_prepend (interfaces, g_strdup (if_req->ifr_name));
-       else
--	loopbacks  = g_list_prepend (loopbacks,  g_strdup (if_req.ifr_name));
-+	loopbacks  = g_list_prepend (loopbacks,  g_strdup (if_req->ifr_name));
-+
-     }
- 
-   interfaces = g_list_concat (interfaces, loopbacks);
diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c
index 3598a24e696d..218948f7600c 100644
--- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c
+++ b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c
@@ -1,160 +1,10 @@
---- src/netstatus-sysdeps.c.orig	Mon Jun  9 13:18:04 2003
-+++ src/netstatus-sysdeps.c	Fri Jan  2 23:29:16 2004
-@@ -27,10 +27,13 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- #include <errno.h>
- #include <glib.h>
- #include <libgnome/gnome-i18n.h>
- 
-+#if !defined(__FreeBSD__)
-+
- static inline char *
- parse_iface_name (const char *buf)
- {
-@@ -90,6 +93,7 @@
- 	}
+--- src/netstatus-sysdeps.c.orig	Wed Mar 24 14:23:47 2004
++++ src/netstatus-sysdeps.c	Wed Mar 24 14:25:19 2004
+@@ -331,7 +331,6 @@
+ 
+     error_shutdown:
+       g_io_channel_unref (channel);
+-      g_io_channel_shutdown (channel, TRUE, NULL);
+       close (pipe_out);
      }
- }
-+#endif
- 
- static inline int
- parse_stats (char  *buf,
-@@ -124,6 +128,8 @@
-   return TRUE;
- }
- 
-+#if !defined(__FreeBSD__)
-+
- static inline FILE *
- get_proc_net_dev_fh (void)
- {
-@@ -206,3 +212,126 @@
- 
-   return error_message;
- }
-+
-+#else
-+
-+static inline void
-+parse_header (char *buf,
-+	      int  *prx_idx,
-+	      int  *ptx_idx,
-+	      int  *brx_idx,
-+	      int  *btx_idx)
-+{
-+   char *p;
-+   int   i;
-+
-+   *prx_idx = *ptx_idx = -1;
-+   *brx_idx = *btx_idx = -1;
-+
-+   p = strtok (buf, " \n\t");
-+   for (i = 0; p; i++, p = strtok (NULL, " \t\n"))
-+     {
-+        if (!strcmp (p, "Ipkts"))
-+	  {
-+	     *prx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Ibytes"))
-+	  {
-+	     *brx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Opkts"))
-+	  {
-+	     *ptx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Obytes"))
-+	  {
-+	     *btx_idx = i;
-+	  }
-+     }
-+}
-+
-+char *
-+netstatus_sysdeps_read_iface_statistics (const char *iface,
-+					 long       *in_packets,
-+					 long       *out_packets,
-+					 long       *in_bytes,
-+					 long       *out_bytes)
-+{
-+   gchar *buf;
-+   gchar *cmd = NULL;
-+   gchar **command_line;
-+   int prx_idx, ptx_idx;
-+   int brx_idx, btx_idx;
-+   char *error_message = NULL;
-+   gchar *dir = g_get_current_dir ();
-+   gint pout;
-+   GIOChannel *channel;
-+   GError *err = NULL;
-+
-+   *in_packets = -1;
-+   *out_packets = -1;
-+   *in_bytes = -1;
-+   *out_bytes = -1;
-+
-+   cmd = g_strdup_printf ("/usr/bin/netstat netstat -n -I %s -b -f inet", iface);
-+   command_line = g_strsplit (cmd, " ", -1);
-+   g_free (cmd);
-+
-+   if (g_spawn_async_with_pipes (dir, command_line, NULL,
-+	       			 G_SPAWN_FILE_AND_ARGV_ZERO, NULL,
-+				 NULL, NULL, NULL, &pout,
-+				 NULL, &err)) {
-+       g_strfreev (command_line);
-+       channel = g_io_channel_unix_new (pout);
-+       g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-+
-+       parse_header (buf, &prx_idx, &ptx_idx, &brx_idx, &btx_idx);
-+       if (prx_idx == -1 || ptx_idx == -1 ||
-+	   brx_idx == -1 || btx_idx == -1)
-+         {
-+	   if (buf)
-+	     g_free (buf);
-+	   g_io_channel_unref (channel);
-+	   g_io_channel_shutdown (channel, TRUE, NULL);
-+	   close (pout);
-+	   return g_strdup ("Could not parse netstat output.  Unknown format");
-+	 }
-+
-+       if (buf)
-+          g_free (buf);
-+       g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-+
-+       if (!parse_stats (buf, prx_idx, ptx_idx, in_packets, out_packets,
-+	       	    brx_idx, btx_idx, in_bytes, out_bytes))
-+       {
-+	  if (error_message)
-+	     g_free (error_message);
-+	  error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. "
-+		      	     "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"),
-+		  	     buf, prx_idx, ptx_idx, brx_idx, btx_idx);
-+       }
-+
-+       if (buf)
-+	 g_free (buf);
-+
-+       if ((*in_packets == -1 || *out_packets == -1 || *in_bytes == -1 || *out_bytes == -1) && !error_message)
-+	   error_message = g_strdup_printf ("Could not obtain information on interface '%s' from netstat", iface);
-+
-+       g_io_channel_unref (channel);
-+       g_io_channel_shutdown (channel, TRUE, NULL);
-+       close (pout);
-+   }
-+   else {
-+      g_strfreev (command_line);
-+      if (error_message)
-+        g_free (error_message);
-+      error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", 
-+	iface, err->message);
-+      g_error_free (err);
-+   }
-+
-+   g_free (dir);
-+
-+   return error_message;
-+}
-+#endif
+   else
diff --git a/net/gnomenetstatus/pkg-descr b/net/gnomenetstatus/pkg-descr
index 85e70885cf36..0848cf01ffc2 100644
--- a/net/gnomenetstatus/pkg-descr
+++ b/net/gnomenetstatus/pkg-descr
@@ -1,2 +1,2 @@
-Gnome-netstatus is an applet which provides information about a network 
-interface on your panel.
+Gnome-netstatus is a panel applet which provides information about 
+network interfaces.
diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist
index 75f6a0c128fc..c4e0a7b62327 100644
--- a/net/gnomenetstatus/pkg-plist
+++ b/net/gnomenetstatus/pkg-plist
@@ -6,36 +6,203 @@ libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
 libexec/gnome-netstatus-applet
 share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml
 share/gnome/gnome-netstatus/gnome-netstatus.glade
-share/gnome/icons/gnome-netstatus/gnome-netstatus-disconn.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-error.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-idle.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-rx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-tx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/C/legal.xml
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/de/legal.xml
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/es/legal.xml
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/fr/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/fr/legal.xml
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/it/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/it/legal.xml
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/ja/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/ja/legal.xml
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/ko/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/ko/legal.xml
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/sv/legal.xml
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/zh_CN/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/zh_CN/legal.xml
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/zh_HK/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/zh_HK/legal.xml
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/zh_TW/legal.xml
+share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-netstatus-tx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-error.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png
+share/locale/ar/LC_MESSAGES/gnome-netstatus.mo
 share/locale/az/LC_MESSAGES/gnome-netstatus.mo
+share/locale/bn/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ca/LC_MESSAGES/gnome-netstatus.mo
 share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
+share/locale/cy/LC_MESSAGES/gnome-netstatus.mo
+share/locale/da/LC_MESSAGES/gnome-netstatus.mo
 share/locale/de/LC_MESSAGES/gnome-netstatus.mo
 share/locale/el/LC_MESSAGES/gnome-netstatus.mo
+share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo
+share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo
 share/locale/es/LC_MESSAGES/gnome-netstatus.mo
+share/locale/fi/LC_MESSAGES/gnome-netstatus.mo
 share/locale/fr/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ga/LC_MESSAGES/gnome-netstatus.mo
+share/locale/hi/LC_MESSAGES/gnome-netstatus.mo
+share/locale/hr/LC_MESSAGES/gnome-netstatus.mo
+share/locale/hu/LC_MESSAGES/gnome-netstatus.mo
 share/locale/it/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ja/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ko/LC_MESSAGES/gnome-netstatus.mo
+share/locale/lt/LC_MESSAGES/gnome-netstatus.mo
 share/locale/mn/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ms/LC_MESSAGES/gnome-netstatus.mo
 share/locale/nl/LC_MESSAGES/gnome-netstatus.mo
+share/locale/nn/LC_MESSAGES/gnome-netstatus.mo
+share/locale/no/LC_MESSAGES/gnome-netstatus.mo
+share/locale/pa/LC_MESSAGES/gnome-netstatus.mo
 share/locale/pl/LC_MESSAGES/gnome-netstatus.mo
 share/locale/pt/LC_MESSAGES/gnome-netstatus.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ro/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ru/LC_MESSAGES/gnome-netstatus.mo
+share/locale/sk/LC_MESSAGES/gnome-netstatus.mo
+share/locale/sq/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sv/LC_MESSAGES/gnome-netstatus.mo
+share/locale/th/LC_MESSAGES/gnome-netstatus.mo
 share/locale/tr/LC_MESSAGES/gnome-netstatus.mo
+share/locale/uk/LC_MESSAGES/gnome-netstatus.mo
 share/locale/vi/LC_MESSAGES/gnome-netstatus.mo
 share/locale/wa/LC_MESSAGES/gnome-netstatus.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
-@dirrm share/gnome/icons/gnome-netstatus
+@dirrm share/gnome/omf/gnome-netstatus
+@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures
+@dirrm share/gnome/help/gnome-netstatus/zh_TW
+@dirrm share/gnome/help/gnome-netstatus/zh_HK/figures
+@dirrm share/gnome/help/gnome-netstatus/zh_HK
+@dirrm share/gnome/help/gnome-netstatus/zh_CN/figures
+@dirrm share/gnome/help/gnome-netstatus/zh_CN
+@dirrm share/gnome/help/gnome-netstatus/sv/figures
+@dirrm share/gnome/help/gnome-netstatus/sv
+@dirrm share/gnome/help/gnome-netstatus/ko/figures
+@dirrm share/gnome/help/gnome-netstatus/ko
+@dirrm share/gnome/help/gnome-netstatus/ja/figures
+@dirrm share/gnome/help/gnome-netstatus/ja
+@dirrm share/gnome/help/gnome-netstatus/it/figures
+@dirrm share/gnome/help/gnome-netstatus/it
+@dirrm share/gnome/help/gnome-netstatus/fr/figures
+@dirrm share/gnome/help/gnome-netstatus/fr
+@dirrm share/gnome/help/gnome-netstatus/es/figures
+@dirrm share/gnome/help/gnome-netstatus/es
+@dirrm share/gnome/help/gnome-netstatus/de/figures
+@dirrm share/gnome/help/gnome-netstatus/de
+@dirrm share/gnome/help/gnome-netstatus/C/figures
+@dirrm share/gnome/help/gnome-netstatus/C
+@dirrm share/gnome/help/gnome-netstatus
 @dirrm share/gnome/gnome-netstatus
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet
 @dirrm etc/gconf/gconf.xml.defaults/apps/netstatus_applet
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true