diff -r c7c26511138f -r 360bd6b35136 imgtools/sisutils/inc/pkglanguage.h
--- a/imgtools/sisutils/inc/pkglanguage.h	Wed Jun 16 16:51:40 2010 +0300
+++ b/imgtools/sisutils/inc/pkglanguage.h	Wed Jun 23 16:56:47 2010 +0800
@@ -1,255 +1,254 @@
-/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "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: 
-*
-*/
-
-
-#ifndef __PKGLANGUAGE_H__
-#define __PKGLANGUAGE_H__
-
-#ifdef _MSC_VER 
-	#pragma warning(disable: 4786) // identifier was truncated to '255' characters in the debug information
-	#pragma warning(disable: 4503) // decorated name length exceeded, name was truncated
-#endif
-
-typedef struct
-{
-	wchar_t*		iName;
-	unsigned long	iId;
-} SKeyword;
-
-/** 
-class PkgLanguage
-	Lookup table for the languages supported
-
-@internalComponent
-@released
-*/
-class PkgLanguage
-{
-public:
-	typedef enum 
-	{
-		//This list is lifted directly from E32std.h
-		ELangTest = 0,
-		/** UK English. */
-		ELangEnglish = 1,
-		/** French. */
-		ELangFrench = 2,
-		/** German. */
-		ELangGerman = 3,
-		/** Spanish. */
-		ELangSpanish = 4,
-		/** Italian. */
-		ELangItalian = 5,
-		/** Swedish. */
-		ELangSwedish = 6,
-		/** Danish. */
-		ELangDanish = 7,
-		/** Norwegian. */
-		ELangNorwegian = 8,
-		/** Finnish. */
-		ELangFinnish = 9,
-		/** American. */
-		ELangAmerican = 10,
-		/** Swiss French. */
-		ELangSwissFrench = 11,
-		/** Swiss German. */
-		ELangSwissGerman = 12,
-		/** Portuguese. */
-		ELangPortuguese = 13,
-		/** Turkish. */
-		ELangTurkish = 14,
-		/** Icelandic. */
-		ELangIcelandic = 15,
-		/** Russian. */
-		ELangRussian = 16,
-		/** Hungarian. */
-		ELangHungarian = 17,
-		/** Dutch. */
-		ELangDutch = 18,
-		/** Belgian Flemish. */
-		ELangBelgianFlemish = 19,
-		/** Australian English. */
-		ELangAustralian = 20,
-		/** Belgian French. */
-		ELangBelgianFrench = 21,
-		/** Austrian German. */
-		ELangAustrian = 22,
-		/** New Zealand English. */
-		ELangNewZealand = 23,
-		/** International French. */
-		ELangInternationalFrench = 24,
-		/** Czech. */
-		ELangCzech = 25,
-		/** Slovak. */
-		ELangSlovak = 26,
-		/** Polish. */
-		ELangPolish = 27,
-		/** Slovenian. */
-		ELangSlovenian = 28,
-		/** Taiwanese Chinese. */
-		ELangTaiwanChinese = 29,
-		/** Hong Kong Chinese. */
-		ELangHongKongChinese = 30,
-		/** Peoples Republic of China Chinese. */
-		ELangPrcChinese = 31,
-		/** Japanese. */
-		ELangJapanese = 32,
-		/** Thai. */
-		ELangThai = 33,
-		/** Afrikaans. */
-		ELangAfrikaans = 34,
-		/** Albanian. */
-		ELangAlbanian = 35,
-		/** Amharic. */
-		ELangAmharic = 36,
-		/** Arabic.*/
-		ELangArabic = 37,
-		/** Armenian. */
-		ELangArmenian = 38,
-		/** Tagalog. */
-		ELangTagalog = 39,
-		/** Belarussian. */
-		ELangBelarussian = 40,
-		/** Bengali. */ 
-		ELangBengali = 41,
-		/** Bulgarian. */
-		ELangBulgarian = 42,
-		/** Burmese. */ 
-		ELangBurmese = 43,
-		/** Catalan. */
-		ELangCatalan = 44,
-		/** Croation. */
-		ELangCroatian = 45,
-		/** Canadian English. */
-		ELangCanadianEnglish = 46,
-		/** International English. */
-		ELangInternationalEnglish = 47,
-		/** South African English. */
-		ELangSouthAfricanEnglish = 48,
-		/** Estonian. */
-		ELangEstonian = 49,
-		/** Farsi. */
-		ELangFarsi = 50,
-		/** Canadian French. */
-		ELangCanadianFrench = 51,
-		/** Gaelic. */
-		ELangScotsGaelic = 52,
-		/** Georgian. */
-		ELangGeorgian = 53,
-		/** Greek. */ 
-		ELangGreek = 54,
-		/** Cyprus Greek. */
-		ELangCyprusGreek = 55,
-		/** Gujarati. */
-		ELangGujarati = 56,
-		/** Hebrew. */
-		ELangHebrew = 57,
-		/** Hindi. */ 
-		ELangHindi = 58,
-		/** Indonesian. */
-		ELangIndonesian = 59,
-		/** Irish. */
-		ELangIrish = 60,
-		/** Swiss Italian. */
-		ELangSwissItalian = 61,
-		/** Kannada. */
-		ELangKannada = 62,
-		/** Kazakh. */
-		ELangKazakh = 63,
-		/** Kmer. */
-		ELangKhmer = 64,
-		/** Korean. */
-		ELangKorean = 65,
-		/** Lao. */
-		ELangLao = 66,
-		/** Latvian. */
-		ELangLatvian = 67,
-		/** Lithuanian. */
-		ELangLithuanian = 68,
-		/** Macedonian. */
-		ELangMacedonian = 69,
-		/** Malay. */
-		ELangMalay = 70,
-		/** Malayalam. */
-		ELangMalayalam = 71,
-		/** Marathi. */ 
-		ELangMarathi = 72,
-		/** Moldovian. */
-		ELangMoldavian = 73,
-		/** Mongolian. */
-		ELangMongolian = 74,
-		/** Norwegian Nynorsk. */
-		ELangNorwegianNynorsk = 75,
-		/** Brazilian Portuguese. */
-		ELangBrazilianPortuguese = 76,
-		/** Punjabi. */
-		ELangPunjabi = 77,
-		/** Romanian. */
-		ELangRomanian = 78,
-		/** Serbian. */
-		ELangSerbian = 79,
-		/** Sinhalese. */
-		ELangSinhalese = 80,
-		/** Somali. */
-		ELangSomali = 81,
-		/** International Spanish. */
-		ELangInternationalSpanish = 82,
-		/** American Spanish. */
-		ELangLatinAmericanSpanish = 83,
-		/** Swahili. */
-		ELangSwahili = 84,
-		/** Finland Swedish. */
-		ELangFinlandSwedish = 85,
-		ELangReserved1 = 86,		// reserved for future use
-		/** Tamil. */ 
-		ELangTamil = 87,
-		/** Telugu. */
-		ELangTelugu = 88,
-		/** Tibetan. */
-		ELangTibetan = 89,
-		/** Tigrinya. */
-		ELangTigrinya = 90,
-		/** Cyprus Turkish. */
-		ELangCyprusTurkish = 91,
-		/** Turkmen. */
-		ELangTurkmen = 92,
-		/** Ukrainian. */
-		ELangUkrainian = 93,
-		/** Urdu. */ 
-		ELangUrdu = 94,
-		ELangReserved2 = 95,	// reserved for future use
-		/** Vietnamese. */
-		ELangVietnamese = 96,
-		/** Welsh. */
-		ELangWelsh = 97,
-		/** Zulu. */
-		ELangZulu = 98,
-		/** Basque */
-		ELangBasque = 102,
-		/** Galician */
-		ELangGalician = 103,
-		/** @deprecated 6.2 */
-		ELangOther = 99,
-		ELangIllegal = 100,
-		ELangNone = 0xFFFF
-	}TLanguage;
-
-	static unsigned long GetLanguageCode(std::wstring aLang);
-	static std::wstring GetLanguageName(unsigned long aCode);
-};
-
-#endif //__PKGLANGUAGE_H__
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "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: 
+*
+*/
+
+
+#ifndef __PKGLANGUAGE_H__
+#define __PKGLANGUAGE_H__
+
+#ifdef _MSC_VER 
+	#pragma warning(disable: 4786) // identifier was truncated to '255' characters in the debug information
+	#pragma warning(disable: 4503) // decorated name length exceeded, name was truncated
+#endif
+
+typedef struct {
+	char* iName;
+	TUint32	iId;
+} SKeyword;
+
+/** 
+class PkgLanguage
+	Lookup table for the languages supported
+
+@internalComponent
+@released
+*/
+class PkgLanguage
+{
+public:
+	typedef enum 
+	{
+		//This list is lifted directly from E32std.h
+		ELangTest = 0,
+		/** UK English. */
+		ELangEnglish = 1,
+		/** French. */
+		ELangFrench = 2,
+		/** German. */
+		ELangGerman = 3,
+		/** Spanish. */
+		ELangSpanish = 4,
+		/** Italian. */
+		ELangItalian = 5,
+		/** Swedish. */
+		ELangSwedish = 6,
+		/** Danish. */
+		ELangDanish = 7,
+		/** Norwegian. */
+		ELangNorwegian = 8,
+		/** Finnish. */
+		ELangFinnish = 9,
+		/** American. */
+		ELangAmerican = 10,
+		/** Swiss French. */
+		ELangSwissFrench = 11,
+		/** Swiss German. */
+		ELangSwissGerman = 12,
+		/** Portuguese. */
+		ELangPortuguese = 13,
+		/** Turkish. */
+		ELangTurkish = 14,
+		/** Icelandic. */
+		ELangIcelandic = 15,
+		/** Russian. */
+		ELangRussian = 16,
+		/** Hungarian. */
+		ELangHungarian = 17,
+		/** Dutch. */
+		ELangDutch = 18,
+		/** Belgian Flemish. */
+		ELangBelgianFlemish = 19,
+		/** Australian English. */
+		ELangAustralian = 20,
+		/** Belgian French. */
+		ELangBelgianFrench = 21,
+		/** Austrian German. */
+		ELangAustrian = 22,
+		/** New Zealand English. */
+		ELangNewZealand = 23,
+		/** International French. */
+		ELangInternationalFrench = 24,
+		/** Czech. */
+		ELangCzech = 25,
+		/** Slovak. */
+		ELangSlovak = 26,
+		/** Polish. */
+		ELangPolish = 27,
+		/** Slovenian. */
+		ELangSlovenian = 28,
+		/** Taiwanese Chinese. */
+		ELangTaiwanChinese = 29,
+		/** Hong Kong Chinese. */
+		ELangHongKongChinese = 30,
+		/** Peoples Republic of China Chinese. */
+		ELangPrcChinese = 31,
+		/** Japanese. */
+		ELangJapanese = 32,
+		/** Thai. */
+		ELangThai = 33,
+		/** Afrikaans. */
+		ELangAfrikaans = 34,
+		/** Albanian. */
+		ELangAlbanian = 35,
+		/** Amharic. */
+		ELangAmharic = 36,
+		/** Arabic.*/
+		ELangArabic = 37,
+		/** Armenian. */
+		ELangArmenian = 38,
+		/** Tagalog. */
+		ELangTagalog = 39,
+		/** Belarussian. */
+		ELangBelarussian = 40,
+		/** Bengali. */ 
+		ELangBengali = 41,
+		/** Bulgarian. */
+		ELangBulgarian = 42,
+		/** Burmese. */ 
+		ELangBurmese = 43,
+		/** Catalan. */
+		ELangCatalan = 44,
+		/** Croation. */
+		ELangCroatian = 45,
+		/** Canadian English. */
+		ELangCanadianEnglish = 46,
+		/** International English. */
+		ELangInternationalEnglish = 47,
+		/** South African English. */
+		ELangSouthAfricanEnglish = 48,
+		/** Estonian. */
+		ELangEstonian = 49,
+		/** Farsi. */
+		ELangFarsi = 50,
+		/** Canadian French. */
+		ELangCanadianFrench = 51,
+		/** Gaelic. */
+		ELangScotsGaelic = 52,
+		/** Georgian. */
+		ELangGeorgian = 53,
+		/** Greek. */ 
+		ELangGreek = 54,
+		/** Cyprus Greek. */
+		ELangCyprusGreek = 55,
+		/** Gujarati. */
+		ELangGujarati = 56,
+		/** Hebrew. */
+		ELangHebrew = 57,
+		/** Hindi. */ 
+		ELangHindi = 58,
+		/** Indonesian. */
+		ELangIndonesian = 59,
+		/** Irish. */
+		ELangIrish = 60,
+		/** Swiss Italian. */
+		ELangSwissItalian = 61,
+		/** Kannada. */
+		ELangKannada = 62,
+		/** Kazakh. */
+		ELangKazakh = 63,
+		/** Kmer. */
+		ELangKhmer = 64,
+		/** Korean. */
+		ELangKorean = 65,
+		/** Lao. */
+		ELangLao = 66,
+		/** Latvian. */
+		ELangLatvian = 67,
+		/** Lithuanian. */
+		ELangLithuanian = 68,
+		/** Macedonian. */
+		ELangMacedonian = 69,
+		/** Malay. */
+		ELangMalay = 70,
+		/** Malayalam. */
+		ELangMalayalam = 71,
+		/** Marathi. */ 
+		ELangMarathi = 72,
+		/** Moldovian. */
+		ELangMoldavian = 73,
+		/** Mongolian. */
+		ELangMongolian = 74,
+		/** Norwegian Nynorsk. */
+		ELangNorwegianNynorsk = 75,
+		/** Brazilian Portuguese. */
+		ELangBrazilianPortuguese = 76,
+		/** Punjabi. */
+		ELangPunjabi = 77,
+		/** Romanian. */
+		ELangRomanian = 78,
+		/** Serbian. */
+		ELangSerbian = 79,
+		/** Sinhalese. */
+		ELangSinhalese = 80,
+		/** Somali. */
+		ELangSomali = 81,
+		/** International Spanish. */
+		ELangInternationalSpanish = 82,
+		/** American Spanish. */
+		ELangLatinAmericanSpanish = 83,
+		/** Swahili. */
+		ELangSwahili = 84,
+		/** Finland Swedish. */
+		ELangFinlandSwedish = 85,
+		ELangReserved1 = 86,		// reserved for future use
+		/** Tamil. */ 
+		ELangTamil = 87,
+		/** Telugu. */
+		ELangTelugu = 88,
+		/** Tibetan. */
+		ELangTibetan = 89,
+		/** Tigrinya. */
+		ELangTigrinya = 90,
+		/** Cyprus Turkish. */
+		ELangCyprusTurkish = 91,
+		/** Turkmen. */
+		ELangTurkmen = 92,
+		/** Ukrainian. */
+		ELangUkrainian = 93,
+		/** Urdu. */ 
+		ELangUrdu = 94,
+		ELangReserved2 = 95,	// reserved for future use
+		/** Vietnamese. */
+		ELangVietnamese = 96,
+		/** Welsh. */
+		ELangWelsh = 97,
+		/** Zulu. */
+		ELangZulu = 98,
+		/** Basque */
+		ELangBasque = 102,
+		/** Galician */
+		ELangGalician = 103,
+		/** @deprecated 6.2 */
+		ELangOther = 99,
+		ELangIllegal = 100,
+		ELangNone = 0xFFFF
+	}TLanguage;
+
+
+};
+TUint32 GetLanguageCode(const char* aLang);
+const char* GetLanguageName(TUint32 aCode);
+#endif //__PKGLANGUAGE_H__