diff options
| author | ByteHamster <info@bytehamster.com> | 2020-11-06 23:17:33 +0100 |
|---|---|---|
| committer | ByteHamster <info@bytehamster.com> | 2020-11-06 23:17:33 +0100 |
| commit | 8d2df1afa1964c9c0c71c2ecbeb8242752828ba8 (patch) | |
| tree | c082e5d8d690216cab128674d632da200cf5b42e /core/src/main/res/values | |
| parent | d6c00574b493d432f3ecfc0fabf4801a91fc70f6 (diff) | |
| parent | e67e5a35befdc71987c5cdd7eb853f8c0aff6598 (diff) | |
| download | AntennaPod-8d2df1afa1964c9c0c71c2ecbeb8242752828ba8.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'core/src/main/res/values')
| -rw-r--r-- | core/src/main/res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index 13ff092b0..1ab44d847 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -236,7 +236,7 @@ <string-array name="media_player_options"> <item>@string/media_player_builtin</item> <item>@string/media_player_sonic</item> - <item>@string/media_player_exoplayer</item> + <item>@string/media_player_exoplayer_recommended</item> </string-array> <string-array name="media_player_values"> diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 82bb0ced0..7da2bff72 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -501,7 +501,7 @@ <string name="pref_enqueue_downloaded_summary">Add downloaded episodes to the queue</string> <string name="media_player_builtin">Built-in Android player</string> <string name="media_player_sonic" translatable="false">Sonic Media Player</string> - <string name="media_player_exoplayer" translatable="false">ExoPlayer</string> + <string name="media_player_exoplayer_recommended">ExoPlayer (recommended)</string> <string name="media_player_switch_to_exoplayer">Switch to ExoPlayer</string> <string name="media_player_switched_to_exoplayer">Switched to ExoPlayer.</string> <string name="pref_skip_silence_title">Skip Silence in Audio</string> @@ -739,6 +739,7 @@ <string name="reconnect_local_folder">Re-connect local folder</string> <string name="reconnect_local_folder_warning">In case of permission denials, you can use this to re-connect to the exact same folder. Do not select another folder.</string> <string name="local_feed_description">This virtual podcast was created by adding a folder to AntennaPod.</string> + <string name="unable_to_start_system_file_manager">Unable to start system file manager</string> <string name="filter">Filter</string> |