*** empty log message ***

2003-08-25  Duarte Loreto <happyguy_pt@hotmail.com>

	* pt.po: Updated and fixed typos in Portuguese translation.

ChangeLog

@@ -1,3 +1,54 @@
+2003-05-10  Danilo Šegan  <dsegan@gmx.net>
+
+	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.
+
+2003-04-30  Abel Cheung  <maddog@linux.org.hk>
+
+	* configure.in: Added "id" to ALL_LINGUAS.
+
+2003-03-13  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "ml" to ALL_LINGUAS.
+
+2003-03-10  Roozbeh Pournader  <roozbeh@sharif.edu>
+
+	* configure.in: Added "fa" to ALL_LINGUAS.
+
+2003-01-25  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* configure.in: Added "it" (Italian) to ALL_LINGUAS.
+
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "mn" to ALL_LINGUAS.
+
+2002-06-25  Yanko Kaneti <yaneti@declera.com>
+
+	* configure.in: (ALL_LINGUAS) Added Bulgarian (bg).
+
+2002-05-08  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Vietnamese (vi) to ALL_LINGUAS
+
+2002-03-11  Duarte Loreto <happyguy_pt@hotmail.com>
+
+        * configure.in: Added pt (Portuguese) to ALL_LINGUAS
+
+2002-02-05  Abel Cheung  <maddog@linux.org.hk>
+
+	* configure.in (ALL_LINGUAS): zh_CN.GB2312 -> zh_CN
+
+2002-01-10  Kevin Vandersloot <kfv101@psu.edu>
+
+	* configure.in: Put in error message telling people
+	not to use HEAD for the time being untill I merger the
+	porting branch
+
+2002-01-09  Darin Adler  <darin@bentspoon.com>
+
+	* Makefile.am: Fix install problem.
+	* ltmain.sh: Don't check this into cvs.
+
 Mon Nov 26 20:11:31 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* lib/xmalloc.c include/glibtop/xmalloc.h: (glibtop_free_r):

Makefile.am

@@ -35,7 +35,7 @@ confexec_DATA	= $(top_builddir)/libgtopConf.sh \
 
 CLEANFILES=libgtopConf.sh
 
-bin_SCRIPTS = $(top_builddir)/libgtop-config
+bin_SCRIPTS = libgtop-config
 
 ## We create libgtopConf.sh here and not from configure because we want
 ## to get the paths expanded correctly.  Macros like srcdir are given

configure.in

@@ -6,6 +6,19 @@ AC_INIT(copyright.txt)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
+if test -z "$I_LIKE_PAIN"; then
+AC_MSG_ERROR([
+*** You don't want this version of libgtop!
+*** If you want the GNOME 2.0 port then check out
+*** the libgtop-GNOME-2-0-port branch of libgtop
+*** You can do this by typing
+*** cvs update -r libgtop-GNOME-2-0-port libgtop/
+*** in the directory above this one.
+*** If you are looking for the stable branch then 
+*** check out the LIBGTOP_STABLE_1_0 branch
+***])
+fi
+  
 dnl This is required at several places
 AC_CHECK_PROG(ac_dc_found, dc, yes, no)
 if test x$ac_dc_found != xyes ; then
@@ -160,7 +173,7 @@ AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
 dnl ## all 'es_??' are only needed for format numbers different of 'es'
-ALL_LINGUAS="az ca da de el es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr ga gl hu ja ko nl nn no pl pt_BR ro ru sk sl sv tr uk zh_CN.GB2312 zh_TW"
+ALL_LINGUAS="am az bg ca da de el es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fa fi fr ga gl hu id it ja ko ml mn nl nn no pl pt pt_BR ro ru sk sl sr sr@Latn sv tr uk vi zh_CN zh_TW"
 AM_GNOME2_GETTEXT
 
 AC_PATH_XTRA

libgtop.spec.in

@@ -8,7 +8,7 @@ Summary: LibGTop library
 Name: libgtop
 Version: %ver
 Release: %rel
-Copyright: LGPL
+Copyright: GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/libgtop-%{ver}.tar.gz
 BuildRoot: /var/tmp/%{name}-%{ver}-root

po/.cvsignore

@@ -1,8 +1,10 @@
 Makefile
 Makefile.in
+Makefile.in.in
 POTFILES
 cat-id-tbl.c
-*.gmo *.mo
-libgtop-1.1.pot
-Makefile.in.in
-libgtop.pot
+stamp-cat-id
+*.gmo
+*.mo
+*.pot
+messages

po/ChangeLog

@@ -1,3 +1,112 @@
+2003-09-08  Mugurel Tudor  <mugurelu@go.ro>
+
+	* ro.po: Updated Romanian translation by
+		Mişu Moldovan  <dumol@go.ro>
+
+2003-08-25  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated and fixed typos in Portuguese translation.
+
+2003-08-18  Metin Amiroff <metin@karegen.com>
+
+	* az.po: Updated Azerbaijani translation.
+
+2003-08-08  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2003-08-07  Wang Jian  <lark@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2003-07-13  Metin Amiroff  <metin@karegen.com>
+
+	* az.po: Updated Azerbaijani translation.
+
+2003-05-16  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation by Serbian 
+	team (Prevod.org).
+
+2003-05-10  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Added Serbian translation by Serbian team
+	(Prevod.org).
+
+2003-03-13  Christian Rose  <menthos@menthos.com>
+
+	* ml.po: Added Malayalam translation by
+	FSF-India <locale@gnu.org.in>.
+
+2003-03-10  Roozbeh Pournader  <roozbeh@sharif.edu>
+
+	* fa.po: Added Persian translation.
+
+2003-02-21  Metin Amiroff  <metin@karegen.com>
+
+	* az.po: Updated Azerbaijani translation.
+
+2003-02-11  Mohammad DAMT  <mdamt@bisnisweb.com>
+
+	* id.po: Updated Indonesian translation
+
+2003-02-09  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Some fixes for problems catched in translation review.
+
+2003-01-25  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Added Italian translation.
+
+2003-01-23  Marius Andreiana <marius galuna.ro>
+
+	* ro.po: updated ( thanks to Mişu Moldovan )
+
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* mn.po: Added Mongolian translation by
+	Sanlig Badral <badral@chinggis.com>.
+
+2003-01-16  Daniel Yacob <locales@geez.org>
+
+	* am.po: Added Amharic translation.
+	
+2002-12-18  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation.
+
+2002-06-25  Yanko Kaneti <yaneti@declera.com>
+
+	* bg.po (added): Bulgarian translation by
+	Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>.
+
+2002-05-08  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* vi.po: Added Vietnamese file
+
+2002-05-01  Germán Poo-Caamaño  <gpoo@ubiobio.cl>
+
+        * es.po: Updated Spanish translation from
+		José Antonio Salgueiro <joseantoniosalgueiro@telefonica.net>.
+
+2002-03-11  Duarte Loreto <happyguy_pt@hotmail.com>
+
+        * pt.po: Added Portuguese translation.
+
+2002-03-10  Christian Rose  <menthos@menthos.com>
+
+	* .cvsignore: Fixed.
+	* POTFILES.in: Sorted.
+	* POTFILES.skip: Added, contains files in the support directory.
+	* README.tools, update.pl, update.sh: Removed, these are obsoleted by
+	intltool.
+	* README.translators: I think the contents of this one is obsoleted too.
+	* stamp-cat-id: Removed, this file should not be stored in cvs.
+
+2002-02-05  Abel Cheung  <maddog@linux.org.hk>
+
+	* zh_CN.GB2312.po -> zh_CN.po
+
 2001-10-14  Valek Filippov  <frob@df.ru>
 
 	* ru.po: Slightly updated russian translation.
@@ -9,7 +118,7 @@
 2001-07-25  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nn.po: Added Norwegian (nynorsk) translation.
-	* no.po: Updated Norwegian (bokm<EFBFBD>l) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 	
 2001-06-07  Pablo Saratxaga  <pablo@mandrakesoft.com>
 
@@ -22,7 +131,7 @@
 2001-03-23  Fatih Demir <kabalak@gtranslator.org>
 
 	* tr.po: Committed updated Turkish translation by
-		G<EFBFBD>rkem also to the HEAD branch (here).
+		Görkem also to the HEAD branch (here).
 
 2001-03-17  Marius Andreiana  <mandreiana@yahoo.com>
 	
@@ -60,7 +169,7 @@
 
 	* sk.po: Added Slovak translation from Marcel Telka <marcel@telka.sk>.
 
-2001-02-10  Christophe Merlet  <redfox@eikonex.org>
+2001-02-10  Christophe Merlet  <christophe@merlet.net>
 
 	* fr.po: Updated French translation.
 
@@ -68,14 +177,14 @@
 
 	* hu.po: Updated  Hungarian translation from Robert Vanyi.
 
-2001-02-05  Christophe Merlet  <redfox@eikonex.org>
+2001-02-05  Christophe Merlet  <christophe@merlet.net>
 
 	* fr.po: Updated French translation.
 
 2001-02-04  Fatih Demir	<kabalak@gmx.net>
 
 	* tr.po: Added Turkish translation by
-		G<EFBFBD>rkem Cetin.
+		Görkem Cetin.
 
 2001-01-31  Szabolcs Ban  <shooby@gnome.hu>
 
@@ -216,7 +325,7 @@
 
 	* gl.po: Added Galician translation.
 
-1999-09-29  Kenneth ll<EFBFBD>phaane Christiansen  <kenneth@ripen.dk>
+1999-09-29  Kenneth lléphaane Christiansen  <kenneth@ripen.dk>
 
 	* da.po: Updated.
 

po/POTFILES.in

@@ -1,30 +1,5 @@
-sysdeps/names/cpu.c
-sysdeps/names/fsusage.c
-sysdeps/names/loadavg.c
-sysdeps/names/mem.c
-sysdeps/names/mountlist.c
-sysdeps/names/msg_limits.c
-sysdeps/names/prockernel.c
-sysdeps/names/proclist.c
-sysdeps/names/procmap.c
-sysdeps/names/procmem.c
-sysdeps/names/procsegment.c
-sysdeps/names/procsignal.c
-sysdeps/names/procstate.c
-sysdeps/names/proctime.c
-sysdeps/names/procuid.c
-sysdeps/names/sem_limits.c
-sysdeps/names/shm_limits.c
-sysdeps/names/swap.c
-sysdeps/names/sysdeps.c
-sysdeps/names/uptime.c
-lib/close.c
-lib/init.c
-lib/open.c
-lib/parameter.c
-lib/sysdeps.c
-lib/errors.c
-lib/inodedb.c
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
 include/glibtop/close.h
 include/glibtop/cpu.h
 include/glibtop/error.h
@@ -55,10 +30,37 @@ include/glibtop/types.h
 include/glibtop/union.h
 include/glibtop/uptime.h
 include/glibtop/xmalloc.h
+lib/close.c
+lib/errors.c
+lib/init.c
+lib/inodedb.c
+lib/open.c
+lib/parameter.c
+lib/sysdeps.c
 src/inodedb/file_by_inode.c
 src/inodedb/mkinodedb.c
 sysdeps/common/fsusage.c
-sysdeps/common/mountlist.c
-sysdeps/common/sysdeps_suid.c
 sysdeps/common/fsusage.h
+sysdeps/common/mountlist.c
 sysdeps/common/mountlist.h
+sysdeps/common/sysdeps_suid.c
+sysdeps/names/cpu.c
+sysdeps/names/fsusage.c
+sysdeps/names/loadavg.c
+sysdeps/names/mem.c
+sysdeps/names/mountlist.c
+sysdeps/names/msg_limits.c
+sysdeps/names/prockernel.c
+sysdeps/names/proclist.c
+sysdeps/names/procmap.c
+sysdeps/names/procmem.c
+sysdeps/names/procsegment.c
+sysdeps/names/procsignal.c
+sysdeps/names/procstate.c
+sysdeps/names/proctime.c
+sysdeps/names/procuid.c
+sysdeps/names/sem_limits.c
+sysdeps/names/shm_limits.c
+sysdeps/names/swap.c
+sysdeps/names/sysdeps.c
+sysdeps/names/uptime.c

po/POTFILES.skip

@@ -0,0 +1,4 @@
+support/error.c
+support/getopt.c
+support/popt.c
+support/popthelp.c

po/README.tools

@@ -1,58 +0,0 @@
-The po/ directory includes two perlscripts, which is done to help 
-making the translations fully uptodate.
-
-The first script is called update.pl and is supposed to be run like this:
-
-	./update.pl [OPTIONS] ...LANGCODE
-
-This will updates the pot file (the po template, generated from the source code) 
-and merge them with the translations po files.
-
-For instance to do this for Danish, type the following
-
-	./update.pl da
-
-
-The update.pl script also supports other options, they are:
-
-  -V, --version                shows the version
-  -H, --help                   shows this help page
-  -P, --pot                    only generates the potfile
-  -M, --maintain               search for missing files in POTFILES.in
-
-Especially the --maintain option is very handy for package maintainer, to check
-if you included all the files that have marked strings in the POTFILES.in, so
-they will be in the generated po template, the socalled pot file.
-
-There is though one thing to take notice of with this option, please check the 
-configure.in file to make sure that the files you add to POTFILES.in are being
-build, otherwise this can leed to "make dist" throuble.
-
-
-The other utility is the desk.pl script, which will check the cvs module for
-missing translation in files like *.desktop, *.directory, *.soundlist and so on.
-
-Run the script like this:
-
-	./desk.pl [OPTIONS] ...LANGCODE ENTRY
-
-An example use could be.
-
-	./desk.pl da
-
-which will check all the files for missing Name[da] entries, or 
-
-	./desk.pl no Comment
-
-which will check all the files for missing Comment[no] entries. "Comment" can
-here be replaced with whatever you like
-
-All scripts support the --help option for further help, though it's not very
-extensive for the moment.
-
-Kenneth Christiansen
-
-kenneth@gnu.org  
-kenneth@gnome.org
-
-Both scripts are copyright 2000 The Free Software Foundation and me.

po/README.translators

