Fix bug 475376 - Unify wording: "reminder" instead of "alarm". r=mmecca
authorPhilipp Kewisch <mozilla@kewis.ch>
Sun, 17 Jul 2011 00:02:00 +0200
changeset 7665 a05d26a057074d1f4e115f350bc226f23f35a0e9
parent 7664 bc022ab9c4b04a81456bebacbf16d8d290e63409
child 7666 817de52f138d50879e5899d195875650c078ceb2
push idunknown
push userunknown
push dateunknown
reviewersmmecca
bugs475376
Fix bug 475376 - Unify wording: "reminder" instead of "alarm". r=mmecca X-Channel-Repo: comm-central X-Channel-Converted-Revision: edfbcb8dc14edee3c94b4e3de967d86d3cd2e118
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/preferences/alarms.dtd
calendar/chrome/calendar/preferences/preferences.dtd
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -282,17 +282,17 @@
 
 <!-- Calendar Alarm Dialog -->
 
 <!ENTITY calendar.alarm.location.label              "Location:" >
 <!ENTITY calendar.alarm.details.label               "Details…" >
 
 <!ENTITY calendar.alarm.snoozefor.label             "Snooze for" >
 <!ENTITY calendar.alarm.snoozeallfor.label          "Snooze All for" >
-<!ENTITY calendar.alarm.title.label                 "Calendar Alarm" >
+<!ENTITY calendar.alarm.title.label                 "Calendar Reminders" >
 <!ENTITY calendar.alarm.dismiss.label               "Dismiss" >
 <!ENTITY calendar.alarm.dismissall.label            "Dismiss All" >
 
 <!ENTITY calendar.alarm.snooze.5minutes.label       "5 Minutes" >
 <!ENTITY calendar.alarm.snooze.10minutes.label      "10 Minutes" >
 <!ENTITY calendar.alarm.snooze.15minutes.label      "15 Minutes" >
 <!ENTITY calendar.alarm.snooze.30minutes.label      "30 Minutes" >
 <!ENTITY calendar.alarm.snooze.45minutes.label      "45 Minutes" >
@@ -316,17 +316,17 @@
 <!ENTITY calendarproperties.caldav.label                   "CalDAV">
 <!ENTITY calendarproperties.wcap.label                     "Sun Java System Calendar Server (WCAP)">
 <!ENTITY calendarproperties.format.label                   "Format:">
 <!ENTITY calendarproperties.location.label                 "Location:">
 <!ENTITY calendarproperties.refreshInterval.label          "Refresh Calendar:">
 <!ENTITY calendarproperties.refreshInterval.manual.label   "Manually">
 <!ENTITY calendarproperties.name.label                     "Name:">
 <!ENTITY calendarproperties.readonly.label                 "Read Only">
-<!ENTITY calendarproperties.firealarms.label               "Show Alarms">
+<!ENTITY calendarproperties.firealarms.label               "Show Reminders">
 <!ENTITY calendarproperties.cache.label                    "Cache (EXPERIMENTAL)">
 <!ENTITY calendarproperties.enabled.label                  "Switch this calendar on">
 <!ENTITY calendarproperties.forceDisabled.label            "The provider for this calendar could not be found. This often happens if you have disabled or uninstalled certain addons.">
 <!ENTITY calendarproperties.unsubscribe.label              "Unsubscribe">
 <!ENTITY calendarproperties.unsubscribe.accesskey          "U">
 
 <!-- Calendar Publish Dialog -->
 <!ENTITY calendar.publish.dialog.title              "Publish Calendar">
--- a/calendar/chrome/calendar/preferences/alarms.dtd
+++ b/calendar/chrome/calendar/preferences/alarms.dtd
@@ -15,16 +15,17 @@
    -
    - The Initial Developer of the Original Code is
    - Matthew Willis
    - Portions created by the Initial Developer are Copyright (C) 2006
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s): 
    -   Cédric Corazza <cedric.corazza@wanadoo.fr>
+   -   Philipp Kewisch <mozilla@kewis.ch>
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
    - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    - in which case the provisions of the GPL or the LGPL are applicable instead
    - of those above. If you wish to allow use of your version of this file only
    - under the terms of either the GPL or the LGPL, and not to allow others to
    - use your version of this file under the terms of the MPL, indicate your
