Clean up server names.

	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Clean up
	server names.

	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
	Likewise

	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
	Likewise. Also mark the evolution:menu_name for i18n.

	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
	Likewise

svn path=/trunk/; revision=20704

5 files changed, 41 insertions, 29 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 45b83071bc..0897a53544 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-07  Dan Winship  <danw@ximian.com>
+
+	* gui/component/GNOME_Evolution_Addressbook.server.in.in: Clean up
+	server names.
+
+	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in: 
+	Likewise
+
+	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in:
+	Likewise. Also mark the evolution:menu_name for i18n.
+
+	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in:
+	Likewise
+
 2003-04-03  Chris Toshok  <toshok@ximian.com>
 
 	* gui/widgets/e-minicard-label.c (e_minicard_label_event): set
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
index ff9b285946..392220d119 100644
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
+++ b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
@@ -8,8 +8,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import LDIF files into Evolution."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution LDIF importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer"
@@ -21,9 +21,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
-		       value="LDAP Data Interchange Format (.ldif)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports LDIF files into Evolution."/>
+		       _value="LDAP Data Interchange Format (.ldif)"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution LDIF importer"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
index 277cf01c76..b630d31bec 100644
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
+++ b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
@@ -8,8 +8,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import VCard files into Evolution."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution VCard importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer"
@@ -21,9 +21,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
-		       value="VCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports VCard files into Evolution."/>
+		       _value="VCard (.vcf, .gcrd)"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution VCard Importer"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
index 384f89b40d..6d46c5fbbe 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
@@ -8,8 +8,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the controls exported by the Evolution Addressbook"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook"/>
 
 </oaf_server>
 
@@ -28,9 +28,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook minicard viewer"/>
-	<oaf_attribute name="description" type="string"
-	               _value="Control that displays an Evolution addressbook minicard."/>
+		       _value="Evolution Addressbook card viewer"/>
 
 </oaf_server>
 
@@ -43,8 +41,8 @@
 		<item value="IDL:GNOME/Control:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="A sample Bonobo control which displays an addressbook."/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook folder viewer"/>
 
 </oaf_server>
 
@@ -56,8 +54,8 @@
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling contacts."/>
+	<oaf_attribute name="name" type="string"
+	               _value="Evolution Addressbook component"/>
 
 	<oaf_attribute name="evolution:shell_component_icon" type="string"
 		       value="evolution-contacts.png"/>
@@ -75,8 +73,8 @@
 		<item value="IDL:GNOME/Control:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="A Bonobo control for displaying an address."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Addressbook address viewer"/>
 
 </oaf_server>
 
@@ -89,8 +87,8 @@
 		<item value="IDL:GNOME/Control:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="A Bonobo control for an address popup."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Addressbook address pop-up"/>
 
 </oaf_server>
 
@@ -117,8 +115,8 @@
 
 	<oaf_attribute name="evolution:config_item:priority" type="string" value="-6"/>
     
-	<oaf_attribute name="description" type="string"
-		       _value="Configuration control for the Evolution Addressbook Storages."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Addressbook LDAP Configuration Control"/>
 
 </oaf_server>
 
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
index 053d2dcddb..6e4d156051 100644
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
+++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
@@ -9,8 +9,8 @@
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Addressbook's name selection interface"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook name selection interface"/>
 
 </oaf_server>
 -->
@@ -23,8 +23,8 @@
 		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Evolution's addressbook name selection interface."/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook name selection interface"/>
 
 </oaf_server>