From 521d66436dacffba642f87ec101adc1654658346 Mon Sep 17 00:00:00 2001
From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Sat, 16 Mar 2013 01:05:57 +0900
Subject: [PATCH] merge with master

---
 inc/IvImageViewerForm.h                            |   5 +
 inc/IvTypes.h                                      |  21 +-
 res/ara-AE.xml                                     |   8 +-
 res/aze-AZ.xml                                     |   6 +-
 res/bul-BG.xml                                     |   6 +-
 res/cat-ES.xml                                     |   6 +-
 res/ces-CZ.xml                                     |   6 +-
 res/dan-DK.xml                                     |   6 +-
 res/deu-DE.xml                                     |   6 +-
 res/ell-GR.xml                                     |   8 +-
 res/eng-GB.xml                                     |   6 +-
 res/eng-PH.xml                                     |   8 +-
 res/eng-US.xml                                     |   6 +-
 res/est-EE.xml                                     |   8 +-
 res/eus-ES.xml                                     |   6 +-
 res/fin-FI.xml                                     |   6 +-
 res/fra-CA.xml                                     |   6 +-
 res/fra-FR.xml                                     |   6 +-
 res/gle-IE.xml                                     |   6 +-
 res/glg-ES.xml                                     |   6 +-
 res/hin-IN.xml                                     |   6 +-
 res/hrv-HR.xml                                     |   6 +-
 res/hun-HU.xml                                     |   6 +-
 res/hye-AM.xml                                     |   6 +-
 res/isl-IS.xml                                     |   6 +-
 res/ita-IT.xml                                     |   6 +-
 res/jpn-JP.xml                                     |   6 +-
 res/kat-GE.xml                                     |   6 +-
 res/kaz-KZ.xml                                     |   6 +-
 res/kor-KR.xml                                     |   6 +-
 res/lav-LV.xml                                     |   6 +-
 res/lit-LT.xml                                     |   6 +-
 res/mkd-MK.xml                                     |   6 +-
 res/nld-NL.xml                                     |   6 +-
 res/nob-NO.xml                                     |   6 +-
 res/pol-PL.xml                                     |   6 +-
 res/por-BR.xml                                     |   6 +-
 res/por-PT.xml                                     |   6 +-
 res/ron-RO.xml                                     |   6 +-
 res/rus-RU.xml                                     |   6 +-
 res/screen-size-normal/IDL_FORM_IMAGE_SETTER.xml   |  14 ++
 .../{IDL_FORM.xml => IDL_FORM_IMAGE_VIEWER.xml}    |  22 +-
 res/screen-size-normal/IDL_FORM_NAME_EDITOR.xml    |  22 ++
 res/slk-SK.xml                                     |   6 +-
 res/slv-SI.xml                                     |   6 +-
 res/spa-ES.xml                                     |   6 +-
 res/spa-MX.xml                                     |   6 +-
 res/srp-RS.xml                                     |   6 +-
 res/swe-SE.xml                                     |   6 +-
 res/tur-TR.xml                                     |   8 +-
 res/ukr-UA.xml                                     |   6 +-
 res/uzb-UZ.xml                                     |   6 +-
 res/zho-CN.xml                                     |   6 +-
 res/zho-HK.xml                                     |   6 +-
 res/zho-SG.xml                                     |   6 +-
 res/zho-TW.xml                                     |  10 +-
 src/IvCommonUtil.cpp                               |  30 +--
 src/IvImageNameEditorForm.cpp                      |  78 +++----
 src/IvImageSetterForm.cpp                          |   3 +-
 src/IvImageViewerForm.cpp                          | 229 +++++++++++++--------
 src/IvImageViewerPresentationModel.cpp             |   5 +-
 src/IvSettingPresentationModel.cpp                 |   2 +
 src/IvTypes.cpp                                    |   9 +-
 63 files changed, 535 insertions(+), 225 deletions(-)
 create mode 100644 res/screen-size-normal/IDL_FORM_IMAGE_SETTER.xml
 rename res/screen-size-normal/{IDL_FORM.xml => IDL_FORM_IMAGE_VIEWER.xml} (55%)
 create mode 100644 res/screen-size-normal/IDL_FORM_NAME_EDITOR.xml

diff --git a/inc/IvImageViewerForm.h b/inc/IvImageViewerForm.h
index 9851050..fc6f92d 100644
--- a/inc/IvImageViewerForm.h
+++ b/inc/IvImageViewerForm.h
@@ -29,6 +29,7 @@
 #include <FMedia.h>
 #include <FSystem.h>
 #include <FUi.h>
+
 #include "IvBaseForm.h"
 #include "IvImageProvider.h"
 #include "IvTypes.h"
@@ -37,6 +38,7 @@
 class ImageInfo;
 class ImageViewerForm;
 class ImageViewerPresentationModel;
+class SettingPresentationModel;
 
 class ImageViewerForm
 	: public BaseForm
@@ -117,6 +119,7 @@ private:
 		  APPCONTROL_MODE_NORMAL = 0
 		, APPCONTROL_MODE_WEB_LINK
 		, APPCONTROL_MODE_CROP
+		, APPCONTROL_MODE_MESSAGE
 		, APPCONTROL_MODE_EMAIL
 	};
 
@@ -142,6 +145,7 @@ private:
 	result DeleteImageFile(void);
 	void RequestDecodeUrl(void);
 	void OnRequestEmailAction(void);
+	void OnRequestMessagesAction(void);
 
 	void SetFooterItemState(bool isEnable);
 	Tizen::Graphics::Bitmap* GetQuickThumbnailN(Tizen::Base::String& fileName);
@@ -173,6 +177,7 @@ private:
 	RequestId __requestId;
 	Tizen::Content::ContentTransfer __contentTransfer;
 	ImageViewerPresentationModel* __pPresentationModel;
+	SettingPresentationModel* __pSettingPresentationModel;
 };
 
 #endif	/* _IV_IMAGE_VIEWER_FORM_H_ */
diff --git a/inc/IvTypes.h b/inc/IvTypes.h
index dca4780..1498018 100644
--- a/inc/IvTypes.h
+++ b/inc/IvTypes.h
@@ -44,10 +44,11 @@ enum ActionID
 	, ACTION_ID_CONTEXTMENU_CALLER = 301
 	, ACTION_ID_CONTEXTMENU_COPY = 302
 	, ACTION_ID_CONTEXTMENU_EMAIL = 303
-	, ACTION_ID_CONTEXTMENU_HOME = 304
-	, ACTION_ID_CONTEXTMENU_LOCK = 305
-	, ACTION_ID_CONTEXTMENU_SET_AS = 306
-	, ACTION_ID_CONTORL_BUTTON_PLAY = 307
+	, ACTION_ID_CONTEXTMENU_MESSAGE = 304
+	, ACTION_ID_CONTEXTMENU_HOME = 305
+	, ACTION_ID_CONTEXTMENU_LOCK = 306
+	, ACTION_ID_CONTEXTMENU_SET_AS = 307
+	, ACTION_ID_CONTORL_BUTTON_PLAY = 308
 	, ACTION_ID_DELETE_POPUP_CANCEL = 401
 	, ACTION_ID_DELETE_POPUP_DEL = 402
 	, ACTION_ID_FOOTER_BUTTON_BACK = 403
@@ -63,12 +64,15 @@ enum ActionID
 
 enum SlideShowTransitionEffect
 {
-	SLIDE_SHOW_TRANSITION_EFFECT_SLIDE,
-	SLIDE_SHOW_TRANSITION_EFFECT_PAGE,
+	SLIDE_SHOW_TRANSITION_EFFECT_SLIDE = 0,
 	SLIDE_SHOW_TRANSITION_EFFECT_DISSOLVE,
 	SLIDE_SHOW_TRANSITION_EFFECT_ZOOM
 };
 
+extern const wchar_t* IDL_FORM_IMAGE_VIEWER;
+extern const wchar_t* IDL_FORM_IMAGE_SETTER;
+extern const wchar_t* IDL_FORM_NAME_EDITOR;
+
 extern const wchar_t* FORM_IMAGE_VIEWER;
 extern const wchar_t* FORM_IMAGE_SETTER;
 extern const wchar_t* FORM_IMAGE_NAME_EDITOR;
@@ -77,7 +81,7 @@ extern const wchar_t* IDSCN_IMAGE_VIEWER;
 extern const wchar_t* IDSCN_IMAGE_SETTER;
 extern const wchar_t* IDSCN_IMAGE_NAME_EDITOR;
 
-extern const wchar_t* APPCONTROL_PROVIDER_ID_MESSAGE;
+extern const wchar_t* APPCONTROL_PROVIDER_ID_MESSAGES;
 extern const wchar_t* APPCONTROL_PROVIDER_ID_EMAIL;
 extern const wchar_t* APPCONTROL_PROVIDER_ID_CONTACTS;
 extern const wchar_t* APPCONTROL_PROVIDER_ID_VIDEO_PLAYER;
@@ -101,6 +105,7 @@ extern const wchar_t* APPCONTROL_KEY_LEGACY_RESULT;
 extern const wchar_t* APPCONTROL_DATA_IMAGE;
 extern const wchar_t* APPCONTROL_DATA_VIDEO;
 extern const wchar_t* APPCONTROL_DATA_SLIDE_SHOW;
+extern const wchar_t* APPCONTROL_DATA_MESSAGE;
 extern const wchar_t* APPCONTROL_DATA_EMAIL;
 extern const wchar_t* APPCONTROL_DATA_SINGLE;
 extern const wchar_t* APPCONTROL_DATA_CONTACT_ID;
@@ -167,5 +172,7 @@ extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_REPEAT;
 extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_SHUFFLE;
 extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT;
 extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_MUSIC;
+extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE;
+extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SHUFFLE_VALUE;
 
 #endif /* _IV_TYPES_H_ */
diff --git a/res/ara-AE.xml b/res/ara-AE.xml
index f43e708..ea4d521 100644
--- a/res/ara-AE.xml
+++ b/res/ara-AE.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">تم الوصول إلى أقصى عدد من الحروف</text>
     <text id="IDS_IV_BODY_ANY">أي</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">صورة المتصل</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">أساسي</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">غير ممكن</text>
     <text id="IDS_IV_BODY_DATE_CREATED">تاريخ الإنشاء</text>
+    <text id="IDS_COM_BODY_GB">جيجابايت</text>
     <text id="IDS_IV_OPT_TRIM">شذب</text>
+    <text id="IDS_COM_BODY_MB">ميجابايت</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">تم رفض الإذن</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">الاستخدامات المتوفرة</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">الشاشة الرئيسية</text>
@@ -25,7 +27,7 @@
     <text id="IDS_COM_POP_UNABLE_TO_SAVE">غير قادر على الحفظ</text>
     <text id="IDS_COM_BODY_ENTER_NAME">أدخل الاسم</text>
     <text id="IDS_IV_BODY_DO_NOT_SHOW_AGAIN">عدم العرض مرة أخرى</text>
-    <text id="IDS_COM_BODY_DELETE">حذف</text>
+    <text id="IDS_COM_BODY_DELETE">مسح</text>
     <text id="IDS_COM_BODY_EDIT_CANCEL">إلغاء</text>
     <text id="IDS_IV_POP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED">تم بلوغ أقصى عدد من الأحرف (%d)</text>
     <text id="IDS_IV_BODY_COUNT">العدد</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">كافة الألبومات</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">النوع</text>
     <text id="IDS_COM_BODY_MORE">المزيد</text>
+    <text id="IDS_COM_BODY_KB">كيلوبايت</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">خلفية الشاشة الرئيسية</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">إلغاء</text>
     <text id="IDS_COM_BODY_GALLERY">استوديو</text>
     <text id="IDS_COM_BODY_SIZE">الحجم</text>
diff --git a/res/aze-AZ.xml b/res/aze-AZ.xml
index e27b9fe..9d37268 100644
--- a/res/aze-AZ.xml
+++ b/res/aze-AZ.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Simvol sayı maksimuma çatıb</text>
     <text id="IDS_IV_BODY_ANY">Hər hansı</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Zəng edənin şəkli</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Əsas</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Mümkün deyil</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Tarix yaradıldı</text>
+    <text id="IDS_COM_BODY_GB">QB</text>
     <text id="IDS_IV_OPT_TRIM">Nizamla</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">İcazə rədd edildi</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">İstifadəsi mümkün olanlar</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Əsas ekran</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Bütün albomlar</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tip</text>
     <text id="IDS_COM_BODY_MORE">Daha įox</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Əsas ekranin divar kağızı</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Ləğv et</text>
     <text id="IDS_COM_BODY_GALLERY">Qalereya</text>
     <text id="IDS_COM_BODY_SIZE">Ölçü</text>
diff --git a/res/bul-BG.xml b/res/bul-BG.xml
index f52ad01..93012af 100644
--- a/res/bul-BG.xml
+++ b/res/bul-BG.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Достигнат максимален брой знаци</text>
     <text id="IDS_IV_BODY_ANY">Всеки</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Изобр. повикващ</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Базово</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Невъзможно</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Дата на създаване</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Орязване</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Отказано разрешение</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Налични употреби</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Начален екран</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Всички албуми</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Тип</text>
     <text id="IDS_COM_BODY_MORE">Още</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Тапет начален екран</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Отмени</text>
     <text id="IDS_COM_BODY_GALLERY">Галерия</text>
     <text id="IDS_COM_BODY_SIZE">Размер</text>
diff --git a/res/cat-ES.xml b/res/cat-ES.xml
index f63d54a..84e42f5 100644
--- a/res/cat-ES.xml
+++ b/res/cat-ES.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">S'ha assolit el nombre màxim de caràcters</text>
     <text id="IDS_IV_BODY_ANY">Qualsevol</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Imatge de la persona que truca</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Bàsic</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">No és possible</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Data creació</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Acoblar</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permís denegat</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Usos disponibles</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Pantalla d'inici</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Tots els àlbums</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tipus</text>
     <text id="IDS_COM_BODY_MORE">Més</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Fons pantalla inici</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cancel·lar</text>
     <text id="IDS_COM_BODY_GALLERY">Galeria</text>
     <text id="IDS_COM_BODY_SIZE">Mida</text>
diff --git a/res/ces-CZ.xml b/res/ces-CZ.xml
index 44df35a..9618e58 100644
--- a/res/ces-CZ.xml
+++ b/res/ces-CZ.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Bylo dosaženo maximálního počtu znaků</text>
     <text id="IDS_IV_BODY_ANY">VÅ¡e</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Obrázek volajícího</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Základní</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Nemožné</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Datum vytvoření</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Oříznout</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Povolení bylo odepřeno</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Počet použití k dispozici</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Domovská obrazovka</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">VÅ¡echna alba</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Typ</text>
     <text id="IDS_COM_BODY_MORE">Další</text>
+    <text id="IDS_COM_BODY_KB">kB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Pozadí dom. obrazovky</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Zrušit</text>
     <text id="IDS_COM_BODY_GALLERY">Galerie</text>
     <text id="IDS_COM_BODY_SIZE">Velikost</text>
diff --git a/res/dan-DK.xml b/res/dan-DK.xml
index d23b87b..23d9e88 100644
--- a/res/dan-DK.xml
+++ b/res/dan-DK.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Det maksimale antal tegn er nået</text>
     <text id="IDS_IV_BODY_ANY">Vilkårlig</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Opkalds-id-billede</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Grundlæggende</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Ikke mulig</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Dato oprettet</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Beskær</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Tilladelse afslået</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Gange tilbage</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Startskærm</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Alle album</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Type</text>
     <text id="IDS_COM_BODY_MORE">Mere</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Baggr. for startskærm</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Annullér</text>
     <text id="IDS_COM_BODY_GALLERY">Galleri</text>
     <text id="IDS_COM_BODY_SIZE">Størrelse</text>
diff --git a/res/deu-DE.xml b/res/deu-DE.xml
index 35b3eb8..9e24664 100644
--- a/res/deu-DE.xml
+++ b/res/deu-DE.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Maximal zulässige Zeichenanzahl erreicht.</text>
     <text id="IDS_IV_BODY_ANY">Jede</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Anruferbild</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Einfach</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Nicht möglich</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Erstellt am</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Zuschneiden</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Berechtigung abgelehnt</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Verfügbare Nutzungen</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Startbildschirm</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Alle Alben</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Typ</text>
     <text id="IDS_COM_BODY_MORE">Mehr</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Home-Hintergrund</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Abbrechen</text>
     <text id="IDS_COM_BODY_GALLERY">Galerie</text>
     <text id="IDS_COM_BODY_SIZE">Größe</text>
diff --git a/res/ell-GR.xml b/res/ell-GR.xml
index f728d62..5110136 100644
--- a/res/ell-GR.xml
+++ b/res/ell-GR.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Ο μέγιστος αριθμός χαρακτήρων συμπληρώθηκε</text>
     <text id="IDS_IV_BODY_ANY">Οποιοδήποτε</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Εικόνα καλούντος</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Βασικός</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Αδύνατο</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Ημερομηνία δημιουργίας</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Ξάκρισμα</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Δεν έχετε δικαίωμα πρόσβασης</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Διαθέσιμες χρήσεις</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Αρχική οθόνη</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Όλα τα άλμπουμ</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Τύπος</text>
     <text id="IDS_COM_BODY_MORE">Περισσότερα</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Φόντο αρχικής οθόνης</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Άκυρο</text>
     <text id="IDS_COM_BODY_GALLERY">Συλλογή</text>
     <text id="IDS_COM_BODY_SIZE">Μέγεθος</text>
@@ -92,7 +96,7 @@
     <text id="IDS_COM_BODY_REMOVE">Κατάργηση</text>
     <text id="IDS_IV_BODY_INTERVAL">Διάστημα</text>
     <text id="IDS_COM_POP_ALREDY_EXISTS">Υπάρχει ήδη</text>
-    <text id="IDS_IV_BODY_LOCK_SCREEN">Οθόνη κλειδώματος</text>
+    <text id="IDS_IV_BODY_LOCK_SCREEN">Κλείδωμα Οθόνης</text>
     <text id="IDS_COM_BODY_DONE">Τέλος</text>
     <text id="IDS_COM_POP_SAVING_FAILED">Αποτυχία αποθήκευσης</text>
     <text id="IDS_IV_BODY_N_A">Μη διαθέσιμο</text>
diff --git a/res/eng-GB.xml b/res/eng-GB.xml
index 39e7b0f..1df120d 100644
--- a/res/eng-GB.xml
+++ b/res/eng-GB.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Maximum number of characters reached</text>
     <text id="IDS_IV_BODY_ANY">Any</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Caller image</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Basic</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Impossible</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Date created</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Trim</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permission denied</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Available uses</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Home screen</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">All albums</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Type</text>
     <text id="IDS_COM_BODY_MORE">More</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Home screen wallpaper</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cancel</text>
     <text id="IDS_COM_BODY_GALLERY">Gallery</text>
     <text id="IDS_COM_BODY_SIZE">Size</text>
diff --git a/res/eng-PH.xml b/res/eng-PH.xml
index 306f2d8..1df120d 100644
--- a/res/eng-PH.xml
+++ b/res/eng-PH.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Maximum number of characters reached</text>
     <text id="IDS_IV_BODY_ANY">Any</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Caller image</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Basic</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Impossible</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Date created</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Trim</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permission denied</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Available uses</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Home screen</text>
@@ -30,7 +32,7 @@
     <text id="IDS_IV_POP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED">Maximum number of characters (%d) reached</text>
     <text id="IDS_IV_BODY_COUNT">Count</text>
     <text id="IDS_IV_BODY_PRINT">Print</text>
-    <text id="IDS_IV_POP_ENTRY_IS_EMPTY">Phone contact is empty</text>
+    <text id="IDS_IV_POP_ENTRY_IS_EMPTY">Entry is empty</text>
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED">Maximum number of characters (%d) reached</text>
     <text id="IDS_IV_OPT_USE_MOTION">Use motion</text>
     <text id="IDS_COM_POP_PS_ALREADY_EXISTS">%s already exists</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">All albums</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Type</text>
     <text id="IDS_COM_BODY_MORE">More</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Home screen wallpaper</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cancel</text>
     <text id="IDS_COM_BODY_GALLERY">Gallery</text>
     <text id="IDS_COM_BODY_SIZE">Size</text>
diff --git a/res/eng-US.xml b/res/eng-US.xml
index e9d7660..de1eb8b 100644
--- a/res/eng-US.xml
+++ b/res/eng-US.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Maximum number of characters reached</text>
     <text id="IDS_IV_BODY_ANY">Any</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Caller image</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Basic</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Impossible</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Date created</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Trim</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permission denied</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Available uses</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Home screen</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">All albums</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Type</text>
     <text id="IDS_COM_BODY_MORE">More</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Home screen wallpaper</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cancel</text>
     <text id="IDS_COM_BODY_GALLERY">Gallery</text>
     <text id="IDS_COM_BODY_SIZE">Size</text>
diff --git a/res/est-EE.xml b/res/est-EE.xml
index 50477d0..fceb135 100644
--- a/res/est-EE.xml
+++ b/res/est-EE.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Lubatud arv märke on täis</text>
     <text id="IDS_IV_BODY_ANY">Ükskõik milline</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Helistaja pilt</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Põhiline</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Võimatu</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Kuupäev loodud</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Lõika</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Loast keelduti</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Võimalikud kasutusviisid</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Avaleht</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Kõik albumid</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tüüp</text>
     <text id="IDS_COM_BODY_MORE">Veel</text>
+    <text id="IDS_COM_BODY_KB">kB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Avaekr. taustp.</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Tühista</text>
     <text id="IDS_COM_BODY_GALLERY">Galerii</text>
     <text id="IDS_COM_BODY_SIZE">Suurus</text>
@@ -92,7 +96,7 @@
     <text id="IDS_COM_BODY_REMOVE">Eemalda</text>
     <text id="IDS_IV_BODY_INTERVAL">Intervall</text>
     <text id="IDS_COM_POP_ALREDY_EXISTS">Juba olemas</text>
-    <text id="IDS_IV_BODY_LOCK_SCREEN">Lukusta ekraan</text>
+    <text id="IDS_IV_BODY_LOCK_SCREEN">Lukustusekraan</text>
     <text id="IDS_COM_BODY_DONE">Valmis</text>
     <text id="IDS_COM_POP_SAVING_FAILED">Salvestamine nurjus</text>
     <text id="IDS_IV_BODY_N_A">Pole teada</text>
diff --git a/res/eus-ES.xml b/res/eus-ES.xml
index 6841544..a051a1f 100644
--- a/res/eus-ES.xml
+++ b/res/eus-ES.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Gehienezko karaktere kopurura heldu zara</text>
     <text id="IDS_IV_BODY_ANY">Edozein</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Dei egilearen irudia</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Oinarrizkoa</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Ezinezkoa</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Sortze data</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Kimatu</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Baimena ukatuta</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Erabilera eskuragarriak</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Hasierako pantaila</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Album guztiak</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Mota</text>
     <text id="IDS_COM_BODY_MORE">Gehiago</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Hasierako pantailako horma papera</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Ezeztatu</text>
     <text id="IDS_COM_BODY_GALLERY">Galeria</text>
     <text id="IDS_COM_BODY_SIZE">Tamaina</text>
diff --git a/res/fin-FI.xml b/res/fin-FI.xml
index 1c3da96..918201f 100644
--- a/res/fin-FI.xml
+++ b/res/fin-FI.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Merkkien enimmäismäärä saavutettu</text>
     <text id="IDS_IV_BODY_ANY">Mikä tahansa</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Soittajan kuva</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Perus</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Mahdoton</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Luontipäivämäärä</text>
+    <text id="IDS_COM_BODY_GB">Gt</text>
     <text id="IDS_IV_OPT_TRIM">Rajaa</text>
+    <text id="IDS_COM_BODY_MB">Mt</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Lupa evätty</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Jäljellä olevat käyttökerrat</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Alkunäyttö</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Kaikki albumit</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tyyppi</text>
     <text id="IDS_COM_BODY_MORE">Lisää</text>
+    <text id="IDS_COM_BODY_KB">kt</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Alkunäytön taustakuva</text>
+    <text id="IDS_COM_BODY_B">t</text>
     <text id="IDS_COM_SK_CANCEL">Peruuta</text>
     <text id="IDS_COM_BODY_GALLERY">Galleria</text>
     <text id="IDS_COM_BODY_SIZE">Koko</text>
diff --git a/res/fra-CA.xml b/res/fra-CA.xml
index 08dded8..23a01a2 100644
--- a/res/fra-CA.xml
+++ b/res/fra-CA.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Nb. max. de caractères atteint</text>
     <text id="IDS_IV_BODY_ANY">N'importe</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Image de l'appelant</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Basique</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Impossible</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Date de création</text>
+    <text id="IDS_COM_BODY_GB">Go</text>
     <text id="IDS_IV_OPT_TRIM">Rogner</text>
+    <text id="IDS_COM_BODY_MB">Mo</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Autorisation refusée</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Utilisations disponibles</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Écran d'accueil</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Tous les albums</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Type</text>
     <text id="IDS_COM_BODY_MORE">Plus</text>
+    <text id="IDS_COM_BODY_KB">Ko</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Papier peint d'accueil</text>
+    <text id="IDS_COM_BODY_B">O</text>
     <text id="IDS_COM_SK_CANCEL">Annuler</text>
     <text id="IDS_COM_BODY_GALLERY">Galerie</text>
     <text id="IDS_COM_BODY_SIZE">Taille</text>
diff --git a/res/fra-FR.xml b/res/fra-FR.xml
index 1f26c9d..da2b9a7 100644
--- a/res/fra-FR.xml
+++ b/res/fra-FR.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Nb. max. de caractères atteint</text>
     <text id="IDS_IV_BODY_ANY">N'importe</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Image d'appelant</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Basique</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Impossible</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Date créée</text>
+    <text id="IDS_COM_BODY_GB">Go</text>
     <text id="IDS_IV_OPT_TRIM">Rogner</text>
+    <text id="IDS_COM_BODY_MB">Mo</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Autorisation refusée</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Utilisations disponibles</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Écran d'accueil</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Tous les albums</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Type</text>
     <text id="IDS_COM_BODY_MORE">Plus</text>
+    <text id="IDS_COM_BODY_KB">Ko</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Fond d'écran d'accueil</text>
+    <text id="IDS_COM_BODY_B">O</text>
     <text id="IDS_COM_SK_CANCEL">Annuler</text>
     <text id="IDS_COM_BODY_GALLERY">Galerie</text>
     <text id="IDS_COM_BODY_SIZE">Taille</text>
diff --git a/res/gle-IE.xml b/res/gle-IE.xml
index fe9e340..0b3c19f 100644
--- a/res/gle-IE.xml
+++ b/res/gle-IE.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Uaslíon na gcarachtar bainte amach</text>
     <text id="IDS_IV_BODY_ANY">Ceann ar bith</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Íomhá ghlaoiteora</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Bunúsach</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Dodhéanta</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Dáta a rinneadh</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Bearr</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Cead séanta</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Úsáidí atá ar fáil</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Scáileán baile</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Gach albam</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Cineál</text>
     <text id="IDS_COM_BODY_MORE">Tuilleadh</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Cúlbhrat an sc. baile</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cuir ar ceal</text>
     <text id="IDS_COM_BODY_GALLERY">Gailearaí</text>
     <text id="IDS_COM_BODY_SIZE">Méid</text>
diff --git a/res/glg-ES.xml b/res/glg-ES.xml
index c697ba5..9eb47cc 100644
--- a/res/glg-ES.xml
+++ b/res/glg-ES.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Número máximo de caracteres alcanzado</text>
     <text id="IDS_IV_BODY_ANY">Calquera</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Imaxe do chamante</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Básico</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Non é posible</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Data creada</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Recortar</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permiso denegado</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Usos dispoñibles</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Pantalla de inicio</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Todos os álbums</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tipo</text>
     <text id="IDS_COM_BODY_MORE">Máis</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Fondo pant. inicio</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_COM_BODY_GALLERY">Galería</text>
     <text id="IDS_COM_BODY_SIZE">Tamaño</text>
diff --git a/res/hin-IN.xml b/res/hin-IN.xml
index 3df2d2f..f108f84 100644
--- a/res/hin-IN.xml
+++ b/res/hin-IN.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">वर्णो की संख्‍या अधिकतम पहुँची</text>
     <text id="IDS_IV_BODY_ANY">कोई</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">कॉलर छवि</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">बेसिक</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">असंभव</text>
     <text id="IDS_IV_BODY_DATE_CREATED">दिनांक निर्मित</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">ट्रिम करें</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">अनुमति से इनकार</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">उपलब्ध उपयोग</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">होम स्क्रीन</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">सभी एलबम्‍स</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">प्रकार</text>
     <text id="IDS_COM_BODY_MORE">अधिक</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">होम स्क्रीन वॉलपेपर</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">रद्द</text>
     <text id="IDS_COM_BODY_GALLERY">गैलरी</text>
     <text id="IDS_COM_BODY_SIZE">आकार</text>
diff --git a/res/hrv-HR.xml b/res/hrv-HR.xml
index 16c2fe2..3736c3e 100644
--- a/res/hrv-HR.xml
+++ b/res/hrv-HR.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Maks. broj znakova</text>
     <text id="IDS_IV_BODY_ANY">Bilo koji</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Slika pozivatelja</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Osnovno</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Nemoguće</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Datum</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Skrati</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Dozvola odbijena</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Preostalo upotreba</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Početni zaslon</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Svi albumi</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Vrsta</text>
     <text id="IDS_COM_BODY_MORE">Više</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Pozadina poč. zaslona</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Prekid</text>
     <text id="IDS_COM_BODY_GALLERY">Album</text>
     <text id="IDS_COM_BODY_SIZE">Veličina</text>
diff --git a/res/hun-HU.xml b/res/hun-HU.xml
index 3ffff7e..65362b6 100644
--- a/res/hun-HU.xml
+++ b/res/hun-HU.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Nincs hely több karakternek</text>
     <text id="IDS_IV_BODY_ANY">Bármely</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Hívó képe</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Alapvető</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Nem lehetséges</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Létrehozás dátuma</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Vágás</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Engedély megtagadva</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Lehetséges felhasználás</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Kezdőképernyő</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Összes album</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Típus</text>
     <text id="IDS_COM_BODY_MORE">Egyebek</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Kezdőképernyő háttere</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Mégse</text>
     <text id="IDS_COM_BODY_GALLERY">Galéria</text>
     <text id="IDS_COM_BODY_SIZE">Méret</text>
diff --git a/res/hye-AM.xml b/res/hye-AM.xml
index bc12c9e..72fc878 100644
--- a/res/hye-AM.xml
+++ b/res/hye-AM.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Հասել եք նիշերի առավելագույն քանակին</text>
     <text id="IDS_IV_BODY_ANY">Ցանկացած</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Զանգահարողի պատկեր</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Հիմնական</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Անհնար է</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Ստեղծման ամսաթիվը</text>
+    <text id="IDS_COM_BODY_GB">Ô³Ô²</text>
     <text id="IDS_IV_OPT_TRIM">Խուզել</text>
+    <text id="IDS_COM_BODY_MB">ՄԲ</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Թույլտվությունը մերժվեց</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Հասանելի օգտվողներ</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Ô±Õ·Õ­Õ¡Õ¿Õ¡Õ½Õ¥Õ²Õ¡Õ¶</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Բոլոր ալբոմները</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Տեսակ</text>
     <text id="IDS_COM_BODY_MORE">Ô±Õ¾Õ¥Õ¬Õ«Õ¶</text>
+    <text id="IDS_COM_BODY_KB">Ô¿Ô²</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Հիմն. էկրանի պաստառ</text>
+    <text id="IDS_COM_BODY_B">Ô²</text>
     <text id="IDS_COM_SK_CANCEL">Չեղարկել</text>
     <text id="IDS_COM_BODY_GALLERY">Պատկերասրահ</text>
     <text id="IDS_COM_BODY_SIZE">Չափս</text>
diff --git a/res/isl-IS.xml b/res/isl-IS.xml
index aeffd25..55d73bb 100644
--- a/res/isl-IS.xml
+++ b/res/isl-IS.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Hámarksfjölda stafa hefur verið náð</text>
     <text id="IDS_IV_BODY_ANY">Hvað sem er</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Mynd af viðmælanda</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Venjulegt</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Ekki hægt</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Dagsetning búin til</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Snyrta</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Leyfi var hafnað</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Tiltæk notkun</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Heimaskjár</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Allar plötur</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tegund</text>
     <text id="IDS_COM_BODY_MORE">Meira</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Veggfóður á heimaskjá</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Hætta við</text>
     <text id="IDS_COM_BODY_GALLERY">Gallerí</text>
     <text id="IDS_COM_BODY_SIZE">Stærð</text>
diff --git a/res/ita-IT.xml b/res/ita-IT.xml
index d6b68ea..6c4bb9e 100644
--- a/res/ita-IT.xml
+++ b/res/ita-IT.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Raggiunto numero massimo di caratteri</text>
     <text id="IDS_IV_BODY_ANY">Qualsiasi</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Immagine chiamante</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Di base</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Impossibile</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Data creazione</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Ritaglia</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permesso negato</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Usi disponibili</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Schermata Home</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Tutti gli album</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tipo</text>
     <text id="IDS_COM_BODY_MORE">Altro</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Sfondo schermata Home</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Annulla</text>
     <text id="IDS_COM_BODY_GALLERY">Galleria</text>
     <text id="IDS_COM_BODY_SIZE">Dimensioni</text>
diff --git a/res/jpn-JP.xml b/res/jpn-JP.xml
index 0873e54..7e8b7a1 100644
--- a/res/jpn-JP.xml
+++ b/res/jpn-JP.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">最大文字数に達しました。</text>
     <text id="IDS_IV_BODY_ANY">どれか</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">発信者画像</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">標準</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">不可</text>
     <text id="IDS_IV_BODY_DATE_CREATED">作成日付</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">トリミング</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">承認が拒否されました。</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">使用可能</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">ホーム画面</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">全アルバム</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">タイプ</text>
     <text id="IDS_COM_BODY_MORE">その他</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">ホーム画面の壁紙</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">キャンセル</text>
     <text id="IDS_COM_BODY_GALLERY">ギャラリー</text>
     <text id="IDS_COM_BODY_SIZE">サイズ</text>
diff --git a/res/kat-GE.xml b/res/kat-GE.xml
index d6a8a30..2d980d3 100644
--- a/res/kat-GE.xml
+++ b/res/kat-GE.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა</text>
     <text id="IDS_IV_BODY_ANY">ნებისმიერი</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">აბონენტის სურათი</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">ძირითადი</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">შეუძლებელია</text>
     <text id="IDS_IV_BODY_DATE_CREATED">შექმნის თარიღი</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">დარეგულირება</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">ნებართვა უარყოფილია</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">დასაშვები გამოყენება</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">საწყისი ეკრანი</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">ყველა ალბომი</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">ტიპი</text>
     <text id="IDS_COM_BODY_MORE">სხვა</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">საწყისი ეკრანის ფონი</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">გაუქმება</text>
     <text id="IDS_COM_BODY_GALLERY">გალერეა</text>
     <text id="IDS_COM_BODY_SIZE">ზომა</text>
diff --git a/res/kaz-KZ.xml b/res/kaz-KZ.xml
index 33f7cf2..c445e9d 100644
--- a/res/kaz-KZ.xml
+++ b/res/kaz-KZ.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Таңбалардың ен көп саны артты</text>
     <text id="IDS_IV_BODY_ANY">Кез келген</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Фотоанықтаушы</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Негізгі</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Мүмкін емес</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Күн белгіленген</text>
+    <text id="IDS_COM_BODY_GB">Гбайт</text>
     <text id="IDS_IV_OPT_TRIM">Жақтау</text>
+    <text id="IDS_COM_BODY_MB">МБ</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Рұқсаттан бас тартылды</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Пайдалануға жарамды</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Бейнебеттің өзіндік беті</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Барлық альбомдар</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Түрі</text>
     <text id="IDS_COM_BODY_MORE">Басқалар</text>
+    <text id="IDS_COM_BODY_KB">KБ</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Баст. экран түсқағазы</text>
+    <text id="IDS_COM_BODY_B">Б</text>
     <text id="IDS_COM_SK_CANCEL">Тоқтату</text>
     <text id="IDS_COM_BODY_GALLERY">Галерея</text>
     <text id="IDS_COM_BODY_SIZE">Өлшемі</text>
diff --git a/res/kor-KR.xml b/res/kor-KR.xml
index af5f055..0ef18c9 100644
--- a/res/kor-KR.xml
+++ b/res/kor-KR.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">입력 가능한 최대 글자수를 초과하였습니다</text>
     <text id="IDS_IV_BODY_ANY">모든 종류</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">발신자 이미지</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">기본</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">불가능</text>
     <text id="IDS_IV_BODY_DATE_CREATED">생성 날짜</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">잘라내기</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">허가가 거부되었습니다</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">사용 가능</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">홈 화면</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">모든 앨범</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">형식</text>
     <text id="IDS_COM_BODY_MORE">더보기</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">홈 화면 배경화면</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">취소</text>
     <text id="IDS_COM_BODY_GALLERY">갤러리</text>
     <text id="IDS_COM_BODY_SIZE">크기</text>
diff --git a/res/lav-LV.xml b/res/lav-LV.xml
index 91af516..f5effe8 100644
--- a/res/lav-LV.xml
+++ b/res/lav-LV.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Sasniegts maksimālais rakstzīmju skaits</text>
     <text id="IDS_IV_BODY_ANY">Jebkurš</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Zvanītāja attēls</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Pamata</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Nav iespējams</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Izveidošanas datums</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Apgriezt</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Atļauja liegta</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Atlikušās lietošanas reizes</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Sākuma ekrāns</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Visi albumi</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Veids</text>
     <text id="IDS_COM_BODY_MORE">Citi</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Sāk.ekrān.fona attēls</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Atcelt</text>
     <text id="IDS_COM_BODY_GALLERY">Galerija</text>
     <text id="IDS_COM_BODY_SIZE">Lielums</text>
diff --git a/res/lit-LT.xml b/res/lit-LT.xml
index 28e4c03..e0a6357 100644
--- a/res/lit-LT.xml
+++ b/res/lit-LT.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Pasiektas didžiausias simbolių skaičius</text>
     <text id="IDS_IV_BODY_ANY">Bet kuris</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Skambintojo vaizdas</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Pagrindinis</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Neįmanoma</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Sukūrimo data</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Nukirpti</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Leidimas atmestas</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Galimi panaudojimai</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Pradžios ekranas</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Visi albumai</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tipas</text>
     <text id="IDS_COM_BODY_MORE">Daugiau</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Pradžios ekrano fonas</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Atšaukti</text>
     <text id="IDS_COM_BODY_GALLERY">Galerija</text>
     <text id="IDS_COM_BODY_SIZE">Dydis</text>
diff --git a/res/mkd-MK.xml b/res/mkd-MK.xml
index a0ae42b..98b4e92 100644
--- a/res/mkd-MK.xml
+++ b/res/mkd-MK.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Достигнат е максималниот број знаци</text>
     <text id="IDS_IV_BODY_ANY">Кој било</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Слика за повикувач</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Основно</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Невозможно</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Датум на создавање</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Отсечи</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Нема дозвола</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Можност за употреба</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Почетен екран</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Сите албуми</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Тип</text>
     <text id="IDS_COM_BODY_MORE">Повеќе</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Заднина на осн. екран</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Откажи</text>
     <text id="IDS_COM_BODY_GALLERY">Галерија</text>
     <text id="IDS_COM_BODY_SIZE">Големина</text>
diff --git a/res/nld-NL.xml b/res/nld-NL.xml
index 8ec0c10..470fce0 100644
--- a/res/nld-NL.xml
+++ b/res/nld-NL.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Maximumaantal tekens bereikt</text>
     <text id="IDS_IV_BODY_ANY">Alle</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Afbeelding beller</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Basis</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Niet mogelijk</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Datum gemaakt</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Bijsnijden</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Toestemming geweigerd</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Aantal keer dat het gebruikt mag worden</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Startscherm</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Alle albums</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Type</text>
     <text id="IDS_COM_BODY_MORE">Meer</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Achtergrond startscherm</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Annuleren</text>
     <text id="IDS_COM_BODY_GALLERY">Galerij</text>
     <text id="IDS_COM_BODY_SIZE">Grootte</text>
diff --git a/res/nob-NO.xml b/res/nob-NO.xml
index 4b78c55..f80e501 100644
--- a/res/nob-NO.xml
+++ b/res/nob-NO.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">NÃ¥dd maksimalt antall tegn</text>
     <text id="IDS_IV_BODY_ANY">Alle</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Anropsbilde</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Grunnleggende</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Umulig</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Opprettet dato</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Beskjær</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Tillatelse avslått</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Kan brukes antall ganger</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Startskjerm</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Alle album</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Type</text>
     <text id="IDS_COM_BODY_MORE">Mer</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Startskjermbakgrunn</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Avbryt</text>
     <text id="IDS_COM_BODY_GALLERY">Galleri</text>
     <text id="IDS_COM_BODY_SIZE">Størrelse</text>
diff --git a/res/pol-PL.xml b/res/pol-PL.xml
index 4fc3f33..6aeecd5 100644
--- a/res/pol-PL.xml
+++ b/res/pol-PL.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Osiągnięto maksymalną liczbę znaków</text>
     <text id="IDS_IV_BODY_ANY">Dowolny</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Zdjęcie kontaktu</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Podstawowy</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Niemożliwe</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Data utworzenia</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Przytnij</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Nie udzielono zezwolenia</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Dostępne zastosowania</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Ekran startowy</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Wszystkie albumy</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Typ</text>
     <text id="IDS_COM_BODY_MORE">Więcej</text>
+    <text id="IDS_COM_BODY_KB">kB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Tapeta ekranu start.</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Anuluj</text>
     <text id="IDS_COM_BODY_GALLERY">Galeria</text>
     <text id="IDS_COM_BODY_SIZE">Rozmiar</text>
diff --git a/res/por-BR.xml b/res/por-BR.xml
index dfd28ff..5183ea2 100644
--- a/res/por-BR.xml
+++ b/res/por-BR.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Número máximo de caracteres atingido</text>
     <text id="IDS_IV_BODY_ANY">Qualquer</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">ID de chamada</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Básico</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Impossível</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Data de criação</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Cortar</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permissão negada</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Utilizações disponíveis</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Tela principal</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Todos os álbuns</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tipo</text>
     <text id="IDS_COM_BODY_MORE">Mais</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Fundo da tela princ.</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_COM_BODY_GALLERY">Galeria</text>
     <text id="IDS_COM_BODY_SIZE">Tamanho</text>
diff --git a/res/por-PT.xml b/res/por-PT.xml
index 41675b7..291e6ce 100644
--- a/res/por-PT.xml
+++ b/res/por-PT.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Número máximo de caracteres atingido.</text>
     <text id="IDS_IV_BODY_ANY">Qualquer</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Imagem do chamador</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Básico</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Impossível</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Data criada</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Recortar</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permissão negada</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Utilizações disponíveis</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Ecrã principal</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Todos os álbuns</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tipo</text>
     <text id="IDS_COM_BODY_MORE">Mais</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Fundo do ecrã princ.</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_COM_BODY_GALLERY">Galeria</text>
     <text id="IDS_COM_BODY_SIZE">Tamanho</text>
diff --git a/res/ron-RO.xml b/res/ron-RO.xml
index 7139e3d..61bb421 100644
--- a/res/ron-RO.xml
+++ b/res/ron-RO.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Adăugare la marcaje</text>
     <text id="IDS_IV_BODY_ANY">Oricare</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Imagine apelant</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">De bază</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Imposibil</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Data creării</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Decupare</text>
+    <text id="IDS_COM_BODY_MB">MO</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permisiunea a fost refuzată</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Utilizări disponibile</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Ecran de pornire</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Toate albumele</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tip</text>
     <text id="IDS_COM_BODY_MORE">Mai multe</text>
+    <text id="IDS_COM_BODY_KB">KO</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Fundal ecran pornire</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Anulare</text>
     <text id="IDS_COM_BODY_GALLERY">Galerie</text>
     <text id="IDS_COM_BODY_SIZE">Dimensiune</text>
diff --git a/res/rus-RU.xml b/res/rus-RU.xml
index 1cd1c50..96774d0 100644
--- a/res/rus-RU.xml
+++ b/res/rus-RU.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Достигнуто максимальное число символов</text>
     <text id="IDS_IV_BODY_ANY">Любой</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Фотоопределитель</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Основной</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Невозможно</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Дата создания</text>
+    <text id="IDS_COM_BODY_GB">Гб</text>
     <text id="IDS_IV_OPT_TRIM">Обрезать</text>
+    <text id="IDS_COM_BODY_MB">Мб</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Разрешение не получено</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Доступно</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Главный экран</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Все альбомы</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Тип</text>
     <text id="IDS_COM_BODY_MORE">Опции</text>
+    <text id="IDS_COM_BODY_KB">Кб</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Обои главного экрана</text>
+    <text id="IDS_COM_BODY_B">б</text>
     <text id="IDS_COM_SK_CANCEL">Отмена</text>
     <text id="IDS_COM_BODY_GALLERY">Галерея</text>
     <text id="IDS_COM_BODY_SIZE">Размер</text>
diff --git a/res/screen-size-normal/IDL_FORM_IMAGE_SETTER.xml b/res/screen-size-normal/IDL_FORM_IMAGE_SETTER.xml
new file mode 100644
index 0000000..d481add
--- /dev/null
+++ b/res/screen-size-normal/IDL_FORM_IMAGE_SETTER.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+	This XML file was automatically generated by UiBuilder - do not modify by hand.
+-->
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">
+
+<Scene Bversion="3.0.0.201302121633" Dversion="20120315">
+    <LogicalCoordinate>720</LogicalCoordinate>
+    <Form id="IDL_FORM_IMAGE_SETTER">
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <layout mode="Portrait" style="FORM_STYLE_INDICATOR" type="NONE"/>
+        <layout mode="Landscape" style="FORM_STYLE_INDICATOR" type="NONE"/>
+    </Form>
+</Scene>
diff --git a/res/screen-size-normal/IDL_FORM.xml b/res/screen-size-normal/IDL_FORM_IMAGE_VIEWER.xml
similarity index 55%
rename from res/screen-size-normal/IDL_FORM.xml
rename to res/screen-size-normal/IDL_FORM_IMAGE_VIEWER.xml
index eba4da5..f3d7fdb 100644
--- a/res/screen-size-normal/IDL_FORM.xml
+++ b/res/screen-size-normal/IDL_FORM_IMAGE_VIEWER.xml
@@ -4,24 +4,24 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="3.0.0.v20120410" Dversion="20120315">
-	<LogicalCoordinate>720</LogicalCoordinate>
-    <Form id="IDF_FORM">
-        <property backgroundColor="" backgroundOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+<Scene Bversion="3.0.0.201302121633" Dversion="20120315">
+    <LogicalCoordinate>720</LogicalCoordinate>
+    <Form id="IDL_FORM_IMAGE_VIEWER">
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Footer>
-        <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/>
+        <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/>
         <itemSet/>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="Hello Tizen!" titleTextColor=""/>
+        <property backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
         <itemSet/>
     </Header>
-    <Button id="IDC_BUTTON_OK" parent="IDF_FORM">
-        <property disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="0" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="0" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="0" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="0" pressedTextColor="" text="OK" textSize="32" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="135" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="420" />
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="102" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="400" />
-    </Button>
+    <Gallery id="IDC_GALLERY" parent="IDL_FORM_IMAGE_VIEWER">
+        <property backgroundColor="" bitmapPathOfEmptyGallery="" slideShowAnimation="GALLERY_ANIMATION_PAGE" slideShowAnimationDuration="3000" slideShowViewDuration="10" textOfEmptyGallery="" zoomingEnabled="true"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1011" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="124" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="730" x="526" y="329"/>
+    </Gallery>
 </Scene>
diff --git a/res/screen-size-normal/IDL_FORM_NAME_EDITOR.xml b/res/screen-size-normal/IDL_FORM_NAME_EDITOR.xml
new file mode 100644
index 0000000..6bdc8a1
--- /dev/null
+++ b/res/screen-size-normal/IDL_FORM_NAME_EDITOR.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+	This XML file was automatically generated by UiBuilder - do not modify by hand.
+-->
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">
+<Scene Bversion="2.0.0.201302250945" Dversion="20120315">
+    <LogicalCoordinate>720</LogicalCoordinate>
+    <Form id="IDL_FORM_NAME_EDITOR">
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/>
+        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/>
+    </Form>
+    <Header>
+        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
+        <itemSet/>
+    </Header>
+    <EditField id="IDC_EDITFIELD_NAME" parent="IDL_FORM_NAME_EDITOR">
+        <property commandButtonVisible="true" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="true" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="255" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="45" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="100" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_FORM_NAME_EDITOR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_FORM_NAME_EDITOR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="IDL_FORM_NAME_EDITOR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="120" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_FORM_NAME_EDITOR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_FORM_NAME_EDITOR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_NORMAL" topRelation="IDL_FORM_NAME_EDITOR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>
+    </EditField>
+</Scene>
diff --git a/res/slk-SK.xml b/res/slk-SK.xml
index 6a3f34e..09c5a2d 100644
--- a/res/slk-SK.xml
+++ b/res/slk-SK.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Bol dosiahnutý maximálny počet znakov</text>
     <text id="IDS_IV_BODY_ANY">VÅ¡etko</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Obrázok volajúceho</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Základný</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Nemožné</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Dátum vytvorenia</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Orezať</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Povolenie odmietnuté</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Počet použití k dispozícii</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Úvodná obrazovka</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">VÅ¡etky albumy</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Typ</text>
     <text id="IDS_COM_BODY_MORE">Ďalšie</text>
+    <text id="IDS_COM_BODY_KB">kB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Tapeta úv. obrazovky</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Zrušiť</text>
     <text id="IDS_COM_BODY_GALLERY">Galéria</text>
     <text id="IDS_COM_BODY_SIZE">Veľkosť</text>
diff --git a/res/slv-SI.xml b/res/slv-SI.xml
index 5477af3..c6d9c90 100644
--- a/res/slv-SI.xml
+++ b/res/slv-SI.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Doseženo je največje dovoljeno število znakov</text>
     <text id="IDS_IV_BODY_ANY">Karkoli</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Slika klicatelja</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Osnovno</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Nemogoče</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Datum ustvarjanja</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Obreži</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Dovoljenje zavrnjeno</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Å tevilo uporab</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Domači zaslon</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Vsi albumi</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Vrsta</text>
     <text id="IDS_COM_BODY_MORE">Več</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Ozadje za dom. zaslon</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Prekliči</text>
     <text id="IDS_COM_BODY_GALLERY">Galerija</text>
     <text id="IDS_COM_BODY_SIZE">Velikost</text>
diff --git a/res/spa-ES.xml b/res/spa-ES.xml
index 4e4813f..1003ee4 100644
--- a/res/spa-ES.xml
+++ b/res/spa-ES.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Alcanzado el número máximo de caracteres</text>
     <text id="IDS_IV_BODY_ANY">Cualquiera</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Imagen de llamante</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Básico</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Imposible</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Fecha de creación</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Recortar</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permiso denegado</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Usos disponibles</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Pantalla de inicio</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Todos los álbumes</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tipo</text>
     <text id="IDS_COM_BODY_MORE">Más</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Fondo de pantalla de inicio</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_COM_BODY_GALLERY">Galería</text>
     <text id="IDS_COM_BODY_SIZE">Tamaño</text>
diff --git a/res/spa-MX.xml b/res/spa-MX.xml
index 8d4134a..4a3d3e9 100644
--- a/res/spa-MX.xml
+++ b/res/spa-MX.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Se ha alcanzado el número máximo de caracteres</text>
     <text id="IDS_IV_BODY_ANY">Cualquiera</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">ID del llamante</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Básico</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Imposible</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Fecha de creación</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Recortar</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Permiso denegado</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Usos disponibles</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Pantalla de inicio</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Todos los álbumes</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tipo</text>
     <text id="IDS_COM_BODY_MORE">Más</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Fondo pantalla inicio</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Cancelar</text>
     <text id="IDS_COM_BODY_GALLERY">Galería</text>
     <text id="IDS_COM_BODY_SIZE">Tamaño</text>
diff --git a/res/srp-RS.xml b/res/srp-RS.xml
index 4c6cb70..22fa392 100644
--- a/res/srp-RS.xml
+++ b/res/srp-RS.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Dostignut maksimalan broj karaktera</text>
     <text id="IDS_IV_BODY_ANY">Sve</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Slika pozivaoca</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Osnovni</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Nemoguće</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Datum kreiranja</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Odseci</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Dozvola odbijena</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Moguće upotrebe</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Početni ekran</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Svi albumi</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tip</text>
     <text id="IDS_COM_BODY_MORE">Još</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Tapet početnog ekrana</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Poništi</text>
     <text id="IDS_COM_BODY_GALLERY">Galerija</text>
     <text id="IDS_COM_BODY_SIZE">Veličina</text>
diff --git a/res/swe-SE.xml b/res/swe-SE.xml
index 66ad0c3..2dae1c3 100644
--- a/res/swe-SE.xml
+++ b/res/swe-SE.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Maximalt antal tecken har använts</text>
     <text id="IDS_IV_BODY_ANY">Alla</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Foto-ID</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Grundläggande</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Ej möjlig</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Skapat den</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Beskär</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Tillstånd nekades</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Tillgängliga tillämpningar</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Hemskärm</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Alla album</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Typ</text>
     <text id="IDS_COM_BODY_MORE">Mer</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Bakg. för hemskärmen</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Avbryt</text>
     <text id="IDS_COM_BODY_GALLERY">Galleri</text>
     <text id="IDS_COM_BODY_SIZE">Storlek</text>
diff --git a/res/tur-TR.xml b/res/tur-TR.xml
index c48cd88..0081217 100644
--- a/res/tur-TR.xml
+++ b/res/tur-TR.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Maksimum karakter sayısına ulaşıldı</text>
     <text id="IDS_IV_BODY_ANY">Herhangi</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Arayanın resmi</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Temel</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">İmkansız</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Oluşturma tarihi</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">Kırp</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Ä°zin reddedildi</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Mevcut kullanımlar</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Ana sayfa ekranı</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Tüm albümler</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tür</text>
     <text id="IDS_COM_BODY_MORE">Diğer</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Ana ekran duvr kağıdı</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Ä°ptal</text>
     <text id="IDS_COM_BODY_GALLERY">Galeri</text>
     <text id="IDS_COM_BODY_SIZE">Boyut</text>
@@ -92,7 +96,7 @@
     <text id="IDS_COM_BODY_REMOVE">Kaldır</text>
     <text id="IDS_IV_BODY_INTERVAL">Aralık</text>
     <text id="IDS_COM_POP_ALREDY_EXISTS">Zaten var</text>
-    <text id="IDS_IV_BODY_LOCK_SCREEN">Kilit ekranı</text>
+    <text id="IDS_IV_BODY_LOCK_SCREEN">Ekranı kilitle</text>
     <text id="IDS_COM_BODY_DONE">Tamamlandı</text>
     <text id="IDS_COM_POP_SAVING_FAILED">Kaydetme başarısız</text>
     <text id="IDS_IV_BODY_N_A">Geçerli değil</text>
diff --git a/res/ukr-UA.xml b/res/ukr-UA.xml
index 0a94473..da21ae3 100644
--- a/res/ukr-UA.xml
+++ b/res/ukr-UA.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Досягнуто максимальної кількості символів</text>
     <text id="IDS_IV_BODY_ANY">Any</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Зображення абонента</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Основний</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Неможливо</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Дату створено</text>
+    <text id="IDS_COM_BODY_GB">ГБ</text>
     <text id="IDS_IV_OPT_TRIM">Обробити</text>
+    <text id="IDS_COM_BODY_MB">МБ</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">У дозволі відмовлено</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Доступні використання</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Головний екран</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Усі альбоми</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Тип</text>
     <text id="IDS_COM_BODY_MORE">Більше</text>
+    <text id="IDS_COM_BODY_KB">КБ</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">Заставка головного екр.</text>
+    <text id="IDS_COM_BODY_B">Б</text>
     <text id="IDS_COM_SK_CANCEL">Скасувати</text>
     <text id="IDS_COM_BODY_GALLERY">Галерея</text>
     <text id="IDS_COM_BODY_SIZE">Розмір</text>
diff --git a/res/uzb-UZ.xml b/res/uzb-UZ.xml
index 365bae7..5bad540 100644
--- a/res/uzb-UZ.xml
+++ b/res/uzb-UZ.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">Belgilar soni ruxsat etilgan maksimal miqdorga yetdi</text>
     <text id="IDS_IV_BODY_ANY">Har qanday</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">Qo‘ng‘iroq qiluvchi rasmi</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">Boshlang'ich</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">Imkonsiz</text>
     <text id="IDS_IV_BODY_DATE_CREATED">Yaratilgan sana</text>
+    <text id="IDS_COM_BODY_GB">Gb</text>
     <text id="IDS_IV_OPT_TRIM">Bezatish</text>
+    <text id="IDS_COM_BODY_MB">Mb</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">Ruxsat rad etildi</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">Mavjud foydalanishlar</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">Asosiy ekran</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">Barcha albomlar</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">Tur</text>
     <text id="IDS_COM_BODY_MORE">Ko‘proq</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">As. ekran fon rasmi</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">Bekor q.</text>
     <text id="IDS_COM_BODY_GALLERY">Galereya</text>
     <text id="IDS_COM_BODY_SIZE">O‘lcham</text>
diff --git a/res/zho-CN.xml b/res/zho-CN.xml
index 31b9db1..6586484 100644
--- a/res/zho-CN.xml
+++ b/res/zho-CN.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">已达到最大字符限制</text>
     <text id="IDS_IV_BODY_ANY">任何</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">来电图片</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">基本</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">不可以</text>
     <text id="IDS_IV_BODY_DATE_CREATED">创建日期</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">修剪</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">许可被拒绝</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">可用于</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">主屏</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">所有相册</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">类型</text>
     <text id="IDS_COM_BODY_MORE">更多</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">主屏幕墙纸</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">取消</text>
     <text id="IDS_COM_BODY_GALLERY">图库</text>
     <text id="IDS_COM_BODY_SIZE">大小</text>
diff --git a/res/zho-HK.xml b/res/zho-HK.xml
index 32bdd42..c68082f 100644
--- a/res/zho-HK.xml
+++ b/res/zho-HK.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">字元數目已達上限</text>
     <text id="IDS_IV_BODY_ANY">任何</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">來電者圖像</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">灰底</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">不可以</text>
     <text id="IDS_IV_BODY_DATE_CREATED">建立日期</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">修剪</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">權限被拒絕</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">可供使用</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">主螢幕</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">全部專輯</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">類型</text>
     <text id="IDS_COM_BODY_MORE">更多</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">主螢幕牆紙</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">取消</text>
     <text id="IDS_COM_BODY_GALLERY">媒體瀏覽器</text>
     <text id="IDS_COM_BODY_SIZE">大小</text>
diff --git a/res/zho-SG.xml b/res/zho-SG.xml
index 0088726..018dbbd 100644
--- a/res/zho-SG.xml
+++ b/res/zho-SG.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">已达最大字符数量</text>
     <text id="IDS_IV_BODY_ANY">任何</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">来电图象</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">基本</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">不可能</text>
     <text id="IDS_IV_BODY_DATE_CREATED">创建日期</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">修整</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">许可被拒绝</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">适用用法</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">主屏</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">所有相册</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">类型</text>
     <text id="IDS_COM_BODY_MORE">更多</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">主屏幕墙纸</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">取消</text>
     <text id="IDS_COM_BODY_GALLERY">画廊</text>
     <text id="IDS_COM_BODY_SIZE">大小</text>
diff --git a/res/zho-TW.xml b/res/zho-TW.xml
index 6fb4a25..9546102 100644
--- a/res/zho-TW.xml
+++ b/res/zho-TW.xml
@@ -2,7 +2,7 @@
 <!--
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201302021409" Dversion="20120315">
+<string_table Bversion="2.0.0.201302250945" Dversion="20120315">
     <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED">已達字元數上限</text>
     <text id="IDS_IV_BODY_ANY">任何</text>
     <text id="IDS_IV_BODY_CALLER_IMAGE">來電者圖像</text>
@@ -12,7 +12,9 @@
     <text id="IDS_IV_BODY_BASIC">基本</text>
     <text id="IDS_IV_BODY_IMPOSSIBLE">不可能</text>
     <text id="IDS_IV_BODY_DATE_CREATED">建立日期</text>
+    <text id="IDS_COM_BODY_GB">GB</text>
     <text id="IDS_IV_OPT_TRIM">剪輯</text>
+    <text id="IDS_COM_BODY_MB">MB</text>
     <text id="IDS_IV_POP_PERMISSION_DENIED">權限被拒絕</text>
     <text id="IDS_IV_BODY_AVAILABLE_USES">可供使用</text>
     <text id="IDS_IV_BODY_HOME_SCREEN">主螢幕</text>
@@ -27,11 +29,11 @@
     <text id="IDS_IV_BODY_DO_NOT_SHOW_AGAIN">不再顯示</text>
     <text id="IDS_COM_BODY_DELETE">刪除</text>
     <text id="IDS_COM_BODY_EDIT_CANCEL">取消</text>
-    <text id="IDS_IV_POP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED">達到%個最大字元</text>
+    <text id="IDS_IV_POP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED">達到%d個最大字元</text>
     <text id="IDS_IV_BODY_COUNT">計數</text>
     <text id="IDS_IV_BODY_PRINT">列印</text>
     <text id="IDS_IV_POP_ENTRY_IS_EMPTY">項目為空</text>
-    <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED">達到%個最大字元</text>
+    <text id="IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED">達到%d個最大字元</text>
     <text id="IDS_IV_OPT_USE_MOTION">使用動作</text>
     <text id="IDS_COM_POP_PS_ALREADY_EXISTS">%s 已存在</text>
     <text id="IDS_COM_BODY_LOADING">正在載入...</text>
@@ -57,7 +59,9 @@
     <text id="IDS_IV_HEADER_ALL_ALBUMS">所有相簿</text>
     <text id="IDS_COM_BODY_DETAILS_TYPE">類型</text>
     <text id="IDS_COM_BODY_MORE">更多</text>
+    <text id="IDS_COM_BODY_KB">KB</text>
     <text id="IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB">主螢幕桌布</text>
+    <text id="IDS_COM_BODY_B">B</text>
     <text id="IDS_COM_SK_CANCEL">取消</text>
     <text id="IDS_COM_BODY_GALLERY">媒體瀏覽器</text>
     <text id="IDS_COM_BODY_SIZE">大小</text>
diff --git a/src/IvCommonUtil.cpp b/src/IvCommonUtil.cpp
index a63a6f0..e1e8761 100644
--- a/src/IvCommonUtil.cpp
+++ b/src/IvCommonUtil.cpp
@@ -44,23 +44,25 @@ CommonUtil::GetMediaType(const String& filePath)
 	}
 	else
 	{
-		if (	filePath.EndsWith(CONTENT_EXT_JPG)
-			|| filePath.EndsWith(CONTENT_EXT_PNG)
-			|| filePath.EndsWith(CONTENT_EXT_BMP)
-			|| filePath.EndsWith(CONTENT_EXT_GIF)
-			|| filePath.EndsWith(CONTENT_EXT_TIF)
-			|| filePath.EndsWith(CONTENT_EXT_TIFF)
-			|| filePath.EndsWith(CONTENT_EXT_WBMP)
-			|| filePath.EndsWith(CONTENT_EXT_JPEG))
+		String tempPath = filePath;
+		tempPath.ToLowerCase();
+		if (	tempPath.EndsWith(CONTENT_EXT_JPG)
+			|| tempPath.EndsWith(CONTENT_EXT_PNG)
+			|| tempPath.EndsWith(CONTENT_EXT_BMP)
+			|| tempPath.EndsWith(CONTENT_EXT_GIF)
+			|| tempPath.EndsWith(CONTENT_EXT_TIF)
+			|| tempPath.EndsWith(CONTENT_EXT_TIFF)
+			|| tempPath.EndsWith(CONTENT_EXT_WBMP)
+			|| tempPath.EndsWith(CONTENT_EXT_JPEG))
 		{
 			mediaType = IMAGE_VIEWER_MEDIA_TYPE_IMAGE;
 		}
-		else if (	filePath.EndsWith(CONTENT_EXT_MP4)
-				|| filePath.EndsWith(CONTENT_EXT_3GP)
-				|| filePath.EndsWith(CONTENT_EXT_AVI)
-				|| filePath.EndsWith(CONTENT_EXT_ASF)
-				|| filePath.EndsWith(CONTENT_EXT_WMV)
-				|| filePath.EndsWith(CONTENT_EXT_FLV))
+		else if (	tempPath.EndsWith(CONTENT_EXT_MP4)
+				|| tempPath.EndsWith(CONTENT_EXT_3GP)
+				|| tempPath.EndsWith(CONTENT_EXT_AVI)
+				|| tempPath.EndsWith(CONTENT_EXT_ASF)
+				|| tempPath.EndsWith(CONTENT_EXT_WMV)
+				|| tempPath.EndsWith(CONTENT_EXT_FLV))
 		{
 			mediaType = IMAGE_VIEWER_MEDIA_TYPE_VIDEO;
 		}
diff --git a/src/IvImageNameEditorForm.cpp b/src/IvImageNameEditorForm.cpp
index d6d4e80..2976d5f 100644
--- a/src/IvImageNameEditorForm.cpp
+++ b/src/IvImageNameEditorForm.cpp
@@ -41,18 +41,15 @@ using namespace Tizen::Media;
 using namespace Tizen::Io;
 using namespace Tizen::System;
 
-static const Rectangle  RECT_NAME_EDIT_FIELD (0, 0, 720, 100);
-static const Rectangle  RECT_LANDSCAPE_NAME_EDIT_FIELD (0, 0, 1280, 100);
-static const wchar_t* CONTENT_ID_STRING_EMPTY = L"00000000-0000-0000-0000-000000000000";
 
-static const unsigned int COLOR_NAME_EDIT_FIELD = Color32<255, 255, 255>::Value;
+static const wchar_t* CONTENT_ID_STRING_EMPTY = L"00000000-0000-0000-0000-000000000000";
 static const int FILE_MAX_LENGTH = 255;
 
 ImageNameEditorForm::ImageNameEditorForm()
-	: __currentIndex(0)
-	, __pNameEditField(null)
-	, __pMessageBox(null)
-	, __pPresentationModel(null)
+: __currentIndex(0)
+, __pNameEditField(null)
+, __pMessageBox(null)
+, __pPresentationModel(null)
 {
 	AppLogDebug("ENTER");
 	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -68,7 +65,7 @@ result
 ImageNameEditorForm::Initialize(void)
 {
 	AppLogDebug("ENTER");
-	result r = Construct(FORM_STYLE_HEADER | FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR);
+	result r = Form::Construct(IDL_FORM_NAME_EDITOR);
 	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
 	return r;
@@ -78,7 +75,6 @@ result
 ImageNameEditorForm::OnInitializing(void)
 {
 	AppLogDebug("ENTER");
-	SetOrientation(ORIENTATION_AUTOMATIC);
 	AddOrientationEventListener(*this);
 	Header* pHeader = GetHeader();
 	pHeader->SetTitleText(ResourceManager::GetString(L"IDS_COM_BODY_CHANGE_NAME"));
@@ -95,14 +91,15 @@ ImageNameEditorForm::OnInitializing(void)
 	pHeader->AddItem(cancelItem);
 	pHeader->AddActionEventListener(*this);
 
-	__pNameEditField = new (std::nothrow) EditField();
-	__pNameEditField->Construct(RECT_NAME_EDIT_FIELD, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, false,
-			FILE_MAX_LENGTH);
-	__pNameEditField->SetColor(EDIT_STATUS_NORMAL, COLOR_NAME_EDIT_FIELD);
-	__pNameEditField->AddTextEventListener(*this);
+	__pNameEditField = static_cast< EditField* >(GetControl(L"IDC_EDITFIELD_NAME"));
 
-	AddControl(*__pNameEditField);
-	__pNameEditField->AddActionEventListener(*this);
+	if (__pNameEditField == null)
+	{
+		return E_FAILURE;
+	}
+
+	__pNameEditField->AddTextEventListener(*this);
+	__pNameEditField->SetOverlayKeypadCommandButtonVisible(false);
 
 	__pPresentationModel = ImageViewerPresentationModel::GetInstance();
 	String filePath = __pPresentationModel->GetFilePathAt(__currentIndex);
@@ -112,7 +109,8 @@ ImageNameEditorForm::OnInitializing(void)
 
 	__pNameEditField->SetText(__nameEditFieldText);
 	__nameEditFieldTempText = __nameEditFieldText;
-	__pNameEditField->SetOverlayKeypadCommandButtonVisible(false);
+	__pNameEditField->AddActionEventListener(*this);
+
 	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
 	return E_SUCCESS;
@@ -121,18 +119,7 @@ ImageNameEditorForm::OnInitializing(void)
 void
 ImageNameEditorForm::OnOrientationChanged(const Control &source, OrientationStatus orientationStatus)
 {
-	AppLogDebug("ENTER");
-	if (orientationStatus == ORIENTATION_STATUS_LANDSCAPE
-		|| orientationStatus == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
-	{
-		__pNameEditField->SetBounds(RECT_LANDSCAPE_NAME_EDIT_FIELD);
-	}
-	else
-	{
-		__pNameEditField->SetBounds(RECT_NAME_EDIT_FIELD);
-	}
-	Draw();
-	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+
 }
 
 result
@@ -189,7 +176,7 @@ ImageNameEditorForm::OnActionPerformed(const Control& source, int actionId)
 				return;
 			}
 			if (originalFilePath.StartsWith(Environment::GetMediaPath(), 0) == true
-				|| originalFilePath.StartsWith(Environment::GetExternalStoragePath(), 0) == true)
+					|| originalFilePath.StartsWith(Environment::GetExternalStoragePath(), 0) == true)
 			{
 				ContentId contentId = __pPresentationModel->GetFileContentId(originalFilePath);
 				ContentManager contentManager;
@@ -370,12 +357,12 @@ ImageNameEditorForm::OnActionPerformed(const Control& source, int actionId)
 			}
 			__pPresentationModel->UpdateFilePathAt(__currentIndex, filePath);
 			__nameEditFieldPreText = __nameEditFieldText;
-			pSceneManager->GoForward(ForwardSceneTransition(IDSCN_IMAGE_VIEWER));
+			pSceneManager->GoBackward(BackwardSceneTransition());
 		}
 		break;
 	case ACTION_ID_BUTTON_EDITFIELD_CANCEL:
 		__pNameEditField->SetText(__nameEditFieldPreText);
-		pSceneManager->GoForward(ForwardSceneTransition(IDSCN_IMAGE_VIEWER));
+		pSceneManager->GoBackward(BackwardSceneTransition());
 		break;
 	default:
 		break;
@@ -407,6 +394,24 @@ ImageNameEditorForm::OnTextValueChanged (const Control &source)
 	String filePath = __pPresentationModel->GetFilePathAt(__currentIndex);
 	String inputString = __pNameEditField->GetText();
 
+	if (inputString.Contains(DIRECTORY_SEPARATOR) == true)
+	{
+		if (__pMessageBox == null)
+		{
+			__pMessageBox = new (std::nothrow) MessageBox();
+			__pMessageBox->Construct(L"", L"Donot use invalid character '/'", MSGBOX_STYLE_NONE, 3000);
+			int modalResult = 0;
+			__pMessageBox->ShowAndWait(modalResult);
+			delete __pMessageBox;
+			__pMessageBox = null;
+		}
+
+		__pNameEditField->SetText(__nameEditFieldTempText);
+		__pNameEditField->SetFocus();
+
+		return;
+	}
+
 	String ext = File::GetFileExtension(filePath);
 
 	ByteBuffer* buffer = StringUtil::StringToUtf8N(inputString);
@@ -466,7 +471,7 @@ ImageNameEditorForm::OnTextValueChanged (const Control &source)
 
 void
 ImageNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId,
-										  const SceneId& currentSceneId, IList* pArgs)
+		const SceneId& currentSceneId, IList* pArgs)
 {
 	AppLogDebug("ENTER");
 	if (previousSceneId == IDSCN_IMAGE_VIEWER)
@@ -492,8 +497,7 @@ ImageNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId,
 		__nameEditFieldPreText = __nameEditFieldText;
 		__pNameEditField->SetText(__nameEditFieldText);
 		__nameEditFieldTempText = __nameEditFieldText;
-		__pNameEditField->SetOverlayKeypadCommandButtonVisible(false);
-		__pNameEditField->SetFocus();
+		__pNameEditField->ShowKeypad();
 
 		Header* header = GetHeader();
 		HeaderItemStatus itemStatus;
@@ -521,7 +525,7 @@ ImageNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId,
 
 void
 ImageNameEditorForm::OnSceneDeactivated(const SceneId& currentSceneId,
-										   const SceneId& nextSceneId)
+		const SceneId& nextSceneId)
 {
 	AppLogDebug("ENTER");
 	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
diff --git a/src/IvImageSetterForm.cpp b/src/IvImageSetterForm.cpp
index 0b81eaf..83fe96d 100644
--- a/src/IvImageSetterForm.cpp
+++ b/src/IvImageSetterForm.cpp
@@ -74,7 +74,7 @@ result
 ImageSetterForm::Initialize(void)
 {
 	AppLogDebug("ENTER");
-	result r = Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR);
+	result r = Form::Construct(IDL_FORM_IMAGE_SETTER);
 	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
 	return r;
@@ -87,7 +87,6 @@ ImageSetterForm::OnInitializing(void)
 	SetFormBackEventListener(this);
 
 	result r = SetActionBarsTranslucent(FORM_ACTION_BAR_INDICATOR, true);
-	SetOrientation(ORIENTATION_AUTOMATIC);
 	AddOrientationEventListener(*this);
 
 	__pPresentationModel = ImageViewerPresentationModel::GetInstance();
diff --git a/src/IvImageViewerForm.cpp b/src/IvImageViewerForm.cpp
index 756dd5e..a27a529 100644
--- a/src/IvImageViewerForm.cpp
+++ b/src/IvImageViewerForm.cpp
@@ -26,6 +26,7 @@
 #include "IvImageViewerForm.h"
 #include "IvImageViewerPresentationModel.h"
 #include "IvResourceManager.h"
+#include "IvSettingPresentationModel.h"
 #include "IvTypes.h"
 
 using namespace Tizen::App;
@@ -92,28 +93,28 @@ static const int DETAIL_MAIN_FONT_SIZE = 48;
 static const int DETAIL_COUNT_MAX = 9;
 
 ImageViewerForm::ImageViewerForm(void)
-	: __initializeDisplayModeCurrent(APPCONTROL_MODE_NORMAL)
-	, __pHeader(null)
-	, __pFooter(null)
-	, __pScrollPanel(null)
-	, __pDetail_Label(null)
-	, __pLabelMessage(null)
-	, __pPlayButton(null)
-	, __pRenameButton(null)
-	, __pDetailFooterItem(null)
-	, __pGallery(null)
-	, __pTimer(null)
-	, __pDecodeBitmap(null)
-	, __pContextMenuMore(null)
-	, __pContextMenuCopy(null)
-	, __pContextMenuSetAs(null)
-	, __pContextMenuShare(null)
-	, __pDeletePopup(null)
-	, __visible(true)
-	, __detail(true)
-	, __startSlide(false)
-	, __requestId(0)
-	, __pPresentationModel(null)
+: __initializeDisplayModeCurrent(APPCONTROL_MODE_NORMAL)
+, __pHeader(null)
+, __pFooter(null)
+, __pScrollPanel(null)
+, __pDetail_Label(null)
+, __pLabelMessage(null)
+, __pPlayButton(null)
+, __pRenameButton(null)
+, __pDetailFooterItem(null)
+, __pGallery(null)
+, __pTimer(null)
+, __pDecodeBitmap(null)
+, __pContextMenuMore(null)
+, __pContextMenuCopy(null)
+, __pContextMenuSetAs(null)
+, __pContextMenuShare(null)
+, __pDeletePopup(null)
+, __visible(true)
+, __detail(true)
+, __startSlide(false)
+, __requestId(0)
+, __pPresentationModel(null)
 {
 	AppLogDebug("ENTER");
 
@@ -149,6 +150,8 @@ ImageViewerForm::Initialize()
 		}
 	}
 
+	__pSettingPresentationModel = SettingPresentationModel::GetInstance();
+
 	int startIndex = __pPresentationModel->GetStartIndex();
 	String filePath = __pPresentationModel->GetFilePathAt(startIndex);
 
@@ -156,6 +159,10 @@ ImageViewerForm::Initialize()
 	{
 		__initializeDisplayModeCurrent = APPCONTROL_MODE_WEB_LINK;
 	}
+	else if (__pPresentationModel->GetType() == APPCONTROL_DATA_MESSAGE)
+	{
+		__initializeDisplayModeCurrent = APPCONTROL_MODE_MESSAGE;
+	}
 	else if (__pPresentationModel->GetType() == APPCONTROL_DATA_EMAIL)
 	{
 		__initializeDisplayModeCurrent = APPCONTROL_MODE_EMAIL;
@@ -165,11 +172,7 @@ ImageViewerForm::Initialize()
 		__initializeDisplayModeCurrent = APPCONTROL_MODE_NORMAL;
 	}
 
-	result r = Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
-	if (r == E_SUCCESS)
-	{
-		SetOrientation(ORIENTATION_AUTOMATIC);
-	}
+	result r = Form::Construct(IDL_FORM_IMAGE_VIEWER);
 
 	if (filePath == EMPTY_SPACE)
 	{
@@ -201,7 +204,8 @@ ImageViewerForm::OnInitializing(void)
 	InitializePopup();
 
 	if (	__initializeDisplayModeCurrent == APPCONTROL_MODE_NORMAL
-		|| __initializeDisplayModeCurrent == APPCONTROL_MODE_EMAIL)
+			|| __initializeDisplayModeCurrent == APPCONTROL_MODE_MESSAGE
+			|| __initializeDisplayModeCurrent == APPCONTROL_MODE_EMAIL)
 	{
 		int index = __pPresentationModel->GetStartIndex();
 		__pGallery->UpdateGallery();
@@ -253,7 +257,7 @@ ImageViewerForm::OnOrientationChanged(const Control &source, OrientationStatus o
 	}
 
 	if (orientationStatus == ORIENTATION_STATUS_PORTRAIT ||
-				orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+			orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
 	{
 		Rectangle clientRect = GetClientAreaBounds();
 		Rectangle rect = GetBounds();
@@ -401,7 +405,7 @@ ImageViewerForm::InitializeDisplay(AppControlMode status)
 		delete pfooterItem1;
 		delete pfooterItem2;
 	}
-	else if (status == APPCONTROL_MODE_EMAIL)
+	else if (status == APPCONTROL_MODE_MESSAGE || status == APPCONTROL_MODE_EMAIL)
 	{
 		__pPlayButton = new (std::nothrow) Button();
 		if (__pPlayButton != null)
@@ -571,9 +575,6 @@ ImageViewerForm::CreateGallery(void)
 
 	switch (effect)
 	{
-	case SLIDE_SHOW_TRANSITION_EFFECT_PAGE:
-		__pGallery->SetSlideShowAnimation(Controls::GALLERY_ANIMATION_PAGE);
-		break;
 	case SLIDE_SHOW_TRANSITION_EFFECT_DISSOLVE:
 		__pGallery->SetSlideShowAnimation(Controls::GALLERY_ANIMATION_DISSOLVE);
 		break;
@@ -593,14 +594,14 @@ result
 ImageViewerForm::InitializePanelDetail()
 {
 	AppLogDebug("ENTER");
-	 __pScrollPanel = new (std::nothrow) ScrollPanel();
+	__pScrollPanel = new (std::nothrow) ScrollPanel();
 
-	 String arrayId[DETAIL_COUNT_MAX] =
-	 {
-		L"IDS_COM_BODY_DETAILS_NAME", L"IDS_IV_BODY_FILE_FORMAT", L"IDS_IV_BODY_DATE_CREATED",
-		L"IDS_COM_BODY_SIZE", L"IDS_IV_BODY_RESOLUTION", L"IDS_COM_BODY_LOCATION",
-		L"IDS_COM_BODY_LATITUDE", L"IDS_COM_BODY_LONGITUDE", L"IDS_IV_BODY_FILE_LOCATION"
-	 };
+	String arrayId[DETAIL_COUNT_MAX] =
+	{
+			L"IDS_COM_BODY_DETAILS_NAME", L"IDS_IV_BODY_FILE_FORMAT", L"IDS_IV_BODY_DATE_CREATED",
+			L"IDS_COM_BODY_SIZE", L"IDS_IV_BODY_RESOLUTION", L"IDS_COM_BODY_LOCATION",
+			L"IDS_COM_BODY_LATITUDE", L"IDS_COM_BODY_LONGITUDE", L"IDS_IV_BODY_FILE_LOCATION"
+	};
 
 	if (__pScrollPanel == null)
 	{
@@ -630,8 +631,8 @@ ImageViewerForm::InitializePanelDetail()
 		__pDetail_FileInfo_Label[i] = new (std::nothrow) Label();
 		__pDetail_FileInfo_Label[i]->Construct(
 				Rectangle(X_DETAIL_FILEINFO_LABEL,
-				GAP_H_DETAIL_TEXT * (i + 1) + H_DETAIL_MAIN_TEXT + (H_DETAIL_MAIN_TEXT + H_DETAIL_SUB_TEXT) * i,
-				W_DETAIL_FILEINFO_LABEL, H_DETAIL_FILEINFO_LABEL), ResourceManager::GetString(arrayId[i]));
+						GAP_H_DETAIL_TEXT * (i + 1) + H_DETAIL_MAIN_TEXT + (H_DETAIL_MAIN_TEXT + H_DETAIL_SUB_TEXT) * i,
+						W_DETAIL_FILEINFO_LABEL, H_DETAIL_FILEINFO_LABEL), ResourceManager::GetString(arrayId[i]));
 		__pScrollPanel->AddControl(*__pDetail_FileInfo_Label[i]);
 
 		__pDetail_FileInfo_Label[i]->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
@@ -642,8 +643,8 @@ ImageViewerForm::InitializePanelDetail()
 		__pDetail_FileInfo_Value_Label[i] = new (std::nothrow) Label();
 		__pDetail_FileInfo_Value_Label[i]->Construct(
 				Rectangle(X_DETAIL_FILEINFO_LABEL,
-				GAP_H_DETAIL_TEXT * (i + 1) + H_DETAIL_MAIN_TEXT + (H_DETAIL_MAIN_TEXT * i) + H_DETAIL_SUB_TEXT * (i + 1),
-				W_DETAIL_FILEINFO_VALUE_LABEL, H_DETAIL_FILEINFO_VALUE_LABEL), L"");
+						GAP_H_DETAIL_TEXT * (i + 1) + H_DETAIL_MAIN_TEXT + (H_DETAIL_MAIN_TEXT * i) + H_DETAIL_SUB_TEXT * (i + 1),
+						W_DETAIL_FILEINFO_VALUE_LABEL, H_DETAIL_FILEINFO_VALUE_LABEL), L"");
 		__pScrollPanel->AddControl(*__pDetail_FileInfo_Value_Label[i]);
 
 		__pDetail_FileInfo_Value_Label[i]->SetTextVerticalAlignment(ALIGNMENT_BOTTOM);
@@ -723,7 +724,7 @@ ImageViewerForm::InitializeContextMenuMore(void)
 	__pContextMenuMore = new (std::nothrow) ContextMenu();
 
 	__pContextMenuMore->Construct(Point(X_MORE, GetClientAreaBounds().y + GetClientAreaBounds().height),
-				CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+			CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
 
 	if (mediaType == IMAGE_VIEWER_MEDIA_TYPE_IMAGE)
 	{
@@ -786,7 +787,9 @@ ImageViewerForm::InitializeContextMenuShare(void)
 			GetClientAreaBounds().y + GetClientAreaBounds().height), CONTEXT_MENU_STYLE_LIST,
 			CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
 
-	__pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),ACTION_ID_CONTEXTMENU_EMAIL);
+	__pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"),
+			ACTION_ID_CONTEXTMENU_MESSAGE);
+	__pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"), ACTION_ID_CONTEXTMENU_EMAIL);
 	__pContextMenuShare->AddActionEventListener(*this);
 	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
@@ -851,19 +854,23 @@ ImageViewerForm::SetDetailInfo(void)
 
 		if (nSize > SINGLE_GIGA_BYTE)
 		{
-			strResult[3].Format(FORMAT_BUFFER_SIZE, L"%lld GB", nSize / SINGLE_GIGA_BYTE);
+			strResult[3].Format(FORMAT_BUFFER_SIZE, L"%lld ", nSize / SINGLE_GIGA_BYTE);
+			strResult[3].Append(ResourceManager::GetString(L"IDS_COM_BODY_GB"));
 		}
 		else if (nSize > SINGLE_MEGA_BYTE)
 		{
-			strResult[3].Format(FORMAT_BUFFER_SIZE, L"%lld MB", nSize / SINGLE_MEGA_BYTE);
+			strResult[3].Format(FORMAT_BUFFER_SIZE, L"%lld ", nSize / SINGLE_MEGA_BYTE);
+			strResult[3].Append(ResourceManager::GetString(L"IDS_COM_BODY_MB"));
 		}
 		else if (nSize > SINGLE_KILO_BYTE)
 		{
-			strResult[3].Format(FORMAT_BUFFER_SIZE, L"%lld KB", nSize / SINGLE_KILO_BYTE);
+			strResult[3].Format(FORMAT_BUFFER_SIZE, L"%lld ", nSize / SINGLE_KILO_BYTE);
+			strResult[3].Append(ResourceManager::GetString(L"IDS_COM_BODY_KB"));
 		}
 		else
 		{
-			strResult[3].Format(FORMAT_BUFFER_SIZE, L"%lld Byte", nSize);
+			strResult[3].Format(FORMAT_BUFFER_SIZE, L"%lld ", nSize);
+			strResult[3].Append(ResourceManager::GetString(L"IDS_COM_BODY_B"));
 		}
 	}
 	else
@@ -937,7 +944,7 @@ ImageViewerForm::SetDetailInfo(void)
 	for (int i = 0; i < DETAIL_COUNT_MAX; ++i)
 	{
 		__pDetail_FileInfo_Value_Label[i]->SetBounds(X_DETAIL_FILEINFO_LABEL, GAP_H_DETAIL_TEXT * (i + 1) + H_DETAIL_MAIN_TEXT + (H_DETAIL_MAIN_TEXT * i) + H_DETAIL_SUB_TEXT * (i + 1),
-																clientRect.width - GAP_LABEL_END, H_DETAIL_FILEINFO_VALUE_LABEL);
+				clientRect.width - GAP_LABEL_END, H_DETAIL_FILEINFO_VALUE_LABEL);
 		__pDetail_FileInfo_Value_Label[i]->SetText(strResult[i]);
 		__pDetail_FileInfo_Value_Label[i]->RequestRedraw();
 	}
