[TSAM-8814]popup issue while rename resolved

Change-Id: Idb0e2fb8edfe65077cef315c4cc46b504f1cecb8
Signed-off-by: shubham kumar <shubham.srib@samsung.com>

diff --git a/inc/mf-callback.h b/inc/mf-callback.h
index 450745e..7d66f54 100755 (executable)
--- a/inc/mf-callback.h
+++ b/inc/mf-callback.h
@@ -60,6 +60,7 @@ void mf_callback_thread_pipe_cb(void *data, void *buffer, unsigned int nbyte);
 void mf_callback_icu_update_cb(app_event_info_h event_info, void *data);
 void mf_callback_exception_popup_cb(void *data);
 void mf_popup_show_vk_cb(void *data, Evas_Object *obj, void *event_info);
+void mf_popup_clear_vk_cb(void *data, Evas_Object *obj, void *event_info);
 void mf_callback_backbutton_clicked_cb(void *data, Evas_Object *obj, void *event_info);
 Eina_Bool mf_callback_navi_backbutton_clicked_cb(void *data, Elm_Object_Item *it);
 void mf_callback_upper_click_cb(void *data, Evas_Object * obj, void *event_info);

diff --git a/res/po/ar.po b/res/po/ar.po
index 13db57d..90f84d5 100644 (file)
--- a/res/po/ar.po
+++ b/res/po/ar.po
@@ -796,6 +796,9 @@ msgstr "جاري النسخ..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "جاري المسح..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "فشل."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "اللائحة"
 

diff --git a/res/po/az.po b/res/po/az.po
index 2ed4792..35e32b6 100644 (file)
--- a/res/po/az.po
+++ b/res/po/az.po
@@ -796,6 +796,9 @@ msgstr "Köçürülmə..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Silinmə"
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Mümkün olmadı."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Siyahı"
 

diff --git a/res/po/bg.po b/res/po/bg.po
index 896c98a..eaa671c 100644 (file)
--- a/res/po/bg.po
+++ b/res/po/bg.po
@@ -796,6 +796,9 @@ msgstr "Копиране..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Изтриване..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Неуспешно."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Списък"
 

diff --git a/res/po/ca.po b/res/po/ca.po
index 56500f5..d58a322 100644 (file)
--- a/res/po/ca.po
+++ b/res/po/ca.po
@@ -796,6 +796,9 @@ msgstr "Copiant..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Esborrant..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Error"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Llista"
 

diff --git a/res/po/cs.po b/res/po/cs.po
index 1204fa1..79d9f40 100644 (file)
--- a/res/po/cs.po
+++ b/res/po/cs.po
@@ -796,6 +796,9 @@ msgstr "Kopírování..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Odstraňování..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nezdařilo se."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Seznam"
 

diff --git a/res/po/da.po b/res/po/da.po
index b4156e6..029c22f 100644 (file)
--- a/res/po/da.po
+++ b/res/po/da.po
@@ -796,6 +796,9 @@ msgstr "Kopierer ..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Sletter ..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Mislykkedes."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Liste"
 

diff --git a/res/po/de.po b/res/po/de.po
index d73ad80..829973d 100644 (file)
--- a/res/po/de.po
+++ b/res/po/de.po
@@ -796,6 +796,9 @@ msgstr "Wird kopiert..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Löschen..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Fehlgeschlagen"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Liste"
 

diff --git a/res/po/el_GR.po b/res/po/el_GR.po
index 23eafb9..36b4dd0 100644 (file)
--- a/res/po/el_GR.po
+++ b/res/po/el_GR.po
@@ -796,6 +796,9 @@ msgstr "Αντιγραφή..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Διαγραφή..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Αποτυχία."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Λίστα"
 

diff --git a/res/po/en.po b/res/po/en.po
index 81554b7..ca5b60a 100644 (file)
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -796,6 +796,9 @@ msgstr "Copying..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Deleting..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Failed."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "List"
 

diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index 6d0d269..2c287d0 100644 (file)
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -796,6 +796,9 @@ msgstr "Copying..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Deleting..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Failed"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "List"
 

