Merge branch 'dev' of github.com:TeamNewPipe/NewPipe into recaptcha

This commit is contained in:
Stypox 2020-02-01 18:27:00 +01:00
commit f95d51b307
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
45 changed files with 970 additions and 535 deletions

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>
@ -591,4 +592,6 @@
<string name="downloads_storage_use_saf_title">Use SAF</string>
<string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
<string name="choose_instance_prompt">Choose an instance</string>
<string name="app_language_title">App language</string>
<string name="systems_language">System default</string>
</resources>