clock/data/translations/clock.ts
changeset 26 a949c2543c15
parent 18 c198609911f9
--- a/clock/data/translations/clock.ts	Mon May 03 12:30:32 2010 +0300
+++ b/clock/data/translations/clock.ts	Fri May 14 15:51:09 2010 +0300
@@ -2,14 +2,14 @@
 <!DOCTYPE TS>
 <TS version="3.0" language="en_GB" sourcelanguage="en_GB">
 <context>
-<message numerus="no" id="txt_clock_setlabel_time_format">
-    <comment>1st label in Regional date &amp; time settings view</comment>        
-    <source>Time format</source>
-    <translation variants="no">Time format</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
+<message numerus="no" id="txt_common_common_clock">
+    <comment>Title for Date and time settings view</comment>        
+    <source>Clock</source>
+    <translation variants="no">Clock</translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>Common</extra-loc-viewid>
+    <extra-loc-positionid>Common</extra-loc-positionid>
+    <extra-loc-feature>Co</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_clock_dblist_val_1_hr">
@@ -22,24 +22,24 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clk_formlabel_val_alarm">
-    <comment>Default value for Description label in Alarm editor view</comment>        
-    <source>Alarm</source>
-    <translation variants="no">Alarm</translation>
-    <extra-loc-layout_id>qtl_dataform_description_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>formlabel_1_val</extra-loc-positionid>
+<message numerus="no" id="txt_clock_dblist_daily_val_1_hr_2_mins">
+    <comment>When a city is added to the World Clock list view, its relative time offset is displayed with respect to Homecity. (Hour and Mins)</comment>        
+    <source>%1 hr %2 mins</source>
+    <translation variants="no">%1 hr %2 mins</translation>
+    <extra-loc-layout_id>txt_clock_dblist_val_l1_hr</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_tumbler_title_alarm_time">
-    <comment>Title for the time picker tumbler widget </comment>        
-    <source>Alarm time</source>
-    <translation variants="no">Alarm time</translation>
-    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
-    <extra-loc-viewid>Tumbler</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>Tu</extra-loc-feature>
+<message numerus="no" id="txt_clock_dblist_val_1_mins">
+    <comment>When a city is added to the World Clock list view, its relative time offset is displayed with respect to Homecity. (Mins)</comment>        
+    <source>%1 mins</source>
+    <translation variants="no">%1 mins</translation>
+    <extra-loc-layout_id>txt_clock_dblist_val_l1_hr</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_clk_setlabel_val_mm_dd_yyyy">
@@ -47,7 +47,7 @@
     <source>mm dd yyyy</source>
     <translation variants="no">mm dd yyyy</translation>
     <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
     <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
@@ -62,23 +62,23 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_opt_discard_changes">
-    <comment>When user edits an already existed alarm in Alarm editor form, he can &quot;Discard changes&quot; from Options menu and the prevoius values are saved.</comment>        
-    <source>Discard changes</source>
-    <translation variants="no">Discard changes</translation>
+<message numerus="no" id="txt_clock_opt_add_city">
+    <comment></comment>        
+    <source>Add city</source>
+    <translation variants="no">Add city</translation>
     <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
+    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
     <extra-loc-positionid>opt</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_button_regional_date_time_settings">
-    <comment>Tapping on this button opens advanced date and time view</comment>        
-    <source>Regional date &amp; time settings</source>
-    <translation variants="no">Regional date &amp; time settings</translation>
-    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
+<message numerus="no" id="txt_clk_menu_show_on_homescreen">
+    <comment>Long tap menu on an added city in World clock view (both portrait and landscape)</comment>        
+    <source>Show on homescreen</source>
+    <translation variants="no">Show on homescreen</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -92,26 +92,6 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_subhead_alarm">
-    <comment>When user taps on already existed alarm in the alarm list, the alarm editor opens with subtitle &quot;Alarm&quot;</comment>        
-    <source>Alarm</source>
-    <translation variants="no">Alarm</translation>
-    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_repeat_daily">
-    <comment>2nd dropdown list value for Occurence label in Alarm editor view</comment>        
-    <source>Repeat daily</source>
-    <translation variants="no">Repeat daily</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_clock_main_view_setlabel_in_1hr_2mins">
     <comment>Secondary text displaying the time remaining for the alarm (hour, mins)</comment>        
     <source>In %1hr %2mins</source>
