corrected PO strings.

Change-Id: I2fb95b5e229a86412d0230608987ea8b7ffe1083
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>

diff --git a/inc/gallery.h b/inc/gallery.h
index a80d5b0b96c571d0ee117bf4aa4fb5d2948e35ce..9e3da1bfe1a81c242b756bd4eb608f64d0263aa7 100644 (file)
--- a/inc/gallery.h
+++ b/inc/gallery.h
@@ -22,7 +22,7 @@
 #include <app.h>
 #include <efl_extension.h>
 #include <app_preference.h>
-#include <storage.h>
+#include <storage/storage.h>
 #include "gl-data.h"
 #include "gl-util.h"
 

diff --git a/inc/util/gl-debug.h b/inc/util/gl-debug.h
index fba2c738e882077b82497395b6f85f7f5acd312e..9ffe62747c3f18307e25069ef35f34f7cc5c78c8 100755 (executable)
--- a/inc/util/gl-debug.h
+++ b/inc/util/gl-debug.h
@@ -46,37 +46,15 @@ extern "C"
 
 #ifdef _USE_DLOG_
 
-#ifndef LOG_DEBUG
-#define LOG_DEBUG LOG_TAG
-#endif
-#ifndef LOGD
-#define LOGD(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-#ifndef LOGW
-#define LOGW(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, ##arg)
-#endif
-#ifndef LOGE
-#define LOGE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, ##arg)
-#endif
-#ifndef SECURE_LOGD
-#define SECURE_LOGD(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-#ifndef SECURE_LOGI
-#define SECURE_LOGI(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-#ifndef SECURE_LOGE
-#define SECURE_LOGE(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-
-#define gl_dbg(fmt, arg...)  LOGD(true, FONT_COLOR_BLUE fmt FONT_COLOR_RESET, ##arg)
-#define gl_dbgI(fmt, arg...) LOGI(true, FONT_COLOR_GREEN fmt FONT_COLOR_RESET, ##arg)
-#define gl_dbgW(fmt, arg...) LOGW(true, FONT_COLOR_CYAN fmt FONT_COLOR_RESET, ##arg)
-#define gl_dbgE(fmt, arg...) LOGE(true, FONT_COLOR_RED fmt FONT_COLOR_RESET, ##arg)
+#define gl_dbg(fmt, arg...)  dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
+#define gl_dbgI(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
+#define gl_dbgW(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
+#define gl_dbgE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
 
-#define GL_PROFILE_IN  gl_dbg("%s LAUNCH [gallery:Application:%s:IN] %s", LOG_DEBUG, __FUNCTION__)
-#define GL_PROFILE_OUT gl_dbg("%s LAUNCH [gallery:Application:%s:OUT] %s", LOG_DEBUG, __FUNCTION__)
-#define GL_PROFILE_F_IN(func)  gl_dbg(LOG_DEBUG, "LAUNCH","[gallery:Application:"func":IN]")
-#define GL_PROFILE_F_OUT(func) gl_dbg(LOG_DEBUG, "LAUNCH","[gallery:Application:"func":OUT]")
+#define GL_PROFILE_IN  gl_dbg(" LAUNCH [gallery:Application:%s:IN] " , __FUNCTION__)
+#define GL_PROFILE_OUT gl_dbg(" LAUNCH [gallery:Application:%s:OUT]", __FUNCTION__)
+#define GL_PROFILE_F_IN(func)  gl_dbg("LAUNCH","[gallery:Application:"func":IN]")
+#define GL_PROFILE_F_OUT(func) gl_dbg("LAUNCH","[gallery:Application:"func":OUT]")
 
 #else
 
@@ -92,9 +70,9 @@ extern "C"
 #endif
 
 #ifdef _USE_SECURE_LOG_
-#define gl_sdbg(fmt, arg...)  SECURE_LOGD(true, FONT_COLOR_BLUE fmt FONT_COLOR_RESET, ##arg)
-#define gl_sdbgW(fmt, arg...) SECURE_LOGI(true, FONT_COLOR_GREEN fmt FONT_COLOR_RESET, ##arg)
-#define gl_sdbgE(fmt, arg...) SECURE_LOGE(true, FONT_COLOR_RED fmt FONT_COLOR_RESET, ##arg)
+#define gl_sdbg(fmt, arg...)  dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
+#define gl_sdbgW(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
+#define gl_sdbgE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
 #endif
 
 

diff --git a/inc/util/gl-strings.h b/inc/util/gl-strings.h
index 3ab3550b4ef6a81d132e8d478460b85d503385f5..02548f69218a00d917d1a437393d8e3621bc7840 100755 (executable)
--- a/inc/util/gl-strings.h
+++ b/inc/util/gl-strings.h
@@ -78,8 +78,8 @@ extern "C"
 #define GL_STR_DELETE_COMFIRMATION dgettext("sys_string", "IDS_COM_POP_DELETE_Q")
 #define GL_STR_SELECTED  dgettext("sys_string", "IDS_COM_POP_SELECTED")
 #define GL_STR_ADDED dgettext("gallery", "IDS_COM_POP_ADDED")
-#define GL_STR_MOVED dgettext("sys_string", "IDS_COM_POP_MOVED")
-#define GL_STR_COPIED dgettext("sys_string", "IDS_COM_POP_COPIED_P")
+#define GL_STR_MOVED dgettext("gallery", "IDS_COM_POP_MOVED")
+#define GL_STR_COPIED dgettext("gallery", "IDS_COM_POP_COPIED_P")
 #define GL_STR_SELECT_ALL dgettext("sys_string", "IDS_COM_BODY_SELECT_ALL")
 #define GL_STR_NO_FILES_SELECTED dgettext("sys_string", GL_STR_ID_NO_FILES_SELECTED)
 #define GL_STR_APPLICATION_NOT_INSTALLED dgettext("sys_string", "IDS_COM_BODY_APPLICATION_NOT_INSTALLED")

diff --git a/inc/util/gl-util.h b/inc/util/gl-util.h
index 09efab3329cd28949a4ea6bad7ccc02c9b09d53f..3980b94480ff795028097c741b601f7dde652d94 100755 (executable)
--- a/inc/util/gl-util.h
+++ b/inc/util/gl-util.h
@@ -24,7 +24,7 @@ extern "C" {
 
 #include "gl-data.h"
 #include "gallery.h"
-#include <storage.h>
+#include <storage/storage.h>
 
 /*     File system related String definition   */
 

diff --git a/src/util/gl-fs.c b/src/util/gl-fs.c
index d490f5f323e9733a2645daed3609e8a6068175ed..c5c2f999034cbe6284ce93dbc9b65fd83d721f1a 100644 (file)
--- a/src/util/gl-fs.c
+++ b/src/util/gl-fs.c
@@ -27,7 +27,7 @@
 #include "gl-thread-util.h"
 #include "gl-file-util.h"
 #include "gl-util.h"
-#include <storage.h>
+#include <storage/storage.h>
 
 static int __gl_fs_free_node(gl_node_info_s *pnode)
 {

diff --git a/src/util/gl-util.c b/src/util/gl-util.c
index 5b246fc8463b000501c7df1a8b33b72beb75beeb..515e9500da95baf90b683a07d05457736618e2fe 100644 (file)
--- a/src/util/gl-util.c
+++ b/src/util/gl-util.c
@@ -21,7 +21,7 @@
 #endif
 #include <media_content.h>
 #include <system_settings.h>
-#include <storage.h>
+#include <storage/storage.h>
 #include "gl-debug.h"
 #include "gallery.h"
 #include "gl-albums.h"

diff --git a/widget/inc/gl_widget_debug.h b/widget/inc/gl_widget_debug.h
index 6548c24968d15c8c17183d5de12a7ae9d459435b..a7eacb7cff48874a77d493bb1367cfc36016a13f 100644 (file)
--- a/widget/inc/gl_widget_debug.h
+++ b/widget/inc/gl_widget_debug.h
@@ -18,29 +18,10 @@
 #ifndef GL_WIDGET_DEBUG_H
 #define GL_WIDGET_DEBUG_H
 
-#ifndef LOGD
-#define LOGD(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-#ifndef LOGW
-#define LOGW(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, ##arg)
-#endif
-#ifndef LOGE
-#define LOGE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, ##arg)
-#endif
-#ifndef SECURE_LOGD
-#define SECURE_LOGD(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-#ifndef SECURE_LOGI
-#define SECURE_LOGI(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-#ifndef SECURE_LOGE
-#define SECURE_LOGE(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-
 #if !defined(FLOG)
-#define DbgPrint(format, arg...)       LOGD(true, format, ##arg)
-#define ErrPrint(format, arg...)       LOGE(true, format, ##arg)
-#define WarnPrint(format, arg...)      LOGW(true, format, ##arg)
+#define DbgPrint(fmt, arg...)  dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
+#define ErrPrint(fmt, arg...)  dlog_print(DLOG_ERROR, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
+#define WarnPrint(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
 #else
 extern FILE *__file_log_fp;
 #define DbgPrint(format, arg...) do { fprintf(__file_log_fp, "[LOG] [\e[32m%s/%s\e[0m:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg); fflush(__file_log_fp); } while (0)

diff --git a/widget/src/gl_widget_create.c b/widget/src/gl_widget_create.c
index e358b98eeb5838a5948c27c2b0b7d001f4c5ba38..8611d5b85f7a31d97facadb995b7a25291158383 100644 (file)
--- a/widget/src/gl_widget_create.c
+++ b/widget/src/gl_widget_create.c
@@ -23,7 +23,6 @@
 #include <dlog.h>
 #include <media_content.h>
 #include "gl_widget_debug.h"
-#include "gl-data-type.h"
 #include "gl_widget.h"
 #include <glib.h>