From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 25 Nov 2016 13:51:38 +0000 (-0800)
Subject: Merge "Revert public API changes. BATCH property." into devel/master
X-Git-Tag: dali_1.2.17~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9451f0b70a22bf739329225cb9db2068a4bbf608;hp=9c07eea9b135baf8b85b1096fccedf4cf1711bd5;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge "Revert public API changes. BATCH property." into devel/master
---

diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp
index c879617..ab6b4b5 100644
--- a/demo/dali-demo.cpp
+++ b/demo/dali-demo.cpp
@@ -84,6 +84,7 @@ int DALI_EXPORT_API main(int argc, char **argv)
   demo.AddExample(Example("sparkle.example", DALI_DEMO_STR_TITLE_SPARKLE));
   demo.AddExample(Example("progress-bar.example", DALI_DEMO_STR_TITLE_PROGRESS_BAR));
   demo.AddExample(Example("contact-cards.example", DALI_DEMO_STR_TITLE_CONTACT_CARDS));
+  demo.AddExample(Example("flex-container.example", DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND));
   demo.AddExample(Example("fpp-game.example", DALI_DEMO_STR_TITLE_FPP_GAME));
 
   demo.SortAlphabetically( true );
diff --git a/resources/po/as.po b/resources/po/as.po
index d431697..4cb3c4b 100755
--- a/resources/po/as.po
+++ b/resources/po/as.po
@@ -28,6 +28,9 @@ msgstr "অকৃতকাৰ্য্য হ"
 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
 msgstr "Emoji"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "Flexbox ডেমো"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "অনুবিম্ব ইজাৰ"
 
diff --git a/resources/po/de.po b/resources/po/de.po
index 9ddb8f0..b0d0821 100755
--- a/resources/po/de.po
+++ b/resources/po/de.po
@@ -31,6 +31,9 @@ msgstr "Emoji"
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "Bild Montage und Sampling"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "Flexbox Playground"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_SCALING"
 msgstr "Bildskalierung"
 
diff --git a/resources/po/en_GB.po b/resources/po/en_GB.po
index 18f1489..330fcad 100755
--- a/resources/po/en_GB.po
+++ b/resources/po/en_GB.po
@@ -28,6 +28,9 @@ msgstr "Effects View"
 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
 msgstr "Emoji Text"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "Flexbox Playground"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "Image Fitting and Sampling"
 
diff --git a/resources/po/en_US.po b/resources/po/en_US.po
index 848950e..ee0921f 100755
--- a/resources/po/en_US.po
+++ b/resources/po/en_US.po
@@ -28,6 +28,9 @@ msgstr "Effects View"
 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
 msgstr "Emoji Text"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "Flexbox Playground"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "Image Fitting and Sampling"
 
diff --git a/resources/po/es.po b/resources/po/es.po
index 1f79c61..42ff232 100755
--- a/resources/po/es.po
+++ b/resources/po/es.po
@@ -28,6 +28,9 @@ msgstr "Vista de efectos"
 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
 msgstr "Texto con emojis"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "Flexbox Playground"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "Modo de encaje y muestreo"
 
diff --git a/resources/po/fi.po b/resources/po/fi.po
index 49cf19c..d27983b 100755
--- a/resources/po/fi.po
+++ b/resources/po/fi.po
@@ -28,6 +28,9 @@ msgstr "Efektinäkymä"
 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
 msgstr "Teksti Hymiöillä"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "Flexbox Testi Sovellus"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "Kuvien Sovitus ja Suodatus"
 
diff --git a/resources/po/ko.po b/resources/po/ko.po
index 79d388b..6b21dc0 100755
--- a/resources/po/ko.po
+++ b/resources/po/ko.po
@@ -28,6 +28,9 @@ msgstr "이펙트 뷰"
 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
 msgstr "이모티콘 텍스트"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "Flexbox 데모"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "이미지 조정 샘플링"
 
diff --git a/resources/po/ml.po b/resources/po/ml.po
index 571fea7..1785e01 100755
--- a/resources/po/ml.po
+++ b/resources/po/ml.po
@@ -28,6 +28,9 @@ msgstr "എഫക്റ്റുകൾ"
 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
 msgstr "ഇമോട്ടികോണുകൾ"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "ഫ്ലക്സ്ബോക്സിനുള്ള ഡെമോ"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "ചിത്രം ഉചിതമാണ് ആൻഡ് ഒരുപറ്റം"
 
diff --git a/resources/po/ur.po b/resources/po/ur.po
index 61492ce..4f4299e 100755
--- a/resources/po/ur.po
+++ b/resources/po/ur.po
@@ -28,6 +28,9 @@ msgstr "اثرات"
 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
 msgstr "اموٹکان"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "فلیکس باکس ڈیمو"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "تصویر فٹنگ"
 
diff --git a/resources/po/zn_CH.po b/resources/po/zn_CH.po
index edc52ca..2cc1113 100755
--- a/resources/po/zn_CH.po
+++ b/resources/po/zn_CH.po
@@ -28,6 +28,9 @@ msgstr "效果视图"
 msgid "DALI_DEMO_STR_TITLE_EMOJI_TEXT"
 msgstr "表情符号"
 
+msgid "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND"
+msgstr "Flexbox演示"
+
 msgid "DALI_DEMO_STR_TITLE_IMAGE_FITTING_SAMPLING"
 msgstr "图像填充及采样"
 
@@ -146,4 +149,4 @@ msgid "DALI_DEMO_STR_TITLE_TILT_SENSOR"
 msgstr "倾斜传感器"
 
 msgid "DALI_DEMO_STR_TITLE_FPP_GAME"
-msgstr "FPP遊戲"
+msgstr "FPP游戏"
diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index e782b17..da304a8 100644
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -42,6 +42,7 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION         dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION")
 #define DALI_DEMO_STR_TITLE_EFFECTS_VIEW                dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EFFECTS_VIEW")
 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
+#define DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND          dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND")
 #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_IMAGE_VIEW                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_IMAGE_VIEW")
@@ -94,6 +95,7 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION         "Dissolve Effect"
 #define DALI_DEMO_STR_TITLE_EFFECTS_VIEW                "Effects View"
 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT                  "Emoji Text"
+#define DALI_DEMO_STR_TITLE_FLEXBOX_PLAYGROUND          "Flexbox Playground"
 #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_IMAGE_VIEW                  "Image View"