Merge branch 'dev' of https://github.com/TeamNewPipe/NewPipe into dev
This commit is contained in:
commit
1d0c3de65f
45 changed files with 1787 additions and 1598 deletions
|
|
@ -45,22 +45,21 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/drawer_header_newpipe_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="@dimen/drawer_header_newpipe_title_default_width"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="@dimen/drawer_header_newpipe_icon_title_space"
|
||||
android:ellipsize="end"
|
||||
android:gravity="start|center_vertical"
|
||||
android:hyphenationFrequency="full"
|
||||
android:maxWidth="@dimen/drawer_header_newpipe_title_max_width"
|
||||
android:maxLines="2"
|
||||
android:minWidth="@dimen/drawer_header_newpipe_title_min_width"
|
||||
android:maxLines="1"
|
||||
android:text="@string/app_name"
|
||||
android:textColor="@color/drawer_header_font_color"
|
||||
android:textStyle="bold"
|
||||
app:autoSizeMaxTextSize="@dimen/drawer_header_newpipe_title_max_text_size"
|
||||
app:autoSizeMinTextSize="@dimen/drawer_header_newpipe_title_min_text_size"
|
||||
app:autoSizeTextType="uniform"
|
||||
tools:ignore="UnusedAttribute" />
|
||||
tools:ignore="UnusedAttribute"
|
||||
tools:text="NewPipe" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
tools:visibility="visible">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/channel_kaomoji"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
|
|
@ -42,12 +43,22 @@
|
|||
tools:ignore="HardcodedText,UnusedAttribute"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/channel_no_videos"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/empty_view_no_videos"
|
||||
android:textSize="24sp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_marginTop="20dp"
|
||||
android:id="@+id/error_content_not_supported"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/content_not_supported"
|
||||
android:textSize="15sp"
|
||||
android:visibility="gone" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!--ERROR PANEL-->
|
||||
|
|
|
|||
|
|
@ -586,4 +586,5 @@
|
|||
<string name="mute">Mutigi</string>
|
||||
<string name="unmute">Malmutigi</string>
|
||||
<string name="help">Helpo</string>
|
||||
<string name="content_not_supported">Tio enhavo ne estas ankoraŭ subtenata per NewPipe.\n\nĜi espereble estos en sekvanta versio.</string>
|
||||
</resources>
|
||||
|
|
@ -598,4 +598,5 @@
|
|||
\n
|
||||
\n Donc le choix vous revient : Préferez-vous la vitesse ou des informations précises \?</string>
|
||||
<string name="help">Aide</string>
|
||||
<string name="content_not_supported">Ce contenu n\'est pas encore supporté par NewPipe.\n\nIl le sera peut-être dans une version future.</string>
|
||||
</resources>
|
||||
|
|
@ -596,4 +596,7 @@
|
|||
<string name="drawer_header_description">Toggle service, momenteel geselecteerd:</string>
|
||||
<string name="most_liked">Meest geliked</string>
|
||||
<string name="error_postprocessing_stopped">NewPipe werd gesloten terwijl het bezig was met het bestand</string>
|
||||
</resources>
|
||||
<string name="songs">Nummers</string>
|
||||
<string name="albums">Albums</string>
|
||||
<string name="artists">Artiesten</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
<dimen name="drawer_header_padding_top">16dp</dimen>
|
||||
<dimen name="drawer_header_newpipe_icon_size">48dp</dimen>
|
||||
<dimen name="drawer_header_newpipe_icon_title_space">12dp</dimen>
|
||||
<dimen name="drawer_header_newpipe_title_min_width">120dp</dimen>
|
||||
<dimen name="drawer_header_newpipe_title_max_width">220dp</dimen>
|
||||
<dimen name="drawer_header_newpipe_title_default_width">130dp</dimen>
|
||||
<dimen name="drawer_header_newpipe_title_max_width">200dp</dimen>
|
||||
<dimen name="drawer_header_newpipe_title_min_text_size">18sp</dimen>
|
||||
<dimen name="drawer_header_newpipe_title_max_text_size">32sp</dimen>
|
||||
<dimen name="drawer_header_service_icon_size">16dp</dimen>
|
||||
|
|
|
|||
|
|
@ -177,6 +177,9 @@
|
|||
<string name="enable_playback_resume_key" translatable="false">enable_playback_resume</string>
|
||||
<string name="enable_playback_state_lists_key" translatable="false">enable_playback_state_lists</string>
|
||||
<string name="playback_unhook_key" translatable="false">playback_unhook_key</string>
|
||||
<string name="playback_speed_key" translatable="false">playback_speed_key</string>
|
||||
<string name="playback_pitch_key" translatable="false">playback_pitch_key</string>
|
||||
<string name="playback_skip_silence_key" translatable="false">playback_skip_silence_key</string>
|
||||
|
||||
<string name="app_language_key" translatable="false">app_language_key</string>
|
||||
<string name="enable_lock_screen_video_thumbnail_key" translatable="false">enable_lock_screen_video_thumbnail</string>
|
||||
|
|
|
|||
|
|
@ -136,8 +136,9 @@
|
|||
<string name="play_btn_text">Play</string>
|
||||
<string name="content">Content</string>
|
||||
<string name="show_age_restricted_content_title">Age restricted content</string>
|
||||
<string name="duration_live">Live</string>
|
||||
<string name="video_is_age_restricted">Show age restricted video. Future changes are possible from the settings.</string>
|
||||
<string name="restricted_video">This video is age restricted.\n\nIf you want to view it, enable \"Age restricted content\" in the settings.</string>
|
||||
<string name="duration_live">Live</string>
|
||||
<string name="downloads">Downloads</string>
|
||||
<string name="downloads_title">Downloads</string>
|
||||
<string name="error_report_title">Error report</string>
|
||||
|
|
@ -150,6 +151,9 @@
|
|||
<string name="tracks">Tracks</string>
|
||||
<string name="users">Users</string>
|
||||
<string name="events">Events</string>
|
||||
<string name="songs">Songs</string>
|
||||
<string name="albums">Albums</string>
|
||||
<string name="artists">Artists</string>
|
||||
<string name="yes">Yes</string>
|
||||
<string name="later">Later</string>
|
||||
<string name="disabled">Disabled</string>
|
||||
|
|
@ -284,6 +288,10 @@
|
|||
<item quantity="other">%s listeners</item>
|
||||
</plurals>
|
||||
<string name="no_videos">No videos</string>
|
||||
<string name="more_than_100_videos">100+ videos</string>
|
||||
<string name="infinite_videos">∞ videos</string>
|
||||
<string name="more_than_100_videos_mini" translatable="false">100+</string>
|
||||
<string name="infinite_videos_mini" translatable="false">∞</string>
|
||||
<plurals name="videos">
|
||||
<item quantity="one">%s video</item>
|
||||
<item quantity="other">%s videos</item>
|
||||
|
|
@ -643,4 +651,5 @@
|
|||
<string name="feed_use_dedicated_fetch_method_enable_button">Enable fast mode</string>
|
||||
<string name="feed_use_dedicated_fetch_method_disable_button">Disable fast mode</string>
|
||||
<string name="feed_use_dedicated_fetch_method_help_text">Do you think feed loading is too slow? If so, try enabling fast loading (you can change it in settings or by pressing the button below).\n\nNewPipe offers two feed loading strategies:\n• Fetching the whole subscription channel, which is slow but complete.\n• Using a dedicated service endpoint, which is fast but usually not complete.\n\nThe difference between the two is that the fast one usually lacks some information, like the item\'s duration or type (can\'t distinguish between live videos and normal ones) and it may return less items.\n\nYouTube is an example of a service that offers this fast method with its RSS feed.\n\nSo the choice boils down to what you prefer: speed or precise information.</string>
|
||||
<string name="content_not_supported">This content is not yet supported by NewPipe.\n\nIt will hopefully be supported in a future version.</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue