TizenRefApp-6566 Field with ringtone, that was added, is not saved after confirming

TizenRefApp-6567 Field with ringtone appears after tapping Back button

Change-Id: Iab930adabe1ab6cb9e333be7d54aaa78f8de7a4e
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/contacts-app/res/po/ar.po b/contacts-app/res/po/ar.po
index 43ffc56..e76e676 100644 (file)
--- a/contacts-app/res/po/ar.po
+++ b/contacts-app/res/po/ar.po
@@ -205,6 +205,9 @@ msgstr "تحديد السجلات"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "الاسم الصوتي"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "إفتراضي"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "الهاتف"
 

diff --git a/contacts-app/res/po/az.po b/contacts-app/res/po/az.po
index 35c86da..ed70bea 100644 (file)
--- a/contacts-app/res/po/az.po
+++ b/contacts-app/res/po/az.po
@@ -205,6 +205,9 @@ msgstr "Tarixçələri seç"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetik ad"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "İlkin təyin olunan"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/bg.po b/contacts-app/res/po/bg.po
index e3dc749..6e4e1cf 100644 (file)
--- a/contacts-app/res/po/bg.po
+++ b/contacts-app/res/po/bg.po
@@ -205,6 +205,9 @@ msgstr "Избери регистри"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Фонетично име"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "По подразбиране"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Телефон"
 

diff --git a/contacts-app/res/po/ca.po b/contacts-app/res/po/ca.po
index 70a7b41..43d4e8a 100644 (file)
--- a/contacts-app/res/po/ca.po
+++ b/contacts-app/res/po/ca.po
@@ -205,6 +205,9 @@ msgstr "Seleccionar registres"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Nom fonètic"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Predeterminat"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telèfon"
 

diff --git a/contacts-app/res/po/cs.po b/contacts-app/res/po/cs.po
index ddad892..7a6c2c8 100644 (file)
--- a/contacts-app/res/po/cs.po
+++ b/contacts-app/res/po/cs.po
@@ -205,6 +205,9 @@ msgstr "Vybrat protokoly"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetické jméno"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Výchozí"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/da.po b/contacts-app/res/po/da.po
index 0fc135c..27f4b8c 100644 (file)
--- a/contacts-app/res/po/da.po
+++ b/contacts-app/res/po/da.po
@@ -205,6 +205,9 @@ msgstr "Vælg opkaldslogger"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetisk navn"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Standard"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/de.po b/contacts-app/res/po/de.po
index fad6f86..8400536 100644 (file)
--- a/contacts-app/res/po/de.po
+++ b/contacts-app/res/po/de.po
@@ -205,6 +205,9 @@ msgstr "Protokolle auswählen"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Phonetischer Name"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Standard"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/el_GR.po b/contacts-app/res/po/el_GR.po
index 0e5b8ba..d0181c8 100644 (file)
--- a/contacts-app/res/po/el_GR.po
+++ b/contacts-app/res/po/el_GR.po
@@ -205,6 +205,9 @@ msgstr "Επιλογή αρχείων καταγραφής"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Φωνητικό όνομα"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Προεπιλογή"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Τηλέφωνο"
 

diff --git a/contacts-app/res/po/en.po b/contacts-app/res/po/en.po
index dd2aaca..f9d7705 100644 (file)
--- a/contacts-app/res/po/en.po
+++ b/contacts-app/res/po/en.po
@@ -205,6 +205,9 @@ msgstr "Select logs"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Phonetic name"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Default"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Phone"
 

diff --git a/contacts-app/res/po/en_PH.po b/contacts-app/res/po/en_PH.po
index 9bd79fb..22f2490 100644 (file)
--- a/contacts-app/res/po/en_PH.po
+++ b/contacts-app/res/po/en_PH.po
@@ -205,6 +205,9 @@ msgstr "Select logs"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Phonetic name"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Default"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Phone"
 

diff --git a/contacts-app/res/po/en_US.po b/contacts-app/res/po/en_US.po
index 810baea..5ea3555 100644 (file)
--- a/contacts-app/res/po/en_US.po
+++ b/contacts-app/res/po/en_US.po
@@ -205,6 +205,9 @@ msgstr "Select logs"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Phonetic name"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Default"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Phone"
 

diff --git a/contacts-app/res/po/es_ES.po b/contacts-app/res/po/es_ES.po
index 260851f..80ac13b 100644 (file)
--- a/contacts-app/res/po/es_ES.po
+++ b/contacts-app/res/po/es_ES.po
@@ -205,6 +205,9 @@ msgstr "Seleccionar registros"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonética"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Predeterminado"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Teléfono"
 

diff --git a/contacts-app/res/po/es_US.po b/contacts-app/res/po/es_US.po
index e448b15..55f386e 100644 (file)
--- a/contacts-app/res/po/es_US.po
+++ b/contacts-app/res/po/es_US.po
@@ -205,6 +205,9 @@ msgstr "Seleccionar registros"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonética"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Predeterminado"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Teléfono"
 

diff --git a/contacts-app/res/po/et.po b/contacts-app/res/po/et.po
index eab77fa..ec2a105 100644 (file)
--- a/contacts-app/res/po/et.po
+++ b/contacts-app/res/po/et.po
@@ -205,6 +205,9 @@ msgstr "Vali logid"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Häälduslik nimi"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Vaikimisi"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/eu.po b/contacts-app/res/po/eu.po
index cf025c7..b8aec4e 100644 (file)
--- a/contacts-app/res/po/eu.po
+++ b/contacts-app/res/po/eu.po
@@ -205,6 +205,9 @@ msgstr "Hautatu erregistroak"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Izen fonetikoa"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Lehenetsia"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/fi.po b/contacts-app/res/po/fi.po
index c447b6e..6503e2c 100644 (file)
--- a/contacts-app/res/po/fi.po
+++ b/contacts-app/res/po/fi.po
@@ -205,6 +205,9 @@ msgstr "Valitse lokit"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Foneettinen nimi"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Oletus"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Puhelin"
 

diff --git a/contacts-app/res/po/fr.po b/contacts-app/res/po/fr.po
index 6c81f7c..7c44a92 100644 (file)
--- a/contacts-app/res/po/fr.po
+++ b/contacts-app/res/po/fr.po
@@ -205,6 +205,9 @@ msgstr "Sélectionner des journaux"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Nom phonétique"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Par défaut"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Téléph."
 

diff --git a/contacts-app/res/po/fr_CA.po b/contacts-app/res/po/fr_CA.po
index 97c35dd..cc81a07 100644 (file)
--- a/contacts-app/res/po/fr_CA.po
+++ b/contacts-app/res/po/fr_CA.po
@@ -205,6 +205,9 @@ msgstr "Sélectionner des journaux"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Nom phonétique"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Par défaut"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Téléph."
 

diff --git a/contacts-app/res/po/ga.po b/contacts-app/res/po/ga.po
index d84ecda..8f1d524 100644 (file)
--- a/contacts-app/res/po/ga.po
+++ b/contacts-app/res/po/ga.po
@@ -205,6 +205,9 @@ msgstr "Roghnaigh logaí"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Ainm foghraíochta"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Réamhshocrú"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Fón"
 

diff --git a/contacts-app/res/po/gl.po b/contacts-app/res/po/gl.po
index 372785f..7dc1e75 100644 (file)
--- a/contacts-app/res/po/gl.po
+++ b/contacts-app/res/po/gl.po
@@ -205,6 +205,9 @@ msgstr "Seleccionar rexistros"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Nome fonético"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Predeterminada"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Teléf."
 

diff --git a/contacts-app/res/po/hi.po b/contacts-app/res/po/hi.po
index f96e91f..ccd086f 100644 (file)
--- a/contacts-app/res/po/hi.po
+++ b/contacts-app/res/po/hi.po
@@ -205,6 +205,9 @@ msgstr "लॉग्स चुनें"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "फोनेटिक नाम"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "डिफॉल्ट"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "फोन"
 

diff --git a/contacts-app/res/po/hr.po b/contacts-app/res/po/hr.po
index e858d2b..6b88763 100644 (file)
--- a/contacts-app/res/po/hr.po
+++ b/contacts-app/res/po/hr.po
@@ -205,6 +205,9 @@ msgstr "Odaberite zapise"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetsko ime"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Zadano"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/hu.po b/contacts-app/res/po/hu.po
index f6e41ec..9041344 100644 (file)
--- a/contacts-app/res/po/hu.po
+++ b/contacts-app/res/po/hu.po
@@ -205,6 +205,9 @@ msgstr "Naplók kiválasztása"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Név fonetikusan"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Alapértelmezett"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/hy.po b/contacts-app/res/po/hy.po
index 2c25500..b3a89a2 100644 (file)
--- a/contacts-app/res/po/hy.po
+++ b/contacts-app/res/po/hy.po
@@ -205,6 +205,9 @@ msgstr "Ընտրել մատյաններ"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Հնչյունային անուն"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Լռելյայն"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Հեռախոս"
 

diff --git a/contacts-app/res/po/is.po b/contacts-app/res/po/is.po
index bb3ee6a..e83a411 100644 (file)
--- a/contacts-app/res/po/is.po
+++ b/contacts-app/res/po/is.po
@@ -205,6 +205,9 @@ msgstr "Velja annála"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Hljóðritað nafn"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Sjálfgefið"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Í síma"
 

diff --git a/contacts-app/res/po/it_IT.po b/contacts-app/res/po/it_IT.po
index 79b312a..9e0ba9b 100644 (file)
--- a/contacts-app/res/po/it_IT.po
+++ b/contacts-app/res/po/it_IT.po
@@ -205,6 +205,9 @@ msgstr "Seleziona registri"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Nome fonetico"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Predefinito"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefono"
 

diff --git a/contacts-app/res/po/ja_JP.po b/contacts-app/res/po/ja_JP.po
index feef1a2..c84ce50 100644 (file)
--- a/contacts-app/res/po/ja_JP.po
+++ b/contacts-app/res/po/ja_JP.po
@@ -205,6 +205,9 @@ msgstr "履歴を選択"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "よみがな"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "標準"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "携帯電話"
 
@@ -212,7 +215,7 @@ msgid "IDS_TPLATFORM_HEADER_SET_DATE"
 msgstr "日付を設定"
 
 msgid "IDS_PB_TAB_CONTACTS"
-msgstr "é\9b»è©±å¸³"
+msgstr "é\80£çµ¡å\85\88"
 
 msgid "IDS_TPLATFORM_ACBUTTON_DONE_ABB"
 msgstr "完了"
@@ -734,7 +737,7 @@ msgid "IDS_PB_BODY_DATE"
 msgstr "日付"
 
 msgid "IDS_PB_BODY_CONTACTS"
-msgstr "é\9b»è©±å¸³"
+msgstr "é\80£çµ¡å\85\88"
 
 msgid "IDS_PB_TPOP_ONLY_FIRST_PD_CONTACTS_DISPLAYED"
 msgstr "最初の%d件の連絡先のみ表示されます。"

diff --git a/contacts-app/res/po/ka.po b/contacts-app/res/po/ka.po
index 0c44c8e..9c851d9 100644 (file)
--- a/contacts-app/res/po/ka.po
+++ b/contacts-app/res/po/ka.po
@@ -205,6 +205,9 @@ msgstr "აირჩიეთ ჩანაწერთა ჟურნალე
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "ფონეტიკური სახელი"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "ნაგულისხმევი"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "ტელეფონი"
 

diff --git a/contacts-app/res/po/kk.po b/contacts-app/res/po/kk.po
index a24826e..f194757 100644 (file)
--- a/contacts-app/res/po/kk.po
+++ b/contacts-app/res/po/kk.po
@@ -205,6 +205,9 @@ msgstr "Журналдар таңдау"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Фонетикалық атау"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Өздігінен"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Телефон"
 

diff --git a/contacts-app/res/po/ko_KR.po b/contacts-app/res/po/ko_KR.po
index e3c3dee..faeb6c8 100644 (file)
--- a/contacts-app/res/po/ko_KR.po
+++ b/contacts-app/res/po/ko_KR.po
@@ -205,6 +205,9 @@ msgstr "기록 선택"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "이름(소리나는 대로)"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "기본"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "휴대전화"
 

diff --git a/contacts-app/res/po/lt.po b/contacts-app/res/po/lt.po
index 5653048..adcbb56 100644 (file)
--- a/contacts-app/res/po/lt.po
+++ b/contacts-app/res/po/lt.po
@@ -205,6 +205,9 @@ msgstr "Pasirinkite žurnalus"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetinis pavadinimas"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Numatytoji"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telef."
 

diff --git a/contacts-app/res/po/lv.po b/contacts-app/res/po/lv.po
index 81320d0..55a16e9 100644 (file)
--- a/contacts-app/res/po/lv.po
+++ b/contacts-app/res/po/lv.po
@@ -205,6 +205,9 @@ msgstr "Izvēlēties žurnālus"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Vārds fonētiski"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Noklusējums"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Tālrunis"
 

diff --git a/contacts-app/res/po/mk.po b/contacts-app/res/po/mk.po
index dd6354e..b9a99d7 100644 (file)
--- a/contacts-app/res/po/mk.po
+++ b/contacts-app/res/po/mk.po
@@ -205,6 +205,9 @@ msgstr "Одбери дневници"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Фонетско име"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Основно"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Телефон"
 

