Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 348254 - Fixes duplicate xul element ids and changes captions to labels for some prefs. patch by Cedric Corazza, r1=lilmatt, r2=jminta

Browse Source
This commit is contained in:
mattwillis%gmail.com 2006-09-07 20:37:38 +00:00
parent d704ecc250
commit 4a2e37e648
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
calendar/base/content/preferences/alarms.xul
View File

@ -154,14 +154,14 @@
<rows>
<row>
<vbox align="start">
<caption label="&pref.defalarm4events.label;"
accesskey="&pref.defalarm4events.accesskey;"
control="eventdefalarm"/>
<label value="&pref.defalarm4events.label;"
accesskey="&pref.defalarm4events.accesskey;"
control="eventdefalarm"/>
</vbox>
<menulist id="eventdefalarm"
crop="none"
preference="calendar.alarms.onforevents">
<menupopup id="eventdefalarm">
<menupopup id="eventdefalarmpopup">
<menuitem id="eventdefalarmon"
label="&pref.alarm.on;"
value="1"/>
@ -174,14 +174,14 @@
</row>
<row>
<vbox align="start">
<caption label="&pref.defalarm4todos.label;"
accesskey="&pref.defalarm4todos.accesskey;"
control="tododefalarm"/>
<label value="&pref.defalarm4todos.label;"
accesskey="&pref.defalarm4todos.accesskey;"
control="tododefalarm"/>
</vbox>
<menulist id="tododefalarm"
crop="none"
preference="calendar.alarms.onfortodos">
<menupopup id="tododefalarm">
<menupopup id="tododefalarmpopup">
<menuitem id="tododefalarmon"
label="&pref.alarm.on;"
value="1"/>
@ -194,9 +194,9 @@
</row>
<row>
<vbox align="start">
<caption label="&pref.defalarmlen4events.label;"
accesskey="&pref.defalarmlen4events.accesskey;"
control="eventdefalarmlen"/>
<label value="&pref.defalarmlen4events.label;"
accesskey="&pref.defalarmlen4events.accesskey;"
control="eventdefalarmlen"/>
</vbox>
<hbox>
<textbox id="eventdefalarmlen"
@ -207,19 +207,19 @@
crop="none"
preference="calendar.alarms.eventalarmunit"
labelnumber="labelplural">
<menupopup id="eventdefalarmunit">
<menuitem id="eventdefalarmunitday"
<menupopup id="eventdefalarmunitpopup">
<menuitem id="eventdefalarmunitmin"
label="&calendar.global.units.minutes;"
labelplural="&calendar.global.units.minutes;"
labelsingular="&calendar.global.units.minute;"
value="minutes"
selected="true"/>
<menuitem id="eventdefalarmunitmin"
<menuitem id="eventdefalarmunithour"
label="&calendar.global.units.hours;"
labelplural="&calendar.global.units.hours;"
labelsingular="&calendar.global.units.hour;"
value="hours"/>
<menuitem id="eventdefalarmunitmin"
<menuitem id="eventdefalarmunitday"
label="&calendar.global.units.days;"
labelplural="&calendar.global.units.days;"
labelsingular="&calendar.global.units.day;"
@ -230,9 +230,9 @@
</row>
<row>
<vbox align="start">
<caption label="&pref.defalarmlen4todos.label;"
accesskey="&pref.defalarmlen4todos.accesskey;"
control="tododefalarmlen"/>
<label value="&pref.defalarmlen4todos.label;"
accesskey="&pref.defalarmlen4todos.accesskey;"
control="tododefalarmlen"/>
</vbox>
<hbox>
<textbox id="tododefalarmlen"
@ -243,19 +243,19 @@
crop="none"
preference="calendar.alarms.todoalarmunit"
labelnumber="labelplural">
<menupopup id="tododefalarmunit">
<menuitem id="tododefalarmunitday"
<menupopup id="tododefalarmunitpopup">
<menuitem id="tododefalarmunitmin"
label="&calendar.global.units.minutes;"
labelplural="&calendar.global.units.minutes;"
labelsingular="&calendar.global.units.minute;"
value="minutes"
selected="true"/>
<menuitem id="tododefalarmunitmin"
<menuitem id="tododefalarmunithour"
label="&calendar.global.units.hours;"
labelplural="&calendar.global.units.hours;"
labelsingular="&calendar.global.units.hour;"
value="hours"/>
<menuitem id="tododefalarmunitmin"
<menuitem id="tododefalarmunitday"
label="&calendar.global.units.days;"
labelplural="&calendar.global.units.days;"
labelsingular="&calendar.global.units.day;"

2
calendar/base/content/preferences/general.xul
View File

@ -86,7 +86,7 @@
control="dateformat"/>
<menulist id="dateformat" crop="none"
preference="calendar.date.format">
<menupopup id="dateformat">
<menupopup id="dateformatpopup">
<menuitem id="dateformat-long-menuitem"
label="&pref.dateformat.long;"
value="0"/>

20
calendar/base/content/preferences/views.xul
View File

@ -99,11 +99,11 @@
<groupbox>
<caption label="&pref.calendar.view.allview.caption;"/>
<hbox align="center">
<caption label="&pref.weekstarts.label;"
accesskey="&pref.weekstarts.accesskey;"
control="weekstarts"/>
<label value="&pref.weekstarts.label;"
accesskey="&pref.weekstarts.accesskey;"
control="weekstarts"/>
<menulist id="weekstarts" preference="calendar.week.start">
<menupopup id="weekstarts">
<menupopup id="weekstartspopup">
<menuitem label="&day.1.name;" value="0"/>
<menuitem label="&day.2.name;" value="1"/>
<menuitem label="&day.3.name;" value="2"/>
@ -161,9 +161,9 @@
<groupbox>
<caption label="&pref.calendar.view.multiweekview.caption;"/>
<hbox align="center">
<caption label="&pref.numberofweeks.label;"
accesskey="&pref.numberofweeks.accesskey;"
control="viewsMultiweekTotalWeeks"/>
<label value="&pref.numberofweeks.label;"
accesskey="&pref.numberofweeks.accesskey;"
control="viewsMultiweekTotalWeeks"/>
<menulist id="viewsMultiweekTotalWeeks"
preference="calendar.weeks.inview">
<menupopup>
@ -177,9 +177,9 @@
</menulist>
</hbox>
<hbox align="center" id="previousWeeksBox">
<caption label="&pref.numberofpreviousweeks.label;"
accesskey="&pref.numberofpreviousweeks.accesskey;"
control="viewsMultiweekPreviousWeeks"/>
<label value="&pref.numberofpreviousweeks.label;"
accesskey="&pref.numberofpreviousweeks.accesskey;"
control="viewsMultiweekPreviousWeeks"/>
<menulist id="viewsMultiweekPreviousWeeks"
preference="calendar.previousweeks.inview">
<menupopup>