diff --git a/res/po/en_US.po b/res/po/en_US.po
index 8aa9f5e..48b0041 100644 (file)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -796,6 +796,9 @@ msgstr "Copying..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Deleting..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Failed"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "List"
 

diff --git a/res/po/es_ES.po b/res/po/es_ES.po
index ef6688f..423e7bd 100644 (file)
--- a/res/po/es_ES.po
+++ b/res/po/es_ES.po
@@ -796,6 +796,9 @@ msgstr "Copiando..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Eliminando..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Error."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lista"
 

diff --git a/res/po/es_US.po b/res/po/es_US.po
index ddd46de..d37ee6b 100644 (file)
--- a/res/po/es_US.po
+++ b/res/po/es_US.po
@@ -796,6 +796,9 @@ msgstr "Copiando..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Eliminando..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Error."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lista"
 

diff --git a/res/po/et.po b/res/po/et.po
index db4f7ee..9bc7eeb 100644 (file)
--- a/res/po/et.po
+++ b/res/po/et.po
@@ -796,6 +796,9 @@ msgstr "Kopeerimine..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Kustutamine..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nurjus."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Loend"
 

diff --git a/res/po/eu.po b/res/po/eu.po
index efd438c..ec607f1 100644 (file)
--- a/res/po/eu.po
+++ b/res/po/eu.po
@@ -796,6 +796,9 @@ msgstr "Kopiatzen..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Ezabatzen..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Huts egin du"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Zerrenda"
 

diff --git a/res/po/fi.po b/res/po/fi.po
index faa7730..c50fdde 100644 (file)
--- a/res/po/fi.po
+++ b/res/po/fi.po
@@ -796,6 +796,9 @@ msgstr "Kopioidaan..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Poistetaan..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Epäonnistui."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Luettelo"
 

diff --git a/res/po/fr.po b/res/po/fr.po
index d4b773d..688804d 100644 (file)
--- a/res/po/fr.po
+++ b/res/po/fr.po
@@ -796,6 +796,9 @@ msgstr "Copie..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Suppression..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Échec"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Liste"
 

diff --git a/res/po/fr_CA.po b/res/po/fr_CA.po
index 95bb3dc..0a8367a 100644 (file)
--- a/res/po/fr_CA.po
+++ b/res/po/fr_CA.po
@@ -796,6 +796,9 @@ msgstr "Copie ..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Suppression ..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Échec."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Liste"
 

diff --git a/res/po/ga.po b/res/po/ga.po
index b672a1f..8a23d83 100644 (file)
--- a/res/po/ga.po
+++ b/res/po/ga.po
@@ -796,6 +796,9 @@ msgstr "Ag cóipeáil..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Ag scriosadh..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Theip air."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Liostaigh"
 

diff --git a/res/po/gl.po b/res/po/gl.po
index d83b65b..35e81d7 100644 (file)
--- a/res/po/gl.po
+++ b/res/po/gl.po
@@ -796,6 +796,9 @@ msgstr "Copiando..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Eliminando..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Erro"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lista"
 

diff --git a/res/po/hr.po b/res/po/hr.po
index efd21fb..7eda2dd 100644 (file)
--- a/res/po/hr.po
+++ b/res/po/hr.po
@@ -796,6 +796,9 @@ msgstr "Kopiranje..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Brisanje..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Neuspješno."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Popis"
 

diff --git a/res/po/hu.po b/res/po/hu.po
index 34a98fb..12f1436 100644 (file)
--- a/res/po/hu.po
+++ b/res/po/hu.po
@@ -796,6 +796,9 @@ msgstr "Másolás..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Törlés..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Sikertelen"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lista"
 

diff --git a/res/po/hy.po b/res/po/hy.po
index 349bae6..a5f89f9 100644 (file)
--- a/res/po/hy.po
+++ b/res/po/hy.po
@@ -796,6 +796,9 @@ msgstr "Պատճենում է..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Ջնջվում է..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Ձախողվեց:"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Ցանկ"
 

