diff -r b01126ce0bec -r ba63c83f4716 menufw/menusuites/foldersuite/data/matrixmenudata_vga.xml
--- a/menufw/menusuites/foldersuite/data/matrixmenudata_vga.xml	Wed Sep 15 12:00:00 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,431 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xcfwml SYSTEM "matrixmenudata.dtd">
-<menu:data xmlns:menu="http:://www.s60.com/xml/applicationshell/1" version="5.0">
-    <menu:folder title_name="&qtn_fldr_root_level;" long_name="&qtn_fldr_root_level;" short_name="&qtn_fldr_root_level;">
-        <!--Calendar-->
-        <menu:application uid="0x10005901"/>
-        <!--Contacts application-->
-        <menu:application uid="0x101F4CCE"/>
-        <!--Music folder-->
-        <menu:folder title_name="&qtn_apps_music_title;"
-                    long_name="&qtn_apps_music_list;"
-                    short_name="&qtn_apps_music_grid;"
-                    applicationgroup_name="Music"
-                    icon_file="z:\resource\apps\matrixmenudata.mif"
-                    icon_id="16384"
-                    mask_id="16385"
-                    icon_skin_minor_id="0x2176"
-                    icon_skin_major_id="0x101F86E3">
-            <!-- Music Player (MusicPlayer)-->
-            <menu:application uid="0x102072C3"/>
-            <!-- Radio -->
-            <menu:application uid="0x10207A89"/>
-            <!-- Ovi Music -->
-            <menu:application uid="0x101FFB51"/>
-            <!--FM transmitter-->
-            <menu:application uid="0x10282BEF"/>
-        </menu:folder>
-        <!--Video & TV Folder-->
-        <menu:folder title_name="&qtn_apps_videotv_title;" 
-                    long_name="&qtn_apps_videotv_list;" 
-                    short_name="&qtn_apps_videotv_grid;" 
-                    applicationgroup_name="TV&Video"
-                    icon_file="z:\resource\apps\matrixmenudata.mif" 
-                    icon_id="16390" 
-                    mask_id="16391" 
-                    icon_skin_minor_id="0x217d" 
-                    icon_skin_major_id="0x101F86E3" >
-            <!-- Videos -->
-            <menu:application uid="0x200159B2"/> 
-            <!-- video services folder -->
-            <menu:folder title_name="&qtn_apps_video_list;" 
-                    long_name="&qtn_apps_video_list;" 
-                    short_name="&qtn_apps_video_grid;"
-                    applicationgroup_name="VideoServices"
-                    icon_file="z:\resource\apps\VideoServices_AIF.mif"
-                    icon_id="16384" 
-                    mask_id="16385">
-                <!-- Youtube-->
-                <menu:application uid="0x2000FBBA"/>
-            </menu:folder>
-            <!--web tv folder-->
-            <menu:folder title_name="&qtn_apps_webtv_widgets_title;" 
-                    long_name="&qtn_apps_webtv_wigdets_list;" 
-                    short_name="&qtn_apps_webtv_wigdets_grid;"
-                    applicationgroup_name="WebTv"
-                    icon_file="z:\resource\apps\vasco_icons.mif"
-                    icon_id="16384" 
-                    mask_id="16385">
-                <!--WebTV Demo-->
-                <menu:application uid="0x2000DDB6" predefined_widget="true"/>
-                <!--CNN Video-->
-                <menu:application uid="0x2000DD9D" predefined_widget="true"/>
-                <!--Nat Geo-->                   
-                <menu:application uid="0x2000DDA6" predefined_widget="true"/>
-                <!--E!-->                        
-                <menu:application uid="0x2000DDA0" predefined_widget="true"/>
-                <!--Movie Teasers-->             
-                <menu:application uid="0x2000dadb" predefined_widget="true"/>
-                <!--Get more link-->
-                <menu:url uid="0x99999988" short_name="&qtn_apps_get_more_grid;" long_name="&qtn_apps_get_more_list;" 
-                        title_name="&qtn_apps_get_more_list;" url="http://more.store.ovi.mobi/av_webtv" 
-                        lock_delete="1" icon_file="z:\resource\apps\vasco_icons.mif" icon_id="16388" mask_id="16389"/>
-                <menu:application uid="0x2000DDBD" predefined_widget="true"/> <!--Al Jazeera-->
-                <menu:application uid="0x2000DDBE" predefined_widget="true"/> <!--Terra TV LTA-->
-                <menu:application uid="0x2000DDBF" predefined_widget="true"/> <!--Terra TV Brazil-->
-                <menu:application uid="0x2000DD93" predefined_widget="true"/> <!--WebTV - ifeng	ifeng.wgz                     -->
-                <menu:application uid="0x2000DD94" predefined_widget="true"/> <!--WebTV - Bh TV Local	bhtv_local.wgz          -->
-                <menu:application uid="0x2000DD95" predefined_widget="true"/> <!--WebTV - Bh TV Live	bhtv_live.wgz           -->
-                <menu:application uid="0x2000DD96" predefined_widget="true"/> <!--WebTV - M1TV	m1tv.wgz                      -->
-                <menu:application uid="0x2000DD97" predefined_widget="true"/> <!--WebTV - imgo	imgo.wgz                      -->
-                <menu:application uid="0x2000DD98" predefined_widget="true"/> <!--WebTV - 8tv	8tv.wgz                         -->
-                <menu:application uid="0x2000DD99" predefined_widget="true"/> <!--WebTV - vesti_russia	vesti_russia.wgz      -->
-                <menu:application uid="0x2000DD9A" predefined_widget="true"/> <!--WebTV - aftonbladettv	aftonbladettv.wgz     -->
-                <menu:application uid="0x2000DD9B" predefined_widget="true"/> <!--WebTV - bbcatv	bbcatv_webtv.wgz            -->
-                <menu:application uid="0x2000DD9C" predefined_widget="true"/> <!--WebTV - channelnewsasia	channelnewsasia.wgz -->
-                <menu:application uid="0x2000DD9E" predefined_widget="true"/> <!--WebTV - digiturk	digiturk.wgz              -->
-                <menu:application uid="0x2000DD9F" predefined_widget="true"/> <!--WebTV - efe_videos	efe_videos.wgz          -->
-                <menu:application uid="0x2000DDA1" predefined_widget="true"/> <!--WebTV - eros_widget	eros_widget.wgz         -->
-                <menu:application uid="0x2000DDA2" predefined_widget="true"/> <!--WebTV - india_today	india_today.wgz         -->
-                <menu:application uid="0x2000DDA3" predefined_widget="true"/> <!--WebTV - iplayer	iplayer.wgz                 -->
-                <menu:application uid="0x2000DDA4" predefined_widget="true"/> <!--WebTV - makansutra	makansutra.wgz          -->
-                <menu:application uid="0x2000DDA5" predefined_widget="true"/> <!--WebTV - mtvs	mtvs.wgz                      -->
-                <menu:application uid="0x2000DDA7" predefined_widget="true"/> <!--WebTV - nokiaonyoutube	nokiaonyoutube.wgz  -->
-                <menu:application uid="0x2000DDA8" predefined_widget="true"/> <!--WebTV - nrk_mobiltv	nrk_mobiltv.wgz         -->
-                <menu:application uid="0x2000DDA9" predefined_widget="true"/> <!--WebTV - ontv	ontv.wgz                      -->
-                <menu:application uid="0x2000DDAA" predefined_widget="true"/> <!--WebTV - paramount	paramount.wgz             -->
-                <menu:application uid="0x2000DDAB" predefined_widget="true"/> <!--WebTV - sftvreader	sftvreader.wgz          -->
-                <menu:application uid="0x2000DDAC" predefined_widget="true"/> <!--WebTV - sina	WebTV-2.wgz                   -->
-                <menu:application uid="0x2000DDAD" predefined_widget="true"/> <!--WebTV - skynews	skynews.wgz                 -->
-                <menu:application uid="0x2000DDAE" predefined_widget="true"/> <!--WebTV - sohuwebtv	sohuwebtv.wgz             -->
-                <menu:application uid="0x2000DDAF" predefined_widget="true"/> <!--WebTV - tudou	tudou.wgz                     -->
-                <menu:application uid="0x2000DDB0" predefined_widget="true"/> <!--WebTV - tv2news	tv2news.wgz                 -->
-                <menu:application uid="0x2000DDB1" predefined_widget="true"/> <!--WebTV - tv2play	tv2play.wgz                 -->
-                <menu:application uid="0x2000DDB2" predefined_widget="true"/> <!--WebTV - tv3	tv3.wgz                         -->
-                <menu:application uid="0x2000DDB3" predefined_widget="true"/> <!--WebTV - viasat_no	viasat_no.wgz             -->
-                <menu:application uid="0x2000DDB4" predefined_widget="true"/> <!--WebTV - viasat_se	viasat_se.wgz             -->
-                <menu:application uid="0x2000DDB5" predefined_widget="true"/> <!--WebTV - virtualmalaysia	virtualmalaysia.wgz -->
-                <menu:application uid="0x2000DDB7" predefined_widget="true"/> <!--WebTV - yle	yle.wgz                         -->
-                <menu:application uid="0x2000DDB8" predefined_widget="true"/> <!--WebTV - youku	youku.wgz                     -->
-                <!--Extra WRT widget uid's-->     
-                <menu:application uid="0x2000DDBC" predefined_widget="true"/>
-                <menu:application uid="0x2000DDBB" predefined_widget="true"/>
-                <menu:application uid="0x2000DDBA" predefined_widget="true"/>
-                <menu:application uid="0x2000DD80" predefined_widget="true"/>	
-                <menu:application uid="0x2000DD81" predefined_widget="true"/> 
-                <menu:application uid="0x2000DD82" predefined_widget="true"/>
-                <menu:application uid="0x2000DD83" predefined_widget="true"/>
-                <menu:application uid="0x2000DD84" predefined_widget="true"/>
-                <menu:application uid="0x2000DD85" predefined_widget="true"/>
-                <menu:application uid="0x2000DD86" predefined_widget="true"/>
-                <menu:application uid="0x2000DD87" predefined_widget="true"/>
-                <menu:application uid="0x2000DD88" predefined_widget="true"/>
-                <menu:application uid="0x2000DD89" predefined_widget="true"/>
-                <menu:application uid="0x2000DD8A" predefined_widget="true"/>
-                <menu:application uid="0x2000DD8B" predefined_widget="true"/>
-                <menu:application uid="0x2000DD8C" predefined_widget="true"/>
-                <menu:application uid="0x2000DD8D" predefined_widget="true"/>
-                <menu:application uid="0x2000DD8E" predefined_widget="true"/>
-                <menu:application uid="0x2000DD8F" predefined_widget="true"/>
-                <menu:application uid="0x2000DD90" predefined_widget="true"/>
-                <menu:application uid="0x2000DD91" predefined_widget="true"/>
-                <menu:application uid="0x2000DD92" predefined_widget="true"/>                    
-            </menu:folder>
-        </menu:folder>
-        <!--Internet folder-->
-        <!--  now using qgnmenugroupweb available in skin -->
-        <!-- <menu:folder title_name="&qtn_apps_browserng_title;"
-                    long_name="&qtn_apps_internet_list;"
-                    short_name="&qtn_apps_internet_grid;"
-                    applicationgroup_name="internet"
-                    icon_file="z:\resource\apps\matrixmenudata.mif"
-                    icon_id="16386"
-                    mask_id="16387"
-                    icon_skin_minor_id="0x2005"
-                    icon_skin_major_id="0x101F86E3" > -->
-        <!--Browser-->
-        <menu:application uid="0x10008D39"/>
-            <!--Online Search-->
-            <!-- <menu:application uid="0x20000907"/> -->
-        <!-- </menu:folder> -->
-        <!--Messaging application-->
-        <menu:application uid="0x100058C5"/>
-        <!--Photos application-->
-        <menu:application uid="0x200009EE"/>
-        <!--Ovi Store application-->
-        <menu:application uid="0x20007803" />
-        <!--Settings/Control Panel-->
-        <menu:application uid="0x100058EC"/>
-        <!--Maps application-->
-        <menu:application uid="0x20001F63"/>
-        <!--Social Networks-->
-        <menu:folder title_name="&qtn_apps_social_networks_title;"
-                    long_name="&qtn_apps_social_networks_list;" 
-                    short_name="&qtn_apps_social_networks_grid;"
-                    applicationgroup_name="Social Networks"
-                    icon_file="z:\resource\apps\matrixmenudata.mif"
-                    icon_id="16394" 
-                    mask_id="16395" 
-                    icon_skin_minor_id="0x2618" 
-                    icon_skin_major_id="0x101F86E3">
-            <!--Communities-->
-            <menu:application uid="0x2000DD5A" predefined_widget="true"/>
-            <!--Facebook-->
-            <menu:application uid="0x2002699D"/>
-            <!--Twitter-->
-            <menu:application uid="0x200269A1"/>
-            <!--RenRen-->
-            <menu:application uid="0x2002F952"/>
-            <!-- Hi5 -->
-            <menu:application uid="0x2000DD56"/>
-            <!-- LinkedIn -->
-            
-        </menu:folder>
-        <!--Application folder-->
-        <menu:folder applicationgroup_name="applications"
-                    default="1"
-                    title_name="&qtn_apps_appsfolder_title;"
-                    long_name="&qtn_apps_applications_list;"
-                    short_name="&qtn_apps_applications_grid;"
-                    icon_file="z:\resource\apps\matrixmenudata.mif"
-                    icon_id="16392"
-                    mask_id="16393"
-                    icon_skin_minor_id="0x2174"
-                    icon_skin_major_id="0x101F86E3">
-            <!-- eMail application -->
-            <menu:application uid="0x2001E277"/>
-            <!--Clock-->
-            <menu:application uid="0x10005903"/>            
-            <!-- Log -->
-            <menu:application uid="0x101F4CD5"/>            
-            <!--Office folder-->
-            <menu:folder title_name="&qtn_apps_office_title;"
-                    long_name="&qtn_apps_office_list;"
-                    short_name="&qtn_apps_office_grid;"
-                    applicationgroup_name="Office"
-                    icon_file="z:\resource\apps\matrixmenudata.mif"
-                    icon_id="16398"
-                    mask_id="16399"
-                    icon_skin_minor_id="0x1ead"
-                    icon_skin_major_id="0x101F86E3">
-                <!--File Manager-->
-                <menu:application uid="0x101F84EB"/>  
-                <!--Ovi Files-->				 
-                <menu:application uid="0x2000DD58" predefined_widget="true"/>
-                <!--Dictionary-->
-                <menu:application uid="0x200159D0"/>
-                <!--Intranet-->
-                <menu:application uid="0x20002595"/>
-                <!--Notes-->
-                <menu:application uid="0x10005907"/>
-                <!--Quick office -->
-                <menu:application uid="0x200002C0"/>
-                <!--Zip-->
-                <menu:application uid="0x2000023D"/>
-                <!--Calculator-->
-                <menu:application uid="0x10005902"/>
-                <!--Podcasting-->            
-                <menu:application uid="0x100058CA"/>
-                <!--Voice recorder-->
-                <menu:application uid="0x10282411"/>         
-                <!--Adobe PDF-->
-                <menu:application uid="0x2000CD2B"/>
-                <!--F secure-->
-                <menu:application uid="0x20001c27"/>
-                <!--Message reader-->
-                <menu:application uid="0x10201B00"/>
-                <!--Multiscanner-->
-                <menu:application uid="0x2000F5BF"/>
-            </menu:folder>            
-            <!--Tools folder-->
-            <!-- Sushi -->
-            <!-- <menu:folder title_name="&qtn_apps_tools_title;" 
-                    long_name="&qtn_apps_tools_list;" 
-                    short_name="&qtn_apps_tools_grid;"
-                    applicationgroup_name="Tools" 
-                    icon_file="z:\resource\apps\att_icons.mif" 
-                    icon_id="16400" 
-                    mask_id="16401"> -->
-            <!-- Vasco -->        
-            <menu:folder title_name="&qtn_apps_tools_title;" 
-                    long_name="&qtn_apps_tools_list;" 
-                    short_name="&qtn_apps_tools_grid;"
-                    applicationgroup_name="Tools"
-                    icon_file="z:\resource\apps\vasco_icons.mif"
-                    icon_id="16386" 
-                    mask_id="16387">
-                <!--Phone setup-->
-                <menu:application uid="0x200122A4"/>
-                <!--Sw update-->
-                <menu:application uid="0x2001FE2F"/>
-                <!--Ovi sync-->
-                <menu:application uid="0x20016C02"/>
-                <!-- Settings wizard -->
-                <menu:application uid="0x10281C96"/>
-                <!--My Nokia-->
-                <menu:application uid="0x2000F8A6"/>
-                <!--Font Magnifier-->
-                <menu:application uid="0x2002DEFF"/>
-                <!--About-->
-                <menu:application uid="0x10005A22"/>
-            </menu:folder>            
-            <!--Search application-->
-            <menu:application uid="0x200044D5"/>
-            <!-- Downloaded (if possible) -->
-            <menu:folder title_name="&qtn_apps_my_apps_title;"
-                    long_name="&qtn_apps_my_apps_list;"
-                    short_name="&qtn_apps_my_apps_grid;"
-                    applicationgroup_name="Downloaded"
-                    icon_file="z:\resource\apps\taika_icons.mif"
-                    icon_id="16392"
-                    mask_id="16393"
-                    icon_skin_minor_id="0x2173"
-                    icon_skin_major_id="0x101F86E3">                    
-            </menu:folder>
-            <!-- User Guide -->
-            <menu:application uid="0x10005234"/>
-            <!-- Chat IM -->
-            <menu:application uid="0x2000DD59" predefined_widget="true"/>
-            <!--Camera-->
-            <menu:application uid="0x101F857A"/>            
-            <!--Photo Editor-->
-            <menu:application uid="0x20026F35"/>
-            <!--Video Editor-->
-            <menu:application uid="0x20026F2F"/>            
-            <!--Games folder-->
-            <menu:folder title_name="&qtn_apps_games_title;"
-                    long_name="&qtn_apps_games_list;"
-                    short_name="&qtn_apps_games_grid;"
-                    applicationgroup_name="Games"
-                    icon_file="z:\resource\apps\matrixmenudata.mif"
-                    icon_id="16396"
-                    mask_id="16397"
-                    icon_skin_minor_id="0x2184"
-                    icon_skin_major_id="0x101F86E3" >
-                <!--Games/N-Gage application-->
-                <!-- <menu:application uid="0x20007B39" /> -->
-                <!--Climate mission-->
-                <!--<menu:application uid="0x2002A09D"/> -->
-                <!--Maps OVI challenge-->
-                <!-- <menu:application uid="0x2002A08C"/> -->
-            </menu:folder>
-            <!--Here and Now-->
-            <menu:application uid="0x2000E557"/>
-            <!--Traveler-->
-            <menu:application uid="0x2001E1AE"/>
-            <!-- PinFree.me -->
-            
-            <!-- Operator menu -->
-            <menu:application uid="0x10008D5E"/>
-            <!-- Plus all widgets -->
-        </menu:folder>
-        <menu:folder flags="hidden" long_name="mcsplugin_folder">
-            <menu:application uid="0x100058EC"
-                            view="0x10207250"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16394"
-                            mask_id="16395"
-                            long_name="&qtn_apps_connectivity_list;"/>
-
-            <menu:application uid="0x100058EC"
-                            view="0x10283321"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16392"
-                            mask_id="16393"
-                            long_name="&qtn_apps_installations_list;"/>
-
-            <menu:shortcut    uid="0x99999999"
-                            long_name="&qtn_apps_newmessage_list;"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16406"
-                            mask_id="16407"
-                            icon_skin_minor_id="0x2056"
-                            icon_skin_major_id="0x101F86E3"
-                            param="messaging:msg"/>
-
-            <menu:shortcut    uid="0x99999998"
-                            long_name="&qtn_apps_msgtypeselection_list;"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16388"
-                            mask_id="16389"
-                            icon_skin_minor_id="0x2058"
-                            icon_skin_major_id="0x101F86E3"
-                            param="messaging:seltype"/>
-
-            <menu:shortcut    uid="0x99999997"
-                            long_name="&qtn_apps_newemail_list;"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16402"
-                            mask_id="16403"
-                            param="messaging:email"/>
-
-            <menu:shortcut    uid="0x99999996"
-                            long_name="&qtn_apps_newsyncml_list;"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16390"
-                            mask_id="16391"
-                            icon_skin_minor_id="0x205a"
-                            icon_skin_major_id="0x101F86E3"
-                            param="messaging:syncmlmail"/>
-
-            <menu:shortcut    uid="0x99999995"
-                            long_name="&qtn_apps_newpostcard_list;"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16400"
-                            mask_id="16401"
-                            icon_skin_minor_id="0x2057"
-                            icon_skin_major_id="0x101F86E3"
-                            param="messaging:postcard"/>
-
-            <menu:shortcut    uid="0x99999994"
-                            long_name="&qtn_apps_newaudiomsg_list;"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16404"
-                            mask_id="16405"
-                            param="messaging:audiomsg"/>
-
-            <menu:shortcut    flags="hidden"
-                            uid="0x99999991"
-                            long_name="&qtn_apps_undefined_list;"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16410"
-                            mask_id="16411"
-                            icon_skin_minor_id="0x24ba"
-                            icon_skin_major_id="0x101F86E3"/>
-
-            <menu:shortcut    uid="0x99999989"
-                            long_name="&qtn_apps_dialledcalls_list;"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16398"
-                            mask_id="16399"
-                            param="logs:dialed"/>
-
-          <menu:shortcut    flags="hidden"
-                            uid="0x99999990"
-                            long_name="&qtn_apps_manage_list;"
-                            icon_file="aimcsplugin.mif"
-                            icon_id="16408"
-                            mask_id="16409"
-                            icon_skin_minor_id="0x25f0"
-                            icon_skin_major_id="0x101F86E3"/>
-
-            <menu:shortcut    uid="0x99999992"
-                            long_name="&qtn_apps_profiles_list;"
-                            icon_file="profileapp_aif.mif"
-                            icon_id="16384"
-                            mask_id="16385"
-                            param="profiles"/>
-                            			    
-            <!-- Menu Application Launcher -->
-            <menu:application uid="0x101F4CD2"/>
-            <!-- Themes Application Launcher -->
-            <menu:application uid="0x10005A32"/>
-            <!-- Photos Suite launcher -->
-            <menu:application uid="0x200104E4"/>
-            <!-- Video Suite launcher -->
-            <menu:application uid="0x200211FA"/>
-            <!-- Conversation application -->
-            <menu:application uid="0x2002A540"/>
-        </menu:folder>
-    </menu:folder>
-</menu:data>