Revision: 201011
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 16 Apr 2010 16:01:57 +0300
changeset 43 1951b3078691
parent 42 2398a337fa76
child 46 bd0cbdaaf2be
child 50 c6286dcf6040
Revision: 201011 Kit: 201015
fontsupport/fontprovider/data/link.ini
layouts/aknlayout2/generated/aknapaclayout.cdl.custom.h
layouts/aknlayout2/generated/aknlayout.cdl.custom.h
layouts/aknlayout2/generated/appapaclayout.cdl.custom.h
layouts/aknlayout2/generated/applayout.cdl.custom.h
layouts/aknlayout2/generated/layoutmetadata.cdl.custom.h
layouts/aknlayout2/generated/skinlayout.cdl.custom.h
layouts/aknlayout2/group/bld.inf
layouts/aknlayout2/layout/Layout change log.txt
locales/loce32/src/ls_coltur.cpp
locales/loce32/src/ls_cy_ms_my_apac.cpp
locales/loce32/src/ls_cymy.cpp
locales/loce32/src/ls_ms_ca.cpp
locales/loce32/src/ls_ms_eu.cpp
locales/loce32/src/ls_ms_gl.cpp
package_definition.xml
skins/AknSkinContent/srcdata/scalableseries60skin/scalableseries60skin.txt
skins/AknSkins/data/AknSkinDescCompiler_NR.EXE
skins/AknSkins/sdcinc/AknsConvertedConstants_NR.inl
skins/AknSkins/sdcinc/SDCGlobals.h
uiresources_pub/skins_api/inc/AknsConstants.h
uiresources_pub/skins_api/inc/AknsConstants.hrh
Binary file fontsupport/fontprovider/data/link.ini has changed
--- a/layouts/aknlayout2/generated/aknapaclayout.cdl.custom.h	Fri Mar 19 09:48:44 2010 +0200
+++ b/layouts/aknlayout2/generated/aknapaclayout.cdl.custom.h	Fri Apr 16 16:01:57 2010 +0300
@@ -22,7 +22,7 @@
 #define AKNAPACLAYOUT_CDL_CUSTOM_H
 
 #include <CdlEngDef.h>
