Merge remote-tracking branch 'origin/dev' into notifications
This commit is contained in:
commit
16d4a034e2
82 changed files with 324 additions and 264 deletions
|
|
@ -360,6 +360,7 @@
|
|||
<string name="background_player_key" translatable="false">background_player</string>
|
||||
<string name="popup_player_key" translatable="false">popup_player</string>
|
||||
<string name="download_key" translatable="false">download</string>
|
||||
<string name="add_to_playlist_key" translatable="false">add_to_playlist</string>
|
||||
<string name="always_ask_open_action_key" translatable="false">always_ask_player</string>
|
||||
|
||||
<string-array name="preferred_open_action_description_list" translatable="false">
|
||||
|
|
@ -368,6 +369,7 @@
|
|||
<item>@string/background_player</item>
|
||||
<item>@string/popup_player</item>
|
||||
<item>@string/download</item>
|
||||
<item>@string/add_to_playlist</item>
|
||||
<item>@string/always_ask_open_action</item>
|
||||
</string-array>
|
||||
<string-array name="preferred_open_action_values_list" translatable="false">
|
||||
|
|
@ -376,6 +378,7 @@
|
|||
<item>@string/background_player_key</item>
|
||||
<item>@string/popup_player_key</item>
|
||||
<item>@string/download_key</item>
|
||||
<item>@string/add_to_playlist_key</item>
|
||||
<item>@string/always_ask_open_action_key</item>
|
||||
</string-array>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue