summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaeyoung Son <taeyoung2.son@samsung.com>2014-06-09 16:04:51 +0900
committerTaeyoung Son <taeyoung2.son@samsung.com>2014-06-09 16:04:51 +0900
commit3a3683631c4ec1c00080d909559b203cbc56abd8 (patch)
treebaf52f9caacedb86ae0773d80a8cf2f239c4f5de
parent24e115552203018e2a3496bde5921836739f1320 (diff)
downloadcommon-eplugin-3a3683631c4ec1c00080d909559b203cbc56abd8.tar.gz
common-eplugin-3a3683631c4ec1c00080d909559b203cbc56abd8.tar.bz2
common-eplugin-3a3683631c4ec1c00080d909559b203cbc56abd8.zip
LAUNCH: Added checking profile messages.
Modified packaging messages. Added checking profile messages. Modified packaging messages. Change-Id: Ie3daa2f570fd782f24ff06ca0bbf95f8677636d1 Signed-off-by: Taeyoung Son <taeyoung2.son@samsung.com> Conflicts: org.tizen.common/src/org/tizen/common/launch/LaunchMessages.properties Change-Id: I2cdb8cf5f178f5821677a7d1fe5591dce7d12517 Signed-off-by: Taeyoung Son <taeyoung2.son@samsung.com>
-rw-r--r--org.tizen.common.packager/src/org/tizen/common/packager/ide/messages.properties4
-rw-r--r--org.tizen.common/src/org/tizen/common/launch/LaunchMessages.java2
-rw-r--r--org.tizen.common/src/org/tizen/common/launch/LaunchMessages.properties6
3 files changed, 8 insertions, 4 deletions
diff --git a/org.tizen.common.packager/src/org/tizen/common/packager/ide/messages.properties b/org.tizen.common.packager/src/org/tizen/common/packager/ide/messages.properties
index 3b34f5f0d..8b73f5670 100644
--- a/org.tizen.common.packager/src/org/tizen/common/packager/ide/messages.properties
+++ b/org.tizen.common.packager/src/org/tizen/common/packager/ide/messages.properties
@@ -1,3 +1,3 @@
PACKAGING_APPLICATION = Packaging application...
-DIALOG_TOGGLE_ALWAYS_PACKAGE_WITHOUT_ASKING = Errors exist in project.\n\nProceed with package?
-DIALOG_QUESTION_CONTINUE_EVEN_IF_IT_HAS_ERROR = Always package without asking \ No newline at end of file
+DIALOG_TOGGLE_ALWAYS_PACKAGE_WITHOUT_ASKING = Always package without asking
+DIALOG_QUESTION_CONTINUE_EVEN_IF_IT_HAS_ERROR = Errors exist in project.\n\nProceed with package? \ No newline at end of file
diff --git a/org.tizen.common/src/org/tizen/common/launch/LaunchMessages.java b/org.tizen.common/src/org/tizen/common/launch/LaunchMessages.java
index 9ab3cda82..865247b9b 100644
--- a/org.tizen.common/src/org/tizen/common/launch/LaunchMessages.java
+++ b/org.tizen.common/src/org/tizen/common/launch/LaunchMessages.java
@@ -34,8 +34,10 @@ public class LaunchMessages extends NLS {
NLS.initializeMessages(LaunchMessages.class.getName(), LaunchMessages.class);
}
+ public static String DIALOG_TITLE_DIFFERENT_PROFILE;
public static String DIALOG_TOGGLE_ALWAYS_LAUNCH_WITHOUT_ASKING;
public static String DIALOG_QUESTION_CONTINUE_EVEN_IF_IT_HAS_ERROR;
+ public static String DIALOG_QUESTION_CONTINUE_EVEN_IF_IT_IS_DIFFERENT_PROFILE;
public static String FAIL;
public static String SUCCESS;
diff --git a/org.tizen.common/src/org/tizen/common/launch/LaunchMessages.properties b/org.tizen.common/src/org/tizen/common/launch/LaunchMessages.properties
index fd3e516a8..8bf698379 100644
--- a/org.tizen.common/src/org/tizen/common/launch/LaunchMessages.properties
+++ b/org.tizen.common/src/org/tizen/common/launch/LaunchMessages.properties
@@ -43,5 +43,7 @@ LAUNCH_END_WITHOUT_RUN = The application is not available for {0}. So the applic
SDB_TIMEOUT_EXCEPTION = There is no response while {0} seconds. Please retry again.
# Dialog
-DIALOG_QUESTION_CONTINUE_EVEN_IF_IT_HAS_ERROR = Errors exist in project.\n\nProceed with launch?
-DIALOG_TOGGLE_ALWAYS_LAUNCH_WITHOUT_ASKING = Always launch without asking
+DIALOG_QUESTION_CONTINUE_EVEN_IF_IT_HAS_ERROR=Errors exist in project.\n\nProceed with launch?
+DIALOG_QUESTION_CONTINUE_EVEN_IF_IT_IS_DIFFERENT_PROFILE=The project is {0} application. but the target is {1} {2}.\n\n Proceed with launch?
+DIALOG_TOGGLE_ALWAYS_LAUNCH_WITHOUT_ASKING=Always launch without asking
+DIALOG_TITLE_DIFFERENT_PROFILE=Different Profile