xml-i18n-tools setup for .oaf.in files. Mark strings for translation.

2001-02-13  Kjartan Maraas  <kmaraas@gnome.org>

	* Makefile.am: xml-i18n-tools setup for .oaf.in files.
	* GNOME_Evolution_Summary.oaf.in: Mark strings for translation.
	* test-service/Makefile.am: xml-i18n-tools setup for .oaf.in files.
	* test-service/*.oaf.in: Mark strings for translation.

svn path=/trunk/; revision=8191

6 files changed, 27 insertions, 14 deletions

diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index 2058117e84..65142aff28 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-13  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* Makefile.am: xml-i18n-tools setup for .oaf.in files.
+	* GNOME_Evolution_Summary.oaf.in: Mark strings for translation.
+	* test-service/Makefile.am: xml-i18n-tools setup for .oaf.in files.
+	* test-service/*.oaf.in: Mark strings for translation.
+	
 2001-01-23  Iain Holmes  <iain@ximian.com>
 
 	* component/e-summary.c (e_summary_load_page): Don't strdup the NULL.
diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in
index c5119bccd1..eeffbe28c0 100644
--- a/executive-summary/GNOME_Evolution_Summary.oaf.in
+++ b/executive-summary/GNOME_Evolution_Summary.oaf.in
@@ -8,7 +8,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string" 
-		value="Factory for the Evolution executive summary component."/>
+		_value="Factory for the Evolution executive summary component."/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"
@@ -20,7 +20,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-		value="Evolution component for the executive summary."/>
+		_value="Evolution component for the executive summary."/>
 
 	<oaf_attribute name="evolution:shell-component-icon" type="string"
 		       value="evolution-today.png"/>
diff --git a/executive-summary/Makefile.am b/executive-summary/Makefile.am
index cd37422535..6d9aa83a17 100644
--- a/executive-summary/Makefile.am
+++ b/executive-summary/Makefile.am
@@ -1,9 +1,12 @@
 SUBDIRS = idl evolution-services component test-service
 
 oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_Evolution_Summary.oafinfo
+oaf_in_files = GNOME_Evolution_Summary.oaf.in
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+@XML_I18N_MERGE_OAF_RULE@
 
 htmldir = $(datadir)/evolution
 html_DATA = summary.html
 
-EXTRA_DIST = $(oaf_DATA) $(html_DATA)
+EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(html_DATA)
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in
index 4cb096b3ae..decd499293 100644
--- a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in
+++ b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in
@@ -9,7 +9,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-			value="Factory for the RDF summary."/>
+			_value="Factory for the RDF summary."/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponent"
@@ -21,7 +21,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-			value="RDF Summary"/>
+			_value="RDF Summary"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
index 098da5e393..b0c9e8f0d6 100644
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
+++ b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
@@ -9,7 +9,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-			value="Factory for the test component."/>
+			_value="Factory for the test component."/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_Component"
@@ -21,7 +21,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-			value="Test service"/>
+			_value="Test service"/>
 </oaf_server>
 
 <!-- This does not work
@@ -34,7 +34,7 @@
         </oaf_attribute>
 
         <oaf_attribute name="description" type="string"
-                        value="Factory for the test bonobo component."/>
+                        _value="Factory for the test bonobo component."/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:evolution-summary-component:test-bonobo-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
@@ -46,7 +46,7 @@
         </oaf_attribute>
 
         <oaf_attribute name="description" type="string"
-                        value="Test bonobo service"/>
+                        _value="Test bonobo service"/>
 </oaf_server>
 
 -->
diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am
index 51f41c899b..c31e95035a 100644
--- a/executive-summary/test-service/Makefile.am
+++ b/executive-summary/test-service/Makefile.am
@@ -33,8 +33,11 @@ rdf_summary_LDADD =			\
 	$(EXTRA_GNOME_LIBS)
 
 oafdir = $(datadir)/oaf
-oaf_DATA = \
-	GNOME_Evolution_Summary_test.oafinfo \
-	GNOME_Evolution_Summary_rdf.oafinfo
+oaf_in_files = \
+	GNOME_Evolution_Summary_test.oaf.in \
+	GNOME_Evolution_Summary_rdf.oaf.in
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
 
-EXTRA_DIST = $(oaf_DATA) 
+@XML_I18N_MERGE_OAF_RULE@
+
+EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)