diff -r 9dbe1b043bea -r e4e3998ddda2 skins/AknSkins/sdcinc/AknsConvertedConstants_NR.inl
--- a/skins/AknSkins/sdcinc/AknsConvertedConstants_NR.inl	Thu Aug 19 10:53:51 2010 +0300
+++ b/skins/AknSkins/sdcinc/AknsConvertedConstants_NR.inl	Tue Aug 31 16:13:36 2010 +0300
@@ -818,8 +818,6 @@
 {L"KAknsIIDQgnNoteFaxpcAnim",  EAknsMajorAvkon, EAknsMinorQgnNoteFaxpcAnim },
 {L"KAknsIIDQgnGrafBarWaitAnim",  EAknsMajorAvkon, EAknsMinorQgnGrafBarWaitAnim },
 {L"KAknsIIDQgnGrafFpsSwipeAnim",  EAknsMajorAvkon, EAknsMinorQgnGrafFpsSwipeAnim },
-{L"KAknsIIDQgnGrafVideoPluginAnimVideoPlaying",  EAknsMajorAvkon, EAknsMinorQgnGrafVideoPluginAnimVideoPlaying },
-{L"KAknsIIDQgnNoteKeyguardTounlockAnimLeft",  EAknsMajorAvkon, EAknsMinorQgnNoteKeyguardTounlockAnimLeft },
 {L"KAknsIIDQgnMenuWmlAnim",  EAknsMajorAvkon, EAknsMinorQgnMenuWmlAnim },
 {L"KAknsIIDQgnIndiWaitWmlCsdAnim",  EAknsMajorAvkon, EAknsMinorQgnIndiWaitWmlCsdAnim },
 {L"KAknsIIDQgnIndiWaitWmlGprsAnim",  EAknsMajorAvkon, EAknsMinorQgnIndiWaitWmlGprsAnim },
@@ -5478,16 +5476,6 @@
 {L"KAknsIIDQgnHomeWmButtonPressedL",  EAknsMajorSkin, EAknsMinorQgnHomeWmButtonPressedL},
 {L"KAknsIIDQgnHomeWmButtonPressedR",  EAknsMajorSkin, EAknsMinorQgnHomeWmButtonPressedR},
 {L"KAknsIIDQgnHomeWmButtonPressedCenter",  EAknsMajorSkin, EAknsMinorQgnHomeWmButtonPressedCenter},
-{L"KAknsIIDQgnFrInputIcfBg",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBg},
-{L"KAknsIIDQgnFrInputIcfBgTl",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBgTl},
-{L"KAknsIIDQgnFrInputIcfBgTr",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBgTr},
-{L"KAknsIIDQgnFrInputIcfBgBl",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBgBl},
-{L"KAknsIIDQgnFrInputIcfBgBr",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBgBr},
-{L"KAknsIIDQgnFrInputIcfBgT",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBgT},
-{L"KAknsIIDQgnFrInputIcfBgB",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBgB},
-{L"KAknsIIDQgnFrInputIcfBgL",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBgL},
-{L"KAknsIIDQgnFrInputIcfBgR",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBgR},
-{L"KAknsIIDQgnFrInputIcfBgCenter",  EAknsMajorSkin, EAknsMinorQgnFrInputIcfBgCenter},
 {L"KAknsIIDQgnGrafBlidFlag",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafBlidFlag },
 {L"KAknsIIDQgnGrafBlidSearching",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafBlidSearching },
 {L"KAknsIIDQgnGrafBlidSearchingSmall",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafBlidSearchingSmall },
@@ -7032,99 +7020,3 @@
 {L"KAknsIIDQgnGrafSetwizSlide3",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide3 },
 {L"KAknsIIDQgnGrafSetwizSlide4",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide4 },
 {L"KAknsIIDQgnGrafSetwizSlide5",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide5 },
