Clean up server names

	* gui/GNOME_Evolution_Calendar.server.in.in: Clean up server names

	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
	Likewise

	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
	Likewise. Also mark the evolution:menu_name for i18n

svn path=/trunk/; revision=20705

4 files changed, 38 insertions, 25 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c4396844ff..7705581589 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-07  Dan Winship  <danw@ximian.com>
+
+	* gui/GNOME_Evolution_Calendar.server.in.in: Clean up server names
+
+	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in: 
+	Likewise
+
+	* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
+	Likewise. Also mark the evolution:menu_name for i18n
+
 2003-04-07  Hans Petter Jansson  <hpj@ximian.com>
 
 	* gui/e-meeting-attendee.[ch]: GObjectify. Eliminates ref/sink
diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
index 8f0ed87967..801cada120 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.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 Evolution Calendar objects"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar and Tasks"/>
 
 </oaf_server>
 
@@ -28,7 +28,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
-		       _value="Evolution calendar iTip/iMip viewer"/>
+		       _value="Evolution Calendar scheduling message viewer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
@@ -39,8 +39,8 @@
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling the calendar."/>
+	<oaf_attribute name="name" type="string"
+	               _value="Evolution Calendar and Tasks component"/>
 
 	<oaf_attribute name="evolution:shell_component_icon" type="string"
 		       value="evolution-calendar.png"/>
@@ -62,8 +62,8 @@
 		<item value="text/calendar"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-	               _value="A sample Bonobo control which displays an calendar."/>
+	<oaf_attribute name="name" type="string"
+	               _value="Evolution Calendar viewer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"
@@ -80,8 +80,8 @@
 		<item value="text/calendar"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-	               _value="A Bonobo control which displays a task list."/>
+	<oaf_attribute name="name" type="string"
+	               _value="Evolution Tasks viewer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
@@ -93,8 +93,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to centralize calendar component editor dialogs"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar/Task editor"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"
@@ -121,8 +121,8 @@
 
 	<oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/>
     
-	<oaf_attribute name="description" type="string"
-		       _value="Configuration control for the Evolution Calendar."/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Calendar configuration control"/>
 
 </oaf_server>
 
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
index c6cba0a7f9..4b34fbdc7b 100644
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
+++ b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.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 alarm notification service"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar alarm notification service"/>
 
 </oaf_server>
 
@@ -17,8 +17,8 @@
             type="factory"
             location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory">
 
-	<oaf_attribute name="description" type="string"
-                       _value="Alarm notification service"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar alarm notification service"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
index b4ed0d9541..d99aba4647 100644
--- a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
+++ b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
@@ -7,8 +7,8 @@
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to import iCalendar files into Evolution"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution iCalendar importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"
@@ -19,9 +19,9 @@
 		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
 	</oaf_attribute>
 	<oaf_attribute name="evolution:menu_name" type="string"
-                       value="iCalendar files (.ics)"/>
-        <oaf_attribute name="description" type="string"
-                       _value="Imports iCalendar files into Evolution"/>
+                       _value="iCalendar files (.ics)"/>
+        <oaf_attribute name="name" type="string"
+                       _value="Evolution iCalendar importer"/>
 
 </oaf_server>
 
@@ -33,9 +33,9 @@
 		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
 	</oaf_attribute>
 	<oaf_attribute name="evolution:menu_name" type="string"
-                       value="vCalendar files (.vcf)"/>
-        <oaf_attribute name="description" type="string"
-                       _value="Imports vCalendar files into Evolution"/>
+                       _value="vCalendar files (.vcf)"/>
+        <oaf_attribute name="name" type="string"
+                       _value="Evolution vCalendar importer"/>
 
 </oaf_server>
 
@@ -47,5 +47,8 @@
 		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
 	</oaf_attribute>
 
+        <oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar intelligent importer"/>
+
 </oaf_server>
 </oaf_info>