Bug 432675 - Move the timezone prefs to General. r=philipp, a=Paenglab
authorRichard Marti <richard.marti@gmail.com>
Sun, 14 Dec 2014 19:35:19 +0100
changeset 8382 1884bdeded92284a29803716a744fe31a2540565
parent 8381 70e924138e8e9f3edcc32874b8faf45a3344d745
child 8383 bd02555d394ce7a1b9c0e88d2a099c9e53c1a068
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersphilipp, Paenglab
bugs432675
Bug 432675 - Move the timezone prefs to General. r=philipp, a=Paenglab X-Channel-Repo: comm-central X-Channel-Converted-Revision: d9842ddc938bb841ce24eb4c3d8fa1b069eb962b
calendar/chrome/calendar/preferences/general.dtd
calendar/chrome/calendar/preferences/preferences.dtd
--- a/calendar/chrome/calendar/preferences/general.dtd
+++ b/calendar/chrome/calendar/preferences/general.dtd
@@ -8,16 +8,20 @@
   -->
 
 <!ENTITY pref.mainbox.label "General Settings" >
 <!ENTITY pref.dateformat.label "Date Text Format:" >
 <!ENTITY pref.dateformat.accesskey "D">
 <!ENTITY pref.dateformat.long "Long" >
 <!ENTITY pref.dateformat.short "Short"  >
 
+<!ENTITY pref.timezones.caption "Timezone">
+<!ENTITY pref.timezones.label "Select the closest city in your timezone:">
+<!ENTITY pref.timezones.accesskey "S">
+
 <!ENTITY pref.defaults.label "Default Values for New Items">
 <!ENTITY pref.events.label "Events">
 <!ENTITY pref.tasks.label "Tasks">
 
 <!ENTITY pref.default_event_length.label "Default Length:" >
 <!ENTITY pref.default_event_length.accesskey "E">
 
 <!ENTITY pref.default_task_none.label "None">
--- a/calendar/chrome/calendar/preferences/preferences.dtd
+++ b/calendar/chrome/calendar/preferences/preferences.dtd
@@ -1,9 +1,8 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  paneGeneral.title       "General">
 <!ENTITY  paneAlarms.title        "Reminders">
 <!ENTITY  paneCategories.title    "Categories">
 <!ENTITY  paneViews.title         "Views">
-<!ENTITY  paneTimezones.title     "Timezone">