@@ -1100,7 +1107,7 @@ ImageViewerForm::CreateItem(int index)
 	}
 	pGallery->Construct(*pBitmap, filePath);
 	delete pBitmap;
-    AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
 	return pGallery;
 }
@@ -1282,8 +1289,8 @@ ImageViewerForm::OnTerminating(void)
 
 	if (__pContextMenuSetAs != null)
 	{
-	 	delete __pContextMenuSetAs;
-	 	__pContextMenuSetAs = null;
+		delete __pContextMenuSetAs;
+		__pContextMenuSetAs = null;
 	}
 
 	if (__pDeletePopup != null)
@@ -1325,7 +1332,7 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId)
 		__pContextMenuMore->SetShowState(true);
 		__pContextMenuMore->Show();
 	}
-		break;
+	break;
 	case ACTION_ID_CONTEXTMENU_SET_AS:
 		InitializeContextMenuSetAs();
 
@@ -1344,6 +1351,8 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId)
 		break;
 	case ACTION_ID_FOOTER_BUTTON_SLIDE:
 	{
+		int repeatValue = 0;
+
 		if (__pPresentationModel->GetFileCount() > 1)
 		{
 			__pGallery->UpdateGallery();
@@ -1351,7 +1360,18 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId)
 			{
 				ShowPanelDetail(false);
 			}
-			__pGallery->StartSlideShow(true);
+
+			__pSettingPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER,
+					ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE, repeatValue);
+
+			if( repeatValue == 0)
+			{
+				__pGallery->StartSlideShow(false);
+			}
+			else
+			{
+				__pGallery->StartSlideShow(true);
+			}
 		}
 		break;
 	}
@@ -1412,6 +1432,11 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId)
 		OnRequestEmailAction();
 		break;
 	}
+	case ACTION_ID_CONTEXTMENU_MESSAGE:
+	{
+		OnRequestMessagesAction();
+		break;
+	}
 	case ACTION_ID_CONTEXTMENU_COPY:
 	{
 		int currentIndex = __pGallery->GetCurrentItemIndex();
@@ -1468,10 +1493,10 @@ ImageViewerForm::OnFormBackRequested(Form& source)
 
 void
 ImageViewerForm::OnSceneActivatedN(const SceneId& previousSceneId,
-										  const SceneId& currentSceneId, IList* pArgs)
+		const SceneId& currentSceneId, IList* pArgs)
 {
 	AppLogDebug("ENTER");
-    OrientationStatus status = GetOrientationStatus();
+	OrientationStatus status = GetOrientationStatus();
 	if (status == ORIENTATION_STATUS_PORTRAIT ||
 			status == ORIENTATION_STATUS_PORTRAIT_REVERSE)
 	{
@@ -1518,7 +1543,7 @@ ImageViewerForm::OnSceneActivatedN(const SceneId& previousSceneId,
 
 void
 ImageViewerForm::OnSceneDeactivated(const SceneId& currentSceneId,
-										   const SceneId& nextSceneId)
+		const SceneId& nextSceneId)
 {
 	AppLogDebug("ENTER");
 	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -1541,8 +1566,8 @@ ImageViewerForm::OnAppControlCompleteResponseReceived(const AppId& appId,
 	AppLogDebug("ENTER");
 
 	if (appId == APPCONTROL_PROVIDER_ID_CONTACTS
-		&& operationId == APPCONTROL_OPERATION_ID_PICK
-		&& appControlResult == APP_CTRL_RESULT_SUCCEEDED)
+			&& operationId == APPCONTROL_OPERATION_ID_PICK
+			&& appControlResult == APP_CTRL_RESULT_SUCCEEDED)
 	{
 		const String* pReturnType =
 				static_cast<const String*>(pExtraData->GetValue(String(APPCONTROL_KEY_RETURN_TYPE)));
@@ -1623,10 +1648,21 @@ ImageViewerForm::InitShowGallery(void)
 void
 ImageViewerForm::OnTimerExpired(Timer &timer)
 {
+	int repeatValue = 0;
 	AppLogDebug("ENTER");
 	if (__pPresentationModel->GetFileCount() > 1)
 	{
-		__pGallery->StartSlideShow(true);
+		__pSettingPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER,
+							ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE, repeatValue);
+
+		if( repeatValue == 0)
+		{
+			__pGallery->StartSlideShow(false);
+		}
+		else
+		{
+			__pGallery->StartSlideShow(true);
+		}
 	}
 	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
@@ -1727,9 +1763,9 @@ ImageViewerForm::OnImageDecodeUrlReceived (RequestId reqId, Bitmap *pBitmap,
 		AppLogDebug("ImageViewerForm::OnImageDecodeUrlReceived [%s]", GetErrorMessage(r));
 	}
 
-	 delete pImage;
-	 pImage = null;
-	 AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+	delete pImage;
+	pImage = null;
+	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
 void
@@ -1741,41 +1777,52 @@ ImageViewerForm::OnRequestEmailAction(void)
 	if (__pPresentationModel->GetFileCount() <= 0)
 	{
 		AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
-
 		return;
 	}
 
-	String combineText = EMPTY_SPACE;
-
 	String filePath = __pPresentationModel->GetFilePathAt(currentIndex);
 
-	if (filePath.EndsWith(CONTENT_EXT_PNG)
-		|| filePath.EndsWith(CONTENT_EXT_BMP)
-		|| filePath.EndsWith(CONTENT_EXT_JPG)
-		|| filePath.EndsWith(CONTENT_EXT_GIF)
-		|| filePath.EndsWith(CONTENT_EXT_TIF)
-		|| filePath.EndsWith(CONTENT_EXT_MP4)
-		|| filePath.EndsWith(CONTENT_EXT_3GP)
-		|| filePath.EndsWith(CONTENT_EXT_AVI)
-		|| filePath.EndsWith(CONTENT_EXT_RM)
-		|| filePath.EndsWith(CONTENT_EXT_WMV)
-		|| filePath.EndsWith(CONTENT_EXT_ASF))
-	{
-		if (combineText.CompareTo(EMPTY_SPACE) != 0)
-		{
-			combineText.Append(L";");
-		}
+	ImageViewerMediaType mediaType = CommonUtil::GetMediaType(filePath);
 
-		combineText.Append(filePath);
+	if (mediaType == IMAGE_VIEWER_MEDIA_TYPE_IMAGE || mediaType == IMAGE_VIEWER_MEDIA_TYPE_VIDEO)
+	{
+		HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
+		pDataList->Construct();
+		pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS),
+				new (std::nothrow) String(filePath));
+
+		__pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL,
+				APPCONTROL_OPERATION_ID_COMPOSE, pDataList, this);
 	}
+	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
 
-	HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
-	pDataList->Construct();
-	pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS),
-			new (std::nothrow) String(combineText));
+void
+ImageViewerForm::OnRequestMessagesAction(void)
+{
+	AppLogDebug("ENTER");
+	int currentIndex = __pGallery->GetCurrentItemIndex();
+
+	if (__pPresentationModel->GetFileCount() <= 0)
+	{
+		AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+		return;
+	}
+
+	String filePath = __pPresentationModel->GetFilePathAt(currentIndex);
+
+	ImageViewerMediaType mediaType = CommonUtil::GetMediaType(filePath);
+
+	if (mediaType == IMAGE_VIEWER_MEDIA_TYPE_IMAGE || mediaType == IMAGE_VIEWER_MEDIA_TYPE_VIDEO)
+	{
+		HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
+		pDataList->Construct();
+		pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS),
+				new (std::nothrow) String(filePath));
 
-	__pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL,
-			APPCONTROL_OPERATION_ID_COMPOSE, pDataList, this);
+		__pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGES,
+				APPCONTROL_OPERATION_ID_COMPOSE, pDataList, this);
+	}
 	AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
diff --git a/src/IvImageViewerPresentationModel.cpp b/src/IvImageViewerPresentationModel.cpp
index 066ba0d..d7bc75f 100644
--- a/src/IvImageViewerPresentationModel.cpp
+++ b/src/IvImageViewerPresentationModel.cpp
@@ -529,12 +529,9 @@ ImageViewerPresentationModel::LoadSettingValue()
 		__transitionEffectOfSlideShow = SLIDE_SHOW_TRANSITION_EFFECT_SLIDE;
 		break;
 	case 1:
-		__transitionEffectOfSlideShow = SLIDE_SHOW_TRANSITION_EFFECT_PAGE;
-		break;
-	case 2:
 		__transitionEffectOfSlideShow = SLIDE_SHOW_TRANSITION_EFFECT_DISSOLVE;
 		break;
-	case 3:
+	case 2:
 		__transitionEffectOfSlideShow = SLIDE_SHOW_TRANSITION_EFFECT_ZOOM;
 		break;
 	default:
diff --git a/src/IvSettingPresentationModel.cpp b/src/IvSettingPresentationModel.cpp
index 1e0af65..40d4738 100644
--- a/src/IvSettingPresentationModel.cpp
+++ b/src/IvSettingPresentationModel.cpp
@@ -38,6 +38,8 @@ const wchar_t* SECTION_VIDEO_PLAYER = L"VIDEO_PLAYER_SETTING";
 
 const wchar_t* SLIDESHOW_INTERVAL_VALUE = L"SLIDESHOW_INTERVAL_VALUE";
 const wchar_t* TRANSITION_EFFECT_VALUE = L"TRANSITION_EFFECT_VALUE";
+const wchar_t* REPEAT_VALUE = L"REPEAT_VALUE";
+const wchar_t* SHUFFLE_VALUE = L"SHUFFLE_VALUE";
 
 SettingPresentationModel* SettingPresentationModel::__pPresentationModelInstance = null;
 
diff --git a/src/IvTypes.cpp b/src/IvTypes.cpp
index 7781d0e..1928bc0 100644
--- a/src/IvTypes.cpp
+++ b/src/IvTypes.cpp
@@ -23,6 +23,10 @@
 #include <FSystem.h>
 #include "IvTypes.h"
 
+const wchar_t* IDL_FORM_IMAGE_VIEWER = L"IDL_FORM_IMAGE_VIEWER";
+const wchar_t* IDL_FORM_IMAGE_SETTER = L"IDL_FORM_IMAGE_SETTER";
+const wchar_t* IDL_FORM_NAME_EDITOR = L"IDL_FORM_NAME_EDITOR";
+
 const wchar_t* FORM_IMAGE_VIEWER = L"ImageViewerForm";
 const wchar_t* FORM_IMAGE_SETTER = L"ImageSetterForm";
 const wchar_t* FORM_IMAGE_NAME_EDITOR = L"ImageNameEditorForm";
@@ -31,7 +35,7 @@ const wchar_t* IDSCN_IMAGE_VIEWER = L"SceneImageView";
 const wchar_t* IDSCN_IMAGE_SETTER = L"SceneImageSetterForm";
 const wchar_t* IDSCN_IMAGE_NAME_EDITOR = L"SceneImageNameEditorForm";
 
-const wchar_t* APPCONTROL_PROVIDER_ID_MESSAGE = L"tizen.messages";
+const wchar_t* APPCONTROL_PROVIDER_ID_MESSAGES = L"tizen.messages";
 const wchar_t* APPCONTROL_PROVIDER_ID_EMAIL = L"tizen.email";
 const wchar_t* APPCONTROL_PROVIDER_ID_CONTACTS = L"tizen.contacts";
 const wchar_t* APPCONTROL_PROVIDER_ID_VIDEO_PLAYER = L"tizen.videoplayer";
@@ -55,6 +59,7 @@ const wchar_t* APPCONTROL_KEY_LEGACY_RESULT = L"http://tizen.org/appcontrol/data
 const wchar_t* APPCONTROL_DATA_IMAGE = L"image";
 const wchar_t* APPCONTROL_DATA_VIDEO = L"video";
 const wchar_t* APPCONTROL_DATA_SLIDE_SHOW = L"slideshow";
+const wchar_t* APPCONTROL_DATA_MESSAGE = L"message";
 const wchar_t* APPCONTROL_DATA_EMAIL = L"email";
 const wchar_t* APPCONTROL_DATA_SINGLE = L"single";
 const wchar_t* APPCONTROL_DATA_CONTACT_ID = L"contactId";
@@ -119,3 +124,5 @@ const wchar_t* SECTION_NAME_VIDEO_PLAYER = L"VIDEO_PLAYER_SETTING";
 const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL = L"SLIDESHOW_INTERVAL_VALUE";
 const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT = L"TRANSITION_EFFECT_VALUE";
 const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_MUSIC = L"MUSIC_VALUE";
+const wchar_t* ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE = L"REPEAT_VALUE";
+const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SHUFFLE_VALUE = L"SHUFFLE_VALUE";
-- 
2.7.4