@@ -1,12 +0,0 @@
-Hello translators,
-
-I'm currently doing larger interface changes in the HEAD of LibGTop
-which means that things will change very often here while the whole
-module is unstable and unusable for the end-user.
-
-So please don't waste your time doing any translations in the HEAD
-at the moment. If you want to do translations, please use the
-`LIBGTOP_1_1_2_PATCHES' branch.
-
-January 2, 2000
-Martin Baulig

po/stamp-cat-id

@@ -1 +0,0 @@
-timestamp

po/update.pl

@@ -1,166 +0,0 @@
-#!/usr/bin/perl -w
-
-#  GNOME po update utility.
-#  (C) 2000 The Free Software Foundation
-#
-#  Author(s): Kenneth Christiansen
-
-
-$VERSION = "1.2.5 beta 2";
-$LANG    = $ARGV[0];
-$PACKAGE  = "libgtop";
-
-if (! $LANG){
-    print "update.pl:  missing file arguments\n";
-    print "Try `update.pl --help' for more information.\n";
-    exit;
-}
-
-if ($LANG=~/^-(.)*/){
-
-    if ("$LANG" eq "--version" || "$LANG" eq "-V"){
-        print "GNOME PO Updater $VERSION\n";
-        print "Written by Kenneth Christiansen <kenneth\@gnome.org>, 2000.\n\n";
-        print "Copyright (C) 2000 Free Software Foundation, Inc.\n";
-        print "This is free software; see the source for copying conditions.  There is NO\n";
-        print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
-	exit;
-    }
-
-
-    elsif ($LANG eq "--help" || "$LANG" eq "-H"){
-        print "Usage: ./update.pl [OPTIONS] ...LANGCODE\n";
-        print "Updates pot files and merge them with the translations.\n\n";
-        print "  -V, --version                shows the version\n";
-        print "  -H, --help                   shows this help page\n";
-        print "  -P, --pot                    only generates the potfile\n";
-        print "  -M, --maintain               search for missing files in POTFILES.in\n";
-	print "\nExamples of use:\n";
-        print "update.sh --pot    just creates a new pot file from the source\n";
-	print "update.sh da       created new pot file and updated the da.po file\n\n";
-        print "Report bugs to <kenneth\@gnome.org>.\n";
-	exit;
-    }
-
-    elsif($LANG eq "--pot" || "$LANG" eq "-P"){
-                
-        print "Building the $PACKAGE.pot ...";
-
-        $b="xgettext --default-domain\=$PACKAGE --directory\=\.\."
-          ." --add-comments --keyword\=\_ --keyword\=N\_"
-          ." --files-from\=\.\/POTFILES\.in ";
-        $b1="test \! -f $PACKAGE\.po \|\| \( rm -f \.\/$PACKAGE\.pot "
-           ."&& mv $PACKAGE\.po \.\/$PACKAGE\.pot \)";
-         
-        `$b`;
-        `$b1`;
-
-        print "...done\n";
-
-        exit;
-    }
-        
-    elsif ($LANG eq "--maintain" || "$LANG" eq "-M"){
-
-        $a="find ../ -print | egrep '.*\\.(c|y|cc|c++|h|gob)' ";
-
-        open(BUF2, "POTFILES.in") || die "update.pl:  there's not POTFILES.in!!!\n";
-        print "Searching for missing _(\" \") entries...\n";
-        open(BUF1, "$a|");
-
-
-        @buf2 = <BUF2>;
-        @buf1 = <BUF1>;
-
-        if (-s "POTFILES.ignore"){
-            open FILE, "POTFILES.ignore";
-            while (<FILE>) {
-                if ($_=~/^[^#]/o){
-                    push @bup, $_;
-                }
-            }
-            print "POTFILES.ignore found! Ignoring files...\n";
-	    @buf2 = (@bup, @buf2);
-        }
-
-        foreach my $file (@buf1){
-            open FILE, "<$file";
-            while (<FILE>) {
-                if ($_=~/_\(\"/o){
-                    $file = unpack("x3 A*",$file) . "\n";
-                    push @buff1, $file;
-                    last;
-                }
-            }
-        }
-
-        @bufff1 = sort (@buff1);
-
-        @bufff2 = sort (@buf2);
-
-        my %in2;
-        foreach (@bufff2) {
-            $in2{$_} = 1;
-        }
-
-        foreach (@bufff1){
-            if (!exists($in2{$_})){
-                push @result, $_ }
-            }
-
-        if(@result){
-            open OUT, ">POTFILES.in.missing";
-            print OUT @result;
-            print "\nHere are the results:\n\n", @result, "\n";
-            print "File POTFILES.in.missing is being placed in directory...\n";
-            print "Please add the files that should be ignored in POTFILES.ignore\n";
-        }
-        else{
-            print "\nWell, it's all perfect! Congratulation!\n";
-        }         
-    }
-
-
-    else{
-        print "update.pl: invalid option -- $LANG\n";
-        print "Try `update.pl --help' for more information.\n";
-    }
-    exit;
-    }
-
-elsif(-s "$LANG.po"){
-
-    print "Building the $PACKAGE.pot ...";
-
-    $c="xgettext --default-domain\=$PACKAGE --directory\=\.\."
-      ." --add-comments --keyword\=\_ --keyword\=N\_"
-      ." --files-from\=\.\/POTFILES\.in ";  
-    $c1="test \! -f $PACKAGE\.po \|\| \( rm -f \.\/$PACKAGE\.pot "
-       ."&& mv $PACKAGE\.po \.\/$PACKAGE\.pot \)";
-
-    `$c`;
-    `$c1`;
-
-    print "...done";
-
-    print "\nNow merging $LANG.po with $PACKAGE.pot, and creating an updated $LANG.po ...\n";
-
-    
-    $d="mv $LANG.po $LANG.po.old && msgmerge $LANG.po.old $PACKAGE.pot -o $LANG.po";
-
-    $f="msgfmt --statistics $LANG.po";
-
-    `$d`;
-    `$f`;
-
-    unlink "messages";
-    unlink "$LANG.po.old";
-
-    exit;
-}
-
-else{
-    print "update.pl:  sorry $LANG.po does not exist!\n";
-    print "Try `update.pl --help' for more information.\n";    
-    exit;
-}

po/update.sh

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-PACKAGE="libgtop"
-
-if [ "x$1" = "x--help" ]; then
-
-echo Usage: ./update.sh langcode
-echo --help                  display this help and exit
-echo
-echo Examples of use:
-echo ./update.sh ----- just creates a new pot file from the source
-echo ./update.sh da -- created new pot file and updated the da.po file 
-
-elif [ "x$1" = "x" ]; then 
-
-echo "Building the $PACKAGE.pot ..."
-
-xgettext --default-domain=$PACKAGE --directory=.. \
-  --add-comments --keyword=_ --keyword=N_ \
-  --files-from=./POTFILES.in \
-&& test ! -f $PACKAGE.po \
-   || ( rm -f ./$PACKAGE.pot \
-&& mv $PACKAGE.po ./$PACKAGE.pot );
-
-else
-
-xgettext --default-domain=$PACKAGE --directory=.. \
-  --add-comments --keyword=_ --keyword=N_ \
-  --files-from=./POTFILES.in \
-&& test ! -f $PACKAGE.po \
-   || ( rm -f ./PACKAGE.pot \
-&& mv $PACKAGE.po ./$PACKAGE.pot );
-
-echo "Building the $PACKAGE.pot ..."
-echo "Now merging $1.po with $PACKAGE.pot, and creating an updated $1.po ..." 
-
-mv $1.po $1.po.old && msgmerge $1.po.old $PACKAGE.pot -o $1.po \
-&& rm $1.po.old;
-
-msgfmt --statistics $1.po
-
-fi;