Evolution string change announcement

[Li Yuan <Li Yuan Sun COM>]

Hi all,

The attach patches have been commit into community trunk and 2-14b.

Thanks,
Li

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.3062
diff -u -r1.3062 ChangeLog
--- ChangeLog	19 Jun 2006 11:25:00 -0000	1.3062
+++ ChangeLog	21 Jun 2006 06:40:23 -0000
@@ -1,3 +1,11 @@
+2006-06-21  Li Yuan	<li yuan sun com>
+
+	* gui/dialogs/event-page.c: (sensitize_widgets):
+	* gui/dialogs/event-page.glade:
+	Add mnemonic widget to widget, and change calendar's shortcut key.
+
+	Fix for #345510.
+
 2006-06-19  Harish Krishnaswamy  <kharish novell com>
 
 	* gui/dialogs/calendar-setup.c: (calendar_setup_edit_calendar):
Index: gui/dialogs/event-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.c,v
retrieving revision 1.115
diff -u -r1.115 event-page.c
--- gui/dialogs/event-page.c	15 Jun 2006 04:56:45 -0000	1.115
+++ gui/dialogs/event-page.c	21 Jun 2006 06:40:24 -0000
@@ -869,7 +869,8 @@
 		gtk_widget_hide (priv->list_box);
 		gtk_widget_hide (priv->attendee_box);
 		gtk_widget_hide (priv->organizer);
-		gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Cale_ndar:"));
+		gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("_Calendar:"));
+		gtk_label_set_mnemonic_widget ((GtkLabel *) priv->org_cal_label, priv->source_selector);
 	} else {
 		gtk_widget_show (priv->calendar_label);
 		gtk_widget_show (priv->list_box);
Index: gui/dialogs/event-page.glade
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.glade,v
retrieving revision 1.38
diff -u -r1.38 event-page.glade
--- gui/dialogs/event-page.glade	4 May 2006 14:35:34 -0000	1.38
+++ gui/dialogs/event-page.glade	21 Jun 2006 06:40:24 -0000
@@ -149,6 +149,7 @@
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
+		  <property name="mnemonic_widget">organizer-entry</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -177,6 +178,7 @@
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
+		  <property name="mnemonic_widget">start-time</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -746,7 +748,7 @@
 		      <child>
 			<widget class="GtkLabel" id="calendar-label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Cale_ndar:</property>
+			  <property name="label" translatable="yes">_Calendar:</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.3062
diff -u -r1.3062 ChangeLog
--- ChangeLog	19 Jun 2006 11:25:00 -0000	1.3062
+++ ChangeLog	26 Jun 2006 06:25:43 -0000
@@ -1,3 +1,10 @@
+2006-06-26  Li Yuan  <li yuan sun com>
+
+	* gui/e-week-view.c: (e_week_view_focus):
+	Fix for 345923.
+	If there is not any event in week view,
+	just grab week view itself.
+
 2006-06-19  Harish Krishnaswamy  <kharish novell com>
 
 	* gui/dialogs/calendar-setup.c: (calendar_setup_edit_calendar):
Index: gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.259
diff -u -r1.259 e-week-view.c
--- gui/e-week-view.c	4 May 2006 15:14:24 -0000	1.259
+++ gui/e-week-view.c	26 Jun 2006 06:25:45 -0000
@@ -1218,6 +1218,12 @@
 		last_focus_span_num = week_view->editing_span_num;
 	}
 
+	/* if there is not event, just grab week_view */
+	if (week_view->events->len == 0) {
+		gtk_widget_grab_focus (widget);
+		return TRUE;
+	}
+
 	for (event_loop = 0; event_loop < week_view->events->len;
 	     ++event_loop) {
 		if (!e_week_view_get_next_tab_event (week_view, direction,