@@ -35,34 +36,34 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 
-<!ENTITY pref.alarmgoesoff.label "When an alarm goes off:">
+<!ENTITY pref.alarmgoesoff.label "When a Reminder is Due:">
 <!ENTITY pref.playasound "Play a sound">
 <!ENTITY pref.calendar.alarms.playsound.accessKey "s">
 <!ENTITY pref.calendar.alarms.sound.useDefault.label "Use default sound">
 <!ENTITY pref.calendar.alarms.sound.useDefault.accessKey "d">
 <!ENTITY pref.calendar.alarms.sound.browse.label "Browse…">
 <!ENTITY pref.calendar.alarms.sound.browse.accessKey "B">
 <!ENTITY pref.calendar.alarms.sound.preview.label "Preview">
 <!ENTITY pref.calendar.alarms.sound.preview.accessKey "P">
-<!ENTITY pref.showalarmbox "Show an alarm box">
+<!ENTITY pref.showalarmbox "Show the reminder dialog">
 <!ENTITY pref.calendar.alarms.showAlarmBox.accessKey "x">
-<!ENTITY pref.missedalarms "Show missed alarms">
+<!ENTITY pref.missedalarms "Show missed reminders">
 <!ENTITY pref.calendar.alarms.missedAlarms.accessKey "m">
-<!ENTITY pref.calendar.alarms.defaults.label "Alarm Defaults">
-<!ENTITY pref.defalarm4events.label "Default alarm setting for events:">
+<!ENTITY pref.calendar.alarms.defaults.label "Reminder Defaults">
+<!ENTITY pref.defalarm4events.label "Default reminder setting for events:">
 <!ENTITY pref.defalarm4events.accesskey "e">
-<!ENTITY pref.defalarm4todos.label "Default alarm setting for tasks:">
+<!ENTITY pref.defalarm4todos.label "Default reminder setting for tasks:">
 <!ENTITY pref.defalarm4todos.accesskey "a">
 <!ENTITY pref.alarm.on "On">
 <!ENTITY pref.alarm.off "Off">
-<!ENTITY pref.defalarmlen4events.label "Default time an alarm goes off before an event:">
+<!ENTITY pref.defalarmlen4events.label "Default time a reminder is set before an event:">
 <!ENTITY pref.defalarmlen4events.accesskey "u">
-<!ENTITY pref.defalarmlen4todos.label "Default time an alarm goes off before a task:">
+<!ENTITY pref.defalarmlen4todos.label "Default time a reminder is set before a task:">
 <!ENTITY pref.defalarmlen4todos.accesskey "o">
-<!ENTITY pref.defaultemail.label "Default address to send alarms to:">
-<!ENTITY pref.defaulttext.label "Default text for alarms:">
+<!ENTITY pref.defaultemail.label "Default address to send reminders to:">
+<!ENTITY pref.defaulttext.label "Default text for reminders :">
--- a/calendar/chrome/calendar/preferences/preferences.dtd
+++ b/calendar/chrome/calendar/preferences/preferences.dtd
@@ -18,16 +18,17 @@
    - Portions created by the Initial Developer are Copyright (C) 2001
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
    -   Mike Potter <mikep@oeone.com>
    -   ArentJan Banck <ajbanck@planet.nl>
    -   Eric Belhaire <belhaire@ief.u-psud.fr>
    -   Matthew Willis <mattwillis@gmail.com>
+   -   Philipp Kewisch <mozilla@kewis.ch>
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
    - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    - in which case the provisions of the GPL or the LGPL are applicable instead
    - of those above. If you wish to allow use of your version of this file only
    - under the terms of either the GPL or the LGPL, and not to allow others to
    - use your version of this file under the terms of the MPL, indicate your
@@ -40,13 +41,13 @@
 
 <!ENTITY  prefWindow.titleWin     "Options">
 <!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
 <!ENTITY  prefWindow.styleWin     "width: 47em; height: 37em;">
 <!ENTITY  prefWindow.styleMac     "width: 47em;">
 <!ENTITY  prefWindow.styleGNOME   "width: 47em; height: 34.5em;">
 
 <!ENTITY  paneGeneral.title       "General">
-<!ENTITY  paneAlarms.title        "Alarms">
+<!ENTITY  paneAlarms.title        "Reminders">
 <!ENTITY  paneCategories.title    "Categories">
 <!ENTITY  paneViews.title         "Views">
 <!ENTITY  paneTimezones.title     "Timezone">
 <!ENTITY  paneAdvanced.title      "Advanced">