Merge remote-tracking branch 'newpipe/dev' into rebase

app/src/main/res/layout-v21/drawer_header.xml

@@ -47,15 +47,22 @@
 
     <TextView
         android:id="@+id/drawer_header_service_view"
-        android:layout_width="100dp"
+        android:layout_width="wrap_content"
         android:layout_height="100dp"
         android:layout_alignLeft="@id/drawer_header_np_text_view"
         android:layout_alignStart="@id/drawer_header_np_text_view"
         android:layout_below="@id/drawer_header_np_text_view"
+        android:layout_toLeftOf="@id/drawer_arrow"
+        android:layout_marginRight="5dp"
         android:text="YouTube"
         android:textSize="18sp"
         android:textColor="@color/drawer_header_font_color"
-        android:textStyle="italic" />
+        android:textStyle="italic"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:scrollHorizontally="true"
+        android:singleLine="true" />
 
     <ImageView
         android:id="@+id/drawer_arrow"

app/src/main/res/layout/drawer_header.xml

@@ -46,15 +46,22 @@ android:focusable="true">
 
     <TextView
         android:id="@+id/drawer_header_service_view"
-        android:layout_width="100dp"
+        android:layout_width="wrap_content"
         android:layout_height="100dp"
         android:text="YouTube"
         android:layout_below="@id/drawer_header_np_text_view"
         android:layout_alignLeft="@id/drawer_header_np_text_view"
         android:layout_alignStart="@id/drawer_header_np_text_view"
+        android:layout_toLeftOf="@id/drawer_arrow"
+        android:layout_marginRight="5dp"
         android:textSize="18sp"
         android:textColor="@color/drawer_header_font_color"
-        android:textStyle="italic"/>
+        android:textStyle="italic"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:scrollHorizontally="true"
+        android:singleLine="true" />
 
     <ImageView
         android:id="@+id/drawer_arrow"

app/src/main/res/layout/drawer_layout.xml

@@ -16,7 +16,8 @@
         android:layout_height="wrap_content"
         app:elevation="0dp"
         android:background="?attr/android:windowBackground"
-        app:headerLayout="@layout/drawer_header"/>
+        app:headerLayout="@layout/drawer_header"
+        android:theme="@style/NavViewTextStyle"/>
         <!-- app:menu="@menu/drawer_items" -->
 
     <LinearLayout

app/src/main/res/layout/fragment_instance_list.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/instanceHelpTV"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="15dp"
+        android:autoLink="web"
+        android:text="@string/peertube_instance_url_help"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/instances"
+        android:layout_below="@id/instanceHelpTV"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_instance" />
+
+    <!-- LOADING INDICATOR-->
+    <ProgressBar
+        android:id="@+id/loading_progress_bar"
+        style="@style/Widget.AppCompat.ProgressBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:indeterminate="true"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/addInstanceButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        app:backgroundTint="?attr/colorPrimary"
+        app:fabSize="auto"
+        app:srcCompat="?attr/ic_add" />
+
+</RelativeLayout>

app/src/main/res/layout/instance_spinner_item.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:maxLength="0" />

app/src/main/res/layout/instance_spinner_layout.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/spinner"
+    tools:listitem="@layout/instance_spinner_item"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="end"
+    android:prompt="@string/choose_instance_prompt" />

app/src/main/res/layout/item_instance.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layoutCard"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="3dp"
+    android:layout_marginLeft="5dp"
+    android:layout_marginRight="5dp"
+    android:layout_marginTop="3dp"
+    android:minHeight="?listPreferredItemHeightSmall"
+    android:orientation="horizontal"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="4dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/instanceIcon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="10dp"
+            tools:ignore="ContentDescription,RtlHardcoded"
+            tools:src="@drawable/place_holder_peertube"/>
+
+        <TextView
+            android:id="@+id/instanceName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="6dp"
+            android:layout_toRightOf="@+id/instanceIcon"
+            android:layout_toLeftOf="@id/selectInstanceRB"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:textAppearance="?textAppearanceListItem"
+            tools:ignore="RtlHardcoded"
+            tools:text="Framatube"/>
+
+        <TextView
+            android:id="@+id/instanceUrl"
+            android:autoLink="web"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="6dp"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@id/instanceIcon"
+            android:layout_toLeftOf="@id/selectInstanceRB"
+            android:layout_below="@id/instanceName"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:textAppearance="?textAppearanceListItemSecondary"
+            tools:ignore="RtlHardcoded"
+            tools:text="https://framatube.org"/>
+
+        <RadioButton
+            android:id="@+id/selectInstanceRB"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@id/handle"
+            android:layout_centerVertical="true"/>
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/handle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:paddingBottom="12dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="10dp"
+            android:paddingTop="12dp"
+            android:src="?attr/drag_handle"
+            tools:ignore="ContentDescription,RtlHardcoded"/>
+    </RelativeLayout>
+</androidx.cardview.widget.CardView>

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

@@ -468,11 +468,9 @@
     <string name="error_connect_host">لا يمكن الاتصال بالخادم</string>
     <string name="error_http_no_content">الخادم لايقوم بإرسال البيانات</string>
     <string name="error_http_unsupported_range">الخادم لا يقبل التنزيل المتعدد، إعادة المحاولة مع @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">عدم استيفاء النطاق المطلوب</string>
     <string name="error_http_not_found">غير موجود</string>
     <string name="error_postprocessing_failed">فشلت المعالجة الاولية</string>
     <string name="clear_finished_download">حذف التنزيلات المنتهية</string>
-    <string name="msg_pending_downloads">"قم بإستكمال  %s حيثما  يتم التحويل من التنزيلات"</string>
     <string name="stop">توقف</string>
     <string name="max_retry_msg">أقصى عدد للمحاولات</string>
     <string name="max_retry_desc">الحد الأقصى لعدد محاولات قبل إلغاء التحميل</string>

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

@@ -455,11 +455,9 @@
     <string name="error_connect_host">Немагчыма злучыцца з серверам</string>
     <string name="error_http_no_content">Не атрымалася атрымаць дадзеныя з сервера</string>
     <string name="error_http_unsupported_range">Сервер не падтрымлівае шматструменную загрузку, паспрабуйце з @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Запытаны дыяпазон недапушчальны</string>
     <string name="error_http_not_found">Не знойдзена</string>
     <string name="error_postprocessing_failed">Пасляапрацоўка не ўдалася</string>
     <string name="clear_finished_download">Ачысціць завершаныя</string>
-    <string name="msg_pending_downloads">Аднавіць прыпыненыя загрузкі (%s)</string>
     <string name="stop">Спыніць</string>
     <string name="max_retry_msg">Максімум спробаў</string>
     <string name="max_retry_desc">Колькасць спробаў перад адменай загрузкі</string>

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

@@ -460,8 +460,6 @@
     <string name="app_update_notification_content_title">NewPipe 更新可用!</string>
     <string name="error_path_creation">无法创建目标文件夹</string>
     <string name="error_http_unsupported_range">服务器不接受多线程下载, 请使用 @string/msg_threads = 1重试</string>
-    <string name="error_http_requested_range_not_satisfiable">请求范围无法满足</string>
-    <string name="msg_pending_downloads">继续进行%s个待下载转移</string>
     <string name="pause_downloads_on_mobile_desc">切换至移动数据时有用，尽管一些下载无法被暂停</string>
     <string name="show_comments_title">显示评论</string>
     <string name="show_comments_summary">禁用停止显示评论</string>

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

@@ -463,11 +463,9 @@ otevření ve vyskakovacím okně</string>
     <string name="error_connect_host">Nelze se připojit k serveru</string>
     <string name="error_http_no_content">Server neposílá data</string>
     <string name="error_http_unsupported_range">Server neakceptuje vícevláknové stahování, opakujte akci s @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Požadovaný rozsah nelze splnit</string>
     <string name="error_http_not_found">Nenalezeno</string>
     <string name="error_postprocessing_failed">Post-processing selhal</string>
     <string name="clear_finished_download">Vyčistit dokončená stahování</string>
-    <string name="msg_pending_downloads">Pokračovat ve stahování %s souborů, čekajících na stažení</string>
     <string name="stop">Zastavit</string>
     <string name="max_retry_msg">Maximální počet pokusů o opakování</string>
     <string name="max_retry_desc">Maximální počet pokusů před zrušením stahování</string>

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

@@ -380,7 +380,6 @@
     <string name="error_connect_host">Kan ikke forbinde til serveren</string>
     <string name="error_http_no_content">Serveren sender ikke data</string>
     <string name="error_http_unsupported_range">Serveren accepterer ikke multitrådede downloads; prøv igen med @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Det anmodede interval er ikke gyldigt</string>
     <string name="error_http_not_found">Ikke fundet</string>
     <string name="error_postprocessing_failed">Efterbehandling fejlede</string>
     <string name="stop">Stop</string>
@@ -448,7 +447,6 @@
     <string name="paused">sat på pause</string>
     <string name="queued">sat i kø</string>
     <string name="clear_finished_download">Ryd færdige downloads</string>
-    <string name="msg_pending_downloads">Fortsæt dine %s ventende overførsler fra Downloads</string>
     <string name="max_retry_msg">Maksimalt antal genforsøg</string>
     <string name="max_retry_desc">Maksimalt antal forsøg før downloaden opgives</string>
     <string name="pause_downloads_on_mobile">Sæt på pause ved skift til mobildata</string>

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

@@ -454,11 +454,9 @@
     <string name="error_connect_host">Kann nicht mit dem Server verbinden</string>
     <string name="error_http_no_content">Der Server sendet keine Daten</string>
     <string name="error_http_unsupported_range">Der Server erlaubt kein mehrfädiges Herunterladen – wiederhole mit @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Gewünschter Bereich ist nicht verfügbar</string>
     <string name="error_http_not_found">Nicht gefunden</string>
     <string name="error_postprocessing_failed">Nachbearbeitung fehlgeschlagen</string>
     <string name="clear_finished_download">Um fertige Downloads bereinigen</string>
-    <string name="msg_pending_downloads">Setze deine %s ausstehenden Übertragungen von Downloads fort</string>
     <string name="stop">Anhalten</string>
     <string name="max_retry_msg">Maximale Wiederholungen</string>
     <string name="max_retry_desc">Maximalanzahl der Versuche, bevor der Download abgebrochen wird</string>

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

@@ -456,11 +456,9 @@
     <string name="error_connect_host">Αδυναμία σύνδεσης με τον εξυπηρετητή</string>
     <string name="error_http_no_content">Ο εξυπηρετητής δεν μπορεί να στείλει τα δεδομένα</string>
     <string name="error_http_unsupported_range">Ο εξυπηρετητής δέν υποστηρίζει πολυνηματικές λήψεις, ξαναπροσπαθήστε με @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Το ζητούμενο εύρος δεν μπορεί να εξυπηρετηθεί</string>
     <string name="error_http_not_found">Δεν βρέθηκε</string>
     <string name="error_postprocessing_failed">Μετεπεξεργασία απέτυχε</string>
     <string name="clear_finished_download">Εκκαθάριση ολοκληρωμένων λήψεων</string>
-    <string name="msg_pending_downloads">Συνέχιση των %s εκκρεμών σας λήψεων</string>
     <string name="stop">Διακοπή</string>
     <string name="max_retry_msg">Μέγιστες επαναπροσπάθειες</string>
     <string name="max_retry_desc">Μέγιστος αριθμός προσπαθειών προτού γίνει ακύρωση της λήψης</string>

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

@@ -351,8 +351,8 @@
 \n3. Inicie sesión cuando se le pida 
 \n4. Copie la URL del perfil a la que fue redireccionado.</string>
     <string name="import_soundcloud_instructions_hint">suID, soundcloud.com/suID</string>
-    <string name="import_network_expensive_warning">Observe que esta operación puede causar un uso intensivo de la red. 
-\n 
+    <string name="import_network_expensive_warning">Observe que esta operación puede causar un uso intensivo de la red.
+\n
 \n¿Quiere continuar\?</string>
     <string name="download_thumbnail_title">Cargar miniaturas</string>
     <string name="download_thumbnail_summary">Desactívela para evitar la carga de miniaturas y ahorrar datos y memoria. Se vaciará la antememoria de imágenes en la memoria volátil y en el disco.</string>
@@ -406,6 +406,7 @@
     <string name="paused">pausado</string>
     <string name="queued">en cola</string>
     <string name="post_processing">posprocesamiento</string>
+    <string name="recovering">recuperando</string>
     <string name="enqueue">Añadir a cola</string>
     <string name="permission_denied">Acción denegada por el sistema</string>
     <string name="file_deleted">Se eliminó el archivo</string>
@@ -424,7 +425,6 @@
     <string name="grid">Mostrar como grilla</string>
     <string name="list">Mostrar como lista</string>
     <string name="clear_finished_download">Limpiar descargas finalizadas</string>
-    <string name="msg_pending_downloads">Tienes %s descargas pendientes, ve a Descargas para continuarlas</string>
     <string name="confirm_prompt">¿Lo confirma\?</string>
     <string name="stop">Detener</string>
     <string name="max_retry_msg">Intentos máximos</string>
@@ -444,8 +444,8 @@
     <string name="error_ssl_exception">Fallo la conexión segura</string>
     <string name="error_unknown_host">No se pudo encontrar el servidor</string>
     <string name="error_connect_host">No se puede conectar con el servidor</string>
-    <string name="error_http_no_content">El servidor no está enviando datos</string>
-    <string name="error_http_unsupported_range">El servidor no acepta descargas multiproceso; intente de nuevo con @string/msg_threads = 1</string>
+    <string name="error_http_no_content">El servidor no devolvio datos</string>
+    <string name="error_http_unsupported_range">El servidor no acepta descargas multi-hilos, intente de nuevo con @string/msg_threads = 1</string>
     <string name="error_http_requested_range_not_satisfiable">No se puede satisfacer el intervalo seleccionado</string>
     <string name="error_http_not_found">No encontrado</string>
     <string name="error_postprocessing_failed">Falló el posprocesamiento</string>
@@ -453,6 +453,7 @@
     <string name="error_insufficient_storage">No hay suficiente espacio disponible en el dispositivo</string>
     <string name="error_progress_lost">Se perdió el progreso porque el archivo fue eliminado</string>
     <string name="error_timeout">Tiempo de espera excedido</string>
+    <string name="error_download_resource_gone">No se puede recuperar esta descarga</string>
     <string name="downloads_storage_ask_title">Preguntar dónde descargar</string>
     <string name="downloads_storage_ask_summary">Se preguntará dónde guardar cada descarga</string>
     <string name="downloads_storage_ask_summary_kitkat">Se le preguntará dónde guardar cada descarga.

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

@@ -457,11 +457,9 @@
     <string name="error_connect_host">Serveriga ei saadud ühendust</string>
     <string name="error_http_no_content">Server ei saada andmeid</string>
     <string name="error_http_unsupported_range">Server ei toeta mitmelõimelisi allalaadimisi. Proovi uuesti kasutades @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Taotletud vahemik ei ole rahuldatav</string>
     <string name="error_http_not_found">Ei leitud</string>
     <string name="error_postprocessing_failed">Järeltöötlemine nurjus</string>
     <string name="clear_finished_download">Eemalda lõpetatud allalaadimised</string>
-    <string name="msg_pending_downloads">Jätka %s pooleliolevat allalaadimist</string>
     <string name="stop">Stopp</string>
     <string name="max_retry_msg">Korduskatseid</string>
     <string name="max_retry_desc">Suurim katsete arv enne allalaadimise tühistamist</string>

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

@@ -456,11 +456,9 @@
     <string name="error_connect_host">Ezin da zerbitzariarekin konektatu</string>
     <string name="error_http_no_content">Zerbitzariak ez du daturik bidaltzen</string>
     <string name="error_http_unsupported_range">Zerbitzariak ez ditu hainbat hariko deskargak onartzen, saiatu @string/msg_threads = 1 erabilita</string>
-    <string name="error_http_requested_range_not_satisfiable">Eskatutako barrutia ezin da bete</string>
     <string name="error_http_not_found">Ez aurkitua</string>
     <string name="error_postprocessing_failed">Post-prozesuak huts egin du</string>
     <string name="clear_finished_download">Garbitu amaitutako deskargak</string>
-    <string name="msg_pending_downloads">Berrekin burutzeke dauden %s transferentzia deskargetatik</string>
     <string name="stop">Gelditu</string>
     <string name="max_retry_msg">Gehienezko saiakerak</string>
     <string name="max_retry_desc">Deskarga ezeztatu aurretik saiatu beharreko aldi kopurua</string>

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

@@ -466,8 +466,6 @@
     <string name="max_retry_desc">Nombre maximum de tentatives avant d’annuler le téléchargement</string>
     <string name="saved_tabs_invalid_json">Utilisation des onglets par défaut, erreur lors de la lecture des onglets enregistrés</string>
     <string name="error_http_unsupported_range">Le serveur n’accepte pas les téléchargements multi-fils, veuillez réessayer avec @string/msg_threads = 1</string>
-    <string name="msg_pending_downloads">Continuer vos %s transferts en attente depuis Téléchargement</string>
-    <string name="error_http_requested_range_not_satisfiable">Le domaine désiré n\'est pas disponible</string>
     <string name="show_comments_title">Afficher les commentaires</string>
     <string name="show_comments_summary">Désactiver pour ne pas afficher les commentaires</string>
     <string name="autoplay_title">Lecture automatique</string>

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

@@ -461,11 +461,9 @@
     <string name="error_connect_host">לא ניתן להתחבר לשרת</string>
     <string name="error_http_no_content">השרת לא שולח נתונים</string>
     <string name="error_http_unsupported_range">"השרת לא מקבל הורדות רב ערוציות, מוטב לנסות שוב עם ‎@string/msg_threads = 1 "</string>
-    <string name="error_http_requested_range_not_satisfiable">הטווח המבוקש לא מתאים</string>
     <string name="error_http_not_found">לא נמצא</string>
     <string name="error_postprocessing_failed">העיבוד המאוחר נכשל</string>
     <string name="clear_finished_download">פינוי ההורדות שהסתיימו</string>
-    <string name="msg_pending_downloads">ניתן להמשיך את %s ההורדות הממתינות שלך דרך ההורדות</string>
     <string name="stop">עצירה</string>
     <string name="max_retry_msg">מספר הניסיונות החוזרים המרבי</string>
     <string name="max_retry_desc">מספר הניסיונות החוזרים המרבי בטרם ביטול ההורדה</string>

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

@@ -454,11 +454,9 @@
     <string name="error_connect_host">Nije moguće povezati se s serverom</string>
     <string name="error_http_no_content">Server ne šalje podatke</string>
     <string name="error_http_unsupported_range">Poslužitelj ne prihvaća preuzimanja s više niti, pokušaj ponovo s @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Traženi raspon nije zadovoljavajući</string>
     <string name="error_http_not_found">Nije pronađeno</string>
     <string name="error_postprocessing_failed">Naknadna obrada nije uspjela</string>
     <string name="clear_finished_download">Obriši završena preuzimanja</string>
-    <string name="msg_pending_downloads">Nastavite s prijenosima na čekanju za %s s preuzimanja</string>
     <string name="stop">Stop</string>
     <string name="max_retry_msg">Maksimalnih ponovnih pokušaja</string>
     <string name="max_retry_desc">Maksimalni broj pokušaja prije poništavanja preuzimanja</string>

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

@@ -450,11 +450,9 @@
     <string name="error_connect_host">Tidak dapat terhubung ke server</string>
     <string name="error_http_no_content">Server tidak mengirim data</string>
     <string name="error_http_unsupported_range">Server tidak menerima unduhan multi-utas, coba lagi dengan @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Rentang yang diminta tidak memuaskan</string>
     <string name="error_http_not_found">Tidak ditemukan</string>
     <string name="error_postprocessing_failed">Pengolahan-pasca gagal</string>
     <string name="clear_finished_download">Hapus unduhan yang sudah selesai</string>
-    <string name="msg_pending_downloads">Lanjutkan %s transfer anda yang tertunda dari Unduhan</string>
     <string name="stop">Berhenti</string>
     <string name="max_retry_msg">Percobaan maksimum</string>
     <string name="max_retry_desc">Jumlah upaya maksimum sebelum membatalkan unduhan</string>

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

@@ -454,11 +454,9 @@
     <string name="error_connect_host">Impossibile connettersi al server</string>
     <string name="error_http_no_content">Il server non invia dati</string>
     <string name="error_http_unsupported_range">Il server non accetta download multipli, riprovare con @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Intervallo richiesto non soddisfatto</string>
     <string name="error_http_not_found">Non trovato</string>
     <string name="error_postprocessing_failed">Post-processing fallito</string>
     <string name="clear_finished_download">Pulisci i download completati</string>
-    <string name="msg_pending_downloads">Continua i %s trasferimenti in corso dai Download</string>
     <string name="stop">Ferma</string>
     <string name="max_retry_msg">Tentativi massimi</string>
     <string name="max_retry_desc">Tentativi massimi prima di cancellare il download</string>

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

@@ -440,7 +440,6 @@
     <string name="error_connect_host">サーバに接続できません</string>
     <string name="error_http_no_content">サーバがデータを送信していません</string>
     <string name="error_http_unsupported_range">サーバが同時接続ダウンロードを受け付けません。再試行してください @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">必要な範囲が満たされていません</string>
     <string name="error_http_not_found">見つかりません</string>
     <string name="error_postprocessing_failed">保存処理に失敗しました</string>
     <string name="clear_finished_download">完了済みを一覧から削除します</string>
@@ -457,7 +456,6 @@
     <string name="saved_tabs_invalid_json">デフォルトのタブを使用します。保存されたタブの読み込みエラーが発生しました</string>
     <string name="main_page_content_summary">メインページに表示されるタブ</string>
     <string name="updates_setting_description">新しいバージョンが利用可能なときにアプリの更新を確認する通知を表示します</string>
-    <string name="msg_pending_downloads">ダウンロードから %s の保留中の転送を続行します</string>
     <string name="pause_downloads_on_mobile">従量制課金ネットワークの割り込み</string>
     <string name="pause_downloads_on_mobile_desc">モバイルデータ通信に切り替える場合に便利ですが、一部のダウンロードは一時停止できません</string>
     <string name="show_comments_title">コメントを表示</string>

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

@@ -451,11 +451,9 @@
     <string name="error_connect_host">서버에 접속할 수 없습니다</string>
     <string name="error_http_no_content">서버가 데이터를 전송하지 않고 있습니다</string>
     <string name="error_http_unsupported_range">서버가 다중 스레드 다운로드를 받아들이지 않습니다, @string/msg_threads = 1 를 사용해 다시 시도해보세요</string>
-    <string name="error_http_requested_range_not_satisfiable">요청된 HTTP 범위가 충분하지 않습니다</string>
     <string name="error_http_not_found">HTTP 찾을 수 없습니다</string>
     <string name="error_postprocessing_failed">후처리 작업이 실패하였습니다</string>
     <string name="clear_finished_download">완료된 다운로드 비우기</string>
-    <string name="msg_pending_downloads">대기중인 %s 다운로드를 지속하세요</string>
     <string name="stop">멈추기</string>
     <string name="max_retry_msg">최대 재시도 횟수</string>
     <string name="max_retry_desc">다운로드를 취소하기 전까지 다시 시도할 최대 횟수</string>

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

@@ -450,11 +450,9 @@
     <string name="error_connect_host">Tidak dapat menyambung ke server</string>
     <string name="error_http_no_content">Server tidak menghantar data</string>
     <string name="error_http_unsupported_range">Server tidak menerima muat turun berbilang thread, cuba lagi dengan @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Julat yang diminta tidak memuaskan</string>
     <string name="error_http_not_found">Tidak ditemui</string>
     <string name="error_postprocessing_failed">Pemprosesan-pasca gagal</string>
     <string name="clear_finished_download">Hapuskan senarai muat turun yang selesai</string>
-    <string name="msg_pending_downloads">Teruskan %s pemindahan anda yang menunggu dari muat turun</string>
     <string name="stop">Berhenti</string>
     <string name="max_retry_msg">Percubaan maksimum</string>
     <string name="max_retry_desc">Jumlah percubaan maksimum sebelum membatalkan muat turun</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -458,7 +458,6 @@
     <string name="error_http_not_found">Ikke funnet</string>
     <string name="error_postprocessing_failed">Etterbehandling mislyktes</string>
     <string name="clear_finished_download">Tøm fullførte nedlastinger</string>
-    <string name="msg_pending_downloads">Fortsett dine %s ventende overføringer fra Nedlastinger</string>
     <string name="stop">Stopp</string>
     <string name="max_retry_msg">Maksimalt antall forsøk</string>
     <string name="max_retry_desc">Maksimalt antall tilkoblingsforsøk før nedlastingen avblåses</string>
@@ -496,7 +495,7 @@
     <string name="pause_downloads">Sett nedlastinger på pause</string>
     <string name="downloads_storage_ask_title">Spør om hvor ting skal lastes ned til</string>
     <string name="downloads_storage_ask_summary">Du vil bli spurt om hvor hver nedlasting skal plasseres</string>
-    <string name="downloads_storage_ask_summary_kitkat">Du vil bli spurt om hvor hver nedlasting skal plasseres. 
+    <string name="downloads_storage_ask_summary_kitkat">Du vil bli spurt om hvor hver nedlasting skal plasseres.
 \nSkru på SAF hvis du vil laste ned til eksternt SD-kort</string>
     <string name="downloads_storage_use_saf_title">Bruk SAF</string>
     <string name="downloads_storage_use_saf_summary">Lagringstilgangsrammeverk (SAF) tillater nedlastinger til eksternt SD-kort.

app/src/main/res/values-nl-rBE/strings.xml

@@ -454,11 +454,9 @@
     <string name="error_connect_host">Kan geen verbinding maken met de server</string>
     <string name="error_http_no_content">De server verzendt geen gegevens</string>
     <string name="error_http_unsupported_range">De server aanvaardt geen meerdradige downloads, probeert het opnieuw met @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Gevraagd bereik niet beschikbaar</string>
     <string name="error_http_not_found">Niet gevonden</string>
     <string name="error_postprocessing_failed">Nabewerking mislukt</string>
     <string name="clear_finished_download">Voltooide downloads wissen</string>
-    <string name="msg_pending_downloads">Zet uw %s wachtende downloads verder via Downloads</string>
     <string name="stop">Stoppen</string>
     <string name="max_retry_msg">Maximaal aantal pogingen</string>
     <string name="max_retry_desc">Maximaal aantal pogingen vooraleer dat den download wordt geannuleerd</string>

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

@@ -454,11 +454,9 @@
     <string name="error_connect_host">Kan niet met de server verbinden</string>
     <string name="error_http_no_content">De server verzendt geen gegevens</string>
     <string name="error_http_unsupported_range">De server accepteert geen multi-threaded downloads, probeer het opnieuw met @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Gevraagde bereik niet beschikbaar</string>
     <string name="error_http_not_found">Niet gevonden</string>
     <string name="error_postprocessing_failed">Nabewerking mislukt</string>
     <string name="clear_finished_download">Voltooide downloads wissen</string>
-    <string name="msg_pending_downloads">Zet je %s wachtende downloads voort via Downloads</string>
     <string name="stop">Stop</string>
     <string name="max_retry_msg">Maximum aantal keer proberen</string>
     <string name="max_retry_desc">Maximum aantal pogingen voordat de download wordt geannuleerd</string>

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

@@ -450,11 +450,9 @@
     <string name="error_connect_host">ਸਰਵਰ ਨਾਲ ਜੁੜ ਨਹੀਂ ਸਕਦਾ</string>
     <string name="error_http_no_content">ਸਰਵਰ ਨੇ ਡਾਟਾ ਨਹੀਂ ਭੇਜਿਆ</string>
     <string name="error_http_unsupported_range">ਸਰਵਰ ਮਲਟੀ-Threaded ਡਾਊਨਲੋਡਸ ਨੂੰ ਸਵੀਕਾਰ ਨਹੀਂ ਕਰਦਾ, ਇਸ ਨਾਲ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">ਬੇਨਤੀ ਕੀਤੀ ਸੀਮਾ ਤਸੱਲੀਬਖਸ਼ ਨਹੀਂ ਹੈ</string>
     <string name="error_http_not_found">ਨਹੀਂ ਲਭਿਆ</string>
     <string name="error_postprocessing_failed">Post-processing ਫੇਲ੍ਹ</string>
     <string name="clear_finished_download">ਮੁਕੰਮਲ ਹੋਈਆਂ ਡਾਊਨਲੋਡ ਸਾਫ਼ ਕਰੋ</string>
-    <string name="msg_pending_downloads">ਡਾਉਨਲੋਡਸ ਤੋਂ ਆਪਣੀਆਂ %s ਬਕਾਇਆ ਟ੍ਰਾਂਸਫਰ ਜਾਰੀ ਰੱਖੋ</string>
     <string name="stop">ਰੁੱਕੋ</string>
     <string name="max_retry_msg">ਵੱਧ ਤੋਂ ਵੱਧ ਕੋਸ਼ਿਸ਼ਾਂ</string>
     <string name="max_retry_desc">ਡਾਉਨਲੋਡ ਰੱਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਵੱਧ ਤੋਂ ਵੱਧ ਕੋਸ਼ਿਸ਼ਾਂ</string>

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

@@ -456,11 +456,9 @@
     <string name="error_connect_host">Nie można połączyć się z serwerem</string>
     <string name="error_http_no_content">Serwer nie wysyła danych</string>
     <string name="error_http_unsupported_range">Serwer nie akceptuje pobierania wielowątkowego, spróbuj ponownie za pomocą @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Niewłaściwy zakres</string>
     <string name="error_http_not_found">Nie znaleziono</string>
     <string name="error_postprocessing_failed">Przetwarzanie końcowe nie powiodło się</string>
     <string name="clear_finished_download">Wyczyść ukończone pobieranie</string>
-    <string name="msg_pending_downloads">Kontynuuj %s oczekujące transfery z plików do pobrania</string>
     <string name="stop">Zatrzymaj</string>
     <string name="max_retry_msg">Maksymalna liczba powtórzeń</string>
     <string name="max_retry_desc">Maksymalna liczba prób przed anulowaniem pobierania</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -463,11 +463,9 @@ abrir em modo popup</string>
     <string name="error_connect_host">Não foi possível conectar ao servidor</string>
     <string name="error_http_no_content">O servidor não envia dados</string>
     <string name="error_http_unsupported_range">O servidor não aceita downloads em multi-thread, tente com @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Intervalo solicitado não aceito</string>
     <string name="error_http_not_found">Não encontrado</string>
     <string name="error_postprocessing_failed">Falha no pós processamento</string>
     <string name="clear_finished_download">Limpar downloads finalizados</string>
-    <string name="msg_pending_downloads">Continuar seus %s downloads pendentes</string>
     <string name="stop">Parar</string>
     <string name="max_retry_msg">Tentativas Máximas</string>
     <string name="max_retry_desc">Número máximo de tentativas antes de cancelar o download</string>

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

@@ -452,11 +452,9 @@
     <string name="error_connect_host">Não é possível ligar ao servidor</string>
     <string name="error_http_no_content">O servidor não envia dados</string>
     <string name="error_http_unsupported_range">O servidor não aceita transferências de vários processos, tente novamente com @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Intervalo solicitado não satisfatório</string>
     <string name="error_http_not_found">Não encontrado</string>
     <string name="error_postprocessing_failed">Pós-processamento falhado</string>
     <string name="clear_finished_download">Limpar transferências concluídas</string>
-    <string name="msg_pending_downloads">Continue as suas %s transferências pendentes das Transferências</string>
     <string name="stop">Parar</string>
     <string name="max_retry_msg">Tentativas máximas</string>
     <string name="max_retry_desc">Número máximo de tentativas antes de cancelar a transferência</string>

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

@@ -454,7 +454,6 @@
     <string name="error_permission_denied">Доступ запрещён системой</string>
     <string name="error_unknown_host">Сервер не найден</string>
     <string name="error_http_unsupported_range">Сервер не принимает многопоточные загрузки, повторная попытка с @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Запрашиваемый диапазон недопустим</string>
     <string name="error_http_not_found">Не найдено</string>
     <string name="clear_finished_download">Очистить завершённые</string>
     <string name="stop">Остановить</string>
@@ -465,7 +464,6 @@
     <string name="download_finished">Загрузка завершена</string>
     <string name="download_finished_more">%s загрузок завершено</string>
     <string name="generate_unique_name">Создать уникальное имя</string>
-    <string name="msg_pending_downloads">Возобновить приостановленные загрузки (%s)</string>
     <string name="max_retry_msg">Максимум попыток</string>
     <string name="max_retry_desc">Количество попыток перед отменой загрузки</string>
     <string name="pause_downloads_on_mobile_desc">Некоторые загрузки не поддерживают докачку и начнутся с начала</string>

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

@@ -462,11 +462,9 @@
     <string name="error_connect_host">Nepodarilo sa pripojiť k serveru</string>
     <string name="error_http_no_content">Server neposiela údaje</string>
     <string name="error_http_unsupported_range">Server neakceptuje preberanie viacerých vlákien, zopakujte s @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Požadovaný rozsah nie je uspokojivý</string>
     <string name="error_http_not_found">Nenájdené</string>
     <string name="error_postprocessing_failed">Post-spracovanie zlyhalo</string>
     <string name="clear_finished_download">Vyčistiť dokončené sťahovania</string>
-    <string name="msg_pending_downloads">Pokračujte v preberaní %s zo súborov na prevzatie</string>
     <string name="stop">Stop</string>
     <string name="max_retry_msg">Maximum opakovaní</string>
     <string name="max_retry_desc">Maximálny počet pokusov pred zrušením stiahnutia</string>

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

@@ -449,11 +449,9 @@
     <string name="error_connect_host">Sunucuya bağlanılamıyor</string>
     <string name="error_http_no_content">Sunucu veri göndermiyor</string>
     <string name="error_http_unsupported_range">Sunucu, çok iş parçacıklı indirmeleri kabul etmez, @string/msg_threads = 1 ile yeniden deneyin</string>
-    <string name="error_http_requested_range_not_satisfiable">İstenen aralık karşılanamıyor</string>
     <string name="error_http_not_found">Bulunamadı</string>
     <string name="error_postprocessing_failed">İşlem sonrası başarısız</string>
     <string name="clear_finished_download">Tamamlanan indirmeleri temizle</string>
-    <string name="msg_pending_downloads">Beklemedeki %s transferinize İndirmeler\'den devam edin</string>
     <string name="stop">Durdur</string>
     <string name="max_retry_msg">Azami deneme sayısı</string>
     <string name="max_retry_desc">İndirmeyi iptal etmeden önce maksimum deneme sayısı</string>

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

@@ -471,8 +471,6 @@
     <string name="saved_tabs_invalid_json">Помилка зчитування збережених вкладок. Використовую типові вкладки.</string>
     <string name="main_page_content_summary">Вкладки, що відображаються на головній сторінці</string>
     <string name="updates_setting_description">Показувати сповіщення з пропозицією оновити застосунок за наявності нової версії</string>
-    <string name="error_http_requested_range_not_satisfiable">Запитуваний діапазон неприпустимий</string>
-    <string name="msg_pending_downloads">Продовжити ваші %s відкладених переміщень із Завантажень</string>
     <string name="pause_downloads_on_mobile_desc">Корисно під час переходу на мобільні дані, хоча деякі завантаження не можуть бути призупинені</string>
     <string name="show_comments_title">Показувати коментарі</string>
     <string name="show_comments_summary">Вимнути відображення дописів</string>

app/src/main/res/values-v21/styles_services.xml

@@ -31,6 +31,25 @@
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
     </style>
 
+    <!-- PeerTube -->
+    <style name="LightTheme.PeerTube" parent="LightTheme.Switchable">
+        <item name="colorPrimary">@color/light_peertube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_peertube_dark_color</item>
+        <item name="colorAccent">@color/light_peertube_accent_color</item>
+    </style>
+
+    <style name="DarkTheme.PeerTube" parent="DarkTheme.Switchable">
+        <item name="colorPrimary">@color/dark_peertube_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
+        <item name="colorAccent">@color/dark_peertube_accent_color</item>
+    </style>
+
+    <style name="BlackTheme.PeerTube" parent="BlackTheme.Switchable">
+        <item name="colorPrimary">@color/dark_peertube_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
+        <item name="colorAccent">@color/dark_peertube_accent_color</item>
+    </style>
+
     <!-- Media.ccc -->
     <style name="LightTheme.MediaCCC" parent="LightTheme.Switchable">
         <item name="colorPrimary">@color/light_media_ccc_primary_color</item>
@@ -49,4 +68,5 @@
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
     </style>
+
 </resources>

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

@@ -449,11 +449,9 @@
     <string name="error_connect_host">Không thế kết nối với máy chủ</string>
     <string name="error_http_no_content">Máy chủ không gửi dữ liệu về</string>
     <string name="error_http_unsupported_range">Máy chủ không chấp nhận tải đa luồng, thử lại với số luồng = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">(HTTP) Không thể đáp ứng khoảng dữ liệu đã yêu cầu</string>
     <string name="error_http_not_found">Không tìm thấy</string>
     <string name="error_postprocessing_failed">Xử lý thất bại</string>
     <string name="clear_finished_download">Dọn các tải về đã hoàn thành</string>
-    <string name="msg_pending_downloads">Hãy tiếp tục %s tải về đang chờ</string>
     <string name="stop">Dừng</string>
     <string name="max_retry_msg">Số lượt thử lại tối đa</string>
     <string name="max_retry_desc">Số lượt thử lại trước khi hủy tải về</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -447,11 +447,9 @@
     <string name="error_connect_host">無法連線到伺服器</string>
     <string name="error_http_no_content">伺服器沒有傳送資料</string>
     <string name="error_http_unsupported_range">伺服器不接受多執行緒下載，請以 @string/msg_threads = 1 重試</string>
-    <string name="error_http_requested_range_not_satisfiable">請求範圍無法滿足</string>
     <string name="error_http_not_found">找不到</string>
     <string name="error_postprocessing_failed">後處理失敗</string>
     <string name="clear_finished_download">清除已結束的下載</string>
-    <string name="msg_pending_downloads">繼續從您所擱置中的下載 %s 傳輸</string>
     <string name="stop">停止</string>
     <string name="max_retry_msg">最大重試次數</string>
     <string name="max_retry_desc">在取消下載前的最大嘗試數</string>

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

@@ -29,6 +29,8 @@
     <attr name="bug" format="reference"/>
     <attr name="settings" format="reference"/>
     <attr name="ic_hot" format="reference"/>
+    <attr name="ic_kiosk_local" format="reference"/>
+    <attr name="ic_kiosk_recent" format="reference"/>
     <attr name="ic_channel" format="reference"/>
     <attr name="ic_bookmark" format="reference"/>
     <attr name="ic_playlist_add" format="reference"/>

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

@@ -22,6 +22,17 @@
     <color name="dark_soundcloud_accent_color">#FFFFFF</color>
     <color name="dark_soundcloud_statusbar_color">#ff9100</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="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>
+
     <!-- Media.CCC -->
     <color name="light_media_ccc_primary_color">#9e9e9e</color>
     <color name="light_media_ccc_dark_color">#616161</color>

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

@@ -133,6 +133,7 @@
 
     <!-- Caption Size -->
     <string name="caption_settings_key" translatable="false">caption_settings_key</string>
+    <string name="caption_user_set_key" translatable="false">caption_user_set_key</string>
 
     <!-- Content & History -->
     <string name="show_search_suggestions_key" translatable="false">show_search_suggestions</string>
@@ -144,6 +145,9 @@
     <string name="default_language_value">en</string>
     <string name="default_country_value">GB</string>
     <string name="content_language_key" translatable="false">content_language</string>
+    <string name="peertube_instance_setup_key" translatable="false">peertube_instance_setup</string>
+    <string name="peertube_selected_instance_key" translatable="false">peertube_selected_instance</string>
+    <string name="peertube_instance_list_key" translatable="false">peertube_instance_list</string>
     <string name="content_country_key" translatable="false">content_country</string>
     <string name="show_age_restricted_content" translatable="false">show_age_restricted_content</string>
     <string name="use_tor_key" translatable="false">use_tor</string>

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

