Merge branch 'master' into CodeFire22

2017-02-15 10:44:27 +05:30
parent 6799680555 2fe59a1f27
commit 64fb3f63f8
23 changed files with 2190 additions and 68 deletions
@@ -7,11 +7,12 @@
    <color name="white">#FFFFFF</color>
    <color name="black">#000000</color>
    <color name="grey_background">#EEEEEE</color>
+    <color name="grey_dark_background">#888</color>
+    <color name="light_orange_background">#FFF9E0BA</color>
    <color name="green">#FF27A404</color>
    <color name="blue">#2196F3</color>

    <color name="colorOrange">#FFE0B2</color>


-
 </resources>
@@ -265,7 +265,15 @@
    <string name="first_geotag_the_store">First geotag the store</string>

    <string name="new_update_available">New Update Available \n\n Yeni güncelleme var</string>
+
+    <string name="title_activity_stock_facing__planogram_tracker">Planogram Tracker</string>
+
    <string name="datanotfound">Data not found in</string>
+
    <string name="title_activity_t2p_brand__avaibility">T2pBrand_Avaibility</string>
    <string name="title_activity_fill_brand">Please fill brand data</string>
+
+    <!--Stock Facing Planogram Tracker-->
+    <string name="stock_planogram_data_uploading">Stock Planogram Data Uploading</string>
+
 </resources>