2001-07-09  Federico Mena Quintero  <federico@ximian.com>

	* pcs/cal-backend-file.c (generate_alarms_for_comp): Pass the
	parent vCalendar component as the timezone closure of
	cal_recur_generate_instances().

	* gui/dialogs/alarm-page.c (get_alarm_string): Make the string
	consistent with the option menu text.
	(get_alarm_string): Removed extra spaces from the last part of the
	alarm string.

svn path=/trunk/; revision=10961