@@ -109,6 +109,14 @@
     <string name="default_content_country_title">Default content country</string>
     <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_help">Find the instances that best suit you on 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_exists">Instance already exists</string>
     <string name="settings_category_player_title">Player</string>
     <string name="settings_category_player_behavior_title">Behavior</string>
     <string name="settings_category_video_audio_title">Video &amp; audio</string>
@@ -400,6 +408,9 @@
     <string name="trending">Trending</string>
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">New &amp; hot</string>
+    <string name="local">Local</string>
+    <string name="recently_added">Recently added</string>
+    <string name="most_liked">Most liked</string>
     <string name="conferences">Conferences</string>
     <string name="service_kiosk_string" translatable="false">%1$s/%2$s</string>
     <!-- Play Queue -->
@@ -526,6 +537,7 @@
     <string name="paused">paused</string>
     <string name="queued">queued</string>
     <string name="post_processing">post-processing</string>
+    <string name="recovering">recovering</string>
     <string name="enqueue">Queue</string>
     <string name="permission_denied">Action denied by the system</string>
     <!-- download notifications -->
@@ -551,16 +563,15 @@
     <string name="error_connect_host">Can not connect to the server</string>
     <string name="error_http_no_content">The server does not send data</string>
     <string name="error_http_unsupported_range">The server does not accept multi-threaded downloads, retry with @string/msg_threads = 1</string>
-    <string name="error_http_requested_range_not_satisfiable">Requested range not satisfiable</string>
     <string name="error_http_not_found">Not found</string>
     <string name="error_postprocessing_failed">Post-processing failed</string>
     <string name="error_postprocessing_stopped">NewPipe was closed while working on the file</string>
     <string name="error_insufficient_storage">No space left on device</string>
     <string name="error_progress_lost">Progress lost, because the file was deleted</string>
     <string name="error_timeout">Connection timeout</string>
+    <string name="error_download_resource_gone">Cannot recover this download</string>
     <string name="clear_finished_download">Clear finished downloads</string>
     <string name="confirm_prompt">Are you sure?</string>
-    <string name="msg_pending_downloads">Continue your %s pending transfers from 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>
@@ -576,4 +587,6 @@
     <string name="downloads_storage_ask_summary_kitkat">You will be asked where to save each download.\nChoose SAF if you want to download to an external SD card</string>
     <string name="downloads_storage_use_saf_title">Use SAF</string>
     <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
+    <string name="choose_instance_prompt">Choose an instance</string>
+
 </resources>

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

@@ -44,6 +44,8 @@
         <item name="pause">@drawable/ic_pause_black_24dp</item>
         <item name="settings">@drawable/ic_settings_black_24dp</item>
         <item name="ic_hot">@drawable/ic_whatshot_black_24dp</item>
+        <item name="ic_kiosk_local">@drawable/ic_kiosk_local_black_24dp</item>
+        <item name="ic_kiosk_recent">@drawable/ic_kiosk_recent_black_24dp</item>
         <item name="ic_channel">@drawable/ic_channel_black_24dp</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_black_24dp</item>
         <item name="ic_playlist_add">@drawable/ic_playlist_add_black_24dp</item>
@@ -108,6 +110,8 @@
         <item name="play">@drawable/ic_play_arrow_white_24dp</item>
         <item name="settings">@drawable/ic_settings_white_24dp</item>
         <item name="ic_hot">@drawable/ic_whatshot_white_24dp</item>
+        <item name="ic_kiosk_local">@drawable/ic_kiosk_local_white_24dp</item>
+        <item name="ic_kiosk_recent">@drawable/ic_kiosk_recent_white_24dp</item>
         <item name="ic_channel">@drawable/ic_channel_white_24dp</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_white_24dp</item>
         <item name="ic_playlist_add">@drawable/ic_playlist_add_white_24dp</item>
@@ -233,4 +237,8 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@null</item>
     </style>
+
+    <style name="NavViewTextStyle">
+        <item name="android:ellipsize">end</item>
+    </style>
 </resources>

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

@@ -32,6 +32,25 @@
         <item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_dark</item>
     </style>
 
+    <!-- PeerTube -->
+    <style name="LightTheme.PeerTube" parent="LightTheme.Switchable">
+        <item name="colorPrimary">@color/light_peertube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_peertube_dark_color</item>
+        <item name="colorAccent">@color/light_peertube_accent_color</item>
+    </style>
+
+    <style name="DarkTheme.PeerTube" parent="DarkTheme.Switchable">
+        <item name="colorPrimary">@color/dark_peertube_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
+        <item name="colorAccent">@color/dark_peertube_accent_color</item>
+    </style>
+
+    <style name="BlackTheme.PeerTube" parent="BlackTheme.Switchable">
+        <item name="colorPrimary">@color/dark_peertube_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
+        <item name="colorAccent">@color/dark_peertube_accent_color</item>
+    </style>
+
     <!-- Media.ccc -->
     <style name="LightTheme.MediaCCC" parent="LightTheme.Switchable">
         <item name="colorPrimary">@color/light_media_ccc_primary_color</item>

app/src/main/res/xml/content_settings.xml

@@ -21,6 +21,13 @@
         android:summary="%s"
         android:title="@string/default_content_country_title"/>
 
+    <PreferenceScreen
+        app:iconSpaceReserved="false"
+        android:fragment="org.schabi.newpipe.settings.PeertubeInstanceListFragment"
+        android:key="@string/peertube_instance_setup_key"
+        android:title="@string/peertube_instance_url_title"
+        android:summary="@string/peertube_instance_url_summary"/>
+
     <SwitchPreference
         app:iconSpaceReserved="false"
         android:defaultValue="false"