Merge remote-tracking branch 'github/Start-screen-hint' into Start-screen-hint

# Conflicts:
#	app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java

app/src/main/res/values/constants.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <!-- The minimum subtitle font size. -->
+  <dimen name="subtitle_minimum_font_size">13sp</dimen>
+
+</resources>

app/src/main/res/values/dimens.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <!-- Video Item Search View Dimensions-->
     <!-- Text Size -->
     <dimen name="video_item_search_title_text_size">14sp</dimen>
@@ -35,5 +34,8 @@
     <!-- Paddings & Margins -->
     <dimen name="video_item_detail_like_margin">6sp</dimen>
     <dimen name="video_item_detail_play_fab_margin">20dp</dimen>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
 
-</resources>
+</resources>

app/src/main/res/values/settings_keys.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources translatable="false">
     <!-- Categories -->
     <string name="settings_category_video_audio">settings_category_video_audio</string>
     <string name="settings_category_appearance">settings_category_appearance</string>
+    <string name="settings_content_options">settings_content_options</string>
     <string name="settings_category_other">settings_category_other</string>
     <!-- Key values -->
     <string name="download_path_key">download_path</string>
@@ -10,6 +11,7 @@
     <string name="use_external_video_player_key">use_external_video_player</string>
     <string name="use_external_audio_player_key">use_external_audio_player</string>
     <string name="autoplay_through_intent_key">autoplay_through_intent</string>
+    <string name="use_exoplayer_key">use_exoplayer</string>
 
     <string name="default_resolution_key">default_resolution_preference</string>
     <string name="default_resolution_value">360p</string>
@@ -207,5 +209,6 @@
         <item>日本語</item>
         <item>한국어</item>
     </string-array>
+    <string name="show_age_restricted_content">show_age_restricted_content</string>
     <string name="use_tor_key">use_tor</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" translatable="false">NewPipe</string>
     <string name="main_bg_subtitle">Tap search to get started</string>
     <string name="background_player_name">NewPipe Background Player</string>
@@ -16,7 +16,7 @@
     <string name="download">Download</string>
     <string name="search">Search</string>
     <string name="settings">Settings</string>
-    <string name="did_you_mean">Did you mean: </string>
+    <string name="did_you_mean">Did you mean: %1$s ?</string>
     <string name="search_page">Search page: </string>
     <string name="share_dialog_title">Share with:</string>
     <string name="choose_browser">Choose browser:</string>
@@ -33,8 +33,8 @@
     <string name="download_path_audio_summary">Path to store downloaded audio in.</string>
     <string name="download_path_audio_dialog_title">Enter download path for audio files.</string>
 
-    <string name="autoplay_through_intent_title">Autoplay through Intent</string>
-    <string name="autoplay_through_intent_summary">Automatically play a video when it\'s called from another app.</string>
+    <string name="autoplay_by_calling_app_title">Autoplay when called form another app.</string>
+    <string name="autoplay_by_calling_app_summary">Automatically play a video when NewPipe is called from another app.</string>
     <string name="default_resolution_title">Default Resolution</string>
     <string name="play_with_kodi_title">Play with Kodi</string>
     <string name="kore_not_found">Kore app not found. Install Kore?</string>
@@ -54,6 +54,15 @@
         <item>Video</item>
         <item>Audio</item>
     </string-array>
+
+    <string-array name="download_options_no_audio">
+        <item>Video</item>
+    </string-array>
+
+    <string-array name="download_options_no_video">
+        <item>Audio</item>
+    </string-array>
+
     <string name="next_video_title">Next video</string>
     <string name="show_next_and_similar_title">Show next and similar videos</string>
     <string name="url_not_supported_toast">URL not supported</string>
@@ -66,13 +75,37 @@
     <string name="background_player_playing_toast">Playing in background</string>
     <string name="c3s_url" translatable="false">https://www.c3s.cc/</string>
     <string name="play_btn_text">Play</string>
