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

10 files changed, 24 insertions, 24 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 @@
   <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>
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 @@
 <!--*- 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>
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 @@
     </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>
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;
 	}