merge with master

diff --git a/inc/StAboutPhoneForm.h b/inc/StAboutPhoneForm.h
index c805218..4c5e87f 100644 (file)
--- a/inc/StAboutPhoneForm.h
+++ b/inc/StAboutPhoneForm.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -26,6 +26,24 @@
 #include <FSystem.h>
 #include "StBaseForm.h"
 
+class CpuUsageGetIntAsyncResultListener
+       : public Tizen::System::IRuntimeInfoGetIntAsyncResultListener
+{
+public:
+       CpuUsageGetIntAsyncResultListener(void) : __pReceivedForm(null), __requestId(0){}
+       virtual ~CpuUsageGetIntAsyncResultListener(void){__pReceivedForm = null;}
+
+       void SetSendEventForm(Tizen::Ui::Controls::Form* pForm, int requestId);
+
+private:
+       void SendEvent(result r, int value);
+       virtual void OnResultReceivedForGetValueAsync(int value, result r);
+
+private:
+       Tizen::Ui::Controls::Form* __pReceivedForm;
+       RequestId __requestId;
+};
+
 class PhoneInfoForm
        : public BaseForm
        , public Tizen::Net::Wifi::IWifiManagerEventListener
@@ -77,8 +95,15 @@ public:
        virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);
        virtual void OnKeypadBoundsChanged(Tizen::Ui::Control& source){}
 
+       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
+
+private:
+       void SetICpuUsageResultListener(void);
+
 private:
        Tizen::Ui::Controls::EditField* __pEditField;
+       CpuUsageGetIntAsyncResultListener* __CpuUsageGetInfoResultListener;
+       Tizen::Base::String __pCpuUsageData;
 };
 
 #endif // _ST_ABOUT_PHONE_FORM_H_
\ No newline at end of file

diff --git a/inc/StAppSettingForm.h b/inc/StAppSettingForm.h
index 9642a83..268410d 100644 (file)
--- a/inc/StAppSettingForm.h
+++ b/inc/StAppSettingForm.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -107,7 +107,8 @@ private:
        void RemoveIOAppSetting(void);
        void SetHeaderTitle(void);
        void ReSizingTableviewForClipboard(int scrollToGroupIndex = 0, int scrollToItemIndex = 0, bool isSetScrollPosition = false);
-
+       void CreateNoContents(void);
+       void RefreshItemList(int groupIndex);
 private:
        Tizen::Base::String __filePath;
        Tizen::Base::String __appId;
@@ -129,8 +130,8 @@ public:
        virtual ~ItemTag(void){}
        void SetItemTag(int groupIndex, int itemIndex);
        void GetItemTag(int& groupIndex, int& itemIndex);
-       int GetGroupIndex(void){ return __groupIndex;}
-       int GetItemIndex(void){ return __itemIndex;}
+       int GetGroupIndex(void){return __groupIndex;}
+       int GetItemIndex(void){return __itemIndex;}
 
 private:
        ItemTag(void){}

diff --git a/inc/StBaseForm.h b/inc/StBaseForm.h
index 4b67845..6a27c0c 100644 (file)
--- a/inc/StBaseForm.h
+++ b/inc/StBaseForm.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);

diff --git a/inc/StBluetoothPresentationModel.h b/inc/StBluetoothPresentationModel.h
index ef8a3fc..3ebf110 100644 (file)
--- a/inc/StBluetoothPresentationModel.h
+++ b/inc/StBluetoothPresentationModel.h
@@ -70,6 +70,7 @@ public:
 
        void SetEventListener(const IBluetoothPresentationModelEventListener* pEventListener);
        BluetoothPresentationModelEvent GetBluetoothEventInProgress(void);
+       void SetBluetoothEventInProgress(BluetoothPresentationModelEvent lastbluetoothEvent);
 
        static BluetoothPresentationModel* GetInstance(void);
 
@@ -86,7 +87,6 @@ protected:
        void RemoveFoundRemoteDeviceList(void);
 
        result FireIBluetoothPresentationModelEventListener(BluetoothPresentationModelEvent bluetoothEvent, result r = E_SUCCESS, Tizen::Net::Bluetooth::BluetoothDevice* pDevice = null);
-       void SetBluetoothEventInProgress(BluetoothPresentationModelEvent lastbluetoothEvent);
 
        static void CreateInstance(void);
        static void DestroyInstance(void);

diff --git a/inc/StFontForm.h b/inc/StFontForm.h
index 7a1f73e..9ad2149 100644 (file)
--- a/inc/StFontForm.h
+++ b/inc/StFontForm.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -27,6 +27,7 @@
 
 class FontForm
        : public BaseForm
+       , public Tizen::System::ISettingEventListener
 {
 public:
        FontForm(void);
@@ -58,6 +59,10 @@ public:
        virtual void OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);
        virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
        virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+       virtual void OnSettingChanged(Tizen::Base::String& key);
+       
+private:
+       void GetTableViewItemString(int groupIndex, int itemIndex, Tizen::Base::String& firstLine, Tizen::Base::String& secondLine);
 
 private:
        bool __isAppControlRequest;

diff --git a/inc/StFontSizeForm.h b/inc/StFontSizeForm.h
index 71d6f82..fa86ef2 100644 (file)
--- a/inc/StFontSizeForm.h
+++ b/inc/StFontSizeForm.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -58,6 +58,11 @@ public:
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
 
 private:
+       void RefreshGroupAt(int groupIndex);
+       void RefreshGroupItemAt(int groupIndex);
+       void RefreshAllItem(void);
+
+private:
        bool __isAppControlRequest;
        Tizen::Base::String __categoryCheck;
 };

diff --git a/inc/StIBluetoothPresentationModelEventListener.h b/inc/StIBluetoothPresentationModelEventListener.h
index d035011..1ebc41f 100644 (file)
--- a/inc/StIBluetoothPresentationModelEventListener.h
+++ b/inc/StIBluetoothPresentationModelEventListener.h
@@ -32,6 +32,7 @@ enum BluetoothPresentationModelEvent
        BLUETOOTH_PRESENTATION_MODEL_EVENT_DEACTIVATING,
        BLUETOOTH_PRESENTATION_MODEL_EVENT_DEACTIVATED,
        BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_DONE,
+       BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_EXIT,
        BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_CANCELED,
        BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_STARTING,
        BLUETOOTH_PRESENTATION_MODEL_EVENT_CANCEL_DISCOVERYING,

diff --git a/inc/StLanguageAndRegionForm.h b/inc/StLanguageAndRegionForm.h
index e34d044..3c7ff97 100644 (file)
--- a/inc/StLanguageAndRegionForm.h
+++ b/inc/StLanguageAndRegionForm.h
@@ -58,6 +58,10 @@ public:
        virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
 
 private:
+       void RefreshTableViewItem(void);
+       void RefreshTableViewGroupItem(int groupIndex);
+
+private:
        Tizen::Base::Collection::ArrayList* __languageDataList;
 };
 

diff --git a/inc/StLanguageForm.h b/inc/StLanguageForm.h
index 4fa89ad..b986f97 100644 (file)
--- a/inc/StLanguageForm.h
+++ b/inc/StLanguageForm.h
@@ -59,10 +59,7 @@ public:
        virtual void OnSettingChanged(Tizen::Base::String& key);
 
 private:
-       Tizen::Base::Collection::IList* __pAvailableLocales;
-       Tizen::Base::Collection::HashMap* __hashMap;
-       Tizen::Base::Collection::IMapEnumerator* pMapEnum;
-       Tizen::Base::Collection::ArrayList* __languageDataList;
+       Tizen::Base::Collection::ArrayList* __pLanguageDataList;
 };
 
 #endif // _ST_LANGUAGE_FORM_H_
\ No newline at end of file

diff --git a/inc/StMainMenuForm.h b/inc/StMainMenuForm.h
index 3f9c317..b6656dd 100644 (file)
--- a/inc/StMainMenuForm.h
+++ b/inc/StMainMenuForm.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -40,6 +40,7 @@ private:
 
 class MainMenuForm
        : public BaseForm
+       , public Tizen::Ui::Controls::IFrameEventListener
 {
 public:
        MainMenuForm(void);
@@ -76,6 +77,11 @@ public:
        virtual void OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r);
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
 
+       virtual void OnFrameActivated(const Tizen::Ui::Controls::Frame& source){}
+       virtual void OnFrameDeactivated(const Tizen::Ui::Controls::Frame& source){}
+       virtual void OnFrameTerminating(const Tizen::Ui::Controls::Frame& source){}
+       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
+
 private:
        result SetDownLoadAppIdKeyList(void);
        result SetAppIdListFromPackageManager(void);
@@ -85,15 +91,15 @@ private:
        Tizen::Base::String GetDownLoadAppNameAt(unsigned int index);
        Tizen::Base::String GetDownLoadAppIdKeyAt(unsigned int index);
        unsigned int GetDownLoadAppCount(void);
-       bool GetSettingInfoItemStatus(const Tizen::Base::String& key);
-       bool GetSystemInfoItemStatus(const Tizen::Base::String& key);
        void FindAppControlScene(int itemIndex);
        void SetIFlightModeSetValueAsyncResultListener(void);
+       Tizen::Base::String GetAppSettingIconPathFromAppIdListAt(Tizen::Base::String& id);
 
 private:
        int __currentTableViewList;
        Tizen::Base::Collection::IList* __pDownloadAppIdKeyList;
        Tizen::Base::Collection::HashMap* __pAppIdHashMap;
+       Tizen::Base::Collection::HashMap* __pAppIconPathHashMap;
        Tizen::Ui::Controls::FooterItem __footerViewType;
        Tizen::System::ISettingInfoSetValueAsyncResultListener* __pFlightModeSetValueAsyncResultListener;
 };

diff --git a/inc/StManageApplicationForm.h b/inc/StManageApplicationForm.h
new file mode 100644 (file)
index 0000000..a28f701
--- /dev/null
+++ b/inc/StManageApplicationForm.h
@@ -0,0 +1,83 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StManageApplicationForm.h
+ * @brief              This is the header file for ManageApplicationForm class.
+ */
+
+#ifndef _ST_MANAGE_APPLICATION_FORM_H_
+#define _ST_MANAGE_APPLICATION_FORM_H_
+
+#include <FSystem.h>
+#include "StBaseForm.h"
+
+class ManageApplicationForm
+       : public BaseForm
+       , public Tizen::Ui::Controls::IFrameEventListener
+{
+public:
+       ManageApplicationForm(void);
+       virtual ~ManageApplicationForm(void);
+
+       void CreateHeaderStyleTab(void);
+       void CreateFooter(void);
+       void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+
+       virtual result OnInitializing(void);
+       virtual result OnTerminating(void);
+
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+
+       virtual Tizen::Ui::Controls::TableViewGroupItem* CreateGroupItem(int groupIndex, int itemWidth);
+       virtual Tizen::Ui::Controls::TableViewItem* CreateItem(int groupIndex, int itemIndex, int itemWidth);
+       virtual int GetDefaultGroupItemHeight(void);
+       virtual int GetDefaultItemHeight(void);
+       virtual bool DeleteGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem);
+       virtual bool DeleteItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+       virtual int GetGroupCount(void);
+       virtual int GetItemCount(int groupIndex);
+       virtual void UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem);
+       virtual void UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+
+       virtual void OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);
+       virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+       virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+       virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+
+       virtual void OnFrameActivated(const Tizen::Ui::Controls::Frame& source);
+       virtual void OnFrameDeactivated(const Tizen::Ui::Controls::Frame& source){}
+       virtual void OnFrameTerminating(const Tizen::Ui::Controls::Frame& source){}
+
+private:
+       void LoadPackageInfoList(void);
+       void ReLoadPackageInfoList(void);
+       void DeletePackageInfoList(void);
+
+       Tizen::Base::String GetPackageInfoItem(int index, int type);
+       result CreateAlertPopup(Tizen::Base::String* appName = null);
+       void HideAlertPopup(void);
+       void ShowAlertPopup(void);
+       void DeleteAlertPopup(void);
+
+private:
+       Tizen::Base::Collection::IList* __pPackageInfoList;
+       Tizen::Ui::Controls::Popup* __uninstallResultPopup;
+};
+
+#endif // _ST_MANAGE_APPLICATION_FORM_H_
\ No newline at end of file

diff --git a/inc/StManageApplicationInfoForm.h b/inc/StManageApplicationInfoForm.h
new file mode 100644 (file)
index 0000000..7431e32
--- /dev/null
+++ b/inc/StManageApplicationInfoForm.h
@@ -0,0 +1,86 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StManageApplicationInfoForm.h
+ * @brief              This is the header file for ManageApplicationInfoForm class.
+ */
+
+#ifndef _ST_MANAGE_APPLICATION_INFO_FORM_H_
+#define _ST_MANAGE_APPLICATION_INFO_FORM_H_
+
+#include <FSystem.h>
+#include "StBaseForm.h"
+
+class ManageApplicationInfoForm
+       : public BaseForm
+       , public Tizen::App::Package::IPackageInstallationEventListener
+       , public Tizen::Ui::Controls::IFrameEventListener
+{
+public:
+       ManageApplicationInfoForm(void);
+       virtual ~ManageApplicationInfoForm(void);
+
+       //void CreateHeader(void);
+       void CreateFooter(void);
+       virtual result OnInitializing(void);
+       virtual result OnTerminating(void);
+
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+
+       virtual Tizen::Ui::Controls::TableViewGroupItem* CreateGroupItem(int groupIndex, int itemWidth);
+       virtual Tizen::Ui::Controls::TableViewItem* CreateItem(int groupIndex, int itemIndex, int itemWidth);
+       virtual int GetDefaultGroupItemHeight(void);
+       virtual int GetDefaultItemHeight(void);
+       virtual bool DeleteGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem);
+       virtual bool DeleteItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+       virtual int GetGroupCount(void);
+       virtual int GetItemCount(int groupIndex);
+       virtual void UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem);
+       virtual void UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+
+       virtual void OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);
+       virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+       virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+       virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+
+       virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+
+       virtual void OnPackageInstallationCompleted(const Tizen::App::PackageId& packageId, Tizen::App::Package::PackageInstallationResult installationResult){}
+       virtual void OnPackageInstallationInProgress(const Tizen::App::PackageId& packageId, int progress){}
+       virtual void OnPackageUninstallationCompleted(const Tizen::App::PackageId& packageId, bool uninstallationResult);
+
+       virtual void OnFrameActivated(const Tizen::Ui::Controls::Frame& source);
+       virtual void OnFrameDeactivated(const Tizen::Ui::Controls::Frame& source){}
+       virtual void OnFrameTerminating(const Tizen::Ui::Controls::Frame& source){}
+
+private:
+       void GroupItemEnable(int groupIndex, bool setEnableStatus);
+       result CreateUninstallPopup(void);
+       void HideUninstallPopup(int popupType);
+       void ShowUninstallPopup(int popupType);
+       void DeleteUninstallPopup(void);
+
+private:
+       Tizen::Base::Collection::ArrayList* __applicationData;
+       Tizen::App::Package::PackageManager* __pPackageManager;
+       Tizen::Ui::Controls::Popup* __uninstallConfirmPopup;
+       Tizen::Ui::Controls::ProgressPopup* __pProgressPopup;
+};
+
+#endif // _ST_MANAGE_APPLICATION_INFO_FORM_H_
\ No newline at end of file

diff --git a/inc/StMoreSystemForm.h b/inc/StMoreSystemForm.h
index 1a4e80e..2691c57 100644 (file)
--- a/inc/StMoreSystemForm.h
+++ b/inc/StMoreSystemForm.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -26,6 +26,7 @@
 
 class MoreSystemForm
        : public BaseForm
+       , public Tizen::System::ISettingEventListener
 {
 public:
        MoreSystemForm(void);
@@ -54,6 +55,11 @@ public:
        virtual void OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);
        virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
        virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+       virtual void OnSettingChanged(Tizen::Base::String& key);
+
+private:
+       Tizen::Base::String GetTableViewItemString(int groupIndex, int itemIndex);
+       void RefreshGroupItemAt(int groupIndex);
 };
 
 #endif // _ST_MORE_SYSTEM_FORM_H_
\ No newline at end of file

diff --git a/inc/StResourceManager.h b/inc/StResourceManager.h
index ee082ac..332741b 100644 (file)
--- a/inc/StResourceManager.h
+++ b/inc/StResourceManager.h
@@ -32,6 +32,7 @@ class ResourceManager
 {
 public:
        static Tizen::Graphics::Bitmap* GetBitmapN(const Tizen::Base::String& imagePath);
+       static Tizen::Graphics::Bitmap* GetApplicationBitmapN(const Tizen::Base::String& imageAbsolutePath);
        static Tizen::Base::String GetString(const Tizen::Base::String& stringId);
 
 private:

diff --git a/inc/StSettingScenesList.h b/inc/StSettingScenesList.h
index 3459f8e..5a3c2e8 100644 (file)
--- a/inc/StSettingScenesList.h
+++ b/inc/StSettingScenesList.h
@@ -45,6 +45,9 @@ extern const wchar_t* IDSCN_SYNCHRONISES;
 //System Scene
 extern const wchar_t* IDSCN_NOTIFICATION;
 extern const wchar_t* IDSCN_WALLPAPER;
+extern const wchar_t* IDSCN_WALLPAPER_ALBUM_LIST;
+extern const wchar_t* IDSCN_WALLPAPER_ALBUM_LIST_DETAIL;
+extern const wchar_t* IDSCN_WALLPAPER_IMAGE_SELECT;
 extern const wchar_t* IDSCN_SOUNDS;
 extern const wchar_t* IDSCN_BRIGHTNESS;
 extern const wchar_t* IDSCN_SECURITY;
@@ -78,6 +81,8 @@ extern const wchar_t* IDSCN_CERTIFICATE_USER;
 extern const wchar_t* IDSCN_CERTIFICATE_USER_INSTALL;
 extern const wchar_t* IDSCN_CERTIFICATE_USER_INSTALL_PASSWORD;
 extern const wchar_t* IDSCN_CERTIFICATE_USER_UNINSTALL;
+extern const wchar_t* IDSCN_MANAGE_APPLICATION;
+extern const wchar_t* IDSCN_MANAGE_APPLICATION_INFO;
 
 //Application Scene
 extern const wchar_t* IDSCN_ACCOUNTS;
@@ -119,6 +124,9 @@ extern const wchar_t* IDC_FORM_SYNCHRONOISES;
 //System Form
 extern const wchar_t* IDC_FORM_NOTIFICATION;
 extern const wchar_t* IDC_FORM_WALLPAPER;
+extern const wchar_t* IDC_FORM_WALLPAPER_ALBUM_LIST;
+extern const wchar_t* IDC_FORM_WALLPAPER_ALBUM_LIST_DETAIL;
+extern const wchar_t* IDC_FORM_WALLPAPER_IMAGE_SELECT;
 extern const wchar_t* IDC_FORM_SOUNDS;
 extern const wchar_t* IDC_FORM_BRIGHTNESS;
 extern const wchar_t* IDC_FORM_SECURITY;
@@ -150,6 +158,8 @@ extern const wchar_t* IDC_FORM_CERTIFICATE_USER;
 extern const wchar_t* IDC_FORM_CERTIFICATE_USER_INSTALL;
 extern const wchar_t* IDC_FORM_CERTIFICATE_USER_INSTALL_PASSWORD;
 extern const wchar_t* IDC_FORM_CERTIFICATE_USER_UNINSTALL;
+extern const wchar_t* IDC_FORM_MANAGE_APPLICATION;
+extern const wchar_t* IDC_FORM_MANAGE_APPLICATION_INFO;
 
 //Application Form
 extern const wchar_t* IDC_FORM_ACCOUNTS;

diff --git a/inc/StTypes.h b/inc/StTypes.h
index 4bb62ea..ed92c32 100644 (file)
--- a/inc/StTypes.h
+++ b/inc/StTypes.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -175,6 +175,10 @@ extern const int ICON_AND_ONE_LINE_ITEM_WIDTH_GAP;
 extern const int RELATIVE_LAYOUT_RIGHT_MARGIN;
 extern const int RELATIVE_LAYOUT_LEFT_MARGIN;
 
+extern const int FRFRESH_REQUEST_EVENT;
+
+extern const wchar_t* IDB_MAIN_FOLDER_BACKGROUND;
+
 extern const wchar_t* IDB_HEADER_BACK_BUTTON_NORMAL;
 extern const wchar_t* IDB_HEADER_BACK_BUTTON_PRESS;
 
@@ -217,6 +221,8 @@ extern const wchar_t* IDB_MUSIC;
 extern const wchar_t* IDB_VOICE_RECODER;
 //Downloaded apps
 extern const wchar_t* IDB_APP_SETTING;
+extern const wchar_t* IDB_DEFAULT_ICON;
+extern const wchar_t* IDB_SEPARATOR;
 //ETC using icon
 extern const wchar_t* IDB_SEARCH_ICON_SIZE_LAGER_IMAGE_PATH_FORMAT;
 extern const wchar_t* IDB_SOUND_MIN;
@@ -339,6 +345,8 @@ extern const wchar_t* SETTING_INFO_KEY_LOCALE_UPDATE_AUTO;
 extern const wchar_t* SETTING_INFO_KEY_USB_DEBUGGING;
 extern const wchar_t* SETTING_INFO_KEY_DEVICE_NAME;
 extern const wchar_t* RUNTIME_INFO_KEY_CPU_USAGE;
+extern const wchar_t* RUNTIME_INFO_KEY_WALLPAPER_SCREEN;
+extern const wchar_t* RUNTIME_INFO_KEY_WALLPAPER_SCREEN_LOCK;
 
 extern const wchar_t* NO_CONTENTS;
 extern const wchar_t* NO_CONTENTS_TEXT;

diff --git a/inc/StWallpaperAlbumInfo.h b/inc/StWallpaperAlbumInfo.h
new file mode 100644 (file)
index 0000000..f135b6b
--- /dev/null
+++ b/inc/StWallpaperAlbumInfo.h
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperAlbumInfo.h
+ * @brief              This is the header file for WallpaperAlbumInfo class.
+ */
+
+#ifndef _ST_WALLPAPER_ALBUM_INFO_H_
+#define _ST_WALLPAPER_ALBUM_INFO_H_
+
+#include <FContent.h>
+#include <FGraphics.h>
+#include "StTypes.h"
+
+class AlbumInfo
+       : public Tizen::Base::Object
+{
+public:
+       AlbumInfo(void);
+       virtual ~AlbumInfo(void);
+
+       result Construct(void);
+       result Construct(const Tizen::Base::String& albumName, Tizen::Content::ContentType contentType ,
+                                       const Tizen::Base::Collection::IList& directoryList,
+                                       const Tizen::Base::Collection::IList& contentIdList);
+       result Construct(const AlbumInfo& albumInfo);
+
+       Tizen::Base::String GetAlbumName(void) const;
+       void SetAlbumName(const Tizen::Base::String& albumName);
+       Tizen::Base::String GetDirectory(int index) const;
+       Tizen::Base::Collection::IList* GetDirectoryListN(void) const;
+       void ClearDirectoryList(void);
+       void AppendDirectory(const Tizen::Base::String& directoryPath);
+       void AppendDirectoryList(const Tizen::Base::Collection::ICollection& directoryList);
+       int GetDirectoryCount(void) const;
+
+       void ClearContentIdList(void);
+       Tizen::Base::Collection::IList* GetContentIdListN(void) const;
+       Tizen::Content::ContentId GetContentId(int index) const;
+       void AppendContentIdList(const Tizen::Base::Collection::ICollection& contentIdList);
+       int GetContentIdCount(void) const;
+
+       Tizen::Base::String GetCreateDateString(void) const;
+       void SetCreateDateString(Tizen::Base::String& strMinimumDate, Tizen::Base::String& strMaximumDate);
+
+protected :
+       Tizen::Base::String __albumName;
+       Tizen::Base::Collection::IList* __pDirectoryFullPathList;
+       Tizen::Base::Collection::IList* __pContentIdList;
+       Tizen::Base::String __createFileDateString;
+};
+
+#endif // _ST_WALLPAPER_ALBUM_INFO_H_
\ No newline at end of file

diff --git a/inc/StWallpaperAlbumListDetailForm.h b/inc/StWallpaperAlbumListDetailForm.h
new file mode 100644 (file)
index 0000000..153b21a
--- /dev/null
+++ b/inc/StWallpaperAlbumListDetailForm.h
@@ -0,0 +1,70 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperAlbumListDetailForm.h
+ * @brief              This is the header file for WallpaperAlbumListDetailForm class.
+ */
+
+#ifndef _ST_WALLPAPER_ALBUM_LIST_DETAIL_FORM_H_
+#define _ST_WALLPAPER_ALBUM_LIST_DETAIL_FORM_H_
+
+#include "StWallpaperAlbumListPresentationModel.h"
+
+class WallpaperAlbumListDetailForm
+       : public Tizen::Ui::Controls::Form
+       , public Tizen::Ui::Controls::IFormBackEventListener
+       , public Tizen::Ui::Controls::IIconListViewItemProvider
+       , public Tizen::Ui::Controls::IIconListViewItemEventListener
+       , public Tizen::Ui::IActionEventListener
+       , public Tizen::Ui::IOrientationEventListener
+       , public Tizen::Ui::Scenes::ISceneEventListener
+{
+public:
+       WallpaperAlbumListDetailForm(void);
+       virtual ~WallpaperAlbumListDetailForm(void);
+
+       result Initialize(void);
+       void CreateHeader(const Tizen::Base::String& textTitle);
+       void CreateFooter(void);
+
+       virtual result OnInitializing(void);
+       virtual result OnTerminating(void);
+
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+
+       virtual int GetItemCount(void);
+       virtual Tizen::Ui::Controls::IconListViewItem* CreateItem(int index);
+       virtual bool DeleteItem(int index, Tizen::Ui::Controls::IconListViewItem* pItem);
+       virtual void OnIconListViewItemStateChanged(Tizen::Ui::Controls::IconListView& iconListView, int index, Tizen::Ui::Controls::IconListViewItemStatus status);
+       virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId){}
+       virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+
+private:
+       void CreateIconListView(void);
+       void SetOrientationAutoMode(void);
+
+private:
+       int __itemCount;
+       WallpaperAlbumListPresentationModel* __pPresentationModel;
+       AlbumInfo* __pAlbumInfo;
+       Tizen::Ui::Controls::IconListView* __pIconListView;
+       Tizen::Base::String* __pArgs;
+};
+
+#endif // _ST_WALLPAPER_ALBUM_LIST_DETAIL_FORM_H_
\ No newline at end of file

diff --git a/inc/StWallpaperAlbumListForm.h b/inc/StWallpaperAlbumListForm.h
new file mode 100644 (file)
index 0000000..eca9a1a
--- /dev/null
+++ b/inc/StWallpaperAlbumListForm.h
@@ -0,0 +1,69 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperAlbumListForm.h
+ * @brief              This is the header file for WallpaperAlbumListForm class.
+ */
+
+#ifndef _ST_WALLPAPER_ALBUM_LIST_FORM_H_
+#define _ST_WALLPAPER_ALBUM_LIST_FORM_H_
+
+#include "StWallpaperAlbumListPresentationModel.h"
+
+class WallpaperAlbumListForm
+       : public Tizen::Ui::Controls::Form
+       , public Tizen::Ui::Controls::IFormBackEventListener
+       , public Tizen::Ui::Controls::IIconListViewItemProvider
+       , public Tizen::Ui::Controls::IIconListViewItemEventListener
+       , public Tizen::Ui::IActionEventListener
+       , public Tizen::Ui::IOrientationEventListener
+       , public Tizen::Ui::Scenes::ISceneEventListener
+{
+public:
+       WallpaperAlbumListForm(void);
+       virtual ~WallpaperAlbumListForm(void);
+
+       result Initialize(void);
+       void CreateHeader(const Tizen::Base::String& textTitle);
+       void CreateFooter(void);
+
+       virtual result OnInitializing(void);
+       virtual result OnTerminating(void);
+
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+
+       virtual int GetItemCount(void);
+       virtual Tizen::Ui::Controls::IconListViewItem* CreateItem(int index);
+       virtual bool DeleteItem(int index, Tizen::Ui::Controls::IconListViewItem* pItem);
+       virtual void OnIconListViewItemStateChanged(Tizen::Ui::Controls::IconListView& iconListView, int index, Tizen::Ui::Controls::IconListViewItemStatus status);
+       virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId){}
+       virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+
+private:
+       void CreateIconListView(void);
+       void SetOrientationAutoMode(void);
+
+private:
+       int __itemCount;
+       WallpaperAlbumListPresentationModel* __pPresentationModel;
+       Tizen::Ui::Controls::IconListView* __pIconListView;
+       Tizen::Base::Collection::IList* __pArgs;
+};
+
+#endif // _ST_WALLPAPER_ALBUM_LIST_FORM_H_
\ No newline at end of file

diff --git a/inc/StWallpaperAlbumListPresentationModel.h b/inc/StWallpaperAlbumListPresentationModel.h
new file mode 100644 (file)
index 0000000..f857fad
--- /dev/null
+++ b/inc/StWallpaperAlbumListPresentationModel.h
@@ -0,0 +1,72 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperAlbumListPresentationModel.h
+ * @brief              This is the header file for WallpaperAlbumListPresentationModel class.
+ */
+
+#ifndef _ST_ALBUM_LIST_PRESENTATION_MODEL_H_
+#define _ST_ALBUM_LIST_PRESENTATION_MODEL_H_
+
+#include <FBase.h>
+#include "StResourceManager.h"
+#include "StWallpaperAlbumInfo.h"
+
+class WallpaperAlbumListPresentationModel
+       : public Tizen::Base::Object
+{
+public:
+       static WallpaperAlbumListPresentationModel* GetInstance(void);
+
+public:
+       void InitializeFileList(AlbumInfo* pAlbumInfo);
+       void InitializeAlbumInfoList(void);
+       int GetFolderCount(void);
+       int GetFileCount(void);
+
+       Tizen::Graphics::Bitmap* CreateDetailMergeBitmapN(int index);
+       Tizen::Graphics::Bitmap* CreateMergeBitmapN(int index);
+       Tizen::Base::Collection::IList* GetAlbumInfoList(void);
+       Tizen::Base::Collection::IList* GetContentIdList(void);
+
+private:
+       WallpaperAlbumListPresentationModel(void);
+       virtual ~WallpaperAlbumListPresentationModel(void);
+
+       result Construct(void);
+       static void CreateInstance(void);
+       static void DestroyInstance(void);
+
+       void DrawPartialImage(Tizen::Graphics::Canvas& canvas, AlbumInfo* pAlbumInfo,
+                       const Tizen::Graphics::Rectangle& rectNew);
+       void DrawFontImage(Tizen::Graphics::Canvas& canvas, AlbumInfo* pAlbumInfo, int index);
+       void InitFolderBackgroundBitmap(void);
+
+       bool GetMinMaxDateTimeString(Tizen::Base::Collection::IList* pContentIdList, Tizen::Base::String& MinimumTime,
+                       Tizen::Base::String& MaximumTime);
+
+       Tizen::Base::Collection::IList* GetContentIdListInDirectoryN(const Tizen::Base::String& directoryPath) const;
+       Tizen::Base::String GetDirectoryNameFromFullPath(const Tizen::Base::String& fullPath) const;
+
+private:
+       static WallpaperAlbumListPresentationModel* __pPresentationModelInstance;
+       Tizen::Graphics::Bitmap* __pFolderBackgroundBitmap;
+       static Tizen::Base::Collection::IList* __pCurrentFolderContentsIdList;
+       static Tizen::Base::Collection::IList* __pAlbumInfoList;
+};
+
+#endif // _ST_ALBUM_LIST_PRESENTATION_MODEL_H_
\ No newline at end of file

diff --git a/inc/StWallpaperForm.h b/inc/StWallpaperForm.h
new file mode 100644 (file)
index 0000000..f6d44c8
--- /dev/null
+++ b/inc/StWallpaperForm.h
@@ -0,0 +1,61 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperForm.h
+ * @brief              This is the header file for WallpaperForm class.
+ */
+
+#ifndef _ST_WALLPAPER_FORM_H_
+#define _ST_WALLPAPER_FORM_H_
+
+#include <FSystem.h>
+#include "StBaseForm.h"
+
+class WallpaperForm
+       : public BaseForm
+{
+public:
+       WallpaperForm(void);
+       virtual ~WallpaperForm(void);
+
+       void CreateFooter(void);
+       result GetFontList(Tizen::Base::Collection::IList& list);
+
+       virtual result OnInitializing(void);
+       virtual result OnTerminating(void);
+
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+
+       virtual Tizen::Ui::Controls::TableViewGroupItem* CreateGroupItem(int groupIndex, int itemWidth);
+       virtual Tizen::Ui::Controls::TableViewItem* CreateItem(int groupIndex, int itemIndex, int itemWidth);
+       virtual int GetDefaultGroupItemHeight(void);
+       virtual int GetDefaultItemHeight(void);
+       virtual bool DeleteGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem);
+       virtual bool DeleteItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+       virtual int GetGroupCount(void);
+       virtual int GetItemCount(int groupIndex);
+       virtual void UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem);
+       virtual void UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem);
+
+       virtual void OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated);
+       virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+       virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
+};
+
+#endif // _ST_WALLPAPER_FORM_H_
\ No newline at end of file

diff --git a/inc/StWallpaperImageSelectForm.h b/inc/StWallpaperImageSelectForm.h
new file mode 100644 (file)
index 0000000..6fd0221
--- /dev/null
+++ b/inc/StWallpaperImageSelectForm.h
@@ -0,0 +1,61 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperImageSelectForm.h
+ * @brief              This is the header file for WallpaperImageSelectForm class.
+ */
+
+#ifndef _ST_WALLPAPER_IMAGE_SELECT_FORM_H_
+#define _ST_WALLPAPER_IMAGE_SELECT_FORM_H_
+
+#include <FSystem.h>
+#include "StResourceManager.h"
+
+class WallpaperImageSelectForm
+       : public Tizen::Ui::Controls::Form
+       , public Tizen::Ui::Controls::IFormBackEventListener
+       , public Tizen::Ui::IActionEventListener
+       , public Tizen::Ui::IOrientationEventListener
+       , public Tizen::Ui::Scenes::ISceneEventListener
+{
+public:
+
+       WallpaperImageSelectForm(void);
+       virtual ~WallpaperImageSelectForm(void);
+
+       result Initialize(void);
+       void CreateFooter(void);
+
+       virtual result OnInitializing(void);
+       virtual result OnTerminating(void);
+
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+       virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+       virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+
+private:
+       void CreateImage(void);
+       void SetOrientationAutoMode(void);
+
+private:
+       Tizen::Base::UuId* __pContentId;
+       int __argIndex;
+};
+
+#endif // _ST_WALLPAPER_IMAGE_SELECT_FORM_H_
\ No newline at end of file

diff --git a/manifest.xml b/manifest.xml
index c231221..4a4a807 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -65,26 +65,30 @@
     <Apps>
         <ApiVersion>2.0</ApiVersion>
         <Privileges>
-            <Privilege>http://tizen.org/privilege/appsetting</Privilege>
-            <Privilege>http://tizen.org/privilege/wifimanager</Privilege>
             <Privilege>http://tizen.org/privilege/wifi.read</Privilege>
-            <Privilege>http://tizen.org/privilege/packageinfo</Privilege>
-            <Privilege>http://tizen.org/privilege/packagesetting</Privilege>
+            <Privilege>http://tizen.org/privilege/certificate.read</Privilege>
             <Privilege>http://tizen.org/privilege/imemanager</Privilege>
             <Privilege>http://tizen.org/privilege/bluetooth.admin</Privilege>
             <Privilege>http://tizen.org/privilege/alarm</Privilege>
-           <Privilege>http://tizen.org/privilege/certificate.read</Privilege>
-            <Privilege>http://tizen.org/privilege/certificate.write</Privilege>
-            <Privilege>http://tizen.org/privilege/systemsetting.write</Privilege>
-            <Privilege>http://tizen.org/privilege/setting</Privilege>
-            <Privilege>http://tizen.org/privilege/wifi.admin</Privilege>
-            <Privilege>http://tizen.org/privilege/networkmanager</Privilege>
+            <Privilege>http://tizen.org/privilege/application.launch</Privilege>
             <Privilege>http://tizen.org/privilege/bluetooth.gap</Privilege>
+            <Privilege>http://tizen.org/privilege/packageinfo</Privilege>
             <Privilege>http://tizen.org/privilege/systemsetting.read</Privilege>
+            <Privilege>http://tizen.org/privilege/packagemanager.install</Privilege>
             <Privilege>http://tizen.org/privilege/systeminfo</Privilege>
+            <Privilege>http://tizen.org/privilege/content.read</Privilege>
+            <Privilege>http://tizen.org/privilege/appsetting</Privilege>
+            <Privilege>http://tizen.org/privilege/wifimanager</Privilege>
+            <Privilege>http://tizen.org/privilege/packagesetting</Privilege>
+            <Privilege>http://tizen.org/privilege/systemsetting.write</Privilege>
+            <Privilege>http://tizen.org/privilege/setting</Privilege>
+            <Privilege>http://tizen.org/privilege/networkmanager</Privilege>
+            <Privilege>http://tizen.org/privilege/wifi.admin</Privilege>
+            <Privilege>http://tizen.org/privilege/certificate.write</Privilege>
+            <Privilege>http://tizen.org/privilege/telephony</Privilege>
+            <Privilege>http://tizen.org/privilege/application.kill</Privilege>
             <Privilege>http://tizen.org/privilege/platforminfo</Privilege>
-            <Privilege>http://tizen.org/privilege/application.launch</Privilege>
-       </Privileges>
+        </Privileges>
         <UiApp Main="True" MenuIconVisible="True" Name="Settings" SubMode="True">
             <UiScalability BaseScreenSize="Normal" CoordinateSystem="Logical" LogicalCoordinate="720"/>
             <UiTheme SystemTheme="White"/>

diff --git a/packaging/apps.Settings.spec b/packaging/apps.Settings.spec
index aef349d..7b53cad 100644 (file)
--- a/packaging/apps.Settings.spec
+++ b/packaging/apps.Settings.spec
@@ -7,6 +7,7 @@ License:    Flora License, Version 1.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(osp-content)
+BuildRequires:  pkgconfig(osp-locations)
 BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  pkgconfig(osp-uifw)
 BuildRequires:  pkgconfig(osp-ime)
@@ -55,4 +56,4 @@ echo "/usr/etc/package-manager/backend/tpk -u "${PKG_ID}
 
 %files
 %defattr(-,root,root,-)
-/usr/apps/*
\ No newline at end of file
+/usr/apps/*

diff --git a/res/ara-AE.xml b/res/ara-AE.xml
index 76741cf..a354eea 100644 (file)
--- a/res/ara-AE.xml
+++ b/res/ara-AE.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">اضغط علي WPS في نقطة وصول Wi-Fi لديك خلال دقيقتين</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">ضبط المصنع</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">نجاح</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">عنوان البوابة</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">الاتصال التلقائي بهذه الشبكة سيتم تعطيله. متابعة؟</text>
     <text id="IDS_ST_BODY_VALID_TO_C">صالح حتى:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">الأجهزة المتصلة</text>
+    <text id="IDS_ST_BODY_TOTAL">كلي</text>
     <text id="IDS_ST_BODY_24_HOURS">24ساعة</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">ضخم</text>
     <text id="IDS_ST_BODY_FONT">الخط</text>
     <text id="IDS_COM_BODY_12_HOURS">12 ساعة</text>
+    <text id="IDS_ST_BODY_DATA">بيانات</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS1</text>
     <text id="IDS_WCL_BODY_CANADA">كندا</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">لوحة المفاتيح</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">تحديث تلقائي</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">بحث</text>
     <text id="IDS_COM_POP_ACTIVATING">جاري التفعيل...</text>
     <text id="IDS_ST_BODY_ON">مفعل</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">الشهادات الخارجية</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">الأصوات</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">وضع الشاشة</text>
     <text id="IDS_WIFI_BODY_CONNECTED">تم التوصيل</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">مزيد من التفاصيل</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">البيانات أثناء التجوال</text>
     <text id="IDS_COM_BODY_RINGTONES">نغمات الرنين</text>
     <text id="IDS_ST_BODY_ISSUER">المصدر</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">التاريخ و الوقت</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">أمان الشاشة</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">إيقاف إجباري</text>
     <text id="IDS_ST_BODY_VOLUME">درجة الصوت</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">تثبيت بطاقة SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">كلمة مرور غير صحيحة</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">تكبير تلقائي</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">الرقم التسلسلي</text>
     <text id="IDS_ST_BODY_PASSWORD">كلمة المرور</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">مسح الافتراضيات</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">شهادة CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">منفذ الوكيل</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">أدخل SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">بطاقة SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">تم ضبط هذا التطبيق على الفتح بشكل افتراضي مع بعض الإجراءات</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">تصحيح USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">المساحة المتوفرة</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">سيترتب على تغيير حجم الخط في إعدادات إمكانية الوصول استبدال حجم الخط في كل تطبيق</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">الطقس</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">لا توجد نتائج للبحث</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">موقع الشبكة</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">المستخدمة بشكل متكرر</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">الفلبين</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">إلغاء</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">أجهزة Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">خيارات المطور</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">معلومات التطبيق</text>
     <text id="IDS_ST_BODY_AUTOMATIC">تلقائي</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">صوت قفل الشاشة</text>
     <text id="IDS_BT_BODY_PAIRED">تم الإقتران</text>

diff --git a/res/aze-AZ.xml b/res/aze-AZ.xml
index 7a1e31c..907ff3a 100644 (file)
--- a/res/aze-AZ.xml
+++ b/res/aze-AZ.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">2 dəqiqə ərzində Wi-Fi giriş nöqtənizdə WPS basın</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Zavod parametrlərinə qur</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Uğur</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Giriş ünvanı</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Bu şəbəkəyə avtomatik bağlanma qeyri-aktiv ediləcək. Davam edilsin?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Bu tarixə qədər qüvvədədir:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Qoşulmuş cihazlar</text>
+    <text id="IDS_ST_BODY_TOTAL">Cəmi</text>
     <text id="IDS_ST_BODY_24_HOURS">24 saat</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Böyük</text>
     <text id="IDS_ST_BODY_FONT">Şrift</text>
     <text id="IDS_COM_BODY_12_HOURS">12 saat</text>
+    <text id="IDS_ST_BODY_DATA">Məlumat</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Klaviatura</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Avtomatik yeniləmə</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Axtarış</text>
     <text id="IDS_COM_POP_ACTIVATING">Fəallaşdırılır...</text>
     <text id="IDS_ST_BODY_ON">Qoş</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Xarici sertifikatlar</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Səslər</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Ekran rejimi</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Qoşuldu</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Əlavə təfərrüatlar</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Məlumat rouminqi</text>
     <text id="IDS_COM_BODY_RINGTONES">Zəng tonu</text>
     <text id="IDS_ST_BODY_ISSUER">Tələbatçı</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Tarix və vaxt</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Ekran təhlükəsizliyi</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Məcburi dayanma</text>
     <text id="IDS_ST_BODY_VOLUME">Həcm</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD kartı quraşdırın</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Yanlış şifrə</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Avtomatik böyütmə</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Seriya nömrəsi</text>
     <text id="IDS_ST_BODY_PASSWORD">Şifrə</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Standarları silin</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA sertifikatı</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proksi portu</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">SSİD daxil edin</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD kartı</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Bu proqram bəzi əməliyyatlar üçün susmaya görə açmağa qurulmuşdur</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB sazlanması</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Mövcud yer</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Xüsusi imkanlar parametrlərində şrift ölçüsünün dəyişdirilməsi hər bir proqramdakı şrift ölçüsünü əvəz edəcək</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Hava</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Axtarış nəticəsi yoxdur</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Şəbəkə mövqeyi</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Tez-tez istifadə edilənlər</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filippin Adaları</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Ləğv et</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct cihazları</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Yaradıcı seçimləri</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Proqram məlumatı</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Avtomatik</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Ekranın kilidi səsi</text>
     <text id="IDS_BT_BODY_PAIRED">Qoşulmuşdur</text>

diff --git a/res/bul-BG.xml b/res/bul-BG.xml
index 35b1e4a..a8ae370 100644 (file)
--- a/res/bul-BG.xml
+++ b/res/bul-BG.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Натиснете WPS на Wi-Fi точката за достъп в рамките на 2 минути</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Нулиране до фабр. стойн.</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Успешно</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Адрес на шлюз</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Автоматичното свързване с тази мрежа ще бъде деактивирано. Продължаване?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Валидно до:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Свързани устройства</text>
+    <text id="IDS_ST_BODY_TOTAL">Общо</text>
     <text id="IDS_ST_BODY_24_HOURS">24 часа</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Много голям</text>
     <text id="IDS_ST_BODY_FONT">Шрифт</text>
     <text id="IDS_COM_BODY_12_HOURS">12 часа</text>
+    <text id="IDS_ST_BODY_DATA">Данни</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Канада</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Клавиатура</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Автоматично обновяване</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Търси</text>
     <text id="IDS_COM_POP_ACTIVATING">Активиране...</text>
     <text id="IDS_ST_BODY_ON">Включено</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Външни сертификати</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Звуци</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Режим на екрана</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Свързан</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Още подробности</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Данни в роуминг</text>
     <text id="IDS_COM_BODY_RINGTONES">Мелодии</text>
     <text id="IDS_ST_BODY_ISSUER">Издал</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Дата и час</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Защита на екрана</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Принудит. спиране</text>
     <text id="IDS_ST_BODY_VOLUME">Сила звук</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Монтиране на SD карта</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Грешна парола</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Автоматично преобразуване в главни</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Сериен номер</text>
     <text id="IDS_ST_BODY_PASSWORD">Парола</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Изчистване на настройките по подразбиране</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Сертификат CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Порт за прокси</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Въвеждане на SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD карта</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Това приложение е зададено на отворено по подразбиране за някои действия</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB поправки</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Налично пространство</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Промяната на размера на шрифта в настройките за достъпност ще припокрие размера на шрифта във всяко приложение</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Време</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Няма резултати от търсенето</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Позиция по мрежата</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Често използвани</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Филипини</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Отказ</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Устройства за Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Опции за разработчици</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Информация за приложението</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Автоматично</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Звук за заключване екран</text>
     <text id="IDS_BT_BODY_PAIRED">Сдвоено</text>

diff --git a/res/cat-ES.xml b/res/cat-ES.xml
index 43b0b93..1f53103 100644 (file)
--- a/res/cat-ES.xml
+++ b/res/cat-ES.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Premi WPS al seu punt d'accés Wi-Fi en 2 minuts</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Restab fàbrica</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Correcte</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Adreça passarel·la</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Es deshabilitarà la connexió automàtica a aquesta xarxa. Continuar?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Vàlid fins a:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Dispositius connectats</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 hores</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Enorme</text>
     <text id="IDS_ST_BODY_FONT">Font</text>
     <text id="IDS_COM_BODY_12_HOURS">12 hores</text>
+    <text id="IDS_ST_BODY_DATA">Dades</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canadà</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Teclat</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Actualització automàtica</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Cercar</text>
     <text id="IDS_COM_POP_ACTIVATING">Activant...</text>
     <text id="IDS_ST_BODY_ON">Activat</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificats externs</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sons</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Mode de pantalla</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Connectat</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Més detalls</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Dades en itinerància</text>
     <text id="IDS_COM_BODY_RINGTONES">Melodies</text>
     <text id="IDS_ST_BODY_ISSUER">Emissor</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Hora i data</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Seguretat de la pantalla</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Forçar aturada</text>
     <text id="IDS_ST_BODY_VOLUME">Volum</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Muntar targeta SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Contrasenya incorrecta</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Majúscula inicial automàticament</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Número de sèrie</text>
     <text id="IDS_ST_BODY_PASSWORD">Contrasenya</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Esborrar valors predeterminats</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificat CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Port de servidor intermediari</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Introdueixi SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Targ SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Aquesta aplicació està definida per obrir-se de forma predeterminada en algunes accions</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Depuració USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Espai disponible</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Si canvia la mida de font als ajustaments d'accessibilitat, es sobreescriurà la mida de font de cada aplicació</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Temps</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">No hi ha cap resultat de cerca</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Posició de xarxa</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Utilitzats amb freqüència</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipines</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cancelar</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Dispositius Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opcions de programador</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informació de l'aplicació</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automàtica</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">So de bloq. de pantalla</text>
     <text id="IDS_BT_BODY_PAIRED">Vinculat</text>

diff --git a/res/ces-CZ.xml b/res/ces-CZ.xml
index 166dfbf..7c65907 100644 (file)
--- a/res/ces-CZ.xml
+++ b/res/ces-CZ.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Stiskněte do 2 minut tlačítko WPS na přístupovém bodu Wi-Fi</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Obnovit výchozí nastavení</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Dokončeno</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Adresa brány</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatické připojení k této síti bude vypnuto. Chcete pokračovat?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Platí do:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Připojená zařízení</text>
+    <text id="IDS_ST_BODY_TOTAL">Celkem</text>
     <text id="IDS_ST_BODY_24_HOURS">24 hodin</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Velmi velké</text>
     <text id="IDS_ST_BODY_FONT">Písmo</text>
     <text id="IDS_COM_BODY_12_HOURS">12 hodin</text>
+    <text id="IDS_ST_BODY_DATA">Data</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Klávesnice</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatická aktualizace</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Hledat</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktivace...</text>
     <text id="IDS_ST_BODY_ON">Zap</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Externí certifikáty</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Zvuky</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Režim displeje</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Připojeno</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Další detaily</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Datový roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Vyzvánění</text>
     <text id="IDS_ST_BODY_ISSUER">Vydavatel</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Datum a čas</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Zabezpečení displeje</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Vynucené zastavení</text>
     <text id="IDS_ST_BODY_VOLUME">Hlasitost</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Připojit SD kartu</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Nesprávné heslo</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automaticky velká písmena na začátku vět</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Sériové číslo</text>
     <text id="IDS_ST_BODY_PASSWORD">Heslo</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Vymazat výchozí nastavení</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certifikát CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Port serveru proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Zadat SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD karta</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Některé akce spustí tuto aplikaci</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Ladění USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Volné místo</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Změna velikosti písma v nastavení usnadnění potlačí velikost písma v jednotlivých aplikacích</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Počasí</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Žádné výsledky</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Určení polohy pomocí sítě</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Často použitá</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipíny</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Zrušit</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Zařízení Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Vývojářské možnosti</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informace o aplikaci</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automaticky</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Zvuk zamknutí displeje</text>
     <text id="IDS_BT_BODY_PAIRED">Spárováno</text>

diff --git a/res/dan-DK.xml b/res/dan-DK.xml
index a01c6f0..db3c31d 100644 (file)
--- a/res/dan-DK.xml
+++ b/res/dan-DK.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Tryk på WPS på dit Wi-Fi-adgangspunkt inden for 2 minutter</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Nulstil til fabriksstandard</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Fuldført</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Gateway-adresse</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatisk forbindelse til dette netværk deaktiveres. Vil du fortsætte?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Gyldig til:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Tilsluttede enheder</text>
+    <text id="IDS_ST_BODY_TOTAL">I alt</text>
     <text id="IDS_ST_BODY_24_HOURS">24 timer</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Meget stor</text>
     <text id="IDS_ST_BODY_FONT">Skrifttype</text>
     <text id="IDS_COM_BODY_12_HOURS">12 timer</text>
+    <text id="IDS_ST_BODY_DATA">Data</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tastatur</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Opdatér automatisk</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Søg</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktiverer ...</text>
     <text id="IDS_ST_BODY_ON">Til</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Eksterne certifikater</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Lyde</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Skærmtilstand</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Forbundet</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Flere oplysninger</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Dataroaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Ringetoner</text>
     <text id="IDS_ST_BODY_ISSUER">Udsteder</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Dato og tid</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Skærmsikkerhed</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Gennemtving stop</text>
     <text id="IDS_ST_BODY_VOLUME">Lydstyrke</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Opret forbindelse til SD-kort</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Forkert adgangskode</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automatiske store bogstaver</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serienummer</text>
     <text id="IDS_ST_BODY_PASSWORD">Adgangskode</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Tøm standardindstillinger</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA-certifikat</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy-port</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Angiv SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-kort</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Dette program er indstillet til at åbne som standard for nogle handlinger</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB-fejlsøgning</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Tilgængelig plads</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Skift af skriftstørrelse under indstillinger for tilgængelighed vil overskrive skriftstørrelse i ethvert program</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Vejr</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Ingen søgeresultater</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Netværksposition</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Hyppigt anvendt</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filippinerne</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Annullér</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct-enheder</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Udviklingsindstillinger</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Programinfo</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatisk</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Lyd for skærmlås</text>
     <text id="IDS_BT_BODY_PAIRED">Parret</text>

diff --git a/res/deu-DE.xml b/res/deu-DE.xml
index 79e4f14..1c8e99c 100644 (file)
--- a/res/deu-DE.xml
+++ b/res/deu-DE.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Drücken Sie die WPS-Taste an Ihrem WLAN-Zugangspunkt innerhalb von 2 Minuten.</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Werkseinstellungen</text>
     <text id="IDS_ST_BODY_WI_FI">WLAN</text>
+    <text id="IDS_COM_POP_SUCCESS">Abgeschlossen</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Gateway-Adresse</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatische Verbindung zu diesem Netzwerk wird deaktiviert. Fortfahren?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Gültig bis:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Verbundene Geräte</text>
+    <text id="IDS_ST_BODY_TOTAL">Gesamt</text>
     <text id="IDS_ST_BODY_24_HOURS">24 Stunden</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Sehr groß</text>
     <text id="IDS_ST_BODY_FONT">Schriftart</text>
     <text id="IDS_COM_BODY_12_HOURS">12 Stunden</text>
+    <text id="IDS_ST_BODY_DATA">Daten</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tastatur</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatische Aktualisierung</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Suche</text>
     <text id="IDS_COM_POP_ACTIVATING">Wird aktiviert...</text>
     <text id="IDS_ST_BODY_ON">Ein</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Externe Zertifikate</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Töne</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Bildschirmmodus</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Verbunden</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Mehr Details</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Daten-Roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Klingeltöne</text>
     <text id="IDS_ST_BODY_ISSUER">Herausgeber</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Datum und Uhrzeit</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Bildschirmsicherheit</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Stopp erzwingen</text>
     <text id="IDS_ST_BODY_VOLUME">Lautstärke</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD-Karte verbinden</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Falsches Passwort</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Autom. Großschreibung</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Seriennummer</text>
     <text id="IDS_ST_BODY_PASSWORD">Passwort</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Standardwerte löschen</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA-Zertifikat</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy-Port</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">SSID eingeben</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-Karte</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Es wurde festgelegt, dass diese App für einige Vorgänge standardmäßig gestartet werden soll.</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB-Debugging</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Verfügbarer Speicherplatz</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Durch Änderung der Schriftgröße in den Eingabehilfeeinstellungen wird die Schriftgröße in jeder Anwendung überschrieben.</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Wetter</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Keine Suchergebnisse</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Netzwerkpositionierung</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Häufig verwendet</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Philippinen</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Abbruch</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct-Geräte</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Entwickler-Optionen</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Anwendungsinfo</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatisch</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Ton für Sperrbildschirm</text>
     <text id="IDS_BT_BODY_PAIRED">Gekoppelt</text>

diff --git a/res/ell-GR.xml b/res/ell-GR.xml
index 527c29b..e3ba425 100644 (file)
--- a/res/ell-GR.xml
+++ b/res/ell-GR.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Πιέστε το WPS του σημείου πρόσβασης Wi-Fi εντός 2 λεπτών</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Επαναφορά εργοστ. ρυθμ.</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Ολοκληρώθηκε</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Διεύθυνση πύλης</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Η αυτόματη σύνδεση σε αυτό το δίκτυο θα απενεργοποιηθεί. Συνέχεια;</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Ισχύει έως:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Συνδεδεμένες συσκευές</text>
+    <text id="IDS_ST_BODY_TOTAL">Σύνολο</text>
     <text id="IDS_ST_BODY_24_HOURS">24 ώρες</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Τεράστιο</text>
     <text id="IDS_ST_BODY_FONT">Γραμματοσειρά</text>
     <text id="IDS_COM_BODY_12_HOURS">12 ώρες</text>
+    <text id="IDS_ST_BODY_DATA">Δεδομένα</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS1</text>
     <text id="IDS_WCL_BODY_CANADA">Καναδάς</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Πληκτρολόγιο</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Αυτόματη ενημέρωση</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Αναζήτηση</text>
     <text id="IDS_COM_POP_ACTIVATING">Ενεργοποίηση...</text>
     <text id="IDS_ST_BODY_ON">Ενεργό</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Εξωτερικά πιστοποιητικά</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Ήχοι</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Λειτουργία οθόνης</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Συνδέθηκε</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Περισσότερες λεπτομέρειες</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Περιαγωγή δεδομένων</text>
     <text id="IDS_COM_BODY_RINGTONES">Ήχοι κλήσης</text>
     <text id="IDS_ST_BODY_ISSUER">Εκδότης</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Ημερομηνία &amp; ώρα</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Ασφάλεια οθόνης</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Επιβολή διακοπής</text>
     <text id="IDS_ST_BODY_VOLUME">Ένταση</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Τοποθέτηση κάρτας SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Λάθος κωδικός</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Αυτόματη κεφαλαιοποίηση</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Σειριακός αριθμός</text>
     <text id="IDS_ST_BODY_PASSWORD">Κωδικός πρόσβασης</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Διαγραφή προεπιλογών</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Πιστοποιητικό CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Θύρα proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Εισαγωγή στο SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Κάρτα SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Αυτή η εφαρμογή έχει ρυθμιστεί ώστε να ανοίγει από προεπιλογή για ορισμένες ενέργειες</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Εντοπισμός σφαλμάτων USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Διαθέσιμος χώρος</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Η αλλαγή του μεγέθους γραμματοσειράς από τις ρυθμίσεις προσβασιμότητας θα παρακάμψει το μέγεθος γραμματοσειράς σε κάθε εφαρμογή</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Καιρός</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Δεν υπάρχουν αποτελέσματα αναζήτησης</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Θέση δικτύου</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Συχνά χρησιμοποιούμενες</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Φιλιππίνες</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Ακύρωση</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Συσκευές Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Επιλογές προγραμματιστή</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Πληροφορίες εφαρμογής</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Αυτόματα</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Ήχος κλειδώματος οθόνης</text>
     <text id="IDS_BT_BODY_PAIRED">Δημιουργία ζεύγους</text>

diff --git a/res/eng-GB.xml b/res/eng-GB.xml
index b1008bf..733c06a 100644 (file)
--- a/res/eng-GB.xml
+++ b/res/eng-GB.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Press WPS on your Wi-Fi access point within 2 minutes</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Factory reset</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Success</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Gateway address</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatic connection to this network will be disabled. Continue?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Valid to:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Connected devices</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 hours</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Huge</text>
     <text id="IDS_ST_BODY_FONT">Font</text>
     <text id="IDS_COM_BODY_12_HOURS">12 hours</text>
+    <text id="IDS_ST_BODY_DATA">Data</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Keyboard</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatic update</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Search</text>
     <text id="IDS_COM_POP_ACTIVATING">Activating...</text>
     <text id="IDS_ST_BODY_ON">On</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">External certificates</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sounds</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Screen mode</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Connected</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">More details</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Data roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Ringtones</text>
     <text id="IDS_ST_BODY_ISSUER">Issuer</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Date and time</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Screen security</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Force stop</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Mount SD card</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Incorrect password</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Auto capitalisation</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serial number</text>
     <text id="IDS_ST_BODY_PASSWORD">Password</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Clear defaults</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA certificate</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy port</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Enter SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD card</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">This app is set to open by default for some actions</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB debugging</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Available space</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Changing the font size in accessibility settings will override the font size in each application</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Weather</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">No search results</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Network position</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Frequently used</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Philippines</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cancel</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct devices</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Developer options</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Application info</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatic</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Screen lock sound</text>
     <text id="IDS_BT_BODY_PAIRED">Paired</text>

diff --git a/res/eng-PH.xml b/res/eng-PH.xml
index 7c7c7a9..c66fb25 100644 (file)
--- a/res/eng-PH.xml
+++ b/res/eng-PH.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Press WPS on your Wi-Fi access point within 2 minutes</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Factory reset</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Success</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Gateway address</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatic connection to this network will be disabled. Continue?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Valid to:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Connected devices</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 hours</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Huge</text>
     <text id="IDS_ST_BODY_FONT">Font</text>
     <text id="IDS_COM_BODY_12_HOURS">12 hours</text>
+    <text id="IDS_ST_BODY_DATA">Data</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Keyboard</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatic update</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Search</text>
     <text id="IDS_COM_POP_ACTIVATING">Activating...</text>
     <text id="IDS_ST_BODY_ON">On</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">External certificates</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sounds</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Screen mode</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Connected</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">More details</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Data roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Ringtones</text>
     <text id="IDS_ST_BODY_ISSUER">Issuer</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Date and time</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Screen security</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Force stop</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Mount SD card</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Incorrect password</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Auto capitalization</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serial number</text>
     <text id="IDS_ST_BODY_PASSWORD">Password</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Clear defaults</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA certificate</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy port</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Enter SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD card</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">This app is set to open by default for some actions</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB debugging</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Available space</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Changing the font size in accessibility settings will override the font size in each application</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Weather</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">No search results</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Network position</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Frequently used</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Philippines</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cancel</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct devices</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Developer options</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Application info</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatic</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Screen lock sound</text>
     <text id="IDS_BT_BODY_PAIRED">Paired</text>

diff --git a/res/eng-US.xml b/res/eng-US.xml
index bc58d4b..782ee88 100644 (file)
--- a/res/eng-US.xml
+++ b/res/eng-US.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Press WPS on your Wi-Fi access point within 2 minutes</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Factory reset</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Success</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Gateway address</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatic connection to this network will be disabled. Continue?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Valid to:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Connected devices</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 hours</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Huge</text>
     <text id="IDS_ST_BODY_FONT">Font</text>
     <text id="IDS_COM_BODY_12_HOURS">12 hours</text>
+    <text id="IDS_ST_BODY_DATA">Data</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Keyboard</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatic update</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Search</text>
     <text id="IDS_COM_POP_ACTIVATING">Activating...</text>
     <text id="IDS_ST_BODY_ON">On</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">External certificates</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sounds</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Screen mode</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Connected</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">More details</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Data roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Ringtones</text>
     <text id="IDS_ST_BODY_ISSUER">Issuer</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Date and time</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Screen security</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Force stop</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Mount SD card</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Incorrect password</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Auto capitalization</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serial number</text>
     <text id="IDS_ST_BODY_PASSWORD">Password</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Clear defaults</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA certificate</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy port</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Enter SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD card</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">This app is set to open by default for some actions</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB debugging</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Available space</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Changing the font size in accessibility settings will override the font size in each application</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Weather</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">No search results</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Network position</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Frequently used</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Philippines</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cancel</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct devices</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Developer options</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Application info</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatic</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Screen lock sound</text>
     <text id="IDS_BT_BODY_PAIRED">Paired</text>

diff --git a/res/est-EE.xml b/res/est-EE.xml
index 1766bb1..d251da9 100644 (file)
--- a/res/est-EE.xml
+++ b/res/est-EE.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Vajutage 2 minuti jooksul WPS-nuppu oma Wi-Fi pääsupunktil</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Tehaseseadete lähtest.</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Õnnestus</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Lüüsi aadress</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Selle võrgu automaatühendus keelatakse. Kas jätkata?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Kehtiv kuni:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Ühendatud seadmed</text>
+    <text id="IDS_ST_BODY_TOTAL">Kokku</text>
     <text id="IDS_ST_BODY_24_HOURS">24 tundi</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Ülisuur</text>
     <text id="IDS_ST_BODY_FONT">Font</text>
     <text id="IDS_COM_BODY_12_HOURS">12 tundi</text>
+    <text id="IDS_ST_BODY_DATA">Andmed</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Klahvistik</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automaatvärskendamine</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Otsi</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktiveerimine...</text>
     <text id="IDS_ST_BODY_ON">Sees</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Välissertifikaadid</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Helid</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Ekraani režiim</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Ühendatud</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Rohkem üksikasju</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Andmesiderändlus</text>
     <text id="IDS_COM_BODY_RINGTONES">Helinad</text>
     <text id="IDS_ST_BODY_ISSUER">Teema</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Kuupäev ja kellaaeg</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Ekraani turvalisus</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Sunnitud peatamine</text>
     <text id="IDS_ST_BODY_VOLUME">Helitugevus</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Sisestage SD-kaart</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Vale parool</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automaatne suur esitäht</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Seerianumber</text>
     <text id="IDS_ST_BODY_PASSWORD">Parool</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Kustuta vaikeseaded</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Sertifitseerimiskeskuse sertifikaat</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Puhverserveri port</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Sisesta SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD kaart</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">See rakendus on määratud avanema vaikimisi mõnede toimingute jaoks</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB-silumine</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Saadaolev ruum</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Fondiseadete muutmine hõlbustusseadetes kirjutab üle kõigi rakenduste fondisuuruse</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Ilm</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Otsingutulemeid pole</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Võrgu positsioneerimine</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Sageli kasutatud</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipiinid</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Tühista</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct seadmed</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Arendaja valikud</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Rakenduse teave</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automaatne</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Ekraaniluku heli</text>
     <text id="IDS_BT_BODY_PAIRED">Ühildatud</text>

diff --git a/res/eus-ES.xml b/res/eus-ES.xml
index 1162467..ee76b25 100644 (file)
--- a/res/eus-ES.xml
+++ b/res/eus-ES.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Sakatu WPS Wi-Fi sargunean 2 minutu igaro baino lehen</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Fabrikako berrezarpena</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Behar bezala</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Atebidearen helbidea</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Sare honetarako konexio automatikoa ezgaituko da. Jarraitu?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Noiz arte balioduna:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Konektatutako gailuak</text>
+    <text id="IDS_ST_BODY_TOTAL">Guztira</text>
     <text id="IDS_ST_BODY_24_HOURS">24 ordu</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Erraldoia</text>
     <text id="IDS_ST_BODY_FONT">Letra</text>
     <text id="IDS_COM_BODY_12_HOURS">12 ordu</text>
+    <text id="IDS_ST_BODY_DATA">Datuak</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Teklatua</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Eguneratze automatikoa</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Bilatu</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktibatzen...</text>
     <text id="IDS_ST_BODY_ON">Aktibatuta</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Kanpo egiaztapenak</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Soinuak</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Pantaila modua</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Konektatuta</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Zehaztasun gehiago</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Datu roaminga</text>
     <text id="IDS_COM_BODY_RINGTONES">Dei doinuak</text>
     <text id="IDS_ST_BODY_ISSUER">Igorlea</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Data eta ordua</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Pantailaren segurtasuna</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Behartu etetera</text>
     <text id="IDS_ST_BODY_VOLUME">Bolumena</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Muntatu SD txartela</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Pasahitz okerra</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Maiuskula jartze automatikoa</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serie zenbakia</text>
     <text id="IDS_ST_BODY_PASSWORD">Pasahitza</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Garbitu lehenetsiak</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA ziurtagiria</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy ataka</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">SSIDa idatzi</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD txar.</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Aplikazioa zenbait ekintzetarako lehenespenez irekitzeko konfiguratuta dago</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB arazketa</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Espazio erabilgarria</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Letraren neurria aldatzean irisgarritasunaren ezarpenetan aplikazio bakoitzaren letra neurria baliogabetuko du</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Eguraldia</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Ez dago bilaketaren emaitzarik</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Sare kokapena</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Maiz erabilitakoa</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipinak</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Ezeztatu</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct-en gailuak</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Garatzailearen aukerak</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Aplikazioaren informazioa</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatikoa</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Pantaila blokeoaren soinua</text>
     <text id="IDS_BT_BODY_PAIRED">Parekatuta</text>

diff --git a/res/fin-FI.xml b/res/fin-FI.xml
index 0807170..a79f61e 100644 (file)
--- a/res/fin-FI.xml
+++ b/res/fin-FI.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Paina Wi-Fi-yhteyspisteesi WPS-painiketta 2 minuutin kuluessa</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Tehdaspalautus</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Valmis</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Yhdyskäytävän osoite</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automaattinen yhteyden muodostaminen tähän verkkoon poistetaan käytöstä. Jatketaanko?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Voimassa:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Yhdistetyt laitteet</text>
+    <text id="IDS_ST_BODY_TOTAL">Yhteensä</text>
     <text id="IDS_ST_BODY_24_HOURS">24 tuntia</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Erittäin suuri</text>
     <text id="IDS_ST_BODY_FONT">Fontti</text>
     <text id="IDS_COM_BODY_12_HOURS">12 tuntia</text>
+    <text id="IDS_ST_BODY_DATA">Data</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Näppäimistö</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automaattinen päivitys</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Etsi</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktivoidaan...</text>
     <text id="IDS_ST_BODY_ON">Päällä</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Ulkoiset varmenteet</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Äänet</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Näyttötila</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Yhdistetty</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Lisätietoja</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Dataverkkovierailu</text>
     <text id="IDS_COM_BODY_RINGTONES">Soittoäänet</text>
     <text id="IDS_ST_BODY_ISSUER">Myöntäjä</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Päivämäärä ja aika</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Näytön suojaus</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Pakota lopetus</text>
     <text id="IDS_ST_BODY_VOLUME">Äänenvoimakkuus</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Ota SD-kortti käyttöön</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Virheellinen salasana</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automaattiset isot kirjaimet</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Sarjanumero</text>
     <text id="IDS_ST_BODY_PASSWORD">Salasana</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Poista oletukset</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA-varmenne</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Välityspalvelimen portti</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Anna SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-kort.</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Tämä sovellus on oletusarvoisesti määritetty avautumaan tiettyjen toimenpiteiden suorittamista varten</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB-virheenkorjaus</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Käytettävissä oleva tila</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Helppokäyttöisyysasetuksissa muutettu fonttikoko ohittaa kunkin sovelluksen fonttikoon</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Sää</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Ei hakutuloksia</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Verkkosijainti</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Usein käytetyt</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filippiinit</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Peruuta</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct -laitteet</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Sovelluskehittäjien asetukset</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Sovelluksen tiedot</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automaattinen</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Näytön lukitusääni</text>
     <text id="IDS_BT_BODY_PAIRED">Yhdistetty</text>

diff --git a/res/fra-CA.xml b/res/fra-CA.xml
index 2149486..8f0ac75 100644 (file)
--- a/res/fra-CA.xml
+++ b/res/fra-CA.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Appuyez sur le bouton WPS de votre point d'accès Wifi d'ici 2 minutes pour l'activer</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Réinit. param. origine</text>
     <text id="IDS_ST_BODY_WI_FI">Wifi</text>
+    <text id="IDS_COM_POP_SUCCESS">Terminé</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Adresse de passerelle</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">La connexion automatique à ce réseau va être désactivée. Continuer ?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Valide jusqu'à :</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Périphériques connectés</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 heures</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Immense</text>
     <text id="IDS_ST_BODY_FONT">Police</text>
     <text id="IDS_COM_BODY_12_HOURS">12 heures</text>
+    <text id="IDS_ST_BODY_DATA">Données</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Clavier</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Mise à jour automatique</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Recherche</text>
     <text id="IDS_COM_POP_ACTIVATING">En cours d'activation ...</text>
     <text id="IDS_ST_BODY_ON">Activé</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificats externes</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sons</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Mode d'écran</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Connecté</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Plus de détails</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Itinérance</text>
     <text id="IDS_COM_BODY_RINGTONES">Sonneries</text>
     <text id="IDS_ST_BODY_ISSUER">Émetteur</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Date et heure</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Sécurité écran</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Forcer l'arrêt</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Activer carte SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Mot de passe incorrect</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Majuscules auto.</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Numéro de série</text>
     <text id="IDS_ST_BODY_PASSWORD">Mot de passe</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Effacer les valeurs par défaut</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificat de l'AC</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Port proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Entrer SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Carte SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Cette application est définie pour s'ouvrir par défaut lors de certaines actions</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Débogage USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Espace disponible</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Lorsque vous modifiez la taille de la police dans les paramètres d'accessibilité, celle-ci est remplacée dans chaque application</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Météo</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Aucun résultat de recherche</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Position réseau</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Fréquemment utilisé</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Philippines</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Annuler</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Périphériques Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Options de développement</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informations sur l'application</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatique</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Son verrouillage écran</text>
     <text id="IDS_BT_BODY_PAIRED">Couplé</text>

diff --git a/res/fra-FR.xml b/res/fra-FR.xml
index 745974c..1329731 100644 (file)
--- a/res/fra-FR.xml
+++ b/res/fra-FR.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Appuyez sur la touche WPS de votre point d'accès Wi-Fi dans 2 minutes</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Param. par défaut</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Terminé</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Adresse de passerelle</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">La connexion automatique à ce réseau va être désactivée. Continuer ?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Valide jusqu'à :</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Périphériques connectés</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 heures</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Immense</text>
     <text id="IDS_ST_BODY_FONT">Police</text>
     <text id="IDS_COM_BODY_12_HOURS">12 heures</text>
+    <text id="IDS_ST_BODY_DATA">Données</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Clavier</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Mise à jour automatique</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Rechercher</text>
     <text id="IDS_COM_POP_ACTIVATING">Activation en cours...</text>
     <text id="IDS_ST_BODY_ON">Activé</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificats externes</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sons</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Mode d'écran</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Connecté</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Plus de détails</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Itinérance</text>
     <text id="IDS_COM_BODY_RINGTONES">Sonneries</text>
     <text id="IDS_ST_BODY_ISSUER">Émetteur</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Date et heure</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Sécurité écran</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Forcer l'arrêt</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Monter la carte SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Mot de passe incorrect</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Majuscules auto.</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Numéro de série</text>
     <text id="IDS_ST_BODY_PASSWORD">Mot de passe</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Supprimer les valeurs par défaut</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificat CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Port proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Entrer SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Carte SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Cette application est définie sur ouvrir par défaut pour certaines actions</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Débogage USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Espace disponible</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Lorsque vous modifiez la taille de la police dans les paramètres d'accessibilité, celle-ci est remplacée dans chaque application</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Météo</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Aucun résultat trouvé</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Position réseau</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Fréquemment utilisé</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Les Philippines</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Annuler</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Périphériques Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Options de développement</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informations sur l'application</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatique</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Son verrouillage écran</text>
     <text id="IDS_BT_BODY_PAIRED">Appairé</text>

diff --git a/res/gle-IE.xml b/res/gle-IE.xml
index 70b8f59..6025a82 100644 (file)
--- a/res/gle-IE.xml
+++ b/res/gle-IE.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Brúigh WPS ar do phointe rochtana Wi-Fi laistigh de 2 nóiméad</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Athshocrú monarchan</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">D’éirigh leis</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Seoladh geata</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Déanfar díchumasú ar an nasc uathoibríoch chuig an líonra seo. Ar aghaidh?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Bailí go dtí:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Gléasanna nasctha</text>
+    <text id="IDS_ST_BODY_TOTAL">Iomlán</text>
     <text id="IDS_ST_BODY_24_HOURS">24 uair an chloig</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Ollmhór</text>
     <text id="IDS_ST_BODY_FONT">Cló</text>
     <text id="IDS_COM_BODY_12_HOURS">12 uair an chloig</text>
+    <text id="IDS_ST_BODY_DATA">Sonraí</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Ceanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Eochairchlár</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Uath-nuashonrú</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Cuardaigh</text>
     <text id="IDS_COM_POP_ACTIVATING">Ag cur i ngníomh...</text>
     <text id="IDS_ST_BODY_ON">Air</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Deimhnithe seachtracha</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Fuaimeanna</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Mód scáileáin</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Nasctha</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Tuilleadh sonraí</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Sonraí fánaíochta</text>
     <text id="IDS_COM_BODY_RINGTONES">Clingthoin</text>
     <text id="IDS_ST_BODY_ISSUER">Eisitheoir</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Dáta agus am</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Slándáil scáileáin</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Fórsáil stad</text>
     <text id="IDS_ST_BODY_VOLUME">Airde</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Gléas cárta SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Pasfhocal mícheart</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Uath-cheannlitriú</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Sraithuimhir</text>
     <text id="IDS_ST_BODY_PASSWORD">Pasfhocal</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Glan réamhshocruithe</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Deimhniú CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Seachphort</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Iontráil SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Cárta SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Tá an feidhmchlár seo socraithe le hoscailt de réir réamhshocraithe le haghaidh roinnt gníomhartha</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Dífhabhtú USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Spás atá ar fáil</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Má athraítear méid an chló sna socruithe rochtana sárófar méid an chló i ngach feidhmchlár</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Aimsir</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Níl torthaí cuardaigh ann</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Suí an líonra</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Úsáidte go minic</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Na hOileáin Fhilipíneacha</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cealaigh</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Gléasanna Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Roghanna forbróirí</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Faisnéis faoin fheidhmchláir</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Uathoibríoch</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Fuaim scáileáin ghlasála</text>
     <text id="IDS_BT_BODY_PAIRED">Péireáilte</text>

diff --git a/res/glg-ES.xml b/res/glg-ES.xml
index 929806a..51ea6ca 100644 (file)
--- a/res/glg-ES.xml
+++ b/res/glg-ES.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Pulsa no botón WPS no teu punto de acceso da Wi-Fi dentro de 2 minutos</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Restauración de fábrica</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Éxito</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Enderezo de pasarela</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">A conexión automática a esta rede vaise desactivar. Continuar?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Válido ata:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Dispositivos conectados</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 horas</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Enorme</text>
     <text id="IDS_ST_BODY_FONT">Fonte</text>
     <text id="IDS_COM_BODY_12_HOURS">12 horas</text>
+    <text id="IDS_ST_BODY_DATA">Datos</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canadá</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Teclado</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Actualización automática</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Buscar</text>
     <text id="IDS_COM_POP_ACTIVATING">Activando...</text>
     <text id="IDS_ST_BODY_ON">Activado</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificados externos</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sons</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Modo de pantalla</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Conectado</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Máis detalles</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Itinerancia de datos</text>
     <text id="IDS_COM_BODY_RINGTONES">Melodías</text>
     <text id="IDS_ST_BODY_ISSUER">Emisor</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Data e hora</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Seguridade da pantalla</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Forzar detención</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Activar tarxeta SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Contrasinal non válido</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Maiúsculas de xeito automático</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Número de serie</text>
     <text id="IDS_ST_BODY_PASSWORD">Contrasinal</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Borrar valores predeterminados</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificado CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Porto do proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Introducir SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Tarx. SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Esta aplicación está definida para abrirse por defecto con algunhas accións</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Depuración de USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Espazo dispoñible</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">O cambio do tamaño da fonte nos axustes de accesibilidade anulará o tamaño da fonte propio de cada aplicación</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Tempo</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Non hai resultados da busca</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Posición da rede</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Usado con frecuencia</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipinas</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cancelar</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Dispositivos Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opcións de creador</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Información da aplicación</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automático</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Son de bloqueo da pantalla</text>
     <text id="IDS_BT_BODY_PAIRED">Vinculado</text>

diff --git a/res/hin-IN.xml b/res/hin-IN.xml
index 8e015e8..86b75be 100644 (file)
--- a/res/hin-IN.xml
+++ b/res/hin-IN.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">2 मिनटों के अंदर आप के Wi-Fi ऍक्सेस पॉइंट पर WPS दबाएँ</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">फ़ैक्टरी रीसेट</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">सफलता</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">गेटवे पता</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">इस नेटवर्क के साथ स्वचालित कनेक्शन अक्षम हो जाएगा। जारी रखें?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">इस पर मान्य:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">कनेक्ट किए गए डिवाइसेस</text>
+    <text id="IDS_ST_BODY_TOTAL">कुल</text>
     <text id="IDS_ST_BODY_24_HOURS">24 घंटे</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">बहुत बड़ा</text>
     <text id="IDS_ST_BODY_FONT">फ़ॉन्ट</text>
     <text id="IDS_COM_BODY_12_HOURS">12 घंटे</text>
+    <text id="IDS_ST_BODY_DATA">डाटा</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">कनाडा</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">की-बोर्ड</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">स्वचालित अपडेट</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">खोजें</text>
     <text id="IDS_COM_POP_ACTIVATING">सक्रिय हो रहा है…</text>
     <text id="IDS_ST_BODY_ON">चालू</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">बाह्य प्रमाणपत्र</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">ध्वनियाँ</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">स्क्रीन मोड</text>
     <text id="IDS_WIFI_BODY_CONNECTED">जोड़ा गया</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">अधिक विवरण</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">डाटा रोमिंग</text>
     <text id="IDS_COM_BODY_RINGTONES">रिंगटोन</text>
     <text id="IDS_ST_BODY_ISSUER">जारीकर्ता</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">दिनांक और समय</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">स्‍क्रीन सुरक्षा</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">फोर्स स्‍टॉप</text>
     <text id="IDS_ST_BODY_VOLUME">वॉल्यूम</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD कार्ड माउंट करें</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">गलत पासवर्ड</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">ऑटो कैपिटैलाइझेशन</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">सीरियल नंबर</text>
     <text id="IDS_ST_BODY_PASSWORD">पासवर्ड</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">डिफॉल्ट साफ़ करें</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA प्रमाणपत्र</text>
     <text id="IDS_ST_BODY_PROXY_PORT">प्रॉक्‍सी पोर्ट</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">एसएसआईडी प्रविष्ट करें</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD कार्ड</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">कुछ कार्रवाइयों के लिए यह ऐप खोलें पर सेट किया गया है</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB डिबग कर रहे है</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">उपलब्ध जगह</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">अभिगम्यता सेटिंग्स में फ़ॉन्ट का आकार बदलने पर प्रत्येक एप्लीकेशन में फ़ॉन्ट का आकार ओवरराइड हो जाएगा</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">मौसम</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">कोई खोज परिणाम नहीं</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">नेटवर्क स्थिति</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">बार बार उपयोग किए गए</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">फ़िलिपिंस</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">रद्द</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">वाई-फाई डायरेक्ट डिवाइसें</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">डेवलपर विकल्प</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">अनुप्रयोग की जानकारी</text>
     <text id="IDS_ST_BODY_AUTOMATIC">स्वचालित</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">स्‍क्रीन लॉक ध्वनि</text>
     <text id="IDS_BT_BODY_PAIRED">जोड़ा गया</text>

diff --git a/res/hrv-HR.xml b/res/hrv-HR.xml
index e2d5bf5..84c7e8f 100644 (file)
--- a/res/hrv-HR.xml
+++ b/res/hrv-HR.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Pritisnite WPS na Wi-Fi pristupnoj točki u roku od 2 min</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Vraćanje tvorn. postavki</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Uspješno</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Adresa pristupnika</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Isključiti će se automatsko spajanje na tu mrežu. Nastaviti?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Vrijedi do:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Spojeni uređaji</text>
+    <text id="IDS_ST_BODY_TOTAL">Ukupno</text>
     <text id="IDS_ST_BODY_24_HOURS">24 sati</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Jako veliko</text>
     <text id="IDS_ST_BODY_FONT">Slova</text>
     <text id="IDS_COM_BODY_12_HOURS">12 sati</text>
+    <text id="IDS_ST_BODY_DATA">Podaci</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tipkovnica</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Auto aktualiziranje</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Traži</text>
     <text id="IDS_COM_POP_ACTIVATING">Uključivanje...</text>
     <text id="IDS_ST_BODY_ON">Uključeno</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Vanjske potvrde</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Zvukovi</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Način zaslona</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Spojeno</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Više detalja</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Podatkovni roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Tonovi zvona</text>
     <text id="IDS_ST_BODY_ISSUER">Izdavač</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Datum i vrijeme</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Zaslonska zaštita</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Prisilno zaustavi</text>
     <text id="IDS_ST_BODY_VOLUME">Glasnoća</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Umetnite SD karticu</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Neispravna šifra</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Auto. veliko početno slovo</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serijski broj</text>
     <text id="IDS_ST_BODY_PASSWORD">Šifra</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Obriši zadane postavke</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA certifikat</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy ulaz</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Unesite SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD kartica</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Ova je aplikacija postavljena kao zadana za neke radnje</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB ispravljanje grešaka</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Slobodna memorija</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Mijenjanje veličine fonta u postavkama pristupačnosti zamijenit će veličinu fonta u svakoj aplikaciji</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Prognoza</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Nema traženih rezultata</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Pozicija mreže</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Najčešće korišteno</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipini</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Prekid</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Uređaji za Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opcije razvoja</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Detalji aplikacije</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatski</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Zvuk zaključavanja zaslona</text>
     <text id="IDS_BT_BODY_PAIRED">Upareno</text>

diff --git a/res/hun-HU.xml b/res/hun-HU.xml
index fadbfc4..ec19b98 100644 (file)
--- a/res/hun-HU.xml
+++ b/res/hun-HU.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">2 percen belül nyomja meg a Wi-Fi hozzáférési pont WPS gombját</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Gyári beá. visszaállítása</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Sikeres</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Átjárócím</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Ezzel letiltja az automatikus kapcsolódást ehhez a hálózathoz. Folytatja?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Érvényesség vége:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Csatlakoztatott eszközök</text>
+    <text id="IDS_ST_BODY_TOTAL">Összesen</text>
     <text id="IDS_ST_BODY_24_HOURS">24 óra</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Nagyon nagy</text>
     <text id="IDS_ST_BODY_FONT">Betűtípus</text>
     <text id="IDS_COM_BODY_12_HOURS">12 óra</text>
+    <text id="IDS_ST_BODY_DATA">Adat</text>
     <text id="IDS_WIFI_BODY_DNS_2">2. DNS</text>
     <text id="IDS_WIFI_BODY_DNS_1">1. DNS</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Billentyűzet</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatikus frissítés</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Keresés</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktiválás...</text>
     <text id="IDS_ST_BODY_ON">Be</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Külső tanúsítványok</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Hangok</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Képernyőmód</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Csatlakoztatva</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">További részletek</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Adatroaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Csengőhangok</text>
     <text id="IDS_ST_BODY_ISSUER">Kibocsátó</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Dátum és idő</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Képernyő biztonsága</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Kényszerleállítás</text>
     <text id="IDS_ST_BODY_VOLUME">Hangerő</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD-kártya csatolása</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Téves jelszó</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automatikus nagybetűs mondatkezdés</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Sorozatszám</text>
     <text id="IDS_ST_BODY_PASSWORD">Jelszó</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Alapértelmezések törlése</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Hitelesítésszolgáltatói tanúsítvány</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy port</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Adja meg az SSID-t</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-kártya</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">A beállításnak megfelelően bizonyos műveleteknél alapértelmezésként megnyílik ez az alkalmazás</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB-hibakeresés</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Szabad terület</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">A betűméret megváltoztatása a kisegítő lehetőségek beállításaiban felülírja az egyes alkalmazások betűméret-beállításait</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Időjárás</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Nincs találat</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Hálózati helymeghatározás</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Gyakran használt</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Fülöp-szigetek</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Mégse</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct-eszközök</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Fejlesztői beállítások</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Alkalmazás adatai</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatikus</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Képernyőzár hangja</text>
     <text id="IDS_BT_BODY_PAIRED">Párosítva</text>

diff --git a/res/hye-AM.xml b/res/hye-AM.xml
index 0a294e8..7937148 100644 (file)
--- a/res/hye-AM.xml
+++ b/res/hye-AM.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Սեղմեք Ձեր Wi-Fi մուտքի կետի WPS-ը 2 րոպե</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Գործ. դրվածքների հտդրձում</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Հաջողված է</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Ուղեմուտի հասցե</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Ինքնամիացումն այս ցանցին կկասեցվի: Շարունակե՞լ:</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Վավեր է մինչև՝</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Միացված սարքեր</text>
+    <text id="IDS_ST_BODY_TOTAL">Ընդամենը</text>
     <text id="IDS_ST_BODY_24_HOURS">24 ժամ</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Խոշոր</text>
     <text id="IDS_ST_BODY_FONT">Տառատեսակ</text>
     <text id="IDS_COM_BODY_12_HOURS">12 ժամ</text>
+    <text id="IDS_ST_BODY_DATA">Տվյալներ</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Կանադա</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Ստեղնաշար</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Թարմացում ավտոմատ կերպով</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Որոնել</text>
     <text id="IDS_COM_POP_ACTIVATING">Ակտիվացվում է...</text>
     <text id="IDS_ST_BODY_ON">Միացված է</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Արտաքին վկայականներ</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Ձայներ</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Էկրանի ռեժիմ</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Միացված է</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Այլ մանրամասներ</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Տվյալների ռոումինգ</text>
     <text id="IDS_COM_BODY_RINGTONES">Մեղեդիներ</text>
     <text id="IDS_ST_BODY_ISSUER">Թողարկող</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Անսաթիվ և ժամանակ</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Էկրանի անվտանգություն</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Հարկադիր կանգ</text>
     <text id="IDS_ST_BODY_VOLUME">Բարձրություն</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Տեղակայել SD քարտ</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Սխալ գաղտնաբառ</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Ինքնաբերական մեծատառ</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Հերթական համար</text>
     <text id="IDS_ST_BODY_PASSWORD">Գաղտնաբառ</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Մաքրել լռելյայնները</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA վկայական</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Պրոքսիի պորտ</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Մուտքագրեք SSID-ն</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD քարտ</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Այս ծրագիրը կանխադրված է որոշ գործողությունների համար բացվելու համար</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB վրիպազերծում</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Առկա տարածք</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Մատչելիության դրվածքներում տառաչափը փոխելը չեղյալ կդարձնի տառաչափը յուրաքանչյուր ծրագրում</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Եղանակ</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Որոնման արդյունքներ չկան</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Ցանցի դիրք</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Հաճախակի օգտագործվող</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Ֆիլիպիններ</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Չեղարկել</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct սարքեր</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Մշակողի ընտրանքներ</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Ծրագրի տեղեկություն</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Ավտոմատ</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Էկրանի կողպման հնչյուն</text>
     <text id="IDS_BT_BODY_PAIRED">Զուգակցված է</text>

diff --git a/res/isl-IS.xml b/res/isl-IS.xml
index 0fc5894..5a42903 100644 (file)
--- a/res/isl-IS.xml
+++ b/res/isl-IS.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Ýttu á WPS á Wi-Fi aðgangsstaðnum innan 2 mínútna</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Núllstilling</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Árangur</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Vistfang gáttar</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Það verður slökkt á sjálfvirkri tengingu við þetta netkerfi. Viltu halda áfram?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Gildir til:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Tengd tæki</text>
+    <text id="IDS_ST_BODY_TOTAL">Alls</text>
     <text id="IDS_ST_BODY_24_HOURS">24 klst.</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Mjög stórt</text>
     <text id="IDS_ST_BODY_FONT">Letur</text>
     <text id="IDS_COM_BODY_12_HOURS">12 klst.</text>
+    <text id="IDS_ST_BODY_DATA">Gögn</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Lyklaborð</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Sjálfvirk uppfærsla</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Leit</text>
     <text id="IDS_COM_POP_ACTIVATING">Ræsi...</text>
     <text id="IDS_ST_BODY_ON">Kveikt</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Ytri vottorð</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Hljóð</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Skjástilling</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Tengt</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Frekari upplýsingar</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Gagnareiki</text>
     <text id="IDS_COM_BODY_RINGTONES">Hringitónar</text>
     <text id="IDS_ST_BODY_ISSUER">Útgefandi</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Dagsetning og tími</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Skjáöryggi</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Þvinga stöðvun</text>
     <text id="IDS_ST_BODY_VOLUME">Rúmmál</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Settu inn SD-kort</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Rangt aðgangsorð</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Sjálfvirkir hástafir</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Raðnúmer</text>
     <text id="IDS_ST_BODY_PASSWORD">Aðgangsorð</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Hreinsa sjálfgefið</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA-skírteini</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Tengi fyrir staðgengilnetþjón</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Tilgreinið SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-kort</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Þetta forrit er stillt þannig að það opnist sjálfkrafa vegna sumra aðgerða</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB-kembing</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Laust pláss</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Breyting á leturstærð í aðgengisstillingum mun hafa forgang á leturstærð í hverju forriti</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Veður</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Engar leitarniðurstöður</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Kerfisstaðsetning</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Oft notað</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filippseyjar</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Hætta v.</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct tæki</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Þróunarvalkostir</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Um forritið</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Sjálfvirkt</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Hljóð skjáláss</text>
     <text id="IDS_BT_BODY_PAIRED">Parað</text>

diff --git a/res/ita-IT.xml b/res/ita-IT.xml
index 65421f9..42f6041 100644 (file)
--- a/res/ita-IT.xml
+++ b/res/ita-IT.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Premi WPS sul punto di accesso Wi-Fi entro 2 minuti</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Ripristina dati di fabbrica</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Operazione eseguita</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Indirizzo gateway</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">La connessione automatica a questa rete sarà disattivata. Continuare?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Valido fino a:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Dispositivi connessi</text>
+    <text id="IDS_ST_BODY_TOTAL">Totale</text>
     <text id="IDS_ST_BODY_24_HOURS">24 ore</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Molto grande</text>
     <text id="IDS_ST_BODY_FONT">Carattere</text>
     <text id="IDS_COM_BODY_12_HOURS">12 ore</text>
+    <text id="IDS_ST_BODY_DATA">Dati</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tastiera</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Aggiornamento auto</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Cerca</text>
     <text id="IDS_COM_POP_ACTIVATING">Attivazione...</text>
     <text id="IDS_ST_BODY_ON">Attivo</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificati esterni</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Suoni</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Modalità schermo</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Connesso</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Altri dettagli</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Roaming dati</text>
     <text id="IDS_COM_BODY_RINGTONES">Suonerie</text>
     <text id="IDS_ST_BODY_ISSUER">Emittente</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Data e ora</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Sicurezza schermata</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Arresto forzato</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Monta scheda SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Password errata</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Maiuscole auto</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Numero di serie</text>
     <text id="IDS_ST_BODY_PASSWORD">Password</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Elimina predefiniti</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificato CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Porta</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Inserisci SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Scheda SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">L'applicazione è configurata per aprirsi come impostazione predefinita per alcune azioni</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Debug USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Spazio disponibile</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">La modifica della dimensione caratteri nelle impostazioni di accessibilità influirà sulla dimensione caratteri di tutte le applicazioni</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Meteo</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Nessun risultato della ricerca</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Posizione rete</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Utilizzato di frequente</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filippine</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Annulla</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Dispositivi Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opzioni sviluppatore</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Info applicazione</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatica</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Suono blocco schermo</text>
     <text id="IDS_BT_BODY_PAIRED">Associazione eseguita</text>

diff --git a/res/jpn-JP.xml b/res/jpn-JP.xml
index 1f263ca..6c8e805 100644 (file)
--- a/res/jpn-JP.xml
+++ b/res/jpn-JP.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">2分以内にWi-FiアクセスポイントのWPSボタンを押してください。</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">初期化</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">正常に完了しました。</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">ゲートウェイアドレス</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">このネットワークへの自動接続を無効にします。続行しますか？</text>
     <text id="IDS_ST_BODY_VALID_TO_C">有効期限：</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">接続デバイス</text>
+    <text id="IDS_ST_BODY_TOTAL">合計</text>
     <text id="IDS_ST_BODY_24_HOURS">24時間</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">最大</text>
     <text id="IDS_ST_BODY_FONT">フォント</text>
     <text id="IDS_COM_BODY_12_HOURS">12時間</text>
+    <text id="IDS_ST_BODY_DATA">データ</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">カナダ</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">キーボード</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">自動​更新</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">検索</text>
     <text id="IDS_COM_POP_ACTIVATING">起動中...</text>
     <text id="IDS_ST_BODY_ON">ON</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">外部証明書</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">サウンド</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">画面モード</text>
     <text id="IDS_WIFI_BODY_CONNECTED">接続しました。</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">注意事項の詳細</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">データローミング</text>
     <text id="IDS_COM_BODY_RINGTONES">着信音</text>
     <text id="IDS_ST_BODY_ISSUER">発行者</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">日付と時刻</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">画面のセキュリティ</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">強制終了</text>
     <text id="IDS_ST_BODY_VOLUME">音量</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">外部SDカードのマウント</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">不正なパスワードです。</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">自動大文字変換</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">シリアル番号</text>
     <text id="IDS_ST_BODY_PASSWORD">パスワード</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">初期設定に戻す</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA証明書</text>
     <text id="IDS_ST_BODY_PROXY_PORT">プロキシポート</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">SSIDを入力</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">外部SDカード</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">このアプリはいくつかのアクションが初期値で起動するように設定されています。</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USBデバッグ</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">空き容量</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">ユーザー補助設定で文字サイズを変更すると、各アプリケーションでの文字サイズが上書きされます。</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">天気予報</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">検索結果がありません。</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">ネットワーク​に​よる​位置​検出</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">よく使う</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">フィリピン</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">キャンセル</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Directデバイス</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">開発者向けオプション</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">アプリケーション情報</text>
     <text id="IDS_ST_BODY_AUTOMATIC">自動</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">画面ロック音</text>
     <text id="IDS_BT_BODY_PAIRED">ペアリング済み</text>

diff --git a/res/kat-GE.xml b/res/kat-GE.xml
index b98387e..681ab2f 100644 (file)
--- a/res/kat-GE.xml
+++ b/res/kat-GE.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">მაქსიმუმ 2 წუთში დააჭირეთ WPS-ს თქვენს Wi-Fi წვდომის წერტილზე</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">ქარხნული პარამ. დაბრუნება</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">წარმატება</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">გასასვლელის მისამართი</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">ამ ქსელთან ავტომატური დაკავშირება გამოირთვება. განაგრძობთ?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">ვარგისიანობის ვადა:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">დაკავშირებული მოწყობილობები</text>
+    <text id="IDS_ST_BODY_TOTAL">სულ</text>
     <text id="IDS_ST_BODY_24_HOURS">24 საათი</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">ძალიან დიდი</text>
     <text id="IDS_ST_BODY_FONT">ფონტი</text>
     <text id="IDS_COM_BODY_12_HOURS">12 საათი</text>
+    <text id="IDS_ST_BODY_DATA">მონაცემები</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">კანადა</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">კლავიატურა</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">ავტომატური განახლება</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">ძიება</text>
     <text id="IDS_COM_POP_ACTIVATING">აქტიურდება...</text>
     <text id="IDS_ST_BODY_ON">ჩართვა</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">გარე სერტიფიკატები</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">ხმები</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">ეკრანის რეჟიმი</text>
     <text id="IDS_WIFI_BODY_CONNECTED">დაკავშირებულია</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">სხვა დეტალები</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">მონაცემთა გადაცემა როუმინგის დროს</text>
     <text id="IDS_COM_BODY_RINGTONES">ზარის მელოდიები</text>
     <text id="IDS_ST_BODY_ISSUER">გამომცემელი</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">თარიღი და დრო</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">ეკრანის უსაფრთხოება</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">გაჩერება</text>
     <text id="IDS_ST_BODY_VOLUME">ხმის სიმაღლე</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">ჩადეთ SD ბარათი</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">პაროლი არასწორია</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">ავტომატურად დაწყება ასომთავრულით</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">სერიული ნომერი</text>
     <text id="IDS_ST_BODY_PASSWORD">პაროლი</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">ნაგულისხმევი პარამეტრების წაშლა</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA სერთიფიკატი</text>
     <text id="IDS_ST_BODY_PROXY_PORT">პროქსი სერვერის პორტი</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">SSID შეტანა</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SDბარათი</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">არჩეულია, რომ ეს პროგრამა ავტომატურად გაიხსნას ზოგიერთ მოქმედებაზე</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB შეცდომების გასწორება</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">თავისუფალი სივრცე</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">შრიფტის შეცვლილი ზომა წვდომის პარამეტრებში გამოყენებული იქნება, როგორც შრიფტის უპირატესი ზომა თითოეულ პროგრამაში</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">ამინდი</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">ძიების შედეგი არ არის</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">ქსელის პოზიცია</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">ხშირად გამოყენებული</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">ფილიპინები</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">გაუქმება</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct მოწყობილობები</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">დეველოპერის ოფციები</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">პროგრამის ინფო</text>
     <text id="IDS_ST_BODY_AUTOMATIC">ავტომატური</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">ეკრანის დაბლოკვის ხმა</text>
     <text id="IDS_BT_BODY_PAIRED">დაწყვილებული</text>

diff --git a/res/kaz-KZ.xml b/res/kaz-KZ.xml
index f33e12c..8c11cc6 100644 (file)
--- a/res/kaz-KZ.xml
+++ b/res/kaz-KZ.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Wi-Fi кіру нүктесіндегі WPS пернесін 2 минут ішінде басыңыз</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Зау. мән. қал. келтірілді</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Жетістік</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Ену нүктесінің адресі</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Бұл желіге автоматты қосылу өшіріледі. Жалғастыру керек пе?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Көрсетілген мерзімге дейін жарамды:\n</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Қосылған құрылғылар</text>
+    <text id="IDS_ST_BODY_TOTAL">Барлығы</text>
     <text id="IDS_ST_BODY_24_HOURS">24 сағат</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Ірі</text>
     <text id="IDS_ST_BODY_FONT">Қаріп</text>
     <text id="IDS_COM_BODY_12_HOURS">12 сағат</text>
+    <text id="IDS_ST_BODY_DATA">Деректер</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Канада</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Пернетақта</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Автоматты жаңарту</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Іздеу</text>
     <text id="IDS_COM_POP_ACTIVATING">Қосу...</text>
     <text id="IDS_ST_BODY_ON">Қосылған</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Сыртқы куәліктер</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Дыбыстар</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Экран режимі</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Қосылды</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Қосымша мәліметтер</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Деректер роумингі</text>
     <text id="IDS_COM_BODY_RINGTONES">Әуендер</text>
     <text id="IDS_ST_BODY_ISSUER">Беруші</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Күні және уақыты</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Экран қауіпсіздігі</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Күшпен тоқтату</text>
     <text id="IDS_ST_BODY_VOLUME">Дауыстың күші</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD картасын салу</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Қате кілтсөз</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Бас әріптерді автоматты қолдану</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Сериялық номері</text>
     <text id="IDS_ST_BODY_PASSWORD">Кілтсөз</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Әдепкі мәндерін өшіру</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA Сертификаты</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Порт прокси</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">SSID нөмірін енгізу</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD карта</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Бұл бағдарлама кейбір әрекеттерді әдепкі мәні бойынша ашуға қойылған</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB жөндеу</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Қол жетімді бос орын</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Арнайы мүмкіндіктер параметрлерінде қаріп өлшемі өзгертілгенде әр қолданбадағы қаріп өлшемінен басым болады</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Ауа райы</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Іздеу нәтижелері жоқ</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Желі орны</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Жиі пайдаланылатын</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Филиппин</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Тоқтату</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct құрылғылары</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Әзірлеуші параметрлері</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Қосымша ақпараты</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Автоматты түрде</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Экран құлыптау дыбысы</text>
     <text id="IDS_BT_BODY_PAIRED">Жұпталған</text>

diff --git a/res/kor-KR.xml b/res/kor-KR.xml
index c2fe25e..34598f8 100644 (file)
--- a/res/kor-KR.xml
+++ b/res/kor-KR.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Wi-Fi 액세스 포인트에서 WPS 버튼을 2분 안에 누르세요</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">기본값 데이터 재설정</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">완료되었습니다</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">게이트웨이 주소</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">이 네트워크로 자동 연결이 해제됩니다. 계속할까요?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">유효기간 만료일:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">연결된 기기</text>
+    <text id="IDS_ST_BODY_TOTAL">전체</text>
     <text id="IDS_ST_BODY_24_HOURS">24시간</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">아주 크게</text>
     <text id="IDS_ST_BODY_FONT">서체</text>
     <text id="IDS_COM_BODY_12_HOURS">12시간</text>
+    <text id="IDS_ST_BODY_DATA">데이터</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS1</text>
     <text id="IDS_WCL_BODY_CANADA">캐나다</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">키보드</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">자동 업데이트</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">검색</text>
     <text id="IDS_COM_POP_ACTIVATING">실행 중...</text>
     <text id="IDS_ST_BODY_ON">켜기</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">외부 인증서</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">사운드</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">화면 모드</text>
     <text id="IDS_WIFI_BODY_CONNECTED">연결되었습니다</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">자세히 보기</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">데이터 로밍</text>
     <text id="IDS_COM_BODY_RINGTONES">벨소리</text>
     <text id="IDS_ST_BODY_ISSUER">발행자</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">날짜 및 시간</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">화면 보안</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">강제 중지</text>
     <text id="IDS_ST_BODY_VOLUME">음량</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD 카드 마운트</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">비밀번호가 바르지 않습니다</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">자동 대문자 입력</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">시리얼 번호</text>
     <text id="IDS_ST_BODY_PASSWORD">비밀번호</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">기본 정보 지우기</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA 인증서</text>
     <text id="IDS_ST_BODY_PROXY_PORT">프록시 포트</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">SSID를 입력하세요</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD 카드</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">이 애플리케이션은 일부 동작에 대해 기본적으로 실행되도록 설정되어 있습니다</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB 디버깅</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">사용할 수 있는 공간</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">접근성 설정에서 글자 크기를 변경하면 각 애플리케이션의 글자 크기가 해당 글자 크기로 변경됩니다</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">날씨</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">검색 결과가 없습니다</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">네트워크를 이용한 위치찾기</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">자주 사용</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">필리핀</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">취소</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct 기기</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">개발자 옵션</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">애플리케이션 정보</text>
     <text id="IDS_ST_BODY_AUTOMATIC">자동</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">화면 잠금 소리</text>
     <text id="IDS_BT_BODY_PAIRED">등록됨</text>

diff --git a/res/lav-LV.xml b/res/lav-LV.xml
index 221209d..29ac93c 100644 (file)
--- a/res/lav-LV.xml
+++ b/res/lav-LV.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">2 minūšu laikā Wi-Fi piekļuves punktā nospiediet WPS</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Rūpnīcas iestat. atjaun.</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Veiksmīgi</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Vārtejas adrese</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automātiskais savienojums ar šo tīklu tiks deaktivizēts. Vai turpināt?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Derīgs līdz:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Pievienotās ierīces</text>
+    <text id="IDS_ST_BODY_TOTAL">Kopā</text>
     <text id="IDS_ST_BODY_24_HOURS">24 stundas</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Ļoti liels</text>
     <text id="IDS_ST_BODY_FONT">Fonts</text>
     <text id="IDS_COM_BODY_12_HOURS">12 stundas</text>
+    <text id="IDS_ST_BODY_DATA">Dati</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanāda</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tastatūra</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automātiska atjaunināšana</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Meklēt</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktivizē...</text>
     <text id="IDS_ST_BODY_ON">Ieslēgt</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Ārējie sertifikāti</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Skaņas</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Ekrāna režīms</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Savienots</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Papildinformācija</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Datu viesabonēšana</text>
     <text id="IDS_COM_BODY_RINGTONES">Zvana signāli</text>
     <text id="IDS_ST_BODY_ISSUER">Izdevējs</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Datums un laiks</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Ekrāna drošība</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Piespiedu apturēšana</text>
     <text id="IDS_ST_BODY_VOLUME">Skaļums</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD-kartes ievietošana</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Nepareiza parole</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automātiska lielo burtu aktivizēšana</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Sērijas numurs</text>
     <text id="IDS_ST_BODY_PASSWORD">Parole</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Notīrīt noklusējumus</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA sertifikāts</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Starpniekservera ports</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Ievadiet SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD karte</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Dažām darbībām ir iestatīts, ka šī programma tiek atvērta pēc noklusējuma</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB atkļūdošana</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Pieejamā vieta</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Mainot fonta lielumu pieejamības iestatījumos, šis fonta lielums tiks izmantots visās programmās</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Laiks</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Nav meklēšanas rezultātu</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Tīkla atrašanās vieta</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Bieži lietotie</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipīnas</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Atcelt</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct ierīces</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Izstrādātāja iespējas</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informācija par programmu</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automātiski</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Ekrāna bloķēšanas skaņa</text>
     <text id="IDS_BT_BODY_PAIRED">Sapārots</text>

diff --git a/res/lit-LT.xml b/res/lit-LT.xml
index 5dc1d7f..d8d32b1 100644 (file)
--- a/res/lit-LT.xml
+++ b/res/lit-LT.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Per 2 min. paspauskite WPS mygtuką „Wi-Fi“ prieigos taške</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Gamyk. nustat. atkūrimas</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Pavyko</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Šliuzo adresas</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatinis jungimasis prie šio tinklo bus išjungtas. Tęsti?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Galioja iki:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Prijungti įrenginiai</text>
+    <text id="IDS_ST_BODY_TOTAL">Iš viso</text>
     <text id="IDS_ST_BODY_24_HOURS">24 valandų</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Milžiniškas</text>
     <text id="IDS_ST_BODY_FONT">Šriftas</text>
     <text id="IDS_COM_BODY_12_HOURS">12 valandų</text>
+    <text id="IDS_ST_BODY_DATA">Duomenys</text>
     <text id="IDS_WIFI_BODY_DNS_2">2 DNS</text>
     <text id="IDS_WIFI_BODY_DNS_1">1 DNS</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Klaviatūra</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatinis naujinimas</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Ieškoti</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktyvinama...</text>
     <text id="IDS_ST_BODY_ON">Įjungta</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Išoriniai sertifikatai</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Garsai</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Ekrano režimas</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Prisijungta</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Daugiau informacijos</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Tarptinklinis duomenų siuntimas</text>
     <text id="IDS_COM_BODY_RINGTONES">Skambėjimo tonai</text>
     <text id="IDS_ST_BODY_ISSUER">Leidėjas</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Data ir laikas</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Ekrano apsauga</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Priverst. sustabdyti</text>
     <text id="IDS_ST_BODY_VOLUME">Garsumas</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Įdėkite SD kortelę</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Neteisingas slaptažodis</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automatinis rašymas iš didžiosios raidės</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serijos numeris</text>
     <text id="IDS_ST_BODY_PASSWORD">Slaptažodis</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Valyti numatytuosius</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA sertifikatas</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy prievadas</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Įvesti SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD kortelė</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Pagal numatytuosius nustatymus dėl kai kurių veiksmų ši programa nustatyta atsidaryti</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB derinimas</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Laisvos vietos</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Pakeitus šrifto dydį pasiekiamumo nustatymuose bus pakeistas kiekvienos programos šrifto dydis</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Oras</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Nėra paieškos rezultatų</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Tinklo padėtis</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Dažnai naudojami</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipinai</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Atšaukti</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">„Wi-Fi Direct“ įrenginiai</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Kūrėjų parinktys</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Programos informacija</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatinis</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Ekrano užrakto garsas</text>
     <text id="IDS_BT_BODY_PAIRED">Susieta</text>

diff --git a/res/mkd-MK.xml b/res/mkd-MK.xml
index 564c77e..26988f4 100644 (file)
--- a/res/mkd-MK.xml
+++ b/res/mkd-MK.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Притиснете WPS на пристапната точка за Wi-Fi во рок од 2 минути</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Фабричко ресетирање</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Успешно</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Адреса на порта</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Автоматското поврзување со оваа мрежа ќе се исклучи. Продолжи?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Важи до:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Поврзани уреди</text>
+    <text id="IDS_ST_BODY_TOTAL">Вкупно</text>
     <text id="IDS_ST_BODY_24_HOURS">24-часовен</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Огромен</text>
     <text id="IDS_ST_BODY_FONT">Фонт</text>
     <text id="IDS_COM_BODY_12_HOURS">12 часа</text>
+    <text id="IDS_ST_BODY_DATA">Податоци</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Канада</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Тастатура</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Автоматско ажурирање</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Пребарување</text>
     <text id="IDS_COM_POP_ACTIVATING">Се активира...</text>
     <text id="IDS_ST_BODY_ON">Вклучено</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Надворешни сертификати</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Звуци</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Екрански режим</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Поврзано</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Повеќе детали</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Роаминг за податоци</text>
     <text id="IDS_COM_BODY_RINGTONES">Тонови на ѕвонење</text>
     <text id="IDS_ST_BODY_ISSUER">Издавач</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Датум и време</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Безбедност на екранот</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Принудно запирање</text>
     <text id="IDS_ST_BODY_VOLUME">Јачина на тон</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Монтирај SD-картичка</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Погрешна лозинка</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Автоматска прва голема буква</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Сериски број</text>
     <text id="IDS_ST_BODY_PASSWORD">Лозинка</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Избриши основни</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA сертификат</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Порт за прокси</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Внесете SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-карт.</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Оваа апликација е поставена да се отвора како основна за некои дејства</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Дебагирање на USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Достапен простор</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Менувањето на големината на фонтот во опциите за достапност ќе ги поништи големините на фонт во секоја апликација</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Време</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Нема резултати од пребарувањето</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Мрежно позиционирање</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Често користени</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Филипини</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Откажи</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Уреди за Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Опции за програмери</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Информации за апликацијата</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Автоматски</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Звук за заклучување на екранот</text>
     <text id="IDS_BT_BODY_PAIRED">Поврзано</text>

diff --git a/res/nld-NL.xml b/res/nld-NL.xml
index 2472ff7..275e36c 100644 (file)
--- a/res/nld-NL.xml
+++ b/res/nld-NL.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Druk binnen 2 minuten op WPS op uw Wi-Fi-toegangspunt</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Fabrieksinst. herstellen</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Voltooid</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Gateway-adres</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatische verbinding met dit netwerk wordt uitgeschakeld. Doorgaan?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Geldig tot:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Verbonden apparaten</text>
+    <text id="IDS_ST_BODY_TOTAL">Totaal</text>
     <text id="IDS_ST_BODY_24_HOURS">24 uur</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Extra groot</text>
     <text id="IDS_ST_BODY_FONT">Lettertype</text>
     <text id="IDS_COM_BODY_12_HOURS">12 uur</text>
+    <text id="IDS_ST_BODY_DATA">Gegevens</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Toetsenbord</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatisch bijwerken</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Zoeken</text>
     <text id="IDS_COM_POP_ACTIVATING">Inschakelen...</text>
     <text id="IDS_ST_BODY_ON">Aan</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Externe certificaten</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Geluiden</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Scherm-modus</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Verbonden</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Meer details</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Beltonen</text>
     <text id="IDS_ST_BODY_ISSUER">Uitgever</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Datum en tijd</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Schermbeveiliging</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Gedwongen stoppen</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD-kaart aanmelden</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Onjuist wachtwoord</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automatisch hoofdletters</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serienummer</text>
     <text id="IDS_ST_BODY_PASSWORD">Wachtwoord</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Standaard-instellingen wissen</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA-certificaat</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Poort proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Geef SSID in</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-kaart</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Deze app wordt standaard geopend bij bepaalde acties</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB-foutopsporing</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Beschikbare ruimte</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Als u de lettergrootte wijzigt in de toegankelijkheidsinstellingen, wordt de lettergrootte in elke applicatie aangepast</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Weer</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Geen zoekresultaten</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Netwerkpositie</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Vaak gebruikt</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipijnen</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Annuleer</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct-apparaten</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Ontwikkelaarsopties</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Applicatie-info</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatisch</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Geluid schermvergrendeling</text>
     <text id="IDS_BT_BODY_PAIRED">Gekoppeld</text>

diff --git a/res/nob-NO.xml b/res/nob-NO.xml
index a9e372b..71eee78 100644 (file)
--- a/res/nob-NO.xml
+++ b/res/nob-NO.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Trykk på WPS på Wi-Fi-tilgangspunktet innen 2 minutter</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Gjennopprett fabrikkinst.</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Fullført</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Gateway-adresse</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatisk tilkobling til dette nettverket vil bli deaktivert. Fortsette?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Gyldig til:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Tilkoblede enheter</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 timer</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Veldig stor</text>
     <text id="IDS_ST_BODY_FONT">Skrifttype</text>
     <text id="IDS_COM_BODY_12_HOURS">12 timer</text>
+    <text id="IDS_ST_BODY_DATA">Data</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tastatur</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatisk oppdatering</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Søk</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktiverer...</text>
     <text id="IDS_ST_BODY_ON">På</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Eksterne sertifikater</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Lyder</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Skjermmodus</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Tilkoblet</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Flere detaljer</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Dataroaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Ringetoner</text>
     <text id="IDS_ST_BODY_ISSUER">Utstedt av</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Dato og tid</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Skjermsikkerhet</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Tving stopp</text>
     <text id="IDS_ST_BODY_VOLUME">Volum</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Sett inn SD-kort</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Feil passord</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automatisk stor forbokstav</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serienummer</text>
     <text id="IDS_ST_BODY_PASSWORD">Passord</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Tøm standarder</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA-sertifikat</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy-port</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Angi SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-kort</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Dette programmet er angitt å åpne som standard for noen handlinger</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB-feilsøking</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Tilgjengelig plass</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Endring av skriftstørrelse i tilgjengelighetsinnstillinger overstyrer skriftstørrelsen i hvert enkelt program</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Vær</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Ingen søkeresultater</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Nettverksposisjon</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Ofte brukt</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filippinene</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Avbryt</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct-enheter</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Utvikleralternativer</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Programinfo</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatisk</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Skjermlåsingslyd</text>
     <text id="IDS_BT_BODY_PAIRED">Paret</text>

diff --git a/res/pol-PL.xml b/res/pol-PL.xml
index f8b4cb9..99324bb 100644 (file)
--- a/res/pol-PL.xml
+++ b/res/pol-PL.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Naciśnij przycisk WPS punktu dostępu do sieci Wi-Fi w ciągu 2 min</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Przywróć ustawien. fabr.</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Zakończono</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Adres bramy</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatyczne połączenie z tą siecią zostanie wyłączone. Kontynuować?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Ważny do:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Podłączone urządzenia</text>
+    <text id="IDS_ST_BODY_TOTAL">Ogółem</text>
     <text id="IDS_ST_BODY_24_HOURS">24 godz.</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Bardzo duży</text>
     <text id="IDS_ST_BODY_FONT">Czcionka</text>
     <text id="IDS_COM_BODY_12_HOURS">12 godz.</text>
+    <text id="IDS_ST_BODY_DATA">Dane</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Klawiatura</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatyczna aktualizacja</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Szukaj</text>
     <text id="IDS_COM_POP_ACTIVATING">Włączanie...</text>
     <text id="IDS_ST_BODY_ON">Wł.</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certyfikaty zewnętrzne</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Dźwięki</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Tryb ekranu</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Połączono</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Więcej szczegółów</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Roaming danych</text>
     <text id="IDS_COM_BODY_RINGTONES">Dzwonki</text>
     <text id="IDS_ST_BODY_ISSUER">Wystawca</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Data i godzina</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Bezpieczeństwo ekranu</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Wymuś zatrzymanie</text>
     <text id="IDS_ST_BODY_VOLUME">Głośność</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Włóż kartę pamięci</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Błędne hasło</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automatyczne wielkie litery</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Numer seryjny</text>
     <text id="IDS_ST_BODY_PASSWORD">Hasło</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Wyczyść ustawienia domyślne</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certyfikat CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Port serwera proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Podaj numer SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Karta pamięci</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Wybrano domyślne uruchamianie tej aplikacji w przypadku niektórych operacji</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Debugowanie USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Dostępne miejsce</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Zmiana rozmiaru czcionki w ustawieniach dostępności spowoduje zastąpienie rozmiaru czcionki w każdej aplikacji</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Pogoda</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Brak wyników wyszukiwania</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Stacje bazowe</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Często używane</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipiny</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Anuluj</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Urządzenia Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opcje programisty</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informacje o aplikacji</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatyczny</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Dźwięki blokowania ekranu</text>
     <text id="IDS_BT_BODY_PAIRED">Powiązano</text>

diff --git a/res/por-BR.xml b/res/por-BR.xml
index 28c4eba..033696a 100644 (file)
--- a/res/por-BR.xml
+++ b/res/por-BR.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Pressione o botão WPS em seu ponto de acesso Wi-Fi dentro de 2 minutos</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Restaurar p/padrão fábr.</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Sucesso</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Endereço do gateway</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">A conexão automática a esta rede será desativada. Continuar?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Válido até:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Dispositivos conectados</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 horas</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Enorme</text>
     <text id="IDS_ST_BODY_FONT">Fonte</text>
     <text id="IDS_COM_BODY_12_HOURS">12 horas</text>
+    <text id="IDS_ST_BODY_DATA">Dados</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canadá</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Teclado</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Atualização automática</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Pesquisar</text>
     <text id="IDS_COM_POP_ACTIVATING">Ativando…</text>
     <text id="IDS_ST_BODY_ON">Ativado</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificados externos</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Tons</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Modo de tela</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Conectado</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Mais detalhes</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Dados em roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Toques</text>
     <text id="IDS_ST_BODY_ISSUER">Emissor</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Data e Hora</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Segurança da tela</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Forçar parada</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Inserir o cartão SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Senha incorreta</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Maiúscula e Minúscula automática</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Número de série</text>
     <text id="IDS_ST_BODY_PASSWORD">Senha</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Limpar padrões</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificado de CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Porta do proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Inserir SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Cartão SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Este aplicativo está configurado para se abrir por padrão para algumas ações</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Depuração de USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Espaço disponível</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">A alteração do tamanho da fonte nas configurações de acessibilidade substituirá o tamanho da fonte de cada aplicativo</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Clima</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Nenhum resultado encontrado</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Posição da rede</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Usado com frequência</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipinas</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cancelar</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Dispositivos Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opções do desenvolvedor</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informações da aplicação</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automático</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Som de bloqueio de tela</text>
     <text id="IDS_BT_BODY_PAIRED">Pareado</text>

diff --git a/res/por-PT.xml b/res/por-PT.xml
index 3f24d0b..202ffeb 100644 (file)
--- a/res/por-PT.xml
+++ b/res/por-PT.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Prima WPS no seu ponto de acesso Wi-Fi dentro de 2 minutos</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Reposição de fábrica</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Concluído</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Endereço de gateway</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">A ligação automática a esta rede será desactivada. Continuar?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Válido até:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Dispositivos ligados</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 horas</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Muito grande</text>
     <text id="IDS_ST_BODY_FONT">Fonte</text>
     <text id="IDS_COM_BODY_12_HOURS">12 horas</text>
+    <text id="IDS_ST_BODY_DATA">Dados</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canadá</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Teclado</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Actualização automática</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Procurar</text>
     <text id="IDS_COM_POP_ACTIVATING">A activar...</text>
     <text id="IDS_ST_BODY_ON">Ligar</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificados externos</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sons</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Modo de ecrã</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Ligado</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Mais detalhes</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Dados em roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Tons de toque</text>
     <text id="IDS_ST_BODY_ISSUER">Emissor</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Data e hora</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Segurança de ecrã</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Forçar paragem</text>
     <text id="IDS_ST_BODY_VOLUME">Volume</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Montar cartão SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Palavra-passe incorrecta</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Capitalização automática</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Número de série</text>
     <text id="IDS_ST_BODY_PASSWORD">Palavra-passe</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Limpar predefinições</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificado de CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Porta de proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Introduzir SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Cartão SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Esta aplicação está definida para ser aberta por predefinição por algumas acções</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Depuração de USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Espaço disponível</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">A alteração do tamanho da fonte nas definições de acessibilidade irá substituir o tamanho da fonte em cada aplicação</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Tempo</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Nenhuns resultados de procura</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Posição da rede</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Frequentemente utilizados</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipinas</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cancelar</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Dispositivos Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opções de programador</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informações da aplicação</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automático</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Som de bloqueio do ecrã</text>
     <text id="IDS_BT_BODY_PAIRED">Emparelhado</text>

diff --git a/res/ron-RO.xml b/res/ron-RO.xml
index c859a6f..36b373a 100644 (file)
--- a/res/ron-RO.xml
+++ b/res/ron-RO.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Apăsaţi pe WPS pe punctul de acces Wi-Fi în interval de 2 minute</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Reset. la val. din fabr.</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Succes</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Adresă gateway</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Va fi dezactivată conectarea automată la această reţea. Continuaţi?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Valid pentru:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Dispozitive conectate</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 ore</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Foarte mare</text>
     <text id="IDS_ST_BODY_FONT">Font</text>
     <text id="IDS_COM_BODY_12_HOURS">12 ore</text>
+    <text id="IDS_ST_BODY_DATA">Date</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS1</text>
     <text id="IDS_WCL_BODY_CANADA">Canada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tastatură</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Actualizare automată</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Căutare</text>
     <text id="IDS_COM_POP_ACTIVATING">Se activează...</text>
     <text id="IDS_ST_BODY_ON">Pornit</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificate externe</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sunete</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Mod ecran</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Conectat</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Mai multe detalii</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Roaming date</text>
     <text id="IDS_COM_BODY_RINGTONES">Tonuri sonerie</text>
     <text id="IDS_ST_BODY_ISSUER">Emitent</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Dată şi oră</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Securitate ecran</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Oprire forţată</text>
     <text id="IDS_ST_BODY_VOLUME">Volum</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Fixare cartelă SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Parolă incorectă</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Majusculă automată</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Număr serie</text>
     <text id="IDS_ST_BODY_PASSWORD">Parolă</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Ştergere valori implicite</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificat CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Port proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Introducere SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Cartelă SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Această aplicaţie este setată să se deschidă în mod implicit pentru anumite acţiuni</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Depanare USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Spaţiu disponibil</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Modificarea dimensiunii fontului în setările de accesibilitate va înlocui dimensiunea fontului din fiecare aplicaţie</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Vreme</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Nu există rezultate ale căutării</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Poziţie în reţea</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Utilizate frecvent</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipine</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Anulare</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Dispozitive cu Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opţiuni dezvoltator</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informaţii aplicaţie</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automat</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Sunet blocare ecran</text>
     <text id="IDS_BT_BODY_PAIRED">Asociat</text>

diff --git a/res/rus-RU.xml b/res/rus-RU.xml
index 87be775..2c379a9 100644 (file)
--- a/res/rus-RU.xml
+++ b/res/rus-RU.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Нажмите кнопку WPS на точке доступа Wi-Fi в течение 2 мин</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Полный сброс</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Успешно</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Адрес шлюза</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Автоматическое подключение к этой сети будет отключено. Продолжить?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Действителен для:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Подключенные устройства</text>
+    <text id="IDS_ST_BODY_TOTAL">Всего</text>
     <text id="IDS_ST_BODY_24_HOURS">24 часов</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Огромный</text>
     <text id="IDS_ST_BODY_FONT">Шрифт</text>
     <text id="IDS_COM_BODY_12_HOURS">12 часов</text>
+    <text id="IDS_ST_BODY_DATA">Данные</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Канада</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Клавиатура</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Автообновление</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Поиск</text>
     <text id="IDS_COM_POP_ACTIVATING">Включение...</text>
     <text id="IDS_ST_BODY_ON">Включено</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Внешние сертификаты</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Звуки</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Режим экрана</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Подключено</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Дополнительно</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Данные в роуминге</text>
     <text id="IDS_COM_BODY_RINGTONES">Мелодии звонка</text>
     <text id="IDS_ST_BODY_ISSUER">Выдан</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Дата и время</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Безопасность</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Принудит. остановить</text>
     <text id="IDS_ST_BODY_VOLUME">Громкость</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Подключить карту памяти</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Неправильный пароль</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Заглавные буквы</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Серийный номер</text>
     <text id="IDS_ST_BODY_PASSWORD">Пароль</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Сбросить настройки по умолчанию</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Сертификат</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Порт прокси</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Введите SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Карта памяти</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Это приложение по умолчанию открывается для некоторых действий</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Отладка USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Доступное место</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Размер шрифта, выбранный в параметрах специальных возможностей, будет использоваться во всех приложениях</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Погода</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Нет результатов поиска</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Сеть оператора</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Часто используемые</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Филиппины</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Отмена</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Устройства Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Параметры разработчика</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Сведения о приложении</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Автоматически</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Звук блокировки экрана</text>
     <text id="IDS_BT_BODY_PAIRED">Авторизовано</text>

diff --git a/res/screen-density-xhigh/A01-1_Vibration_bar.png b/res/screen-density-xhigh/A01-1_Vibration_bar.png
new file mode 100644 (file)
index 0000000..57d87c2
Binary files /dev/null and b/res/screen-density-xhigh/A01-1_Vibration_bar.png differ

diff --git a/res/screen-density-xhigh/T01_main_folder_bg.png b/res/screen-density-xhigh/T01_main_folder_bg.png
new file mode 100644 (file)
index 0000000..16d1d59
Binary files /dev/null and b/res/screen-density-xhigh/T01_main_folder_bg.png differ

diff --git a/res/slk-SK.xml b/res/slk-SK.xml
index 1aed8f6..3f6fe48 100644 (file)
--- a/res/slk-SK.xml
+++ b/res/slk-SK.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Do 2 minút stlačte tlačidlo WPS na prístupovom bode Wi-Fi</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Obnoviť nast. od výrobcu</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Dokončené</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Adresa brány</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatické pripojenie na túto sieť bude zakázané. Pokračovať?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Platnosť do:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Pripojené zariadenia</text>
+    <text id="IDS_ST_BODY_TOTAL">Celkom</text>
     <text id="IDS_ST_BODY_24_HOURS">24 hodín</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Veľmi veľké</text>
     <text id="IDS_ST_BODY_FONT">Písmo</text>
     <text id="IDS_COM_BODY_12_HOURS">12 hodín</text>
+    <text id="IDS_ST_BODY_DATA">Dáta</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Klávesnica</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatická aktualizácia</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Hľadať</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktivácia...</text>
     <text id="IDS_ST_BODY_ON">Zap.</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Externé certifikáty</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Zvuky</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Režim obrazovky</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Pripojené</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Ďalšie podrobnosti</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Dátový roaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Zvonenia</text>
     <text id="IDS_ST_BODY_ISSUER">Vydavateľ</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Dátum a čas</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Zabezpečenie obrazovky</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Vynútiť zastavenie</text>
     <text id="IDS_ST_BODY_VOLUME">Hlasitosť</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Pripojiť kartu SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Nesprávne heslo</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automatická kapitalizácia</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Sériové číslo</text>
     <text id="IDS_ST_BODY_PASSWORD">Heslo</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Vymazať predvolené</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certifikát certifikačného úradu</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Port proxy servera</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Zadajte SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Karta SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Táto aplikácia je nastavená na predvolené otvorenie pre niektoré akcie</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Ladenie zariadenia USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Dostupné miesto</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Zmena veľkosti písma v nastaveniach zjednodušenia ovládania má vyššiu prioritu než veľkosť písma nastavená v jednotlivých aplikáciách</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Počasie</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Žiadne výsledky vyhľadávania</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Sieťová poloha</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Často používané</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipíny</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Zrušiť</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Zariadenia Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Vývojárske možnosti</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informácie o aplikácii</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automaticky</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Zvuk zamknutia obrazovky</text>
     <text id="IDS_BT_BODY_PAIRED">Spárované</text>

diff --git a/res/slv-SI.xml b/res/slv-SI.xml
index b001970..5e36146 100644 (file)
--- a/res/slv-SI.xml
+++ b/res/slv-SI.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Pritisnite WPS na dostopni točki Wi-Fi v 2 minutah</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Tovarniška ponastavitev</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Uspeh</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Naslov prehoda</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Samodejna povezava v to omrežje bo onemogočena. Nadaljujem?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Veljavno do:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Povezane naprave</text>
+    <text id="IDS_ST_BODY_TOTAL">Skupaj</text>
     <text id="IDS_ST_BODY_24_HOURS">24 ur</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Zelo velika</text>
     <text id="IDS_ST_BODY_FONT">Pisava</text>
     <text id="IDS_COM_BODY_12_HOURS">12 ur</text>
+    <text id="IDS_ST_BODY_DATA">Podatki</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tipkovnica</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Samodejna posodobitev</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Iskanje</text>
     <text id="IDS_COM_POP_ACTIVATING">Vključujem...</text>
     <text id="IDS_ST_BODY_ON">Vključeno</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Zunanji certifikati</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Zvoki</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Način zaslona</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Povezano</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Več podrobnosti</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Podatkovno gostovanje</text>
     <text id="IDS_COM_BODY_RINGTONES">Zvonjenja</text>
     <text id="IDS_ST_BODY_ISSUER">Izdajatelj</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Datum in čas</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Varnost zaslona</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Vsili ustavitev</text>
     <text id="IDS_ST_BODY_VOLUME">Glasnost</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Vpni kartico SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Napačno geslo</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Samodejno pisanje z veliko začetnico</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serijska številka</text>
     <text id="IDS_ST_BODY_PASSWORD">Geslo</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Počisti privzeto</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certifikat CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Vrata strežnika proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Vnesite SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Kartica SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Ta program je nastavljen, da se privzeto odpre za nekatera dejanja</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Razhroščevanje USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Razpoložljiv prostor</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Če spremenite velikost pisave v nastavitvah dostopnosti, se bo prepisala velikost pisave v vsakem programu</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Vreme</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Ni rezultatov iskanja</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Položaj določen z omrežjem</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Pogosto uporabljeno</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipini</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Prekliči</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Naprave Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Možnosti za razvijalce</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informacije o aplikaciji</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Samodejno</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Zvok za zaklepanja zaslona</text>
     <text id="IDS_BT_BODY_PAIRED">Seznanjeno</text>

diff --git a/res/spa-ES.xml b/res/spa-ES.xml
index 6bfb14b..39cc836 100644 (file)
--- a/res/spa-ES.xml
+++ b/res/spa-ES.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Pulse WPS en su punto de acceso Wi-Fi en un tiempo estimado de 2 minutos</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Restab. de fábrica</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Finalizado</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Dirección de puerta de enlace</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">La conexión automática a esta red se desactivará. ¿Continuar?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Válido hasta:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Dispositivos conectados</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 horas</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Enorme</text>
     <text id="IDS_ST_BODY_FONT">Fuente</text>
     <text id="IDS_COM_BODY_12_HOURS">12 horas</text>
+    <text id="IDS_ST_BODY_DATA">Datos</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canadá</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Teclado</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Actualización auto.</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Buscar</text>
     <text id="IDS_COM_POP_ACTIVATING">Activando...</text>
     <text id="IDS_ST_BODY_ON">Activar</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificados externos</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sonidos</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Modo de pantalla</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Conectado</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Más detalles</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Itinerancia de datos</text>
     <text id="IDS_COM_BODY_RINGTONES">Melodías</text>
     <text id="IDS_ST_BODY_ISSUER">Emisor</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Fecha y hora</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Seguridad de pantalla</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Forzar detención</text>
     <text id="IDS_ST_BODY_VOLUME">Volumen</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Insertar tarjeta SD</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Contraseña incorrecta</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Uso de mayúsculas automático</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Número de serie</text>
     <text id="IDS_ST_BODY_PASSWORD">Contraseña</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Borrar valores predeterminados</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificado CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Puerto Proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Introducir SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Tarjeta SD</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Esta aplicación está definida para abrirse de forma predeterminada para algunas acciones</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Depuración de USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Espacio disponible</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Si cambia el tamaño de fuente en ajustes de accesibilidad, anulará el tamaño de fuente de cada aplicación</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Clima</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">No se han encontrado resultados</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Posición de red</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Usados con frecuencia</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipinas</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cancelar</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Dispositivos Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opciones de desarrollador</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Información de aplicación</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automático</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Sonido de bloqueo de pantalla</text>
     <text id="IDS_BT_BODY_PAIRED">Vinculado</text>

diff --git a/res/spa-MX.xml b/res/spa-MX.xml
index 453f4c8..74517c0 100644 (file)
--- a/res/spa-MX.xml
+++ b/res/spa-MX.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Presione WPS en el punto de acceso Wi-Fi en 2 minutos</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Rest. valores de fábrica</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Exitoso</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Dirección de puerta de enlace</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">La conexión automática a esta red se desactivará. ¿Continuar?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Válido hasta:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Dispositivos conectados</text>
+    <text id="IDS_ST_BODY_TOTAL">Total</text>
     <text id="IDS_ST_BODY_24_HOURS">24 horas</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Enorme</text>
     <text id="IDS_ST_BODY_FONT">Fuente</text>
     <text id="IDS_COM_BODY_12_HOURS">12 horas</text>
+    <text id="IDS_ST_BODY_DATA">Datos</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Canadá</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Teclado</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Actualización automática</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Buscar</text>
     <text id="IDS_COM_POP_ACTIVATING">Activando...</text>
     <text id="IDS_ST_BODY_ON">Activado</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Certificados externos</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sonidos</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Modo de pantalla</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Conectado</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Más detalles</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Roaming de datos</text>
     <text id="IDS_COM_BODY_RINGTONES">Tonos de llamada</text>
     <text id="IDS_ST_BODY_ISSUER">Emisor</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Fecha y hora</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Seguridad de la pantalla</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Forzar cierre</text>
     <text id="IDS_ST_BODY_VOLUME">Volumen</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Insertar tarjeta de memoria</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Contraseña incorrecta</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Uso de mayúsculas automático</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Número de serie</text>
     <text id="IDS_ST_BODY_PASSWORD">Contraseña</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Eliminar valores predeterminados</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Certificado de CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Puerto proxy</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Introducir SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">Tarjeta de memoria</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Esta aplicación está configurada para abrirse de manera predeterminada para algunas acciones</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Depuración de USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Espacio disponible</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Cambiar el tamaño de la fuente en las configuraciones de accesibilidad sobrescribirá el tamaño de las fuentes de todas las aplicaciones</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Clima</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">No se han encontrado resultados</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Posición de red</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Usados con frecuencia</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipinas</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Cancelar</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Dispositivos Wi-Fi Directo</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opciones de desarrollador</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Información de aplicación</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automático</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Sonido de bloqueo de pantalla</text>
     <text id="IDS_BT_BODY_PAIRED">Vinculado</text>

diff --git a/res/srp-RS.xml b/res/srp-RS.xml
index 4283c39..4bc5a83 100644 (file)
--- a/res/srp-RS.xml
+++ b/res/srp-RS.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Pritisni WPS dugme na Wi-Fi pristupnoj tački u roku od 2 minuta</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Fabričko resetovanje</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Uspeh</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Adresa mrežnog prolaza</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatsko priključivanje na ovu mrežu će biti onemogućeno. Nastavak?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Važi do:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Povezani uređaji</text>
+    <text id="IDS_ST_BODY_TOTAL">Ukupno</text>
     <text id="IDS_ST_BODY_24_HOURS">24 sata</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Ogroman</text>
     <text id="IDS_ST_BODY_FONT">Font</text>
     <text id="IDS_COM_BODY_12_HOURS">12 sati</text>
+    <text id="IDS_ST_BODY_DATA">Podaci</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tastatura</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatsko ažuriranje</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Pretraži</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktiviranje...</text>
     <text id="IDS_ST_BODY_ON">Uključeno</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Eksterni sertifikati</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Zvuci</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Režim ekrana</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Povezan</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Više informacija</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Slanje podataka u romingu</text>
     <text id="IDS_COM_BODY_RINGTONES">Tonovi zvona</text>
     <text id="IDS_ST_BODY_ISSUER">Izdavač</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Datum i vreme</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Bezbednost ekrana</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Prinudno zaustavi</text>
     <text id="IDS_ST_BODY_VOLUME">Glasnoća</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Uključi SD karticu</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Pogrešna šifra</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Automatska velika slova</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serijski broj</text>
     <text id="IDS_ST_BODY_PASSWORD">Šifra</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Obriši podrazumevane vrednosti</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA sertifikat</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Port proksija</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Unesi SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD kart.</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Podešeno je da se ova aplikacija podrazumevano otvara za neke radnje</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Otkrivanje greške putem USB-a</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Dostupan prostor</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Promena veličine fonta u okviru podešavanja pristupačnosti će potisnuti veličinu fonta u svakoj aplikaciji</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Vreme</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Nema rezultata pretrage</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Mrežno pozicioniranje</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Često korišćeno</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipini</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Poništi</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct uređaji</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Opcije razvojnog tima</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Informacije o aplikaciji</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatski</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Zvuci zaključavanja ekrana</text>
     <text id="IDS_BT_BODY_PAIRED">Upareno</text>

diff --git a/res/swe-SE.xml b/res/swe-SE.xml
index e20e61d..d1889a5 100644 (file)
--- a/res/swe-SE.xml
+++ b/res/swe-SE.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Tryck på WPS på Wi-Fi-åtkomstpunkten inom 2 minuter</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Fabriksåterställning</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Slutfört</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Gateway-adress</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Automatisk anslutning till det här nätverket avaktiveras. Fortsätta?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Giltig för:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Anslutna enheter</text>
+    <text id="IDS_ST_BODY_TOTAL">Totalt</text>
     <text id="IDS_ST_BODY_24_HOURS">24 timmar</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Mycket stor</text>
     <text id="IDS_ST_BODY_FONT">Tecken</text>
     <text id="IDS_COM_BODY_12_HOURS">12 timmar</text>
+    <text id="IDS_ST_BODY_DATA">Data</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Tangentbord</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Automatisk uppdatering</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Sök</text>
     <text id="IDS_COM_POP_ACTIVATING">Aktiverar...</text>
     <text id="IDS_ST_BODY_ON">På</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Externa certifikat</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Ljud</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Skärmläge</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Ansluten</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Mer information</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Dataroaming</text>
     <text id="IDS_COM_BODY_RINGTONES">Ringsignaler</text>
     <text id="IDS_ST_BODY_ISSUER">Utfärdare</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Datum och tid</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Skärmsäkerhet</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Tvinga stopp</text>
     <text id="IDS_ST_BODY_VOLUME">Volym</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Montera SD-kort</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Fel lösenord</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Stor bokstav automatiskt</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Serienummer</text>
     <text id="IDS_ST_BODY_PASSWORD">Lösenord</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Rensa standard</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA-certifikat</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxyport</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Ange SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-kort</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Du har valt att starta detta program som standard för vissa åtgärder</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB-felsökning</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Tillgängligt utrymme</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Om du ändrar teckenstorlek i inställningarna för åtkomst så åsidosätter det teckenstorleken i alla program</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Väder</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Inga sökresultat</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Nätverksposition</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Ofta använda</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filippinerna</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Avbryt</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct-enheter</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Utvecklaralternativ</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Programinfo</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Automatisk</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Ljud för skärmlås</text>
     <text id="IDS_BT_BODY_PAIRED">Sammankopplat</text>

diff --git a/res/tur-TR.xml b/res/tur-TR.xml
index d633b67..dc9b7d5 100644 (file)
--- a/res/tur-TR.xml
+++ b/res/tur-TR.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">2 dakika içinde Wi-Fi erişim noktanızdaki WPS düğmesine basın</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Fabrika sıfırlaması</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Başarılı</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Ağ geçidi adresi</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Bu ağa otomatik bağlantı devre dışı bırakılacak. Devam edilsin mi?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Son geçerlilik tarihi:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Bağlı cihazlar</text>
+    <text id="IDS_ST_BODY_TOTAL">Toplam</text>
     <text id="IDS_ST_BODY_24_HOURS">24 saat</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Çok büyük</text>
     <text id="IDS_ST_BODY_FONT">Yazı tipi</text>
     <text id="IDS_COM_BODY_12_HOURS">12 saat</text>
+    <text id="IDS_ST_BODY_DATA">Data</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Klavye</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Otomatik güncelleştirme</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Buluyor</text>
     <text id="IDS_COM_POP_ACTIVATING">Etkinleştiriliyor…</text>
     <text id="IDS_ST_BODY_ON">Açık</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Harici sertifikalar</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Sesler</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Ekran modu</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Bağlantı kuruldu</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Daha fazla ayrıntı</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Veri dolaşımı</text>
     <text id="IDS_COM_BODY_RINGTONES">Zil sesleri</text>
     <text id="IDS_ST_BODY_ISSUER"> Veren</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Tarih ve saat</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Ekran güvenliği</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Durmaya zorla</text>
     <text id="IDS_ST_BODY_VOLUME">Ses seviyesi</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD kartı takın</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Yanlış şifre</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Otomatik büyük harf yapma</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER"> Seri numarası</text>
     <text id="IDS_ST_BODY_PASSWORD">Şifre</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Varsayılanları sil</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA Sertifika</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proxy portu</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">SSID girin</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD kart</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Bu uygulama bazı eylemler için varsayılan olarak açılmaya ayarlanmış</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB hata ayıklama</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Kullanılabilir alan</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Erişebilirlik ayarlarında yazı tipi boyutunun değiştirilmesi, her bir uygulamada yazı tipi boyutunu geçersiz kılacaktır</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Hava</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Hiç arama sonucu bulunamadı</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Ağ konumu</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Sık kullanılanlar</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filipinler</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">İptal</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct cihazları</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Geliştirici seçenekleri</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Uygulama bilgisi</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Otomatik</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Ekran kilidi sesi</text>
     <text id="IDS_BT_BODY_PAIRED">Eşleştirildi</text>

diff --git a/res/ukr-UA.xml b/res/ukr-UA.xml
index 9c2e478..5bca831 100644 (file)
--- a/res/ukr-UA.xml
+++ b/res/ukr-UA.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Натисніть кнопку WPS на точці доступу Wi-Fi протягом 2 хвилин</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Віднов. завод. установок</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Успішно</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Адреса шлюзу</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Автоматичне підключення до цієї мережі буде вимкнено. Продовжити?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Дійсний до:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Підключені пристрої</text>
+    <text id="IDS_ST_BODY_TOTAL">Загалом</text>
     <text id="IDS_ST_BODY_24_HOURS">24 години</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Величезний</text>
     <text id="IDS_ST_BODY_FONT">Шрифт</text>
     <text id="IDS_COM_BODY_12_HOURS">12 годин</text>
+    <text id="IDS_ST_BODY_DATA">Дані</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Канада</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Клавіатура</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Автоматичне оновлення</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Пошук</text>
     <text id="IDS_COM_POP_ACTIVATING">Активація...</text>
     <text id="IDS_ST_BODY_ON">Увімкнено</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Зовнішні сертифікати</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Звуки</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Режим екрана</text>
     <text id="IDS_WIFI_BODY_CONNECTED">З'єднано</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Додаткові деталі</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Передача даних у роумінгу</text>
     <text id="IDS_COM_BODY_RINGTONES">Звуки дзвінка</text>
     <text id="IDS_ST_BODY_ISSUER">Видано</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Дата і час</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Безпека екрана</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Примусово закрити</text>
     <text id="IDS_ST_BODY_VOLUME">Гучність</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">Підключення карти пам’яті</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Хибний пароль</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Автовикористання великих літер</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Серійний номер</text>
     <text id="IDS_ST_BODY_PASSWORD">Пароль</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Очистити стандартні установки</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">Сертифікат CA</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Порт проксі</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">Ввести SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-карта</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Цю програму встановлено як програму за замовчуванням для виконання певних дій</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">Налагодження USB</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Доступне місце</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Зміна розміру шрифтів в установках доступності буде впливати на розмір шрифтів в кожній програмі</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Погода</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Пошук не дав результатів</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Позиціонування через мережу</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Часто використовувані</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Філіппіни</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Скасувати</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Пристрої Wi-Fi Direct</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Опції розробки</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Відомості про програму</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Автоматично</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Звук блокування екрана</text>
     <text id="IDS_BT_BODY_PAIRED">Утворено пару</text>

diff --git a/res/uzb-UZ.xml b/res/uzb-UZ.xml
index 2f2b2ab..c4b4081 100644 (file)
--- a/res/uzb-UZ.xml
+++ b/res/uzb-UZ.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">Wi-Fi kirishda WPSni 2 daqiqa bosib turing</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">Ishlab chiqarilgan parametrlarga qaytarish</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">Muvaffaqiyat</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">Shluz manzili</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">Inglizcha</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">Ushbu tarmoqqa avtomatik ulanish o‘chiriladi. Davom ettirilsinmi?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">Quyidagigacha foydalanish mumkin:</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">Ulangan qurilmalar</text>
+    <text id="IDS_ST_BODY_TOTAL">Jami</text>
     <text id="IDS_ST_BODY_24_HOURS">24 soat</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">Ulkan</text>
     <text id="IDS_ST_BODY_FONT">Shrift</text>
     <text id="IDS_COM_BODY_12_HOURS">12 soat</text>
+    <text id="IDS_ST_BODY_DATA">Ma’lumot</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">Kanada</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">Klaviatura</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">Avtomatik yangilash</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">Qidirish</text>
     <text id="IDS_COM_POP_ACTIVATING">Faollashtirilmoqda...</text>
     <text id="IDS_ST_BODY_ON">Yoq.</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">Tashqi sertifikatlar</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">Ovozlar</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">Ekran rejimi</text>
     <text id="IDS_WIFI_BODY_CONNECTED">Ulangan</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">Ko‘proq tafsilotlar</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">Ma’lumotlar roumingi</text>
     <text id="IDS_COM_BODY_RINGTONES">Ringtonlar</text>
     <text id="IDS_ST_BODY_ISSUER">Emitent</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">Sana va vaqt</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">Ekran xavfsizligi</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">Zo'rlab to'xtashish</text>
     <text id="IDS_ST_BODY_VOLUME">Ovoz Balandliigi</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">SD-kartani montajlash</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">Noto‘g‘ri parol</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">Avt. bosh harflar bilan boshlash</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">Seriya raqami</text>
     <text id="IDS_ST_BODY_PASSWORD">Parol</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">Birlamchi parametrlarni o'chirish</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA sertifikati</text>
     <text id="IDS_ST_BODY_PROXY_PORT">Proksi porti</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">SSID kiriting</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD-karta</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">Ushbu ilova ba'zi amallar uchun birlamchi holatda ochiladigan qilib sozlangan</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB vositalari</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">Bo‘sh maydon</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">Maxsus imkoniyatlar parametrlarida shrift o‘lchamini o‘zgartirish har bir ilovada shrift o‘lchamini oshirib yuboradi</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">Ob-havo</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">Qidirish natijalari yo‘q</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">Tarmoq joylashuvi</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">Ko‘p ishlatiladigan</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">Filippin</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">Bekor q.</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct qurilmalari</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">Ishlab chiqaruvchi opsiyalari</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">Ilova haqida ma’lumot</text>
     <text id="IDS_ST_BODY_AUTOMATIC">Avtomatik</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">Ekran bloki ovozi</text>
     <text id="IDS_BT_BODY_PAIRED">Bog‘langan</text>

diff --git a/res/zho-CN.xml b/res/zho-CN.xml
index 6551943..a783f84 100644 (file)
--- a/res/zho-CN.xml
+++ b/res/zho-CN.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">在 2 分钟内按下您 Wi-Fi 接入点上的 WPS</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">恢复出厂设置</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">成功</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">网关地址</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">自动连接到此网络将被禁用。继续吗？</text>
     <text id="IDS_ST_BODY_VALID_TO_C">有效期：</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">已连接设备</text>
+    <text id="IDS_ST_BODY_TOTAL">全部</text>
     <text id="IDS_ST_BODY_24_HOURS">24 小时</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">超大</text>
     <text id="IDS_ST_BODY_FONT">字体</text>
     <text id="IDS_COM_BODY_12_HOURS">12 小时</text>
+    <text id="IDS_ST_BODY_DATA">数据</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">加拿大</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">键盘</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">自动更新</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">搜索</text>
     <text id="IDS_COM_POP_ACTIVATING">激活中...</text>
     <text id="IDS_ST_BODY_ON">开</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">外部证书</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">声音</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">屏幕模式</text>
     <text id="IDS_WIFI_BODY_CONNECTED">已连接</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">更多详情</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">数据漫游</text>
     <text id="IDS_COM_BODY_RINGTONES">铃声</text>
     <text id="IDS_ST_BODY_ISSUER">发行者</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">日期和时间</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">屏幕安全性</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">强制停止</text>
     <text id="IDS_ST_BODY_VOLUME">音量</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">安装 SD 卡</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">密码错误</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">自动大写</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">序号</text>
     <text id="IDS_ST_BODY_PASSWORD">密码</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">清除默认值</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA 证书</text>
     <text id="IDS_ST_BODY_PROXY_PORT">代理服务器端口</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">输入 SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD 卡</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">法语</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">荷兰语</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">该应用程序设置为由部分动作默认打开</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB调试</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">可用空间</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">更改辅助功能设置中的字体大小将覆盖每个应用程序中的字体大小</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">西班牙语</text>
     <text id="IDS_ST_BODY_WEATHER">天气</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">无搜索结果</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">网络定位</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">常用</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">菲律宾</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">取消</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi直连设备</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">开发者选项</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">应用程序信息</text>
     <text id="IDS_ST_BODY_AUTOMATIC">自动</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">屏幕锁定声音</text>
     <text id="IDS_BT_BODY_PAIRED">已配对</text>

diff --git a/res/zho-HK.xml b/res/zho-HK.xml
index 3618ddf..45a20bb 100644 (file)
--- a/res/zho-HK.xml
+++ b/res/zho-HK.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">請在 2分鐘內按下 Wi-Fi 接入點的 WPS</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">重設至原廠</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">成功</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">網關地址</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">自動連接此網絡將會關閉。繼續嗎?</text>
     <text id="IDS_ST_BODY_VALID_TO_C">有效期至：</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">已連接裝置</text>
+    <text id="IDS_ST_BODY_TOTAL">總計</text>
     <text id="IDS_ST_BODY_24_HOURS">24 小時</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">巨大</text>
     <text id="IDS_ST_BODY_FONT">字型</text>
     <text id="IDS_COM_BODY_12_HOURS">12 小時</text>
+    <text id="IDS_ST_BODY_DATA">數據</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">加拿大</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">鍵盤</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">自動更新</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">搜尋</text>
     <text id="IDS_COM_POP_ACTIVATING">正在啟動...</text>
     <text id="IDS_ST_BODY_ON">開</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">外部證書</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">聲音</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">螢幕模式</text>
     <text id="IDS_WIFI_BODY_CONNECTED">已連接</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">更多詳情</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">數據漫遊</text>
     <text id="IDS_COM_BODY_RINGTONES">鈴聲</text>
     <text id="IDS_ST_BODY_ISSUER">簽發者</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">日期和時間</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">螢幕安全性</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">強制停止</text>
     <text id="IDS_ST_BODY_VOLUME">音量</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">掛載 SD 卡</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">密碼不正確</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">自動大寫</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">序號</text>
     <text id="IDS_ST_BODY_PASSWORD">密碼</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">清除預設值</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA 證書</text>
     <text id="IDS_ST_BODY_PROXY_PORT">代理伺服器端口</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">輸入 SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD 卡</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">此應用程式設定為由部分動作預設開啟</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB 除錯</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">可用空間</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">變更協助工具設定中的字體大小將覆寫每個應用程式中的字體大小</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">天氣</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">無搜尋結果</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">網絡定位</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">經常使用</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">菲律賓</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">取消</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct 裝置</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">開發人員選項</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">應用程式資訊</text>
     <text id="IDS_ST_BODY_AUTOMATIC">自動</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">螢幕鎖定聲音</text>
     <text id="IDS_BT_BODY_PAIRED">已配對</text>

diff --git a/res/zho-SG.xml b/res/zho-SG.xml
index d9d91a5..7ff6c5c 100644 (file)
--- a/res/zho-SG.xml
+++ b/res/zho-SG.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">在 2 分钟内按下您 Wi-Fi 接入点上的 WPS</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">恢复出厂设置</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">成功</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">网关地址</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">自动连接到此网络将被禁用。继续吗？</text>
     <text id="IDS_ST_BODY_VALID_TO_C">有效期：</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">已连接设备</text>
+    <text id="IDS_ST_BODY_TOTAL">总数</text>
     <text id="IDS_ST_BODY_24_HOURS">24小时</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">超大</text>
     <text id="IDS_ST_BODY_FONT">字体</text>
     <text id="IDS_COM_BODY_12_HOURS">12小时</text>
+    <text id="IDS_ST_BODY_DATA">数据通话</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">加拿大</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">键盘</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">自动更新</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">搜寻</text>
     <text id="IDS_COM_POP_ACTIVATING">启动中……</text>
     <text id="IDS_ST_BODY_ON">开</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">外部证书</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">声音</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">屏幕模式</text>
     <text id="IDS_WIFI_BODY_CONNECTED">已连接</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">更多详情</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">数据漫游</text>
     <text id="IDS_COM_BODY_RINGTONES">铃声</text>
     <text id="IDS_ST_BODY_ISSUER">发行人</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">日期和时间</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">屏幕安全性</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">强制停止</text>
     <text id="IDS_ST_BODY_VOLUME">音量</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">安装 SD 卡</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">密码不正确</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">自动大写</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">序号</text>
     <text id="IDS_ST_BODY_PASSWORD">密码</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">清除默认值</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA 证书</text>
     <text id="IDS_ST_BODY_PROXY_PORT">代理服务器端口</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">输入 SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD 卡</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">该应用程序设置为由部分动作默认打开</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB调试</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">可用空间</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">更改无障碍设置中的字体大小将覆盖每个应用程序中的字体大小</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">天气</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">无搜索结果</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">网络定位</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">常用</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">菲律宾</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">取消</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">直接Wi-Fi设备</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">开发者选项</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">应用程序信息</text>
     <text id="IDS_ST_BODY_AUTOMATIC">自动</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">屏幕锁定声音</text>
     <text id="IDS_BT_BODY_PAIRED">已配对</text>

diff --git a/res/zho-TW.xml b/res/zho-TW.xml
index bedba61..38f145a 100644 (file)
--- a/res/zho-TW.xml
+++ b/res/zho-TW.xml
@@ -2,10 +2,11 @@
 <!--
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
-<string_table Bversion="3.0.0.201301291730" Dversion="20120315">
+<string_table Bversion="2.0.0.201302151552" Dversion="20120315">
     <text id="IDS_ST_BODY_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_2_MINUTES">請在 2 分鐘內於 Wi-Fi 按下 WPS 存取點</text>
     <text id="IDS_ST_MBODY_FACTORY_RESET">原廠設定</text>
     <text id="IDS_ST_BODY_WI_FI">Wi-Fi</text>
+    <text id="IDS_COM_POP_SUCCESS">成功</text>
     <text id="IDS_IME_BODY_LANG_HINDI">हिन्दी</text>
     <text id="IDS_WIFI_BODY_GATEWAY_ADDRESS">閘道位址</text>
     <text id="IDS_IME_OPT_LANG_ENGLISH">English</text>
@@ -57,10 +58,12 @@
     <text id="IDS_WIFI_POP_AUTOMATIC_CONNECTION_NETWORK_WILL_DISABLED_CONTINUE_Q_MSG">自動連接到這個網路將被關閉。繼續？</text>
     <text id="IDS_ST_BODY_VALID_TO_C">有效期至：</text>
     <text id="IDS_ST_HEADER_CONNECTED_DEVICES">已連接的裝置</text>
+    <text id="IDS_ST_BODY_TOTAL">總計</text>
     <text id="IDS_ST_BODY_24_HOURS">24 小時</text>
     <text id="IDS_EMAIL_OPT_HUGE_M_TEXTSIZE">超大</text>
     <text id="IDS_ST_BODY_FONT">字型</text>
     <text id="IDS_COM_BODY_12_HOURS">12 小時</text>
+    <text id="IDS_ST_BODY_DATA">數據</text>
     <text id="IDS_WIFI_BODY_DNS_2">DNS 2</text>
     <text id="IDS_WIFI_BODY_DNS_1">DNS 1</text>
     <text id="IDS_WCL_BODY_CANADA">加拿大</text>
@@ -96,6 +99,7 @@
     <text id="IDS_ST_BODY_KEYBOARD">鍵盤</text>
     <text id="IDS_ST_BODY_AUTOMATIC_UPDATE">自動更新</text>
     <text id="IDS_IME_BODY_CHINESE_TRADITIONAL_TAIWAN">台灣繁體</text>
+    <text id="IDS_COM_BODY_SEARCH">搜尋</text>
     <text id="IDS_COM_POP_ACTIVATING">正在啟動...</text>
     <text id="IDS_ST_BODY_ON">開啟</text>
     <text id="IDS_ST_BODY_EXTERNAL_CERTIFICATES">外部證書</text>
@@ -106,12 +110,14 @@
     <text id="IDS_ST_BODY_SOUNDS">聲音</text>
     <text id="IDS_ST_BODY_SCREEN_MODE">背景效果</text>
     <text id="IDS_WIFI_BODY_CONNECTED">已連線</text>
+    <text id="IDS_ST_BODY_MORE_DETAILS">更多詳細資料</text>
     <text id="IDS_ST_BODY_DATA_ROAMING">數據漫遊</text>
     <text id="IDS_COM_BODY_RINGTONES">鈴聲</text>
     <text id="IDS_ST_BODY_ISSUER">簽發者</text>
     <text id="IDS_IME_OPT_LANG_KAZAKH">Қазақ</text>
     <text id="IDS_ST_BODY_DATE_AND_TIME">日期與時間</text>
     <text id="IDS_ST_HEADER_SCREEN_SECURITY">螢幕安全性</text>
+    <text id="IDS_ST_BUTTON_FORCE_STOP">強制停止</text>
     <text id="IDS_ST_BODY_VOLUME">音量</text>
     <text id="IDS_ST_BODY_MOUNT_SD_CARD">安裝 SD 卡</text>
     <text id="IDS_ST_BODY_INCORRECT_PASSWORD">密碼不正確</text>
@@ -172,6 +178,7 @@
     <text id="IDS_IME_BODY_AUTO_CAPITALISATION">自動擷取</text>
     <text id="IDS_ST_BODY_SERIAL_NUMBER">序號</text>
     <text id="IDS_ST_BODY_PASSWORD">密碼</text>
+    <text id="IDS_ST_BODY_CLEAR_DEFAULTS">清除預設值</text>
     <text id="IDS_WIFI_BODY_CA_CERTIFICATE">CA 憑證</text>
     <text id="IDS_ST_BODY_PROXY_PORT">代理伺服器連接埠</text>
     <text id="IDS_WIFI_BODY_ENTER_SSID">輸入 SSID</text>
@@ -189,6 +196,7 @@
     <text id="IDS_ST_BODY_SD_CARD">SD 卡</text>
     <text id="IDS_IME_OPT_LANG_FRENCH">Français</text>
     <text id="IDS_IME_OPT_LANG_DUTCH">Nederlands</text>
+    <text id="IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS">應用程式已設定將根據預設開啟部分動作</text>
     <text id="IDS_ST_BODY_USB_DEBUGGING">USB 偵錯</text>
     <text id="IDS_ST_BODY_AVAILABLE_SPACE">可用空間</text>
     <text id="IDS_IME_OPT_LANG_RUSSIAN">Русский</text>
@@ -203,6 +211,7 @@
     <text id="IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVERRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION">在協助設定中變更字型大小將覆寫每個應用程式中的字型大小</text>
     <text id="IDS_IME_OPT_LANG_SPANISH">Español</text>
     <text id="IDS_ST_BODY_WEATHER">氣象</text>
+    <text id="IDS_COM_BODY_NO_SEARCH_RESULTS">無搜尋結果</text>
     <text id="IDS_LBS_BODY_NETWORK_POSITION">網路定位</text>
     <text id="IDS_ST_BODY_FREQUENTLY_USED">經常使用</text>
     <text id="IDS_WCL_BODY_PHILIPPINES">菲律賓</text>
@@ -281,6 +290,7 @@
     <text id="IDS_ST_BUTTON_CANCEL">取消</text>
     <text id="IDS_WIFI_BODY_WI_FI_DIRECT_DEVICES">Wi-Fi Direct設備</text>
     <text id="IDS_ST_BODY_DEVELOPER_OPTIONS">開發人員選項</text>
+    <text id="IDS_ST_BODY_APPLICATION_INFO">應用程式資訊</text>
     <text id="IDS_ST_BODY_AUTOMATIC">自動</text>
     <text id="IDS_ST_BODY_SCREEN_LOCK_SOUND">螢幕鎖定音效</text>
     <text id="IDS_BT_BODY_PAIRED">已配對</text>

diff --git a/src/StAboutPhoneForm.cpp b/src/StAboutPhoneForm.cpp
index 4a14b4f..55c823f 100644 (file)
--- a/src/StAboutPhoneForm.cpp
+++ b/src/StAboutPhoneForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -54,14 +54,43 @@ static const int ID_ITEM_ABOUT_PHONE_CERTIFICATE_CERTIFICATES = 0;
 
 static const int ID_GROUP_COUNT = 2;
 static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_ABOUT_PHONE_MAIN_ITEM_COUNT;
-static const int LIMIT_EDITFIELD = 30;
+static const int LIMIT_EDITFIELD = 100;
 static const int DEFAULT_TEXT_SIZE = 10;
 
 static const int ID_SECOND_CONTROL = 1;
 static const int IDA_HEADER_BACK_BUTTON = 300;
+static const int ID_RECEIVED_USER_EVENT_CPU_USAGE = 400;
+
+void
+CpuUsageGetIntAsyncResultListener::OnResultReceivedForGetValueAsync(int value, result r)
+{
+       SendEvent(r, value);
+}
+
+void
+CpuUsageGetIntAsyncResultListener::SetSendEventForm(Tizen::Ui::Controls::Form* pForm, int requestId)
+{
+       __pReceivedForm = pForm;
+       __requestId = requestId;
+}
+
+void
+CpuUsageGetIntAsyncResultListener::SendEvent(result r, int value)
+{
+       Collection::ArrayList* pData = new (std::nothrow) Collection::ArrayList(Collection::SingleObjectDeleter);
+       pData->Construct();
+
+       pData->Add(new (std::nothrow) String(GetErrorMessage(r)));
+       pData->Add(new (std::nothrow) String(Integer::ToString(value)));
+
+       __pReceivedForm->SendUserEvent( __requestId, pData);
+}
+
 
 PhoneInfoForm::PhoneInfoForm(void)
        : __pEditField(null)
+       , __CpuUsageGetInfoResultListener(null)
+       , __pCpuUsageData(L"")
 {
 }
 
@@ -378,14 +407,18 @@ PhoneInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                case ID_ITEM_ABOUT_PHONE_MAIN_CPU_USAGE:
                        {
                                int cpuUsage = 0;
-                               if (RuntimeInfo::GetValue(RUNTIME_INFO_KEY_CPU_USAGE, cpuUsage) == E_SUCCESS)
+                               SetICpuUsageResultListener();
+
+                       //      if (RuntimeInfo::GetValue(RUNTIME_INFO_KEY_CPU_USAGE, cpuUsage) == E_SUCCESS)
+                               if (RuntimeInfo::GetValueAsync(RUNTIME_INFO_KEY_CPU_USAGE, __CpuUsageGetInfoResultListener))
                                {
                                        itemTextTwoLine = Integer::ToString(cpuUsage);
                                        itemTextTwoLine.Append(L"%");
                                }
                                else
                                {
-                                       itemTextTwoLine = L"03%";
+                                       AppLogDebug("Get Value Fail [%s]", GetErrorMessage(GetLastResult()));
+                                       itemTextTwoLine = L"--%";
                                }
 
                                itemText = ResourceManager::GetString(L"IDS_ST_BODY_CPU_USAGE");
@@ -609,6 +642,14 @@ PhoneInfoForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Ta
                        }
                        break;
 
+               case ID_ITEM_ABOUT_PHONE_MAIN_CPU_USAGE:
+                       {
+                               Label* pLabel = static_cast<Label*>(pItem->GetControl(ID_SECOND_CONTROL));
+                               pLabel->SetText(__pCpuUsageData + L"%");
+                               pLabel->Invalidate(false);
+                       }
+                       break;
+
                default:
                        break;
                }
@@ -648,6 +689,12 @@ PhoneInfoForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 }
 
 void
+PhoneInfoForm::OnKeypadOpened(Tizen::Ui::Control& source)
+{
+       Invalidate(true);
+}
+
+void
 PhoneInfoForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
        Header* pHeader = GetHeader();
@@ -659,12 +706,6 @@ PhoneInfoForm::OnKeypadClosed(Tizen::Ui::Control& source)
 }
 
 void
-PhoneInfoForm::OnKeypadOpened(Tizen::Ui::Control& source)
-{
-       Invalidate(true);
-}
-
-void
 PhoneInfoForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction)
 {
        AppLogDebug("keypadAction Status[%d]", keypadAction);
@@ -683,4 +724,27 @@ PhoneInfoForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::Ke
        default:
                break;
        }
+}
+
+void
+PhoneInfoForm::SetICpuUsageResultListener(void)
+{
+       __CpuUsageGetInfoResultListener = new (std::nothrow) CpuUsageGetIntAsyncResultListener();
+       __CpuUsageGetInfoResultListener->SetSendEventForm(this, ID_RECEIVED_USER_EVENT_CPU_USAGE);
+}
+
+void
+PhoneInfoForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
+{
+       if (requestId == ID_RECEIVED_USER_EVENT_CPU_USAGE)
+       {
+               String* pResult = static_cast<String*>(pArgs->GetAt(0));
+
+               if (pResult->Equals(L"E_SUCCESS", false))
+               {
+                       __pCpuUsageData = *(static_cast<String*>(pArgs->GetAt(1)));
+                       __pTableView->RefreshItem(ID_GROUP_ABOUT_PHONE_MAIN, ID_ITEM_ABOUT_PHONE_MAIN_CPU_USAGE, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               }
+               delete pArgs;
+       }
 }
\ No newline at end of file

diff --git a/src/StAppSettingForm.cpp b/src/StAppSettingForm.cpp
index 6142e3b..1f0cf35 100644 (file)
--- a/src/StAppSettingForm.cpp
+++ b/src/StAppSettingForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -34,7 +34,7 @@ using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 static const int APPSETTING_DEFAULT_COUNT = 1;
-static const int LIMIT_EDITFIELD = 100;
+static const int LIMIT_EDITFIELD = 30;
 static const int STRING_SIZE_LIMIT = 10;
 static const int ID_APPSETTTING_ARGUMENT_DEFAULT = 0;
 static const int ID_APPSETTTING_ARGUMENT_APP_ID = 1;
@@ -50,6 +50,7 @@ static const wchar_t* ID_APPSETTING_ITEM_TYPE_STRING = L"string";
 static const wchar_t* ID_APPSETTING_ITEM_TYPE_LABEL = L"label";
 static const wchar_t* ID_APPSETTING_ITEM_TYPE_EXPAND_LIST = L"expandlist";
 static const wchar_t* ID_APPSETTING_ITEM_TYPE_EXPAND_ITEM = L"expanditem";
+static const wchar_t* ID_APPSETTING_ITEM_TYPE_SEPARATOR = L"separator";
 
 static const wchar_t* ID_APPSETTING_ATTRIBUTE_TYPE_TITLE = L"title";
 static const wchar_t* ID_APPSETTING_ATTRIBUTE_TYPE_MIN = L"min";
@@ -199,7 +200,7 @@ AppSettingForm::SetGroupItemNodeList(Tizen::Base::String rootId)
        Enumerator* pEnum = pRoot->CreateEnumerator();
        while (pEnum->MoveNext() == E_SUCCESS)
        {
-               pNode = static_cast<const Node*>(pEnum->GetCurrentObject());
+               pNode = static_cast<Node*>(pEnum->GetCurrentObject());
                if (pNode->GetType().Equals(L"setting", false))
                {
                        isFindSttingElement = true;
@@ -397,7 +398,7 @@ AppSettingForm::MakeTranslateTable(void)
                pEnum = pNode->CreateEnumerator();
                while (pEnum->MoveNext() == E_SUCCESS)
                {
-                       Node* pCurrent = static_cast<const Node*>(pEnum->GetCurrentObject());
+                       Node* pCurrent = static_cast<Node*>(pEnum->GetCurrentObject());
                        if (pCurrent == null)
                        {
                                AppLogDebug("pNode is null");
@@ -443,6 +444,28 @@ AppSettingForm::MakeTranslateTable(void)
                        SetTranslateTableHashCodeToItemTag(idHashCode, new (std::nothrow) ItemTag(i, enumLoopCount));
                        enumLoopCount = enumLoopCount + APPSETTING_DEFAULT_COUNT;
                }
+               if (enumLoopCount == 0)
+               {
+                       if (pNode)
+                       {
+                               unsigned int idHashCode = pNode->GetId().GetHashCode();
+
+                               r = pGroupItemHashCode->Add(idHashCode);
+                               if (IsFailed(r))
+                               {
+                                       AppLogDebug("Add fail [%s]", GetErrorMessage(r));
+                                       RemoveAllTranslateTableIndexToHashCode();
+                                       RemoveAllItemHashCodeMap();
+                                       delete pEnum;
+
+                                       pGroupItemHashCode->RemoveAll();
+                                       delete pGroupItemHashCode;
+
+                                       return r;
+                               }
+                               SetTranslateTableHashCodeToItemTag(idHashCode, new (std::nothrow) ItemTag(i, enumLoopCount));
+                       }
+               }
                delete pEnum;
 
                r = SetTranslateTableIndexToHashCode(pGroupItemHashCode);
@@ -811,8 +834,14 @@ AppSettingForm::RemoveIOAppSetting(void)
 result
 AppSettingForm::OnTerminating(void)
 {
-       __pTableView->SetItemProvider(null);
-
+       if (__pTableView)
+       {
+               __pTableView->SetItemProvider(null);
+       }
+       else
+       {
+               RemoveAllControls();
+       }
        RemoveAllGroupItemNodeList();
        RemoveAllItemHashCodeMap();
        RemoveAllTranslateTableIndexToHashCode();
@@ -965,10 +994,35 @@ CATCH:
                delete pArgs;
        }
 
+       CreateHeader(L"Error");
+       CreateNoContents();
        AppLogDebug("AppSettingForm Initialize fail");
 }
 
 void
+AppSettingForm::CreateNoContents(void)
+{
+       Rectangle clientRect = GetClientAreaBounds();
+       clientRect.y = 0;
+       String labelText = ResourceManager::GetString(L"IDS_RSSR_BODY_INVALID_FORMAT");
+
+       if (labelText.IsEmpty())
+       {
+               labelText = L"Invalid Format.. \ncheck XML file again";
+       }
+
+       Label* pInvalidFormatLabel = new (std::nothrow) Label();
+       pInvalidFormatLabel->Construct(clientRect, labelText);
+       pInvalidFormatLabel->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
+       pInvalidFormatLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
+       pInvalidFormatLabel->SetTextConfig(GetFontSize(), LABEL_TEXT_STYLE_NORMAL);
+       pInvalidFormatLabel->SetBackgroundColor(COLOR_BG_GROUP_ITEM_LISTITEM);
+       pInvalidFormatLabel->SetName(L"InvalidFormat");
+       AddControl(*pInvalidFormatLabel);
+       Invalidate(true);
+}
+
+void
 AppSettingForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
 }
@@ -1016,7 +1070,7 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
        String* groupText = null;
        Node* pNode = null;
        __pGroupItemNodeList->GetAt(groupIndex, pNode);
-
+       Label* pLabel = null;
        TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
 
        itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
@@ -1027,10 +1081,10 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
        itemHeight = H_GROUP_INDEX_DEFAULT;
        itemRectangle.y = H_GROUP_INDEX_TITLE_TEXT;
        itemRectangle.height = H_GROUP_INDEX_DEFAULT - H_GROUP_INDEX_TITLE_TEXT;
-
        groupText = pNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_TITLE);
        if (groupText == null)
        {
+               AppLogDebug("grpText null");
                delete pItem;
                return null;
        }
@@ -1052,25 +1106,65 @@ AppSettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                __isNoTitleGroup = true;
        }
 
-       (*groupText).Format(STRING_SIZE_LIMIT, L"Group %d", groupIndex);
-       pItem->Construct(Dimension(itemWidth, itemHeight));
-       pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
+       if (pNode->GetType().Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
+       {
+               ItemTypeOneLine(itemRectangle);
+               itemHeight = itemRectangle.height;
+       }
 
-       Label* pLabel = new (std::nothrow) Label();
 
-       pLabel->Construct(itemRectangle, (*groupText).GetPointer());
-       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-       pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
+       if ((pNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
+       {
+               String* value = pNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE);
+               String expendList;
 
-       pItem->AddControl(*pLabel);
+               AppLogDebug("groupText [%ls]", groupText->GetPointer());
+               AppLogDebug("value [%ls]", value->GetPointer());
 
-       pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
-       pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
+               pNode->RegisterObserverlistener(__pIOAppSetting);
 
-       pItem->SetEnabled(false);
+               pItem->Construct(Dimension(itemRectangle.width, itemRectangle.height));
+               pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
-       delete groupText;
-       return pItem;
+               expendList.Append(groupText->GetPointer());
+               expendList.Append(L" : ");
+               expendList.Append(value->GetPointer());
+
+               delete value;
+
+               pLabel = new (std::nothrow) Label();
+               pLabel->Construct(itemRectangle, expendList);
+               pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+               pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
+               pLabel->SetName(pNode->GetId());
+
+               pItem->AddControl(*pLabel);
+               pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
+               pItem->SetEnabled(true);
+
+               return pItem;
+       }
+       else
+       {
+               pItem->Construct(Dimension(itemWidth, itemHeight));
+               pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
+
+               Label* pLabel = new (std::nothrow) Label();
+
+               pLabel->Construct(itemRectangle, (*groupText).GetPointer());
+               pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+               pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
+
+               pItem->AddControl(*pLabel);
+
+               pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style);
+               pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
+
+               pItem->SetEnabled(false);
+
+               delete groupText;
+               return pItem;
+       }
 }
 
 TableViewItem*
@@ -1301,6 +1395,33 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                delete pParentValue;
                delete pCurrentValue;
        }
+       else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_SEPARATOR, false))
+       {
+               Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_SEPARATOR);
+               itemRectangle.height = H_GROUP_INDEX_NO_TITLE_DEFAULT;
+
+               if (pBitmap == null)
+               {
+                       AppLogDebug("bitmap is null ");
+                       AppLogDebug("separator id [%ls]", pItemNode->GetId().GetPointer());
+               }       
+               
+               RelativeLayout relativeLayout;
+               relativeLayout.Construct();
+               pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectangle.height), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+
+               pLabel = new (std::nothrow) Label();
+               pLabel->Construct(itemRectangle, L" ");
+               pLabel->SetBackgroundBitmap(*pBitmap);
+               pItem->AddControl(*pLabel);
+
+               delete pBitmap;
+               pItem->SetEnabled(false);
+
+               relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_RIGHT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+               relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+       }
        else
        {
                AppLogDebug("pItem is null");
@@ -1338,6 +1459,7 @@ AppSettingForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedT
        Node* pItemNode = GetItemHashCodeMap(hashCode);
        if (pItemNode == null)
        {
+               AppLogDebug("pItemNode is null");
                return;
        }
 
@@ -1368,6 +1490,25 @@ AppSettingForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedT
 
                unsigned int hashCode = pParent->GetId().GetHashCode();
                ItemTag* itemTag = GetTranslateTableHashCodeToItemTag(hashCode);
+
+               if (itemTag == null)
+               {
+                       int itemCount = __pTableView->GetItemCountAt(groupIndex);
+
+                       for (int count = 0; count < itemCount; count++)
+                       {
+                               bool itemSelectStatus = false;
+                               if (count == itemIndex)
+                               {
+                                       itemSelectStatus = true;
+                               }
+                               __pTableView->SetItemChecked(groupIndex, count, itemSelectStatus);
+                       }
+                       RefreshItemList(groupIndex);
+
+                       Invalidate(true);
+                       return;
+               }
                int loopCount = pParent->GetChildCount() + itemTag->GetItemIndex() + APPSETTING_DEFAULT_COUNT;
 
                for (int pos = itemTag->GetItemIndex() + APPSETTING_DEFAULT_COUNT; pos < loopCount; pos++)
@@ -1386,7 +1527,6 @@ AppSettingForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedT
                        __pStaticEdit->HideKeypad();
                        __pStaticEdit->Invalidate(false);
                }
-
                __pTableView->RefreshItem(itemTag->GetGroupIndex(), itemTag->GetItemIndex(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
                Invalidate(true);
 
@@ -1459,8 +1599,40 @@ AppSettingForm::GetDefaultItemHeight(void)
 }
 
 void
+AppSettingForm::RefreshItemList(int groupIndex)
+{
+       int itemCount = __pTableView->GetItemCountAt(groupIndex);
+
+       for (int count = -1; count < itemCount; count++)
+       {
+               __pTableView->RefreshItem(groupIndex, count, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       }
+}
+
+void
 AppSettingForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem)
 {
+       Node* pNode = null;
+       __pGroupItemNodeList->GetAt(groupIndex, pNode);
+
+       if (pNode->GetType().Equals("expandlist",false))
+       {
+               Label* pLabel = static_cast<Label*>(pItem->GetControl(0));
+               String expandList;
+
+               String* groupText = pNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_TITLE);
+               String* value = pNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE);
+
+               expandList.Append(groupText->GetPointer());
+               expandList.Append(L" : ");
+               expandList.Append(value->GetPointer());
+
+               AppLogTag("hwkim", "itemChanged [%ls]", expandList.GetPointer());
+               pLabel->SetText(expandList);
+               pLabel->Invalidate(false);
+               delete groupText;
+               delete value;
+       }
 }
 
 void
@@ -1476,7 +1648,13 @@ AppSettingForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::T
 
        if (!pItemNode->GetType().Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
        {
-               AppLogDebug("pItemNode->GetType not equal ID_APPSETTING_ITEM_TYPE_EXPAND_LIST");
+               AppLogDebug("pItemNode->GetType not equal ID_APPSETTING_ITEM_TYPE_EXPAND_LIST [%ls]", pItemNode->GetType().GetPointer());
+
+               if (pItemNode->GetType().Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_ITEM, false))
+               {
+                       AppLogDebug("here [%ls]", pItemNode->GetType().GetPointer());
+                       pItem->Invalidate(false);
+               }
                return;
        }
 
@@ -1610,6 +1788,11 @@ AppSettingForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 }
 
 void
+AppSettingForm::OnKeypadOpened(Tizen::Ui::Control& source)
+{
+}
+
+void
 AppSettingForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
        if (__pGroupItemNodeList == null)
@@ -1745,20 +1928,33 @@ AppSettingForm::ReSizingTableviewForClipboard(int scrollToGroupIndex, int scroll
 }
 
 void
-AppSettingForm::OnKeypadOpened(Tizen::Ui::Control& source)
-{
-}
-
-void
 AppSettingForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
 {
-       Clipboard* pClipboard = Clipboard::GetInstance();
-       if (pClipboard != null && pClipboard->IsPopupVisible() == true)
+       if (__pTableView != null)
        {
-               SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
+               Clipboard* pClipboard = Clipboard::GetInstance();
+               if (pClipboard != null && pClipboard->IsPopupVisible() == true)
+               {
+                       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
+               }
+               ReSizingTableviewForClipboard();
        }
-       ReSizingTableviewForClipboard();
+       else
+       {
+               Label* pLabel = static_cast<Label*>(GetControl(L"InvalidFormat"));
+
+               if (pLabel)
+               {
+                       Rectangle clientRect = GetClientAreaBounds();
+                       Rectangle labelRect = pLabel->GetBounds();
 
+                       labelRect = clientRect;
+                       labelRect.y = 0;
+
+                       pLabel->SetBounds(labelRect);
+                       pLabel->Invalidate(false);
+               }
+       }
        Invalidate(true);
 }
 

diff --git a/src/StAppSettingManager.cpp b/src/StAppSettingManager.cpp
index 8b4827f..93599e5 100644 (file)
--- a/src/StAppSettingManager.cpp
+++ b/src/StAppSettingManager.cpp
@@ -39,6 +39,7 @@ static const wchar_t* ID_APPSETTING_CHANGED_VALUE_INTEGER_TYPE = L"integer";
 static const int APP_SETTING_DEFAULT_TOKEN_COUNT = 1;
 static const int XML_READER_FOR_FILE_DEFAULT_OPTION = 524288;
 
+int separatorCount = 1;
 static const wchar_t* appSettingElementNodeDelimit[] =
 {
                L"settings",
@@ -821,7 +822,7 @@ ElementEnumerator::MoveNext(void)
                                if ((__pCurrentIEnumerator != null)
                                        && (__pCurrentIEnumerator->MoveNext() == E_SUCCESS))
                                {
-                                       pNode = static_cast<const Node*>(__pCurrentIEnumerator->GetCurrent());
+                                       pNode = static_cast<Node*>(__pCurrentIEnumerator->GetCurrent());
                                        r = __enumeratorStack.Push(pNode);
                                        if (IsFailed(r))
                                        {
@@ -1135,15 +1136,24 @@ AppSettingManager::XmlAppSettingFileRead(Tizen::Base::String filePath, ElementNo
                delete pBuf;
                return E_FAILURE;
        }
+       ArrayList* idList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       idList->Construct();
+       idList->Add(new (std::nothrow) String(L"Start"));
 
        int xmlreadType = 0;
        Node* pParentOfNewNode = dynamic_cast<Node*>(pRootNode);
        while (xmlTextReaderRead(reader))
        {
+               const xmlChar* name = xmlTextReaderConstName(reader);
                xmlreadType = xmlTextReaderNodeType(reader);
                if ((xmlreadType != XML_READER_TYPE_ELEMENT)
                        && (xmlreadType != XML_READER_TYPE_END_ELEMENT))
                {
+                       if (xmlStrcasecmp(name, (const xmlChar*) null) == 0)
+                       {
+                               AppLogDebug("value field must be not empty");
+                               break;
+                       }
                        continue;
                }
 
@@ -1158,7 +1168,10 @@ AppSettingManager::XmlAppSettingFileRead(Tizen::Base::String filePath, ElementNo
 
                if (xmlTextReaderAttributeCount(reader) == 0)
                {
-                       continue;
+                       if (xmlStrcasecmp(name, (const xmlChar*) "separator") != 0)
+                       {
+                               continue;
+                       }
                }
 
                String elementIdType;
@@ -1183,8 +1196,15 @@ AppSettingManager::XmlAppSettingFileRead(Tizen::Base::String filePath, ElementNo
                        ElementNode* pElementNode = dynamic_cast<ElementNode*>(pParentOfNewNode);
                        if (pElementNode != null)
                        {
+                               if (idList->Contains(String(elementId)))
+                               {
+                                       AppLogDebug("continue elementId[%ls]", elementId.GetPointer());
+                                       continue;
+                               }
                                pParentOfNewNode = pElementNode->AddChild(elementId, elementIdType, newNodeType);
                                pCurrentNode = pParentOfNewNode;
+
+                               idList->Add(new (std::nothrow) String(elementId));
                        }
                }
                else
@@ -1192,7 +1212,30 @@ AppSettingManager::XmlAppSettingFileRead(Tizen::Base::String filePath, ElementNo
                        ElementNode* pElementNode = dynamic_cast<ElementNode*>(pParentOfNewNode);
                        if (pElementNode != null)
                        {
-                               pCurrentNode = pElementNode->AddChild(elementId, elementIdType, newNodeType);
+                               if(xmlStrcasecmp(name, (const xmlChar*) "separator") == 0)
+                               {
+                                       String separatorId;
+                                       separatorId.Format(20, L"IDSP_%d", separatorCount);
+
+                                       if (idList->Contains(String(separatorId)))
+                                       {
+                                               continue;
+                                       }
+                                       pCurrentNode = pElementNode->AddChild(separatorId, elementIdType, newNodeType);
+                                       idList->Add(new (std::nothrow) String(separatorId));
+                                       separatorCount++;
+                               }
+                               else
+                               {
+                                       if (idList->Contains(String(elementId)))
+                                       {
+                                               AppLogDebug("continue elementId[%ls]", elementId.GetPointer());
+                                               continue;
+                                       }
+                                       AppLogDebug("continue elementId[%ls]", elementId.GetPointer());
+                                       pCurrentNode = pElementNode->AddChild(elementId, elementIdType, newNodeType);
+                                       idList->Add(new (std::nothrow) String(elementId));
+                               }
                        }
                }
 
@@ -1213,14 +1256,23 @@ AppSettingManager::XmlAppSettingFileRead(Tizen::Base::String filePath, ElementNo
                        }
                        delete pBuf;
                }
+                       if(xmlStrcasecmp(name, (const xmlChar*) "separator") == 0)
+                       {
+                               if (pCurrentNode != null)
+                               {
+                                       pCurrentNode->AddAttribute(appSettingNodeAttributeDelimit[1], L"separator");
+                                       pCurrentNode->AddAttribute(appSettingNodeAttributeDelimit[2], L"true");
+                               }
+                       }
        }
 
        if (reader)
        {
                xmlFreeTextReader(reader);
        }
-
+       separatorCount = 0;
        delete pBuf;
+       delete  idList;
        return E_SUCCESS;
 }
 

diff --git a/src/StBaseForm.cpp b/src/StBaseForm.cpp
index f7ea952..5bdf106 100644 (file)
--- a/src/StBaseForm.cpp
+++ b/src/StBaseForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -31,6 +31,8 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 
 static const int W_LARGE_SIZE_TEXT_GAP = 110;
+static const int W_HUGE_SIZE_PORTRAIT_TEXT_GAP = 90;
+static const int W_HUGE_SIZE_LANDSCAPE_TEXT_GAP = 220;
 static const int LINE_COUNT_DEFAULT = 1;
 
 static const int BASE_FORM_DEFAULT_MARGIN = 32;
@@ -286,6 +288,19 @@ BaseForm::GetHeightForStringArea(const Tizen::Base::String source, int width, in
        int margin = BASE_FORM_DEFAULT_MARGIN + RELATIVE_LAYOUT_RIGHT_MARGIN;
        if (fontSize > FONT_MAIN_TEXT_SIZE_LARGE)
        {
+               OrientationStatus orientationStatus = GetOrientationStatus();
+               if (((orientationStatus == ORIENTATION_STATUS_PORTRAIT)
+                       || (orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE))
+                       && (fontSize == FONT_MAIN_TEXT_SIZE_HUGE))
+               {
+                       width -= W_HUGE_SIZE_PORTRAIT_TEXT_GAP;
+               }
+               else if (((orientationStatus == ORIENTATION_STATUS_LANDSCAPE)
+                       || (orientationStatus == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                       && (fontSize == FONT_MAIN_TEXT_SIZE_HUGE))
+               {
+                       width -= W_HUGE_SIZE_LANDSCAPE_TEXT_GAP;
+               }
                width -= W_LARGE_SIZE_TEXT_GAP;
        }
        int boudwidth = width - margin;

diff --git a/src/StBluetoothForm.cpp b/src/StBluetoothForm.cpp
index 8310629..dcdd96b 100644 (file)
--- a/src/StBluetoothForm.cpp
+++ b/src/StBluetoothForm.cpp
@@ -55,6 +55,7 @@ static const int ID_IN_PROGRESS__REPEAT_COUNT = 1000;
 
 static const int ID_BLUETOOTH_VISIBLE_GROUP_ITEM_CONUNT = 5;
 static const int SEARCH_ICON_FILE_PATH_NAME_LENGTH_MAX = 100;
+static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
 
 enum BluetoothTurnOnOffStatusItem
 {
@@ -176,6 +177,8 @@ BluetoothForm::OnTerminating(void)
 void
 BluetoothForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
+       __pTableView->CollapseGroup(BLUETOOTH_GROUP_INDEX_1);
+       __pTableView->UpdateTableView();
        if (__pBluetoothPresentationModelInstance == null)
        {
                if (pArgs != null)
@@ -188,12 +191,7 @@ BluetoothForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
                        delete pArgs;
                        pArgs = null;
                }
-               __pTableView->UpdateTableView();
-               if (__pBluetoothPresentationModelInstance == null)
-               {
-                       __pTableView->CollapseGroup(BLUETOOTH_GROUP_INDEX_1);
-                       __pTableView->SetItemEnabled(BLUETOOTH_GROUP_INDEX_0, BLUETOOTH_TURN_ON_OFF_STATUS_ITEM_VISIBLE_STATUS, false);
-               }
+               __pTableView->SetItemEnabled(BLUETOOTH_GROUP_INDEX_0, BLUETOOTH_TURN_ON_OFF_STATUS_ITEM_VISIBLE_STATUS, false);
                return;
        }
 
@@ -228,8 +226,10 @@ BluetoothForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
+       __pTableView->CollapseGroup(BLUETOOTH_GROUP_INDEX_1);
        if (__pBluetoothPresentationModelInstance != null)
        {
+               __pBluetoothPresentationModelInstance->SetBluetoothEventInProgress(BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_EXIT);
                __pBluetoothPresentationModelInstance->CancelBluetoothDiscovery();
        }
 
@@ -302,7 +302,6 @@ BluetoothForm::CreateGroupItem(int groupIndex, int itemWidth)
        if (pItem == null)
        {
                AppLogDebug("__pBluetoothPresentationModelInstance or pItem is null");
-               delete pItem;
                return null;
        }
 
@@ -408,7 +407,6 @@ BluetoothForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        if (pItem == null)
        {
-               delete pItem;
                return null;
        }
 
@@ -654,6 +652,10 @@ BluetoothForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
                relativeLayout.SetMargin(*pLabel, RELATIVE_LAYOUT_LEFT_MARGIN, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        }
+       if (style == TABLE_VIEW_ANNEX_STYLE_DETAILED)
+       {
+               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
+       }
        else
        {
                relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
@@ -754,7 +756,7 @@ BluetoothForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTa
                                                break;
                                        }
 
-                                       if (tableView.IsItemChecked(groupIndex, itemIndex) == true)
+                                       if (tableView.IsItemChecked(groupIndex, itemIndex) == false)
                                        {
                                                result r = __pBluetoothPresentationModelInstance->DeactivateBluetooth();
                                                if (IsFailed(r))
@@ -853,19 +855,21 @@ BluetoothForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTa
 
        case BLUETOOTH_GROUP_ITEM_AVAILABLE_DEVICES:
                {
-                       if (__pBluetoothPresentationModelInstance->GetBluetoothEventInProgress() == BLUETOOTH_PRESENTATION_MODEL_EVENT_PAIRING)
+                       if (__pBluetoothPresentationModelInstance != null)
                        {
-                               result r = __pBluetoothPresentationModelInstance->CancelBluetoothPair();
-                               if (IsFailed(r))
+                               if (__pBluetoothPresentationModelInstance->GetBluetoothEventInProgress() == BLUETOOTH_PRESENTATION_MODEL_EVENT_PAIRING)
                                {
-                                       AppLogDebug("BluetoothCancelPair fail [%s]", GetErrorMessage(r));
+                                       result r = __pBluetoothPresentationModelInstance->CancelBluetoothPair();
+                                       if (IsFailed(r))
+                                       {
+                                               AppLogDebug("BluetoothCancelPair fail [%s]", GetErrorMessage(r));
+                                               break;
+                                       }
+
+                                       ModifyTableViewItem(groupIndex, itemIndex);
                                        break;
                                }
-
-                               ModifyTableViewItem(groupIndex, itemIndex);
-                               break;
                        }
-
                        result r = __pBluetoothPresentationModelInstance->PairToFoundBluetoothDeviceAt(itemIndex);
                        if (IsFailed(r))
                        {

diff --git a/src/StBluetoothPresentationModel.cpp b/src/StBluetoothPresentationModel.cpp
index 363e7ec..818ffe0 100644 (file)
--- a/src/StBluetoothPresentationModel.cpp
+++ b/src/StBluetoothPresentationModel.cpp
@@ -353,7 +353,10 @@ BluetoothPresentationModel::CancelBluetoothDiscovery(void)
        result r = __pBluetoothMgr->CancelDiscovery();
        if (!IsFailed(r))
        {
-               SetBluetoothEventInProgress(BLUETOOTH_PRESENTATION_MODEL_EVENT_CANCEL_DISCOVERYING);
+               if (__bluetoothEventInProgress != BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_EXIT)
+               {
+                       SetBluetoothEventInProgress(BLUETOOTH_PRESENTATION_MODEL_EVENT_CANCEL_DISCOVERYING);
+               }
        }
 
        return r;
@@ -648,14 +651,20 @@ BluetoothPresentationModel::OnBluetoothDiscoveryDone(bool isCompleted)
                bluetoothPresentationModelEvent = BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_DONE;
        }
 
-       FireIBluetoothPresentationModelEventListener(bluetoothPresentationModelEvent);
+       if (__bluetoothEventInProgress != BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_EXIT)
+       {
+               FireIBluetoothPresentationModelEventListener(bluetoothPresentationModelEvent);
+       }
 }
 
 void
 BluetoothPresentationModel::OnBluetoothDiscoveryStarted(result r)
 {
        InitFoundRemoteDeviceList();
-       FireIBluetoothPresentationModelEventListener(BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_STARTED, r);
+       if (__bluetoothEventInProgress != BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_EXIT)
+       {
+               FireIBluetoothPresentationModelEventListener(BLUETOOTH_PRESENTATION_MODEL_EVENT_DISCOVERY_STARTED, r);
+       }
 }
 
 void

diff --git a/src/StCertificateUserForm.cpp b/src/StCertificateUserForm.cpp
index 72194d3..3358708 100644 (file)
--- a/src/StCertificateUserForm.cpp
+++ b/src/StCertificateUserForm.cpp
@@ -138,21 +138,22 @@ CertificateUserForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previou
 
                        int bitmapWidth = pBitmp->GetWidth();
                        int bitmapHeight = pBitmp->GetHeight();
-
-                       int xPos = (clientRect.width / LINE_COUNT_2) - (bitmapWidth / DEVIDE_TWO);
-                       int yPos = (clientRect.height / LINE_COUNT_2) - (bitmapHeight / DEVIDE_TWO);
                        String labelText = ResourceManager::GetString(L"IDS_ST_BODY_NO_CONTENT");
                        Color textColor = COLOR_HELP_TEXT_TYPE_03_NORMAL;
+                       int noContentTextHeight = GetHeightForStringArea(labelText, bitmapWidth, 32);
+
+                       int xPos = (clientRect.width / LINE_COUNT_2) - (bitmapWidth / DEVIDE_TWO);
+                       int yPos = (clientRect.height / LINE_COUNT_2) - ((bitmapHeight + noContentTextHeight) / DEVIDE_TWO);
 
                        Label* pLabel = new (std::nothrow) Label();
                        pLabel->Construct(Rectangle(xPos, yPos, bitmapWidth, bitmapHeight), L"");
                        pLabel->SetName(NO_CONTENTS);
                        pLabel->SetBackgroundBitmap(*pBitmp);
 
-                       yPos = yPos + (bitmapHeight / DEVIDE_TWO);
+                       yPos = yPos + bitmapHeight;
 
                        Label* pLabelNoContents = new (std::nothrow) Label();
-                       pLabelNoContents->Construct(Rectangle(xPos, yPos, bitmapWidth, bitmapHeight), L"");
+                       pLabelNoContents->Construct(Rectangle(0, yPos, clientRect.width, noContentTextHeight), L"");
                        pLabelNoContents->SetName(NO_CONTENTS_TEXT);
                        pLabelNoContents->SetTextColor(textColor);
                        pLabelNoContents->SetText(labelText);
@@ -361,11 +362,11 @@ CertificateUserForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tize
                int yPos = (clientRect.height / LINE_COUNT_2) -(labelBound.height / LINE_COUNT_2);
 
                pLabel->SetBounds(Rectangle(xPos, yPos, labelBound.width, labelBound.height));
-               yPos = yPos + (pLabel->GetBounds().height / DEVIDE_TWO);
+               yPos = yPos + pLabel->GetBounds().height;
                Label* pTextLabel = static_cast<Label*>(this->GetControl(NO_CONTENTS_TEXT, false));
                if (pTextLabel != null)
                {
-                       pTextLabel->SetBounds(Rectangle(xPos, yPos, labelBound.width, labelBound.height));
+                       pTextLabel->SetBounds(Rectangle(0, yPos, clientRect.width, pTextLabel->GetBounds().height));
                }
        }
        Invalidate(true);

diff --git a/src/StCertificateUserInstallForm.cpp b/src/StCertificateUserInstallForm.cpp
index c25578e..748a316 100644 (file)
--- a/src/StCertificateUserInstallForm.cpp
+++ b/src/StCertificateUserInstallForm.cpp
@@ -81,6 +81,12 @@ CertificateUserInstallForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId&
        CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_SELECT_CERTIFICATE_TO_INSTALL"));
        CreateFooter();
 
+       if (__pTableView != null)
+       {
+               __pTableView->RemoveAllControls();
+               __pTableView = null;
+       }
+       RemoveAllControls();
        if (!IsFailed(__pCertificatePresentationModelInstance->FindUserCertificateToInstallFromStorage()))
        {
                CreateTableView();
@@ -88,21 +94,37 @@ CertificateUserInstallForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId&
        }
        else
        {
-               Rectangle clientRect = GetClientAreaBounds();
-               Bitmap* pBitmp = ResourceManager::GetBitmapN(IDB_NO_CONTENTS);
+               Label* pLabel = static_cast<Label*>(this->GetControl(NO_CONTENTS, false));
+               if (pLabel == null)
+               {
+                       Rectangle clientRect = GetClientAreaBounds();
+                       Bitmap* pBitmp = ResourceManager::GetBitmapN(IDB_NO_CONTENTS);
+
+                       int bitmapWidth = pBitmp->GetWidth();
+                       int bitmapHeight = pBitmp->GetHeight();
+                       String labelText = ResourceManager::GetString(L"IDS_ST_BODY_NO_CONTENT");
+                       Color textColor = COLOR_HELP_TEXT_TYPE_03_NORMAL;
+                       int noContentTextHeight = GetHeightForStringArea(labelText, bitmapWidth, 32);
 
-               int bitmapWidth = pBitmp->GetWidth();
-               int bitmapHeight = pBitmp->GetHeight();
+                       int xPos = (clientRect.width / LINE_COUNT_2) - (bitmapWidth / DEVIDE_TWO);
+                       int yPos = (clientRect.height / LINE_COUNT_2) - ((bitmapHeight + noContentTextHeight) / DEVIDE_TWO);
 
-               int xPos = (clientRect.width / LINE_COUNT_2) - (bitmapWidth / DEVIDE_TWO);
-               int yPos = (clientRect.height / LINE_COUNT_2) - (bitmapHeight / DEVIDE_TWO);
+                       Label* pLabel = new (std::nothrow) Label();
+                       pLabel->Construct(Rectangle(xPos, yPos, bitmapWidth, bitmapHeight), L"");
+                       pLabel->SetName(NO_CONTENTS);
+                       pLabel->SetBackgroundBitmap(*pBitmp);
 
-               Label* pLabel = new (std::nothrow) Label();
-               pLabel->Construct(Rectangle(xPos, yPos, bitmapWidth, bitmapHeight), L"");
-               pLabel->SetName(NO_CONTENTS);
+                       yPos = yPos + bitmapHeight;
 
-               pLabel->SetBackgroundBitmap(*pBitmp);
-               AddControl(*pLabel);
+                       Label* pLabelNoContents = new (std::nothrow) Label();
+                       pLabelNoContents->Construct(Rectangle(0, yPos, clientRect.width, noContentTextHeight), L"");
+                       pLabelNoContents->SetName(NO_CONTENTS_TEXT);
+                       pLabelNoContents->SetTextColor(textColor);
+                       pLabelNoContents->SetText(labelText);
+
+                       AddControl(*pLabel);
+                       AddControl(*pLabelNoContents);
+               }
        }
 }
 
@@ -277,7 +299,23 @@ void
 CertificateUserInstallForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
 {
        BaseForm::OnOrientationChanged(source, orientationStatus);
-       __pTableView->UpdateTableView();
+       Label* pLabel = static_cast<Label*>(this->GetControl(NO_CONTENTS, false));
+       if (pLabel != null)
+       {
+               Rectangle clientRect = GetClientAreaBounds();
+               Rectangle labelBound = pLabel->GetBounds();
+
+               int xPos = (clientRect.width / LINE_COUNT_2) - (labelBound.width / LINE_COUNT_2);
+               int yPos = (clientRect.height / LINE_COUNT_2) -(labelBound.height / LINE_COUNT_2);
+
+               pLabel->SetBounds(Rectangle(xPos, yPos, labelBound.width, labelBound.height));
+               yPos = yPos + pLabel->GetBounds().height;
+               Label* pTextLabel = static_cast<Label*>(this->GetControl(NO_CONTENTS_TEXT, false));
+               if (pTextLabel != null)
+               {
+                       pTextLabel->SetBounds(Rectangle(0, yPos, clientRect.width, pTextLabel->GetBounds().height));
+               }
+       }
        Invalidate(true);
 }
 

diff --git a/src/StCertificateUserInstallPasswordForm.cpp b/src/StCertificateUserInstallPasswordForm.cpp
index 65649e9..6c621e8 100644 (file)
--- a/src/StCertificateUserInstallPasswordForm.cpp
+++ b/src/StCertificateUserInstallPasswordForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -439,15 +439,15 @@ CertificateUserInstallPasswordForm::OnTextValueChanged(const Tizen::Ui::Control&
 }
 
 void
-CertificateUserInstallPasswordForm::OnKeypadClosed(Tizen::Ui::Control& source)
+CertificateUserInstallPasswordForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
-       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
 }
 
 void
-CertificateUserInstallPasswordForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
+CertificateUserInstallPasswordForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
-       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
 }
 
 result

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index bdaab1a..5f14940 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -82,8 +82,7 @@ static const int DIVIDE_BY_TWO = 2;
 static const int TIME_FIELD_GAP = 20;
 
 static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 240;
-
-static const int MULTI_BY_TWO = 2;
+static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
 
 DateTimeForm::DateTimeForm(void)
 {
@@ -133,11 +132,14 @@ DateTimeForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
        bool automaticUpdate = false;
        bool hourFormat = false;
 
+       __pTableView->CollapseGroup(ID_GROUP_DATE_AND_TIME_FORMAT_LIST);
        __pTableView->UpdateTableView();
 
        if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_UPDATE_AUTO, automaticUpdate) == E_SUCCESS)
        {
                __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_MAIN, ID_ITEM_DATE_AND_TIME_MAIN_AUTOMATIC_UPDATE, automaticUpdate);
+               __pTableView->SetItemEnabled(ID_GROUP_DATE_AND_TIME_LOCAL_TIME, ID_ITEM_DATE_AND_TIME_TIME_ZONE, !automaticUpdate);
+               __pTableView->SetItemEnabled(ID_GROUP_DATE_AND_TIME_LOCAL_TIME, ID_ITEM_DATE_AND_TIME_DATE_AND_TIME, !automaticUpdate);
        }
 
        if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_TIME_FORMAT_24HOUR, hourFormat) == E_SUCCESS)
@@ -150,7 +152,6 @@ DateTimeForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
                {
                        __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_FORMAT_LIST, ID_ITEM_DATE_AND_TIME_FORMAT_24_HOURS, true);
                }
-               __pTableView->CollapseGroup(ID_GROUP_DATE_AND_TIME_FORMAT_LIST);
 
                AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
        }
@@ -167,6 +168,7 @@ DateTimeForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
+       __pTableView->CollapseGroup(ID_GROUP_DATE_AND_TIME_FORMAT_LIST);
        pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
 }
 
@@ -208,7 +210,6 @@ DateTimeForm::GetItemCount(int groupIndex)
                }
                break;
 
-
        case ID_GROUP_DATE_AND_TIME_FIRST_DAY:
                {
                        itemCount = ID_GROUP_DATE_AND_TIME_FIRST_DAY_ITEM_COUNT;
@@ -549,14 +550,7 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_TIME_FORMAT_24HOUR, hourFormat) == E_SUCCESS)
                {
-                       if (hourFormat == true)
-                       {
-                               pEditTime->Set24HourNotationEnabled(true);
-                       }
-                       else
-                       {
-                               pEditTime->Set24HourNotationEnabled(false);
-                       }
+                       pEditTime->Set24HourNotationEnabled(hourFormat);
                }
 
                pEditTime->AddTimeChangeEventListener(*this);
@@ -584,7 +578,14 @@ DateTimeForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               if (style == TABLE_VIEW_ANNEX_STYLE_DETAILED)
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
+               }
+               else
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               }
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
@@ -677,7 +678,10 @@ DateTimeForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
 
                        if (SettingInfo::SetValue(SETTING_INFO_KEY_LOCALE_UPDATE_AUTO, automaticUpdateStatus) == E_SUCCESS)
                        {
-                               __pTableView->SetItemChecked(groupIndex, itemIndex, automaticUpdateStatus);
+                               tableView.SetItemChecked(groupIndex, itemIndex, automaticUpdateStatus);
+                               tableView.SetItemEnabled(ID_GROUP_DATE_AND_TIME_LOCAL_TIME, ID_ITEM_DATE_AND_TIME_TIME_ZONE, !automaticUpdateStatus);
+                               tableView.SetItemEnabled(ID_GROUP_DATE_AND_TIME_LOCAL_TIME, ID_ITEM_DATE_AND_TIME_DATE_AND_TIME, !automaticUpdateStatus);
+                               tableView.UpdateTableView();
                        }
                        else
                        {
@@ -745,7 +749,7 @@ DateTimeForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                        {
                                AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
                        }
-                       __pTableView->UpdateTableView();
+                       tableView.UpdateTableView();
                }
                break;
 

diff --git a/src/StFontForm.cpp b/src/StFontForm.cpp
index 58d5712..54eb076 100644 (file)
--- a/src/StFontForm.cpp
+++ b/src/StFontForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -66,6 +66,9 @@ static const int ID_GROUP_COUNT = 4;
 static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_FONT_ITEM_COUNT;
 
 static const int H_HELP_TEXT_GAP = 6;
+static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
+static const int FONT_FORM_FIRST_CONTROL = 0;
+static const int FONT_FORM_SECOND_CONTROL = 1;
 
 FontForm::FontForm(void)
        : __isAppControlRequest(false)
@@ -100,9 +103,10 @@ FontForm::OnInitializing(void)
        __fontList = new (std::nothrow) ArrayList(SingleObjectDeleter);
        __fontList->Construct();
        GetFontList(*__fontList);
-
        CreateTableView();
-
+       __pTableView->UpdateTableView();
+       __pTableView->CollapseGroup(ID_GROUP_FONT_LIST);
+       SettingInfo::AddSettingEventListener(*this);
        AppLogDebug("ENTER");
 
        return E_SUCCESS;
@@ -114,6 +118,8 @@ FontForm::OnTerminating(void)
        __pTableView = null;
        delete __fontList;
        __fontList = null;
+
+       SettingInfo::RemoveSettingEventListener(*this);
        SetFormBackEventListener(null);
        return E_SUCCESS;
 }
@@ -121,7 +127,6 @@ FontForm::OnTerminating(void)
 void
 FontForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       __pTableView->UpdateTableView();
        if (pArgs != null)
        {
                __categoryCheck = static_cast<String*>(pArgs->GetAt(0))->GetPointer();
@@ -139,9 +144,9 @@ FontForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, c
                                __pTableView->SetItemEnabled(ID_GROUP_FONT, ID_ITEM_FONT_TYPE, false);
                        }
                }
-               __pTableView->UpdateTableView();
                delete pArgs;
        }
+       __pTableView->Draw(true);
 
        String currentFontType;
 
@@ -159,7 +164,8 @@ FontForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, c
                }
                AppLogDebug("Get Font Type[%ls] :Result[%s]", currentFontType.GetPointer(), GetErrorMessage(GetLastResult()));
        }
-       __pTableView->CollapseGroup(ID_GROUP_FONT_LIST);
+       __pTableView->RefreshItem(ID_GROUP_FONT_SIZE, ID_ITEM_FONT_SIZE, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       __pTableView->RefreshItem(ID_GROUP_FONT_LIST, ID_ITEM_FONT_TYPE, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
 }
 
 void
@@ -173,6 +179,7 @@ FontForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
+       __pTableView->CollapseGroup(ID_GROUP_FONT_LIST);
        if (GetAppControlRequest() == true)
        {
                UiApp* pApp = UiApp::GetInstance();
@@ -317,11 +324,6 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        case ID_GROUP_FONT:
                {
                        style = TABLE_VIEW_ANNEX_STYLE_DETAILED;
-                       if ((SettingInfo::GetValue(SETTING_INFO_KEY_FONT_TYPE, fontReturnValue)) == E_SUCCESS)
-                       {
-                               secondLineText = fontReturnValue;
-                       }
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FONT_TYPE");
                }
                break;
 
@@ -330,45 +332,6 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        String currentFontType;
                        isTwoLineText = false;
                        style = TABLE_VIEW_ANNEX_STYLE_RADIO;
-                       itemText = static_cast<String*>(__fontList->GetAt(itemIndex))->GetPointer();
-
-                       if (SettingInfo::GetValue(SETTING_INFO_KEY_FONT_TYPE, currentFontType) == E_SUCCESS)
-                       {
-                               if (itemText.Equals(currentFontType, false))
-                               {
-                                       __pTableView->SetItemChecked(groupIndex, itemIndex, true);
-                               }
-                       }
-                       AppLogDebug("Get Font Type[%ls] :Result[%s]", currentFontType.GetPointer(), GetErrorMessage(GetLastResult()));
-               }
-               break;
-
-       case ID_GROUP_FONT_SIZE:
-               {
-                       if ((SettingInfo::GetValue(SETTING_INFO_KEY_FONT_SIZE, fontReturnValue)) == E_SUCCESS)
-                       {
-                               if (fontReturnValue.Equals(L"giant", false))
-                               {
-                                       secondLineText = ResourceManager::GetString(L"IDS_EMAIL_POP_GIANT_M_TEXTSIZE");
-                               }
-                               else if (fontReturnValue.Equals(L"huge", false))
-                               {
-                                       secondLineText = ResourceManager::GetString(L"IDS_EMAIL_OPT_HUGE_M_TEXTSIZE");
-                               }
-                               else if (fontReturnValue.Equals(L"large", false))
-                               {
-                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_TEXTSTYLE_LARGE");
-                               }
-                               else if (fontReturnValue.Equals(L"medium", false))
-                               {
-                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
-                               }
-                               else
-                               {
-                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_SMALL_M_TEXTSIZE");
-                               }
-                       }
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FONT_SIZE");
                }
                break;
 
@@ -376,6 +339,8 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
        }
 
+       GetTableViewItemString(groupIndex, itemIndex, itemText, secondLineText);
+
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
 
        if (isTwoLineText == true )
@@ -396,7 +361,14 @@ FontForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               if (style == TABLE_VIEW_ANNEX_STYLE_DETAILED)
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
+               }
+               else
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               }
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
@@ -508,7 +480,7 @@ FontForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableVi
                        String fontGetValue;
                        fontReturnValue = static_cast<String*>(__fontList->GetAt(itemIndex))->GetPointer();
 
-                       tableView.UpdateTableView();
+//                     tableView.UpdateTableView();
 
                        for (int count = 0; count < listCount; count++)
                        {
@@ -568,6 +540,57 @@ FontForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupIte
 void
 FontForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
+       Rectangle firstLine;
+       Rectangle secondLine;
+       Rectangle pItemBounds = pItem->GetBounds();
+       int fontSize = GetFontSize();
+
+       switch (groupIndex)
+       {
+       case ID_GROUP_FONT:
+               // fall through
+       case ID_GROUP_FONT_SIZE:
+               {
+                       ItemTypeTwoLine(firstLine, secondLine, fontSize);
+
+                       pItemBounds.height = firstLine.height + secondLine.height;
+                       pItem->SetBounds(pItemBounds);
+                       Label* pFirstLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_FIRST_CONTROL));
+                       Label* pSecondLabel = static_cast<Label*>(pItem->GetControl(FONT_FORM_SECOND_CONTROL));
+
+                       pFirstLabel->SetBounds(firstLine);
+                       pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+                       pSecondLabel->SetBounds(secondLine);
+                       pSecondLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
+
+                       String firstLineText = L"";
+                       String secondLineText = L"";
+
+                       GetTableViewItemString(groupIndex, itemIndex, firstLineText, secondLineText);
+                       pFirstLabel->SetText(firstLineText);
+                       pSecondLabel->SetText(secondLineText);
+
+                       pFirstLabel->Invalidate(false);
+                       pSecondLabel->Invalidate(false);
+                       pItem->Invalidate(false);
+               }
+               break;
+
+       case ID_GROUP_FONT_LIST:
+               {
+                       ItemTypeOneLine(firstLine);
+                       Label* pFirstLabel = static_cast<Label*>(pItem->GetControl(0));
+                       pFirstLabel->SetBounds(firstLine);
+                       pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+                       pFirstLabel->Invalidate(false);
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       Invalidate(true);
 }
 
 void
@@ -711,6 +734,82 @@ FontForm::GetFontList(Tizen::Base::Collection::IList& list)
        return E_SUCCESS;
 }
 
+void
+FontForm::GetTableViewItemString(int groupIndex, int itemIndex, Tizen::Base::String& firstLineText, Tizen::Base::String& secondLineText)
+{
+       switch (groupIndex)
+       {
+       case ID_GROUP_FONT:
+               {
+                       String fontReturnValue;
+                       if ((SettingInfo::GetValue(SETTING_INFO_KEY_FONT_TYPE, fontReturnValue)) == E_SUCCESS)
+                       {
+                               secondLineText = fontReturnValue;
+                       }
+                       firstLineText = ResourceManager::GetString(L"IDS_ST_BODY_FONT_TYPE");
+               }
+               break;
+
+       case ID_GROUP_FONT_LIST:
+               {
+                       firstLineText = static_cast<String*>(__fontList->GetAt(itemIndex))->GetPointer();
+                       secondLineText = L"";
+               }
+               break;
+
+       case ID_GROUP_FONT_SIZE:
+               {
+                       String fontReturnValue;
+                       if ((SettingInfo::GetValue(SETTING_INFO_KEY_FONT_SIZE, fontReturnValue)) == E_SUCCESS)
+                       {
+                               if (fontReturnValue.Equals(L"giant", false))
+                               {
+                                       secondLineText = ResourceManager::GetString(L"IDS_EMAIL_POP_GIANT_M_TEXTSIZE");
+                               }
+                               else if (fontReturnValue.Equals(L"huge", false))
+                               {
+                                       secondLineText = ResourceManager::GetString(L"IDS_EMAIL_OPT_HUGE_M_TEXTSIZE");
+                               }
+                               else if (fontReturnValue.Equals(L"large", false))
+                               {
+                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_TEXTSTYLE_LARGE");
+                               }
+                               else if (fontReturnValue.Equals(L"medium", false))
+                               {
+                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_FONTTYPE_NORMAL");
+                               }
+                               else
+                               {
+                                       secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_SMALL_M_TEXTSIZE");
+                               }
+                       }
+                       firstLineText = ResourceManager::GetString(L"IDS_ST_BODY_FONT_SIZE");
+               }
+               break;
+
+       default:
+               break;
+       }
+}
+
+void
+FontForm::OnSettingChanged (Tizen::Base::String &key)
+{
+       AppLogDebug("FontForm::key changed [%ls]", key.GetPointer());
+
+       int groupCount = __pTableView->GetGroupCount();
+
+       for (int i = 0; i < groupCount; i++)
+       {
+               int itemCount = __pTableView->GetItemCountAt(i);
+
+               for (int j = 0; j < itemCount; j++)
+               {
+                       __pTableView->RefreshItem(i, j, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               }
+       }
+}
+
 bool
 FontForm::GetAppControlRequest(void)
 {

diff --git a/src/StFontSizeForm.cpp b/src/StFontSizeForm.cpp
index 9fb2e8f..5abefa0 100644 (file)
--- a/src/StFontSizeForm.cpp
+++ b/src/StFontSizeForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -441,7 +441,8 @@ FontSizeForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                        tableView.SetItemChecked(localGroup, localItem, false);
                }
        }
-       tableView.UpdateTableView();
+       RefreshAllItem();
+       __pTableView->ScrollToItem(groupIndex, itemIndex);
 }
 
 int
@@ -479,9 +480,10 @@ FontSizeForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGrou
        int itemHeight = GetHeightForStringArea(groupText, clientRect.width, fontSize);
 
        itemRect.height = itemHeight + H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
-
+       pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetBounds(clientRect.x, H_GROUP_INDEX_HELP_TEXT_TOP_GAP, clientRect.width, itemHeight);
        pItem->SetBounds(itemRect);
+       Invalidate(true);
 }
 
 void
@@ -500,6 +502,35 @@ FontSizeForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::Group
 }
 
 void
+FontSizeForm::RefreshAllItem(void)
+{
+       int groupCount = __pTableView->GetGroupCount();
+
+       for (int count = 0; count < groupCount; count++)
+       {
+               RefreshGroupAt(count);
+//             RefreshGroupItemAt(count);
+       }
+}
+
+void
+FontSizeForm::RefreshGroupAt(int groupIndex)
+{
+       __pTableView->RefreshItem(groupIndex, -1, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+}
+
+void
+FontSizeForm::RefreshGroupItemAt(int groupIndex)
+{
+       int itemCount = __pTableView->GetItemCountAt(groupIndex);
+
+       for (int count = 0; count < itemCount; count++)
+       {
+               __pTableView->RefreshItem(groupIndex, count, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       }
+}
+
+void
 FontSizeForm::AppControlFontResult(void)
 {
        RequestId reqId = 0;

diff --git a/src/StFormFactory.cpp b/src/StFormFactory.cpp
index d0235f8..3a0630f 100644 (file)
--- a/src/StFormFactory.cpp
+++ b/src/StFormFactory.cpp
@@ -44,6 +44,8 @@
 #include "StLocationForm.h"
 #include "StLocationHelpForm.h"
 #include "StMainMenuForm.h"
+#include "StManageApplicationForm.h"
+#include "StManageApplicationInfoForm.h"
 #include "StMemoryForm.h"
 #include "StMemoryStatusForm.h"
 #include "StMoreConnectivityForm.h"
@@ -57,6 +59,10 @@
 #include "StSoundsForm.h"
 #include "StTimeZoneForm.h"
 #include "StKeyboardInfoForm.h"
+#include "StWallpaperAlbumListForm.h"
+#include "StWallpaperAlbumListDetailForm.h"
+#include "StWallpaperForm.h"
+#include "StWallpaperImageSelectForm.h"
 #include "StWifiApDetailForm.h"
 #include "StWifiConnectionForm.h"
 #include "StWifiDirectAboutForm.h"
@@ -88,6 +94,9 @@ const wchar_t* IDSCN_SYNCHRONISES = L"Synchronises";
 
 const wchar_t* IDSCN_NOTIFICATION = L"Notification";
 const wchar_t* IDSCN_WALLPAPER = L"Wallpaper";
+const wchar_t* IDSCN_WALLPAPER_ALBUM_LIST = L"WallpaperAlbumList";
+const wchar_t* IDSCN_WALLPAPER_ALBUM_LIST_DETAIL = L"WallpaperAlbumListDetail";
+const wchar_t* IDSCN_WALLPAPER_IMAGE_SELECT = L"WallpaperImageSelect";
 const wchar_t* IDSCN_SOUNDS = L"Sounds";
 const wchar_t* IDSCN_BRIGHTNESS = L"Brightness";
 const wchar_t* IDSCN_SECURITY = L"Security";
@@ -119,6 +128,8 @@ const wchar_t* IDSCN_CERTIFICATE_USER = L"CertificateUser";
 const wchar_t* IDSCN_CERTIFICATE_USER_INSTALL = L"CertificateUserInstall";
 const wchar_t* IDSCN_CERTIFICATE_USER_INSTALL_PASSWORD = L"CertificateUserInstallPassword";
 const wchar_t* IDSCN_CERTIFICATE_USER_UNINSTALL = L"CertificateUserUnInstall";
+const wchar_t* IDSCN_MANAGE_APPLICATION = L"ManageApplication";
+const wchar_t* IDSCN_MANAGE_APPLICATION_INFO = L"ManageApplicationInfo";
 
 const wchar_t* IDSCN_ACCOUNTS = L"Accounts";
 const wchar_t* IDSCN_PHONE = L"Phone";
@@ -156,6 +167,9 @@ const wchar_t* IDC_FORM_SYNCHRONOISES = L"SynchroniseForm";
 
 const wchar_t* IDC_FORM_NOTIFICATION = L"NotificationForm";
 const wchar_t* IDC_FORM_WALLPAPER = L"WallpaperForm";
+const wchar_t* IDC_FORM_WALLPAPER_ALBUM_LIST = L"WallpaperAlbumListForm";
+const wchar_t* IDC_FORM_WALLPAPER_ALBUM_LIST_DETAIL = L"WallpaperAlbumListDetailForm";
+const wchar_t* IDC_FORM_WALLPAPER_IMAGE_SELECT= L"WallpaperImageSelectForm";
 const wchar_t* IDC_FORM_SOUNDS = L"SoundsForm";
 const wchar_t* IDC_FORM_BRIGHTNESS = L"BrightnessForm";
 const wchar_t* IDC_FORM_SECURITY = L"SecurityForm";
@@ -187,6 +201,8 @@ const wchar_t* IDC_FORM_CERTIFICATE_USER = L"CertificateUserForm";
 const wchar_t* IDC_FORM_CERTIFICATE_USER_INSTALL = L"CertificateUserInstallForm";
 const wchar_t* IDC_FORM_CERTIFICATE_USER_INSTALL_PASSWORD = L"CertificateUserInstallPasswordForm";
 const wchar_t* IDC_FORM_CERTIFICATE_USER_UNINSTALL = L"CertificateUserUnInstallForm";
+const wchar_t* IDC_FORM_MANAGE_APPLICATION = L"ManageApplicationForm";
+const wchar_t* IDC_FORM_MANAGE_APPLICATION_INFO = L"ManageApplicationInfoForm";
 
 const wchar_t* IDC_FORM_ACCOUNTS = L"AccountsForm";
 const wchar_t* IDC_FORM_PHONE = L"PhoneForm";
@@ -297,6 +313,34 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                pSceneManager->AddSceneEventListener(sceneId, *pForm);
                pNewForm = pForm;
        }
+       else if (formId == IDC_FORM_WALLPAPER)
+       {
+               WallpaperForm* pForm = new (std::nothrow) WallpaperForm();
+               pForm->Initialize();
+               pSceneManager->AddSceneEventListener(sceneId, *pForm);
+               pNewForm = pForm;
+       }
+       else if (formId == IDC_FORM_WALLPAPER_ALBUM_LIST)
+       {
+               WallpaperAlbumListForm* pForm = new (std::nothrow) WallpaperAlbumListForm();
+               pForm->Initialize();
+               pSceneManager->AddSceneEventListener(sceneId, *pForm);
+               pNewForm = pForm;
+       }
+       else if (formId == IDC_FORM_WALLPAPER_ALBUM_LIST_DETAIL)
+       {
+               WallpaperAlbumListDetailForm* pForm = new (std::nothrow) WallpaperAlbumListDetailForm();
+               pForm->Initialize();
+               pSceneManager->AddSceneEventListener(sceneId, *pForm);
+               pNewForm = pForm;
+       }
+       else if (formId == IDC_FORM_WALLPAPER_IMAGE_SELECT)
+       {
+               WallpaperImageSelectForm* pForm = new (std::nothrow) WallpaperImageSelectForm();
+               pForm->Initialize();
+               pSceneManager->AddSceneEventListener(sceneId, *pForm);
+               pNewForm = pForm;
+       }
        else if (formId == IDC_FORM_BRIGHTNESS)
        {
                BrightnessForm* pForm = new (std::nothrow) BrightnessForm();
@@ -479,6 +523,20 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
                pSceneManager->AddSceneEventListener(sceneId, *pForm);
                pNewForm = pForm;
        }
+       else if (formId == IDC_FORM_MANAGE_APPLICATION)
+       {
+               ManageApplicationForm* pForm = new (std::nothrow) ManageApplicationForm();
+               pForm->Initialize();
+               pSceneManager->AddSceneEventListener(sceneId, *pForm);
+               pNewForm = pForm;
+       }
+       else if (formId == IDC_FORM_MANAGE_APPLICATION_INFO)
+       {
+               ManageApplicationInfoForm* pForm = new (std::nothrow) ManageApplicationInfoForm();
+               pForm->Initialize();
+               pSceneManager->AddSceneEventListener(sceneId, *pForm);
+               pNewForm = pForm;
+       }
        else if (formId == IDC_FORM_LOCATION_HELP)
        {
                LocationHelpForm* pForm = new (std::nothrow) LocationHelpForm();

diff --git a/src/StKeyboardInfoForm.cpp b/src/StKeyboardInfoForm.cpp
index 82a48d1..f359cb0 100644 (file)
--- a/src/StKeyboardInfoForm.cpp
+++ b/src/StKeyboardInfoForm.cpp
@@ -104,36 +104,49 @@ KeyboardInfoForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSc
        CreateHeader(headerName);
        CreateFooter();
 
+       if (__pTableView != null)
+       {
+               __pTableView->RemoveAllControls();
+               __pTableView = null;
+       }
+       RemoveAllControls();
        if (pLangList->GetCount() != 0)
        {
                CreateTableView();
        }
        else
        {
-               Rectangle clientRect = GetClientAreaBounds();
-               Bitmap* pBitmp = ResourceManager::GetBitmapN(IDB_NO_CONTENTS);
-               int bitmapWidth = pBitmp->GetWidth();
-               int bitmapHeight = pBitmp->GetHeight();
-               int xPos = (clientRect.width / LINE_COUNT_2) - (bitmapWidth / DEVIDE_TWO);
-               int yPos = (clientRect.height / LINE_COUNT_2) - (bitmapHeight / DEVIDE_TWO);
-               String labelText = ResourceManager::GetString(L"IDS_ST_BODY_NO_CONTENT");
-               Color textColor = COLOR_HELP_TEXT_TYPE_03_NORMAL;
-
-               Label* pLabel = new (std::nothrow) Label();
-               pLabel->Construct(Rectangle(xPos, yPos, bitmapWidth, bitmapHeight), L"");
-               pLabel->SetName(NO_CONTENTS);
-               pLabel->SetBackgroundBitmap(*pBitmp);
-
-               yPos = yPos + (bitmapHeight / DEVIDE_TWO);
-
-               Label* pLabelNoContents = new (std::nothrow) Label();
-               pLabelNoContents->Construct(Rectangle(xPos, yPos, bitmapWidth, bitmapHeight), L"");
-               pLabelNoContents->SetName(NO_CONTENTS_TEXT);
-               pLabelNoContents->SetTextColor(textColor);
-               pLabelNoContents->SetText(labelText);
-
-               AddControl(*pLabel);
-               AddControl(*pLabelNoContents);
+               Label* pLabel = static_cast<Label*>(this->GetControl(NO_CONTENTS, false));
+               if (pLabel == null)
+               {
+                       Rectangle clientRect = GetClientAreaBounds();
+                       Bitmap* pBitmp = ResourceManager::GetBitmapN(IDB_NO_CONTENTS);
+
+                       int bitmapWidth = pBitmp->GetWidth();
+                       int bitmapHeight = pBitmp->GetHeight();
+                       String labelText = ResourceManager::GetString(L"IDS_ST_BODY_NO_CONTENT");
+                       Color textColor = COLOR_HELP_TEXT_TYPE_03_NORMAL;
+                       int noContentTextHeight = GetHeightForStringArea(labelText, bitmapWidth, 32);
+
+                       int xPos = (clientRect.width / LINE_COUNT_2) - (bitmapWidth / DEVIDE_TWO);
+                       int yPos = (clientRect.height / LINE_COUNT_2) - ((bitmapHeight + noContentTextHeight) / DEVIDE_TWO);
+
+                       Label* pLabel = new (std::nothrow) Label();
+                       pLabel->Construct(Rectangle(xPos, yPos, bitmapWidth, bitmapHeight), L"");
+                       pLabel->SetName(NO_CONTENTS);
+                       pLabel->SetBackgroundBitmap(*pBitmp);
+
+                       yPos = yPos + bitmapHeight;
+
+                       Label* pLabelNoContents = new (std::nothrow) Label();
+                       pLabelNoContents->Construct(Rectangle(0, yPos, clientRect.width, noContentTextHeight), L"");
+                       pLabelNoContents->SetName(NO_CONTENTS_TEXT);
+                       pLabelNoContents->SetTextColor(textColor);
+                       pLabelNoContents->SetText(labelText);
+
+                       AddControl(*pLabel);
+                       AddControl(*pLabelNoContents);
+               }
        }
 }
 
@@ -237,6 +250,8 @@ KeyboardInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        pLabel->SetTextColor(COLOR_MAIN_TEXT);
 
        pItem->AddControl(*pLabel);
+       pItem->SetIndividualSelectionEnabled(pLabel, true);
+
        relativeLayout.SetMargin(*pLabel, 0, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
        relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
@@ -349,14 +364,16 @@ KeyboardInfoForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::
        {
                Rectangle clientRect = GetClientAreaBounds();
                Rectangle labelBound = pLabel->GetBounds();
+
                int xPos = (clientRect.width / LINE_COUNT_2) - (labelBound.width / LINE_COUNT_2);
-               int yPos = (clientRect.height / LINE_COUNT_2) - (labelBound.height / LINE_COUNT_2);
+               int yPos = (clientRect.height / LINE_COUNT_2) -(labelBound.height / LINE_COUNT_2);
+
                pLabel->SetBounds(Rectangle(xPos, yPos, labelBound.width, labelBound.height));
-               yPos = yPos + (pLabel->GetBounds().height / DEVIDE_TWO);
+               yPos = yPos + pLabel->GetBounds().height;
                Label* pTextLabel = static_cast<Label*>(this->GetControl(NO_CONTENTS_TEXT, false));
                if (pTextLabel != null)
                {
-                       pTextLabel->SetBounds(Rectangle(xPos, yPos, labelBound.width, labelBound.height));
+                       pTextLabel->SetBounds(Rectangle(0, yPos, clientRect.width, pTextLabel->GetBounds().height));
                }
        }
        Invalidate(true);

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index b1f3fc1..336bdf8 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -464,7 +464,8 @@ LocaleForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
        Header* pHeader = GetHeader();
        pHeader->SetTitleText(ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_REGION_ABB"));
 
-       __pTableView->UpdateTableView();
+       __pTableView->Draw();
+       RefreshTableViewItem();
 }
 
 void
@@ -840,11 +841,184 @@ LocaleForm::GetDefaultItemHeight(void)
 void
 LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem)
 {
+       switch (groupIndex)
+       {
+       case ID_GROUP_LANGUAGE_AND_REGION_MAIN_TEXT:
+               {
+                       Rectangle pItemBounds = pItem->GetBounds();
+                       Label* pGroupLabel = static_cast<Label*>(pItem->GetControl(0));
+                       String groupText;
+                       String formattedString;
+                       String numberFormat;
+                       long inputNumber = DEFAULT_INPUT_NUMBER;
+                       int fontSize = GetFontSize();
+
+                       LocaleManager localeManager;
+                       localeManager.Construct();
+
+                       Locale systemLocale = localeManager.GetSystemLocale();
+                       NumberFormatter* pNumberFormatter = NumberFormatter::CreateCurrencyFormatterN(systemLocale);
+                       DateTimeFormatter* pDateFormatter = DateTimeFormatter::CreateDateFormatterN(systemLocale);
+
+                       DateTime dateTime;
+                       SystemTime::GetCurrentTime(dateTime);
+
+                       groupText = ResourceManager::GetString(L"IDS_ST_BODY_REGIONAL_EXAMPLE");
+
+                       if (pDateFormatter)
+                       {
+                               pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
+                               pDateFormatter->Format(dateTime, formattedString);
+                               formattedString = L"Date : " + formattedString;
+                               groupText.Insert(L"\n" + formattedString, groupText.GetLength());
+
+                               formattedString.Remove(0, formattedString.GetLength());
+                               pDateFormatter->ApplyPattern("HH : mm aa");
+                               pDateFormatter->Format(dateTime, formattedString);
+                               formattedString = L"Time : " + formattedString;
+                               groupText.Insert(L"\n" + formattedString, groupText.GetLength());
+
+                               formattedString.Remove(0, formattedString.GetLength());
+                               pNumberFormatter->Format(inputNumber, formattedString);
+                               formattedString = L"Number : " + formattedString;
+                               groupText.Insert(L"\n" + formattedString, groupText.GetLength());
+                       }
+                       pItemBounds.height = (((fontSize * H_HELP_TEXT_GAP)* LINE_COUNT_3) + H_GROUP_INDEX_NO_TITLE_TEXT_GAP);
+
+                       pItem->SetBounds(pItemBounds);
+                       pGroupLabel->SetText(groupText);
+                       pGroupLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+                       pGroupLabel->Invalidate(false);
+                       pItem->Invalidate(false);
+               }
+               break;
+
+       default:
+               break;
+       }
 }
 
 void
 LocaleForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
+       switch (groupIndex)
+       {
+       case ID_GROUP_LANGUAGE_AND_REGION_MAIN:
+               {
+                       String firstLineText;
+                       String secondLineText;
+                       Rectangle firstLineRect;
+                       Rectangle secondLineRect;
+                       Rectangle pItemBounds = pItem->GetBounds();
+                       Label* pFirstLabel = static_cast<Label*>(pItem->GetControl(0));
+                       Label* pSecondLabel = static_cast<Label*>(pItem->GetControl(1));
+                       int fontSize = GetFontSize();
+
+                       ItemTypeTwoLine(firstLineRect, secondLineRect, fontSize);
+                       pItemBounds.height = (firstLineRect.height + secondLineRect.height);
+
+                       switch (itemIndex)
+                       {
+                       case ID_ITEM_LANGUAGE_AND_REGION_MAIN_DISPLAY_LANGUAGE:
+                               {
+                                       firstLineText = ResourceManager::GetString(L"IDS_ST_HEADER_DISPLAY_LANGUAGE");
+
+                                       if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, secondLineText) != E_SUCCESS)
+                                       {
+                                               AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
+                                       }
+                                       else
+                                       {
+                                               for (int i = 0; i< ID_GROUP_LANGUAGE_ITEM_COUNT; i++)
+                                               {
+                                                       if (secondLineText.Equals(languageCode[i], false))
+                                                       {
+                                                               String* pKey = static_cast<String*>(__languageDataList->GetAt(i));
+
+                                                               StringTokenizer stringTokenizer(*pKey, L"/");
+                                                               stringTokenizer.GetNextToken(secondLineText);
+                                                               break;
+                                                       }
+                                               }
+                                       }
+                                       pItem->SetBounds(pItemBounds);
+                                       pFirstLabel->SetText(firstLineText);
+                                       pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+
+                                       pSecondLabel->SetText(secondLineText);
+                                       pSecondLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
+
+                                       pFirstLabel->Invalidate(false);
+                                       pSecondLabel->Invalidate(false);
+                                       pItem->Invalidate(false);
+                               }
+                               break;
+
+                       case ID_ITEM_LANGUAGE_AND_REGION_MAIN_REGION:
+                               {
+                                       LocaleManager localeManager;
+                                       localeManager.Construct();
+                                       Locale locale = localeManager.GetSystemLocale();
+                                       String systemLocaleString;
+
+                                       firstLineText = ResourceManager::GetString(L"IDS_ST_BODY_REGION");
+
+                                       String localeLanguage;
+                                       if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_LANGUAGE, localeLanguage) != E_SUCCESS)
+                                       {
+                                               AppLogDebug("GetValue: SETTING_INFO_KEY_LOCALE_LANGUAGE failed [%s]", GetErrorMessage(GetLastResult()));
+                                               localeLanguage = L"eng_GB";
+                                       }
+
+                                       LanguageCode langCode = LANGUAGE_INVALID;
+                                       CountryCode countryCode = COUNTRY_INVALID;
+                                       StringTokenizer strTok(localeLanguage, L"_");
+                                       String token;
+
+                                       if (strTok.HasMoreTokens())
+                                       {
+                                               strTok.GetNextToken(token);
+                                               langCode = Locale::StringToLanguageCode(token);
+                                       }
+
+                                       if (strTok.HasMoreTokens())
+                                       {
+                                               strTok.GetNextToken(token);
+                                               countryCode = Locale::StringToCountryCode(token);
+                                       }
+
+                                       Locale currentLocale(langCode, countryCode);
+
+                                       locale.GetLanguageName(currentLocale, systemLocaleString);
+                                       secondLineText.Append(systemLocaleString + L"(");
+                                       systemLocaleString.Remove(0, systemLocaleString.GetLength());
+
+                                       locale.GetCountryName(currentLocale, systemLocaleString);
+                                       secondLineText.Append(systemLocaleString + L")");
+                                       systemLocaleString.Remove(0, systemLocaleString.GetLength());
+
+                                       pItem->SetBounds(pItemBounds);
+                                       pFirstLabel->SetText(firstLineText);
+                                       pFirstLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+
+                                       pSecondLabel->SetText(secondLineText);
+                                       pSecondLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
+
+                                       pFirstLabel->Invalidate(false);
+                                       pSecondLabel->Invalidate(false);
+                                       pItem->Invalidate(false);
+                               }
+                               break;
+
+                       default:
+                               break;
+                       }
+               }
+               break;
+
+       default:
+               break;
+       }
 }
 
 void
@@ -855,4 +1029,31 @@ LocaleForm::OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Contr
 void
 LocaleForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
 {
+}
+
+void
+LocaleForm::RefreshTableViewGroupItem(int groupIndex)
+{
+       int itemCount = __pTableView->GetItemCountAt(groupIndex);
+
+       for (int index = -1; index < itemCount; index++)
+       {
+               __pTableView->RefreshItem(groupIndex, index, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       }
+}
+
+void
+LocaleForm::RefreshTableViewItem(void)
+{
+       if (__pTableView == null)
+       {
+               return;
+       }
+
+       int groupCount = __pTableView->GetGroupCount();
+
+       for (int index = 0; index < groupCount; index++)
+       {
+               RefreshTableViewGroupItem(index);
+       }
 }
\ No newline at end of file

diff --git a/src/StLanguageForm.cpp b/src/StLanguageForm.cpp
index 5d0b813..5bbb7d3 100644 (file)
--- a/src/StLanguageForm.cpp
+++ b/src/StLanguageForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -42,6 +42,7 @@ static const int ITEM_WIDTH_GAP = 100;
 static const int ID_GROUP_LANGUAGE_ITEM_COUNT = 49;
 
 LocaleLanguageForm::LocaleLanguageForm(void)
+       : __pLanguageDataList(null)
 {
 }
 
@@ -78,8 +79,8 @@ LocaleLanguageForm::OnTerminating(void)
        SettingInfo::RemoveSettingEventListener(*this);
        __pTableView = null;
 
-       delete __languageDataList;
-       __languageDataList = null;
+       delete __pLanguageDataList;
+       __pLanguageDataList = null;
 
        SetFormBackEventListener(null);
        return E_SUCCESS;
@@ -92,7 +93,7 @@ LocaleLanguageForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
 
        if (pArgs != null)
        {
-               __languageDataList = static_cast<ArrayList*>(pArgs->GetItemsN(0, pArgs->GetCount()));
+               __pLanguageDataList = static_cast<ArrayList*>(pArgs->GetItemsN(0, pArgs->GetCount()));
        }
        __pTableView->UpdateTableView();
 }
@@ -114,6 +115,12 @@ LocaleLanguageForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 int
 LocaleLanguageForm::GetGroupCount(void)
 {
+       // Temporary code due to the UI Framework defect
+       if (!__pLanguageDataList)
+       {
+               return 0;
+       }
+
        AppLogDebug("ENTER");
        return ID_GROUP_COUNT;
 }
@@ -121,7 +128,13 @@ LocaleLanguageForm::GetGroupCount(void)
 int
 LocaleLanguageForm::GetItemCount(int groupIndex)
 {
-       int itemCount = __languageDataList->GetCount();
+       // Temporary code due to the UI Framework defect
+       if (!__pLanguageDataList)
+       {
+               return 0;
+       }
+
+       int itemCount = __pLanguageDataList->GetCount();
 
        AppLogDebug("GetItemCount %d", itemCount);
 
@@ -183,7 +196,7 @@ LocaleLanguageForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        Label* pLabel = null;
        int fontSize = GetFontSize();
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       String* pKey = static_cast<String*>(__languageDataList->GetAt(itemIndex));
+       String* pKey = static_cast<String*>(__pLanguageDataList->GetAt(itemIndex));
 
        ItemTypeOneLine(itemRectangle);
        itemWidth = itemRectangle.width;
@@ -243,7 +256,7 @@ LocaleLanguageForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::Grou
        AppAssert(pSceneManager);
 
        String langCode;
-       String* pKey = static_cast<String*>(__languageDataList->GetAt(itemIndex));
+       String* pKey = static_cast<String*>(__pLanguageDataList->GetAt(itemIndex));
 
        StringTokenizer stringTokenizer(*pKey, L"/");
 

diff --git a/src/StLocationForm.cpp b/src/StLocationForm.cpp
index bc27c36..18ac461 100644 (file)
--- a/src/StLocationForm.cpp
+++ b/src/StLocationForm.cpp
@@ -69,7 +69,7 @@ static const int ID_FOOTER_ITEM_INDEX_2 = 1;
 static const int IDA_FOOTER_ITEM_HELP = 100;
 
 static const int W_RESIZE_LABEL_GAP = 170;
-static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 106;
+static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 120;
 
 LocationForm::LocationForm(void)
        : __isAppControlRequest(false)

diff --git a/src/StMainFrame.cpp b/src/StMainFrame.cpp
index c0b012c..ae59545 100644 (file)
--- a/src/StMainFrame.cpp
+++ b/src/StMainFrame.cpp
@@ -70,6 +70,9 @@ MainFrame::OnInitializing(void)
 
        pSceneManager->RegisterScene(IDSCN_NOTIFICATION, IDC_FORM_NOTIFICATION, L"");
        pSceneManager->RegisterScene(IDSCN_WALLPAPER, IDC_FORM_WALLPAPER, L"");
+       pSceneManager->RegisterScene(IDSCN_WALLPAPER_ALBUM_LIST, IDC_FORM_WALLPAPER_ALBUM_LIST, L"");
+       pSceneManager->RegisterScene(IDSCN_WALLPAPER_ALBUM_LIST_DETAIL, IDC_FORM_WALLPAPER_ALBUM_LIST_DETAIL, L"");
+       pSceneManager->RegisterScene(IDSCN_WALLPAPER_IMAGE_SELECT, IDC_FORM_WALLPAPER_IMAGE_SELECT, L"");
        pSceneManager->RegisterScene(IDSCN_SOUNDS, IDC_FORM_SOUNDS, L"");
        pSceneManager->RegisterScene(IDSCN_BRIGHTNESS, IDC_FORM_BRIGHTNESS, L"");
        pSceneManager->RegisterScene(IDSCN_SECURITY, IDC_FORM_SECURITY, L"");
@@ -101,6 +104,8 @@ MainFrame::OnInitializing(void)
        pSceneManager->RegisterScene(IDSCN_SCREEN_LOCK_TYPE, IDC_FORM_SCREEN_LOCK_TYPE, L"");
        pSceneManager->RegisterScene(IDSCN_LOCK_SCREEN, IDC_FORM_LOCK_SCREEN, L"");
        pSceneManager->RegisterScene(IDSCN_SCREEN_MODE, IDC_FORM_SCREEN_MODE, L"");
+       pSceneManager->RegisterScene(IDSCN_MANAGE_APPLICATION, IDC_FORM_MANAGE_APPLICATION, L"");
+       pSceneManager->RegisterScene(IDSCN_MANAGE_APPLICATION_INFO, IDC_FORM_MANAGE_APPLICATION_INFO, L"");
 
        pSceneManager->RegisterScene(IDSCN_ACCOUNTS, IDC_FORM_ACCOUNTS, L"");
        pSceneManager->RegisterScene(IDSCN_PHONE, IDC_FORM_PHONE, L"");

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index 4c9eb7f..8c2cd2d 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -67,18 +67,20 @@ static const int ID_ITEM_CONNECTIVITY_BLUETOOTH = 4;
 static const int ID_GROUP_SYSTEM = 1;
 
 #ifdef DISPLAY_SETTING_MENU_FOR_R0
-static const int ID_ALL_SYSTEM_ITEM_COUNT = 8;
-static const int ID_FREQUENTLY_SYSTEM_ITEM_COUNT = 2;
-
-static const int ID_ITEM_SYSTEM_SOUND = 0;
-static const int ID_ITEM_SYSTEM_MORESETTINGS = 1;
-static const int ID_ITEM_SYSTEM_FONT = 1;
-static const int ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN = 2;
-static const int ID_ITEM_SYSTEM_DATE_AND_TIME = 3;
-static const int ID_ITEM_SYSTEM_LANGUAGE_AND_REGION = 4;
-static const int ID_ITEM_SYSTEM_KEYBOARD = 5;
-static const int ID_ITEM_SYSTEM_DEVELOPER_OPTION = 6;
-static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 7;
+static const int ID_ALL_SYSTEM_ITEM_COUNT = 9;
+static const int ID_FREQUENTLY_SYSTEM_ITEM_COUNT = 3;
+
+static const int ID_ITEM_SYSTEM_WALLPAPER = 0;
+static const int ID_ITEM_SYSTEM_SOUND = 1;
+static const int ID_ITEM_SYSTEM_MORESETTINGS = 2;
+static const int ID_ITEM_SYSTEM_FONT = 2;
+static const int ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN = 3;
+static const int ID_ITEM_SYSTEM_DATE_AND_TIME = 4;
+static const int ID_ITEM_SYSTEM_LANGUAGE_AND_REGION = 5;
+static const int ID_ITEM_SYSTEM_KEYBOARD = 6;
+static const int ID_ITEM_SYSTEM_MANAGE_APPLICATION = 7;
+static const int ID_ITEM_SYSTEM_DEVELOPER_OPTION = 8;
+static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 9;
 #else
 static const int ID_ALL_SYSTEM_ITEM_COUNT = 18;
 static const int ID_FREQUENTLY_SYSTEM_ITEM_COUNT = 6;
@@ -107,9 +109,9 @@ static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 17;
 static const int ID_GROUP_APPLICATIONS = 2;
 
 #ifdef DISPLAY_SETTING_MENU_FOR_R0
-static const int ID_APPLICATIONS_ITEM_COUNT = 7;
+static const int ID_APPLICATIONS_ITEM_COUNT = 6;
 #else
-static const int ID_APPLICATIONS_ITEM_COUNT = 8;
+static const int ID_APPLICATIONS_ITEM_COUNT = 7;
 #endif
 static const int ID_ITEM_APPLICATIONS_PHONE = 0;
 static const int ID_ITEM_APPLICATIONS_MESSAGE = 1;
@@ -117,7 +119,6 @@ static const int ID_ITEM_APPLICATIONS_EMAIL = 2;
 static const int ID_ITEM_APPLICATIONS_CONTACTS = 3;
 static const int ID_ITEM_APPLICATIONS_CALENDAR = 4;
 static const int ID_ITEM_APPLICATIONS_GALLERY = 5;
-static const int ID_ITEM_APPLICATIONS_MUSIC = 6;
 
 #ifndef DISPLAY_SETTING_MENU_FOR_R0
 static const int ID_ITEM_APPLICATIONS_VOICERECODER = 7;
@@ -175,6 +176,7 @@ MainMenuForm::MainMenuForm(void)
        : __currentTableViewList(ID_PAGE_FREQUENTLY_USE)
        , __pDownloadAppIdKeyList(null)
        , __pAppIdHashMap(null)
+       , __pAppIconPathHashMap(null)
        , __footerViewType()
        , __pFlightModeSetValueAsyncResultListener(null)
 {
@@ -231,14 +233,24 @@ MainMenuForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
 
        Footer* pFooter = GetFooter();
 
+       RemoveAllDownLoadAppIdKeyList();
+       SetAppIdListFromPackageManager();
        __pTableView->UpdateTableView();
 
-       __pTableView->SetItemChecked(ID_GROUP_CONNECTIVITY, ID_ITEM_CONNECTIVITY_FLIGHTMODE, GetSettingInfoItemStatus(SETTING_INFO_KEY_NETWORK_FLIGHTMODE));
+       bool flightModeEnableStatus = false;
+       if (SettingInfo::GetValue(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, flightModeEnableStatus) == E_SUCCESS)
+       {
+               __pTableView->SetItemChecked(ID_GROUP_CONNECTIVITY, ID_ITEM_CONNECTIVITY_FLIGHTMODE, flightModeEnableStatus);
+       }
 
        if (__currentTableViewList == ID_PAGE_ALL)
        {
                __footerViewType.SetText(ResourceManager::GetString(L"IDS_ST_BODY_FREQUENTLY_USED"));
-               __pTableView->SetItemChecked(ID_GROUP_SYSTEM, ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN, GetSettingInfoItemStatus(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO));
+               bool autoRotation = false;
+               if (SettingInfo::GetValue(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO, autoRotation) == E_SUCCESS)
+               {
+                       __pTableView->SetItemChecked(ID_GROUP_SYSTEM, ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN, autoRotation);
+               }
        }
        else
        {
@@ -442,7 +454,12 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        case ID_ITEM_CONNECTIVITY_FLIGHTMODE:
                                {
                                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-                                       __pTableView->SetItemChecked(groupIndex, itemIndex, GetSettingInfoItemStatus(SETTING_INFO_KEY_NETWORK_FLIGHTMODE));
+                                       bool EnableStatus = false;
+
+                                       if (SettingInfo::GetValue(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, EnableStatus) == E_SUCCESS)
+                                       {
+                                               __pTableView->SetItemChecked(groupIndex, itemIndex, EnableStatus);
+                                       }
                                        itemRectLabel.width -= W_RESIZE_LABEL_GAP;
                                        pBitmap = ResourceManager::GetBitmapN(IDB_FLIGHT_MODE);
                                        itemText = ResourceManager::GetString(L"IDS_ST_BODY_FLIGHT_MODE");
@@ -503,7 +520,14 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                        if (EnableStatus == true)
                                                        {
                                                                btEnableStatus = BluetoothPresentationModel::GetInstance()->IsBluetoothActivated();
-                                                               itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_ON");
+                                                               if (btEnableStatus == true)
+                                                               {
+                                                                       itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_ON");
+                                                               }
+                                                               else
+                                                               {
+                                                                       itemTextTwoLine = ResourceManager::GetString(L"IDS_ST_BODY_OFF");
+                                                               }
                                                        }
                                                        else
                                                        {
@@ -522,6 +546,13 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                {
                        switch (itemIndex)
                        {
+                       case ID_ITEM_SYSTEM_WALLPAPER:
+                               {
+                                       pBitmap = ResourceManager::GetBitmapN(IDB_WALLPAPER);
+                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MAINDISPLAY_WALLPAPER");
+                               }
+                               break;
+
                        case ID_ITEM_SYSTEM_SOUND:
                                {
                                        pBitmap = ResourceManager::GetBitmapN(IDB_SOUND);
@@ -565,6 +596,12 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                }
                                break;
 
+                       case ID_ITEM_SYSTEM_MANAGE_APPLICATION:
+                               {
+                                       pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
+                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS");
+                               }
+                               break;
 #ifndef DISPLAY_SETTING_MENU_FOR_R0
                        case ID_ITEM_SYSTEM_MEMORY:
                                {
@@ -596,18 +633,11 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                }
                                break;
 
-                       case ID_ITEM_SYSTEM_WALLPAPER:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_WALLPAPER);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MAINDISPLAY_WALLPAPER");
-                               }
-                               break;
-
                        case ID_ITEM_SYSTEM_BRIGHTNESS:
                                {
                                        isTwoLineItemText = true;
                                        itemHeight = H_GROUP_ITEM_TWO_LINE_DEFAULT;
-                                       ItemTypeIconAndTwoLine(itemRectIcon, itemRectLabel, itemRectSecondLabel);
+                                       ItemTypeIconAndTwoLine(itemRectIcon, itemRectLabel, itemRectSecondLabel, fontSize);
                                        pBitmap = ResourceManager::GetBitmapN(String(IDB_BRIGHTNESS));
                                        itemText = ResourceManager::GetString(L"IDS_ST_BODY_BRIGHTNESS");
 
@@ -683,6 +713,8 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                                itemTextTwoLine.Append(L", ");
                                                itemTextTwoLine.Append(ResourceManager::GetString(L"IDS_ST_BODY_KEYBOARD"));
                                                itemTextTwoLine.Append(L", ");
+                                               itemTextTwoLine.Append(ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS"));
+                                               itemTextTwoLine.Append(L", ");
                                                itemTextTwoLine.Append(ResourceManager::GetString(L"IDS_ST_BODY_DEVELOPER_OPTIONS"));
                                                itemTextTwoLine.Append(L", ");
 
@@ -747,13 +779,6 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                                }
                                break;
 
-                       case ID_ITEM_APPLICATIONS_MUSIC:
-                               {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_MUSIC);
-                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MUSIC");
-                               }
-                               break;
-
                        default:
                                {
 #ifndef DISPLAY_SETTING_MENU_FOR_R0
@@ -768,8 +793,19 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_GROUP_DOWNLOADED_APPLICATIONS:
                {
-                       pBitmap = ResourceManager::GetBitmapN(IDB_APP_SETTING);
+                       String appIdKey = GetDownLoadAppIdKeyAt(itemIndex);
+                       String iconPath = GetAppSettingIconPathFromAppIdListAt(appIdKey);
+
                        itemText = GetDownLoadAppNameAt(itemIndex);
+
+                       if (iconPath.IsEmpty() == true)
+                       {
+                               pBitmap = ResourceManager::GetBitmapN(IDB_DEFAULT_ICON);
+                       }
+                       else
+                       {
+                               pBitmap = ResourceManager::GetApplicationBitmapN(iconPath);
+                       }
                }
                break;
 
@@ -834,6 +870,21 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        return pItem;
 }
 
+Tizen::Base::String
+MainMenuForm::GetAppSettingIconPathFromAppIdListAt(Tizen::Base::String& id)
+{
+       String iconPath;
+
+       if (__pAppIconPathHashMap)
+       {
+               if (__pAppIconPathHashMap->ContainsKey(id) == true)
+               {
+                       iconPath = *(static_cast<String*>(__pAppIconPathHashMap->GetValue((id))));
+               }
+       }
+       return iconPath;
+}
+
 bool
 MainMenuForm::DeleteGroupItem(int groupIndex, TableViewGroupItem* pItem)
 {
@@ -992,7 +1043,12 @@ MainMenuForm::OnActionPerformed(const Control& source, int actionId)
 
                        if (__currentTableViewList == ID_PAGE_ALL)
                        {
-                               __pTableView->SetItemChecked(ID_GROUP_SYSTEM, ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN, GetSettingInfoItemStatus(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO));
+                               bool EnableStatus = false;
+
+                               if (SettingInfo::GetValue(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO, EnableStatus) == E_SUCCESS)
+                               {
+                                       __pTableView->SetItemChecked(ID_GROUP_SYSTEM, ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN, EnableStatus);
+                               }
                        }
                }
                break;
@@ -1057,6 +1113,20 @@ MainMenuForm::SetAppIdListFromPackageManager(void)
                return E_FAILURE;
        }
 
+       __pAppIconPathHashMap = new (std::nothrow) HashMap();
+       if (__pAppIconPathHashMap == null)
+       {
+               AppLogDebug("__pAppIconPathHashMap is null");
+               return E_FAILURE;
+       }
+       r = __pAppIconPathHashMap->Construct();
+       if (IsFailed(r))
+       {
+               AppLogDebug("Construct fail [%s]", GetErrorMessage(GetLastResult()));
+               RemoveAllAppIdList();
+               return E_FAILURE;
+       }
+
        IList* pList = null;
        PackageManager* pPackageManager = PackageManager::GetInstance();
        if (pPackageManager == null)
@@ -1105,7 +1175,12 @@ MainMenuForm::SetAppIdListFromPackageManager(void)
                                key.Append(L":");
                                key.Append(pPackage->GetId());
 
+                               String currentAppId = pPackage->GetMainAppId();
+                               PackageAppInfo* pPackageInfo = static_cast<PackageAppInfo*>(pPackage->GetPackageAppInfoN(currentAppId));
+                               String iconPath = pPackageInfo->GetAppMenuIconPath();
+
                                __pAppIdHashMap->Add(*(new (std::nothrow) String(key)), *(new (std::nothrow) String(path)));
+                               __pAppIconPathHashMap->Add(*(new (std::nothrow) String(key)), *(new (std::nothrow) String(iconPath)));
                                isFindXml = true;
                        }
                }
@@ -1138,6 +1213,10 @@ MainMenuForm::RemoveAllAppIdList(void)
                __pAppIdHashMap->RemoveAll();
                delete __pAppIdHashMap;
                __pAppIdHashMap = null;
+
+               __pAppIconPathHashMap->RemoveAll();
+               delete __pAppIconPathHashMap;
+               __pAppIconPathHashMap = null;
        }
 }
 
@@ -1242,40 +1321,6 @@ MainMenuForm::GetDownLoadAppCount(void)
        return downLoadAppCount;
 }
 
-bool
-MainMenuForm::GetSettingInfoItemStatus(const String& key)
-{
-       bool EnableStatus = false;
-
-       if (SettingInfo::GetValue(key, EnableStatus) != E_SUCCESS)
-       {
-               AppLogDebug("Failed...key[%ls] Value[%d] result[%s]", key.GetPointer(), EnableStatus, GetErrorMessage(GetLastResult()));
-       }
-       else
-       {
-               AppLogDebug("Success...key[%ls] Value[%d] result[%s]", key.GetPointer(), EnableStatus, GetErrorMessage(GetLastResult()));
-       }
-
-       return EnableStatus;
-}
-
-bool
-MainMenuForm::GetSystemInfoItemStatus(const String& key)
-{
-       bool EnableStatus = true;
-
-       if (SystemInfo::GetValue(key, EnableStatus) != E_SUCCESS)
-       {
-               AppLogDebug("Failed...key[%ls] Value[%d] result[%s]", key.GetPointer(), EnableStatus, GetErrorMessage(GetLastResult()));
-       }
-       else
-       {
-               AppLogDebug("Success.. key[%ls] Value[%d] result[%s]", key.GetPointer(), EnableStatus, GetErrorMessage(GetLastResult()));
-       }
-
-       return EnableStatus;
-}
-
 const wchar_t*
 MainMenuForm::GroupSystemSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status)
 {
@@ -1285,39 +1330,13 @@ MainMenuForm::GroupSystemSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Co
        {
                pScene = IDSCN_NOTIFICATION;
        }
-       else if (itemIndex == ID_ITEM_SYSTEM_WALLPAPER)
+       else
+#endif
+       if (itemIndex == ID_ITEM_SYSTEM_WALLPAPER)
        {
-               // TODO: not yet done. had to use image viewer instead of gallery. there is no providerId/operationId to use gallery.
-               pScene = L"";
-
-               ArrayList* pDataList = new (std::nothrow) ArrayList();
-               pDataList->Construct();
-
-               String providerId = L"http://tizen.org/appcontrol/provider/image";
-               String operationId = L"http://tizen.org/appcontrol/operation/view";
-
-               String* pData = null;
-               pData = new (std::nothrow) String(L"type:image");
-               pDataList->Add(*pData);
-
-               String* pData2 = null;
-               pData2 = new (std::nothrow) String(L"path:" + Environment::GetMediaPath() + L"Images/sample.jpg");
-               pDataList->Add(*pData2);
-
-               AppControl* pAppControl = AppManager::FindAppControlN(providerId, operationId);
-
-               if (pAppControl)
-               {
-                       pAppControl->Start(pDataList, null);
-                       delete pAppControl;
-               }
-
-               pDataList->RemoveAll(true);
-               delete pDataList;
+               pScene = IDSCN_WALLPAPER;
        }
-       else 
-#endif
-       if (itemIndex == ID_ITEM_SYSTEM_SOUND)
+       else if (itemIndex == ID_ITEM_SYSTEM_SOUND)
        {
                pScene = IDSCN_SOUNDS;
        }
@@ -1353,6 +1372,10 @@ MainMenuForm::GroupSystemSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Co
                {
                        pScene = IDSCN_KEYBOARD;
                }
+               else if (itemIndex == ID_ITEM_SYSTEM_MANAGE_APPLICATION)
+               {
+                       pScene = IDSCN_MANAGE_APPLICATION;
+               }
 #ifndef DISPLAY_SETTING_MENU_FOR_R0
                else if (itemIndex == ID_ITEM_SYSTEM_DISPLAY)
                {
@@ -1502,13 +1525,6 @@ MainMenuForm::FindAppControlScene(int itemIndex)
                }
                break;
 
-       case ID_ITEM_APPLICATIONS_MUSIC:
-               {
-                       providerId = L"tizen.musicplayer";
-                       operationId = L"http://tizen.org/appcontrol/operation/configure";
-               }
-               break;
-
 #ifndef        DISPLAY_SETTING_MENU_FOR_R0
        case ID_ITEM_APPLICATIONS_VOICERECODER:
                {
@@ -1569,7 +1585,7 @@ MainMenuForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::Group
 void
 MainMenuForm::OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r)
 {
-       AppLogDebug("Enter");
+       AppLogDebug("ENTER");
 }
 
 void
@@ -1583,7 +1599,31 @@ MainMenuForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::
 {
        if (__currentTableViewList == ID_PAGE_ALL)
        {
-               __pTableView->SetItemChecked(ID_GROUP_SYSTEM, ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN, GetSettingInfoItemStatus(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO));
+               bool EnableStatus = false;
+
+               if (SettingInfo::GetValue(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO, EnableStatus) == E_SUCCESS)
+               {
+                       __pTableView->SetItemChecked(ID_GROUP_SYSTEM, ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN, EnableStatus);
+               }
        }
        Invalidate(true);
+}
+
+void
+MainMenuForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
+{
+       if (requestId == FRFRESH_REQUEST_EVENT)
+       {
+               if (__pTableView)
+               {
+                       RemoveAllDownLoadAppIdKeyList();
+                       SetAppIdListFromPackageManager();
+                       __pTableView->UpdateTableView();
+               }
+               if (pArgs)
+               {
+                       pArgs->RemoveAll(true);
+                       delete pArgs;
+               }
+       }
 }
\ No newline at end of file

diff --git a/src/StManageApplicationForm.cpp b/src/StManageApplicationForm.cpp
new file mode 100644 (file)
index 0000000..fcd084c
--- /dev/null
+++ b/src/StManageApplicationForm.cpp
@@ -0,0 +1,604 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StManageApplicationForm.cpp
+ * @brief              This is the implementation file for ManageApplicationForm class.
+ */
+
+#include "StManageApplicationForm.h"
+#include "StResourceManager.h"
+#include "StSettingScenesList.h"
+#include "StTypes.h"
+
+using namespace Tizen::App;
+using namespace Tizen::App::Package;
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Graphics;
+using namespace Tizen::System;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
+
+static const int IDA_HEADER_APPLICATION = 300;
+static const int IDA_HEADER_RUNNING = 310;
+static const int IDA_HEADER_ALL = 320;
+static const int IDA_UNINSTALL_OK = 400;
+
+static const int Y_ALERT_POPUP_CLIENT_RECT_DEFAULT = 160;
+static const int Y_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT = 20;
+static const int H_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT = 340;
+static const int W_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT = 690;
+static const int X_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT = 12;
+static const int Y_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT = 360;
+static const int W_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT = 620;
+static const int H_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT = 80;
+static const int ALERT_POPUP_LABEL_FONT_SIZE = 40;
+
+static const int W_ALERT_POPUP_CLIENT_RECT_DEFAULT = 700;
+static const int H_ALERT_POPUP_CLIENT_RECT_DEFAULT = 550;
+
+static const int BYTE_TO_KILOBYTE = 1024;
+
+enum _dataType
+{
+       DATA_TYPE_APPLICATION_NAME = 0,
+       DATA_TYPE_APPLICATION_ICON_PATH,
+       DATA_TYPE_APPLICATION_UNINSTALLABLE,
+       DATA_TYPE_APPLICATION_SIZE,
+       DATA_TYPE_APPLICATION_DATA_SIZE,
+       DATA_TYPE_APPLICATION_ID,
+       DATA_TYPE_APPLICATION_PACKAGE_ID,
+};
+
+ManageApplicationForm::ManageApplicationForm(void)
+       : __pPackageInfoList(null)
+       , __uninstallResultPopup(null)
+{
+}
+
+ManageApplicationForm::~ManageApplicationForm(void)
+{
+}
+
+void
+ManageApplicationForm::CreateHeaderStyleTab()
+{
+#ifdef HEADER_HAS_THREE_TAB
+       Header* pHeader = GetHeader();
+       pHeader->SetStyle(HEADER_STYLE_TAB_WITH_TITLE);
+       pHeader->SetTitleText(ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS"));
+
+       HeaderItem headerItemApplication;
+       headerItemApplication.Construct(IDA_HEADER_APPLICATION);
+       headerItemApplication.SetText(ResourceManager::GetString(L"IDS_ST_BODY_APPLICATION"));
+
+       HeaderItem headerItemRunning;
+       headerItemRunning.Construct(IDA_HEADER_RUNNING);
+       headerItemRunning.SetText(L"Running");
+
+       HeaderItem headerItemAll;
+       headerItemAll.Construct(IDA_HEADER_ALL);
+       headerItemAll.SetText(ResourceManager::GetString(L"IDS_ST_OPT_ALL"));
+
+       pHeader->AddItem(headerItemApplication);
+       pHeader->AddItem(headerItemRunning);
+       pHeader->AddItem(headerItemAll);
+       pHeader->AddActionEventListener(*this);
+#else
+       CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS"));
+#endif
+}
+
+void
+ManageApplicationForm::CreateFooter(void)
+{
+       Footer* pFooter = GetFooter();
+       AppAssert(pFooter);
+
+       pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT);
+       pFooter->SetBackButton();
+       pFooter->AddActionEventListener(*this);
+
+       SetFormBackEventListener(this);
+}
+
+Tizen::Base::String
+ManageApplicationForm::GetPackageInfoItem(int index, int type)
+{
+       String data;
+       PackageInfo* pPackageInfo = static_cast<PackageInfo*>(__pPackageInfoList->GetAt(index));
+
+       switch (type)
+       {
+       case DATA_TYPE_APPLICATION_NAME:
+               {
+                       data = pPackageInfo->GetDisplayName();
+               }
+               break;
+
+       case DATA_TYPE_APPLICATION_ICON_PATH:
+               {
+                       IList* pPackageAppInfoList = pPackageInfo->GetPackageAppInfoListN();
+
+                       for (int i = 0; i< pPackageAppInfoList->GetCount(); i++)
+                       {
+                               PackageAppInfo* pPackageAppInfo = static_cast<PackageAppInfo*>(pPackageAppInfoList->GetAt(i));
+
+                               data = pPackageAppInfo->GetAppMenuIconPath();
+                       }
+
+                       delete pPackageAppInfoList;
+               }
+               break;
+
+       case DATA_TYPE_APPLICATION_UNINSTALLABLE:
+               {
+                       data = Integer::ToString(pPackageInfo->IsUninstallable());
+               }
+               break;
+
+       case DATA_TYPE_APPLICATION_SIZE:
+               {
+                       data = Integer::ToString((pPackageInfo->GetSize() / BYTE_TO_KILOBYTE));
+               }
+               break;
+
+       case DATA_TYPE_APPLICATION_DATA_SIZE:
+               {
+                       data = Integer::ToString((pPackageInfo->GetDataSize() / BYTE_TO_KILOBYTE));
+               }
+               break;
+
+       case DATA_TYPE_APPLICATION_ID:
+               {
+                       data = pPackageInfo->GetMainAppId();
+               }
+               break;
+
+       case DATA_TYPE_APPLICATION_PACKAGE_ID:
+               {
+                       data = pPackageInfo->GetId();
+               }
+               break;
+
+       default:
+               break;
+       }
+       return data;
+}
+
+void
+ManageApplicationForm::LoadPackageInfoList(void)
+{
+       if (__pPackageInfoList == null)
+       {
+               PackageManager* pPackageManager = PackageManager::GetInstance();
+               __pPackageInfoList = pPackageManager->GetPackageInfoListN();
+       }
+}
+
+void
+ManageApplicationForm::DeletePackageInfoList(void)
+{
+       if (__pPackageInfoList)
+       {
+               __pPackageInfoList->RemoveAll(true);
+               delete __pPackageInfoList;
+       }
+}
+
+void
+ManageApplicationForm::ReLoadPackageInfoList(void)
+{
+       __pPackageInfoList->RemoveAll(true);
+       delete __pPackageInfoList;
+       __pPackageInfoList = null;
+       LoadPackageInfoList();
+}
+
+
+result
+ManageApplicationForm::OnInitializing(void)
+{
+       LoadPackageInfoList();
+
+       CreateHeaderStyleTab();
+       CreateFooter();
+       CreateTableView();
+
+       Frame* pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame();
+       pFrame->AddFrameEventListener(*this);
+       AppLogDebug("ENTER");
+
+       return E_SUCCESS;
+}
+
+result
+ManageApplicationForm::OnTerminating(void)
+{
+       __pTableView = null;
+       Frame* pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame();
+       pFrame->RemoveFrameEventListener(*this);
+
+       DeletePackageInfoList();
+       DeleteAlertPopup();
+
+       SetFormBackEventListener(null);
+       return E_SUCCESS;
+}
+
+void
+ManageApplicationForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
+{
+       if (previousSceneId.Equals(IDSCN_MANAGE_APPLICATION_INFO, false))
+       {
+               if (pArgs != null)
+               {
+//                     String* uninstalledApplicationName = (static_cast<String*>(pArgs->GetAt(0)));
+                       String uninstallationResult = *(static_cast<String*>(pArgs->GetAt(1)));
+
+                       if (uninstallationResult.Equals(L"true", false))
+                       {
+                               ReLoadPackageInfoList();
+//                             CreateAlertPopup(uninstalledApplicationName);
+//                             ShowAlertPopup();
+                       }
+                       delete pArgs;
+               }
+       }
+       __pTableView->UpdateTableView();
+}
+
+void
+ManageApplicationForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
+{
+}
+
+void
+ManageApplicationForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
+}
+
+int
+ManageApplicationForm::GetGroupCount(void)
+{
+       // Temporary code due to the UI Framework defect
+       if (!__pPackageInfoList)
+       {
+               return 0;
+       }
+
+       AppLogDebug("ENTER");
+       return 1;
+}
+
+int
+ManageApplicationForm::GetItemCount(int groupIndex)
+{
+       // Temporary code due to the UI Framework defect
+       if (!__pPackageInfoList)
+       {
+               return 0;
+       }
+
+       int itemCount = __pPackageInfoList->GetCount();
+
+       AppLogDebug("GetItemCount %d", itemCount);
+
+       return itemCount;
+}
+
+TableViewGroupItem*
+ManageApplicationForm::CreateGroupItem(int groupIndex, int itemWidth)
+{
+       AppLogDebug("ENTER");
+
+       int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
+       int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
+       LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
+       Rectangle itemRectangle;
+       int fontSize = GetFontSize();
+       String groupText;
+       Label* pLabel = null;
+
+       TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
+
+       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemRectangle.y = yItemOffset;
+       itemRectangle.width = itemWidth;
+       itemRectangle.height = itemHeight;
+
+       RelativeLayout relativeLayout;
+       relativeLayout.Construct();
+
+       pItem->Construct(relativeLayout, Dimension(itemWidth, itemHeight));
+       pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
+
+       pLabel = new (std::nothrow) Label();
+       pLabel->Construct(itemRectangle, groupText);
+       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
+       pLabel->SetTextConfig(fontSize, style);
+       pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
+
+       pItem->AddControl(*pLabel);
+       pItem->SetEnabled(false);
+       relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+
+       return pItem;
+}
+
+TableViewItem*
+ManageApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
+{
+       AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
+
+       Rectangle iconRectangle;
+       Rectangle itemRectangle;
+       Rectangle itemSecondLineTextRect;
+       TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
+       String itemText;
+       String secondLineText;
+       String fontReturnValue;
+       Label* pLabel = null;
+       Bitmap* pBitmap = null;
+
+       int fontSize = GetFontSize();
+       TableViewItem* pItem = new (std::nothrow) TableViewItem();
+
+       itemText = GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_NAME);
+       ItemTypeIconAndOneLine(iconRectangle, itemRectangle);
+
+       RelativeLayout relativeLayout;
+       relativeLayout.Construct();
+
+       pItem->Construct(relativeLayout, Dimension(itemWidth, H_GROUP_ITEM_DEFAULT), style);
+       pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
+
+       pBitmap = ResourceManager::GetApplicationBitmapN(GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_ICON_PATH));
+
+       if (pBitmap == null)
+       {
+               pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
+       }
+       pLabel = new (std::nothrow) Label();
+       pLabel->Construct(iconRectangle, L"");
+       pLabel->SetBackgroundBitmap(*pBitmap);
+       pItem->AddControl(*pLabel);
+
+       pLabel = new (std::nothrow) Label();
+       pLabel->Construct(itemRectangle, itemText);
+       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+
+       pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+       pLabel->SetTextColor(COLOR_MAIN_TEXT);
+
+       pItem->AddControl(*pLabel);
+
+       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+       delete pBitmap;
+       return pItem;
+}
+
+bool
+ManageApplicationForm::DeleteGroupItem(int groupIndex, TableViewGroupItem* pItem)
+{
+       AppLogDebug("ENTER");
+
+       delete pItem;
+       pItem = null;
+
+       return true;
+}
+
+bool
+ManageApplicationForm::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+
+       delete pItem;
+       pItem = null;
+
+       return true;
+}
+
+void
+ManageApplicationForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
+{
+       AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
+
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       ArrayList* pData = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       pData->Construct();
+
+       String applicationName(GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_NAME));
+       String applicationIconPath(GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_ICON_PATH));
+       String applicationUninstallAble(GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_UNINSTALLABLE));
+       String applicationSize(GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_SIZE));
+       String applicationDataSize(GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_DATA_SIZE));
+       String applicationId(GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_ID));
+       String applicationPackageId(GetPackageInfoItem(itemIndex, DATA_TYPE_APPLICATION_PACKAGE_ID));
+
+       pData->Add(new (std::nothrow) String(applicationName));
+       pData->Add(new (std::nothrow) String(applicationIconPath));
+       pData->Add(new (std::nothrow) String(applicationUninstallAble));
+       pData->Add(new (std::nothrow) String(applicationSize));
+       pData->Add(new (std::nothrow) String(applicationDataSize));
+       pData->Add(new (std::nothrow) String(applicationId));
+       pData->Add(new (std::nothrow) String(applicationPackageId));
+
+       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_MANAGE_APPLICATION_INFO, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), pData);
+}
+
+int
+ManageApplicationForm::GetDefaultGroupItemHeight(void)
+{
+       return H_GROUP_INDEX_NO_TITLE_DEFAULT;
+}
+
+int
+ManageApplicationForm::GetDefaultItemHeight(void)
+{
+       return H_GROUP_ITEM_DEFAULT;
+}
+
+void
+ManageApplicationForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem)
+{
+}
+
+void
+ManageApplicationForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+}
+
+void
+ManageApplicationForm::OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated)
+{
+}
+
+void
+ManageApplicationForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
+{
+}
+
+void
+ManageApplicationForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+       Invalidate(true);
+}
+
+void
+ManageApplicationForm::OnFrameActivated(const Tizen::Ui::Controls::Frame& source)
+{
+       AppLogDebug("OnFrameActivated");
+
+       if (__pTableView)
+       {
+               ReLoadPackageInfoList();
+               __pTableView->UpdateTableView();
+       }
+}
+
+void
+ManageApplicationForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
+{
+       switch (actionId)
+       {
+       case IDA_UNINSTALL_OK:
+               {
+                       HideAlertPopup();
+                       this->SetFocus();
+               }
+               break;
+
+       default:
+               break;
+       }
+}
+
+result
+ManageApplicationForm::CreateAlertPopup(Tizen::Base::String* appName)
+{
+       String buttonText;
+       Label* pLabel = null;
+       Button* pOkButton = null;
+
+       Rectangle clientRect = GetClientAreaBounds();
+       Rectangle itemRectLabel;
+       Rectangle itemRectLhsButton;
+       Rectangle itemRectRhsButton;
+
+       clientRect.x = 0;
+       clientRect.y = Y_ALERT_POPUP_CLIENT_RECT_DEFAULT;
+       clientRect.width = W_ALERT_POPUP_CLIENT_RECT_DEFAULT;
+       clientRect.height = H_ALERT_POPUP_CLIENT_RECT_DEFAULT;
+
+       itemRectLabel.x = 0;
+       itemRectLabel.y = Y_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT;
+       itemRectLabel.width = W_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT;
+       itemRectLabel.height = H_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT;
+
+       itemRectLhsButton.x = X_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT;
+       itemRectLhsButton.y = Y_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT;
+       itemRectLhsButton.width = W_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT;
+       itemRectLhsButton.height = H_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT;
+
+       Dimension bounds = Dimension(clientRect.width, clientRect.height);
+
+       __uninstallResultPopup = new (std::nothrow) Popup();
+       __uninstallResultPopup->Construct(true, bounds);
+       __uninstallResultPopup->SetTitleText(*appName);
+       __uninstallResultPopup->SetTitleTextColor(COLOR_SUB_TEXT);
+
+       String descriptionText = ResourceManager::GetString(L"IDS_ST_BUTTON_UNINSTALL");
+       descriptionText.Append(L" Success");
+
+       pLabel = new (std::nothrow) Label();
+       pLabel->Construct(itemRectLabel, descriptionText);
+       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
+       pLabel->SetTextConfig(ALERT_POPUP_LABEL_FONT_SIZE, LABEL_TEXT_STYLE_BOLD);
+
+       __uninstallResultPopup->AddControl(*pLabel);
+
+       buttonText = ResourceManager::GetString(L"IDS_ST_BUTTON_OK");
+       pOkButton = new (std::nothrow) Button();
+       pOkButton->Construct(itemRectLhsButton, buttonText);
+       pOkButton->SetActionId(IDA_UNINSTALL_OK);
+
+       __uninstallResultPopup->AddControl(*pOkButton);
+
+       pOkButton->AddActionEventListener(*this);
+
+       return E_SUCCESS;
+}
+
+void
+ManageApplicationForm::ShowAlertPopup(void)
+{
+       __uninstallResultPopup->SetShowState(true);
+       __uninstallResultPopup->Show();
+}
+
+void
+ManageApplicationForm::HideAlertPopup(void)
+{
+       __uninstallResultPopup->SetShowState(false);
+       __uninstallResultPopup->Invalidate(true);
+}
+
+void
+ManageApplicationForm::DeleteAlertPopup(void)
+{
+       if (__uninstallResultPopup)
+       {
+               delete __uninstallResultPopup;
+               __uninstallResultPopup = null;
+       }
+}
\ No newline at end of file

diff --git a/src/StManageApplicationInfoForm.cpp b/src/StManageApplicationInfoForm.cpp
new file mode 100644 (file)
index 0000000..d874464
--- /dev/null
+++ b/src/StManageApplicationInfoForm.cpp
@@ -0,0 +1,894 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StManageApplicationInfoForm.cpp
+ * @brief              This is the implementation file for ManageApplicationInfoForm class.
+ */
+
+#include "StManageApplicationInfoForm.h"
+#include "StResourceManager.h"
+#include "StTypes.h"
+
+using namespace Tizen::App;
+using namespace Tizen::App::Package;
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Graphics;
+using namespace Tizen::System;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
+
+static const int ID_GROUP_APPLICATION_NAME = 0;
+static const int ID_GROUP_APPLICATION_NAME_ITEM_COUNT = 2;
+static const int ID_ITEM_APPLICATION_NAME = 0;
+static const int ID_ITEM_APPLICATION_COMMAND_BUTTON = 1;
+
+static const int ID_GROUP_APPLICATION_SIZE = 1;
+static const int ID_GROUP_APPLICATION_SIZE_ITEM_COUNT = 3;
+static const int ID_ITEM_APPLICATION_TOTAL_SIZE = 0;
+static const int ID_ITEM_APPLICATION_SIZE = 1;
+static const int ID_ITEM_APPLICATION_DATA_SIZE = 2;
+
+static const int ID_GROUP_APPLICATION_CLEAR_DEFAULT = 2;
+static const int ID_GROUP_APPLICATION_CLEAR_DEFAULT_ITEM_COUNT = 1;
+static const int ID_ITEM_APPLICATION_CLEAR_DEFAULT = 0;
+
+static const int ID_GROUP_APPLICATION_CLEAR_DEFAULT_HELP = 3;
+
+static const int ID_GROUP_APPLICATION_DETAIL = 4;
+static const int ID_GROUP_APPLICATION_DETAIL_ITEM_COUNT = 1;
+static const int ID_ITEM_APPLICATION_DETAIL = 0;
+
+static const int ID_TOTAL_GROUP_COUNT = 5;
+
+static const int IDA_FORCE_STOP = 300;
+static const int IDA_UNINSTALL = 310;
+static const int IDA_UNINSTALL_CONFIRM_OK = 320;
+static const int IDA_UNINSTALL_CONFIRM_CANCEL = 330;
+
+static const int Y_ALERT_POPUP_CLIENT_RECT_DEFAULT = 160;
+static const int Y_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT = 20;
+static const int H_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT = 340;
+static const int W_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT = 690;
+static const int X_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT = 12;
+static const int Y_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT = 360;
+static const int W_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT = 310;
+static const int H_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT = 80;
+static const int X_ALERT_POPUP_ITEM_RECT_RHS_BUTTON_RESIZE = 20;
+static const int ALERT_POPUP_LABEL_FONT_SIZE = 40;
+
+static const int W_ALERT_POPUP_CLIENT_RECT_DEFAULT = 700;
+static const int H_ALERT_POPUP_CLIENT_RECT_DEFAULT = 550;
+
+static const int COMMAND_BUTTON_GAP = 20;
+
+static const int DIVIDE_BY_TWO = 2;
+static const int KILOBYTE_TO_MEGABYTE = 1024;
+static const int MEGABYTE_TO_GIGABYTE = 1024;
+
+enum _dataType
+{
+       DATA_TYPE_APPLICATION_NAME = 0,
+       DATA_TYPE_APPLICATION_ICON_PATH,
+       DATA_TYPE_APPLICATION_UNINSTALLABLE,
+       DATA_TYPE_APPLICATION_SIZE,
+       DATA_TYPE_APPLICATION_DATA_SIZE,
+       DATA_TYPE_APPLICATION_ID,
+       DATA_TYPE_APPLICATION_PACKAGE_ID,
+};
+
+enum _uninstallPopup
+{
+       UNINSTALL_POPUP_OKCANCEL = 0,
+       UNINSTALL_POPUP_PROGRESS,
+};
+
+ManageApplicationInfoForm::ManageApplicationInfoForm(void)
+       : __applicationData(null)
+       , __pPackageManager(null)
+       , __uninstallConfirmPopup(null)
+       , __pProgressPopup(null)
+{
+}
+
+ManageApplicationInfoForm::~ManageApplicationInfoForm(void)
+{
+}
+
+void
+ManageApplicationInfoForm::CreateFooter(void)
+{
+       Footer* pFooter = GetFooter();
+       AppAssert(pFooter);
+
+       pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT);
+       pFooter->SetBackButton();
+       pFooter->AddActionEventListener(*this);
+
+       SetFormBackEventListener(this);
+}
+
+result
+ManageApplicationInfoForm::OnInitializing(void)
+{
+       CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_APPLICATION_INFO"));
+       CreateFooter();
+       CreateTableView();
+
+       __pPackageManager = PackageManager::GetInstance();
+
+       if (__pPackageManager)
+       {
+               __pPackageManager->AddPackageInstallationEventListener(*this);
+       }
+
+       Frame* pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame();
+       pFrame->AddFrameEventListener(*this);
+
+       AppLogDebug("ENTER");
+
+       return E_SUCCESS;
+}
+
+result
+ManageApplicationInfoForm::OnTerminating(void)
+{
+       if (__pPackageManager)
+       {
+               __pPackageManager->RemovePackageInstallationEventListener(*this);
+       }
+       delete __applicationData;
+
+       Frame* pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame();
+       pFrame->RemoveFrameEventListener(*this);
+
+       DeleteUninstallPopup();
+
+       __pTableView = null;
+       SetFormBackEventListener(null);
+       return E_SUCCESS;
+}
+
+void
+ManageApplicationInfoForm::GroupItemEnable(int groupIndex, bool setEnableStatus)
+{
+       int itemCount = __pTableView->GetItemCountAt(groupIndex);
+
+       for (int i = 0; i< itemCount; i++)
+       {
+               __pTableView->SetItemEnabled(groupIndex, i, setEnableStatus);
+       }
+}
+
+void
+ManageApplicationInfoForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
+{
+       if (pArgs)
+       {
+               __applicationData = static_cast<ArrayList*>(pArgs->GetItemsN(0, pArgs->GetCount()));
+
+               __pTableView->UpdateTableView();
+
+               GroupItemEnable(ID_GROUP_APPLICATION_SIZE, false);
+               GroupItemEnable(ID_GROUP_APPLICATION_CLEAR_DEFAULT, false);
+               GroupItemEnable(ID_GROUP_APPLICATION_DETAIL, false);
+       }
+}
+
+void
+ManageApplicationInfoForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
+{
+}
+
+void
+ManageApplicationInfoForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
+}
+
+int
+ManageApplicationInfoForm::GetGroupCount(void)
+{
+       // Temporary code due to the UI Framework defect
+       if (!__applicationData)
+       {
+               return 0;
+       }
+
+       AppLogDebug("ENTER");
+       return ID_TOTAL_GROUP_COUNT;
+}
+
+int
+ManageApplicationInfoForm::GetItemCount(int groupIndex)
+{
+       // Temporary code due to the UI Framework defect
+       if (!__applicationData)
+       {
+               return 0;
+       }
+
+       int itemCount = 0;
+
+       switch(groupIndex)
+       {
+       case ID_GROUP_APPLICATION_NAME:
+               {
+                       itemCount = ID_GROUP_APPLICATION_NAME_ITEM_COUNT;
+               }
+               break;
+
+       case ID_GROUP_APPLICATION_SIZE:
+               {
+                       itemCount = ID_GROUP_APPLICATION_SIZE_ITEM_COUNT;
+               }
+               break;
+
+       case ID_GROUP_APPLICATION_CLEAR_DEFAULT:
+               // fall through
+       case ID_GROUP_APPLICATION_DETAIL:
+               {
+                       itemCount = ID_GROUP_APPLICATION_CLEAR_DEFAULT_ITEM_COUNT;
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       AppLogDebug("GetItemCount %d", itemCount);
+
+       return itemCount;
+}
+
+TableViewGroupItem*
+ManageApplicationInfoForm::CreateGroupItem(int groupIndex, int itemWidth)
+{
+       AppLogDebug("ENTER");
+
+       int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
+       int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
+       LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
+       Rectangle itemRectangle;
+       String groupText;
+       Label* pLabel = null;
+
+       TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
+
+       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemRectangle.y = yItemOffset;
+       itemRectangle.width = itemWidth;
+       itemRectangle.height = itemHeight;
+
+       if (groupIndex == ID_GROUP_APPLICATION_CLEAR_DEFAULT_HELP)
+       {
+               itemRectangle.y = 0;
+               itemRectangle.height = itemHeight = H_GROUP_ITEM_DEFAULT;
+               groupText = ResourceManager::GetString(L"IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_FOR_SOME_ACTIONS");
+       }
+
+       RelativeLayout relativeLayout;
+       relativeLayout.Construct();
+
+       pItem->Construct(relativeLayout, Dimension(itemWidth, itemHeight));
+       pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
+
+       pLabel = new (std::nothrow) Label();
+       pLabel->Construct(itemRectangle, groupText);
+       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
+       pLabel->SetTextConfig(FONT_MAIN_TEXT_SIZE_SMALL, style);
+       pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
+
+       pItem->AddControl(*pLabel);
+       pItem->SetEnabled(false);
+       relativeLayout.SetMargin(*pLabel, itemRectangle.x, 0, 0, 0);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+
+       return pItem;
+}
+
+TableViewItem*
+ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
+{
+       AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
+
+       TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
+
+       bool isTwoLineText = false;
+       bool isBitmapSet = false;
+       bool isCommandButton = false;
+       Rectangle iconRectangle;
+       Rectangle firstLineRectangle;
+       Rectangle secondLineRectangle;
+
+       int itemHeight = H_ITEM_TYPE_1_LABEL;
+
+       Bitmap* pBitmap = null;
+       Button* pStopButton = null;
+       Button* pUninstallButton = null;
+       Label* pLabel = null;
+       Label* pBitmapLabel = null;
+
+       String itemText;
+       String secondLineText;
+
+       int fontSize = GetFontSize();
+       TableViewItem* pItem = new (std::nothrow) TableViewItem();
+
+       ItemTypeOneLine(firstLineRectangle);
+       itemHeight = firstLineRectangle.height;
+
+       switch (groupIndex)
+       {
+       case ID_GROUP_APPLICATION_NAME:
+               {
+                       switch (itemIndex)
+                       {
+                       case ID_ITEM_APPLICATION_NAME:
+                               {
+                                       isTwoLineText = true;
+                                       isBitmapSet = true;
+                                       double appSize = 0;
+                                       double dataSize = 0;
+
+                                       String bitmapPath = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_ICON_PATH)));
+                                       pBitmap = ResourceManager::GetApplicationBitmapN(bitmapPath);
+
+                                       if (pBitmap == null)
+                                       {
+                                               pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
+                                       }
+
+                                       String sizeData;
+                                       ItemTypeIconAndTwoLine(iconRectangle, firstLineRectangle, secondLineRectangle, fontSize);
+                                       itemHeight = (firstLineRectangle.height + secondLineRectangle.height);
+                                       itemText = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_NAME)));
+                                       sizeData = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_SIZE)));
+                                       Double::Parse(sizeData, appSize);
+                                       sizeData = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_DATA_SIZE)));
+                                       Double::Parse(sizeData, dataSize);
+
+                                       if (((appSize+dataSize) / KILOBYTE_TO_MEGABYTE) >= 1)
+                                       {
+                                               secondLineText = Double::ToString(((appSize+dataSize)/KILOBYTE_TO_MEGABYTE));
+                                               secondLineText.Append(L" MB");
+                                       }
+                                       else
+                                       {
+                                               secondLineText = Double::ToString(((appSize+dataSize)));
+                                               secondLineText.Append(L" KB");
+                                       }
+                               }
+                               break;
+
+                       default:
+                               {
+                                       isCommandButton = true;
+                               }
+                               break;
+                       }
+               }
+               break;
+
+       case ID_GROUP_APPLICATION_SIZE:
+               {
+                       double appSize = 0;
+                       double dataSize = 0;
+                       double totalSize = 0;
+                       String tmpDataSize;
+
+                       isTwoLineText = true;
+
+                       ItemTypeTwoLine(firstLineRectangle, secondLineRectangle, fontSize);
+                       itemHeight = (firstLineRectangle.height + secondLineRectangle.height);
+
+                       switch (itemIndex)
+                       {
+                       case ID_ITEM_APPLICATION_SIZE:
+                               {
+                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_APPLICATION");
+                                       tmpDataSize = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_SIZE)));
+
+                                       Double::Parse(tmpDataSize, appSize);
+                                       totalSize = appSize;
+                               }
+                               break;
+
+                       case ID_ITEM_APPLICATION_DATA_SIZE:
+                               {
+                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DATA");
+                                       tmpDataSize = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_DATA_SIZE)));
+
+                                       Double::Parse(tmpDataSize, dataSize);
+                                       totalSize = dataSize;
+                               }
+                               break;
+
+                       default:
+                               {
+                                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_TOTAL");
+                                       tmpDataSize = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_SIZE)));
+                                       Double::Parse(tmpDataSize, appSize);
+                                       tmpDataSize = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_DATA_SIZE)));
+                                       Double::Parse(tmpDataSize, dataSize);
+
+                                       totalSize = (appSize + dataSize);
+                               }
+                               break;
+                       }
+
+                       if ((totalSize / KILOBYTE_TO_MEGABYTE) >= 1)
+                       {
+                               secondLineText = Double::ToString((totalSize/KILOBYTE_TO_MEGABYTE));
+                               secondLineText.Append(L" MB");
+                       }
+                       else
+                       {
+                               secondLineText = Double::ToString((totalSize));
+                               secondLineText.Append(L" KB");
+                       }
+               }
+               break;
+
+       case ID_GROUP_APPLICATION_CLEAR_DEFAULT:
+               {
+                       ItemTypeOneLine(firstLineRectangle);
+                       itemHeight = firstLineRectangle.height;
+
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_CLEAR_DEFAULTS");
+               }
+               break;
+
+       case ID_GROUP_APPLICATION_DETAIL:
+               {
+                       ItemTypeOneLine(firstLineRectangle);
+                       itemHeight = firstLineRectangle.height;
+
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MORE_DETAILS");
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       RelativeLayout relativeLayout;
+       relativeLayout.Construct();
+       pItem->Construct(Dimension(itemWidth, itemHeight), style);
+       pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
+
+       if (isCommandButton == true)
+       {
+               String appId;
+               firstLineRectangle.height -= (H_ITEM_TYPE_1_LABEL/ DIVIDE_BY_TWO);
+
+               pItem->Construct(Dimension(itemWidth, firstLineRectangle.height), style);
+               pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
+
+               Rectangle stopButtonRect;
+               Rectangle uninstallButtonRect;
+
+               stopButtonRect = firstLineRectangle;
+               stopButtonRect.width = (itemWidth / DIVIDE_BY_TWO) - COMMAND_BUTTON_GAP;
+
+               uninstallButtonRect = firstLineRectangle;
+               uninstallButtonRect.x = (itemWidth / DIVIDE_BY_TWO);
+               uninstallButtonRect.width = (itemWidth / DIVIDE_BY_TWO)- COMMAND_BUTTON_GAP;
+
+               pStopButton = new (std::nothrow) Button();
+               pStopButton->Construct(stopButtonRect, ResourceManager::GetString(L"IDS_ST_BUTTON_FORCE_STOP"));
+               pStopButton->SetActionId(IDA_FORCE_STOP);
+
+               appId = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_ID)));
+               AppManager* pAppManager = AppManager::GetInstance();
+
+               if (pAppManager->IsRunning(appId) == false)
+               {
+                       pStopButton->SetEnabled(false);
+               }
+
+               pStopButton->AddActionEventListener(*this);
+
+               String uninstallable = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_UNINSTALLABLE)));
+
+               pUninstallButton = new (std::nothrow) Button();
+               pUninstallButton->Construct(uninstallButtonRect, ResourceManager::GetString(L"IDS_ST_BUTTON_UNINSTALL"));
+
+               if (uninstallable.Equals(L"0", true))
+               {
+                       pUninstallButton->SetEnabled(false);
+               }
+               pUninstallButton->SetActionId(IDA_UNINSTALL);
+               pUninstallButton->AddActionEventListener(*this);
+
+               pItem->AddControl(*pStopButton);
+               pItem->AddControl(*pUninstallButton);
+               pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT, TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED);
+       }
+       else
+       {
+               if (isBitmapSet == true)
+               {
+                       pBitmapLabel = new (std::nothrow) Label();
+                       pBitmapLabel->Construct(iconRectangle, L"");
+                       pBitmapLabel->SetBackgroundBitmap(*pBitmap);
+                       pItem->AddControl(*pBitmapLabel);
+               }
+
+               pLabel = new (std::nothrow) Label();
+               pLabel->Construct(firstLineRectangle, itemText);
+               pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+               pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+               pLabel->SetTextColor(COLOR_MAIN_TEXT);
+
+               pItem->AddControl(*pLabel);
+               relativeLayout.SetMargin(*pLabel, firstLineRectangle.x, 0, 0, 0);
+
+               relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+               relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+
+               if (isTwoLineText == true)
+               {
+                       pLabel = new (std::nothrow) Label();
+                       pLabel->Construct(secondLineRectangle, secondLineText);
+                       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+                       pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL);
+                       pLabel->SetTextColor(COLOR_SUB_TEXT);
+
+                       pItem->AddControl(*pLabel);
+
+                       relativeLayout.SetMargin(*pLabel, firstLineRectangle.x, 0, 0, 0);
+                       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+                       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+               }
+       }
+       return pItem;
+}
+
+bool
+ManageApplicationInfoForm::DeleteGroupItem(int groupIndex, TableViewGroupItem* pItem)
+{
+       AppLogDebug("ENTER");
+
+       delete pItem;
+       pItem = null;
+
+       return true;
+}
+
+bool
+ManageApplicationInfoForm::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+
+       delete pItem;
+       pItem = null;
+
+       return true;
+}
+
+void
+ManageApplicationInfoForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
+{
+       AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
+}
+
+int
+ManageApplicationInfoForm::GetDefaultGroupItemHeight(void)
+{
+       return H_GROUP_INDEX_NO_TITLE_DEFAULT;
+}
+
+int
+ManageApplicationInfoForm::GetDefaultItemHeight(void)
+{
+       return H_GROUP_ITEM_DEFAULT;
+}
+
+void
+ManageApplicationInfoForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem)
+{
+}
+
+void
+ManageApplicationInfoForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+       switch (groupIndex)
+       {
+       case ID_GROUP_APPLICATION_NAME:
+               {
+                       if (itemIndex == ID_ITEM_APPLICATION_COMMAND_BUTTON)
+                       {
+                               Rectangle pItemRect = pItem->GetBounds();
+                               Rectangle clientRect = GetClientAreaBounds();
+
+                               Button* pStopButton = static_cast<Button*>(pItem->GetControl(0));
+                               Button* pUninstallButton = static_cast<Button*>(pItem->GetControl(1));
+
+                               pStopButton->SetBounds(0, 0, (clientRect.width/DIVIDE_BY_TWO -COMMAND_BUTTON_GAP), pItemRect.height);
+                               pUninstallButton->SetBounds((clientRect.width/DIVIDE_BY_TWO), 0, (clientRect.width/DIVIDE_BY_TWO -COMMAND_BUTTON_GAP), pItemRect.height);
+
+                               String appId = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_ID)));
+                               AppManager* pAppManager = AppManager::GetInstance();
+
+                               if (pAppManager->IsRunning(appId) == false)
+                               {
+                                       pStopButton->SetEnabled(false);
+                               }
+                               else
+                               {
+                                       pStopButton->SetEnabled(true);
+                               }
+
+                               pStopButton->Invalidate(false);
+                               pUninstallButton->Invalidate(false);
+                       }
+               }
+               break;
+
+       default:
+               break;
+       }
+}
+
+void
+ManageApplicationInfoForm::OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated)
+{
+}
+
+void
+ManageApplicationInfoForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
+{
+}
+
+void
+ManageApplicationInfoForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+       __pTableView->RefreshItem(ID_GROUP_APPLICATION_NAME, ID_ITEM_APPLICATION_COMMAND_BUTTON, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       Invalidate(true);
+}
+
+void
+ManageApplicationInfoForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
+{
+       switch (actionId)
+       {
+       case IDA_FORCE_STOP:
+               {
+                       String appId = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_ID)));
+                       AppManager* pAppManager = AppManager::GetInstance();
+
+                       if (pAppManager->IsRunning(appId) == true)
+                       {
+                               if (pAppManager->TerminateApplication(appId) == E_SUCCESS)
+                               {
+                                       Button* pStopButton = static_cast<Button*>(&const_cast<Control&>(source));
+                                       pStopButton->SetEnabled(false);
+                               }
+                               AppLogDebug("TerminateApplication Result [%s]", GetErrorMessage(GetLastResult()));
+                       }
+                       else
+                       {
+                               AppLogDebug("[%ls] is not running", appId.GetPointer());
+                       }
+               }
+               break;
+
+       case IDA_UNINSTALL:
+               {
+                       CreateUninstallPopup();
+                       ShowUninstallPopup(UNINSTALL_POPUP_OKCANCEL);
+               }
+               break;
+
+       case IDA_UNINSTALL_CONFIRM_OK:
+               {
+                       String packageId = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_PACKAGE_ID)));
+                       __pPackageManager->UninstallPackage (packageId, null);
+
+                       HideUninstallPopup(UNINSTALL_POPUP_OKCANCEL);
+                       ShowUninstallPopup(UNINSTALL_POPUP_PROGRESS);
+               }
+               break;
+
+       case IDA_UNINSTALL_CONFIRM_CANCEL:
+               {
+                       HideUninstallPopup(UNINSTALL_POPUP_OKCANCEL);
+               }
+               break;
+
+       default:
+               break;
+       }
+}
+
+void
+ManageApplicationInfoForm::OnFrameActivated(const Tizen::Ui::Controls::Frame& source)
+{
+       if (__pTableView)
+       {
+               __pTableView->RefreshItem(ID_GROUP_APPLICATION_NAME, ID_ITEM_APPLICATION_COMMAND_BUTTON, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       }
+}
+
+void
+ManageApplicationInfoForm::OnPackageUninstallationCompleted(const Tizen::App::PackageId& packageId, bool uninstallationResult)
+{
+       HideUninstallPopup(UNINSTALL_POPUP_PROGRESS);
+
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       ArrayList* pUninstallationResult = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       pUninstallationResult->Construct();
+
+       String applicationName = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_NAME)));
+       pUninstallationResult->Add(new (std::nothrow) String(applicationName));
+       pUninstallationResult->Add(new (std::nothrow) String(Boolean::ToString(uninstallationResult)));
+
+       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), pUninstallationResult);
+}
+
+result
+ManageApplicationInfoForm::CreateUninstallPopup(void)
+{
+       String buttonText;
+       Label* pLabel = null;
+       Button* pOkButton = null;
+       Button* pCancelButton = null;
+       String applicationName = *(static_cast<String*>(__applicationData->GetAt(DATA_TYPE_APPLICATION_NAME)));
+
+       Rectangle clientRect = GetClientAreaBounds();
+       Rectangle itemRectLabel;
+       Rectangle itemRectLhsButton;
+       Rectangle itemRectRhsButton;
+
+       clientRect.x = 0;
+       clientRect.y = Y_ALERT_POPUP_CLIENT_RECT_DEFAULT;
+       clientRect.width = W_ALERT_POPUP_CLIENT_RECT_DEFAULT;
+       clientRect.height = H_ALERT_POPUP_CLIENT_RECT_DEFAULT;
+
+       itemRectLabel.x = 0;
+       itemRectLabel.y = Y_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT;
+       itemRectLabel.width = W_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT;
+       itemRectLabel.height = H_ALERT_POPUP_ITEM_RECT_LABEL_DEFAULT;
+
+       itemRectLhsButton.x = X_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT;
+       itemRectLhsButton.y = Y_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT;
+       itemRectLhsButton.width = W_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT;
+       itemRectLhsButton.height = H_ALERT_POPUP_ITEM_RECT_LHS_BUTTON_DEFAULT;
+
+       itemRectRhsButton = itemRectLhsButton;
+       itemRectRhsButton.x = itemRectLhsButton.x + itemRectLhsButton.width + X_ALERT_POPUP_ITEM_RECT_RHS_BUTTON_RESIZE;
+
+       Dimension bounds = Dimension(clientRect.width, clientRect.height);
+
+       __uninstallConfirmPopup = new (std::nothrow) Popup();
+       __uninstallConfirmPopup->Construct(true, bounds);
+       __uninstallConfirmPopup->SetTitleText(applicationName);
+       __uninstallConfirmPopup->SetTitleTextColor(COLOR_SUB_TEXT);
+
+       String descriptionText = ResourceManager::GetString(L"IDS_ST_BUTTON_UNINSTALL");
+       descriptionText.Append(L"?");
+
+       pLabel = new (std::nothrow) Label();
+       pLabel->Construct(itemRectLabel, descriptionText);
+       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
+       pLabel->SetTextConfig(ALERT_POPUP_LABEL_FONT_SIZE, LABEL_TEXT_STYLE_BOLD);
+
+       __uninstallConfirmPopup->AddControl(*pLabel);
+
+       buttonText = ResourceManager::GetString(L"IDS_ST_BUTTON_YES");
+       pOkButton = new (std::nothrow) Button();
+       pOkButton->Construct(itemRectLhsButton, buttonText);
+       pOkButton->SetActionId(IDA_UNINSTALL_CONFIRM_OK);
+
+       __uninstallConfirmPopup->AddControl(*pOkButton);
+
+       buttonText = ResourceManager::GetString(L"IDS_COM_SK_NO");
+
+       pCancelButton = new (std::nothrow) Button();
+       pCancelButton->Construct(itemRectRhsButton, buttonText);
+       pCancelButton->SetActionId(IDA_UNINSTALL_CONFIRM_CANCEL);
+
+       __uninstallConfirmPopup->AddControl(*pCancelButton);
+
+       pOkButton->AddActionEventListener(*this);
+       pCancelButton->AddActionEventListener(*this);
+
+       __pProgressPopup = new (std::nothrow) ProgressPopup();
+       __pProgressPopup->Construct(false,false);
+       __pProgressPopup->SetTitleText(applicationName);
+       __pProgressPopup->SetBounds(clientRect);
+
+       descriptionText = ResourceManager::GetString(L"IDS_ST_BUTTON_UNINSTALL");
+       descriptionText.Append(L"....");
+       __pProgressPopup->SetText(descriptionText);
+
+       return E_SUCCESS;
+}
+
+void
+ManageApplicationInfoForm::ShowUninstallPopup(int popupType)
+{
+       switch (popupType)
+       {
+       case UNINSTALL_POPUP_OKCANCEL:
+               {
+                       __uninstallConfirmPopup->SetShowState(true);
+                       __uninstallConfirmPopup->Show();
+               }
+               break;
+
+       case UNINSTALL_POPUP_PROGRESS:
+               {
+                       __pProgressPopup->SetShowState(true);
+                       __pProgressPopup->Show();
+               }
+               break;
+
+       default:
+               break;
+       }
+}
+
+void
+ManageApplicationInfoForm::HideUninstallPopup(int popupType)
+{
+       switch (popupType)
+       {
+       case UNINSTALL_POPUP_OKCANCEL:
+               {
+                       __uninstallConfirmPopup->SetShowState(false);
+                       __uninstallConfirmPopup->Invalidate(true);
+               }
+               break;
+
+       case UNINSTALL_POPUP_PROGRESS:
+               {
+                       __pProgressPopup->SetShowState(false);
+                       __pProgressPopup->Invalidate(true);
+               }
+               break;
+
+       default:
+               break;
+       }
+}
+
+void
+ManageApplicationInfoForm::DeleteUninstallPopup(void)
+{
+       if (__uninstallConfirmPopup)
+       {
+               delete __uninstallConfirmPopup;
+               __uninstallConfirmPopup = null;
+       }
+
+       if (__pProgressPopup)
+       {
+               delete __pProgressPopup;
+               __pProgressPopup = null;
+       }
+}
\ No newline at end of file

diff --git a/src/StMoreSystemForm.cpp b/src/StMoreSystemForm.cpp
index 887d592..7114808 100644 (file)
--- a/src/StMoreSystemForm.cpp
+++ b/src/StMoreSystemForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -34,14 +34,15 @@ using namespace Tizen::Ui::Scenes;
 
 static const int ID_GROUP_SYSTEM = 0;
 #ifdef DISPLAY_SETTING_MENU_FOR_R0
-static const int ID_GROUP_SYSTEM_ITEM_COUNT = 7;
+static const int ID_GROUP_SYSTEM_ITEM_COUNT = 8;
 static const int ID_ITEM_SYSTEM_FONT = 0;
 static const int ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN = 1;
 static const int ID_ITEM_SYSTEM_DATE_AND_TIME = 2;
 static const int ID_ITEM_SYSTEM_LANGUAGE_AND_REGION = 3;
 static const int ID_ITEM_SYSTEM_KEYBOARD = 4;
-static const int ID_ITEM_SYSTEM_DEVELOPER_OPTIONS = 5;
-static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 6;
+static const int ID_ITEM_SYSTEM_MANAGE_APPLICATION = 5;
+static const int ID_ITEM_SYSTEM_DEVELOPER_OPTIONS = 6;
+static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 7;
 #else
 static const int ID_GROUP_SYSTEM_ITEM_COUNT = 13;
 static const int ID_ITEM_SYSTEM_FONT = 0;
@@ -91,7 +92,7 @@ MoreSystemForm::OnInitializing(void)
        CreateHeader(ResourceManager::GetString(L"IDS_ST_BODY_MORE_SYSTEM_SETTINGS"));
        CreateFooter();
        CreateTableView();
-
+       SettingInfo::AddSettingEventListener(*this);
        AppLogDebug("ENTER");
        return E_SUCCESS;
 }
@@ -100,7 +101,7 @@ result
 MoreSystemForm::OnTerminating(void)
 {
        __pTableView = null;
-
+       SettingInfo::RemoveSettingEventListener(*this);
        SetFormBackEventListener(null);
        return E_SUCCESS;
 }
@@ -113,7 +114,7 @@ MoreSystemForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScen
        Header* pHeader = GetHeader();
        pHeader->SetTitleText(ResourceManager::GetString(L"IDS_ST_BODY_MORE_SYSTEM_SETTINGS"));
 
-       __pTableView->UpdateTableView();
+       __pTableView->Draw(true);
 
        if (SettingInfo::GetValue(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO, autoRotation) == E_SUCCESS)
        {
@@ -214,7 +215,6 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        case ID_ITEM_SYSTEM_FONT:
                {
                        pBitmap = ResourceManager::GetBitmapN(IDB_FONT);
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FONT");
                }
                break;
 
@@ -223,27 +223,18 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
                        itemRectLabel.width -= W_RESIZE_LABEL_GAP;
                        pBitmap = ResourceManager::GetBitmapN(IDB_AUTO_ROTATE_SCREEN);
-                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB");
-
-                       bool autoRotation = false;
-                       if (SettingInfo::GetValue(SETTING_INFO_KEY_SCREEN_ROTAION_AUTO, autoRotation) == E_SUCCESS)
-                       {
-                               __pTableView->SetItemChecked(groupIndex, itemIndex, autoRotation);
-                       }
                }
                break;
 
        case ID_ITEM_SYSTEM_DATE_AND_TIME:
                {
                        pBitmap = ResourceManager::GetBitmapN(IDB_DATE_AND_TIME);
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME");
                }
                break;
 
        case ID_ITEM_SYSTEM_LANGUAGE_AND_REGION:
                {
                        pBitmap = ResourceManager::GetBitmapN(IDB_LANGUAGE);
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_REGION_ABB");
                }
                break;
 
@@ -263,16 +254,20 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                break;
 #endif
 
+       case ID_ITEM_SYSTEM_MANAGE_APPLICATION:
+               {
+                       pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
+               }
+               break;
+
        case ID_ITEM_SYSTEM_DEVELOPER_OPTIONS:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DEVELOPER_OPTIONS");
                        pBitmap = ResourceManager::GetBitmapN(IDB_DEVELOPER_OPTION);
                }
                break;
 
        case ID_ITEM_SYSTEM_ABOUT_PHONE:
                {
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ABOUT_PHONE");
                        pBitmap = ResourceManager::GetBitmapN(IDB_ABOUT_PHONE);
                }
                break;
@@ -317,10 +312,13 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        default:
                break;
        }
+
+       itemText = GetTableViewItemString(groupIndex, itemIndex);
+
        RelativeLayout relativeLayout;
        relativeLayout.Construct();
 
-       pItem->Construct(relativeLayout, Dimension(itemWidth, H_GROUP_ITEM_DEFAULT), style);
+       pItem->Construct(relativeLayout, Dimension(itemWidth, itemRectLabel.height), style);
        pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
 
        if (pBitmap == null)
@@ -477,6 +475,12 @@ MoreSystemForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedT
                break;
 #endif
 
+       case ID_ITEM_SYSTEM_MANAGE_APPLICATION:
+               {
+                       pSceneName = IDSCN_MANAGE_APPLICATION;
+               }
+               break;
+
        case ID_ITEM_SYSTEM_DEVELOPER_OPTIONS:
                {
                        pSceneName = IDSCN_DEVELOPER_OPTION;
@@ -523,6 +527,28 @@ MoreSystemForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGr
 void
 MoreSystemForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
 {
+       String itemText;
+       int fontSize = GetFontSize();
+       Rectangle iconRect;
+       Rectangle oneLineRect;
+       Rectangle pItemBounds = pItem->GetBounds();
+
+       ItemTypeIconAndOneLine(iconRect, oneLineRect);
+
+       pItemBounds.height = oneLineRect.height;
+
+       pItem->SetBounds(pItemBounds);
+
+       Label* pLabel = static_cast<Label*>(pItem->GetControl(1));
+       itemText = GetTableViewItemString(groupIndex, itemIndex);
+
+       pLabel->SetBounds(oneLineRect);
+       pLabel->SetText(itemText);
+       pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+
+       pLabel->Invalidate(false);
+
+       Invalidate(true);
 }
 
 void
@@ -533,4 +559,97 @@ MoreSystemForm::OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::C
 void
 MoreSystemForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
 {
+}
+
+Tizen::Base::String
+MoreSystemForm::GetTableViewItemString(int groupIndex, int itemIndex)
+{
+       String itemText;
+
+       switch (itemIndex)
+       {
+       case ID_ITEM_SYSTEM_FONT:
+               {
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FONT");
+               }
+               break;
+
+       case ID_ITEM_SYSTEM_AUTO_ROTATE_SCREEN:
+               {
+                       itemText = ResourceManager::GetString(L"IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB");
+               }
+               break;
+
+       case ID_ITEM_SYSTEM_DATE_AND_TIME:
+               {
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DATE_AND_TIME");
+               }
+               break;
+
+       case ID_ITEM_SYSTEM_LANGUAGE_AND_REGION:
+               {
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_REGION_ABB");
+               }
+               break;
+
+       case ID_ITEM_SYSTEM_KEYBOARD:
+               {
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_KEYBOARD");
+               }
+               break;
+
+       case ID_ITEM_SYSTEM_MANAGE_APPLICATION:
+               {
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_MANAGE_APPLICATIONS");
+               }
+               break;
+
+       case ID_ITEM_SYSTEM_DEVELOPER_OPTIONS:
+               {
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_DEVELOPER_OPTIONS");
+               }
+               break;
+
+       case ID_ITEM_SYSTEM_ABOUT_PHONE:
+               {
+                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_ABOUT_PHONE");
+               }
+               break;
+
+       default:
+               {
+                       itemText = L"";
+               }
+               break;
+       }
+       return itemText;
+}
+
+void
+MoreSystemForm::RefreshGroupItemAt(int groupIndex)
+{
+       int itemCount = __pTableView->GetItemCountAt(groupIndex);
+
+       for (int count = 0; count < itemCount; count++)
+       {
+               __pTableView->RefreshItem(groupIndex, count, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+       }
+}
+
+void
+MoreSystemForm::OnSettingChanged (Tizen::Base::String &key)
+{
+       AppLogDebug("MoreSystemForm::key changed [%ls]", key.GetPointer());
+
+       if (key.Equals(SETTING_INFO_KEY_FONT_SIZE, false)
+               ||key.Equals(SETTING_INFO_KEY_FONT_TYPE, false)
+               ||key.Equals(SETTING_INFO_KEY_LOCALE_LANGUAGE, false))
+       {
+               int groupCount = __pTableView->GetGroupCount();
+
+               for (int count = 0; count < groupCount; count++)
+               {
+                       RefreshGroupItemAt(count);
+               }
+       }
 }
\ No newline at end of file

diff --git a/src/StNetworkForm.cpp b/src/StNetworkForm.cpp
index ead56f2..1e1a5bb 100644 (file)
--- a/src/StNetworkForm.cpp
+++ b/src/StNetworkForm.cpp
@@ -144,6 +144,7 @@ NetworkForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
+       __pTableView->CollapseGroup(ID_GROUP_NETWORK_MODE_SUB);
        pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
 }
 

diff --git a/src/StRegionForm.cpp b/src/StRegionForm.cpp
index 8dfa5eb..4279c05 100644 (file)
--- a/src/StRegionForm.cpp
+++ b/src/StRegionForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -183,7 +183,7 @@ LocaleRegionForm::CreateSearchBar(void)
 
        __pSearchBar = new (std::nothrow) SearchBar();
        __pSearchBar->Construct(searchbarBounds, true, KEYPAD_ACTION_SEARCH);
-       __pSearchBar->SetGuideText(L"Search");
+       __pSearchBar->SetGuideText(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"));
        __pSearchBar->AddSearchBarEventListener(*this);
        __pSearchBar->AddTextEventListener(*this);
        __pSearchBar->AddKeypadEventListener(*this);
@@ -395,7 +395,9 @@ LocaleRegionForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::Groupe
        String key = *(static_cast<String*>(__pSearchedText->GetAt(itemIndex)));
        AppLogDebug("selected key [%ls]", key.GetPointer());
 
-       if (key.Equals(L"No Search Result", true))
+       String noSearchResult = ResourceManager::GetString(L"IDS_COM_BODY_NO_SEARCH_RESULTS");
+
+       if (key.Equals(noSearchResult, true))
        {
                AppLogDebug("selected key is \"No Search Result\"");
                return;
@@ -483,21 +485,21 @@ LocaleRegionForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source,
 }
 
 void
-LocaleRegionForm::OnKeypadClosed(Tizen::Ui::Control& source)
+LocaleRegionForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
-       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
-       Invalidate(true);
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
 }
 
 void
-LocaleRegionForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
+LocaleRegionForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
-       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
+       Invalidate(true);
 }
 
 void
-LocaleRegionForm::OnKeypadOpened(Tizen::Ui::Control& source)
+LocaleRegionForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
        Invalidate(true);
 }
 
@@ -507,6 +509,7 @@ LocaleRegionForm::OnTextValueChanged(const Tizen::Ui::Control& source)
        String searchData;
        String inputsearchText = __pSearchBar->GetText();
        int GetItemCount = __pTotalLocale->GetCount();
+       String noSearchResult = ResourceManager::GetString(L"IDS_COM_BODY_NO_SEARCH_RESULTS");
 
        if (inputsearchText.CompareTo(L"") != 0)
        {
@@ -538,7 +541,7 @@ LocaleRegionForm::OnTextValueChanged(const Tizen::Ui::Control& source)
 
        if (__pSearchedText->GetCount() <= 0)
        {
-                __pSearchedText->Add(*(new (std::nothrow) String(L"No Search Result")));
+                __pSearchedText->Add(*(new (std::nothrow) String(noSearchResult)));
        }
 
        __pTableView->UpdateTableView();

diff --git a/src/StResourceManager.cpp b/src/StResourceManager.cpp
index 639da21..ca361ba 100644 (file)
--- a/src/StResourceManager.cpp
+++ b/src/StResourceManager.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -19,11 +19,13 @@
  * @brief              This is the implementation file for ResourceManager class.
  */
 
+#include <FMedia.h>
 #include "StResourceManager.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Graphics;
+using namespace Tizen::Media;
 using namespace Tizen::Ui;
 
 Bitmap*
@@ -39,6 +41,53 @@ ResourceManager::GetBitmapN(const Tizen::Base::String& imagePath)
        return pAppResource->GetBitmapN(imagePath);
 }
 
+Bitmap*
+ResourceManager::GetApplicationBitmapN(const String& imageAbsolutePath)
+{
+       result r = E_SUCCESS;
+       Bitmap* pBitmap = null;
+       Image* pImage = new (std::nothrow) Image();
+
+       String fullname;
+       fullname.Append(imageAbsolutePath);
+
+       if (pImage != null)
+       {
+               r = pImage->Construct();
+               TryCatch(r == E_SUCCESS, , "Image Construct Failed = (%s)\n", GetErrorMessage(r));
+               if (fullname.EndsWith(L"jpg") || fullname.EndsWith(L"JPG") || fullname.EndsWith(L"jpeg") || fullname.EndsWith(L"JPEG"))
+               {
+                       pBitmap = pImage->DecodeN(fullname, BITMAP_PIXEL_FORMAT_RGB565);
+               }
+               else if (fullname.EndsWith(L"bmp") || fullname.EndsWith(L"BMP"))
+               {
+                       pBitmap = pImage->DecodeN(fullname, BITMAP_PIXEL_FORMAT_RGB565);
+               }
+               else if (fullname.EndsWith(L"png") || fullname.EndsWith(L"PNG") || fullname.EndsWith(L"wbmp") || fullname.EndsWith(L"WBMP"))
+               {
+                       pBitmap = pImage->DecodeN(fullname, BITMAP_PIXEL_FORMAT_ARGB8888);
+               }
+               else if (fullname.EndsWith(L"gif") || fullname.EndsWith(L"GIF"))
+               {
+                       pBitmap = pImage->DecodeN(fullname, BITMAP_PIXEL_FORMAT_RGB565);
+               }
+
+               TryCatch(pBitmap != null, , "not found image path or not enough memory %ls error = %s", fullname.GetPointer()
+                               , GetErrorMessage(GetLastResult()));
+
+               delete pImage;
+               return pBitmap;
+       }
+
+CATCH:
+       if (pImage != null)
+       {
+               delete pImage;
+       }
+
+       return null;
+}
+
 String
 ResourceManager::GetString(const Tizen::Base::String& stringId)
 {

diff --git a/src/StSettingsApp.cpp b/src/StSettingsApp.cpp
index 1e63422..9ccd287 100644 (file)
--- a/src/StSettingsApp.cpp
+++ b/src/StSettingsApp.cpp
@@ -29,7 +29,9 @@ using namespace Tizen::Base::Collection;
 using namespace Tizen::System;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
 
+static const int FRFRESH_REQUEST_EVENT = 9999;
 //static const int ITEM_COUNT_ONE = 1;
 static const int CATEGORY_LIST_ITEM_COUNT = 6;
 
@@ -113,6 +115,9 @@ void
 SettingsApp::OnForeground(void)
 {
        AppLogDebug("Foreground");
+
+       Form* pCurrentForm = (SceneManager::GetInstance()->GetCurrentScene()->GetForm());
+       pCurrentForm->SendUserEvent(FRFRESH_REQUEST_EVENT, null);
 }
 
 void

diff --git a/src/StTimeZoneForm.cpp b/src/StTimeZoneForm.cpp
index 0913c55..ba32ab0 100644 (file)
--- a/src/StTimeZoneForm.cpp
+++ b/src/StTimeZoneForm.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -199,7 +199,7 @@ TimeZoneForm::OnInitializing(void)
 
        __pSearchBar = new (std::nothrow) SearchBar();
        __pSearchBar->Construct(searchbarBounds, true, KEYPAD_ACTION_SEARCH);
-       __pSearchBar->SetGuideText(L"Search");
+       __pSearchBar->SetGuideText(ResourceManager::GetString(L"IDS_COM_BODY_SEARCH"));
        __pSearchBar->AddSearchBarEventListener(*this);
        __pSearchBar->AddTextEventListener(*this);
        __pSearchBar->AddKeypadEventListener(*this);
@@ -326,6 +326,8 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        Rectangle itemSecondLineTextRect;
        int itemHeight = H_GROUP_ITEM_DEFAULT;
 
+       String noSearchResult = ResourceManager::GetString(L"IDS_COM_BODY_NO_SEARCH_RESULTS");
+
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
        Label* pLabel = null;
        int fontSize = GetFontSize();
@@ -338,7 +340,7 @@ TimeZoneForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        secondLineText = pData->GetRegionData();
        gmtMin = pData->GetGMTData();
 
-       if (firstLineText.Equals(L"No Search Result", false))
+       if (firstLineText.Equals(noSearchResult, false))
        {
                ItemTypeOneLine(itemRectangle);
                itemHeight = (itemRectangle.height);
@@ -468,11 +470,11 @@ TimeZoneForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
 
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
-
+       String noSearchResult = ResourceManager::GetString(L"IDS_COM_BODY_NO_SEARCH_RESULTS");
        String key;
        TimeZoneData* pData = static_cast<TimeZoneData*>(__timeZoneSearchList->GetAt(itemIndex));
 
-       if (pData->GetCountryData().Equals(L"No Search Result", true))
+       if (pData->GetCountryData().Equals(noSearchResult, true))
        {
                AppLogDebug("selected key is \"No Search Result\"");
                return;
@@ -527,21 +529,21 @@ TimeZoneForm::SortTimeZoneData(void)
 }
 
 void
-TimeZoneForm::OnKeypadClosed(Tizen::Ui::Control& source)
+TimeZoneForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
 {
-       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
-       Invalidate(true);
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
 }
 
 void
-TimeZoneForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
+TimeZoneForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
-       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, false);
+       Invalidate(true);
 }
 
 void
-TimeZoneForm::OnKeypadOpened(Tizen::Ui::Control& source)
+TimeZoneForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
        Invalidate(true);
 }
 
@@ -595,7 +597,7 @@ TimeZoneForm::OnTextValueChanged(const Tizen::Ui::Control& source)
        if (__timeZoneSearchList->GetCount() == 0)
        {
                Integer noData;
-               String noSearchData(L"No Search Result");
+               String noSearchData(ResourceManager::GetString(L"IDS_COM_BODY_NO_SEARCH_RESULTS"));
                SetTimeZoneLocaleSearchList(new (std::nothrow)TimeZoneData(noSearchData, noSearchData, noData));
        }
        else

diff --git a/src/StTypes.cpp b/src/StTypes.cpp
index a23fd97..1de84a3 100644 (file)
--- a/src/StTypes.cpp
+++ b/src/StTypes.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -171,6 +171,10 @@ const int ICON_AND_ONE_LINE_ITEM_WIDTH_GAP = 170;
 const int RELATIVE_LAYOUT_RIGHT_MARGIN = 20;
 const int RELATIVE_LAYOUT_LEFT_MARGIN = 116;
 
+const int FRFRESH_REQUEST_EVENT = 9999;
+
+const wchar_t* IDB_MAIN_FOLDER_BACKGROUND = L"T01_main_folder_bg.png";
+
 const wchar_t* IDB_HEADER_BACK_BUTTON_NORMAL = L"00_icon_Back_02.png";
 const wchar_t* IDB_HEADER_BACK_BUTTON_PRESS = L"00_icon_Back_02_press.png";
 
@@ -214,6 +218,8 @@ const wchar_t* IDB_MUSIC = L"apptray_icon_music.png";
 const wchar_t* IDB_VOICE_RECODER = L"settings_74_voice.png";
 //Downloaded apps
 const wchar_t* IDB_APP_SETTING = L"settings_74_web_app.png";
+const wchar_t* IDB_DEFAULT_ICON = IDB_APP_SETTING;
+const wchar_t* IDB_SEPARATOR = L"A01-1_Vibration_bar.png";
 //ETC using icon
 const wchar_t* IDB_SEARCH_ICON_SIZE_LAGER_IMAGE_PATH_FORMAT = L"00_list_process_%d.png";
 const wchar_t* IDB_SOUND_MIN = L"A01-1_list_progress_sound_min.png";
@@ -334,6 +340,8 @@ const wchar_t* SETTING_INFO_KEY_LOCALE_UPDATE_AUTO = L"http://tizen.org/setting/
 const wchar_t* SETTING_INFO_KEY_USB_DEBUGGING = L"http://tizen.org/setting/developer.usb_debugging";
 const wchar_t* SETTING_INFO_KEY_DEVICE_NAME = L"http://tizen.org/setting/device_name";
 const wchar_t* RUNTIME_INFO_KEY_CPU_USAGE = L"http://tizen.org/runtime/cpu.core.all.usage";
+const wchar_t* RUNTIME_INFO_KEY_WALLPAPER_SCREEN = L"http://tizen.org/setting/screen.wallpaper";
+const wchar_t* RUNTIME_INFO_KEY_WALLPAPER_SCREEN_LOCK = L"http://tizen.org/setting/screen.wallpaper.lock";
 
 const wchar_t* NO_CONTENTS = L"NoContents";
 const wchar_t* NO_CONTENTS_TEXT = L"NoContentsText";
\ No newline at end of file

diff --git a/src/StWallpaperAlbumInfo.cpp b/src/StWallpaperAlbumInfo.cpp
new file mode 100644 (file)
index 0000000..5c17e25
--- /dev/null
+++ b/src/StWallpaperAlbumInfo.cpp
@@ -0,0 +1,351 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperAlbumInfo.cpp
+ * @brief              This is the implementation file for WallpaperAlbumInfo class.
+ */
+
+#include "StWallpaperAlbumInfo.h"
+#include "StTypes.h"
+
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Content;
+
+static const int FORMAT_BUFFER_SIZE = 256;
+static const wchar_t* EMPTY_SPACE = L"";
+
+AlbumInfo::AlbumInfo(void)
+       : __albumName(EMPTY_SPACE)
+       , __pDirectoryFullPathList(null)
+       , __pContentIdList(null)
+{
+}
+
+AlbumInfo::~AlbumInfo(void)
+{
+       if (__pDirectoryFullPathList != null)
+       {
+               delete __pDirectoryFullPathList;
+       }
+
+       if (__pContentIdList != null)
+       {
+               delete __pContentIdList;
+       }
+}
+
+String
+AlbumInfo::GetAlbumName(void) const
+{
+       String returnValue;
+       if ((__albumName != null) && (__albumName.GetLength() > 0))
+       {
+               returnValue = __albumName;
+       }
+
+       return returnValue;
+}
+
+void
+AlbumInfo::SetAlbumName(const String& albumName)
+{
+       if (&albumName == null)
+       {
+               __albumName = EMPTY_SPACE;
+       }
+       else
+       {
+               __albumName = String(albumName);
+       }
+}
+
+String
+AlbumInfo::GetDirectory(int index) const
+{
+       String fullDirPath = *(static_cast<String*>(__pDirectoryFullPathList->GetAt(index)));
+       return fullDirPath;
+}
+
+IList*
+AlbumInfo::GetDirectoryListN(void) const
+{
+       if (__pDirectoryFullPathList == null)
+       {
+               return null;
+       }
+
+       IList* pDirectoryFullPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+
+       IEnumerator* pEnum = __pDirectoryFullPathList->GetEnumeratorN();
+       String* pItem = null;
+       while (pEnum->MoveNext() == E_SUCCESS)
+       {
+               pItem = new (std::nothrow) String((static_cast<String*>(pEnum->GetCurrent()))->GetPointer());
+               pDirectoryFullPathList->Add(pItem);
+       }
+       delete pEnum;
+       pEnum = null;
+
+       return pDirectoryFullPathList;
+}
+
+void
+AlbumInfo::ClearDirectoryList(void)
+{
+       if (__pDirectoryFullPathList != null)
+       {
+               delete __pDirectoryFullPathList;
+       }
+       __pDirectoryFullPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+}
+
+void
+AlbumInfo::AppendDirectory(const String& directoryPath)
+{
+       if (&directoryPath == null || directoryPath == EMPTY_SPACE)
+       {
+               return;
+       }
+
+       if (__pDirectoryFullPathList == null)
+       {
+               __pDirectoryFullPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       }
+
+       __pDirectoryFullPathList->Add(new (std::nothrow) String(directoryPath));
+}
+
+void
+AlbumInfo::AppendDirectoryList(const ICollection& directoryList)
+{
+       if (&directoryList == null || directoryList.GetCount() == 0)
+       {
+               return;
+       }
+       if (__pDirectoryFullPathList == null)
+       {
+               __pDirectoryFullPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       }
+       IEnumerator* pEnum = directoryList.GetEnumeratorN();
+       String* pItem = null;
+
+       while (pEnum->MoveNext() == E_SUCCESS)
+       {
+               pItem = new (std::nothrow) String((static_cast<String*>(pEnum->GetCurrent()))->GetPointer());
+               __pDirectoryFullPathList->Add(pItem);
+       }
+       delete pEnum;
+       pEnum = null;
+}
+
+int
+AlbumInfo::GetDirectoryCount(void) const
+{
+       if (__pDirectoryFullPathList == null)
+       {
+               return 0;
+       }
+       else
+       {
+               return __pDirectoryFullPathList->GetCount();
+       }
+}
+
+IList*
+AlbumInfo::GetContentIdListN(void) const
+{
+       if (__pContentIdList == null)
+       {
+               return null;
+       }
+
+       IList* pContentIdList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+
+       IEnumerator* pEnum = __pContentIdList->GetEnumeratorN();
+       ContentId* pItem;
+       while (pEnum->MoveNext() == E_SUCCESS)
+       {
+               pItem = new (std::nothrow) ContentId(*static_cast<ContentId*>(pEnum->GetCurrent()));
+               pContentIdList->Add(pItem);
+       }
+       delete pEnum;
+       pEnum = null;
+
+       return pContentIdList;
+}
+
+ContentId
+AlbumInfo::GetContentId(int index) const
+{
+       ContentId contentId = *(static_cast<ContentId*>(__pContentIdList->GetAt(index)));
+       return contentId;
+}
+
+result
+AlbumInfo::Construct(void)
+{
+       __albumName = EMPTY_SPACE;
+       __pDirectoryFullPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       __pContentIdList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       result r = E_SUCCESS;
+       if (__pDirectoryFullPathList != null && __pContentIdList != null)
+       {
+               r = E_SUCCESS;
+       }
+       else
+       {
+               delete __pDirectoryFullPathList;
+               delete __pContentIdList;
+               r = E_FAILURE;
+       }
+
+       return r;
+}
+
+result
+AlbumInfo::Construct(const String& albumName, ContentType contentType ,
+               const IList& directoryList, const IList& contentIdList)
+{
+       if (&albumName == null)
+       {
+               __albumName = EMPTY_SPACE;
+       }
+       else
+       {
+               __albumName = albumName;
+       }
+
+       if (&directoryList == null)
+       {
+               ClearDirectoryList();
+       }
+       else
+       {
+               ClearDirectoryList();
+               AppendDirectoryList(directoryList);
+       }
+
+       if (&contentIdList == null)
+       {
+               ClearContentIdList();
+       }
+       else
+       {
+               AppendContentIdList(contentIdList);
+       }
+
+       return E_SUCCESS;
+}
+
+result
+AlbumInfo::Construct(const AlbumInfo& albumInfo)
+{
+       if (&albumInfo == null)
+       {
+               __albumName = EMPTY_SPACE;
+               ClearDirectoryList();
+               ClearContentIdList();
+               return E_SUCCESS;
+       }
+       __albumName = albumInfo.GetAlbumName();
+
+       ClearDirectoryList();
+       IList* pDirList = albumInfo.GetDirectoryListN();
+       AppendDirectoryList(*pDirList);
+       delete pDirList;
+
+       ClearContentIdList();
+       IList* pContentIdList = albumInfo.GetContentIdListN();
+       AppendContentIdList(*pContentIdList);
+       delete pContentIdList;
+
+       return E_SUCCESS;
+}
+
+void
+AlbumInfo::ClearContentIdList(void)
+{
+       if (__pContentIdList != null)
+       {
+               delete __pContentIdList;
+       }
+
+       __pContentIdList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+}
+
+void
+AlbumInfo::AppendContentIdList(const ICollection& contentIdList)
+{
+       if (&contentIdList == null || contentIdList.GetCount() == 0)
+       {
+               return;
+       }
+
+       if (__pContentIdList == null)
+       {
+               __pContentIdList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       }
+
+       IEnumerator* pEnum = contentIdList.GetEnumeratorN();
+       ContentId* pItem = null;
+
+       while (pEnum->MoveNext() == E_SUCCESS)
+       {
+               pItem = new (std::nothrow) ContentId(*(static_cast<ContentId*>(pEnum->GetCurrent())));
+               __pContentIdList->Add(pItem);
+       }
+       delete pEnum;
+       pEnum = null;
+}
+
+int
+AlbumInfo::GetContentIdCount(void) const
+{
+       if (__pContentIdList == null)
+       {
+               return 0;
+       }
+       else
+       {
+               return __pContentIdList->GetCount();
+       }
+}
+
+String
+AlbumInfo::GetCreateDateString(void) const
+{
+       return __createFileDateString;
+}
+
+void
+AlbumInfo::SetCreateDateString(String& strMinimumDate, String& strMaximumDate)
+{
+       String resultTime;
+
+       if (strMinimumDate == strMaximumDate)
+       {
+               resultTime.Format(FORMAT_BUFFER_SIZE, L"%ls", strMaximumDate.GetPointer());
+       }
+       else
+       {
+               resultTime.Format(FORMAT_BUFFER_SIZE, L"%ls - %ls", strMinimumDate.GetPointer(),
+                               strMaximumDate.GetPointer());
+       }
+
+       __createFileDateString = resultTime;
+}
\ No newline at end of file

diff --git a/src/StWallpaperAlbumListDetailForm.cpp b/src/StWallpaperAlbumListDetailForm.cpp
new file mode 100644 (file)
index 0000000..84f550d
--- /dev/null
+++ b/src/StWallpaperAlbumListDetailForm.cpp
@@ -0,0 +1,255 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperAlbumListDetailForm.cpp
+ * @brief              This is the implementation file for WallpaperAlbumListDetailForm class.
+ */
+
+#include "StSettingScenesList.h"
+#include "StTypes.h"
+#include "StWallpaperAlbumListDetailForm.h"
+
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Content;
+using namespace Tizen::Graphics;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
+
+static const int MAX_UNDER_FILE_SIZE = 334;
+static const int MAX_OVER_FILE_SIZE = 158;
+static const int FOLDER_BITMAP_MAX = 6;
+
+WallpaperAlbumListDetailForm::WallpaperAlbumListDetailForm(void)
+       : __itemCount(0)
+       , __pPresentationModel(null)
+       , __pAlbumInfo(null)
+       , __pArgs(null)
+{
+}
+
+WallpaperAlbumListDetailForm::~WallpaperAlbumListDetailForm(void)
+{
+}
+
+result
+WallpaperAlbumListDetailForm::Initialize(void)
+{
+       AppLogDebug("ENTER");
+       Form::Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetOrientationAutoMode();
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return GetLastResult();
+}
+
+void
+WallpaperAlbumListDetailForm::SetOrientationAutoMode(void)
+{
+       this->SetOrientation(ORIENTATION_AUTOMATIC_FOUR_DIRECTION);
+       this->AddOrientationEventListener(*this);
+}
+
+void
+WallpaperAlbumListDetailForm::CreateHeader(const Tizen::Base::String& textTitle)
+{
+       Header* pHeader = GetHeader();
+
+       pHeader->SetStyle(HEADER_STYLE_TITLE);
+       pHeader->SetTitleText(textTitle);
+}
+
+void
+WallpaperAlbumListDetailForm::CreateFooter(void)
+{
+       Footer* pFooter = GetFooter();
+       AppAssert(pFooter);
+
+       pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT);
+       pFooter->SetBackButton();
+
+       SetFormBackEventListener(this);
+}
+
+result
+WallpaperAlbumListDetailForm::OnInitializing(void)
+{
+       __pPresentationModel = WallpaperAlbumListPresentationModel::GetInstance();
+
+       return E_SUCCESS;
+}
+
+result
+WallpaperAlbumListDetailForm::OnTerminating(void)
+{
+       AppLogDebug("ENTER");
+
+       if (__pPresentationModel != null)
+       {
+               __pPresentationModel = null;
+       }
+
+       if (__pIconListView != null)
+       {
+               __pIconListView = null;
+       }
+
+       if (__pAlbumInfo != null)
+       {
+               __pAlbumInfo = null;
+       }
+
+       if (__pArgs != null)
+       {
+               __pArgs = null;
+       }
+
+       return E_SUCCESS;
+}
+
+int
+WallpaperAlbumListDetailForm::GetItemCount(void)
+{
+       return __itemCount;
+}
+
+IconListViewItem*
+WallpaperAlbumListDetailForm::CreateItem(int index)
+{
+       AppLogDebug("ENTER : index(%d)", index);
+
+       Bitmap* pBitmap = __pPresentationModel->CreateDetailMergeBitmapN(index);
+
+       if (pBitmap != null)
+       {
+               IconListViewItem* pIconListview = new (std::nothrow) IconListViewItem();
+               pIconListview->Construct(*pBitmap);
+               delete pBitmap;
+               pBitmap = null;
+
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               return pIconListview;
+       }
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return null;
+}
+
+bool
+WallpaperAlbumListDetailForm::DeleteItem(int index, IconListViewItem* pItem)
+{
+       delete pItem;
+       return true;
+}
+
+void
+WallpaperAlbumListDetailForm::OnIconListViewItemStateChanged(IconListView& view, int index, IconListViewItemStatus status)
+{
+       AppLogDebug("ENTER");
+       if (status == ICON_LIST_VIEW_ITEM_SELECTED)
+       {
+               SceneManager* pSceneManager = SceneManager::GetInstance();
+
+               IList* pContentIdList = __pPresentationModel->GetContentIdList();
+               ContentId* pContentId = static_cast<ContentId*>(pContentIdList->GetAt(index));
+
+               ArrayList* aList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+               aList->Construct();
+               aList->Add(*(new (std::nothrow) String(*__pArgs)));
+               aList->Add(pContentId);
+
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_WALLPAPER_IMAGE_SELECT, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), aList);
+       }
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+void
+WallpaperAlbumListDetailForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
+}
+
+void
+WallpaperAlbumListDetailForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
+{
+       if (pArgs != null)
+       {
+               if (__pArgs == null)
+               {
+                       __pArgs = static_cast<String*>(pArgs->GetAt(0));
+               }
+               if (__pAlbumInfo == null)
+               {
+                       __pAlbumInfo = static_cast<AlbumInfo*>(pArgs->GetAt(1));
+               }
+       }
+
+       if (__pPresentationModel == null)
+       {
+               __pPresentationModel = WallpaperAlbumListPresentationModel::GetInstance();
+       }
+       __pPresentationModel->InitializeFileList(__pAlbumInfo);
+       __itemCount = __pPresentationModel->GetFileCount();
+
+       CreateIconListView();
+       CreateHeader(L"Add Image");
+       CreateFooter();
+}
+
+void
+WallpaperAlbumListDetailForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
+{
+}
+
+void
+WallpaperAlbumListDetailForm::CreateIconListView(void)
+{
+       int itemRectLineSize = 0;
+
+       if (__itemCount < FOLDER_BITMAP_MAX)
+       {
+               itemRectLineSize = MAX_UNDER_FILE_SIZE;
+       }
+       else
+       {
+               itemRectLineSize = MAX_OVER_FILE_SIZE;
+       }
+       Dimension itemSize(itemRectLineSize, itemRectLineSize);
+
+       __pIconListView = new IconListView();
+       __pIconListView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height), itemSize);
+       __pIconListView->SetItemProvider(*this);
+       __pIconListView->SetItemBorderStyle(ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE);
+       __pIconListView->AddIconListViewItemEventListener(*this);
+
+       AddControl(*__pIconListView);
+
+       Invalidate(true);
+}
+
+void
+WallpaperAlbumListDetailForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+       RemoveAllControls();
+       CreateHeader(L"Wallpaper Album List");
+       CreateFooter();
+       CreateIconListView();
+       Invalidate(true);
+}
\ No newline at end of file

diff --git a/src/StWallpaperAlbumListForm.cpp b/src/StWallpaperAlbumListForm.cpp
new file mode 100644 (file)
index 0000000..aac119f
--- /dev/null
+++ b/src/StWallpaperAlbumListForm.cpp
@@ -0,0 +1,233 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperAlbumListForm.cpp
+ * @brief              This is the implementation file for WallpaperAlbumListForm class.
+ */
+
+#include "StSettingScenesList.h"
+#include "StTypes.h"
+#include "StWallpaperAlbumListForm.h"
+
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Graphics;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
+
+static const int W_FOLDER_SIZE = 334;
+static const int H_FOLDER_SIZE = 334;
+
+WallpaperAlbumListForm::WallpaperAlbumListForm(void)
+       : __itemCount(0)
+       , __pPresentationModel(null)
+       , __pIconListView(null)
+       , __pArgs(null)
+{
+}
+
+WallpaperAlbumListForm::~WallpaperAlbumListForm(void)
+{
+}
+
+result
+WallpaperAlbumListForm::Initialize(void)
+{
+       AppLogDebug("ENTER");
+       Form::Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       SetOrientationAutoMode();
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return GetLastResult();
+}
+
+void
+WallpaperAlbumListForm::SetOrientationAutoMode(void)
+{
+       this->SetOrientation(ORIENTATION_AUTOMATIC_FOUR_DIRECTION);
+       this->AddOrientationEventListener(*this);
+}
+
+void
+WallpaperAlbumListForm::CreateHeader(const Tizen::Base::String& textTitle)
+{
+       Header* pHeader = GetHeader();
+
+       pHeader->SetStyle(HEADER_STYLE_TITLE);
+       pHeader->SetTitleText(textTitle);
+}
+
+void
+WallpaperAlbumListForm::CreateFooter(void)
+{
+       Footer* pFooter = GetFooter();
+       AppAssert(pFooter);
+
+       pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT);
+       pFooter->SetBackButton();
+
+       SetFormBackEventListener(this);
+}
+
+result
+WallpaperAlbumListForm::OnInitializing(void)
+{
+       __pPresentationModel = WallpaperAlbumListPresentationModel::GetInstance();
+       __pPresentationModel->InitializeAlbumInfoList();
+       __itemCount = __pPresentationModel->GetFolderCount();
+       CreateIconListView();
+
+       return E_SUCCESS;
+}
+
+result
+WallpaperAlbumListForm::OnTerminating(void)
+{
+       AppLogDebug("ENTER");
+       if (__pPresentationModel != null)
+       {
+               __pPresentationModel = null;
+       }
+
+       if (__pIconListView != null)
+       {
+               __pIconListView = null;
+       }
+
+       if (__pArgs != null)
+       {
+               __pArgs = null;
+       }
+
+       return E_SUCCESS;
+}
+
+int
+WallpaperAlbumListForm::GetItemCount(void)
+{
+       return __itemCount;
+}
+
+IconListViewItem*
+WallpaperAlbumListForm::CreateItem(int index)
+{
+       AppLogDebug("ENTER : index(%d)", index);
+
+       Bitmap* pBitmap = __pPresentationModel->CreateMergeBitmapN(index);
+
+       if (pBitmap != null)
+       {
+               IconListViewItem* pIconListview = new (std::nothrow) IconListViewItem();
+               pIconListview->Construct(*pBitmap);
+               delete pBitmap;
+               pBitmap = null;
+
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               return pIconListview;
+       }
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return null;
+}
+
+bool
+WallpaperAlbumListForm::DeleteItem(int index, IconListViewItem* pItem)
+{
+       delete pItem;
+       return true;
+}
+
+void
+WallpaperAlbumListForm::OnIconListViewItemStateChanged(IconListView& view, int index, IconListViewItemStatus status)
+{
+       if (status == ICON_LIST_VIEW_ITEM_SELECTED)
+       {
+               SceneManager* pSceneManager = SceneManager::GetInstance();
+
+               IList* pAlbumInfoList = __pPresentationModel->GetAlbumInfoList();
+               AlbumInfo* pAlbumInfo = static_cast<AlbumInfo*>(pAlbumInfoList->GetAt(index));
+               AlbumInfo* pSendAlbumInfo = new (std::nothrow) AlbumInfo();
+               pSendAlbumInfo->Construct(*pAlbumInfo);
+
+               ArrayList* aList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+               aList->Construct();
+               aList->Add(__pArgs->GetAt(0));
+               aList->Add(pSendAlbumInfo);
+
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_WALLPAPER_ALBUM_LIST_DETAIL, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), aList);
+       }
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+void
+WallpaperAlbumListForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
+}
+void
+WallpaperAlbumListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
+{
+       if ((pArgs != null) && (__pArgs == null))
+       {
+               __pArgs = pArgs;
+       }
+
+       if (__pPresentationModel == null)
+       {
+               __pPresentationModel = WallpaperAlbumListPresentationModel::GetInstance();
+       }
+       __pPresentationModel->InitializeAlbumInfoList();
+       __itemCount = __pPresentationModel->GetFolderCount();
+       __pIconListView->UpdateList();
+       CreateHeader(L"Add Image");
+       CreateFooter();
+}
+
+void
+WallpaperAlbumListForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
+{
+}
+
+void
+WallpaperAlbumListForm::CreateIconListView(void)
+{
+       Dimension itemSize(W_FOLDER_SIZE, H_FOLDER_SIZE);
+
+       __pIconListView = new IconListView();
+       __pIconListView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height),
+               itemSize, ICON_LIST_VIEW_STYLE_NORMAL, ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL);
+       __pIconListView->SetItemProvider(*this);
+       __pIconListView->SetItemBorderStyle(ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE);
+       __pIconListView->AddIconListViewItemEventListener(*this);
+
+       AddControl(*__pIconListView);
+
+       Invalidate(true);
+}
+
+void
+WallpaperAlbumListForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+       RemoveAllControls();
+       CreateHeader(L"Wallpaper Album List");
+       CreateFooter();
+       CreateIconListView();
+       Invalidate(true);
+}
\ No newline at end of file

diff --git a/src/StWallpaperAlbumListPresentationModel.cpp b/src/StWallpaperAlbumListPresentationModel.cpp
new file mode 100644 (file)
index 0000000..6e3fd25
--- /dev/null
+++ b/src/StWallpaperAlbumListPresentationModel.cpp
@@ -0,0 +1,848 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperAlbumListPresentationModel.cpp
+ * @brief              This is the implementation file for WallpaperAlbumListPresentationModel class.
+ */
+
+#include <cstdlib>
+#include <FSystem.h>
+#include "StWallpaperAlbumListPresentationModel.h"
+
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Base::Utility;
+using namespace Tizen::Content;
+using namespace Tizen::Graphics;
+using namespace Tizen::System;
+
+static const int ICON_CAP = 3;
+static const int FOLDER_CAP = 8;
+static const int ICON_SIZE = 102;
+static const int W_FILE_DEFAULT_THUMBNAIL_SIZE = 336;
+static const int H_FILE_DEFAULT_THUMBNAIL_SIZE = 336;
+static const int FOLDER_SIZE_WIDTH = 334;
+static const int FOLDER_SIZE_HEIGHT = 334;
+
+static const int FONT_SIZE_FOLDER_NAME = 32;
+static const int FONT_SIZE_FOLDER_DATE = 25;
+static const int FONT_SIZE_FOLDER_COUNT = 42;
+static const int GAP_FONT = 5;
+
+static const int MAX_FONT_LENGTH = 15;
+
+static const unsigned int COLOR_BLACK = Color32<25, 25, 25>::Value;
+static const unsigned int COLOR_1 = Color32<71, 128, 11>::Value;
+static const unsigned int COLOR_2 = Color32<56, 78, 116>::Value;
+static const unsigned int COLOR_3 = Color32<49, 125, 174>::Value;
+static const unsigned int COLOR_4 = Color32<165, 53, 33>::Value;
+
+static const String RESERVED_MEDIA_PATH = Environment::GetMediaPath();
+static const String RESERVED_CAMERA_PATH = Environment::GetMediaPath() + L"Camera";
+static const String RESERVED_CAMERA_PATH_EXT = Environment::GetExternalStoragePath() + L"Camera";
+static const String RESERVED_DOWNLOAD_PATH = Environment::GetMediaPath() + L"Downloads";
+static const String CONTENT_INFO_ORDER = L"ContentFileName";
+
+static const int FORMAT_BUFFER_SIZE = 256;
+
+static const int MAX_RANDOM_COLOR_NUMBER = 4;
+static const int COMPARE_COLOR_NUMBER_0 = 0;
+static const int COMPARE_COLOR_NUMBER_1 = 1;
+static const int COMPARE_COLOR_NUMBER_2 = 2;
+static const int COMPARE_COLOR_NUMBER_3 = 3;
+
+static const int DOUBLE_NUMBER = 2;
+static const int TRIPLE_NUMBER = 3;
+
+static const wchar_t* EMPTY_SPACE = L"";
+static const wchar_t* DIRECTORY_SEPARATOR = L"/";
+static const wchar_t* ALBUM_NAME_ALL_ALBUMS = L"All albums";
+static const wchar_t* ALBUM_NAME_CAMERA = L"Camera";
+static const wchar_t* ALBUM_NAME_DOWNLOADS = L"Downloads";
+static const wchar_t* ALBUM_NAME_NO_NAME = L"No name";
+
+static const int MAX_UNDER_FILE_SIZE = 334;
+static const int MAX_OVER_FILE_SIZE = 158;
+static const int FOLDER_BITMAP_MAX = 6;
+
+WallpaperAlbumListPresentationModel* WallpaperAlbumListPresentationModel::__pPresentationModelInstance = null;
+IList* WallpaperAlbumListPresentationModel::__pCurrentFolderContentsIdList = null;
+IList* WallpaperAlbumListPresentationModel::__pAlbumInfoList = null;
+
+WallpaperAlbumListPresentationModel::WallpaperAlbumListPresentationModel(void)
+       : __pFolderBackgroundBitmap(null)
+{
+}
+
+WallpaperAlbumListPresentationModel::~WallpaperAlbumListPresentationModel(void)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+WallpaperAlbumListPresentationModel*
+WallpaperAlbumListPresentationModel::GetInstance(void)
+{
+       AppLogDebug("ENTER");
+       if (__pPresentationModelInstance == null)
+       {
+               CreateInstance();
+       }
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return __pPresentationModelInstance;
+}
+
+result
+WallpaperAlbumListPresentationModel::Construct(void)
+{
+       if (__pAlbumInfoList != null)
+       {
+               delete __pAlbumInfoList;
+               __pAlbumInfoList = null;
+       }
+
+       if (__pCurrentFolderContentsIdList != null)
+       {
+               delete __pCurrentFolderContentsIdList;
+               __pCurrentFolderContentsIdList = null;
+       }
+
+       return E_SUCCESS;
+}
+
+void
+WallpaperAlbumListPresentationModel::CreateInstance(void)
+{
+       AppLogDebug("ENTER");
+       __pPresentationModelInstance = new (std::nothrow) WallpaperAlbumListPresentationModel;
+       result r = __pPresentationModelInstance->Construct();
+
+       if (IsFailed(r) == true)
+       {
+               delete __pPresentationModelInstance;
+               __pPresentationModelInstance = null;
+               AppLogDebug("EXIT false");
+               return;
+       }
+
+       std::atexit(DestroyInstance);
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+void
+WallpaperAlbumListPresentationModel::DestroyInstance(void)
+{
+       AppLogDebug("ENTER");
+
+       if (__pAlbumInfoList != null)
+       {
+               delete __pAlbumInfoList;
+               __pAlbumInfoList = null;
+       }
+
+       if (__pCurrentFolderContentsIdList != null)
+       {
+               delete __pCurrentFolderContentsIdList;
+               __pCurrentFolderContentsIdList = null;
+       }
+
+       if (__pPresentationModelInstance != null)
+       {
+               __pPresentationModelInstance->InitFolderBackgroundBitmap();
+               __pPresentationModelInstance = null;
+       }
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+void
+WallpaperAlbumListPresentationModel::InitFolderBackgroundBitmap(void)
+{
+       if (__pFolderBackgroundBitmap != null)
+       {
+               delete __pFolderBackgroundBitmap;
+               __pFolderBackgroundBitmap = null;
+       }
+}
+
+void
+WallpaperAlbumListPresentationModel::DrawPartialImage(Canvas& canvas, AlbumInfo* pAlbumInfo, const Rectangle& rectNew)
+{
+       if (&canvas == null || __pFolderBackgroundBitmap == null || pAlbumInfo == null)
+       {
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               return;
+       }
+
+       canvas.DrawBitmap(rectNew, *__pFolderBackgroundBitmap);
+       int startIndex = 0;
+
+       result r = E_FAILURE;
+       ContentId pContentId = pAlbumInfo->GetContentId(startIndex);
+       ContentManager pContentManager;
+       pContentManager.Construct();
+       ContentInfo* pContentInfo = pContentManager.GetContentInfoN(pContentId);
+       Bitmap* pBitmap1 = pContentInfo->GetThumbnailN();
+       if (pBitmap1 != null)
+       {
+               Rectangle rectFirst(ICON_CAP+FOLDER_CAP, ICON_CAP,
+                               ICON_CAP * DOUBLE_NUMBER + ICON_SIZE * TRIPLE_NUMBER,
+                               ICON_CAP * DOUBLE_NUMBER + ICON_SIZE * TRIPLE_NUMBER);
+               r = canvas.DrawBitmap(rectFirst, *pBitmap1);
+       }
+       delete pContentInfo;
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+void
+WallpaperAlbumListPresentationModel::DrawFontImage(Canvas& canvas, AlbumInfo* pAlbumInfo, int index)
+{
+       AppLogDebug("ENTER");
+       if (&canvas == null)
+       {
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               return;
+       }
+
+       String dateString;
+       dateString = pAlbumInfo->GetCreateDateString();
+
+       String strCnt;
+       int allContentCount = pAlbumInfo->GetContentIdCount();
+       strCnt.Format(FORMAT_BUFFER_SIZE, L"%d", allContentCount);
+
+       String strFolderName = pAlbumInfo->GetAlbumName();
+       Color colorBack = COLOR_BLACK;
+
+       if ((strFolderName == ALBUM_NAME_ALL_ALBUMS)
+               || (strFolderName == ALBUM_NAME_CAMERA)
+               || (strFolderName == ALBUM_NAME_DOWNLOADS))
+       {
+               colorBack = COLOR_BLACK;
+       }
+       else
+       {
+               if (index % MAX_RANDOM_COLOR_NUMBER == COMPARE_COLOR_NUMBER_0)
+               {
+                       colorBack = COLOR_1;
+               }
+               else if (index % MAX_RANDOM_COLOR_NUMBER == COMPARE_COLOR_NUMBER_1)
+               {
+                       colorBack = COLOR_2;
+               }
+               else if (index % MAX_RANDOM_COLOR_NUMBER == COMPARE_COLOR_NUMBER_2)
+               {
+                       colorBack = COLOR_3;
+               }
+               else if (index % MAX_RANDOM_COLOR_NUMBER == COMPARE_COLOR_NUMBER_3)
+               {
+                       colorBack = COLOR_4;
+               }
+       }
+
+       Rectangle rectBack(ICON_CAP + FOLDER_CAP, ICON_CAP, ICON_SIZE * DOUBLE_NUMBER + ICON_CAP, ICON_SIZE);
+       canvas.FillRectangle(colorBack, rectBack);
+
+       Point pointText;
+
+       Font ftFolderName, ftDate, ftCnt;
+       ftFolderName.Construct(FONT_STYLE_PLAIN, FONT_SIZE_FOLDER_NAME);
+       ftDate.Construct(FONT_STYLE_PLAIN, FONT_SIZE_FOLDER_DATE);
+       ftCnt.Construct(FONT_STYLE_PLAIN, FONT_SIZE_FOLDER_COUNT);
+
+       EnrichedText enText;
+       enText.Construct(Dimension(ICON_SIZE * DOUBLE_NUMBER - (ICON_CAP * DOUBLE_NUMBER),
+                       FONT_SIZE_FOLDER_NAME + ICON_CAP * DOUBLE_NUMBER));
+       enText.SetHorizontalAlignment(TEXT_ALIGNMENT_LEFT);
+
+       TextElement textElement;
+       textElement.Construct(strFolderName);
+       textElement.SetFont(ftFolderName);
+       textElement.SetTextColor(Color::GetColor(COLOR_ID_WHITE));
+       enText.SetTextAbbreviationEnabled(true);
+       enText.Add(textElement);
+
+       pointText = Point(ICON_CAP + FOLDER_CAP, ICON_CAP + FONT_SIZE_FOLDER_NAME);
+       canvas.SetFont(ftDate);
+       canvas.SetForegroundColor(Color::GetColor(COLOR_ID_GREY));
+       canvas.DrawText(pointText, dateString, MAX_FONT_LENGTH);
+
+       pointText = Point((ICON_SIZE * DOUBLE_NUMBER + ICON_CAP) - ((FONT_SIZE_FOLDER_COUNT / DOUBLE_NUMBER) * strCnt.GetLength() + GAP_FONT),
+                       ICON_CAP + FONT_SIZE_FOLDER_NAME + FONT_SIZE_FOLDER_DATE);
+       canvas.SetFont(ftCnt);
+       canvas.SetForegroundColor(Color::GetColor(COLOR_ID_WHITE));
+       canvas.DrawText(pointText, strCnt, MAX_FONT_LENGTH);
+
+       pointText = Point(ICON_CAP + FOLDER_CAP, ICON_CAP);
+       canvas.SetForegroundColor(Color::GetColor(COLOR_ID_WHITE));
+       canvas.DrawText(pointText, enText);
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+Bitmap*
+WallpaperAlbumListPresentationModel::CreateDetailMergeBitmapN(int index)
+{
+       AppLogDebug("ENTER index(%d)", index);
+       if (__pCurrentFolderContentsIdList == null)
+       {
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+       ContentId* pContentId = static_cast<ContentId*>(__pCurrentFolderContentsIdList->GetAt(index));
+       ContentManager pContentManager;
+       pContentManager.Construct();
+       ContentInfo* pContentInfo = pContentManager.GetContentInfoN(*pContentId);
+
+       Bitmap* pBitmapNew = new (std::nothrow) Bitmap();
+       BufferInfo bufferinfo;
+       Canvas canvas;
+       Rectangle rectNew(0, 0, W_FILE_DEFAULT_THUMBNAIL_SIZE, H_FILE_DEFAULT_THUMBNAIL_SIZE);
+       Dimension size(W_FILE_DEFAULT_THUMBNAIL_SIZE, H_FILE_DEFAULT_THUMBNAIL_SIZE);
+
+       result r = pBitmapNew->Construct(size, BITMAP_PIXEL_FORMAT_ARGB8888);
+       if (r != E_SUCCESS)
+       {
+               delete pBitmapNew;
+               AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       pBitmapNew->Lock(bufferinfo);
+       r = canvas.Construct(bufferinfo);
+       if (r != E_SUCCESS)
+       {
+               delete pBitmapNew;
+               AppLogDebug("EXIT 3(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       Bitmap* pBitmap = pContentInfo->GetThumbnailN();
+       if (pBitmap != null)
+       {
+               int itemRectLineSize = 0;
+
+               if (__pCurrentFolderContentsIdList->GetCount() < FOLDER_BITMAP_MAX)
+               {
+                       itemRectLineSize = MAX_UNDER_FILE_SIZE;
+               }
+               else
+               {
+                       itemRectLineSize = MAX_OVER_FILE_SIZE;
+               }
+               Rectangle rectFirst(ICON_CAP+FOLDER_CAP, ICON_CAP,
+                               ICON_CAP * DOUBLE_NUMBER + ICON_SIZE * TRIPLE_NUMBER,
+                               ICON_CAP * DOUBLE_NUMBER + ICON_SIZE * TRIPLE_NUMBER);
+               r = canvas.DrawBitmap(rectFirst, *pBitmap);
+       }
+       pBitmapNew->Unlock();
+       delete pContentInfo;
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return pBitmapNew;
+}
+
+Bitmap*
+WallpaperAlbumListPresentationModel::CreateMergeBitmapN(int index)
+{
+       AppLogDebug("ENTER index(%d)", index);
+       if (__pAlbumInfoList == null)
+       {
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       AlbumInfo* pAlbumInfo = static_cast<AlbumInfo*>(__pAlbumInfoList->GetAt(index));
+       if (pAlbumInfo == null)
+       {
+               AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       Bitmap* pBitmapNew = new (std::nothrow) Bitmap();
+       BufferInfo bufferinfo;
+       Canvas canvas;
+       Rectangle rectNew(0, 0, FOLDER_SIZE_WIDTH, FOLDER_SIZE_HEIGHT);
+       Dimension size(FOLDER_SIZE_WIDTH, FOLDER_SIZE_HEIGHT);
+
+       result r = pBitmapNew->Construct(size, BITMAP_PIXEL_FORMAT_ARGB8888);
+       if (r != E_SUCCESS)
+       {
+               delete pBitmapNew;
+               AppLogDebug("EXIT 3(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       pBitmapNew->Lock(bufferinfo);
+       r = canvas.Construct(bufferinfo);
+       if (r != E_SUCCESS)
+       {
+               delete pBitmapNew;
+               AppLogDebug("EXIT 4(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       DrawPartialImage(canvas, pAlbumInfo, rectNew);
+       DrawFontImage(canvas, pAlbumInfo, index);
+
+       pBitmapNew->Unlock();
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return pBitmapNew;
+}
+
+bool
+WallpaperAlbumListPresentationModel::GetMinMaxDateTimeString(IList* pContentIdList, String& MinimumTime, String& MaximumTime)
+{
+       AppLogDebug("ENTER");
+       int fileCount = pContentIdList->GetCount();
+
+       if (pContentIdList == null)
+       {
+               MinimumTime = EMPTY_SPACE;
+               MaximumTime = EMPTY_SPACE;
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               return false;
+       }
+
+       if (fileCount == 0)
+       {
+               MinimumTime = EMPTY_SPACE;
+               MaximumTime = EMPTY_SPACE;
+               AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
+               return false;
+       }
+
+       DateTime dateMin, dateMax;
+       ContentManager contentManager;
+       result r = contentManager.Construct();
+       if (r == E_SUCCESS)
+       {
+               for (int count = 0; count < fileCount; ++count)
+               {
+                       ContentId* pContentId = static_cast<ContentId*>(pContentIdList->GetAt(count));
+                       ContentInfo* pContentInfo = dynamic_cast<ImageContentInfo*>(contentManager.GetContentInfoN(*pContentId));
+                       TryReturn(pContentInfo != null, GetLastResult(), "GetContentInfoN failed.");
+
+                       if (pContentInfo == null)
+                       {
+                               MinimumTime = EMPTY_SPACE;
+                               MaximumTime = EMPTY_SPACE;
+                               AppLogDebug("EXIT 3(%s)", GetErrorMessage(GetLastResult()));
+                               return false;
+                       }
+
+                       DateTime dateFileTime = pContentInfo->GetDateTime();
+
+                       if (count == 0)
+                       {
+                               dateMin = dateFileTime;
+                               dateMax = dateFileTime;
+                               continue;
+                       }
+
+                       if (DateTime::Compare(dateMax, dateFileTime) > 0)
+                       {
+                               dateMax = dateFileTime;
+                       }
+
+                       if (DateTime::Compare(dateMin, dateFileTime) < 0)
+                       {
+                               dateMin = dateFileTime;
+                       }
+               }
+               MinimumTime.Format(FORMAT_BUFFER_SIZE, L"%04d.%d", dateMin.GetYear(), dateMin.GetMonth());
+               MaximumTime.Format(FORMAT_BUFFER_SIZE, L"%04d.%d", dateMax.GetYear(), dateMax.GetMonth());
+       }
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return true;
+}
+
+int
+WallpaperAlbumListPresentationModel::GetFolderCount(void)
+{
+       return __pAlbumInfoList->GetCount();
+}
+
+int
+WallpaperAlbumListPresentationModel::GetFileCount(void)
+{
+       return __pCurrentFolderContentsIdList->GetCount();
+}
+
+void
+WallpaperAlbumListPresentationModel::InitializeFileList(AlbumInfo* pAlbumInfo)
+{
+       if (__pCurrentFolderContentsIdList != null)
+       {
+               __pCurrentFolderContentsIdList->RemoveAll(true);
+               __pCurrentFolderContentsIdList = null;
+       }
+
+       __pCurrentFolderContentsIdList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       int albumInfoDirectoryIndex = 0;
+       while (albumInfoDirectoryIndex < pAlbumInfo->GetDirectoryCount())
+       {
+               String fullPath = pAlbumInfo->GetDirectory(albumInfoDirectoryIndex++);
+               IList* pList = GetContentIdListInDirectoryN(fullPath);
+               int contentIdListIndex = 0;
+               while (contentIdListIndex < pList->GetCount())
+               {
+                       __pCurrentFolderContentsIdList->Add(pList->GetAt(contentIdListIndex++));
+               }
+       }
+}
+
+void
+WallpaperAlbumListPresentationModel::InitializeAlbumInfoList(void)
+{
+       AppLogDebug("ENTER");
+
+       if (__pAlbumInfoList != null)
+       {
+               delete __pAlbumInfoList;
+       }
+
+       if (__pFolderBackgroundBitmap == null)
+       {
+               __pFolderBackgroundBitmap = ResourceManager::GetBitmapN(IDB_MAIN_FOLDER_BACKGROUND);
+       }
+
+       __pAlbumInfoList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+
+       ContentDirectory directory;
+
+       result r = directory.Construct(CONTENT_TYPE_IMAGE);
+       if (r != E_SUCCESS)
+       {
+               delete __pAlbumInfoList;
+               __pAlbumInfoList = null;
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(r));
+               return;
+       }
+
+       IList* pContentDirectoryPathList = directory.GetContentDirectoryPathListN(SORT_ORDER_ASCENDING);
+       String* pDirPath = null;
+       AlbumInfo* pAlbumInfo = null;
+       AlbumInfo* pAllAlbumInfo = new (std::nothrow) AlbumInfo();
+       r = pAllAlbumInfo->Construct();
+       if (r != E_SUCCESS)
+       {
+               delete pContentDirectoryPathList;
+               delete pAllAlbumInfo;
+               AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
+               return;
+       }
+
+       pAllAlbumInfo->SetAlbumName(ALBUM_NAME_ALL_ALBUMS);
+       AlbumInfo* pCameraAlbumInfo = new (std::nothrow) AlbumInfo();
+       r = pCameraAlbumInfo->Construct();
+       if (r != E_SUCCESS)
+       {
+               delete pContentDirectoryPathList;
+               delete pAllAlbumInfo;
+               delete pCameraAlbumInfo;
+               AppLogDebug("EXIT 3(%s)", GetErrorMessage(GetLastResult()));
+               return;
+       }
+
+       pCameraAlbumInfo->SetAlbumName(ALBUM_NAME_CAMERA);
+       AlbumInfo* pDownloadAlbumInfo = new (std::nothrow) AlbumInfo();
+       r = pDownloadAlbumInfo->Construct();
+       if (r != E_SUCCESS)
+       {
+               delete pContentDirectoryPathList;
+               delete pAllAlbumInfo;
+               delete pCameraAlbumInfo;
+               delete pDownloadAlbumInfo;
+               AppLogDebug("EXIT 4(%s)", GetErrorMessage(GetLastResult()));
+               return;
+       }
+
+       pDownloadAlbumInfo->SetAlbumName(ALBUM_NAME_DOWNLOADS);
+       AlbumInfo* pNoNameAlbumInfo = new (std::nothrow) AlbumInfo();
+       r = pNoNameAlbumInfo->Construct();
+       if (r != E_SUCCESS)
+       {
+               delete pContentDirectoryPathList;
+               delete pAllAlbumInfo;
+               delete pCameraAlbumInfo;
+               delete pDownloadAlbumInfo;
+               delete pNoNameAlbumInfo;
+               AppLogDebug("EXIT 5(%s)", GetErrorMessage(GetLastResult()));
+               return;
+       }
+
+       pNoNameAlbumInfo->SetAlbumName(ALBUM_NAME_NO_NAME);
+       if ((pContentDirectoryPathList == null) || (pContentDirectoryPathList->GetCount() <= 0))
+       {
+               delete pAllAlbumInfo;
+               delete pCameraAlbumInfo;
+               delete pDownloadAlbumInfo;
+               delete pNoNameAlbumInfo;
+               AppLogDebug("EXIT 6(%s)", GetErrorMessage(GetLastResult()));
+               return;
+       }
+
+       IEnumerator* pEnum = pContentDirectoryPathList->GetEnumeratorN();
+       while (pEnum->MoveNext() == E_SUCCESS)
+       {
+               pDirPath = static_cast<String*>(pEnum->GetCurrent());
+               if (pDirPath == null)
+               {
+                       continue;
+               }
+
+               if ((*pDirPath == RESERVED_CAMERA_PATH)
+                       || (*pDirPath == RESERVED_CAMERA_PATH_EXT))
+               {
+                       IList* pContentIdList = GetContentIdListInDirectoryN(*pDirPath);
+
+                       if (pContentIdList == null)
+                       {
+                               delete pContentIdList;
+                               continue;
+                       }
+                       pCameraAlbumInfo->AppendDirectory(*pDirPath);
+                       pCameraAlbumInfo->AppendContentIdList(*pContentIdList);
+
+                       pAllAlbumInfo->AppendDirectory(*pDirPath);
+                       pAllAlbumInfo->AppendContentIdList(*pContentIdList);
+                       delete pContentIdList;
+               }
+               else if (*pDirPath == RESERVED_DOWNLOAD_PATH)
+               {
+                       IList* pContentIdList = GetContentIdListInDirectoryN(*pDirPath);
+
+                       if (pContentIdList == null)
+                       {
+                               delete pContentIdList;
+                               continue;
+                       }
+                       pDownloadAlbumInfo->AppendDirectory(*pDirPath);
+                       pDownloadAlbumInfo->AppendContentIdList(*pContentIdList);
+
+                       pAllAlbumInfo->AppendDirectory(*pDirPath);
+                       pAllAlbumInfo->AppendContentIdList(*pContentIdList);
+                       delete pContentIdList;
+               }
+               else if (*pDirPath == RESERVED_MEDIA_PATH)
+               {
+                       IList* pContentIdList = GetContentIdListInDirectoryN(*pDirPath);
+
+                       if (pContentIdList != null)
+                       {
+                               delete pContentIdList;
+                               continue;
+                       }
+                       pNoNameAlbumInfo->AppendDirectory(*pDirPath);
+                       pNoNameAlbumInfo->AppendContentIdList(*pContentIdList);
+
+                       pAllAlbumInfo->AppendDirectory(*pDirPath);
+                       pAllAlbumInfo->AppendContentIdList(*pContentIdList);
+                       delete pContentIdList;
+               }
+               else
+               {
+                       IList* pContentIdList = GetContentIdListInDirectoryN(*pDirPath);
+
+                       if (pContentIdList == null)
+                       {
+                               delete pContentIdList;
+                               continue;
+                       }
+                       if (pContentIdList->GetCount() <= 0)
+                       {
+                               delete pContentIdList;
+                               continue;
+                       }
+
+                       pAlbumInfo = new (std::nothrow) AlbumInfo();
+                       IList* pSubDirList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+
+                       pSubDirList->Add(new (std::nothrow) String(*pDirPath));
+
+                       pAlbumInfo->Construct(GetDirectoryNameFromFullPath(*pDirPath), CONTENT_TYPE_IMAGE, *pSubDirList,
+                                       *pContentIdList);
+
+                       pAllAlbumInfo->AppendDirectory(*pDirPath);
+                       pAllAlbumInfo->AppendContentIdList(*pContentIdList);
+                       delete pSubDirList;
+                       delete pContentIdList;
+               }
+
+               if (pAlbumInfo == null || pAlbumInfo->GetContentIdCount() <= 0)
+               {
+                       delete pAlbumInfo;
+                       pAlbumInfo = null;
+                       continue;
+               }
+
+               String strMaximumDate;
+               String strMinimumDate;
+               GetMinMaxDateTimeString(pAlbumInfo->GetContentIdListN(), strMinimumDate, strMaximumDate);
+               pAlbumInfo->SetCreateDateString(strMinimumDate, strMaximumDate);
+               __pAlbumInfoList->Add(pAlbumInfo);
+               pAlbumInfo = null;
+       }
+
+       int insertIndex = 0;
+       if (pAllAlbumInfo->GetContentIdCount() > 0)
+       {
+               String strMaximumDate;
+               String strMinimumDate;
+               GetMinMaxDateTimeString(pAllAlbumInfo->GetContentIdListN(), strMinimumDate, strMaximumDate);
+               pAllAlbumInfo->SetCreateDateString(strMinimumDate, strMaximumDate);
+               __pAlbumInfoList->InsertAt((Object&)*pAllAlbumInfo, insertIndex++);
+               pAllAlbumInfo = null;
+       }
+       else
+       {
+               delete pAllAlbumInfo;
+               pAllAlbumInfo = null;
+       }
+
+       if (pCameraAlbumInfo->GetContentIdCount() > 0)
+       {
+               String strMaximumDate;
+               String strMinimumDate;
+               GetMinMaxDateTimeString(pCameraAlbumInfo->GetContentIdListN(), strMinimumDate, strMaximumDate);
+               pCameraAlbumInfo->SetCreateDateString(strMinimumDate, strMaximumDate);
+               __pAlbumInfoList->InsertAt((Object&)*pCameraAlbumInfo, insertIndex++);
+       }
+       else
+       {
+               delete pCameraAlbumInfo;
+               pCameraAlbumInfo = null;
+       }
+
+       if (pDownloadAlbumInfo->GetContentIdCount() > 0)
+       {
+               String strMaximumDate;
+               String strMinimumDate;
+               String dateString;
+               GetMinMaxDateTimeString(pDownloadAlbumInfo->GetContentIdListN(), strMinimumDate, strMaximumDate);
+               pDownloadAlbumInfo->SetCreateDateString(strMinimumDate, strMaximumDate);
+               __pAlbumInfoList->InsertAt((Object&)*pDownloadAlbumInfo, insertIndex++);
+       }
+       else
+       {
+               delete pDownloadAlbumInfo;
+               pDownloadAlbumInfo = null;
+       }
+
+       if (pNoNameAlbumInfo->GetContentIdCount() > 0)
+       {
+               String strMaximumDate;
+               String strMinimumDate;
+               String dateString;
+               GetMinMaxDateTimeString(pNoNameAlbumInfo->GetContentIdListN(), strMinimumDate, strMaximumDate);
+               pNoNameAlbumInfo->SetCreateDateString(strMinimumDate, strMaximumDate);
+               __pAlbumInfoList->InsertAt((Object&)*pNoNameAlbumInfo, insertIndex++);
+       }
+       else
+       {
+               delete pNoNameAlbumInfo;
+               pNoNameAlbumInfo = null;
+       }
+
+       delete pEnum;
+
+       if (pContentDirectoryPathList != null)
+       {
+               delete pContentDirectoryPathList;
+       }
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+String
+WallpaperAlbumListPresentationModel::GetDirectoryNameFromFullPath(const String& fullPath)const
+{
+       AppLogDebug("ENTER");
+       if (fullPath == null)
+       {
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+       String delim(DIRECTORY_SEPARATOR);
+       StringTokenizer st(fullPath,delim);
+       String token;
+       while (st.HasMoreTokens())
+       {
+               st.GetNextToken(token);
+       }
+
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return token;
+}
+
+IList*
+WallpaperAlbumListPresentationModel::GetContentIdListInDirectoryN(const String& directoryPath)const
+{
+       AppLogDebug("ENTER");
+
+       if (&directoryPath == null)
+       {
+               AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       ContentDirectory directory;
+       const String contentDirectoryPath = directoryPath;
+       result r = directory.Construct(CONTENT_TYPE_IMAGE);
+       if (r != E_SUCCESS)
+       {
+               AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
+               return null;
+       }
+
+       int pageNo = 1;
+       int countPerPage = directory.GetContentDirectoryItemCount(contentDirectoryPath);
+       IList* pContentInfoList = directory.GetContentDirectoryItemListN(contentDirectoryPath, pageNo, countPerPage,
+                       CONTENT_INFO_ORDER, SORT_ORDER_ASCENDING);
+       IList* pContentIdList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+
+       if ((pContentInfoList != null) && (pContentInfoList->GetCount() > 0))
+       {
+               IEnumerator* pEnum = pContentInfoList->GetEnumeratorN();
+               ContentId* pItem;
+               while (pEnum->MoveNext() == E_SUCCESS)
+               {
+                       ContentInfo* pContentInfo = static_cast<ContentInfo*>(pEnum->GetCurrent());
+                       pItem = new (std::nothrow) ContentId(pContentInfo->GetContentId());
+                       pContentIdList->Add(pItem);
+               }
+               delete pEnum;
+       }
+       delete pContentInfoList;
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return pContentIdList;
+}
+
+IList*
+WallpaperAlbumListPresentationModel::GetAlbumInfoList(void)
+{
+       return __pAlbumInfoList;
+}
+
+IList*
+WallpaperAlbumListPresentationModel::GetContentIdList(void)
+{
+       return __pCurrentFolderContentsIdList;
+}
\ No newline at end of file

diff --git a/src/StWallpaperForm.cpp b/src/StWallpaperForm.cpp
new file mode 100644 (file)
index 0000000..2ccc18b
--- /dev/null
+++ b/src/StWallpaperForm.cpp
@@ -0,0 +1,323 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperForm.cpp
+ * @brief              This is the implementation file for WallpaperForm class.
+ */
+
+#include <memory>
+#include <FIo.h>
+#include "StResourceManager.h"
+#include "StSettingScenesList.h"
+#include "StTypes.h"
+#include "StWallpaperForm.h"
+
+using namespace Tizen::App;
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Graphics;
+using namespace Tizen::Io;
+using namespace Tizen::System;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
+
+static const int ID_GROUP_WALLPAPER_COUNT = 1;
+static const int ID_GROUP_WALLPAPER_ITEM_COUNT = 3;
+static const int ID_HOME_SCREEN_WALLPAPER = 0;
+static const int ID_LOCK_SCREEN_WALLPAPER = 1;
+static const int ID_HOME_AND_LOCK_SCREEN_WALLPAPER = 2;
+
+WallpaperForm::WallpaperForm(void)
+{
+}
+
+WallpaperForm::~WallpaperForm(void)
+{
+}
+
+void
+WallpaperForm::CreateFooter(void)
+{
+       Footer* pFooter = GetFooter();
+       AppAssert(pFooter);
+
+       pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT);
+       pFooter->SetBackButton();
+       pFooter->AddActionEventListener(*this);
+
+       SetFormBackEventListener(this);
+}
+
+result
+WallpaperForm::OnInitializing(void)
+{
+       CreateHeader(L"Wallpaper");
+       CreateFooter();
+
+       CreateTableView();
+
+       AppLogDebug("ENTER");
+
+       return E_SUCCESS;
+}
+
+result
+WallpaperForm::OnTerminating(void)
+{
+       SetFormBackEventListener(null);
+       return E_SUCCESS;
+}
+
+void
+WallpaperForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
+{
+       __pTableView->UpdateTableView();
+}
+
+void
+WallpaperForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
+{
+}
+
+void
+WallpaperForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
+}
+
+int
+WallpaperForm::GetGroupCount(void)
+{
+       AppLogDebug("ENTER");
+       return ID_GROUP_WALLPAPER_COUNT;
+}
+
+int
+WallpaperForm::GetItemCount(int groupIndex)
+{
+       return ID_GROUP_WALLPAPER_ITEM_COUNT;
+}
+
+TableViewGroupItem*
+WallpaperForm::CreateGroupItem(int groupIndex, int itemWidth)
+{
+       AppLogDebug("ENTER");
+
+       int itemHeight = H_GROUP_INDEX_NO_TITLE_DEFAULT;
+       int yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
+       LabelTextStyle style = LABEL_TEXT_STYLE_NORMAL;
+       Rectangle itemRectangle;
+       String groupText;
+       Label* pLabel = null;
+       int fontSize = GetFontSize();
+
+       TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem();
+
+       itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL;
+       itemRectangle.y = yItemOffset;
+       itemRectangle.width = itemWidth;
+       itemRectangle.height = itemHeight;
+
+       RelativeLayout relativeLayout;
+       relativeLayout.Construct();
+
+       pItem->Construct(relativeLayout, Dimension(itemWidth, itemHeight));
+       pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT);
+
+       pLabel = new (std::nothrow) Label();
+       pLabel->Construct(itemRectangle, groupText);
+       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
+       pLabel->SetTextConfig(fontSize, style);
+       pLabel->SetTextColor(COLOR_HELP_TEXT_TYPE_01);
+
+       pItem->AddControl(*pLabel);
+       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+       pItem->SetEnabled(false);
+
+       return pItem;
+}
+
+TableViewItem*
+WallpaperForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
+{
+       AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
+       TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
+       int itemHeight = H_GROUP_ITEM_DEFAULT;
+       String itemText;
+       Rectangle itemRectangle;
+       Label* pLabel = null;
+       int fontSize = GetFontSize();
+
+       switch (itemIndex)
+       {
+       case ID_HOME_SCREEN_WALLPAPER:
+               {
+                       itemText = L"Home screen wallpaper";
+               }
+               break;
+
+       case ID_LOCK_SCREEN_WALLPAPER:
+               {
+                       itemText = L"Lock screen wallpaper";
+               }
+               break;
+
+       case ID_HOME_AND_LOCK_SCREEN_WALLPAPER:
+               {
+                       itemText = L"Home and lock screen wallpaper";
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       TableViewItem* pItem = new (std::nothrow) TableViewItem();
+
+       RelativeLayout relativeLayout;
+       relativeLayout.Construct();
+
+       pItem->Construct(relativeLayout, Dimension(itemWidth, itemHeight), style);
+       pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT);
+
+       ItemTypeOneLine(itemRectangle);
+       pLabel = new (std::nothrow) Label();
+       pLabel->Construct(itemRectangle, itemText);
+       pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+       pLabel->SetTextColor(COLOR_MAIN_TEXT);
+
+       pItem->AddControl(*pLabel);
+       relativeLayout.SetMargin(*pLabel, 0, 0, 0, 0);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+
+       return pItem;
+}
+
+bool
+WallpaperForm::DeleteGroupItem(int groupIndex, TableViewGroupItem* pItem)
+{
+       AppLogDebug("ENTER");
+
+       delete pItem;
+       pItem = null;
+
+       return true;
+}
+
+bool
+WallpaperForm::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem)
+{
+       AppLogDebug("ENTER");
+
+       delete pItem;
+       pItem = null;
+
+       return true;
+}
+
+void
+WallpaperForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
+{
+       AppLogDebug("group[%d] index[%d]", groupIndex, itemIndex);
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       ArrayList* pArgs = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       if (pArgs == null)
+       {
+               AppLogDebug("pArgs is null");
+               return;
+       }
+
+       result r = pArgs->Construct();
+       if (IsFailed(r))
+       {
+               delete pArgs;
+               pArgs = null;
+               AppLogDebug("Construct fail [%s]", GetErrorMessage(r));
+               return;
+       }
+
+       pArgs->Add(*(new (std::nothrow) String(Integer::ToString(itemIndex))));
+       switch (itemIndex)
+       {
+       case ID_HOME_SCREEN_WALLPAPER:
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_WALLPAPER_ALBUM_LIST, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), pArgs);
+               }
+               break;
+
+       case ID_LOCK_SCREEN_WALLPAPER:
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_WALLPAPER_ALBUM_LIST, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), pArgs);
+               }
+               break;
+
+       case ID_HOME_AND_LOCK_SCREEN_WALLPAPER:
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_WALLPAPER_ALBUM_LIST, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), pArgs);
+               }
+               break;
+
+       default:
+               {
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_WALLPAPER_ALBUM_LIST, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), null);
+               }
+               break;
+       }
+}
+
+int
+WallpaperForm::GetDefaultGroupItemHeight(void)
+{
+       return H_GROUP_INDEX_NO_TITLE_DEFAULT;
+}
+
+int
+WallpaperForm::GetDefaultItemHeight(void)
+{
+       return H_GROUP_ITEM_DEFAULT;
+}
+
+void
+WallpaperForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem)
+{
+}
+
+void
+WallpaperForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem)
+{
+}
+
+void
+WallpaperForm::OnGroupedTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated)
+{
+}
+
+void
+WallpaperForm::OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status)
+{
+}
\ No newline at end of file

diff --git a/src/StWallpaperImageSelectForm.cpp b/src/StWallpaperImageSelectForm.cpp
new file mode 100644 (file)
index 0000000..d2335b1
--- /dev/null
+++ b/src/StWallpaperImageSelectForm.cpp
@@ -0,0 +1,275 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/**
+ * @file               StWallpaperImageSelectForm.cpp
+ * @brief              This is the implementation file for WallpaperImageSelectForm class.
+ */
+
+#include <FContent.h>
+#include "StSettingScenesList.h"
+#include "StWallpaperAlbumListPresentationModel.h"
+#include "StWallpaperImageSelectForm.h"
+
+using namespace Tizen::Base;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Content;
+using namespace Tizen::Graphics;
+using namespace Tizen::System;
+using namespace Tizen::Ui;
+using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
+
+static const int IDA_POPUP_ACTION_ID_BASE = 200;
+static const int IDA_FOOTER_SAVE = IDA_POPUP_ACTION_ID_BASE + 1;
+
+static const int DEVIDE_TWO = 2;
+
+WallpaperImageSelectForm::WallpaperImageSelectForm(void)
+       : __pContentId(null)
+       , __argIndex(0)
+{
+}
+
+WallpaperImageSelectForm::~WallpaperImageSelectForm(void)
+{
+}
+
+result
+WallpaperImageSelectForm::Initialize(void)
+{
+       AppLogDebug("ENTER");
+       Form::Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_FOOTER);
+       SetOrientationAutoMode();
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       return GetLastResult();
+}
+
+void
+WallpaperImageSelectForm::SetOrientationAutoMode(void)
+{
+       this->SetOrientation(ORIENTATION_AUTOMATIC_FOUR_DIRECTION);
+       this->AddOrientationEventListener(*this);
+}
+
+void
+WallpaperImageSelectForm::CreateFooter(void)
+{
+       Footer* pFooter = GetFooter();
+       AppAssert(pFooter);
+
+       pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT);
+
+       FooterItem footerSave;
+       footerSave.Construct(IDA_FOOTER_SAVE);
+       footerSave.SetText(L"Save");
+
+       pFooter->AddItem(footerSave);
+       pFooter->SetBackButton();
+       pFooter->AddActionEventListener(*this);
+       pFooter->SetItemEnabled(0, true);
+
+       SetFormBackEventListener(this);
+}
+
+result
+WallpaperImageSelectForm::OnInitializing(void)
+{
+       CreateFooter();
+       SetOrientationAutoMode();
+       return E_SUCCESS;
+}
+
+result
+WallpaperImageSelectForm::OnTerminating(void)
+{
+       AppLogDebug("ENTER");
+       return E_SUCCESS;
+}
+
+void
+WallpaperImageSelectForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+
+       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
+}
+
+void
+WallpaperImageSelectForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
+{
+       switch (actionId)
+       {
+       case IDA_FOOTER_SAVE:
+               {
+                       ContentManager pContentManager;
+                       pContentManager.Construct();
+                       ImageContentInfo* pImageContentInfo = static_cast<ImageContentInfo*>(pContentManager.GetContentInfoN(*__pContentId));
+
+                       ArrayList* aList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+                       aList->Construct();
+                       aList->Add(*(new (std::nothrow) String(Integer::ToString(actionId))));
+                       switch (__argIndex)
+                       {
+                       case 0:
+                               {
+                                       if (SettingInfo::SetValue(RUNTIME_INFO_KEY_WALLPAPER_SCREEN, pImageContentInfo->GetContentPath()) != E_SUCCESS)
+                                       {
+                                               AppLogDebug("Wallpapaer Screen SetValue is Fail [%s]", GetErrorMessage(GetLastResult()));
+                                       }
+                               }
+                               break;
+
+                       case 1:
+                               {
+                                       if (SettingInfo::SetValue(RUNTIME_INFO_KEY_WALLPAPER_SCREEN_LOCK, pImageContentInfo->GetContentPath()) != E_SUCCESS)
+                                       {
+                                               AppLogDebug("Wallpapaer Lock Screen SetValue is Fail [%s]", GetErrorMessage(GetLastResult()));
+                                       }
+                               }
+                               break;
+
+                       case 2:
+                               {
+                                       if (SettingInfo::SetValue(RUNTIME_INFO_KEY_WALLPAPER_SCREEN, pImageContentInfo->GetContentPath()) != E_SUCCESS)
+                                       {
+                                               AppLogDebug("Wallpapaer Screen SetValue is Fail [%s]", GetErrorMessage(GetLastResult()));
+                                               return;
+                                       }
+                                       if (SettingInfo::SetValue(RUNTIME_INFO_KEY_WALLPAPER_SCREEN_LOCK, pImageContentInfo->GetContentPath()) != E_SUCCESS)
+                                       {
+                                               AppLogDebug("Wallpapaer Lock Screen SetValue is Fail [%s]", GetErrorMessage(GetLastResult()));
+                                               return;
+                                       }
+                               }
+                               break;
+
+                       default:
+                               break;
+                       }
+                       SceneManager* pSceneManager = SceneManager::GetInstance();
+                       AppAssert(pSceneManager);
+                       IListT<SceneId>* sceneList = pSceneManager->GetSceneHistoryN();
+                       pSceneManager->ClearSceneHistory();
+                       int sceneIndex = 0;
+                       while (sceneIndex < sceneList->GetCount())
+                       {
+                               String* pSceneId = new (std::nothrow) String();
+                               sceneList->GetAt(sceneIndex++, *pSceneId);
+                               if ((pSceneId->Equals(IDSCN_WALLPAPER_ALBUM_LIST, true) == true)
+                                       || (pSceneId->Equals(IDSCN_WALLPAPER_ALBUM_LIST_DETAIL, true) == true))
+                               {
+                                       if (pSceneManager->IsSceneAlive(*pSceneId) == true)
+                                       {
+                                               pSceneManager->DestroyScene(*pSceneId);
+                                       }
+                                       delete pSceneId;
+                                       continue;
+                               }
+
+                               pSceneManager->AddToSceneHistory(*pSceneId);
+                               delete pSceneId;
+                       }
+                       pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), aList);
+               }
+               break;
+
+       default:
+               {
+                       AppLogDebug("no search Tab Selected %d", actionId);
+               }
+               break;
+       }
+}
+
+void
+WallpaperImageSelectForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
+{
+       if (pArgs != null)
+       {
+               String* pStr = static_cast<String*>(pArgs->GetAt(0));
+               if (pStr->Equals(L"0", true))
+               {
+                       __argIndex = 0;
+               }
+               else if (pStr->Equals(L"1", true))
+               {
+                       __argIndex = 1;
+               }
+               else if (pStr->Equals(L"2", true))
+               {
+                       __argIndex = 2;
+               }
+               __pContentId = static_cast<ContentId*>(pArgs->GetAt(1));
+       }
+       if (__pContentId != null)
+       {
+               CreateImage();
+       }
+}
+
+void
+WallpaperImageSelectForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
+{
+}
+
+void
+WallpaperImageSelectForm::CreateImage(void)
+{
+       ContentManager pContentManager;
+       pContentManager.Construct();
+       ImageContentInfo* pImageContentInfo = static_cast<ImageContentInfo*>(pContentManager.GetContentInfoN(*__pContentId));
+
+       Rectangle rect = GetClientAreaBounds();
+       Bitmap* pBitmap = ResourceManager::GetApplicationBitmapN(pImageContentInfo->GetContentPath());
+       Rectangle clientRect = GetClientAreaBounds();
+
+       float bitmapWidthRate = rect.width / (float)pBitmap->GetWidth();
+       float bitmapHeightRate = rect.height / (float)pBitmap->GetHeight();
+
+       int bitmapWidth = 0;
+       int bitmapHeight = 0;
+
+       if (bitmapWidthRate > bitmapHeightRate)
+       {
+               bitmapHeight = pBitmap->GetHeight() * bitmapHeightRate;
+               bitmapWidth = pBitmap->GetWidth() * bitmapHeightRate;
+       }
+       else
+       {
+               bitmapHeight = pBitmap->GetHeight() * bitmapWidthRate;
+               bitmapWidth = pBitmap->GetWidth() * bitmapWidthRate;
+       }
+       int xPos = (clientRect.width / LINE_COUNT_2) - (bitmapWidth / DEVIDE_TWO);
+       int yPos = (clientRect.height / LINE_COUNT_2) - (bitmapHeight / DEVIDE_TWO);
+
+       Label* pLabel = new (std::nothrow) Label();
+       pLabel->Construct(Rectangle(xPos, yPos, bitmapWidth, bitmapHeight), L"");
+       pLabel->SetName(NO_CONTENTS);
+       pLabel->SetBackgroundBitmap(*pBitmap);
+
+       AddControl(*pLabel);
+}
+
+void
+WallpaperImageSelectForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+       RemoveAllControls();
+       CreateFooter();
+       CreateImage();
+       Invalidate(true);
+}
\ No newline at end of file

diff --git a/src/StWifiApDetailForm.cpp b/src/StWifiApDetailForm.cpp
index 78d318b..da0e034 100644 (file)
--- a/src/StWifiApDetailForm.cpp
+++ b/src/StWifiApDetailForm.cpp
@@ -205,6 +205,7 @@ WifiApDetailForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
+       __pTableView->CollapseGroup(ID_GROUP_WIFI_AP_DETAIL_STATIC_IP_SUB);
        pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
 }
 

diff --git a/src/StWifiConnectionForm.cpp b/src/StWifiConnectionForm.cpp
index 36d28b2..223d0ac 100644 (file)
--- a/src/StWifiConnectionForm.cpp
+++ b/src/StWifiConnectionForm.cpp
@@ -54,6 +54,8 @@ static const int ID_ITEM_WIFI_EAP_CONNECT_PROXY_PORT = 2;
 
 static const int ID_GROUP_COUNT = 3;
 static const int ID_GROUP_MAX_ITEM_COUNT = ID_GROUP_WIFI_EAP_CONNECT_MAIN_ITEM_COUNT;
+static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 240;
+static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
 
 WifiConnectionForm::WifiConnectionForm(void)
 {
@@ -345,7 +347,18 @@ WifiConnectionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pLabel->SetTextColor(itemLableTextColor);
 
                pItem->AddControl(*pLabel);
-               relativeLayout.SetMargin(*pLabel, itemRectLable.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               if (style == TABLE_VIEW_ANNEX_STYLE_DETAILED)
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectLable.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
+               }
+               else if (style == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING)
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectLable.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
+               }
+               else
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectLable.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
+               }
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
                relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        }

diff --git a/src/StWifiForm.cpp b/src/StWifiForm.cpp
index fc80d9b..828e4ed 100644 (file)
--- a/src/StWifiForm.cpp
+++ b/src/StWifiForm.cpp
@@ -54,6 +54,7 @@ static const int WIFI_RSSI_DETAIL_MAX = -70;
 static const int WIFI_RSSI_DETAIL_MID = -80;
 static const int WIFI_RSSI_DETAIL_MIN = -90;
 static const int RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING = 140;
+static const int RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON = 90;
 
 enum GroupIndex
 {
@@ -608,6 +609,10 @@ WifiForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                {
                        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_ONOFF_SLIDING, 0, 0);
                }
+               else if (style == TABLE_VIEW_ANNEX_STYLE_DETAILED)
+               {
+                       relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN_DETAIL_BUTTON, 0, 0);
+               }
                else
                {
                        relativeLayout.SetMargin(*pLabel, itemRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);