Commit 444011c9 authored by Andre Klapper's avatar Andre Klapper 💬
Browse files

Replace alarm by reminder for UI consistency. Fixes bug #340614

parent e7e0b035
......@@ -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);
......
......@@ -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) {
......
......@@ -86,7 +86,7 @@
<object class="GtkDialog" id="alarm-dialog">
<property name="border_width">6</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Add Alarm</property>
<property name="title" translatable="yes">Add Reminder</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">True</property>
......@@ -147,7 +147,7 @@
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">Alarm</property>
<property name="label" translatable="yes">Reminder</property>
<property name="use_underline">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
......@@ -366,7 +366,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="label" translatable="yes">_Repeat the alarm</property>
<property name="label" translatable="yes">_Repeat the reminder</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
......@@ -406,7 +406,7 @@
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes" comments="This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.">extra times every</property>
<property name="label" translatable="yes" comments="This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.">extra times every</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
......@@ -676,7 +676,7 @@
<object class="GtkCheckButton" id="aalarm-sound">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Custom alarm sound</property>
<property name="label" translatable="yes">Custom reminder sound</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
......
......@@ -2,7 +2,7 @@
<!--*- mode: xml -*-->
<interface>
<object class="GtkDialog" id="alarm-list-dialog">
<property name="title" translatable="yes">Alarms</property>
<property name="title" translatable="yes">Reminders</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="modal">True</property>
......
......@@ -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);
}
......
......@@ -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 (
......
......@@ -41,13 +41,13 @@
</columns>
<data>
<row>
<col id="0" translatable="yes" context="eventpage" comments="TRANSLATORS: Predefined alarm's description">15 minutes before appointment</col>
<col id="0" translatable="yes" context="eventpage" comments="TRANSLATORS: Predefined reminder's description">15 minutes before appointment</col>
</row>
<row>
<col id="0" translatable="yes" context="eventpage" comments="TRANSLATORS: Predefined alarm's description">1 hour before appointment</col>
<col id="0" translatable="yes" context="eventpage" comments="TRANSLATORS: Predefined reminder's description">1 hour before appointment</col>
</row>
<row>
<col id="0" translatable="yes" context="eventpage" comments="TRANSLATORS: Predefined alarm's description">1 day before appointment</col>
<col id="0" translatable="yes" context="eventpage" comments="TRANSLATORS: Predefined reminder's description">1 day before appointment</col>
</row>
</data>
</object>
......@@ -967,7 +967,7 @@
</object>
<object class="GtkDialog" id="alarm-dialog">
<property name="border_width">4</property>
<property name="title" translatable="yes">Alarms</property>
<property name="title" translatable="yes">Reminders</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="modal">False</property>
......@@ -1027,7 +1027,7 @@
<child>
<object class="GtkLabel" id="label79">
<property name="visible">True</property>
<property name="label" translatable="yes">_Alarm</property>
<property name="label" translatable="yes">_Reminder</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -1089,7 +1089,7 @@
<child>
<object class="GtkLabel" id="label80">
<property name="visible">True</property>
<property name="label" translatable="yes">Custom Alarm:</property>
<property name="label" translatable="yes">Custom Reminder:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......
......@@ -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"));
......
......@@ -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.");
......
......@@ -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;
}
......
......@@ -726,8 +726,8 @@
<type>int</type>
<default>-1</default>
<locale name="C">
<short>Last alarm time</short>
<long>Time the last alarm ran, in time_t.</long>
<short>Last reminder time</short>
<long>Time the last reminder ran, in time_t.</long>
</locale>
</schema>
......@@ -739,7 +739,7 @@
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>Calendars to run alarms for</short>
<short>Calendars to run reminders for</short>
</locale>
</schema>
......@@ -751,8 +751,8 @@
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>Alarm programs</short>
<long>Programs that are allowed to be run by alarms.</long>
<short>Reminder programs</short>
<long>Programs that are allowed to be run by reminders.</long>
</locale>
</schema>
......@@ -763,8 +763,8 @@
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Show display alarms in notification tray</short>
<long>Whether or not to use the notification tray for display alarms.</long>
<short>Show display reminders in notification tray</short>
<long>Whether or not to use the notification tray for display reminders.</long>
</locale>
</schema>
......@@ -798,9 +798,9 @@
<owner>evolution-calendar</owner>
<type>string</type>
<locale name="C">
<short>Save directory for alarm audio</short>
<short>Save directory for reminder audio</short>
<long>
Directory for saving alarm audio files
Directory for saving reminder audio files
</long>
</locale>
</schema>
......
......@@ -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);
......
......@@ -1158,7 +1158,7 @@
<object class="GtkLabel" id="label67">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Alarms</property>
<property name="label" translatable="yes">Reminders</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
......@@ -1181,7 +1181,7 @@
<property name="spacing">4</property>
<child>
<object class="GtkCheckButton" id="notify_with_tray">
<property name="label" translatable="yes">Display alarms in _notification area only</property>
<property name="label" translatable="yes">Display reminders in _notification area only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
......@@ -1341,7 +1341,7 @@
<object class="GtkLabel" id="label62">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Select the calendars for alarm notification</property>
<property name="label" translatable="yes">Select the calendars for reminder notification</property>
</object>
<packing>
<property name="expand">False</property>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment