Ignore more files. Removed obsolete files. Add missing files, remove

2002-06-21  Abel Cheung  <maddog@linux.org.hk>

	* .cvsignore: Ignore more files.
	* Makefile.i18npatch, update.sh: Removed obsolete files.
	* POTFILES.in: Add missing files, remove entries already present in
	POTFILES.skip.
	* POTFILES.skip: Remove non-existant entries.

svn path=/trunk/; revision=17248

6 files changed, 14 insertions, 118 deletions

diff --git a/po/.cvsignore b/po/.cvsignore
index c2a0771f2e..1b0b11d498 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,10 +1,11 @@
 *.gmo
 *.mo
+*.pot
 Makefile
 Makefile.in
 Makefile.in.in
 POTFILES
 cat-id-tbl.c
-stamp-cat-id
-evolution.pot
 messages
+missing
+stamp-cat-id
diff --git a/po/ChangeLog b/po/ChangeLog
index f06cb87f15..47a2200105 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-21  Abel Cheung  <maddog@linux.org.hk>
+
+	* .cvsignore: Ignore more files.
+	* Makefile.i18npatch, update.sh: Removed obsolete files.
+	* POTFILES.in: Add missing files, remove entries already present in
+	POTFILES.skip.
+	* POTFILES.skip: Remove non-existant entries.
+
 2002-06-13  Andrew V. Samoilov  <kai@cmail.ru>
 
 	* ru.po: Updated Russian translation.