diff --git a/res/po/is.po b/res/po/is.po
index 81b08d8..22f775b 100644 (file)
--- a/res/po/is.po
+++ b/res/po/is.po
@@ -796,6 +796,9 @@ msgstr "Afritun stendur yfir..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Verið er að eyða..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Mistókst."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Listi"
 

diff --git a/res/po/it_IT.po b/res/po/it_IT.po
index 4f0d219..ef47d15 100644 (file)
--- a/res/po/it_IT.po
+++ b/res/po/it_IT.po
@@ -796,6 +796,9 @@ msgstr "Copia..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Eliminazione..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Errore"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Elenco"
 

diff --git a/res/po/ja_JP.po b/res/po/ja_JP.po
index b5c2c69..db8c868 100644 (file)
--- a/res/po/ja_JP.po
+++ b/res/po/ja_JP.po
@@ -796,6 +796,9 @@ msgstr "コピー中..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "削除中..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "失敗しました。"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "リスト"
 

diff --git a/res/po/ka.po b/res/po/ka.po
index 263ada6..26056e8 100644 (file)
--- a/res/po/ka.po
+++ b/res/po/ka.po
@@ -796,6 +796,9 @@ msgstr "კოპირდება..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "წაშლა..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "ვერ შესრულდა."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "სია"
 

diff --git a/res/po/kk.po b/res/po/kk.po
index 264ac0a..7189745 100644 (file)
--- a/res/po/kk.po
+++ b/res/po/kk.po
@@ -796,6 +796,9 @@ msgstr "Көшірілуде..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Жойылуда..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Үзіліп кетті"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Тізім"
 

diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po
index 1157da2..96ffda2 100644 (file)
--- a/res/po/ko_KR.po
+++ b/res/po/ko_KR.po
@@ -796,6 +796,9 @@ msgstr "복사 중..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "삭제 중..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "완료하지 못하였습니다."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "목록"
 

diff --git a/res/po/lt.po b/res/po/lt.po
index ffa7c4d..b16ec4f 100644 (file)
--- a/res/po/lt.po
+++ b/res/po/lt.po
@@ -796,6 +796,9 @@ msgstr "Kopijuojama..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Trinama..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nepavyko."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Sąrašas"
 

diff --git a/res/po/lv.po b/res/po/lv.po
index 0728bb0..4d9e038 100644 (file)
--- a/res/po/lv.po
+++ b/res/po/lv.po
@@ -796,6 +796,9 @@ msgstr "Kopē..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Dzēš..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Neizdevās."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Saraksts"
 

diff --git a/res/po/mk.po b/res/po/mk.po
index bbc1d9f..e080fc2 100644 (file)
--- a/res/po/mk.po
+++ b/res/po/mk.po
@@ -796,6 +796,9 @@ msgstr "Се копира..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Се брише..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Неуспешно."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Листа"
 

diff --git a/res/po/nb.po b/res/po/nb.po
index 7afb2b8..5dcd3d7 100644 (file)
--- a/res/po/nb.po
+++ b/res/po/nb.po
@@ -796,6 +796,9 @@ msgstr "Kopierer..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Sletter..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Det oppstod en feil."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Liste"
 

diff --git a/res/po/nl.po b/res/po/nl.po
index f27e0c9..07bc88d 100644 (file)
--- a/res/po/nl.po
+++ b/res/po/nl.po
@@ -796,6 +796,9 @@ msgstr "Kopiëren..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Verwijderen..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Mislukt."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lijst"
 

diff --git a/res/po/pl.po b/res/po/pl.po
index 56b4d9b..03a510c 100644 (file)
--- a/res/po/pl.po
+++ b/res/po/pl.po
@@ -796,6 +796,9 @@ msgstr "Kopiowanie..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Usuwanie..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Błąd"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lista"
 

diff --git a/res/po/pt_BR.po b/res/po/pt_BR.po
index f79c848..718dc34 100644 (file)
--- a/res/po/pt_BR.po
+++ b/res/po/pt_BR.po
@@ -796,6 +796,9 @@ msgstr "Copiando..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Apagando…"
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Falhou."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lista"
 

