diff -r bd7edf625bdd -r 97232defd20e calendarui/editors/data/CalenDefaultEditorsData.rss
--- a/calendarui/editors/data/CalenDefaultEditorsData.rss	Wed Sep 01 12:32:31 2010 +0100
+++ b/calendarui/editors/data/CalenDefaultEditorsData.rss	Tue Sep 14 21:17:03 2010 +0300
@@ -30,6 +30,8 @@
 #include <avkon.loc>
 #include <calencommands.hrh>            // Calendar commands
 
+#include "KoreanLunarDateEditor.rh"
+#include <calenkoreanlunar.loc>
 #include "CalenDefaultEditors.hrh"
 #include "CalendarVariant.hrh"
 #include "calendar.hrh"
@@ -132,6 +134,32 @@
 
 // ---------------------------------------------------------
 //
+//    r_korean_lunar_type_popup_items
+//    Define items of "Solar/lunar:" popup list.
+//
+// ---------------------------------------------------------
+//
+RESOURCE ARRAY r_korean_lunar_type_popup_items
+    {
+    items=
+        {
+        LBUF
+            {
+            txt = qtn_kor_cale_note_type_solar;
+            },
+        LBUF
+            {
+            txt = qtn_kor_cale_note_type_lunar;
+            },
+        LBUF
+            {
+            txt = qtn_kor_cale_note_type_leap;
+            }
+        };
+    }
+
+// ---------------------------------------------------------
+//
 //    r_calen_noteview_menubar
 //    Menubar for NoteView
 //    The upper menu title is defined in , the lower display position is.
@@ -1707,5 +1735,60 @@
         LBUF { txt = qtn_cale_om_descript_exist; }
         };
     }
+    
+// ---------------------------------------------------------
+//
+//    r_korean_lunar_date_editor_line
+//    Define Lunar "Date:" line
+//
+// ---------------------------------------------------------
+//
+RESOURCE DLG_LINE r_korean_lunar_date_editor_line
+    {
+    type = ECalenCtLunarDateEditor;
+    prompt = qtn_cale_anniversary_start_date;
+    id = EKoreanLunarAniversityStart; // was ecalendata tms.
+    control = KOREAN_LUNAR_DATE_EDITOR
+        {
+	    flags = 0;
+        };
+    }
+
+// ---------------------------------------------------------
+//
+//    r_korean_lunar_noteview_type_line
+//    Define "solar/lunar/leap:" line of Note Form
+//
+// ---------------------------------------------------------
+//
+RESOURCE DLG_LINE r_korean_lunar_noteview_type_line
+    {
+    type = EAknCtPopupField;
+    prompt = qtn_kor_cale_note_type;
+    id = EKoreanLunarTypeSelectSolarLunarLeap;
+    // means that OK-Key works - IMPORTANT!
+    itemflags = EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys;
+    control = POPUP_FIELD
+        {
+        flags = 0;
+        width = 8; // in characters  
+        other = " "; // Dummy
+        };
+    }
+
+RESOURCE TBUF r_kor_cale_note_offset_unit
+    {
+    buf = qtn_kor_cale_note_offset_unit;
+    }
+
+RESOURCE TBUF r_qtn_kor_cale_viewer_alarm_offset
+    {
+    buf = qtn_kor_cale_viewer_alarm_offset;
+    }
+
+RESOURCE TBUF r_qtn_kor_cale_viewer_alarm_offset_time
+    {
+    buf = qtn_kor_cale_viewer_alarm_offset_time;
+    }
 
 // End of File