Merge remote-tracking branch 'upstream/dev' into unsupported-url-dialog
This commit is contained in:
bopol
commit
1f3a768f71
290 changed files with 11279 additions and 7754 deletions
|
|
@ -4,44 +4,44 @@
|
|||
<color name="light_youtube_primary_color">#e53935</color>
|
||||
<color name="light_youtube_dark_color">#992722</color>
|
||||
<color name="light_youtube_accent_color">#000000</color>
|
||||
<color name="light_youtube_statusbar_color">#ff4336</color>
|
||||
<color name="light_youtube_statusbar_color">#e53935</color>
|
||||
|
||||
<color name="dark_youtube_primary_color">#CD322E</color>
|
||||
<color name="dark_youtube_dark_color">#992722</color>
|
||||
<color name="dark_youtube_accent_color">#FFFFFF</color>
|
||||
<color name="dark_youtube_statusbar_color">#ff4336</color>
|
||||
<color name="dark_youtube_statusbar_color">#CD322E</color>
|
||||
|
||||
<!-- SoundCloud -->
|
||||
<color name="light_soundcloud_primary_color">#f57c00</color>
|
||||
<color name="light_soundcloud_dark_color">#995700</color>
|
||||
<color name="light_soundcloud_accent_color">#000000</color>
|
||||
<color name="light_soundcloud_statusbar_color">#ff9100</color>
|
||||
<color name="light_soundcloud_statusbar_color">#f57c00</color>
|
||||
|
||||
<color name="dark_soundcloud_primary_color">#f57c00</color>
|
||||
<color name="dark_soundcloud_dark_color">#995700</color>
|
||||
<color name="dark_soundcloud_accent_color">#FFFFFF</color>
|
||||
<color name="dark_soundcloud_statusbar_color">#ff9100</color>
|
||||
<color name="dark_soundcloud_statusbar_color">#f57c00</color>
|
||||
|
||||
<!-- PeerTube -->
|
||||
<color name="light_peertube_primary_color">#ff6f00</color>
|
||||
<color name="light_peertube_dark_color">#c43e00</color>
|
||||
<color name="light_peertube_accent_color">#000000</color>
|
||||
<color name="light_peertube_statusbar_color">#ff833a</color>
|
||||
<color name="light_peertube_statusbar_color">#ff6f00</color>
|
||||
|
||||
<color name="dark_peertube_primary_color">#ff6f00</color>
|
||||
<color name="dark_peertube_dark_color">#c43e00</color>
|
||||
<color name="dark_peertube_accent_color">#FFFFFF</color>
|
||||
<color name="dark_peertube_statusbar_color">#ff833a</color>
|
||||
<color name="dark_peertube_statusbar_color">#ff6f00</color>
|
||||
|
||||
<!-- Media.CCC -->
|
||||
<color name="light_media_ccc_primary_color">#9e9e9e</color>
|
||||
<color name="light_media_ccc_dark_color">#616161</color>
|
||||
<color name="light_media_ccc_accent_color">#000000</color>
|
||||
<color name="light_media_ccc_statusbar_color">#afafaf</color>
|
||||
<color name="light_media_ccc_statusbar_color">#9e9e9e</color>
|
||||
|
||||
<color name="dark_media_ccc_primary_color">#9e9e9e</color>
|
||||
<color name="dark_media_ccc_dark_color">#616161</color>
|
||||
<color name="dark_media_ccc_accent_color">#FFFFFF</color>
|
||||
<color name="dark_media_ccc_statusbar_color">#afafaf</color>
|
||||
<color name="dark_media_ccc_statusbar_color">#9e9e9e</color>
|
||||
|
||||
</resources>
|
||||
|
|
@ -40,6 +40,15 @@
|
|||
<dimen name="video_item_detail_description_to_details_margin">4dp</dimen>
|
||||
<dimen name="software_component_item_padding">8dp</dimen>
|
||||
<dimen name="channel_item_grid_padding">12dp</dimen>
|
||||
|
||||
<!-- Players padding & sizes -->
|
||||
<dimen name="player_main_controls_padding">16dp</dimen>
|
||||
<dimen name="player_popup_controls_padding">6dp</dimen>
|
||||
<dimen name="player_main_top_padding">4dp</dimen>
|
||||
<dimen name="player_main_buttons_padding">6dp</dimen>
|
||||
<dimen name="player_popup_buttons_padding">1dp</dimen>
|
||||
<dimen name="player_main_buttons_min_width">40dp</dimen>
|
||||
|
||||
<!-- Miscellaneous -->
|
||||
<dimen name="popup_default_width">180dp</dimen>
|
||||
<dimen name="popup_minimum_width">150dp</dimen>
|
||||
|
|
@ -68,6 +77,7 @@
|
|||
<dimen name="video_item_detail_like_image_width">18sp</dimen>
|
||||
<dimen name="channel_avatar_size">70dp</dimen>
|
||||
<dimen name="sub_channel_avatar_size">35dp</dimen>
|
||||
<dimen name="mini_player_height">60dp</dimen>
|
||||
<!-- Paddings & Margins -->
|
||||
<dimen name="video_item_detail_like_margin">5dp</dimen>
|
||||
<dimen name="video_item_detail_error_panel_margin">50dp</dimen>
|
||||
|
|
@ -115,4 +125,5 @@
|
|||
<dimen name="feed_group_carousel_top_bottom_margin">2dp</dimen>
|
||||
<dimen name="feed_group_carousel_between_items_margin">4dp</dimen>
|
||||
|
||||
<dimen name="search_suggestion_text_size">16sp</dimen>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<string name="auto_queue_key" translatable="false">auto_queue_key</string>
|
||||
<string name="screen_brightness_key" translatable="false">screen_brightness_key</string>
|
||||
<string name="screen_brightness_timestamp_key" translatable="false">screen_brightness_timestamp_key</string>
|
||||
<string name="clear_queue_confirmation_key" translatable="false">clear_queue_confirmation_key</string>
|
||||
|
||||
<string name="seek_duration_key" translatable="false">seek_duration</string>
|
||||
<string name="seek_duration_default_value" translatable="false">10000</string>
|
||||
|
|
@ -66,6 +67,23 @@
|
|||
<item>@string/minimize_on_exit_popup_description</item>
|
||||
</string-array>
|
||||
|
||||
|
||||
<string name="autoplay_key" translatable="false">autoplay_key</string>
|
||||
<string name="autoplay_value" translatable="false">@string/autoplay_wifi_key</string>
|
||||
<string name="autoplay_always_key" translatable="false">autoplay_always_key</string>
|
||||
<string name="autoplay_wifi_key" translatable="false">autoplay_wifi_key</string>
|
||||
<string name="autoplay_never_key" translatable="false">autoplay_never_key</string>
|
||||
<string-array name="autoplay_type_key" translatable="false">
|
||||
<item>@string/autoplay_always_key</item>
|
||||
<item>@string/autoplay_wifi_key</item>
|
||||
<item>@string/autoplay_never_key</item>
|
||||
</string-array>
|
||||
<string-array name="autoplay_type_description" translatable="false">
|
||||
<item>@string/autoplay_always_description</item>
|
||||
<item>@string/autoplay_wifi_description</item>
|
||||
<item>@string/autoplay_never_description</item>
|
||||
</string-array>
|
||||
|
||||
<string name="default_resolution_key" translatable="false">default_resolution</string>
|
||||
<string name="default_resolution_value" translatable="false">360p</string>
|
||||
<string name="show_higher_resolutions_key" translatable="false">show_higher_resolutions</string>
|
||||
|
|
@ -126,8 +144,6 @@
|
|||
<item>@string/audio_webm_key</item>
|
||||
</string-array>
|
||||
|
||||
<string name="last_orientation_landscape_key" translatable="false">last_orientation_landscape_key</string>
|
||||
|
||||
<string name="last_resize_mode" translatable="false">last_resize_mode</string>
|
||||
|
||||
<!-- DEBUG ONLY -->
|
||||
|
|
@ -220,6 +236,11 @@
|
|||
<string name="clear_playback_states_key" translatable="false">clear_playback_states</string>
|
||||
<string name="clear_search_history_key" translatable="false">clear_search_history</string>
|
||||
|
||||
<string name="last_used_download_type" translatable="false">@string/last_download_type_video_key</string>
|
||||
<string name="last_download_type_video_key" translatable="false">last_dl_type_video</string>
|
||||
<string name="last_download_type_audio_key" translatable="false">last_dl_type_audio</string>
|
||||
<string name="last_download_type_subtitle_key" translatable="false">last_dl_type_subtitle</string>
|
||||
|
||||
<string name="downloads_storage_ask" translatable="false">downloads_storage_ask</string>
|
||||
<string name="storage_use_saf" translatable="false">storage_use_saf</string>
|
||||
|
||||
|
|
@ -966,12 +987,15 @@
|
|||
<item>@string/default_localization_key</item>
|
||||
<item>ace</item>
|
||||
<item>ar</item>
|
||||
<item>ar-ly</item>
|
||||
<item>az</item>
|
||||
<item>ast</item>
|
||||
<item>be</item>
|
||||
<item>bg-bd</item>
|
||||
<item>bn</item>
|
||||
<item>bg</item>
|
||||
<item>bn-bd</item>
|
||||
<item>bn-in</item>
|
||||
<item>ca</item>
|
||||
<item>ckb</item>
|
||||
<item>cs</item>
|
||||
<item>da</item>
|
||||
<item>de</item>
|
||||
|
|
@ -995,6 +1019,8 @@
|
|||
<item>in</item>
|
||||
<item>it</item>
|
||||
<item>ja</item>
|
||||
<item>jv</item>
|
||||
<item>kab</item>
|
||||
<item>ko</item>
|
||||
<item>ku</item>
|
||||
<item>lt</item>
|
||||
|
|
@ -1031,12 +1057,15 @@
|
|||
<item>@string/systems_language</item>
|
||||
<item>Basa Acèh</item>
|
||||
<item>العربية</item>
|
||||
<item>العربية (ليبيا)</item>
|
||||
<item>Azərbaycan dili</item>
|
||||
<item>Asturianu</item>
|
||||
<item>Беларуская</item>
|
||||
<item>български език</item>
|
||||
<item>বাংলা</item>
|
||||
<item>বাংলা (বাংলাদেশ)</item>
|
||||
<item>বাংলা (भारत)</item>
|
||||
<item>Català</item>
|
||||
<item>کوردیی سۆرانی</item>
|
||||
<item>Čeština</item>
|
||||
<item>Dansk</item>
|
||||
<item>Deutsch</item>
|
||||
|
|
@ -1060,6 +1089,8 @@
|
|||
<item>Bahasa Indonesia</item>
|
||||
<item>Italiano</item>
|
||||
<item>日本語</item>
|
||||
<item>ꦧꦱꦗꦮ</item>
|
||||
<item>Taqbaylit</item>
|
||||
<item>한국어</item>
|
||||
<item>کوردی</item>
|
||||
<item>Lietuvių kalba</item>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
<string name="search">Search</string>
|
||||
<string name="settings">Settings</string>
|
||||
<string name="did_you_mean">Did you mean: %1$s?</string>
|
||||
<string name="search_showing_result_for">Showing results for: %s</string>
|
||||
<string name="share_dialog_title">Share with</string>
|
||||
<string name="choose_browser">Choose browser</string>
|
||||
<string name="screen_rotation">rotation</string>
|
||||
|
|
@ -66,11 +67,14 @@
|
|||
<string name="light_theme_title">Light</string>
|
||||
<string name="dark_theme_title">Dark</string>
|
||||
<string name="black_theme_title">Black</string>
|
||||
<string name="popup_remember_size_pos_title">Remember popup size and position</string>
|
||||
<string name="popup_remember_size_pos_title">Remember popup properties</string>
|
||||
<string name="popup_remember_size_pos_summary">Remember last size and position of popup</string>
|
||||
<string name="use_inexact_seek_title">Use fast inexact seek</string>
|
||||
<string name="use_inexact_seek_summary">Inexact seek allows the player to seek to positions faster with reduced precision. Seeking for 5, 15 or 25 seconds doesn\'t work with this.</string>
|
||||
<string name="seek_duration_title">Fast-forward/-rewind seek duration</string>
|
||||
<string name="clear_queue_confirmation_title">Ask for confirmation before clearing a queue</string>
|
||||
<string name="clear_queue_confirmation_summary">After switching from one player to another your queue may be replaced</string>
|
||||
<string name="clear_queue_confirmation_description">Queue from the active player will be replaced</string>
|
||||
<string name="download_thumbnail_title">Load thumbnails</string>
|
||||
<string name="show_comments_title">Show comments</string>
|
||||
<string name="show_comments_summary">Turn off to hide comments</string>
|
||||
|
|
@ -81,6 +85,7 @@
|
|||
<string name="metadata_cache_wipe_complete_notice">Metadata cache wiped</string>
|
||||
<string name="auto_queue_title">Auto-queue next stream</string>
|
||||
<string name="auto_queue_summary">Continue ending (non-repeating) playback queue by appending a related stream</string>
|
||||
<string name="auto_queue_toggle">Auto-queue</string>
|
||||
<string name="volume_gesture_control_title">Volume gesture control</string>
|
||||
<string name="volume_gesture_control_summary">Use gestures to control player volume</string>
|
||||
<string name="brightness_gesture_control_title">Brightness gesture control</string>
|
||||
|
|
@ -235,11 +240,14 @@
|
|||
<string name="sorry_string">Sorry, that should not have happened.</string>
|
||||
<string name="guru_meditation" translatable="false">Guru Meditation.</string>
|
||||
<string name="error_report_button_text">Report this error via e-mail</string>
|
||||
<string name="copy_for_github">Copy formatted report</string>
|
||||
<string name="error_report_open_issue_button_text">Report error on GitHub</string>
|
||||
<string name="error_report_open_github_notice">Please check whether an issue discussing your crash already exists. When creating duplicate tickets, you take time from us which we could spend with fixing the actual bug.</string>
|
||||
<string name="error_snackbar_message">Sorry, some errors occurred.</string>
|
||||
<string name="error_snackbar_action">Report</string>
|
||||
<string name="what_device_headline">Info:</string>
|
||||
<string name="what_happened_headline">What happened:</string>
|
||||
<string name="info_labels">What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:</string>
|
||||
<string name="info_labels">What:\\nRequest:\\nContent Language:\\nContent Country:\\nApp Language:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:</string>
|
||||
<string name="your_comment">Your comment (in English):</string>
|
||||
<string name="error_details_headline">Details:</string>
|
||||
<!-- Content descriptions (for better accessibility) -->
|
||||
|
|
@ -349,7 +357,7 @@
|
|||
<string name="action_settings">Settings</string>
|
||||
<string name="action_about">About</string>
|
||||
<string name="title_licenses">Third-party Licenses</string>
|
||||
<string name="copyright" formatted="true">© %1$s by %2$s under %3$s</string>
|
||||
<string name="copyright">© %1$s by %2$s under %3$s</string>
|
||||
<string name="error_unable_to_load_license">Could not load license</string>
|
||||
<string name="action_open_website">Open website</string>
|
||||
<string name="tab_about">About</string>
|
||||
|
|
@ -400,6 +408,8 @@
|
|||
<string name="channel_page_summary">Channel Page</string>
|
||||
<string name="select_a_channel">Select a channel</string>
|
||||
<string name="no_channel_subscribed_yet">No channel subscriptions yet</string>
|
||||
<string name="select_a_playlist">Select a playlist</string>
|
||||
<string name="no_playlist_bookmarked_yet">No playlists bookmarks yet</string>
|
||||
<string name="select_a_kiosk">Select a kiosk</string>
|
||||
<string name="export_complete_toast">Exported</string>
|
||||
<string name="import_complete_toast">Imported</string>
|
||||
|
|
@ -420,8 +430,7 @@
|
|||
<string name="conferences">Conferences</string>
|
||||
<string name="service_kiosk_string" translatable="false">%1$s/%2$s</string>
|
||||
<!-- Play Queue -->
|
||||
<string name="title_activity_background_player">Background player</string>
|
||||
<string name="title_activity_popup_player">Popup player</string>
|
||||
<string name="title_activity_play_queue">Play queue</string>
|
||||
<string name="play_queue_remove">Remove</string>
|
||||
<string name="play_queue_stream_detail">Details</string>
|
||||
<string name="play_queue_audio_settings">Audio Settings</string>
|
||||
|
|
@ -531,13 +540,18 @@
|
|||
<string name="minimize_on_exit_none_description">None</string>
|
||||
<string name="minimize_on_exit_background_description">Minimize to background player</string>
|
||||
<string name="minimize_on_exit_popup_description">Minimize to popup player</string>
|
||||
<!-- Autoplay behavior -->
|
||||
<string name="autoplay_summary">Start playback automatically — %s</string>
|
||||
<string name="autoplay_always_description">Always</string>
|
||||
<string name="autoplay_wifi_description">Only on WiFi</string>
|
||||
<string name="autoplay_never_description">Never</string>
|
||||
<string name="list_view_mode">List view mode</string>
|
||||
<string name="list">List</string>
|
||||
<string name="grid">Grid</string>
|
||||
<string name="auto">Auto</string>
|
||||
<string name="switch_view">Switch View</string>
|
||||
<!-- App update notification -->
|
||||
<string name="app_update_notification_content_title">NewPipe Update Available!</string>
|
||||
<string name="app_update_notification_content_title">NewPipe update is available!</string>
|
||||
<string name="app_update_notification_content_text">Tap to download</string>
|
||||
<string name="missions_header_finished">Finished</string>
|
||||
<string name="missions_header_pending">Pending</string>
|
||||
|
|
@ -580,7 +594,7 @@
|
|||
<string name="clear_download_history">Clear download history</string>
|
||||
<string name="confirm_prompt">Do you want to clear your download history or delete all downloaded files?</string>
|
||||
<string name="delete_downloaded_files">Delete downloaded files</string>
|
||||
<string name="deleted_downloads">Deleted %1$s downloads</string>
|
||||
<string name="deleted_downloads">Deleted %1$d downloads</string>
|
||||
<string name="stop">Stop</string>
|
||||
<string name="max_retry_msg">Maximum retries</string>
|
||||
<string name="max_retry_desc">Maximum number of attempts before canceling the download</string>
|
||||
|
|
@ -638,6 +652,7 @@
|
|||
<string name="feed_group_dialog_name_input">Name</string>
|
||||
<string name="feed_group_dialog_delete_message">Do you want to delete this group?</string>
|
||||
<string name="feed_create_new_group_button_title">New</string>
|
||||
<string name="feed_group_show_only_ungrouped_subscriptions">Show only ungrouped subscriptions</string>
|
||||
<string name="settings_category_feed_title">Feed</string>
|
||||
<string name="feed_update_threshold_title">Feed update threshold</string>
|
||||
<string name="feed_update_threshold_summary">Time after last update before a subscription is considered outdated — %s</string>
|
||||
|
|
@ -651,4 +666,5 @@
|
|||
<string name="detail_sub_channel_thumbnail_view_description">Channel\'s avatar thumbnail</string>
|
||||
<string name="channel_created_by">Created by %s</string>
|
||||
<string name="video_detail_by">By %s</string>
|
||||
<string name="playlist_page_summary">Playlist page</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
<style name="LightTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/light_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/light_background_color</item>
|
||||
<item name="windowBackground">@color/light_background_color</item>
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
<style name="Base.DarkTheme" parent="Base.V7.DarkTheme" />
|
||||
<style name="DarkTheme" parent="Base.DarkTheme">
|
||||
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/dark_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/dark_background_color</item>
|
||||
<item name="windowBackground">@color/dark_background_color</item>
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
<!-- Dialogs -->
|
||||
<style name="LightDialogTheme" parent="Theme.AppCompat.Light.Dialog">
|
||||
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/light_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/light_dialog_background_color</item>
|
||||
<item name="windowBackground">@color/light_dialog_background_color</item>
|
||||
|
|
@ -248,7 +248,7 @@
|
|||
|
||||
<style name="DarkDialogTheme" parent="Theme.AppCompat.Dialog">
|
||||
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/dark_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/dark_dialog_background_color</item>
|
||||
<item name="windowBackground">@color/dark_dialog_background_color</item>
|
||||
|
|
@ -256,7 +256,7 @@
|
|||
|
||||
<style name="LightDialogMinWidthTheme" parent="Theme.AppCompat.Light.Dialog.MinWidth">
|
||||
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/light_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/light_dialog_background_color</item>
|
||||
<item name="windowBackground">@color/light_dialog_background_color</item>
|
||||
|
|
@ -264,7 +264,7 @@
|
|||
|
||||
<style name="DarkDialogMinWidthTheme" parent="Theme.AppCompat.Dialog.MinWidth">
|
||||
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/dark_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/dark_dialog_background_color</item>
|
||||
<item name="windowBackground">@color/dark_dialog_background_color</item>
|
||||
|
|
@ -289,7 +289,7 @@
|
|||
|
||||
<style name="OldVideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/light_youtube_accent_color</item>
|
||||
<item name="android:windowFullscreen">false</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
|
|
@ -330,5 +330,4 @@
|
|||
<item name="android:windowAnimationStyle">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="VideoPlayerTheme" />
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue