Hook up the xml-i18n-tools + .oaf.in stuff. Marked strings for

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

	* gui/Makefile.am: Hook up the xml-i18n-tools + .oaf.in stuff.
	* gui/GNOME_Evolution_Calendar*.oaf.in: Marked strings for translation.

svn path=/trunk/; revision=8185

5 files changed, 25 insertions, 13 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index aca8f9f9bd..3ca253d5f0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gui/Makefile.am: Hook up the xml-i18n-tools + .oaf.in stuff.
+	* gui/GNOME_Evolution_Calendar*.oaf.in: Marked strings for translation.
+	
 2001-02-11  Rodrigo Moya <rodrigo@ximian.com>
 
 	* pcs/cal-backend-db.[ch]: added the new DB3-based backend. This is just
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
index 75aa4a6b0f..e96e4b7c8a 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
@@ -9,7 +9,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
+                       _value="Factory for the calendar iTip view control"/>
 
 </oaf_server>
 
@@ -28,9 +28,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
+		       _value="Evolution calendar iTip/iMip viewer"/>
 	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
+                       _value="Factory for the calendar iTip view control"/>
 
 </oaf_server>
 
@@ -43,7 +43,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
+	               _value="Factory for the Evolution calendar component."/>
 
 </oaf_server>
 
@@ -56,7 +56,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
+	               _value="Evolution component for handling the calendar."/>
 
 	<oaf_attribute name="evolution:shell-component-icon" type="string"
 		       value="evolution-calendar.png"/>
@@ -71,7 +71,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
+			_value="Factory for the Calendar Summary component."/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Summary_Component"
@@ -83,7 +83,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
+		       _value="Evolution calendar executive summary component."/>
 </oaf_server>
 
 </oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
index 48cbfa7cbb..d241806784 100644
--- a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
@@ -9,7 +9,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Calendar control"/>
+                       _value="Factory for the sample Calendar control"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"
@@ -22,7 +22,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-	               value="A sample Bonobo control which displays an calendar."/>
+	               _value="A sample Bonobo control which displays an calendar."/>
 </oaf_server>
 
 </oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
index c4b91b9dd8..3719ba618b 100644
--- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
@@ -9,7 +9,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="Calendar Repository"/>
+                       _value="Calendar Repository"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"
@@ -21,7 +21,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="Calendar Server"/>
+                       _value="Calendar Server"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 351194da4f..547134d67e 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -132,7 +132,14 @@ evolution_calendar_LDADD =								\
 #evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
 
 oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_Evolution_Calendar_Control.oafinfo GNOME_Evolution_Calendar.oafinfo 
+oaf_in_files = \
+	GNOME_Evolution_Calendar_Control.oaf.in \
+	GNOME_Evolution_Calendar.oaf.in \
+	GNOME_Evolution_Calendar_gnomecal.oaf.in
+
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+@XML_I18N_MERGE_OAF_RULE@
 
 EXTRA_DIST =	 			\
 	$(glade_DATA)			\
@@ -149,7 +156,7 @@ EXTRA_DIST =	 			\
 	weekview.xpm			\
 	workweekview.xpm		\
 	yearview.xpm			\
-	$(oaf_DATA)
+	$(oaf_in_files) $(oaf_DATA)
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(help_base)/C