From 2f84b3ecea730db023b637291f6befab134dd8aa Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Thu, 5 Jan 2017 09:58:16 +0530
Subject: [PATCH] Merge branch 'master' of
 https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into
 Category_G

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
---
 GSKMTOrange/src/main/res/layout/content_stock_facing.xml | 9 ++++-----
 GSKMTOrange/src/main/res/values/strings.xml              | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/GSKMTOrange/src/main/res/layout/content_stock_facing.xml b/GSKMTOrange/src/main/res/layout/content_stock_facing.xml
index 4d1552a..4c5e87c 100644
--- a/GSKMTOrange/src/main/res/layout/content_stock_facing.xml
+++ b/GSKMTOrange/src/main/res/layout/content_stock_facing.xml
@@ -5,8 +5,7 @@
     android:id="@+id/content_msl__availability"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/activity_msl__availability">
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -46,7 +45,7 @@
                     android:gravity="center"
                     android:paddingBottom="5dp"
                     android:paddingTop="5dp"
-                    android:text="SKU"
+                    android:text="@string/stock_facing_sku_name"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="#222" />
             </LinearLayout>
@@ -63,7 +62,7 @@
                     android:gravity="center"
                     android:paddingBottom="5dp"
                     android:paddingTop="5dp"
-                    android:text="Stock"
+                    android:text="@string/stock_facing_stock"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="#222" />
             </LinearLayout>
@@ -80,7 +79,7 @@
                     android:gravity="center"
                     android:paddingBottom="5dp"
                     android:paddingTop="5dp"
-                    android:text="Faceup"
+                    android:text="@string/stock_facing_faceup"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="#222" />
             </LinearLayout>
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index f48146f..f349214 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -56,8 +56,9 @@
     <string name="msl_availability_availability">Availability</string>
 
     <string name="stock_facing_reference_image">Reference Image</string>
+    <string name="stock_facing_sku_name">SKU Name</string>
     <string name="stock_facing_stock">Stock</string>
-    <string name="stock_facing_facing">Facing</string>
+    <string name="stock_facing_faceup">Facing</string>
     <string name="stock_facing_sos_target">SOS Target</string>