xml-i18n-toolized Nautilus (plus a bit of other cleanup) as part

	of resolving bug 2693 (I will consider my work done once I have
	also handled Bonobo).

	* autogen.sh, configure.in: xml-i18n-toolize
	* .cvsignore: ignore xml-i18n scripts
	* Makefile.am: distribute xml-i18n-scripts

	* components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in:
	Renamed from components/adapter/nautilus-adapter.oafinfo; mark
	translatable strings transalatable.
	* components/adapter/Makefile.am: Deal w/ oaf file rename, do
	merge.
	* components/adapter/.cvsignore: Ignore .oaf file.

	* components/hardware/.cvsignore, components/hardware/Makefile.am,
	components/hardware/Nautilus_View_hardware.oaf.in,
	components/hardware/nautilus-hardware-view.oafinfo: Ditto.
	* components/history/.cvsignore, components/history/Makefile.am,
	components/history/Nautilus_View_history.oaf.in,
	components/history/nautilus-history-view.oafinfo: Ditto.

	* components/image-viewer/.cvsignore,
	components/image-viewer/Makefile.am,
	components/image-viewer/Nautilus_View_image.oaf.in,
	components/image-viewer/nautilus-image-view.oafinfo: Ditto.

	* components/loser/content/.cvsignore,
	components/loser/content/Makefile.am,
	components/loser/content/Nautilus_View_content-loser.oaf.in,
	components/loser/content/nautilus-content-loser.oafinfo: Ditto.

	* components/loser/sidebar/.cvsignore,
	components/loser/sidebar/Makefile.am,
	components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in,
	components/loser/sidebar/nautilus-sidebar-loser.oafinfo: Ditto.
	* components/mozilla/.cvsignore, components/mozilla/Makefile.am,
	components/mozilla/Nautilus_View_mozilla.oaf.in,
	components/mozilla/nautilus-mozilla-content-view.oafinfo: Ditto.
	* components/music/.cvsignore, components/music/Makefile.am,
	components/music/Nautilus_View_music.oaf.in,
	components/music/nautilus-music-view.oafinfo: Ditto.
	* components/notes/.cvsignore, components/notes/Makefile.am,
	components/notes/Nautilus_View_notes.oaf.in,
	components/notes/nautilus-notes.oafinfo: Ditto.
	* components/rpmview/.cvsignore, components/rpmview/Makefile.am,
	components/rpmview/Nautilus_View_rpm.oaf.in,
	components/rpmview/nautilus-rpm-view.oafinfo: Ditto.
	* components/sample/.cvsignore, components/sample/Makefile.am,
	components/sample/Nautilus_View_sample.oaf.in,
	components/sample/nautilus-sample-content-view.oafinfo: Ditto.
	* components/services/install/nautilus-view/.cvsignore,
	components/services/install/nautilus-view/Makefile.am,
	components/services/install/nautilus-view/Nautilus_View_install.oaf.in,
	components/services/install/nautilus-view/nautilus-service-install-view.oafinfo:
	Ditto.
	* components/services/install/server/.cvsignore,
	components/services/install/server/Makefile.am,
	components/services/install/server/Trilobite_Service_install.oaf.in,
	components/services/install/server/trilobite-eazel-install-service.oafinfo:
	Ditto.
	* components/services/login/nautilus-view/.cvsignore,
	components/services/login/nautilus-view/Makefile.am,
	components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in,
	components/services/login/nautilus-view/nautilus-change-password-view.oafinfo:
	Ditto.
	* components/services/summary/nautilus-view/.cvsignore,
	components/services/summary/nautilus-view/Makefile.am,
	components/services/summary/nautilus-view/Nautilus_View_services-summary.oaf.in,
	components/services/summary/nautilus-view/nautilus-summary-view.oafinfo: Ditto.
	* components/services/trilobite/sample/.cvsignore,
	components/services/trilobite/sample/nautilus-view/Makefile.am,
	components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in,
	components/services/trilobite/sample/nautilus-view/nautilus-sample-service-view.oafinfo:
	Ditto.
	* components/services/trilobite/sample/service/.cvsignore,
	components/services/trilobite/sample/service/Makefile.am,
	components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in,
	components/services/trilobite/sample/service/trilobite-eazel-sample-service.oafinfo:
	Ditto.
	* components/text/.cvsignore, components/text/Makefile.am,
	components/text/Nautilus_View_text.oaf.in,
	components/text/nautilus-text-view.oafinfo: Ditto.
	* src/.cvsignore, src/Makefile.am, src/Nautilus_shell.oaf.in,
	src/nautilus.oafinfo: Ditto.
	* components/tree/.cvsignore, components/tree/Makefile.am,
	components/tree/Nautilus_View_tree.oaf.in,
	components/tree/nautilus-tree-view.oafinfo.shlib: Ditto, and
	removed ability to build tree view as an exe component (no one was
	really using it anyway).
	* components/tree/nautilus-tree-view.oafinfo.exe: Removed.
	* components/help/.cvsignore, components/help/Makefile.am,
	components/help/Nautilus_View_help.oaf.in:
	components/help/help-contents.oafinfo: Ditto, and merged other
	oafinfo files into Nautilus_View_help.oaf.in, commented out.
	* components/help/help-factory.oafinfo,
	components/help/help-index.oafinfo,
	components/help/help-search.oafinfo: Removed.

	* po/POTFILES.in: Added .oaf.in files.
	* po/README.tools, po/ui-extract.pl, po/ui-testcases.glade,
	po/ui-testcases.xml, po/update.pl, po/update.sh: Removed these
	now-obsolete files.

	* components/services/Makefile.am: Removed time service from build.
	* components/html/*, components/websearch/*: cvs deleted these
	obsolete long since non-built components.
	* ChangeLog-200001018: Renamed to ChangeLog-20001018 (whoops)

6 files changed, 77 insertions, 110 deletions

diff --git a/components/text/.cvsignore b/components/text/.cvsignore
index 6f8fdd767..ca907d0e3 100644
--- a/components/text/.cvsignore
+++ b/components/text/.cvsignore
@@ -3,3 +3,4 @@
 Makefile
 Makefile.in
 nautilus-text-view
+Nautilus_View_text.oaf
diff --git a/components/text/Makefile.am b/components/text/Makefile.am
index 8bb38331d..1cca0503e 100644
--- a/components/text/Makefile.am
+++ b/components/text/Makefile.am
@@ -16,13 +16,6 @@ INCLUDES =					\
 	$(BONOBO_CFLAGS)			\
 	$(VFS_CFLAGS)
 
-oafdir = $(datadir)/oaf
-oaf_DATA =					\
-	nautilus-text-view.oafinfo
-
-uidir = $(datadir)/gnome/ui
-ui_DATA = nautilus-text-view-ui.xml
-
 bin_PROGRAMS =					\
 	nautilus-text-view
 
@@ -42,7 +35,17 @@ nautilus_text_view_LDADD =			\
 
 OBJECT_DIRECTORY_LIBS = $(GNOME_LIBS) $(OAF_LIBS)
 
-EXTRA_DIST = 			\
-	$(oaf_DATA)		\
-	$(ui_DATA)		\
+uidir = $(datadir)/gnome/ui
+ui_DATA = nautilus-text-view-ui.xml
+
+oafdir = $(datadir)/oaf
+oaf_in_files =					\
+	Nautilus_View_text.oaf.in		\
 	$(NULL)
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+@XML_I18N_MERGE_OAF_RULE@
+
+EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA) 
+
+
diff --git a/components/text/Nautilus_View_text.oaf.in b/components/text/Nautilus_View_text.oaf.in
index c2b05b0b1..1d056f47b 100644
--- a/components/text/Nautilus_View_text.oaf.in
+++ b/components/text/Nautilus_View_text.oaf.in
@@ -1,30 +1,30 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" type="exe" location="nautilus-text-view">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:GNOME/ObjectFactory:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="Music view factory"/>
-<oaf_attribute name="description" type="string" value="Factory for music view"/>
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Text view factory"/>
+	<oaf_attribute name="description" type="string" _value="Factory for text view"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:Bonobo/Unknown:1.0"/>
-<item value="IDL:Bonobo/Control:1.0"/>
-<item value="IDL:Nautilus/View:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="Text view"/>
-<oaf_attribute name="description" type="string" value="Text view"/>
-<oaf_attribute name="bonobo:editable" type="boolean" value="true"/>
-<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-<item value="text/plain"/>
-<item value="text/*"/>
-</oaf_attribute>
-<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
-<item value="file"/>
-</oaf_attribute>
-<oaf_attribute name="nautilus:view_as_name" type="string" value="Text"/>
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+		<item value="IDL:Bonobo/Control:1.0"/>
+		<item value="IDL:Nautilus/View:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Text view"/>
+	<oaf_attribute name="description" type="string" _value="Text view"/>
+	<oaf_attribute name="bonobo:editable" type="boolean" value="true"/>
+	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+		<item value="text/plain"/>
+		<item value="text/*"/>
+	</oaf_attribute>
+	<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
+		<item value="file"/>
+	</oaf_attribute>
+	<oaf_attribute name="nautilus:view_as_name" type="string" _value="Text"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/components/text/Nautilus_View_text.server.in b/components/text/Nautilus_View_text.server.in
index c2b05b0b1..1d056f47b 100644
--- a/components/text/Nautilus_View_text.server.in
+++ b/components/text/Nautilus_View_text.server.in
@@ -1,30 +1,30 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" type="exe" location="nautilus-text-view">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:GNOME/ObjectFactory:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="Music view factory"/>
-<oaf_attribute name="description" type="string" value="Factory for music view"/>
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Text view factory"/>
+	<oaf_attribute name="description" type="string" _value="Factory for text view"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:Bonobo/Unknown:1.0"/>
-<item value="IDL:Bonobo/Control:1.0"/>
-<item value="IDL:Nautilus/View:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="Text view"/>
-<oaf_attribute name="description" type="string" value="Text view"/>
-<oaf_attribute name="bonobo:editable" type="boolean" value="true"/>
-<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-<item value="text/plain"/>
-<item value="text/*"/>
-</oaf_attribute>
-<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
-<item value="file"/>
-</oaf_attribute>
-<oaf_attribute name="nautilus:view_as_name" type="string" value="Text"/>
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+		<item value="IDL:Bonobo/Control:1.0"/>
+		<item value="IDL:Nautilus/View:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Text view"/>
+	<oaf_attribute name="description" type="string" _value="Text view"/>
+	<oaf_attribute name="bonobo:editable" type="boolean" value="true"/>
+	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+		<item value="text/plain"/>
+		<item value="text/*"/>
+	</oaf_attribute>
+	<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
+		<item value="file"/>
+	</oaf_attribute>
+	<oaf_attribute name="nautilus:view_as_name" type="string" _value="Text"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/components/text/Nautilus_View_text.server.in.in b/components/text/Nautilus_View_text.server.in.in
index c2b05b0b1..1d056f47b 100644
--- a/components/text/Nautilus_View_text.server.in.in
+++ b/components/text/Nautilus_View_text.server.in.in
@@ -1,30 +1,30 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" type="exe" location="nautilus-text-view">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:GNOME/ObjectFactory:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="Music view factory"/>
-<oaf_attribute name="description" type="string" value="Factory for music view"/>
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Text view factory"/>
+	<oaf_attribute name="description" type="string" _value="Factory for text view"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:Bonobo/Unknown:1.0"/>
-<item value="IDL:Bonobo/Control:1.0"/>
-<item value="IDL:Nautilus/View:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="Text view"/>
-<oaf_attribute name="description" type="string" value="Text view"/>
-<oaf_attribute name="bonobo:editable" type="boolean" value="true"/>
-<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-<item value="text/plain"/>
-<item value="text/*"/>
-</oaf_attribute>
-<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
-<item value="file"/>
-</oaf_attribute>
-<oaf_attribute name="nautilus:view_as_name" type="string" value="Text"/>
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+		<item value="IDL:Bonobo/Control:1.0"/>
+		<item value="IDL:Nautilus/View:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Text view"/>
+	<oaf_attribute name="description" type="string" _value="Text view"/>
+	<oaf_attribute name="bonobo:editable" type="boolean" value="true"/>
+	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+		<item value="text/plain"/>
+		<item value="text/*"/>
+	</oaf_attribute>
+	<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
+		<item value="file"/>
+	</oaf_attribute>
+	<oaf_attribute name="nautilus:view_as_name" type="string" _value="Text"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/components/text/nautilus-text-view.oafinfo b/components/text/nautilus-text-view.oafinfo
deleted file mode 100644
index c2b05b0b1..000000000
--- a/components/text/nautilus-text-view.oafinfo
+++ /dev/null
@@ -1,37 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" type="exe" location="nautilus-text-view">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:GNOME/ObjectFactory:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="Music view factory"/>
-<oaf_attribute name="description" type="string" value="Factory for music view"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21">
-<oaf_attribute name="repo_ids" type="stringv">
-<item value="IDL:Bonobo/Unknown:1.0"/>
-<item value="IDL:Bonobo/Control:1.0"/>
-<item value="IDL:Nautilus/View:1.0"/>
-</oaf_attribute>
-<oaf_attribute name="name" type="string" value="Text view"/>
-<oaf_attribute name="description" type="string" value="Text view"/>
-<oaf_attribute name="bonobo:editable" type="boolean" value="true"/>
-<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-<item value="text/plain"/>
-<item value="text/*"/>
-</oaf_attribute>
-<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
-<item value="file"/>
-</oaf_attribute>
-<oaf_attribute name="nautilus:view_as_name" type="string" value="Text"/>
-</oaf_server>
-
-</oaf_info>
-
-
-
-
-
-
-