diff -r 53c8aa5d97a3 -r 8f559c47d7fd camerauis/cameraapp/generic/data/vgacamsettings.rss
--- a/camerauis/cameraapp/generic/data/vgacamsettings.rss	Tue May 25 12:22:04 2010 +0300
+++ b/camerauis/cameraapp/generic/data/vgacamsettings.rss	Wed Jun 09 09:21:41 2010 +0300
@@ -387,6 +387,35 @@
 	{
 	buf = qtn_lcam_tt_video_editor;
 	}
+
+//-----------------------------------------------------------------------------
+//
+//    r_qtn_lcam_hdmi_cable_detected
+//    This popup note is displayed when HDMI cable is plugged to the device
+//    while video recording is ongoing. Video recording is not allowed
+//    with HDMI connection.
+//    popup_note_window
+//-----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_qtn_lcam_hdmi_cable_detected
+	{
+	buf = qtn_lcam_hdmi_cable_detected;
+	}
+
+//-----------------------------------------------------------------------------
+//
+//    r_qtn_lcam_hdmi_remove_cable
+//    This popup note is displayed when user tries to start 
+//    video recording while HDMI cable is plugged. 
+//    Video recording is not allowed with HDMI connection.
+//    popup_note_window
+//-----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_qtn_lcam_hdmi_remove_cable
+	{
+	buf = qtn_lcam_hdmi_remove_cable;
+	}
+
 	
 /**************************************
 *         Other structures            *
@@ -1457,7 +1486,7 @@
                                 {
                                 AVKON_BUTTON_STATE
                                     {
-                                    txt = qtn_lcam_tb_show_viewfinder_grid;
+                                    txt = qtn_lcam_tb_grid;
                                     }
                                 };
                             };
@@ -3182,6 +3211,18 @@
 
 //----------------------------------------------------
 //   
+//    r_qtn_lcam_tb_grid
+//    Text for the 'grid' button in toolbar extension
+//
+//----------------------------------------------------
+//
+RESOURCE TBUF r_qtn_lcam_tb_grid 
+    {
+    buf = qtn_lcam_tb_grid;
+    }
+
+//----------------------------------------------------
+//   
 //    r_qtn_lcam_tt_videoflash
 //    Tooltip for the video button in fixed toolbar
 //