This commit was manufactured by cvs2svn to create tagEVOLUTION_1_4_4

'EVOLUTION_1_4_4'.

svn path=/tags/EVOLUTION_1_4_4/; revision=21997

5 files changed, 5 insertions, 103 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 59d92af583..928beda8fd 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,24 +1,8 @@
-2003-07-17  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-tasks.xml: s/Expunge/Purge.
-
-	* evolution-calendar.xml: fixed menmonic for Purge.
-
-2003-07-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-calendar.xml: added 'Purge' menu item.
-
-	* evolution-tasks.xml: added separator after 'Send/Receive'.
-
-2003-07-10  Yuedong Du  <yuedong.du@sun.com>
-
-	* evolution-mail-message.xml: add a menu entry corresponding to new
-	introduced caret mode, see bug #44607
-
 2003-07-09  Anna Marie Dirks  <anna@ximian.com>
 
-	* evolution-mail-list.xml: Change the accelerator for "Mark All Read"
-	to be "R". Fixes bug #45811. 
+	* evolution-mail-list.xml: Changed the accelerator for "Mark All 
+	as Read" to "_r". Fixes the problem of duplicate accelerators in the
+	Edit menu.
 
 2003-07-01  Rodrigo Moya <rodrigo@ximian.com>
 
diff --git a/ui/evolution-addressbook.h b/ui/evolution-addressbook.h
deleted file mode 100644
index 3128ccfb83..0000000000
--- a/ui/evolution-addressbook.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This file is autogenerated from evolution-addressbook.xml, do not edit
- *
- *  This file contains translatable strings generated by
- * bonobo-ui-extract. Add this file to your project's
- * POTFILES.in. DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("_Print Contacts...");
-gchar *s = N_("As _Table");
-gchar *s = N_("_New Contact");
-gchar *s = N_("_Tools");
-gchar *s = N_("_Search for contacts");
-gchar *s = N_("New");
-gchar *s = N_("Create a new contact");
-gchar *s = N_("Find");
-gchar *s = N_("Find a contact");
-gchar *s = N_("Print");
-gchar *s = N_("Print contacts");
-gchar *s = N_("Delete");
-gchar *s = N_("Delete a contact");
-gchar *s = N_("View All");
-gchar *s = N_("View all contacts");
-gchar *s = N_("Stop");
-gchar *s = N_("Stop Loading");
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index fb605baeb3..10e21941dd 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -23,7 +23,6 @@
     <cmd name="DeleteAllOccurrences" _tip="Delete All Occurrences" pixtype="stock" pixname="gtk-delete"/>
 
     <cmd name="PublishFreeBusy" _tip="Publish Free/Busy information for this calendar"/>
-    <cmd name="CalendarPurge" _label="Purg_e" _tip="Purge old appointments and meetings" accel="*Control*e"/>
   </commands>
 
   <menu>
@@ -65,9 +64,7 @@
 
     <submenu name="Actions" _label="_Actions">
       <placeholder name="ComponentActionsPlaceholder">
-        <separator/>
 	<menuitem name="PublishFreeBusy" verb="" _label="_Publish Free/Busy Information"/>
-	<menuitem name="CalendarPurge" verb=""/>
       </placeholder>
     </submenu>
   </menu>
diff --git a/ui/evolution-message-composer.h b/ui/evolution-message-composer.h
deleted file mode 100644
index bcc259c4d5..0000000000
--- a/ui/evolution-message-composer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  This file is autogenerated from evolution-message-composer.xml, do not edit
- *
- *  This file contains translatable strings generated by
- * bonobo-ui-extract. Add this file to your project's
- * POTFILES.in. DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Open");
-gchar *s = N_("Open a file");
-gchar *s = N_("Save");
-gchar *s = N_("Save the current file");
-gchar *s = N_("Save As");
-gchar *s = N_("Save the current file with a different name");
-gchar *s = N_("Close");
-gchar *s = N_("Close the current file");
-gchar *s = N_("Save in folder...");
-gchar *s = N_("Save the message in a specified folder");
-gchar *s = N_("Insert text file...");
-gchar *s = N_("Insert a file as text into the message");
-gchar *s = N_("Send");
-gchar *s = N_("Send the message now");
-gchar *s = N_("Send _later");
-gchar *s = N_("Send the message later");
-gchar *s = N_("Attach");
-gchar *s = N_("Attach a file");
-gchar *s = N_("HTML");
-gchar *s = N_("Send the mail in HTML format");
-gchar *s = N_("Show attachments");
-gchar *s = N_("Show / hide attachments");
-gchar *s = N_("_File");
-gchar *s = N_("_Open...");
-gchar *s = N_("_Save");
-gchar *s = N_("Save _As...");
-gchar *s = N_("Save in _folder... (FIXME)");
-gchar *s = N_("_Insert text file... (FIXME)");
-gchar *s = N_("Send");
-gchar *s = N_("Send _Later");
-gchar *s = N_("_Close");
-gchar *s = N_("_Edit");
-gchar *s = N_("F_ormat");
-gchar *s = N_("_View");
-gchar *s = N_("Show _attachments");
-gchar *s = N_("_Help");
-gchar *s = N_("_About...");
-gchar *s = N_("_Debug");
-gchar *s = N_("Send this message now");
-gchar *s = N_("Bold");
-gchar *s = N_("Sets something as bold");
-
-
-
-
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index 7403d20af3..1fb255a330 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -11,7 +11,7 @@
          pixtype="stock" pixname="gtk-delete"/>
     <cmd name="TasksMarkComplete" _tip="Mark selected tasks as complete" accel="*Control*k" sensitive="0"/>
 
-    <cmd name="TasksPurge" _label="Purg_e" _tip="Delete completed tasks" accel="*Control*e"/>
+    <cmd name="TasksExpunge" _label="_Expunge" _tip="Delete completed tasks" accel="*Control*e"/>
   </commands>
   
   <menu>
@@ -42,8 +42,7 @@
 
     <submenu name="Actions" _label="_Actions">
       <placeholder name="ComponentActionsPlaceholder">
-        <separator/>
-	<menuitem name="TasksPurge" verb=""/>
+	<menuitem name="TasksExpunge" verb=""/>
       </placeholder>
     </submenu>