Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'eximport' into dev

Browse source
This commit is contained in:
Christian Schabesberger 2018-02-04 13:40:03 +01:00
commit 87ba5a7eb6
7 changed files with 316 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/values/settings_keys.xml
View file

@ -130,6 +130,8 @@
<string name="main_page_selected_channel_name" translatable="false">main_page_selected_channel_name</string>
<string name="main_page_selected_channel_url" translatable="false">main_page_selected_channel_url</string>
<string name="main_page_selectd_kiosk_id" translatable="false">main_page_selectd_kiosk_id</string>
<string name="import_data">import_data</string>
<string name="export_data">export_data</string>
<!-- FileName Downloads -->
<string name="settings_file_charset_key" translatable="false">file_rename</string>