+    <string name="content">Content</string>
+    <string name="show_age_restricted_content_title">Show age restricted content</string>
+    <string name="video_is_age_restricted">Video is Age restricted. Enable age restricted videos in the settings first.</string>
+    <string name="duration_live">live</string>
+
+    <!-- error strings -->
     <string name="general_error">Error</string>
     <string name="network_error">Network error</string>
     <string name="could_not_load_thumbnails">Could not load all Thumbnails</string>
     <string name="youtube_signature_decryption_error">Could not decrypt video url signature.</string>
     <string name="parsing_error">Could not parse website.</string>
+    <string name="light_parsing_error">Could not parse website complete.</string>
     <string name="content_not_available">Content not available.</string>
     <string name="blocked_by_gema">Blocked by GEMA.</string>
+    <string name="could_not_setup_download_menu">Could not setup download menu.</string>
+    <string name="live_streams_not_supported">This is a LIVE STREAM. These are not yet supported.</string>
+    <string name="could_not_get_stream">Could not get any stream.</string>
+    <!-- error activity -->
+    <string name="sorry_string">Sorry that should not happen.</string>
+    <string name="guru_meditation" translatable="false">Guru Meditation.</string>
+    <string name="error_report_button_text">Report error via mail</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:\\nVersion:\\nOS version:\\nGlob. IP range:</string>
+    <string name="info_searched_lbl">Searched for:</string>
+    <string name="info_requested_stream_lbl">Requested stream:</string>
+    <string name="your_comment">Your comment (in English):</string>
+    <string name="error_details_headline">Details:</string>
+
 
     <!-- Content descriptions (for better accessibility) -->
     <string name="list_thumbnail_view_description">Video preview thumbnail</string>
@@ -81,8 +114,30 @@
     <string name="detail_likes_img_view_description">Likes</string>
     <string name="detail_dislikes_img_view_description">Dislikes</string>
     <string name="use_tor_title">Use Tor</string>
-    <string name="use_tor_summary">Force download traffic through Tor for increased privacy (streaming videos not yet supported)</string>
+    <string name="use_tor_summary">(Experimental) Force download traffic through Tor for increased privacy (streaming videos not yet supported).</string>
+    <string name="report_error">Report an Error</string>
+    <string name="user_report">User report</string>
 
     <string name="err_dir_create">Cannot create download directory \'%1$s\'</string>
     <string name="info_dir_created">Created download directory \'%1$s\'</string>
-</resources>
+
+	<string name="enable_background_audio">Play in background</string>
+    <string name="video">Video</string>
+    <string name="audio">Audio</string>
+    <string name="text">Text</string>
+    <string name="logging">Logging</string>
+    <string name="logging_normal">Normal</string>
+    <string name="logging_verbose">Verbose</string>
+    <string name="retry">Retry</string>
+    <string name="off">[off]</string>
+    <string name="error_drm_not_supported">Protected content not supported on API levels below 18</string>
+    <string name="error_drm_unsupported_scheme">This device does not support the required DRM scheme</string>
+    <string name="error_drm_unknown">An unknown DRM error occurred</string>
+    <string name="error_no_decoder">This device does not provide a decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
+    <string name="error_no_secure_decoder">This device does not provide a secure decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
+    <string name="error_querying_decoders">Unable to query device decoders</string>
+    <string name="error_instantiating_decoder">Unable to instantiate decoder <xliff:g id="decoder_name">%1$s</xliff:g></string>
+    <string name="storage_permission_denied">Permission to access storage was denied</string>
+    <string name="use_exoplayer_title">Use ExoPlayer</string>
+    <string name="use_exoplayer_summary">Experimental</string>
+</resources>

app/src/main/res/values/styles.xml

@@ -1,4 +1,19 @@
 <resources>
+
+  <style name="RootTheme" parent="android:Theme.Holo">
+  </style>
+
+  <style name="PlayerTheme" parent="@style/RootTheme">
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowBackground">@android:color/black</item>
+  </style>
+
+  <style name="ExoPlayerButton">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:minWidth">40dp</item>
+  </style>
+
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
@@ -32,4 +47,5 @@
         <item name="android:background">@color/video_overlay_color</item>
         <item name="background">@color/video_overlay_color</item>
     </style>
-</resources>
+
+</resources>