Merge branch 'devel/master' into devel/new_mesh

[platform/core/uifw/dali-demo.git] / shared / dali-demo-strings.h

diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index 56adecf..d6b01a9 100644 (file)
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -47,15 +47,19 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_SCROLL_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCROLL_VIEW")
 #define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS")
 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")
+#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING")
 #define DALI_DEMO_STR_TITLE_IMAGE_SCALING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_SCALING")
+#define DALI_DEMO_STR_TITLE_TEXT_FIELD dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_FIELD")
 #define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL")
 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE")
 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
-#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES dgettext(DALI_DEMO_STR_TITLE_ANIMATED_SHAPES)
-#define DALI_DEMO_STR_TITLE_PATH_ANIMATION dgettext(DALI_DEMO_STR_TITLE_PATH_ANIMATION)
 #define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE dgettext(DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE)
 #define DALI_DEMO_STR_TITLE_BUTTONS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BUTTONS")
 #define DALI_DEMO_STR_TITLE_LOGGING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_LOGGING")
+#define DALI_DEMO_STR_TITLE_MESH_MORPH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_MESH_MORPH")
+#define DALI_DEMO_STR_TITLE_MESH_SORTING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_MESH_SORTING")
+#define DALI_DEMO_STR_TITLE_TEXTURED_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TEXTURED_MESH")
+#define DALI_DEMO_STR_TITLE_LINE_MESH dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_LINE_MESH")
 
 #else // !INTERNATIONALIZATION_ENABLED
 
@@ -74,15 +78,19 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_SCROLL_VIEW               "Scroll View"
 #define DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS        "Lights and shadows"
 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI           "Script Based UI"
-#define DALI_DEMO_STR_TITLE_IMAGE_SCALING             "Image Scaling Modes"
+#define DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING    "Image Fitting and Sampling"
+#define DALI_DEMO_STR_TITLE_IMAGE_SCALING             "Image Scaling Grid"
+#define DALI_DEMO_STR_TITLE_TEXT_FIELD                "Text Field"
 #define DALI_DEMO_STR_TITLE_TEXT_LABEL                "Text Label"
 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts"
 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT                "Emoji Text"
-#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES           "Animated Shapes"
-#define DALI_DEMO_STR_TITLE_PATH_ANIMATION            "Animated Path"
 #define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE            "Negotiate Size"
 #define DALI_DEMO_STR_TITLE_BUTTONS                   "Buttons"
 #define DALI_DEMO_STR_TITLE_LOGGING                   "Logging"
+#define DALI_DEMO_STR_TITLE_MESH_MORPH                "Mesh Morph"
+#define DALI_DEMO_STR_TITLE_MESH_SORTING              "Mesh Sorting"
+#define DALI_DEMO_STR_TITLE_TEXTURED_MESH             "Mesh Texture"
+#define DALI_DEMO_STR_TITLE_LINE_MESH                 "Mesh Line"
 
 #endif