diff --git a/contacts-app/res/po/nb.po b/contacts-app/res/po/nb.po
index a5cf647..37b8e97 100644 (file)
--- a/contacts-app/res/po/nb.po
+++ b/contacts-app/res/po/nb.po
@@ -205,6 +205,9 @@ msgstr "Velg logger"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetisk navn"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Standard"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/nl.po b/contacts-app/res/po/nl.po
index 78dd976..fde734b 100644 (file)
--- a/contacts-app/res/po/nl.po
+++ b/contacts-app/res/po/nl.po
@@ -205,6 +205,9 @@ msgstr "Logbestanden selecteren"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Naam fonetisch"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Standaard"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefoon"
 

diff --git a/contacts-app/res/po/pl.po b/contacts-app/res/po/pl.po
index b278454..af59cf6 100644 (file)
--- a/contacts-app/res/po/pl.po
+++ b/contacts-app/res/po/pl.po
@@ -205,6 +205,9 @@ msgstr "Wybór dzienników"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Nazwa fonetyczna"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Domyślnie"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/pt_BR.po b/contacts-app/res/po/pt_BR.po
index e4852d5..5ac8ff9 100644 (file)
--- a/contacts-app/res/po/pt_BR.po
+++ b/contacts-app/res/po/pt_BR.po
@@ -205,6 +205,9 @@ msgstr "Selecionar logs"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Nome fonético"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Padrão"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefone"
 

diff --git a/contacts-app/res/po/pt_PT.po b/contacts-app/res/po/pt_PT.po
index 290fa23..19ae672 100644 (file)
--- a/contacts-app/res/po/pt_PT.po
+++ b/contacts-app/res/po/pt_PT.po
@@ -205,6 +205,9 @@ msgstr "Seleccionar registos"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Nome fonético"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Padrão"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefone"
 

diff --git a/contacts-app/res/po/ro.po b/contacts-app/res/po/ro.po
index 2ce4c6a..6aa900f 100644 (file)
--- a/contacts-app/res/po/ro.po
+++ b/contacts-app/res/po/ro.po
@@ -205,6 +205,9 @@ msgstr "Selectare jurnale"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Nume fonetic"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Implicit"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/ru_RU.po b/contacts-app/res/po/ru_RU.po
index fd478d4..627e087 100644 (file)
--- a/contacts-app/res/po/ru_RU.po
+++ b/contacts-app/res/po/ru_RU.po
@@ -205,6 +205,9 @@ msgstr "Выбрать журналы"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Фонетическое имя"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "По умолчанию"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Телефон"
 

diff --git a/contacts-app/res/po/sk.po b/contacts-app/res/po/sk.po
index 2a61f01..5c5c4c3 100644 (file)
--- a/contacts-app/res/po/sk.po
+++ b/contacts-app/res/po/sk.po
@@ -205,6 +205,9 @@ msgstr "Vybrať denníky"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Výslovnosť mena"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Predvolený"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefón"
 

diff --git a/contacts-app/res/po/sl.po b/contacts-app/res/po/sl.po
index aa14428..349a566 100644 (file)
--- a/contacts-app/res/po/sl.po
+++ b/contacts-app/res/po/sl.po
@@ -205,6 +205,9 @@ msgstr "Izberi dnevnike"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetsko ime"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Privzeto"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/sr.po b/contacts-app/res/po/sr.po
index 9383853..5fb7b0b 100644 (file)
--- a/contacts-app/res/po/sr.po
+++ b/contacts-app/res/po/sr.po
@@ -205,6 +205,9 @@ msgstr "Izaberi dnevnike"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetski napisano ime"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Podrazumevano"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/sv.po b/contacts-app/res/po/sv.po
index 3b741a5..549c628 100644 (file)
--- a/contacts-app/res/po/sv.po
+++ b/contacts-app/res/po/sv.po
@@ -205,6 +205,9 @@ msgstr "Välj loggar"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetiskt namn"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Standard"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/tr_TR.po b/contacts-app/res/po/tr_TR.po
index 42331d1..40e4c8b 100644 (file)
--- a/contacts-app/res/po/tr_TR.po
+++ b/contacts-app/res/po/tr_TR.po
@@ -205,6 +205,9 @@ msgstr "Kayıtları seç"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetik ad"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Varsayılan"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/uk.po b/contacts-app/res/po/uk.po
index dcf2fa3..6639a26 100644 (file)
--- a/contacts-app/res/po/uk.po
+++ b/contacts-app/res/po/uk.po
@@ -205,6 +205,9 @@ msgstr "Вибір журналів"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Фонетичне ім’я"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Стандартний"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Телефон"
 

