Merge "Fix N_SE-11040 and N_SE-11346"

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index dbcd483..b93375a 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -149,7 +149,7 @@ GOPTION="-g 6514"
 
        vconftool $GOPTION set -t string db/setting/sound/noti/email_ringtone_path      "${DEFAULT_NOTI_TONE}"
        vconftool $GOPTION set -t int db/setting/sound/noti/email_alert_rep_type                "0"
-
+       vconftool $GOPTION set -t bool db/setting/sound/touch_sounds "1"
        vconftool $GOPTION set -t bool db/setting/sound/sound_lock "1"
 
 #resetWallpaper

diff --git a/resource/langlist.xml b/resource/langlist.xml
index 2411a74..778de97 100755 (executable)
--- a/resource/langlist.xml
+++ b/resource/langlist.xml
@@ -1,19 +1,54 @@
 <?xml version="1.0"?>
 <langlist>
-       <language id="ko_KR.UTF-8" string="한국어" no="1"/>
-       <language id="en_US.UTF-8" string="English" no="2"/>
-       <language id="zh_CN.UTF-8" string="简体中文" no="3"/>
-       <language id="zh_HK.UTF-8" string="繁體中文(香港)" no="4"/>
-       <language id="zh_TW.UTF-8" string="繁體中文(台灣)" no="5"/>
-       <language id="de_DE.UTF-8" string="Deutsch" no="6"/>
-       <language id="nl_NL.UTF-8" string="Nederlands" no="7"/>
-       <language id="es_ES.UTF-8" string="Español" no="8"/>
-       <language id="pt_PT.UTF-8" string="Português" no="9"/>
-       <language id="el_GR.UTF-8" string="Eλληνικά" no="10"/>
-       <language id="it_IT.UTF-8" string="Italiano" no="11"/>
-       <language id="fr_FR.UTF-8" string="Français" no="12"/>
-       <language id="tr_TR.UTF-8" string="Türkçe" no="13"/>
-       <language id="ja_JP.UTF-8" string="にほんご" no="14"/>
-       <language id="ru_RU.UTF-8" string="Россию" no="15"/>
-       <language id="en_US.UTF-8" string="ADDTEST" no="16"/>
+  <language id="az_AZ.utf8" string="Azərbaycanca" no="1" lang="Azerbaijani"/>
+  <language id="ca_ES.utf8" string="Català" no="2" lang="Catalan"/>
+  <language id="cs_CZ.utf8" string="Čeština" no="3" lang="Czech"/>
+  <language id="sr_RS" string="Cрпски" no="4" lang="Serbian"/>
+  <language id="da_DK.utf8" string="Dansk" no="5" lang="Danish"/>
+  <language id="de_DE.utf8" string="Deutsch" no="6" lang="German"/>
+  <language id="et_EE.utf8" string="Eesti" no="7" lang="Estonian"/>
+  <language id="en_PH.utf8" string="English (Philippines)" no="8" lang="English(Philippines)"/>
+  <language id="en_GB.utf8" string="English (United Kingdom)" no="9" lang="English(UK)"/>
+  <language id="en_US.utf8" string="English (United States)" no="10" lang="English(US)"/>
+  <language id="es_ES.utf8" string="Español (España)" no="11" lang="Spanish"/>
+  <language id="es_US.utf8" string="Español (Estados Unidos)" no="12" lang="Spanish(US)"/>
+  <language id="eu_ES.utf8" string="Euskara" no="13" lang="Basque"/>
+  <language id="fr_CA.utf8" string="Français (Canada)" no="14" lang="French(Canada)"/>
+  <language id="fr_FR.utf8" string="Français (France)" no="15" lang="French"/>
+  <language id="ga_IE.utf8" string="Gaeilge" no="16" lang="Irish"/>
+  <language id="gl_ES.utf8" string="Galego" no="17" lang="Galician"/>
+  <language id="hr_HR.utf8" string="Hrvatski" no="18" lang="Croatian"/>
+  <language id="is_IS.utf8" string="Íslenska" no="19" lang="Icelandic"/>
+  <language id="it_IT.utf8" string="Italiano" no="20" lang="Italian"/>
+  <language id="lv_LV.utf8" string="Latviešu" no="21" lang="Latvian"/>
+  <language id="lt_LT.utf8" string="Lietuvių" no="22" lang="Lithuanian"/>
+  <language id="hu_HU.utf8" string="Magyar" no="23" lang="Hungarian"/>
+  <language id="nl_NL.utf8" string="Nederlands" no="24" lang="Dutch"/>
+  <language id="nb_NO.utf8" string="Norsk" no="25" lang="Norwegian"/>
+  <language id="uz_UZ.utf8" string="Oʻzbek" no="26" lang="Uzbek"/>
+  <language id="pl_PL.utf8" string="Polski" no="27" lang="Polish"/>
+  <language id="pt_BR.utf8" string="Português (Brasil)" no="28" lang="Portuguese(Brazil)"/>
+  <language id="pt_PT.utf8" string="Português (Portugal)" no="29" lang="Portuguese"/>
+  <language id="ru_RU.utf8" string="Pусский" no="30" lang="Russian"/>
+  <language id="ro_RO.utf8" string="Română" no="31" lang="Romanian"/>
+  <language id="sk_SK.utf8" string="Slovenčina" no="32" lang="Slovak"/>
+  <language id="sl_SI.utf8" string="Slovenščina" no="33" lang="Slovenian"/>
+  <language id="fi_FI.utf8" string="Suomi" no="34" lang="Finnish"/>
+  <language id="sv_SE.utf8" string="Svenska" no="35" lang="Swedish"/>
+  <language id="tr_TR.utf8" string="Türkçe" no="36" lang="Turkish"/>
+  <language id="el_GR.utf8" string="Ελληνικά" no="37" lang="Greek"/>
+  <language id="bg_BG.utf8" string="Български език" no="38" lang="Bulgarian"/>
+  <language id="kk_KZ.utf8" string="Қазақ тілі" no="39" lang="Kazakh"/>
+  <language id="mk_MK.utf8" string="Македонски" no="40" lang="Macedonian"/>
+  <language id="uk_UA.utf8" string="Українська" no="41" lang="Ukrainian"/>
+  <language id="hy_AM" string="Հայերէն" no="42" lang="Armenian"/>
+  <language id="ka_GE.utf8" string="ქართული ენა" no="43" lang="Georgian"/>
+  <language id="ar_AE.utf8" string="العربية" no="44" lang="Arabic"/>
+  <language id="hi_IN" string="हिंदी" no="45" lang="Hindi"/>
+  <language id="zh_CN.utf8" string="简体中文" no="46" lang="Chinese"/>
+  <language id="zh_SG.utf8" string="简体中文 (新加坡)" no="47" lang="Chinese(Singapore)"/>
+  <language id="zh_TW.utf8" string="繁體中文 (台灣)" no="48" lang="Chinese(Taiwan)"/>
+  <language id="zh_HK.utf8" string="繁體中文 (香港)" no="49" lang="Chinese(HongKong)"/>
+  <language id="ja_JP.utf8" string="日本語" no="50" lang="Japanese"/>
+  <language id="ko_KR.utf8" string="한국어" no="51" lang="Korean"/>
 </langlist>

diff --git a/setting-profile/include/setting-profile-sound-main.h b/setting-profile/include/setting-profile-sound-main.h
index d008314..e90d241 100755 (executable)
--- a/setting-profile/include/setting-profile-sound-main.h
+++ b/setting-profile/include/setting-profile-sound-main.h
@@ -23,8 +23,6 @@
 
 #include <setting-profile.h>
 
-// Test comment by rndclub(jungbae.lee@samsung.com) 2012.06
-
 #define SETTING_SOUND_VIB_TYPE_LEN 5
 #define SETTING_SOUND_REPEAT_TYPE_LEN 4
 #define SETTING_SOUND_VOLUME_TIMER_INTERVAL 0.2

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index 8dd3cbc..37c3a58 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -532,6 +532,9 @@ static Evas_Object *__get_main_list(void *data)
                                         ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
        /* Touch sounds */
+       if (vconf_get_bool(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, &vconf_value) < 0)
+               vconf_value = TRUE;     /*  default value of touch sounds : on */
+
        ad->data_touch_sounds =
            setting_create_Gendial_field_def(genlist, &(ad->itc_1text_1icon),
                                             setting_profile_sound_main_mouse_up_Gendial_list_cb,
@@ -1132,6 +1135,12 @@ setting_profile_sound_main_Gendial_chk_cb(void *data, Evas_Object *obj,
                        elm_check_state_set(list_item->eo_check, !state);
                }
        }
+       else if (!safeStrCmp("IDS_ST_BODY_TOUCH_SOUNDS", list_item->keyStr)) {
+               if (vconf_set_bool(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, list_item->chk_status) < 0) {
+                       list_item->chk_status = !state;
+                       elm_check_state_set(list_item->eo_check, !state);
+               }
+       }
 
        /* end */
 
@@ -1186,9 +1195,11 @@ setting_profile_sound_main_mouse_up_Gendial_list_cb(void *data,
        else if (!safeStrCmp("IDS_ST_BODY_TOUCH_SOUNDS", list_item->keyStr)) {
                int old_status = elm_check_state_get(list_item->eo_check);
                /* To do : set vconfkey for touch sounds */
-
-               list_item->chk_status = !old_status;
-               elm_check_state_set(list_item->eo_check, list_item->chk_status);
+               if (vconf_set_bool(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, !old_status) == 0) {
+                       /* new status */
+                       list_item->chk_status = !old_status;
+                       elm_check_state_set(list_item->eo_check, list_item->chk_status);
+               }
        }
        /* end */
        else if (ad->data_msg_alert_repeat == list_item