diff -r 7516d6d86cf5 -r ed14f46c0e55 src/hbcore/i18n/translations/languages.ts
--- a/src/hbcore/i18n/translations/languages.ts	Mon Oct 04 17:49:30 2010 +0300
+++ b/src/hbcore/i18n/translations/languages.ts	Mon Oct 18 18:23:13 2010 +0300
@@ -3,207 +3,207 @@
 <TS version="1.0" language="en">
 <context>
 	<name>hblanguageswitch</name>
-	<message id="language_en">
+	<message id="txt_language_en">
 		<source>English</source>
 		<translation variants="no">English</translation>
 	</message>
-	<message id="language_fr">
+	<message id="txt_language_fr">
 		<source>French</source>
 		<translation variants="no">Français</translation>
 	</message>
-	<message id="language_de">
+	<message id="txt_language_de">
 		<source>German</source>
 		<translation variants="no">Deutsch</translation>
 	</message>
-	<message id="language_es">
+	<message id="txt_language_es">
 		<source>Spanish</source>
 		<translation variants="no">Español</translation>
 	</message>
-	<message id="language_it">
+	<message id="txt_language_it">
 		<source>Italian</source>
 		<translation variants="no">Italiano</translation>
 	</message>
-	<message id="language_sv">
+	<message id="txt_language_sv">
 		<source>Swedish</source>
 		<translation variants="no">Svenska</translation>
 	</message>
-	<message id="language_da">
+	<message id="txt_language_da">
 		<source>Danish</source>
 		<translation variants="no">Dansk</translation>
 	</message>
-	<message id="language_no">
+	<message id="txt_language_no">
 		<source>Norwegian</source>
 		<translation variants="no">Norsk</translation>
 	</message>
-	<message id="language_fi">
+	<message id="txt_language_fi">
 		<source>Finnish</source>
 		<translation variants="no">Suomi</translation>
 	</message>
-	<message id="language_en_US">
+	<message id="txt_language_en_US">
 		<source>English (American)</source>
 		<translation variants="no">English</translation>
 	</message>
-	<message id="language_pt">
+	<message id="txt_language_pt">
 		<source>Portuguese</source>
 		<translation variants="no">Português</translation>
 	</message>
-	<message id="language_tr">
+	<message id="txt_language_tr">
 		<source>Turkish</source>
 		<translation variants="no">Türkçe</translation>
 	</message>
-	<message id="language_is">
+	<message id="txt_language_is">
 		<source>Icelandic</source>
 		<translation variants="no">Íslenska</translation>
 	</message>
-	<message id="language_ru">
+	<message id="txt_language_ru">
 		<source>Russian</source>
 		<translation variants="no">Русский</translation>
 	</message>
-	<message id="language_hu">
+	<message id="txt_language_hu">
 		<source>Hungarian</source>
 		<translation variants="no">Magyar</translation>
 	</message>
-	<message id="language_nl">
+	<message id="txt_language_nl">
 		<source>Dutch</source>
 		<translation variants="no">Nederlands</translation>
 	</message>
-	<message id="language_cs">
+	<message id="txt_language_cs">
 		<source>Czech</source>
 		<translation variants="no">Čeština</translation>
 	</message>
-	<message id="language_sk">
+	<message id="txt_language_sk">
 		<source>Slovak</source>
 		<translation variants="no">Slovenčina</translation>
 	</message>
-	<message id="language_pl">
+	<message id="txt_language_pl">
 		<source>Polish</source>
 		<translation variants="no">Polski</translation>
 	</message>
-	<message id="language_sl">
+	<message id="txt_language_sl">
 		<source>Slovenian</source>
 		<translation variants="no">Slovenščina</translation>
 	</message>
-	<message id="language_zh_TW">
+	<message id="txt_language_zh_TW">
 		<source>Chinese TW</source>
 		<translation variants="no">繁體中文(台灣)</translation>
 	</message>
-	<message id="language_zh_HK">
+	<message id="txt_language_zh_HK">
 		<source>Chinese HK</source>
 		<translation variants="no">繁體中文(香港)</translation>
 	</message>
-	<message id="language_zh">
+	<message id="txt_language_zh">
 		<source>Chinese PRC</source>
 		<translation variants="no">简体中文</translation>
 	</message>
-	<message id="language_ja">
+	<message id="txt_language_ja">
 		<source>Japanese</source>
 		<translation variants="no">日本語</translation>
 	</message>
-	<message id="language_th">
+	<message id="txt_language_th">
 		<source>Thai</source>
 		<translation variants="no">ภาษาไทย</translation>
 	</message>
-	<message id="language_ar">
+	<message id="txt_language_ar">
 		<source>Arabic</source>
 		<translation variants="no">العربية</translation>
 	</message>
-	<message id="language_tl">
+	<message id="txt_language_tl">
 		<source>Pilipino</source>
-		<translation variants="no">Pilipino</translation>
+		<translation variants="no">Filipino</translation>
 	</message>
-	<message id="language_bg">
+	<message id="txt_language_bg">
 		<source>Burgarian</source>
 		<translation variants="no">Български</translation>
 	</message>
-	<message id="language_ca">
+	<message id="txt_language_ca">
 		<source>Catalan</source>
 		<translation variants="no">Català</translation>
 	</message>
-	<message id="language_hr">
+	<message id="txt_language_hr">
 		<source>Croatian</source>
 		<translation variants="no">Hrvatski</translation>
 	</message>
-	<message id="language_et">
+	<message id="txt_language_et">
 		<source>Estonian</source>
 		<translation variants="no">Eesti</translation>
 	</message>
-	<message id="language_fa">
+	<message id="txt_language_fa">
 		<source>Farsi</source>
 		<translation variants="no">فارسى</translation>
 	</message>
-	<message id="language_fr_CA">
+	<message id="txt_language_fr_CA">
 		<source>French (Canadian)</source>
 		<translation variants="no">Français</translation>
 	</message>
-	<message id="language_el">
+	<message id="txt_language_el">
 		<source>Greek</source>
 		<translation variants="no">Ελληνικά</translation>
 	</message>
-	<message id="language_he">
+	<message id="txt_language_he">
 		<source>Hebrew</source>
 		<translation variants="no">עברית</translation>
 	</message>
-	<message id="language_hi">
+	<message id="txt_language_hi">
 		<source>Hindi</source>
 		<translation variants="no">हिन्दी</translation>
 	</message>
-	<message id="language_id">
+	<message id="txt_language_id">
 		<source>Indonesian</source>
-		<translation variants="no">Indonesia</translation>
+		<translation variants="no">Bahasa Indonesia</translation>
 	</message>
-	<message id="language_ko">
+	<message id="txt_language_ko">
 		<source>Korean</source>
 		<translation variants="no">한국어</translation>
 	</message>
-	<message id="language_lv">
+	<message id="txt_language_lv">
 		<source>Latvian</source>
 		<translation variants="no">Latviešu</translation>
 	</message>
-	<message id="language_lt">
+	<message id="txt_language_lt">
 		<source>Lithuanian</source>
 		<translation variants="no">Lietuvių</translation>
 	</message>
-	<message id="language_ms">
+	<message id="txt_language_ms">
 		<source>Malay</source>
 		<translation variants="no">Melayu</translation>
 	</message>
-	<message id="language_mr">
+	<message id="txt_language_mr">
 		<source>Marathi</source>
 		<translation variants="no">मराठी</translation>
 	</message>
-  <message id="language_pt_BR">
+	<message id="txt_language_pt_BR">
 		<source>Portuguese (Brazil)</source>
 		<translation variants="no">Português</translation>
 	</message>
-	<message id="language_ro">
+	<message id="txt_language_ro">
 		<source>Romanian</source>
 		<translation variants="no">Română</translation>
 	</message>
-	<message id="language_sr">
+	<message id="txt_language_sr">
 		<source>Serbian</source>
 		<translation variants="no">Srpski</translation>
 	</message>
-	<message id="language_419">
+	<message id="txt_language_es_419">
 		<source>Spanish (American)</source>
 		<translation variants="no">Español</translation>
 	</message>
-	<message id="language_uk">
+	<message id="txt_language_uk">
 		<source>Ukrainian</source>
 		<translation variants="no">Українська</translation>
 	</message>
-	<message id="language_ur">
+	<message id="txt_language_ur">
 		<source>Urdu</source>
 		<translation variants="no">اردو</translation>
 	</message>
-	<message id="language_vi">
+	<message id="txt_language_vi">
 		<source>Vietnamese</source>
 		<translation variants="no">Tiếng Việt</translation>
 	</message>
-	<message id="language_eu">
+	<message id="txt_language_eu">
 		<source>Basque</source>
 		<translation variants="no">Euskara</translation>
 	</message>
-	<message id="language_gl">
+	<message id="txt_language_gl">
 		<source>Galician</source>
 		<translation variants="no">Galego</translation>
 	</message>