[TIZENIOT-1754,1691] Updated PO files & gallery Icon in homescreen

Change-Id: Id61fc3da64b905107086b1acfe8fd9588d4b11ab

diff --git a/inc/util/gl-strings.h b/inc/util/gl-strings.h
index 0d300305b0018df53d5e1e84aef15b37af2320cb..21e91e569b05451e3cf68e9ecb54d587fbb865c6 100644 (file)
--- a/inc/util/gl-strings.h
+++ b/inc/util/gl-strings.h
@@ -41,6 +41,8 @@ extern "C" {
 #define GL_STR_NO_ALBUMS_SELECTED _("IDS_MEDIABR_POP_NO_ALBUMS_SELECTED")
 #define GL_STR_SELECT_ITEM _(GL_STR_ID_SELECT_ITEM)
 #define GL_STR_NO_ALBUMS _(GL_STR_ID_NO_ALBUMS)
+#define GL_STR_PHOTO_TAB _("GL_STR_PHOTO_TAB")
+#define GL_STR_ALBUM_TAB _("GL_STR_ALBUM_TAB")
 
 #define GL_STR_EMPTY _("")
 #define GL_STR_NO_NAME GL_STR_ID_NO_NAME

diff --git a/res/po/en.po b/res/po/en.po
index f06b996175479f64ac82541aaf8bafb6ead13bd0..2e155235b0fa7a01718f80acf525b32095df96ce 100755 (executable)
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -5,7 +5,7 @@ msgid "IDS_VIDEO_TPOP_MOBILE_DATA_TURNED_OFF_CONNECT_TO_WI_FI_NETWORK_INSTEAD_OR
 msgstr "Mobile data turned off. Connect to Wi-Fi network instead, or turn on Mobile data and try again."
 
 msgid "IDS_VIDEO_BODY_AFTER_YOU_RECORD_VIDEOS_USING_THE_CAMERA_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you record videos using the camera, they will be shown here."
+msgstr "When videos are added, they will be shown here."
 
 msgid "IDS_VIDEO_TPOP_FILE_NAME_ALREADY_IN_USE"
 msgstr "File name already in use."
@@ -413,7 +413,7 @@ msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE"
 msgstr "Unsupported file type."
 
 msgid "IDS_IMGE_BODY_AFTER_YOU_TAKE_PICTURES_PICTURES_WILL_BE_SHOWN"
-msgstr "After you take pictures, pictures will be shown."
+msgstr "When photos are added, they will be shown here."
 
 msgid "IDS_IME_BODY_LANDSCAPE_MODE"
 msgstr "Landscape mode"
@@ -868,3 +868,8 @@ msgstr "%d items already selected in another album."
 msgid "IDS_GALLERY_TPOP_VIDEO_ALREADY_SELECTED_IN_ANOTHER_ALBUM"
 msgstr "Video already selected in another album."
 
+msgid "GL_STR_PHOTO_TAB"
+msgstr "Photos"
+
+msgid "GL_STR_ALBUM_TAB"
+msgstr "Albums"

diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index 51929fa73e8a58d41391be3d8a79d8a8ef576685..46eb00b4ebe765a13efa6b60e9ce56ee56e99f4f 100755 (executable)
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -5,7 +5,7 @@ msgid "IDS_VIDEO_TPOP_MOBILE_DATA_TURNED_OFF_CONNECT_TO_WI_FI_NETWORK_INSTEAD_OR
 msgstr "Mobile data turned off. Connect to Wi-Fi network instead, or turn on Mobile data and try again."
 
 msgid "IDS_VIDEO_BODY_AFTER_YOU_RECORD_VIDEOS_USING_THE_CAMERA_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you record videos using the camera, they will be shown here."
+msgstr "When videos are added, they will be shown here."
 
 msgid "IDS_VIDEO_TPOP_FILE_NAME_ALREADY_IN_USE"
 msgstr "File name already in use."
@@ -413,7 +413,7 @@ msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE"
 msgstr "Unsupported file type."
 
 msgid "IDS_IMGE_BODY_AFTER_YOU_TAKE_PICTURES_PICTURES_WILL_BE_SHOWN"
-msgstr "Photos will be shown only after you taken the picture."
+msgstr "When photos are added, they will be shown here."
 
 msgid "IDS_IME_BODY_LANDSCAPE_MODE"
 msgstr "Landscape mode"
@@ -868,3 +868,8 @@ msgstr "%d items already selected in another album."
 msgid "IDS_GALLERY_TPOP_VIDEO_ALREADY_SELECTED_IN_ANOTHER_ALBUM"
 msgstr "Video already selected in another album."
 
+msgid "GL_STR_PHOTO_TAB"
+msgstr "Photos"
+
+msgid "GL_STR_ALBUM_TAB"
+msgstr "Albums"

diff --git a/res/po/en_US.po b/res/po/en_US.po
index a4671dce6caf3c39d23d414967ec723981ea9400..7ddc5d360f68e97b6920da88d336c1aa07954bf0 100755 (executable)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -5,7 +5,7 @@ msgid "IDS_VIDEO_TPOP_MOBILE_DATA_TURNED_OFF_CONNECT_TO_WI_FI_NETWORK_INSTEAD_OR
 msgstr "Mobile data off. Connect to Wi-Fi network instead, or turn on Mobile data and try again."
 
 msgid "IDS_VIDEO_BODY_AFTER_YOU_RECORD_VIDEOS_USING_THE_CAMERA_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you record videos using the camera, they will be shown here."
+msgstr "When videos are added, they will be shown here."
 
 msgid "IDS_VIDEO_TPOP_FILE_NAME_ALREADY_IN_USE"
 msgstr "File name already in use."
@@ -413,7 +413,7 @@ msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE"
 msgstr "Unsupported file type."
 
 msgid "IDS_IMGE_BODY_AFTER_YOU_TAKE_PICTURES_PICTURES_WILL_BE_SHOWN"
-msgstr "After you take pictures, pictures will be shown."
+msgstr "When photos are added, they will be shown here."
 
 msgid "IDS_IME_BODY_LANDSCAPE_MODE"
 msgstr "Landscape mode"
@@ -868,3 +868,8 @@ msgstr "%d items already selected in another album."
 msgid "IDS_GALLERY_TPOP_VIDEO_ALREADY_SELECTED_IN_ANOTHER_ALBUM"
 msgstr "Video already selected in another album."
 
+msgid "GL_STR_PHOTO_TAB"
+msgstr "Photos"
+
+msgid "GL_STR_ALBUM_TAB"
+msgstr "Albums"

diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po
index 2ca368680c7014fbaee427b858dee415853bad3b..03bc59215a408a896522f16af82b684d34cdf31c 100644 (file)
--- a/res/po/ko_KR.po
+++ b/res/po/ko_KR.po
@@ -5,7 +5,7 @@ msgid "IDS_VIDEO_TPOP_MOBILE_DATA_TURNED_OFF_CONNECT_TO_WI_FI_NETWORK_INSTEAD_OR
 msgstr "모바일 데이터 기능이 해제된 상태입니다. Wi-Fi 네트워크에 연결하거나, 모바일 데이터 기능을 실행한 후 다시 시도하세요."
 
 msgid "IDS_VIDEO_BODY_AFTER_YOU_RECORD_VIDEOS_USING_THE_CAMERA_THEY_WILL_BE_SHOWN_HERE"
-msgstr "ì¹´ë©\94ë\9d¼ë¥¼ ì\82¬ì\9a©í\95\98ì\97¬ ë\8f\99ì\98\81ì\83\81ì\9d\84 ì´¬ì\98\81í\95\98ë©´ ë\8f\99ì\98\81ì\83\81ì\9d´ ì\97¬ê¸°ì\97\90 í\91\9cì\8b\9cë\90©ë\8b\88ë\8b¤."
+msgstr "ë¹\84ë\94\94ì\98¤ë¥¼ ì¶\94ê°\80í\95\98ë©´ ì\97¬ê¸°ì\97\90 í\91\9cì\8b\9cë\90©ë\8b\88ë\8b¤."
 
 msgid "IDS_VIDEO_TPOP_FILE_NAME_ALREADY_IN_USE"
 msgstr "사용 중인 이름입니다."
@@ -413,7 +413,7 @@ msgid "IDS_MF_POP_UNSUPPORTED_FILE_TYPE"
 msgstr "지원되지 않는 파일 형식입니다."
 
 msgid "IDS_IMGE_BODY_AFTER_YOU_TAKE_PICTURES_PICTURES_WILL_BE_SHOWN"
-msgstr "ì\82¬ì§\84ì\9d\84 ì´¬ì\98\81í\95\98ë©´ ì\82¬ì§\84ì\9d´ 표시됩니다."
+msgstr "ì\82¬ì§\84ì\9d\84 ì¶\94ê°\80í\95\98ë©´ ì\97¬ê¸°ì\97\90 표시됩니다."
 
 msgid "IDS_IME_BODY_LANDSCAPE_MODE"
 msgstr "가로 모드"
@@ -868,3 +868,8 @@ msgstr "항목 %d개가 다른 앨범에서 이미 선택된 상태입니다."
 msgid "IDS_GALLERY_TPOP_VIDEO_ALREADY_SELECTED_IN_ANOTHER_ALBUM"
 msgstr "동영상이 다른 앨범에서 이미 선택된 상태입니다."
 
+msgid "GL_STR_PHOTO_TAB"
+msgstr "사진"
+
+msgid "GL_STR_ALBUM_TAB"
+msgstr "앨범"

diff --git a/shared/res/org.tizen.gallery.png b/shared/res/org.tizen.gallery.png
index 3bf41ce5db44dc5f18be68b7f36193bdcdaf0091..79d03377857f7bff6d26009905652d6ed6ece54c 100644 (file)
Binary files a/shared/res/org.tizen.gallery.png and b/shared/res/org.tizen.gallery.png differ

diff --git a/src/2dview/gl-thumbs.c b/src/2dview/gl-thumbs.c
index 077f3b3961f60d8aff42e2e1dd1198545826cdf8..c600c67bcb5e0cc60a83383a35b15fed9f83ecf3 100755 (executable)
--- a/src/2dview/gl-thumbs.c
+++ b/src/2dview/gl-thumbs.c
@@ -1144,9 +1144,6 @@ static int __gl_thumbs_ctxpopup_append(void *data, Evas_Object * parent)
 
        gl_appdata *ad = (gl_appdata *) data;
 
-       if (ad->gridinfo.grid_type == GL_GRID_T_FAV) {
-               return 0;
-       }
        /* 2. Edit */
        /* No 'edit' for facebook files, only share */
        if (!_gl_thumbs_check_zero(data))

diff --git a/src/features/gl-main.c b/src/features/gl-main.c
index 9dba227fac07d2021679819b34d49524046c7524..7a416a4d12d5ab0da6dd964159d74d8d1499ada1 100755 (executable)
--- a/src/features/gl-main.c
+++ b/src/features/gl-main.c
@@ -57,8 +57,8 @@ static Evas_Object* create_tabbar_with_title(Evas_Object *parent,gl_appdata * ad
        elm_object_style_set(toolbar, "tabbar_with_title");
        elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
        elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
-       elm_toolbar_item_append(toolbar, NULL, "Photos", _gl_time_view_selected_cb, ad);
-       elm_toolbar_item_append(toolbar, NULL, "Albums", _gl_album_view_selected_cb, ad);
+       elm_toolbar_item_append(toolbar, NULL, GL_STR_PHOTO_TAB, _gl_time_view_selected_cb, ad);
+       elm_toolbar_item_append(toolbar, NULL, GL_STR_ALBUM_TAB, _gl_album_view_selected_cb, ad);
        elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS);
        if (_gl_get_launch_state_preference()) {
                elm_toolbar_item_selected_set(elm_toolbar_first_item_get(toolbar),EINA_TRUE);