-#include "aknapaclayout.cdl.common.h"
+#include "AknApacLayout.cdl.common.h"
 
 namespace AknApacLayout
 {
--- a/layouts/aknlayout2/generated/aknlayout.cdl.custom.h	Fri Mar 19 09:48:44 2010 +0200
+++ b/layouts/aknlayout2/generated/aknlayout.cdl.custom.h	Fri Apr 16 16:01:57 2010 +0300
@@ -22,7 +22,7 @@
 #define AKNLAYOUT_CDL_CUSTOM_H
 
 #include <CdlEngDef.h>
-#include "aknlayout.cdl.common.h"
+#include "AknLayout.cdl.common.h"
 
 namespace AknLayout
 {
--- a/layouts/aknlayout2/generated/appapaclayout.cdl.custom.h	Fri Mar 19 09:48:44 2010 +0200
+++ b/layouts/aknlayout2/generated/appapaclayout.cdl.custom.h	Fri Apr 16 16:01:57 2010 +0300
@@ -22,7 +22,7 @@
 #define APPAPACLAYOUT_CDL_CUSTOM_H
 
 #include <CdlEngDef.h>
-#include "appapaclayout.cdl.common.h"
+#include "AppApacLayout.cdl.common.h"
 
 namespace AppApacLayout
 {
--- a/layouts/aknlayout2/generated/applayout.cdl.custom.h	Fri Mar 19 09:48:44 2010 +0200
+++ b/layouts/aknlayout2/generated/applayout.cdl.custom.h	Fri Apr 16 16:01:57 2010 +0300
@@ -22,7 +22,7 @@
 #define APPLAYOUT_CDL_CUSTOM_H
 
 #include <CdlEngDef.h>
-#include "applayout.cdl.common.h"
+#include "AppLayout.cdl.common.h"
 
 namespace AppLayout
 {
--- a/layouts/aknlayout2/generated/layoutmetadata.cdl.custom.h	Fri Mar 19 09:48:44 2010 +0200
+++ b/layouts/aknlayout2/generated/layoutmetadata.cdl.custom.h	Fri Apr 16 16:01:57 2010 +0300
@@ -22,7 +22,7 @@
 #define LAYOUTMETADATA_CDL_CUSTOM_H
 
 #include <CdlEngDef.h>
-#include "LayoutMetaData.cdl.common.h"
+#include "layoutmetadata.cdl.common.h"
 
 namespace Layout_Meta_Data
 {
--- a/layouts/aknlayout2/generated/skinlayout.cdl.custom.h	Fri Mar 19 09:48:44 2010 +0200
+++ b/layouts/aknlayout2/generated/skinlayout.cdl.custom.h	Fri Apr 16 16:01:57 2010 +0300
@@ -22,7 +22,7 @@
 #define SKINLAYOUT_CDL_CUSTOM_H
 
 #include <CdlEngDef.h>
-#include "skinlayout.cdl.common.h"
+#include "SkinLayout.cdl.common.h"
 
 namespace SkinLayout
 {
--- a/layouts/aknlayout2/group/bld.inf	Fri Mar 19 09:48:44 2010 +0200
+++ b/layouts/aknlayout2/group/bld.inf	Fri Apr 16 16:01:57 2010 +0300
@@ -63,18 +63,18 @@
 
 // Quick workaround for exporting needed headers that are currently generated and exported
 // only when gencode.cmd is run.
-../generated_inc/layoutpack.cdl.h                        MW_LAYER_PLATFORM_EXPORT_PATH(LayoutPack.cdl.h)
-../generated_inc/layoutpack.cdl.common.h                 MW_LAYER_PLATFORM_EXPORT_PATH(LayoutPack.cdl.common.h)
-../generated_inc/aknlayout.cdl.common.h                  MW_LAYER_PLATFORM_EXPORT_PATH(AknLayout.cdl.common.h)
-../generated_inc/aknapaclayout.cdl.common.h              MW_LAYER_PLATFORM_EXPORT_PATH(AknApacLayout.cdl.common.h)
-../generated_inc/applayout.cdl.common.h                  MW_LAYER_PLATFORM_EXPORT_PATH(AppLayout.cdl.common.h)
-../generated_inc/appapaclayout.cdl.common.h              MW_LAYER_PLATFORM_EXPORT_PATH(AppApacLayout.cdl.common.h)
-../generated_inc/skinlayout.cdl.common.h                 MW_LAYER_PLATFORM_EXPORT_PATH(SkinLayout.cdl.common.h)
-../generated_inc/aknlayoutscalable_avkon.cdl.common.h    MW_LAYER_PLATFORM_EXPORT_PATH(AknLayoutScalable_Avkon.cdl.common.h)
-../generated_inc/aknlayoutscalable_apps.cdl.common.h     MW_LAYER_PLATFORM_EXPORT_PATH(AknLayoutScalable_Apps.cdl.common.h)
-../generated_inc/aknlayoutscalable_uiaccel.cdl.common.h  MW_LAYER_PLATFORM_EXPORT_PATH(AknLayoutScalable_uiaccel.cdl.common.h)
-../generated_inc/cdlfont.cdl.common.h                    MW_LAYER_PLATFORM_EXPORT_PATH(CdlFont.cdl.common.h)
-../generated_inc/layoutmetadata.cdl.common.h             MW_LAYER_PLATFORM_EXPORT_PATH(LayoutMetaData.cdl.common.h)
+../generated_inc/layoutpack.cdl.h                        MW_LAYER_PLATFORM_EXPORT_PATH(layoutpack.cdl.h)
+../generated_inc/layoutpack.cdl.common.h                 MW_LAYER_PLATFORM_EXPORT_PATH(layoutpack.cdl.common.h)
+../generated_inc/aknlayout.cdl.common.h                  MW_LAYER_PLATFORM_EXPORT_PATH(aknlayout.cdl.common.h)
+../generated_inc/aknapaclayout.cdl.common.h              MW_LAYER_PLATFORM_EXPORT_PATH(aknapaclayout.cdl.common.h)
+../generated_inc/applayout.cdl.common.h                  MW_LAYER_PLATFORM_EXPORT_PATH(applayout.cdl.common.h)
+../generated_inc/appapaclayout.cdl.common.h              MW_LAYER_PLATFORM_EXPORT_PATH(appapaclayout.cdl.common.h)
+../generated_inc/skinlayout.cdl.common.h                 MW_LAYER_PLATFORM_EXPORT_PATH(skinlayout.cdl.common.h)
+../generated_inc/aknlayoutscalable_avkon.cdl.common.h    MW_LAYER_PLATFORM_EXPORT_PATH(aknlayoutscalable_avkon.cdl.common.h)
+../generated_inc/aknlayoutscalable_apps.cdl.common.h     MW_LAYER_PLATFORM_EXPORT_PATH(aknlayoutscalable_apps.cdl.common.h)
+../generated_inc/aknlayoutscalable_uiaccel.cdl.common.h  MW_LAYER_PLATFORM_EXPORT_PATH(aknlayoutscalable_uiaccel.cdl.common.h)
+../generated_inc/cdlfont.cdl.common.h                    MW_LAYER_PLATFORM_EXPORT_PATH(cdlfont.cdl.common.h)
+../generated_inc/layoutmetadata.cdl.common.h             MW_LAYER_PLATFORM_EXPORT_PATH(layoutmetadata.cdl.common.h)
 ../generated_inc/displaylayoutmetrics.cdl.h              MW_LAYER_PLATFORM_EXPORT_PATH(displaylayoutmetrics.cdl.h)
 ../generated_inc/displaylayoutmetrics.cdl.common.h       MW_LAYER_PLATFORM_EXPORT_PATH(displaylayoutmetrics.cdl.common.h)
 ../generated_inc/aknapaclayout.cdl.common.hrh              MW_LAYER_PLATFORM_EXPORT_PATH(aknapaclayout.cdl.common.hrh)
--- a/layouts/aknlayout2/layout/Layout change log.txt	Fri Mar 19 09:48:44 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-September 03
-Initial lay files copied from AknLayout
-
-27/10/03
-lay files caught up to AknLayout latest values
-
-28/10/03
-Unification of elaf and apac APIs. The following elaf APIs had parameters added to allow
-apac to work too.
-	TAknTextLineLayout Title_pane_texts_Line_1(TInt aIndex_l, TInt aIndex_W);
-	TAknTextLineLayout Navi_pane_texts_Line_1(TInt aCommon1);
-The following elaf APIs were removed because of duplicate tables:
-	TAknTextLineLayout List_pane_texts__setting_double2__Line_1(TInt aCommon1);
-	TAknTextLineLayout List_pane_texts__setting_double2__Line_2();
-The following elaf APIs had parameter name changes
-	TAknTextLineLayout Wait_or_progress_note_pop_up_window_texts_Line_1(TInt aCommon1, TInt aIndex_r, TInt aIndex_B);
-	TAknMultiLineTextLayout Multiline_Wait_or_progress_note_pop_up_window_texts_Line_1(TInt aCommon1, TInt aIndex_r, TInt aNumberOfLinesShown);
-
-29/10/03
-Unified API for square too.
-Square LAF extracted from P:\Averell\Team\docs\Requirements\LAF\Averell_2.6\Elaf\html\Series_60_2_6_Square_AVKON_LAF_Delta_0_1.htm
-This involves lots of changes to all lay files.
-This is a list of table that we don't want in any API:
-TAknLayoutTableLimits List_pane_elements__double_large_graphic__SUB_TABLE_0_Limits()
-TAknWindowLineLayout List_pane_elements__double_large_graphic__SUB_TABLE_0(TInt aLineIndex)
-TAknLayoutTableLimits Pop_up_windows__main_pane_as_parent__SUB_TABLE_0_Limits()
-TAknWindowLineLayout Pop_up_windows__main_pane_as_parent__SUB_TABLE_0(TInt aLineIndex, TInt aIndex_H)
-TAknLayoutTableLimits Pop_up_windows__main_pane_as_parent__SUB_TABLE_1_Limits()
-TAknWindowLineLayout Pop_up_windows__main_pane_as_parent__SUB_TABLE_1(TInt aLineIndex, TInt aIndex_H)
-TAknLayoutTableLimits Pop_up_windows__main_pane_as_parent__SUB_TABLE_2_Limits()
-TAknWindowLineLayout Pop_up_windows__main_pane_as_parent__SUB_TABLE_2(TInt aLineIndex, TInt aIndex_H)
-Skin LAF re-extracted from P:\Averell\Team\docs\Requirements\LAF\Averell_2.0\skin\html\Series_60_Skin_LAF_R2.0_v2.htm
-
-31/10/03
-AknLayout.cdl regenerated with comments saying what LAF table is the source
-Table API review by MGR to remove unnecessary table API. Removed:
-TAknLayoutTableLimits Status_pane_descendants_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Status_pane_descendants_SUB_TABLE_0(TInt aLineIndex, const TRect& aParentRect);
-TAknLayoutTableLimits Navi_pane_texts_SUB_TABLE_0_Limits();
-TAknTextLineLayout Navi_pane_texts_SUB_TABLE_0(TInt aLineIndex);
-TAknLayoutTableLimits Main_pane_descendants_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Main_pane_descendants_SUB_TABLE_0(TInt aLineIndex);
-TAknLayoutTableLimits Form_pop_up_field_elements_and_descendants_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Form_pop_up_field_elements_and_descendants_SUB_TABLE_0(TInt aLineIndex);
-TAknLayoutTableLimits Form_pop_up_wide_field_elements_and_descendants_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Form_pop_up_wide_field_elements_and_descendants_SUB_TABLE_0(TInt aLineIndex);
-TAknLayoutTableLimits Form_slider_field_elements_and_descendants_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Form_slider_field_elements_and_descendants_SUB_TABLE_0(TInt aLineIndex);
-TAknLayoutTableLimits Form_slider_field_elements_and_descendants_dup_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Form_slider_field_elements_and_descendants_dup_SUB_TABLE_0(TInt aLineIndex);
-TAknLayoutTableLimits List_pane_elements_and_descendants__settings_edited__SUB_TABLE_0_Limits();
-TAknWindowLineLayout List_pane_elements_and_descendants__settings_edited__SUB_TABLE_0(TInt aLineIndex);
-TAknLayoutTableLimits List_pane_elements_and_descendants__settings_edited__SUB_TABLE_1_Limits();
-TAknWindowLineLayout List_pane_elements_and_descendants__settings_edited__SUB_TABLE_1(TInt aLineIndex);
-TAknLayoutTableLimits Pop_up_window_list_pane_descendants_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Pop_up_window_list_pane_descendants_SUB_TABLE_0(TInt aLineIndex, TInt aIndex_t);
-TAknLayoutTableLimits List_pane_elements__menu_single_graphic_heading__SUB_TABLE_0_Limits();
-TAknWindowLineLayout List_pane_elements__menu_single_graphic_heading__SUB_TABLE_0(TInt aLineIndex);
-TAknLayoutTableLimits Data_query_pop_up_window_elements_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Data_query_pop_up_window_elements_SUB_TABLE_0(TInt aLineIndex, const TRect& aParentRect, TInt aCommon1);
-TAknLayoutTableLimits Combined_data_and_code_query_pop_up_window_elements_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Combined_data_and_code_query_pop_up_window_elements_SUB_TABLE_0(TInt aLineIndex, TInt aIndex_C, TInt aIndex_t);
-TAknLayoutTableLimits Combined_data_and_code_query_pop_up_window_elements_SUB_TABLE_1_Limits();
-TAknWindowLineLayout Combined_data_and_code_query_pop_up_window_elements_SUB_TABLE_1(TInt aLineIndex, TInt aIndex_t);
-TAknLayoutTableLimits Colour_selection_pop_up_window_descendants_SUB_TABLE_0_Limits();
-TAknWindowLineLayout Colour_selection_pop_up_window_descendants_SUB_TABLE_0(TInt aLineIndex);
-
-8/12/2003
-API updating to 2.1 and 2.6 versions, where possible.
-The layout API is divided up as {akn, app} x {elaf, apac, square}
-The source documents are:
-Akn     Series_60_EUR_AVKON_LAF_R2.1_v1.0.doc -> AknElaf.lay
-AknApac Series_60_APAC_AVKON_LAF_Delta_R2.1_v1.0.doc -> AknApac.lay
-AknSq   Series_60_2_6_Square_AVKON_LAF_Delta_0_1.doc -> AknElafSq.lay
-App     Series_60_EUR_APPS_LAF_R2.1_v1.0.doc -> AppElaf.lay
-AppApac Series_60_APAC_APPS_LAF_Delta_R2.1_v1.0.doc -> AppApac.lay
-AppSq   Series_60_2_6_Square_Application_LAF_Delta_0_3.doc -> AppElafSq.lay
-Note that LAY file names have changed.
-The avkon changes are going to be a careful update of the API as necessary.
-The apps changes are going to be a complete rebuild of the layout system.
-Both avkon and apps will have a unified elaf/apac/square API.
-AknElaf changes: 
-	Small status pane added to lay and CDL, 
-	no numeric changes made, 
-	BC maintianed.
-AknApac changes: 
-	None taken from LAF, numeric changes only.
-	Comments added to CDL file
-	CDL name changed.
-AknElafSq changes: 
-	Whole LAY file taken.
-	Square LAY modified to match ELAF API where necessary.
-	CDL updated with new square only API
-	Comments added to CDL file
-	CDL name changed.
-Apps elaf, apac and square APIs unified
-	All changes taken
-	New CDL files created
-
-8/1/2004
-Layout compiler extract mode fix has found more tables in elaf and square laf specs
-for avkon and apps. APAC laf specs do not have this problem.
-New tables will be added to the end of the existing APIs.
-Akn elaf: All apparently new tables were already in the Elaf.lay file - they must have had
-their tables corrupted in word some time after they were originally extracted.
-Akn elaf sq: All new tables moved across and unified with elaf.
-Apps elaf: two new tables added to lay file and to the end of the CDL interface
-Apps square: tables added to lay file
-Unification check is good
-
-24/2/2004
-Multiple changes to Avkon layouts to support apac square and abrw square
-New lay files added
-makefile updated to build new packages etc
-data unified between layouts where necessary
-
-2/3/2004
-Multiple changes to App layouts to support AppAbrw
-Note that some changes have forced change to CDL API, which have been manually merged in, breaking SC
-makefile updated to build updated package contents etc
-Unification check fails at present - needs investigation
-
-16/3/2004
-Added AppApacSq and AppAbrwSquare lay files
-makefile updated to build new packages etc
-data unified between layouts where necessary
-minor SC breaking change to CDL API - no known clients
-Unification check fails at present - needs investigation
-
-6/4/2004
-Added skinSq lay file
-added to build system and unirep
-
-8/4/2004
-Added skinAbrw lay file
-added to build system and unirep
-
-15/4/2004
-Added skinAbrwSq lay file
-added to build system and unirep
-
-16/4/2004
-new contents of skin laf extracted from Series_60_2_x_Skin_LAF_3_2.doc, 
-updates applied to skin lay files, mirroring where appropriate. 
-new "scaling" tables added in all cases, even if data redundant, as they refer to scaling of bitmaps not of item placement, so should be separate API. 
-Added API to CDL.
-
-2/3/2006
-Legacy layout files removed from the project.
-The new system uses only adaptation layer to provide clients with legacy layout data.
--- a/locales/loce32/src/ls_coltur.cpp	Fri Mar 19 09:48:44 2010 +0200
+++ b/locales/loce32/src/ls_coltur.cpp	Fri Apr 16 16:01:57 2010 +0300
@@ -18,6 +18,7 @@
 
 #include <kernel/ls_std.h>
 #include <collate.h>
+#include <unicode.h>
 
 const TUint KUidColturCollationMethod = 0x100059DD;
 
@@ -71,9 +72,27 @@
 	2
 	};
 
+static const TUnicodeData TheUnicodeTurkishData[] =	// property table
+	{
+	{ 0, 0, 0, 0, 232, 1 }	// character properties. See the definition of TUnicodeData in /include/unicode.h.
+	};
+static const TUnicodeDataRange TheUnicodeTurkishDataRange[] =	// character range table
+	{
+// This table defines only one character 0x49.
+	{ 0x0, -1 },	// characters 0x0-0x48 has index=-1 into above property table (-1 means not defined)
+	{ 0x49, 0 },	// characters 0x49-0x49 has index=0 into above property table, that is, 0x49 has property {0,0,0,0,232,1}
+	{ 0x4A, -1 }	// characters 0x4A-0x10FFFF has index=-1 into above property table (-1 means not defined)
+	};
+const TUnicodeDataSet TheUnicodeTurkishDataSet =	
+	{
+	TheUnicodeTurkishData, 						// address of above property table
+	TheUnicodeTurkishDataRange, 					// character range table
+	sizeof(TheUnicodeTurkishDataRange)/sizeof(TUnicodeDataRange) 	// character range table size (should be 3 in this case)
+	};
+
 // The one and only locale character set object.
 const LCharSet TheCharSet =
 	{
-	NULL,
+	&TheUnicodeTurkishDataSet,
 	&TheCollationDataSet
 	};
--- a/locales/loce32/src/ls_cy_ms_my_apac.cpp	Fri Mar 19 09:48:44 2010 +0200
+++ b/locales/loce32/src/ls_cy_ms_my_apac.cpp	Fri Apr 16 16:01:57 2010 +0300
@@ -51,7 +51,7 @@
 const TText* const LLocaleData::LongDateFormatSpec = _S("%F%*D %N, %Y");
 const TText* const LLocaleData::TimeFormatSpec = _S("%F%:0%*H%:1%T%:2%S%:3");
 const TFatUtilityFunctions* const LLocaleData::FatUtilityFunctions = NULL;
-const TDay LLocaleData::StartOfWeek = EMonday;
+const TDay LLocaleData::StartOfWeek = ESunday;
 const TClockFormat LLocaleData::ClockFormat = EClockDigital;
 const TUnitsFormat LLocaleData::UnitsGeneral = EUnitsMetric;
 const TUnitsFormat LLocaleData::UnitsDistanceShort = EUnitsMetric;
--- a/locales/loce32/src/ls_cymy.cpp	Fri Mar 19 09:48:44 2010 +0200
+++ b/locales/loce32/src/ls_cymy.cpp	Fri Apr 16 16:01:57 2010 +0300
@@ -52,7 +52,7 @@
 const TText* const LLocaleData::LongDateFormatSpec = _S("%F%*D %N, %Y"); // Month(name) day(no leading zeros), year
 const TText* const LLocaleData::TimeFormatSpec = _S("%F%:0%*I%:1%T%:2%S%:3"); // Hours:Minutes:seconds (without leading zeros)
 const TFatUtilityFunctions* const LLocaleData::FatUtilityFunctions = NULL;
-const TDay LLocaleData::StartOfWeek = EMonday;
+const TDay LLocaleData::StartOfWeek = ESunday;
 const TClockFormat LLocaleData::ClockFormat = EClockDigital;
 const TUnitsFormat LLocaleData::UnitsGeneral = EUnitsMetric;
 const TUnitsFormat LLocaleData::UnitsDistanceShort = EUnitsMetric;
--- a/locales/loce32/src/ls_ms_ca.cpp	Fri Mar 19 09:48:44 2010 +0200
+++ b/locales/loce32/src/ls_ms_ca.cpp	Fri Apr 16 16:01:57 2010 +0300
@@ -27,14 +27,14 @@
 const TText * const LMessages::MsgTable[ELocaleMessages_LastMsg] =
          {
 // Fileserver
-         _S("Reintentar"),                                     // Button 1
-         _S("Detener"),                                        // Button 2
-         _S("Vuelva a introducir el disco"),                   // Put the card back - line1
-         _S("o se perder\x00e1n los datos"),                   // Put the card back - line2
-         _S("Carga de la bater\x00ed"L"a demasiado baja"),     // Low power - line1
-         _S("Imposible terminar escritura en el disco"),       // Low power - line2
-         _S("Error de disco - imposible terminar escritura"),  // Disk error - line1
-         _S("Reint\x00e9ntelo o se perder\x00e1n los datos"),  // Disk error - line2
+         _S("Reintenta"),                                        // Button 1
+         _S("Atura"),                                            // Button 2
+         _S("Torna a col\x00b7"L"locar el disc"),                // Put the card back - line1
+         _S("o es perdran les dades"),                           // Put the card back - line2
+         _S("Bateria massa baixa"),                              // Low power - line1
+         _S("No es pot completar l'escriptura al disc"),         // Low power - line2
+         _S("Error de disc. No es pot completar l'escriptura"),  // Disk error - line1
+         _S("Reintenta-ho o es perdran les dades"),              // Disk error - line2
 // SoundDriver
          _S("Carill\x00f3n"),                                  // Chimes
          _S("Rings"),                                          // Rings
--- a/locales/loce32/src/ls_ms_eu.cpp	Fri Mar 19 09:48:44 2010 +0200
+++ b/locales/loce32/src/ls_ms_eu.cpp	Fri Apr 16 16:01:57 2010 +0300
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:   Default locale messages for Basque, Epoc code 401
+* Description:   Default locale messages for Basque, Epoc code 102
 *
 */
 
@@ -27,14 +27,14 @@
 const TText * const LMessages::MsgTable[ELocaleMessages_LastMsg] =
          {
 // Fileserver
-         _S("Reintentar"),                                     // Button 1
-         _S("Detener"),                                        // Button 2
-         _S("Vuelva a introducir el disco"),                   // Put the card back - line1
-         _S("o se perder\x00e1n los datos"),                   // Put the card back - line2
-         _S("Carga de la bater\x00ed"L"a demasiado baja"),     // Low power - line1
-         _S("Imposible terminar escritura en el disco"),       // Low power - line2
-         _S("Error de disco - imposible terminar escritura"),  // Disk error - line1
-         _S("Reint\x00e9ntelo o se perder\x00e1n los datos"),  // Disk error - line2
+         _S("Saiatu berriz"),                             // Button 1
+         _S("Gelditu"),                                   // Button 2
+         _S("Sartu berriz diskoa"),                       // Put the card back - line1
+         _S("edo datuak galduko dira"),                   // Put the card back - line2
+         _S("Bateria baxuegi"),                           // Low power - line1
+         _S("Ezin da diskoan idazketa osatu"),            // Low power - line2
+         _S("Diskoaren akatsa - ezin da idazketa osatu"), // Disk error - line1
+         _S("Saiatu berriz edo datuak galduko dira"),     // Disk error - line2
 // SoundDriver
          _S("Carill\x00f3n"),                                  // Chimes
          _S("Rings"),                                          // Rings
--- a/locales/loce32/src/ls_ms_gl.cpp	Fri Mar 19 09:48:44 2010 +0200
+++ b/locales/loce32/src/ls_ms_gl.cpp	Fri Apr 16 16:01:57 2010 +0300
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:   Default locale messages for Galician, Epoc code 402
+* Description:   Default locale messages for Galician, Epoc code 103
 *
 */
 
@@ -27,14 +27,14 @@
 const TText * const LMessages::MsgTable[ELocaleMessages_LastMsg] =
          {
 // Fileserver
-         _S("Reintentar"),                                     // Button 1
-         _S("Detener"),                                        // Button 2
-         _S("Vuelva a introducir el disco"),                   // Put the card back - line1
-         _S("o se perder\x00e1n los datos"),                   // Put the card back - line2
-         _S("Carga de la bater\x00ed"L"a demasiado baja"),     // Low power - line1
-         _S("Imposible terminar escritura en el disco"),       // Low power - line2
-         _S("Error de disco - imposible terminar escritura"),  // Disk error - line1
-         _S("Reint\x00e9ntelo o se perder\x00e1n los datos"),  // Disk error - line2
+         _S("Reintentar"),                                        // Button 1
+         _S("Deter"),                                             // Button 2
+         _S("Volva po\x00f1"L"er o disco"),                       // Put the card back - line1
+         _S("ou perderanse os datos"),                            // Put the card back - line2
+         _S("Bater\x00ed"L"a demasiado baixa"),                   // Low power - line1
+         _S("Non se pode finalizar a escritura do disco"),        // Low power - line2
+         _S("Erro no disco - non se pode finalizar a escritura"), // Disk error - line1
+         _S("Reint\x00e9"L"nteo ou perderanse os datos"),         // Disk error - line2
 // SoundDriver
          _S("Carill\x00f3n"),                                  // Chimes
          _S("Rings"),                                          // Rings
--- a/package_definition.xml	Fri Mar 19 09:48:44 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="uiresources" name="UI Resources" levels="compile plugin framework server generic data">
-    <collection id="uiresources_info" name="UI Resources Info" level="data">
-      <component id="uiresources_plat" filter="s60" name="UI Resources Platform Interfaces" class="api">
-      	<!-- can only have one unit, need to include these from main one -->
-        <unit bldFile="uiresources_plat/group"/>
-        <unit bldFile="uiresources_plat/cdl_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/extended_skins_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/graphic_configuration_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/layout_data_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/layout_system_private_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/skins_image_attributes_api/tsrc/group"/>
-      </component>
-      <component id="uiresources_pub" filter="s60" name="UI Resources Public Interfaces" class="api">
-      	<!-- can only have one unit, need to include these from main one -->
-        <unit bldFile="uiresources_pub/group"/>
-        <unit bldFile="uiresources_pub/font_definition_api/tsrc/group"/>
-        <unit bldFile="uiresources_pub/graphics_api/tsrc/group"/>
-        <unit bldFile="uiresources_pub/pictograph_api/tsrc/group"/>
-        <unit bldFile="uiresources_pub/scalable_icons_api/tsrc/group"/>
-        <unit bldFile="uiresources_pub/skins_api/tsrc/group"/>
-      </component>
-    </collection>
-    <collection id="uigraphics" name="UI Graphics" level="generic">
-      <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
-        <unit bldFile="uigraphics/bitmaps2/group"/>
-      </component>
-      <component id="icons" filter="s60" class="config" name="Icons">
-        <unit bldFile="uigraphics/icons/group"/>
-      </component>
-      <component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
-        <unit bldFile="uigraphics/variatedbitmaps/group"/>
-      </component>
-      <component id="aknicon" filter="s60" name="Avkon Icon Framework">
-        <unit bldFile="uigraphics/aknicon/group"/>
-      </component>
-      <component id="palette" filter="s60" name="Palette Utils">
-      	<!-- should this really be commented out? why? -->
-        <!-- <unit bldFile="uigraphics/palette/group"/> -->
-      </component>
-    </collection>
-    <collection id="layouts" name="Layouts" level="plugin">
-      <component id="cdl" filter="s60" name="Customization Definition Language">
-      	<!-- can only have one unti. Need to #include them or split into multiple components -->
-        <unit bldFile="layouts/cdl/cdlengine/group"/>
-        <unit bldFile="layouts/cdl/cdlserver/group"/>
-        <!-- <unit bldFile="layouts/cdl/cdlutils/cdlexplorer/group"/> -->
-      </component>
-      <component id="aknlayout2" filter="s60" name="Avkon Layout 2">
-        <unit bldFile="layouts/aknlayout2/group"/>
-        <!-- need to do something with all these commented-out units -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/nhd_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/nhd_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qhd_touch_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qhd_touch_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qvga2_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qvga2_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qvga_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qvga_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga3_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga3_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga_touch_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga_uiaccel"/> -->
-      </component>
-    </collection>
-    <collection id="skins" name="Skins" level="data">
-      <component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
-        <unit bldFile="skins/aknskincontent/group"/>
-        <!-- <unit bldFile="skins/aknskincontent/srcdata/scalableseries60skin/mifindexdll"/> -->
-      </component>
-      <component id="aknskins" filter="s60" name="Avkon Skin Compiler">
-        <unit bldFile="skins/aknskins/group"/>
-      </component>
-    </collection>
-    <collection id="pictographs" name="Pictographs" level="data">
-      <component id="aknpictograph" filter="s60" name="Avkon Pictograph">
-        <unit bldFile="pictographs/aknpictograph/group"/>
-        <!-- <unit bldFile="pictographs/aknpictograph/tools/aknpictobitmapbuilder/group"/> -->
-      </component>
-    </collection>
-    <collection id="locales" name="Locales" level="framework">
-      <component id="locales_build" filter="s60" name="Locales Build">
-        <unit bldFile="locales/loce32"/>
-      </component>
-    </collection>
-    <collection id="uiconfig" name="UI Config" level="server">
-      <component id="s60config" filter="s60" name="S60 UI Config">
-        <unit bldFile="uiconfig/s60config/group"/>
-      </component>
-    </collection>
-    <collection id="fontsupport" name="Font Support" level="generic">
-      <component id="fontprovider" filter="s60" name="Font Provider">
-        <unit bldFile="fontsupport/fontprovider/group"/>
-      </component>
-      <component id="fontutils" filter="s60" name="Font Utils">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
-    </collection>
-    <collection id="helpthemes" name="Help Themes" level="data">
-      <component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
-        <unit bldFile="helpthemes/group"/>
-      </component>
-    </collection>
-    <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
-      <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
-      	<!-- to be moved here -->
-        <unit bldFile="../uitools/aknlayoutcompiler/group"/>
-      </component>
-    </collection>
-    <collection id="cdlcompiler" name="CDL Compiler" level="compile">
-      <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
-      	<!-- to be moved here -->
-        <unit bldFile="../uitools/cdlcompiler/group"/>
-      </component>
-    </collection>
-    <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
-      <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
-      	<!-- to be moved here -->
-        <unit bldFile="../uitools/cdlcompilertoolkit/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
Binary file skins/AknSkinContent/srcdata/scalableseries60skin/scalableseries60skin.txt has changed
Binary file skins/AknSkins/data/AknSkinDescCompiler_NR.EXE has changed
--- a/skins/AknSkins/sdcinc/AknsConvertedConstants_NR.inl	Fri Mar 19 09:48:44 2010 +0200
+++ b/skins/AknSkins/sdcinc/AknsConvertedConstants_NR.inl	Fri Apr 16 16:01:57 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 {L"KAknsIIDNone",  EAknsMajorNone, EAknsMinorNone },
 {L"KAknsIIDDefault",  EAknsMajorDefault, EAknsMinorDefault },
 {L"KAknsIIDQsnBgScreen",  EAknsMajorSkin, EAknsMinorQsnBgScreen },
@@ -6988,3 +7005,35 @@
 {L"KAknsIIDQgnPropCmccCustomermanage",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCmccCustomermanage },
 {L"KAknsIIDQgnPropModesProfiles",  EAknsMajorGeneric, EAknsMinorGenericQgnPropModesProfiles },
 {L"KAknsIIDQgnPropModesThemes",  EAknsMajorGeneric, EAknsMinorGenericQgnPropModesThemes },
+{L"KAknsIIDQgnHomeWidgetOffline",  EAknsMajorGeneric, EAknsMinorGenericQgnHomeWidgetOffline },
+{L"KAknsIIDQgnHomeWidgetOffline1",  EAknsMajorGeneric, EAknsMinorGenericQgnHomeWidgetOffline1 },
+{L"KAknsIIDQgnIndiBack",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiBack },
+{L"KAknsIIDQgnIndiCdrActionArrowDownSelected",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCdrActionArrowDownSelected },
+{L"KAknsIIDQgnIndiCdrActionArrowUpSelected",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiCdrActionArrowUpSelected },
+{L"KAknsIIDQgnIndiConviewMessageAdd",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiConviewMessageAdd },
+{L"KAknsIIDQgnIndiGotomusic",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiGotomusic },
+{L"KAknsIIDQgnIndiTsButtonClose",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiTsButtonClose },
+{L"KAknsIIDQgnIndiTsButtonClosePressed",  EAknsMajorGeneric, EAknsMinorGenericQgnIndiTsButtonClosePressed },
+{L"KAknsIIDQgnMenuCallconnect",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuCallconnect },
+{L"KAknsIIDQgnMenuHswidgetNotification",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuHswidgetNotification },
+{L"KAknsIIDQgnMenuMobileDictionary",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuMobileDictionary },
+{L"KAknsIIDQgnMenuMynokia",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuMynokia },
+{L"KAknsIIDQgnMenuOvistore",  EAknsMajorGeneric, EAknsMinorGenericQgnMenuOvistore },
+{L"KAknsIIDQgnPropAddFriend",  EAknsMajorGeneric, EAknsMinorGenericQgnPropAddFriend },
+{L"KAknsIIDQgnPropAlbumartLarge",  EAknsMajorGeneric, EAknsMinorGenericQgnPropAlbumartLarge },
+{L"KAknsIIDQgnPropCapturedThumbnailVideo",  EAknsMajorGeneric, EAknsMinorGenericQgnPropCapturedThumbnailVideo },
+{L"KAknsIIDQgnPropDownloadThumbnailVideo",  EAknsMajorGeneric, EAknsMinorGenericQgnPropDownloadThumbnailVideo },
+{L"KAknsIIDQgnPropFusionplayerTbNext",  EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbNext },
+{L"KAknsIIDQgnPropFusionplayerTbNextDimmed",  EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbNextDimmed },
+{L"KAknsIIDQgnPropFusionplayerTbNextFocused",  EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbNextFocused },
+{L"KAknsIIDQgnPropFusionplayerTbPrev",  EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbPrev },
+{L"KAknsIIDQgnPropFusionplayerTbPrevDimmed",  EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbPrevDimmed },
+{L"KAknsIIDQgnPropFusionplayerTbPrevFocused",  EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbPrevFocused },
+{L"KAknsIIDQgnPropOviThumbnailVideo",  EAknsMajorGeneric, EAknsMinorGenericQgnPropOviThumbnailVideo },
+{L"KAknsIIDQgnPropRecentThumbnailVideo",  EAknsMajorGeneric, EAknsMinorGenericQgnPropRecentThumbnailVideo },
+{L"KAknsIIDQgnPropServiceThumbnailVideo",  EAknsMajorGeneric, EAknsMinorGenericQgnPropServiceThumbnailVideo },
+{L"KAknsIIDQgnGrafSetwizSlide1",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide1 },
+{L"KAknsIIDQgnGrafSetwizSlide2",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide2 },
+{L"KAknsIIDQgnGrafSetwizSlide3",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide3 },
+{L"KAknsIIDQgnGrafSetwizSlide4",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide4 },
+{L"KAknsIIDQgnGrafSetwizSlide5",  EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide5 },
--- a/skins/AknSkins/sdcinc/SDCGlobals.h	Fri Mar 19 09:48:44 2010 +0200
+++ b/skins/AknSkins/sdcinc/SDCGlobals.h	Fri Apr 16 16:01:57 2010 +0300
@@ -41,7 +41,7 @@
 // 3.0 = 2
 static const int gVersionMajor = 2;
 
-static const int gVersionMinor = 140;
+static const int gVersionMinor = 143;
 
 #if defined(__SERIES60_26__)
 static const unsigned char gPlatformMajor = 2;
--- a/uiresources_pub/skins_api/inc/AknsConstants.h	Fri Mar 19 09:48:44 2010 +0200
+++ b/uiresources_pub/skins_api/inc/AknsConstants.h	Fri Apr 16 16:01:57 2010 +0300
@@ -21906,6 +21906,102 @@
 static const TAknsItemID KAknsIIDQgnPropModesThemes =
     { EAknsMajorGeneric, EAknsMinorGenericQgnPropModesThemes };
 
+static const TAknsItemID KAknsIIDQgnHomeWidgetOffline =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnHomeWidgetOffline };
+
+static const TAknsItemID KAknsIIDQgnHomeWidgetOffline1 =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnHomeWidgetOffline1 };
+
+static const TAknsItemID KAknsIIDQgnIndiBack =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnIndiBack };
+
+static const TAknsItemID KAknsIIDQgnIndiCdrActionArrowDownSelected =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnIndiCdrActionArrowDownSelected };
+
+static const TAknsItemID KAknsIIDQgnIndiCdrActionArrowUpSelected =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnIndiCdrActionArrowUpSelected };
+
+static const TAknsItemID KAknsIIDQgnIndiConviewMessageAdd =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnIndiConviewMessageAdd };
+
+static const TAknsItemID KAknsIIDQgnIndiGotomusic =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnIndiGotomusic };
+
+static const TAknsItemID KAknsIIDQgnIndiTsButtonClose =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnIndiTsButtonClose };
+
+static const TAknsItemID KAknsIIDQgnIndiTsButtonClosePressed =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnIndiTsButtonClosePressed };
+
+static const TAknsItemID KAknsIIDQgnMenuCallconnect =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnMenuCallconnect };
+
+static const TAknsItemID KAknsIIDQgnMenuHswidgetNotification =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnMenuHswidgetNotification };
+
+static const TAknsItemID KAknsIIDQgnMenuMobileDictionary =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnMenuMobileDictionary };
+
+static const TAknsItemID KAknsIIDQgnMenuMynokia =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnMenuMynokia };
+
+static const TAknsItemID KAknsIIDQgnMenuOvistore =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnMenuOvistore };
+
+static const TAknsItemID KAknsIIDQgnPropAddFriend =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropAddFriend };
+
+static const TAknsItemID KAknsIIDQgnPropAlbumartLarge =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropAlbumartLarge };
+
+static const TAknsItemID KAknsIIDQgnPropCapturedThumbnailVideo =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropCapturedThumbnailVideo };
+
+static const TAknsItemID KAknsIIDQgnPropDownloadThumbnailVideo =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropDownloadThumbnailVideo };
+
+static const TAknsItemID KAknsIIDQgnPropFusionplayerTbNext =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbNext };
+
+static const TAknsItemID KAknsIIDQgnPropFusionplayerTbNextDimmed =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbNextDimmed };
+
+static const TAknsItemID KAknsIIDQgnPropFusionplayerTbNextFocused =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbNextFocused };
+
+static const TAknsItemID KAknsIIDQgnPropFusionplayerTbPrev =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbPrev };
+
+static const TAknsItemID KAknsIIDQgnPropFusionplayerTbPrevDimmed =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbPrevDimmed };
+
+static const TAknsItemID KAknsIIDQgnPropFusionplayerTbPrevFocused =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropFusionplayerTbPrevFocused };
+
+static const TAknsItemID KAknsIIDQgnPropOviThumbnailVideo =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropOviThumbnailVideo };
+
+static const TAknsItemID KAknsIIDQgnPropRecentThumbnailVideo =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropRecentThumbnailVideo };
+
+static const TAknsItemID KAknsIIDQgnPropServiceThumbnailVideo =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnPropServiceThumbnailVideo };
+
+static const TAknsItemID KAknsIIDQgnGrafSetwizSlide1 =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide1 };
+
+static const TAknsItemID KAknsIIDQgnGrafSetwizSlide2 =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide2 };
+
+static const TAknsItemID KAknsIIDQgnGrafSetwizSlide3 =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide3 };
+
+static const TAknsItemID KAknsIIDQgnGrafSetwizSlide4 =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide4 };
+
+static const TAknsItemID KAknsIIDQgnGrafSetwizSlide5 =
+    { EAknsMajorGeneric, EAknsMinorGenericQgnGrafSetwizSlide5 };
+
 // SCMMARKER_INSERTIONPOINT
 
 // SCCMARKER_END
--- a/uiresources_pub/skins_api/inc/AknsConstants.hrh	Fri Mar 19 09:48:44 2010 +0200
+++ b/uiresources_pub/skins_api/inc/AknsConstants.hrh	Fri Apr 16 16:01:57 2010 +0300
@@ -7643,8 +7643,40 @@
     EAknsMinorGenericQgnPropCmccCustomermanage = 0x25c6,
     EAknsMinorGenericQgnPropModesProfiles = 0x25c7,
     EAknsMinorGenericQgnPropModesThemes = 0x25c8,
-    // SCMMARKER_INSERTIONPOINT [9673]
-    EAknsMinorGenericInternalCurrentLastItem = 0x25c9
+    EAknsMinorGenericQgnHomeWidgetOffline = 0x25c9,
+    EAknsMinorGenericQgnHomeWidgetOffline1 = 0x25ca,
+    EAknsMinorGenericQgnIndiBack = 0x25cb,
+    EAknsMinorGenericQgnIndiCdrActionArrowDownSelected = 0x25cc,
+    EAknsMinorGenericQgnIndiCdrActionArrowUpSelected = 0x25cd,
+    EAknsMinorGenericQgnIndiConviewMessageAdd = 0x25ce,
+    EAknsMinorGenericQgnIndiGotomusic = 0x25cf,
+    EAknsMinorGenericQgnIndiTsButtonClose = 0x25d0,
+    EAknsMinorGenericQgnIndiTsButtonClosePressed = 0x25d1,
+    EAknsMinorGenericQgnMenuCallconnect = 0x25d2,
+    EAknsMinorGenericQgnMenuHswidgetNotification = 0x25d3,
+    EAknsMinorGenericQgnMenuMobileDictionary = 0x25d4,
+    EAknsMinorGenericQgnMenuMynokia = 0x25d5,
+    EAknsMinorGenericQgnMenuOvistore = 0x25d6,
+    EAknsMinorGenericQgnPropAddFriend = 0x25d7,
+    EAknsMinorGenericQgnPropAlbumartLarge = 0x25d8,
+    EAknsMinorGenericQgnPropCapturedThumbnailVideo = 0x25d9,
+    EAknsMinorGenericQgnPropDownloadThumbnailVideo = 0x25da,
+    EAknsMinorGenericQgnPropFusionplayerTbNext = 0x25db,
+    EAknsMinorGenericQgnPropFusionplayerTbNextDimmed = 0x25dc,
+    EAknsMinorGenericQgnPropFusionplayerTbNextFocused = 0x25dd,
+    EAknsMinorGenericQgnPropFusionplayerTbPrev = 0x25de,
+    EAknsMinorGenericQgnPropFusionplayerTbPrevDimmed = 0x25df,
+    EAknsMinorGenericQgnPropFusionplayerTbPrevFocused = 0x25e0,
+    EAknsMinorGenericQgnPropOviThumbnailVideo = 0x25e1,
+    EAknsMinorGenericQgnPropRecentThumbnailVideo = 0x25e2,
+    EAknsMinorGenericQgnPropServiceThumbnailVideo = 0x25e3,
+    EAknsMinorGenericQgnGrafSetwizSlide1 = 0x25e4,
+    EAknsMinorGenericQgnGrafSetwizSlide2 = 0x25e5,
+    EAknsMinorGenericQgnGrafSetwizSlide3 = 0x25e6,
+    EAknsMinorGenericQgnGrafSetwizSlide4 = 0x25e7,
+    EAknsMinorGenericQgnGrafSetwizSlide5 = 0x25e8,
+    // SCMMARKER_INSERTIONPOINT [9705]
+    EAknsMinorGenericInternalCurrentLastItem = 0x25e9
     };
 
 // ----------------------------------------------------------------------------