Marked strings for translation in this newly created file. Hook up the

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

	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in:
	Marked strings for translation in this newly created file.
	* gui/component/select-names/Makefile.am: Hook up the .oaf.in files in the
	xml-i18n-tools framework.
	* gui/component/Makefile.am: Same as above.
	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Marked stuff for translation here
	too.

svn path=/trunk/; revision=8183

6 files changed, 24 insertions, 13 deletions

diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
index 01474ce90a..2a523c9dc1 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
@@ -9,7 +9,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook Minicard control"/>
+                       _value="Factory for the Addressbook Minicard control"/>
 
 </oaf_server>
 
@@ -28,9 +28,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
-		       value="Evolution Addressbook minicard viewer"/>
+		       _value="Evolution Addressbook minicard viewer"/>
 	<oaf_attribute name="description" type="string"
-	               value="Control that displays an Evolution addressbook minicard."/>
+	               _value="Control that displays an Evolution addressbook minicard."/>
 
 </oaf_server>
 
@@ -43,7 +43,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Addressbook control"/>
+                       _value="Factory for the sample Addressbook control"/>
 
 </oaf_server>
 
@@ -57,7 +57,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="A sample Bonobo control which displays an addressbook."/>
+                       _value="A sample Bonobo control which displays an addressbook."/>
 
 </oaf_server>
 
@@ -70,7 +70,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook component."/>
+	               _value="Factory for the Evolution addressbook component."/>
 
 </oaf_server>
 
@@ -83,7 +83,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling contacts."/>
+	               _value="Evolution component for handling contacts."/>
 
 	<oaf_attribute name="evolution:shell-component-icon" type="string"
 		       value="evolution-contacts.png"/>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index dee94188db..eaefdbab96 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -57,15 +57,20 @@ evolution_addressbook_LDADD =						\
 
 evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
 
+@XML_I18N_MERGE_OAF_RULE@
+
 oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_Evolution_Addressbook.oafinfo
+oaf_in_files = GNOME_Evolution_Addressbook.oaf.in
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
 
 gladedir   = $(datadir)/evolution/glade
 glade_DATA = addressbook-config.glade
 
 EXTRA_DIST = 			\
 	$(glade_DATA)		\
-	$(oaf_DATA)
+	$(oaf_DATA)		\
+	addressbook-config.glade\
+	$(oaf_in_files)
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
index e3719967b0..7f26e2aaed 100644
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
+++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
@@ -9,7 +9,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook's name selection interface"/>
+                       _value="Factory for the Addressbook's name selection interface"/>
 
 </oaf_server>
 
@@ -22,7 +22,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="Evolution's addressbook name selection interface."/>
+                       _value="Evolution's addressbook name selection interface."/>
 
 </oaf_server>
 
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index e1c8795707..0bbff76a71 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -16,9 +16,12 @@ $(IDL_GENERATED): $(IDLS)
 		$(srcdir)/Evolution-Addressbook-SelectNames.idl
 
 oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_Evolution_Addressbook_SelectNames.oafinfo
 
-#
+oaf_in_files = GNOME_Evolution_Addressbook_SelectNames.oaf.in
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+@XML_I18N_MERGE_OAF_RULE@
+
 
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
@@ -66,6 +69,7 @@ glade_DATA = select-names.glade
 
 EXTRA_DIST = 			\
 	$(glade_DATA)		\
+	$(oaf_in_files)		\
 	$(oaf_DATA)		\
 	$(IDLS)
 
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
index 7209c5e8f8..5a88c31ffa 100644
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ b/addressbook/gui/contact-editor/e-contact-save-as.c
@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <e-contact-save-as.h>
 #include <gal/util/e-util.h>
 #include <unistd.h>
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index f6c0a3eedc..946be317e4 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -596,6 +596,7 @@ static char *list [] = {
 	N_("Spouse"),
 	N_("Note"),
 	N_("Free-busy URL"),
+	N_("Click here to add a contact")
 };
 #endif