diff -Nru gnome-system-monitor-2.22.0/config.guess gnome-system-monitor-2.22.1/config.guess --- gnome-system-monitor-2.22.0/config.guess 2007-08-29 07:24:43.000000000 +0200 +++ gnome-system-monitor-2.22.1/config.guess 2008-03-12 17:26:09.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-03-06' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -330,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -532,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -793,12 +793,15 @@ exit ;; *:Interix*:[3456]*) case ${UNAME_MACHINE} in - x86) + x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -833,7 +836,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -954,8 +964,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -1474,9 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/config.sub /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/config.sub --- gnome-system-monitor-2.22.0/config.sub 2007-08-29 07:24:43.000000000 +0200 +++ gnome-system-monitor-2.22.1/config.sub 2008-03-12 17:26:09.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-01-18' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -475,8 +487,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -809,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1017,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/configure /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/configure --- gnome-system-monitor-2.22.0/configure 2008-03-10 20:07:29.000000000 +0100 +++ gnome-system-monitor-2.22.1/configure 2008-03-12 17:26:02.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for gnome-system-monitor 2.22.0. +# Generated by GNU Autoconf 2.61 for gnome-system-monitor 2.22.1. # # Report bugs to . # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='gnome-system-monitor' PACKAGE_TARNAME='gnome-system-monitor' -PACKAGE_VERSION='2.22.0' -PACKAGE_STRING='gnome-system-monitor 2.22.0' +PACKAGE_VERSION='2.22.1' +PACKAGE_STRING='gnome-system-monitor 2.22.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor' ac_unique_file="configure.in" @@ -1453,7 +1453,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 2.22.0 to adapt to many kinds of systems. +\`configure' configures gnome-system-monitor 2.22.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1523,7 +1523,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-system-monitor 2.22.0:";; + short | recursive ) echo "Configuration of gnome-system-monitor 2.22.1:";; esac cat <<\_ACEOF @@ -1642,7 +1642,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-system-monitor configure 2.22.0 +gnome-system-monitor configure 2.22.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1656,7 +1656,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 2.22.0, which was +It was created by gnome-system-monitor $as_me 2.22.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2330,7 +2330,7 @@ # Define the identity of the package. PACKAGE='gnome-system-monitor' - VERSION='2.22.0' + VERSION='2.22.1' cat >>confdefs.h <<_ACEOF @@ -24650,7 +24650,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 2.22.0, which was +This file was extended by gnome-system-monitor $as_me 2.22.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24703,7 +24703,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gnome-system-monitor config.status 2.22.0 +gnome-system-monitor config.status 2.22.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/configure.in /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/configure.in --- gnome-system-monitor-2.22.0/configure.in 2008-03-10 20:06:37.000000000 +0100 +++ gnome-system-monitor-2.22.1/configure.in 2008-03-10 20:29:46.000000000 +0100 @@ -2,7 +2,7 @@ AC_PREREQ(2.52) -AC_INIT([gnome-system-monitor], [2.22.0], +AC_INIT([gnome-system-monitor], [2.22.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor]) AC_CONFIG_SRCDIR(configure.in) AC_CONFIG_HEADERS(config.h) diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/debian/changelog /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/debian/changelog --- gnome-system-monitor-2.22.0/debian/changelog 2008-04-28 16:38:16.000000000 +0200 +++ gnome-system-monitor-2.22.1/debian/changelog 2008-04-28 16:38:16.000000000 +0200 @@ -1,3 +1,11 @@ +gnome-system-monitor (2.22.1-0ubuntu1) hardy-proposed; urgency=low + + * New upstream version (lp: #223640): + - lsof: don't crash on invalid regex + - graphs: fixed the time scale (lp: #217645) + + -- Sebastien Bacher Mon, 28 Apr 2008 11:39:01 +0200 + gnome-system-monitor (2.22.0-1ubuntu3) hardy; urgency=low * debian/control.in, diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/debian/control /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/debian/control --- gnome-system-monitor-2.22.0/debian/control 2008-04-28 16:38:16.000000000 +0200 +++ gnome-system-monitor-2.22.1/debian/control 2008-04-28 16:38:16.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Loic Minier , Oystein Gisnas , Riccardo Setti , Sebastian Dröge +Uploaders: Debian GNOME Maintainers , Loic Minier , Riccardo Setti , Sebastian Dröge Build-Depends: cdbs (>= 0.4.0), debhelper (>= 5), libgtk2.0-dev (>= 2.12.0), diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/gnome-doc-utils.make /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/gnome-doc-utils.make --- gnome-system-monitor-2.22.0/gnome-doc-utils.make 2007-08-29 07:24:17.000000000 +0200 +++ gnome-system-monitor-2.22.1/gnome-doc-utils.make 2008-03-12 17:25:40.000000000 +0100 @@ -416,6 +416,11 @@ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ done @@ -486,6 +491,12 @@ done @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ done @@ -554,7 +565,7 @@ uninstall-doc-omf: @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ - if test "x$(_ENABLE_SK)" == "xtrue"; then \ + if test "x$(_ENABLE_SK)" = "xtrue"; then \ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ fi; \ diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/gnome-system-monitor.desktop.in /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/gnome-system-monitor.desktop.in --- gnome-system-monitor-2.22.0/gnome-system-monitor.desktop.in 2008-03-10 20:08:11.000000000 +0100 +++ gnome-system-monitor-2.22.1/gnome-system-monitor.desktop.in 2008-03-12 17:26:50.000000000 +0100 @@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=system-monitor X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=2.22.0 +X-GNOME-Bugzilla-Version=2.22.1 diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/help/Makefile.in /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/help/Makefile.in --- gnome-system-monitor-2.22.0/help/Makefile.in 2008-03-10 20:07:22.000000000 +0100 +++ gnome-system-monitor-2.22.1/help/Makefile.in 2008-03-12 17:26:07.000000000 +0100 @@ -735,6 +735,11 @@ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ done @@ -803,6 +808,12 @@ done @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ done @@ -870,7 +881,7 @@ uninstall-doc-omf: @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ - if test "x$(_ENABLE_SK)" == "xtrue"; then \ + if test "x$(_ENABLE_SK)" = "xtrue"; then \ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ fi; \ diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/intltool-extract.in /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/intltool-extract.in --- gnome-system-monitor-2.22.0/intltool-extract.in 2007-08-29 07:24:14.000000000 +0200 +++ gnome-system-monitor-2.22.1/intltool-extract.in 2008-03-12 17:25:40.000000000 +0100 @@ -32,7 +32,7 @@ ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; -my $VERSION = "0.36.0"; +my $VERSION = "0.37.1"; ## Loaded modules use strict; @@ -161,7 +161,8 @@ --type=TYPE Specify the file type of FILENAME. Currently supports: "gettext/glade", "gettext/ini", "gettext/keys" "gettext/rfc822deb", "gettext/schemas", - "gettext/scheme", "gettext/xml", "gettext/quoted" + "gettext/scheme", "gettext/xml", "gettext/quoted", + "gettext/quotedxml" -l, --local Writes output into current working directory (conflicts with --update) --update Writes output into the same directory the source file @@ -218,6 +219,7 @@ &type_schemas if $gettext_type eq "schemas"; &type_rfc822deb if $gettext_type eq "rfc822deb"; &type_quoted if $gettext_type eq "quoted"; + &type_quotedxml if $gettext_type eq "quotedxml"; } sub entity_decode_minimal @@ -731,6 +733,18 @@ } } +sub type_quotedxml { + while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { + my $message = $1; + my $before = $`; + $message =~ s/\\\"/\"/g; + $message = entity_decode($message); + $before =~ s/[^\n]//g; + $messages{$message} = []; + $loc{$message} = length ($before) + 2; + } +} + sub type_glade { ### For translatable Glade XML files ### diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/intltool-merge.in /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/intltool-merge.in --- gnome-system-monitor-2.22.0/intltool-merge.in 2007-08-29 07:24:14.000000000 +0200 +++ gnome-system-monitor-2.22.1/intltool-merge.in 2008-03-12 17:25:40.000000000 +0100 @@ -35,7 +35,7 @@ ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; -my $VERSION = "0.36.0"; +my $VERSION = "0.37.1"; ## Loaded modules use strict; @@ -61,6 +61,7 @@ my $SCHEMAS_STYLE_ARG = 0; my $RFC822DEB_STYLE_ARG = 0; my $QUOTED_STYLE_ARG = 0; +my $QUOTEDXML_STYLE_ARG = 0; my $QUIET_ARG = 0; my $PASS_THROUGH_ARG = 0; my $UTF8_ARG = 0; @@ -81,6 +82,7 @@ "schemas-style|s" => \$SCHEMAS_STYLE_ARG, "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, "quoted-style" => \$QUOTED_STYLE_ARG, + "quotedxml-style" => \$QUOTEDXML_STYLE_ARG, "pass-through|p" => \$PASS_THROUGH_ARG, "utf8|u" => \$UTF8_ARG, "multiple-output|m" => \$MULTIPLE_OUTPUT, @@ -100,24 +102,13 @@ { my ($file) = @_; # If either a file exists, or when run it returns 0 exit status - return 1 if ((-x $file) or (system("$file --version >$devnull") == 0)); + return 1 if ((-x $file) or (system("$file -l >$devnull") == 0)); return 0; } -sub isGNUGettextTool +if (! isProgramInPath ("$iconv")) { - my ($file) = @_; - # Check that we are using GNU gettext tools - if (isProgramInPath ($file)) { - my $version = `$file --version`; - return 1 if ($version =~ m/.*\(GNU .*\).*/); - } - return 0; -} - -if (! isGNUGettextTool ("$iconv")) -{ - print STDERR " *** GNU iconv is not found on this system!\n". + print STDERR " *** iconv is not found on this system!\n". " *** Without it, intltool-merge can not convert encodings.\n"; exit; } @@ -159,7 +150,7 @@ &utf8_sanity_check; &preparation; &print_message; - &keys_merge_translations; + &keys_merge_translations; &finalize; } elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) @@ -185,12 +176,12 @@ &rfc822deb_merge_translations; &finalize; } -elsif ($QUOTED_STYLE_ARG && @ARGV > 2) +elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2) { &utf8_sanity_check; &preparation; &print_message; - "ed_merge_translations; + "ed_merge_translations($QUOTEDXML_STYLE_ARG); &finalize; } else @@ -230,6 +221,7 @@ -s, --schemas-style includes translations in the schemas style -r, --rfc822deb-style includes translations in the RFC822 style --quoted-style includes translations in the quoted string style + --quotedxml-style includes translations in the quoted xml string style -x, --xml-style includes translations in the standard xml style Other options: @@ -286,8 +278,41 @@ sub gather_po_files { - for my $po_file (glob "$PO_DIR/*.po") { - $po_files_by_lang{po_file2lang($po_file)} = $po_file; + if (my $linguas = $ENV{"LINGUAS"}) + { + for my $lang (split / /, $linguas) { + my $po_file = $PO_DIR . "/" . $lang . ".po"; + if (-e $po_file) { + $po_files_by_lang{$lang} = $po_file; + } + } + } + else + { + if (open LINGUAS_FILE, "$PO_DIR/LINGUAS") + { + while () + { + next if /^#/; + + for my $lang (split) + { + chomp ($lang); + my $po_file = $PO_DIR . "/" . $lang . ".po"; + if (-e $po_file) { + $po_files_by_lang{$lang} = $po_file; + } + } + } + + close LINGUAS_FILE; + } + else + { + for my $po_file (glob "$PO_DIR/*.po") { + $po_files_by_lang{po_file2lang($po_file)} = $po_file; + } + } } } @@ -553,6 +578,7 @@ return "&" if $_ == 38; return "'" if $_ == 39; return "<" if $_ == 60; + return ">" if $_ == 62; return chr $_; } @@ -1053,43 +1079,74 @@ close OUTPUT; print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; } - } - open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree); - close OUTPUT; - print "CREATED $OUTFILE\n" unless $QUIET_ARG; + if ( ! -d "C" ) { + mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n"; + } + open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + my $tree = readXml($FILE); + print_header($FILE, \*OUTPUT); + parseTree(\*OUTPUT, $tree); + close OUTPUT; + print "CREATED C/$OUTFILE\n" unless $QUIET_ARG; + } else { + open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + my $tree = readXml($FILE); + print_header($FILE, \*OUTPUT); + parseTree(\*OUTPUT, $tree); + close OUTPUT; + print "CREATED $OUTFILE\n" unless $QUIET_ARG; + } } -sub keys_merge_translations +sub keys_merge_translation { - open INPUT, "<${FILE}" or die; - open OUTPUT, ">${OUTFILE}" or die; + my ($lang) = @_; + + if ( ! -d $lang && $MULTIPLE_OUTPUT) + { + mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; + } + + open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n"; + open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; binmode (OUTPUT) if $^O eq 'MSWin32'; - while () + while () { - if (s/^(\s*)_(\w+=(.*))/$1$2/) + if (s/^(\s*)_(\w+=(.*))/$1$2/) { - my $string = $3; + my $string = $3; - print OUTPUT; + if (!$MULTIPLE_OUTPUT) + { + print OUTPUT; - my $non_translated_line = $_; + my $non_translated_line = $_; - for my $lang (sort keys %po_files_by_lang) + for my $lang (sort keys %po_files_by_lang) + { + my $translation = $translations{$lang, $string}; + next if !$translation; + + $_ = $non_translated_line; + s/(\w+)=.*/[$lang]$1=$translation/; + print OUTPUT; + } + } + else { - my $translation = $translations{$lang, $string}; - next if !$translation; + my $non_translated_line = $_; + my $translation = $translations{$lang, $string}; + $translation = $string if !$translation; $_ = $non_translated_line; - s/(\w+)=.*/[$lang]$1=$translation/; + s/(\w+)=.*/$1=$translation/; print OUTPUT; } - } - else + } + else { print OUTPUT; } @@ -1097,6 +1154,24 @@ close OUTPUT; close INPUT; + + print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; +} + +sub keys_merge_translations +{ + if ($MULTIPLE_OUTPUT) + { + for my $lang (sort keys %po_files_by_lang) + { + keys_merge_translation ($lang); + } + keys_merge_translation ("C"); + } + else + { + keys_merge_translation ("."); + } } sub desktop_merge_translations @@ -1392,19 +1467,22 @@ sub quoted_translation { - my ($lang, $string) = @_; + my ($xml_mode, $lang, $string) = @_; + $string = entity_decode($string) if $xml_mode; $string =~ s/\\\"/\"/g; my $translation = $translations{$lang, $string}; $translation = $string if !$translation; - + $translation = entity_encode($translation) if $xml_mode; $translation =~ s/\"/\\\"/g; return $translation } sub quoted_merge_translations { + my ($xml_mode) = @_; + if (!$MULTIPLE_OUTPUT) { print "Quoted only supports Multiple Output.\n"; exit(1); @@ -1419,7 +1497,7 @@ binmode (OUTPUT) if $^O eq 'MSWin32'; while () { - s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge; + s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge; print OUTPUT; } close OUTPUT; diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/intltool-update.in /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/intltool-update.in --- gnome-system-monitor-2.22.0/intltool-update.in 2007-08-29 07:24:14.000000000 +0200 +++ gnome-system-monitor-2.22.1/intltool-update.in 2008-03-12 17:25:40.000000000 +0100 @@ -30,7 +30,7 @@ ## Release information my $PROGRAM = "intltool-update"; -my $VERSION = "0.36.0"; +my $VERSION = "0.37.1"; my $PACKAGE = "intltool"; ## Loaded modules @@ -334,7 +334,7 @@ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; - }, "$SRCDIR/.."; + }, "$SRCDIR/.." if "$SRCDIR" ne "."; open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; @buf_potfiles = grep !/^(#|\s*$)/, ; @@ -434,8 +434,8 @@ last; } - ## N_ Q_ and _ are the three macros defined in gi8n.h - if (/[NQ]?_ *\(QUOTEDTEXT/) + ## C_ N_ Q_ and _ are the macros defined in gi8n.h + if (/[CNQ]?_ *\(QUOTEDTEXT/) { if (defined isNotValidMissing (unpack("x3 A*", $file))) { ## Remove the first 3 chars and add newline @@ -777,7 +777,7 @@ my $XGETTEXT_KEYWORDS = &FindPOTKeywords; push @xgettext_argument, $XGETTEXT_KEYWORDS; my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress; - push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS; + push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS; push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; my $xgettext_command = join ' ', @xgettext_argument; @@ -917,15 +917,15 @@ foreach my $lang (@languages) { - print "$lang: "; + print STDERR "$lang: "; &POFile_Update ($lang, ""); } - print "\n\n * Current translation support in $MODULE \n\n"; + print STDERR "\n\n * Current translation support in $MODULE \n\n"; foreach my $lang (@languages) { - print "$lang: "; + print STDERR "$lang: "; system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po"); } } @@ -1118,6 +1118,8 @@ close IN; } + # unwrap lines split with a trailing \ + $make_source =~ s/\\ $ \n/ /mxg; $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m; return $keywords; diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/ltmain.sh /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/ltmain.sh --- gnome-system-monitor-2.22.0/ltmain.sh 2007-07-11 23:56:46.000000000 +0200 +++ gnome-system-monitor-2.22.1/ltmain.sh 2008-02-02 15:19:01.000000000 +0100 @@ -2,7 +2,7 @@ # NOTE: Changing this file will not affect anything until you rerun configure. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. +# 2007, 2008 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.24 Debian 1.5.24-1" -TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" +VERSION="1.5.26 Debian 1.5.26-1" +TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -113,15 +113,21 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +lt_env= +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${$lt_var+set}\" = set; then save_$lt_var=\$$lt_var + lt_env=\"$lt_var=\$$lt_var \$lt_env\" $lt_var=C export $lt_var fi" done +if test -n "$lt_env"; then + lt_env="env $lt_env" +fi + # Make sure IFS has a sensible default lt_nl=' ' @@ -485,7 +491,7 @@ echo "\ $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP -Copyright (C) 2007 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? @@ -788,6 +794,7 @@ *.for) xform=for ;; *.java) xform=java ;; *.obj) xform=obj ;; + *.sx) xform=sx ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -956,7 +963,7 @@ $run $rm "$lobj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else test -n "$output_obj" && $run $rm $removelist exit $EXIT_FAILURE @@ -1028,7 +1035,7 @@ command="$command$suppress_output" $run $rm "$obj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else $run $rm $removelist exit $EXIT_FAILURE @@ -1161,6 +1168,7 @@ thread_safe=no vinfo= vinfo_number=no + single_module="${wl}-single_module" func_infer_tag $base_compile @@ -1646,6 +1654,11 @@ continue ;; + -multi_module) + single_module="${wl}-multi_module" + continue + ;; + -module) module=yes continue @@ -2152,7 +2165,12 @@ continue fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library lib="$searchdir/lib${name}${search_ext}" @@ -2948,12 +2966,18 @@ # we do not want to link against static libs, # but need to link against shared eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do depdepl=$tmp done - if test -f "$path/$depdepl" ; then + if test -f "$deplibdir/$depdepl" ; then + depdepl="$deplibdir/$depdepl" + elif test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" + else + # Can't find it, oh well... + depdepl= fi # do not add paths which are already there case " $newlib_search_path " in @@ -3101,9 +3125,10 @@ case $linkmode in oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 @@ -4245,9 +4270,10 @@ ;; obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 @@ -6486,7 +6512,7 @@ fi # Restore saved environment variables - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${save_$lt_var+set}\" = set; then $lt_var=\$save_$lt_var; export $lt_var diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/NEWS /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/NEWS --- gnome-system-monitor-2.22.0/NEWS 2008-03-10 20:06:37.000000000 +0100 +++ gnome-system-monitor-2.22.1/NEWS 2008-04-14 18:21:18.000000000 +0200 @@ -1,3 +1,7 @@ +New in 2.22.1 - 14 April 2008 +* lsof: don't crash on invalid regex (#524162). +* graphs: fixed the time scale (#521394). + New in 2.22.0 - 10 Mars 2008 * Updated translations. diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/po/ChangeLog /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/po/ChangeLog --- gnome-system-monitor-2.22.0/po/ChangeLog 2008-03-10 20:19:49.000000000 +0100 +++ gnome-system-monitor-2.22.1/po/ChangeLog 2008-04-14 18:40:21.000000000 +0200 @@ -1,3 +1,19 @@ +2008-04-07 Priit Laes + + * et.po: Translation updated by Ivar Smolin + +2008-03-31 Eskild Hustvedt + + * nn.po: Updated Norwegian Nynorsk translation + +2008-03-29 Yair Hershkovitz + + * he.po: Updated Hebrew translation. + +2008-03-11 Priit Laes + + * et.po: Translation updated by Ivar Smolin + 2008-03-09 Baris Cicek * tr.po: Updated Turkish translation from Deniz Kocak diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/po/et.po /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/po/et.po --- gnome-system-monitor-2.22.0/po/et.po 2008-03-10 20:19:43.000000000 +0100 +++ gnome-system-monitor-2.22.1/po/et.po 2008-04-14 18:40:02.000000000 +0200 @@ -11,10 +11,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnome-system-monitor HEAD\n" +"Project-Id-Version: gnome-system-monitor 2.22\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-01-07 11:08+0000\n" -"PO-Revision-Date: 2008-02-25 12:13+0200\n" +"PO-Revision-Date: 2008-04-03 16:16+0300\n" "Last-Translator: Ivar Smolin \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -347,7 +347,7 @@ #: ../src/gsm_color_button.c:189 msgid "Percentage full for pie colour pickers" -msgstr "" +msgstr "Sektori värvuse valija protsentuaalne osa" #: ../src/gsm_color_button.c:196 msgid "Title" @@ -1041,7 +1041,7 @@ #: ../src/util.cpp:346 msgid "N/A" -msgstr "" +msgstr "pole saadaval" #. xgettext: rate, 10MiB/s #: ../src/util.cpp:463 diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/po/he.po /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/po/he.po --- gnome-system-monitor-2.22.0/po/he.po 2008-03-10 20:19:43.000000000 +0100 +++ gnome-system-monitor-2.22.1/po/he.po 2008-04-14 18:40:04.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: procman.HEAD.he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-27 03:16+0100\n" +"POT-Creation-Date: 2008-03-11 03:16+0000\n" "PO-Revision-Date: 2003-06-27 23:17+0300\n" "Last-Translator: Gil 'Dolfin' Osher \n" "Language-Team: Hebrew \n" @@ -19,58 +19,58 @@ "X-Generator: KBabel 1.0.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../gnome-system-monitor.desktop.in.in.h:1 ../src/callbacks.cpp:155 -#: ../src/interface.cpp:660 ../src/procman.cpp:705 +#: ../gnome-system-monitor.desktop.in.in.h:1 ../src/callbacks.cpp:156 +#: ../src/interface.cpp:619 ../src/procman.cpp:674 msgid "System Monitor" msgstr "מנטר המערכת" -#: ../gnome-system-monitor.desktop.in.in.h:2 ../src/callbacks.cpp:156 +#: ../gnome-system-monitor.desktop.in.in.h:2 ../src/callbacks.cpp:157 msgid "View current processes and monitor system state" msgstr "מראה את התהליכים ומציג את מצב המערכת" -#: ../src/callbacks.cpp:165 +#: ../src/callbacks.cpp:166 msgid "translator-credits" msgstr "" "גיל אשר \n" -"יאיר הרשקוביץ " +"יאיר הרשקוביץ \n" "\n" "פרוייקט תרגום GNOME לעברית:\n" "‏http://gnome-il.berlios.de" -#: ../src/disks.cpp:281 ../src/memmaps.cpp:500 +#: ../src/disks.cpp:279 ../src/memmaps.cpp:500 msgid "Device" msgstr "התקן" -#: ../src/disks.cpp:282 +#: ../src/disks.cpp:280 msgid "Directory" msgstr "ספרייה" -#: ../src/disks.cpp:283 ../src/openfiles.cpp:235 +#: ../src/disks.cpp:281 ../src/gsm_color_button.c:211 ../src/openfiles.cpp:235 msgid "Type" msgstr "סוג" -#: ../src/disks.cpp:284 +#: ../src/disks.cpp:282 msgid "Total" msgstr "סך-הכל" -#: ../src/disks.cpp:285 +#: ../src/disks.cpp:283 msgid "Free" msgstr "חופשי" -#: ../src/disks.cpp:286 +#: ../src/disks.cpp:284 msgid "Available" msgstr "פנוי" -#: ../src/disks.cpp:287 +#: ../src/disks.cpp:285 msgid "Used" msgstr "בשימוש" -#: ../src/disks.cpp:294 ../src/interface.cpp:736 ../src/procdialogs.cpp:718 -#: ../src/procdialogs.cpp:722 +#: ../src/disks.cpp:292 ../src/interface.cpp:702 ../src/procdialogs.cpp:680 +#: ../src/procdialogs.cpp:684 msgid "File Systems" msgstr "מערכות קבצים" -#. translators: ? stands for unknown +#. xgettext: ? stands for unknown #: ../src/e_date.c:155 msgid "?" msgstr "?" @@ -104,34 +104,26 @@ "for the disks list" #: ../src/gnome-system-monitor.schemas.in.h:2 -msgid "Default graph background color" -msgstr "Default graph background color" - -#: ../src/gnome-system-monitor.schemas.in.h:3 msgid "Default graph cpu color" msgstr "Default graph cpu color" -#: ../src/gnome-system-monitor.schemas.in.h:4 -msgid "Default graph frame color" -msgstr "Default graph frame color" - -#: ../src/gnome-system-monitor.schemas.in.h:5 +#: ../src/gnome-system-monitor.schemas.in.h:3 msgid "Default graph incoming network traffic color" msgstr "Default graph incoming network traffic color" -#: ../src/gnome-system-monitor.schemas.in.h:6 +#: ../src/gnome-system-monitor.schemas.in.h:4 msgid "Default graph mem color" msgstr "Default graph mem color" -#: ../src/gnome-system-monitor.schemas.in.h:7 +#: ../src/gnome-system-monitor.schemas.in.h:5 msgid "Default graph outgoing network traffic color" msgstr "Default graph outgoing network traffic color" -#: ../src/gnome-system-monitor.schemas.in.h:8 +#: ../src/gnome-system-monitor.schemas.in.h:6 msgid "Default graph swap color" msgstr "Default graph swap color" -#: ../src/gnome-system-monitor.schemas.in.h:9 +#: ../src/gnome-system-monitor.schemas.in.h:7 msgid "" "Determines which processes to show by default. 0 is All, 1 is user, and 2 is " "active" @@ -139,15 +131,15 @@ "Determines which processes to show by default. 0 is All, 1 is user, and 2 is " "active" -#: ../src/gnome-system-monitor.schemas.in.h:10 +#: ../src/gnome-system-monitor.schemas.in.h:8 msgid "Disk view columns order" msgstr "Disk view columns order" -#: ../src/gnome-system-monitor.schemas.in.h:11 +#: ../src/gnome-system-monitor.schemas.in.h:9 msgid "Enable/Disable smooth refresh" msgstr "Enable/Disable smooth refresh" -#: ../src/gnome-system-monitor.schemas.in.h:12 +#: ../src/gnome-system-monitor.schemas.in.h:10 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'." @@ -155,124 +147,124 @@ "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/gnome-system-monitor.schemas.in.h:13 +#: ../src/gnome-system-monitor.schemas.in.h:11 msgid "Main Window height" msgstr "Main Window height" -#: ../src/gnome-system-monitor.schemas.in.h:14 +#: ../src/gnome-system-monitor.schemas.in.h:12 msgid "Main Window width" msgstr "Main Window width" -#: ../src/gnome-system-monitor.schemas.in.h:15 +#: ../src/gnome-system-monitor.schemas.in.h:13 msgid "Process view columns order" msgstr "Process view columns order" -#: ../src/gnome-system-monitor.schemas.in.h:16 +#: ../src/gnome-system-monitor.schemas.in.h:14 msgid "Process view sort column" msgstr "Process view sort column" -#: ../src/gnome-system-monitor.schemas.in.h:17 +#: ../src/gnome-system-monitor.schemas.in.h:15 msgid "Process view sort order" msgstr "Process view sort order" -#: ../src/gnome-system-monitor.schemas.in.h:18 +#: ../src/gnome-system-monitor.schemas.in.h:16 msgid "Saves the currently viewed tab" msgstr "Saves the currently viewed tab" -#: ../src/gnome-system-monitor.schemas.in.h:20 +#: ../src/gnome-system-monitor.schemas.in.h:18 #, no-c-format msgid "Show process 'CPU %' column on startup" msgstr "Show process 'CPU %' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:21 +#: ../src/gnome-system-monitor.schemas.in.h:19 msgid "Show process 'CPU time' column on startup" msgstr "Show process 'CPU time' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:22 +#: ../src/gnome-system-monitor.schemas.in.h:20 msgid "Show process 'PID' column on startup" msgstr "Show process 'PID' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:23 +#: ../src/gnome-system-monitor.schemas.in.h:21 msgid "Show process 'SELinux security context' column on startup" msgstr "Show process 'SELinux security context' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:24 +#: ../src/gnome-system-monitor.schemas.in.h:22 msgid "Show process 'X server memory' column on startup" msgstr "Show process 'X server memory' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:25 +#: ../src/gnome-system-monitor.schemas.in.h:23 msgid "Show process 'arguments' column on startup" msgstr "Show process 'arguments' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:26 +#: ../src/gnome-system-monitor.schemas.in.h:24 msgid "Show process 'estimated memory usage' column on startup" msgstr "Show process 'estimated memory usage' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:27 +#: ../src/gnome-system-monitor.schemas.in.h:25 msgid "Show process 'name' column on startup" msgstr "Show process 'name' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:28 +#: ../src/gnome-system-monitor.schemas.in.h:26 msgid "Show process 'nice' column on startup" msgstr "Show process 'nice' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:29 +#: ../src/gnome-system-monitor.schemas.in.h:27 msgid "Show process 'owner' column on startup" msgstr "Show process 'owner' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:30 +#: ../src/gnome-system-monitor.schemas.in.h:28 msgid "Show process 'resident memory' column on startup" msgstr "Show process 'resident memory' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:31 +#: ../src/gnome-system-monitor.schemas.in.h:29 msgid "Show process 'shared memory' column on startup" msgstr "Show process 'shared memory' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:32 +#: ../src/gnome-system-monitor.schemas.in.h:30 msgid "Show process 'start time' column on startup" msgstr "Show process 'start time' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:33 +#: ../src/gnome-system-monitor.schemas.in.h:31 msgid "Show process 'status' column on startup" msgstr "Show process 'status' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:34 +#: ../src/gnome-system-monitor.schemas.in.h:32 msgid "Show process 'virtual memory' column on startup" msgstr "Show process 'virtual memory' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:35 +#: ../src/gnome-system-monitor.schemas.in.h:33 msgid "Show process 'writable memory' column on startup" msgstr "Show process 'writable memory' column on startup" -#: ../src/gnome-system-monitor.schemas.in.h:36 +#: ../src/gnome-system-monitor.schemas.in.h:34 msgid "Show process dependencies in tree form" msgstr "Show process dependencies in tree form" -#: ../src/gnome-system-monitor.schemas.in.h:37 +#: ../src/gnome-system-monitor.schemas.in.h:35 msgid "Show warning dialog when killing processes" msgstr "Show warning dialog when killing processes" -#: ../src/gnome-system-monitor.schemas.in.h:38 +#: ../src/gnome-system-monitor.schemas.in.h:36 msgid "Solaris mode for CPU percentage" -msgstr "Solaris mode for CPU percentage" +msgstr "Solaris mode for CPU percentage" -#: ../src/gnome-system-monitor.schemas.in.h:39 +#: ../src/gnome-system-monitor.schemas.in.h:37 msgid "Time in milliseconds between updates of the devices list" msgstr "Time in milliseconds between updates of the devices list" -#: ../src/gnome-system-monitor.schemas.in.h:40 +#: ../src/gnome-system-monitor.schemas.in.h:38 msgid "Time in milliseconds between updates of the graphs" msgstr "Time in milliseconds between updates of the graphs" -#: ../src/gnome-system-monitor.schemas.in.h:41 +#: ../src/gnome-system-monitor.schemas.in.h:39 msgid "Time in milliseconds between updates of the process view" msgstr "Time in milliseconds between updates of the process view" -#: ../src/gnome-system-monitor.schemas.in.h:42 +#: ../src/gnome-system-monitor.schemas.in.h:40 msgid "Whether information about all filesystems should be displayed" msgstr "Whether information about all filesystems should be displayed" -#: ../src/gnome-system-monitor.schemas.in.h:43 +#: ../src/gnome-system-monitor.schemas.in.h:41 msgid "" "Whether to display information about all filesystems (including types like " "'autofs' and 'procfs'). Useful for getting a list of all currently mounted " @@ -282,323 +274,365 @@ "'autofs' and 'procfs'). Useful for getting a list of all currently mounted " "filesystems." -#: ../src/gnome-system-monitor.schemas.in.h:45 +#: ../src/gnome-system-monitor.schemas.in.h:43 #, no-c-format msgid "Width of process 'CPU %' column" msgstr "Width of process 'CPU %' column" -#: ../src/gnome-system-monitor.schemas.in.h:46 +#: ../src/gnome-system-monitor.schemas.in.h:44 msgid "Width of process 'CPU time' column" msgstr "Width of process 'CPU time' column" -#: ../src/gnome-system-monitor.schemas.in.h:47 +#: ../src/gnome-system-monitor.schemas.in.h:45 msgid "Width of process 'PID' column" msgstr "Width of process 'PID' column" -#: ../src/gnome-system-monitor.schemas.in.h:48 +#: ../src/gnome-system-monitor.schemas.in.h:46 msgid "Width of process 'SELinux security context' column" msgstr "Width of process 'SELinux security context' column" -#: ../src/gnome-system-monitor.schemas.in.h:49 +#: ../src/gnome-system-monitor.schemas.in.h:47 msgid "Width of process 'X server memory' column" msgstr "Width of process 'X server memory' column" -#: ../src/gnome-system-monitor.schemas.in.h:50 +#: ../src/gnome-system-monitor.schemas.in.h:48 msgid "Width of process 'arguments' column" msgstr "Width of process 'arguments' column" -#: ../src/gnome-system-monitor.schemas.in.h:51 +#: ../src/gnome-system-monitor.schemas.in.h:49 msgid "Width of process 'estimated memory usage' column" msgstr "Width of process 'estimated memory usage' column" -#: ../src/gnome-system-monitor.schemas.in.h:52 +#: ../src/gnome-system-monitor.schemas.in.h:50 msgid "Width of process 'name' column" msgstr "Width of process 'name' column" -#: ../src/gnome-system-monitor.schemas.in.h:53 +#: ../src/gnome-system-monitor.schemas.in.h:51 msgid "Width of process 'nice' column" msgstr "Width of process 'nice' column" -#: ../src/gnome-system-monitor.schemas.in.h:54 +#: ../src/gnome-system-monitor.schemas.in.h:52 msgid "Width of process 'owner' column" msgstr "Width of process 'owner' column" -#: ../src/gnome-system-monitor.schemas.in.h:55 +#: ../src/gnome-system-monitor.schemas.in.h:53 msgid "Width of process 'resident memory' column" msgstr "Width of process 'resident memory' column" -#: ../src/gnome-system-monitor.schemas.in.h:56 +#: ../src/gnome-system-monitor.schemas.in.h:54 msgid "Width of process 'shared memory' column" msgstr "Width of process 'shared memory' column" -#: ../src/gnome-system-monitor.schemas.in.h:57 +#: ../src/gnome-system-monitor.schemas.in.h:55 msgid "Width of process 'start time' column" msgstr "Width of process 'start time' column" -#: ../src/gnome-system-monitor.schemas.in.h:58 +#: ../src/gnome-system-monitor.schemas.in.h:56 msgid "Width of process 'status' column" msgstr "Width of process 'status' column" -#: ../src/gnome-system-monitor.schemas.in.h:59 +#: ../src/gnome-system-monitor.schemas.in.h:57 msgid "Width of process 'virtual memory' column" msgstr "Width of process 'virtual memory' column" -#: ../src/gnome-system-monitor.schemas.in.h:60 +#: ../src/gnome-system-monitor.schemas.in.h:58 msgid "Width of process 'writable memory' column" msgstr "Width of process 'writable memory' column" -#. translators: noun, top level menu. +#: ../src/gsm_color_button.c:188 +msgid "Fraction" +msgstr "שבר" + +#: ../src/gsm_color_button.c:189 +msgid "Percentage full for pie colour pickers" +msgstr "" + +#: ../src/gsm_color_button.c:196 +msgid "Title" +msgstr "כותרת" + +#: ../src/gsm_color_button.c:197 +msgid "The title of the color selection dialog" +msgstr "הכותרת של חלון בחירת הצבע" + +#: ../src/gsm_color_button.c:198 ../src/gsm_color_button.c:602 +msgid "Pick a Color" +msgstr "בחר צבע" + +#: ../src/gsm_color_button.c:204 +msgid "Current Color" +msgstr "צבע נוכחי" + +#: ../src/gsm_color_button.c:205 +msgid "The selected color" +msgstr "הצבע הנבחר" + +#: ../src/gsm_color_button.c:212 +msgid "Type of color picker" +msgstr "סוג בוחר הצבע" + +#: ../src/gsm_color_button.c:522 +msgid "Received invalid color data\n" +msgstr "התקבל מידע צבע לא תקין\n" + +#. xgettext: noun, top level menu. #. "File" did not make sense for system-monitor -#: ../src/interface.cpp:49 +#: ../src/interface.cpp:50 msgid "_Monitor" msgstr "_ניטור" -#: ../src/interface.cpp:50 +#: ../src/interface.cpp:51 msgid "_Edit" msgstr "_עריכה" -#: ../src/interface.cpp:51 +#: ../src/interface.cpp:52 msgid "_View" msgstr "_תצוגה" -#: ../src/interface.cpp:52 +#: ../src/interface.cpp:53 msgid "_Help" msgstr "_עזרה" -#: ../src/interface.cpp:54 +#: ../src/interface.cpp:55 msgid "Search for _Open Files" msgstr "חפש _קבצים פתוחים" -#: ../src/interface.cpp:55 +#: ../src/interface.cpp:56 msgid "Search for open files" msgstr "חפש קבצים פתוחים" -#: ../src/interface.cpp:56 -msgid "_Quit" -msgstr "_יציאה" - -#: ../src/interface.cpp:57 +#: ../src/interface.cpp:58 msgid "Quit the program" msgstr "צא מהתוכנית" -#: ../src/interface.cpp:60 +#: ../src/interface.cpp:61 msgid "_Stop Process" msgstr "_עצור תהליך" -#: ../src/interface.cpp:61 +#: ../src/interface.cpp:62 msgid "Stop process" msgstr "עצור תהליך" -#: ../src/interface.cpp:62 +#: ../src/interface.cpp:63 msgid "_Continue Process" msgstr "ה_משך תהליך" -#: ../src/interface.cpp:63 +#: ../src/interface.cpp:64 msgid "Continue process if stopped" msgstr "המשך תהליך שנעצר" -#: ../src/interface.cpp:65 ../src/interface.cpp:183 -msgid "End _Process" -msgstr "סיים _תהליך" +#: ../src/interface.cpp:66 ../src/procdialogs.cpp:84 +msgid "_End Process" +msgstr "_סיים תהליך" -#: ../src/interface.cpp:66 +#: ../src/interface.cpp:67 msgid "Force process to finish normally" msgstr "חייב תהליך להסתיים" -#: ../src/interface.cpp:67 ../src/procdialogs.cpp:75 +#: ../src/interface.cpp:68 ../src/procdialogs.cpp:75 msgid "_Kill Process" msgstr "ה_רוג תהליך" # -#: ../src/interface.cpp:68 +#: ../src/interface.cpp:69 msgid "Force process to finish immediately" msgstr "חייב תהליך להסתיים מיידית" -#: ../src/interface.cpp:69 +#: ../src/interface.cpp:70 msgid "_Change Priority..." msgstr "_שנה עדיפות..." -#: ../src/interface.cpp:70 +#: ../src/interface.cpp:71 msgid "Change the order of priority of process" msgstr "שנה את רמת העדיפות של תהליך" -#: ../src/interface.cpp:71 -msgid "Prefere_nces" -msgstr "הע_דפות" - -#: ../src/interface.cpp:72 +#: ../src/interface.cpp:73 msgid "Configure the application" msgstr "הגדר את היישום" -#: ../src/interface.cpp:74 +#: ../src/interface.cpp:75 +msgid "_Refresh" +msgstr "_רענן" + +#: ../src/interface.cpp:76 +msgid "Refresh the process list" +msgstr "רענן את רשימת התהליכים" + +#: ../src/interface.cpp:78 msgid "_Memory Maps" msgstr "מפות _זיכרון" -#: ../src/interface.cpp:75 +#: ../src/interface.cpp:79 msgid "Open the memory maps associated with a process" msgstr "פתח את מפות הזיכרון המשויכות לתהליך" -#: ../src/interface.cpp:76 +#: ../src/interface.cpp:80 msgid "Open _Files" msgstr "_קבצים פתוחים" -#: ../src/interface.cpp:77 +#: ../src/interface.cpp:81 msgid "View the files opened by a process" msgstr "הצג את הקבצים שנפתחו על ידי התהליך" -#: ../src/interface.cpp:79 +#: ../src/interface.cpp:83 msgid "_Contents" msgstr "_תוכן" -#: ../src/interface.cpp:80 +#: ../src/interface.cpp:84 msgid "Open the manual" msgstr "פתח את המדריך" -#: ../src/interface.cpp:81 -msgid "_About" -msgstr "_אודות" - -#: ../src/interface.cpp:82 +#: ../src/interface.cpp:86 msgid "About this application" msgstr "אודות יישום זה" -#: ../src/interface.cpp:87 +#: ../src/interface.cpp:91 msgid "_Dependencies" msgstr "_תלויות" -#: ../src/interface.cpp:88 +#: ../src/interface.cpp:92 msgid "Show parent/child relationship between processes" msgstr "הצג את יחסי התלות בין תהליכים" -#: ../src/interface.cpp:95 +#: ../src/interface.cpp:99 msgid "_Active Processes" msgstr "תהליכים _פעילים" -#: ../src/interface.cpp:96 +#: ../src/interface.cpp:100 msgid "Show active processes" msgstr "הצג את התהליכים הפעילים" -#: ../src/interface.cpp:97 +#: ../src/interface.cpp:101 msgid "A_ll Processes" msgstr "_כל התהליכים" -#: ../src/interface.cpp:98 +#: ../src/interface.cpp:102 msgid "Show all processes" msgstr "הצג את כל התהליכים" -#: ../src/interface.cpp:99 +#: ../src/interface.cpp:103 msgid "M_y Processes" msgstr "התהליכים _שלי" -#: ../src/interface.cpp:100 +#: ../src/interface.cpp:104 msgid "Show user own process" msgstr "הצג את התהליכים של המשתמש" -#: ../src/interface.cpp:250 +#: ../src/interface.cpp:189 +msgid "End _Process" +msgstr "סיים _תהליך" + +#: ../src/interface.cpp:243 msgid "CPU History" msgstr "היסטורית המעבד" #: ../src/interface.cpp:300 -msgid "CPU:" -msgstr "מעבד:" +msgid "CPU" +msgstr "מעבד" -#: ../src/interface.cpp:303 +#: ../src/interface.cpp:302 #, c-format -msgid "CPU%d:" -msgstr "מעבד%d" +msgid "CPU%d" +msgstr "מעבד-%d" -#: ../src/interface.cpp:323 +#: ../src/interface.cpp:320 msgid "Memory and Swap History" msgstr "היסטורית זיכרון ותחלופה" -#: ../src/interface.cpp:355 -msgid "User memory:" -msgstr "זיכרון משתמש:" - -#. translators: user memory: 123 MiB of 512MiB -#. translators: swap: 10MiB of 1GiB -#: ../src/interface.cpp:373 ../src/interface.cpp:433 -msgid "of" -msgstr "מתוך" - -#: ../src/interface.cpp:414 -msgid "Used swap:" -msgstr "תחלופה בשימוש:" +#: ../src/interface.cpp:359 ../src/proctable.cpp:224 +msgid "Memory" +msgstr "זיכרון" + +#: ../src/interface.cpp:385 +msgid "Swap" +msgstr "תחלופה" -#: ../src/interface.cpp:473 +#: ../src/interface.cpp:406 msgid "Network History" msgstr "היסטורית רשת" -#: ../src/interface.cpp:504 -msgid "Received:" -msgstr "התקבל:" - -#: ../src/interface.cpp:524 ../src/interface.cpp:567 -msgid "Total:" -msgstr "סך-הכל:" - -#: ../src/interface.cpp:548 -msgid "Sent:" -msgstr "נשלח:" +#: ../src/interface.cpp:445 +msgid "Receiving" +msgstr "מקבל" + +#: ../src/interface.cpp:466 +msgid "Total Received" +msgstr "סה\"כ התקבל" + +#: ../src/interface.cpp:500 +msgid "Sending" +msgstr "שולח" + +#: ../src/interface.cpp:522 +msgid "Total Sent" +msgstr "סה\"כ נשלח" -#: ../src/interface.cpp:724 +#: ../src/interface.cpp:690 msgid "System" msgstr "מערכת" -#: ../src/interface.cpp:728 ../src/procdialogs.cpp:514 +#: ../src/interface.cpp:694 ../src/procdialogs.cpp:512 msgid "Processes" msgstr "תהליכים" -#: ../src/interface.cpp:732 ../src/procdialogs.cpp:629 +#: ../src/interface.cpp:698 ../src/procdialogs.cpp:627 msgid "Resources" msgstr "משאבים" -#. translators: rate, 10MiB/s -#: ../src/load-graph.cpp:441 ../src/load-graph.cpp:452 +#: ../src/load-graph.cpp:150 #, c-format -msgid "%s/s" -msgstr "%s/שניה" +msgid "%u second" +msgid_plural "%u seconds" +msgstr[0] "שניה אחת" +msgstr[1] "%u שניות" -#: ../src/lsof.cpp:355 +#. xgettext: 540MiB (53 %) of 1.0 GiB +#: ../src/load-graph.cpp:366 +#, c-format +msgid "%s (%.1f %%) of %s" +msgstr "" +"‏‎%s ‏(%% %.1f) מתוך ‎%s" + +#: ../src/lsof.cpp:247 msgid "Process" msgstr "תהליך" -#: ../src/lsof.cpp:367 +#: ../src/lsof.cpp:259ii msgid "PID" msgstr "מזהה תהליך" -#: ../src/lsof.cpp:377 ../src/memmaps.cpp:478 +#: ../src/lsof.cpp:269 ../src/memmaps.cpp:478 msgid "Filename" msgstr "שם קובץ" #. gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); -#: ../src/lsof.cpp:394 +#: ../src/lsof.cpp:286 msgid "Search for Open Files" msgstr "חפש קבצים פתוחים" -#: ../src/lsof.cpp:422 +#: ../src/lsof.cpp:314 msgid "_Name contains:" msgstr "_שם מכיל:" -#: ../src/lsof.cpp:438 +#: ../src/lsof.cpp:330 msgid "Case insensitive matching" msgstr "ללא התאמת רשיות" -#: ../src/lsof.cpp:446 +#: ../src/lsof.cpp:338 msgid "S_earch results:" msgstr "_תוצות חיפוש:" -#. translators: virtual memory start +#. xgettext: virtual memory start #: ../src/memmaps.cpp:480 msgid "VM Start" msgstr "תחילת VM" -#. translators: virtual memory end +#. xgettext: virtual memory end #: ../src/memmaps.cpp:482 msgid "VM End" msgstr "סיום VM" -#. translators: virtual memory syze +#. xgettext: virtual memory syze #: ../src/memmaps.cpp:484 msgid "VM Size" msgstr "גודל VM" @@ -607,30 +641,30 @@ msgid "Flags" msgstr "דגלים" -#. translators: virtual memory offset +#. xgettext: virtual memory offset #: ../src/memmaps.cpp:487 msgid "VM Offset" msgstr "הסט VM" -#. translators: memory that has not been modified since +#. xgettext: memory that has not been modified since #. it has been allocated #: ../src/memmaps.cpp:490 msgid "Private clean" msgstr "זיכרון פרטי נקי" -#. translators: memory that has been modified since it +#. xgettext: memory that has been modified since it #. has been allocated #: ../src/memmaps.cpp:493 msgid "Private dirty" msgstr "זיכרון פרטי מלוכלך" -#. translators: shared memory that has not been modified +#. xgettext: shared memory that has not been modified #. since it has been allocated #: ../src/memmaps.cpp:496 msgid "Shared clean" msgstr "זיכרון משותף נקי" -#. translators: shared memory that has been modified +#. xgettext: shared memory that has been modified #. since it has been allocated #: ../src/memmaps.cpp:499 msgid "Shared dirty" @@ -708,12 +742,12 @@ "לא יכול להרוג את התהליך עם מזהה התהליך %d בעזרת האות %d.\n" "%s" -#. translators: primary alert message +#. xgettext: primary alert message #: ../src/procdialogs.cpp:70 msgid "Kill the selected process?" msgstr "להרוג את התהליך הנבחר?" -#. translators: secondary alert message +#. xgettext: secondary alert message #: ../src/procdialogs.cpp:72 msgid "" "Killing a process may destroy data, break the session or introduce a " @@ -722,12 +756,12 @@ "הריגת תהליך עלולה לגרום לאיבוד מידע ופגיעה באבטחה. יש להרוג תהליך שאינו מגיב " "בלבד." -#. translators: primary alert message +#. xgettext: primary alert message #: ../src/procdialogs.cpp:79 msgid "End the selected process?" msgstr "לסיים את התהליך?" -#. translators: secondary alert message +#. xgettext: secondary alert message #: ../src/procdialogs.cpp:81 msgid "" "Ending a process may destroy data, break the session or introduce a security " @@ -736,10 +770,6 @@ "סיום תהליך עלול לגרום לאיבוד מידע ופגיעה באבטחה. יש לסיים תהליך שאינו מגיב " "בלבד." -#: ../src/procdialogs.cpp:84 -msgid "_End Process" -msgstr "_סיים תהליך" - #: ../src/procdialogs.cpp:113 msgid "(Very High Priority)" msgstr "(עדיפות גבוהה מאוד)" @@ -790,235 +820,269 @@ msgid "Icon" msgstr "סמל" -#: ../src/procdialogs.cpp:491 +#: ../src/procdialogs.cpp:489 msgid "System Monitor Preferences" msgstr "העדפות מנטר המערכת" -#: ../src/procdialogs.cpp:521 +#: ../src/procdialogs.cpp:519 msgid "Behavior" msgstr "התנהגות" -#: ../src/procdialogs.cpp:540 ../src/procdialogs.cpp:655 -#: ../src/procdialogs.cpp:741 +#: ../src/procdialogs.cpp:538 ../src/procdialogs.cpp:653 +#: ../src/procdialogs.cpp:703 msgid "_Update interval in seconds:" msgstr "מרוח _עדכון בשניות:" -#: ../src/procdialogs.cpp:565 +#: ../src/procdialogs.cpp:563 msgid "Enable _smooth refresh" msgstr "אפשר _רענון חלק" -#: ../src/procdialogs.cpp:579 +#: ../src/procdialogs.cpp:577 msgid "Alert before ending or _killing processes" -msgstr "התרה לפני _סיום או הריגת תהליכים" +msgstr "התרע לפני _סיום או הריגת תהליכים" -#: ../src/procdialogs.cpp:593 +#: ../src/procdialogs.cpp:591 msgid "Solaris mode" msgstr "מצב Solaris" -#: ../src/procdialogs.cpp:611 +#: ../src/procdialogs.cpp:609 msgid "Information Fields" msgstr "שדות מידע" -#: ../src/procdialogs.cpp:636 +#: ../src/procdialogs.cpp:634 msgid "Graphs" msgstr "גרפים" -#: ../src/procdialogs.cpp:677 -msgid "_Background color:" -msgstr "צבע _רקע:" - -#: ../src/procdialogs.cpp:696 -msgid "_Grid color:" -msgstr "צבע ר_שת:" - -#: ../src/procdialogs.cpp:761 +#: ../src/procdialogs.cpp:723 msgid "Show _all filesystems" msgstr "הצג את _כל מערכות הקבצים" -#: ../src/proctable.cpp:271 +#: ../src/proctable.cpp:209 msgid "Process Name" msgstr "שם התהליך" -#: ../src/proctable.cpp:272 +#: ../src/proctable.cpp:210 msgid "User" msgstr "משתמש" -#: ../src/proctable.cpp:273 +#: ../src/proctable.cpp:211 msgid "Status" msgstr "מצב" -#: ../src/proctable.cpp:274 +#: ../src/proctable.cpp:212 msgid "Virtual Memory" msgstr "זיכרון וירטואלי" -#: ../src/proctable.cpp:275 +#: ../src/proctable.cpp:213 msgid "Resident Memory" msgstr "זיכרון מקומי" -#: ../src/proctable.cpp:276 +#: ../src/proctable.cpp:214 msgid "Writable Memory" msgstr "זיכרון ניתן לכתיבה" -#: ../src/proctable.cpp:277 +#: ../src/proctable.cpp:215 msgid "Shared Memory" msgstr "זיכרון משותף" -#: ../src/proctable.cpp:278 +#: ../src/proctable.cpp:216 msgid "X Server Memory" msgstr "זיכרון שרת X" -#. translators:no-c-format -#: ../src/proctable.cpp:279 -#, c-format +#: ../src/proctable.cpp:217 +#, no-c-format msgid "% CPU" msgstr "% מעבד" -#: ../src/proctable.cpp:280 +#: ../src/proctable.cpp:218 msgid "CPU Time" msgstr "זמן מעבד" -#: ../src/proctable.cpp:281 +#: ../src/proctable.cpp:219 msgid "Started" msgstr "התחיל" -#: ../src/proctable.cpp:282 +#: ../src/proctable.cpp:220 msgid "Nice" msgstr "עדיפות" -#: ../src/proctable.cpp:283 +#: ../src/proctable.cpp:221 msgid "ID" msgstr "מזהה" -#: ../src/proctable.cpp:284 +#: ../src/proctable.cpp:222 msgid "Security Context" msgstr "תוכן אבטחה" -#: ../src/proctable.cpp:285 +#: ../src/proctable.cpp:223 msgid "Command Line" msgstr "פקודה" -#: ../src/proctable.cpp:286 -msgid "Memory" -msgstr "זיכרון" - -#: ../src/proctable.cpp:480 -msgid "Running" -msgstr "מופעל" - -#: ../src/proctable.cpp:484 -msgid "Stopped" -msgstr "מופסק" - -#: ../src/proctable.cpp:488 -msgid "Zombie" -msgstr "זומבי" - -#: ../src/proctable.cpp:492 -msgid "Uninterruptible" -msgstr "לא ניתן להפרעה" - -#: ../src/proctable.cpp:496 -msgid "Sleeping" -msgstr "ישן" - -#. translators: weeks, days -#: ../src/proctable.cpp:623 -#, c-format -msgid "%uw%ud" -msgstr "%uw%ud" - -#. translators: days, hours (0 -> 23) -#: ../src/proctable.cpp:627 -#, c-format -msgid "%ud%02uh" -msgstr "%ud%02uh" - -#. translators: hours (0 -> 23), minutes, seconds -#: ../src/proctable.cpp:631 -#, c-format -msgid "%u:%02u:%02u" -msgstr "%u:%02u:%02u" - -#. translators: minutes, seconds, centiseconds -#: ../src/proctable.cpp:634 -#, c-format -msgid "%u:%02u.%02u" -msgstr "%u:%02u.%02u" - -#: ../src/proctable.cpp:1050 +#: ../src/proctable.cpp:926 #, c-format msgid "Load averages for the last 1, 5, 15 minutes: %0.2f, %0.2f, %0.2f" msgstr "ממוצעי עומס עבור 1, 5, 15 הדקות האחרונות: %0.2f, %0.2f, %0.2f" -#: ../src/sysinfo.cpp:92 -msgid "Unknown CPU model" -msgstr "מודל מעבד לא ידוע" - -#. translators: Release 2.6.19 -#: ../src/sysinfo.cpp:401 +#: ../src/sysinfo.cpp:75 #, c-format msgid "Release %s" msgstr "הוצאה %s" -#: ../src/sysinfo.cpp:408 +#: ../src/sysinfo.cpp:109 +msgid "Unknown CPU model" +msgstr "מודל מעבד לא ידוע" + +#: ../src/sysinfo.cpp:503 #, c-format msgid "Kernel %s" msgstr "ליבה %s" -#: ../src/sysinfo.cpp:416 +#: ../src/sysinfo.cpp:511 #, c-format msgid "GNOME %s" msgstr "GNOME %s" #. hardware section -#: ../src/sysinfo.cpp:425 +#: ../src/sysinfo.cpp:520 +#, c-format msgid "Hardware" msgstr "חומרה" -#: ../src/sysinfo.cpp:446 +#: ../src/sysinfo.cpp:541 msgid "Memory:" msgstr "זיכרון:" -#: ../src/sysinfo.cpp:466 +#: ../src/sysinfo.cpp:561 #, c-format msgid "Processor %d:" msgstr "מעבד %d:" -#: ../src/sysinfo.cpp:471 +#: ../src/sysinfo.cpp:566 msgid "Processor:" msgstr "מעבד:" #. disk space section -#: ../src/sysinfo.cpp:491 +#: ../src/sysinfo.cpp:586 +#, c-format msgid "System Status" msgstr "סטטוס מערכת" -#: ../src/sysinfo.cpp:512 +#: ../src/sysinfo.cpp:607 msgid "Available disk space:" msgstr "מקום פנוי בדיסק:" -#: ../src/util.cpp:77 +#: ../src/util.cpp:31 +msgid "Running" +msgstr "מופעל" + +#: ../src/util.cpp:35 +msgid "Stopped" +msgstr "מופסק" + +#: ../src/util.cpp:39 +msgid "Zombie" +msgstr "זומבי" + +#: ../src/util.cpp:43 +msgid "Uninterruptible" +msgstr "לא ניתן להפרעה" + +#: ../src/util.cpp:47 +msgid "Sleeping" +msgstr "ישן" + +#. xgettext: weeks, days +#: ../src/util.cpp:102 +#, c-format +msgid "%uw%ud" +msgstr "%uw%ud" + +#. xgettext: days, hours (0 -> 23) +#: ../src/util.cpp:106 +#, c-format +msgid "%ud%02uh" +msgstr "%ud%02uh" + +#. xgettext: hours (0 -> 23), minutes, seconds +#: ../src/util.cpp:110 +#, c-format +msgid "%u:%02u:%02u" +msgstr "%u:%02u:%02u" + +#. xgettext: minutes, seconds, centiseconds +#: ../src/util.cpp:113 +#, c-format +msgid "%u:%02u.%02u" +msgstr "%u:%02u.%02u" + +#: ../src/util.cpp:162 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u בתים" msgstr[1] "%u בתים" -#: ../src/util.cpp:84 +#: ../src/util.cpp:169 #, c-format msgid "%.1f KiB" msgstr "%.1f KiB" -#: ../src/util.cpp:87 +#: ../src/util.cpp:172 #, c-format msgid "%.1f MiB" msgstr "%.1f MiB" -#: ../src/util.cpp:90 +#: ../src/util.cpp:175 #, c-format msgid "%.1f GiB" msgstr "%.1f GiB" +#: ../src/util.cpp:349 +msgid "N/A" +msgstr "לא זמין" + +#. xgettext: rate, 10MiB/s +#: ../src/util.cpp:466 +#, c-format +msgid "%s/s" +msgstr "%s/שניה" + +#~ msgid "Default graph background color" +#~ msgstr "Default graph background color" + +#~ msgid "Default graph frame color" +#~ msgstr "Default graph frame color" + +#~ msgid "_Quit" +#~ msgstr "_יציאה" + +#~ msgid "Prefere_nces" +#~ msgstr "הע_דפות" + +#~ msgid "_About" +#~ msgstr "_אודות" + +#~ msgid "User memory:" +#~ msgstr "זיכרון משתמש:" + +#~ msgid "of" +#~ msgstr "מתוך" + +#~ msgid "Used swap:" +#~ msgstr "תחלופה בשימוש:" + +#~ msgid "Total:" +#~ msgstr "סך-הכל:" + +#~ msgid "Sent:" +#~ msgstr "נשלח:" + +#~ msgid "_Background color:" +#~ msgstr "צבע _רקע:" + +#~ msgid "_Grid color:" +#~ msgstr "צבע ר_שת:" + #~ msgid "No hidden processes" #~ msgstr "אין תהליכים נסתרים" @@ -1063,9 +1127,6 @@ #~ msgid "_Hide Process" #~ msgstr "_הסתר תהליך" -#~ msgid "Hide process from list" -#~ msgstr "הסתר תהליך מהרשיצה" - #~ msgid "_Hidden Processes" #~ msgstr "תהליכים _נסתרים" @@ -1362,9 +1423,6 @@ #~ msgid "Total : " #~ msgstr "סך-הכל : " -#~ msgid "Swap" -#~ msgstr "תחלופה" - #~ msgid "Update Speed ( seconds ) :" #~ msgstr "מהירות עדכון ( שניות ) :" @@ -1373,6 +1431,3 @@ #~ msgid "Used Space" #~ msgstr "שטח בשימוש" - -#~ msgid "Total Space" -#~ msgstr "סך-הכל שטח" diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/po/Makefile.in.in /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/po/Makefile.in.in --- gnome-system-monitor-2.22.0/po/Makefile.in.in 2008-03-10 20:19:49.000000000 +0100 +++ gnome-system-monitor-2.22.1/po/Makefile.in.in 2008-04-14 18:40:22.000000000 +0200 @@ -1,10 +1,10 @@ # Makefile for program source directory in GNU NLS utilities package. # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# Copyright (C) 2004-2008 Rodney Dawes # -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License +# This file may be copied and used freely without restrictions. It may +# be used in projects which are not available under a GNU Public License, # but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. # # - Modified by Owen Taylor to use GETTEXT_PACKAGE # instead of PACKAGE and to look for po2tbl in ./ not in intl/ @@ -12,7 +12,7 @@ # - Modified by jacob berkman to install # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize # -# - Modified by Rodney Dawes for use with intltool +# - Modified by Rodney Dawes for use with intltool # # We have the following line for use by intltoolize: # INTLTOOL_MAKEFILE diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/po/nn.po /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/po/nn.po --- gnome-system-monitor-2.22.0/po/nn.po 2008-03-10 20:19:46.000000000 +0100 +++ gnome-system-monitor-2.22.1/po/nn.po 2008-04-14 18:40:11.000000000 +0200 @@ -1,167 +1,130 @@ -# translation of nn.po to Norwegian Nynorsk -# translation of nn.po to -# This file is distributed under the same license as the PACKAGE package. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006. +# translation of nome-system-monitor.po to Norwegian Nynorsk +# This file is distributed under the same license as the gnome-system-monitor package. +# Copyright (C) Free Software Foundation, Inc. # Åsmund Skjæveland , 2006. -# +# Eskild Hustvedt , 2008 msgid "" msgstr "" "Project-Id-Version: nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-25 15:05+0200\n" -"PO-Revision-Date: 2006-05-25 15:20+0200\n" -"Last-Translator: Åsmund Skjæveland \n" +"POT-Creation-Date: 2008-03-31 13:39+0200\n" +"PO-Revision-Date: 2008-03-31 13:39+0200\n" +"Last-Translator: MagicPO 0.3 (automated)\n" "Language-Team: Norwegian Nynorsk \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.3.1\n" +"X-Generator: MagicPO 0.3\n" -#: ../gnome-system-monitor.desktop.in.in.h:1 ../src/callbacks.c:164 -#: ../src/interface.c:666 +#: ../gnome-system-monitor.desktop.in.in.h:1 ../src/callbacks.cpp:156 +#: ../src/interface.cpp:619 ../src/procman.cpp:674 msgid "System Monitor" msgstr "Systemovervakar" -#: ../gnome-system-monitor.desktop.in.in.h:2 ../src/callbacks.c:165 +#: ../gnome-system-monitor.desktop.in.in.h:2 ../src/callbacks.cpp:157 msgid "View current processes and monitor system state" msgstr "Vis aktive prosessar og overvak systemtilstanden" -#: ../src/callbacks.c:173 +#: ../src/callbacks.cpp:166 msgid "translator-credits" msgstr "" "Åsmund Skjæveland \n" +"Eskild Hustvedt \n" "\n" "Send feilmeldingar og kommentarar til " -#: ../src/disks.c:204 ../src/memmaps.c:302 +#: ../src/disks.cpp:279 ../src/memmaps.cpp:500 msgid "Device" msgstr "Eining" -#: ../src/disks.c:205 +#: ../src/disks.cpp:280 msgid "Directory" msgstr "Katalog" -#: ../src/disks.c:206 ../src/openfiles.c:232 +#: ../src/disks.cpp:281 ../src/gsm_color_button.c:211 ../src/openfiles.cpp:235 msgid "Type" msgstr "Type" -#: ../src/disks.c:207 +#: ../src/disks.cpp:282 msgid "Total" msgstr "Totalt" -#: ../src/disks.c:208 +#: ../src/disks.cpp:283 msgid "Free" msgstr "Ledig" -#: ../src/disks.c:209 +#: ../src/disks.cpp:284 msgid "Available" msgstr "Tilgjengeleg" -#: ../src/disks.c:210 +#: ../src/disks.cpp:285 msgid "Used" msgstr "Brukt" -#: ../src/disks.c:217 ../src/interface.c:745 ../src/procdialogs.c:770 -#: ../src/procdialogs.c:774 -msgid "Devices" -msgstr "Einigar" +# +#: ../src/disks.cpp:292 ../src/interface.cpp:702 ../src/procdialogs.cpp:680 +#: ../src/procdialogs.cpp:684 +msgid "File Systems" +msgstr "Filsystem" -#: ../src/e_date.c:154 +#. xgettext: ? stands for unknown +#: ../src/e_date.c:155 msgid "?" msgstr "?" -#: ../src/e_date.c:161 +#: ../src/e_date.c:162 msgid "Today %l:%M %p" msgstr "I dag, %H.%M" -#: ../src/e_date.c:170 +#: ../src/e_date.c:171 msgid "Yesterday %l:%M %p" msgstr "I går, %H.%M" -#: ../src/e_date.c:182 +#: ../src/e_date.c:183 msgid "%a %l:%M %p" msgstr "%a %H.%M" -#: ../src/e_date.c:190 +#: ../src/e_date.c:191 msgid "%b %d %l:%M %p" msgstr "%d. %b %H.%M" -#: ../src/e_date.c:192 +#: ../src/e_date.c:193 msgid "%b %d %Y" msgstr "%d. %b %Y" -#. translators: primary alert message -#: ../src/favorites.c:350 -msgid "No hidden processes" -msgstr "Ingen gøymde prosessar" - -#. translators: secondary alert message -#: ../src/favorites.c:357 -msgid "" -"There are no hidden processes in the list. To show all running processes, " -"select the \"All processes\" option in the main window." -msgstr "" -"Det er ingen gøymde prosessar i lista. Vel «Alle prosessar» i hovudvindauget " -"for å visa alle køyrande prosessar." - -#: ../src/favorites.c:377 -msgid "Hidden Processes" -msgstr "Gøymde prosessar" - -#: ../src/favorites.c:401 -msgid "Currently _hidden processes:" -msgstr "Prosessar som er _gøymde no:" - -#: ../src/favorites.c:423 -msgid "_Remove From List" -msgstr "_Fjern frå lista" - -#: ../src/favorites.c:432 ../src/procdialogs.c:285 -msgid "Note:" -msgstr "Merk:" - -#: ../src/favorites.c:433 +# +#: ../src/gnome-system-monitor.schemas.in.h:1 msgid "" -"These are the processes you have chosen to hide. You can reshow a process by " -"removing it from this list." +"0 for the System Info, 1 for the processes list, 2 for the resources and 3 " +"for the disks list" msgstr "" -"Dette er prosessar du har vald å gøyma. Du kan visa dei på nytt ved å fjerna " -"dei frå lista." - -#: ../src/gnome-system-monitor.schemas.in.h:1 -msgid "Column zero saved width" -msgstr "Kolonne null lagra breidde" +"0 for systeminfo, 1 for liste over prossesser, 2 for ressurser og 3 for " +"liste over diskar" #: ../src/gnome-system-monitor.schemas.in.h:2 -msgid "Default graph background color" -msgstr "Standard bakgrunn på graf" - -#: ../src/gnome-system-monitor.schemas.in.h:3 msgid "Default graph cpu color" msgstr "Standard farge på CPU-graf" -#: ../src/gnome-system-monitor.schemas.in.h:4 -msgid "Default graph frame color" -msgstr "Standard farge på graframme" +# +#: ../src/gnome-system-monitor.schemas.in.h:3 +msgid "Default graph incoming network traffic color" +msgstr "Forvald farge på graf for innkommende nettverkstrafikk" -#: ../src/gnome-system-monitor.schemas.in.h:5 +#: ../src/gnome-system-monitor.schemas.in.h:4 msgid "Default graph mem color" msgstr "Standard farge på minnegraf" -#: ../src/gnome-system-monitor.schemas.in.h:6 -msgid "Default graph net in color" -msgstr "Standard farge på inngåande nettraffikk-graf" - -#: ../src/gnome-system-monitor.schemas.in.h:7 -msgid "Default graph net out color" -msgstr "Standard farge på utgåande nettraffikk-graf" +# +#: ../src/gnome-system-monitor.schemas.in.h:5 +msgid "Default graph outgoing network traffic color" +msgstr "Forvald farge på graf for utgående nettverkstrafikk" -#: ../src/gnome-system-monitor.schemas.in.h:8 +#: ../src/gnome-system-monitor.schemas.in.h:6 msgid "Default graph swap color" msgstr "Standard farge på virtuelt minne-graf" -#: ../src/gnome-system-monitor.schemas.in.h:9 +#: ../src/gnome-system-monitor.schemas.in.h:7 msgid "" "Determines which processes to show by default. 0 is All, 1 is user, and 2 is " "active" @@ -169,369 +132,665 @@ "Styrer kva for prosessar som vert viste som standard. 0 er alle, 1 er " "brukarprosessar, og 2 er aktive prosessar." -#: ../src/gnome-system-monitor.schemas.in.h:10 +#: ../src/gnome-system-monitor.schemas.in.h:8 msgid "Disk view columns order" msgstr "Kolonnerekkefølgje i diskframsyning" -#: ../src/gnome-system-monitor.schemas.in.h:11 +#: ../src/gnome-system-monitor.schemas.in.h:9 msgid "Enable/Disable smooth refresh" msgstr "Bruk/ikkje bruk jamn oppfrisking" -#: ../src/gnome-system-monitor.schemas.in.h:12 +# +#: ../src/gnome-system-monitor.schemas.in.h:10 +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'." +msgstr "" +"Viss denne setjes til TRUE vil systemovervaking operere i Solaris-modus kor " +"ein oppgaves CPU-bruk deles på totalt tal på CPUer. Elles benyttes Irix-" +"modus." + +#: ../src/gnome-system-monitor.schemas.in.h:11 msgid "Main Window height" msgstr "Høgde på hovudvindauget" -#: ../src/gnome-system-monitor.schemas.in.h:13 +#: ../src/gnome-system-monitor.schemas.in.h:12 msgid "Main Window width" msgstr "Breidde på hovudvindauget" -#: ../src/gnome-system-monitor.schemas.in.h:14 +#: ../src/gnome-system-monitor.schemas.in.h:13 msgid "Process view columns order" msgstr "Kolonnerekkefølgje i prosessframsyning" -#: ../src/gnome-system-monitor.schemas.in.h:15 +#: ../src/gnome-system-monitor.schemas.in.h:14 msgid "Process view sort column" -msgstr "Sorteringskolonne i diskframsyning" +msgstr "Sorteringskolonna i diskframsyning" -#: ../src/gnome-system-monitor.schemas.in.h:16 +#: ../src/gnome-system-monitor.schemas.in.h:15 msgid "Process view sort order" msgstr "Sorteringsrekkefølgje i diskframsyning" -#: ../src/gnome-system-monitor.schemas.in.h:17 +#: ../src/gnome-system-monitor.schemas.in.h:16 msgid "Saves the currently viewed tab" msgstr "Lagrar den opne arkfana" #: ../src/gnome-system-monitor.schemas.in.h:18 -msgid "Show column zero on startup" -msgstr "Vis kolonne null ved oppstart" +#, no-c-format +msgid "Show process 'CPU %' column on startup" +msgstr "Vis kolonna for CPU-bruk for prosess ved oppstart" +# #: ../src/gnome-system-monitor.schemas.in.h:19 -msgid "Show process dependencies in tree form" -msgstr "" +msgid "Show process 'CPU time' column on startup" +msgstr "Vis kolonna for CPU-tid per prosess ved oppstart" +# #: ../src/gnome-system-monitor.schemas.in.h:20 -msgid "Show process threads" -msgstr "Vis prosesstrådar" +msgid "Show process 'PID' column on startup" +msgstr "Vis kolonna med PID for prosess ved oppstart" +# #: ../src/gnome-system-monitor.schemas.in.h:21 -msgid "Show warning dialog when hiding processes" -msgstr "Vis åtvaringsdialogar når prosessar vert gøymde" +msgid "Show process 'SELinux security context' column on startup" +msgstr "Vis kolonna SELinux sikkerhetssamanheng ved oppstart" +# #: ../src/gnome-system-monitor.schemas.in.h:22 +msgid "Show process 'X server memory' column on startup" +msgstr "Vis kolonna for minneforbruk i X-tenar ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:23 +msgid "Show process 'arguments' column on startup" +msgstr "Vis kolonna for prosessargumenter ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:24 +msgid "Show process 'estimated memory usage' column on startup" +msgstr "Vis kolonna for estimert minnebruk for prosess ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:25 +msgid "Show process 'name' column on startup" +msgstr "Vis kolonna for prosessnamn ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:26 +msgid "Show process 'nice' column on startup" +msgstr "Vis kolonna for nice-verdi for prosess ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:27 +msgid "Show process 'owner' column on startup" +msgstr "Vis kolonna for eigar av prosess ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:28 +msgid "Show process 'resident memory' column on startup" +msgstr "Vis kolonna med resident minne for prosess ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:29 +msgid "Show process 'shared memory' column on startup" +msgstr "Vis kolonna for delt minne for prosess ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:30 +msgid "Show process 'start time' column on startup" +msgstr "Vis kolonna for starttid for prosess ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:31 +msgid "Show process 'status' column on startup" +msgstr "Vis kolonna for status for prosess ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:32 +msgid "Show process 'virtual memory' column on startup" +msgstr "Vis kolonna for virtuelt minne for prosess ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:33 +msgid "Show process 'writable memory' column on startup" +msgstr "Vis kolonna skrivbart minne for prosess ved oppstart" + +# +#: ../src/gnome-system-monitor.schemas.in.h:34 +msgid "Show process dependencies in tree form" +msgstr "Vis prosessavhengigheter som eit tre" + +#: ../src/gnome-system-monitor.schemas.in.h:35 msgid "Show warning dialog when killing processes" msgstr "Vis åtvaringsdialogar når prosessar vert drepne" -#: ../src/gnome-system-monitor.schemas.in.h:23 +# +#: ../src/gnome-system-monitor.schemas.in.h:36 +msgid "Solaris mode for CPU percentage" +msgstr "Solaris-modus for CPU-prosent" + +#: ../src/gnome-system-monitor.schemas.in.h:37 msgid "Time in milliseconds between updates of the devices list" msgstr "Tid i millisekund mellom oppdateringar av eininglista" -#: ../src/gnome-system-monitor.schemas.in.h:24 +#: ../src/gnome-system-monitor.schemas.in.h:38 msgid "Time in milliseconds between updates of the graphs" msgstr "Tid i millisekund mellom oppdateringar av grafane" -#: ../src/gnome-system-monitor.schemas.in.h:25 +#: ../src/gnome-system-monitor.schemas.in.h:39 msgid "Time in milliseconds between updates of the process view" msgstr "Tid i millisekund mellom oppdateringar av prosessframsyninga" -#: ../src/gnome-system-monitor.schemas.in.h:26 +#: ../src/gnome-system-monitor.schemas.in.h:40 msgid "Whether information about all filesystems should be displayed" msgstr "Om informasjon om alle filsystema skal visast" -#: ../src/gnome-system-monitor.schemas.in.h:27 +#: ../src/gnome-system-monitor.schemas.in.h:41 msgid "" "Whether to display information about all filesystems (including types like " "'autofs' and 'procfs'). Useful for getting a list of all currently mounted " "filesystems." -msgstr "Om informasjon om alle filsystema (inkl. typar som «autofs» og «procfs») skal visast. Nyttig for å få eit oversyn over monterte filsystem." +msgstr "" +"Om informasjon om alle filsystema (inkl. typar som «autofs» og «procfs») skal " +"visast. Nyttig for å få eit oversyn over monterte filsystem." + +#: ../src/gnome-system-monitor.schemas.in.h:43 +#, no-c-format +msgid "Width of process 'CPU %' column" +msgstr "Breidd på kolonna «CPU %»" + +# +#: ../src/gnome-system-monitor.schemas.in.h:44 +msgid "Width of process 'CPU time' column" +msgstr "Breidd på kolonna «CPU-tid»" + +# +#: ../src/gnome-system-monitor.schemas.in.h:45 +msgid "Width of process 'PID' column" +msgstr "Breidd på kolonna «PID»" + +# +#: ../src/gnome-system-monitor.schemas.in.h:46 +msgid "Width of process 'SELinux security context' column" +msgstr "Breidd for kolonna med SELinux sikkerhetssamanheng" + +# +#: ../src/gnome-system-monitor.schemas.in.h:47 +msgid "Width of process 'X server memory' column" +msgstr "Breidd på kolonna «X-tenar minne»" + +# +#: ../src/gnome-system-monitor.schemas.in.h:48 +msgid "Width of process 'arguments' column" +msgstr "Breidd på kolonna med prosessargumenter" + +# +#: ../src/gnome-system-monitor.schemas.in.h:49 +msgid "Width of process 'estimated memory usage' column" +msgstr "Breidd på kolonna med estimert minnebruk for prosess" + +# +#: ../src/gnome-system-monitor.schemas.in.h:50 +msgid "Width of process 'name' column" +msgstr "Breidd på kolonna med prosessnamn" + +# +#: ../src/gnome-system-monitor.schemas.in.h:51 +msgid "Width of process 'nice' column" +msgstr "Breidd på prosess' nice-kolonna" + +# +#: ../src/gnome-system-monitor.schemas.in.h:52 +msgid "Width of process 'owner' column" +msgstr "Breidd på kolonna med prosesseigar" + +# +#: ../src/gnome-system-monitor.schemas.in.h:53 +msgid "Width of process 'resident memory' column" +msgstr "Breidd på kolonna med resident minne for prosess" + +# +#: ../src/gnome-system-monitor.schemas.in.h:54 +msgid "Width of process 'shared memory' column" +msgstr "Breidd på kolonna med delt minne for prosess" + +# +#: ../src/gnome-system-monitor.schemas.in.h:55 +msgid "Width of process 'start time' column" +msgstr "Breidd på kolonna med starttid for prosess" + +# +#: ../src/gnome-system-monitor.schemas.in.h:56 +msgid "Width of process 'status' column" +msgstr "Breidd på kolonna med status for prosess" + +# +#: ../src/gnome-system-monitor.schemas.in.h:57 +msgid "Width of process 'virtual memory' column" +msgstr "Breidd på kolonna med virtuelt minne for prosess" + +# +#: ../src/gnome-system-monitor.schemas.in.h:58 +msgid "Width of process 'writable memory' column" +msgstr "Breidd på kolonna med skrivbart minne for prosess" + +# +#: ../src/gsm_color_button.c:188 +msgid "Fraction" +msgstr "Del" + +# +#: ../src/gsm_color_button.c:189 +msgid "Percentage full for pie colour pickers" +msgstr "Prosent full for fargevelgere for pai" + +# +#: ../src/gsm_color_button.c:196 +msgid "Title" +msgstr "Tittel" + +# +#: ../src/gsm_color_button.c:197 +msgid "The title of the color selection dialog" +msgstr "Tittel for fargeval-dialogen" + +# +#: ../src/gsm_color_button.c:198 ../src/gsm_color_button.c:602 +msgid "Pick a Color" +msgstr "Vel ein farge" + +# +#: ../src/gsm_color_button.c:204 +msgid "Current Color" +msgstr "Aktiv farge" + +# +#: ../src/gsm_color_button.c:205 +msgid "The selected color" +msgstr "Vald farge" + +# +#: ../src/gsm_color_button.c:212 +msgid "Type of color picker" +msgstr "Type fargevelger" -#: ../src/interface.c:46 -msgid "_File" -msgstr "_Fil" +# +#: ../src/gsm_color_button.c:522 +msgid "Received invalid color data\n" +msgstr "Fargedata for ugyldig mottak\n" + +# +#. xgettext: noun, top level menu. +#. "File" did not make sense for system-monitor +#: ../src/interface.cpp:50 +msgid "_Monitor" +msgstr "_Overvak" -#: ../src/interface.c:47 +#: ../src/interface.cpp:51 msgid "_Edit" msgstr "R_ediger" -#: ../src/interface.c:48 +#: ../src/interface.cpp:52 msgid "_View" msgstr "_Vis" -#: ../src/interface.c:49 +#: ../src/interface.cpp:53 msgid "_Help" msgstr "_Hjelp" -#: ../src/interface.c:51 -msgid "_Quit" -msgstr "_Avslutt" +# +#: ../src/interface.cpp:55 +msgid "Search for _Open Files" +msgstr "Søk etter _opna filer" + +# +#: ../src/interface.cpp:56 +msgid "Search for open files" +msgstr "Søk etter opna filer" -#: ../src/interface.c:52 +#: ../src/interface.cpp:58 msgid "Quit the program" msgstr "Avslutt programmet" -#: ../src/interface.c:55 +#: ../src/interface.cpp:61 msgid "_Stop Process" msgstr "_Stopp prosess" -#: ../src/interface.c:56 +#: ../src/interface.cpp:62 msgid "Stop process" msgstr "Stopp prosess" -#: ../src/interface.c:57 +#: ../src/interface.cpp:63 msgid "_Continue Process" msgstr "_Hald fram prosess" -#: ../src/interface.c:58 +#: ../src/interface.cpp:64 msgid "Continue process if stopped" msgstr "Hald fram med prosessen om stoppa" -#: ../src/interface.c:60 ../src/interface.c:188 -msgid "End _Process" +#: ../src/interface.cpp:66 ../src/procdialogs.cpp:84 +msgid "_End Process" msgstr "_Avslutt prosess" -#: ../src/interface.c:61 +#: ../src/interface.cpp:67 msgid "Force process to finish normally" msgstr "Tving prosessen til å avslutta på vanleg måte" -#: ../src/interface.c:62 ../src/procdialogs.c:129 +#: ../src/interface.cpp:68 ../src/procdialogs.cpp:75 msgid "_Kill Process" msgstr "_Drep prosess" -#: ../src/interface.c:63 +#: ../src/interface.cpp:69 msgid "Force process to finish immediately" msgstr "Tving prosessen til å avslutta på vanleg måte" -#: ../src/interface.c:64 +#: ../src/interface.cpp:70 msgid "_Change Priority..." msgstr "_Endra prioritet ..." -#: ../src/interface.c:65 +#: ../src/interface.cpp:71 msgid "Change the order of priority of process" msgstr "Endra prioritetrekkefølgja på prosessen" -#: ../src/interface.c:66 -msgid "Prefere_nces" -msgstr "_Brukarval" - -#: ../src/interface.c:67 +#: ../src/interface.cpp:73 msgid "Configure the application" msgstr "Still inn programmet" -#: ../src/interface.c:69 ../src/procdialogs.c:85 -msgid "_Hide Process" -msgstr "_Gøym prosess" - -#: ../src/interface.c:70 -msgid "Hide process from list" -msgstr "Ikkje vis prosessen i lista" - -#: ../src/interface.c:71 -msgid "_Hidden Processes" -msgstr "_Gøymde prosessar" - -#: ../src/interface.c:72 -msgid "Open the list of currently hidden processes" -msgstr "Opna lista over gøymde prosessar" +# +#: ../src/interface.cpp:75 +msgid "_Refresh" +msgstr "Oppdate_r" -#: ../src/interface.c:73 +# +#: ../src/interface.cpp:76 +msgid "Refresh the process list" +msgstr "Oppdater prosesslista" + +#: ../src/interface.cpp:78 msgid "_Memory Maps" msgstr "_Minnekart" -#: ../src/interface.c:74 +#: ../src/interface.cpp:79 msgid "Open the memory maps associated with a process" msgstr "Opna minnekarta knytta til ein prosess" -#: ../src/interface.c:75 +#: ../src/interface.cpp:80 msgid "Open _Files" msgstr "Opne _filer" -#: ../src/interface.c:76 +#: ../src/interface.cpp:81 msgid "View the files opened by a process" msgstr "Vis filene opna av ein prosess" -#: ../src/interface.c:78 +#: ../src/interface.cpp:83 msgid "_Contents" msgstr "_Innhald" -#: ../src/interface.c:79 +#: ../src/interface.cpp:84 msgid "Open the manual" msgstr "Opna brukarrettleiinga" -#: ../src/interface.c:80 -msgid "_About" -msgstr "_Om" - -#: ../src/interface.c:81 +#: ../src/interface.cpp:86 msgid "About this application" msgstr "Om dette programmet" -#: ../src/interface.c:86 +# +#: ../src/interface.cpp:91 msgid "_Dependencies" -msgstr "" +msgstr "Av_hengigheter" -#: ../src/interface.c:87 +#: ../src/interface.cpp:92 msgid "Show parent/child relationship between processes" msgstr "Vis forelder/barn-band mellom prosessar" -#: ../src/interface.c:94 +#: ../src/interface.cpp:99 msgid "_Active Processes" msgstr "_Aktive prosessar" -#: ../src/interface.c:95 +#: ../src/interface.cpp:100 msgid "Show active processes" msgstr "Vis aktive prosessar" -#: ../src/interface.c:96 +#: ../src/interface.cpp:101 msgid "A_ll Processes" msgstr "A_lle prosessane" -#: ../src/interface.c:97 +#: ../src/interface.cpp:102 msgid "Show all processes" msgstr "Vis alle prosessane" -#: ../src/interface.c:98 +#: ../src/interface.cpp:103 msgid "M_y Processes" msgstr "_Mine prosessar" -#: ../src/interface.c:99 +#: ../src/interface.cpp:104 msgid "Show user own process" msgstr "Vis brukaren sine prosessar" -#: ../src/interface.c:260 +#: ../src/interface.cpp:189 +msgid "End _Process" +msgstr "_Avslutt prosess" + +#: ../src/interface.cpp:243 msgid "CPU History" msgstr "CPU-logg" -#: ../src/interface.c:303 -msgid "CPU:" -msgstr "CPU:" +# +#: ../src/interface.cpp:300 +msgid "CPU" +msgstr "CPU" -#: ../src/interface.c:306 +#: ../src/interface.cpp:302 #, c-format -msgid "CPU%d:" -msgstr "CPU%d:" +msgid "CPU%d" +msgstr "CPU%d" -#: ../src/interface.c:326 +#: ../src/interface.cpp:320 msgid "Memory and Swap History" msgstr "Minne- og swap-logg" -#: ../src/interface.c:359 -msgid "User memory:" -msgstr "Brukarminne:" - -#: ../src/interface.c:377 ../src/interface.c:437 -msgid "of" -msgstr "av" - -#: ../src/interface.c:418 -msgid "Used swap:" -msgstr "Brukt swap:" +# +#: ../src/interface.cpp:359 ../src/proctable.cpp:224 +msgid "Memory" +msgstr "Minne" + +# +#: ../src/interface.cpp:385 +msgid "Swap" +msgstr "Swap" -#: ../src/interface.c:477 +#: ../src/interface.cpp:406 msgid "Network History" msgstr "Nettverkslogg" -#: ../src/interface.c:509 -msgid "Received:" -msgstr "Motteke:" - -#: ../src/interface.c:529 ../src/interface.c:572 -msgid "Total:" -msgstr "Totalt:" - -#: ../src/interface.c:553 -msgid "Sent:" -msgstr "Sendt:" +# +#: ../src/interface.cpp:445 +msgid "Receiving" +msgstr "Mottar" + +# +#: ../src/interface.cpp:466 +msgid "Total Received" +msgstr "Totalt motteken" + +# +#: ../src/interface.cpp:500 +msgid "Sending" +msgstr "Sendar" + +# +#: ../src/interface.cpp:522 +msgid "Total Sent" +msgstr "Totalt sendt" + +# +#: ../src/interface.cpp:690 +msgid "System" +msgstr "System" -#: ../src/interface.c:733 ../src/procdialogs.c:579 +#: ../src/interface.cpp:694 ../src/procdialogs.cpp:512 msgid "Processes" msgstr "Prosessar" -#: ../src/interface.c:739 ../src/procdialogs.c:682 +#: ../src/interface.cpp:698 ../src/procdialogs.cpp:627 msgid "Resources" msgstr "Ressursar" -#: ../src/load-graph.c:369 ../src/load-graph.c:379 +#: ../src/load-graph.cpp:150 #, c-format -msgid "%s/s" -msgstr "%s/s" +msgid "%u second" +msgid_plural "%u seconds" +msgstr[0] "%u sekund" +msgstr[1] "%u sekund" + +#. xgettext: 540MiB (53 %) of 1.0 GiB +#: ../src/load-graph.cpp:366 +#, c-format +msgid "%s (%.1f %%) of %s" +msgstr "%s (%.1f %%) av %s" + +# +#: ../src/lsof.cpp:254 +msgid "Process" +msgstr "Prosess" -#: ../src/memmaps.c:296 +# +#: ../src/lsof.cpp:266 +msgid "PID" +msgstr "PID" + +#: ../src/lsof.cpp:276 ../src/memmaps.cpp:478 msgid "Filename" msgstr "Filnamn" -#: ../src/memmaps.c:297 +# +#. gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); +#: ../src/lsof.cpp:293 +msgid "Search for Open Files" +msgstr "Søk etter opna filer" + +# +#: ../src/lsof.cpp:321 +msgid "_Name contains:" +msgstr "_Namn inneheld:" + +# +#: ../src/lsof.cpp:337 +msgid "Case insensitive matching" +msgstr "Treff på små/store bokstavar" + +# +#: ../src/lsof.cpp:345 +msgid "S_earch results:" +msgstr "S_økeresultat:" + +#. xgettext: virtual memory start +#: ../src/memmaps.cpp:480 msgid "VM Start" msgstr "VM-start" -#: ../src/memmaps.c:298 +#. xgettext: virtual memory end +#: ../src/memmaps.cpp:482 msgid "VM End" msgstr "VM-slutt" -#: ../src/memmaps.c:299 +#. xgettext: virtual memory syze +#: ../src/memmaps.cpp:484 msgid "VM Size" msgstr "VM-storleik" -#: ../src/memmaps.c:300 +#: ../src/memmaps.cpp:485 msgid "Flags" msgstr "Flagg" -#: ../src/memmaps.c:301 +# +#. xgettext: virtual memory offset +#: ../src/memmaps.cpp:487 msgid "VM Offset" -msgstr "" +msgstr "VM avstand" + +# +#. xgettext: memory that has not been modified since +#. it has been allocated +#: ../src/memmaps.cpp:490 +msgid "Private clean" +msgstr "Privat rent" + +# +#. xgettext: memory that has been modified since it +#. has been allocated +#: ../src/memmaps.cpp:493 +msgid "Private dirty" +msgstr "Privat skittent" + +# +#. xgettext: shared memory that has not been modified +#. since it has been allocated +#: ../src/memmaps.cpp:496 +msgid "Shared clean" +msgstr "Delt rent" -#: ../src/memmaps.c:303 +# +#. xgettext: shared memory that has been modified +#. since it has been allocated +#: ../src/memmaps.cpp:499 +msgid "Shared dirty" +msgstr "Delt skittent" + +#: ../src/memmaps.cpp:501 msgid "Inode" msgstr "Inode" -#: ../src/memmaps.c:405 +#. gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); +#: ../src/memmaps.cpp:610 msgid "Memory Maps" msgstr "Minnekart" -#: ../src/memmaps.c:425 +#: ../src/memmaps.cpp:629 #, c-format msgid "_Memory maps for process \"%s\" (PID %u):" msgstr "_Minnekart for prosessen «%s» (PID %u):" -#: ../src/openfiles.c:31 +#: ../src/openfiles.cpp:33 msgid "file" msgstr "fil" -#: ../src/openfiles.c:33 +#: ../src/openfiles.cpp:35 msgid "pipe" msgstr "røyr" -#: ../src/openfiles.c:35 +#: ../src/openfiles.cpp:37 msgid "network connection" msgstr "nettverkstilkopling" -#: ../src/openfiles.c:37 +#: ../src/openfiles.cpp:39 msgid "local socket" msgstr "lokal sokkel" -#: ../src/openfiles.c:39 +#: ../src/openfiles.cpp:41 msgid "unknown type" msgstr "ukjend type" #. 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.c:231 +#: ../src/openfiles.cpp:234 msgid "FD" msgstr "FD" -#: ../src/openfiles.c:233 +#: ../src/openfiles.cpp:236 msgid "Object" msgstr "Objekt" -#: ../src/openfiles.c:312 +#: ../src/openfiles.cpp:320 msgid "Open Files" msgstr "Opne filer" -#: ../src/openfiles.c:334 +#: ../src/openfiles.cpp:342 #, c-format msgid "_Files opened by process \"%s\" (PID %u):" msgstr "_Filer opna av prosessen «%s» (PID %u):" -#: ../src/procactions.c:75 +#: ../src/procactions.cpp:75 #, c-format msgid "" "Cannot change the priority of process with pid %d to %d.\n" @@ -540,7 +799,7 @@ "Kan ikkje endra prioriteten til prosessen med pid %d til %d.\n" "%s" -#: ../src/procactions.c:144 +#: ../src/procactions.cpp:155 #, c-format msgid "" "Cannot kill process with pid %d with signal %d.\n" @@ -549,242 +808,428 @@ "Kan ikkje drepa prosessen med pid %d med signal %d.\n" "%s" -#. translators: primary alert message -#: ../src/procdialogs.c:65 -msgid "Hide the selected process?" -msgstr "Gøym vald prosess?" - -#. FIXME: View menu -> Edit menu -#. translators: secondary alert messagex -#: ../src/procdialogs.c:75 -msgid "" -"Hidden processes are no longer visible in the process list. You can re-" -"enable them by selecting the \"Hidden Processes\" entry in the View menu." -msgstr "Gøymde prosessar er ikkje synlege i prosesslista. Du kan slå dei på att ved å velja «gøymde prosessar»-oppføringa i Vis-menyen" - -#. translators: primary alert message -#: ../src/procdialogs.c:124 +#. xgettext: primary alert message +#: ../src/procdialogs.cpp:70 msgid "Kill the selected process?" msgstr "Drepa vald prosess?" -#. translators: secondary alert message -#: ../src/procdialogs.c:126 +#. xgettext: secondary alert message +#: ../src/procdialogs.cpp:72 msgid "" "Killing a process may destroy data, break the session or introduce a " "security risk. Only unresponding processes should be killed." -msgstr "Å drepa ein prosess kan øydeleggja data, øydeleggja økta eller opna for ein tryggleiksrisiko. Berre prosessar som ikkje reagerer bør drepast." +msgstr "" +"Å drepa ein prosess kan øydeleggja data, øydeleggja økta eller opna for ein " +"tryggleiksrisiko. Berre prosessar som ikkje reagerer bør drepast." -#. translators: primary alert message -#: ../src/procdialogs.c:133 +#. xgettext: primary alert message +#: ../src/procdialogs.cpp:79 msgid "End the selected process?" msgstr "Avslutta vald prosess?" -#. translators: secondary alert message -#: ../src/procdialogs.c:135 +#. xgettext: secondary alert message +#: ../src/procdialogs.cpp:81 msgid "" "Ending a process may destroy data, break the session or introduce a security " "risk. Only unresponding processes should be ended." -msgstr "Å avslutta ein prosess kan øydeleggja data, øydeleggja økta eller opna for ein tryggleiksrisiko. Berre prosessar som ikkje reagerer bør avsluttast." - -#: ../src/procdialogs.c:138 -msgid "_End Process" -msgstr "_Avslutt prosess" +msgstr "" +"Å avslutta ein prosess kan øydeleggja data, øydeleggja økta eller opna for " +"ein tryggleiksrisiko. Berre prosessar som ikkje reagerer bør avsluttast." -#: ../src/procdialogs.c:167 +#: ../src/procdialogs.cpp:113 msgid "(Very High Priority)" msgstr "(Svært høg prioritet)" -#: ../src/procdialogs.c:169 +#: ../src/procdialogs.cpp:115 msgid "(High Priority)" msgstr "(Høg prioritet)" -#: ../src/procdialogs.c:171 +#: ../src/procdialogs.cpp:117 msgid "(Normal Priority)" msgstr "(Vanleg prioritet)" -#: ../src/procdialogs.c:173 +#: ../src/procdialogs.cpp:119 msgid "(Low Priority)" msgstr "(Låg prioritet)" -#: ../src/procdialogs.c:175 +#: ../src/procdialogs.cpp:121 msgid "(Very Low Priority)" msgstr "(Svært låg prioritet)" -#: ../src/procdialogs.c:227 +#: ../src/procdialogs.cpp:173 msgid "Change Priority" msgstr "Endra prioritet" -#: ../src/procdialogs.c:248 +#: ../src/procdialogs.cpp:194 msgid "Change _Priority" msgstr "Endra _prioritet" -#: ../src/procdialogs.c:269 +#: ../src/procdialogs.cpp:215 msgid "_Nice value:" msgstr "_Nice-verdi:" -#: ../src/procdialogs.c:286 +#: ../src/procdialogs.cpp:231 +msgid "Note:" +msgstr "Merk:" + +#: ../src/procdialogs.cpp:232 msgid "" "The priority of a process is given by its nice value. A lower nice value " "corresponds to a higher priority." -msgstr "Prioriteten til ein prosess vert styrt av nice-verdien. Ein låg verdi tilsvarar høg prioritet." +msgstr "" +"Prioriteten til ein prosess vert styrt av nice-verdien. Ein låg verdi " +"tilsvarar høg prioritet." -#: ../src/procdialogs.c:464 -msgid "Processes i_nfo showed in list:" -msgstr "Prosessi_nfo vist i lista:" +# +#: ../src/procdialogs.cpp:392 +msgid "Process i_nformation shown in list:" +msgstr "I_nformasjon for prosesser som vert viste i lista:" -#: ../src/procdialogs.c:516 +#: ../src/procdialogs.cpp:444 msgid "Icon" msgstr "Ikon" -#: ../src/procdialogs.c:556 +#: ../src/procdialogs.cpp:489 msgid "System Monitor Preferences" msgstr "Eigenskapar for systemovervakar" -#: ../src/procdialogs.c:586 +#: ../src/procdialogs.cpp:519 msgid "Behavior" msgstr "Åtferd" -#: ../src/procdialogs.c:605 ../src/procdialogs.c:708 ../src/procdialogs.c:793 +#: ../src/procdialogs.cpp:538 ../src/procdialogs.cpp:653 +#: ../src/procdialogs.cpp:703 msgid "_Update interval in seconds:" msgstr "_Oppdateringstid i sekund:" -#: ../src/procdialogs.c:630 +#: ../src/procdialogs.cpp:563 msgid "Enable _smooth refresh" msgstr "Bruk _glatt oppfrisking" -#: ../src/procdialogs.c:644 +#: ../src/procdialogs.cpp:577 msgid "Alert before ending or _killing processes" msgstr "Varsla før prosessar vert avslutta eller _drepne" -#: ../src/procdialogs.c:654 -msgid "Alert before _hiding processes" -msgstr "Varsla før prosessar vert _gøymde" - -#: ../src/procdialogs.c:664 -msgid "Process Fields" -msgstr "Prosessfelt" +# +#: ../src/procdialogs.cpp:591 +msgid "Solaris mode" +msgstr "Solaris-modus" + +# +#: ../src/procdialogs.cpp:609 +msgid "Information Fields" +msgstr "Informasjonsfelt" -#: ../src/procdialogs.c:689 +#: ../src/procdialogs.cpp:634 msgid "Graphs" msgstr "Grafar" -#: ../src/procdialogs.c:729 -msgid "_Background color:" -msgstr "_Bakgrunnsfarge:" - -#: ../src/procdialogs.c:748 -msgid "_Grid color:" -msgstr "_Rutenettfarge:" - -#: ../src/procdialogs.c:812 +#: ../src/procdialogs.cpp:723 msgid "Show _all filesystems" msgstr "Vis :_alle filsystema" -#: ../src/proctable.c:245 +#: ../src/proctable.cpp:209 msgid "Process Name" msgstr "Prosessnamn" -#: ../src/proctable.c:246 +#: ../src/proctable.cpp:210 msgid "User" msgstr "Brukar" -#: ../src/proctable.c:247 +#: ../src/proctable.cpp:211 msgid "Status" msgstr "Status" -#: ../src/proctable.c:248 +#: ../src/proctable.cpp:212 msgid "Virtual Memory" msgstr "Virtuelt minne" -#: ../src/proctable.c:249 +# +#: ../src/proctable.cpp:213 msgid "Resident Memory" -msgstr "" +msgstr "Resident minne" -#: ../src/proctable.c:250 +#: ../src/proctable.cpp:214 msgid "Writable Memory" msgstr "Skrivbart minne" -#: ../src/proctable.c:251 +#: ../src/proctable.cpp:215 msgid "Shared Memory" msgstr "Delt minne" -#: ../src/proctable.c:252 +#: ../src/proctable.cpp:216 msgid "X Server Memory" msgstr "X-tenarminne" -#: ../src/proctable.c:253 +#: ../src/proctable.cpp:217 #, no-c-format msgid "% CPU" msgstr "% CPU" -#: ../src/proctable.c:254 +#: ../src/proctable.cpp:218 msgid "CPU Time" msgstr "CPU-tid" -#: ../src/proctable.c:255 +#: ../src/proctable.cpp:219 msgid "Started" msgstr "Starta" -#: ../src/proctable.c:256 +#: ../src/proctable.cpp:220 msgid "Nice" msgstr "Nice" -#: ../src/proctable.c:257 +#: ../src/proctable.cpp:221 msgid "ID" msgstr "ID" -#: ../src/proctable.c:258 +#: ../src/proctable.cpp:222 msgid "Security Context" msgstr "Tryggleikskontekst" -#: ../src/proctable.c:259 -msgid "Arguments" -msgstr "Argument" +# +#: ../src/proctable.cpp:223 +msgid "Command Line" +msgstr "Kommandolinje" + +#: ../src/proctable.cpp:926 +#, c-format +msgid "Load averages for the last 1, 5, 15 minutes: %0.2f, %0.2f, %0.2f" +msgstr "Snittlast siste 1, 5 og 15 minutt: %0.2f, %0.2f, %0.2f" + +#: ../src/sysinfo.cpp:75 +#, c-format +msgid "Release %s" +msgstr "Versjon %s" + +# +#: ../src/sysinfo.cpp:109 +msgid "Unknown CPU model" +msgstr "Ukjend CPU-modell" + +#: ../src/sysinfo.cpp:503 +#, c-format +msgid "Kernel %s" +msgstr "Kjerne %s" + +#: ../src/sysinfo.cpp:511 +#, c-format +msgid "GNOME %s" +msgstr "GNOME %s" + +#. hardware section +#: ../src/sysinfo.cpp:520 +#, c-format +msgid "Hardware" +msgstr "Maskinvare" + +# +#: ../src/sysinfo.cpp:541 +msgid "Memory:" +msgstr "Minne:" -#: ../src/proctable.c:432 +#: ../src/sysinfo.cpp:561 +#, c-format +msgid "Processor %d:" +msgstr "Prosessor %d:" + +# +#: ../src/sysinfo.cpp:566 +msgid "Processor:" +msgstr "Prosessor:" + +#. disk space section +#: ../src/sysinfo.cpp:586 +#, c-format +msgid "System Status" +msgstr "Systemstatus" + +# +#: ../src/sysinfo.cpp:607 +msgid "Available disk space:" +msgstr "Tilgjengeleg diskplass:" + +#: ../src/util.cpp:31 msgid "Running" msgstr "Køyrer" -#: ../src/proctable.c:437 +#: ../src/util.cpp:35 msgid "Stopped" msgstr "Stoppa" -#: ../src/proctable.c:442 +#: ../src/util.cpp:39 msgid "Zombie" msgstr "Zombie" -#: ../src/proctable.c:447 +#: ../src/util.cpp:43 msgid "Uninterruptible" msgstr "Kan ikkje avbrytast" -#: ../src/proctable.c:452 +#: ../src/util.cpp:47 msgid "Sleeping" msgstr "Sovande" -#: ../src/proctable.c:1038 +#. xgettext: weeks, days +#: ../src/util.cpp:102 #, c-format -msgid "Load averages for the last 1, 5, 15 minutes: %0.2f, %0.2f, %0.2f" -msgstr "Snittlast siste 1, 5 og 15 minutt: %0.2f, %0.2f, %0.2f" +msgid "%uw%ud" +msgstr "%uw%ud" + +#. xgettext: days, hours (0 -> 23) +#: ../src/util.cpp:106 +#, c-format +msgid "%ud%02uh" +msgstr "%ud%02uh" + +#. xgettext: hours (0 -> 23), minutes, seconds +#: ../src/util.cpp:110 +#, c-format +msgid "%u:%02u:%02u" +msgstr "%u:%02u:%02u" -#: ../src/util.c:87 +#. xgettext: minutes, seconds, centiseconds +#: ../src/util.cpp:113 +#, c-format +msgid "%u:%02u.%02u" +msgstr "%u:%02u.%02u" + +#: ../src/util.cpp:162 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u byte" msgstr[1] "%u byte" -#: ../src/util.c:93 +#: ../src/util.cpp:169 #, c-format msgid "%.1f KiB" msgstr "%.1f KiB" -#: ../src/util.c:97 +#: ../src/util.cpp:172 #, c-format msgid "%.1f MiB" msgstr "%.1f MiB" -#: ../src/util.c:101 +#: ../src/util.cpp:175 #, c-format msgid "%.1f GiB" msgstr "%.1f GiB" +# +#: ../src/util.cpp:349 +msgid "N/A" +msgstr "I/T" + +#. xgettext: rate, 10MiB/s +#: ../src/util.cpp:466 +#, c-format +msgid "%s/s" +msgstr "%s/s" + +# +#~ msgid "A simple process and system monitor." +#~ msgstr "Ein enkel prosess- og systemovervakar" + +#~ msgid "Devices" +#~ msgstr "Einigar" + +#~ msgid "No hidden processes" +#~ msgstr "Ingen gøymde prosessar" + +#~ msgid "" +#~ "There are no hidden processes in the list. To show all running processes, " +#~ "select the \"All processes\" option in the main window." +#~ msgstr "" +#~ "Det er ingen gøymde prosessar i lista. Vel «Alle prosessar» i " +#~ "hovudvindauget for å visa alle køyrande prosessar." + +#~ msgid "Hidden Processes" +#~ msgstr "Gøymde prosessar" + +#~ msgid "Currently _hidden processes:" +#~ msgstr "Prosessar som er _gøymde no:" + +#~ msgid "_Remove From List" +#~ msgstr "_Fjern frå lista" + +#~ msgid "" +#~ "These are the processes you have chosen to hide. You can reshow a process " +#~ "by removing it from this list." +#~ msgstr "" +#~ "Dette er prosessar du har vald å gøyma. Du kan visa dei på nytt ved å " +#~ "fjerna dei frå lista." + +#~ msgid "Column zero saved width" +#~ msgstr "Kolonne null lagra breidde" + +#~ msgid "Default graph background color" +#~ msgstr "Standard bakgrunn på graf" + +#~ msgid "Default graph frame color" +#~ msgstr "Standard farge på graframme" + +#~ msgid "Default graph net out color" +#~ msgstr "Standard farge på utgåande nettraffikk-graf" + +#~ msgid "Show process threads" +#~ msgstr "Vis prosesstrådar" + +#~ msgid "Show warning dialog when hiding processes" +#~ msgstr "Vis åtvaringsdialogar når prosessar vert gøymde" + +#~ msgid "_File" +#~ msgstr "_Fil" + +#~ msgid "_Quit" +#~ msgstr "_Avslutt" + +#~ msgid "Prefere_nces" +#~ msgstr "_Brukarval" + +#~ msgid "_Hide Process" +#~ msgstr "_Gøym prosess" + +#~ msgid "_Hidden Processes" +#~ msgstr "_Gøymde prosessar" + +#~ msgid "Open the list of currently hidden processes" +#~ msgstr "Opna lista over gøymde prosessar" + +#~ msgid "_About" +#~ msgstr "_Om" + +#~ msgid "User memory:" +#~ msgstr "Brukarminne:" + +#~ msgid "of" +#~ msgstr "av" + +#~ msgid "Used swap:" +#~ msgstr "Brukt swap:" + +#~ msgid "Total:" +#~ msgstr "Totalt:" + +#~ msgid "Sent:" +#~ msgstr "Sendt:" + +#~ msgid "Hide the selected process?" +#~ msgstr "Gøym vald prosess?" + +#~ msgid "" +#~ "Hidden processes are no longer visible in the process list. You can re-" +#~ "enable them by selecting the \"Hidden Processes\" entry in the View menu." +#~ msgstr "" +#~ "Gøymde prosessar er ikkje synlege i prosesslista. Du kan slå dei på att " +#~ "ved å velja «gøymde prosessar»-oppføringa i Vis-menyen" + +#~ msgid "Alert before _hiding processes" +#~ msgstr "Varsla før prosessar vert _gøymde" + +#~ msgid "_Background color:" +#~ msgstr "_Bakgrunnsfarge:" + +#~ msgid "_Grid color:" +#~ msgstr "_Rutenettfarge:" + +#~ msgid "Arguments" +#~ msgstr "Argument" diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/src/load-graph.h /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/src/load-graph.h --- gnome-system-monitor-2.22.0/src/load-graph.h 2008-02-25 20:30:29.000000000 +0100 +++ gnome-system-monitor-2.22.1/src/load-graph.h 2008-04-05 18:44:55.000000000 +0200 @@ -34,7 +34,7 @@ struct LoadGraph { - static const unsigned NUM_POINTS = 60; + static const unsigned NUM_POINTS = 60 + 2; static const unsigned GRAPH_MIN_HEIGHT = 40; LoadGraph(guint type); diff -Nru /tmp/Z6G9s0Y5bs/gnome-system-monitor-2.22.0/src/lsof.cpp /tmp/uEpuAOlLuZ/gnome-system-monitor-2.22.1/src/lsof.cpp --- gnome-system-monitor-2.22.0/src/lsof.cpp 2008-01-29 18:25:36.000000000 +0100 +++ gnome-system-monitor-2.22.1/src/lsof.cpp 2008-03-29 20:01:45.000000000 +0100 @@ -138,28 +138,35 @@ this->clear_results(); - Lsof lsof(this->pattern(), this->case_insensitive); - // lsof = new SimpleLsof(this->pattern(), this->case_insensitive); unsigned count = 0; - for (ProcInfo::Iterator it(ProcInfo::begin()); it != ProcInfo::end(); ++it) { - const ProcInfo &info(*it->second); + try { + Lsof lsof(this->pattern(), this->case_insensitive); - MatchSet matches; - lsof.search(info, std::inserter(matches, matches.begin())); - count += matches.size(); - - for (iterator it(matches.begin()), end(matches.end()); it != end; ++it) { - GtkTreeIter file; - gtk_list_store_append(this->model, &file); - gtk_list_store_set(this->model, &file, - PROCMAN_LSOF_COL_PIXBUF, info.pixbuf->gobj(), - PROCMAN_LSOF_COL_PROCESS, info.name, - PROCMAN_LSOF_COL_PID, info.pid, - PROCMAN_LSOF_COL_FILENAME, it->c_str(), - -1); + for (ProcInfo::Iterator it(ProcInfo::begin()); it != ProcInfo::end(); ++it) { + const ProcInfo &info(*it->second); + + MatchSet matches; + lsof.search(info, std::inserter(matches, matches.begin())); + count += matches.size(); + + for (iterator it(matches.begin()), end(matches.end()); it != end; ++it) { + GtkTreeIter file; + gtk_list_store_append(this->model, &file); + gtk_list_store_set(this->model, &file, + PROCMAN_LSOF_COL_PIXBUF, info.pixbuf->gobj(), + PROCMAN_LSOF_COL_PROCESS, info.name, + PROCMAN_LSOF_COL_PID, info.pid, + PROCMAN_LSOF_COL_FILENAME, it->c_str(), + -1); + } } } + catch (Glib::RegexError& error) { + procman_debug("Regex error with pattern '%s' : %s", + this->pattern().c_str(), + error.what().c_str()); + } this->update_count(count); }