From 444011c99f83b1b3afde86862e7efe7fc348744d Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Tue, 2 Aug 2011 11:29:12 +0200
Subject: Replace alarm by reminder for UI consistency. Fixes bug #340614

---
 modules/calendar/apps_evolution_calendar.schemas.in | 18 +++++++++---------
 modules/calendar/e-calendar-preferences.c           |  2 +-
 modules/calendar/e-calendar-preferences.ui          |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'modules')

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 @@
       <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>
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 @@
           <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>
-- 
cgit