From 444011c99f83b1b3afde86862e7efe7fc348744d Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Tue, 2 Aug 2011 11:29:12 +0200 Subject: Replace alarm by reminder for UI consistency. Fixes bug #340614 --- calendar/gui/alarm-notify/alarm-queue.c | 2 +- calendar/gui/dialogs/alarm-dialog.c | 2 +- calendar/gui/dialogs/alarm-dialog.ui | 10 +++++----- calendar/gui/dialogs/alarm-list-dialog.ui | 2 +- calendar/gui/dialogs/event-editor.c | 6 +++--- calendar/gui/dialogs/event-page.c | 8 ++++---- calendar/gui/dialogs/event-page.ui | 12 ++++++------ calendar/gui/dialogs/send-comp.c | 2 +- calendar/gui/ea-cal-view-event.c | 2 +- calendar/importers/icalendar-importer.c | 2 +- modules/calendar/apps_evolution_calendar.schemas.in | 18 +++++++++--------- modules/calendar/e-calendar-preferences.c | 2 +- modules/calendar/e-calendar-preferences.ui | 6 +++--- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index fde985f8be..7ba2ff9005 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -1586,7 +1586,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, gchar *tip; tip = g_strdup_printf (ngettext ( - "You have %d alarm", "You have %d alarms", + "You have %d reminder", "You have %d reminders", g_list_length (tray_icons_list)), g_list_length (tray_icons_list)); gtk_status_icon_set_tooltip_text (tray_icon, tip); diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index ec57b11657..ab50520d5c 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -623,7 +623,7 @@ populate_widgets_from_alarm (Dialog *dialog) if (*action == E_CAL_COMPONENT_ALARM_NONE) return; - gtk_window_set_title (GTK_WINDOW (dialog->toplevel),_("Edit Alarm")); + gtk_window_set_title (GTK_WINDOW (dialog->toplevel),_("Edit Reminder")); /* Alarm Types */ switch (trigger->type) { diff --git a/calendar/gui/dialogs/alarm-dialog.ui b/calendar/gui/dialogs/alarm-dialog.ui index 38244ac7ae..d25972f0e0 100644 --- a/calendar/gui/dialogs/alarm-dialog.ui +++ b/calendar/gui/dialogs/alarm-dialog.ui @@ -86,7 +86,7 @@ 6 True - Add Alarm + Add Reminder GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -147,7 +147,7 @@ True - Alarm + Reminder False GTK_JUSTIFY_LEFT False @@ -366,7 +366,7 @@ True True True - _Repeat the alarm + _Repeat the reminder True GTK_RELIEF_NORMAL True @@ -406,7 +406,7 @@ True - extra times every + extra times every False False GTK_JUSTIFY_CENTER @@ -676,7 +676,7 @@ True True - Custom alarm sound + Custom reminder sound True GTK_RELIEF_NORMAL True diff --git a/calendar/gui/dialogs/alarm-list-dialog.ui b/calendar/gui/dialogs/alarm-list-dialog.ui index eb293c8369..70fa138669 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.ui +++ b/calendar/gui/dialogs/alarm-list-dialog.ui @@ -2,7 +2,7 @@ - Alarms + Reminders GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT True diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 4c3169854b..0529e90286 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -209,9 +209,9 @@ static GtkActionEntry editable_entries[] = { { "alarms", "appointment-soon", - N_("_Alarms"), + N_("_Reminders"), NULL, - N_("Set or unset alarms for this event"), + N_("Set or unset reminders for this event"), G_CALLBACK (action_alarms_cb) }, }; @@ -357,7 +357,7 @@ event_editor_constructor (GType type, /* Alarm page */ alarm_page = event_page_get_alarm_page (priv->event_page); - comp_editor_append_widget (editor, alarm_page, _("Alarm"), TRUE); + comp_editor_append_widget (editor, alarm_page, _("Reminder"), TRUE); g_object_unref (alarm_page); } diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 68210d1090..12b59a2c32 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -646,7 +646,7 @@ sensitize_widgets (EventPage *epage) e_dialog_combo_box_get (priv->alarm_time_combo, priv->alarm_map) == ALARM_CUSTOM ? TRUE:FALSE; if (alarm && !priv->alarm_icon) { - priv->alarm_icon = create_alarm_image_button ("stock_bell", _("This event has alarms"), epage); + priv->alarm_icon = create_alarm_image_button ("stock_bell", _("This event has reminders"), epage); gtk_box_pack_start ((GtkBox *) priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6); } @@ -3018,7 +3018,7 @@ alarm_changed_cb (GtkWidget *widget, e_alarm_list_append (priv->alarm_list_store, NULL, ca); } if (!priv->alarm_icon) { - priv->alarm_icon = create_alarm_image_button ("stock_bell", _("This event has alarms"), epage); + priv->alarm_icon = create_alarm_image_button ("stock_bell", _("This event has reminders"), epage); gtk_box_pack_start ((GtkBox *) priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6); } } else { @@ -3283,8 +3283,8 @@ init_widgets (EventPage *epage) gtk_list_store_insert (store, &iter, 0); gtk_list_store_set (store, &iter, - /* Translators: "None" for "No alarm set" */ - 0, C_("cal-alarms", "None"), + /* Translators: "None" for "No reminder set" */ + 0, C_("cal-reminders", "None"), -1); g_signal_connect_swapped ( diff --git a/calendar/gui/dialogs/event-page.ui b/calendar/gui/dialogs/event-page.ui index 019c2b46b6..9377c836b8 100644 --- a/calendar/gui/dialogs/event-page.ui +++ b/calendar/gui/dialogs/event-page.ui @@ -41,13 +41,13 @@ - 15 minutes before appointment + 15 minutes before appointment - 1 hour before appointment + 1 hour before appointment - 1 day before appointment + 1 day before appointment @@ -967,7 +967,7 @@ 4 - Alarms + Reminders GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT False @@ -1027,7 +1027,7 @@ True - _Alarm + _Reminder True False GTK_JUSTIFY_LEFT @@ -1089,7 +1089,7 @@ True - Custom Alarm: + Custom Reminder: False False GTK_JUSTIFY_LEFT diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index d67d9fb626..bf016403ec 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -189,7 +189,7 @@ send_component_dialog (GtkWindow *parent, ECalClient *client, ECalComponent *com content_area = e_alert_dialog_get_content_area (E_ALERT_DIALOG (dialog)); if (strip_alarms) - sa_checkbox = add_checkbox (GTK_BOX (content_area), _("Send my alarms with this event")); + sa_checkbox = add_checkbox (GTK_BOX (content_area), _("Send my reminders with this event")); if (only_new_attendees) ona_checkbox = add_checkbox (GTK_BOX (content_area), _("Notify new attendees _only")); diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c index 55457bf4dc..f3716d7623 100644 --- a/calendar/gui/ea-cal-view-event.c +++ b/calendar/gui/ea-cal-view-event.c @@ -287,7 +287,7 @@ ea_cal_view_event_get_name (AtkObject *accessible) alarm_string = recur_string = meeting_string = ""; if (event && event->comp_data) { if (e_cal_util_component_has_alarms (event->comp_data->icalcomp)) - alarm_string = _("It has alarms."); + alarm_string = _("It has reminders."); if (e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) recur_string = _("It has recurrences."); diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 01b5d8349c..6f3b2d9a98 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -1095,7 +1095,7 @@ preview_comp (EWebViewPreview *preview, ECalComponent *comp) } if (e_cal_component_has_alarms (comp)) { - e_web_view_preview_add_section (preview, have ? NULL : str, C_("iCalImp", "has alarms")); + e_web_view_preview_add_section (preview, have ? NULL : str, C_("iCalImp", "has reminders")); have = TRUE; } diff --git a/modules/calendar/apps_evolution_calendar.schemas.in b/modules/calendar/apps_evolution_calendar.schemas.in index 5f946d12ef..7df4f95271 100644 --- a/modules/calendar/apps_evolution_calendar.schemas.in +++ b/modules/calendar/apps_evolution_calendar.schemas.in @@ -726,8 +726,8 @@ int -1 - Last alarm time - Time the last alarm ran, in time_t. + Last reminder time + Time the last reminder ran, in time_t. @@ -739,7 +739,7 @@ string [] - Calendars to run alarms for + Calendars to run reminders for @@ -751,8 +751,8 @@ string [] - Alarm programs - Programs that are allowed to be run by alarms. + Reminder programs + Programs that are allowed to be run by reminders. @@ -763,8 +763,8 @@ bool false - Show display alarms in notification tray - Whether or not to use the notification tray for display alarms. + Show display reminders in notification tray + Whether or not to use the notification tray for display reminders. @@ -798,9 +798,9 @@ evolution-calendar string - Save directory for alarm audio + Save directory for reminder audio - Directory for saving alarm audio files + Directory for saving reminder audio files diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c index 40ba9c7937..ad04d307cf 100644 --- a/modules/calendar/e-calendar-preferences.c +++ b/modules/calendar/e-calendar-preferences.c @@ -438,7 +438,7 @@ show_alarms_config (ECalendarPreferences *prefs) if (e_cal_client_get_sources (&prefs->alarms_list, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, NULL)) { prefs->alarm_list_widget = e_source_selector_new (prefs->alarms_list); - atk_object_set_name (gtk_widget_get_accessible (prefs->alarm_list_widget), _("Selected Calendars for Alarms")); + atk_object_set_name (gtk_widget_get_accessible (prefs->alarm_list_widget), _("Selected Calendars for Reminders")); gtk_container_add (GTK_CONTAINER (prefs->scrolled_window), prefs->alarm_list_widget); gtk_widget_show (prefs->alarm_list_widget); initialize_selection (E_SOURCE_SELECTOR (prefs->alarm_list_widget), prefs->alarms_list); diff --git a/modules/calendar/e-calendar-preferences.ui b/modules/calendar/e-calendar-preferences.ui index c01f568273..96f0d70e43 100644 --- a/modules/calendar/e-calendar-preferences.ui +++ b/modules/calendar/e-calendar-preferences.ui @@ -1158,7 +1158,7 @@ True 0 - Alarms + Reminders @@ -1181,7 +1181,7 @@ 4 - Display alarms in _notification area only + Display reminders in _notification area only True True False @@ -1341,7 +1341,7 @@ True 0 - Select the calendars for alarm notification + Select the calendars for reminder notification False -- cgit v1.2.3