Merge branch 'dev' into 1473_remove_duplicates_from_playlist
This commit is contained in:
commit
e26fafd61b
308 changed files with 5310 additions and 1395 deletions
|
|
@ -1,5 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- Common dimensions -->
|
||||
<dimen name="margin_normal">16dp</dimen>
|
||||
<dimen name="margin_small">8dp</dimen>
|
||||
<dimen name="margin_large">32dp</dimen>
|
||||
<dimen name="spacing_normal">8dp</dimen>
|
||||
<dimen name="spacing_micro">4dp</dimen>
|
||||
<dimen name="spacing_nano">2dp</dimen>
|
||||
|
||||
<!-- Menu Drawer Dimensions -->
|
||||
<dimen name="drawer_header_content_min_height">120dp</dimen>
|
||||
<dimen name="drawer_header_padding_top">16dp</dimen>
|
||||
|
|
@ -30,7 +38,7 @@
|
|||
<dimen name="video_item_grid_thumbnail_image_width">164dp</dimen>
|
||||
<dimen name="video_item_grid_thumbnail_image_height">92dp</dimen>
|
||||
|
||||
<dimen name="channel_item_grid_thumbnail_image_size">42dp</dimen>
|
||||
<dimen name="channel_item_grid_thumbnail_image_size">92dp</dimen>
|
||||
<dimen name="channel_item_grid_min_width">128dp</dimen>
|
||||
<!-- Calculated: 2*video_item_search_padding + video_item_search_thumbnail_image_height -->
|
||||
<dimen name="video_item_search_height">96dp</dimen>
|
||||
|
|
|
|||
|
|
@ -27,4 +27,5 @@
|
|||
<string name="soundcloud">SoundCloud</string>
|
||||
<string name="preferred_open_action_share_menu_title">@string/app_name</string>
|
||||
<string name="leakcanary">LeakCanary</string>
|
||||
<string name="caption_file_name">%1$s-%2$s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -443,6 +443,7 @@
|
|||
<item>no</item>
|
||||
<item>nn</item>
|
||||
<item>uz</item>
|
||||
<item>or</item>
|
||||
<item>pl</item>
|
||||
<item>pt-PT</item>
|
||||
<item>pt</item>
|
||||
|
|
@ -494,7 +495,7 @@
|
|||
<string-array name="language_names">
|
||||
<item>@string/systems_language</item>
|
||||
<item>Afrikaans</item>
|
||||
<item>Azərbaycan</item>
|
||||
<item>Azərbaycanca</item>
|
||||
<item>Bahasa Indonesia</item>
|
||||
<item>Bahasa Malaysia</item>
|
||||
<item>Català</item>
|
||||
|
|
@ -522,6 +523,7 @@
|
|||
<item>Norsk</item>
|
||||
<item>Nynorsk</item>
|
||||
<item>O‘zbek</item>
|
||||
<item>ଓଡ଼ିଆ</item>
|
||||
<item>Polski</item>
|
||||
<item>Português</item>
|
||||
<item>Português (Brasil)</item>
|
||||
|
|
@ -1129,6 +1131,7 @@
|
|||
<item>nl</item>
|
||||
<item>nl-be</item>
|
||||
<item>oc</item>
|
||||
<item>or</item>
|
||||
<item>pa</item>
|
||||
<item>pl</item>
|
||||
<item>pt</item>
|
||||
|
|
@ -1162,7 +1165,7 @@
|
|||
<item>Basa Acèh</item>
|
||||
<item>العربية</item>
|
||||
<item>العربية (ليبيا)</item>
|
||||
<item>Azərbaycan dili</item>
|
||||
<item>Azərbaycanca</item>
|
||||
<item>Asturianu</item>
|
||||
<item>Беларуская</item>
|
||||
<item>ⵜⴰⵎⴰⵣⵉⵖⵜ</item>
|
||||
|
|
@ -1211,13 +1214,14 @@
|
|||
<item>Nederlands (NL)</item>
|
||||
<item>Nederlands (BE)</item>
|
||||
<item>Occitan</item>
|
||||
<item>ଓଡ଼ିଆ</item>
|
||||
<item>ਪੰਜਾਬੀ</item>
|
||||
<item>Polski</item>
|
||||
<item>Português</item>
|
||||
<item>Português (BR)</item>
|
||||
<item>Português (PT)</item>
|
||||
<item>Română</item>
|
||||
<item>русский язык</item>
|
||||
<item>Pусский</item>
|
||||
<item>ᱥᱟᱱᱛᱟᱲᱤ</item>
|
||||
<item>sardu</item>
|
||||
<item>Slovenčina</item>
|
||||
|
|
@ -1263,16 +1267,19 @@
|
|||
<string name="list_view_mode_auto_key">auto</string>
|
||||
<string name="list_view_mode_list_key">list</string>
|
||||
<string name="list_view_mode_grid_key">grid</string>
|
||||
<string name="list_view_mode_card_key">card</string>
|
||||
|
||||
<string-array name="list_view_mode_values">
|
||||
<item>@string/list_view_mode_auto_key</item>
|
||||
<item>@string/list_view_mode_list_key</item>
|
||||
<item>@string/list_view_mode_grid_key</item>
|
||||
<item>@string/list_view_mode_card_key</item>
|
||||
</string-array>
|
||||
<string-array name="list_view_mode_description">
|
||||
<item>@string/auto</item>
|
||||
<item>@string/list</item>
|
||||
<item>@string/grid</item>
|
||||
<item>@string/card</item>
|
||||
</string-array>
|
||||
|
||||
<string name="tablet_mode_key">tablet_mode</string>
|
||||
|
|
|
|||
|
|
@ -327,6 +327,7 @@
|
|||
<string name="msg_calculating_hash">Calculating hash</string>
|
||||
<string name="msg_wait">Please wait…</string>
|
||||
<string name="msg_copied">Copied to clipboard</string>
|
||||
<string name="msg_failed_to_copy">Failed to copy to clipboard</string>
|
||||
<string name="no_available_dir">Please define a download folder later in settings</string>
|
||||
<string name="no_dir_yet">No download folder set yet, choose the default download folder now</string>
|
||||
<string name="msg_popup_permission">This permission is needed to\nopen in popup mode</string>
|
||||
|
|
@ -432,6 +433,7 @@
|
|||
<string name="preferred_player_fetcher_notification_message">"Loading requested content"</string>
|
||||
<!-- Local Playlist -->
|
||||
<string name="create_playlist">New Playlist</string>
|
||||
<string name="duplicate_in_playlist">The playlists that are grayed out already contain this item.</string>
|
||||
<string name="rename_playlist">Rename</string>
|
||||
<string name="name">Name</string>
|
||||
<string name="add_to_playlist">Add to playlist</string>
|
||||
|
|
@ -439,11 +441,13 @@
|
|||
<string name="mute">Mute</string>
|
||||
<string name="unmute">Unmute</string>
|
||||
<string name="set_as_playlist_thumbnail">Set as playlist thumbnail</string>
|
||||
<string name="unset_playlist_thumbnail">Unset permanent thumbnail</string>
|
||||
<string name="bookmark_playlist">Bookmark Playlist</string>
|
||||
<string name="unbookmark_playlist">Remove Bookmark</string>
|
||||
<string name="delete_playlist_prompt">Delete this playlist\?</string>
|
||||
<string name="playlist_creation_success">Playlist created</string>
|
||||
<string name="playlist_add_stream_success">Playlisted</string>
|
||||
<string name="playlist_add_stream_success_duplicate">Duplicate added %d time(s)</string>
|
||||
<string name="playlist_thumbnail_change_success">Playlist thumbnail changed.</string>
|
||||
<string name="playlist_no_uploader">Auto-generated (no uploader found)</string>
|
||||
<!-- Players -->
|
||||
|
|
@ -548,6 +552,7 @@
|
|||
<string name="list_view_mode">List view mode</string>
|
||||
<string name="list">List</string>
|
||||
<string name="grid">Grid</string>
|
||||
<string name="card">Card</string>
|
||||
<string name="auto">Auto</string>
|
||||
<!-- Seekbar Preview Thumbnail-->
|
||||
<string name="seekbar_preview_thumbnail_title">Seekbar thumbnail preview</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue