Add new string in .po files

- IDS_ST_BODY_SHOW_NETWORK_STATUS_AND_OTHER_INFORMATION
- IDS_ST_BODY_SOFTKEY
- IDS_ST_BODY_RESET_INITIAL_CONFIGURATION
- IDS_MSG_RESET_INITIAL_CONFIGURATION
- IDS_MSG_FACTORY_RESET
- IDS_MSG_RESET_CANNOT_BE_UNDONE

Change-Id: I2feca322c26a7b92dfd7e6a3b4089d8fc9dc64fa
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/resource/po/en.po b/resource/po/en.po
old mode 100755 (executable)
new mode 100644 (file)
index cd96773..b45f09f
--- a/resource/po/en.po
+++ b/resource/po/en.po
@@ -2741,4 +2741,19 @@ msgid "IDS_ST_BODY_THE_APPLICATIONS_BELOW_WERE_STARTED_BY_PS_STOPPING_THESE_APPL
 msgstr "The applications below were started by %s. Stopping these applications may cause %s to fail."
 
 msgid "IDS_ST_BODY_SOFTKEY"
-msgstr "Soft Keys"
\ No newline at end of file
+msgstr "Soft Keys"
+
+msgid "IDS_ST_BODY_RESET_INITIAL_CONFIGURATION"
+msgstr "Reset initial configuration"
+
+msgid "IDS_MSG_RESET_INITIAL_CONFIGURATION"
+msgstr "Initial configuration will be reset."
+
+msgid "IDS_MSG_FACTORY_RESET"
+msgstr "Factory reset will be performed."
+
+msgid "IDS_MSG_RESET_CANNOT_BE_UNDONE"
+msgstr "This action cannot be undone."
+
+msgid "IDS_ST_BODY_SHOW_NETWORK_STATUS_AND_OTHER_INFORMATION"
+msgstr "show network status and other information."
\ No newline at end of file

diff --git a/resource/po/ko_KR.po b/resource/po/ko_KR.po
index 681aae156993bac44902d2a935339eed4bdeda64..34cf47329df3dd42e412cbbb146e7cc82e775317 100644 (file)
--- a/resource/po/ko_KR.po
+++ b/resource/po/ko_KR.po
@@ -2754,3 +2754,21 @@ msgstr "언어 변경"
 
 msgid "IDS_ST_POP_DEFAULT_LANGUAGE_WILL_BE_CHANGED"
 msgstr "기본 언어가 변경됩니다"
+
+msgid "IDS_ST_BODY_SOFTKEY"
+msgstr "소프트키"
+
+msgid "IDS_ST_BODY_RESET_INITIAL_CONFIGURATION"
+msgstr "설정 초기화"
+
+msgid "IDS_MSG_RESET_INITIAL_CONFIGURATION"
+msgstr "모든 설정을 초기화 합니다."
+
+msgid "IDS_MSG_FACTORY_RESET"
+msgstr "모든 데이터를 초기화합니다."
+
+msgid "IDS_MSG_RESET_CANNOT_BE_UNDONE"
+msgstr "수행한 작업은 취소할 수 없습니다."
+
+msgid "IDS_ST_BODY_SHOW_NETWORK_STATUS_AND_OTHER_INFORMATION"
+msgstr "네트워크 상황 및 기타 정보 표시"
\ No newline at end of file

diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c
index 43ec79225862629468c0a5074b71756c69b97281..57d8d73f7a44c74a5c398c5461217563ea6030e5 100755 (executable)
--- a/setting-about/src/setting-about-main.c
+++ b/setting-about/src/setting-about-main.c
@@ -732,8 +732,8 @@ static int __generate_genlist(void *data)
        (void)setting_create_Gendial_field_def(ad->md.genlist,
                        &(ad->itc_1icon_1text_sub), __mouse_up_Gendial_list_cb,
                        ad, SWALLOW_Type_INVALID, NULL, NULL, 0,
-                       ITEM_NAME_STATUS, "Show network "\
-                       "status, and other information.", NULL);
+                       ITEM_NAME_STATUS, _("IDS_ST_BODY_SHOW_NETWORK_STATUS_AND_OTHER_INFORMATION"),
+                       NULL);
 
        return SETTING_RETURN_SUCCESS;
 }

diff --git a/setting-reset/src/setting-reset-main.c b/setting-reset/src/setting-reset-main.c
index cd59d817c97a97868f251b3fecf5ba69bd937db9..ec05fd0705418a96f5801dbecc258f63c6b5f0e7 100644 (file)
--- a/setting-reset/src/setting-reset-main.c
+++ b/setting-reset/src/setting-reset-main.c
@@ -17,6 +17,11 @@
 #include "setting-reset.h"
 #include "controls/confirm-popup.h"
 