diff --git a/contacts-app/res/po/uz.po b/contacts-app/res/po/uz.po
index ad6af83..19609e4 100644 (file)
--- a/contacts-app/res/po/uz.po
+++ b/contacts-app/res/po/uz.po
@@ -205,6 +205,9 @@ msgstr "Jurnallarni tanlash"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "Fonetik nomi"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "Birlamchi"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "Telefon"
 

diff --git a/contacts-app/res/po/zh_CN.po b/contacts-app/res/po/zh_CN.po
index 77b5dda..1ca197e 100644 (file)
--- a/contacts-app/res/po/zh_CN.po
+++ b/contacts-app/res/po/zh_CN.po
@@ -205,6 +205,9 @@ msgstr "选择记录"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "姓名发音"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "默认"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "手机"
 
@@ -443,7 +446,7 @@ msgid "IDS_PB_OPT_EDIT"
 msgstr "编辑"
 
 msgid "IDS_PB_OPT_DOMESTIC_PARTNER_ABB2"
-msgstr "å\90\8cå±\85ä¼´ä¾£"
+msgstr "室å\8f\8b"
 
 msgid "IDS_PB_OPT_CUSTOM"
 msgstr "自定义"

diff --git a/contacts-app/res/po/zh_HK.po b/contacts-app/res/po/zh_HK.po
index 40c1123..85e85ab 100644 (file)
--- a/contacts-app/res/po/zh_HK.po
+++ b/contacts-app/res/po/zh_HK.po
@@ -205,6 +205,9 @@ msgstr "選擇記錄"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "語音名稱"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "預設"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "電話"
 

diff --git a/contacts-app/res/po/zh_TW.po b/contacts-app/res/po/zh_TW.po
index f1243fd..2bd2a27 100644 (file)
--- a/contacts-app/res/po/zh_TW.po
+++ b/contacts-app/res/po/zh_TW.po
@@ -205,6 +205,9 @@ msgstr "選擇記錄"
 msgid "IDS_PB_BODY_PHONETIC_NAME"
 msgstr "語音名稱"
 
+msgid "IDS_PB_BODY_DEFAULT"
+msgstr "預設"
+
 msgid "IDS_PB_BUTTON_PHONE_ABB"
 msgstr "電話"
 

diff --git a/lib-apps-common/src/App/AppControlRequest.cpp b/lib-apps-common/src/App/AppControlRequest.cpp
index 61bb8b2..f400791 100644 (file)
--- a/lib-apps-common/src/App/AppControlRequest.cpp
+++ b/lib-apps-common/src/App/AppControlRequest.cpp
@@ -123,6 +123,7 @@ AppControl App::requestPickRingtone(const char *selectedPath)
        AppControl request("setting-ringtone-efl");
        request.addExtra("marked_mode", selectedPath);
        request.addExtra("path", "/opt/share/settings/Ringtones");
+       request.addExtra("default", "default show");
        return request;
 }
 

diff --git a/lib-contacts/inc/Contacts/Details/RingtoneFieldItem.h b/lib-contacts/inc/Contacts/Details/RingtoneFieldItem.h
new file mode 100644 (file)
index 0000000..0dbd63a
--- /dev/null
+++ b/lib-contacts/inc/Contacts/Details/RingtoneFieldItem.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ *
+ */
+
+#ifndef CONTACTS_DETAILS_RINGTONE_FIELD_ITEM_H
+#define CONTACTS_DETAILS_RINGTONE_FIELD_ITEM_H
+
+#include "Contacts/Details/FieldItem.h"
+
+namespace Contacts
+{
+       namespace Details
+       {
+               /**
+                * @brief Genlist item representing Ringtone field.
+                */
+               class RingtoneFieldItem : public FieldItem
+               {
+               public:
+                       using FieldItem::FieldItem;
+
+               protected:
+                       /**
+                        * @see GenlistItem::getText()
+                        */
+                       virtual char *getText(Evas_Object *parent, const char *part) override;
+               };
+       }
+}
+
+#endif /* CONTACTS_DETAILS_RINGTONE_FIELD_ITEM_H */

diff --git a/lib-contacts/inc/Contacts/Input/ContactDateFieldControl.h b/lib-contacts/inc/Contacts/Input/ContactDateFieldControl.h
index 7c415d4..ddd9ff7 100644 (file)
--- a/lib-contacts/inc/Contacts/Input/ContactDateFieldControl.h
+++ b/lib-contacts/inc/Contacts/Input/ContactDateFieldControl.h
@@ -38,11 +38,6 @@ namespace Contacts
                        ContactDateFieldControl(Model::ContactDateField &field);
 
                        /**
-                        * @brief Show date picker popup.
-                        */
-                       void showPicker();
-
-                       /**
                         * @brief Update the control using field's value.
                         */
                        void update();

diff --git a/lib-contacts/inc/Contacts/Input/ContactRingtoneFieldItem.h b/lib-contacts/inc/Contacts/Input/ContactRingtoneFieldItem.h
index 8b4c5fd..7a1f756 100644 (file)
--- a/lib-contacts/inc/Contacts/Input/ContactRingtoneFieldItem.h
+++ b/lib-contacts/inc/Contacts/Input/ContactRingtoneFieldItem.h
@@ -38,6 +38,11 @@ namespace Contacts
                         */
                        virtual bool isFocusable() const override;
 
+                       /**
+                        * @see ContactFieldSubItem::update()
+                        */
+                       virtual void update() override;
+
                private:
                        virtual Elm_Genlist_Item_Class *getItemClass() const override;
                        virtual char *getText(Evas_Object *parent, const char *part) override;
@@ -45,10 +50,6 @@ namespace Contacts
 
                        virtual void onInserted() override;
                        virtual void onSelected() override;
-                       virtual void onFocused() override;
-
-                       char *getRingtonePath() const;
-                       void pickRingtone();
                        void onPickResult(app_control_h request, app_control_h reply,
                                        app_control_result_e result);
 

diff --git a/lib-contacts/inc/Contacts/Input/InputView.h b/lib-contacts/inc/Contacts/Input/InputView.h
index 693a9e6..60b7b57 100644 (file)
--- a/lib-contacts/inc/Contacts/Input/InputView.h
+++ b/lib-contacts/inc/Contacts/Input/InputView.h
@@ -92,6 +92,9 @@ namespace Contacts
                        ContactFieldItem *addFieldItem(Model::ContactObject &field);
                        void removeFieldItem(ContactFieldItem *item);
 
+                       void addEventField();
+                       void addRingtoneField();
+
                        void onAddField(Model::ContactFieldId fieldId);
                        void onRemoveField(ContactFieldItem *item);
                        void onContactFilled(bool isFilled);

diff --git a/lib-contacts/src/Contacts/Details/DetailsView.cpp b/lib-contacts/src/Contacts/Details/DetailsView.cpp
index 35e377f..e9593a3 100644 (file)
--- a/lib-contacts/src/Contacts/Details/DetailsView.cpp
+++ b/lib-contacts/src/Contacts/Details/DetailsView.cpp
@@ -18,6 +18,7 @@
 #include "Contacts/Details/DetailsView.h"
 #include "Contacts/Details/BasicInfoItem.h"
 #include "Contacts/Details/MultilineFieldItem.h"
+#include "Contacts/Details/RingtoneFieldItem.h"
 #include "Contacts/Details/TypedActionFieldItem.h"
 #include "Contacts/Input/InputView.h"
 #include "Contacts/Model/ContactArray.h"
@@ -190,6 +191,8 @@ FieldItem *DetailsView::createFieldItem(ContactObject &field)
        } else if (fieldId == FieldNote) {
                /* FIXME: Use MultilineFieldItem when style will be available */
                item = new FieldItem(field);
+       } else if (fieldId == FieldRingtone) {
+               item = new RingtoneFieldItem(field);
        } else if (field.getInterfaces() & InterfaceTypedObject) {
                item = new TypedFieldItem(field);
        } else {

diff --git a/lib-contacts/src/Contacts/Details/RingtoneFieldItem.cpp b/lib-contacts/src/Contacts/Details/RingtoneFieldItem.cpp
new file mode 100644 (file)
index 0000000..d6af3ab
--- /dev/null
+++ b/lib-contacts/src/Contacts/Details/RingtoneFieldItem.cpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ *
+ */
+
+#include "Contacts/Details/RingtoneFieldItem.h"
+
+using namespace Contacts::Details;
+
+char *RingtoneFieldItem::getText(Evas_Object *parent, const char *part)
+{
+       if (strcmp(part, "elm.text") == 0) {
+               char *path = FieldItem::getText(parent, "elm.text");
+               char *name = strdup(basename(path));
+               free(path);
+               return name;
+       }
+
+       return FieldItem::getText(parent, part);
+}

diff --git a/lib-contacts/src/Contacts/Input/ContactDateFieldControl.cpp b/lib-contacts/src/Contacts/Input/ContactDateFieldControl.cpp
index 24df184..25eb006 100644 (file)
--- a/lib-contacts/src/Contacts/Input/ContactDateFieldControl.cpp
+++ b/lib-contacts/src/Contacts/Input/ContactDateFieldControl.cpp
@@ -33,16 +33,6 @@ ContactDateFieldControl::ContactDateFieldControl(Model::ContactDateField &field)
 {
 }
 
-void ContactDateFieldControl::showPicker()
-{
-       Ui::DatePopup *popup = new Ui::DatePopup(m_Field.getValue());
-       popup->setResultCallback([this](const tm &date) {
-               m_Field.setValue(date);
-               update();
-       });
-       popup->create(getEvasObject());
-}
-
 void ContactDateFieldControl::update()
 {
        tm date = m_Field.getValue();
@@ -75,5 +65,10 @@ void ContactDateFieldControl::onCreated()
 
 void ContactDateFieldControl::onButtonPressed(Evas_Object *button, void *eventInfo)
 {
-       showPicker();
+       Ui::DatePopup *popup = new Ui::DatePopup(m_Field.getValue());
+       popup->setResultCallback([this](const tm &date) {
+               m_Field.setValue(date);
+               update();
+       });
+       popup->create(getEvasObject());
 }

diff --git a/lib-contacts/src/Contacts/Input/ContactFieldSubItem.cpp b/lib-contacts/src/Contacts/Input/ContactFieldSubItem.cpp
index c7cad82..d985bb6 100644 (file)
--- a/lib-contacts/src/Contacts/Input/ContactFieldSubItem.cpp
+++ b/lib-contacts/src/Contacts/Input/ContactFieldSubItem.cpp
@@ -105,9 +105,6 @@ void ContactFieldSubItem::onFocused()
                if (m_Field.getType() == TypeText) {
                        auto textControl = static_cast<ContactTextFieldControl *>(control);
                        elm_object_focus_set(textControl->getEntry(), EINA_TRUE);
-               } else if (m_Field.getType() == TypeDate) {
-                       auto dateControl = static_cast<ContactDateFieldControl *>(control);
-                       dateControl->showPicker();
                }
        }
 }

diff --git a/lib-contacts/src/Contacts/Input/ContactRingtoneFieldItem.cpp b/lib-contacts/src/Contacts/Input/ContactRingtoneFieldItem.cpp
index 22e98e1..a9c5a24 100644 (file)
--- a/lib-contacts/src/Contacts/Input/ContactRingtoneFieldItem.cpp
+++ b/lib-contacts/src/Contacts/Input/ContactRingtoneFieldItem.cpp
@@ -37,6 +37,11 @@ bool ContactRingtoneFieldItem::isFocusable() const
        return false;
 }
 
+void ContactRingtoneFieldItem::update()
+{
+       elm_genlist_item_fields_update(getObjectItem(), "elm.text", ELM_GENLIST_ITEM_FIELD_TEXT);
+}
+
 Elm_Genlist_Item_Class *ContactRingtoneFieldItem::getItemClass() const
 {
        static Elm_Genlist_Item_Class itc = createItemClass("type2");
@@ -46,10 +51,13 @@ Elm_Genlist_Item_Class *ContactRingtoneFieldItem::getItemClass() const
 char *ContactRingtoneFieldItem::getText(Evas_Object *parent, const char *part)
 {
        if (strcmp(part, "elm.text") == 0) {
-               char *value = getRingtonePath();
-               char *substr = strdup(basename(value));
-               free(value);
-               return substr;
+               const char *value = getField().cast<ContactTextField>().getValue();
+               if (value) {
+                       std::string path = value;
+                       return strdup(basename(&path[0]));
+               }
+
+               return strdup(_("IDS_PB_BODY_DEFAULT"));
        } else if (strcmp(part, "elm.text.sub") == 0) {
                const char *name = Common::getContactFieldName(ContactFieldId(getObject().getId()));
                return Utils::safeDup(_(name));
@@ -75,35 +83,9 @@ void ContactRingtoneFieldItem::onInserted()
 
 void ContactRingtoneFieldItem::onSelected()
 {
-       pickRingtone();
-}
-
-void ContactRingtoneFieldItem::onFocused()
-{
-       pickRingtone();
-}
-
-char *ContactRingtoneFieldItem::getRingtonePath() const
-{
-       char *value = nullptr;
-       const char *fieldValue = getField().cast<ContactTextField>().getValue();
-       if (fieldValue) {
-               value = strdup(fieldValue);
-       } else {
-               char *defaultValue = nullptr;
-               system_settings_get_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, &defaultValue);
-               value = defaultValue;
-       }
-
-       return value;
-}
-
-void ContactRingtoneFieldItem::pickRingtone()
-{
-       char *value = getRingtonePath();
-       m_AppControl = App::requestPickRingtone(value);
+       const char *value = getField().cast<ContactTextField>().getValue();
+       m_AppControl = App::requestPickRingtone(value ? value : "default");
        m_AppControl.launch(makeCallbackWithLastParam(&ContactRingtoneFieldItem::onPickResult), this);
-       free(value);
 }
 
 void ContactRingtoneFieldItem::onPickResult(app_control_h request, app_control_h reply,
@@ -113,6 +95,12 @@ void ContactRingtoneFieldItem::onPickResult(app_control_h request, app_control_h
        int err = app_control_get_extra_data(reply, "result", &path);
        WARN_IF_ERR(err, "app_control_get_extra_data() failed.");
 
-       getField().cast<ContactTextField>().setValue(path);
+       if (strcmp(path, "default") == 0) {
+               getField().reset();
+       } else {
+               getField().cast<ContactTextField>().setValue(path);
+       }
+
+       update();
        free(path);
 }

diff --git a/lib-contacts/src/Contacts/Input/InputView.cpp b/lib-contacts/src/Contacts/Input/InputView.cpp
index bde61ef..06a14e9 100644 (file)
--- a/lib-contacts/src/Contacts/Input/InputView.cpp
+++ b/lib-contacts/src/Contacts/Input/InputView.cpp
@@ -25,10 +25,13 @@
 #include "Contacts/Details/DetailsView.h"
 
 #include "Contacts/Model/ContactArray.h"
+#include "Contacts/Model/ContactDateField.h"
 #include "Contacts/Model/ContactTextField.h"
 #include "Contacts/Model/ContactCompoundObject.h"
 
+#include "App/AppControlRequest.h"
 #include "App/Path.h"
+#include "Ui/DatePopup.h"
 #include "Ui/Genlist.h"
 #include "Ui/Navigator.h"
 #include "Ui/Popup.h"
@@ -285,10 +288,50 @@ void InputView::removeFieldItem(ContactFieldItem *item)
        delete item;
 }
 
+void InputView::addEventField()
+{
+       time_t now = time(nullptr);
+       Ui::DatePopup *popup = new Ui::DatePopup(*localtime(&now));
+       popup->setResultCallback([this](const tm &date) {
+               ContactObject &field = addField(FieldEvent);
+               field.getField<ContactDateField>(0)->setValue(date);
+               addFieldItem(field);
+       });
+       popup->create(getEvasObject());
+}
+
+void InputView::addRingtoneField()
+{
+       auto request = App::requestPickRingtone("default");
+       request.launch([](app_control_h request, app_control_h reply,
+                       app_control_result_e result, void *data) {
+               InputView *view = (InputView *) data;
+
+               char *path = nullptr;
+               int err = app_control_get_extra_data(reply, "result", &path);
+               RETM_IF_ERR(err, "app_control_get_extra_data() failed.");
+
+               if (strcmp(path, "default") != 0) {
+                       ContactObject &field = view->addField(FieldRingtone);
+                       field.getField<ContactTextField>(0)->setValue(path);
+                       view->addFieldItem(field);
+               }
+
+               free(path);
+       }, this);
+       request.detach();
+}
+
 void InputView::onAddField(ContactFieldId fieldId)
 {
-       ContactFieldItem *item = addFieldItem(addField(fieldId));
-       item->focus(ELM_GENLIST_ITEM_SCROLLTO_TOP);
+       if (fieldId == FieldRingtone) {
+               addRingtoneField();
+       } else if (fieldId == FieldEvent) {
+               addEventField();
+       } else {
+               ContactFieldItem *item = addFieldItem(addField(fieldId));
+               item->focus(ELM_GENLIST_ITEM_SCROLLTO_TOP);
+       }
 }
 
 void InputView::onRemoveField(ContactFieldItem *item)