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
This commit is contained in:
@@ -16,6 +16,7 @@
|
|||||||
<string name="menu_daily_download">Günlük Veri Indir</string>
|
<string name="menu_daily_download">Günlük Veri Indir</string>
|
||||||
<string name="menu_upload_data">Veri Paylaş</string>
|
<string name="menu_upload_data">Veri Paylaş</string>
|
||||||
<string name="menu_geotag">Coğrafi Konum</string>
|
<string name="menu_geotag">Coğrafi Konum</string>
|
||||||
|
<string name="menu_export">Data Export</string>
|
||||||
<string name="menu_exit">Çıkış</string>
|
<string name="menu_exit">Çıkış</string>
|
||||||
<string name="menu_setting">Ayarlar</string>
|
<string name="menu_setting">Ayarlar</string>
|
||||||
<string name="menu_services">Hizmetler</string>
|
<string name="menu_services">Hizmetler</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user