diff --git a/po/Makefile.i18npatch b/po/Makefile.i18npatch
deleted file mode 100644
index 98837e85c2..0000000000
--- a/po/Makefile.i18npatch
+++ /dev/null
@@ -1,63 +0,0 @@
---- Makefile.in.in.clean	Sat Oct 28 15:31:52 2000
-+++ Makefile.in.in	Sat Oct 28 16:11:18 2000
-@@ -33,7 +33,9 @@
- GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
- MSGFMT = @MSGFMT@
- XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
--MSGMERGE = PATH=../src:$$PATH msgmerge
-+MSGMERGE = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --dist
-+GENPOT   = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --pot
-+GENHEAD  = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --headers
- 
- DEFS = @DEFS@
- CFLAGS = @CFLAGS@
-@@ -47,7 +49,7 @@
- POFILES = @POFILES@
- GMOFILES = @GMOFILES@
- DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
--stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
-+stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) update.pl ui-extract.pl
- 
- POTFILES = \
- 
-@@ -83,12 +85,7 @@
- all-no:
- 
- $(srcdir)/$(PACKAGE).pot: $(POTFILES)
--	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--	  --add-comments --keyword=_ --keyword=N_ \
--	  --files-from=$(srcdir)/POTFILES.in \
--	&& test ! -f $(PACKAGE).po \
--	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
--		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
-+	$(GENPOT)
- 
- $(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
- $(srcdir)/stamp-cat-id: $(PACKAGE).pot
-@@ -214,18 +211,21 @@
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
--	  mv $$lang.po $$lang.old.po; \
-+	  cp $$lang.po $$lang.old.po; \
- 	  echo "$$lang:"; \
--	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
--	    rm -f $$lang.old.po; \
-+	  if $(MSGMERGE) $$lang; then \
-+	  rm -f $$lang.old.po; \
- 	  else \
- 	    echo "msgmerge for $$cat failed!"; \
--	    rm -f $$lang.po; \
- 	    mv $$lang.old.po $$lang.po; \
- 	  fi; \
- 	done
- 
--POTFILES: POTFILES.in
-+.headerlock:
-+	$(GENHEAD)
-+	touch .headerlock
-+
-+POTFILES: POTFILES.in .headerlock
- 	( if test 'x$(srcdir)' != 'x.'; then \
- 	    posrcprefix='$(top_srcdir)/'; \
- 	  else \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ae613339ca..725dd4be0c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,12 +14,12 @@ addressbook/backend/pas/pas-backend-ldap.c
 addressbook/conduit/address-conduit.c
 addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
 addressbook/gui/component/addressbook-component.c
+addressbook/gui/component/addressbook-config.c
 addressbook/gui/component/addressbook-factory.c
 addressbook/gui/component/addressbook-storage.c
 addressbook/gui/component/addressbook.c
 addressbook/gui/component/e-address-popup.c
 addressbook/gui/component/e-address-widget.c
-addressbook/gui/component/addressbook-config.c
 addressbook/gui/component/ldap-config.glade
 addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
 addressbook/gui/component/select-names/e-select-names-popup.c
@@ -134,6 +134,7 @@ camel/camel-folder.c
 camel/camel-lock-client.c
 camel/camel-lock.c
 camel/camel-movemail.c
+camel/camel-multipart-signed.c
 camel/camel-pgp-context.c
 camel/camel-pgp-mime.c
 camel/camel-provider.c
@@ -161,6 +162,7 @@ camel/providers/imap/camel-imap-folder.c
 camel/providers/imap/camel-imap-message-cache.c
 camel/providers/imap/camel-imap-provider.c
 camel/providers/imap/camel-imap-store.c
+camel/providers/local/camel-local-folder.c
 camel/providers/local/camel-local-provider.c
 camel/providers/local/camel-local-store.c
 camel/providers/local/camel-local-summary.c
@@ -260,7 +262,6 @@ mail/mail-search.c
 mail/mail-send-recv.c
 mail/mail-session.c
 mail/mail-signature-editor.c
-#mail/mail-summary.c
 mail/mail-tools.c
 mail/mail-vfolder.c
 mail/message-browser.c
@@ -286,7 +287,6 @@ my-evolution/e-summary.c
 my-evolution/main.c
 my-evolution/metar.c
 my-evolution/my-evolution.glade
-#notes/GNOME_Evolution_Notes.oaf.in
 shell/GNOME_Evolution_Shell.oaf.in
 shell/e-activity-handler.c
 shell/e-folder-dnd-bridge.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 62720b3be4..f326f706b5 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,10 +1,6 @@
 tests/ui-tests/store_listing.glade
 addressbook/gui/component/select-names/recipient.glade
 addressbook/gui/widgets/test-minicard-view.c
-calendar/gui/alarm-notify.c
-calendar/gui/getdate.c
-camel/providers/local/camel-mbox-provider.c
-cmdline/compose.c
 notes/component-factory.c
 notes/main.c
 tests/ui-tests/message-browser.c
@@ -24,4 +20,3 @@ executive-summary/test-service/rdf-summary.c
 mail/mail-summary.c
 my-evolution/GNOME_Evolution_Summary.oaf.in.in
 notes/GNOME_Evolution_Notes.oaf.in
-wombat/GNOME_Evolution_Wombat.oaf.in
diff --git a/po/update.sh b/po/update.sh
deleted file mode 100755
index f16601f81b..0000000000
--- a/po/update.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-#
-#  Script for translators not being able to run autogen.sh
-#
-#  Copyright (C) 2000 Free Software Foundation.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License as
-#  published by the Free Software Foundation; either version 2 of the
-#  License, or (at your option) any later version.
-#
-#  This script is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this library; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#  Authors: Kenneth Christiansen <kenneth@gnu.org>
-
-PACKAGE=evolution
-
-DEPENDS=$(which xml-i18n-toolize 2> /dev/null)
-
-if [ "$DEPENDS" = "" -o ! -x "$DEPENDS" ] ;
-   then echo "The xml-i18n-tools system is not installed or in path!"
-        echo
-        echo "The module $PACKAGE requires this inplimentation, which"
-        echo "can be found at:"
-        echo
-        echo "  ftp://ftp.gnome.org/pub/GNOME/stable/xml-i18n-tools "
-        echo
-        echo "Please install before trying to update the translations"
-        echo "again..."
-        echo
-        exit
-fi
-
-XMLDIR=$(which xml-i18n-toolize | sed s@/bin/xml-i18n-toolize@@)
-XML_I18N_EXTRACT="$XMLDIR/share/xml-i18n-tools/xml-i18n-extract"
-XML_I18N_UPDATE="$XMLDIR/share/xml-i18n-tools/xml-i18n-update"
-PACKAGE=$PACKAGE XML_I18N_EXTRACT=$XML_I18N_EXTRACT \
-$XML_I18N_UPDATE $1