From 2980776fcca4b90a6a50cbdd7acfcc7801cb72d9 Mon Sep 17 00:00:00 2001 From: "gliang.wang" Date: Tue, 16 Apr 2013 15:59:36 +0800 Subject: [PATCH] [SR][Nabi-se][Nabi_SEN_SE-32480] Unable to select more then one file for attachment at Email Change-Id: I9768f095b10eac39a8c6412aacc136df24fe90ce --- CMakeLists.txt | 6 +- image/mf_new_folder_editfield_bg.png | Bin 0 -> 3667 bytes packaging/ug-myfile-efl.spec | 4 +- po/CMakeLists.txt | 2 +- po/ar.po | 8 ++ po/az.po | 9 ++ po/bg.po | 9 ++ po/ca.po | 9 ++ po/cs.po | 9 ++ po/da.po | 9 ++ po/de.po | 120 --------------------- po/de_DE.po | 6 ++ po/el.po | 120 --------------------- po/el_GR.po | 5 + po/en.po | 6 ++ po/en_GB.po | 46 -------- po/en_PH.po | 9 ++ po/en_US.po | 21 ++-- po/es.po | 120 --------------------- po/es_ES.po | 5 + po/{es_US.po => es_MX.po} | 28 ++--- po/et.po | 9 ++ po/eu.po | 9 ++ po/fi.po | 9 ++ po/fr.po | 120 --------------------- po/fr_CA.po | 9 ++ po/fr_FR.po | 8 +- po/ga.po | 9 ++ po/gl.po | 9 ++ po/hi.po | 9 ++ po/hr.po | 9 ++ po/hu.po | 9 ++ po/hy.po | 9 ++ po/is.po | 9 ++ po/it.po | 120 --------------------- po/it_IT.po | 6 ++ po/ja.po | 137 ------------------------ po/ja_JP.po | 70 ++++++------ po/ka.po | 9 ++ po/kk.po | 9 ++ po/ko.po | 155 --------------------------- po/ko_KR.po | 18 ++-- po/lt.po | 9 ++ po/lv.po | 9 ++ po/mk.po | 9 ++ po/nb.po | 9 ++ po/nl.po | 120 --------------------- po/nl_NL.po | 6 +- po/pl.po | 9 ++ po/pt.po | 120 --------------------- po/pt_BR.po | 9 ++ po/pt_PT.po | 6 ++ po/ro.po | 9 ++ po/ru.po | 120 --------------------- po/ru_RU.po | 6 ++ po/sk.po | 9 ++ po/sl.po | 9 ++ po/sr.po | 9 ++ po/sv.po | 9 ++ po/tk.po | 120 --------------------- po/tr_TR.po | 6 ++ po/uk.po | 11 +- po/uz.po | 9 ++ po/zh_CN.po | 10 +- po/zh_HK.po | 10 +- po/zh_SG.po | 9 ++ po/zh_TW.po | 6 ++ src/common/file-system/mf-ug-file-attr.c | 3 +- src/common/file-system/mf-ug-fs-oper.c | 26 ++++- src/common/mf-ug-cb.c | 44 ++++++-- src/common/mf-ug-list-play.c | 127 +++++++++++++++++----- src/common/mf-ug-util.c | 12 ++- src/include/mf-ug-conf.h | 5 + src/include/mf-ug-fs-util.h | 2 + src/include/mf-ug-main.h | 6 ++ src/include/mf-ug-resource.h | 48 +++++---- src/include/mf-ug-util.h | 1 + src/mf-ug-main.c | 55 ++++++++-- src/widget/mf-ug-ctrl-bar.c | 8 +- src/widget/mf-ug-genlist.c | 97 ++++++++++++----- src/widget/mf-ug-navi-bar.c | 23 +++- src/widget/mf-ug-popup.c | 177 +++++++++++++++++++++++++++++- ug-myfile-efl.xml | 6 ++ ug_navibar_layout.edc | 178 ++++++++++++++++++++++++------- 84 files changed, 1134 insertions(+), 1644 deletions(-) create mode 100644 image/mf_new_folder_editfield_bg.png delete mode 100644 po/de.po delete mode 100644 po/el.po delete mode 100644 po/en_GB.po delete mode 100644 po/es.po rename po/{es_US.po => es_MX.po} (92%) delete mode 100644 po/fr.po delete mode 100644 po/it.po delete mode 100644 po/ja.po delete mode 100644 po/ko.po delete mode 100644 po/nl.po delete mode 100644 po/pt.po delete mode 100644 po/ru.po delete mode 100644 po/tk.po diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fc0aad..4f382f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ dlog capi-media-sound-manager capi-media-player capi-system-power -status +notification ) FOREACH(flag ${ug_pkgs_CFLAGS}) @@ -75,6 +75,8 @@ ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"") ADD_DEFINITIONS("-DLIST_PLAY_SUPPORT") ADD_DEFINITIONS("-DUG_THUMB_REAL_TIME_UPDATE") ADD_DEFINITIONS("-DMF_UG_FEATURE_NEW_UX") +ADD_DEFINITIONS("-DUG_OPERATION_SELECT_MODE") + ADD_LIBRARY(${MFUGNAME} SHARED ${SRCS}) TARGET_LINK_LIBRARIES(${MFUGNAME} ${ug_pkgs_LDFLAGS} dl) @@ -84,7 +86,7 @@ INSTALL(TARGETS ${MFUGNAME} LIBRARY DESTINATION ${LIBDIR}) # edje ADD_CUSTOM_TARGET(ug_navibar_layout.edj - COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/image ${CMAKE_SOURCE_DIR}/ug_navibar_layout.edc ${CMAKE_BINARY_DIR}/ug_navibar_layout.edj DEPENDS ${CMAKE_SOURCE_DIR}/ug_navibar_layout.edc diff --git a/image/mf_new_folder_editfield_bg.png b/image/mf_new_folder_editfield_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..6c671f447d8a07c32ddbc0b04c7fca5c59fda40c GIT binary patch literal 3667 zcmV-Z4y^HsP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000AiNklf*(6o#MsVS8-PXGTdQrL-lfP_sa!M51DekWeKgmPK840Tp6} zxl`PBG z*M5BNIlk`^)>?{MTxiV!?*VTCX8@Ojs}HOIw}2bK&-sl@m#?A=kTUQEa3x8lRN6y3 zE?R4(ln5dBVOXrS7&Gv)G@Z@Tcvi{mBcKIb17ctZTU=;Wg^)`-eKYTP6{>ZgAP8|? z2cUu98%$I^1wOXA@r9uz{ zc%Fyrx+tX(Li{5vmobJc%gC~fD2nKGLLRTLy&*;VIq;#l`StbJfZJA9X*QcQ8g;7G z8oux2c^+Ep1Htm>a$vu|L#MMvyWQr|A9t;__GKLe)SF-`en~65d=PA81ClkNfnAifdHhGD5Y>5hf>L-QmvCDI}K@!#dTd= zcUTOL;~cmk_LC4|v@#0M^DxE;i2$WEt~>mviV+<}`SZn`%i=&D(QzqXoqR)(Vl-IH z&v63xM0wasJBlR#q5fa6qJ_!75Bxiz;aS?kMZTFHC#d*NDTTlogE50+jWBnBp~od? z?I3+WBuVr|red0JKiXz(UYn(bY^NpT5dHU1S zXU@L!;K3SUIJ6fKhceFmgN!k|5yf##x4XqJ_m`PIJ8Mr&PJO0<+jFnJezW`it#{Xc zyN6PmEK4bsd>lt3#QvVPx9avZJgnYd#xHryoxkuEa7T+ zY;1xcEaN!NGupT(tz4QW^m-AS8*SR_YfR6al6O&U+&zv*0TB8MATU=, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-16 18:18+0900\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: libraries/winset-wrapper/myfileListView.c:75 -msgid "IDS_MF_BODY_IMAGES" -msgstr "Images" - -#: libraries/winset-wrapper/myfileListView.c:77 -#msgid "Videos" -#msgstr "" - -#: libraries/winset-wrapper/myfileListView.c:78 -msgid "IDS_MF_BODY_VIDEOS" -msgstr "Videos" - -#: libraries/winset-wrapper/myfileListView.c:80 -#msgid "Sounds" -#msgstr "" - -#: libraries/winset-wrapper/myfileListView.c:81 -msgid "IDS_MF_BODY_SOUNDS" -msgstr "Sounds" - -#: libraries/winset-wrapper/myfileListView.c:83 -#msgid "Others" -#msgstr "" - -#: libraries/winset-wrapper/myfileListView.c:84 -msgid "IDS_MF_BODY_OTHERS" -msgstr "Others" - diff --git a/po/en_PH.po b/po/en_PH.po index 93cf214..db6a617 100644 --- a/po/en_PH.po +++ b/po/en_PH.po @@ -271,6 +271,9 @@ msgstr "Descending" msgid "IDS_MF_TAB_ALL" msgstr "All" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Up" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Search all folders" @@ -307,3 +310,9 @@ msgstr "Go to My Files" msgid "IDS_MF_BODY_RINGTONES" msgstr "Ringtones" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Export here" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Unable to set DRM protected content as ringtone or notification alert" + diff --git a/po/en_US.po b/po/en_US.po index 93cf214..0b051b7 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "IDS_MF_POP_DELETE_FAILED" msgstr "Delete failed" msgid "IDS_MF_POP_DRM_FILE_CANNOT_SEND" -msgstr "DRM file. Cannot send" +msgstr "DRM file. Cannot send." msgid "IDS_MF_POP_INVALID_FILE_NAME" msgstr "Invalid file name" @@ -41,7 +41,7 @@ msgid "IDS_MF_POP_UNABLE_TO_MOVE" msgstr "Unable to move" msgid "IDS_MF_BODY_NOT_ENOUGH_MEMORY_IN_PHONE_MEMORY_DELETE_SOME_ITEMS_AND_TRY_AGAIN" -msgstr "Not enough memory in phone memory. Delete some items and try again" +msgstr "Not enough memory in phone memory. Delete some items and try again." msgid "IDS_MF_POP_COPYING_FAILED" msgstr "Copying failed" @@ -50,13 +50,13 @@ msgid "IDS_MF_POP_MOVING_FAILED" msgstr "Moving failed" msgid "IDS_MF_POP_NOT_ENOUGH_MEMORY_PS_AVAILABLE" -msgstr "Not enough memory. %s available" +msgstr "Not enough memory. %s available." msgid "IDS_MF_POP_SAME_NAME_ALREADY_IN_USE" msgstr "Same name already in use" msgid "IDS_MF_POP_UNABLE_TO_MOVE_DESTINATION_FOLDER_SAME_AS_SOURCE_FOLDER" -msgstr "Unable to move. Destination folder same as source folder" +msgstr "Unable to move. Destination folder same as source folder." msgid "IDS_MF_SK3_CREATE_FOLDER" msgstr "Create folder" @@ -188,7 +188,7 @@ msgid "IDS_MF_POP_NOT_ENOUGH_HEAP_MEMORY" msgstr "Not enough heap memory" msgid "IDS_MF_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" -msgstr "Not enough memory. Delete some items" +msgstr "Not enough memory. Delete some items." msgid "IDS_MF_BODY_CREATED_DATE" msgstr "Created date" @@ -224,7 +224,7 @@ msgid "IDS_MF_BODY_IMPOSSIBLE" msgstr "Impossible" msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "MMC data is initializing…" +msgstr "MMC data is initializing..." msgid "IDS_MF_BODY_POSSIBLE" msgstr "Possible" @@ -271,6 +271,9 @@ msgstr "Descending" msgid "IDS_MF_TAB_ALL" msgstr "All" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Up" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Search all folders" @@ -307,3 +310,9 @@ msgstr "Go to My Files" msgid "IDS_MF_BODY_RINGTONES" msgstr "Ringtones" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Export here" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Unable to set DRM protected content as ringtone or notification alert" + diff --git a/po/es.po b/po/es.po deleted file mode 100644 index ce73e46..0000000 --- a/po/es.po +++ /dev/null @@ -1,120 +0,0 @@ -msgid "IDS_MF_BODY_ANY" -msgstr "Cualquiera" - -msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "Usos disponibles" - -msgid "IDS_MF_BODY_CREATE_FOLDER" -msgstr "Crear carpeta" - -msgid "IDS_MF_BODY_DATE" -msgstr "Fecha" - -msgid "IDS_MF_BODY_DONE" -msgstr "Finalizado" - -msgid "IDS_MF_BODY_EXECUTE" -msgstr "Ejecutar" - -msgid "IDS_MF_BODY_FORWARDING" -msgstr "Reenviando" - -msgid "IDS_MF_BODY_IMAGES" -msgstr "Imágenes" - -msgid "IDS_MF_BODY_IMPOSSIBLE" -msgstr "Imposible" - -msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "Προετοιμασία των δεδομένων MMC..." - -msgid "IDS_MF_BODY_OTHERS" -msgstr "Otros" - -msgid "IDS_MF_BODY_POSSIBLE" -msgstr "Posible" - -msgid "IDS_MF_BODY_PRINT" -msgstr "Imprimir" - -msgid "IDS_MF_BODY_SIZE" -msgstr "Tamaño" - -msgid "IDS_MF_BODY_SOUNDS" -msgstr "Sonidos" - -msgid "IDS_MF_BODY_VALIDITY" -msgstr "Validez" - -msgid "IDS_MF_BODY_VIDEOS" -msgstr "Vídeos" - -msgid "IDS_MF_HEADER_NEW_FOLDER" -msgstr "Nueva carpeta" - -msgid "IDS_MF_HEADER_PHONE" -msgstr "Teléfono" - -msgid "IDS_MF_HEADER_RENAME" -msgstr "Cambiar nombre" - -msgid "IDS_MF_OPT_COPY" -msgstr "Copiar" - -msgid "IDS_MF_OPT_DETAILS" -msgstr "Detalles" - -msgid "IDS_MF_OPT_EDIT" -msgstr "Editar" - -msgid "IDS_MF_OPT_LISTBY_TYPE" -msgstr "Tipo" - -msgid "IDS_MF_OPT_LIST_BY" -msgstr "Ordenar por" - -msgid "IDS_MF_OPT_MOVE" -msgstr "Mover" - -msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "Mover aquí" - -msgid "IDS_MF_OPT_RINGTONE" -msgstr "Melodía" - -msgid "IDS_MF_OPT_WALLPAPER" -msgstr "Fondos" - -msgid "IDS_MF_POP_CLOSE" -msgstr "Cerrar" - -msgid "IDS_MF_POP_CONTINUE" -msgstr "Continuar" - -msgid "IDS_MF_POP_COPYING" -msgstr "Copiando..." - -msgid "IDS_MF_POP_DELETING_ING" -msgstr "Eliminando..." - -msgid "IDS_MF_POP_DO_YOU_WANT_TO_UNLOCK_IT_NOW_Q" -msgstr "¿Desea desbloquearlo ahora?" - -msgid "IDS_MF_POP_MOVING" -msgstr "Moviendo..." - -msgid "IDS_MF_POP_PASTE_HERE" -msgstr "Pegar aquí" - -msgid "IDS_MF_POP_SELECT_ALL" -msgstr "Seleccionar todo" - -msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "Tipo de archivo no admitido" - -msgid "IDS_MF_SK_ADD" -msgstr "Añadir" - -msgid "IDS_MF_SK_CANCEL" -msgstr "Cancelar" - diff --git a/po/es_ES.po b/po/es_ES.po index 0d399d4..c8eb517 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -310,3 +310,8 @@ msgstr "Ir a Mis archivos" msgid "IDS_MF_BODY_RINGTONES" msgstr "Melodías" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exportar aquí" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "No se puede definir contenido protegido por DRM como melodía o alerta de notificación" diff --git a/po/es_US.po b/po/es_MX.po similarity index 92% rename from po/es_US.po rename to po/es_MX.po index ff81b32..1a8e7f9 100644 --- a/po/es_US.po +++ b/po/es_MX.po @@ -158,7 +158,7 @@ msgid "IDS_MF_BODY_RENAME_ABB" msgstr "Renomb" msgid "IDS_MF_BODY_TIME" -msgstr "Hora" +msgstr "Fecha" msgid "IDS_MF_BODY_TIMED_COUNT" msgstr "Recuento de tiempo" @@ -271,6 +271,9 @@ msgstr "Descendente" msgid "IDS_MF_TAB_ALL" msgstr "Todo" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Arriba" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Buscar en todas carp." @@ -286,24 +289,9 @@ msgstr "Ordenar por" msgid "IDS_MF_BODY_LIST_AND_DETAILS_ABB" msgstr "Lista y detalles" -msgid "IDS_MF_OPT_HIDE_FILE_EXTENSION_ABB" -msgstr "Ocultar ext. del arch." - -msgid "IDS_MF_OPT_NAME_HA_TO_Z" -msgstr "Nombre (A a Z)" - -msgid "IDS_MF_OPT_NAME_HZ_TO_A" -msgstr "Nombre (Z a A)" - -msgid "IDS_MF_OPT_DATE_HMOST_RECENT" -msgstr "Fecha (más reciente)" - -msgid "IDS_MF_OPT_DATE_HOLDEST" -msgstr "Fecha (más antigua)" - -msgid "IDS_MF_BUTTON_GO_TO_MY_FILES" -msgstr "Ir a Mis Archivos" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exportar aquí" -msgid "IDS_MF_BODY_RINGTONES" -msgstr "Tonos de llamada" +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Imposible definir el contenido protegido de DRM como tono de timbre o alerta de notificación" diff --git a/po/et.po b/po/et.po index 2b50ff8..e89ee6e 100644 --- a/po/et.po +++ b/po/et.po @@ -271,6 +271,9 @@ msgstr "Langev" msgid "IDS_MF_TAB_ALL" msgstr "Kõik" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Üles" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Otsi kaustadest" @@ -307,3 +310,9 @@ msgstr "Mine Minu Failidesse" msgid "IDS_MF_BODY_RINGTONES" msgstr "Helinad" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Ekspordi siia" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM-kaitsega sisu ei saa määrata helinaks või teavituse märguandeks" + diff --git a/po/eu.po b/po/eu.po index ac3f5bc..ce87de9 100644 --- a/po/eu.po +++ b/po/eu.po @@ -271,6 +271,9 @@ msgstr "Beheranzkoa" msgid "IDS_MF_TAB_ALL" msgstr "Guztia(k)" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Gora" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Bilatu karpeta guztiak" @@ -307,3 +310,9 @@ msgstr "Joan Nire Fitxat." msgid "IDS_MF_BODY_RINGTONES" msgstr "Dei doinuak" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Esportatu hona" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Ezin da babestutako DRM edukia ezarri dei tonu edo jakinarazpen alerta moduan" + diff --git a/po/fi.po b/po/fi.po index a3d885e..2dbcc44 100644 --- a/po/fi.po +++ b/po/fi.po @@ -271,6 +271,9 @@ msgstr "Laskeva" msgid "IDS_MF_TAB_ALL" msgstr "Kaikki" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Ylös" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Hae kaikista kansioista" @@ -307,3 +310,9 @@ msgstr "Siirry Omiin tiedostoihin" msgid "IDS_MF_BODY_RINGTONES" msgstr "Soittoäänet" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Vie tänne" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM-suojattua sisältöä ei voi määrittää soittoääneksi tai ilmoitusääneksi" + diff --git a/po/fr.po b/po/fr.po deleted file mode 100644 index 109bf21..0000000 --- a/po/fr.po +++ /dev/null @@ -1,120 +0,0 @@ -msgid "IDS_MF_BODY_ANY" -msgstr "N'importe" - -msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "Utilisations disponibles" - -msgid "IDS_MF_BODY_CREATE_FOLDER" -msgstr "Créer dossier" - -msgid "IDS_MF_BODY_DATE" -msgstr "Date" - -msgid "IDS_MF_BODY_DONE" -msgstr "OK" - -msgid "IDS_MF_BODY_EXECUTE" -msgstr "Exécuter" - -msgid "IDS_MF_BODY_FORWARDING" -msgstr "Transfert" - -msgid "IDS_MF_BODY_IMAGES" -msgstr "Images" - -msgid "IDS_MF_BODY_IMPOSSIBLE" -msgstr "Impossible" - -msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "" - -msgid "IDS_MF_BODY_OTHERS" -msgstr "Autres" - -msgid "IDS_MF_BODY_POSSIBLE" -msgstr "Possible" - -msgid "IDS_MF_BODY_PRINT" -msgstr "Imprimer" - -msgid "IDS_MF_BODY_SIZE" -msgstr "Taille" - -msgid "IDS_MF_BODY_SOUNDS" -msgstr "Sons" - -msgid "IDS_MF_BODY_VALIDITY" -msgstr "Validité" - -msgid "IDS_MF_BODY_VIDEOS" -msgstr "Vidéos" - -msgid "IDS_MF_HEADER_NEW_FOLDER" -msgstr "Nouveau dossier" - -msgid "IDS_MF_HEADER_PHONE" -msgstr "Téléphone" - -msgid "IDS_MF_HEADER_RENAME" -msgstr "Renommer" - -msgid "IDS_MF_OPT_COPY" -msgstr "Copier" - -msgid "IDS_MF_OPT_DETAILS" -msgstr "Détails" - -msgid "IDS_MF_OPT_EDIT" -msgstr "Modifier" - -msgid "IDS_MF_OPT_LISTBY_TYPE" -msgstr "Type" - -msgid "IDS_MF_OPT_LIST_BY" -msgstr "Trier par" - -msgid "IDS_MF_OPT_MOVE" -msgstr "Déplacer" - -msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "Déplacer ici" - -msgid "IDS_MF_OPT_RINGTONE" -msgstr "Sonnerie" - -msgid "IDS_MF_OPT_WALLPAPER" -msgstr "Fond d'écran" - -msgid "IDS_MF_POP_CLOSE" -msgstr "Fermer" - -msgid "IDS_MF_POP_CONTINUE" -msgstr "Continuer" - -msgid "IDS_MF_POP_COPYING" -msgstr "Copie ..." - -msgid "IDS_MF_POP_DELETING_ING" -msgstr "Suppression ..." - -msgid "IDS_MF_POP_DO_YOU_WANT_TO_UNLOCK_IT_NOW_Q" -msgstr "Voulez-vous le déverrouiller maintenant ?" - -msgid "IDS_MF_POP_MOVING" -msgstr "Déplacement..." - -msgid "IDS_MF_POP_PASTE_HERE" -msgstr "Coller ici" - -msgid "IDS_MF_POP_SELECT_ALL" -msgstr "Sélectionner tout" - -msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "Type de fichier non pris en charge" - -msgid "IDS_MF_SK_ADD" -msgstr "Ajouter" - -msgid "IDS_MF_SK_CANCEL" -msgstr "Annuler" - diff --git a/po/fr_CA.po b/po/fr_CA.po index aca9e84..0087b5c 100644 --- a/po/fr_CA.po +++ b/po/fr_CA.po @@ -271,6 +271,9 @@ msgstr "Décroissant" msgid "IDS_MF_TAB_ALL" msgstr "Tout" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Haut" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Rech. dans ts dossiers" @@ -307,3 +310,9 @@ msgstr "Accès à Mes fichiers" msgid "IDS_MF_BODY_RINGTONES" msgstr "Sonneries" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exporter ici" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Impossible de définir un contenu protégé par GDN en tant que sonnerie ou alerte de notification" + diff --git a/po/fr_FR.po b/po/fr_FR.po index d01fded..fc557f6 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -278,7 +278,7 @@ msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Rech. dans ts dossiers" msgid "IDS_MF_OPT_THUMBNAIL_VIEW" -msgstr "Miniatures" +msgstr "Affichage miniature" msgid "IDS_MF_OPT_SHOW_FILE_EXTENSION" msgstr "Afficher l'extension du fichier" @@ -310,3 +310,9 @@ msgstr "Accès à Mes fichiers" msgid "IDS_MF_BODY_RINGTONES" msgstr "Sonneries" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exporter ici" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Impossible de définir un contenu protégé par DRM en tant que sonnerie ou alerte de notification" + diff --git a/po/ga.po b/po/ga.po index 6415f3d..18bc3d4 100644 --- a/po/ga.po +++ b/po/ga.po @@ -271,6 +271,9 @@ msgstr "In ord íslitheach" msgid "IDS_MF_TAB_ALL" msgstr "Gach" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Suas" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Cuardaigh gach fillteán" @@ -307,3 +310,9 @@ msgstr "Gabh go Mo Chomhaid" msgid "IDS_MF_BODY_RINGTONES" msgstr "Clingthoin" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Easpórtáil anseo" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Níorbh fhéidir inneachar faoi chosaint DRM a shocrú mar chlingthon nó mar fhógra foláirimh" + diff --git a/po/gl.po b/po/gl.po index 9e463c3..616a071 100644 --- a/po/gl.po +++ b/po/gl.po @@ -271,6 +271,9 @@ msgstr "Descendente" msgid "IDS_MF_TAB_ALL" msgstr "Todo" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Arriba" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Buscar todas carpetas" @@ -307,3 +310,9 @@ msgstr "Ir a Os Meus Arquiv" msgid "IDS_MF_BODY_RINGTONES" msgstr "Melodías" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exportar aquí" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Non se poden definir contidos protexidos mediante DRM como melodías ou alertas de notificación" + diff --git a/po/hi.po b/po/hi.po index c63bc68..9b05a72 100644 --- a/po/hi.po +++ b/po/hi.po @@ -271,6 +271,9 @@ msgstr "अवरोही क्रम" msgid "IDS_MF_TAB_ALL" msgstr "सभी" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "ऊपर" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "सभी फ़ोल्डर खोजें" @@ -307,3 +310,9 @@ msgstr "मेरी फाइल्स में जाएँ" msgid "IDS_MF_BODY_RINGTONES" msgstr "रिंगटोन" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "यहाँ निर्यात करें" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM सुरक्षित सामग्री को रिंगटोन या अधिसूचना सतर्क के रूप में सेट करने में अक्षम" + diff --git a/po/hr.po b/po/hr.po index 4294eac..dd6b4d8 100644 --- a/po/hr.po +++ b/po/hr.po @@ -271,6 +271,9 @@ msgstr "Z-A" msgid "IDS_MF_TAB_ALL" msgstr "Sve" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Gore" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Pretraži sve mape" @@ -307,3 +310,9 @@ msgstr "Idi u Datoteke" msgid "IDS_MF_BODY_RINGTONES" msgstr "Tonovi zvona" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Izvezi ovdje" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Nemoguće postaviti DRM zaštićen sadržaj kao ton zvona ili ton obavijesti" + diff --git a/po/hu.po b/po/hu.po index f3fdead..912e6a0 100644 --- a/po/hu.po +++ b/po/hu.po @@ -271,6 +271,9 @@ msgstr "Csökkenő" msgid "IDS_MF_TAB_ALL" msgstr "Mind" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Fel" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Ker. az összes mappában" @@ -307,3 +310,9 @@ msgstr "Saját fájlok megny." msgid "IDS_MF_BODY_RINGTONES" msgstr "Csengőhangok" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exportálás ide" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM-védett tartalom nem állítható be csengőhangként vagy értesítésként" + diff --git a/po/hy.po b/po/hy.po index 501faa9..2714cd6 100644 --- a/po/hy.po +++ b/po/hy.po @@ -271,6 +271,9 @@ msgstr "Նվազող" msgid "IDS_MF_TAB_ALL" msgstr "Բոլոր" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Վերև" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Որոնեք բոլոր թղթպնկները" @@ -307,3 +310,9 @@ msgstr "Գնալ Իմ Ֆայլերը" msgid "IDS_MF_BODY_RINGTONES" msgstr "Մեղեդիներ" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Արտահանել այստեղ" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Անհնար է DRM-ով պաշտպանված բովանդակությունը դնել որպես զանգի հնչերանգ կամ ծանուցման զգուշացում" + diff --git a/po/is.po b/po/is.po index be5b4d9..5d46f8f 100644 --- a/po/is.po +++ b/po/is.po @@ -271,6 +271,9 @@ msgstr "Lækkandi" msgid "IDS_MF_TAB_ALL" msgstr "Allt" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Upp" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Leita í öllum möppum" @@ -307,3 +310,9 @@ msgstr "Opna Skrárnar mínar" msgid "IDS_MF_BODY_RINGTONES" msgstr "Hringitónar" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Flytja hingað" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Ekki hægt að velja DRM-varið efni sem hringitón eða tilkynningu" + diff --git a/po/it.po b/po/it.po deleted file mode 100644 index 15a979b..0000000 --- a/po/it.po +++ /dev/null @@ -1,120 +0,0 @@ -msgid "IDS_MF_BODY_ANY" -msgstr "Qualsiasi" - -msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "Usi disponibili" - -msgid "IDS_MF_BODY_CREATE_FOLDER" -msgstr "Crea cartella" - -msgid "IDS_MF_BODY_DATE" -msgstr "Data" - -msgid "IDS_MF_BODY_DONE" -msgstr "Fatto" - -msgid "IDS_MF_BODY_EXECUTE" -msgstr "Esegui" - -msgid "IDS_MF_BODY_FORWARDING" -msgstr "Inoltro" - -msgid "IDS_MF_BODY_IMAGES" -msgstr "Immagini" - -msgid "IDS_MF_BODY_IMPOSSIBLE" -msgstr "Impossibile" - -msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "MMC verileri başlatılıyor..." - -msgid "IDS_MF_BODY_OTHERS" -msgstr "Altro" - -msgid "IDS_MF_BODY_POSSIBLE" -msgstr "Possibile" - -msgid "IDS_MF_BODY_PRINT" -msgstr "Stampa" - -msgid "IDS_MF_BODY_SIZE" -msgstr "Dimensioni" - -msgid "IDS_MF_BODY_SOUNDS" -msgstr "Suoni" - -msgid "IDS_MF_BODY_VALIDITY" -msgstr "Validità" - -msgid "IDS_MF_BODY_VIDEOS" -msgstr "Video" - -msgid "IDS_MF_HEADER_NEW_FOLDER" -msgstr "Nuova cartella" - -msgid "IDS_MF_HEADER_PHONE" -msgstr "Telefono" - -msgid "IDS_MF_HEADER_RENAME" -msgstr "Rinomina" - -msgid "IDS_MF_OPT_COPY" -msgstr "Copia" - -msgid "IDS_MF_OPT_DETAILS" -msgstr "Dettagli" - -msgid "IDS_MF_OPT_EDIT" -msgstr "Modifica" - -msgid "IDS_MF_OPT_LISTBY_TYPE" -msgstr "Tipo" - -msgid "IDS_MF_OPT_LIST_BY" -msgstr "Elenca per" - -msgid "IDS_MF_OPT_MOVE" -msgstr "Sposta" - -msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "Sposta qui" - -msgid "IDS_MF_OPT_RINGTONE" -msgstr "Suoneria" - -msgid "IDS_MF_OPT_WALLPAPER" -msgstr "Sfondo" - -msgid "IDS_MF_POP_CLOSE" -msgstr "Chiudi" - -msgid "IDS_MF_POP_CONTINUE" -msgstr "Continua" - -msgid "IDS_MF_POP_COPYING" -msgstr "Copia in corso..." - -msgid "IDS_MF_POP_DELETING_ING" -msgstr "Eliminazione..." - -msgid "IDS_MF_POP_DO_YOU_WANT_TO_UNLOCK_IT_NOW_Q" -msgstr "Sbloccarlo adesso?" - -msgid "IDS_MF_POP_MOVING" -msgstr "Spostamento..." - -msgid "IDS_MF_POP_PASTE_HERE" -msgstr "Incolla qui" - -msgid "IDS_MF_POP_SELECT_ALL" -msgstr "Seleziona tutto" - -msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "Tipo file non supportato" - -msgid "IDS_MF_SK_ADD" -msgstr "Aggiungi" - -msgid "IDS_MF_SK_CANCEL" -msgstr "Annulla" - diff --git a/po/it_IT.po b/po/it_IT.po index e8cc149..ddbbb47 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -310,3 +310,9 @@ msgstr "Vai all'Archivio" msgid "IDS_MF_BODY_RINGTONES" msgstr "Suonerie" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Esporta qui" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Impossibile impostare il contenuto protetto di DRM come suoneria o avviso di notifica" + diff --git a/po/ja.po b/po/ja.po deleted file mode 100644 index 170b593..0000000 --- a/po/ja.po +++ /dev/null @@ -1,137 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-16 18:18+0900\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -msgid "IDS_MF_BODY_ANY" -msgstr "どれか" - -msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "使用​可能" - -msgid "IDS_MF_BODY_CREATE_FOLDER" -msgstr "フォルダ作成" - -msgid "IDS_MF_BODY_DATE" -msgstr "日付" - -msgid "IDS_MF_BODY_DONE" -msgstr "完了" - -msgid "IDS_MF_BODY_EXECUTE" -msgstr "実行" - -msgid "IDS_MF_BODY_FORWARDING" -msgstr "外部転送" - -msgid "IDS_MF_BODY_IMAGES" -msgstr "画像" - -msgid "IDS_MF_BODY_IMPOSSIBLE" -msgstr "不可" - -msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "Los datos MMC se están inicializando..." - -msgid "IDS_MF_BODY_OTHERS" -msgstr "その他" - -msgid "IDS_MF_BODY_POSSIBLE" -msgstr "可能" - -msgid "IDS_MF_BODY_PRINT" -msgstr "印刷" - -msgid "IDS_MF_BODY_SIZE" -msgstr "サイズ" - -msgid "IDS_MF_BODY_SOUNDS" -msgstr "サウンド" - -msgid "IDS_MF_BODY_VALIDITY" -msgstr "有効性" - -msgid "IDS_MF_BODY_VIDEOS" -msgstr "ムービー" - -msgid "IDS_MF_HEADER_NEW_FOLDER" -msgstr "新​フォルダ" - -msgid "IDS_MF_HEADER_PHONE" -msgstr "本体" - -msgid "IDS_MF_HEADER_RENAME" -msgstr "ファイル名変更" - -msgid "IDS_MF_OPT_COPY" -msgstr "コピー" - -msgid "IDS_MF_OPT_DETAILS" -msgstr "詳細" - -msgid "IDS_MF_OPT_EDIT" -msgstr "編集​" - -msgid "IDS_MF_OPT_LISTBY_TYPE" -msgstr "種類" - -msgid "IDS_MF_OPT_LIST_BY" -msgstr "ソート" - -msgid "IDS_MF_OPT_MOVE" -msgstr "移動" - -msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "ここに​移動" - -msgid "IDS_MF_OPT_RINGTONE" -msgstr "着信音" - -msgid "IDS_MF_OPT_WALLPAPER" -msgstr "壁紙" - -msgid "IDS_MF_POP_CLOSE" -msgstr "閉じる" - -msgid "IDS_MF_POP_CONTINUE" -msgstr "次へ" - -msgid "IDS_MF_POP_COPYING" -msgstr "コピー中..." - -msgid "IDS_MF_POP_DELETING_ING" -msgstr "削除中..." - -msgid "IDS_MF_POP_DO_YOU_WANT_TO_UNLOCK_IT_NOW_Q" -msgstr "今すぐ​ロック​解除​しますか？" - -msgid "IDS_MF_POP_MOVING" -msgstr "移動中..." - -msgid "IDS_MF_POP_PASTE_HERE" -msgstr "ここにコピー" - -msgid "IDS_MF_POP_SELECT_ALL" -msgstr "全て選択" - -msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "非対応のファイルです" - -msgid "IDS_MF_SK_ADD" -msgstr "追加" - -msgid "IDS_MF_SK_CANCEL" -msgstr "キャンセル" diff --git a/po/ja_JP.po b/po/ja_JP.po index 0c42d17..43b70c4 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -5,31 +5,31 @@ msgid "IDS_MF_BUTTON_HOME" msgstr "ホーム" msgid "IDS_MF_OPT_VIEW_BY_LIST" -msgstr "リスト​表示" +msgstr "リスト表示" msgid "IDS_MF_OPT_VIEW_BY_THUMBNAIL" -msgstr "サムネイル​表示" +msgstr "サムネイル表示" msgid "IDS_MF_POP_DELETE_FAILED" -msgstr "削除​でき​ません​でした。" +msgstr "削除できませんでした。" msgid "IDS_MF_POP_DRM_FILE_CANNOT_SEND" msgstr "DRMファイルです。送信できません。" msgid "IDS_MF_POP_INVALID_FILE_NAME" -msgstr "ファイル名​が​正しく​あり​ません。" +msgstr "ファイル名が正しくありません。" msgid "IDS_MF_POP_MAXIMUM_FOLDER_REACHED" msgstr "最大フォルダ数に達しました。" msgid "IDS_MF_POP_PERMISSION_DENIED" -msgstr "承認が​拒否されました。" +msgstr "承認が拒否されました。" msgid "IDS_MF_POP_SEND_FAILED" -msgstr "送信​​に失敗しました" +msgstr "送信に失敗しました" msgid "IDS_MF_POP_THE_DESTINATION_FOLDER_IS_A_SUBFOLDER_OF_THE_SOURCE_FOLDER" -msgstr "目的のフォルダが元のフォルダと同じです。" +msgstr "移動元と移動先のフォルダが同じです。" msgid "IDS_MF_POP_THIS_FILE_DOES_NOT_EXIST" msgstr "このファイルは存在しません。" @@ -38,13 +38,13 @@ msgid "IDS_MF_POP_UNABLE_TO_COPY" msgstr "コピーできません。" msgid "IDS_MF_POP_UNABLE_TO_MOVE" -msgstr "移動​でき​ません。" +msgstr "移動できません。" msgid "IDS_MF_BODY_NOT_ENOUGH_MEMORY_IN_PHONE_MEMORY_DELETE_SOME_ITEMS_AND_TRY_AGAIN" msgstr "システムメモリ（本体）が不足しています。不要なアイテムを削除し、再度実行してください。" msgid "IDS_MF_POP_COPYING_FAILED" -msgstr "コピー​に​失敗​しました。" +msgstr "コピーに失敗しました。" msgid "IDS_MF_POP_MOVING_FAILED" msgstr "移動に失敗しました。" @@ -53,7 +53,7 @@ msgid "IDS_MF_POP_NOT_ENOUGH_MEMORY_PS_AVAILABLE" msgstr "メモリ不足です。%s使用可能" msgid "IDS_MF_POP_SAME_NAME_ALREADY_IN_USE" -msgstr "同じ​名前​が​既に​使用​されて​います" +msgstr "同じ名前が既に使用されています" msgid "IDS_MF_POP_UNABLE_TO_MOVE_DESTINATION_FOLDER_SAME_AS_SOURCE_FOLDER" msgstr "移動できません。移動元と移動先のフォルダが同じです。" @@ -83,7 +83,7 @@ msgid "IDS_MF_BODY_SOUNDS" msgstr "サウンド" msgid "IDS_MF_BODY_DOWNLOADS" -msgstr "ダウン​ロード" +msgstr "ダウンロード" msgid "IDS_MF_TAB_MEMORY_CARD" msgstr "メモリカード" @@ -104,7 +104,7 @@ msgid "IDS_MF_BODY_UP" msgstr "上" msgid "IDS_MF_SK3_MOVE_HERE" -msgstr "ここに​移動" +msgstr "ここに移動" msgid "IDS_MF_SK3_COPY" msgstr "コピー" @@ -122,10 +122,10 @@ msgid "IDS_MF_OPT_CREATE_FOLDER" msgstr "フォルダ作成" msgid "IDS_MF_BODY_FOLDER_NAME" -msgstr "フォルダ​名" +msgstr "フォルダ名" msgid "IDS_MF_BODY_ACCESS_MORE_MY_ALBUM" -msgstr "マイ​アルバム" +msgstr "マイアルバム" msgid "IDS_MF_OPT_VIEW_AS" msgstr "表示形式" @@ -134,16 +134,16 @@ msgid "IDS_MF_SK3_BACK" msgstr "戻る" msgid "IDS_MF_BODY_MY_VIDEO_CLIPS" -msgstr "マイ​ビデオ​クリップ" +msgstr "マイビデオクリップ" msgid "IDS_MF_BODY_RIGHT_STATUS" msgstr "権限の状態" msgid "IDS_MF_BODY_VENDOR" -msgstr "提供元順" +msgstr "提供元" msgid "IDS_MF_HEADER_COUNT" -msgstr "カウント" +msgstr "回数" msgid "IDS_MF_BODY_CONTAINS" msgstr "含む" @@ -161,10 +161,10 @@ msgid "IDS_MF_BODY_TIME" msgstr "時刻" msgid "IDS_MF_BODY_TIMED_COUNT" -msgstr "時間​カウント" +msgstr "時間カウント" msgid "IDS_MF_BODY_TYPE" -msgstr "種類" +msgstr "タイプ" msgid "IDS_MF_BODY_UNLIMITED" msgstr "無制限" @@ -173,7 +173,7 @@ msgid "IDS_MF_BUTTON_REPLACE_ABB" msgstr "上書き" msgid "IDS_MF_OPT_CALLER_RINGTONE" -msgstr "個別​着信音" +msgstr "個別着信音" msgid "IDS_MF_OPT_LISTBY_NAME" msgstr "名前" @@ -182,7 +182,7 @@ msgid "IDS_MF_POP_COPIED" msgstr "コピーしました。" msgid "IDS_MF_POP_NOTHING_SELECTED" -msgstr "何も​選択​されて​いません。" +msgstr "何も選択されていません。" msgid "IDS_MF_POP_NOT_ENOUGH_HEAP_MEMORY" msgstr "ヒープメモリ不足です。" @@ -197,13 +197,13 @@ msgid "IDS_MF_BODY_GPS_INFORMATION" msgstr "GPS情報" msgid "IDS_MF_BODY_GPS_LATITUDE" -msgstr "GPS​緯度" +msgstr "GPS緯度" msgid "IDS_MF_BODY_GPS_LONGITUDE" -msgstr "GPS​経度" +msgstr "GPS経度" msgid "IDS_MF_BODY_GPS_VERSION" -msgstr "GPS​バージョン" +msgstr "GPSバージョン" msgid "IDS_MF_SK_DETAILS" msgstr "詳細" @@ -212,7 +212,7 @@ msgid "IDS_MF_BODY_ANY" msgstr "どれか" msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "使用​可能" +msgstr "使用可能" msgid "IDS_MF_BODY_EXECUTE" msgstr "実行" @@ -233,7 +233,7 @@ msgid "IDS_MF_BODY_PRINT" msgstr "印刷" msgid "IDS_MF_BODY_VALIDITY" -msgstr "有効​回数" +msgstr "有効回数" msgid "IDS_MF_HEADER_NEW_FOLDER" msgstr "新規フォルダ" @@ -245,7 +245,7 @@ msgid "IDS_MF_OPT_LIST_BY" msgstr "ソート" msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "ここに​移動" +msgstr "ここに移動" msgid "IDS_MF_POP_CONTINUE" msgstr "次へ" @@ -254,10 +254,10 @@ msgid "IDS_MF_POP_COPYING" msgstr "コピー中..." msgid "IDS_MF_POP_PASTE_HERE" -msgstr "ここに​コピー" +msgstr "ここに貼付" msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "未​対応​の​ファイル​です。" +msgstr "未対応のファイルです。" msgid "IDS_MF_OPT_DETAIL_VIEW" msgstr "詳細表示" @@ -275,13 +275,13 @@ msgid "IDS_MF_BODY_UP_M_BACK" msgstr "戻る" msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" -msgstr "全て​の​フォルダ​を​検索" +msgstr "全てのフォルダを検索" msgid "IDS_MF_OPT_THUMBNAIL_VIEW" -msgstr "サムネイル​表示" +msgstr "サムネイル表示" msgid "IDS_MF_OPT_SHOW_FILE_EXTENSION" -msgstr "ファイル​拡張子を​表示" +msgstr "ファイル拡張子を表示" msgid "IDS_MF_OPT_SORT_BY" msgstr "ソート" @@ -310,3 +310,9 @@ msgstr "マイ​ファイル​に​移動" msgid "IDS_MF_BODY_RINGTONES" msgstr "着信音" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "ここにエクスポート" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM保護コンテンツは、着信音または通知音に設定できません。" + diff --git a/po/ka.po b/po/ka.po index 07c05d9..8fce845 100644 --- a/po/ka.po +++ b/po/ka.po @@ -271,6 +271,9 @@ msgstr "კლებადი" msgid "IDS_MF_TAB_ALL" msgstr "ყველა" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "ზევით" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "ყველა საქაღალდის ძებნა" @@ -307,3 +310,9 @@ msgstr "ჩემს ფაილებზე გადას." msgid "IDS_MF_BODY_RINGTONES" msgstr "ზარის მელოდიები" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "შეასრულეთ ექსპორტი აქ" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM-ით დაცული მასალის ზარის მელოდიად ან შეტყობინების სიგნალად დაყენება შეუძლებელია" + diff --git a/po/kk.po b/po/kk.po index 7a98f6d..685c196 100644 --- a/po/kk.po +++ b/po/kk.po @@ -271,6 +271,9 @@ msgstr "Кему" msgid "IDS_MF_TAB_ALL" msgstr "Барлығы" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Жоғары" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Барлық қалталарды іздеу" @@ -307,3 +310,9 @@ msgstr "Менің файлдарыма өту" msgid "IDS_MF_BODY_RINGTONES" msgstr "Әуендер" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Мұнда экспорттау" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM арқылы қорғалған мазмұнды рингтон не ескерту сигналы ретінде қою мүмкін емес" + diff --git a/po/ko.po b/po/ko.po deleted file mode 100644 index 5be8a5c..0000000 --- a/po/ko.po +++ /dev/null @@ -1,155 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-16 18:18+0900\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src_sg/myfile_sg_lib.c:98 src_sg/myfile_sg_lib.c:482 -#: src_sg/myfile_sg_lib.c:518 src_sg/myfile_sg_lib.c:901 -msgid "IDS_COM_SK_OK" -msgstr "확인" - -#: src_sg/myfile_sg_lib.c:478 src_sg/myfile_sg_lib.c:894 -msgid "IDS_COM_BODY_BACK" -msgstr "이전" - -#: src_sg/myfile_sg_lib.c:504 src_sg/myfile_sg_lib.c:897 -#: src_sg/myfile_sg_lib.c:942 -msgid "IDS_COM_BODY_DELETE" -msgstr "삭제" - -#: src_sg/myfile_sg_lib.c:517 -msgid "Select at least one item" -msgstr "" - -msgid "IDS_MF_BODY_ANY" -msgstr "모든 종류" - -msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "사용 가능" - -msgid "IDS_MF_BODY_CREATE_FOLDER" -msgstr "폴더 추가" - -msgid "IDS_MF_BODY_DATE" -msgstr "날짜" - -msgid "IDS_MF_BODY_DONE" -msgstr "완료" - -msgid "IDS_MF_BODY_EXECUTE" -msgstr "실행" - -msgid "IDS_MF_BODY_FORWARDING" -msgstr "전송" - -msgid "IDS_MF_BODY_IMAGES" -msgstr "이미지" - -msgid "IDS_MF_BODY_IMPOSSIBLE" -msgstr "불가능" - -msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "외장메모리 데이터 읽어오는 중…" - -msgid "IDS_MF_BODY_OTHERS" -msgstr "기타" - -msgid "IDS_MF_BODY_POSSIBLE" -msgstr "가능" - -msgid "IDS_MF_BODY_PRINT" -msgstr "인쇄" - -msgid "IDS_MF_BODY_SIZE" -msgstr "크기" - -msgid "IDS_MF_BODY_SOUNDS" -msgstr "사운드" - -msgid "IDS_MF_BODY_VALIDITY" -msgstr "유효 횟수" - -msgid "IDS_MF_BODY_VIDEOS" -msgstr "동영상" - -msgid "IDS_MF_HEADER_NEW_FOLDER" -msgstr "폴더 추가" - -msgid "IDS_MF_HEADER_PHONE" -msgstr "휴대폰" - -msgid "IDS_MF_HEADER_RENAME" -msgstr "이름 변경" - -msgid "IDS_MF_OPT_COPY" -msgstr "복사" - -msgid "IDS_MF_OPT_DETAILS" -msgstr "상세정보" - -msgid "IDS_MF_OPT_EDIT" -msgstr "편집" - -msgid "IDS_MF_OPT_LISTBY_TYPE" -msgstr "형식" - -msgid "IDS_MF_OPT_LIST_BY" -msgstr "정렬" - -msgid "IDS_MF_OPT_MOVE" -msgstr "이동" - -msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "여기로 이동" - -msgid "IDS_MF_OPT_RINGTONE" -msgstr "벨소리" - -msgid "IDS_MF_OPT_WALLPAPER" -msgstr "배경화면" - -msgid "IDS_MF_POP_CLOSE" -msgstr "닫기" - -msgid "IDS_MF_POP_CONTINUE" -msgstr "계속" - -msgid "IDS_MF_POP_COPYING" -msgstr "복사 중..." - -msgid "IDS_MF_POP_DELETING_ING" -msgstr "삭제 중..." - -msgid "IDS_MF_POP_DO_YOU_WANT_TO_UNLOCK_IT_NOW_Q" -msgstr "지금 해제할까요?" - -msgid "IDS_MF_POP_MOVING" -msgstr "이동 중..." - -msgid "IDS_MF_POP_PASTE_HERE" -msgstr "여기로 복사" - -msgid "IDS_MF_POP_SELECT_ALL" -msgstr "모두 선택" - -msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "지원되지 않는 파일 형식입니다" - -msgid "IDS_MF_SK_ADD" -msgstr "추가" - -msgid "IDS_MF_SK_CANCEL" -msgstr "취소" diff --git a/po/ko_KR.po b/po/ko_KR.po index d0d6e17..a3bd6ca 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -41,7 +41,7 @@ msgid "IDS_MF_POP_UNABLE_TO_MOVE" msgstr "이동시킬 수 없습니다" msgid "IDS_MF_BODY_NOT_ENOUGH_MEMORY_IN_PHONE_MEMORY_DELETE_SOME_ITEMS_AND_TRY_AGAIN" -msgstr "내장 메모리에 저장 공간이 부족합니다. 일부 항목을 삭제한 후 다시 시도하세요" +msgstr "내장 메모리에 저장 공간이 부족합니다. 일부 항목을 삭제한 후 다시 시도하세요." msgid "IDS_MF_POP_COPYING_FAILED" msgstr "복사하지 못하였습니다" @@ -50,13 +50,13 @@ msgid "IDS_MF_POP_MOVING_FAILED" msgstr "이동하지 못하였습니다" msgid "IDS_MF_POP_NOT_ENOUGH_MEMORY_PS_AVAILABLE" -msgstr "메모리가 부족합니다. %s을(를) 사용할 수 있습니다" +msgstr "메모리가 부족합니다. %s을(를) 사용할 수 있습니다." msgid "IDS_MF_POP_SAME_NAME_ALREADY_IN_USE" msgstr "사용 중인 이름입니다" msgid "IDS_MF_POP_UNABLE_TO_MOVE_DESTINATION_FOLDER_SAME_AS_SOURCE_FOLDER" -msgstr "이동시킬 수 없습니다. 소스 폴더와 이름이 같습니다" +msgstr "이동시킬 수 없습니다. 소스 폴더와 이름이 같습니다." msgid "IDS_MF_SK3_CREATE_FOLDER" msgstr "폴더 추가" @@ -188,7 +188,7 @@ msgid "IDS_MF_POP_NOT_ENOUGH_HEAP_MEMORY" msgstr "힙메모리가 부족합니다" msgid "IDS_MF_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" -msgstr "저장 공간이 없습니다. 필요 없는 파일을 삭제하세요" +msgstr "저장 공간이 없습니다. 필요 없는 파일을 삭제하세요." msgid "IDS_MF_BODY_CREATED_DATE" msgstr "생성 날짜" @@ -224,7 +224,7 @@ msgid "IDS_MF_BODY_IMPOSSIBLE" msgstr "불가능" msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "메모리 카드 데이터 초기화 중…" +msgstr "메모리 카드 데이터 초기화 중..." msgid "IDS_MF_BODY_POSSIBLE" msgstr "가능" @@ -281,7 +281,7 @@ msgid "IDS_MF_OPT_THUMBNAIL_VIEW" msgstr "썸네일 보기" msgid "IDS_MF_OPT_SHOW_FILE_EXTENSION" -msgstr "파일 확장자 보기" +msgstr "파일 확장자 표시" msgid "IDS_MF_OPT_SORT_BY" msgstr "정렬" @@ -310,3 +310,9 @@ msgstr "내 파일로 이동" msgid "IDS_MF_BODY_RINGTONES" msgstr "벨소리" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "여기로 내보내기" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM 컨텐츠를 벨소리 또는 알림 메시지로 설정할 수 없습니다" + diff --git a/po/lt.po b/po/lt.po index a901dd5..da5ad4e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -271,6 +271,9 @@ msgstr "Mažėjimo tvarka" msgid "IDS_MF_TAB_ALL" msgstr "Visi" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Aukštyn" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Ieškoti visų aplankų" @@ -307,3 +310,9 @@ msgstr "Eiti į „Mano failus“" msgid "IDS_MF_BODY_RINGTONES" msgstr "Skambėjimo tonai" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Eksportuoti čia" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Neįmanoma nustatyti DRM apsaugoto turinio kaip skambėjimo tono ar pranešimo įspėjimo" + diff --git a/po/lv.po b/po/lv.po index 9636261..0d7e01c 100644 --- a/po/lv.po +++ b/po/lv.po @@ -271,6 +271,9 @@ msgstr "Dilstošā secībā" msgid "IDS_MF_TAB_ALL" msgstr "Visas" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Uz augšu" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Meklēt visās mapēs" @@ -307,3 +310,9 @@ msgstr "Atv.mapi Mani faili" msgid "IDS_MF_BODY_RINGTONES" msgstr "Zvana signāli" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Eksportēt šeit" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Saturu, kas aizsargāts ar DRM, nevar iestatīt kā zvana signālu vai paziņojuma signālu" + diff --git a/po/mk.po b/po/mk.po index 0de9dc6..1c2d8d5 100644 --- a/po/mk.po +++ b/po/mk.po @@ -271,6 +271,9 @@ msgstr "Надолен редослед" msgid "IDS_MF_TAB_ALL" msgstr "Сите" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Отворање" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Пребарај ги сите папки" @@ -307,3 +310,9 @@ msgstr "Оди во Мои фајлови" msgid "IDS_MF_BODY_RINGTONES" msgstr "Тонови на ѕвонење" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Извези тука" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Не може да се постави содржина заштитена со DRM како тон за ѕвонење или за известување" + diff --git a/po/nb.po b/po/nb.po index 0c1abbc..931df5f 100644 --- a/po/nb.po +++ b/po/nb.po @@ -271,6 +271,9 @@ msgstr "Synkende" msgid "IDS_MF_TAB_ALL" msgstr "Alle" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Opp" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Søk i alle mapper" @@ -307,3 +310,9 @@ msgstr "Gå til Mine Filer" msgid "IDS_MF_BODY_RINGTONES" msgstr "Ringetoner" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Eksporter hit" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Kan ikke angi DRM-beskyttet innhold som ringetone eller varselsignal" + diff --git a/po/nl.po b/po/nl.po deleted file mode 100644 index 1be7c74..0000000 --- a/po/nl.po +++ /dev/null @@ -1,120 +0,0 @@ -msgid "IDS_MF_BODY_ANY" -msgstr "Alle" - -msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "Aantal keer dat het gebruikt mag worden" - -msgid "IDS_MF_BODY_CREATE_FOLDER" -msgstr "Map maken" - -msgid "IDS_MF_BODY_DATE" -msgstr "Datum" - -msgid "IDS_MF_BODY_DONE" -msgstr "Gereed" - -msgid "IDS_MF_BODY_EXECUTE" -msgstr "Uitvoeren" - -msgid "IDS_MF_BODY_FORWARDING" -msgstr "Doorsturen" - -msgid "IDS_MF_BODY_IMAGES" -msgstr "Afbeeldingen" - -msgid "IDS_MF_BODY_IMPOSSIBLE" -msgstr "Niet mogelijk" - -msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "MMC-gegevens worden geïnitialiseerd..." - -msgid "IDS_MF_BODY_OTHERS" -msgstr "Overige" - -msgid "IDS_MF_BODY_POSSIBLE" -msgstr "Mogelijk" - -msgid "IDS_MF_BODY_PRINT" -msgstr "Afdrukken" - -msgid "IDS_MF_BODY_SIZE" -msgstr "Grootte" - -msgid "IDS_MF_BODY_SOUNDS" -msgstr "Geluiden" - -msgid "IDS_MF_BODY_VALIDITY" -msgstr "Geldigheid" - -msgid "IDS_MF_BODY_VIDEOS" -msgstr "Video's" - -msgid "IDS_MF_HEADER_NEW_FOLDER" -msgstr "Nieuwe map" - -msgid "IDS_MF_HEADER_PHONE" -msgstr "Telefoon" - -msgid "IDS_MF_HEADER_RENAME" -msgstr "Naam wijzigen" - -msgid "IDS_MF_OPT_COPY" -msgstr "Kopiëren" - -msgid "IDS_MF_OPT_DETAILS" -msgstr "Details" - -msgid "IDS_MF_OPT_EDIT" -msgstr "Wijzigen" - -msgid "IDS_MF_OPT_LISTBY_TYPE" -msgstr "Type" - -msgid "IDS_MF_OPT_LIST_BY" -msgstr "Sorteren op" - -msgid "IDS_MF_OPT_MOVE" -msgstr "Verplaatsen" - -msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "Hier plaatsen" - -msgid "IDS_MF_OPT_RINGTONE" -msgstr "Beltoon" - -msgid "IDS_MF_OPT_WALLPAPER" -msgstr "Achtergrond" - -msgid "IDS_MF_POP_CLOSE" -msgstr "Dichtbij" - -msgid "IDS_MF_POP_CONTINUE" -msgstr "Doorgaan" - -msgid "IDS_MF_POP_COPYING" -msgstr "Kopiëren..." - -msgid "IDS_MF_POP_DELETING_ING" -msgstr "Wissen..." - -msgid "IDS_MF_POP_DO_YOU_WANT_TO_UNLOCK_IT_NOW_Q" -msgstr "Wilt u het apparaat nu ontgrendelen?" - -msgid "IDS_MF_POP_MOVING" -msgstr "Verplaatsen..." - -msgid "IDS_MF_POP_PASTE_HERE" -msgstr "Hier kopiëren" - -msgid "IDS_MF_POP_SELECT_ALL" -msgstr "Alles selecteren" - -msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "Niet-ondersteund bestandstype" - -msgid "IDS_MF_SK_ADD" -msgstr "Voeg toe" - -msgid "IDS_MF_SK_CANCEL" -msgstr "Annul." - diff --git a/po/nl_NL.po b/po/nl_NL.po index 336dcee..54afd4b 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -289,8 +289,8 @@ msgstr "Sorteren op" msgid "IDS_MF_BODY_LIST_AND_DETAILS_ABB" msgstr "Lijst en details" -msgid "IDS_MF_OPT_HIDE_FILE_EXTENSION_ABB" -msgstr "Bestandsext. verbergen" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Hiernaartoe exporteren" msgid "IDS_MF_OPT_NAME_HA_TO_Z" msgstr "Naam (A tot Z)" @@ -310,3 +310,5 @@ msgstr "Naar Mijn bestanden" msgid "IDS_MF_BODY_RINGTONES" msgstr "Beltonen" +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Kan door DRM beveiligde inhoud niet instellen als beltoon of meldingsignaal" diff --git a/po/pl.po b/po/pl.po index 287f05f..76c0c79 100644 --- a/po/pl.po +++ b/po/pl.po @@ -271,6 +271,9 @@ msgstr "Malejąco" msgid "IDS_MF_TAB_ALL" msgstr "Wszystkie" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "W górę" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Przesz. wszystkie kat." @@ -307,3 +310,9 @@ msgstr "Idź do Moich plików" msgid "IDS_MF_BODY_RINGTONES" msgstr "Dzwonki" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Eksportuj tutaj" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Zawartości chronionej za pomocą technologii DRM nie można ustawić jako dzwonek lub powiadomienie" + diff --git a/po/pt.po b/po/pt.po deleted file mode 100644 index 4ed2697..0000000 --- a/po/pt.po +++ /dev/null @@ -1,120 +0,0 @@ -msgid "IDS_MF_BODY_ANY" -msgstr "Qualquer" - -msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "Utilizações disponíveis" - -msgid "IDS_MF_BODY_CREATE_FOLDER" -msgstr "Criar pasta" - -msgid "IDS_MF_BODY_DATE" -msgstr "Data" - -msgid "IDS_MF_BODY_DONE" -msgstr "Concluído" - -msgid "IDS_MF_BODY_EXECUTE" -msgstr "Executar" - -msgid "IDS_MF_BODY_FORWARDING" -msgstr "A reencaminhar" - -msgid "IDS_MF_BODY_IMAGES" -msgstr "Imagens" - -msgid "IDS_MF_BODY_IMPOSSIBLE" -msgstr "Impossível" - -msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "Données MMC en cours d'initialisation..." - -msgid "IDS_MF_BODY_OTHERS" -msgstr "Outros" - -msgid "IDS_MF_BODY_POSSIBLE" -msgstr "Possível" - -msgid "IDS_MF_BODY_PRINT" -msgstr "Imprimir" - -msgid "IDS_MF_BODY_SIZE" -msgstr "Tamanho" - -msgid "IDS_MF_BODY_SOUNDS" -msgstr "Sons" - -msgid "IDS_MF_BODY_VALIDITY" -msgstr "Validade" - -msgid "IDS_MF_BODY_VIDEOS" -msgstr "Vídeos" - -msgid "IDS_MF_HEADER_NEW_FOLDER" -msgstr "Nova pasta" - -msgid "IDS_MF_HEADER_PHONE" -msgstr "Telefone" - -msgid "IDS_MF_HEADER_RENAME" -msgstr "Mudar nome" - -msgid "IDS_MF_OPT_COPY" -msgstr "Copiar" - -msgid "IDS_MF_OPT_DETAILS" -msgstr "Detalhes" - -msgid "IDS_MF_OPT_EDIT" -msgstr "Editar" - -msgid "IDS_MF_OPT_LISTBY_TYPE" -msgstr "Tipo" - -msgid "IDS_MF_OPT_LIST_BY" -msgstr "Listar por" - -msgid "IDS_MF_OPT_MOVE" -msgstr "Mover" - -msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "Mover para aqui" - -msgid "IDS_MF_OPT_RINGTONE" -msgstr "Tom de toque" - -msgid "IDS_MF_OPT_WALLPAPER" -msgstr "Fundo" - -msgid "IDS_MF_POP_CLOSE" -msgstr "Fechar" - -msgid "IDS_MF_POP_CONTINUE" -msgstr "Continuar" - -msgid "IDS_MF_POP_COPYING" -msgstr "A copiar..." - -msgid "IDS_MF_POP_DELETING_ING" -msgstr "A eliminar..." - -msgid "IDS_MF_POP_DO_YOU_WANT_TO_UNLOCK_IT_NOW_Q" -msgstr "Quer desbloquear agora?" - -msgid "IDS_MF_POP_MOVING" -msgstr "A mover..." - -msgid "IDS_MF_POP_PASTE_HERE" -msgstr "Colar aqui" - -msgid "IDS_MF_POP_SELECT_ALL" -msgstr "Seleccionar tudo" - -msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "Tipo de ficheiro não suportado" - -msgid "IDS_MF_SK_ADD" -msgstr "Adicionar" - -msgid "IDS_MF_SK_CANCEL" -msgstr "Cancelar" - diff --git a/po/pt_BR.po b/po/pt_BR.po index 86819e3..307739d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -271,6 +271,9 @@ msgstr "Descendente" msgid "IDS_MF_TAB_ALL" msgstr "Todos" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Para cima" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Pesq. todas as pastas" @@ -307,3 +310,9 @@ msgstr "Ir p/ Meus Arquivos" msgid "IDS_MF_BODY_RINGTONES" msgstr "Toques" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exportar aqui" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Não é possível definir conteúdo protegido por DRM como toque de chamada ou aviso de alerta" + diff --git a/po/pt_PT.po b/po/pt_PT.po index b999adb..6f5dc83 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -310,3 +310,9 @@ msgstr "Ir para Os Meus Ficheiros" msgid "IDS_MF_BODY_RINGTONES" msgstr "Tons de toque" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exportar aqui" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Impossível definir conteúdo protegido por DRM como tom de toque ou alerta de notificação" + diff --git a/po/ro.po b/po/ro.po index 85374e8..9bbb247 100644 --- a/po/ro.po +++ b/po/ro.po @@ -271,6 +271,9 @@ msgstr "Descrescător" msgid "IDS_MF_TAB_ALL" msgstr "Toate" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Sus" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Căutare totală foldere" @@ -307,3 +310,9 @@ msgstr "Accesare Fişierele mele" msgid "IDS_MF_BODY_RINGTONES" msgstr "Tonuri sonerie" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Export aici" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Imposibil de setat conţinutul protejat prin drepturi DRM ca ton de sonerie sau ca alertă de notificare" + diff --git a/po/ru.po b/po/ru.po deleted file mode 100644 index 4eb84d6..0000000 --- a/po/ru.po +++ /dev/null @@ -1,120 +0,0 @@ -msgid "IDS_MF_BODY_ANY" -msgstr "Любой" - -msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "Доступно" - -msgid "IDS_MF_BODY_CREATE_FOLDER" -msgstr "Создать папку" - -msgid "IDS_MF_BODY_DATE" -msgstr "Дата" - -msgid "IDS_MF_BODY_DONE" -msgstr "Готово" - -msgid "IDS_MF_BODY_EXECUTE" -msgstr "Запуск" - -msgid "IDS_MF_BODY_FORWARDING" -msgstr "Пересылка" - -msgid "IDS_MF_BODY_IMAGES" -msgstr "Картинки" - -msgid "IDS_MF_BODY_IMPOSSIBLE" -msgstr "Невозможно" - -msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "Инициализация данных MMC..." - -msgid "IDS_MF_BODY_OTHERS" -msgstr "Прочее" - -msgid "IDS_MF_BODY_POSSIBLE" -msgstr "Возможно" - -msgid "IDS_MF_BODY_PRINT" -msgstr "Печать" - -msgid "IDS_MF_BODY_SIZE" -msgstr "Размер" - -msgid "IDS_MF_BODY_SOUNDS" -msgstr "Звуки" - -msgid "IDS_MF_BODY_VALIDITY" -msgstr "Период действия" - -msgid "IDS_MF_BODY_VIDEOS" -msgstr "Видео" - -msgid "IDS_MF_HEADER_NEW_FOLDER" -msgstr "Новая папка" - -msgid "IDS_MF_HEADER_PHONE" -msgstr "Телефон" - -msgid "IDS_MF_HEADER_RENAME" -msgstr "Переименовать" - -msgid "IDS_MF_OPT_COPY" -msgstr "Копировать" - -msgid "IDS_MF_OPT_DETAILS" -msgstr "Свойства" - -msgid "IDS_MF_OPT_EDIT" -msgstr "Изменить" - -msgid "IDS_MF_OPT_LISTBY_TYPE" -msgstr "Тип" - -msgid "IDS_MF_OPT_LIST_BY" -msgstr "Сортировка по" - -msgid "IDS_MF_OPT_MOVE" -msgstr "Переместить" - -msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "Переместить сюда" - -msgid "IDS_MF_OPT_RINGTONE" -msgstr "Мелодия звонка" - -msgid "IDS_MF_OPT_WALLPAPER" -msgstr "Обои" - -msgid "IDS_MF_POP_CLOSE" -msgstr "Закрыть" - -msgid "IDS_MF_POP_CONTINUE" -msgstr "Продолжить" - -msgid "IDS_MF_POP_COPYING" -msgstr "Копирование..." - -msgid "IDS_MF_POP_DELETING_ING" -msgstr "Удаление..." - -msgid "IDS_MF_POP_DO_YOU_WANT_TO_UNLOCK_IT_NOW_Q" -msgstr "Разблокировать элемент?" - -msgid "IDS_MF_POP_MOVING" -msgstr "Перемещение..." - -msgid "IDS_MF_POP_PASTE_HERE" -msgstr "Вставить сюда" - -msgid "IDS_MF_POP_SELECT_ALL" -msgstr "Выбрать все" - -msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "Неподдерживаемый тип файла" - -msgid "IDS_MF_SK_ADD" -msgstr "Добавить" - -msgid "IDS_MF_SK_CANCEL" -msgstr "Отмена" - diff --git a/po/ru_RU.po b/po/ru_RU.po index 3fa7c83..b939937 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -310,3 +310,9 @@ msgstr "Перейти в Мои файлы" msgid "IDS_MF_BODY_RINGTONES" msgstr "Мелодии звонка" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Экспортировать сюда" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Не удалось установить содержимое, защищенное DRM, в качестве мелодии звонка или сигнала уведомления" + diff --git a/po/sk.po b/po/sk.po index cbb9c23..dad2163 100644 --- a/po/sk.po +++ b/po/sk.po @@ -271,6 +271,9 @@ msgstr "Zostupne" msgid "IDS_MF_TAB_ALL" msgstr "Všetko" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Hore" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Hľadať vo všet. prieč." @@ -307,3 +310,9 @@ msgstr "Ísť na Moje súbory" msgid "IDS_MF_BODY_RINGTONES" msgstr "Zvonenia" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exportovať sem" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Obsah chránený technológiou DRM nemožno nastaviť ako vyzváňací tón ani upozornenie na oznámenie" + diff --git a/po/sl.po b/po/sl.po index f121df9..a7acac8 100644 --- a/po/sl.po +++ b/po/sl.po @@ -271,6 +271,9 @@ msgstr "Padajoče" msgid "IDS_MF_TAB_ALL" msgstr "Vse" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Gor" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Iskanje po vseh mapah" @@ -307,3 +310,9 @@ msgstr "Pojdi na Moje datot." msgid "IDS_MF_BODY_RINGTONES" msgstr "Zvonjenja" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Izvozi sem" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Vsebine, zaščitene z DRM, ni mogoče nastaviti za zvonjenje ali opozorilo" + diff --git a/po/sr.po b/po/sr.po index 3815e9a..1223920 100644 --- a/po/sr.po +++ b/po/sr.po @@ -271,6 +271,9 @@ msgstr "Opadajuće" msgid "IDS_MF_TAB_ALL" msgstr "Sve" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Gore" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Pretraži sve foldere" @@ -307,3 +310,9 @@ msgstr "Idi u Moje fajlove" msgid "IDS_MF_BODY_RINGTONES" msgstr "Tonovi zvona" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Izvezi ovde" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Nije moguće podesiti sadržaj koji ima DRM zaštitu kao ton zvona ili upozorenje o obaveštenju" + diff --git a/po/sv.po b/po/sv.po index 87ff69b..4dad0e7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -271,6 +271,9 @@ msgstr "Fallande" msgid "IDS_MF_TAB_ALL" msgstr "Alla" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Upp" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Sök i alla mappar" @@ -307,3 +310,9 @@ msgstr "Gå till Mina filer" msgid "IDS_MF_BODY_RINGTONES" msgstr "Ringsignaler" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Exportera hit" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Det går inte att ställa in DRM-skyddat innehåll som ringsignaler eller meddelandevarningar" + diff --git a/po/tk.po b/po/tk.po deleted file mode 100644 index 826304e..0000000 --- a/po/tk.po +++ /dev/null @@ -1,120 +0,0 @@ -msgid "IDS_MF_BODY_ANY" -msgstr "Herhangi" - -msgid "IDS_MF_BODY_AVAILABLE_USES" -msgstr "Mevcut kullanımlar" - -msgid "IDS_MF_BODY_CREATE_FOLDER" -msgstr "Klasör oluştur" - -msgid "IDS_MF_BODY_DATE" -msgstr "Tarih" - -msgid "IDS_MF_BODY_DONE" -msgstr "Kaydet" - -msgid "IDS_MF_BODY_EXECUTE" -msgstr "Uygulama" - -msgid "IDS_MF_BODY_FORWARDING" -msgstr "İletme" - -msgid "IDS_MF_BODY_IMAGES" -msgstr "Resimler" - -msgid "IDS_MF_BODY_IMPOSSIBLE" -msgstr "İmkansız" - -msgid "IDS_MF_BODY_MMC_DATA_IS_INITIALIZING_ING" -msgstr "Os dados MMC estão a ser iniciados..." - -msgid "IDS_MF_BODY_OTHERS" -msgstr "Diğerleri" - -msgid "IDS_MF_BODY_POSSIBLE" -msgstr "Mümkün" - -msgid "IDS_MF_BODY_PRINT" -msgstr "Yazdır" - -msgid "IDS_MF_BODY_SIZE" -msgstr "Boyut" - -msgid "IDS_MF_BODY_SOUNDS" -msgstr "Seslerim" - -msgid "IDS_MF_BODY_VALIDITY" -msgstr "Geçerlilik" - -msgid "IDS_MF_BODY_VIDEOS" -msgstr "Videolar" - -msgid "IDS_MF_HEADER_NEW_FOLDER" -msgstr "Yeni klasör" - -msgid "IDS_MF_HEADER_PHONE" -msgstr "Telefon" - -msgid "IDS_MF_HEADER_RENAME" -msgstr "Yeniden adlandır" - -msgid "IDS_MF_OPT_COPY" -msgstr "Kopyala" - -msgid "IDS_MF_OPT_DETAILS" -msgstr "Ayrıntılar" - -msgid "IDS_MF_OPT_EDIT" -msgstr "Düzenle" - -msgid "IDS_MF_OPT_LISTBY_TYPE" -msgstr "Tür" - -msgid "IDS_MF_OPT_LIST_BY" -msgstr "Listele" - -msgid "IDS_MF_OPT_MOVE" -msgstr "Taşı" - -msgid "IDS_MF_OPT_MOVE_HERE" -msgstr "Buraya taşı" - -msgid "IDS_MF_OPT_RINGTONE" -msgstr "Zil sesi" - -msgid "IDS_MF_OPT_WALLPAPER" -msgstr "Duvar kağıdı" - -msgid "IDS_MF_POP_CLOSE" -msgstr "Kapat" - -msgid "IDS_MF_POP_CONTINUE" -msgstr "Devam" - -msgid "IDS_MF_POP_COPYING" -msgstr "Kopyalanıyor..." - -msgid "IDS_MF_POP_DELETING_ING" -msgstr "Siliniyor..." - -msgid "IDS_MF_POP_DO_YOU_WANT_TO_UNLOCK_IT_NOW_Q" -msgstr "Kilidi kaldırmak istiyor musunuz?" - -msgid "IDS_MF_POP_MOVING" -msgstr "Taşıyor..." - -msgid "IDS_MF_POP_PASTE_HERE" -msgstr "Buraya yapıştır" - -msgid "IDS_MF_POP_SELECT_ALL" -msgstr "Hepsini seç" - -msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE" -msgstr "Desteklenmeyen dosya türü" - -msgid "IDS_MF_SK_ADD" -msgstr "Ekle" - -msgid "IDS_MF_SK_CANCEL" -msgstr "İptal" - diff --git a/po/tr_TR.po b/po/tr_TR.po index 595e1d2..bd98a9b 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -310,3 +310,9 @@ msgstr "Dosyalarım’a git" msgid "IDS_MF_BODY_RINGTONES" msgstr "Zil sesleri" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Buraya aktar" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM korumalı içerik zil sesi veya bildirim uyarısı olarak belirlenemedi" + diff --git a/po/uk.po b/po/uk.po index 328a90e..778172e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -95,7 +95,7 @@ msgid "IDS_MF_SK3_EDIT" msgstr "Редагу-\nвати" msgid "IDS_MF_SK3_DELETE" -msgstr "Видал." +msgstr "Видалити" msgid "IDS_MF_SK3_MOVE" msgstr "Переміст." @@ -271,6 +271,9 @@ msgstr "За спаданням" msgid "IDS_MF_TAB_ALL" msgstr "Всі" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Вгору" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Шукати в усіх папках" @@ -307,3 +310,9 @@ msgstr "Пер. до моїх файлів" msgid "IDS_MF_BODY_RINGTONES" msgstr "Звуки дзвінка" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Експортувати сюди" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "Неможливо встановити вміст, захищений DRM, як звук дзвінка або сигнал сповіщення" + diff --git a/po/uz.po b/po/uz.po index 07cfda8..c0e84b3 100644 --- a/po/uz.po +++ b/po/uz.po @@ -271,6 +271,9 @@ msgstr "Kamayib borish" msgid "IDS_MF_TAB_ALL" msgstr "Barcha" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "Up" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "Barcha jildlarni qidir" @@ -307,3 +310,9 @@ msgstr "Fayllarimga o‘ting" msgid "IDS_MF_BODY_RINGTONES" msgstr "Ringtonlar" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "Bu yerga eksport qil" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "DRM himoyalangan tarkibni rington yoki bildirishnoma signali sifatida o‘rnatib bo‘lmaydi" + diff --git a/po/zh_CN.po b/po/zh_CN.po index 86deb2d..464e17f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,7 +2,7 @@ msgid "IDS_MF_TAB_UP" msgstr "向上" msgid "IDS_MF_BUTTON_HOME" -msgstr "主屏" +msgstr "主界面" msgid "IDS_MF_OPT_VIEW_BY_LIST" msgstr "通过列表查看" @@ -284,7 +284,7 @@ msgid "IDS_MF_OPT_SHOW_FILE_EXTENSION" msgstr "显示文件扩展名" msgid "IDS_MF_OPT_SORT_BY" -msgstr "排序通过" +msgstr "排序方式" msgid "IDS_MF_BODY_LIST_AND_DETAILS_ABB" msgstr "列表和详情" @@ -310,3 +310,9 @@ msgstr "转到我的文件" msgid "IDS_MF_BODY_RINGTONES" msgstr "铃声" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "此处导出" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "无法将 DRM 保护内容设置为铃声或通知提醒" + diff --git a/po/zh_HK.po b/po/zh_HK.po index 3b5b140..33e8318 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -110,7 +110,7 @@ msgid "IDS_MF_SK3_COPY" msgstr "複製" msgid "IDS_MF_SK3_SORT_BY" -msgstr "排序按" +msgstr "排序方式" msgid "IDS_MF_SK3_SEARCH" msgstr "搜尋" @@ -284,7 +284,7 @@ msgid "IDS_MF_OPT_SHOW_FILE_EXTENSION" msgstr "顯示檔案伸展內容" msgid "IDS_MF_OPT_SORT_BY" -msgstr "排序按" +msgstr "排序方式" msgid "IDS_MF_BODY_LIST_AND_DETAILS_ABB" msgstr "清單及詳情" @@ -310,3 +310,9 @@ msgstr "前往我的檔案" msgid "IDS_MF_BODY_RINGTONES" msgstr "鈴聲" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "於此匯出" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "無法將受 DRM 保護的內容設為鈴聲或通知提醒" + diff --git a/po/zh_SG.po b/po/zh_SG.po index 55d54d5..99adf4d 100644 --- a/po/zh_SG.po +++ b/po/zh_SG.po @@ -271,6 +271,9 @@ msgstr "降序" msgid "IDS_MF_TAB_ALL" msgstr "全部" +msgid "IDS_MF_BODY_UP_M_BACK" +msgstr "上" + msgid "IDS_MF_BUTTON_SEARCH_ALL_FOLDERS" msgstr "搜索所有文件夹" @@ -307,3 +310,9 @@ msgstr "转到我的文件" msgid "IDS_MF_BODY_RINGTONES" msgstr "铃声" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "此处导出" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "无法将 DRM 保护内容设置为铃声或通知提醒" + diff --git a/po/zh_TW.po b/po/zh_TW.po index 2049198..b22bd6b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -310,3 +310,9 @@ msgstr "前往我的檔案" msgid "IDS_MF_BODY_RINGTONES" msgstr "鈴聲" +msgid "IDS_MF_BUTTON_EXPORT_HERE" +msgstr "於此匯出" + +msgid "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT" +msgstr "無法將受 DRM 保護的內容設為鈴聲或通知提醒" + diff --git a/src/common/file-system/mf-ug-file-attr.c b/src/common/file-system/mf-ug-file-attr.c index b5e41af..78f8b5f 100644 --- a/src/common/file-system/mf-ug-file-attr.c +++ b/src/common/file-system/mf-ug-file-attr.c @@ -622,7 +622,8 @@ int mf_ug_file_attr_get_file_category(const char *filepath, mf_ug_fs_file_type * /*/ToDo: error file name like the last letter is "." */ for (i = strlen(filename); i >= 0; i--) { if (filename[i] == '.') { - strncpy(file_ext, &filename[i + 1], FILE_EXT_LEN_MAX + 1); + strncpy(file_ext, &filename[i + 1], FILE_EXT_LEN_MAX); + ug_error("file_ext = %s\n",file_ext); flag = 1; break; } diff --git a/src/common/file-system/mf-ug-fs-oper.c b/src/common/file-system/mf-ug-fs-oper.c index 5257ddb..eb539f2 100644 --- a/src/common/file-system/mf-ug-fs-oper.c +++ b/src/common/file-system/mf-ug-fs-oper.c @@ -250,7 +250,7 @@ mf_ug_drm_file_mime_type mf_ug_fs_oper_get_drm_type(char *path) } } -static int __drm_is_action_allowed(const char *path, drm_action_type_e action) +int mf_ug_fs_oper_drm_is_action_allowed(const char *path, drm_action_type_e action, drm_setas_category_e category) { drm_bool_type_e is_allowed = 0; drm_action_allowed_data_s action_data; @@ -259,6 +259,8 @@ static int __drm_is_action_allowed(const char *path, drm_action_type_e action) memset(&action_data,0x0,sizeof(drm_action_allowed_data_s)); UG_SAFE_STRCPY(action_data.file_path, path); + action_data.data = category; + ret = drm_is_action_allowed(action,&action_data,&is_allowed); if(DRM_RETURN_SUCCESS == ret && DRM_TRUE == is_allowed){ return true; @@ -267,6 +269,22 @@ static int __drm_is_action_allowed(const char *path, drm_action_type_e action) } } +bool mf_ug_fs_oper_drm_is_valid(const char *path, drm_permission_type_e perm_type) +{ + int res = DRM_RETURN_SUCCESS; + drm_license_status_e licence_status = DRM_LICENSE_STATUS_UNDEFINED; + if (path) { + res = drm_get_license_status(path, perm_type, &licence_status); + } + + ug_error("res is [%d] licence is [%d]", res, licence_status); + if (res == DRM_RETURN_SUCCESS && licence_status == DRM_LICENSE_STATUS_VALID) { + return true; + } else { + return false; + } + +} static bool __mf_ug_fs_oper_exec_drm_filter(ugFsNodeInfo *pnode_info, int option) { if (pnode_info == NULL) { @@ -282,7 +300,7 @@ static bool __mf_ug_fs_oper_exec_drm_filter(ugFsNodeInfo *pnode_info, int option if (option & MF_UG_FILTER_DRM_WITHOUT_FL) { fullpath = g_strconcat(pnode_info->path, "/", pnode_info->name, NULL); - res = __drm_is_action_allowed(fullpath, DRM_IS_FORWARDING_ALLOWED); + res = mf_ug_fs_oper_drm_is_action_allowed(fullpath, DRM_IS_FORWARDING_ALLOWED, DRM_SETAS_NONE); if (res == DRM_RETURN_SUCCESS) { return FALSE; } else { @@ -293,7 +311,7 @@ static bool __mf_ug_fs_oper_exec_drm_filter(ugFsNodeInfo *pnode_info, int option if (option & MF_UG_FILTER_DRM_IMAGE) { fullpath = g_strconcat(pnode_info->path, "/", pnode_info->name, NULL); - result = __drm_is_action_allowed(fullpath, DRM_HAS_VALID_SETAS_STATUS); + result = mf_ug_fs_oper_drm_is_action_allowed(fullpath, DRM_HAS_VALID_SETAS_STATUS, DRM_SETAS_WALLPAPER); if (result) { mf_ug_drm_file_mime_type drm_mime_type = mf_ug_fs_oper_get_drm_type(fullpath); if (drm_mime_type == MF_UG_DRM_IMAGE_FILE) @@ -308,7 +326,7 @@ static bool __mf_ug_fs_oper_exec_drm_filter(ugFsNodeInfo *pnode_info, int option if (option & MF_UG_FILTER_DRM_RINGTONE) { fullpath = g_strconcat(pnode_info->path, "/", pnode_info->name, NULL); - result = __drm_is_action_allowed(fullpath, DRM_HAS_VALID_SETAS_STATUS); + result = mf_ug_fs_oper_drm_is_action_allowed(fullpath, DRM_HAS_VALID_SETAS_STATUS, DRM_SETAS_RINGTONE); if (result) { mf_ug_drm_file_mime_type drm_mime_type = mf_ug_fs_oper_get_drm_type(fullpath); if (drm_mime_type == MF_UG_DRM_RINGTONE_FILE) diff --git a/src/common/mf-ug-cb.c b/src/common/mf-ug-cb.c index fb0661f..1708709 100644 --- a/src/common/mf-ug-cb.c +++ b/src/common/mf-ug-cb.c @@ -32,7 +32,9 @@ #include "mf-ug-list-play.h" #define UG_MAX_LEN_VIB_DURATION 0.5 - +#ifdef UG_OPERATION_SELECT_MODE +#define RESULT_KEY "http://tizen.org/appcontrol/data/selected" +#endif /****************************** ** Prototype : mf_ug_cb_back_button_cb ** Description : @@ -196,11 +198,37 @@ void mf_ug_cb_add_button_cb(void *data, Evas_Object *obj, void *event_info) } else { result = mf_ug_util_get_send_result(ugd); } + if (ugd->ug_Status.ug_bRingtoneSet) { + ug_error("result is [%s]", result); + int ret = MYFILE_ERR_NONE; + ret = mf_ug_file_attr_is_drm_file(result); + ug_error("ret is [%d]", ret); + if (ret == MYFILE_ERR_NONE) { + ret = mf_ug_fs_oper_drm_is_valid(result, DRM_PERMISSION_TYPE_PLAY); + ug_error("ret is [%d]", ret); + if (ret == true) { + ret = mf_ug_fs_oper_drm_is_action_allowed(result, DRM_HAS_VALID_SETAS_STATUS, DRM_SETAS_RINGTONE); + ug_error("ret is [%d]", ret); + } + if (ret == false) { + mf_ug_popup_create(ugd, UG_POPMODE_TEXT, NULL, MF_UG_LABEL_DRM_UNABLE_SET, NULL, NULL, NULL, NULL, NULL); + return; + } + } + } if (result) { int ret = 0; ret = service_create(&service); if (ret == SERVICE_ERROR_NONE) { +#ifdef UG_OPERATION_SELECT_MODE + if (ugd->ug_UiGadget.ug_bOperationSelectFlag) { + service_add_extra_data(service, RESULT_KEY, result); + } else { + service_add_extra_data(service, "result", result); + } +#else service_add_extra_data(service, "result", result); +#endif ug_send_result(ugd->ug, service); service_destroy(service); } @@ -1079,6 +1107,7 @@ void mf_ug_cb_dir_pipe_cb(void *data, void *buffer, unsigned int nbyte) if (ugd->ug_UiGadget.ug_iSelectMode == MULTI_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || + ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE || ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == SAVE_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { @@ -1301,7 +1330,7 @@ void mf_ug_cb_create_new_folder(void *data, Evas_Object * obj, void *event_info) ugd->ug_Status.ug_pThumbUpdateTimer = NULL; } #endif - mf_ug_navi_bar_create_new_folder_view(ugd); + ugd->ug_MainWindow.ug_pNewFolderPopup = mf_ug_popup_create_new_folder_popup(ugd, MF_UG_LABEL_CREATE); } @@ -1345,14 +1374,7 @@ void mf_ug_cb_cancel_new_folder_cb(void *data, Evas_Object * obj, void *event_in ecore_imf_context_input_panel_hide(elm_entry_imf_context_get(ugd->ug_MainWindow.ug_pEntry)); evas_object_del(ugd->ug_MainWindow.ug_pEntry); - Evas_Object *btn = NULL; - btn = elm_object_item_part_content_unset(ugd->ug_MainWindow.ug_pNaviItem, TITLE_RIGHT_BTN); - UG_SAFE_FREE_OBJ(btn); - btn = elm_object_item_part_content_unset(ugd->ug_MainWindow.ug_pNaviItem, TITLE_LEFT_BTN); - UG_SAFE_FREE_OBJ(btn); - - mf_ug_navi_bar_create_default_view(ugd); - mf_ug_ctrl_bar_set_item_disable(ugd); + UG_SAFE_FREE_OBJ(ugd->ug_MainWindow.ug_pNewFolderPopup); } static int __mf_cb_imk_cancel_cb(void *data) @@ -1599,7 +1621,7 @@ void mf_ug_cb_save_cb(void *data, Evas_Object *obj, void *event_info) ugd->ug_Status.ug_iMore = UG_MORE_DEFAULT; ecore_imf_context_input_panel_hide(elm_entry_imf_context_get(ugd->ug_MainWindow.ug_pEntry)); evas_object_del(ugd->ug_MainWindow.ug_pEntry); - + UG_SAFE_FREE_OBJ(ugd->ug_MainWindow.ug_pNewFolderPopup); mf_ug_navi_bar_create_default_view(ugd); } diff --git a/src/common/mf-ug-list-play.c b/src/common/mf-ug-list-play.c index c052f45..5fd9e1b 100644 --- a/src/common/mf-ug-list-play.c +++ b/src/common/mf-ug-list-play.c @@ -660,6 +660,63 @@ __mf_ug_list_play_mgr_error_cb(int error_code, void *userdata) ecore_pipe_write(g_player_pipe, &extra_data, sizeof(mf_player_cb_extra_data)); } +static bool __mf_ug_list_play_set_uri(player_h player, const char *uri) +{ + UG_TRACE_BEGIN; + ug_mf_retvm_if(player == NULL, false, "player is NULL"); + ug_mf_retvm_if(uri == NULL, false, "uri is NULL"); + + int ret = 0; + ret = player_set_uri(player, uri); + //player_set_sound_type(ugd->ug_ListPlay.ug_Player, SOUND_TYPE_MEDIA); + if (ret != PLAYER_ERROR_NONE) { + ug_error(">>>>>>>>>>>>>g_err_name : %d\n", ret); + UG_TRACE_END; + return false; + } else { + UG_TRACE_END; + return true; + } + +} + +static bool __mf_ug_list_play_set_sound_type(player_h player, sound_type_e type) +{ + UG_TRACE_BEGIN; + ug_mf_retvm_if(player == NULL, false, "player is NULL"); + + int ret = 0; + ret = player_set_sound_type(player, type); + //player_set_sound_type(ugd->ug_ListPlay.ug_Player, SOUND_TYPE_MEDIA); + if (ret != PLAYER_ERROR_NONE) { + ug_error(">>>>>>>>>>>>>g_err_name : %d\n", ret); + UG_TRACE_END; + return false; + } else { + UG_TRACE_END; + return true; + } + +} + +static bool __mf_ug_list_play_create_player(player_h *player) +{ + UG_TRACE_BEGIN; + + int ret = 0; + ret = player_create(player); + //player_set_sound_type(ugd->ug_ListPlay.ug_Player, SOUND_TYPE_MEDIA); + if (ret != PLAYER_ERROR_NONE) { + ug_error(">>>>>>>>>>>>>g_err_name : %d\n", ret); + UG_TRACE_END; + return false; + } else { + UG_TRACE_END; + return true; + } + +} + static bool __mf_ug_list_play_create_player_mgr(void *data, const char *path) { UG_TRACE_BEGIN; @@ -672,37 +729,51 @@ static bool __mf_ug_list_play_create_player_mgr(void *data, const char *path) if (path_len > 0 && path_len < MYFILE_DIR_PATH_LEN_MAX) { if (ugd->ug_ListPlay.ug_Player == 0) { - if (player_create(&ugd->ug_ListPlay.ug_Player) != PLAYER_ERROR_NONE) { - ug_debug("Error when __mf_ug_list_play_create_player_mgr\n"); + ret = __mf_ug_list_play_create_player(&ugd->ug_ListPlay.ug_Player); + if (ret == false) { UG_TRACE_END; return false; } - ug_debug("player is [%d]", ugd->ug_ListPlay.ug_Player); + ug_debug("player is [%s]", ugd->ug_ListPlay.ug_Player); /*avsysaudiosink volume table setting */ //ret = mm_player_set_attribute(ugd->ug_ListPlay.ug_Player, &g_err_name, "sound_volume_type", MM_SOUND_VOLUME_TYPE_MEDIA, // "profile_uri", path, strlen(path), NULL); - - ug_debug("path is [%s]", path); - ret = player_set_uri(ugd->ug_ListPlay.ug_Player, path); - //player_set_sound_type(ugd->ug_ListPlay.ug_Player, SOUND_TYPE_MEDIA); - if (ret != PLAYER_ERROR_NONE) { - ug_debug(">>>>>>>>>>>>>g_err_name : %s\n", g_err_name); + ret = __mf_ug_list_play_set_uri(ugd->ug_ListPlay.ug_Player, path); + if (ret == false) { UG_TRACE_END; return false; } - ret = player_set_sound_type(ugd->ug_ListPlay.ug_Player, SOUND_TYPE_MEDIA); - if (ret != PLAYER_ERROR_NONE) { + ret = __mf_ug_list_play_set_sound_type(ugd->ug_ListPlay.ug_Player, SOUND_TYPE_MEDIA); + if (ret == false) { ug_error("set sound type failed"); } else { ug_error("set sound type success"); } + UG_SAFE_FREE_CHAR(g_player_cbs); + if (g_player_pipe) { + ecore_pipe_del(g_player_pipe); + g_player_pipe = NULL; + } + g_player_cbs = calloc(1, sizeof(mf_player_cbs)); + g_player_pipe = ecore_pipe_add(__mf_player_mgr_callback_pipe_handler, ugd); + + + player_set_completed_cb(ugd->ug_ListPlay.ug_Player, __mf_ug_list_play_mgr_completed_cb, NULL); + player_set_interrupted_cb(ugd->ug_ListPlay.ug_Player, __mf_ug_list_play_mgr_interrupted_cb, NULL); + player_set_error_cb(ugd->ug_ListPlay.ug_Player, __mf_ug_list_play_mgr_error_cb, NULL); } else { ug_debug("player handle is exist"); + + ret = __mf_ug_list_play_set_uri(ugd->ug_ListPlay.ug_Player, path); + if (ret == false) { + UG_TRACE_END; + return false; + } UG_TRACE_END; - return false; + return true; } } else { ug_debug("the path_len is too long"); @@ -710,18 +781,6 @@ static bool __mf_ug_list_play_create_player_mgr(void *data, const char *path) return false; } - UG_SAFE_FREE_CHAR(g_player_cbs); - if (g_player_pipe) { - ecore_pipe_del(g_player_pipe); - g_player_pipe = NULL; - } - g_player_cbs = calloc(1, sizeof(mf_player_cbs)); - g_player_pipe = ecore_pipe_add(__mf_player_mgr_callback_pipe_handler, ugd); - - - player_set_completed_cb(ugd->ug_ListPlay.ug_Player, __mf_ug_list_play_mgr_completed_cb, NULL); - player_set_interrupted_cb(ugd->ug_ListPlay.ug_Player, __mf_ug_list_play_mgr_interrupted_cb, NULL); - player_set_error_cb(ugd->ug_ListPlay.ug_Player, __mf_ug_list_play_mgr_error_cb, NULL); //player_set_buffering_cb(ugd->ug_ListPlay.ug_Player, _mp_player_mgr_buffering_cb, NULL); return true; @@ -1080,7 +1139,7 @@ static bool __mf_ug_list_play_ready_new_file_play(void *data, bool drm_check_fla free(path); path = NULL; ug_error("ERROR HERE !!!!!!!"); - ugd->ug_MainWindow.ug_pNormalPopup = mf_ug_popup_create(ugd, UG_POPMODE_TEXT, NULL, MF_UG_LABEL_ERROR_OCCUR, NULL, NULL, NULL, NULL, NULL); + ugd->ug_MainWindow.ug_pNormalPopup = mf_ug_popup_create(ugd, UG_POPMODE_TEXT, NULL, MF_UG_LABEL_UNABLE_TO_PLAY_ERROR_OCCURRED, NULL, NULL, NULL, NULL, NULL); UG_TRACE_END; return false; } @@ -1097,7 +1156,7 @@ static bool __mf_ug_list_play_ready_new_file_play(void *data, bool drm_check_fla free(path); path = NULL; ug_error("ERROR HERE !!!!!!!"); - ugd->ug_MainWindow.ug_pNormalPopup = mf_ug_popup_create(ugd, UG_POPMODE_TEXT, NULL, MF_UG_LABEL_ERROR_OCCUR, NULL, NULL, NULL, NULL, NULL); + ugd->ug_MainWindow.ug_pNormalPopup = mf_ug_popup_create(ugd, UG_POPMODE_TEXT, NULL, MF_UG_LABEL_UNABLE_TO_PLAY_ERROR_OCCURRED, NULL, NULL, NULL, NULL, NULL); UG_TRACE_END; return false; } @@ -1253,8 +1312,9 @@ static bool __mf_ug_list_play_unrealize(ugData *data) if (ugd->ug_ListPlay.ug_Player != 0) { /*/unrealize can be invoked at any state */ - if (player_unprepare(ugd->ug_ListPlay.ug_Player) != 0) { - ug_debug("Error when __mf_ug_list_play_unrealize\n"); + int ret = player_unprepare(ugd->ug_ListPlay.ug_Player); + if (ret != 0) { + ug_error("Error when __mf_ug_list_play_unrealize %d", ret); UG_TRACE_END; return false; } else { @@ -1589,7 +1649,8 @@ void mf_ug_list_play_play_music_item(ugListItemData *data) if (ugd->ug_ListPlay.ug_pPlayFilePath != NULL) { ug_debug(); if (g_strcmp0(ugd->ug_ListPlay.ug_pPlayFilePath, itemData->ug_pItemName->str) != 0) { - mf_ug_list_play_destory_playing_file(ugd); + //mf_ug_list_play_destory_playing_file(ugd); + mf_ug_list_play_reset_playing_file(ugd); mf_ug_list_disable_play_itc(ugd, true); //mf_ug_list_play_update_item_icon(ugd); __mf_ug_list_play_play_new_file(itemData, true); @@ -1623,6 +1684,14 @@ void mf_ug_list_play_play_music_item(ugListItemData *data) ** Modification : Created function ** ******************************/ +void mf_ug_list_play_reset_playing_file(void *data) +{ + UG_TRACE_BEGIN; + ugData *ugd = (ugData *)data; + ug_mf_retm_if(ugd == NULL, "ugd is NULL"); + __mf_ug_list_play_unrealize(ugd); + +} void mf_ug_list_play_destory_playing_file(void *data) { UG_TRACE_BEGIN; diff --git a/src/common/mf-ug-util.c b/src/common/mf-ug-util.c index 76ed9fc..6d9c581 100644 --- a/src/common/mf-ug-util.c +++ b/src/common/mf-ug-util.c @@ -32,6 +32,10 @@ #define MF_UG_TIMER_INTERVAL_VIBRATION 0.5 #define MF_UG_VIBRATION_DEVICE 0 #define MF_UG_VIBRATION_DURATION 500 +#ifdef UG_OPERATION_SELECT_MODE +#define OPERATION_SEPERATOR ";" +#endif +#define NORMAL_SEPERATOR "?" /****************************** ** Prototype : ug_genlist_selected_state_get @@ -242,6 +246,7 @@ static void __mf_ug_util_get_marked_off_selected_items(void *data, Eina_List **s } else if (ugd->ug_UiGadget.ug_iSelectMode == MULTI_ALL_MODE || ugd->ug_UiGadget.ug_iSelectMode == MULTI_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || + ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { if (params->ug_pCheckBox) { if (params->ug_bChecked == true) { @@ -294,7 +299,12 @@ char *mf_ug_util_get_send_result(void *data) file_selected = g_strconcat(pNode, NULL); } else { char *temp = file_selected; - file_selected = g_strconcat(file_selected, "?", pNode, NULL); +#ifdef UG_OPERATION_SELECT_MODE + if (ugd->ug_UiGadget.ug_bOperationSelectFlag) { + file_selected = g_strconcat(file_selected, OPERATION_SEPERATOR, pNode, NULL); + } else +#endif + file_selected = g_strconcat(file_selected, NORMAL_SEPERATOR, pNode, NULL); free(temp); } } diff --git a/src/include/mf-ug-conf.h b/src/include/mf-ug-conf.h index 0698312..57df023 100644 --- a/src/include/mf-ug-conf.h +++ b/src/include/mf-ug-conf.h @@ -38,7 +38,11 @@ #define UG_GRP_NAVI_VIEW "navigation_view" #define UG_GRP_NO_CONTENT "noContent" #define UG_GRP_PATH_INFO "pathinfo" +#ifdef UG_OPERATION_SELECT_MODE +#define UG_OPTION_COUNT 6 +#else #define UG_OPTION_COUNT 5 +#endif #define UG_ERROR_RETURN (-1) #define UG_SELECT_MODE_MULTI_ALL "MULTI_ALL" @@ -46,6 +50,7 @@ #define UG_SELECT_MODE_MULTI_FILE "MULTI_FILE" #define UG_SELECT_MODE_SINGLE_FILE "SINGLE_FILE" #define UG_SELECT_MODE_IMPORT "IMPORT" +#define UG_SELECT_MODE_IMPORT_PATH_SELECT "IMPORT_PATH_SELECT" #define UG_SELECT_MODE_IMPORT_SINGLE "IMPORT_SINGLE" #define UG_SELECT_MODE_EXPORT "EXPORT" #define UG_SELECT_MODE_SHORTCUT "SHORTCUT" diff --git a/src/include/mf-ug-fs-util.h b/src/include/mf-ug-fs-util.h index a8eb5ad..680fde4 100644 --- a/src/include/mf-ug-fs-util.h +++ b/src/include/mf-ug-fs-util.h @@ -329,5 +329,7 @@ int mf_ug_file_attr_is_system_dir(char *fullpath, bool * result); mf_ug_fs_file_type mf_ug_file_attr_get_file_type_by_mime(const char *file_path); int mf_ug_fs_oper_create_dir(const char *dir); void mf_ug_fs_oper_sort_list(Eina_List **list, int sort_opt); +int mf_ug_fs_oper_drm_is_action_allowed(const char *path, drm_action_type_e action, drm_setas_category_e category); +bool mf_ug_fs_oper_drm_is_valid(const char *path, drm_permission_type_e perm_type); #endif diff --git a/src/include/mf-ug-main.h b/src/include/mf-ug-main.h index 43b07c7..a0ccb2d 100644 --- a/src/include/mf-ug-main.h +++ b/src/include/mf-ug-main.h @@ -83,6 +83,7 @@ struct _ugMainWindow { Evas_Object *ug_pSelectAllCheckBox; Evas_Object *ug_pSearchPopup; Evas_Object *ug_pContextPopup; + Evas_Object *ug_pNewFolderPopup; Elm_Object_Item *ug_pPreNaviItem; Elm_Object_Item *ug_pNaviItem; @@ -112,6 +113,7 @@ struct _ugStatus { bool ug_bNoContentFlag; bool ug_bCancelDisableFlag; bool ug_b_NaviPushFlag; + bool ug_bRingtoneSet; Eina_Bool ug_bSelectAllChecked; int ug_iThemeType; char *ug_pUpper_folder; @@ -140,6 +142,7 @@ struct _ugStatus { Ecore_Idler *popup_create_idler; Ecore_Idler *msg_finish_idler; Ecore_Timer *pPopupTimer; + Ecore_Timer *play_timer; }; @@ -150,6 +153,9 @@ struct _ugUiGadget { int ug_iMarkedMode; int ug_iDrmFilterMode; int ug_iImportMode; +#ifdef UG_OPERATION_SELECT_MODE + int ug_bOperationSelectFlag; +#endif unsigned long ug_iFileFilter; int ug_iDrmFilter; char *ug_pExtension; diff --git a/src/include/mf-ug-resource.h b/src/include/mf-ug-resource.h index d05ff9a..fbaccee 100644 --- a/src/include/mf-ug-resource.h +++ b/src/include/mf-ug-resource.h @@ -22,43 +22,55 @@ #include "mf-ug-conf.h" +/************* system strings ************/ +#define MF_UG_LABEL_UNSUPPORT_FILE_TYPE dgettext("sys_string", "IDS_COM_BODY_UNSUPPORTED_FILE_TYPE") +#define MF_UG_LABEL_CONNECT_FAILED dgettext("sys_string", "IDS_COM_POP_CONNECTION_FAILED") #define MF_UG_LABEL_PHONE dgettext("sys_string", "IDS_COM_BODY_PHONE") #define MF_UG_LABEL_SELECTED dgettext("sys_string", "IDS_COM_BODY_SELECTED") #define MF_UG_LABEL_MMC dgettext("sys_string", "IDS_COM_BODY_MEMORY_CARD") -#define MF_UG_LABEL_OTG "External storage" #define MF_UG_LABEL_UNKNOWN dgettext("sys_string", "IDS_COM_BODY_UNKNOWN") #define MF_UG_LABEL_SET dgettext("sys_string", "IDS_COM_SK_SET") #define MF_UG_LABEL_ATTACH dgettext("sys_string", "IDS_COM_POP_ATTACH") #define MF_UG_LABEL_CANCEL dgettext("sys_string", "IDS_COM_SK_CANCEL") -#define MF_UG_LABEL_OTHER_MUSIC "Other music" #define MF_UG_LABEL_NO_FILES dgettext("sys_string", "IDS_COM_BODY_NO_FILES") #define MF_UG_LABEL_MYFILES dgettext("sys_string", "IDS_COM_BODY_MY_FILES") #define MF_UG_LABEL_OK dgettext("sys_string", "IDS_COM_SK_OK") -#define MF_UG_LABEL_HOME dgettext(UGPACKAGE, "IDS_MF_BUTTON_HOME") -#define MF_UG_LABEL_UPPER dgettext(UGPACKAGE, "IDS_MF_TAB_UP") -#define MF_UG_LABEL_UNABLE_TO_PLAY_DURING_CALL "Unable to play during call" -#define MF_UG_LABEL_UNABLE_TO_PLAY_ERROR_OCCURRED "Unable to play. Error occurred" -#define MF_UG_LABEL_LIST_BY dgettext(UGPACKAGE, "IDS_MF_OPT_LIST_BY") #define MF_UG_LABEL_DATE dgettext("sys_string", "IDS_COM_POP_DATE") #define MF_UG_LABEL_SIZE dgettext("sys_string", "IDS_COM_POP_SIZE") #define MF_UG_LABEL_TYPE dgettext("sys_string", "IDS_COM_POP_TYPE") #define MF_UG_LABEL_NAME dgettext("sys_string", "IDS_COM_POP_NAME") -#define MF_UG_LABEL_ASCENDING dgettext(UGPACKAGE, "IDS_MF_POP_ASCENDING") -#define MF_UG_LABEL_DESCENDING dgettext(UGPACKAGE, "IDS_MF_POP_DESCENDING") #define MF_UG_LABEL_SEARCH dgettext("sys_string", "IDS_COM_BODY_SEARCH") #define MF_UG_LABEL_CANCEL dgettext("sys_string", "IDS_COM_SK_CANCEL") #define MF_UG_LABEL_NO_RESULT dgettext("sys_string", "IDS_COM_BODY_NO_SEARCH_RESULTS") #define MF_UG_LABEL_IMPORT dgettext("sys_string", "IDS_COM_OPT_IMPORT") -#define MF_UG_LABEL_EXPORT "Export here" -#define MF_UG_LABEL_SAVE_HERE "Set here" #define MF_UG_LABEL_CREATE dgettext("sys_string", "IDS_COM_BODY_CREATE_FOLDER") #define MF_UG_LABEL_NOT_ENOUGH_SPACE dgettext("sys_string", "IDS_COM_POP_NOT_ENOUGH_MEMORY") #define MF_UG_LABEL_FOLDER dgettext("sys_string", "IDS_COM_POP_FOLDER") #define MF_UG_LABEL_SAVE dgettext("sys_string", "IDS_COM_SK_SAVE") -#define MF_UG_LABEL_GET_NAME_FAILED "Get name failed. try again!" #define MF_UG_LABEL_YES dgettext("sys_string", "IDS_COM_SK_YES") #define MF_UG_LABEL_NO dgettext("sys_string", "IDS_COM_SK_NO") -#define MF_UG_LABEL_MEMORY_NOT_ENOUGH dgettext(UGPACKAGE, "IDS_MF_POP_NOT_ENOUGH_HEAP_MEMORY") +#define MF_UG_LABEL_SELECT_ALL dgettext("sys_string", "IDS_COM_BODY_SELECT_ALL") +#define MF_UG_LABEL_MAX_CHARACTER_REACHED dgettext("sys_string", "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED") +#define MF_UG_LABEL_ALARM dgettext("sys_string", "IDS_COM_BODY_ALARM") + +/************ myfile strings *************/ +#define MF_UG_LABEL_MEMORY_NOT_ENOUGH dgettext(UGPACKAGE, "IDS_MF_POP_NOT_ENOUGH_HEAP_MEMORY") +#define MF_UG_LABEL_ASCENDING dgettext(UGPACKAGE, "IDS_MF_POP_ASCENDING") +#define MF_UG_LABEL_DESCENDING dgettext(UGPACKAGE, "IDS_MF_POP_DESCENDING") +#define MF_UG_LABEL_EXPORT dgettext(UGPACKAGE, "IDS_MF_BUTTON_EXPORT_HERE") +#define MF_UG_LABEL_HOME dgettext(UGPACKAGE, "IDS_MF_BUTTON_HOME") +#define MF_UG_LABEL_UPPER dgettext(UGPACKAGE, "IDS_MF_TAB_UP") +#define MF_UG_LABEL_LIST_BY dgettext(UGPACKAGE, "IDS_MF_OPT_LIST_BY") +#define MF_UG_LABEL_GO_TO_MYFILES dgettext(UGPACKAGE, "IDS_MF_BUTTON_GO_TO_MY_FILES") +#define MF_UG_LABEL_RINGTONES dgettext(UGPACKAGE, "IDS_MF_BODY_RINGTONES") +#define MF_UG_LABEL_DRM_UNABLE_SET dgettext(UGPACKAGE, "IDS_MF_POP_UNABLE_TO_SET_DRM_PROTECTED_CONTENT_AS_RINGTONE_OR_NOTIFICATION_ALERT") + +/************no design id **************/ +#define MF_UG_LABEL_OTHER_MUSIC "Other music" +#define MF_UG_LABEL_UNABLE_TO_PLAY_DURING_CALL "Unable to play during call" +#define MF_UG_LABEL_UNABLE_TO_PLAY_ERROR_OCCURRED "Unable to play. Error occurred" +#define MF_UG_LABEL_SAVE_HERE "Set here" +#define MF_UG_LABEL_GET_NAME_FAILED "Get name failed. try again!" #define MF_UG_LABEL_NAME_INVALID ("Invalid name, retry!") #define MF_UG_LABEL_ILLEGAL_CHAR "Name contains illegal character, Retry!" #define MF_UG_LABEL_PATH_REACH_MAX_LEN "Full path length should be less than 4096,Retry!" @@ -66,13 +78,7 @@ #define MF_UG_LABEL_OPER_READ_ONLY "Operation failed: Read Only Area" #define MF_UG_LABEL_CREATE_DIR_FAILED "Create Directory failed" #define MF_UG_LABEL_EMPTY_FOLDER_NAME "Folder name can't be empty, Retry!" -#define MF_UG_LABEL_SELECT_ALL dgettext("sys_string", "IDS_COM_BODY_SELECT_ALL") -#define MF_UG_LABEL_UNSUPPORT_FILE_TYPE dgettext("sys_string", "IDS_COM_BODY_UNSUPPORTED_FILE_TYPE") -#define MF_UG_LABEL_CONNECT_FAILED dgettext("sys_string", "IDS_COM_POP_CONNECTION_FAILED") -#define MF_UG_LABEL_ERROR_OCCUR "Unable to play. Error occurred" -#define MF_UG_LABEL_GO_TO_MYFILES dgettext(UGPACKAGE, "IDS_MF_BUTTON_GO_TO_MY_FILES") -#define MF_UG_LABEL_RINGTONES dgettext(UGPACKAGE, "IDS_MF_BODY_RINGTONES") -#define MF_UG_LABEL_MAX_CHARACTER_REACHED dgettext("sys_string", "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED") -#define MF_UG_LABEL_ALARM dgettext("sys_string", "IDS_COM_BODY_ALARM") + + #endif diff --git a/src/include/mf-ug-util.h b/src/include/mf-ug-util.h index 2056488..e3ceea6 100644 --- a/src/include/mf-ug-util.h +++ b/src/include/mf-ug-util.h @@ -116,6 +116,7 @@ enum _mf_ug_select_mode { EXPORT_MODE, IMPORT_MODE, IMPORT_SINGLE, + IMPORT_PATH_SELECT_MODE, SAVE_MODE, SELECT_MODE_MAX }; diff --git a/src/mf-ug-main.c b/src/mf-ug-main.c index b8bd008..591e29e 100644 --- a/src/mf-ug-main.c +++ b/src/mf-ug-main.c @@ -36,6 +36,13 @@ #include "mf-ug-cb.h" #include "mf-ug-list-play.h" +#ifdef UG_OPERATION_SELECT_MODE + +#define MF_BUNDLE_SELECTION_MODE "http://tizen.org/appcontrol/data/selection_mode" +#define MF_BUNDLE_SELECTION_MODE_SINGLE "single" +#define MF_BUNDLE_SELECTION_MODE_MULTI "multiple" +#endif + /****************************** ** Prototype : __mf_ug_main_init_data ** Description : @@ -81,6 +88,9 @@ static void __mf_ug_main_init_data(void *data) ugd->ug_ListPlay.ug_pPlayFilePath = NULL; ugd->ug_ListPlay.ug_iPlayState = PLAY_STATE_INIT; +#ifdef UG_OPERATION_SELECT_MODE + ugd->ug_UiGadget.ug_bOperationSelectFlag = false; +#endif mf_ug_util_create_dir_monitor(ugd); @@ -316,6 +326,7 @@ static int __mf_ug_main_set_path_option(void *data, const char *path) } ugd->ug_Status.ug_bInSettingView = true; ugd->ug_Status.ug_bSettingEntry = true; + ugd->ug_Status.ug_bRingtoneSet = true; } else if (strlen(path) == 1 && strncmp(path, "/", 1)) { /**chech the path whether is "/" */ entry_path = strdup(PHONE_FOLDER); @@ -341,6 +352,7 @@ static int __mf_ug_main_set_path_option(void *data, const char *path) if (ecore_file_exists(entry_path) == false) { if (ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE || + ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == SAVE_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { @@ -414,6 +426,8 @@ static void __mf_ug_main_set_select_mode(void *data, const char *select_mode) ugd->ug_UiGadget.ug_iSelectMode = MULTI_ALL_MODE; } else if(!strncmp(select_mode, UG_SELECT_MODE_IMPORT, strlen(select_mode))) { ugd->ug_UiGadget.ug_iSelectMode = IMPORT_MODE; + } else if(!strncmp(select_mode, UG_SELECT_MODE_IMPORT_PATH_SELECT, strlen(select_mode))) { + ugd->ug_UiGadget.ug_iSelectMode = IMPORT_PATH_SELECT_MODE; } else if(!strncmp(select_mode, UG_SELECT_MODE_EXPORT, strlen(select_mode))) { ugd->ug_UiGadget.ug_iSelectMode = EXPORT_MODE; } else if (!strncmp(select_mode, UG_SELECT_MODE_IMPORT_SINGLE, strlen(select_mode))) { @@ -569,17 +583,37 @@ static void __mf_ug_main_set_drm_filter_mode(void *data, const char *drm_filter) } else if (!strncmp(drm_filter, UG_DRM_FILTER_WITHOUT_FL, strlen(drm_filter))) { ugd->ug_UiGadget.ug_iDrmFilterMode = DRM_FILTER_WITHOUT_FL; } else { - ugd->ug_UiGadget.ug_iDrmFilterMode = DRM_FILTER_NONE; + ugd->ug_UiGadget.ug_iDrmFilterMode = DRM_FILTER_ALL; } } else { - ugd->ug_UiGadget.ug_iDrmFilterMode = DRM_FILTER_NONE; + ugd->ug_UiGadget.ug_iDrmFilterMode = DRM_FILTER_ALL; } ugd->ug_UiGadget.ug_iDrmFilter = mf_ug_fm_svc_wapper_get_drm_filter(ugd->ug_UiGadget.ug_iDrmFilterMode, ugd->ug_UiGadget.ug_iFileFilter); UG_TRACE_END; } +#ifdef UG_OPERATION_SELECT_MODE +static void __mf_ug_main_set_operation_select_mode(void *data, const char *select_mode) +{ + UG_TRACE_BEGIN; + ugData *ugd = (ugData *)data; + ug_mf_retm_if(ugd == NULL, "ugd is NULL"); + if (select_mode != NULL) { + if (!strncmp(select_mode, MF_BUNDLE_SELECTION_MODE_SINGLE, strlen(select_mode))) { + ugd->ug_UiGadget.ug_iSelectMode = SINGLE_FILE_MODE; + } else if (!strncmp(select_mode, MF_BUNDLE_SELECTION_MODE_MULTI, strlen(select_mode))) { + ugd->ug_UiGadget.ug_iSelectMode = MULTI_FILE_MODE; + } else { + ugd->ug_UiGadget.ug_iSelectMode = SINGLE_FILE_MODE; + } + ugd->ug_UiGadget.ug_bOperationSelectFlag = true; + } + UG_TRACE_END; + +} +#endif /****************************** ** Prototype : __mf_ug_main_set_option_status ** Description : Samsung @@ -602,12 +636,17 @@ static void __mf_ug_main_set_option_status(void *data, service_h service) UG_TRACE_BEGIN; ugData *ugd = (ugData *)data; ug_mf_retm_if(ugd == NULL, "ugd is NULL"); - char *key[UG_OPTION_COUNT] = { "path", "select_type", "file_type", "marked_mode", "drm_type"}; char *path = NULL; char *select_mode = NULL; char *filter_mode = NULL; char *marked_mode = NULL; char *drm_filter_mode = NULL; +#ifdef UG_OPERATION_SELECT_MODE + char *key[UG_OPTION_COUNT] = { "path", "select_type", "file_type", "marked_mode", "drm_type", MF_BUNDLE_SELECTION_MODE}; + char *operation_select_mode = NULL; +#else + char *key[UG_OPTION_COUNT] = { "path", "select_type", "file_type", "marked_mode", "drm_type"}; +#endif service_get_extra_data(service, key[0], &path); service_get_extra_data(service, key[1], &select_mode); @@ -620,6 +659,10 @@ static void __mf_ug_main_set_option_status(void *data, service_h service) __mf_ug_main_set_filter_mode(ugd, filter_mode); __mf_ug_main_set_marked_mode(ugd, marked_mode); __mf_ug_main_set_drm_filter_mode(ugd, drm_filter_mode); +#ifdef UG_OPERATION_SELECT_MODE + service_get_extra_data(service, key[5], &operation_select_mode); + __mf_ug_main_set_operation_select_mode(ugd, operation_select_mode); +#endif UG_TRACE_END; } @@ -1076,10 +1119,8 @@ static void on_destroy(ui_gadget_h ug, service_h service, void *priv) UG_SAFE_FREE_CHAR(ugd->ug_ListPlay.ug_pPlayFilePath); } - if (ugd->ug_Status.ug_pThumbUpdateTimer != NULL) { - ecore_timer_del(ugd->ug_Status.ug_pThumbUpdateTimer); - ugd->ug_Status.ug_pThumbUpdateTimer = NULL; - } + UG_SAFE_DEL_ECORE_TIMER(ugd->ug_Status.ug_pThumbUpdateTimer); + UG_SAFE_DEL_ECORE_TIMER(ugd->ug_Status.play_timer); __mf_ug_main_free_evas_object(ugd); UG_TRACE_END; } diff --git a/src/widget/mf-ug-ctrl-bar.c b/src/widget/mf-ug-ctrl-bar.c index a3071c3..e538019 100644 --- a/src/widget/mf-ug-ctrl-bar.c +++ b/src/widget/mf-ug-ctrl-bar.c @@ -95,7 +95,9 @@ static void __mf_ug_ctrl_bar_append_item(void *data, Evas_Object *ctrl_bar, int elm_object_item_disabled_set(item, EINA_TRUE); //elm_toolbar_item_append(pCtrlBar, NULL, MF_UG_LABEL_SET, (Evas_Smart_Cb) mf_ug_cb_add_button_cb, ugd); } else { - if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { + if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || + ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE || + ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { elm_toolbar_item_append(pCtrlBar, NULL, MF_UG_LABEL_IMPORT, (Evas_Smart_Cb) mf_ug_cb_add_button_cb, ugd); item = elm_toolbar_item_append(pCtrlBar, NULL, NULL, NULL, NULL); elm_object_item_disabled_set(item, EINA_TRUE); @@ -187,7 +189,9 @@ void mf_ug_ctrl_bar_disable_item(void *data, bool disable) const char *disable_labe = NULL; if (ugd->ug_UiGadget.ug_iSelectMode == SINGLE_ALL_MODE || ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE) { disable_labe = MF_UG_LABEL_SET; - } else if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { + } else if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || + ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE || + ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { disable_labe = MF_UG_LABEL_IMPORT; } else { disable_labe = MF_UG_LABEL_ATTACH; diff --git a/src/widget/mf-ug-genlist.c b/src/widget/mf-ug-genlist.c index e57f78a..ffc2482 100644 --- a/src/widget/mf-ug-genlist.c +++ b/src/widget/mf-ug-genlist.c @@ -27,6 +27,8 @@ #define MF_UG_SELECTED_ITEM_BRING_UP_COUNT 7 #define MF_UG_SELECTED_ITEM_BRING_UP_COUNT_MAX 8 + +#define MF_UG_LIST_PLAY_TIME_OUT 0.5 /****************************** ** Prototype : __mf_ug_genlist_is_file_marked ** Description : Samsung @@ -290,6 +292,33 @@ static Evas_Object *__mf_ug_genlist_create_radio_box(Evas_Object *parent, ugList } +static bool __mf_ug_list_play_timer_cb(void *data) +{ + ugListItemData *item_data = (ugListItemData *)data; + ugData *ugd = (ugData *)item_data->ug_pData; + + + if (ugd->ug_ListPlay.ug_iPlayState == PLAY_STATE_PLAYING || ugd->ug_ListPlay.ug_iPlayState == PLAY_STATE_PAUSED) { + if (g_strcmp0(ugd->ug_ListPlay.ug_pPlayFilePath, item_data->ug_pItemName->str) == 0) { + mf_ug_list_play_destory_playing_file(ugd); + //mf_ug_list_disable_play_itc(ugd, true); + //mf_ug_list_play_update_item_icon(ugd); + UG_SAFE_FREE_CHAR(ugd->ug_ListPlay.ug_pPlayFilePath); + } else { + //mf_ug_list_paly_hide_play_icon(ugd); + } + } + mf_ug_cb_list_play_cb(item_data, NULL, NULL); + if (elm_radio_value_get(ugd->ug_MainWindow.ug_pRadioGroup) != item_data->ug_iGroupValue) { + ugd->ug_Status.ug_iRadioOn = item_data->ug_iGroupValue; + item_data->ug_bChecked = true; + elm_radio_value_set(ugd->ug_MainWindow.ug_pRadioGroup, item_data->ug_iGroupValue); + } + + item_data->ug_pData->ug_Status.play_timer = NULL; + return ECORE_CALLBACK_CANCEL; + +} /****************************** ** Prototype : __mf_ug_genlist_radio_box_cb @@ -314,11 +343,26 @@ static void __mf_ug_genlist_radio_box_cb(void *data, Evas_Object *obj, void *eve UG_TRACE_BEGIN; ugListItemData *itemData = (ugListItemData *)data; ug_mf_retm_if(itemData == NULL, "ugListItemData is NULL"); + ugData *ugd = (ugData *)itemData->ug_pData; + ug_mf_retm_if(ugd == NULL, "ugd is NULL"); itemData->ug_bChecked = true; itemData->ug_pData->ug_Status.ug_iRadioOn = itemData->ug_iGroupValue; elm_radio_value_set(itemData->ug_pData->ug_MainWindow.ug_pRadioGroup, itemData->ug_iGroupValue); mf_ug_ctrl_bar_set_item_disable(itemData->ug_pData); + + + mf_ug_launch_type launch_type = mf_ug_util_get_file_launch_type(itemData->ug_pItemName->str); + if (launch_type == LAUNCH_TYPE_MUSIC) { + if (ugd->ug_Status.play_timer == NULL) { + ug_error(">>>>>>>>>>>>>> entry list play"); + ugd->ug_Status.play_timer = ecore_timer_add(MF_UG_LIST_PLAY_TIME_OUT, (Ecore_Task_Cb)__mf_ug_list_play_timer_cb, itemData); + } else { + ug_error(">>>>>>>>>>>>>> Faild entry list play"); + + } + } + UG_TRACE_END; } @@ -698,6 +742,7 @@ static Evas_Object *__mf_ug_genlist_get_gl_icon(void *data, Evas_Object *obj, co } else { if (ugd->ug_UiGadget.ug_iSelectMode == MULTI_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == MULTI_ALL_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE) { selected_box = __mf_ug_genlist_add_checkbox(listItemData, obj); } else if (ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE @@ -707,6 +752,7 @@ static Evas_Object *__mf_ug_genlist_get_gl_icon(void *data, Evas_Object *obj, co selected_box = __mf_ug_genlist_add_radio_box(listItemData, obj); } } + evas_object_propagate_events_set(selected_box, EINA_FALSE); return selected_box; } else if (!strcmp(part, "elm.icon.2")) { __mf_ug_genlist_get_thumbnail(listItemData); @@ -870,6 +916,7 @@ static void __mf_ug_genlist_del_gl(void *data, Evas_Object *obj) ** Modification : Created function ** ******************************/ + void mf_ug_genlist_selected_gl(void *data, Evas_Object *obj, void *event_info) { UG_TRACE_BEGIN; @@ -893,29 +940,25 @@ void mf_ug_genlist_selected_gl(void *data, Evas_Object *obj, void *event_info) if (ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == SAVE_MODE) { return; } - if (ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == SINGLE_ALL_MODE) { - if (elm_radio_value_get(ugd->ug_MainWindow.ug_pRadioGroup) != selected->ug_iGroupValue) { - ugd->ug_Status.ug_iRadioOn = selected->ug_iGroupValue; - selected->ug_bChecked = true; - elm_radio_value_set(ugd->ug_MainWindow.ug_pRadioGroup, selected->ug_iGroupValue); - } - mf_ug_launch_type launch_type = mf_ug_util_get_file_launch_type(selected->ug_pItemName->str); if (launch_type == LAUNCH_TYPE_MUSIC) { - if (ugd->ug_ListPlay.ug_iPlayState == PLAY_STATE_PLAYING || ugd->ug_ListPlay.ug_iPlayState == PLAY_STATE_PAUSED) { - if (g_strcmp0(ugd->ug_ListPlay.ug_pPlayFilePath, selected->ug_pItemName->str) == 0) { - mf_ug_list_play_destory_playing_file(ugd); - //mf_ug_list_disable_play_itc(ugd, true); - //mf_ug_list_play_update_item_icon(ugd); - UG_SAFE_FREE_CHAR(ugd->ug_ListPlay.ug_pPlayFilePath); - } else { - //mf_ug_list_paly_hide_play_icon(ugd); - } + if (ugd->ug_Status.play_timer == NULL) { + ug_error(">>>>>>>>>>>>>> entry list play"); + ugd->ug_Status.play_timer = ecore_timer_add(MF_UG_LIST_PLAY_TIME_OUT, (Ecore_Task_Cb)__mf_ug_list_play_timer_cb, selected); + } else { + ug_error(">>>>>>>>>>>>>> Faild entry list play"); + + } + } else { + if (elm_radio_value_get(ugd->ug_MainWindow.ug_pRadioGroup) != selected->ug_iGroupValue) { + ugd->ug_Status.ug_iRadioOn = selected->ug_iGroupValue; + selected->ug_bChecked = true; + elm_radio_value_set(ugd->ug_MainWindow.ug_pRadioGroup, selected->ug_iGroupValue); } - mf_ug_cb_list_play_cb(selected, NULL, NULL); } + } else { if (selected->ug_bChecked == 0) { selected->ug_bChecked = 1; @@ -1128,6 +1171,7 @@ Evas_Object *__mf_ug_genlist_create_gl(void *data) if (ugd->ug_UiGadget.ug_iSelectMode == MULTI_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE || + ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == SAVE_MODE || @@ -1403,9 +1447,6 @@ Evas_Object *mf_ug_genlist_create_content_list_view(void *data) ugd->ug_Status.ug_iRadioOn = 0; ugd->ug_Status.ug_bNoContentFlag = false; - genlist = __mf_ug_genlist_create_gl(ugd); - - ugd->ug_MainWindow.ug_pNaviGenlist = genlist; GString *fullpath = g_string_new(ugd->ug_Status.ug_pPath->str); @@ -1446,7 +1487,6 @@ Evas_Object *mf_ug_genlist_create_content_list_view(void *data) if ((dir_list_len == 0 && filter_file_list_len == 0)) { ug_debug("=========================================== create the no content view"); - Evas_Object *layout; Evas_Object *nocontent = NULL; nocontent = elm_layout_add(ugd->ug_MainWindow.ug_pMainLayout); @@ -1455,18 +1495,16 @@ Evas_Object *mf_ug_genlist_create_content_list_view(void *data) ugd->ug_Status.ug_bNoContentFlag = true; - elm_scroller_bounce_set(genlist, EINA_FALSE, EINA_FALSE); - - layout = elm_layout_add(ugd->ug_MainWindow.ug_pMainLayout); - elm_layout_file_set(layout, UG_EDJ_NAVIGATIONBAR, UG_GRP_NO_CONTENT); - elm_object_part_content_set(layout, "myfile.noContent.upper", genlist); - elm_object_part_content_set(layout, "myfile.noContent.content", nocontent); mf_ug_util_add_dir_watch(fullpath->str, ugd); g_string_free(fullpath, true); fullpath = NULL; - return layout; + return nocontent; } + + genlist = __mf_ug_genlist_create_gl(ugd); + + ugd->ug_MainWindow.ug_pNaviGenlist = genlist; ugFsNodeInfo *pNode = NULL; Eina_List *l = NULL; @@ -1474,8 +1512,9 @@ Evas_Object *mf_ug_genlist_create_content_list_view(void *data) count++; -if (ugd->ug_UiGadget.ug_iSelectMode == MULTI_FILE_MODE || + if (ugd->ug_UiGadget.ug_iSelectMode == MULTI_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE || + ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == SAVE_MODE || diff --git a/src/widget/mf-ug-navi-bar.c b/src/widget/mf-ug-navi-bar.c index e8e4615..b552718 100644 --- a/src/widget/mf-ug-navi-bar.c +++ b/src/widget/mf-ug-navi-bar.c @@ -315,7 +315,9 @@ void mf_ug_navi_bar_title_set(void *data) UG_TRACE_BEGIN; ugData *ugd = (ugData *)data; ug_mf_retm_if(ugd == NULL, "ugd is NULL"); - if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { + if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { elm_object_part_text_set(ugd->ug_MainWindow.ug_pNaviBar, "elm.text.title", MF_UG_LABEL_IMPORT); } else if (ugd->ug_Status.ug_iViewType != mf_ug_view_root && !(ugd->ug_Status.ug_bSettingEntry == true && ugd->ug_Status.ug_bInSettingView == true)) { Evas_Object *home_btn = elm_button_add(ugd->ug_MainWindow.ug_pNaviBar); @@ -424,7 +426,9 @@ void mf_ug_navi_bar_set_ctrl_button(void *data) Evas_Object *pNavi = ugd->ug_MainWindow.ug_pNaviBar; Evas_Object *bt_1 = NULL; Evas_Object *bt_2 = NULL; - if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { + if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { bt_1 = mf_ug_navi_bar_create_button(pNavi, NAVI_BUTTON_STYLE, MF_UG_LABEL_IMPORT, NULL, mf_ug_cb_add_button_cb, ugd); } else if (ugd->ug_Status.ug_iViewType != mf_ug_view_root) { if (ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE) { @@ -476,7 +480,9 @@ void mf_ug_navi_bar_create_default_view(void *data) pNaviLayout = mf_ug_navi_bar_create_layout(box, UG_EDJ_NAVIGATIONBAR, UG_GRP_NAVI_VIEW); ugd->ug_MainWindow.ug_pNaviLayout = pNaviLayout; - if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { + if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { newContent = __mf_ug_genlist_create_gl(ugd); ugd->ug_MainWindow.ug_pNaviGenlist = newContent; @@ -486,6 +492,7 @@ void mf_ug_navi_bar_create_default_view(void *data) evas_object_size_hint_min_set(top_layout, MF_UG_UPPER_WIDTH, MF_UG_UPPER_HEIGHT); upper_genlist = mf_navi_bar_upper_create(top_layout); elm_object_scroll_freeze_push(upper_genlist); + elm_genlist_scroller_policy_set(upper_genlist, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); mf_ug_genlist_goto_myfile_style_set(ugd); mf_ug_genlist_goto_myfile_item_append(upper_genlist, ugd); ugd->ug_Status.ug_bUpperFlag = true; @@ -551,10 +558,13 @@ void mf_ug_navi_bar_create_default_view(void *data) mf_ug_navi_bar_title_set(ugd); mf_ug_navi_bar_remove_previous_contents(ugd); - if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { + if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { ug_ecore_idler_del(ugd->ug_Status.search_idler); ugd->ug_Status.search_idler = ecore_idler_add(mf_ug_navi_search_idler_cb, ugd); } + UG_SAFE_DEL_ECORE_TIMER(ugd->ug_Status.play_timer); UG_TRACE_END; } @@ -608,6 +618,7 @@ void mf_ug_navi_bar_create_new_folder_view(void *data) elm_object_item_signal_emit(ugd->ug_MainWindow.ug_pNaviItem, "elm,state,sip,shown", ""); elm_object_focus_set(ugd->ug_MainWindow.ug_pEntry, EINA_TRUE); + UG_SAFE_DEL_ECORE_TIMER(ugd->ug_Status.play_timer); //mf_ug_navi_bar_set_ctrl_button(ugd); } @@ -896,7 +907,9 @@ void mf_ug_navi_bar_button_set_disable(void *data, bool disable) ug_mf_retm_if(pNavi_s == NULL, "get navigation bar in use failed"); const char *disable_labe = NULL; - if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { + if (ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_PATH_SELECT_MODE + || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { disable_labe = MF_UG_LABEL_IMPORT; } else if (ugd->ug_UiGadget.ug_iSelectMode == SINGLE_ALL_MODE || ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE) { disable_labe = MF_UG_LABEL_SET; diff --git a/src/widget/mf-ug-popup.c b/src/widget/mf-ug-popup.c index 5de8202..438d651 100644 --- a/src/widget/mf-ug-popup.c +++ b/src/widget/mf-ug-popup.c @@ -16,7 +16,7 @@ -#include +#include #include "mf-ug-util.h" #include "mf-ug-winset.h" @@ -364,7 +364,7 @@ Evas_Object *mf_ug_popup_create(void *data, mf_ug_popup_mode popupMode, char *ti void mf_ug_popup_indicator_popup(const char *text) { ug_mf_retm_if(text == NULL, "text is NULL"); - int ret = status_message_post(text); + int ret = notification_status_message_post(text); ug_debug("status_message_post()... [0x%x]!", ret); if (ret != 0) { ug_debug("status_message_post()... [0x%x]!", ret); @@ -426,3 +426,176 @@ void mf_ug_context_popup_create_more(void *data, Evas_Object *parent) UG_TRACE_END; } +static Evas_Object *__mf_ug_popup_entry_create(Evas_Object *parent) +{ + Evas_Object *en = NULL; + + en = elm_entry_add(parent); + elm_entry_scrollable_set(en, EINA_TRUE); + elm_entry_select_all(en); + elm_scroller_policy_set(en, ELM_SCROLLER_POLICY_OFF, + ELM_SCROLLER_POLICY_AUTO); + + Ecore_IMF_Context *imf_context = elm_entry_imf_context_get(en); + + elm_entry_single_line_set(en, EINA_TRUE); + evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_show(en); + + return en; + +} + +static char *__new_folder_text_get(void *data) +{ + UG_TRACE_BEGIN; + ugData *ugd = (ugData *)data; + ug_mf_retvm_if(ugd == NULL, NULL, "ugd is NULL"); + + int error_code = 0; + char *fileName = NULL; + char *fullpath = (char *)malloc(sizeof(char) * MYFILE_FILE_PATH_LEN_MAX); + if (fullpath == NULL) { + return NULL; + } + GString *dest_fullpath = NULL; + + memset(fullpath, 0, MYFILE_FILE_PATH_LEN_MAX); + fileName = elm_entry_markup_to_utf8(MF_UG_LABEL_FOLDER); + snprintf(fullpath, (MYFILE_FILE_PATH_LEN_MAX), "%s/%s", (char *)ugd->ug_Status.ug_pPath->str, fileName); + + dest_fullpath = g_string_new(fullpath); + + + if (mf_ug_fm_svc_wrapper_detect_duplication(dest_fullpath)) { + ug_debug("dectetion result is TRUE\ndest_fullpath is %s\n", dest_fullpath->str); + error_code = mf_ug_fm_svc_wrapper_file_auto_rename(ugd, dest_fullpath, FILE_NAME_WITH_BRACKETS, &dest_fullpath); + ug_debug("rename result is %s\n", dest_fullpath->str); + memset(fullpath, 0, strlen(fullpath)); + int len = strlen(ugd->ug_Status.ug_pPath->str) + 1; + strncpy(fullpath, dest_fullpath->str + len, MYFILE_FILE_PATH_LEN_MAX); + /*memset(fileName,0,strlen(fileName));*/ + + UG_SAFE_FREE_CHAR(fileName); + fileName = elm_entry_markup_to_utf8(fullpath); + } + + /*elm_entry_entry_set(entry, ecore_file_file_get(params->m_ItemName->str));*/ + + + UG_SAFE_FREE_CHAR(fullpath); + UG_SAFE_FREE_GSTRING(dest_fullpath); + return fileName; +} +static void __mf_ug_popup_show_vk_cb(void *data, Evas_Object *obj, void *event_info) +{ + UG_TRACE_BEGIN; + ug_mf_retm_if(data == NULL, "data is NULL"); + ugData *ugd = (ugData *)data; + + Evas_Object *pEntry = NULL; + + evas_object_del(ugd->ug_MainWindow.ug_pNormalPopup); + + ugd->ug_MainWindow.ug_pNormalPopup = NULL; + + pEntry = ugd->ug_MainWindow.ug_pEntry; + elm_entry_cursor_end_set(ugd->ug_MainWindow.ug_pEntry); + + elm_object_focus_set(ugd->ug_MainWindow.ug_pEntry, EINA_TRUE); + + UG_TRACE_END; + +} + + +static void __mf_ug_popup_create_folder_imf_changed_cb(void *data, Evas_Object *obj, void *event_info) +{ + UG_TRACE_BEGIN; + ug_mf_retm_if(data == NULL, "data is NULL"); + ugData *ugd = (ugData *)data; + + const char *entry_data = NULL; + char *name = NULL; + char new_str[MYFILE_FILE_NAME_LEN_MAX] = { '\0', }; + + entry_data = elm_entry_entry_get(ugd->ug_MainWindow.ug_pEntry); + ug_mf_retm_if(entry_data == NULL, "entry_data is null"); + name = elm_entry_markup_to_utf8(entry_data); + ug_mf_retm_if(name == NULL, "name is null"); + + ug_error("name is [%s]", name); + if (mf_ug_file_attr_is_valid_name(name) != MYFILE_ERR_NONE) { + strncpy(new_str, name, MYFILE_FILE_NAME_LEN_MAX - 1); + if (strlen(name) > 0) + new_str[strlen(name) - 1] = '\0'; + elm_entry_entry_set(ugd->ug_MainWindow.ug_pEntry, new_str); + elm_entry_cursor_end_set(ugd->ug_MainWindow.ug_pEntry); + elm_object_focus_set(ugd->ug_MainWindow.ug_pEntry, EINA_FALSE); + + UG_SAFE_FREE_OBJ(ugd->ug_MainWindow.ug_pNormalPopup); + ugd->ug_MainWindow.ug_pNormalPopup = mf_ug_popup_create(ugd, UG_POPMODE_TEXT, NULL, MF_UG_LABEL_ILLEGAL_CHAR, NULL, NULL, + NULL, __mf_ug_popup_show_vk_cb, ugd); + } + UG_SAFE_FREE_CHAR(name); + UG_TRACE_END; +} + +Evas_Object *mf_ug_popup_create_new_folder_popup(void *data, char *context) +{ + + UG_TRACE_BEGIN; + ug_mf_retvm_if(data == NULL, NULL, "data is NULL"); + ugData *ugd = (ugData *)data; + + Evas_Object *popup; + Evas_Object *layout; + char *text = NULL; + static Elm_Entry_Filter_Limit_Size limit_filter_data; + + popup = elm_popup_add(ugd->ug_MainWindow.ug_pMainLayout); + elm_object_focus_set(popup, EINA_FALSE); + + layout = elm_layout_add(popup); + elm_object_focus_set(layout, EINA_FALSE); + elm_layout_file_set(layout, UG_EDJ_NAVIGATIONBAR, "popup_new_folder"); + evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + + Evas_Object *en = NULL; + en = __mf_ug_popup_entry_create(layout); + + text = __new_folder_text_get(ugd); + limit_filter_data.max_char_count = MYFILE_FILE_NAME_LEN_MAX; + elm_entry_entry_set(en, text); + elm_entry_cursor_end_set(en); + UG_SAFE_FREE_CHAR(text); + + elm_entry_markup_filter_append(en, elm_entry_filter_limit_size, + &limit_filter_data); + elm_object_part_content_set(layout, "elm.swallow.content", en); + + edje_object_part_text_set(elm_layout_edje_get(layout), "title.text", context); + evas_object_smart_callback_add(en, "maxlength,reached", mf_ug_cb_reach_max_len_cb, ugd); + evas_object_smart_callback_add(en, "changed", __mf_ug_popup_create_folder_imf_changed_cb, ugd); + ugd->ug_MainWindow.ug_pEntry = en; + + elm_object_content_set(popup, layout); + + + Evas_Object *btn1 = __ug_mf_popup_button_create(popup, MF_UG_LABEL_OK); + elm_object_style_set(btn1, "popup_button/default"); + Evas_Object *btn2 = __ug_mf_popup_button_create(popup, MF_UG_LABEL_CANCEL); + elm_object_style_set(btn2, "popup_button/default"); + + evas_object_smart_callback_add(btn1, "clicked", mf_ug_cb_save_cb, ugd); + evas_object_smart_callback_add(btn2, "clicked", mf_ug_cb_cancel_new_folder_cb, ugd); + elm_object_part_content_set(popup, "button1", btn1); + elm_object_part_content_set(popup, "button2", btn2); + + evas_object_show(popup); + + return popup; +} + diff --git a/ug-myfile-efl.xml b/ug-myfile-efl.xml index d71a363..d4af352 100644 --- a/ug-myfile-efl.xml +++ b/ug-myfile-efl.xml @@ -24,5 +24,11 @@ + + + + + + diff --git a/ug_navibar_layout.edc b/ug_navibar_layout.edc index 7e87bcc..2e4980f 100644 --- a/ug_navibar_layout.edc +++ b/ug_navibar_layout.edc @@ -25,6 +25,13 @@ #define PATH_INFO_BG_COLOR 68 68 68 255 #define BOTTOM_LINE_COLOR 199 199 199 255 +#define IMG_EDITFIELD_BG "mf_new_folder_editfield_bg.png" +images { + + image: IMG_EDITFIELD_BG COMP; + +} + #define MF_UG_PART_PADDING_TOP( param_padding_size ) \ part { name: "elm.padding.top"; \ @@ -427,44 +434,141 @@ collections } } } -#else - group - { - name: "search_path"; - parts { - - part - { - name: "base"; - type: RECT; - repeat_events: 0; - scale: 1; - description { - state: "default" 0.0; - min : UG_SEARCH_FOLDER_W UG_SEARCH_FOLDER_H; - max : UG_SEARCH_FOLDER_W UG_SEARCH_FOLDER_H; - } - } - part - { - name: "path"; - type: SWALLOW; - description - { - state: "default" 0.0; - align: 0.5 0.5; - rel1 - { - relative: 0.0 0.4; to:"base"; - } - rel2 - { - relative: 1.0 1.0;to:"base"; - } - } - } + group { name: "popup_new_folder"; + parts { + part { name: "base"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 0 220; + fixed: 1 0; + } + } + part { name: "t_pad"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + align: 0.0 0.0; + min: 0 0; + max: 0 0; + fixed: 1 1; + } + } + part { name: "title.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 0 70; + max: -1 70; + rel1 { + relative: 0.0 1.0; + to: "t_pad"; + } + rel2.to: "base"; + align: 0.0 0.0; + fixed: 1 1; + color: 128 128 128 255; + text { + font: "Tizen:style=Medium"; + size: 42; + min: 1 1; + text_class: "tizen"; + } } + } + part { name: "top_password_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 0 20; + max: 0 20; + rel1 { + to_x: "base"; + to_y: "title.text"; + relative: 0.0 1.0; + } + rel2 { + to_x: "base"; + to_y: "title.text"; + relative: 1.0 1.0; + } + align: 0.0 0.0; + fixed: 1 1; + } + } + part { name: "password_field_image"; + type: IMAGE; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 0 80; + image { + normal: IMG_EDITFIELD_BG; + border: 9 9 9 9; + } + rel1 { + to_x: "base"; + to_y: "top_password_padding"; + relative: 0.0 1.0; + } + rel2 { + to_x: "base"; + to_y: "top_password_padding"; + relative: 1.0 1.0; + } + fixed: 1 1; + align: 0.0 0.0; + } + } + part { name: "left_swallow_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 16 0; + max: 16 0; + rel1.to: "password_field_image"; + rel2.to: "password_field_image"; + align: 0.0 0.0; + fixed: 1 1; + } + } + part { name: "right_swallow_padding"; + type: SPACER; + scale: 1; + description { + min: 16 0; + max: 16 0; + rel1.to: "password_field_image"; + rel2.to: "password_field_image"; + align: 1.0 0.0; + fixed: 1 1; + } + } + part { + name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + rel1 { + to_x: "left_swallow_padding"; + to_y: "password_field_image"; + relative : 1.0 0.0; + } + rel2 { + to_x: "right_swallow_padding"; + to_y: "password_field_image"; + relative: 0.0 1.0; + } + align: 0.0 0.5; + // fixed: 1 1; + } + } + } } -#endif + } -- 2.7.4