Merge branch 'dev' into dev

This commit is contained in:
B0pol 2020-01-09 10:07:22 +01:00 committed by GitHub
commit e0a39efa2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 1130 additions and 204 deletions

View file

@ -58,7 +58,9 @@
<string name="kore_not_found">Kore app not found. Install it?</string>
<string name="kore_package" translatable="false">org.xbmc.kore</string>
<string name="show_play_with_kodi_title">Show \"Play with Kodi\" option</string>
<string name="enable_lock_screen_video_thumbnail_title">Enable lock screen video thumbnail</string>
<string name="show_play_with_kodi_summary">Display an option to play a video via Kodi media center</string>
<string name="enable_lock_screen_video_thumbnail_summary">When using the background player a video thumbnail will be displayed on the lock screen</string>
<string name="play_audio">Audio</string>
<string name="default_audio_format_title">Default audio format</string>
<string name="default_video_format_title">Default video format</string>
@ -111,13 +113,13 @@
<string name="service_title">Service</string>
<string name="content_language_title">Default content language</string>
<string name="peertube_instance_url_title">PeerTube instances</string>
<string name="peertube_instance_url_summary">Set your favorite peertube instances</string>
<string name="peertube_instance_url_summary">Select your favorite PeerTube instances</string>
<string name="peertube_instance_url_help">Find the instances that best suit you on %s</string>
<string name="peertube_instance_list_url" translatable="false">https://joinpeertube.org/instances#instances-list</string>
<string name="peertube_instance_add_title">Add instance</string>
<string name="peertube_instance_add_help">Enter instance url</string>
<string name="peertube_instance_add_fail">Failed to validate instance</string>
<string name="peertube_instance_add_https_only">Only https urls are supported</string>
<string name="peertube_instance_add_help">Enter instance URL</string>
<string name="peertube_instance_add_fail">Could not validate instance</string>
<string name="peertube_instance_add_https_only">Only HTTPS URLs are supported</string>
<string name="peertube_instance_add_exists">Instance already exists</string>
<string name="settings_category_player_title">Player</string>
<string name="settings_category_player_behavior_title">Behavior</string>