Fixed. Sorted. Added, contains files in the support directory. Removed,libgtop-GNOME-2-0-port

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.

9 files changed, 51 insertions, 312 deletions

diff --git a/po/.cvsignore b/po/.cvsignore
index f94ccc16..7771092d 100644
--- a/po/.cvsignore
+++ b/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
diff --git a/po/ChangeLog b/po/ChangeLog
index 9c9aa500..022a87db 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,13 @@
+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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3ec3c9c1..a73505f1 100644
--- a/po/POTFILES.in
+++ b/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
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 00000000..3f8475c7
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,4 @@
+support/error.c
+support/getopt.c
+support/popt.c
+support/popthelp.c
diff --git a/po/README.tools b/po/README.tools
deleted file mode 100644
index 4ec99c16..00000000
--- a/po/README.tools
+++ /dev/null
@@ -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.
diff --git a/po/README.translators b/po/README.translators
deleted file mode 100644
index 4c9cf23d..00000000
--- a/po/README.translators
+++ /dev/null
@@ -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
diff --git a/po/stamp-cat-id b/po/stamp-cat-id
deleted file mode 100644
index 9788f702..00000000
--- a/po/stamp-cat-id
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/po/update.pl b/po/update.pl
deleted file mode 100755
index 81ec0f3c..00000000
--- a/po/update.pl
+++ /dev/null
@@ -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;
-}
diff --git a/po/update.sh b/po/update.sh
deleted file mode 100755
index 3ad571c6..00000000
--- a/po/update.sh
+++ /dev/null
@@ -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;