@@ -122,53 +102,33 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_tumbler_title_time">
+<message numerus="no" id="txt_common_setlabel_dst">
     <comment></comment>        
-    <source>Time</source>
-    <translation variants="no">Time</translation>
-    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
-    <extra-loc-viewid>Tumbler</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>Tu</extra-loc-feature>
+    <source>DST</source>
+    <translation variants="no">DST</translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>Common</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
+    <extra-loc-feature>Co</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_formlabel_place">
-    <comment>5th label for Place in Clock settings view</comment>        
-    <source>Place</source>
-    <translation variants="no">Place</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>formlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_time">
-    <comment>Label for Time in Alarm editor view</comment>        
-    <source>Time</source>
-    <translation variants="no">Time</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
+<message numerus="no" id="txt_clock_main_view_setlabel_in_1hrs_2mins">
+    <comment>Secondary text displaying the time remaining for the alarm (hours, mins)</comment>        
+    <source>In %1hrs %2mins</source>
+    <translation variants="no">In %1hrs %2mins</translation>
+    <extra-loc-layout_id>txt_clock_main_view_setlabel_in_1hrs_2mins</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
     <extra-loc-positionid>setlabel_1</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clk_setlabel_val_once">
-    <comment>1st dropdown list value for Occurence label in Alarm editor view</comment>        
-    <source>Once</source>
-    <translation variants="no">Once</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_friday">
-    <comment>5th dropdown list value for Day label in Alarm editor view</comment>        
-    <source>Friday</source>
-    <translation variants="no">Friday</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_5_val</extra-loc-positionid>
+<message numerus="no" id="txt_clock_main_view_button_alarms">
+    <comment></comment>        
+    <source>Alarms</source>
+    <translation variants="no">Alarms</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -182,33 +142,23 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_setlabel_week_starts_on">
-    <comment>6th field in Regional date &amp; time settings view</comment>        
-    <source>Week starts on</source>
-    <translation variants="no">Week starts on</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
+<message numerus="no" id="txt_clock_main_view_dblist_daily_val_workdays">
+    <comment>Layout ID Parent. Custom Layout. Text to show the alarm occurance.</comment>        
+    <source>Workdays</source>
+    <translation variants="no">Workdays</translation>
+    <extra-loc-layout_id>txt_clock_main_view_dblist_daily_val_today</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clk_setlabel_val_repeat_on_workdays">
-    <comment>4th dropdown list value for Occurence label in Alarm editor view</comment>        
-    <source>Repeat on workdays</source>
-    <translation variants="no">Repeat on workdays</translation>
+<message numerus="no" id="txt_clk_setlabel_val_yyyy_mm_dd">
+    <comment>3rd value in combo box list for Date format label</comment>        
+    <source>yyyy mm dd</source>
+    <translation variants="no">yyyy mm dd</translation>
     <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_sunday">
-    <comment>7th dropdown list value for Day label in Alarm editor view</comment>        
-    <source>Sunday</source>
-    <translation variants="no">Sunday</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_7_val</extra-loc-positionid>
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -222,23 +172,13 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clk_setlabel_val_yyyy_mm_dd">
-    <comment>3rd value in combo box list for Date format label</comment>        
-    <source>yyyy mm dd</source>
-    <translation variants="no">yyyy mm dd</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_dpopinfo_time_to_alarm_1_hr_and_2_mins">
-    <comment>Note displayed after alarm is set (time remaining) (hr, mins)</comment>        
-    <source>Time to alarm %1 hour and %2 minutes</source>
-    <translation variants="no">Time to alarm %1 hour and %2 minutes</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+<message numerus="no" id="txt_clock_subhead_world_clock">
+    <comment>Subtitle for World Clock view</comment>        
+    <source>World Clock</source>
+    <translation variants="no">World Clock</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -252,23 +192,13 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_formlabel_city_name">
-    <comment>Form label for city name in add own city (popup) data entry form</comment>        
-    <source>City name</source>
-    <translation variants="no">City name</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_City list_P07</extra-loc-viewid>
-    <extra-loc-positionid>formlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_formlabel_timezone">
-    <comment>Form label for timezone in add own city (popup) data entry form</comment>        
-    <source>Timezone</source>
-    <translation variants="no">Timezone</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_City list_P07</extra-loc-viewid>
-    <extra-loc-positionid>formlabel_1</extra-loc-positionid>
+<message numerus="no" id="txt_clock_button_add_city">
+    <comment></comment>        
+    <source>Add city</source>
+    <translation variants="no">Add city</translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -282,6 +212,16 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_clock_main_view_setlabel_in_1hrs_2min">
+    <comment>Secondary text displaying the time remaining for the alarm (hours, min)</comment>        
+    <source>In %1hrs %2min</source>
+    <translation variants="no">In %1hrs %2min</translation>
+    <extra-loc-layout_id>txt_clock_main_view_setlabel_in_1hrs_2min</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
+    <extra-loc-feature>Cl</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_common_common_gmt">
     <comment></comment>        
     <source>GMT</source>
@@ -292,13 +232,23 @@
     <extra-loc-feature>Co</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clk_opt_add_own_city">
-    <comment>&quot;Add own city&quot; from Options menu in City list </comment>        
-    <source>Add own city</source>
-    <translation variants="no">Add own city</translation>
-    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_City list_P07</extra-loc-viewid>
-    <extra-loc-positionid>opt</extra-loc-positionid>
+<message numerus="no" id="txt_short_caption_clock">
+    <comment>Clock application in Application library grid</comment>        
+    <source>Clock</source>
+    <translation variants="no">Clock</translation>
+    <extra-loc-layout_id>qtl_grid_applications_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock</extra-loc-viewid>
+    <extra-loc-positionid>grid</extra-loc-positionid>
+    <extra-loc-feature>Cl</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_clock_main_view_setlabel_in_1days">
+    <comment>Layout ID Parent. Custom layout. Days remaining for the alarm</comment>        
+    <source>In %1days</source>
+    <translation variants="no">In %1days</translation>
+    <extra-loc-layout_id>txt_clock_main_view_setlabel_in_1days</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -322,36 +272,6 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_setlabel_date">
-    <comment>Label to the date field (picker) in the settings view</comment>        
-    <source>Date</source>
-    <translation variants="no">Date</translation>
-    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_setlabel_workdays">
-    <comment>Label for Workdays in Alarm editor</comment>        
-    <source>Workdays</source>
-    <translation variants="no">Workdays</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_12_hour">
-    <comment>2nd value in combo box list for Time format label</comment>        
-    <source>12 hour</source>
-    <translation variants="no">12 hour</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_clock_main_view_setlabel_every_1">
     <comment>Layout ID Parent. Custom. Alarm Occurance detail.</comment>        
     <source>Every %1</source>
@@ -362,499 +282,6 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_dpopinfo_time_to_alarm_1_hrs_and_2_mins">
-    <comment>Note displayed after alarm is set (time remaining) (hrs, mins)</comment>        
-    <source>Time to alarm %1 hours and %2 minutes</source>
-    <translation variants="no">Time to alarm %1 hours and %2 minutes</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_repeat_weekly">
-    <comment>3rd dropdown list value for Occurence label in Alarm editor view</comment>        
-    <source>Repeat weekly</source>
-    <translation variants="no">Repeat weekly</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_note_alarm_occurs_workdays_at_1">
-    <comment>Note displayed after alarm is set (workdays)</comment>        
-    <source>Alarm occurs workdays at %1</source>
-    <translation variants="no">Alarm occurs workdays at %1</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_long_caption_clock">
-    <comment>Clock application in Application library list</comment>        
-    <source>Clock</source>
-    <translation variants="no">Clock</translation>
-    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_subhead_date_time">
-    <comment>Sub-title for Date &amp; time settings view</comment>        
-    <source>Date &amp; time</source>
-    <translation variants="no">Date &amp; time</translation>
-    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_main_view_dpopinfo_alarm_deactivated">
-    <comment>Information shown in a popup once the alarm is deactivated</comment>        
-    <source>Alarm Deactivated</source>
-    <translation variants="no">Alarm Deactivated</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_menu_set_as_current_location">
-    <comment>Long tap menu on an added city in the World clock view (both portrait and landscape)</comment>        
-    <source>Set as current location</source>
-    <translation variants="no">Set as current location</translation>
-    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_main_view_opt_settings">
-    <comment>Item in Options menu from Clock main vew</comment>        
-    <source>Settings</source>
-    <translation variants="no">Settings</translation>
-    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
-    <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_wednesday">
-    <comment>3rd dropdown list value for Day label in Alarm editor view</comment>        
-    <source>Wednesday</source>
-    <translation variants="no">Wednesday</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_3_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_common_clock">
-    <comment>Title for Date and time settings view</comment>        
-    <source>Clock</source>
-    <translation variants="no">Clock</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>Common</extra-loc-viewid>
-    <extra-loc-positionid>Common</extra-loc-positionid>
-    <extra-loc-feature>Co</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_cp_main_view_list_time_info_date_info">
-    <comment>The time and date information will be displayed in 2nd row</comment>        
-    <source>%1, %2</source>
-    <translation variants="no">%1, %2</translation>
-    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>CP main view_time &amp; date plugin_P11</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>CP</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_button_digital">
-    <comment>Setting item to clock display type. Tap to toggle values.</comment>        
-    <source>Digital</source>
-    <translation variants="no">Digital</translation>
-    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_cp_main_view_list_time_date">
-    <comment>This text is displayed in 1st row</comment>        
-    <source>Time &amp; date</source>
-    <translation variants="no">Time &amp; date</translation>
-    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>CP main view_time &amp; date plugin_P11</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>CP</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_note_alarm_occurs_every_week_on_1_at_2">
-    <comment>Note displayed after alarm is set (every week)</comment>        
-    <source>Alarm occurs every week on %1 at %2</source>
-    <translation variants="no">Alarm occurs every week on %1 at %2</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_dblist_daily_val_1_hr_2_mins">
-    <comment>When a city is added to the World Clock list view, its relative time offset is displayed with respect to Homecity. (Hour and Mins)</comment>        
-    <source>%1 hr %2 mins</source>
-    <translation variants="no">%1 hr %2 mins</translation>
-    <extra-loc-layout_id>txt_clock_dblist_val_l1_hr</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
-    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_occurence">
-    <comment>Label for Occurence in Alarm editor</comment>        
-    <source>Occurence</source>
-    <translation variants="no">Occurence</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_dblist_val_1_mins">
-    <comment>When a city is added to the World Clock list view, its relative time offset is displayed with respect to Homecity. (Mins)</comment>        
-    <source>%1 mins</source>
-    <translation variants="no">%1 mins</translation>
-    <extra-loc-layout_id>txt_clock_dblist_val_l1_hr</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
-    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_setlabel_date_format">
-    <comment>3rd field in Regional date &amp; time settings view</comment>        
-    <source>Date format</source>
-    <translation variants="no">Date format</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_dpopinfo_time_to_alarm_1_hrs_and_2_min">
-    <comment>Note displayed after alarm is set (time remaining) (hrs, min)</comment>        
-    <source>Time to alarm %1 hours and %2 minute</source>
-    <translation variants="no">Time to alarm %1 hours and %2 minute</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_menu_show_on_homescreen">
-    <comment>Long tap menu on an added city in World clock view (both portrait and landscape)</comment>        
-    <source>Show on homescreen</source>
-    <translation variants="no">Show on homescreen</translation>
-    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_dpopinfo_alarm_will_occur_at_1_after_au">
-    <comment>Popup Information which comes after setting the alarm.</comment>        
-    <source>Alarm will occur at %1 after automatic daylight saving update</source>
-    <translation variants="no">Alarm will occur at %1 after automatic daylight saving update</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_subhead_new_alarm">
-    <comment>When user taps on &quot;New alarm&quot; toolbar button in Clock main view, alarm editor opens with the subtitle &quot;New alarm&quot;.</comment>        
-    <source>New alarm</source>
-    <translation variants="no">New alarm</translation>
-    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_subhead_regional_date_time_settings">
-    <comment>Sub-title for Regiional date &amp; time settings</comment>        
-    <source>Regional date &amp; time settings</source>
-    <translation variants="no">Regional date &amp; time settings</translation>
-    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_24_hour">
-    <comment>1st Value in combo box list for Time format label</comment>        
-    <source>24 hour</source>
-    <translation variants="no">24 hour</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_main_view_setlabel_in_1hrs_2mins">
-    <comment>Secondary text displaying the time remaining for the alarm (hours, mins)</comment>        
-    <source>In %1hrs %2mins</source>
-    <translation variants="no">In %1hrs %2mins</translation>
-    <extra-loc-layout_id>txt_clock_main_view_setlabel_in_1hrs_2mins</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_formlabel_country">
-    <comment>Form label for country in add own city (popup) data entry form</comment>        
-    <source>Country</source>
-    <translation variants="no">Country</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_City list_P07</extra-loc-viewid>
-    <extra-loc-positionid>formlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_setlabel_dst">
-    <comment></comment>        
-    <source>DST</source>
-    <translation variants="no">DST</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>Common</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Co</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_alarm_sound">
-    <comment>Label for Alarm sound in Alarm editor view</comment>        
-    <source>Alarm sound</source>
-    <translation variants="no">Alarm sound</translation>
-    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_monday">
-    <comment>1st dropdown list value for Day label in Alarm editor view</comment>        
-    <source>Monday</source>
-    <translation variants="no">Monday</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_main_view_button_alarms">
-    <comment></comment>        
-    <source>Alarms</source>
-    <translation variants="no">Alarms</translation>
-    <extra-loc-layout_id>qtl_toolbar_tiny1_3</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_dpopinfo_alarm_occurs_every_day_at_1">
-    <comment>Note displayed after alarm is set (Everyday Time)</comment>        
-    <source>Alarm occurs every day at %1</source>
-    <translation variants="no">Alarm occurs every day at %1</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_thursday">
-    <comment>4th dropdown list value for Day label in Alarm editor view</comment>        
-    <source>Thursday</source>
-    <translation variants="no">Thursday</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_4_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="yes" id="txt_clock_list_ln_minutes">
-    <comment>Alarm snooze time details in the list box (5mins, 10mins, 15mins, 30mins)</comment>        
-    <source>%Ln minutes</source>
-    <translation>
-        <numerusform variants="no">(s)%Ln minutes</numerusform>
-        <numerusform variants="no">(p)%Ln minutes</numerusform>
-    </translation>
-    <extra-loc-layout_id>qtl_dataform_combobox_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>set</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_button_analog">
-    <comment>Setting item to clock display type. Tap to toggle values.</comment>        
-    <source>Analog</source>
-    <translation variants="no">Analog</translation>
-    <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_dpopinfo_time_to_alarm_1_hr_and_2_min">
-    <comment>Note displayed after alarm is set (time remaining)</comment>        
-    <source>Time to alarm %1 hour and %2 minute</source>
-    <translation variants="no">Time to alarm %1 hour and %2 minute</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_main_view_dblist_daily_val_workdays">
-    <comment>Layout ID Parent. Custom Layout. Text to show the alarm occurance.</comment>        
-    <source>Workdays</source>
-    <translation variants="no">Workdays</translation>
-    <extra-loc-layout_id>txt_clock_main_view_dblist_daily_val_today</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
-    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_val_tuesday">
-    <comment>2nd dropdown list value for Day label in Alarm editor view</comment>        
-    <source>Tuesday</source>
-    <translation variants="no">Tuesday</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_2_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_subhead_world_clock">
-    <comment>Subtitle for World Clock view</comment>        
-    <source>World Clock</source>
-    <translation variants="no">World Clock</translation>
-    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
-    <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_note_alarm_occurs_once_only_on_next_1_a">
-    <comment>Note displayed after alarm is set (only once)</comment>        
-    <source>Alarm occurs once only on next %1 at %2</source>
-    <translation variants="no">Alarm occurs once only on next %1 at %2</translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_tumbler_title_alarm_date">
-    <comment>Title for the date picker tumbler widget </comment>        
-    <source>Alarm date</source>
-    <translation variants="no">Alarm date</translation>
-    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
-    <extra-loc-viewid>Tumbler</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>Tu</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_tumbler_title_date">
-    <comment></comment>        
-    <source>Date</source>
-    <translation variants="no">Date</translation>
-    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
-    <extra-loc-viewid>Tumbler</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>Tu</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_main_view_setlabel_in_1hrs_2min">
-    <comment>Secondary text displaying the time remaining for the alarm (hours, min)</comment>        
-    <source>In %1hrs %2min</source>
-    <translation variants="no">In %1hrs %2min</translation>
-    <extra-loc-layout_id>txt_clock_main_view_setlabel_in_1hrs_2min</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_short_caption_clock">
-    <comment>Clock application in Application library grid</comment>        
-    <source>Clock</source>
-    <translation variants="no">Clock</translation>
-    <extra-loc-layout_id>qtl_grid_applications_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock</extra-loc-viewid>
-    <extra-loc-positionid>grid</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_day">
-    <comment>Label for Day in Alarm editor view</comment>        
-    <source>Day</source>
-    <translation variants="no">Day</translation>
-    <extra-loc-layout_id>qtl_dataform_heading_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_main_view_setlabel_in_1days">
-    <comment>Layout ID Parent. Custom layout. Days remaining for the alarm</comment>        
-    <source>In %1days</source>
-    <translation variants="no">In %1days</translation>
-    <extra-loc-layout_id>txt_clock_main_view_setlabel_in_1days</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_setlabel_use_network_date_time">
-    <comment>1st label in Date and time settings view</comment>        
-    <source>Use network date &amp; time</source>
-    <translation variants="no">Use network date &amp; time</translation>
-    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_setlabel_time_separator">
-    <comment>Subtitle for the time seperator drop down list</comment>        
-    <source>Time separator</source>
-    <translation variants="no">Time separator</translation>
-    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_setlabel_date_separator">
-    <comment>Subtitle for the date seperator drop down list</comment>        
-    <source>Date separator</source>
-    <translation variants="no">Date separator</translation>
-    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_setlabel_time">
-    <comment>Label to the time field (picker) in the settings view</comment>        
-    <source>Time</source>
-    <translation variants="no">Time</translation>
-    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_clock_main_view_dblist_daily_val_today">
     <comment>Layout ID Parent. Custom Layout. Text to show the alarm occurance.</comment>        
     <source>Today</source>
@@ -865,40 +292,40 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_setlabel_clock_type">
-    <comment>Primary text label for Clock Type</comment>        
-    <source>Clock Type</source>
-    <translation variants="no">Clock Type</translation>
-    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_1</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_5</extra-loc-positionid>
+<message numerus="no" id="txt_long_caption_clock">
+    <comment>Clock application in Application library list</comment>        
+    <source>Clock</source>
+    <translation variants="no">Clock</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_subhead_city_list">
-    <comment>Subtitle for City list</comment>        
-    <source>City list</source>
-    <translation variants="no">City list</translation>
-    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_City list_P07</extra-loc-viewid>
-    <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clock_opt_delete">
-    <comment>When user creates a new alarm in Alarm editor form, he can &quot;Delete&quot; this alarm via Options menu.</comment>        
-    <source>Delete</source>
-    <translation variants="no">Delete</translation>
+<message numerus="no" id="txt_clk_main_view_opt_settings">
+    <comment>Item in Options menu from Clock main vew</comment>        
+    <source>Settings</source>
+    <translation variants="no">Settings</translation>
     <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
     <extra-loc-positionid>opt</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clock_main_view_dpopinfo_alarm_activated">
-    <comment>Information shown in a popup once the alarm is activated</comment>        
-    <source>Alarm Activated</source>
-    <translation variants="no">Alarm Activated</translation>
+<message numerus="no" id="txt_clk_menu_set_as_current_location">
+    <comment>Long tap menu on an added city in the World clock view (both portrait and landscape)</comment>        
+    <source>Set as current location</source>
+    <translation variants="no">Set as current location</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock_World clock_P05</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>Cl</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_clock_main_view_dpopinfo_alarm_deactivated">
+    <comment>Information shown in a popup once the alarm is deactivated</comment>        
+    <source>Alarm Deactivated</source>
+    <translation variants="no">Alarm Deactivated</translation>
     <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
     <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
     <extra-loc-positionid>dpopinfo</extra-loc-positionid>
