From 33ee5a017602f94de35057624f92d71e97e592aa Mon Sep 17 00:00:00 2001
From: "mvl%exedo.nl" <mvl%exedo.nl@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 7 Jun 2006 02:10:48 +0000
Subject: [PATCH] Bug 328073, make the UI for monthly recurrence work. r=jminta

git-svn-id: svn://10.0.0.236/trunk@199388 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../en-US/chrome/calendar/calendar.dtd        | 24 +-------
 .../en-US/chrome/calendar/calendar.properties | 56 +++++++++++++++++++
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/mozilla/calendar/locales/en-US/chrome/calendar/calendar.dtd b/mozilla/calendar/locales/en-US/chrome/calendar/calendar.dtd
index a65a4dac2ad..cd1a9f8e8a2 100644
--- a/mozilla/calendar/locales/en-US/chrome/calendar/calendar.dtd
+++ b/mozilla/calendar/locales/en-US/chrome/calendar/calendar.dtd
@@ -150,13 +150,7 @@
 <!ENTITY newevent.recurrence.month.label    "monthly" >
 <!ENTITY newevent.recurrence.year.label     "annually" >
 <!ENTITY newevent.recurrence.on.label       "On:" >
-<!ENTITY newevent.recurrence.every.label    "Every" >
-<!ENTITY newevent.repeat.first.label        "every first" >
-<!ENTITY newevent.repeat.second.label       "every second" >
-<!ENTITY newevent.repeat.third.label        "every third" >
-<!ENTITY newevent.repeat.fourth.label       "every fourth" >
-<!ENTITY newevent.repeat.fifth.label        "every fifth" >
-<!ENTITY newevent.repeat.last.label         "every last" >
+<!ENTITY newevent.recurrence.every.label    "Every:" >
 <!ENTITY newevent.repeat.onthe.label        "Repeat on the" >
 <!ENTITY newevent.repeat.forever.label      "Repeat forever" >
 <!ENTITY newevent.repeat.for.label          "Repeat for" >
@@ -185,22 +179,6 @@
 <!ENTITY newevent.add.contact.label         "Add" >
 <!ENTITY newevent.attach.file.label         "Attach File…" >
 
-<!ENTITY newevent.advanced.repeat.dayofmonth.label "On the xth day of the month">
-<!ENTITY newevent.advanced.repeat.dayofweek.label "4th Tuesday of the month">
-<!ENTITY newevent.advanced.repeat.lastdayofweek.label "Last Tuesday of the month">
-<!ENTITY newevent.advanced.repeat.ofthemonth.label " of the month">
-
-<!ENTITY newevent.advanced.repeat.onthe.label "On the ">
-<!ENTITY newevent.advanced.repeat.last.label "Last ">
-<!ENTITY newevent.advanced.repeat.first.label "First">
-<!ENTITY newevent.advanced.repeat.second.label "Second">
-<!ENTITY newevent.advanced.repeat.third.label "Third">
-<!ENTITY newevent.advanced.repeat.fourth.label "Fourth">
-<!ENTITY newevent.advanced.repeat.first.extension "st">
-<!ENTITY newevent.advanced.repeat.second.extension "nd">
-<!ENTITY newevent.advanced.repeat.third.extension "rd">
-<!ENTITY newevent.advanced.repeat.nth.extension "th">
-
 <!ENTITY newevent.removeselectedfile.label "Remove Selected File">
 
 <!ENTITY newtodo.completed.label "Completed">
diff --git a/mozilla/calendar/locales/en-US/chrome/calendar/calendar.properties b/mozilla/calendar/locales/en-US/chrome/calendar/calendar.properties
index 502f9a109dd..81f1a0b2ed1 100644
--- a/mozilla/calendar/locales/en-US/chrome/calendar/calendar.properties
+++ b/mozilla/calendar/locales/en-US/chrome/calendar/calendar.properties
@@ -49,6 +49,62 @@ editEventDialog=Edit Event
 newTaskDialog=New Task
 editTaskDialog=Edit Task
 
+# For the recurrence dialog
+wordOrdinal1=First
+wordOrdinal2=Second
+wordOrdinal3=Third
+wordOrdinal4=Fourth
+wordOrdinal5=Fifth
+day0=Sunday
+day1=Monday
+day2=Tuesday
+day3=Wednesday
+day4=Thursday
+day5=Friday
+day6=Saturday
+ordinal1=1th
+ordinal2=2nd
+ordinal3=3th
+ordinal4=4th
+ordinal5=5th
+ordinal6=6th
+ordinal7=7th
+ordinal8=8th
+ordinal9=9th
+ordinal10=10th
+ordinal11=11th
+ordinal12=12th
+ordinal13=13th
+ordinal14=14th
+ordinal15=15th
+ordinal16=16th
+ordinal17=17th
+ordinal18=18th
+ordinal19=19th
+ordinal20=20th
+ordinal21=21st
+ordinal22=22nd
+ordinal23=23th
+ordinal24=24th
+ordinal25=25th
+ordinal26=26th
+ordinal27=27th
+ordinal28=28th
+ordinal29=29th
+ordinal30=30th
+ordinal31=31st
+
+# Will be subsituted with one of recurN and one of dayN above, to form
+# Second Tuesday of the month
+recurNthWeek=%1$S %2$S of the month
+# Will be subsitutes with one of dayN above, to form
+# Last Tuesday of the month
+recurLast=Last %1$S of the month
+# Will be subsitured with one of ordinalN, to form
+# 15th day of the month
+recurNthDay=%1$S day of the month
+
+
 # The name of the calendar provided with the application by default
 homeCalendarName=Home