resolve merge conflicts
This commit is contained in:
parent
c2524bb98c
commit
55fbeb7e28
2 changed files with 4 additions and 4 deletions
|
|
@ -591,6 +591,6 @@
|
|||
<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="system_default">System default</string>
|
||||
<string name="systems_language">System default</string>
|
||||
<string name="dynamic_seek_duration_description">%s seconds</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue