Merge branch 'master' into ysy_latest_setting

This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-13 18:03:13 +05:30
committed by GitHub
17 changed files with 772 additions and 369 deletions
@@ -161,6 +161,15 @@
<!--Gagan start new code 2-->
<string name="stock_facing_planogram_dialog_title">Planogram</string>
<string name="title_activity_settings">SettingsActivity</string>
<string name="ok">OK</string>
<string name="check_save_message">Are you sure you want to save</string>
<string name="save_message">Data has been saved</string>
<string name="update_message">Data has been updated</string>
<string name="empty_field">Fill the value </string>
<string name="fill_data">Please fill all the data</string>
<string name="dialog_title">Parinaam</string>
<!--Gagan end new code 2-->
<string name="select_language_item">Select language</string>