+#include <string.h>
+
+
+#define MAX_POPUPMSG   512
+
 struct item {
        const char *display_title;
        setting_call_back_func select;
@@ -51,8 +56,8 @@ const static struct item items[] = {
        { "Reset settings", setting_reset_settings_clicked, NULL},
        { "Reset network settings", setting_reset_network_clicked, NULL},
 #endif
-       { "Reset initial configuration", setting_reset_initial_config_clicked, NULL},
-       { "Factory data reset", setting_reset_factory_reset_clicked, NULL},
+       { "IDS_ST_BODY_RESET_INITIAL_CONFIGURATION", setting_reset_initial_config_clicked, NULL},
+       { "IDS_ST_MBODY_FACTORY_RESET", setting_reset_factory_reset_clicked, NULL},
 };
 
 #else
@@ -61,8 +66,8 @@ const static struct item items[] = {
 const static struct item Item_AllReset;
 const static struct item Item_NetworkReset;
 #endif
-const static struct item Item_ConfigReset = { "Reset initial configuration", setting_reset_initial_config_clicked, NULL};
-const static struct item Item_FactoryReset = { "Factory data reset", setting_reset_factory_reset_clicked, NULL};
+const static struct item Item_ConfigReset = { "IDS_ST_BODY_RESET_INITIAL_CONFIGURATION", setting_reset_initial_config_clicked, NULL};
+const static struct item Item_FactoryReset = { "IDS_ST_MBODY_FACTORY_RESET", setting_reset_factory_reset_clicked, NULL};
 
 #endif
 
@@ -103,8 +108,8 @@ static Evas_Object *_reset_confirm_popup_create(Evas_Object *parent)
 {
        Evas_Object *confirm_popup = confirm_popup_create(parent);
        confirm_popup_title_set(confirm_popup, "Confirm Reset");
-       confirm_popup_confirm_text_set(confirm_popup, "Reset");
-       confirm_popup_reject_text_set(confirm_popup, "Cancel");
+       confirm_popup_confirm_text_set(confirm_popup, _("IDS_ST_BUTTON_RESET"));
+       confirm_popup_reject_text_set(confirm_popup, _("IDS_ST_BUTTON_CANCEL"));
        return confirm_popup;
 }
 
@@ -148,9 +153,12 @@ static void _on_confirmed_reset_initial_config(void *data, Evas_Object *obj, voi
 
 static void setting_reset_initial_config_clicked(void *data, Evas_Object *obj, void *event_info)
 {
+       char popupmsg[MAX_POPUPMSG];
        MainData *md = data;
        Evas_Object *confirm_popup = _reset_confirm_popup_create(md->window);
-       confirm_popup_text_set(confirm_popup, "<align=center>Initial configuration will be reset.<br>This action cannot be undone.</align>");
+       snprintf(popupmsg, MAX_POPUPMSG, "<align=center>%s<br>%s</align>",
+                       _("IDS_MSG_RESET_INITIAL_CONFIGURATION"), _("IDS_MSG_RESET_CANNOT_BE_UNDONE"));
+       confirm_popup_text_set(confirm_popup, popupmsg);
        evas_object_smart_callback_add(confirm_popup, "confirmed", _on_confirmed_reset_initial_config, NULL);
        evas_object_smart_callback_add(confirm_popup, "rejected", _dismiss_popup, NULL);
        elm_genlist_item_selected_set(event_info, EINA_FALSE);
@@ -165,9 +173,12 @@ static void _on_confirmed_factory_reset(void *data, Evas_Object *obj, void *even
 
 static void setting_reset_factory_reset_clicked(void *data, Evas_Object *obj, void *event_info)
 {
+       char popupmsg[MAX_POPUPMSG];
        MainData *md = data;
        Evas_Object *confirm_popup = _reset_confirm_popup_create(md->window);
-       confirm_popup_text_set(confirm_popup, "<align=center>Factory reset will be performed.<br>This action cannot be undone.</align>");
+       snprintf(popupmsg, MAX_POPUPMSG, "<align=center>%s<br>%s</align>",
+                       _("IDS_MSG_FACTORY_RESET"), _("IDS_MSG_RESET_CANNOT_BE_UNDONE"));
+       confirm_popup_text_set(confirm_popup, popupmsg);
        evas_object_smart_callback_add(confirm_popup, "confirmed", _on_confirmed_factory_reset, NULL);
        evas_object_smart_callback_add(confirm_popup, "rejected", _dismiss_popup, NULL);
        elm_genlist_item_selected_set(event_info, EINA_FALSE);
@@ -207,7 +218,7 @@ static int setting_reset_create(void *ad)
                                                        (char*)it->icon,
                                                        NULL,
                                                        0,
-                                                       it->display_title,
+                                                       _(it->display_title),
                                                        NULL,
                                                        NULL);
        }
@@ -222,7 +233,7 @@ static int setting_reset_create(void *ad)
                                                (char*)it->icon,
                                                NULL,
                                                0,
-                                               it->display_title,
+                                               _(it->display_title),
                                                NULL,
                                                NULL);
 
@@ -240,7 +251,7 @@ static int setting_reset_create(void *ad)
                                                                (char*)it->icon,
                                                                NULL,
                                                                0,
-                                                               it->display_title,
+                                                               _(it->display_title),
                                                                NULL,
                                                                NULL);
                }