Merge branch 'dev' into giga-postprocessing

This commit is contained in:
kapodamy 2018-11-28 22:53:29 -03:00 committed by GitHub
commit 7e9bcff0f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 26 additions and 463 deletions

View file

@ -240,8 +240,6 @@
<string name="audio">Audio</string>
<string name="retry">Retry</string>
<string name="storage_permission_denied">Storage access permission denied</string>
<string name="use_old_player_title">Use old player</string>
<string name="use_old_player_summary">Old built-in Mediaframework player</string>
<string name="short_thousand">K</string>
<string name="short_million">M</string>