diff --git a/res/po/pt_PT.po b/res/po/pt_PT.po
index 600b9b2..0ae875e 100644 (file)
--- a/res/po/pt_PT.po
+++ b/res/po/pt_PT.po
@@ -796,6 +796,9 @@ msgstr "A copiar..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "A eliminar..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Falha."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lista"
 

diff --git a/res/po/ro.po b/res/po/ro.po
index 6c43212..d096aa2 100644 (file)
--- a/res/po/ro.po
+++ b/res/po/ro.po
@@ -796,6 +796,9 @@ msgstr "Copiere..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Se șterge..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nereușit"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Listă"
 

diff --git a/res/po/ru_RU.po b/res/po/ru_RU.po
index 32b4283..bf5159b 100644 (file)
--- a/res/po/ru_RU.po
+++ b/res/po/ru_RU.po
@@ -796,6 +796,9 @@ msgstr "Копирование..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Удаление..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Сбой."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Список"
 

diff --git a/res/po/sk.po b/res/po/sk.po
index bc3f944..4e9c45a 100644 (file)
--- a/res/po/sk.po
+++ b/res/po/sk.po
@@ -796,6 +796,9 @@ msgstr "Kopírovanie..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Odstraňovanie..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Nepodarilo sa."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Zoznam"
 

diff --git a/res/po/sl.po b/res/po/sl.po
index c6be277..a6799b6 100644 (file)
--- a/res/po/sl.po
+++ b/res/po/sl.po
@@ -796,6 +796,9 @@ msgstr "Kopiram ..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Brišem"
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Ni uspelo."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Seznam"
 

diff --git a/res/po/sr.po b/res/po/sr.po
index d6b3ddd..cc4ac6e 100644 (file)
--- a/res/po/sr.po
+++ b/res/po/sr.po
@@ -796,6 +796,9 @@ msgstr "Kopiranje..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Brisanje..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Neuspešno."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lista"
 

diff --git a/res/po/sv.po b/res/po/sv.po
index e241d46..2206ca5 100644 (file)
--- a/res/po/sv.po
+++ b/res/po/sv.po
@@ -796,6 +796,9 @@ msgstr "Kopierar..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Raderar..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Misslyckades."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Lista"
 

diff --git a/res/po/tr_TR.po b/res/po/tr_TR.po
index e3b90ab..0d52339 100644 (file)
--- a/res/po/tr_TR.po
+++ b/res/po/tr_TR.po
@@ -796,6 +796,9 @@ msgstr "Kopyalanıyor..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Siliniyor..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Başarısız oldu."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Listele"
 

diff --git a/res/po/uk.po b/res/po/uk.po
index 3a17f71..321cf37 100644 (file)
--- a/res/po/uk.po
+++ b/res/po/uk.po
@@ -796,6 +796,9 @@ msgstr "Копіювання..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "Видалення..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Збій."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Список"
 

diff --git a/res/po/uz.po b/res/po/uz.po
index 4ec94b7..4a70340 100644 (file)
--- a/res/po/uz.po
+++ b/res/po/uz.po
@@ -796,6 +796,9 @@ msgstr "Nusxa ko‘chirilmoqda..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "O'chirilmoqda…"
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "Xato."
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "Ro‘yxat"
 

diff --git a/res/po/zh_CN.po b/res/po/zh_CN.po
index 9a754f1..9bd7497 100644 (file)
--- a/res/po/zh_CN.po
+++ b/res/po/zh_CN.po
@@ -796,6 +796,9 @@ msgstr "正在复制..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "删除中.."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "失败"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "列表"
 

diff --git a/res/po/zh_HK.po b/res/po/zh_HK.po
index facf12b..b17b720 100644 (file)
--- a/res/po/zh_HK.po
+++ b/res/po/zh_HK.po
@@ -796,6 +796,9 @@ msgstr "正在複製..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "正在刪除..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "失敗。"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "清單"
 

diff --git a/res/po/zh_TW.po b/res/po/zh_TW.po
index 6f8df0a..59ccb93 100644 (file)
--- a/res/po/zh_TW.po
+++ b/res/po/zh_TW.po
@@ -796,6 +796,9 @@ msgstr "正在複製..."
 msgid "IDS_MF_POP_DELETING_ING"
 msgstr "正在刪除..."
 
+msgid "IDS_COM_POP_FAILED"
+msgstr "失敗"
+
 msgid "IDS_COM_OPT_LIST"
 msgstr "清單"
 

diff --git a/src/common/mf-callback.c b/src/common/mf-callback.c
index d41399b..fed9d7e 100755 (executable)
--- a/src/common/mf-callback.c
+++ b/src/common/mf-callback.c
@@ -849,7 +849,19 @@ void mf_popup_show_vk_cb(void *data, Evas_Object *obj, void *event_info)
        SAFE_FREE_OBJ(ap->mf_MainWindow.pNormalPopup);
        mf_callback_entry_focus();
        MF_TRACE_END;
+}
 
+void mf_popup_clear_vk_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       MF_TRACE_BEGIN;
+       struct appdata *ap = (struct appdata *)data;
+       assert(ap);
+
+       mf_popup_second_popup_destory();
+       SAFE_FREE_OBJ(ap->mf_MainWindow.pNormalPopup);
+//     mf_callback_entry_focus();
+       mf_popup_rename_cancel();
+       MF_TRACE_END;
 }
 
 static int __mf_callback_idle_rename_search_refresh(void *data)
@@ -1234,8 +1246,10 @@ void mf_callback_rename_save_cb(void *ad, Evas_Object *obj, void *event_info)
        if (ap->mf_Status.more == MORE_THUMBNAIL_RENAME || ap->mf_Status.more == MORE_EDIT_RENAME) {
                //ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,LABEL_CANCEL, MF_BUTTON_LABEL_OK, NULL, mf_callback_illegal_char_popup_cb, ap);
                mf_callback_entry_unfocus(pEntry);
-               mf_popup_second_popup_create(ap, ap->mf_MainWindow.pWindow, message,
-                               MF_BUTTON_LABEL_OK, mf_popup_show_vk_cb, ap);
+               mf_popup_indicator_popup(ap, mf_util_get_text(message));
+//             mf_popup_second_popup_create(ap, ap->mf_MainWindow.pWindow, message,
+//                             MF_BUTTON_LABEL_OK, mf_popup_clear_vk_cb, ap);
+               mf_popup_rename_cancel();
                mf_callback_monitor_media_db_update_flag_set(EINA_FALSE);
                mf_callback_monitor_internal_update_flag_set(EINA_FALSE);
                return;

diff --git a/src/widget/mf-category-view.c b/src/widget/mf-category-view.c
index c46bafb..43031a1 100755 (executable)
--- a/src/widget/mf-category-view.c
+++ b/src/widget/mf-category-view.c
@@ -303,6 +303,7 @@ void mf_category_list_item_remove_by_fullname(Eina_List **list, const char *full
        }
        if (eina_list_count(*list) == 0) {
                eina_list_free(*list);
+               mf_popup_rename_cancel();
                *list = NULL;
        }
 }

diff --git a/src/widget/mf-root-view.c b/src/widget/mf-root-view.c
index 92bd473..b02497e 100755 (executable)
--- a/src/widget/mf-root-view.c
+++ b/src/widget/mf-root-view.c
@@ -373,6 +373,7 @@ Eina_Bool mf_root_view_back_cb(void *data, Elm_Object_Item *it)
        if (ap->mf_Status.more == MORE_DEFAULT) {
                if (ap->mf_Status.view_type == mf_view_root) {
                        Evas_Object *win = ap->mf_MainWindow.pWindow;
+                       mf_navi_bar_reset_navi_obj(ap);
                        elm_win_lower(win);
                } else if (ap->mf_Status.view_type == mf_view_root_category) {
                        if (ap->mf_MainWindow.pProgressPopup) {