@@ -915,23 +342,13 @@
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_clk_setlabel_val_saturday">
-    <comment>6th dropdown list value for Day label in Alarm editor view</comment>        
-    <source>Saturday</source>
-    <translation variants="no">Saturday</translation>
-    <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>setlabel_6_val</extra-loc-positionid>
-    <extra-loc-feature>Cl</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_clk_formlabel_description">
-    <comment>Label for Description in Alarm editor view</comment>        
-    <source>Description</source>
-    <translation variants="no">Description</translation>
-    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Alarm editor_P03</extra-loc-viewid>
-    <extra-loc-positionid>formlabel_1</extra-loc-positionid>
+<message numerus="no" id="txt_clock_main_view_dpopinfo_alarm_activated">
+    <comment>Information shown in a popup once the alarm is activated</comment>        
+    <source>Alarm Activated</source>
+    <translation variants="no">Alarm Activated</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -940,7 +357,7 @@
     <source>dd mm yyyy</source>
     <translation variants="no">dd mm yyyy</translation>
     <extra-loc-layout_id>qtl_dataform_group_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>Clock_Date &amp; time settings_P04_3</extra-loc-viewid>
+    <extra-loc-viewid>Clock main view_P01</extra-loc-viewid>
     <extra-loc-positionid>setlabel_1_val</extra-loc-positionid>
     <extra-loc-feature>Cl</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>