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

Merge remote-tracking branch 'upstream/dev' into dev

Browse source 
merging dev
This commit is contained in:
bopol 2020-02-01 15:11:01 +01:00
commit c5e6bb58bc
25 changed files with 677 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/values/strings.xml
View file

@ -227,6 +227,7 @@
<string name="saved_tabs_invalid_json">Using default tabs, error while reading saved tabs</string>
<string name="restore_defaults">Restore defaults</string>
<string name="restore_defaults_confirmation">Do you want to restore the defaults?</string>
<string name="permission_display_over_apps">Give permission to display over other apps</string>
<!-- error activity -->
<string name="sorry_string">Sorry, that should not have happened.</string>
<string name="guru_meditation" translatable="false">Guru Meditation.</string>