-{L"KAknsIIDQgnIndiNaviColor",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiNaviColor },
-{L"KAknsIIDQgnAppsShopmusicList",  EAknsMajorGeneric, EAknsMinorGenericQgnAppsShopmusicList },
-{L"KAknsIIDQgnIndiMpttvTbMark",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiMpttvTbMark },
-{L"KAknsIIDQgnIndiUsbMemc",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiUsbMemc },
-{L"KAknsIIDQgnMenuAttMusic",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuAttMusic },
-{L"KAknsIIDQgnMenuGroupWebapps",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuGroupWebapps },
-{L"KAknsIIDQgnMenuRss",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuRss },
-{L"KAknsIIDQgnMenuShortcutAdd",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuShortcutAdd },
-{L"KAknsIIDQgnIndiBrowserTbDownloads",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiBrowserTbDownloads },
-{L"KAknsIIDQgnIndiFebAsterisk",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiFebAsterisk },
-{L"KAknsIIDQsnBigclockAnalogueFaceScreensaver",  EAknsMajorGeneric, EAknsMinorGenericQsnBigclockAnalogueFaceScreensaver },
-{L"KAknsIIDQgnHsNfcOff",  EAknsMajorGeneric, EAknsMinorGenericQgnHsNfcOff },
-{L"KAknsIIDQgnHsNfcOn",  EAknsMajorGeneric, EAknsMinorGenericQgnHsNfcOn },
-{L"KAknsIIDQgnIndiCam4Auto",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4Auto },
-{L"KAknsIIDQgnIndiNsliderLevelMuted",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiNsliderLevelMuted },
-{L"KAknsIIDQgnIndiNsliderLevelUnmuted",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiNsliderLevelUnmuted },
-{L"KAknsIIDQgnMenuFriendster",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuFriendster },
-{L"KAknsIIDQgnMenuLinkedin",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuLinkedin },
-{L"KAknsIIDQgnMenuOrkut",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuOrkut },
-{L"KAknsIIDQgnMenuPicasa",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuPicasa },
-{L"KAknsIIDQgnMenuZipManager",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuZipManager },
-{L"KAknsIIDQgnPropFolderSubUnsub",  EAknsMajorGeneric, EAknsMinorGenericQgnPropFolderSubUnsub },
-{L"KAknsIIDQgnPropSwitchFetch",  EAknsMajorGeneric, EAknsMinorGenericQgnPropSwitchFetch },
-{L"KAknsIIDQgnPropSwitchFetchUp",  EAknsMajorGeneric, EAknsMinorGenericQgnPropSwitchFetchUp },
-{L"KAknsIIDQgnPropSwitchStore",  EAknsMajorGeneric, EAknsMinorGenericQgnPropSwitchStore },
-{L"KAknsIIDQgnPropSwitchStoreUp",  EAknsMajorGeneric, EAknsMinorGenericQgnPropSwitchStoreUp },
-{L"KAknsIIDQgnPropSwitchSynchronise",  EAknsMajorGeneric, EAknsMinorGenericQgnPropSwitchSynchronise },
-{L"KAknsIIDQgnPropSwitchSynchroniseUp",  EAknsMajorGeneric, EAknsMinorGenericQgnPropSwitchSynchroniseUp },
-{L"KAknsIIDQgnMenuShareOnline",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuShareOnline },
-{L"KAknsIIDQgnPropSetCamTab2",  EAknsMajorGeneric, EAknsMinorGenericQgnPropSetCamTab2 },
-{L"KAknsIIDQtgIndiSquareGrid",  EAknsMajorGeneric, EAknsMinorGenericQtgIndiSquareGrid },
-{L"KAknsIIDQgnHereAndNowApp",  EAknsMajorGeneric, EAknsMinorGenericQgnHereAndNowApp },
-{L"KAknsIIDQgnIndiInputQwertyPage11Ah",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiInputQwertyPage11Ah },
-{L"KAknsIIDQgnIndiInputQwertyPage12Ah",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiInputQwertyPage12Ah },
-{L"KAknsIIDQgnIndiInputQwertyPage22Ah",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiInputQwertyPage22Ah },
-{L"KAknsIIDQgnIndiTbOviMusic",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiTbOviMusic },
-{L"KAknsIIDQgnMenuGroupMyapps",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuGroupMyapps },
-{L"KAknsIIDQgnMenuOtasyncLst",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuOtasyncLst },
-{L"KAknsIIDQgnNoteOtasyncCreatebu",  EAknsMajorGeneric, EAknsMinorGenericQgnNoteOtasyncCreatebu },
-{L"KAknsIIDQgnNoteOtasyncRetrievebu",  EAknsMajorGeneric, EAknsMinorGenericQgnNoteOtasyncRetrievebu },
-{L"KAknsIIDQgnNoteOtasyncSync",  EAknsMajorGeneric, EAknsMinorGenericQgnNoteOtasyncSync },
-{L"KAknsIIDQgnPropOtasyncLog",  EAknsMajorGeneric, EAknsMinorGenericQgnPropOtasyncLog },
-{L"KAknsIIDQgnPropOtasyncSync",  EAknsMajorGeneric, EAknsMinorGenericQgnPropOtasyncSync },
-{L"KAknsIIDQgnPropPslnAudioThemeSub",  EAknsMajorGeneric, EAknsMinorGenericQgnPropPslnAudioThemeSub },
-{L"KAknsIIDQgnGrafCamSplash",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafCamSplash },
-{L"KAknsIIDQgnGrafTaskswitcherCamcoder",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafTaskswitcherCamcoder },
-{L"KAknsIIDQgnGrafTaskswitcherCamera",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafTaskswitcherCamera },
-{L"KAknsIIDQgnPropSocialCommunities",  EAknsMajorGeneric, EAknsMinorGenericQgnPropSocialCommunities },
-{L"KAknsIIDQgnIndiVid4TbCamera",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiVid4TbCamera },
-{L"KAknsIIDQgnNoteSwitchPlugin",  EAknsMajorGeneric, EAknsMinorGenericQgnNoteSwitchPlugin },
-{L"KAknsIIDQgnPropAttach",  EAknsMajorGeneric, EAknsMinorGenericQgnPropAttach },
-{L"KAknsIIDQgnPropNewMessage",  EAknsMajorGeneric, EAknsMinorGenericQgnPropNewMessage },
-{L"KAknsIIDQgnPropOutbox",  EAknsMajorGeneric, EAknsMinorGenericQgnPropOutbox },
-{L"KAknsIIDQgnIndiInputCaseNumeric2",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiInputCaseNumeric2 },
-{L"KAknsIIDQgnMenuIntrovideo",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuIntrovideo },
-{L"KAknsIIDQgnPropCmccSmsbusinesshall",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccSmsbusinesshall },
-{L"KAknsIIDQsnBigclockAnaloguePointerHoursScreensaver",  EAknsMajorGeneric, EAknsMinorGenericQsnBigclockAnaloguePointerHoursScreensaver },
-{L"KAknsIIDQsnBigclockAnaloguePointerMinutesScreensaver",  EAknsMajorGeneric, EAknsMinorGenericQsnBigclockAnaloguePointerMinutesScreensaver },
-{L"KAknsIIDQgnIndiCam4BatteryStrength0",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4BatteryStrength0 },
-{L"KAknsIIDQgnIndiCam4BatteryStrength1",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4BatteryStrength1 },
-{L"KAknsIIDQgnIndiCam4BatteryStrength2",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4BatteryStrength2 },
-{L"KAknsIIDQgnIndiCam4BatteryStrength3",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4BatteryStrength3 },
-{L"KAknsIIDQgnIndiCam4BatteryStrength4",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4BatteryStrength4 },
-{L"KAknsIIDQgnIndiCam4BatteryStrength5",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4BatteryStrength5 },
-{L"KAknsIIDQgnIndiCam4BatteryStrength6",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4BatteryStrength6 },
-{L"KAknsIIDQgnIndiCam4BatteryStrength7",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4BatteryStrength7 },
-{L"KAknsIIDQgnIndiCam4CaptureImage",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4CaptureImage },
-{L"KAknsIIDQgnIndiCam4CaptureImagePressed",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4CaptureImagePressed },
-{L"KAknsIIDQgnIndiCam4CaptureVideo",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4CaptureVideo },
-{L"KAknsIIDQgnIndiCam4CaptureVideoPressed",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCam4CaptureVideoPressed },
-{L"KAknsIIDQgnIndiTbAddToFavourites",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiTbAddToFavourites },
-{L"KAknsIIDQgnMenuSocialNetworks",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuSocialNetworks },
-{L"KAknsIIDQgnPropInternetRadioStation",  EAknsMajorGeneric, EAknsMinorGenericQgnPropInternetRadioStation },
-{L"KAknsIIDQgnWelcomePluginSync",  EAknsMajorGeneric, EAknsMinorGenericQgnWelcomePluginSync },
-{L"KAknsIIDQgnCustomisedPrivacy32x32px",  EAknsMajorGeneric, EAknsMinorGenericQgnCustomisedPrivacy32x32px },
-{L"KAknsIIDQgnCustomisedPrivacy50x50px",  EAknsMajorGeneric, EAknsMinorGenericQgnCustomisedPrivacy50x50px },
-{L"KAknsIIDQgnGrafJavaLogo",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafJavaLogo },
-{L"KAknsIIDQgnMaximumPrivacy32x32px",  EAknsMajorGeneric, EAknsMinorGenericQgnMaximumPrivacy32x32px },
-{L"KAknsIIDQgnMaximumPrivacy50x50px",  EAknsMajorGeneric, EAknsMinorGenericQgnMaximumPrivacy50x50px },
-{L"KAknsIIDQgnMediumPrivacy32x32px",  EAknsMajorGeneric, EAknsMinorGenericQgnMediumPrivacy32x32px },
-{L"KAknsIIDQgnMediumPrivacy50x50px",  EAknsMajorGeneric, EAknsMinorGenericQgnMediumPrivacy50x50px },
-{L"KAknsIIDQgnMinimumPrivacy32x32px",  EAknsMajorGeneric, EAknsMinorGenericQgnMinimumPrivacy32x32px },
-{L"KAknsIIDQgnMinimumPrivacy50x50px",  EAknsMajorGeneric, EAknsMinorGenericQgnMinimumPrivacy50x50px },
-{L"KAknsIIDQgnPropCmccDtmf",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccDtmf },
-{L"KAknsIIDQgnPropCmccDtmfUnsync",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccDtmfUnsync },
-{L"KAknsIIDQgnPropCmccMap",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccMap },
-{L"KAknsIIDQgnPropCmccMapUnsync",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccMapUnsync },
-{L"KAknsIIDQgnPropCmccRingtone",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccRingtone },
-{L"KAknsIIDQgnPropCmccRingtoneUnsync",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccRingtoneUnsync },
-{L"KAknsIIDQgnIndiInputPage",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiInputPage },
-{L"KAknsIIDQgnIndiInputPage1",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiInputPage1 },
-{L"KAknsIIDQgnIndiInputPage2",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiInputPage2 },
-{L"KAknsIIDQtgGrafTaskswitcherVideoPlayer",  EAknsMajorGeneric, EAknsMinorGenericQtgGrafTaskswitcherVideoPlayer },
-{L"KAknsIIDQsnBigclockAnalogueFaceScreensaverStrokeLandscape",  EAknsMajorGeneric, EAknsMinorGenericQsnBigclockAnalogueFaceScreensaverStrokeLandscape },
-{L"KAknsIIDQgnPropCmccSync",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccSync },
-{L"KAknsIIDQgnPropCmccUnsync",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccUnsync },