AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
This commit is contained in:
yadavendras
2017-01-24 17:28:56 +05:30
parent 38166663dd
commit c5efee08d6
5 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/values/strings.xml
+9 -1
View File
@@ -209,7 +209,7 @@
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="title_activity_checkout">CheckoutActivity</string>
<string name="title_activity_checkout">Checkout Activity</string>
<string name="checkout_successful">Checkout Success</string>
<string name="NetworkError">Network Error ,</string>
@@ -251,5 +251,13 @@
<string name="select_promo">Select</string>
<!--Gagan end code 3-->
//text for uploading screen
<string name="coverage_data_uploading">Coverage Uploading</string>
<string name="availability_data_uploading">Availability Data Uploading</string>
<string name="stock_data_uploading">Stock Data Uploading</string>
<string name="t2p_data_uploading">T2P Data Uploading</string>
<string name="additional_data_uploading">Additional Visibility Data Uploading</string>
<string name="promo_data_uploading">Promo Data Uploading</string>
</resources>