From fa3a047519a70fdbc6e3ce7e0464c52a652952cb Mon Sep 17 00:00:00 2001
From: abvgeej <lzue.github@lf.nx.tc>
Date: Sun, 24 Feb 2019 21:45:56 +0000
Subject: [PATCH 001/138] Translated using Weblate (Russian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 32d57db8b..fa388df8b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -49,7 +49,7 @@
     <string name="download_path_audio_title">Путь загрузки аудио</string>
     <string name="download_path_audio_summary">Папка для хранения загруженных аудио</string>
     <string name="download_path_audio_dialog_title">Введите путь к папке для загрузки аудио</string>
-    <string name="main_bg_subtitle">Начните с поиска</string>
+    <string name="main_bg_subtitle">Коснитесь поиска, чтобы начать</string>
     <string name="msg_wait">Подождите…</string>
     <string name="msg_exists">Файл уже существует</string>
     <string name="msg_threads">Потоки</string>
@@ -141,7 +141,7 @@
     <string name="best_resolution">Лучшее разрешение</string>
     <string name="reCaptcha_title">Запрос reCAPTCHA</string>
     <string name="recaptcha_request_toast">Запрошен ввод reCAPTCHA</string>
-    <string name="show_higher_resolutions_title">Высокие разрешения</string>
+    <string name="show_higher_resolutions_title">Показывать высокие разрешения</string>
     <string name="popup_mode_share_menu_title">NewPipe в окне</string>
     <string name="title_activity_about">О NewPipe</string>
     <string name="action_settings">Настройки</string>

From b9187445e0a1b55b0e3c45e994bdac91d9bd50d6 Mon Sep 17 00:00:00 2001
From: Javi <komz@i.xcode.ro>
Date: Wed, 27 Feb 2019 20:19:36 +0000
Subject: [PATCH 002/138] Translated using Weblate (Spanish)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-es/strings.xml | 188 ++++++++-----------------
 1 file changed, 60 insertions(+), 128 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 60257c508..47748195d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -29,25 +29,20 @@
     <string name="url_not_supported_toast">URL no soportada</string>
     <string name="use_external_video_player_title">Usar reproductor de vídeo externo</string>
     <string name="use_external_audio_player_title">Usar reproductor de audio externo</string>
-
     <string name="theme_title">Tema</string>
     <string name="dark_theme_title">Oscuro</string>
     <string name="light_theme_title">Claro</string>
-
     <string name="settings_category_appearance_title">Apariencia</string>
     <string name="settings_category_other_title">Otros</string>
     <string name="background_player_playing_toast">Reproduciendo en segundo plano</string>
     <string name="content_not_available">Contenido no disponible</string>
     <string name="use_tor_title">Usar Tor</string>
     <string name="use_tor_summary">(Experimental) Forzar la descarga a través de Tor para una mayor privacidad (transmisión de vídeos aún no compatible).</string>
-
     <string name="err_dir_create">No se puede crear la carpeta de descarga \'%1$s\'</string>
     <string name="info_dir_created">Carpeta de descarga creada \'%1$s\'</string>
     <string name="download_path_audio_summary">Los audios descargados se almacenan aquí</string>
     <string name="download_path_audio_dialog_title">Introducir ruta de descarga para archivos de audio</string>
-
     <string name="blocked_by_gema">Bloqueado por GEMA</string>
-
     <string name="download_path_audio_title">Carpeta de descarga de audio</string>
     <string name="settings_category_video_audio_title">Vídeo y audio</string>
     <string name="play_btn_text">Reproducir</string>
@@ -64,12 +59,9 @@
     <string name="detail_dislikes_img_view_description">No me gusta</string>
     <string name="detail_uploader_thumbnail_view_description">Miniatura del avatar del usuario</string>
     <string name="live_streams_not_supported">Las transmisiones en vivo aún no están soportadas</string>
-
-
     <string name="content">Contenido</string>
     <string name="show_age_restricted_content_title">Contenido restringido por edad</string>
-    <string name="video_is_age_restricted">Mostrar vídeo restringido por edad. Permitir este tipo de material es posible desde \"Ajustes\".</string>
-
+    <string name="video_is_age_restricted">Mostrar vídeo restringido por edad. Se puede permitir este tipo de material desde Ajustes.</string>
     <string name="main_bg_subtitle">Toque en buscar para empezar</string>
     <string name="autoplay_by_calling_app_title">Reproducción automática</string>
     <string name="autoplay_by_calling_app_summary">Reproducir un vídeo cuando NewPipe es llamado desde otra app</string>
@@ -77,7 +69,6 @@
     <string name="downloads">Descargas</string>
     <string name="downloads_title">Descargas</string>
     <string name="error_report_title">Reportar error</string>
-
     <string name="light_parsing_error">No se pudo analizar el sitio web completamente</string>
     <string name="could_not_setup_download_menu">No se pudo configurar el menú de descarga</string>
     <string name="could_not_get_stream">No se pudo obtener ninguna transmisión</string>
@@ -89,26 +80,19 @@
     <string name="what_happened_headline">Qué ha ocurrido:</string>
     <string name="your_comment">Su comentario (en Inglés):</string>
     <string name="error_details_headline">Detalles:</string>
-
-
     <string name="report_error">Reportar un error</string>
     <string name="user_report">Reporte de usuario</string>
-
     <string name="video">Vídeo</string>
-
     <string name="audio">Audio</string>
     <string name="retry">Reintentar</string>
     <string name="storage_permission_denied">Permiso de acceso al almacenamiento denegado</string>
-
     <string name="start">Iniciar</string>
     <string name="pause">Pausar</string>
     <string name="view">Reproducir</string>
     <string name="delete">Eliminar</string>
     <string name="checksum">Checksum</string>
-
     <string name="add">Nueva misión</string>
     <string name="finish">OK</string>
-
     <string name="msg_name">Nombre del archivo</string>
     <string name="msg_threads">Hilos</string>
     <string name="msg_error">Error</string>
@@ -120,60 +104,45 @@
     <string name="msg_wait">Espere, por favor …</string>
     <string name="msg_copied">Copiado al portapapeles</string>
     <string name="no_available_dir">Por favor, seleccione un directorio de descarga disponible</string>
-
     <string name="could_not_load_image">No se pudo cargar la imagen</string>
     <string name="app_ui_crash">La interfaz de la app dejó de funcionar</string>
     <string name="info_labels">Lo sucedido:\\nPetición:\\nIdioma del contenido:\\nServicio:\\nHora GMT:\\nPaquete:\\nVersión:\\nVersión del SO:</string>
-
     <string name="black_theme_title">Negro</string>
-
     <string name="all">Todo</string>
     <string name="channel">Canal</string>
     <string name="yes">Sí</string>
     <string name="later">Después</string>
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">MM</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="open_in_popup_mode">Abrir en modo popup</string>
     <string name="msg_popup_permission">Este permiso es necesario para
 abrir en modo popup</string>
-
     <string name="reCaptcha_title">Reto reCAPTCHA</string>
     <string name="recaptcha_request_toast">Reto reCAPTCHA requerido</string>
-
     <string name="popup_mode_share_menu_title">Modo popup de NewPipe</string>
-
     <string name="popup_playing_toast">Reproduciendo en modo popup</string>
     <string name="default_video_format_title">Formato de vídeo por defecto</string>
     <string name="disabled">Desactivado</string>
-
     <string name="show_higher_resolutions_title">Mostrar resoluciones más altas</string>
     <string name="show_higher_resolutions_summary">Solo algunos dispositivos soportan reproducción de vídeos en 2K/4K</string>
     <string name="default_popup_resolution_title">Resolución por defecto del popup</string>
     <string name="controls_background_title">Segundo plano</string>
     <string name="controls_popup_title">Popup</string>
-
     <string name="filter">Filtro</string>
     <string name="refresh">Actualizar</string>
     <string name="clear">Limpiar</string>
-
     <string name="popup_remember_size_pos_title">Recordar tamaño y posición del popup</string>
     <string name="popup_remember_size_pos_summary">Recordar el último tamaño y posición del popup</string>
-
     <string name="settings_category_popup_title">Popup</string>
     <string name="popup_resizing_indicator_title">Redimensionando</string>
-
     <string name="use_external_video_player_summary">Elimina el audio en algunas resoluciones</string>
     <string name="player_gesture_controls_title">Controles de gestos del reproductor</string>
     <string name="player_gesture_controls_summary">Usar gestos para controlar el brillo y volumen del reproductor</string>
     <string name="show_search_suggestions_title">Sugerencias de búsqueda</string>
     <string name="show_search_suggestions_summary">Mostrar sugerencias cuando esté buscando</string>
-
-<string name="best_resolution">Mejor resolución</string>
-
+    <string name="best_resolution">Mejor resolución</string>
     <string name="title_activity_about">Acerca de NewPipe</string>
     <string name="action_settings">Ajustes</string>
     <string name="action_about">Acerca de</string>
@@ -190,28 +159,22 @@ abrir en modo popup</string>
     <string name="contribution_encouragement">Si tienes ideas de; traducción, cambios de diseño, limpieza de código o cambios de código realmente fuertes—la ayuda siempre es bienvenida. Cuanto más se hace, mejor se pone!</string>
     <string name="read_full_license">Leer licencia</string>
     <string name="contribution_title">Contribuir</string>
-<string name="subscribe_button_title">Suscribirse</string>
+    <string name="subscribe_button_title">Suscribirse</string>
     <string name="subscribed_button_title">Suscrito</string>
     <string name="channel_unsubscribed">Canal no suscrito</string>
     <string name="subscription_change_failed">No se pudo cambiar la suscripción</string>
     <string name="subscription_update_failed">No se pudo actualizar la suscripción</string>
-
     <string name="tab_main">Principal</string>
     <string name="tab_subscriptions">Suscripciones</string>
-
     <string name="fragment_whats_new">Qué hay de nuevo</string>
-
     <string name="resume_on_audio_focus_gain_title">Reanudar al enfocar</string>
     <string name="resume_on_audio_focus_gain_summary">Continuar reproduciendo después de las interrupciones (ej. llamadas telefónicas)</string>
-
     <string name="settings_category_downloads_title">Descargar</string>
     <string name="settings_file_charset_title">Caracteres permitidos en los nombres de archivo</string>
     <string name="settings_file_replacement_character_summary">Los caracteres no válidos se reemplazan por este valor</string>
     <string name="settings_file_replacement_character_title">Carácter de reemplazo</string>
-
     <string name="charset_letters_and_digits">Letras y dígitos</string>
     <string name="charset_most_special_characters">La mayoría de caracteres especiales</string>
-
     <string name="enable_search_history_title">Historial de búsqueda</string>
     <string name="enable_search_history_summary">Almacenar búsquedas localmente</string>
     <string name="enable_watch_history_title">Historial y caché</string>
@@ -223,40 +186,33 @@ abrir en modo popup</string>
     <string name="action_history">Historial</string>
     <string name="history_empty">El historial está vacío</string>
     <string name="history_cleared">Historial borrado</string>
-
-<string name="notification_channel_name">Notificación de NewPipe</string>
+    <string name="notification_channel_name">Notificación de NewPipe</string>
     <string name="notification_channel_description">Notificaciones para NewPipe en segundo plano y reproductores popup</string>
-
     <string name="settings_category_player_title">Reproductor</string>
     <string name="settings_category_player_behavior_title">Funcionamiento</string>
     <string name="settings_category_history_title">Historial y caché</string>
     <string name="playlist">Lista de reproducción</string>
     <string name="undo">Deshacer</string>
-
     <string name="search_no_results">No hay resultados</string>
     <string name="empty_subscription_feed_subtitle">Nada más que grillos</string>
-
     <string name="no_subscribers">Sin suscriptores</string>
     <plurals name="subscribers">
-	<item quantity="one">%s suscriptor</item>
-	<item quantity="other">%s suscriptores</item>
-</plurals>
-
+        <item quantity="one">%s suscriptor</item>
+        <item quantity="other">%s suscriptores</item>
+    </plurals>
     <string name="no_views">Sin reproducciones</string>
     <plurals name="views">
-	<item quantity="one">%s reproducción</item>
-	<item quantity="other">%s reproducciones</item>
-</plurals>
-
+        <item quantity="one">%s reproducción</item>
+        <item quantity="other">%s reproducciones</item>
+    </plurals>
     <string name="no_videos">Sin vídeos</string>
     <plurals name="videos">
-	<item quantity="one">%s vídeo</item>
-	<item quantity="other">%s vídeos</item>
-</plurals>
-
+        <item quantity="one">Vídeo</item>
+        <item quantity="other">Vídeos</item>
+    </plurals>
     <string name="item_deleted">Elemento eliminado</string>
-<string name="delete_item_search_history">¿Desea eliminar este elemento del historial de búsqueda?</string>
-<string name="main_page_content">Contenido de la página principal</string>
+    <string name="delete_item_search_history">¿Desea eliminar este elemento del historial de búsqueda?</string>
+    <string name="main_page_content">Contenido de la página principal</string>
     <string name="blank_page_summary">Página en blanco</string>
     <string name="kiosk_page_summary">Página del kiosco</string>
     <string name="subscription_page_summary">Página de suscripción</string>
@@ -265,32 +221,28 @@ abrir en modo popup</string>
     <string name="select_a_channel">Seleccione un canal</string>
     <string name="no_channel_subscribed_yet">No hay canales suscritos todavía</string>
     <string name="select_a_kiosk">Seleccione un kiosco</string>
-
     <string name="kiosk">Kiosco</string>
     <string name="trending">Tendencias</string>
     <string name="top_50">Top 50</string>
-<string name="show_hold_to_append_summary">Mostrar sugerencia cuando se presiona el botón de segundo plano o popup en la página de detalles del vídeo</string>
+    <string name="show_hold_to_append_summary">Mostrar sugerencia cuando se presiona el botón de segundo plano o popup en la página de detalles del vídeo</string>
     <string name="background_player_append">En cola en el reproductor de fondo</string>
     <string name="popup_playing_append">En cola en el reproductor popup</string>
     <string name="play_all">Reproducir todo</string>
-
     <string name="player_stream_failure">No se pudo reproducir este stream</string>
     <string name="player_unrecoverable_failure">Se produjo un error irrecuperable del reproductor</string>
     <string name="player_recoverable_failure">Recuperándose del error del reproductor</string>
-
     <string name="title_activity_background_player">Reproductor en segundo plano</string>
     <string name="title_activity_popup_player">Reproductor popup</string>
     <string name="play_queue_remove">Quitar</string>
     <string name="play_queue_stream_detail">Detalles</string>
     <string name="play_queue_audio_settings">Ajustes de audio</string>
     <string name="unknown_content">[Desconocido]</string>
-
     <string name="enqueue_on_background">Poner en cola de segundo plano</string>
     <string name="enqueue_on_popup">Poner en cola de popup</string>
     <string name="start_here_on_main">Comenzar a reproducir aquí</string>
     <string name="start_here_on_background">Comenzar aquí en segundo plano</string>
     <string name="start_here_on_popup">Comenzar aquí en popup</string>
-<string name="show_hold_to_append_title">Mostrar consejo \"Mantener para poner en la cola\"</string>
+    <string name="show_hold_to_append_title">Mostrar consejo \"Mantener para poner en la cola\"</string>
     <string name="new_and_hot">Nuevo y popular</string>
     <string name="hold_to_append">Mantener para poner en la cola</string>
     <string name="donation_title">Donar</string>
@@ -303,27 +255,23 @@ abrir en modo popup</string>
     <string name="switch_to_background">Cambiar a segundo plano</string>
     <string name="switch_to_popup">Cambiar a popup</string>
     <string name="switch_to_main">Cambiar a principal</string>
-
     <string name="service_title">Servicio</string>
     <string name="drawer_open">Abrir cajón</string>
     <string name="drawer_close">Cerrar cajón</string>
     <string name="no_player_found_toast">No se ha encontrado ningún reproductor de vídeo (puede instalar VLC para reproducirlo).</string>
     <string name="always">Siempre</string>
     <string name="just_once">Sólo una vez</string>
-
     <string name="external_player_unsupported_link_type">Los reproductores externos no soportan este tipo de enlaces</string>
     <string name="invalid_url_toast">URL no válida</string>
     <string name="video_streams_empty">No se encontraron transmisiones de vídeo</string>
     <string name="audio_streams_empty">No se encontraron transmisiones de audio</string>
-
     <string name="video_player">Reproductor de vídeo</string>
     <string name="background_player">Reproductor de fondo</string>
     <string name="popup_player">Reproductor de popup</string>
     <string name="always_ask_player">Preguntar siempre</string>
-    
     <string name="preferred_player_fetcher_notification_title">Obteniendo información…</string>
     <string name="preferred_player_fetcher_notification_message">Cargando contenido solicitado</string>
-<string name="import_data_title">Importar base de datos</string>
+    <string name="import_data_title">Importar base de datos</string>
     <string name="export_data_title">Exportar base de datos</string>
     <string name="import_data_summary">Reemplazará su historial actual y sus suscripciones</string>
     <string name="export_data_summary">Exportar historial, suscripciones y listas de reproducción</string>
@@ -332,90 +280,67 @@ abrir en modo popup</string>
     <string name="no_valid_zip_file">Archivo ZIP no válido</string>
     <string name="could_not_import_all_files">ADVERTENCIA: no se pudieron importar todos los archivos.</string>
     <string name="override_current_data">Esto reemplazará su configuración actual.</string>
-
     <string name="controls_download_desc">Descargar archivo stream</string>
     <string name="show_info">Mostrar info</string>
-
     <string name="tab_bookmarks">"Listas de reproducción en marcadores "</string>
-
     <string name="controls_add_to_playlist_title">Añadir a</string>
-
     <string name="detail_drag_description">Arrastrar para reordenar</string>
-
     <string name="create">Crear</string>
     <string name="delete_one">Eliminar uno</string>
     <string name="delete_all">Eliminar todos</string>
     <string name="dismiss">Descartar</string>
     <string name="rename">Renombrar</string>
-
     <string name="delete_stream_history_prompt">¿Desea eliminar este elemento del historial de reproducciones?</string>
     <string name="delete_all_history_prompt">¿Seguro que desea eliminar todos los elementos del historial?</string>
     <string name="title_last_played">Última reproducción</string>
     <string name="title_most_played">Más reproducido</string>
-
     <string name="always_ask_open_action">Preguntar siempre</string>
-    
     <string name="create_playlist">Nueva lista de reproducción</string>
     <string name="delete_playlist">Eliminar</string>
     <string name="rename_playlist">Renombrar</string>
     <string name="playlist_name_input">Nombre</string>
     <string name="append_playlist">Añadir a la lista de reproducción</string>
     <string name="set_as_playlist_thumbnail">Definir como miniatura de lista de reproducción</string>
-
     <string name="bookmark_playlist">Marcar lista de reproducción</string>
     <string name="unbookmark_playlist">Eliminar marcador</string>
-
     <string name="delete_playlist_prompt">¿Borrar esta lista de reproducción\?</string>
     <string name="playlist_creation_success">Lista de reproducción creada</string>
     <string name="playlist_add_stream_success">Añadido a la lista de reproducción</string>
     <string name="playlist_thumbnail_change_success">Miniatura de lista de reproducción cambiada.</string>
     <string name="playlist_delete_failure">No se pudo eliminar la lista de reproducción.</string>
-
     <string name="drawer_header_action_paceholder_text">Algo aparecerá aquí pronto ;D</string>
-
-
     <string name="caption_none">Sin subtítulos</string>
-
     <string name="resize_fit">Ajustar</string>
     <string name="resize_fill">Rellenar</string>
     <string name="resize_zoom">Zoom</string>
-
-<string name="settings_category_debug_title">Depuración</string>
+    <string name="settings_category_debug_title">Depuración</string>
     <string name="caption_auto_generated">Auto generados</string>
     <string name="enable_leak_canary_title">Activar LeakCanary</string>
     <string name="enable_leak_canary_summary">La monitorización de fugas de memoria puede causar que la app no responda cuando hay Heap Dump</string>
-
     <string name="enable_disposed_exceptions_title">Reportar errores fuera del ciclo de duración</string>
     <string name="enable_disposed_exceptions_summary">Forzar reporte de excepciones no entregables de RX fuera del fragmento o del ciclo de actividad después del descarte</string>
-
-<string name="use_inexact_seek_title">Usar búsqueda rápida inexacta</string>
+    <string name="use_inexact_seek_title">Usar búsqueda rápida inexacta</string>
     <string name="use_inexact_seek_summary">La búsqueda inexacta permite al reproductor buscar posiciones más rápido con menor precisión</string>
     <string name="auto_queue_title">Auto-encolar la siguiente transmisión</string>
     <string name="auto_queue_summary">Auto-añadir un vídeo relacionado al reproducir el último vídeo en una cola no repetitiva.</string>
     <string name="live">DIRECTO</string>
     <string name="live_sync">SINCRONIZAR</string>
-<string name="file">Archivo</string>
-
+    <string name="file">Archivo</string>
     <string name="invalid_directory">No existe el directorio</string>
     <string name="invalid_source">No existe la fuente del archivo/contenido</string>
     <string name="invalid_file">El archivo no existe o insuficientes permisos para leerlo o escribir en él</string>
     <string name="file_name_empty_error">El nombre del archivo no puede estar vacío</string>
     <string name="error_occurred_detail">Ocurrió un error: %1$s</string>
-
     <string name="import_export_title">Importar/exportar</string>
     <string name="import_title">Importar</string>
     <string name="import_from">Importar desde</string>
     <string name="export_to">Exportar a</string>
-
     <string name="import_ongoing">Importando…</string>
     <string name="export_ongoing">Exportando…</string>
-
     <string name="import_file_title">Importar archivo</string>
     <string name="previous_export">Exportación anterior</string>
-
     <string name="subscriptions_import_unsuccessful">No se pudo importar suscripciones</string>
     <string name="subscriptions_export_unsuccessful">No se pudo exportar suscripciones</string>
-
     <string name="import_youtube_instructions">Importe suscripciones de YouTube descargando el archivo de exportación: 
 \n 
 \n1. Vaya a esta URL: %1$s 
@@ -428,12 +353,11 @@ abrir en modo popup</string>
 \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">Tenga en cuenta que esta operación puede ser costosa para la red.
 \n
 \n¿Desea continuar?</string>
-<string name="download_thumbnail_title">Cargar Miniaturas</string>
-    <string name="download_thumbnail_summary">Cuando está desactivado no se cargan miniaturas, economizando el uso de datos y memoria. Los cambios borrarán tanto la caché de imágenes en la memoria como en el disco.</string>
+    <string name="download_thumbnail_title">Cargar miniaturas</string>
+    <string name="download_thumbnail_summary">Desactívalo para evitar la carga de miniaturas, ahorrando datos y uso de memoria. Los cambios borrarán tanto la caché de imágenes en la memoria como en el disco.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Caché de imagen limpiado</string>
     <string name="metadata_cache_wipe_title">Metadatos eliminados del caché</string>
     <string name="metadata_cache_wipe_summary">Eliminar todos los datos de la página web en caché</string>
@@ -442,16 +366,12 @@ abrir en modo popup</string>
     <string name="playback_tempo">Tiempo</string>
     <string name="playback_pitch">Tono</string>
     <string name="unhook_checkbox">Desenganchar (puede causar distorsión)</string>
-<string name="no_streams_available_download">No hay streams disponibles para descargar</string>
-
+    <string name="no_streams_available_download">No hay streams disponibles para descargar</string>
     <string name="preferred_open_action_settings_title">Acción \'abrir\' preferida</string>
     <string name="preferred_open_action_settings_summary">Acción por defecto al abrir contenido — %s</string>
-
     <string name="toast_no_player">No hay ninguna app instalada para reproducir este archivo</string>
-
     <string name="caption_setting_title">Subtítulos</string>
     <string name="caption_setting_description">Modificar la escala de texto de los subtítulos y los estilos de fondo del reproductor. Requiere el reinicio de la app para que surta efecto.</string>
-
     <string name="clear_views_history_title">Borrar historial de reproducciones</string>
     <string name="clear_views_history_summary">Elimina el historial de las transmisiones reproducidas</string>
     <string name="delete_view_history_alert">¿Eliminar todo el historial de reproducciones\?</string>
@@ -461,68 +381,54 @@ abrir en modo popup</string>
     <string name="delete_search_history_alert">¿Eliminar todo el historial de búsqueda\?</string>
     <string name="search_history_deleted">Historial de búsquedas eliminado.</string>
     <string name="one_item_deleted">1 elemento eliminado.</string>
-
     <string name="app_license">NewPipe es software libre copyleft: puedes usarlo, estudiarlo, compartirlo y mejorarlo a tu antojo. Específicamente, puedes redistribuirlo y/o modificarlo bajo los términos de la Licencia Pública General GNU publicada por la Free Software Foundation, ya sea la versión 3 de la Licencia, o (a tu elección) cualquier versión posterior.</string>
     <string name="import_settings">¿Desea importar también los ajustes?</string>
-
     <string name="privacy_policy_title">Política de Privacidad de NewPipe</string>
     <string name="privacy_policy_encouragement">El proyecto NewPipe toma su privacidad muy en serio. Por lo tanto, la aplicación no recopila ningún dato sin su consentimiento. La política de privacidad de NewPipe explica en detalle qué datos se envían y almacenan cuando envía un informe de fallas.</string>
     <string name="read_privacy_policy">Leer la Política de Privacidad</string>
     <string name="start_accept_privacy_policy">Para cumplir con el Reglamento general europeo de protección de datos (GDPR), podemos llamar su atención sobre la política de privacidad de NewPipe. Por favor léelo cuidadosamente. Debe aceptarlo para enviarnos el informe de error.</string>
     <string name="accept">Aceptar</string>
     <string name="decline">Declinar</string>
-
     <string name="limit_data_usage_none_description">Sin límite</string>
-    <string name="limit_mobile_data_usage_title">Limitar resolución cuando se use Datos Móviles</string>
+    <string name="limit_mobile_data_usage_title">Limitar la resolución cuando se usen datos móviles</string>
     <string name="minimize_on_exit_title">Mimimizar al cambiar de aplicación</string>
     <string name="minimize_on_exit_summary">Acción de cambiar a otra aplicación desde el reproductor principal — %s</string>
     <string name="minimize_on_exit_none_description">Ninguna</string>
     <string name="minimize_on_exit_background_description">Minimizar al reproductor de fondo</string>
-    <string name="minimize_on_exit_popup_description">Minimizar el reproductor emergente</string>
-
-<string name="skip_silence_checkbox">Avance rápido durante el silencio</string>
+    <string name="minimize_on_exit_popup_description">Minimizar al reproductor popup</string>
+    <string name="skip_silence_checkbox">Avance rápido durante el silencio</string>
     <string name="playback_step">Paso</string>
     <string name="playback_reset">Reiniciar</string>
-
     <string name="channels">Canales</string>
     <string name="users">Usuarios</string>
     <string name="playlists">Listas de reproducción</string>
     <string name="tracks">Pistas</string>
     <string name="missions_header_finished">Finalizadas</string>
     <string name="missions_header_pending">En cola</string>
-    
     <string name="paused">pausado</string>
     <string name="queued">en cola</string>
     <string name="post_processing">post-procesado</string>
-    
     <string name="enqueue">Encolar</string>
-    
     <string name="permission_denied">Acción denegada por el sistema</string>
-
     <string name="file_deleted">Archivo borrado</string>
-
     <!-- download notifications -->
     <string name="download_failed">Descarga fallida</string>
     <string name="download_finished">Descarga finalizada</string>
     <string name="download_finished_more">%s descargas finalizadas</string>
-
     <!-- dialog about existing downloads -->
     <string name="generate_unique_name">Generar nombre único</string>
     <string name="overwrite">Sobrescribir</string>
     <string name="overwrite_warning">Ya existe un archivo descargado con este nombre</string>
     <string name="download_already_running">Hay una descarga en curso con este nombre</string>
-
     <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="msg_pending_downloads">Continúa tus %s transferencias pendientes desde Descargas</string>
     <string name="stop">Detener</string>
-    <string name="max_retry_msg">Intentos maximos</string>
+    <string name="max_retry_msg">Intentos máximos</string>
     <string name="max_retry_desc">Cantidad máxima de intentos antes de cancelar la descarga</string>
     <string name="pause_downloads_on_mobile">Pausar al cambiar a datos moviles</string>
-    <string name="pause_downloads_on_mobile_desc">No todas las descargas se pueden suspender, en esos casos, se reiniciaran</string>
-
-
+    <string name="pause_downloads_on_mobile_desc">Las descargas que no se pueden pausar serán reiniciadas</string>
     <!-- message dialog about download error -->
     <string name="show_error">Mostrar error</string>
     <string name="label_code">Codigo</string>
@@ -530,12 +436,38 @@ abrir en modo popup</string>
     <string name="error_file_creation">No se puede crear el archivo</string>
     <string name="error_permission_denied">Permiso denegado por el sistema</string>
     <string name="error_ssl_exception">Fallo la conexión segura</string>
-    <string name="error_unknown_host">No se puede encontrar el servidor</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 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">Rango solicitado no satisfactorio</string>
+    <string name="error_http_requested_range_not_satisfiable">El rango solicitado no se puede satisfacer</string>
     <string name="error_http_not_found">No encontrado</string>
     <string name="error_postprocessing_failed">Fallo el post-procesado</string>
-    
-</resources>
+    <string name="unsubscribe">Desuscribirse</string>
+    <string name="tab_new">Nueva pestaña</string>
+    <string name="tab_choose">Elige la pestaña</string>
+    <string name="volume_gesture_control_title">Control de volumen por gestos</string>
+    <string name="volume_gesture_control_summary">Usar gestos para controlar el volumen del reproductor</string>
+    <string name="brightness_gesture_control_title">Control de brillo por gestos</string>
+    <string name="brightness_gesture_control_summary">Usar gestos para controlar el brillo del reproductor</string>
+    <string name="settings_category_updates_title">Actualizaciones</string>
+    <string name="events">Eventos</string>
+    <string name="app_update_notification_channel_name">Notificación de actualización de la aplicación</string>
+    <string name="app_update_notification_channel_description">Notificaciones para nueva versión de NewPipe</string>
+    <string name="download_to_sdcard_error_title">Almacenamiento externo no disponible</string>
+    <string name="download_to_sdcard_error_message">Todavía no es posible descargar a una tarjeta SD externa. ¿Restablecer la ubicación de la carpeta de descarga\?</string>
+    <string name="saved_tabs_invalid_json">Usando las pestañas por defecto, error al leer las pestañas guardadas</string>
+    <string name="restore_defaults">Restaurar valores por defecto</string>
+    <string name="restore_defaults_confirmation">¿Quieres restaurar los valores por defecto\?</string>
+    <string name="subscribers_count_not_available">Número de suscriptores no disponible</string>
+    <string name="main_page_content_summary">Qué pestañas aparecen en la página principal</string>
+    <string name="selection">Selección</string>
+    <string name="conferences">Conferencias</string>
+    <string name="updates_setting_title">Actualizaciones</string>
+    <string name="updates_setting_description">Mostrar una notificación para solicitar actualizar la aplicación cuando haya una nueva versión disponible</string>
+    <string name="list_view_mode">Modo de vista de lista</string>
+    <string name="auto">Automático</string>
+    <string name="switch_view">Cambiar vista</string>
+    <string name="app_update_notification_content_title">¡Actualización de NewPipe disponible!</string>
+    <string name="app_update_notification_content_text">Pulsa para descargar</string>
+</resources>
\ No newline at end of file

From 0e3af45466ae8d5ec9e6bb3c4da6ed2da57bfa1c Mon Sep 17 00:00:00 2001
From: Rex_sa <asd1234567890m@gmail.com>
Date: Fri, 1 Mar 2019 14:58:17 +0000
Subject: [PATCH 003/138] Translated using Weblate (Arabic)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ar/strings.xml | 144 +++++++------------------
 1 file changed, 39 insertions(+), 105 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 882a65af0..f197bf975 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -26,7 +26,7 @@
     <string name="light_theme_title">مضيء</string>
     <string name="list_thumbnail_view_description">صور معاينة الفيديو</string>
     <string name="network_error">خطأ في الشبكة</string>
-    <string name="next_video_title">التالى</string>
+    <string name="next_video_title">التالي</string>
     <string name="no_player_found">لا يوجد مشغل فيديو. هل تريد تثبيت VLC ؟</string>
     <string name="open_in_browser">افتح في المتصفح</string>
     <string name="play_audio">الصوت</string>
@@ -38,15 +38,15 @@
     <string name="settings">الإعدادات</string>
     <string name="settings_category_appearance_title">المظهر</string>
     <string name="settings_category_other_title">اخرى</string>
-    <string name="settings_category_video_audio_title">الفيديو &amp; الصوتيات</string>
+    <string name="settings_category_video_audio_title">الفيديو و الصوتيات</string>
     <string name="share">مشاركة</string>
     <string name="share_dialog_title">مشاركة بواسطة</string>
-    <string name="show_next_and_similar_title">عرض مقاطع الفيديو \"التالية\" و \"شبيه\"</string>
+    <string name="show_next_and_similar_title">عرض مقاطع الفيديو \"التالية\" و \"المشابهة\"</string>
     <string name="show_play_with_kodi_summary">عرض خيار لتشغيل الفيديو بواسطة مشغل كودي</string>
     <string name="show_play_with_kodi_title">عرض خيار التشغيل بواسطة كودي</string>
     <string name="theme_title">السمة</string>
     <string name="upload_date_text">تم النشر يوم %1$s</string>
-    <string name="url_not_supported_toast">رابط غير معتمد URL</string>
+    <string name="url_not_supported_toast">رابط URL غير معتمد</string>
     <string name="use_external_audio_player_title">استخدام مشغل صوت خارجي</string>
     <string name="use_external_video_player_title">استخدام مشغل فيديو خارجي</string>
     <string name="use_tor_summary">(إختبارية) إجراء التنزيلات من خلال استخدام بروكسي Tor لزيادة الخصوصية ( تشغيل الفيديو المباشر غير مدعوم حتى الأن ).</string>
@@ -58,19 +58,17 @@
     <string name="general_error">خطأ</string>
     <string name="parsing_error">تعذرت عملية تحليل الموقع</string>
     <string name="youtube_signature_decryption_error">تعذر فك تشفير توقيع رابط الفيديو</string>
-<string name="main_bg_subtitle">اضغط بحث للبدء</string>
+    <string name="main_bg_subtitle">اضغط بحث للبدء</string>
     <string name="subscribe_button_title">اشتراك</string>
     <string name="subscribed_button_title">مشترك</string>
     <string name="tab_main">الرئيسية</string>
     <string name="tab_subscriptions">الاشتراكات</string>
-
     <string name="fragment_whats_new">ما الجديد</string>
-
     <string name="controls_background_title">في الخلفية</string>
     <string name="autoplay_by_calling_app_title">تشغيل تلقائي</string>
     <string name="black_theme_title">اسود</string>
     <string name="enable_watch_history_title">التاريخ وذاكرة التخزين المؤقت</string>
-    <string name="settings_category_history_title">التاريخ &amp; ذاكرة التخزين المؤقت</string>
+    <string name="settings_category_history_title">التاريخ و ذاكرة التخزين المؤقت</string>
     <string name="content">المحتوى</string>
     <string name="downloads">التنزيلات</string>
     <string name="downloads_title">التنزيلات</string>
@@ -83,14 +81,12 @@
     <string name="title_activity_history">التاريخ</string>
     <string name="action_history">التاريخ</string>
     <string name="open_in_popup_mode">افتح في وضع النافذة المنبثقة</string>
-    <string name="use_external_video_player_summary">يزيل الصوت في بعض القرارات</string>
+    <string name="use_external_video_player_summary">يزيل الصوت في بعض الخيارات</string>
     <string name="popup_mode_share_menu_title">وضع النوافذ المنبثقة NewPipe</string>
     <string name="channel_unsubscribed">تم إلغاء الاشتراك في القناة</string>
     <string name="subscription_change_failed">تعذر تغيير حالة الاشتراك</string>
     <string name="subscription_update_failed">تعذر تحديث الاشتراك</string>
-
     <string name="controls_popup_title">نافذة المنبثقة</string>
-
     <string name="autoplay_by_calling_app_summary">تشغيل مقطع الفيديو عند إستدعاء NewPipe من تطبيق آخر</string>
     <string name="default_popup_resolution_title">الدقة الافتراضية لنوافذ المنبثقة</string>
     <string name="show_higher_resolutions_title">"عرض أعلى جودة "</string>
@@ -130,22 +126,18 @@
     <string name="best_resolution">أفضل دقة</string>
     <string name="undo">تراجع</string>
     <string name="play_all">تشغيل الكل</string>
-
     <string name="notification_channel_name">تنبيهات NewPipe</string>
     <string name="notification_channel_description">تنبيهات مشغل NewPipe للخلفية والنوافذ المنبثقة</string>
-
     <string name="unknown_content">[غير معروف]</string>
-
     <string name="light_parsing_error">لا يمكن تحليل الموقع بشكل كلي</string>
     <string name="could_not_setup_download_menu">تعذرت عملية إعداد قائمة التنزيل</string>
-    <string name="live_streams_not_supported">لبث المباشر غير مدعوم حتى الآن</string>
+    <string name="live_streams_not_supported">البث المباشر غير مدعوم حتى الآن</string>
     <string name="could_not_get_stream">تعذر الحصول على أي بث</string>
     <string name="could_not_load_image">تعذرت عملية تحميل الصورة</string>
     <string name="app_ui_crash">تعطل التطبيق / واجهة المستخدم</string>
     <string name="player_stream_failure">لا يمكن تشغيل هذا البث</string>
     <string name="player_unrecoverable_failure">حدث خطأ للمشغل غير قابل للاسترداد</string>
     <string name="player_recoverable_failure">استرداد المشغل من الخطأ</string>
-
     <string name="sorry_string">عذرا، لا ينبغي أن يحدث ذلك.</string>
     <string name="error_report_button_text">الإبلاغ عن خطأ عبر البريد الإلكتروني</string>
     <string name="error_snackbar_message">عذرا، حدثت بعض الأخطاء.</string>
@@ -155,31 +147,25 @@
     <string name="info_labels">ماذا:\\nطلب:\\nيحتوى اللغة:\\nSالخدمات:\\nتوقيت غرينتش:\\nحزمة:\\nالإصدار:\\nOS إصدار نظام التشغيل:</string>
     <string name="your_comment">تعليقك (باللغة الإنجليزية):</string>
     <string name="error_details_headline">التفاصيل:</string>
-
-
     <string name="report_error">الإبلاغ عن خطأ</string>
     <string name="user_report">تقرير المستخدم</string>
     <string name="search_no_results">لم يتم العثور على نتائج</string>
     <string name="empty_subscription_feed_subtitle">لا شيء هنا غير الصراصير</string>
-
     <string name="audio">الصوت</string>
     <string name="retry">إعادة المحاولة</string>
     <string name="storage_permission_denied">تم رفض إذن الوصول إلى التخزين</string>
-
     <string name="short_thousand">ألف</string>
     <string name="short_million">مليون</string>
     <string name="short_billion">بليون</string>
-
     <string name="no_subscribers">ليس هناك مشترِكون</string>
     <plurals name="subscribers">
-    <item quantity="zero">%s لا يوجد مشترك</item>
-    <item quantity="one">%s مشترك</item>
-    <item quantity="two">%s اثنتين مشتركين</item>
-    <item quantity="few">%s اشتراكات</item>
-    <item quantity="many">%s مشتركين</item>
-    <item quantity="other">%s مشتركون</item>
-</plurals>
-
+        <item quantity="zero">%s لا يوجد مشترك</item>
+        <item quantity="one">%s مشترك</item>
+        <item quantity="two">%s اثنتين مشتركين</item>
+        <item quantity="few">%s اشتراكات</item>
+        <item quantity="many">%s مشتركين</item>
+        <item quantity="other">%s مشتركون</item>
+    </plurals>
     <string name="no_views">دون مشاهدات</string>
     <string name="no_videos">لاتوجد فيديوهات</string>
     <string name="start">ابدأ</string>
@@ -187,10 +173,8 @@
     <string name="view">شغل</string>
     <string name="delete">حذف</string>
     <string name="checksum">التوقيع</string>
-
     <string name="add">مهمة جديدة</string>
     <string name="finish">حسناً</string>
-
     <string name="msg_name">اسم الملف</string>
     <string name="msg_threads">التقسيم</string>
     <string name="msg_error">الخطأ</string>
@@ -204,15 +188,12 @@
     <string name="no_available_dir">الرجاء تحديد مجلد لحفظ التنزيلات</string>
     <string name="msg_popup_permission">هذا الإذن مطلوب
 \nللفتح في وضع النافذة المنبثقة</string>
-
     <string name="reCaptchaActivity">اختبار reCAPTCHA</string>
     <string name="settings_file_charset_title">السماح بالرموز في أسماء الملفات</string>
     <string name="settings_file_replacement_character_summary">يتم استبدال الرموز غير المسموح بها بهذه القيمة</string>
     <string name="settings_file_replacement_character_title">استبدال الحرف</string>
-
     <string name="charset_letters_and_digits">الحروف والأرقام</string>
     <string name="charset_most_special_characters">معظم الأحرف الخاصة</string>
-
     <string name="title_activity_about">عن تطبيق نيوپايپ</string>
     <string name="action_settings">الإعدادات</string>
     <string name="title_licenses">تراخيص الجهات الخارجية</string>
@@ -231,8 +212,6 @@
     <string name="website_encouragement">قم بزيارة موقع NewPipe لمزيد من المعلومات والمستجدات.</string>
     <string name="app_license_title">تراخيص NewPipe</string>
     <string name="read_full_license">قراءة الرخصة</string>
-
-
     <string name="title_history_search">التي تم البحث عنها</string>
     <string name="title_history_view">تمت مشاهدتها</string>
     <string name="history_disabled">تم تعطيل السجل</string>
@@ -240,7 +219,6 @@
     <string name="history_cleared">تم مسح التاريخ</string>
     <string name="item_deleted">تم حذف العنصر</string>
     <string name="delete_item_search_history">هل تريد حذف هذا العنصر من سجل البحث؟</string>
-
     <string name="main_page_content">محتوى الشاشة الرئيسية</string>
     <string name="blank_page_summary">صفحة فارغة</string>
     <string name="subscription_page_summary">صفحة الاشتراك</string>
@@ -258,83 +236,68 @@
     <string name="play_queue_audio_settings">الإعدادات الصوتية</string>
     <string name="start_here_on_main">تشغيل هنا</string>
     <string name="start_here_on_popup">تشغيل هنا في وضع النافذة المنبثقة</string>
-<string name="reCaptcha_title">تحدي الكابتشا</string>
+    <string name="reCaptcha_title">تحدي الكابتشا</string>
     <string name="hold_to_append">اضغط للإدراج في قائمة الانتظار</string>
     <plurals name="views">
-    <item quantity="zero">بدون مشاهدات</item>
-    <item quantity="one">%s مشاهدة</item>
-    <item quantity="two">%s مشاهدتين</item>
-    <item quantity="few">%s مشاهدون</item>
-    <item quantity="many">%s مشاهدات</item>
-    <item quantity="other">%s مشاهدين</item>
-</plurals>
-
+        <item quantity="zero">بدون مشاهدات</item>
+        <item quantity="one">%s مشاهدة</item>
+        <item quantity="two">%s مشاهدتين</item>
+        <item quantity="few">%s مشاهدون</item>
+        <item quantity="many">%s مشاهدات</item>
+        <item quantity="other">%s مشاهدين</item>
+    </plurals>
     <plurals name="videos">
-    <item quantity="zero">%s فيديو</item>
-    <item quantity="one">%s فيديو</item>
-    <item quantity="two">%s فيديوهان</item>
-    <item quantity="few">%s فيديو</item>
-    <item quantity="many">%s فيديوهات</item>
-    <item quantity="other">%s فيديو</item>
-</plurals>
-
+        <item quantity="zero">%s فيديو</item>
+        <item quantity="one">%s فيديو</item>
+        <item quantity="two">%s فيديوهان</item>
+        <item quantity="few">%s فيديو</item>
+        <item quantity="many">%s فيديوهات</item>
+        <item quantity="other">%s فيديو</item>
+    </plurals>
     <string name="recaptcha_request_toast">طلب اختبار الكابتشا مطلوب</string>
-
     <string name="copyright" formatted="true">© %1$sبواسطة%2$sتحت%3$s</string>
     <string name="kiosk_page_summary">صفحة الكشك</string>
     <string name="select_a_kiosk">حدد كشك</string>
-
     <string name="kiosk">الكشك</string>
     <string name="enqueue_on_background">إدراج في قائمة الانتظار في الخلفية</string>
     <string name="enqueue_on_popup">إدراج في قائمة الانتظار على المنبثقة</string>
     <string name="start_here_on_background">تشغيل في الخلفية</string>
-<string name="default_content_country_title">المحتوى الإفتراضي حسب البلد</string>
+    <string name="default_content_country_title">المحتوى الإفتراضي حسب البلد</string>
     <string name="toggle_orientation">تغيير الإتجاه</string>
     <string name="switch_to_background">الإنتقال إلى التشغيل في الخلفية</string>
     <string name="switch_to_popup">الإنتقال إلى التشغيل في النافذة المنبثقة</string>
     <string name="switch_to_main">الإنتقال إلى الرئيسية</string>
-
     <string name="service_title">الخدمة</string>
     <string name="drawer_open">فتح الدرج</string>
     <string name="drawer_close">إغلاق الدرج</string>
     <string name="always">دائماً</string>
     <string name="just_once">مرة واحدة فقط</string>
-
     <string name="invalid_url_toast">العنوان خاطئ</string>
-    <string name="no_player_found_toast">لم يتم العثور على مشغل تدفق (يمكنك تثبيت VLC وتشغيله).</string>
+    <string name="no_player_found_toast">لم يتم العثور على مشغل الفيديو (يمكنك تثبيت VLC وتشغيله).</string>
     <string name="import_data_title">استيراد قاعدة البيانات</string>
     <string name="export_data_title">تصدير قاعدة البيانات</string>
     <string name="import_data_summary">"الكتابة فوق سجل التاريخ  والاشتراكات الحالية "</string>
     <string name="export_data_summary">تصدير السجل، الإشتراكات وقوائم التشغيل</string>
     <string name="show_info">عرض المعلومات</string>
-
     <string name="controls_add_to_playlist_title">إضافة إلى</string>
-
     <string name="settings_category_debug_title">تحليل</string>
     <string name="live">مٌباشِر</string>
     <string name="video_streams_empty">لم يتم العثور على أي بث مرئي</string>
     <string name="audio_streams_empty">لم يتم العثور على أي بث صوتي</string>
-
     <string name="detail_drag_description">إسحب للقيام بالترتيب</string>
-
     <string name="create">إنشاء</string>
     <string name="delete_one">إحذف واحدة</string>
     <string name="delete_all">حذف الكل</string>
     <string name="dismiss">إلغاء</string>
     <string name="rename">إعادة التسمية</string>
-
     <string name="export_complete_toast">تمت عملية التصدير</string>
     <string name="import_complete_toast">إكتَملَت عملية الإستيراد</string>
     <string name="could_not_import_all_files">تنبيه : تعذرت عملية استيراد كافة الملفات.</string>
     <string name="drawer_header_action_paceholder_text">سوف يظهر شيء هنا قريبا ;D</string>
-
-
     <string name="video_player">مشغل الفيديو</string>
     <string name="always_ask_open_action">السؤال دائماً</string>
-    
     <string name="preferred_player_fetcher_notification_title">الحصول على المعلومات …</string>
     <string name="preferred_player_fetcher_notification_message">تحميل المحتوى المطلوب</string>
-
     <string name="create_playlist">إنشاء قائمة تشغيل جديدة</string>
     <string name="delete_playlist">حذف قائمة التشغيل</string>
     <string name="rename_playlist">"إعادة تسمية قائمة التشغيل "</string>
@@ -344,68 +307,52 @@
     <string name="playlist_creation_success">تم إنشاء قائمة التشغيل</string>
     <string name="playlist_add_stream_success">تمت إضافتها إلى قائمة التشغيل</string>
     <string name="playlist_delete_failure">لا يمكن حذف قائمة التشغيل.</string>
-
     <string name="resize_fill">ملئ الشاشة</string>
     <string name="resize_zoom">تكبير</string>
-
     <string name="caption_font_size_settings_title">حجم خط التسمية</string>
     <string name="smaller_caption_font_size">أصغر خط</string>
     <string name="normal_caption_font_size">خط عادي</string>
     <string name="larger_caption_font_size">خط ذو حجم كبير</string>
-
     <string name="live_sync">مُزامَنة</string>
-
     <string name="controls_download_desc">تنزيل ملف البث</string>
     <string name="tab_bookmarks">الإشارات المرجعية</string>
-
     <string name="use_inexact_seek_title">استعمال التقديم السريع الغير دقيق</string>
     <string name="use_inexact_seek_summary">"التقديم الغير دقيق يسمح للمشغل بالإطلاع الى الأماكن بشكل اسرع مع دقة اقل "</string>
     <string name="download_thumbnail_title">تحميل الصور المصغرة</string>
     <string name="thumbnail_cache_wipe_complete_notice">تم إفراغ مساحة ذاكرة التخزين المؤقتة الخاصة بالصور</string>
     <string name="file">الملف</string>
-
     <string name="invalid_directory">لا يوجد مثل هذا المجلد</string>
     <string name="file_name_empty_error">لا يمكن أن يكون اسم الملف فارغا</string>
     <string name="error_occurred_detail">طرأ هناك خطأ: %1$s</string>
     <string name="no_valid_zip_file">ملف مضغوط ZIP غير صالح</string>
     <string name="unbookmark_playlist">إزالة الفواصل المرجعية</string>
-
     <string name="resize_fit">تناسب مع الشاشة</string>
     <string name="caption_auto_generated">توليد تلقائي</string>
-
     <string name="import_export_title">إستيراد او تصدير</string>
     <string name="import_title">إستيراد</string>
     <string name="import_from">إستعادة مِن</string>
     <string name="export_to">تصدير إلى</string>
-
     <string name="import_ongoing">عملية الإستعادة جارية …</string>
     <string name="export_ongoing">عملية التصدير جارية …</string>
-
     <string name="import_file_title">إستيراد ملف</string>
     <string name="import_soundcloud_instructions_hint">"معرفك , soundcloud.com/ الخاص بك  "</string>
-
     <string name="playback_default">إفتراضي</string>
-<string name="download_thumbnail_summary">عند إيقاف تحميل أي صور مصغرة ، وتوفير البيانات واستخدام الذاكرة. تعمل التغييرات على محو ذاكرة التخزين المؤقت للصورة الموجودة على الذاكرة أو على القرص.</string>
+    <string name="download_thumbnail_summary">عند إيقاف تحميل أي صور مصغرة ، وتوفير البيانات واستخدام الذاكرة. تعمل التغييرات على محو ذاكرة التخزين المؤقت للصورة الموجودة على الذاكرة أو على القرص.</string>
     <string name="metadata_cache_wipe_title">امسح البيانات الوصفية المخزنة مؤقتًا</string>
     <string name="metadata_cache_wipe_summary">إزالة جميع بيانات صفحات الويب المخزنة مؤقتًا</string>
     <string name="metadata_cache_wipe_complete_notice">تم محو ذاكرة التخزين المؤقت للبيانات الوصفية</string>
     <string name="auto_queue_title">وضع البث القادم تلقائيا في قائمة الإنتظار</string>
     <string name="auto_queue_summary">رفض التدفق-التلقائي المشابه في حال كان التدفق السابق يعمل في-حالة عدم التكرار.</string>
     <string name="set_as_playlist_thumbnail">إضافة صورة مصغرة إلى قائمة التشغيل</string>
-
     <string name="bookmark_playlist">تفضيل قائمة التشغيل</string>
     <string name="playlist_thumbnail_change_success">تم تغيير الصورة المصغرة لقائمة التشغيل.</string>
     <string name="caption_none">بدون تسميات توضيحية</string>
-
     <string name="caption_setting_title">تسميات توضيحية</string>
     <string name="caption_setting_description">تعديل مشغل نص التسمية التوضيحية وأنماط الخلفية. يتطلب إعادة تشغيل التطبيق لتصبح التغييرات سارية المفعول.</string>
-
     <string name="enable_leak_canary_title">تمكين LeakCanary</string>
     <string name="enable_leak_canary_summary">قد تتسبب مراقبة تسرب الذاكرة في عدم استجابة التطبيق عند تفريغ السجلات</string>
-
     <string name="enable_disposed_exceptions_title">تقرير الأخطاء خارج دورة الحياة</string>
     <string name="enable_disposed_exceptions_summary">فرض الإبلاغ عن استثناءات Rx غير القابلة للتسليم خارج دورة حياة الجزء أو النشاط بعد التخلص منها</string>
-
     <string name="clear_views_history_title">محو سجل المشاهدة</string>
     <string name="clear_views_history_summary">احذف سِجل الفيديوهات التي تم تشغيلها</string>
     <string name="delete_view_history_alert">حذف سجل المشاهدة بالكامل\?</string>
@@ -418,29 +365,21 @@
     <string name="invalid_source">لا يوجد مثل هذا الملف/مصدر المحتوى</string>
     <string name="invalid_file">الملف غير موجود أو الإذن بالقراءة أو الكتابة إليه غير موجود</string>
     <string name="no_streams_available_download">لا يوجد بث متاح للتنزيل</string>
-
     <string name="one_item_deleted">تم حذف عنصر واحد.</string>
-
     <string name="toast_no_player">لم يتم تثبيت أي تطبيق لتشغيل هذا الملف</string>
-
-    <string name="app_license">NewPipe هو برنامج مفتوح المصدر حقوق متروكة: يمكنك استخدام الكود ودراسته وتحسينه كما شئت. و على وجه التحديد يمكنك إعادة توزيعه / أو تعديله تحت شروط رخصة GNU العمومية والتي نشرتها مؤسسة البرمجيات الحرة، سواء الإصدار 3 من الرخصة، أو (باختيارك) أي إصدار جديد.</string>
+    <string name="app_license">NewPipe هو برنامج مفتوح المصدر و بحقوق متروكة: يمكنك استخدام الكود ودراسته وتحسينه كما شئت. و على وجه التحديد يمكنك إعادة توزيعه / أو تعديله تحت شروط رخصة GNU العمومية والتي نشرتها مؤسسة البرمجيات الحرة، سواء الإصدار 3 من الرخصة، أو (باختيارك) أي إصدار جديد.</string>
     <string name="delete_stream_history_prompt">هل تريد حذف هذا العنصر من سجل المشاهدة؟</string>
     <string name="delete_all_history_prompt">هل أنت متأكد من أنك تريد حذف كل العناصر من السجل؟</string>
     <string name="title_last_played">آخر ما تم تشغيله</string>
     <string name="title_most_played">الأكثر تشغيلا</string>
-
     <string name="override_current_data">هذا سوف يُزيل إعداداتك الحالية.</string>
-
     <string name="preferred_open_action_settings_title">طريقة \'التشغيل\' المفضلة</string>
     <string name="preferred_open_action_settings_summary">"الإجراء الافتراضي عند فتح المحتوى  — %s"</string>
-
     <string name="background_player">مشغل الخلفية</string>
     <string name="popup_player">المشغل المنبثق</string>
     <string name="previous_export">نسخة احتياطية</string>
-
     <string name="subscriptions_import_unsuccessful">تعذر استيراد الاشتراكات</string>
     <string name="subscriptions_export_unsuccessful">لا يمكن تصدير الاشتراكات</string>
-
     <string name="import_youtube_instructions">استيراد اشتراكات YouTube عن طريق تنزيل ملف التصدير: 
 \n 
 \n1. انتقل إلى عنوان URL هذا: %1$s 
@@ -455,14 +394,12 @@
     <string name="import_network_expensive_warning">ضع في اعتبارك أن هذه العملية يمكن أن تكون مكلفة اذا كنت تستخدم بيانات اشتراك انترنت. 
 \n 
 \nهل تريد الاستمرار؟</string>
-
     <string name="playback_speed_control">ضوابط سرعة التشغيل</string>
     <string name="playback_tempo">سرعة الأداء</string>
     <string name="playback_pitch">تردد الصوت</string>
     <string name="unhook_checkbox">نزع الإرتباط (قد يسبب تشويه)</string>
     <string name="playback_nightcore">تعديل الايقاع Nightcore</string>
     <string name="import_settings">هل تريد أيضا استيراد الإعدادات؟</string>
-
     <string name="privacy_policy_title">"سياسة الخصوصية في NewPipe "</string>
     <string name="privacy_policy_encouragement">يأخذ مشروع NewPipe خصوصيتك على محمل الجد. لذلك ، لا يجمع التطبيق أي بيانات دون موافقتك.
 \nتوضح سياسة خصوصية NewPipe بالتفصيل البيانات التي يتم إرسالها وتخزينها عند إرسال تقرير الأعطال.</string>
@@ -471,20 +408,17 @@
 \nو يجب عليك قبولها لإرسال تقرير الأخطاء إلينا.</string>
     <string name="accept">قبول</string>
     <string name="decline">رفض</string>
-
     <string name="limit_data_usage_none_description">لا حدود</string>
     <string name="limit_mobile_data_usage_title">الحد من جودة الفيديو عند استخدام بيانات الهاتف المحمول</string>
     <string name="skip_silence_checkbox">تسريع إلى الأمام أثناء الصمت</string>
     <string name="playback_step">خطوة</string>
     <string name="playback_reset">إعادة تعيين</string>
-
     <string name="minimize_on_exit_title">تصغير عند تبديل التطبيق</string>
     <string name="minimize_on_exit_summary">الإجراء عند التبديل إلى تطبيق آخر من مشغل الفيديو الرئيسي — %s</string>
     <string name="minimize_on_exit_none_description">لاشيء</string>
     <string name="minimize_on_exit_background_description">تصغير إلى مشغل الخلفية</string>
     <string name="minimize_on_exit_popup_description">تصغير إلى مشغل منبثق</string>
-
-<string name="channels">القنوات</string>
+    <string name="channels">القنوات</string>
     <string name="playlists">قوائم التشغيل</string>
     <string name="tracks">المسارات</string>
     <string name="users">المستخدمين</string>
@@ -500,8 +434,8 @@
     <string name="volume_gesture_control_title">إيماءة التحكم بالصوت</string>
     <string name="events">الأحداث</string>
     <string name="app_update_notification_channel_description">التنبيه بإصدارات newpipe الجديدة</string>
-    <string name="download_to_sdcard_error_title">ذاكرة التخزين الخارجي غير متوفر</string>
-    <string name="download_to_sdcard_error_message">تحميل إلى بطاقة SD الخارجية ليس متاحا حتى الآن. إعادة تعيين موقع مجلد التحميل؟</string>
+    <string name="download_to_sdcard_error_title">ذاكرة التخزين الخارجي غير متوفرة</string>
+    <string name="download_to_sdcard_error_message">التحميل إلى بطاقة الذاكرة الخارجية ليس متاحا حتى الآن. إعادة تعيين موقع مجلد التحميل؟</string>
     <string name="saved_tabs_invalid_json">باستخدام علامات الجدولة الافتراضية، حدث خطأ أثناء قراءة علامات التبويب المحفوظة</string>
     <string name="restore_defaults">استعادة الافتراضيات</string>
     <string name="restore_defaults_confirmation">هل تريد استعادة الإعدادات الافتراضية؟</string>
@@ -522,7 +456,7 @@
     <string name="missions_header_pending">في قائمة الانتظار</string>
     <string name="paused">متوقف</string>
     <string name="queued">في قائمة الانتظار</string>
-    <string name="post_processing">بعد المعالجة</string>
+    <string name="post_processing">قيد المعالجة</string>
     <string name="enqueue">قائمة الانتظار</string>
     <string name="permission_denied">تم رفضها من قبل النظام</string>
     <string name="download_failed">فشل التنزيل</string>
@@ -545,7 +479,7 @@
     <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="clear_finished_download">حذف التنزيلات المنتهية</string>
     <string name="msg_pending_downloads">"قم بإستكمال  %s حيثما  يتم التحويل من التنزيلات"</string>
     <string name="stop">توقف</string>
     <string name="max_retry_msg">أقصى عدد للمحاولات</string>

From 891bb7fa40fbd52c63db1677754bb6351947ab94 Mon Sep 17 00:00:00 2001
From: rimasx <riks_12@hot.ee>
Date: Sun, 3 Mar 2019 09:33:52 +0000
Subject: [PATCH 004/138] Translated using Weblate (Estonian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-et/strings.xml | 155 +++++++++++++------------
 1 file changed, 82 insertions(+), 73 deletions(-)

diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index bf5cee76b..95065f8e7 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1,5 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="main_bg_subtitle">Alustuseks puuduta otsingut</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="main_bg_subtitle">Alustuseks puuduta otsingut</string>
     <string name="view_count_text">%1$s vaatamist</string>
     <string name="upload_date_text">Avaldatud %1$s</string>
     <string name="no_player_found">Voogesituseks puudub pleier. Kas paigaldada VLC?</string>
@@ -27,24 +28,18 @@
     <string name="subscription_change_failed">Tellimust ei saanud muuta</string>
     <string name="subscription_update_failed">Tellimust ei õnnestunud uuendada</string>
     <string name="show_info">Kuva info</string>
-
     <string name="tab_subscriptions">Tellimused</string>
     <string name="tab_bookmarks">Esitusloendid järjehoidjates</string>
-
     <string name="fragment_whats_new">Mis on uut</string>
-
     <string name="controls_background_title">Taust</string>
     <string name="controls_popup_title">Hüpikaken</string>
     <string name="controls_add_to_playlist_title">"Lisa "</string>
-
     <string name="download_path_title">Video allalaadimise kaust</string>
     <string name="download_path_summary">Kaust allalaetud videote hoiustamiseks</string>
     <string name="download_path_dialog_title">Sisesta videote allalaadimise rada</string>
-
     <string name="download_path_audio_title">Audio allalaadimise kaust</string>
     <string name="download_path_audio_summary">Siia salvestatakse alla laaditud audio</string>
     <string name="download_path_audio_dialog_title">Sisesta audio allalaadimise rada</string>
-
     <string name="autoplay_by_calling_app_title">Automaatesitus</string>
     <string name="autoplay_by_calling_app_summary">Esita video, kui NewPipe käivitub teise rakenduse kaudu</string>
     <string name="default_resolution_title">Vaikelahutus</string>
@@ -67,15 +62,15 @@
     <string name="use_inexact_seek_title">Kasuta ebatäpset kerimist</string>
     <string name="use_inexact_seek_summary">Ebatäpne kerimine lubab pleieril otsida asukohta kiiremini täpsuse arvel</string>
     <string name="download_thumbnail_title">Laadi pisipildid</string>
-    <string name="download_thumbnail_summary">Välujalülitatult ei toimu pisipiltide laadimist, salvestamist ja puhverdamist. Muutmine puhastab vahemälu nii kettal kui ka mälus.</string>
+    <string name="download_thumbnail_summary">Lülita välja, et keelata pisipiltide laadimist, andmete salvestamist ja mälu kasutust. Muutmine puhastab vahemälu nii kettal kui ka mälus.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Pildid kustutati vahemälust</string>
     <string name="metadata_cache_wipe_title">Kustuta metaandmed vahemälust</string>
     <string name="metadata_cache_wipe_summary">Kustuta veebilehtede andmed vahemälust</string>
     <string name="metadata_cache_wipe_complete_notice">Metaandmed kustutati vahemälust</string>
     <string name="auto_queue_title">Järgmine voog automaatselt järjekorda</string>
     <string name="auto_queue_summary">Lisa seotud voog automaatselt, kui esitusel on viimane voog mittekorduvast järjekorrast.</string>
-    <string name="player_gesture_controls_title">Pleieri juhtimise viiped</string>
-    <string name="player_gesture_controls_summary">Luba viiped helitugevuse ja ereduse juhtimiseks</string>
+    <string name="player_gesture_controls_title">Pleieri juhtimine viibetega</string>
+    <string name="player_gesture_controls_summary">Kasuta helitugevuse ja ereduse reguleerimiseks viipeid</string>
     <string name="show_search_suggestions_title">Kuva soovitused</string>
     <string name="show_search_suggestions_summary">Kuva otsingu ajal soovitusi</string>
     <string name="enable_search_history_title">Otsinguajalugu</string>
@@ -108,7 +103,7 @@
     <string name="play_btn_text">Esita</string>
     <string name="content">Sisu</string>
     <string name="show_age_restricted_content_title">Vanusepiiranguga sisu</string>
-    <string name="video_is_age_restricted">Kuva vanusepiiranguga sisu. Sellise materjali saab lubada \"seadetes\".</string>
+    <string name="video_is_age_restricted">Kuva vanusepiiranguga sisu. Sellise materjali saab lubada seadetes.</string>
     <string name="duration_live">OTSE</string>
     <string name="downloads">Allalaadimised</string>
     <string name="downloads_title">Allalaadimised</string>
@@ -129,12 +124,9 @@
     <string name="always">Alati</string>
     <string name="just_once">Üks kord</string>
     <string name="file">Fail</string>
-
     <string name="notification_channel_name">NewPipe teavitus</string>
     <string name="notification_channel_description">Teavitused NewPipe tausta- ja hüpikpleierile</string>
-
     <string name="unknown_content">[Tundmatu]</string>
-
     <string name="toggle_orientation">Vaheta suunda</string>
     <string name="switch_to_background">Lülita taustale</string>
     <string name="switch_to_popup">Lülita hüpikpleierile</string>
@@ -176,7 +168,6 @@
     <string name="file_name_empty_error">Tühi failinimi pole lubatud</string>
     <string name="error_occurred_detail">Ilmnes viga: %1$s</string>
     <string name="no_streams_available_download">Allalaaditavaid videovooge pole</string>
-
     <string name="sorry_string">Vabandust, seda poleks pidanud juhtuma.</string>
     <string name="error_report_button_text">Teata veast e-posti kaudu</string>
     <string name="error_snackbar_message">Vabandust, ilmnesid mõned vead.</string>
@@ -186,8 +177,6 @@
     <string name="info_labels">Mis:\\nPäring:\\nSisu Keel:\\nTeenus:\\nGMT aeg:\\nPakett:\\nVersioon:\\nOS versioon:</string>
     <string name="your_comment">Oma kommentaar (inglise keeles):</string>
     <string name="error_details_headline">Üksikasjad:</string>
-
-
     <string name="list_thumbnail_view_description">Video eelvaate pisipilt</string>
     <string name="detail_thumbnail_view_description">Video eelvaate pisipilt</string>
     <string name="detail_uploader_thumbnail_view_description">Üleslaadiaja avatari pisipilt</string>
@@ -200,39 +189,32 @@
     <string name="search_no_results">Tulemusi pole</string>
     <string name="empty_subscription_feed_subtitle">Siin pole veel midagi</string>
     <string name="detail_drag_description">Lohista järjestuse muutmiseks</string>
-
     <string name="err_dir_create">Allalaadimiskataloogi \'%1$s\' loomine nurjus</string>
     <string name="info_dir_created">Loodi allalaadimiskataloog \'%1$s\'</string>
-
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Proovi uuesti</string>
     <string name="storage_permission_denied">Pääsuõigused salvestile puuduvad</string>
     <string name="use_old_player_title">Kasuta vana pleierit</string>
     <string name="use_old_player_summary">Vana sisseehitatud mediaframework pleier</string>
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-
     <string name="no_subscribers">Tellijaid pole</string>
     <plurals name="subscribers">
-	<item quantity="one">%s tellija</item>
-	<item quantity="other">%s tellijat</item>
-</plurals>
-
+        <item quantity="one">%s tellija</item>
+        <item quantity="other">%s tellijat</item>
+    </plurals>
     <string name="no_views">Pole vaadatud</string>
     <plurals name="views">
-	<item quantity="one">%s vaatamine</item>
-	<item quantity="other">%s vaatamist</item>
-</plurals>
-
+        <item quantity="one">%s vaatamine</item>
+        <item quantity="other">%s vaatamist</item>
+    </plurals>
     <string name="no_videos">Videoid pole</string>
     <plurals name="videos">
-	<item quantity="one">%s video</item>
-	<item quantity="other">%s videot</item>
-</plurals>
-
+        <item quantity="one">%s video</item>
+        <item quantity="other">%s videot</item>
+    </plurals>
     <string name="start">"Start "</string>
     <string name="pause">Paus</string>
     <string name="view">Esita</string>
@@ -243,10 +225,8 @@
     <string name="checksum">Kontrollsumma</string>
     <string name="dismiss">Loobu</string>
     <string name="rename">Nimeta ümber</string>
-
     <string name="add">Uus ülesanne</string>
     <string name="finish">OK</string>
-
     <string name="msg_name">Faili nimi</string>
     <string name="msg_threads">Lõimed</string>
     <string name="msg_error">Viga</string>
@@ -261,18 +241,14 @@
     <string name="msg_popup_permission">Need õigused on vajalikud
 \nhüpikakna avamiseks</string>
     <string name="one_item_deleted">Kustutati 1 element.</string>
-
     <string name="reCaptchaActivity">"reCAPTCHA "</string>
     <string name="settings_category_downloads_title">Laadi alla</string>
     <string name="settings_file_charset_title">Lubatud tähemärgid failinimedes</string>
     <string name="settings_file_replacement_character_summary">Vigased tähemärgid asendatakse selle väärtusega</string>
     <string name="settings_file_replacement_character_title">Asendustähemärk</string>
-
     <string name="charset_letters_and_digits">Tähed ja numbrid</string>
     <string name="charset_most_special_characters">Erimärgid</string>
-
     <string name="toast_no_player">Selle faili esitamiseks puudub rakendus</string>
-
     <string name="title_activity_about">NewPipe rakendusest</string>
     <string name="action_settings">Seaded</string>
     <string name="action_about">Programmist</string>
@@ -291,8 +267,6 @@
     <string name="read_privacy_policy">Loe privaatsuspoliitikat</string>
     <string name="app_license_title">NewPipe litsents</string>
     <string name="read_full_license">Loe litsentsi</string>
-
-
     <string name="title_activity_history">Ajalugu</string>
     <string name="title_history_search">Otsitud</string>
     <string name="title_history_view">Vaadatud</string>
@@ -306,7 +280,6 @@
     <string name="delete_all_history_prompt">Kas kustutada kõik kirjed ajaloost?</string>
     <string name="title_last_played">Viimati esitatud</string>
     <string name="title_most_played">Enim esitatud</string>
-
     <string name="main_page_content">Avalehe sisu</string>
     <string name="blank_page_summary">Tühi leht</string>
     <string name="kiosk_page_summary">Kioski leht</string>
@@ -322,7 +295,6 @@
     <string name="could_not_import_all_files">Hoiatus: Kõiki faile ei õnnestunud importida.</string>
     <string name="override_current_data">See alistab praeguse seadistuse.</string>
     <string name="import_settings">Kas importida ka seadistused?</string>
-
     <string name="kiosk">"Kiosk "</string>
     <string name="trending">Trendid</string>
     <string name="top_50">"Top 50 "</string>
@@ -338,66 +310,48 @@
     <string name="start_here_on_main">Alusta taasesitust siit</string>
     <string name="start_here_on_background">Alusta siit olles taustal</string>
     <string name="start_here_on_popup">Alusta siit uue hüpikaknaga</string>
-
     <string name="drawer_open">Ava sahtel</string>
     <string name="drawer_close">Sulge sahtel</string>
     <string name="drawer_header_action_paceholder_text">Siia ilmub varsti midagi ;D</string>
-
-
     <string name="preferred_open_action_settings_title">Lingi avamine</string>
     <string name="preferred_open_action_settings_summary">Vaikimisi tegevus sisu avamisel — %s</string>
-
     <string name="video_player">Videopleier</string>
     <string name="background_player">Taustapleier</string>
     <string name="popup_player">Hüpikpleier</string>
     <string name="always_ask_open_action">Küsi alati</string>
-
     <string name="preferred_player_fetcher_notification_title">Info hankimine…</string>
     <string name="preferred_player_fetcher_notification_message">Soovitud sisu laadimine</string>
-
     <string name="create_playlist">Uus pleilist</string>
     <string name="delete_playlist">Kustuta</string>
     <string name="rename_playlist">Nimeta ümber</string>
     <string name="playlist_name_input">Nimi</string>
     <string name="append_playlist">Lisa pleilisti</string>
     <string name="set_as_playlist_thumbnail">Määra pleilisti pisipildiks</string>
-
     <string name="bookmark_playlist">Lisa pleilist järjehoidjaks</string>
     <string name="unbookmark_playlist">Eemalda järjehoidja</string>
-
     <string name="delete_playlist_prompt">Kas kustutada see pleilist?</string>
     <string name="playlist_creation_success">Pleilist loodud</string>
     <string name="playlist_add_stream_success">Lisati pleilisti</string>
     <string name="playlist_thumbnail_change_success">Pleilisti pisipilt muudetud.</string>
     <string name="playlist_delete_failure">Pleilisti kustutamine nurjus.</string>
-
     <string name="caption_none">Subtiitriteta</string>
-
     <string name="resize_fit">Mahuta</string>
     <string name="resize_fill">Täida</string>
     <string name="resize_zoom">Suumi</string>
-
     <string name="caption_auto_generated">Automaatselt loodud</string>
-
     <string name="caption_setting_title">Subtiitrid</string>
     <string name="caption_setting_description">Kohanda pleieri subtiitrite teksti suurust ja tausta. Jõustamiseks tuleb rakendus taaskäivitada.</string>
-
     <string name="enable_leak_canary_summary">Mälulekke seire võib põhjustada rakenduse hangumise</string>
-
     <string name="import_export_title">Import/eksport</string>
     <string name="import_title">Import</string>
     <string name="import_from">Impordi asukohast</string>
     <string name="export_to">Ekspordi asukohta</string>
-
     <string name="import_ongoing">Import…</string>
     <string name="export_ongoing">Eksport…</string>
-
     <string name="import_file_title">Impordi fail</string>
     <string name="previous_export">Eelmine eksport</string>
-
     <string name="subscriptions_import_unsuccessful">Tellimuste import nurjus</string>
     <string name="subscriptions_export_unsuccessful">Tellimuste eksport nurjus</string>
-
     <string name="import_youtube_instructions">Impordi YouTube tellimused eksportfaili abil:
 \n
 \n1. Ava URL: %1$s
@@ -406,14 +360,11 @@
     <string name="import_network_expensive_warning">See toiming võib põhjustada suurt võrguliiklust.
 \n
 \nKas jätkata?</string>
-
     <string name="playback_speed_control">Taasesituse kiiruse juhtimine</string>
     <string name="playback_tempo">"Tempo "</string>
     <string name="playback_default">Vaikimisi</string>
-
     <string name="accept">Nõustu</string>
     <string name="decline">Keeldu</string>
-
     <string name="limit_data_usage_none_description">Piiranguta</string>
     <string name="limit_mobile_data_usage_title">Piira lahutust mobiilse andmeside kasutamisel</string>
     <string name="tab_main">Peamenüü</string>
@@ -422,10 +373,8 @@
     <string name="tracks">Lood</string>
     <string name="users">Kasutajad</string>
     <string name="switch_to_main">Lülitu peamisele</string>
-
     <string name="reCaptcha_title">reCAPTCHA nõue</string>
     <string name="recaptcha_request_toast">reCAPTCHA nõude taotlus</string>
-
     <string name="copyright" formatted="true">© %1$s %2$s %3$s alla</string>
     <string name="app_description">Vaba kergekaaluline Androidi voogesitus.</string>
     <string name="contribution_encouragement">Kui sul on ideid kujunduse muutmisest, koodi puhastamisest või suurtest koodi muudatustest - abi on alati teretulnud. Mida rohkem tehtud, seda paremaks läheb!</string>
@@ -443,13 +392,11 @@
 \n3. Logi sisse
 \n4. Kopeeri suunatud profiili URL.</string>
     <string name="import_soundcloud_instructions_hint">sinu_ID, soundcloud.com/sinu_id</string>
-
     <string name="playback_pitch">Toon</string>
     <string name="unhook_checkbox">Tühista ühendus (võib põhjustada moonutusi)</string>
     <string name="skip_silence_checkbox">Keri helitu koht edasi</string>
     <string name="playback_step">Samm</string>
     <string name="playback_reset">Lähtesta</string>
-
     <string name="start_accept_privacy_policy">Selleks, et täita Euroopa Üldist Andmekaitse Määrust (GDPR), juhime tähelepanu NewPipe\'i privaatsuspoliitikale. Palun lugege seda hoolikalt.
 \nMeile veateate saatmiseks tuleb sellega nõustuda.</string>
     <string name="minimize_on_exit_title">Minimeeri, kui kasutad teisi rakendusi</string>
@@ -457,7 +404,69 @@
     <string name="minimize_on_exit_none_description">Pole</string>
     <string name="minimize_on_exit_background_description">Esita taustal</string>
     <string name="minimize_on_exit_popup_description">Minimeeri hüpikpleierisse</string>
-
-<string name="enable_disposed_exceptions_summary">Jõusta väljaspool fragmenti või elutsüklit olevate kättetoimetamatute Rx erindite raporteerimine nende vabastamise järgselt</string>
-
-    </resources>
+    <string name="enable_disposed_exceptions_summary">Jõusta väljaspool fragmenti või elutsüklit olevate kättetoimetamatute Rx erindite raporteerimine nende vabastamise järgselt</string>
+    <string name="unsubscribe">Lõpeta tellimine</string>
+    <string name="tab_new">Uus vahekaart</string>
+    <string name="tab_choose">Vali vahekaart</string>
+    <string name="volume_gesture_control_title">Helitugevuse juhtimine viibetega</string>
+    <string name="volume_gesture_control_summary">Kasuta helitugevuse reguleerimiseks viipeid</string>
+    <string name="brightness_gesture_control_title">Ereduse reguleerimine viibetega</string>
+    <string name="brightness_gesture_control_summary">Kasuta ereduse reguleerimiseks viipeid</string>
+    <string name="settings_category_updates_title">Uuendused</string>
+    <string name="events">Sündmused</string>
+    <string name="file_deleted">Fail kustutati</string>
+    <string name="app_update_notification_channel_name">Rakenduse värskenduse teatis</string>
+    <string name="app_update_notification_channel_description">NewPipe uuest versioonist teavitamine</string>
+    <string name="download_to_sdcard_error_title">Väline andmekandja pole saadaval</string>
+    <string name="download_to_sdcard_error_message">Allalaadimine välisele SD-kaardile ei ole veel võimalik. Kas lähtestada allalaadimiste kataloogi asukoht\?</string>
+    <string name="saved_tabs_invalid_json">Tõrge salvestatud vahekaaride lugemisel. Kasutatakse vaikeväärtusi</string>
+    <string name="restore_defaults">Taasta vaikeväärtused</string>
+    <string name="restore_defaults_confirmation">Kas taastada vaikeväärtused\?</string>
+    <string name="subscribers_count_not_available">Tellijate arv ei ole saadaval</string>
+    <string name="main_page_content_summary">Esilehel kuvatavad vahekaardid</string>
+    <string name="selection">Valik</string>
+    <string name="conferences">Konverentsid</string>
+    <string name="updates_setting_title">Uuendused</string>
+    <string name="updates_setting_description">Kuva teavitus, kui uus versioon on saadaval</string>
+    <string name="list_view_mode">Nimekirjavaate režiim</string>
+    <string name="list">Nimekiri</string>
+    <string name="grid">Võrgustik</string>
+    <string name="auto">Auto</string>
+    <string name="switch_view">Vaheta vaadet</string>
+    <string name="app_update_notification_content_title">NewPipe värskendus on saadaval!</string>
+    <string name="app_update_notification_content_text">Allalaadimiseks puuduta</string>
+    <string name="missions_header_finished">Lõpetatud</string>
+    <string name="missions_header_pending">Järjekorras</string>
+    <string name="paused">peatatud</string>
+    <string name="queued">järjekorras</string>
+    <string name="post_processing">järeltöötlus</string>
+    <string name="enqueue">Järjekord</string>
+    <string name="permission_denied">Tegevus keelati süsteemi poolt</string>
+    <string name="download_failed">Allalaadimine nurjus</string>
+    <string name="download_finished">Allalaadimine lõpetatud</string>
+    <string name="download_finished_more">%s allalaadimist lõppenud</string>
+    <string name="generate_unique_name">Loo kordumatu nimi</string>
+    <string name="overwrite">Kirjuta üle</string>
+    <string name="overwrite_warning">Selle nimega allalaetud fail on juba olemas</string>
+    <string name="download_already_running">Selle nimega allalaadimine on käimas</string>
+    <string name="show_error">Näita viga</string>
+    <string name="label_code">Kood</string>
+    <string name="error_path_creation">Faili ei saa luua</string>
+    <string name="error_file_creation">Sihtkausta ei saa luua</string>
+    <string name="error_permission_denied">Tegevus keelati süsteemi poolt</string>
+    <string name="error_ssl_exception">Turvaline ühendus nurjus</string>
+    <string name="error_unknown_host">Serverit ei leitud</string>
+    <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">Mitterahuldav taotletud vahemik</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">Uusi katseid kuni</string>
+    <string name="max_retry_desc">Suurim katsete arv enne allalaadimise tühistamist</string>
+    <string name="pause_downloads_on_mobile">Paus üleminekul mobiilsele andmesidele</string>
+    <string name="pause_downloads_on_mobile_desc">Allalaadimised, mida ei saa peatada, taaskäivitatakse</string>
+</resources>
\ No newline at end of file

From 4d4d776e4d94be7edc3354b92d07f29b0beeee74 Mon Sep 17 00:00:00 2001
From: YONGLE <tanyongle0633@gmail.com>
Date: Tue, 5 Mar 2019 03:17:13 +0000
Subject: [PATCH 005/138] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-cmn/strings.xml | 47 +++++++++----------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml
index 897365ca9..99ac876a9 100644
--- a/app/src/main/res/values-cmn/strings.xml
+++ b/app/src/main/res/values-cmn/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources><string name="main_bg_subtitle">点击搜索按钮即可开始使用</string>
+<resources>
+    <string name="main_bg_subtitle">点击搜索按钮即可开始使用</string>
     <string name="view_count_text">%1$s 次观看</string>
     <string name="upload_date_text">发布于 %1$s</string>
     <string name="no_player_found">找不到媒体播放器。您要安装 VLC 吗？</string>
@@ -26,26 +27,20 @@
     <string name="channel_unsubscribed">退订成功</string>
     <string name="subscription_change_failed">无法更改订阅</string>
     <string name="subscription_update_failed">无法更新订阅</string>
-    <string name="show_info">显示详情</string>
-
+    <string name="show_info">显示信息</string>
     <string name="tab_main">主页</string>
     <string name="tab_subscriptions">订阅</string>
     <string name="tab_bookmarks">已添加书签到播放列表</string>
-
     <string name="fragment_whats_new">新功能</string>
-
     <string name="controls_background_title">转到后台</string>
     <string name="controls_popup_title">悬浮窗</string>
     <string name="controls_add_to_playlist_title">添加到</string>
-
     <string name="download_path_title">视频下载路径</string>
     <string name="download_path_summary">储存视频文件的路径</string>
     <string name="download_path_dialog_title">输入视频的下载地址</string>
-
     <string name="download_path_audio_title">音频下载的路径</string>
     <string name="download_path_audio_summary">下载音频的储存路径</string>
     <string name="download_path_audio_dialog_title">输入音频的下载路径</string>
-
     <string name="autoplay_by_calling_app_title">自动播放</string>
     <string name="autoplay_by_calling_app_summary">NewPipes被其它程序调用时播放视频</string>
     <string name="default_resolution_title">默认分辨率</string>
@@ -55,7 +50,7 @@
     <string name="play_with_kodi_title">用 Kodi 播放</string>
     <string name="kore_not_found">没找到 Kore 应用，需要安装它吗？</string>
     <string name="show_play_with_kodi_title">显示“用 Kodi 播放”选项</string>
-    <string name="show_play_with_kodi_summary">显示用 Kodi媒体中心 播放视频的选项</string>
+    <string name="show_play_with_kodi_summary">显示以 Kodi 媒体中心播放视频的选项</string>
     <string name="play_audio">音频</string>
     <string name="default_audio_format_title">默认音频格式</string>
     <string name="default_video_format_title">默认视频格式</string>
@@ -68,10 +63,8 @@
     <string name="popup_remember_size_pos_summary">记住上一次悬浮窗的位置以及大小</string>
     <string name="thumbnail_cache_wipe_complete_notice">已清除图像缓存</string>
     <string name="minimize_on_exit_popup_description">最小化悬浮窗播放器</string>
-
-
-<string name="clear_views_history_title">清除观看历史</string>
-    <string name="search_history_deleted">已删除搜索历史</string>
+    <string name="clear_views_history_title">清除观看历史</string>
+    <string name="search_history_deleted">搜索记录已删除。</string>
     <string name="general_error">错误</string>
     <string name="network_error">网络错误</string>
     <string name="report_error">举报错误</string>
@@ -85,7 +78,6 @@
     <string name="add">新任务</string>
     <string name="finish">好
 \n</string>
-
     <string name="msg_error">错误
 \n</string>
     <string name="msg_server_unsupported">不支持的服务器</string>
@@ -94,27 +86,22 @@
     <string name="msg_wait">请稍等…</string>
     <string name="charset_letters_and_digits">字母与数字</string>
     <string name="charset_most_special_characters">最特别的字符</string>
-
     <string name="toast_no_player">这个文件里没有已下载应用程式</string>
-
     <string name="title_activity_about">关于NewPipe</string>
     <string name="action_settings">设置</string>
     <string name="action_about">关于</string>
     <string name="title_licenses">第三方执照</string>
     <string name="action_open_website">打开网页</string>
     <string name="unbookmark_playlist">删除书签</string>
-
     <string name="delete_playlist_prompt">确定要删除该播放列表吗？</string>
     <string name="playlist_creation_success">已创建播放列表</string>
     <string name="playlist_add_stream_success">播放列表</string>
     <string name="playback_step">步骤</string>
     <string name="playback_reset">重置</string>
-
     <string name="start_accept_privacy_policy">为了遵守欧洲通用数据保护法规（GDPR,我们请你注意NewPipe的隐私政策.请仔细阅读.
 \n你必须接受它才能将错误报告发送给我们.</string>
     <string name="accept">接受</string>
     <string name="decline">拒绝</string>
-
     <string name="limit_data_usage_none_description">没有限制</string>
     <string name="limit_mobile_data_usage_title">使用移动数据时的解析度限制</string>
     <string name="minimize_on_exit_title">最小化应用程序切换</string>
@@ -263,19 +250,19 @@
     <string name="short_billion">亿</string>
     <string name="no_subscribers">没有订阅者</string>
     <plurals name="subscribers">
-    <item quantity="one">%s 位订阅者</item>
-    <item quantity="other"/>
-</plurals>
+        <item quantity="one">%s 位订阅者</item>
+        <item quantity="other"/>
+    </plurals>
     <string name="no_views">无观看次数</string>
     <plurals name="views">
-    <item quantity="one">%s 次观看</item>
-    <item quantity="other"/>
-</plurals>
+        <item quantity="one">%s 次观看</item>
+        <item quantity="other"/>
+    </plurals>
     <string name="no_videos">没有视频</string>
     <plurals name="videos">
-    <item quantity="one">部视频</item>
-    <item quantity="other"></item>
-</plurals>
+        <item quantity="one">部视频</item>
+        <item quantity="other"/>
+    </plurals>
     <string name="delete_one">删除</string>
     <string name="checksum">校验</string>
     <string name="dismiss">退出</string>
@@ -289,7 +276,7 @@
     <string name="msg_popup_permission">在悬浮窗模式打开
 \n需要此权限</string>
     <string name="one_item_deleted">已删除一个项目。</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
+    <string name="reCaptchaActivity">reCAPTCHA 验证</string>
     <string name="reCaptcha_title">reCAPTCHA 验证</string>
     <string name="recaptcha_request_toast">需完成 reCAPTCHA 验证</string>
     <string name="settings_category_downloads_title">下载</string>
@@ -412,7 +399,7 @@
 \n2.移至该网址：%1$s
 \n3.当被询问时登入帐号
 \n4.复制您重定向的配置文件到网址。</string>
-    <string name="import_soundcloud_instructions_hint">yourID, soundcloud.com/yourid</string>
+    <string name="import_soundcloud_instructions_hint">您的 ID，soundcloud.com/yourid</string>
     <string name="import_network_expensive_warning">请记住，此操作可能造成昂贵的网络花费。
 \n
 \n您是否要继续？</string>

From dd0f3ac6511c6fbd82caf86b9ea9bd154d2cf252 Mon Sep 17 00:00:00 2001
From: Konstantinos Giannopoulos <greksoft@ymail.com>
Date: Tue, 5 Mar 2019 17:33:36 +0000
Subject: [PATCH 006/138] Translated using Weblate (Greek)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-el/strings.xml | 154 +++++++++++++------------
 1 file changed, 80 insertions(+), 74 deletions(-)

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 1106baf09..8a2a3403d 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -16,15 +16,12 @@
     <string name="screen_rotation">περιστροφή</string>
     <string name="use_external_video_player_title">Χρήση εξωτερικής εφαρμογής αναπαραγωγής βίντεο</string>
     <string name="use_external_audio_player_title">Χρήση εξωτερικής συσκευής αναπαραγωγής ήχου</string>
-
     <string name="download_path_title">Διαδρομή λήψης βίντεο</string>
     <string name="download_path_summary">Διαδρομή για αποθήκευση των βίντεο</string>
     <string name="download_path_dialog_title">Εισάγετε διαδρομή για λήψη των βίντεο</string>
-
     <string name="download_path_audio_title">Διαδρομή λήψης αρχείων ήχου</string>
     <string name="download_path_audio_summary">Αυτή είναι η διαδρομή για την αποθήκευση αρχείων ήχου</string>
     <string name="download_path_audio_dialog_title">Εισάγετε διαδρομή για λήψη αρχείων ήχου</string>
-
     <string name="default_resolution_title">Προεπιλεγμένη ανάλυση</string>
     <string name="play_with_kodi_title">Αναπαραγωγή με το Kodi</string>
     <string name="kore_not_found">Η εφαρμογή Kore δεν βρέθηκε. Εγκατάσταση της;</string>
@@ -37,7 +34,6 @@
     <string name="theme_title">Θέμα</string>
     <string name="dark_theme_title">Σκοτεινό</string>
     <string name="light_theme_title">Φωτεινό</string>
-
     <string name="download_dialog_title">Λήψη</string>
     <string name="next_video_title">Επόμενο</string>
     <string name="show_next_and_similar_title">Εμφάνιση \"Επόμενου\" και \"Σχετικών\" βίντεο</string>
@@ -49,7 +45,6 @@
     <string name="background_player_playing_toast">Αναπαραγωγή στο υπόβαθρο</string>
     <string name="play_btn_text">Αναπαραγωγή</string>
     <string name="network_error">Σφάλμα δικτύου</string>
-
     <string name="list_thumbnail_view_description">Μικρογραφία προεπισκόπισης βίντεο</string>
     <string name="detail_thumbnail_view_description">Μικρογραφία προεπισκόπησης βίντεο</string>
     <string name="detail_uploader_thumbnail_view_description">Μικρογραφία εικόνας προφίλ του χρήστη</string>
@@ -57,11 +52,9 @@
     <string name="detail_dislikes_img_view_description">Dislike</string>
     <string name="use_tor_title">Χρήση του Tor</string>
     <string name="use_tor_summary">(Πειραματικό) Αναγκάζει την κίνηση λήψης μέσω Tor για αυξημένη προστασία προσωπικών δεδομένων (η αναπαραγωγή δεν υποστηρίζεται ακόμη).</string>
-
     <string name="err_dir_create">Δεν μπόρεσε να δημιουργηθεί ο φάκελος \'%1$s\'</string>
     <string name="info_dir_created">Δημιουργήθηκε ο φάκελος \'%1$s\'</string>
-<string name="short_billion">Δ</string>
-
+    <string name="short_billion">Δις</string>
     <string name="open_in_popup_mode">Άνοιγμα σε αναδυόμενο παράθυρο</string>
     <string name="subscribe_button_title">Εγγραφή</string>
     <string name="subscribed_button_title">Εγγεγραμμένος</string>
@@ -82,8 +75,6 @@
     <string name="what_happened_headline">Τι συνέβη:</string>
     <string name="your_comment">Το σχόλιό σας (στα Αγγλικά):</string>
     <string name="error_details_headline">Λεπτομέρειες:</string>
-
-
     <string name="report_error">Αναφορά Σφάλματος</string>
     <string name="video">Βίντεο</string>
     <string name="audio">Ήχος</string>
@@ -100,7 +91,6 @@
     <string name="title_activity_history">Ιστορικό</string>
     <string name="action_history">Ιστορικό</string>
     <string name="show_info">Εμφάνιση πληροφοριών</string>
-
     <string name="main_bg_subtitle">Πατήστε στην αναζήτηση για να ξεκινήσετε</string>
     <string name="no_player_found_toast">Δε βρέθηκε πρόγραμμα αναπαραγωγής ροής δεδομένων (μπορείτε να εγκαταστήσετε το VLC για να κάνετε αναπαραγωγή).</string>
     <string name="controls_download_desc">Κατέβασμα του αρχείου ροής</string>
@@ -110,15 +100,12 @@
     <string name="subscription_change_failed">Αδύνατη η αλλαγή της εγγραφής</string>
     <string name="subscription_update_failed">Αδύνατη η ενημέρωση της εγγραφής</string>
     <string name="tab_main">Κύριο</string>
-    <string name="tab_subscriptions">Εγγραφές</string>
+    <string name="tab_subscriptions">Συνδρομές</string>
     <string name="tab_bookmarks">Αγαπημένες λίστες αναπαραγωγής</string>
-
     <string name="fragment_whats_new">Νέα</string>
-
     <string name="controls_background_title">Στο παρασκήνιο</string>
     <string name="controls_popup_title">Αναδυόμενο παράθυρο</string>
     <string name="controls_add_to_playlist_title">Προσθήκη σε</string>
-
     <string name="autoplay_by_calling_app_title">Αυτόματη αναπαραγωγή</string>
     <string name="autoplay_by_calling_app_summary">Αναπαραγωγή του βίντεο όταν το NewPipe καλείται από άλλη εφαρμογή</string>
     <string name="default_popup_resolution_title">Προεπιλεγμένη ανάλυση αναδυόμενου παραθύρου</string>
@@ -129,7 +116,7 @@
     <string name="use_inexact_seek_title">Χρήση γρήγορης μη-ακριβούς αναζήτησης</string>
     <string name="use_inexact_seek_summary">Η μη-ακριβής αναζήτηση επιτρέπει στην εφαρμογή να αναζητεί θέσεις στο βίντεο γρηγορότερα με μειωμένη ακρίβεια</string>
     <string name="download_thumbnail_title">Φόρτωση thumbnails</string>
-    <string name="download_thumbnail_summary">Αν η επιλογή είναι απενεργοποιημένη δεν φορτώνονται οι μικρογραφίες, χρησιμοποιώντας λιγότερα δεδομένα και μνήμη. Οι αλλαγές σβήνουν την προσωρινή μνήμη των εικόνων.</string>
+    <string name="download_thumbnail_summary">Με την απενεργοποίηση δεν φορτώνονται οι μικρογραφίες, χρησιμοποιώντας λιγότερα δεδομένα και μνήμη. Οι αλλαγές σβήνουν τις προσωρινά αποθηκευμένες εικόνες στην μνήμη.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Εκκαθαρίστηκε η προσωρινή μνήμη εικονών</string>
     <string name="metadata_cache_wipe_title">Εκκαθάριση προσωρινά αποθηκευμένων μεταδεδομένων</string>
     <string name="metadata_cache_wipe_summary">Αφαίρεση όλων των προσωρινά αποθηκευμένων δεδομένων ιστοσελίδων</string>
@@ -158,7 +145,7 @@
     <string name="popup_playing_append">Προστέθηκε στη λίστα αναπαραγωγής αναδυόμενου παραθύρου</string>
     <string name="content">Περιεχόμενο</string>
     <string name="show_age_restricted_content_title">Περιεχόμενο περιορισμένης ηλικίας</string>
-    <string name="video_is_age_restricted">Βίντεο περιορισμένης πρόσβασης. Για να επιτρέπετε περιερχόμενο τέτοιου είδους, ενεργοποιήστε το στις \"Ρυθμίσεις\".</string>
+    <string name="video_is_age_restricted">Βίντεο ηλικιακά περιορισμένης πρόσβασης. Για να επιτρέπετε περιερχόμενο τέτοιου είδους, ενεργοποιήστε το στις \"Ρυθμίσεις\".</string>
     <string name="duration_live">ΖΩΝΤΑΝΑ</string>
     <string name="error_report_title">Αναφορά σφαλμάτων</string>
     <string name="channels">Κανάλια</string>
@@ -176,17 +163,13 @@
     <string name="always">Πάντα</string>
     <string name="just_once">Μόνο μία φορά</string>
     <string name="file">Αρχείο</string>
-
     <string name="notification_channel_name">Ειδοποίηση NewPipe</string>
     <string name="notification_channel_description">Ειδοποιήσεις για την αναπαραγωγή Παρασκηνίου και Αναδυόμενου Παραθύρου</string>
-
     <string name="unknown_content">[Άγνωστο]</string>
-
     <string name="toggle_orientation">Αλλαγή προσανατολισμού</string>
     <string name="switch_to_background">Αλλαγή σε Παρασκήνιο</string>
     <string name="switch_to_popup">Αλλαγή σε Αναδυόμενο Παράθυρο</string>
     <string name="switch_to_main">Αλλαγή σε Κύριο</string>
-
     <string name="import_data_title">Εισαγωγή βάσης δεδομένων</string>
     <string name="export_data_title">Εξαγωγή βάσης δεδομένων</string>
     <string name="import_data_summary">Θα παρακάμψει το τρέχον ιστορικό και εγγραφές σας</string>
@@ -223,7 +206,6 @@
     <string name="file_name_empty_error">Το όνομα αρχείου δεν μπορεί να είναι κενό</string>
     <string name="error_occurred_detail">Προέκυψε ένα σφάλμα: %1$s</string>
     <string name="no_streams_available_download">Δεν υπάρχουν διαθέσιμες ροές για λήψη</string>
-
     <string name="sorry_string">Λυπούμαστε, αυτό δεν έπρεπε να έχει συμβεί.</string>
     <string name="error_report_button_text">Αναφορά σφάλματος με ηλεκτρονικό ταχυδρομίο</string>
     <string name="error_snackbar_message">Λυπούμαστε, συνέβησαν κάποια σφάλματα.</string>
@@ -232,32 +214,27 @@
     <string name="search_no_results">Κανένα αποτέλεσμα</string>
     <string name="empty_subscription_feed_subtitle">Δεν υπάρχει τίποτα εδώ</string>
     <string name="detail_drag_description">Σύρετε για ταξινόμηση</string>
-
     <string name="retry">Προσπάθεια εκ νέου</string>
     <string name="storage_permission_denied">Δεν δώθηκε άδεια εγγραφής στην εσωτερική μνήμη</string>
     <string name="use_old_player_title">Χρήση παλαιάς συσκευής αναπαραγωγής</string>
     <string name="use_old_player_summary">Παλαιά συσκευή αναπαραγωγής Mediaframework</string>
-
-    <string name="short_thousand">Κ</string>
-    <string name="short_million">Μ</string>
+    <string name="short_thousand">χιλ</string>
+    <string name="short_million">Εκ</string>
     <string name="no_subscribers">Κανένας εγγεγραμένος χρήστης</string>
     <plurals name="subscribers">
-	<item quantity="one">%s εγγεγραμένος χρήστης</item>
-	<item quantity="other">%s εγγεγραμένοι χρήστες</item>
-</plurals>
-
+        <item quantity="one">%s εγγεγραμένος χρήστης</item>
+        <item quantity="other">%s εγγεγραμένοι χρήστες</item>
+    </plurals>
     <string name="no_views">Καμία προβολή</string>
     <plurals name="views">
-	<item quantity="one">%s προβολή</item>
-	<item quantity="other">%s προβολές</item>
-</plurals>
-
+        <item quantity="one">%s προβολή</item>
+        <item quantity="other">%s προβολές</item>
+    </plurals>
     <string name="no_videos">Κανένα βίντεο</string>
     <plurals name="videos">
-	<item quantity="one">%s βίντεο</item>
-	<item quantity="other">"%s βίντεο "</item>
-</plurals>
-
+        <item quantity="one">Βίντεο</item>
+        <item quantity="other">Βίντεο</item>
+    </plurals>
     <string name="start">Εκκίνηση</string>
     <string name="view">Αναπαραγωγή</string>
     <string name="create">Δημιουργία</string>
@@ -266,10 +243,8 @@
     <string name="checksum">Άθροισμα ελέγχου</string>
     <string name="dismiss">Αγνόηση</string>
     <string name="rename">Μετονομασία</string>
-
     <string name="add">Νέα αποστολη</string>
     <string name="finish">ΟΚ</string>
-
     <string name="msg_name">Όνομα αρχείου</string>
     <string name="msg_threads">Νήματα</string>
     <string name="msg_server_unsupported">Ο εξυπηρετητής δεν υποστηρίζεται</string>
@@ -281,19 +256,14 @@
     <string name="msg_popup_permission">Αυτή η άδεια είναι απαραίτητη για
 \nτο άνοιγμα αναδυόμενων παραθύρων</string>
     <string name="one_item_deleted">1 αντικείμενο διαγράφηκε.</string>
-
     <string name="reCaptchaActivity">Αυτόματο τεστ</string>
     <string name="reCaptcha_title">Πρόκληση reCAPTCHA</string>
     <string name="recaptcha_request_toast">Ζητήθηκε πρόκληση reCAPTCHA</string>
-
     <string name="settings_file_charset_title">Επιτρεπτοί χαρακτήρες σε ονόματα αρχείων</string>
     <string name="settings_file_replacement_character_summary">Οι μη έγκυροι χαρακτήρες αντικαθίστανται με αυτήν την τιμή</string>
     <string name="settings_file_replacement_character_title">Αντικαταστάτης χαρακτήρας</string>
-
     <string name="charset_most_special_characters">Οι περισσότεροι ειδικοί χαρακτήρες</string>
-
     <string name="toast_no_player">Δεν υπάρχει εφαρμογή εγκατεστημένη για την αναπαραγωγή αυτού του αρχείου</string>
-
     <string name="title_activity_about">Σχετικά με το NewPipe</string>
     <string name="action_about">Περί</string>
     <string name="title_licenses">Άδειες Τρίτων</string>
@@ -317,8 +287,6 @@
     <string name="app_license_title">Η άδεια του NewPipe</string>
     <string name="app_license">Το NewPipe είναι copylelft ελεύθερο λογισμικό: Μπορείτε να το χρησιμοποιήσετε, να το μελετήσετε, να το μοιραστείτε και να το βελτιώσετε κατά βούληση. Ειδικότερα, μπορείτε να το αναδιανείμετε ή/και να το τροποποιήσετε υπό την άδεια GNU General Public Licence όπως αυτή εκδόθηκε από το Free Software Foundation, είτε υπό την έκδοση 3 της Άδειας είτε (προεραιτικά) υπό οποιαδήποτε μεταγενέστερη άδεια.</string>
     <string name="read_full_license">Διαβάστε την άδεια</string>
-
-
     <string name="title_history_search">Αναζητημένα</string>
     <string name="title_history_view">Έχει γίνει προβολή</string>
     <string name="history_disabled">Το ιστορικό έχει απενεργοποιηθεί</string>
@@ -330,7 +298,6 @@
     <string name="delete_all_history_prompt">Είστε σίγουροι ότι θέλετε να σβήσετε όλα τα αντικείμενα από το ιστορικό;</string>
     <string name="title_last_played">Τελευταία αναπαραγωγή</string>
     <string name="title_most_played">Αναπαράχθηκε περισσότερο</string>
-
     <string name="main_page_content">Περιεχόμενο της κεντρικής σελίδας</string>
     <string name="blank_page_summary">Κενή σελίδα</string>
     <string name="kiosk_page_summary">Σελίδα περιπτέρου</string>
@@ -345,7 +312,6 @@
     <string name="could_not_import_all_files">Προσοχή: Δεν ήταν δυνατή η εισαγωγή όλων των αρχείων.</string>
     <string name="override_current_data">Αυτό θα παρακάμψει τις τρέχουσες ρυθμίσεις σας.</string>
     <string name="import_settings">Θέλετε επίσης να εισάγετε ρυθμίσεις;</string>
-
     <string name="kiosk">Περίπτερο</string>
     <string name="title_activity_background_player">Συσκευή αναπαραγωγής Παρασκηνίου</string>
     <string name="title_activity_popup_player">Συσκευή αναπαραγωγής Αναδυόμενου παραθύρου</string>
@@ -358,71 +324,52 @@
     <string name="start_here_on_main">Εκκίνηση Αναπαραγωγής εδώ</string>
     <string name="start_here_on_background">Εκκίνηση εδώ όταν είναι στο Παρασκήνιο</string>
     <string name="start_here_on_popup">Εκκίνηση εδώ όταν είναι στο Αναδυόμενο Παράθυρο</string>
-
     <string name="drawer_open">Άνοιγμα Συρταριού</string>
     <string name="drawer_close">Κλείσιμο Συρταριού</string>
     <string name="drawer_header_action_paceholder_text">Κάτι θα παιχτεί εδω σύντομα ;D</string>
-
-
     <string name="top_50">Τοπ 50</string>
     <string name="new_and_hot">Καινούρια &amp; δημοφιλή</string>
     <string name="preferred_open_action_settings_title">Προτιμώμενη ενέργεια ανοίγματος</string>
     <string name="preferred_open_action_settings_summary">Προεπιλεγμένη ενέργεια για το άνοιγμα περιεχομένου — %s</string>
-
     <string name="video_player">Συσκευή αναπαραγωγής βίντεο</string>
     <string name="background_player">Αναπαραγωγή Παρασκηνίου</string>
     <string name="popup_player">Αναπαραγωγή σε Αναδυόμενο Παράθυρο</string>
     <string name="always_ask_open_action">Πάντα ερώτηση</string>
-
     <string name="preferred_player_fetcher_notification_title">Γίνεται λήψη πληροφοριών…</string>
     <string name="preferred_player_fetcher_notification_message">Γίνεται φόρτωση του ζητούμενου περιεχομένου</string>
-
     <string name="create_playlist">Νέα Λίστα Αναπαραγωγής</string>
     <string name="delete_playlist">Διαγραφή</string>
     <string name="rename_playlist">Μετονομασία</string>
     <string name="playlist_name_input">Όνομα</string>
     <string name="append_playlist">Προσθήκη στη Λίστα</string>
     <string name="set_as_playlist_thumbnail">Ορισμός ως μικρογραφία λίστας αναπαραγωγής</string>
-
     <string name="bookmark_playlist">Προσθήκη Σελιδοδείκτη στη Λίστα</string>
     <string name="unbookmark_playlist">Διαγραφή Σελιδοδείκτη</string>
-
     <string name="delete_playlist_prompt">Διαγραφή αυτής της λίστας αναπαραγωγής;</string>
     <string name="playlist_creation_success">Η λίστα αναπαραγωγής δημιουργήθηκε</string>
     <string name="playlist_add_stream_success">Προστέθηκε στη λίστα αναπαραγωγής</string>
     <string name="playlist_thumbnail_change_success">Η μικρογραφία της λίστας αναπαραγωγής άλλαξε.</string>
     <string name="playlist_delete_failure">Δεν ήταν δυνατή η διαγραφή της λίστας.</string>
-
-    <string name="caption_none">Δεν υπάρχουν υπότιτλοι</string>
-
+    <string name="caption_none">Χωρίς υπότιτλους</string>
     <string name="resize_fit">Προσαρμογή</string>
     <string name="resize_fill">Γέμισμα</string>
     <string name="resize_zoom">Μεγέθυνση</string>
-
     <string name="caption_auto_generated">Αυτόματοι</string>
-
     <string name="caption_setting_title">Υπότιτλοι</string>
     <string name="caption_setting_description">Τροποποίηση του μεγέθους και του φόντου των υπότιτλων. Απαιτεί επανεκκίνηση της εφαρμογής.</string>
-
     <string name="enable_leak_canary_title">Ενεργοποίηση του LeakCanary</string>
     <string name="enable_leak_canary_summary">Η παρακολούθηση των διαρροών μνήμης μπορεί να προκαλέσει την διακοπή της εφαρμογής</string>
-
     <string name="enable_disposed_exceptions_summary">Υποχρεωτική αναφορά μη παραδοτέων Rx εξαιρέσεων έξω από το κομμάτι ή τον κύκλο δραστηριότητας μετά από απόρριψη</string>
-
     <string name="import_export_title">Εισαγωγή/Εξαγωγή</string>
     <string name="import_title">Εισαγωγή</string>
     <string name="import_from">Εισαγωγή από</string>
     <string name="export_to">Εξαγωγή σε</string>
-
     <string name="import_ongoing">Γίνεται εισαγωγή…</string>
     <string name="export_ongoing">Γίνεται εξαγωγή…</string>
-
     <string name="import_file_title">Εισαγωγή αρχείου</string>
     <string name="previous_export">Προηγούμενη εξαγωγή</string>
-
     <string name="subscriptions_import_unsuccessful">Δεν ήταν δυνατή η εισαγωγή των εγγραφών</string>
     <string name="subscriptions_export_unsuccessful">Δεν ήταν δυνατή η εισαγωγή των εγγραφών</string>
-
     <string name="import_youtube_instructions">Κάντε εισαγωγή των εγγραφών σας στο YouTube κατεβάζοντας το εξής αρχείο:
 \n
 \n1. Πλοηγηθήτε στο: %1$s
@@ -437,7 +384,6 @@
     <string name="import_network_expensive_warning">Αυτή η διαδικασία μπορεί να χρησιμοποιήσει μεγάλο όγκο δεδομένων.
 \n
 \nΕπιθυμείτε να συνεχίσετε;</string>
-
     <string name="playback_speed_control">Έλεγχος ταχύτητας αναπαραγωγής</string>
     <string name="playback_tempo">Τέμπο</string>
     <string name="playback_pitch">Τόνος</string>
@@ -446,22 +392,82 @@
     <string name="trending">Δημοφιλή</string>
     <string name="enable_disposed_exceptions_title">Αναφορά σφαλμάτων εκτός κύκλου ζωής</string>
     <string name="import_soundcloud_instructions_hint">Το όνομα χρήστη σας, soundcloud.com/όνομαχρήστη</string>
-
     <string name="unhook_checkbox">Αποσύνδεση (μπορεί να προκαλέσει παραμόρφωση)</string>
     <string name="skip_silence_checkbox">Επιτάχυνση αναπαραγωγής κατά τη διάρκεια σιωπής</string>
     <string name="playback_step">Βήμα</string>
     <string name="playback_reset">Επαναφορά</string>
-
     <string name="start_accept_privacy_policy">Προς συμμόρφωση με τον Ευρωπαϊκό Γενικό Κανονισμό για την Προστασία Δεδομένων (GDPR), σας επιστούμε την προσοχή στην πολιτική προστασίας προσωπικών δεδομένων του NewPipe. Παραλούμε, διαβάστε την προσεκτικά.
 \nΘα πρέπει να την αποδεχτέιτε προκειμένου να μας αποστείλετε την αναφορά σφάλματος.</string>
     <string name="accept">Αποδοχή</string>
     <string name="decline">Απόρριψη</string>
-
     <string name="limit_data_usage_none_description">Χωρίς όριο</string>
     <string name="limit_mobile_data_usage_title">Περιορισμός της ανάλυσης όταν γίνεται χρήση δεδομένων</string>
     <string name="minimize_on_exit_title">Ελαχιστοποίηση κατά την εναλλαγή εφαρμογών</string>
     <string name="minimize_on_exit_none_description">Καμία</string>
     <string name="minimize_on_exit_background_description">Ελαχιστοποίηση στο παρασκήνιο</string>
     <string name="minimize_on_exit_popup_description">Ελαχιστοποίηση σε αναδυόμενο παράθυρο</string>
-
+    <string name="unsubscribe">Απεγγραφή</string>
+    <string name="tab_new">Νέα Καρτέλα</string>
+    <string name="tab_choose">Επιλογή Καρτέλας</string>
+    <string name="volume_gesture_control_title">Ρυθμίσεις χειρονομιών ήχου</string>
+    <string name="volume_gesture_control_summary">Χρησιμοποιήστε χειρονομίες για τον έλεγχο της έντασης του ήχου</string>
+    <string name="brightness_gesture_control_title">Ρυθμίσεις χειρονομιών φωτεινότητας</string>
+    <string name="brightness_gesture_control_summary">Χρησιμοποιήστε χειρονομίες για τον έλεγχο της φωτεινότητας</string>
+    <string name="settings_category_updates_title">Ενημερώσεις</string>
+    <string name="events">Συμβάντα</string>
+    <string name="file_deleted">Το αρχείο διαγράφηκε</string>
+    <string name="app_update_notification_channel_name">Ειδοποίηση Ενημέρωσης Εφαρμογής</string>
+    <string name="app_update_notification_channel_description">Ειδοποίηση για νεότερη έκδοση του NewPipe</string>
+    <string name="download_to_sdcard_error_title">Εξωτερική μνήμη αποθήκευσης μη διαθέσιμη</string>
+    <string name="download_to_sdcard_error_message">Η αποθήκευση στην εξωτερική μνήμη απέτυχε. Επαναφορά στην αρχική τοποθεσία λήψης;</string>
+    <string name="saved_tabs_invalid_json">Χρήση προεπιλεγμένων καρτέλων, σφάλμα κατα την ανάγνωση των αποθηκευμένων καρτέλων</string>
+    <string name="restore_defaults">Επαναφορά προεπιλεγμένων ρυθμίσεων</string>
+    <string name="restore_defaults_confirmation">Θέλετε να επαναφέρετε τις προεπιλεγμένες ρυθμίσεις;</string>
+    <string name="subscribers_count_not_available">Το πλήθος των συνδρομητών δεν είναι διαθέσιμο</string>
+    <string name="main_page_content_summary">Ποιές καρτέλες θα εμφανίζονται στην αρχική σελίδα</string>
+    <string name="selection">Επιλογή</string>
+    <string name="conferences">Συνέδρια</string>
+    <string name="updates_setting_title">Ενημερώσεις</string>
+    <string name="updates_setting_description">Εμφάνιση ειδοποίησης όταν μια υπάρχει μια νεότερη έκδοση</string>
+    <string name="list_view_mode">Λειτουργία προβολής ως λίστα</string>
+    <string name="list">Λίστα</string>
+    <string name="grid">Πλέγμα</string>
+    <string name="auto">Αυτόματα</string>
+    <string name="switch_view">Αλλαγή τρόπου προβολής</string>
+    <string name="app_update_notification_content_title">Νεά Έκδοση NewPipe Διαθέσιμη!</string>
+    <string name="app_update_notification_content_text">Πατήστε για λήψη</string>
+    <string name="missions_header_finished">Ολοκληρώθηκε</string>
+    <string name="missions_header_pending">Στην ουρά αναμονής</string>
+    <string name="paused">Παύση</string>
+    <string name="queued">στην ουρά</string>
+    <string name="post_processing">Μετεπεξεργασία</string>
+    <string name="enqueue">Ουρά</string>
+    <string name="permission_denied">Η δράση απορρίφθηκε από το σύστημα</string>
+    <string name="download_failed">Η λήψη απέτυχε</string>
+    <string name="download_finished">Η λήψη ολοκληρώθηκε</string>
+    <string name="download_finished_more">%s λήψεις ολοκρηρώθηκαν</string>
+    <string name="generate_unique_name">Δημιουργία μοναδικού ονόματος</string>
+    <string name="overwrite">Αντικατάσταση</string>
+    <string name="overwrite_warning">Ένα αρχείο με το ίδιο όνομα υπάρχει ήδη</string>
+    <string name="download_already_running">Υπάρχει μια λήψη σε εξέλιξη με αυτό το όνομα</string>
+    <string name="show_error">Εμφάνιση σφάλματος</string>
+    <string name="label_code">Κωδικός</string>
+    <string name="error_path_creation">Το αρχείο δεν μπορεί να δημιουργηθεί</string>
+    <string name="error_file_creation">Αδυναμία δημιουργίας φάκελου προορισμού</string>
+    <string name="error_permission_denied">Η αδειοδότηση απορρίφθηκε απο το σύστημα</string>
+    <string name="error_ssl_exception">Δημιουργία ασφαλής σύνδεσης απέτυχε</string>
+    <string name="error_unknown_host">Αδυναμία εύρεσης του εξυπηρετητή</string>
+    <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>
+    <string name="pause_downloads_on_mobile">Παύση με την εναλλαγή του δικτύου σε δεδομένα</string>
+    <string name="pause_downloads_on_mobile_desc">Οι λήψεις που δεν δέχονται παύση θα επανεκκινηθούν</string>
 </resources>
\ No newline at end of file

From 5412a087fef0ae17a3ff50201f5fb36cd6d34997 Mon Sep 17 00:00:00 2001
From: Michalis Nikolaidis <artuistiq@gmail.com>
Date: Tue, 5 Mar 2019 18:39:34 +0000
Subject: [PATCH 007/138] Translated using Weblate (Greek)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-el/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 8a2a3403d..2422a493b 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -91,7 +91,7 @@
     <string name="title_activity_history">Ιστορικό</string>
     <string name="action_history">Ιστορικό</string>
     <string name="show_info">Εμφάνιση πληροφοριών</string>
-    <string name="main_bg_subtitle">Πατήστε στην αναζήτηση για να ξεκινήσετε</string>
+    <string name="main_bg_subtitle">Πατήστε αναζήτηση για να ξεκινήσετε</string>
     <string name="no_player_found_toast">Δε βρέθηκε πρόγραμμα αναπαραγωγής ροής δεδομένων (μπορείτε να εγκαταστήσετε το VLC για να κάνετε αναπαραγωγή).</string>
     <string name="controls_download_desc">Κατέβασμα του αρχείου ροής</string>
     <string name="use_external_video_player_summary">Αφαίρεση του ήχου από κάποιες αναλύσεις</string>
@@ -259,7 +259,7 @@
     <string name="reCaptchaActivity">Αυτόματο τεστ</string>
     <string name="reCaptcha_title">Πρόκληση reCAPTCHA</string>
     <string name="recaptcha_request_toast">Ζητήθηκε πρόκληση reCAPTCHA</string>
-    <string name="settings_file_charset_title">Επιτρεπτοί χαρακτήρες σε ονόματα αρχείων</string>
+    <string name="settings_file_charset_title">Επιτρεπόμενοι χαρακτήρες σε ονόματα αρχείων</string>
     <string name="settings_file_replacement_character_summary">Οι μη έγκυροι χαρακτήρες αντικαθίστανται με αυτήν την τιμή</string>
     <string name="settings_file_replacement_character_title">Αντικαταστάτης χαρακτήρας</string>
     <string name="charset_most_special_characters">Οι περισσότεροι ειδικοί χαρακτήρες</string>
@@ -287,8 +287,8 @@
     <string name="app_license_title">Η άδεια του NewPipe</string>
     <string name="app_license">Το NewPipe είναι copylelft ελεύθερο λογισμικό: Μπορείτε να το χρησιμοποιήσετε, να το μελετήσετε, να το μοιραστείτε και να το βελτιώσετε κατά βούληση. Ειδικότερα, μπορείτε να το αναδιανείμετε ή/και να το τροποποιήσετε υπό την άδεια GNU General Public Licence όπως αυτή εκδόθηκε από το Free Software Foundation, είτε υπό την έκδοση 3 της Άδειας είτε (προεραιτικά) υπό οποιαδήποτε μεταγενέστερη άδεια.</string>
     <string name="read_full_license">Διαβάστε την άδεια</string>
-    <string name="title_history_search">Αναζητημένα</string>
-    <string name="title_history_view">Έχει γίνει προβολή</string>
+    <string name="title_history_search">Αναζητήθηκαν</string>
+    <string name="title_history_view">Προβλήθηκαν</string>
     <string name="history_disabled">Το ιστορικό έχει απενεργοποιηθεί</string>
     <string name="history_empty">Το ιστορικό είναι κενό</string>
     <string name="history_cleared">Το ιστορικό εκκαθαρίστηκε</string>

From 389d08c23328db0bdf2603141e7a8d96ed03a0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Perovi=C4=87?= <nikolaperovicccc@gmail.com>
Date: Mon, 4 Mar 2019 16:15:07 +0000
Subject: [PATCH 008/138] Translated using Weblate (Serbian)

Currently translated at 47.4% (210 of 443 strings)
---
 app/src/main/res/values-sr/strings.xml | 100 +++++--------------------
 1 file changed, 20 insertions(+), 80 deletions(-)

diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index fa3011936..5182144e0 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="view_count_text">%1$s приказа</string>
     <string name="upload_date_text">Објављен %1$s</string>
@@ -10,7 +10,7 @@
     <string name="download">Преузми</string>
     <string name="search">Тражи</string>
     <string name="settings">Поставке</string>
-    <string name="did_you_mean">Да ли сте мислили: %1$s ?</string>
+    <string name="did_you_mean">Да ли сте мислили: %1$s\?</string>
     <string name="share_dialog_title">Подели помоћу</string>
     <string name="choose_browser">Отвори помоћу</string>
     <string name="screen_rotation">ротација</string>
@@ -39,21 +39,16 @@
     <string name="use_external_video_player_title">Користи спољашњи видео плејер</string>
     <string name="use_external_audio_player_title">Користи спољашњи аудио плејер</string>
     <string name="background_player_playing_toast">Пуштам у позадини</string>
-
     <string name="play_btn_text">Пусти</string>
-
     <string name="use_tor_title">Користи Тор</string>
     <string name="use_tor_summary">(Експериментално) Принудно преусмерење саобраћаја кроз Тор за доданту приватност (токови још нису подржани).</string>
     <string name="theme_title">Тема</string>
     <string name="dark_theme_title">Тамна</string>
     <string name="light_theme_title">Светла</string>
-
     <string name="settings_category_appearance_title">Изглед</string>
     <string name="network_error">Грешка мреже</string>
-
     <string name="download_path_audio_title">Одредиште преузимања за аудио</string>
     <string name="download_path_audio_dialog_title">Унесите путању за преузимање аудио фајлова</string>
-
     <string name="download_path_audio_summary">Путања за упис преузетих аудио фајлова</string>
     <string name="info_dir_created">Направљен директоријум за преузимање „%1$s“</string>
     <string name="err_dir_create">Не могу да направим директоријум за преузимање„ %1$s“</string>
@@ -63,15 +58,11 @@
     <string name="parsing_error">Не могу да рашчланим веб-сајт</string>
     <string name="content_not_available">Садржај није доступан</string>
     <string name="blocked_by_gema">Блокирала ГЕМА</string>
-
     <string name="content">Садржај</string>
     <string name="show_age_restricted_content_title">Прикажи старосно-ограничени садржај</string>
     <string name="video_is_age_restricted">Старосно-ограничени видео. Премошћавање је доступно у поставкама.</string>
-
     <string name="could_not_setup_download_menu">Не могу да поставим мени преузимања</string>
     <string name="live_streams_not_supported">Ово је ТОК УЖИВО, ово још није подржано.</string>
-
-
     <string name="light_parsing_error">Не могу да рашчланим веб-сајт у целости</string>
     <string name="could_not_get_stream">Не могу да добавим ниједан ток</string>
     <string name="sorry_string">Нажалост, то не би требало да се деси.</string>
@@ -82,17 +73,13 @@
     <string name="what_happened_headline">Шта се десило:</string>
     <string name="your_comment">Ваш коментар (на енглеском):</string>
     <string name="error_details_headline">Детаљи:</string>
-
-
     <string name="video">Видео</string>
     <string name="audio">Аудио</string>
     <string name="retry">Покушај поново</string>
     <string name="storage_permission_denied">Дозвола за приступ складишту је одбијена</string>
     <string name="report_error">Пријавите грешку</string>
     <string name="user_report">Извештај корисника</string>
-
     <string name="duration_live">уживо</string>
-
     <string name="main_bg_subtitle">Тапните на претрагу за почетак</string>
     <string name="autoplay_by_calling_app_title">Аутопуштање</string>
     <string name="autoplay_by_calling_app_summary">Аутоматско пуштање видеа по позиву друге апликације</string>
@@ -101,11 +88,8 @@
     <string name="view">Пусти</string>
     <string name="delete">Обриши</string>
     <string name="checksum">Хеш</string>
-
     <string name="add">Нова мисија</string>
     <string name="finish">У реду</string>
-
-
     <string name="msg_name">Назив фајла</string>
     <string name="msg_threads">Нити</string>
     <string name="msg_error">Грешка</string>
@@ -117,56 +101,39 @@
     <string name="msg_wait">Сачекајте…</string>
     <string name="msg_copied">Копирано у привремену меморију</string>
     <string name="no_available_dir">Одредите доступну фасциклу за преузимање</string>
-
     <string name="downloads">Преузимања</string>
     <string name="downloads_title">Преузимања</string>
     <string name="error_report_title">Извештај о грешци</string>
-
     <string name="could_not_load_image">Не могох да учитам слику</string>
     <string name="app_ui_crash">Апликација/УИ је краховала</string>
     <string name="info_labels">Шта:\\nЗахтев:\\nЈезик садржаја:\\nУслуга:\\nГМТ време:\\nПакет:\\nИздање:\\nИздање ОС-а:\\nГлоб. ИП распон:</string>
-
     <string name="reCaptchaActivity">Стопка</string>
     <string name="reCaptcha_title">reCAPTCHA стопка</string>
-
     <string name="recaptcha_request_toast">Решите reCAPTCHA стопку</string>
-
     <string name="black_theme_title">Црна</string>
-
     <string name="all">Сви</string>
     <string name="channel">Канал</string>
-
-
     <string name="short_thousand">хиљ</string>
     <string name="short_million">мил</string>
     <string name="short_billion">млрд</string>
-
     <string name="yes">Да</string>
     <string name="later">Касније</string>
-
-
     <string name="open_in_popup_mode">Отвори у искачућем режиму</string>
     <string name="msg_popup_permission">Ова дозвола је потребна за
 отварање у искачућем режиму</string>
-
     <string name="popup_mode_share_menu_title">Режим прозорчета</string>
-
     <string name="popup_playing_toast">Пуштање у режиму прозорчета</string>
     <string name="disabled">Искључено</string>
-
     <string name="use_old_player_title">Користи стари плејер</string>
     <string name="default_video_format_title">Пожељни формат видеа</string>
     <string name="default_popup_resolution_title">Резолуција искачућег прозора</string>
     <string name="show_higher_resolutions_title">Прикажи више резолуције</string>
     <string name="show_higher_resolutions_summary">Само неки уређаји подржавају пуштање 2K/4K видеа</string>
-
     <string name="filter">Филтер</string>
     <string name="refresh">Освежи</string>
     <string name="clear">Очисти</string>
-
     <string name="controls_background_title">Позадина</string>
     <string name="controls_popup_title">Прозорче</string>
-
     <string name="use_external_video_player_summary">Неке резолуције биће БЕЗ звука када је ова опција укључена</string>
     <string name="popup_remember_size_pos_title">Упамти величину и позицију искачућег прозора</string>
     <string name="popup_remember_size_pos_summary">Памти последњу величину и позицију искачућег прозорчета</string>
@@ -174,25 +141,20 @@
     <string name="player_gesture_controls_summary">Користите потезе за управљање осветљајем у јачином звука</string>
     <string name="show_search_suggestions_title">Предлози у претрази</string>
     <string name="show_search_suggestions_summary">Приказује предлоге током претраге</string>
-
     <string name="settings_category_popup_title">Искачући прозор</string>
     <string name="popup_resizing_indicator_title">Мењање величине</string>
-
     <string name="use_old_player_summary">Стара градња Медијафрејмворк плејера</string>
-<string name="subscribed_button_title">Претплаћен</string>
+    <string name="subscribed_button_title">Претплаћен</string>
     <string name="subscribe_button_title">Претплати</string>
     <string name="tab_main">Главно</string>
     <string name="tab_subscriptions">Претплате</string>
-
     <string name="fragment_whats_new">Шта је ново</string>
-
     <string name="enable_search_history_title">Историјат претраге</string>
     <string name="enable_search_history_summary">Уписуј појмове претраге локално</string>
     <string name="enable_watch_history_title">Историјат</string>
     <string name="enable_watch_history_summary">Чувај историјат гледања</string>
     <string name="resume_on_audio_focus_gain_title">Настави по дохвату фокуса</string>
     <string name="best_resolution">Најбоља резолуција</string>
-
     <string name="settings_category_downloads_title">Преузми</string>
     <string name="title_activity_about">О програму</string>
     <string name="action_settings">Поставке</string>
@@ -205,7 +167,6 @@
     <string name="view_on_github">Погледај на Гитхабу</string>
     <string name="read_full_license">Прочитај лиценцу</string>
     <string name="contribution_title">Допринос</string>
-
     <string name="title_activity_history">Историјат</string>
     <string name="title_history_search">Тражено</string>
     <string name="title_history_view">Гледано</string>
@@ -213,10 +174,7 @@
     <string name="action_history">Историјат</string>
     <string name="history_empty">Историјат је празан</string>
     <string name="history_cleared">Историјат очишћен</string>
-
-<string name="resume_on_audio_focus_gain_summary">Настави пуштање након прекида (нпр. позива)</string>
-
-
+    <string name="resume_on_audio_focus_gain_summary">Настави пуштање након прекида (нпр. позива)</string>
     <string name="settings_file_charset_title">Дозвољени знакови у називима</string>
     <string name="charset_letters_and_digits">Слова и бројке</string>
     <string name="copyright" formatted="true">© %1$s од %2$s под %3$s</string>
@@ -224,60 +182,48 @@
     <string name="channel_unsubscribed">Одјављен са канала</string>
     <string name="subscription_change_failed">Не могу да изменим претплату</string>
     <string name="subscription_update_failed">Не могу да ажурирам претплату</string>
-
     <string name="settings_category_player_title">Плејер</string>
     <string name="settings_category_player_behavior_title">Понашање</string>
     <string name="settings_category_history_title">Историјат</string>
     <string name="playlist">Листа пуштања</string>
     <string name="undo">Врати</string>
-
     <string name="notification_channel_name">Обавештење</string>
     <string name="notification_channel_description">Обавештења за Нупајп у позадини и искачући прозор</string>
-
     <string name="search_no_results">Нема резултата</string>
     <string name="empty_subscription_feed_subtitle">Нема ничега овде</string>
-
     <string name="no_subscribers">Нема претплатника</string>
     <plurals name="subscribers">
-	<item quantity="one">%s претплатник</item>
-	<item quantity="few">%s претплатника</item>
-	<item quantity="other">%s претплатника</item>
-</plurals>
-
+        <item quantity="one">%s претплатник</item>
+        <item quantity="few">%s претплатника</item>
+        <item quantity="other">%s претплатника</item>
+    </plurals>
     <string name="no_views">Нема прегледа</string>
     <plurals name="views">
-	<item quantity="one">%s преглед</item>
-	<item quantity="few">%s прегледа</item>
-	<item quantity="other">%s прегледа</item>
-</plurals>
-
+        <item quantity="one">%s преглед</item>
+        <item quantity="few">%s прегледа</item>
+        <item quantity="other">%s прегледа</item>
+    </plurals>
     <string name="no_videos">Нема видеа</string>
     <plurals name="videos">
-	<item quantity="one">%s видео</item>
-	<item quantity="few">%s видеа</item>
-	<item quantity="other">%s видеа</item>
-</plurals>
-
+        <item quantity="one">%s видео</item>
+        <item quantity="few">%s видеа</item>
+        <item quantity="other">%s видеа</item>
+    </plurals>
     <string name="settings_file_replacement_character_summary">Неисправни знакови ће бити замењени овом вредношћу</string>
     <string name="settings_file_replacement_character_title">Знак за замену</string>
-
     <string name="charset_most_special_characters">Посебни знакови</string>
-
     <string name="title_licenses">Лиценце треће стране</string>
     <string name="app_license_title">Лиценца Њупајпа</string>
     <string name="contribution_encouragement">Помоћ је увек добро дошла, било да имате идеју за превод, дизајн, козметичке или озбиљне измене кôда. Што се више уради, боље је!</string>
     <string name="item_deleted">Ставка обрисана</string>
-<string name="show_hold_to_append_summary">Приказ савета када је позадинско или искачуће дугме притиснуто на страници детаља видеа</string>
+    <string name="show_hold_to_append_summary">Приказ савета када је позадинско или искачуће дугме притиснуто на страници детаља видеа</string>
     <string name="background_player_append">У реду за позадински плејер</string>
     <string name="popup_playing_append">У реду за искачући плејер</string>
     <string name="play_all">Пусти све</string>
-
     <string name="player_stream_failure">Неуспех пуштања овог тока</string>
     <string name="player_unrecoverable_failure">Десила се непоправљива грешка плејера</string>
     <string name="player_recoverable_failure">Опорављам се од грешке плејера</string>
-
     <string name="delete_item_search_history">Желите ли да обришете ову ставку из историјата претраге?</string>
-
     <string name="main_page_content">Садржај на главној страници</string>
     <string name="blank_page_summary">Празна страница</string>
     <string name="kiosk_page_summary">Киоск страница</string>
@@ -287,7 +233,6 @@
     <string name="select_a_channel">Изаберите канал</string>
     <string name="no_channel_subscribed_yet">Још нема претплата на канал</string>
     <string name="select_a_kiosk">Изаберите киоск</string>
-
     <string name="kiosk">Киоск</string>
     <string name="trending">У тренду</string>
     <string name="top_50">Топ 50</string>
@@ -297,22 +242,17 @@
     <string name="play_queue_remove">Уклони</string>
     <string name="play_queue_stream_detail">Детаљи</string>
     <string name="play_queue_audio_settings">Поставке звука</string>
-    <string name="no_player_found_toast">Нема плејера тока (можете инсталирати ВЛЦ)</string>
-    <string name="controls_download_desc">Преузимање фајла тока.</string>
+    <string name="no_player_found_toast">Нема плејера тока (можете инсталирати ВЛЦ).</string>
+    <string name="controls_download_desc">Преузимање фајла тока</string>
     <string name="show_info">Прикажи податке</string>
-
     <string name="tab_bookmarks">Обележивачи</string>
-
     <string name="controls_add_to_playlist_title">Додај у</string>
-
     <string name="default_content_country_title">Подразумевана држава за садржај</string>
     <string name="service_title">Услуга</string>
     <string name="settings_category_debug_title">Исправљање грешака</string>
     <string name="always">Увек</string>
     <string name="just_once">Само једном</string>
-
     <string name="unknown_content">[непознато]</string>
-
     <string name="show_hold_to_append_title">Прикажи поруку \"задржи ради стављања у ред\"</string>
     <string name="donation_title">Донирај</string>
     <string name="donation_encouragement">ЊуПајп развијају волонтери у своје слободно време како би вама пружили најбоље искуство. Сада је време да им узвратите како би они могли да наставе са побољшавањем ЊуПајпа док уживају пијући кафу!</string>
@@ -321,4 +261,4 @@
     <string name="website_encouragement">Да бисте добили више информација и најновије вести о ЊуПајпу посетите наш вебсајт.</string>
     <string name="hold_to_append">Задржи за стављање у ред</string>
     <string name="start_here_on_main">Пусти одавде</string>
-    </resources>
+</resources>
\ No newline at end of file

From 27579dff37ecd7d5001582c30b3d395c86fa0da0 Mon Sep 17 00:00:00 2001
From: Marian Hanzel <marulinko@gmail.com>
Date: Tue, 5 Mar 2019 20:00:14 +0000
Subject: [PATCH 009/138] Translated using Weblate (Slovak)

Currently translated at 88.3% (391 of 443 strings)
---
 app/src/main/res/values-sk/strings.xml | 198 +++++++++++--------------
 1 file changed, 87 insertions(+), 111 deletions(-)

diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index a7359b0d7..c33bfde1b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="view_count_text">%1$s pozretí</string>
     <string name="upload_date_text">Zverejnené %1$s</string>
@@ -16,14 +16,11 @@
     <string name="screen_rotation">otočenie</string>
     <string name="use_external_video_player_title">Použiť externý prehrávač videa</string>
     <string name="use_external_audio_player_title">Použiť externý prehrávač zvuku</string>
-
     <string name="download_path_title">Prevzaté video ukladať do</string>
     <string name="download_path_summary">Cesta kam sa budú ukladať prevzaté videá</string>
     <string name="download_path_dialog_title">Vložte cestu kam sa budú ukladať videá</string>
-
     <string name="download_path_audio_title">Prevzaté audio ukladať do</string>
     <string name="download_path_audio_dialog_title">Vložte cestu kam sa budú ukladať zvukové súbory</string>
-
     <string name="download_path_audio_summary">Cesta kam sa bude ukladať prevzaté audio</string>
     <string name="default_resolution_title">Štandardné rozlíšenie</string>
     <string name="play_with_kodi_title">Prehrať cez Kodi</string>
@@ -35,10 +32,9 @@
     <string name="theme_title">Téma</string>
     <string name="dark_theme_title">Tmavá</string>
     <string name="light_theme_title">Svetlá</string>
-
     <string name="download_dialog_title">Prevziať</string>
-    <string name="next_video_title">Ďalšie video</string>
-    <string name="show_next_and_similar_title">Ukázať \'ďalšie\' a \'podobné\' videá</string>
+    <string name="next_video_title">Ďalšie</string>
+    <string name="show_next_and_similar_title">Ukázať \'Ďalšie\' a \'Podobné\' videá</string>
     <string name="url_not_supported_toast">URL nie je podporovaná</string>
     <string name="content_language_title">Preferovaný jazyk obsahu</string>
     <string name="settings_category_video_audio_title">Video &amp; Zvuk</string>
@@ -53,7 +49,6 @@
     <string name="parsing_error">Nemožno analyzovať webovú stránku</string>
     <string name="content_not_available">Obsah nie je dostupný</string>
     <string name="blocked_by_gema">Obsah blokuje GEMA</string>
-
     <string name="list_thumbnail_view_description">Náhľad videa</string>
     <string name="detail_thumbnail_view_description">Náhľad videa</string>
     <string name="detail_uploader_thumbnail_view_description">Náhľad avataru uploadera</string>
@@ -61,7 +56,6 @@
     <string name="detail_dislikes_img_view_description">Dislajky</string>
     <string name="use_tor_title">Použiť Tor</string>
     <string name="use_tor_summary">(Experimentálne) Vyžadovať preberanie cez Tor pre väčšie súkromie (streamovanie videa momentálne nie je podporované).</string>
-
     <string name="err_dir_create">Nemožno vytvoriť adresár na preberanie \'%1$s\'</string>
     <string name="info_dir_created">Adresár na preberanie bol vytvorený \'%1$s\'</string>
     <string name="main_bg_subtitle">Začnite vyhľadaním obsahu</string>
@@ -71,7 +65,6 @@
     <string name="show_age_restricted_content_title">Zobraziť vekovo obmedzený obsah</string>
     <string name="video_is_age_restricted">Toto video je vekovo obmedzené. Povoľte zobrazenie obsahu v nastavení.</string>
     <string name="duration_live">naživo</string>
-
     <string name="light_parsing_error">Nemožno kompletne zanalyzovať web</string>
     <string name="could_not_setup_download_menu">Nemožno nastaviť menu preberania</string>
     <string name="live_streams_not_supported">Toto je ŽIVÉ VYSIELANIE, ktoré ešte nie je podporované.</string>
@@ -84,11 +77,8 @@
     <string name="what_happened_headline">Čo sa stalo:</string>
     <string name="your_comment">Váš komentár (v Angličtine):</string>
     <string name="error_details_headline">Detaily:</string>
-
-
     <string name="report_error">Nahlásiť chybu</string>
     <string name="user_report">Hlásenie používateľa</string>
-
     <string name="video">Video</string>
     <string name="audio">Zvuk</string>
     <string name="retry">Znova</string>
@@ -98,11 +88,8 @@
     <string name="view">Prehrať</string>
     <string name="delete">Zmazať</string>
     <string name="checksum">Kontrolný súčet</string>
-
     <string name="add">Nová misia</string>
     <string name="finish">OK</string>
-
-
     <string name="msg_name">Názov súboru</string>
     <string name="msg_threads">Vlákna</string>
     <string name="msg_error">Chyba</string>
@@ -114,99 +101,72 @@
     <string name="msg_wait">Čakajte prosím…</string>
     <string name="msg_copied">Skopírované do schránky</string>
     <string name="no_available_dir">Vyberte si dostupný adresár na preberanie</string>
-
     <string name="downloads">Prevzaté</string>
     <string name="downloads_title">Prevzaté</string>
     <string name="error_report_title">Hlásenie o chybe</string>
-
     <string name="could_not_load_image">Nemožno načítať obrázok</string>
     <string name="app_ui_crash">Aplikácia/UP zlyhalo</string>
     <string name="info_labels">Čo:\\nPožiadavka:\\nJazyk obsahu:\\nSlužba:\\nČas v GMT:\\nBalík:\\nVerzia:\\nVerzia OS:</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">Výzva reCAPTCHA</string>
-
     <string name="black_theme_title">Čierna</string>
-
     <string name="all">Všetko</string>
     <string name="channel">Kanál</string>
-
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-
     <string name="recaptcha_request_toast">Požiadavka reCAPTCHA</string>
-
     <string name="yes">Áno</string>
     <string name="later">Neskôr</string>
-
-
     <string name="open_in_popup_mode">Spustiť v okne</string>
     <string name="msg_popup_permission">Tieto práva sú potrebné pre
 \nprehrávanie v mini okne</string>
-
     <string name="popup_mode_share_menu_title">NewPipe v okne</string>
-
     <string name="default_video_format_title">Preferovaný formát videa</string>
     <string name="popup_playing_toast">Prehrávanie v mini okne</string>
     <string name="disabled">Vypnuté</string>
-
     <string name="use_old_player_title">Použiť starší prehrávač</string>
     <string name="use_old_player_summary">Starý zabudovaný prehrávač Mediaframework</string>
-
     <string name="default_popup_resolution_title">Predvolená veľkosť mini okna</string>
     <string name="show_higher_resolutions_title">Zobraziť vyššie rozlíšenie</string>
     <string name="show_higher_resolutions_summary">Len niektoré zariadenia podporujú videá 2K/4K</string>
     <string name="controls_background_title">Na pozadí</string>
     <string name="controls_popup_title">V okne</string>
-
     <string name="filter">Filter</string>
     <string name="refresh">Obnoviť</string>
     <string name="clear">Vyčistiť</string>
-
-<string name="use_external_video_player_summary">Po zapnutí tejto funkcie niektoré formáty NEBUDÚ obsahovať zvukovú stopu</string>
+    <string name="use_external_video_player_summary">Odoberie audio pri NIEKTORÝCH rozlíšeniach</string>
     <string name="popup_remember_size_pos_title">Zapamätať si veľkosť a pozíciu mini okna</string>
     <string name="popup_remember_size_pos_summary">Zapamätať si posledné nastavenie veľkosti a pozície mini okna</string>
     <string name="player_gesture_controls_title">Ovládanie prehrávača gestami</string>
     <string name="player_gesture_controls_summary">Používať gestá pre kontrolu jasu a hlasitosti prehrávača</string>
     <string name="show_search_suggestions_title">Hľadať návrhy</string>
     <string name="show_search_suggestions_summary">Zobrazovať návrhy pri vyhľadávaní</string>
-
     <string name="settings_category_popup_title">Mini okno</string>
     <string name="popup_resizing_indicator_title">Zmena veľkosti</string>
     <string name="best_resolution">Najlepšie rozlíšenie</string>
-
     <string name="subscribe_button_title">Odber</string>
     <string name="subscribed_button_title">Odoberané</string>
     <string name="channel_unsubscribed">Odber zrušený</string>
     <string name="subscription_change_failed">Nemožno zmeniť odber</string>
     <string name="subscription_update_failed">Nemožno aktualizovať odber</string>
-
     <string name="tab_main">Hlavné</string>
     <string name="tab_subscriptions">Odbery</string>
-
     <string name="fragment_whats_new">Čo je nové</string>
-
     <string name="enable_search_history_title">Hľadať v histórií</string>
     <string name="enable_search_history_summary">Hľadané výrazy ukladať lokálne</string>
     <string name="enable_watch_history_title">História a vyrovnávacia pamäť</string>
     <string name="enable_watch_history_summary">Ukladať históriu pozretých videí</string>
     <string name="resume_on_audio_focus_gain_title">Pokračovať po prepnutí zobrazenia</string>
     <string name="resume_on_audio_focus_gain_summary">Pokračovať po prerušeniach (napr. hlasový hovor)</string>
-
-
     <string name="notification_channel_name">NewPipe notifikácie</string>
     <string name="notification_channel_description">Notifikácie pre NewPipe na pozadí a v mini okne</string>
-
     <string name="settings_category_downloads_title">Preberanie</string>
     <string name="settings_file_charset_title">Povolené znaky v názvoch súborov</string>
     <string name="settings_file_replacement_character_summary">Neplatné znaky budú nahradené týmito znakmi</string>
     <string name="settings_file_replacement_character_title">Náhradný znak</string>
-
     <string name="charset_letters_and_digits">Písmená a číslice</string>
     <string name="charset_most_special_characters">Väčšina špeciálnych znakov</string>
-
     <string name="title_activity_about">O NewPipe</string>
     <string name="action_settings">Nastavenia</string>
     <string name="action_about">O</string>
@@ -223,7 +183,6 @@
     <string name="contribution_encouragement">Či už máte nápady, prekladáte, spravíte zmenu dizajnu, čistenie kódu alebo skutočné ťažké zmeny v kóde, pomoc je vždy vítaná. Čím viac, tým lepšie!</string>
     <string name="read_full_license">Prečítať licencie</string>
     <string name="contribution_title">Zapojiť sa</string>
-
     <string name="title_activity_history">História</string>
     <string name="title_history_search">Vyhľadávané</string>
     <string name="title_history_view">Pozreté</string>
@@ -231,46 +190,37 @@
     <string name="action_history">História</string>
     <string name="history_empty">História je prázdna</string>
     <string name="history_cleared">História bola vyčistená</string>
-
-<string name="settings_category_player_title">Prehrávač</string>
+    <string name="settings_category_player_title">Prehrávač</string>
     <string name="settings_category_player_behavior_title">Správanie</string>
     <string name="settings_category_history_title">História a vyrovnávacia pamäť</string>
     <string name="playlist">Zoznam</string>
     <string name="undo">Vrátiť</string>
-
     <string name="search_no_results">Žiadne výsledky</string>
     <string name="empty_subscription_feed_subtitle">Zatiaľ je tu ticho ako v hrobe</string>
-
     <string name="no_subscribers">Žiadni odberatelia</string>
     <plurals name="subscribers">
-	<item quantity="one">%s odberateľ</item>
-	<item quantity="few">%s odberatelia</item>
-	<item quantity="other">%s odberateľov</item>
-</plurals>
-
+        <item quantity="one">%s odberateľ</item>
+        <item quantity="few">%s odberatelia</item>
+        <item quantity="other">%s odberateľov</item>
+    </plurals>
     <string name="no_views">Žiadne pozretia</string>
     <plurals name="views">
-	<item quantity="one">%s pozriete</item>
-	<item quantity="few">%s pozretia</item>
-	<item quantity="other">%s pozretí</item>
-</plurals>
-
+        <item quantity="one">%s pozriete</item>
+        <item quantity="few">%s pozretia</item>
+        <item quantity="other">%s pozretí</item>
+    </plurals>
     <string name="no_videos">Žiadne videá</string>
     <plurals name="videos">
-	<item quantity="one">%s video</item>
-	<item quantity="few">%s videá</item>
-	<item quantity="other">%s videí</item>
-</plurals>
-
+        <item quantity="one">%s video</item>
+        <item quantity="few">%s videá</item>
+        <item quantity="other">%s videí</item>
+    </plurals>
     <string name="item_deleted">Položka bola odstránená</string>
-<string name="no_player_found_toast">Nebol nájdený žiadny prehrávač pre stream (môžete si nainštalovať napr. VLC)</string>
-    <string name="controls_download_desc">Stiahnuť súbor stream.</string>
+    <string name="no_player_found_toast">Nebol nájdený žiadny prehrávač pre stream (môžete si nainštalovať napr. VLC)</string>
+    <string name="controls_download_desc">Stiahnuť súbor stream</string>
     <string name="show_info">Zobraziť info</string>
-
-    <string name="tab_bookmarks">Záložky</string>
-
+    <string name="tab_bookmarks">Uložené zoznamy</string>
     <string name="controls_add_to_playlist_title">Pridať do</string>
-
     <string name="show_hold_to_append_title">Zobrazovať tip \"Pridať podržaním\"</string>
     <string name="show_hold_to_append_summary">Zobraziť tip pre stlačenie tlačidiel \"Pozadie\" alebo \"V okne\" na stránke videa</string>
     <string name="default_content_country_title">Predvolený obsah pre krajinu</string>
@@ -280,14 +230,11 @@
     <string name="play_all">Prehrať všetko</string>
     <string name="always">Vždy</string>
     <string name="just_once">Iba raz</string>
-
     <string name="unknown_content">[Neznámy]</string>
-
     <string name="toggle_orientation">Prehodiť orientáciu</string>
     <string name="switch_to_background">Prepnúť na pozadie</string>
     <string name="switch_to_popup">Prepnúť do mini okna</string>
     <string name="switch_to_main">Prepnúť na Video</string>
-
     <string name="import_data_title">Importovať databázu</string>
     <string name="export_data_title">Exportovať databázu</string>
     <string name="import_data_summary">Prepíše aktuálnu históriu pozretí a odberov</string>
@@ -299,15 +246,12 @@
     <string name="invalid_url_toast">Neplatná URL adresa</string>
     <string name="video_streams_empty">Neboli nájdené žiadne video streamy</string>
     <string name="audio_streams_empty">Neboli nájdené žiadne audio streamy</string>
-
     <string name="detail_drag_description">Potiahnutím zmeniť poradie</string>
-
     <string name="create">Vytvoriť</string>
     <string name="delete_one">Odstrániť jeden</string>
     <string name="delete_all">Odstrániť všetko</string>
     <string name="dismiss">Zrušiť</string>
     <string name="rename">Premenovať</string>
-
     <string name="donation_title">Prispieť</string>
     <string name="donation_encouragement">Aplikácia NewPipe je vyvíjaná dobrovoľníkmi vo voľnom čase. Ak sa vám aplikácia páči, odmeňte vývojárov aby mohli NewPipe naďalej vylepšovať. Určite ich poteší napríklad šálka dobrej kávy.</string>
     <string name="give_back">Daruj</string>
@@ -318,7 +262,6 @@
     <string name="delete_all_history_prompt">Ste si istý, že chcete vymazať všetky položky z histórie?</string>
     <string name="title_last_played">Naposledy prehrávané</string>
     <string name="title_most_played">Najprehrávanejšie</string>
-
     <string name="main_page_content">Obsah na hlavnej stránke</string>
     <string name="blank_page_summary">Prázdna strana</string>
     <string name="kiosk_page_summary">Kiosk</string>
@@ -333,7 +276,6 @@
     <string name="no_valid_zip_file">Neplatný ZIP súbor</string>
     <string name="could_not_import_all_files">Upozornenie: Nemožno importovať všetky súbory.</string>
     <string name="override_current_data">Toto prepíše vaše aktuálne nastavenie.</string>
-
     <string name="kiosk">Kiosky</string>
     <string name="trending">Trendy</string>
     <string name="top_50">Top 50</string>
@@ -349,45 +291,36 @@
     <string name="start_here_on_main">Video odtiaľto</string>
     <string name="start_here_on_background">Zvuk odtiaľto</string>
     <string name="start_here_on_popup">Mini okno odtiaľto</string>
-
     <string name="drawer_open">Otvoriť zásuvku</string>
     <string name="drawer_close">Zavrieť zásuvku</string>
-
     <string name="video_player">Prehrávač videa</string>
     <string name="background_player">Zvuk na pozadí</string>
     <string name="popup_player">Mini okno</string>
     <string name="always_ask_open_action">Vždy sa opýtať</string>
-    
     <string name="preferred_player_fetcher_notification_title">Získavajú sa informácie…</string>
     <string name="preferred_player_fetcher_notification_message">Načítanie požadované obsahu</string>
-
     <string name="create_playlist">Vytvoriť nový zoznam skladieb</string>
     <string name="delete_playlist">Vymazať zoznam skladieb</string>
     <string name="rename_playlist">Premenovať zoznam skladieb</string>
     <string name="playlist_name_input">Názov</string>
     <string name="append_playlist">Pridať do zoznamu skladieb</string>
     <string name="set_as_playlist_thumbnail">Nastaviť ako miniatúru zoznamu skladieb</string>
-
     <string name="bookmark_playlist">Záložka zoznamu skladieb</string>
     <string name="unbookmark_playlist">Odstrániť Záložku</string>
-
     <string name="delete_playlist_prompt">Chcete odstrániť tento zoznam skladieb?</string>
     <string name="playlist_creation_success">Zoznam skladieb vytvorený</string>
     <string name="playlist_add_stream_success">Pridané do zoznamu skladieb</string>
     <string name="playlist_thumbnail_change_success">Miniatúra zoznamu skladieb bola zmenená</string>
     <string name="playlist_delete_failure">Nemožno odstrániť zoznam skladieb</string>
-
     <string name="caption_none">Bez titulkov</string>
-
     <string name="resize_fit">Prispôsobiť</string>
     <string name="resize_fill">Vyplniť</string>
     <string name="resize_zoom">Zväčšiť</string>
-
     <string name="caption_font_size_settings_title">Veľkosť písma titulkov</string>
     <string name="smaller_caption_font_size">Menšie Písmo</string>
     <string name="normal_caption_font_size">Normálne Písmo</string>
     <string name="larger_caption_font_size">Väčšie Písmo</string>
-<string name="use_inexact_seek_title">Používať rýchly posun</string>
+    <string name="use_inexact_seek_title">Používať rýchly posun</string>
     <string name="use_inexact_seek_summary">Rýchly posun umožňuje prejsť na novú pozíciu rýchlejšie, ale s menšou presnosťou</string>
     <string name="download_thumbnail_title">Načítanie miniatúr</string>
     <string name="download_thumbnail_summary">Vypnutím tejto funkcie sa nebudú vytvárať miniatúry a tým sa ušetrí miesto a pamäť. Zmena nastavení spôsobuje vyčistenie vyrovnávacej pamäte</string>
@@ -399,33 +332,23 @@
     <string name="auto_queue_summary">Automaticky zaradí súvisiaci stream, keď prehrávanie začne na poslednom streame v neopakujúcich sa zoznamoch prehrávania</string>
     <string name="settings_category_debug_title">Ladenie</string>
     <string name="file">Súbor</string>
-
     <string name="invalid_directory">Neplatný adresár</string>
     <string name="invalid_source">Neplatný zdroj súboru/obsahu</string>
     <string name="invalid_file">Súbor buď neexistuje alebo nemáte dostatočné práva na je čítanie či zápis</string>
     <string name="file_name_empty_error">Názov súboru nesme byť prázdny</string>
     <string name="error_occurred_detail">Nastala chyba: %1$s</string>
     <string name="no_streams_available_download">Žiadne streamy nie sú k dispozícii na prevzatie</string>
-
     <string name="toast_no_player">Prehrávač pre daný typ súboru nebol nájdený</string>
-
     <string name="drawer_header_action_paceholder_text">Čoskoro sa tu niečo objaví ;D</string>
-
-
     <string name="preferred_open_action_settings_title">Preferovaná akcia \'otvoriť\'</string>
     <string name="preferred_open_action_settings_summary">Predvolená akcia pri otváraní obsahu — %s</string>
-
     <string name="caption_auto_generated">Automaticky vygenerované</string>
-
     <string name="caption_setting_title">Titulky</string>
     <string name="caption_setting_description">Upravte mierku textu titulkov a štýly pozadia. Vyžaduje reštart prehrávača</string>
-
     <string name="enable_leak_canary_title">Povoliť službu LeakCanary</string>
     <string name="enable_leak_canary_summary">Monitorovanie pretečenia pamäte môže spôsobiť, že aplikácia nebude reagovať</string>
-
     <string name="enable_disposed_exceptions_title">Nahlásiť mimo-cyklické chyby</string>
     <string name="enable_disposed_exceptions_summary">Vynútiť hlásenie výnimiek nedoručiteľných Rx mimo časového cyklu fragmentov alebo aktivity po zneškodnení</string>
-
     <string name="import_export_title">Import/Export
 \n</string>
     <string name="import_title">Import
@@ -433,16 +356,12 @@
     <string name="import_from">Importovať z
 \n</string>
     <string name="export_to">Exportovať do</string>
-
     <string name="import_ongoing">Importovanie…</string>
     <string name="export_ongoing">Exportovanie…</string>
-
     <string name="import_file_title">Import súboru</string>
     <string name="previous_export">Predchádzajúci export</string>
-
     <string name="subscriptions_import_unsuccessful">Nemožno importovať odbery</string>
     <string name="subscriptions_export_unsuccessful">Nemožno exportovať odbery</string>
-
     <string name="import_youtube_instructions">Import odberov služby YouTube pomocou exportovaného zoznamu
 \n 
 \n1. Prejdite na túto adresu URL: %1$s 
@@ -456,18 +375,16 @@
 \n3. Po výzve sa prihláste do svojho účtu 
 \n4. Skopírujte adresu URL, na ktorú ste boli presmerovaní. "</string>
     <string name="import_soundcloud_instructions_hint">vašeID, soundcloud.com/vašeid</string>
-
     <string name="import_network_expensive_warning">Operácia môže byť náročná na počet prenesených dát.
 \n
 \nChcete pokračovať?</string>
-
     <string name="playback_speed_control">Ovládanie rýchlosti prehrávania</string>
     <string name="playback_tempo">Rýchlosť</string>
     <string name="playback_pitch">Výška</string>
     <string name="unhook_checkbox">"Spomalenie  (môže spôsobovať skreslenie)"</string>
     <string name="playback_nightcore">Nightcore režim</string>
     <string name="playback_default">Predvolené</string>
-<string name="clear_views_history_title">Vymazať históriu pozretí</string>
+    <string name="clear_views_history_title">Vymazať históriu pozretí</string>
     <string name="clear_views_history_summary">Odstráni históriu prehrávaných streamov</string>
     <string name="delete_view_history_alert">Vymazať celú históriu pozretí.</string>
     <string name="view_history_deleted">História pozretí bola vymazaná.</string>
@@ -476,18 +393,15 @@
     <string name="delete_search_history_alert">Vymazať celú históriu vyhľadávania.</string>
     <string name="search_history_deleted">História vyhľadávaní bola vymazaná.</string>
     <string name="one_item_deleted">1 položka bola vymazaná.</string>
-
     <string name="app_license">"NewPipe je slobodný softvér pod licenciou copyleft. Môžete ho používať, študovať a vylepšovať ako len chcete.  Konkrétne ho môžete šíriť a/alebo upravovať pod podmienkami Všeobecnej verejnej licencie GNU, ako ju publikuje Free Software Foundation, buď verzia 3 licencie, alebo (podľa vašej voľby) ktorákoľvek neskoršia verzia."</string>
     <string name="privacy_policy_title">Ochrana osobných údajov v NewPipe</string>
     <string name="privacy_policy_encouragement">NewPipe projekt berie vaše súkromie vážne. Preto aplikácia nezhromažďuje žiadne údaje bez vášho súhlasu.
 \nNewPipe v ochrane súkromia podrobne vysvetľuje, aké údaje budú odoslané a uložené pri hlásení o páde.</string>
     <string name="read_privacy_policy">Prečítajte si pravidlá ochrany osobných údajov</string>
     <string name="import_settings">Chcete zároveň importovať aj nastavenia?</string>
-
     <string name="start_accept_privacy_policy">V súlade s Európskym Všeobecným Nariadením o Ochrane Údajov (GDPR), chceme upriamiť vašu pozornosť na ochranu osobných údajov v NewPipe. Starostlivo si ich prečítajte. Musíte ich prijať pred nahlásením chyby.</string>
     <string name="accept">Prijať</string>
     <string name="decline">Odmietnuť</string>
-
     <string name="limit_data_usage_none_description">Bez limitu</string>
     <string name="limit_mobile_data_usage_title">Limitovať rozlíšenie pri použití mobilných dát</string>
     <string name="channels">Kanály</string>
@@ -497,11 +411,73 @@
     <string name="skip_silence_checkbox">Pretáčať tiché pasáže</string>
     <string name="playback_step">Krok</string>
     <string name="playback_reset">Vynulovať</string>
-
     <string name="minimize_on_exit_title">Minimalizovať pri prepnutí aplikácie</string>
     <string name="minimize_on_exit_summary">Akcia pri prepnutí na inú aplikáciu z hlavného prehrávača videa — %s</string>
     <string name="minimize_on_exit_none_description">Nič</string>
     <string name="minimize_on_exit_background_description">Prehrávať na pozadí</string>
     <string name="minimize_on_exit_popup_description">Prehrávať v okne</string>
-
-</resources>
+    <string name="unsubscribe">Zrušiť odber</string>
+    <string name="tab_new">Nový panel</string>
+    <string name="tab_choose">Zvoliť panel</string>
+    <string name="volume_gesture_control_title">Ovládanie hlasitosti gestom</string>
+    <string name="volume_gesture_control_summary">Používať gestá pre ovládanie hlasitosti</string>
+    <string name="brightness_gesture_control_title">Ovládanie jasu gestom</string>
+    <string name="brightness_gesture_control_summary">Použivať gestá pre ovládanie jasu</string>
+    <string name="settings_category_updates_title">Aktualizácie</string>
+    <string name="events">Udalosti</string>
+    <string name="file_deleted">Súbor vymazaný</string>
+    <string name="app_update_notification_channel_name">Oznámenie o aktualizácii aplikácie</string>
+    <string name="app_update_notification_channel_description">Upozornenia na novú verziu NewPipe</string>
+    <string name="download_to_sdcard_error_title">Externé úložisko je nedostupné</string>
+    <string name="download_to_sdcard_error_message">Sťahovanie na externú SD kartu ešte nie je možné. Obnoviť umiestnenie priečinka na prevzatie\?</string>
+    <string name="saved_tabs_invalid_json">Chyba pri načítavaní uložených kariet, použijú sa predvolené</string>
+    <string name="restore_defaults">Obnoviť predvolené nastavenia</string>
+    <string name="restore_defaults_confirmation">Chcete obnoviť predvolené hodnoty\?</string>
+    <string name="subscribers_count_not_available">Počet účastníkov nie je k dispozícii</string>
+    <string name="main_page_content_summary">Karty, ktoré sa zobrazujú na hlavnej stránke</string>
+    <string name="selection">Výber</string>
+    <string name="conferences">Konferencie</string>
+    <string name="updates_setting_title">Aktualizácie</string>
+    <string name="updates_setting_description">Zobrazí sa výzva na aktualizáciu aplikácie, keď je k dispozícii nová verzia</string>
+    <string name="list_view_mode">Režim zobrazenia zoznamu</string>
+    <string name="list">Zoznam</string>
+    <string name="grid">Mriežka</string>
+    <string name="auto">Auto</string>
+    <string name="switch_view">Prepnúť zobrazenie</string>
+    <string name="app_update_notification_content_title">Aktualizácia NewPipe je k dispozícii!</string>
+    <string name="app_update_notification_content_text">Ťuknite a stiahnite</string>
+    <string name="missions_header_finished">Ukončené</string>
+    <string name="missions_header_pending">Vo fronte</string>
+    <string name="paused">pozastavené</string>
+    <string name="queued">vo fronte</string>
+    <string name="post_processing">následné spracovanie</string>
+    <string name="enqueue">Fronta</string>
+    <string name="permission_denied">Akcia odmietnutá systémom</string>
+    <string name="download_failed">Sťahovanie zlyhalo</string>
+    <string name="download_finished">Sťahovanie ukončené</string>
+    <string name="download_finished_more">%s sťahovania skončené</string>
+    <string name="generate_unique_name">Vytvoriť jedinečný názov</string>
+    <string name="overwrite">Prepísať</string>
+    <string name="overwrite_warning">Stiahnutý súbor s týmto menom už existuje</string>
+    <string name="download_already_running">Sťahovanie s týmto názvom už prebieha</string>
+    <string name="show_error">Zobraziť chybu</string>
+    <string name="label_code">Kód</string>
+    <string name="error_path_creation">Súbor sa nedá vytvoriť</string>
+    <string name="error_file_creation">Cieľový priečinok nie je možné vytvoriť</string>
+    <string name="error_permission_denied">Povolenie odmietnuté systémom</string>
+    <string name="error_ssl_exception">Bezpečnostné pripojenie zlyhalo</string>
+    <string name="error_unknown_host">Server sa nepodarilo nájsť</string>
+    <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>
+    <string name="pause_downloads_on_mobile">Pozastaviť pri prechode na mobilné dáta</string>
+    <string name="pause_downloads_on_mobile_desc">Preberania, ktoré nie je možné pozastaviť, budú reštartované</string>
+</resources>
\ No newline at end of file

From 06711dc6c38568cc674e1c3dadee90480453fcee Mon Sep 17 00:00:00 2001
From: Marco Szeto <pakhoosz@gmail.com>
Date: Fri, 8 Mar 2019 10:17:44 +0000
Subject: [PATCH 010/138] Translated using Weblate (Chinese (Hong Kong))

Currently translated at 31.8% (141 of 443 strings)
---
 app/src/main/res/values-zh-rHK/strings.xml | 44 ++++++++--------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 506705536..d1b5fde31 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="install">安裝</string>
     <string name="cancel">取消</string>
@@ -25,7 +25,6 @@
     <string name="theme_title">主題</string>
     <string name="dark_theme_title">黑暗</string>
     <string name="light_theme_title">明亮</string>
-
     <string name="download_dialog_title">下載</string>
     <string name="next_video_title">下一部影片</string>
     <string name="show_next_and_similar_title">顯示下一部及相關的影片</string>
@@ -37,7 +36,6 @@
     <string name="background_player_playing_toast">背景播放</string>
     <string name="play_btn_text">播放</string>
     <string name="network_error">網絡問題</string>
-
     <string name="list_thumbnail_view_description">影片預覽縮圖</string>
     <string name="detail_thumbnail_view_description">影片預覽縮圖</string>
     <string name="detail_uploader_thumbnail_view_description">上載者的個人頭像縮圖</string>
@@ -52,7 +50,6 @@
     <string name="download_path_audio_title">聲音下載路徑</string>
     <string name="download_path_audio_summary">已下載的聲音之存放路徑</string>
     <string name="download_path_audio_dialog_title">請輸入聲音檔案的下載路徑</string>
-
     <string name="err_dir_create">未能建立下載路徑「%1$s」</string>
     <string name="info_dir_created">已建立下載路徑「%1$s」</string>
     <string name="blocked_by_gema">內容被 GEMA 封鎖</string>
@@ -63,7 +60,6 @@
     <string name="show_age_restricted_content_title">顯示已設年齡限制的影片</string>
     <string name="video_is_age_restricted">此影片設有年齡限制。若要觀看，請先在設定中解除年齡限制。</string>
     <string name="duration_live">直播</string>
-
     <string name="general_error">問題</string>
     <string name="could_not_load_thumbnails">無法載入全部縮圖</string>
     <string name="youtube_signature_decryption_error">無法為影片地址的簽署解碼。</string>
@@ -80,31 +76,23 @@
     <string name="what_happened_headline">事發經過：</string>
     <string name="your_comment">您的意見（請以英文輸入）：</string>
     <string name="error_details_headline">詳情：</string>
-
-
     <string name="report_error">報告問題</string>
     <string name="user_report">用戶報告</string>
-
     <string name="video">影片</string>
     <string name="audio">聲音</string>
     <string name="retry">重試</string>
     <string name="downloads">下載</string>
     <string name="downloads_title">下載</string>
     <string name="error_report_title">問題報告</string>
-
     <string name="content_not_available">未能提供內容。</string>
     <string name="storage_permission_denied">存取儲存空間的權限被拒</string>
-
     <string name="start">開始</string>
     <string name="pause">暫停</string>
     <string name="view">觀看</string>
     <string name="delete">刪除</string>
     <string name="checksum">校驗和</string>
-
     <string name="add">新任務</string>
     <string name="finish">好</string>
-
-
     <string name="msg_name">檔案名稱</string>
     <string name="msg_threads">線程</string>
     <string name="msg_error">錯誤</string>
@@ -116,16 +104,13 @@
     <string name="msg_wait">請稍候…</string>
     <string name="msg_copied">已複製至剪貼板</string>
     <string name="no_available_dir">請選擇下載資料夾。</string>
-
     <string name="open_in_popup_mode">在畫中畫模式開啟</string>
     <string name="popup_mode_share_menu_title">NewPipe 畫中畫模式</string>
-
     <string name="default_popup_resolution_title">預設畫中畫解像度</string>
     <string name="show_higher_resolutions_title">顯示更高解像度</string>
     <string name="show_higher_resolutions_summary">只有某些裝置能夠播放 2K 或 4K 影片</string>
     <string name="default_video_format_title">預設影片檔案格式</string>
     <string name="black_theme_title">純黑</string>
-
     <string name="popup_playing_toast">以畫中畫模式播放</string>
     <string name="all">所有</string>
     <string name="channel">頻道</string>
@@ -135,39 +120,30 @@
     <string name="app_ui_crash">應用程式或介面出現問題</string>
     <string name="info_labels">事件：\\n請求：\\n內容語言：\\n服務：\\nGMT 時間：\\nPackage：\\n版本：\\n作業系統版本：</string>
     <string name="use_old_player_title">使用舊播放器</string>
-
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">reCAPTCHA 挑戰</string>
     <string name="msg_popup_permission">畫中畫模式需要此權限</string>
-
     <string name="recaptcha_request_toast">需完成 reCAPTCHA 挑戰</string>
-
-<string name="use_external_video_player_summary">啟用此選項將導致某些解像度的影片失去聲音</string>
+    <string name="use_external_video_player_summary">啟用此選項將導致某些解像度的影片失去聲音</string>
     <string name="controls_background_title">背景播放</string>
     <string name="controls_popup_title">畫中畫播放</string>
-
     <string name="popup_remember_size_pos_title">記住畫中畫大小及位置</string>
     <string name="popup_remember_size_pos_summary">記住最近設定的畫中畫大小及位置</string>
     <string name="player_gesture_controls_title">以動作控制播放器</string>
     <string name="player_gesture_controls_summary">使用動作以控制播放器的亮度及音量</string>
     <string name="show_search_suggestions_title">搜尋建議</string>
     <string name="show_search_suggestions_summary">進行搜尋時顯示建議</string>
-
     <string name="settings_category_popup_title">畫中畫</string>
     <string name="filter">過濾</string>
     <string name="disabled">不適用</string>
     <string name="refresh">重新整理</string>
     <string name="clear">清除</string>
     <string name="best_resolution">最佳解像度</string>
-
     <string name="popup_resizing_indicator_title">調整大小</string>
     <string name="use_old_player_summary">使用舊的內置 Mediaframework 播放器</string>
     <string name="short_billion">B</string>
-
     <string name="title_activity_about">關於 NewPipe</string>
     <string name="action_settings">設定</string>
     <string name="action_about">關於</string>
@@ -184,5 +160,17 @@
     <string name="contribution_encouragement">無論您僅想分享您對 NewPipe 的一些構思，還是願意設計和翻譯程式介面，甚至想幫我們整理或重新編寫原始碼，我們都無任歡迎。貢獻更多，應用程式便會變得更好！</string>
     <string name="read_full_license">檢閱特許</string>
     <string name="contribution_title">貢獻</string>
-<string name="clear_views_history_title">清除觀看歷史</string>
-    </resources>
+    <string name="clear_views_history_title">清除觀看歷史</string>
+    <string name="no_player_found_toast">找不到串流播放器 （您可以安裝並使用VLC播放）。</string>
+    <string name="controls_download_desc">下載串流檔案</string>
+    <string name="subscribe_button_title">訂閱</string>
+    <string name="subscribed_button_title">已訂閱</string>
+    <string name="unsubscribe">取消訂閱</string>
+    <string name="channel_unsubscribed">已成功取消訂閱頻道</string>
+    <string name="subscription_change_failed">無法變更訂閱</string>
+    <string name="subscription_update_failed">無法更新訂閱</string>
+    <string name="show_info">顯示資訊</string>
+    <string name="tab_main">首頁</string>
+    <string name="tab_subscriptions">訂閱項目</string>
+    <string name="tab_bookmarks">已收藏播放清單</string>
+</resources>
\ No newline at end of file

From 2f38943488c8026fad5a4762a2381969587cf62d Mon Sep 17 00:00:00 2001
From: Terry Louwers <t.louwers@gmail.com>
Date: Fri, 8 Mar 2019 15:52:15 +0000
Subject: [PATCH 011/138] Translated using Weblate (Dutch)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-nl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index db3eb00df..3bf219912 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -155,7 +155,7 @@
     <string name="tab_about">Over</string>
     <string name="tab_contributors">Bijdragers</string>
     <string name="tab_licenses">Licenties</string>
-    <string name="app_description">Vrij en lichtgewicht streamen op Android.</string>
+    <string name="app_description">Vrij en licht streamen voor Android.</string>
     <string name="view_on_github">Bekijken op GitHub</string>
     <string name="app_license_title">Licentie van NewPipe</string>
     <string name="contribution_encouragement">Hulp is altijd welkom. Of je nu nieuwe ideeën hebt, vertalingen kan aanleveren, wijzigingen in het ontwerp kan verrichten, code kan opschonen of van grote wijzigingen voorzien. Hoe meer hulp, hoe beter het wordt!</string>

From 1a6b915112d312932eb2d4bf7aa51bd094f9bcdd Mon Sep 17 00:00:00 2001
From: WaldiS <admin@sto.ugu.pl>
Date: Fri, 8 Mar 2019 08:39:14 +0000
Subject: [PATCH 012/138] Translated using Weblate (Polish)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-pl/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e1c03d75b..27a398e60 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -464,10 +464,10 @@
     <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 prób</string>
+    <string name="max_retry_msg">Maksymalna liczba powtórzeń</string>
     <string name="max_retry_desc">Maksymalna liczba prób przed anulowaniem pobierania</string>
     <string name="pause_downloads_on_mobile">Przerwij przełączanie na dane mobilne</string>
-    <string name="pause_downloads_on_mobile_desc">Pobierane pliki, których nie można wstrzymać, zostaną ponownie uruchomione</string>
+    <string name="pause_downloads_on_mobile_desc">Pobierane pliki, których nie można wstrzymać, zostaną zrestartowane</string>
     <string name="events">Zdarzenia</string>
     <string name="conferences">Konferencje</string>
 </resources>
\ No newline at end of file

From c46e3cf5cb26616f9eb988dac5ee6c0c2af4cf75 Mon Sep 17 00:00:00 2001
From: marciozomb13 <marciozomb13@outlook.com>
Date: Thu, 7 Mar 2019 18:36:12 +0000
Subject: [PATCH 013/138] Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.5% (441 of 443 strings)
---
 app/src/main/res/values-pt-rBR/strings.xml | 111 +++++----------------
 1 file changed, 23 insertions(+), 88 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2c73758b1..6ec9ced28 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -112,7 +112,6 @@
     <string name="user_report">Relatório do usuário</string>
     <string name="show_play_with_kodi_title">Exibir opção \"Reproduzir com Kodi\"</string>
     <string name="info_labels">O que:\\nRequisição:\\nIdioma do conteúdo:\\nServiço:\\nHora GMT:\\nPacote:\\nVersão:\\nVersão SO:</string>
-
     <string name="open_in_popup_mode">Abrir em modo popup</string>
     <string name="default_popup_resolution_title">Resolução padrão de popup</string>
     <string name="show_higher_resolutions_title">Mostrar resoluções maiores</string>
@@ -124,37 +123,27 @@
     <string name="yes">Sim</string>
     <string name="later">Depois</string>
     <string name="disabled">Desabilitado</string>
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-
     <string name="msg_popup_permission">Essa permissão é necessária para
 abrir em modo popup</string>
-
     <string name="popup_mode_share_menu_title">Modo de popup NewPipe</string>
-
     <string name="filter">Filtro</string>
     <string name="refresh">Atualizar</string>
     <string name="clear">Limpar</string>
-
     <string name="controls_popup_title">Popup</string>
-
     <string name="controls_background_title">Plano de fundo</string>
     <string name="popup_remember_size_pos_title">Lembrar tamanho e posição do popup</string>
     <string name="popup_remember_size_pos_summary">Lembrar do último tamanho e posição definido para o popup</string>
-
     <string name="settings_category_popup_title">Popup</string>
     <string name="popup_resizing_indicator_title">Redimensionamento</string>
-
     <string name="use_external_video_player_summary">Remove o áudio em ALGUMAS resoluções</string>
     <string name="player_gesture_controls_title">Controle do player por gestos</string>
     <string name="player_gesture_controls_summary">Usar gestos para controlar o brilho da tela e volume do player</string>
     <string name="show_search_suggestions_title">Sugestões de busca</string>
     <string name="show_search_suggestions_summary">Mostrar sugestões quando pesquisar</string>
-
-<string name="best_resolution">Melhor resolução</string>
-
+    <string name="best_resolution">Melhor resolução</string>
     <string name="action_settings">Configurações</string>
     <string name="action_about">Sobre</string>
     <string name="title_licenses">Licenças de Terceiros</string>
@@ -169,30 +158,24 @@ abrir em modo popup</string>
     <string name="contribution_encouragement">Sempre que tiver ideias, traduções, mudanças do design, limpeza de código ou grandes alterações de código, a ajuda é bem vinda. Quanto mais for feito, melhor o aplicativo fica!</string>
     <string name="read_full_license">Ler licença</string>
     <string name="contribution_title">Contribuir</string>
-<string name="copyright" formatted="true">© %1$s %2$s protegido pela licença %3$s</string>
+    <string name="copyright" formatted="true">© %1$s %2$s protegido pela licença %3$s</string>
     <string name="title_activity_about">Sobre NewPipe</string>
     <string name="settings_category_downloads_title">Download</string>
     <string name="settings_file_charset_title">Caracteres permitidos em nome de arquivos</string>
     <string name="settings_file_replacement_character_summary">Caracteres inválidos são substituídos por este valor</string>
     <string name="settings_file_replacement_character_title">Caractere de substituição</string>
-
     <string name="charset_letters_and_digits">Letras e dígitos</string>
     <string name="charset_most_special_characters">Caracteres especiais</string>
-
     <string name="subscribe_button_title">Inscrever-se</string>
     <string name="subscribed_button_title">Inscrito</string>
     <string name="channel_unsubscribed">Inscrição ao canal cancelada</string>
     <string name="subscription_change_failed">Não foi possível modificar inscrição</string>
     <string name="subscription_update_failed">Não foi possível atualizar inscrição</string>
-
     <string name="tab_main">Principal</string>
     <string name="tab_subscriptions">Inscrições</string>
-
     <string name="fragment_whats_new">Novidades</string>
-
     <string name="resume_on_audio_focus_gain_title">Retomar reprodução ao ganhar foco</string>
     <string name="resume_on_audio_focus_gain_summary">Continuar reproduzindo depois de interrupções (exemplo: ligações)</string>
-
     <string name="enable_search_history_title">Histórico de pesquisas</string>
     <string name="enable_search_history_summary">Armazenar histórico de pesquisa localmente</string>
     <string name="enable_watch_history_title">Histórico &amp; Cache</string>
@@ -204,40 +187,33 @@ abrir em modo popup</string>
     <string name="action_history">Histórico</string>
     <string name="history_empty">O histórico está vazio</string>
     <string name="history_cleared">Histórico limpo</string>
-
-<string name="notification_channel_name">Notificações do NewPipe</string>
+    <string name="notification_channel_name">Notificações do NewPipe</string>
     <string name="notification_channel_description">Notificações em plano de fundo para o NewPipe e players em popup</string>
-
     <string name="settings_category_player_behavior_title">Comportamento</string>
     <string name="settings_category_history_title">Histórico e Cache</string>
     <string name="playlist">Playlist</string>
     <string name="undo">Desfazer</string>
-
     <string name="search_no_results">Nenhum resultado</string>
     <string name="no_subscribers">Nenhum inscrito</string>
     <plurals name="subscribers">
-	<item quantity="one">%s inscrito</item>
-	<item quantity="other">%s inscritos</item>
-</plurals>
-
+        <item quantity="one">%s inscrito</item>
+        <item quantity="other">%s inscritos</item>
+    </plurals>
     <string name="no_views">Nenhuma visualização</string>
     <plurals name="views">
-	<item quantity="one">%s visualização</item>
-	<item quantity="other">%s visualizações</item>
-</plurals>
-
+        <item quantity="one">%s visualização</item>
+        <item quantity="other">%s visualizações</item>
+    </plurals>
     <string name="no_videos">Nenhum video</string>
     <plurals name="videos">
-    <item quantity="one">%s Vídeo</item>
-    <item quantity="other">%s Vídeos</item>
-</plurals>
-
+        <item quantity="one">Vídeo</item>
+        <item quantity="other">Vídeos</item>
+    </plurals>
     <string name="item_deleted">Item excluído</string>
-<string name="settings_category_player_title">Reprodutor</string>
+    <string name="settings_category_player_title">Reprodutor</string>
     <string name="empty_subscription_feed_subtitle">Não há nada aqui</string>
-
     <string name="delete_item_search_history">Deseja apagar este item do seu histórico de busca?</string>
-<string name="main_page_content">Conteúdo</string>
+    <string name="main_page_content">Conteúdo</string>
     <string name="blank_page_summary">Página em Branco</string>
     <string name="kiosk_page_summary">Página de Quiosque</string>
     <string name="subscription_page_summary">Página de Inscrição</string>
@@ -246,35 +222,31 @@ abrir em modo popup</string>
     <string name="select_a_channel">Selecione um canal</string>
     <string name="no_channel_subscribed_yet">Nenhuma inscrição ainda</string>
     <string name="select_a_kiosk">Selecione um quiosque</string>
-
     <string name="kiosk">Quiosque</string>
     <string name="trending">Em Alta</string>
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">Novos e tendências</string>
-<string name="show_hold_to_append_title">Mostrar dica \"Mantenha pressionado para enfileirar\"</string>
+    <string name="show_hold_to_append_title">Mostrar dica \"Mantenha pressionado para enfileirar\"</string>
     <string name="show_hold_to_append_summary">Mostrar dica quando o botão de plano de fundo ou de popup for pressionado na página de detalhes do vídeo</string>
     <string name="background_player_append">Adicionado a fila do reprodutor em plano de fundo</string>
     <string name="popup_playing_append">Adicionado a fila no reprodutor popup</string>
     <string name="play_all">Reproduzir tudo</string>
-
     <string name="player_stream_failure">Não foi possível reproduzir esta stream</string>
     <string name="player_unrecoverable_failure">Ocorreu um erro no reprodutor</string>
     <string name="player_recoverable_failure">Recuperando erro do reprodutor</string>
-
     <string name="title_activity_background_player">Reprodutor de Plano de Fundo</string>
     <string name="title_activity_popup_player">Reprodutor Popup</string>
     <string name="play_queue_remove">Remover</string>
     <string name="play_queue_stream_detail">Detalhes</string>
     <string name="play_queue_audio_settings">Configurações de Áudio</string>
     <string name="hold_to_append">Mantenha pressionado para colocar na fila</string>
-<string name="unknown_content">[Desconhecido]</string>
-
+    <string name="unknown_content">[Desconhecido]</string>
     <string name="enqueue_on_background">Adicionar a fila em Plano de Fundo</string>
     <string name="enqueue_on_popup">Adicionar a fila em Popup</string>
     <string name="start_here_on_main">Iniciar a reproduzir à partir daqui</string>
     <string name="start_here_on_background">Iniciar aqui quando estiver em Plano de Fundo</string>
     <string name="start_here_on_popup">Iniciar aqui em novo popup</string>
-<string name="donation_title">Doar</string>
+    <string name="donation_title">Doar</string>
     <string name="donation_encouragement">NewPipe é desenvolvido por voluntários que usam seu tempo para trazer a melhor experiência para você. Retribua para ajudar os desenvolvedores a tornarem o NewPipe ainda melhor enquanto desfrutam uma xícara de café.</string>
     <string name="give_back">Retribuir</string>
     <string name="website_title">Site oficial</string>
@@ -284,24 +256,20 @@ abrir em modo popup</string>
     <string name="service_title">Serviço</string>
     <string name="always">Sempre</string>
     <string name="just_once">Apenas esta vez</string>
-
     <string name="toggle_orientation">Alterar a orientação</string>
     <string name="switch_to_background">Alterar para Plano de Fundo</string>
     <string name="switch_to_popup">Alterar para Popup</string>
     <string name="switch_to_main">Alterar para o Principal</string>
-
     <string name="external_player_unsupported_link_type">Reprodutores externos não suportam estes tipos de links</string>
     <string name="invalid_url_toast">URL inválida</string>
     <string name="video_streams_empty">Nenhum stream de vídeo encontrado</string>
     <string name="audio_streams_empty">Nenhum stream de áudio encontrado</string>
-
     <string name="video_player">Reprodutor de vídeo</string>
     <string name="background_player">Reprodutor em plano de fundo</string>
     <string name="popup_player">Reprodutor popup</string>
-    
     <string name="preferred_player_fetcher_notification_title">Obtendo informações…</string>
     <string name="preferred_player_fetcher_notification_message">Carregando o conteúdo requisitado</string>
-<string name="import_data_title">Importar base de dados</string>
+    <string name="import_data_title">Importar base de dados</string>
     <string name="export_data_title">Exportar base de dados</string>
     <string name="import_data_summary">Sobrescreve seu histórico e inscrições</string>
     <string name="export_data_summary">Exportar histórico, inscrições e listas de reprodução</string>
@@ -310,88 +278,64 @@ abrir em modo popup</string>
     <string name="no_valid_zip_file">Não há nenhum arquivo ZIP válido</string>
     <string name="could_not_import_all_files">Aviso: Não foi possível importar todos arquivos.</string>
     <string name="override_current_data">Isso irá sobrescrever suas configurações atuais.</string>
-
     <string name="controls_download_desc">Baixar arquivo de stream</string>
     <string name="show_info">Mostrar informações</string>
-
     <string name="tab_bookmarks">Playlists favoritas</string>
-
     <string name="controls_add_to_playlist_title">Adicionar a</string>
-
     <string name="detail_drag_description">Arraste para ordenar</string>
-
     <string name="create">Criar</string>
     <string name="delete_one">Deletar um</string>
     <string name="delete_all">Deletar todos</string>
     <string name="dismiss">Dispensar</string>
     <string name="rename">Renomear</string>
-
     <string name="delete_stream_history_prompt">Deseja apagar este item do seu histórico de visualizações?</string>
     <string name="delete_all_history_prompt">Tem certeza que deseja apagar todos itens do histórico?</string>
     <string name="title_last_played">Reproduzido anteriormente</string>
     <string name="title_most_played">Mais vezes reproduzido</string>
-
     <string name="always_ask_open_action">Sempre perguntar</string>
-    
     <string name="create_playlist">Nova Lista de Reprodução</string>
     <string name="delete_playlist">Apagar</string>
     <string name="rename_playlist">Renomear</string>
     <string name="playlist_name_input">Nome</string>
     <string name="append_playlist">Adicionar a Lista de Reprodução</string>
     <string name="set_as_playlist_thumbnail">Definir como Miniatura da Lista de Reprodução</string>
-
     <string name="bookmark_playlist">Favoritar Lista de Reprodução</string>
     <string name="unbookmark_playlist">Remover Favorito</string>
-
     <string name="delete_playlist_prompt">Deletar esta lista de reprodução\?</string>
     <string name="playlist_creation_success">Lista de Reprodução criada</string>
     <string name="playlist_add_stream_success">Adicionado a lista de reprodução</string>
     <string name="playlist_thumbnail_change_success">Miniatura da lista de reprodução alterada.</string>
     <string name="playlist_delete_failure">Falha ao apagar lista de reprodução.</string>
-
     <string name="caption_none">Sem Legendas</string>
-
     <string name="resize_fit">Ajustar</string>
     <string name="resize_fill">Preencher</string>
     <string name="resize_zoom">Zoom</string>
     <string name="drawer_header_action_paceholder_text">Algo irá aparecer aqui em breve ;D</string>
-
-
     <string name="caption_auto_generated">Gerado automaticamente</string>
     <string name="enable_leak_canary_title">Habilitar LeakCanary</string>
     <string name="enable_leak_canary_summary">"Monitoramento de vazamento de memória pode fazer com que o app fique sem responder quando estiver despejando a pilha "</string>
-
     <string name="enable_disposed_exceptions_title">Reportar Erros de Fora do Ciclo de Vida</string>
     <string name="enable_disposed_exceptions_summary">Forçar o report de exceções Rx não entregáveis ocorrendo fora do fragmento ou ciclo de vida da atividade após o dispose</string>
-
-<string name="use_inexact_seek_title">Usar índice de indexação rápido porém não preciso</string>
+    <string name="use_inexact_seek_title">Usar índice de indexação rápido porém não preciso</string>
     <string name="use_inexact_seek_summary">Usar índice de indexação inexato</string>
     <string name="auto_queue_title">Adicionar a próxima stream à fila automaticamente</string>
     <string name="auto_queue_summary">Auto anexar uma stream relacionada quando a reprodução iniciar na última stream em uma fila não repetitiva.</string>
-
-
     <string name="file">Arquivo</string>
-
     <string name="invalid_directory">Pasta não encontrada</string>
     <string name="invalid_source">Origem do arquivo/conteúdo não econtrada</string>
     <string name="invalid_file">Arquivo não existe ou não há permissão para ler ou escrever nele</string>
     <string name="file_name_empty_error">Nome do arquivo não pode ser vazio</string>
     <string name="error_occurred_detail">Um erro ocorreu: %1$s</string>
-
     <string name="import_export_title">Importar/Exportar</string>
     <string name="import_title">Importar</string>
     <string name="import_from">Importar de</string>
     <string name="export_to">Exportar para</string>
-
     <string name="import_ongoing">Importando…</string>
     <string name="export_ongoing">Exportando…</string>
-
     <string name="import_file_title">Importar arquivo</string>
     <string name="previous_export">Exportação anteriore</string>
-
     <string name="subscriptions_import_unsuccessful">Importação de inscrições falhou</string>
     <string name="subscriptions_export_unsuccessful">Exportação de inscrições falhou</string>
-
     <string name="import_youtube_instructions">"Importe as inscrições da sua conta no YouTube através do arquivo exportado por ela em: 
 \n 
 \n1. Vá para este link:  %1$s 
@@ -404,11 +348,10 @@ abrir em modo popup</string>
 \n3. Faça login quando solicitado 
 \n4. Copie o link no qual você foi redirecionado (este é o link do seu perfil).</string>
     <string name="import_soundcloud_instructions_hint">seuID, soundcloud.com/seuid</string>
-
     <string name="import_network_expensive_warning">Tenha em mente que esta operação poderá usar bastante a conexão com a internet.
 \n
 \nVocê deseja continuar?</string>
-<string name="download_thumbnail_title">Carregar miniaturas</string>
+    <string name="download_thumbnail_title">Carregar miniaturas</string>
     <string name="thumbnail_cache_wipe_complete_notice">Cache de imagem foi limpo</string>
     <string name="metadata_cache_wipe_title">Limpar o cache de metadados</string>
     <string name="metadata_cache_wipe_summary">Remover todos os dados de páginas em cache</string>
@@ -418,18 +361,14 @@ abrir em modo popup</string>
     <string name="download_thumbnail_summary">Quando desligado miniaturas não carregarão, economizando uso de dados e memória. Alterar esta configuração irá limpar o cache de imagens na memória e em disco.</string>
     <string name="playback_pitch">Passo</string>
     <string name="unhook_checkbox">Desvincular (pode causar distorção)</string>
-<string name="preferred_open_action_settings_title">Ação de \'abrir\' preferida</string>
+    <string name="preferred_open_action_settings_title">Ação de \'abrir\' preferida</string>
     <string name="preferred_open_action_settings_summary">Ação padrão quando abrir conteúdo — %s</string>
-
     <string name="no_streams_available_download">Sem fontes disponíveis para download</string>
-
     <string name="drawer_open">Abrir gaveta</string>
     <string name="drawer_close">Fechar gaveta</string>
     <string name="caption_setting_title">Legendas</string>
     <string name="caption_setting_description">Modifique o tamanho da legenda e o estilo da tela de fundo. Necessário reiniciar o aplicativo para ter efeito.</string>
-
     <string name="toast_no_player">Nenhum player instalado para reproduzir este arquivo</string>
-
     <string name="clear_views_history_title">"Limpar histórico de já assistidos "</string>
     <string name="clear_views_history_summary">Deleta o histórico de videos já reproduzidos</string>
     <string name="delete_view_history_alert">Deletar todo o histórico de já reproduzidos\?</string>
@@ -439,10 +378,8 @@ abrir em modo popup</string>
     <string name="delete_search_history_alert">Deletar todo o histórico de pesquisa\?</string>
     <string name="search_history_deleted">Histórico de pesquisa deletado.</string>
     <string name="one_item_deleted">1 item deletado.</string>
-
     <string name="app_license">NewPipe é software livre copyleft: Você pode usar, estudar, compartilhar e melhorar ele a vontade. Mais especificamente você pode redistribuir e/ou modificar ele sob os termos da GNU General Public License como publicada pela Free Software Foundation, tanto a versão 3 dessa Licença, ou (a sua escolha) qualquer outra versão posterior.</string>
     <string name="import_settings">Você também quer importar as configurações?</string>
-
     <string name="privacy_policy_title">Política de privacidade do NewPipe</string>
     <string name="privacy_policy_encouragement">O projeto NewPipe leva a sua privacidade muito a sério. Sendo assim, o aplicativo não coleta nenhum dado sem seu consentimento.
 \nA polícia de privacidade do NewPipe explica em detalhes qual dado é enviado e salvo quando você envia um relatório de erros.</string>
@@ -451,19 +388,17 @@ abrir em modo popup</string>
 \nVocê tem que aceitá-la para nos enviar relatório de erros.</string>
     <string name="accept">Aceitar</string>
     <string name="decline">Recusar</string>
-<string name="limit_data_usage_none_description">Ilimitado</string>
+    <string name="limit_data_usage_none_description">Ilimitado</string>
     <string name="limit_mobile_data_usage_title">Limitar resolução quando dados móveis estiverem em uso</string>
     <string name="minimize_on_exit_title">Minimizar ao trocar de aplicativo</string>
     <string name="minimize_on_exit_summary">Ação ao trocar de aplicativo quando estiver no reprodutor de vídeo principal — %s</string>
     <string name="minimize_on_exit_none_description">"Nenhuma "</string>
     <string name="minimize_on_exit_background_description">Minimizar para reprodutor em plano de fundo</string>
     <string name="minimize_on_exit_popup_description">Minimizar para reprodutor popup</string>
-
-<string name="skip_silence_checkbox">Avançar rapidamente durante silêncio</string>
+    <string name="skip_silence_checkbox">Avançar rapidamente durante silêncio</string>
     <string name="playback_step">Parar
 \n</string>
     <string name="playback_reset">Reiniciar</string>
-
     <string name="channels">Canais</string>
     <string name="playlists">Listas de reprodução</string>
     <string name="tracks">Faixas</string>

From b01fc1be624c0f0ecca9681637d1649e86064fc5 Mon Sep 17 00:00:00 2001
From: Pj Pj <pj0899@rediffmail.com>
Date: Thu, 7 Mar 2019 09:44:34 +0000
Subject: [PATCH 014/138] Translated using Weblate (Telugu)

Currently translated at 28.7% (127 of 443 strings)
---
 app/src/main/res/values-te/strings.xml | 56 +++++++++-----------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index b566977d5..5915aee7a 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-<string name="main_bg_subtitle">ప్రారంభించడానికి శోధనను క్లిక్</string>
+    <string name="main_bg_subtitle">ప్రారంభించడానికి శోధనను క్లిక్</string>
     <string name="view_count_text">%1$s వీక్షణలు</string>
     <string name="upload_date_text">%1$s ప్రచురించబడింది</string>
     <string name="install">ఇన్స్టాల్</string>
@@ -10,35 +10,29 @@
     <string name="download">డౌన్లోడ్</string>
     <string name="search">శోధిచు</string>
     <string name="settings">సెట్టింగ్‌లు</string>
-    <string name="did_you_mean">%1$s ? అంటే నువ్వు అనేది</string>
+    <string name="did_you_mean">అంటే నువ్వు అనేది</string>
     <string name="share_dialog_title">తో పంచు</string>
     <string name="choose_browser">బ్రౌజర్ను ఎంచుకోండి</string>
-    <string name="screen_rotation">భ్రమణ</string>
+    <string name="screen_rotation">రొటేషన్</string>
     <string name="use_external_audio_player_title">బాహ్యట ఆడియో ప్లేయర్ని ఉపయోగించండి</string>
     <string name="popup_mode_share_menu_title">న్యూపైప్ పాపప్ మోడ్
 \n</string>
-    <string name="subscribe_button_title">సభ్యత్వ</string>
+    <string name="subscribe_button_title">"సభ్యత్వం "</string>
     <string name="subscribed_button_title">సబ్ స్క్రైబ్</string>
-    <string name="channel_unsubscribed">అన్ సబ్స్క్రైబ్ చేయబడింది</string>
+    <string name="channel_unsubscribed">అన్ సబ్స్క్రైబ్ చెసిరు</string>
     <string name="subscription_change_failed">సబ్ స్క్రైబ్ సాధ్యం కాలేదు</string>
     <string name="subscription_update_failed">సబ్ స్క్రైబ్ నవీకరించలేరు</string>
-
     <string name="tab_main">ప్రధానంగా</string>
     <string name="tab_subscriptions">సభ్యత్వం</string>
-
     <string name="fragment_whats_new">కొత్తది ఏమిటి</string>
-
     <string name="controls_background_title">వెనకవైపు</string>
     <string name="controls_popup_title">పాపప్</string>
-
     <string name="download_path_title">వీడియో డౌన్లోడ్ మార్గం</string>
     <string name="download_path_summary">డౌన్లోడ్ చేసిన వీడియోలను నిల్వ చేయడానికి మార్గం</string>
     <string name="download_path_dialog_title">వీడియోల కోసం డౌన్లోడ్ మార్గాన్ని నమోదు చేయండి</string>
-
     <string name="download_path_audio_title">ఆడియో డౌన్లోడ్ మార్గం</string>
     <string name="download_path_audio_summary">ఆడియో కోసం డౌన్లోడ్ మార్గాన్ని నమోదు చేయండి</string>
     <string name="download_path_audio_dialog_title">ఆడియో ఫైల్లకు డౌన్లోడ్ మార్గాన్ని ఇవ్వండి</string>
-
     <string name="autoplay_by_calling_app_title">దానంతట అదే ఆడుతుంది</string>
     <string name="play_with_kodi_title">కోడితో ప్లే చేయండి</string>
     <string name="kore_not_found">కోరే అనువర్తనం కనుగొనబడలేదు. దీన్ని ఇన్స్టాల్ చేయండి</string>
@@ -76,7 +70,6 @@
     <string name="later">తర్వాత</string>
     <string name="refresh">రిఫ్రెష్</string>
     <string name="play_all">అన్నింటినీ ప్లే చేయండి</string>
-
     <string name="notification_channel_name">న్యూప్యాప్ నోటిఫికేషన్</string>
     <string name="general_error">లోపం</string>
     <string name="network_error">నెట్వర్క్ లోపం</string>
@@ -89,7 +82,6 @@
     <string name="could_not_load_image">చిత్రాన్ని లోడ్ చేయడం సాధ్యపడలేదు</string>
     <string name="player_stream_failure">ఈ స్ట్రీమ్ని ప్లే చేయడం విఫలమైంది</string>
     <string name="player_recoverable_failure">ఆటగాడు లోపం నుండి పునరుద్ధరించడం</string>
-
     <string name="sorry_string">క్షమించాలి, అది జరగకూడదు</string>
     <string name="error_report_button_text">ఇ-మెయిల్ ద్వారా నివేదన లోపం</string>
     <string name="error_snackbar_message">క్షమించండి, కొన్ని లోపాలు సంభవించాయి</string>
@@ -98,8 +90,6 @@
     <string name="what_happened_headline">ఏం జరిగింది</string>
     <string name="your_comment">మీ వ్యాఖ్య(ఆంగ్లం లో)</string>
     <string name="error_details_headline">వివరాలు</string>
-
-
     <string name="list_thumbnail_view_description">వీడియో ప్రివ్యూ సూక్ష్మచిత్రం</string>
     <string name="detail_thumbnail_view_description">Video preview thumbnail</string>
     <string name="detail_likes_img_view_description">ఇష్టాలు</string>
@@ -116,32 +106,27 @@
     <string name="short_thousand">కె</string>
     <string name="short_million">ఎం</string>
     <string name="short_billion">బి</string>
-
     <string name="no_subscribers">చందాదారులు లేరు</string>
     <plurals name="subscribers">
-	<item quantity="one">%s సబ్స్క్రయిబ్</item>
-	<item quantity="other">%s సబ్స్క్రయిబలు</item>
-</plurals>
-
+        <item quantity="one">%s సబ్స్క్రయిబ్</item>
+        <item quantity="other">%s సబ్స్క్రయిబలు</item>
+    </plurals>
     <string name="no_views">వీక్షణలు లేవు</string>
     <plurals name="views">
-	<item quantity="one">%s వీక్షణ</item>
-	<item quantity="other">%s వీక్షణలు</item>
-</plurals>
-
+        <item quantity="one">%s వీక్షణ</item>
+        <item quantity="other">%s వీక్షణలు</item>
+    </plurals>
     <string name="no_videos">వీడియోలు లేవు</string>
     <plurals name="videos">
-	<item quantity="one">%s వీడియో</item>
-	<item quantity="other">%s వీడియోలు</item>
-</plurals>
-
+        <item quantity="one">%s వీడియో</item>
+        <item quantity="other">%s వీడియోలు</item>
+    </plurals>
     <string name="start">ప్రారంభం</string>
     <string name="pause">ఆపు</string>
     <string name="view">ప్లే</string>
     <string name="delete">తొలగించు</string>
     <string name="add">కొత్త మిషన్</string>
     <string name="finish">అలాగే</string>
-
     <string name="msg_name">ఫైలుపేరు</string>
     <string name="msg_threads">థ్రెడ్లు</string>
     <string name="msg_error">లోపం</string>
@@ -156,7 +141,6 @@
     <string name="settings_file_charset_title">ఫైల్ పేర్లలో అనుమతించిన అక్షరాలు</string>
     <string name="settings_file_replacement_character_summary">చెల్లని అక్షరాలు ఈ విలువతో భర్తీ చేయబడతాయి</string>
     <string name="settings_file_replacement_character_title">ప్రత్యామ్నాయం పాత్ర</string>
-
     <string name="charset_letters_and_digits">లెటర్స్ మరియు అంకెలు</string>
     <string name="title_activity_about">న్యూపిప్ గురించి</string>
     <string name="action_settings">సెట్టింగులు</string>
@@ -172,7 +156,6 @@
     <string name="contribution_encouragement">మీరు ఆలోచనలు ఉన్నాయా లేదో; అనువాదం, డిజైన్ మార్పులు, కోడ్ క్లీనింగ్ లేదా రియల్ భారీ కోడ్ మార్పులు-సహాయం ఎల్లప్పుడూ స్వాగతం. మరింత అది గెట్స్ మంచి జరుగుతుంది</string>
     <string name="read_full_license">లైసెన్స్ చదువు</string>
     <string name="contribution_title">కాంట్రిబ్యూషన్</string>
-
     <string name="title_activity_history">చరిత్ర</string>
     <string name="title_history_search">శోధించింది</string>
     <string name="title_history_view">వీక్షించారు</string>
@@ -182,7 +165,6 @@
     <string name="history_cleared">చరిత్ర క్లియర్ చేయబడింది</string>
     <string name="item_deleted">అంశం తొలగించబడింది</string>
     <string name="delete_item_search_history">మీరు ఈ అంశాన్ని శోధన చరిత్ర నుండి తొలగించాలనుకుంటున్నారా?</string>
-
     <string name="main_page_content">ప్రధాన పేజీ యొక్క కంటెంట్</string>
     <string name="blank_page_summary">ఖాళీ పేజీ</string>
     <string name="subscription_page_summary">చందా పేజీ</string>
@@ -197,8 +179,10 @@
     <string name="play_queue_stream_detail">వివరాలు</string>
     <string name="play_queue_audio_settings">ఆడియో సెట్టింగ్లు</string>
     <string name="hold_to_append">ఎన్క్యూలో పట్టుకోండి</string>
-<string name="no_player_found">"మీదగార వీడియో కి కావాల్సిన ప్లేయర్ లేదు. VLC  ప్లేయర్ ఇన్స్టాల్ చేసుకుంటారా?"</string>
-    <string name="no_player_found_toast">"మీదగార వీడియో కి కావాల్సిన ప్లేయర్ లేదు (మీరు VLC  ఇసన్తాల్ చేసుకోవచ్చు)"</string>
+    <string name="no_player_found">"మీదగార వీడియో కి కావాల్సిన ప్లేయర్ లేదు. VLC  ప్లేయర్ ఇన్స్టాల్ చేసుకుంటారా?"</string>
+    <string name="no_player_found_toast">"మీదగార వీడియో కి కావాల్సిన ప్లేయర్ లేదు (మీరు VLC  ఇసన్తాల్ చేసుకోండి )"</string>
     <string name="open_in_popup_mode">పాపప్ మోడ్ తెరవండి</string>
     <string name="default_popup_resolution_title">డిఫాల్ట్ పాపప్ స్పష్టత</string>
-    </resources>
+    <string name="controls_download_desc">ప్రసార ఫైల్ను డౌన్లోడ్ చేయండి</string>
+    <string name="use_external_video_player_title">బాహ్య వీడియో ప్లేయర్ని ఉపయోగించండి</string>
+</resources>
\ No newline at end of file

From c4d8eae547ef3afc87221ff3a0c92a80b1aae2be Mon Sep 17 00:00:00 2001
From: 84436 <thien.bui.84436@gmail.com>
Date: Fri, 8 Mar 2019 06:56:39 +0000
Subject: [PATCH 015/138] Translated using Weblate (Vietnamese)

Currently translated at 99.3% (440 of 443 strings)
---
 app/src/main/res/values-vi/strings.xml | 36 ++++++++++++++------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index df246a5df..f200bdd72 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -16,11 +16,11 @@
     <string name="share_dialog_title">Chia sẻ với</string>
     <string name="choose_browser">Chọn trình duyệt</string>
     <string name="use_external_video_player_title">Sử dụng trình phát video bên ngoài</string>
-    <string name="use_external_video_player_summary">Loại bỏ âm thanh ở một vài độ phân giải video</string>
+    <string name="use_external_video_player_summary">Âm thanh có thể không có ở *một vài* độ phân giải video</string>
     <string name="use_external_audio_player_title">Sử dụng trình phát audio bên ngoài</string>
     <string name="popup_mode_share_menu_title">Chế độ popup của NewPipe</string>
-    <string name="controls_popup_title">Popup</string>
-    <string name="download_path_title">Đường dẫn tải về video</string>
+    <string name="controls_popup_title"></string>
+    <string name="download_path_title">Thư mục tải về video</string>
     <string name="download_path_summary">Đường dẫn để lưu video đã tải về</string>
     <string name="download_path_dialog_title">Nhập đường dẫn tải về cho video</string>
     <string name="download_path_audio_title">Thư mục tải về audio</string>
@@ -31,14 +31,14 @@
     <string name="default_resolution_title">Độ phân giải mặc định</string>
     <string name="default_popup_resolution_title">Độ phân giải popup mặc định</string>
     <string name="show_higher_resolutions_title">Hiển thị độ phân giải cao hơn</string>
-    <string name="show_higher_resolutions_summary">Chỉ một số thiết bị hỗ trợ chơi các video 2K / 4K</string>
+    <string name="show_higher_resolutions_summary">Chỉ một số thiết bị hỗ trợ phát video 2K/4K</string>
     <string name="play_with_kodi_title">Phát với Kodi</string>
     <string name="kore_not_found">Không tìm thấy ứng dụng Kore. Bạn có muốn cài đặt nó\?</string>
     <string name="show_play_with_kodi_title">Hiển thị tùy chọn \"Phát với Kodi\"</string>
     <string name="show_play_with_kodi_summary">Hiển thị tùy chọn để phát video qua trung tâm media Kodi</string>
     <string name="play_audio">Âm thanh</string>
-    <string name="default_audio_format_title">Định dạng âm thanh mặc định</string>
-    <string name="default_video_format_title">Định dạng video ưa thích</string>
+    <string name="default_audio_format_title">Định dạng audio mặc định</string>
+    <string name="default_video_format_title">Định dạng video mặc định</string>
     <string name="controls_background_title">Nền</string>
     <string name="theme_title">Chủ đề</string>
     <string name="light_theme_title">Sáng</string>
@@ -52,7 +52,7 @@
     <string name="show_search_suggestions_summary">Hiển thị các đề xuất khi tìm kiếm</string>
     <string name="download_dialog_title">Tải về</string>
     <string name="next_video_title">Tiếp</string>
-    <string name="show_next_and_similar_title">Hiển thị video \'Tiếp\' và \'Tương tự\'</string>
+    <string name="show_next_and_similar_title">Hiển thị video \"Tiếp theo\" và \"Tương tự\"</string>
     <string name="url_not_supported_toast">URL không được hỗ trợ</string>
     <string name="settings_category_appearance_title">Hiển thị</string>
     <string name="settings_category_other_title">Khác</string>
@@ -60,7 +60,7 @@
     <string name="popup_playing_toast">Phát ở chế độ popup</string>
     <string name="play_btn_text">Phát</string>
     <string name="content">Nội dung</string>
-    <string name="show_age_restricted_content_title">Nội dung có giới hạn độ tuổi</string>
+    <string name="show_age_restricted_content_title">Cho phép nội dung có giới hạn độ tuổi</string>
     <string name="video_is_age_restricted">Hiện video có giới hạn độ tuổi. Có thể bật cài đặt này trong phần Cài đặt.</string>
     <string name="duration_live">TRỰC TIẾP</string>
     <string name="downloads">Tải xuống</string>
@@ -160,7 +160,7 @@
     <string name="screen_rotation">xoay màn hình</string>
     <string name="content_language_title">Ngôn ngữ nội dung ưu tiên</string>
     <string name="settings_category_video_audio_title">Video &amp; âm thanh</string>
-    <string name="settings_category_popup_title">Popup</string>
+    <string name="settings_category_popup_title"></string>
     <string name="enable_watch_history_title">Lịch sử &amp; bộ nhớ cache</string>
     <string name="settings_category_history_title">Lịch sử &amp; bộ nhớ cache</string>
     <string name="playlist">Playlist</string>
@@ -178,8 +178,8 @@
     <string name="tab_bookmarks">Playlist đã đánh dấu</string>
     <string name="fragment_whats_new">Có gì mới</string>
     <string name="controls_add_to_playlist_title">Thêm vào</string>
-    <string name="use_inexact_seek_title">Sử dụng tìm kiếm không chính xác nhanh</string>
-    <string name="use_inexact_seek_summary">Tìm kiếm không chính xác cho phép người chơi tìm kiếm vị trí nhanh hơn với độ chính xác giảm</string>
+    <string name="use_inexact_seek_title">Sử dụng tìm kiếm nhanh không chính xác</string>
+    <string name="use_inexact_seek_summary">Tìm kiếm không chính xác cho phép trình phát tua đến vị trí nhanh hơn với độ chính xác bị hạn chế</string>
     <string name="download_thumbnail_title">Tải hình thu nhỏ</string>
     <string name="download_thumbnail_summary">Tắt để không tải về các hình thu nhỏ, tiết kiệm lưu lượng mạng và bộ nhớ. Thay đổi điều này sẽ xóa bộ nhớ đệm hình ảnh cả trong RAM và trong bộ nhớ.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Đã xóa bộ nhớ cache hình ảnh</string>
@@ -191,7 +191,7 @@
     <string name="enable_search_history_title">Lịch sử tìm kiếm</string>
     <string name="enable_search_history_summary">Lưu trữ truy vấn tìm kiếm cục bộ</string>
     <string name="enable_watch_history_summary">Theo dõi các video đã xem</string>
-    <string name="resume_on_audio_focus_gain_title">Tiếp tục lấy tiêu điểm</string>
+    <string name="resume_on_audio_focus_gain_title">Tiếp tục phát sau khi bị gián đoạn</string>
     <string name="resume_on_audio_focus_gain_summary">Tiếp tục phát sau khi bị gián đoạn (ví dụ: cuộc gọi điện thoại)</string>
     <string name="show_hold_to_append_title">Hiển thị mẹo \"Giữ để nối thêm\"</string>
     <string name="show_hold_to_append_summary">Hiển thị mẹo khi nhấn nút phát trong nền hoặc phát trên popup trong trang chi tiết video</string>
@@ -267,7 +267,7 @@
     <string name="settings_file_charset_title">Các ký tự được cho phép trong tên tệp</string>
     <string name="settings_file_replacement_character_summary">Ký tự không hợp lệ được thay thế bằng giá trị này</string>
     <string name="settings_file_replacement_character_title">Ký tự thay thế</string>
-    <string name="charset_letters_and_digits">Chữ cái và chữ số</string>
+    <string name="charset_letters_and_digits">Chỉ chữ cái và chữ số</string>
     <string name="charset_most_special_characters">Hầu hết các ký tự đặc biệt</string>
     <string name="toast_no_player">Không có ứng dụng nào được cài đặt để phát tệp này</string>
     <string name="donation_title">Đóng góp</string>
@@ -396,16 +396,16 @@
     <string name="limit_mobile_data_usage_title">Giới hạn độ phân giải khi sử dụng dữ liệu di động</string>
     <string name="minimize_on_exit_title">Thu nhỏ khi chuyển qua ứng dụng khác</string>
     <string name="minimize_on_exit_summary">Hành động khi chuyển sang ứng dụng khác từ trình phát chính — %s</string>
-    <string name="minimize_on_exit_none_description">không ai</string>
+    <string name="minimize_on_exit_none_description">Không</string>
     <string name="minimize_on_exit_background_description">Thu nhỏ xuống trình phát nền</string>
     <string name="minimize_on_exit_popup_description">Thu nhỏ vào trình phát popup</string>
     <string name="unsubscribe">Hủy đăng ký</string>
     <string name="tab_new">Tab mới</string>
     <string name="tab_choose">Chọn tab</string>
     <string name="volume_gesture_control_title">Điều khiển âm lượng bằng cử chỉ</string>
-    <string name="volume_gesture_control_summary">Sử dụng cử chỉ để điều khiển âm lượng của trình nghe nhạc</string>
+    <string name="volume_gesture_control_summary">Sử dụng cử chỉ để điều khiển âm lượng của trình phát</string>
     <string name="brightness_gesture_control_title">Điều khiển độ sáng màn hình bằng cử chỉ</string>
-    <string name="brightness_gesture_control_summary">Sử dụng cử chỉ để điều khiển độ sáng màn hình của trình phát nhạc</string>
+    <string name="brightness_gesture_control_summary">Sử dụng cử chỉ để điều khiển độ sáng màn hình của trình phát</string>
     <string name="settings_category_updates_title">Cập nhật</string>
     <string name="events">Sự kiện</string>
     <string name="file_deleted">Đã xóa tập tin</string>
@@ -419,7 +419,7 @@
     <string name="subscribers_count_not_available">Số người đăng ký không khả dụng</string>
     <string name="main_page_content_summary">Chọn các tab để hiện trên trang chủ</string>
     <string name="selection">Lựa chọn</string>
-    <string name="top_50"></string>
+    <string name="top_50"/>
     <string name="import_soundcloud_instructions_hint">Nhập ID SoundCloud hoặc link soundcloud.com/&lt;ID của bạn&gt;</string>
     <string name="updates_setting_title">Cập nhật</string>
     <string name="updates_setting_description">Hiện thông báo khi có bản cập nhật ứng dụng</string>
@@ -463,4 +463,6 @@
     <string name="max_retry_desc">Số lượt thử lại trước khi hủy tải về</string>
     <string name="pause_downloads_on_mobile">Tạm dừng tải khi chuyển qua dữ liệu di động</string>
     <string name="pause_downloads_on_mobile_desc">Các tải về không thể tạm dừng được sẽ bắt đầu lại từ đầu</string>
+    <string name="conferences">Hội thảo</string>
+    <string name="label_code">Mã</string>
 </resources>
\ No newline at end of file

From 1315da0da7d720b95b87216ab8b7200c2d2f69cc Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Sat, 9 Mar 2019 19:51:30 +0000
Subject: [PATCH 016/138] Translated using Weblate (German)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-de/strings.xml | 127 ++++---------------------
 1 file changed, 21 insertions(+), 106 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e233e017b..319e5e8e6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -39,19 +39,15 @@
     <string name="use_external_audio_player_title">Externen Audio-Player verwenden</string>
     <string name="background_player_playing_toast">Spiele im Hintergrund ab</string>
     <string name="play_btn_text">Abspielen</string>
-
     <string name="use_tor_title">Benutze Tor</string>
     <string name="use_tor_summary">(Experimentell) Erzwinge das Herunterladen über Tor für verbesserte Privatsphäre (Videostream werden noch nicht unterstützt).</string>
     <string name="network_error">Netzwerkfehler</string>
-
     <string name="download_path_audio_title">Downloadverzeichnis für Audiodateien</string>
     <string name="download_path_audio_summary">Heruntergeladene Audiodateien werden hier gespeichert</string>
     <string name="download_path_audio_dialog_title">Downloadverzeichnis für Audiodateien angeben</string>
-
     <string name="theme_title">Design</string>
     <string name="dark_theme_title">Dunkel</string>
     <string name="light_theme_title">Hell</string>
-
     <string name="settings_category_appearance_title">Aussehen</string>
     <string name="settings_category_other_title">Andere</string>
     <string name="err_dir_create">Kann Downloadverzeichnis \'%1$s\' nicht anlegen</string>
@@ -62,15 +58,11 @@
     <string name="parsing_error">Konnte Webseite nicht analysieren</string>
     <string name="content_not_available">Inhalt nicht verfügbar</string>
     <string name="blocked_by_gema">Durch die GEMA gesperrt</string>
-
     <string name="content">Inhalt</string>
     <string name="show_age_restricted_content_title">Altersbeschränkte Inhalte</string>
     <string name="video_is_age_restricted">Altersbeschränktes Video anzeigen. Das Zulassen dieses Materials ist von den Einstellungen aus möglich.</string>
-
     <string name="could_not_setup_download_menu">Konnte Download-Menü nicht einrichten</string>
     <string name="live_streams_not_supported">Live-Streams werden noch nicht unterstützt</string>
-
-
     <string name="light_parsing_error">Konnte Webseite nicht vollständig analysieren</string>
     <string name="error_report_button_text">Fehler via E-Mail melden</string>
     <string name="error_snackbar_action">MELDEN</string>
@@ -78,7 +70,6 @@
     <string name="what_happened_headline">Dies ist passiert:</string>
     <string name="info_labels">Was:\\nAnfrage:\\nSprache des Inhalts:\\nDienst:\\nZeit (GMT):\\nPaket:\\nVersion:\\nOS-Version:</string>
     <string name="error_details_headline">Details:</string>
-
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Wiederholen</string>
@@ -91,30 +82,22 @@
     <string name="autoplay_by_calling_app_summary">Spiele ein Video ab, wenn NewPipe von einer anderen App aufgerufen wurde</string>
     <string name="report_error">Einen Fehler melden</string>
     <string name="user_report">Anwenderbericht</string>
-
     <string name="duration_live">LIVE</string>
-
-    <string name="main_bg_subtitle">„Suchen“ antippen, um zu beginnen</string>
+    <string name="main_bg_subtitle">Suchen antippen, um zu beginnen</string>
     <string name="downloads">Downloads</string>
     <string name="downloads_title">Downloads</string>
     <string name="error_report_title">Fehlerbericht</string>
-
     <string name="delete">Löschen</string>
     <string name="checksum">Prüfsumme</string>
-
-
-
     <string name="short_thousand">Tsd.</string>
     <string name="short_million">Mio.</string>
     <string name="short_billion">Mrd.</string>
-
     <string name="msg_name">Dateiname</string>
     <string name="msg_error">Fehler</string>
     <string name="msg_exists">Datei existiert bereits</string>
     <string name="msg_wait">Bitte warten…</string>
     <string name="msg_copied">In Zwischenablage kopiert</string>
     <string name="no_available_dir">Bitte wähle ein verfügbares Downloadverzeichnis</string>
-
     <string name="start">Starten</string>
     <string name="pause">Pause</string>
     <string name="view">Abspielen</string>
@@ -126,53 +109,41 @@
     <string name="msg_threads">Threads</string>
     <string name="msg_running">NewPipe lädt herunter</string>
     <string name="msg_running_detail">Für Details antippen</string>
-
     <string name="msg_url_malform">Ungültige URL oder Internet nicht verfügbar</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="black_theme_title">Schwarz</string>
-
     <string name="reCaptcha_title">reCAPTCHA-Aufgabe</string>
     <string name="recaptcha_request_toast">reCAPTCHA-Aufgabe angefordert</string>
-
     <string name="later">Später</string>
-
     <string name="yes">Ja</string>
     <string name="all">Alle</string>
     <string name="channel">Kanal</string>
-
     <string name="disabled">Deaktiviert</string>
-
     <string name="use_old_player_title">Alten Player benutzen</string>
     <string name="open_in_popup_mode">Im Pop-up-Modus öffnen</string>
     <string name="default_video_format_title">Bevorzugtes Videoformat</string>
     <string name="popup_playing_toast">Spiele im Pop-up Modus ab</string>
     <string name="popup_mode_share_menu_title">NewPipe-Pop-up-Modus</string>
-
-
     <string name="msg_popup_permission">Diese Berechtigung ist für das Öffnen im Pop-up-Modus erforderlich</string>
-
     <string name="use_old_player_summary">Alter eingebauter Mediaframework-Player</string>
     <string name="default_popup_resolution_title">Standardauflösung des Pop-ups</string>
     <string name="show_higher_resolutions_title">Höhere Auflösungen anzeigen</string>
     <string name="show_higher_resolutions_summary">Nur manche Geräte unterstützen das Abspielen von 2K-/4K-Videos</string>
     <string name="controls_background_title">Hintergrund</string>
     <string name="controls_popup_title">Pop-up</string>
-
     <string name="popup_remember_size_pos_title">Größe und Position des Pop-ups merken</string>
-<string name="use_external_video_player_summary">Entfernt Tonspur bei manchen Auflösungen</string>
+    <string name="use_external_video_player_summary">Entfernt Tonspur bei manchen Auflösungen</string>
     <string name="popup_remember_size_pos_summary">Letzte Größe und Position des Pop-ups merken</string>
     <string name="player_gesture_controls_title">Gestensteuerung</string>
     <string name="player_gesture_controls_summary">Helligkeit und Lautstärke mittels Gesten einstellen</string>
     <string name="show_search_suggestions_title">Suchvorschläge</string>
     <string name="show_search_suggestions_summary">Beim Suchen Vorschläge anzeigen</string>
-
     <string name="settings_category_popup_title">Pop-up</string>
     <string name="filter">Filter</string>
     <string name="refresh">Aktualisieren</string>
     <string name="clear">Löschen</string>
     <string name="popup_resizing_indicator_title">Größenänderung</string>
     <string name="best_resolution">Beste Auflösung</string>
-
     <string name="action_about">Über</string>
     <string name="title_activity_about">Über NewPipe</string>
     <string name="action_open_website">Website öffnen</string>
@@ -189,19 +160,16 @@
     <string name="title_licenses">Drittanbieter-Lizenzen</string>
     <string name="view_on_github">Auf GitHub ansehen</string>
     <string name="contribution_title">Beitragen</string>
-<string name="settings_category_downloads_title">Download</string>
+    <string name="settings_category_downloads_title">Download</string>
     <string name="settings_file_charset_title">Erlaubte Zeichen im Dateinamen</string>
     <string name="settings_file_replacement_character_summary">Ungültige Zeichen werden durch dieses Zeichen ersetzt</string>
     <string name="settings_file_replacement_character_title">Ersetzungszeichen</string>
-
     <string name="charset_letters_and_digits">Buchstaben und Zahlen</string>
     <string name="subscribe_button_title">Abonnieren</string>
     <string name="subscribed_button_title">Abonniert</string>
     <string name="channel_unsubscribed">Abonnement beendet</string>
     <string name="tab_subscriptions">Abos</string>
-
     <string name="fragment_whats_new">Neuigkeiten</string>
-
     <string name="enable_search_history_title">Suchverlauf</string>
     <string name="enable_search_history_summary">Suchanfragen lokal speichern</string>
     <string name="enable_watch_history_title">Verlauf &amp; Cache</string>
@@ -213,56 +181,44 @@
     <string name="action_history">Verlauf</string>
     <string name="history_empty">Der Verlauf ist leer</string>
     <string name="history_cleared">Verlauf bereinigt</string>
-
-<string name="subscription_change_failed">Abonnement konnte nicht geändert werden</string>
+    <string name="subscription_change_failed">Abonnement konnte nicht geändert werden</string>
     <string name="subscription_update_failed">Abonnement konnte nicht aktualisiert werden</string>
-
     <string name="resume_on_audio_focus_gain_summary">Nach Unterbrechungen (z.B. Telefonaten) Wiedergabe fortsetzen</string>
-
-
     <string name="notification_channel_name">NewPipe-Benachrichtigung</string>
     <string name="notification_channel_description">Benachrichtigungen für NewPipe-Hintergrund- und Pop-up Wiedergabe</string>
-
     <string name="tab_main">Hauptmenü</string>
     <string name="settings_category_player_behavior_title">Verhalten</string>
     <string name="settings_category_history_title">Verlauf &amp; Cache</string>
     <string name="playlist">Wiedergabeliste</string>
     <string name="undo">Rückgängig machen</string>
-
     <string name="search_no_results">Keine Ergebnisse</string>
     <string name="no_subscribers">Keine Abonnenten</string>
     <plurals name="subscribers">
-	<item quantity="one">%s Abonnent</item>
-	<item quantity="other">%s Abonnenten</item>
-</plurals>
-
+        <item quantity="one">%s Abonnent</item>
+        <item quantity="other">%s Abonnenten</item>
+    </plurals>
     <string name="no_views">Keine Aufrufe</string>
     <plurals name="views">
-	<item quantity="one">%s Aufruf</item>
-	<item quantity="other">%s Aufrufe</item>
-</plurals>
-
+        <item quantity="one">%s Aufruf</item>
+        <item quantity="other">%s Aufrufe</item>
+    </plurals>
     <string name="no_videos">Keine Videos</string>
     <plurals name="videos">
-    <item quantity="one">Video</item>
-    <item quantity="other">Videos</item>
-</plurals>
-
+        <item quantity="one">Video</item>
+        <item quantity="other">Videos</item>
+    </plurals>
     <string name="charset_most_special_characters">Die meisten Sonderzeichen</string>
-
     <string name="item_deleted">Element gelöscht</string>
     <string name="resume_on_audio_focus_gain_title">Fortsetzen bei erneutem Fokussieren</string>
     <string name="settings_category_player_title">Player</string>
     <string name="empty_subscription_feed_subtitle">Nichts hier außer das Zirpen der Grillen</string>
-
     <string name="delete_item_search_history">Möchtest du dieses Element aus dem Suchverlauf löschen?</string>
-<string name="blank_page_summary">Leere Seite</string>
+    <string name="blank_page_summary">Leere Seite</string>
     <string name="select_a_channel">Wähle einen Kanal aus</string>
     <string name="no_channel_subscribed_yet">Noch keine Kanalabonnements vorhanden</string>
     <string name="trending">Trends</string>
     <string name="popup_playing_append">In der Warteschlange der Pop-up-Wiedergabe</string>
     <string name="play_all">Alles abspielen</string>
-
     <string name="play_queue_remove">Entfernen</string>
     <string name="play_queue_audio_settings">Audio-Einstellungen</string>
     <string name="player_stream_failure">Konnte diesen Stream nicht abspielen</string>
@@ -276,24 +232,21 @@
     <string name="top_50">Top 50</string>
     <string name="player_unrecoverable_failure">Nicht behebbarer Wiedergabefehler aufgetreten</string>
     <string name="player_recoverable_failure">Wiederherstellen nach einem Wiedergabefehler</string>
-
     <string name="kiosk_page_summary">Kiosk-Seite</string>
     <string name="select_a_kiosk">Kiosk auswählen</string>
-
     <string name="kiosk">Kiosk</string>
     <string name="show_hold_to_append_summary">Tipp anzeigen, wenn der Hintergrundwiedergabe- oder Pop-up-Button auf der Videodetailseite gedrückt gehalten wird</string>
     <string name="background_player_append">In der Warteschlange der Hintergrundwiedergabe</string>
     <string name="new_and_hot">Neu &amp; Heiß</string>
     <string name="hold_to_append">Halten, um zur Wiedergabeliste hinzuzufügen</string>
-<string name="show_hold_to_append_title">\"Gedrückt halten, um hinzuzufügen\" Tipp anzeigen</string>
+    <string name="show_hold_to_append_title">\"Gedrückt halten, um hinzuzufügen\" Tipp anzeigen</string>
     <string name="unknown_content">[Unbekannt]</string>
-
     <string name="enqueue_on_background">In Warteschlange für Hintergrundwiedergabe</string>
     <string name="enqueue_on_popup">In Warteschlange für Pop-up</string>
     <string name="start_here_on_main">Ab hier wiedergeben</string>
     <string name="start_here_on_background">Ab hier im Hintergrundmodus</string>
     <string name="start_here_on_popup">Ab hier im Pop-up</string>
-<string name="donation_title">Spenden</string>
+    <string name="donation_title">Spenden</string>
     <string name="give_back">Zurückgeben</string>
     <string name="website_title">Website</string>
     <string name="website_encouragement">Besuche die NewPipe Website für weitere Informationen und Neuigkeiten.</string>
@@ -303,71 +256,54 @@
     <string name="default_content_country_title">Bevorzugtes Land des Inhalts</string>
     <string name="always">Immer</string>
     <string name="just_once">Nur einmal</string>
-
     <string name="toggle_orientation">Ausrichtung umschalten</string>
     <string name="switch_to_background">In den Hintergrund wechseln</string>
     <string name="switch_to_popup">Zum Pop-up wechseln</string>
     <string name="switch_to_main">Zur normalen Wiedergabe wechseln</string>
-
     <string name="external_player_unsupported_link_type">Externe Player unterstützen diese Art von Links nicht</string>
     <string name="invalid_url_toast">Ungültige URL</string>
     <string name="video_streams_empty">Keine Video-Streams gefunden</string>
     <string name="audio_streams_empty">Keine Audio-Streams gefunden</string>
-
     <string name="drawer_open">Navigationsleiste öffnen</string>
     <string name="drawer_close">Navigationsleiste schließen</string>
-
     <string name="video_player">Video-Player</string>
     <string name="background_player">Hintergrund-Player</string>
     <string name="popup_player">Popup-Player</string>
     <string name="always_ask_player">Immer fragen</string>
-    
     <string name="preferred_player_fetcher_notification_title">Informationen werden abgerufen…</string>
     <string name="preferred_player_fetcher_notification_message">Gewünschten Inhalt laden</string>
-<string name="import_data_title">Datenbank importieren</string>
+    <string name="import_data_title">Datenbank importieren</string>
     <string name="export_data_title">Datenbank exportieren</string>
     <string name="import_data_summary">Überschreibt deinen aktuellen Verlauf und deine Abonnements</string>
     <string name="export_data_summary">Verlauf, Abonnements und Wiedergabelisten exportieren</string>
     <string name="no_valid_zip_file">Keine gültige ZIP-Datei</string>
     <string name="could_not_import_all_files">Warnung: Nicht alle Dateien konnten importiert werden.</string>
     <string name="override_current_data">Dies wird deine aktuellen Einstellungen überschreiben.</string>
-
     <string name="show_info">Info anzeigen</string>
-
     <string name="tab_bookmarks">Lesezeichen für Wiedergabelisten</string>
-
     <string name="controls_add_to_playlist_title">Hinzufügen zu</string>
-
     <string name="detail_drag_description">Zum Neuordnen ziehen</string>
-
     <string name="create">Erstellen</string>
     <string name="delete_one">Einen löschen</string>
     <string name="delete_all">Alle löschen</string>
     <string name="rename">Umbenennen</string>
-
     <string name="delete_stream_history_prompt">Möchtest du dieses Element aus dem Wiedergabeverlauf löschen?</string>
     <string name="delete_all_history_prompt">Bist du sicher, dass du alle Elemente aus dem Verlauf löschen möchtest?</string>
     <string name="title_last_played">Zuletzt wiedergegeben</string>
     <string name="title_most_played">Am häufigsten wiedergegeben</string>
-
     <string name="always_ask_open_action">Immer fragen</string>
-    
     <string name="create_playlist">Neue Wiedergabeliste</string>
     <string name="delete_playlist">Löschen</string>
     <string name="rename_playlist">Umbenennen</string>
     <string name="append_playlist">Zur Wiedergabeliste hinzufügen</string>
     <string name="set_as_playlist_thumbnail">Als Vorschaubild der Wiedergabeliste festlegen</string>
-
     <string name="unbookmark_playlist">Lesezeichen entfernen</string>
-
     <string name="delete_playlist_prompt">Diese Wiedergabeliste löschen?</string>
     <string name="playlist_creation_success">Wiedergabeliste erstellt</string>
     <string name="playlist_add_stream_success">Zur Wiedergabeliste hinzugefügt</string>
     <string name="playlist_thumbnail_change_success">Vorschaubild der Wiedergabeliste geändert.</string>
     <string name="playlist_delete_failure">Konnte Wiedergabeliste nicht löschen.</string>
-
     <string name="caption_none">Keine Untertitel</string>
-
     <string name="caption_font_size_settings_title">Schriftgröße der Untertitel</string>
     <string name="dismiss">Abbrechen</string>
     <string name="normal_caption_font_size">Normale Schriftgröße</string>
@@ -375,30 +311,24 @@
     <string name="use_inexact_seek_title">Schnelle, ungenaue Suche verwenden</string>
     <string name="use_inexact_seek_summary">Mit ungenauem Suchen kann die Abspielposition schneller erreicht werden, aber auf Kosten der Genauigkeit</string>
     <string name="file">Datei</string>
-
     <string name="invalid_directory">Verzeichnis existiert nicht</string>
     <string name="invalid_file">Die Datei existiert nicht oder die Rechte zum Lesen oder Schreiben fehlen</string>
     <string name="file_name_empty_error">Dateiname darf nicht leer sein</string>
     <string name="error_occurred_detail">Ein Fehler ist aufgetreten: %1$s</string>
-
     <string name="caption_auto_generated">Automatisch erzeugt</string>
     <string name="smaller_caption_font_size">Kleinere Schrift</string>
     <string name="larger_caption_font_size">Größere Schrift</string>
-
     <string name="enable_leak_canary_title">LeakCanary aktivieren</string>
     <string name="import_from">Import von</string>
     <string name="export_to">Export nach</string>
-
     <string name="import_ongoing">Importiere…</string>
     <string name="export_ongoing">Exportiere…</string>
-
     <string name="import_file_title">Datei importieren</string>
     <string name="previous_export">Vorheriger Export</string>
-
     <string name="import_network_expensive_warning">Beachte, dass diese Aktion das Netzwerk stark belasten kann. 
 \n 
 \nMöchtest du fortfahren?</string>
-<string name="download_thumbnail_title">Vorschaubilder laden</string>
+    <string name="download_thumbnail_title">Vorschaubilder laden</string>
     <string name="thumbnail_cache_wipe_complete_notice">Bilder-Cache gelöscht</string>
     <string name="metadata_cache_wipe_title">Zwischengespeicherte Metadaten löschen</string>
     <string name="metadata_cache_wipe_summary">Alle zwischengespeicherten Website-Daten entfernen</string>
@@ -412,29 +342,23 @@
     <string name="import_title">Import</string>
     <string name="subscriptions_import_unsuccessful">Abonnements konnten nicht importiert werden</string>
     <string name="subscriptions_export_unsuccessful">Abonnements konnten nicht exportiert werden</string>
-
     <string name="playback_speed_control">Wiedergabegeschwindigkeitsregler</string>
     <string name="playback_tempo">Geschwindigkeit</string>
     <string name="playback_pitch">Tonhöhe</string>
     <string name="unhook_checkbox">Verknüpfung aufheben (kann zu Verzerrungen führen)</string>
     <string name="playback_nightcore">Nightcore</string>
     <string name="playback_default">Standard</string>
-<string name="download_thumbnail_summary">Abschalten, um das Laden von Miniaturansichten zu verhindern, was Daten- und Speicherverbrauch spart. Änderungen löschen den Bildzwischenspeicher sowohl im Arbeitsspeicher als auch auf der Festplatte.</string>
+    <string name="download_thumbnail_summary">Abschalten, um das Laden von Miniaturansichten zu verhindern, was Daten- und Speicherverbrauch spart. Änderungen löschen den Bildzwischenspeicher sowohl im Arbeitsspeicher als auch auf der Festplatte.</string>
     <string name="auto_queue_title">Nächsten Stream automatisch einreihen</string>
     <string name="auto_queue_summary">Automatisches Anhängen eines verwandten Streams beim Abspielen des letzten Streams in einer nicht wiederholten Warteschlange.</string>
     <string name="drawer_header_action_paceholder_text">Hier wird bald etwas stehen ;D</string>
-
-
     <string name="bookmark_playlist">Wiedergabeliste mit Lesezeichen versehen</string>
     <string name="resize_fit">Anpassen</string>
     <string name="resize_fill">Füllen</string>
     <string name="resize_zoom">Vergrößern</string>
-
     <string name="enable_leak_canary_summary">Speicherlecküberwachung kann dazu führen, dass die App beim Heap-Dumping nicht mehr reagiert</string>
-
     <string name="enable_disposed_exceptions_title">Fehler außerhalb des Lebenszyklus melden</string>
     <string name="enable_disposed_exceptions_summary">Erzwingen der Meldung unzustellbarer Rx-Ausnahmen außerhalb des Lebenszyklus von Fragmenten oder Aktivitäten nach der Entsorgung</string>
-
     <string name="import_youtube_instructions">Importiere YouTube-Abonnements, indem du die Exportdatei herunterlädst: 
 \n 
 \n1. Gehe zu dieser URL: %1$s 
@@ -447,17 +371,12 @@
 \n3. Melden dich an, falls du dazu aufgefordert wirst 
 \n4. Kopiere die Profil-URL, zu der du weitergeleitet wurdest.</string>
     <string name="import_soundcloud_instructions_hint">yourID, soundcloud.com/yourid</string>
-
     <string name="no_streams_available_download">Keine Streams zum Download verfügbar</string>
-
     <string name="preferred_open_action_settings_title">Bevorzugte \'Öffnen\' Aktion</string>
     <string name="preferred_open_action_settings_summary">Standardaktion beim Öffnen von Inhalten - %s</string>
-
     <string name="caption_setting_title">Untertitel</string>
     <string name="caption_setting_description">Textgröße und Hintergrund der Untertitel im Player anpassen. Wird erst nach Neustart der App wirksam.</string>
-
     <string name="toast_no_player">Keine App zum Abspielen dieser Datei installiert</string>
-
     <string name="clear_views_history_title">Wiedergabeverlauf löschen</string>
     <string name="clear_views_history_summary">Löscht den Verlauf der abgespielten Streams</string>
     <string name="delete_view_history_alert">Den ganzen Wiedergabeverlauf löschen\?</string>
@@ -467,17 +386,15 @@
     <string name="delete_search_history_alert">Den gesamten Suchverlauf löschen\?</string>
     <string name="search_history_deleted">Suchverlauf gelöscht.</string>
     <string name="one_item_deleted">1 Element gelöscht.</string>
-
     <string name="app_license">NewPipe ist freie Copyleft-Software: Du kannst sie nach Belieben benutzen, untersuchen, mit anderen teilen und verbessern. Insbesondere kannst du sie unter den von der Free Software Foundation veröffentlichten Bedingungen der GNU General Public License, in der Version 3 der Lizenz oder (nach deiner Wahl) jeder späteren Version, weitergeben und/oder verändern.</string>
     <string name="import_settings">Möchtest du auch Einstellungen importieren?</string>
-
     <string name="privacy_policy_title">NewPipe-Datenschutzbestimmungen</string>
     <string name="privacy_policy_encouragement">Dem NewPipe-Projekt ist Datenschutz sehr wichtig. Deshalb sammelt diese App keine Daten ohne deine Zustimmung.
 \nNewPipes Datenschutzbestimmungen erklären im Detail, welche Daten beim Absenden eines Absturzberichtes verschickt und gespeichert werden.</string>
     <string name="read_privacy_policy">Datenschutzbestimmungen lesen</string>
     <string name="accept">Akzeptieren</string>
     <string name="decline">Ablehnen</string>
-<string name="start_accept_privacy_policy">Um der europäischen Datenschutz-Grundverordnung (DSGVO) gerecht zu werden, weisen wir hiermit auf NewPipe\'s Datenschutzerklärung hin. Bitte lies sie sorgfältig durch.
+    <string name="start_accept_privacy_policy">Um der europäischen Datenschutz-Grundverordnung (DSGVO) gerecht zu werden, weisen wir hiermit auf NewPipe\'s Datenschutzerklärung hin. Bitte lies sie sorgfältig durch.
 \nDu musst den Datenschutzrichtlinien zustimmen, um den Fehlerbericht an uns zu senden.</string>
     <string name="limit_data_usage_none_description">Unbegrenzt</string>
     <string name="limit_mobile_data_usage_title">Auflösung bei Verwendung mobiler Daten begrenzen</string>
@@ -486,11 +403,9 @@
     <string name="minimize_on_exit_none_description">Keine</string>
     <string name="minimize_on_exit_background_description">Zum Hintergrund-Player minimieren</string>
     <string name="minimize_on_exit_popup_description">Zum Popup-Player minimieren</string>
-
-<string name="skip_silence_checkbox">Vorspulen während der Stille</string>
+    <string name="skip_silence_checkbox">Vorspulen während der Stille</string>
     <string name="playback_step">Schritt</string>
     <string name="playback_reset">Zurücksetzen</string>
-
     <string name="channels">Kanäle</string>
     <string name="playlists">Wiedergabelisten</string>
     <string name="tracks">Titel</string>

From b7667ce97a5f78c3cce019e73031e82ed055fbaa Mon Sep 17 00:00:00 2001
From: Nathan Follens <nthn@unseen.is>
Date: Sun, 10 Mar 2019 15:32:07 +0000
Subject: [PATCH 017/138] Translated using Weblate (Flemish)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-nl-rBE/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 6eff6b040..5fb175b3e 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -292,7 +292,7 @@
     <string name="could_not_import_all_files">Opgelet: kon niet alle bestanden importeren.</string>
     <string name="override_current_data">Dit zal uw huidige configuratie overschrijven.</string>
     <string name="kiosk">Kiosk</string>
-    <string name="trending">Trending</string>
+    <string name="trending">Populair</string>
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">Nieuw en populair</string>
     <string name="title_activity_background_player">Achtergrondspeler</string>

From fc4e007cc4879a01f477326ac4832116892be53e Mon Sep 17 00:00:00 2001
From: WaldiS <admin@sto.ugu.pl>
Date: Sat, 9 Mar 2019 16:47:42 +0000
Subject: [PATCH 018/138] Translated using Weblate (Polish)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-pl/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 27a398e60..cc4e717c7 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -208,7 +208,7 @@
     <plurals name="subscribers">
         <item quantity="one">%s subskrybent</item>
         <item quantity="few">%s subskrybentów</item>
-        <item quantity="many">%s subskrybentów</item>
+        <item quantity="many">%s subskrybenci</item>
     </plurals>
     <plurals name="views">
         <item quantity="one">%s odtworzenie</item>
@@ -356,7 +356,7 @@
 \n
 \nCzy chcesz kontynuować?</string>
     <string name="playback_speed_control">Kontrola prędkości odtwarzania</string>
-    <string name="playback_tempo">Tempo</string>
+    <string name="playback_tempo">Czas</string>
     <string name="playback_pitch">Wysokość dźwięku</string>
     <string name="import_soundcloud_instructions_hint">twojeID, soundcloud.com/yourid</string>
     <string name="unhook_checkbox">Odłącz (może powodować zniekształcenia)</string>

From 70238fd77300f2a811644f0ac437c3353a99e39e Mon Sep 17 00:00:00 2001
From: Olexandr Nesterenko <olexn@ukr.net>
Date: Sun, 10 Mar 2019 13:27:35 +0000
Subject: [PATCH 019/138] Translated using Weblate (Ukrainian)

Currently translated at 98.4% (436 of 443 strings)
---
 app/src/main/res/values-uk/strings.xml | 168 +++++++++++--------------
 1 file changed, 76 insertions(+), 92 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index eaca5719a..81e25e7be 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -16,12 +16,9 @@
     <string name="screen_rotation">обертання</string>
     <string name="use_external_video_player_title">Зовнішній відео-програвач</string>
     <string name="use_external_audio_player_title">Зовнішній авдіопрогравач</string>
-
     <string name="download_path_title">Шлях для завантаження відеозапису</string>
     <string name="download_path_dialog_title">Вкажіть шлях для завантаження відеозаписів</string>
-
     <string name="download_path_audio_dialog_title">Вкажіть шлях для завантаження авдіофайлів</string>
-
     <string name="download_path_summary">Шлях де зберігатимуться завантажені відеозаписи</string>
     <string name="download_path_audio_title">Тека для завантаженого аудіо</string>
     <string name="download_path_audio_summary">Завантажені авдіофайли зберігатимуться тут</string>
@@ -37,7 +34,6 @@
     <string name="theme_title">Тема</string>
     <string name="dark_theme_title">Темна</string>
     <string name="light_theme_title">Світла</string>
-
     <string name="download_dialog_title">Завантажити</string>
     <string name="next_video_title">Наступний відеозапис</string>
     <string name="show_next_and_similar_title">Являти \"наступні\" й \"схожі\" відео</string>
@@ -51,9 +47,8 @@
     <string name="storage_permission_denied">У доступі відмовлено</string>
     <string name="content">Контент</string>
     <string name="show_age_restricted_content_title">Контент з віковими обмеженнями</string>
-    <string name="video_is_age_restricted">Показувати відеозаписи, які мають вікові обмеження. Спершу активуйте опцію для програвання таких записів у \"налаштуваннях\".</string>
+    <string name="video_is_age_restricted">Показувати відеозаписи, які мають вікові обмеження. Спершу активуйте опцію для програвання таких записів у налаштуваннях.</string>
     <string name="duration_live">НАЖИВО</string>
-
     <string name="general_error">Помилка</string>
     <string name="network_error">Помилка мережі</string>
     <string name="could_not_load_thumbnails">Не вдалося завантажити всі ескізи</string>
@@ -73,7 +68,6 @@
     <string name="what_happened_headline">Що сталося:</string>
     <string name="main_bg_subtitle">Натисніть на пошук аби почати</string>
     <string name="black_theme_title">Чорна</string>
-
     <string name="downloads">Завантаження</string>
     <string name="downloads_title">Завантаження</string>
     <string name="error_report_title">Звіт про помилку</string>
@@ -82,13 +76,10 @@
     <string name="yes">Так</string>
     <string name="later">Пізніше</string>
     <string name="disabled">Вимкнено</string>
-
     <string name="could_not_load_image">Не вдалося завантажити зображення</string>
     <string name="app_ui_crash">Застосунок/інтерфейс зазнав краху</string>
     <string name="your_comment">Ваш коментар (англійською):</string>
     <string name="error_details_headline">Деталі:</string>
-
-
     <string name="list_thumbnail_view_description">Ескіз попереднього перегляду відео</string>
     <string name="detail_thumbnail_view_description">Ескіз попереднього перегляду відео</string>
     <string name="use_tor_title">Використовувати Tor</string>
@@ -96,7 +87,6 @@
     <string name="report_error">Повідомити про помилку</string>
     <string name="err_dir_create">Не вдалося створити теку для завантаження \'%1$s\'</string>
     <string name="info_dir_created">Створити теку для завантаження \'%1$s\'</string>
-
     <string name="video">Відео</string>
     <string name="audio">Аудіо</string>
     <string name="retry">Повторити</string>
@@ -104,13 +94,11 @@
     <string name="short_thousand">т</string>
     <string name="short_million">млн</string>
     <string name="short_billion">мрд</string>
-
     <string name="start">Почати</string>
     <string name="pause">Павза</string>
     <string name="view">Відтворити</string>
     <string name="delete">Видалити</string>
     <string name="checksum">Контрольна сума</string>
-
     <string name="finish">ОК</string>
     <string name="msg_name">Назва файлу</string>
     <string name="msg_threads">Гілки</string>
@@ -122,8 +110,7 @@
     <string name="msg_wait">Будь ласка, зачекайте…</string>
     <string name="msg_copied">Копійовано до сховку</string>
     <string name="no_available_dir">Будь ласка, оберіть теку для завантаження</string>
-
-<string name="no_player_found_toast">Потокового програвача не знайдено (ви можете встановити VLC для відтворення).</string>
+    <string name="no_player_found_toast">Потокового програвача не знайдено (ви можете встановити VLC для відтворення).</string>
     <string name="open_in_popup_mode">Відкрити у віконному режимі</string>
     <string name="use_external_video_player_summary">Усувається звук ПЕВНИХ роздільностей</string>
     <string name="popup_mode_share_menu_title">NewPipe у віконному режимі</string>
@@ -132,15 +119,11 @@
     <string name="channel_unsubscribed">Ви відписалися від каналу</string>
     <string name="subscription_change_failed">Неможливо змінити підписання</string>
     <string name="subscription_update_failed">Неможливо оновити підписання</string>
-
     <string name="tab_main">Головна</string>
     <string name="tab_subscriptions">Підписання</string>
-
     <string name="fragment_whats_new">Новинки</string>
-
     <string name="controls_background_title">На тлі</string>
     <string name="controls_popup_title">У вікні</string>
-
     <string name="default_popup_resolution_title">Типова роздільна здатність вікна</string>
     <string name="show_higher_resolutions_summary">Не всі пристрої підтримують відтворення 2K/4K відеозаписи</string>
     <string name="show_higher_resolutions_title">Вищі роздільні здатності</string>
@@ -177,16 +160,12 @@
     <string name="play_all">Грати всі</string>
     <string name="always">Завжди</string>
     <string name="just_once">Тільки тепер</string>
-
     <string name="notification_channel_name">NewPipe сповіщення</string>
     <string name="notification_channel_description">"Сповіщення для NewPipe-ових тлового і віконного програвачів "</string>
-
     <string name="unknown_content">[Невідомо]</string>
-
     <string name="switch_to_background">Перемкнутися до тла</string>
     <string name="switch_to_popup">Перемкнутися до вікна</string>
     <string name="switch_to_main">Перемкнутися на головну</string>
-
     <string name="import_data_title">Імпортувати базу</string>
     <string name="export_data_title">Експортувати базу</string>
     <string name="import_data_summary">Перепише поточну історію та підписки</string>
@@ -196,23 +175,19 @@
     <string name="invalid_url_toast">Помилкова URL</string>
     <string name="video_streams_empty">Відеостримів не знайдено</string>
     <string name="audio_streams_empty">Не знайдено аудіопотоків</string>
-
     <string name="user_report">Звіт користувача</string>
     <string name="no_subscribers">Без підписників</string>
     <string name="no_videos">Немає відео</string>
     <string name="msg_url_malform">Помилкова URL або інтернет недоступний</string>
     <string name="msg_popup_permission">Цей дозвіл має бути відкритим 
 \nу вікні</string>
-
     <string name="reCaptchaActivity">«reCAPTCHA»</string>
     <string name="settings_category_downloads_title">Завантаження</string>
     <string name="settings_file_charset_title">Допустимі символи у назвах файлів</string>
     <string name="settings_file_replacement_character_summary">"Неправильні символи коригуватимуться цим "</string>
     <string name="settings_file_replacement_character_title">Символ заміни</string>
-
     <string name="charset_letters_and_digits">Літери та цифри</string>
     <string name="charset_most_special_characters">Більш специфічні символи</string>
-
     <string name="title_activity_about">Про NewPipe</string>
     <string name="action_settings">Налаштування</string>
     <string name="action_about">Візитівка</string>
@@ -230,20 +205,15 @@
     <string name="new_and_hot">Новинки</string>
     <string name="play_queue_stream_detail">Деталі</string>
     <string name="play_queue_audio_settings">Звукові налаштування</string>
-
     <string name="video_player">Відеопрогравач</string>
     <string name="background_player">Тловий програвач</string>
     <string name="popup_player">Віконний програвач</string>
-    
     <string name="preferred_player_fetcher_notification_title">Отримую інформацію…</string>
     <string name="preferred_player_fetcher_notification_message">Завантажується запитаний контент</string>
-<string name="controls_download_desc">Завантажити потоковий файл</string>
+    <string name="controls_download_desc">Завантажити потоковий файл</string>
     <string name="show_info">Показати інформацію</string>
-
     <string name="tab_bookmarks">Закладкові плейлисти</string>
-
     <string name="controls_add_to_playlist_title">Додати до</string>
-
     <string name="show_hold_to_append_summary">Показувати підказку коли натиснута кнопка тла або вікна на сторінці інформації відеозапису</string>
     <string name="toggle_orientation">Перемкнути орієнтацію</string>
     <string name="player_unrecoverable_failure">Фатальна помилка програвача</string>
@@ -254,44 +224,37 @@
     <string name="detail_dislikes_img_view_description">Не сподобалося</string>
     <string name="search_no_results">Нічого не знайдено</string>
     <string name="detail_drag_description">Перетягніть для зміни сортування</string>
-
     <plurals name="subscribers">
-	<item quantity="one">%s підписник</item>
-	<item quantity="few">%s підписники</item>
-	<item quantity="many">n &gt; 1</item>
-</plurals>
-
+        <item quantity="one">%s підписник</item>
+        <item quantity="few">%s підписники</item>
+        <item quantity="many">n &gt; 1</item>
+    </plurals>
     <plurals name="videos">
-	<item quantity="one">%s відеозапис</item>
-	<item quantity="few">%s відеозаписи</item>
-	<item quantity="many">%s відеозаписів</item>
-</plurals>
-
+        <item quantity="one">Відеозапис</item>
+        <item quantity="few">Відеозаписи</item>
+        <item quantity="many">Відеозаписів</item>
+    </plurals>
     <string name="create">Створити</string>
     <string name="delete_one">Видалення одного</string>
     <string name="delete_all">Видалити всі</string>
     <string name="dismiss">Відхилити</string>
     <string name="rename">Змінити назву</string>
-
     <string name="title_licenses">Сторонні ліцензії</string>
     <string name="action_open_website">Перейти до сайту</string>
     <string name="tab_about">Візитівка</string>
     <string name="app_description">Вільний та легковагий стримінґ для Андроїду.</string>
     <string name="contribution_encouragement">Які б не були Ваші ідеї: переклад, дизайн, легкий чи глобальний рефакторинґ - будь-яка допомога завжди у нагоді. Що більше зроблено, то ліпшим NewPipe стає!</string>
-<string name="settings_category_debug_title">Усунення вад</string>
+    <string name="settings_category_debug_title">Усунення вад</string>
     <string name="empty_subscription_feed_subtitle">Нічого нема</string>
-
     <string name="no_views">Перегляди відсутні</string>
     <plurals name="views">
-	<item quantity="one">%s перегляд</item>
-	<item quantity="few">%s переглядів</item>
-	<item quantity="many">%s переглядів</item>
-</plurals>
-
+        <item quantity="one">%s перегляд</item>
+        <item quantity="few">%s перегляди</item>
+        <item quantity="many">%s переглядів</item>
+    </plurals>
     <string name="add">Нове завдання</string>
     <string name="reCaptcha_title">Виклик reCAPTCHA</string>
     <string name="recaptcha_request_toast">Запит на виклик reCAPTCHA</string>
-
     <string name="copyright" formatted="true">© %1$s by %2$s under %3$s</string>
     <string name="tab_contributors">Учасники</string>
     <string name="donation_encouragement">NewPipe розроблений добровольцями, які витрачають власний час заради вашого задоволення. Допоможіть розробникам зробити NewPipe ще ліпшим, насолоджуючись філіжанкою кави.</string>
@@ -299,8 +262,6 @@
     <string name="website_encouragement">Завітайте на офіційний сайт, аби отримати більше інформацій та новин.</string>
     <string name="app_license_title">Ліцензія NewPipe</string>
     <string name="read_full_license">Прочитати ліцензію</string>
-
-
     <string name="title_history_search">Історія пошуку</string>
     <string name="title_history_view">Переглянуто</string>
     <string name="history_disabled">Історію вимкнено</string>
@@ -312,7 +273,6 @@
     <string name="delete_all_history_prompt">Чи ви впевнені, що хочете видали всі елементи з історії\?</string>
     <string name="title_last_played">Програвалося останнім</string>
     <string name="title_most_played">Програвалося найбільше</string>
-
     <string name="main_page_content">Контент на головній сторінці</string>
     <string name="blank_page_summary">Порожня сторінка</string>
     <string name="kiosk_page_summary">Kiosk</string>
@@ -325,7 +285,6 @@
     <string name="no_valid_zip_file">Недійсний ZIP-файл</string>
     <string name="could_not_import_all_files">Увага: не можливо здійснити імпортування всіх файлів.</string>
     <string name="override_current_data">Це перепише ваші поточні налаштування.</string>
-
     <string name="kiosk">Кіоски</string>
     <string name="trending">Набуває популярності</string>
     <string name="title_activity_background_player">Тловий програвач</string>
@@ -337,71 +296,52 @@
     <string name="start_here_on_main">Розпочати відтворення звідси</string>
     <string name="start_here_on_background">Розпочати звідси у тловому програвачеві</string>
     <string name="start_here_on_popup">Розпочати відтворення у вікні звідси</string>
-
     <string name="drawer_open">Відкрити шухляду</string>
     <string name="drawer_close">Закрити шухляду</string>
     <string name="drawer_header_action_paceholder_text">Незабаром тут щось буде ;D</string>
-
-
     <string name="always_ask_open_action">Завжди питати</string>
-    
     <string name="create_playlist">Новий плейлист</string>
     <string name="delete_playlist">Видалити</string>
     <string name="rename_playlist">Змінити назву</string>
     <string name="playlist_name_input">Назва</string>
     <string name="append_playlist">Додати до плейлиста</string>
     <string name="set_as_playlist_thumbnail">Установити як ескіз плейлиста</string>
-
     <string name="bookmark_playlist">Додати плейлист до закладок</string>
     <string name="unbookmark_playlist">Усунути закладку</string>
-
     <string name="delete_playlist_prompt">Чи видалити цього плейлиста\?</string>
     <string name="playlist_creation_success">Плейлист було створено</string>
     <string name="playlist_add_stream_success">Додано до плейлиста</string>
     <string name="playlist_thumbnail_change_success">Ескіз плейлиста змінився.</string>
     <string name="playlist_delete_failure">Неможливо видалити плейлист.</string>
-
     <string name="caption_none">Субтитри відсутні</string>
-
     <string name="resize_fit">Замостити</string>
     <string name="resize_fill">Заповнити</string>
     <string name="resize_zoom">Збільшити</string>
-
     <string name="caption_auto_generated">Створено автоматичним шляхом</string>
-
     <string name="enable_leak_canary_title">Увімкнути LeakCanary</string>
     <string name="enable_leak_canary_summary">Моніторування витіків пам\'яті може призвести до нереагівності застосунку</string>
-
     <string name="enable_disposed_exceptions_title">Зазвітувати out-of-lifecycle хиби</string>
     <string name="enable_disposed_exceptions_summary">Примусове звітування про неможливість доставлення Rx винятків, які відбуваються за межами фраґменту або діяльності життєвого циклу після усунення</string>
-
-<string name="use_inexact_seek_title">Використовувати неточний пошук</string>
+    <string name="use_inexact_seek_title">Використовувати неточний пошук</string>
     <string name="use_inexact_seek_summary">Неточний пошук дозволяє програвачеві рухатися позиціями швидше, проте з меншою точністю</string>
     <string name="auto_queue_title">Додавати в чергу наступний стрим</string>
     <string name="auto_queue_summary">Автоматично додавати пов\'язаний стрим під час відтворення останнього у черзі без повторювань.</string>
-
     <string name="file">Файл</string>
-
     <string name="invalid_directory">Такої теки не існує</string>
     <string name="invalid_source">Не існує файлу/джерела контенту</string>
     <string name="invalid_file">Файл не існує, або немає дозволу на його запис або читання</string>
     <string name="file_name_empty_error">Назва файлу не може бути порожньою</string>
     <string name="error_occurred_detail">Помилка: %1$s</string>
-
     <string name="import_export_title">Імпортування/експортування</string>
     <string name="import_title">Імпортування</string>
     <string name="import_from">Імпортувати з</string>
     <string name="export_to">Експортувати до</string>
-
     <string name="import_ongoing">Імпортування…</string>
     <string name="export_ongoing">Експортування…</string>
-
     <string name="import_file_title">Імпортування файлу</string>
     <string name="previous_export">Попереднього експортування</string>
-
     <string name="subscriptions_import_unsuccessful">Неможливо імпортувати підписання</string>
     <string name="subscriptions_export_unsuccessful">Неможливо експортувати підписання</string>
-
     <string name="import_youtube_instructions">Імпортуйте Ютюбові підписання завантаженням файлу еспортування: 
 \n 
 \n1. Перейдіть за цією ланкою: %1$s 
@@ -414,12 +354,11 @@
 \n3. За запитом увійдіть до вашої обліківки 
 \n4. Скопіюйте URL профайлу, до якого вас переспрямує.</string>
     <string name="import_soundcloud_instructions_hint">вашID, soundcloud.com/вашid</string>
-
     <string name="import_network_expensive_warning">Майте на увазі: ця операція може потребувати багато трафіку.
 \n
 \nПродовжуватимете?</string>
-<string name="download_thumbnail_title">Завантажити ескізи</string>
-    <string name="download_thumbnail_summary">При вимкненому завантаженні ескізів, заощадується трафік та внутрішня пам\'ять. Зміни призведуть очищення кешу зображень.</string>
+    <string name="download_thumbnail_title">Завантажити ескізи</string>
+    <string name="download_thumbnail_summary">Вимкніть завантаженні ескізів, заощаджується трафік та внутрішня пам\'ять. Зміни призведуть очищення кешу зображень.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Кеш зображень стерто</string>
     <string name="metadata_cache_wipe_title">Стерти кеш метаданих</string>
     <string name="metadata_cache_wipe_summary">"Усунути всі кешовані дані вебсторінки "</string>
@@ -428,16 +367,12 @@
     <string name="playback_tempo">Темп</string>
     <string name="playback_pitch">Тон</string>
     <string name="unhook_checkbox">Від\'єднати (може спричинити спотворення)</string>
-<string name="no_streams_available_download">Стрими недоступні для завантаження</string>
-
+    <string name="no_streams_available_download">Стрими недоступні для завантаження</string>
     <string name="preferred_open_action_settings_title">Переважний спосіб \"відкриття\"</string>
     <string name="preferred_open_action_settings_summary">Типова дія під час відкриття вмісту — %s</string>
-
     <string name="caption_setting_title">Субтитри</string>
     <string name="caption_setting_description">Змінення маштабу субтитрового тексту та тлових стилів. Увімкнення функції потребує перезавантаження застосунку.</string>
-
     <string name="toast_no_player">Не знайдено відповідного застосунку для відтворення цього файлу</string>
-
     <string name="clear_views_history_title">Очистити історію переглядів</string>
     <string name="clear_views_history_summary">Видаляє історію відтворень</string>
     <string name="delete_view_history_alert">Чи видалити всю історію переглядів\?</string>
@@ -447,10 +382,8 @@
     <string name="delete_search_history_alert">Чи видалити всю пошукову історію\?</string>
     <string name="search_history_deleted">Пошукову історію видалено.</string>
     <string name="one_item_deleted">Видалено один фрагмент.</string>
-
     <string name="app_license">"NewPipe є вільною копілефт програмою: Ви можете використовувати її, поширювати та вдосконалювати з розсудом. Зокрема ви можете перерозподіляти та/або змінювати її за умов використання GNU General Public License, опублікованою Free Software Foundation,  під 3-ю версією ліцензії, або (на ваш вибір) будь-якою пізнішою версією."</string>
     <string name="import_settings">Бажаєте імпортувати з налаштуваннями\?</string>
-
     <string name="privacy_policy_title">NewPipe\'ова політика приватності</string>
     <string name="privacy_policy_encouragement">Проєкт NewPipe дуже серйозно ставиться до вашої приватності. Тому застосунок не збирає ніяких даних без вашої згоди 
 \nПолітика приватності NewPipe пояснює у деталях, які дані було відіслано та збережено, під час відсилання крахового звіту.</string>
@@ -459,18 +392,16 @@
 \nВи маєте підтвердити її аби надіслати нам баґового звіту.</string>
     <string name="accept">Ухвалити</string>
     <string name="decline">Відхилити</string>
-<string name="limit_data_usage_none_description">Безмежно</string>
+    <string name="limit_data_usage_none_description">Безмежно</string>
     <string name="limit_mobile_data_usage_title">Обмеження якості відео (мобільний трафік)</string>
     <string name="skip_silence_checkbox">Перемотувати підчас тиші</string>
     <string name="playback_step">Крок</string>
     <string name="playback_reset">Скинути</string>
-
     <string name="minimize_on_exit_title">Зменшити при перемкненні застосунку</string>
     <string name="minimize_on_exit_summary">Дія при перемкненні до іншого застосунку з головного відеопрогравача — %s</string>
     <string name="minimize_on_exit_none_description">Жодних</string>
     <string name="minimize_on_exit_background_description">До тлового програвача</string>
     <string name="minimize_on_exit_popup_description">Зменшити до віконного програвачу</string>
-
     <string name="channels">Канали</string>
     <string name="playlists">Плейлисти</string>
     <string name="tracks">Стежки</string>
@@ -478,5 +409,58 @@
     <string name="list_view_mode">Вигляд списку</string>
     <string name="list">Список</string>
     <string name="grid">Сiтка</string>
-</resources>
-
+    <string name="unsubscribe">Відписатися</string>
+    <string name="tab_new">Нова вкладка</string>
+    <string name="tab_choose">Обрати вкладку</string>
+    <string name="volume_gesture_control_title">Жест керування гучністю</string>
+    <string name="volume_gesture_control_summary">Змінювати гучність плеєра жестами</string>
+    <string name="brightness_gesture_control_title">Жест регулювання яскравістю</string>
+    <string name="brightness_gesture_control_summary">Змінювати яскравість жестами</string>
+    <string name="settings_category_updates_title">Оновлення</string>
+    <string name="events">Події</string>
+    <string name="file_deleted">Файл видалено</string>
+    <string name="app_update_notification_channel_name">Сповіщення про оновлення</string>
+    <string name="app_update_notification_channel_description">Сповіщення про нову версію NewPipe</string>
+    <string name="download_to_sdcard_error_title">Зовнішнє сховище недоступне</string>
+    <string name="restore_defaults">Відновити на типові</string>
+    <string name="restore_defaults_confirmation">Бажаєте відновити на типові\?</string>
+    <string name="subscribers_count_not_available">Кількість підписників недоступне</string>
+    <string name="selection">Вибір</string>
+    <string name="conferences">Конференції</string>
+    <string name="updates_setting_title">Оновлення</string>
+    <string name="auto">Автоматично</string>
+    <string name="switch_view">Перемкнути вигляд</string>
+    <string name="app_update_notification_content_title">Доступна нова версія NewPipe!</string>
+    <string name="app_update_notification_content_text">Натисніть для завантаження</string>
+    <string name="missions_header_finished">Завершено</string>
+    <string name="missions_header_pending">В черзі</string>
+    <string name="paused">призупинено</string>
+    <string name="queued">додано в чергу</string>
+    <string name="post_processing">пост-обробка</string>
+    <string name="enqueue">Черга</string>
+    <string name="permission_denied">Дію заборонено системою</string>
+    <string name="download_failed">Помилка завантаження</string>
+    <string name="download_finished">Завантаження завершено</string>
+    <string name="download_finished_more">Завантажень завершено: %s</string>
+    <string name="generate_unique_name">Створення унікального імені</string>
+    <string name="overwrite">Перезаписати</string>
+    <string name="overwrite_warning">Файл з таким іменем вже існує</string>
+    <string name="download_already_running">Файл з таким іменем вже завантажується</string>
+    <string name="show_error">Показати помилку</string>
+    <string name="label_code">Код</string>
+    <string name="error_path_creation">Не можливо створити файл</string>
+    <string name="error_file_creation">Не можливо створити теку призначення</string>
+    <string name="error_permission_denied">Не надано доступу системою</string>
+    <string name="error_ssl_exception">Захищене з\'єднання не встановлено</string>
+    <string name="error_unknown_host">Сервер не знайдено</string>
+    <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_not_found">Не знайдено</string>
+    <string name="error_postprocessing_failed">Невдала пост-обробка</string>
+    <string name="clear_finished_download">Очистити завершені завантаження</string>
+    <string name="stop">Зупинити</string>
+    <string name="max_retry_msg">Максимум спроб</string>
+    <string name="max_retry_desc">Максимальна кількість спроб перед скасуванням завантаження</string>
+    <string name="pause_downloads_on_mobile">Призупиняти завантаження при переході на стільникові дані</string>
+</resources>
\ No newline at end of file

From ffa4b1483fab10a4fb5dcc30c436e1c0327f3762 Mon Sep 17 00:00:00 2001
From: Der_Floh <e-mail_platzhalter1@web.de>
Date: Sun, 10 Mar 2019 19:11:37 +0000
Subject: [PATCH 020/138] Translated using Weblate (German)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-de/strings.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 319e5e8e6..eb891dec0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,9 +2,11 @@
 <resources>
     <string name="view_count_text">%1$s Aufrufe</string>
     <string name="upload_date_text">Veröffentlicht am %1$s</string>
-    <string name="no_player_found">Keinen Streamplayer gefunden. Möchtest du VLC installieren?</string>
+    <string name="no_player_found">Keinen Streamplayer gefunden. Willst du VLC installieren\?
+\n\t</string>
     <string name="install">Installieren</string>
-    <string name="cancel">Abbrechen</string>
+    <string name="cancel">Abbrechen 
+\n</string>
     <string name="open_in_browser">Im Browser öffnen</string>
     <string name="share">Teilen</string>
     <string name="download">Download</string>
@@ -78,8 +80,8 @@
     <string name="error_snackbar_message">Entschuldigung. Es sind einige Fehler aufgetreten.</string>
     <string name="your_comment">Dein Kommentar (auf englisch):</string>
     <string name="could_not_get_stream">Konnte keinen Stream abrufen</string>
-    <string name="autoplay_by_calling_app_title">Autoplay</string>
-    <string name="autoplay_by_calling_app_summary">Spiele ein Video ab, wenn NewPipe von einer anderen App aufgerufen wurde</string>
+    <string name="autoplay_by_calling_app_title">Automatische Wiedergabe</string>
+    <string name="autoplay_by_calling_app_summary">Spielt ein Video ab, wenn NewPipe von einer anderen App aufgerufen wurde</string>
     <string name="report_error">Einen Fehler melden</string>
     <string name="user_report">Anwenderbericht</string>
     <string name="duration_live">LIVE</string>

From 716f7e722b2c2373c461bc74c4aedfe54ce1ce22 Mon Sep 17 00:00:00 2001
From: dextro67 <abhishekshah67@gmail.com>
Date: Mon, 11 Mar 2019 02:11:11 +0000
Subject: [PATCH 021/138] Translated using Weblate (Hindi)

Currently translated at 73.6% (326 of 443 strings)
---
 app/src/main/res/values-hi/strings.xml | 94 +++++---------------------
 1 file changed, 16 insertions(+), 78 deletions(-)

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index d78e37403..4d7397152 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<string name="view_count_text">%1$s दृश्य</string>
+    <string name="view_count_text">%1$s दृश्य</string>
     <string name="upload_date_text">%1$s को प्रकाशित</string>
     <string name="no_player_found">कोई स्ट्रीम प्लेयर नहीं मिला। क्या आप VLC इंस्टॉल करना चाहते हैं?</string>
     <string name="install">इंस्टॉल करें</string>
@@ -17,10 +17,8 @@
     <string name="subscribed_button_title">सदस्यता ली</string>
     <string name="channel_unsubscribed">चैनल सदस्यता रद्द करी गयी</string>
     <string name="tab_subscriptions">सदस्यता</string>
-
     <string name="controls_background_title">पीछे</string>
     <string name="controls_popup_title">पॉपअप</string>
-
     <string name="autoplay_by_calling_app_title">ऑटोप्‍ले करें</string>
     <string name="play_audio">ऑडियो</string>
     <string name="light_theme_title">हलका</string>
@@ -44,7 +42,6 @@
     <string name="app_license_title">न्यूपाइप का लाइसेंस</string>
     <string name="read_full_license">लाइसेंस पढ़ें</string>
     <string name="contribution_title">योगदान करें</string>
-
     <string name="title_activity_history">इतिहास</string>
     <string name="title_history_search">खोजा जा चूका है</string>
     <string name="title_history_view">विडियो जो देख लिए गए है</string>
@@ -63,19 +60,15 @@
     <string name="use_external_video_player_summary">कुछ रेसोल्युशनस में नहीं आएगी</string>
     <string name="use_external_audio_player_title">अन्य ऑडियो प्लेयर उपयोग करें</string>
     <string name="tab_main">मुख्य</string>
-    <string name="subscription_change_failed">सदस्यता को बदलने में असमर्थ है</string>
+    <string name="subscription_change_failed">"सदस्यता को बदलने में असमर्थ "</string>
     <string name="subscription_update_failed">सदस्यता को अपडेट करने में असमर्थ है</string>
-
     <string name="fragment_whats_new">देखे की क्या नया है</string>
-
     <string name="download_path_title">विडियो को डाउनलोड करने के लिए फाइल की जगह</string>
     <string name="download_path_summary">डाउनलोड किए गए विडियो फाइल को रखने की जगह</string>
     <string name="download_path_dialog_title">वीडियो के लिए डाउनलोड पथ दर्ज करें</string>
-
     <string name="download_path_audio_title">ऑडियो डाउनलोड फ़ोल्डर</string>
     <string name="download_path_audio_summary">डाउनलोड किये गए ऑडियो यहाँ है</string>
     <string name="download_path_audio_dialog_title">ऑडियो फाइल डाउनलोड करने के लिए जगह दर्ज करें</string>
-
     <string name="autoplay_by_calling_app_summary">अन्य अप्प के द्वारा NewPipe के आह्वान पर वीडियो तुरंत चले</string>
     <string name="default_resolution_title">वीडियो का डिफ़ॉल्ट रिज़ॉल्यूशन</string>
     <string name="default_popup_resolution_title">विडियो पॉपअप का डिफ़ॉल्ट रिज़ॉल्यूशन</string>
@@ -107,7 +100,6 @@
     <string name="show_hold_to_append_summary">जब बैकग्राउंड और पॉपअप बटन विडियो के विवरण पन्ने में दबाई जाए तो tip को दिखाए</string>
     <string name="url_not_supported_toast">ये वाला URL इसमें नहीं चलेगा</string>
     <string name="content_language_title">डिफ़ॉल्ट विषय की भाषा</string>
-
     <string name="settings_category_player_title">प्लेयर</string>
     <string name="settings_category_player_behavior_title">चाल चलन</string>
     <string name="settings_category_popup_title">पॉपअप</string>
@@ -137,12 +129,9 @@
     <string name="best_resolution">बेहतर विडियो की क्वालिटी</string>
     <string name="undo">वापस जाए</string>
     <string name="play_all">सारे प्ले करे</string>
-
     <string name="notification_channel_name">NewPipe की अधिसूचना</string>
     <string name="notification_channel_description">NewPipe के बैकग्राउंड में चल रहे विडियो और पॉपअप विडियो के लिए अधिसूचना</string>
-
     <string name="unknown_content">[नहीं जानते]</string>
-
     <string name="general_error">त्रुटी</string>
     <string name="network_error">नेटवर्क में त्रुटी</string>
     <string name="could_not_load_thumbnails">सारे thumbnail(फोटो जो फ़ोन की मेमोरी में है ) भरे नहीं जा सकते</string>
@@ -159,7 +148,6 @@
     <string name="player_stream_failure">इस विडियो को चलाने में असफल हुए</string>
     <string name="player_unrecoverable_failure">कभी ठीक न होने वाले विडियो प्लेयर की त्रुटी आ रही है</string>
     <string name="player_recoverable_failure">विडियो प्लेयर त्रुटी से ठीक हो रहा है</string>
-
     <string name="sorry_string">खेद है की, ऐसा होना नहीं चाहिए था.</string>
     <string name="error_report_button_text">त्रुटी की रिपोर्ट को ईमेल से भेजे</string>
     <string name="error_snackbar_message">माफ़ करे , कुछ त्रुटियाँ हो रही है</string>
@@ -169,8 +157,6 @@
     <string name="info_labels">क्या:\\nमांग:\\nविषयवस्तु की भाषा:\\nसेवा:\\nजीएमटी समय:\\nपैकेज:\\nसंस्करण:\\nOS संस्करण:</string>
     <string name="your_comment">आपकी टिप्पणी:</string>
     <string name="error_details_headline">विवरण:</string>
-
-
     <string name="list_thumbnail_view_description">विडियो के thumbnail के पूर्व दर्शन</string>
     <string name="detail_thumbnail_view_description">विडियो के thumbnail के पूर्व दर्शन</string>
     <string name="detail_uploader_thumbnail_view_description">अपलोडर के thumbnail वाले फोटो</string>
@@ -182,46 +168,37 @@
     <string name="user_report">उपयोगकर्ता की रिपोर्ट</string>
     <string name="search_no_results">कोई परिणाम नहीं मिला</string>
     <string name="empty_subscription_feed_subtitle">यंहा कुछ नहीं है</string>
-
     <string name="err_dir_create">"डाउनलोड वाली डायरेक्टरी को बना नहीं सकते  \'%1$s\'"</string>
     <string name="info_dir_created">डाउनलोड की डायरेक्टरी बना दी गई है \'%1$s\'</string>
-
     <string name="video">विडियो</string>
     <string name="audio">ऑडियो</string>
     <string name="retry">फिर से कोशिश करे</string>
     <string name="storage_permission_denied">स्टोरेज में प्रवेश के लिए अनुमति नहीं मिली</string>
     <string name="use_old_player_title">पुराना विडियो प्लेयर प्रयोग करे</string>
     <string name="use_old_player_summary">पुराना Mediaframework Player जो फ़ोन में बना हुआ है</string>
-
     <string name="short_thousand">हज़ार</string>
     <string name="short_million">करोड़</string>
     <string name="short_billion">अरब</string>
-
     <string name="no_subscribers">कोई भी सदस्य नहीं है</string>
     <plurals name="subscribers">
-	<item quantity="one">%s सदस्य</item>
-	<item quantity="other">%s सदस्यो</item>
-</plurals>
-
+        <item quantity="one">%s सदस्य</item>
+        <item quantity="other">%s सदस्यो</item>
+    </plurals>
     <plurals name="views">
-	<item quantity="one">%s दर्शक</item>
-	<item quantity="other">%s दर्शके</item>
-</plurals>
-
+        <item quantity="one">%s दर्शक</item>
+        <item quantity="other">%s दर्शके</item>
+    </plurals>
     <plurals name="videos">
-	<item quantity="one">%s विडियो</item>
-	<item quantity="other">%s वीडियो</item>
-</plurals>
-
+        <item quantity="one">%s विडियो</item>
+        <item quantity="other">%s वीडियो</item>
+    </plurals>
     <string name="start">शुरू</string>
     <string name="pause">रोके</string>
     <string name="view">चलाये</string>
     <string name="delete">मिटाए</string>
     <string name="checksum">checksum</string>
-
     <string name="add">नया मिशन</string>
     <string name="finish">ठीक है</string>
-
     <string name="msg_name">फाइल का नाम</string>
     <string name="msg_threads">मेसेज के thread</string>
     <string name="msg_error">त्रुटी</string>
@@ -234,26 +211,21 @@
     <string name="msg_copied">क्लिपबोर्ड पर कॉपी हो गया है</string>
     <string name="no_available_dir">कृपया उपलब्ध डाउनलोड फोल्डर को चुने</string>
     <string name="msg_popup_permission">पॉपअप के तरीके में खोलने के लिए अनुमति की जरुरत है</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">reCAPTCHA चुनोती</string>
     <string name="recaptcha_request_toast">reCAPTCHA चुनोती के लिए निवेदन</string>
-
     <string name="settings_category_downloads_title">डाउनलोड</string>
     <string name="settings_file_charset_title">फाइल के नाम के लिए आवश्यक characters(जैसे - १२३, abc) की अनुमति है</string>
     <string name="settings_file_replacement_character_summary">अमान्य characters इस value से बदल जायेंगे</string>
     <string name="settings_file_replacement_character_title">रिप्लेसमेंट करैक्टर</string>
-
     <string name="charset_letters_and_digits">वर्ण और अंक</string>
     <string name="charset_most_special_characters">विशेष वर्ण</string>
-
     <string name="copyright" formatted="true">%2$s के द्वारा © %1$s जो %3$s के अधीन आते है</string>
     <string name="error_unable_to_load_license">लाइसेंस load नहीं हो रहा</string>
     <string name="tab_contributors">सहयोगकर्ता</string>
     <string name="app_description">एंड्राइड के लिए हल्का और मुफ्त स्ट्रीमिंग एप्लिकेशन|</string>
     <string name="contribution_encouragement">अगर आपके पास कोई सुझाव हो जैसे -अनुवाद , डिजाईन में बदलाव ,code को साफ़ रखना , या फिर code में जायदा बदलाव लाना हो तो - साहयता के लिए आपका स्वागत है . जितना ज्यादा होगा उतना बेहतर होगा !</string>
     <string name="delete_item_search_history">क्या आप इसको खोज इतिहास के मिटाना चाहते है ?</string>
-
     <string name="main_page_content">मुख्य पेज की विषयवस्तु</string>
     <string name="blank_page_summary">खाली पन्ना</string>
     <string name="kiosk_page_summary">kiosk पन्ना</string>
@@ -263,7 +235,6 @@
     <string name="select_a_channel">चैनल को चुने</string>
     <string name="no_channel_subscribed_yet">अभी तक किसी भी चैनल के सदस्य नहीं है</string>
     <string name="select_a_kiosk">kiosk को चुने</string>
-
     <string name="kiosk">kiosk</string>
     <string name="top_50">टॉप 50</string>
     <string name="new_and_hot">नया और गरम</string>
@@ -277,24 +248,19 @@
     <string name="start_here_on_main">यंहा से चलाना शुरू करे</string>
     <string name="start_here_on_background">बैकग्राउंड में चलाना शुरू करे</string>
     <string name="start_here_on_popup">पॉपअप में चलाना शुरू करे</string>
-<string name="no_player_found_toast">स्ट्रीम करने के लिए प्लेयर उपलब्ध नहीं है (आप इसे चलाने के लिए VLC प्लेयर इंस्टॉल कर सकते हैं)।</string>
+    <string name="no_player_found_toast">स्ट्रीम करने के लिए प्लेयर उपलब्ध नहीं है (आप इसे चलाने के लिए VLC प्लेयर इंस्टॉल कर सकते हैं)।</string>
     <string name="controls_download_desc">स्ट्रीम डाउनलोड करें</string>
     <string name="show_info">जानकारी दिखाएं</string>
-
     <string name="tab_bookmarks">बुकमार्क किये गए प्लेलिस्टस</string>
-
     <string name="controls_add_to_playlist_title">में जोड़े</string>
-
     <string name="default_content_country_title">डिफ़ॉल्ट देश का विषय</string>
     <string name="service_title">सर्विस</string>
     <string name="always">हमेशा के लिए</string>
     <string name="just_once">सिर्फ एक बार के लिए</string>
-
     <string name="toggle_orientation">टॉगल ओरिएंटेशन</string>
     <string name="switch_to_background">बैकग्राउंड में स्विच करें</string>
     <string name="switch_to_popup">पॉपअप मोड में जाएं</string>
     <string name="switch_to_main">मुख्य पर स्विच करें</string>
-
     <string name="import_data_title">डेटाबेस आयात करें</string>
     <string name="export_data_title">डेटाबेस निर्यात करें</string>
     <string name="import_data_summary">आपके वर्तमान इतिहास और सब्सक्रिप्शन को ओवरराइड करेगा</string>
@@ -303,15 +269,12 @@
     <string name="invalid_url_toast">अमान्य URL</string>
     <string name="video_streams_empty">कोई वीडियो स्ट्रीम नहीं मिला</string>
     <string name="audio_streams_empty">कोई वीडियो स्ट्रीम नहीं मिला</string>
-
     <string name="detail_drag_description">फिर से क्रम देने के लिए खींचें</string>
-
     <string name="create">बनाइये</string>
     <string name="delete_one">एक को हटाएं</string>
     <string name="delete_all">सभी को हटाएँ</string>
     <string name="dismiss">ख़ारिज करें</string>
     <string name="rename">नाम बदलें</string>
-
     <string name="donation_title">दान करें</string>
     <string name="donation_encouragement">NewPipe स्वयंसेवकों द्वारा विकसित किया जाता है जो आपको अच्छा अनुभव देने के लिए अपना खाली समय व्यतीत करते हैं। स्वयंसेवको को मदद भेजे, ताकि वह NewPipe को और अच्छा बना सके।</string>
     <string name="give_back">वापस दे</string>
@@ -321,61 +284,48 @@
     <string name="delete_all_history_prompt">क्या आप वाकई इतिहास से सभी आइटंस हटाना चाहते हैं?</string>
     <string name="title_last_played">पिछला चलाया गया</string>
     <string name="title_most_played">अधिकतम चलाए गए</string>
-
     <string name="export_complete_toast">निर्यात पूर्ण हुआ</string>
     <string name="import_complete_toast">आयात पूर्ण हुआ</string>
     <string name="no_valid_zip_file">कोई मांय ज़िप फ़ाइल नहीं</string>
     <string name="could_not_import_all_files">चेतावनी: सभी फ़ाइलों को आयात नहीं किया जा सका।</string>
     <string name="override_current_data">यह आपके वर्तमान सेटअप को ओवरराइड करेगा ।</string>
-
     <string name="drawer_open">ड्रावर खोलें</string>
     <string name="drawer_close">ड्रावर बंद करें</string>
     <string name="drawer_header_action_paceholder_text">जल्द ही यहां पर कुछ दिखाई देगा ;D</string>
-
-
     <string name="video_player">वीडियो प्लेयर</string>
     <string name="background_player">बैकग्राउंड प्लेयर</string>
     <string name="popup_player">पॉपअप प्लेयर</string>
     <string name="always_ask_open_action">हमेशा पूछें</string>
-    
     <string name="preferred_player_fetcher_notification_title">जानकारी प्राप्त की जा रही है…</string>
     <string name="preferred_player_fetcher_notification_message">अनुरोधित सामग्री लोड कर रहे है</string>
-
     <string name="create_playlist">नई प्लेलिस्ट बनाएं</string>
     <string name="delete_playlist">प्लेलिस्ट हटाएं</string>
     <string name="rename_playlist">प्लेलिस्ट का नाम बदलें</string>
     <string name="playlist_name_input">नाम</string>
     <string name="append_playlist">प्लेलिस्ट में जोड़ें</string>
     <string name="set_as_playlist_thumbnail">प्लेलिस्ट थंबनेल के रूप में सेट करें</string>
-
     <string name="bookmark_playlist">प्लेलिस्ट बुकमार्क करें</string>
     <string name="unbookmark_playlist">बुकमार्क हटायें</string>
-
     <string name="delete_playlist_prompt">क्या आप इस प्लेलिस्ट को हटाना चाहते हैं?</string>
     <string name="playlist_creation_success">सूची बना दी गई</string>
     <string name="playlist_add_stream_success">प्लेलिस्ट में जोड़ा गया</string>
     <string name="playlist_thumbnail_change_success">प्लेलिस्ट का थंबनेल बदल दिया गया है</string>
     <string name="playlist_delete_failure">सूची हटाने में असफल</string>
-
     <string name="caption_none">कोई कैप्शन नहीं है</string>
-
     <string name="resize_fit">फिट</string>
     <string name="resize_fill">भरें</string>
     <string name="resize_zoom">ज़ूम करें</string>
-
     <string name="caption_font_size_settings_title">कैप्शन फ़ॉंट आकार</string>
     <string name="smaller_caption_font_size">छोटे फ़ॉंट</string>
     <string name="normal_caption_font_size">सामांय फ़ॉंट</string>
     <string name="larger_caption_font_size">बड़ा फ़ॉंट</string>
-
     <string name="toggle_leak_canary">मॉनिटर लीक</string>
     <string name="enable_leak_canary_notice">मेमोरी लीक मॉनिटरिंग सक्षम है, हीप डंपिंग के समय ऐप अप्रतिसादी हो सकती है</string>
     <string name="disable_leak_canary_notice">मेमोरी लीक मॉनिटरिंग अक्षम है</string>
-<string name="settings_category_debug_title">डीबग करें</string>
+    <string name="settings_category_debug_title">डीबग करें</string>
     <string name="caption_auto_generated">ऑटो-जनरेटेड</string>
     <string name="enable_leak_canary_title">LeakCanary सक्षम करें</string>
     <string name="enable_leak_canary_summary">हीप डंप करने के दौरान मेमोरी लीक मॉनिटरिंग ऐप को अनुत्तरदायी बना सकता है</string>
-
     <string name="enable_disposed_exceptions_title">Out-of-Lifecycle त्रुटियों की रिपोर्ट करें</string>
     <string name="download_thumbnail_title">छायाप्रारुप लोड करें</string>
     <string name="use_inexact_seek_title">तेजी से अचूक तलाश का प्रयोग करें</string>
@@ -388,7 +338,6 @@
     <string name="auto_queue_title">अगली स्ट्रीम को स्वचालित रूप से जोड़ें</string>
     <string name="auto_queue_summary">गैर-दोहराने वाली कतार में अंतिम स्ट्रीम चलाते समय संबंधित स्ट्रीम को स्वतः संलग्न करें</string>
     <string name="file">फाइल</string>
-
     <string name="channels">चेनल्स</string>
     <string name="playlists">सूची</string>
     <string name="tracks">ट्रेक</string>
@@ -407,48 +356,36 @@
     <string name="file_name_empty_error">फ़ाइल का नाम खाली नहीं हो सकता</string>
     <string name="error_occurred_detail">एक भूल हुई: %1$s</string>
     <string name="no_streams_available_download">डाउनलोड करने के लिए कोई स्ट्रीम उपलब्ध नही है</string>
-
     <string name="one_item_deleted">एक चीज़ साफ कर दी गई।</string>
-
     <string name="toast_no_player">इस फ़ाइल को चलाने के लिए कोई ऐप स्थापित नही है</string>
-
     <string name="privacy_policy_title">न्यूपाइप की गोपनीयता नीति</string>
     <string name="privacy_policy_encouragement">न्यूपाइप परियोजना आपकी गोपनीयता को बहोत गंभीर रूप से लेता है। इसलिए, ऐप आपकी अनुमति के बिना कोई डेटा जमा नही करता। 
 \nन्यूपाइप की गोपनीयता नीति विस्तार से समज़ाती है कि कोनसा डेटा भेजा या संग्रह किया जाता है जब आप क्रेश विवरण भेजते है।</string>
     <string name="read_privacy_policy">गोपनीयता नीति पढ़े</string>
     <string name="import_settings">क्या आप सेटिंग्स भी आयात करना चाहते है?</string>
-
     <string name="preferred_open_action_settings_title">पसंदीदा \'खोलने पर\' करवाई</string>
     <string name="preferred_open_action_settings_summary">सामग्री खोलते समय डिफ़ॉल्ट कारवाही — %s</string>
-
     <string name="caption_setting_title">केप्सन</string>
     <string name="caption_setting_description">प्लेयर केप्शन के शब्दों का परिमाण और पृष्ठभूमि शैलियो को बदले। लागू करने के लिए ऐप को पुनः प्रारम्भ करना जरूरी है।</string>
-
     <string name="import_export_title">आयात/निर्यात</string>
     <string name="import_title">आयात</string>
     <string name="import_from">से आयात करे</string>
     <string name="export_to">पर निर्यात करे</string>
-
     <string name="import_ongoing">आयात किया जा रहा है…</string>
     <string name="export_ongoing">निर्यात किया जा रहा है…</string>
-
     <string name="import_file_title">फाइल आयात करे</string>
     <string name="previous_export">पहले वाला निर्यात</string>
-
     <string name="subscriptions_import_unsuccessful">सब्सक्रिप्शन आयात नही कर सके</string>
     <string name="subscriptions_export_unsuccessful">सब्सक्रिप्शन निर्यात नही कर सके</string>
-
     <string name="import_youtube_instructions">निर्यात की गई फाइल को डाउनलोड करके यूट्यूब सब्सक्रिप्शन को आयात करे:
 \n
 \n1. इस URL पर जाए: %1$s
 \n2. जब कहा जाए, लॉगिन करे
 \n3. एक डाउनलोड शुरू होना चाहिए (यही निर्यात की गई फाइल है)</string>
     <string name="import_soundcloud_instructions_hint">आपका आई डी, soundcloud.com/yourid</string>
-
     <string name="import_network_expensive_warning">ध्यान रखे, यह तरीका नेटवर्क साधनो के लिए मंहगा हो सकता है।
 \n
 \nक्या आप आगे बढ़ना चाहते है?</string>
-
     <string name="playback_speed_control">चलाने की गति के नियंत्रण</string>
     <string name="playback_tempo">गति</string>
     <string name="playback_pitch">ऊंचाई</string>
@@ -456,10 +393,8 @@
     <string name="skip_silence_checkbox">खामोशी के समय तेज़ी से आगे बढ़े</string>
     <string name="playback_step">कदम</string>
     <string name="playback_reset">रिसेट</string>
-
     <string name="accept">स्वीकारे</string>
     <string name="decline">अस्वीकार करे</string>
-
     <string name="limit_data_usage_none_description">असीमित</string>
     <string name="limit_mobile_data_usage_title">मोबाइल डेटा उपयोग करते समय रेसॉल्युसेन मर्यादित करे</string>
     <string name="minimize_on_exit_title">ऐप बदलते समय मिनिमाइज करे</string>
@@ -468,4 +403,7 @@
     <string name="minimize_on_exit_background_description">पृष्ठभूमि प्लेयर जैसे मिनिमाइज करे</string>
     <string name="minimize_on_exit_popup_description">पॉप अप प्लेयर जैसे मिनिमाइज करे</string>
     <string name="app_license">न्यूपाइप एक काॅपीलेफ़्ट फ़्री साॅफ़्टवेर है: इसे आप अपनी इच्छा के अनुसार इस्तेमाल, जाँच, बाँट तथा और बेहतर बना सकते है। खास तौर पर आप इसे फ़्री साॅफ़्टवेर फ़ाउंडेशन के द्वारा जारी जीएनयू जनरल पब्लिक लाइसेंस के तीसरे या उसके बाद आने वाले कोई भी वर्णन के शर्तों के मुताबिक फिर से बाँट या बदल सकते हैं।</string>
+    <string name="unsubscribe">सदस्यता वापस ले ली</string>
+    <string name="tab_new">नया टॅब</string>
+    <string name="tab_choose">टॅब चुने</string>
 </resources>
\ No newline at end of file

From d8746dc5926aab25fa56095f2f5f4ee71b6cc2ba Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Thu, 14 Mar 2019 09:20:37 +0100
Subject: [PATCH 022/138] hotfix decrypt function and move on to version
 v0.16.1

---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 28a4861f4..3b1b8b4f9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 720
-        versionName "0.16.0"
+        versionCode 730
+        versionName "0.16.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -57,7 +57,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:8de53111d9'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:e072bf6461b295'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'

From 48f966e7db3e240622fd118270c32c7237b51938 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Thu, 14 Mar 2019 09:24:02 +0100
Subject: [PATCH 023/138] add changelog for 730

---
 fastlane/metadata/android/en-US/changelogs/730.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/730.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/730.txt b/fastlane/metadata/android/en-US/changelogs/730.txt
new file mode 100644
index 000000000..c317f53d2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/730.txt
@@ -0,0 +1,2 @@
+# Fixed
+- Hot fix decrypt function error again.

From 8b86f9ea6d75a7f0f9b7fa996d92096503426cde Mon Sep 17 00:00:00 2001
From: Gontzal Manuel Pujana Onaindia <thadahdenyse@gmail.com>
Date: Thu, 14 Mar 2019 16:35:07 +0000
Subject: [PATCH 024/138] Translated using Weblate (Basque)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-eu/strings.xml | 105 ++++---------------------
 1 file changed, 16 insertions(+), 89 deletions(-)

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index f6c723bd4..d49af0961 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -29,7 +29,6 @@
     <string name="content_language_title">Edukiaren hizkuntz lehenetsia</string>
     <string name="settings_category_video_audio_title">Bideoa eta Audioa</string>
     <string name="play_btn_text">Erreproduzitu</string>
-
     <string name="list_thumbnail_view_description">Bideoaren aurreikuspen argazkitxoa</string>
     <string name="detail_thumbnail_view_description">Bideoaren aurreikuspen argazkitxoa</string>
     <string name="detail_uploader_thumbnail_view_description">Igotzailearen abatarraren iruditxoa</string>
@@ -45,20 +44,17 @@
     <string name="main_bg_subtitle">Ukitu bilaketa hasteko</string>
     <string name="download_path_audio_title">Audioa deskargatzeko karpeta</string>
     <string name="download_path_audio_dialog_title">Zehaztu audioa deskargatzeko bide-izena</string>
-
     <string name="download_path_audio_summary">Deskargatutako audioa hemen gordetzen da</string>
     <string name="autoplay_by_calling_app_title">Erreprodukzio automatikoa</string>
     <string name="autoplay_by_calling_app_summary">Bideoa abiatzen du NewPipe beste aplikazio batek deitu badu</string>
     <string name="dark_theme_title">Iluna</string>
     <string name="light_theme_title">Argia</string>
-
     <string name="settings_category_appearance_title">Itxura</string>
-<string name="open_in_popup_mode">Ireki laster-leiho moduan</string>
+    <string name="open_in_popup_mode">Ireki laster-leiho moduan</string>
     <string name="use_external_video_player_summary">Audioa kentzen du bereizmen batzuetan</string>
     <string name="popup_mode_share_menu_title">NewPipe laster-leiho modua</string>
     <string name="controls_background_title">Bigarren planoa</string>
     <string name="controls_popup_title">Laster-leihoa</string>
-
     <string name="default_popup_resolution_title">Laster-leihoaren lehenetsitako bereizmena</string>
     <string name="show_higher_resolutions_title">Erakutsi bereizmen altuagoak</string>
     <string name="show_higher_resolutions_summary">Gailu batzuk besterik ez dute onartzen 2K/4K bideoak erreproduzitzea</string>
@@ -71,7 +67,6 @@
     <string name="player_gesture_controls_summary">Erabili keinuak erreproduzigailuaren distira eta bolumena kontrolatzeko</string>
     <string name="show_search_suggestions_title">Bilaketa-iradokizunak</string>
     <string name="show_search_suggestions_summary">Erakutsi iradokizunak bilatzean</string>
-
     <string name="settings_category_popup_title">Laster-leihoa</string>
     <string name="settings_category_other_title">Besteak</string>
     <string name="popup_playing_toast">Laster-leiho moduan erreproduzitzen</string>
@@ -92,7 +87,6 @@
     <string name="clear">Garbitu</string>
     <string name="popup_resizing_indicator_title">Tamainaz aldatzen</string>
     <string name="best_resolution">Bereizmen onena</string>
-
     <string name="general_error">Errorea</string>
     <string name="network_error">Sare-errorea</string>
     <string name="could_not_load_thumbnails">Ezin izan dira iruditxo guztiak deskargatu</string>
@@ -115,35 +109,26 @@
     <string name="info_labels">Zer:\\nEskaria:\\nEdukiaren hizkuntza:\\nZerbitzua:\\nGMT Ordua:\\nPaketea:\\nBertsioa:\\nSE bertsioa:</string>
     <string name="your_comment">Zure iruzkina (Ingelesez):</string>
     <string name="error_details_headline">Xehetasunak:</string>
-
-
     <string name="report_error">Eman errore baten berri</string>
     <string name="user_report">Erabiltzaile-txostena</string>
-
     <string name="err_dir_create">Ezin izan da \'%1$s\' karpeta sortu deskargetarako</string>
     <string name="info_dir_created">\'%1$s\' karpeta sortu da deskargetarako</string>
-
     <string name="video">Bideoa</string>
     <string name="audio">Audioa</string>
     <string name="retry">Saiatu berriro</string>
     <string name="storage_permission_denied">Biltegia atzitzeko baimena ukatu da</string>
     <string name="use_old_player_title">Erabili erreproduzigailu zaharra</string>
     <string name="use_old_player_summary">Barne Media Framework erreproduzigailu zaharra</string>
-
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">MM</string>
-
     <string name="start">Hasi</string>
     <string name="pause">Pausatu</string>
     <string name="view">Jo</string>
     <string name="delete">Ezabatu</string>
     <string name="checksum">Egiaztaketa-batura</string>
-
     <string name="add">Misio berria</string>
     <string name="finish">Ados</string>
-
     <string name="msg_name">Fitxategi-izena</string>
     <string name="msg_threads">Hariak</string>
     <string name="msg_error">Errorea</string>
@@ -157,11 +142,9 @@
     <string name="no_available_dir">Aukeratu eskuragarri dagoen karpeta bat deskargetarako</string>
     <string name="msg_popup_permission">Baimen hau beharrezkoa da
 \nlaster-leiho moduan irekitzeko</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">reCAPTCHA erronka</string>
     <string name="recaptcha_request_toast">reCAPTCHA erronka eskatu da</string>
-
     <string name="title_activity_about">NewPipe aplikazioari buruz</string>
     <string name="action_settings">Ezarpenak</string>
     <string name="action_about">Honi buruz</string>
@@ -178,28 +161,22 @@
     <string name="contribution_encouragement">Ideiak, itzulpenak, diseinu aldaketak, kode garbiketak, kode aldaketa sakonak badituzu, laguntza beti da ongi etorria. Eginaz hobetzen da!</string>
     <string name="read_full_license">Irakurri lizentzia</string>
     <string name="contribution_title">Hartu parte</string>
-<string name="subscribe_button_title">Harpidetu</string>
+    <string name="subscribe_button_title">Harpidetu</string>
     <string name="subscribed_button_title">Harpidetuta</string>
     <string name="channel_unsubscribed">Kanaletik harpidetza kenduta</string>
     <string name="subscription_change_failed">Ezin izan da harpidetza aldatu</string>
     <string name="subscription_update_failed">Ezin izan da harpidetza eguneratu</string>
-
     <string name="tab_main">Nagusia</string>
     <string name="tab_subscriptions">Harpidetzak</string>
-
     <string name="fragment_whats_new">Zer dago berri</string>
-
     <string name="resume_on_audio_focus_gain_title">Jarraitu fokua irabaztean</string>
     <string name="resume_on_audio_focus_gain_summary">Jarraitu etenaldiak eta gero (adib. telefono deiak)</string>
-
     <string name="settings_category_downloads_title">Deskargatu</string>
     <string name="settings_file_charset_title">Fitxategi-izenetan baimendutako karaktereak</string>
     <string name="settings_file_replacement_character_summary">Karaktere baliogabeak balio honekin ordezkatzen dira</string>
     <string name="settings_file_replacement_character_title">Ordezko karakterea</string>
-
     <string name="charset_letters_and_digits">Hizkiak eta zenbakiak</string>
     <string name="charset_most_special_characters">Karaktere berezi gehienak</string>
-
     <string name="enable_search_history_title">Bilaketa historiala</string>
     <string name="enable_search_history_summary">Gorde bilaketak lokalki</string>
     <string name="enable_watch_history_title">Historiala eta katxea</string>
@@ -210,30 +187,24 @@
     <string name="settings_category_history_title">Historia eta cache-a</string>
     <string name="playlist">Erreprodukzio-zerrenda</string>
     <string name="undo">Desegin</string>
-
     <string name="notification_channel_description">Atzeko planoko eta laster-leihoko NewPipe erreproduzigailuen jakinarazpenak</string>
-
     <string name="search_no_results">Emaitzarik ez</string>
     <string name="empty_subscription_feed_subtitle">Kilkerrak besterik ez daude hemen</string>
-
     <string name="no_subscribers">Harpidedunik ez</string>
     <plurals name="subscribers">
-	<item quantity="one">Harpidedun %s</item>
-	<item quantity="other">%s harpidedun</item>
-</plurals>
-
+        <item quantity="one">Harpidedun %s</item>
+        <item quantity="other">%s harpidedun</item>
+    </plurals>
     <string name="no_views">Ikustaldirik ez</string>
     <plurals name="views">
-	<item quantity="one">ikustaldi %s</item>
-	<item quantity="other">%s ikustaldi</item>
-</plurals>
-
+        <item quantity="one">ikustaldi %s</item>
+        <item quantity="other">%s ikustaldi</item>
+    </plurals>
     <string name="no_videos">Bideorik ez</string>
     <plurals name="videos">
-    <item quantity="one">Bideoa</item>
-    <item quantity="other">Bideoak</item>
-</plurals>
-
+        <item quantity="one">Bideoa</item>
+        <item quantity="other">Bideoak</item>
+    </plurals>
     <string name="title_activity_history">Historiala</string>
     <string name="title_history_search">Bilatuta</string>
     <string name="title_history_view">Ikusita</string>
@@ -242,32 +213,27 @@
     <string name="history_empty">Historiala hutsik dago</string>
     <string name="history_cleared">Historiala garbitu da</string>
     <string name="item_deleted">Elementua ezabatuta</string>
-<string name="show_hold_to_append_title">Erakutsi \"mantendu eransteko\" aholkua</string>
+    <string name="show_hold_to_append_title">Erakutsi \"mantendu eransteko\" aholkua</string>
     <string name="show_hold_to_append_summary">Erakutsi aholkua bigarren planoko eta laster-leihoko botoia sakatzean bideoaren xehetasunen orrian</string>
     <string name="default_content_country_title">Lehenetsitako edukiaren herrialdea</string>
     <string name="service_title">Zerbitzua</string>
     <string name="background_player_append">Bigarren planoko erreproduzigailuaren ilaran</string>
     <string name="popup_playing_append">Laster-leiho erreproduzigailuaren ilaran</string>
     <string name="play_all">Jo denak</string>
-
     <string name="unknown_content">[Ezezaguna]</string>
-
     <string name="toggle_orientation">Txandakatu orientazioa</string>
     <string name="switch_to_background">Aldatu bigarren planora</string>
     <string name="switch_to_popup">Aldatu laster-leihora</string>
     <string name="switch_to_main">Aldatu nagusira</string>
-
     <string name="player_stream_failure">Ezin izan da jario hau erreproduzitu</string>
     <string name="player_unrecoverable_failure">Erreproduzigailuaren errore berreskuraezina gertatu da</string>
     <string name="player_recoverable_failure">Erreproduzigailuaren erroretik berreskuratzen</string>
-
     <string name="donation_title">Dohaintza</string>
     <string name="donation_encouragement">NewPipe zuri esperientziarik onena ekartzeko denbora ematen duten boluntarioek garatzen dute. Emaiezu zerbait garatzaileei NewPipe kafe bat hartzen duten bitartean hobetu ahal izan dezaten.</string>
     <string name="give_back">Egin dohaintza</string>
     <string name="website_title">Webgunea</string>
     <string name="website_encouragement">Bisitatu NewPipe webgunea informazio gehiagorako eta berriak irakurtzeko.</string>
     <string name="delete_item_search_history">Elementu hau bilaketen historialetik ezabatu nahi duzu?</string>
-
     <string name="main_page_content">Orri nagusiko edukia</string>
     <string name="blank_page_summary">Orri hutsa</string>
     <string name="kiosk_page_summary">Kioskoaren orria</string>
@@ -277,7 +243,6 @@
     <string name="select_a_channel">Hautatu kanal bat</string>
     <string name="no_channel_subscribed_yet">Ez zara inolako kanalera harpidetu oraindik</string>
     <string name="select_a_kiosk">Hautatu kiosko bat</string>
-
     <string name="kiosk">Kioskoa</string>
     <string name="trending">Joerak</string>
     <string name="top_50">Lehen 50ak</string>
@@ -293,32 +258,25 @@
     <string name="start_here_on_main">Hasi hemen erreproduzitzen</string>
     <string name="start_here_on_background">Hasi hemen bigarren planoan</string>
     <string name="start_here_on_popup">Hasi hemen laster-leihoan</string>
-
     <string name="drawer_open">"Ireki tiradera "</string>
     <string name="drawer_close">Itxi tiradera</string>
     <string name="no_player_found_toast">Ez da jarioen erreproduzigailurik aurkitu (VLC instalatu dezakezu).</string>
     <string name="always">Beti</string>
     <string name="just_once">Behin besterik ez</string>
-
     <string name="external_player_unsupported_link_type">Kanpo erreproduzigailuek ez dituzte mota honetako estekak onartzen</string>
     <string name="invalid_url_toast">URL baliogabea</string>
     <string name="video_streams_empty">Ez da bideo jariorik aurkitu</string>
     <string name="audio_streams_empty">Ez da audio jariorik aurkitu</string>
-
     <string name="video_player">Bideo erreproduzigailua</string>
     <string name="background_player">Bigarren planoko erreproduzigailua</string>
     <string name="popup_player">Laster-leiho erreproduzigailua</string>
     <string name="always_ask_player">Galdetu beti</string>
-    
     <string name="preferred_player_fetcher_notification_title">Informazioa eskuratzen…</string>
     <string name="preferred_player_fetcher_notification_message">Kargatzen eskatutako edukia</string>
-<string name="controls_download_desc">Deskargatu jario fitxategia</string>
+    <string name="controls_download_desc">Deskargatu jario fitxategia</string>
     <string name="show_info">Erakutsi informazioa</string>
-
     <string name="tab_bookmarks">Gogoko erreprodukzio-zerrendak</string>
-
     <string name="controls_add_to_playlist_title">Gehitu hona</string>
-
     <string name="use_inexact_seek_title">Erabili bilaketa azkar ez zehatza</string>
     <string name="download_thumbnail_title">Kargatu iruditxoak</string>
     <string name="thumbnail_cache_wipe_complete_notice">Irudien cache-a ezabatuta</string>
@@ -329,7 +287,6 @@
     <string name="auto_queue_summary">Gehitu erlazionatutako jario bat azken jarioa jo bitartean errepikapenik gabeko ilara batean.</string>
     <string name="settings_category_debug_title">Arazketa</string>
     <string name="file">Fitxategia</string>
-
     <string name="import_data_title">Inportatu datu-basea</string>
     <string name="export_data_title">Esportatu datu-basea</string>
     <string name="import_data_summary">Zure uneko historiala eta harpidetzak gainidazten ditu</string>
@@ -348,83 +305,60 @@
     <string name="file_name_empty_error">Fitxategi izena ezin da hutsik egon</string>
     <string name="error_occurred_detail">Errore bat gertatu da: %1$s</string>
     <string name="no_streams_available_download">Ez dago jariorik deskargatzeko eskuragarri</string>
-
     <string name="detail_drag_description">Arrastatu ordena aldatzeko</string>
-
     <string name="create">Sortu</string>
     <string name="delete_one">Ezabatu bat</string>
     <string name="delete_all">Ezabatu guztiak</string>
     <string name="dismiss">Baztertu</string>
     <string name="rename">Aldatu izena</string>
-
     <string name="one_item_deleted">Elementu 1 ezabatuta.</string>
-
     <string name="toast_no_player">Ez dago fitxategi hau erreproduzitzeko aplikaziorik instalatuta</string>
-
     <string name="delete_stream_history_prompt">Elementu hau ikusitakoen historialetik ezabatu nahi duzu?</string>
     <string name="delete_all_history_prompt">Ziur elementu guztiak ezabatu nahi dituzula historialetik?</string>
     <string name="title_last_played">Jotako azkena</string>
     <string name="title_most_played">Ikusiena</string>
-
     <string name="export_complete_toast">Esportatuta</string>
     <string name="import_complete_toast">Inportatuta</string>
     <string name="no_valid_zip_file">Ez da baliozko ZIP fitxategia</string>
     <string name="could_not_import_all_files">Ebisua: Ezin izan dira fitxategi guztiak inportatu.</string>
     <string name="override_current_data">Honek oraingo ezarpenak gainidatziko ditu.</string>
-
     <string name="drawer_header_action_paceholder_text">Laster hemen zerbait egongo da ;D</string>
-
-
     <string name="preferred_open_action_settings_title">\'Ireki\' ekintza hobetsia</string>
     <string name="preferred_open_action_settings_summary">Lehenetsitako ekintza edukia irekitzean — %s</string>
-
     <string name="always_ask_open_action">Galdetu beti</string>
-
     <string name="create_playlist">Erreprodukzio-zerrenda berria</string>
     <string name="delete_playlist">Ezabatu</string>
     <string name="rename_playlist">Aldatu izena</string>
     <string name="playlist_name_input">Izena</string>
     <string name="append_playlist">Gehitu erreprodukzio-zerrendara</string>
     <string name="set_as_playlist_thumbnail">Ezarri erreprodukzio-zerrendaren iruditxo gisa</string>
-
     <string name="bookmark_playlist">Gogoko erreprodukzio-zerrenda</string>
     <string name="unbookmark_playlist">Kendu gogokoa</string>
-
     <string name="delete_playlist_prompt">Erreprodukzio zerrenda hau ezabatu\?</string>
     <string name="playlist_creation_success">Erreprodukzio-zerrenda sortuta</string>
     <string name="playlist_add_stream_success">Erreprodukzio-zerrendatua</string>
     <string name="playlist_thumbnail_change_success">Erreprodukzio zerrendaren iruditxoa aldatuta.</string>
     <string name="playlist_delete_failure">Ezin izan da erreprodukzio-zerrenda ezabatu.</string>
-
     <string name="caption_none">Azpititulurik ez</string>
-
     <string name="resize_fit">Doitu</string>
     <string name="resize_fill">Bete</string>
     <string name="resize_zoom">Zoom</string>
-
     <string name="caption_auto_generated">Automatikoki sortuak</string>
-
     <string name="caption_setting_title">Azpitituluak</string>
     <string name="caption_setting_description">Aldatu azpitituluen testuaren eskala eta atzealdeko estiloa. Aplikazioa berrabiarazi behar da aldaketak aplikatzeko.</string>
-
     <string name="enable_leak_canary_title">Gaitu LeakCanary</string>
     <string name="enable_leak_canary_summary">Memoria galeren monitorizazioa. Aplikazioak agian ez du erantzungo memoriaren aitortza egin bitartean</string>
-
     <string name="enable_disposed_exceptions_title">Eman bizitza-ziklo kanpoko erroreen berri</string>
     <string name="import_export_title">Inportatu/esportatu</string>
     <string name="import_title">Inportatu</string>
     <string name="import_from">Inportatu hemendik</string>
     <string name="export_to">Esportatu hona</string>
-
     <string name="import_ongoing">Inportatzen…</string>
     <string name="export_ongoing">Esportatzen…</string>
-
     <string name="import_file_title">Inportatu fitxategia</string>
     <string name="previous_export">Aurreko esportazioa</string>
-
     <string name="subscriptions_import_unsuccessful">Ezin izan dira harpidetzak inportatu</string>
     <string name="subscriptions_export_unsuccessful">Ezin izan dira harpidetzak esportatu</string>
-
     <string name="import_youtube_instructions">Inporttu YouTube harpidetzak esportazio fitxategia deskargatuz:
 \n
 \n1. Joan URL honetara: %1$s
@@ -437,24 +371,20 @@
 \n3. Hasi saioa eskatzen zaizunean
 \n4. Kopiatu profilaren URL-a eraman zaizun orritik.</string>
     <string name="import_soundcloud_instructions_hint">zureID,soundcloud.com/zureid</string>
-
     <string name="import_network_expensive_warning">Eragiketa honek sarearen erabilera handia egin lezake.
 \n
 \nJarraitu nahi duzu?</string>
-
     <string name="playback_speed_control">Erreprodukzio-abiaduraren kontrolak</string>
     <string name="playback_tempo">Tempoa</string>
     <string name="playback_pitch">Tonua</string>
     <string name="unhook_checkbox">Deslotu (distortsioa sor lezake)</string>
     <string name="playback_nightcore">Nightcore</string>
     <string name="playback_default">Lehenetsia</string>
-<string name="import_settings">Ezarpenak ere inportatu nahi dituzu?</string>
-
+    <string name="import_settings">Ezarpenak ere inportatu nahi dituzu?</string>
     <string name="use_inexact_seek_summary">Bilaketa ez zehatzak posizioak azkarrago baina prezisio gutxiagoz bilatzea ahalbidetzen du</string>
     <string name="download_thumbnail_summary">Desgaitu koadro txikiak ez kargatzeko, datuak eta memoria aurreztuz. Aldaketak memoria eta diskoko irudien cache-ak garbituko ditu.</string>
     <string name="app_license">NewPipe Software Librea eta Copyleft da: Erabili, ikertu, partekatu eta hobetu dezakezu. Zehazki, elkarbanatzea eta aldatzea Free Software Foundation-ek argitaratutako GNU General Public License-ren 3. bertsioa edo berriagoren baten terminoen arabera egiteko baimena duzu.</string>
     <string name="enable_disposed_exceptions_summary">Behartu aktibitatearen bizitza ziklotik kanpo baztertu eta gero entregatu ezin diren Rx salbuespenen inguruko txostena</string>
-
     <string name="privacy_policy_title">NewPipe pribatutasun politika</string>
     <string name="privacy_policy_encouragement">NewPipe proiektuak aintzat hartzen du zure pribatutasuna. Aplikazioak ez du zure baimenik gabe daturik jasotzen.
 \nNewPipe pribatutasun politikak azaltzen du zehazki bidali eta gordetako informazioa zein den kraskatze txosten bat bidaltzen duzunean.</string>
@@ -463,20 +393,17 @@
 \nAkats txosten bat bidali ahal  izateko onartu behar duzu."</string>
     <string name="accept">Onartu</string>
     <string name="decline">Ukatu</string>
-
     <string name="limit_data_usage_none_description">Mugagabea</string>
     <string name="limit_mobile_data_usage_title">Mugatu bereizmena datu mugikorrak erabiltzean</string>
     <string name="skip_silence_checkbox">Aurreratu azkar isilunea dagoenean</string>
     <string name="playback_step">Urratsa</string>
     <string name="playback_reset">Leheneratu</string>
-
     <string name="minimize_on_exit_title">Minimizatu app-a aldatzean</string>
     <string name="minimize_on_exit_summary">Ekintza bideo erreproduzigailu nagusitik beste app batera aldatzean — %s</string>
     <string name="minimize_on_exit_none_description">Bat ere ez</string>
     <string name="minimize_on_exit_background_description">Minimizatu bigarren planoko erreproduzigailura</string>
     <string name="minimize_on_exit_popup_description">Minimizatu laster-liho erreproduzigailura</string>
-
-<string name="channels">Kanalak</string>
+    <string name="channels">Kanalak</string>
     <string name="playlists">Erreprodukzio-zerrendak</string>
     <string name="tracks">Pistak</string>
     <string name="users">Erabiltzaileak</string>
@@ -540,7 +467,7 @@
     <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">Saiakerak gehienez</string>
+    <string name="max_retry_msg">Gehienezko saiakerak</string>
     <string name="max_retry_desc">Deskarga ezeztatu aurretik saiatu beharreko aldi kopurua</string>
     <string name="pause_downloads_on_mobile">Pausatu datu mugikorretara aldatzean</string>
     <string name="pause_downloads_on_mobile_desc">Pausatu ezin daitezkeen deskargak berrekingo dira</string>

From f4fa68c390ef57ac6b76833610e1f147ebd134d6 Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Fri, 15 Mar 2019 21:36:32 +0000
Subject: [PATCH 025/138] Translated using Weblate (German)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-de/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index eb891dec0..193fde6bd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,8 +2,7 @@
 <resources>
     <string name="view_count_text">%1$s Aufrufe</string>
     <string name="upload_date_text">Veröffentlicht am %1$s</string>
-    <string name="no_player_found">Keinen Streamplayer gefunden. Willst du VLC installieren\?
-\n\t</string>
+    <string name="no_player_found">Keinen Stream-Player gefunden. Möchten Sie VLC installieren\?</string>
     <string name="install">Installieren</string>
     <string name="cancel">Abbrechen 
 \n</string>

From 26991928ae2ced159338dcf62ee5befa1598e134 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 15 Mar 2019 01:28:51 +0000
Subject: [PATCH 026/138] Translated using Weblate (Chinese (Traditional))

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-zh-rTW/strings.xml | 103 ++++-----------------
 1 file changed, 17 insertions(+), 86 deletions(-)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2d46f4516..655cd0dd6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -29,7 +29,6 @@
     <string name="theme_title">主題</string>
     <string name="dark_theme_title">灰暗</string>
     <string name="light_theme_title">明亮</string>
-
     <string name="download_dialog_title">下載</string>
     <string name="next_video_title">下一部</string>
     <string name="show_next_and_similar_title">顯示「下一部」與「相關」的影片</string>
@@ -41,7 +40,6 @@
     <string name="background_player_playing_toast">背景播放中</string>
     <string name="play_btn_text">播放</string>
     <string name="network_error">網路錯誤</string>
-
     <string name="list_thumbnail_view_description">影片預覽縮圖</string>
     <string name="detail_thumbnail_view_description">影片預覽縮圖</string>
     <string name="detail_uploader_thumbnail_view_description">發佈者的個人頭像縮圖</string>
@@ -52,10 +50,9 @@
     <string name="download_path_audio_title">音訊下載資料夾</string>
     <string name="download_path_audio_summary">已下載的音訊存放存儲在這裡\t</string>
     <string name="download_path_audio_dialog_title">輸入音訊檔案的下載路徑</string>
-
     <string name="err_dir_create">無法建立下載目錄「%1$s」</string>
     <string name="info_dir_created">已建立下載目錄「%1$s」</string>
-<string name="main_bg_subtitle">輕觸搜尋按鈕開始使用 NewPipe</string>
+    <string name="main_bg_subtitle">輕觸搜尋按鈕開始使用 NewPipe</string>
     <string name="open_in_popup_mode">以懸浮視窗開啟</string>
     <string name="use_external_video_player_summary">移除某些解析度的音訊</string>
     <string name="popup_mode_share_menu_title">NewPipe 懸浮視窗模式</string>
@@ -73,7 +70,6 @@
     <string name="player_gesture_controls_summary">使用手勢來控制播放器的亮度及音量</string>
     <string name="show_search_suggestions_title">搜尋建議</string>
     <string name="show_search_suggestions_summary">搜尋時顯示搜尋建議</string>
-
     <string name="settings_category_popup_title">懸浮視窗</string>
     <string name="popup_playing_toast">以懸浮視窗播放中</string>
     <string name="content">內容</string>
@@ -91,7 +87,6 @@
     <string name="refresh">重新整理</string>
     <string name="clear">清除</string>
     <string name="best_resolution">最佳解析度</string>
-
     <string name="popup_resizing_indicator_title">調整大小</string>
     <string name="general_error">錯誤</string>
     <string name="could_not_load_thumbnails">無法載入所有縮圖</string>
@@ -114,32 +109,24 @@
     <string name="info_labels">發生了什麼：\\n請求：\\n內容語言：\\n服務：\\nGMT 時間：\\n套件：\\n版本：\\n系統版本：</string>
     <string name="your_comment">您的留言(請用英文)：</string>
     <string name="error_details_headline">詳細資訊：</string>
-
-
     <string name="report_error">回報錯誤</string>
     <string name="user_report">使用者回報</string>
-
     <string name="video">影片</string>
     <string name="audio">音訊</string>
     <string name="retry">重試</string>
     <string name="storage_permission_denied">無法存取儲存空間</string>
     <string name="use_old_player_title">使用舊式播放器</string>
     <string name="use_old_player_summary">舊型內建 Mediaframework 播放器</string>
-
-
     <string name="short_thousand">千</string>
     <string name="short_million">百萬</string>
     <string name="short_billion">十億</string>
-
     <string name="start">開始</string>
     <string name="pause">暫停</string>
     <string name="view">播放</string>
     <string name="delete">刪除</string>
     <string name="checksum">檢查碼</string>
-
     <string name="add">新任務</string>
     <string name="finish">好</string>
-
     <string name="msg_name">檔案名稱</string>
     <string name="msg_threads">連線數</string>
     <string name="msg_error">錯誤</string>
@@ -152,25 +139,19 @@
     <string name="msg_copied">已複製至剪貼簿</string>
     <string name="no_available_dir">請選擇下載資料夾</string>
     <string name="msg_popup_permission">使用懸浮視窗模式需要此權限</string>
-
     <string name="reCaptchaActivity">reCAPTCHA 驗證</string>
     <string name="reCaptcha_title">reCAPTCHA 驗證</string>
     <string name="recaptcha_request_toast">已請求 reCAPTCHA 驗證</string>
-
     <string name="controls_popup_title">懸浮視窗</string>
-
     <string name="duration_live">直播</string>
     <string name="subscribe_button_title">訂閱</string>
     <string name="subscribed_button_title">已訂閱</string>
     <string name="channel_unsubscribed">已取消訂閱頻道</string>
     <string name="subscription_change_failed">無法更改訂閱</string>
     <string name="subscription_update_failed">無法更新訂閱</string>
-
     <string name="tab_main">主頁</string>
     <string name="tab_subscriptions">訂閱清單</string>
-
     <string name="fragment_whats_new">新鮮事</string>
-
     <string name="enable_search_history_title">搜尋紀錄</string>
     <string name="enable_search_history_summary">在本機儲存搜尋紀錄</string>
     <string name="enable_watch_history_title">歷史紀錄與快取</string>
@@ -182,36 +163,28 @@
     <string name="settings_category_history_title">歷史記錄和快取</string>
     <string name="playlist">播放清單</string>
     <string name="undo">復原</string>
-
     <string name="notification_channel_name">NewPipe 通知</string>
     <string name="notification_channel_description">NewPipe 背景播放與懸浮模式播放器的通知</string>
-
     <string name="search_no_results">沒有結果</string>
     <string name="empty_subscription_feed_subtitle">這裡空空如也</string>
-
     <string name="no_subscribers">無訂閱者</string>
     <plurals name="subscribers">
-	<item quantity="other">%s 位訂閱者</item>
-</plurals>
-
+        <item quantity="other">%s 位訂閱者</item>
+    </plurals>
     <string name="no_views">無觀看次數</string>
     <plurals name="views">
-	<item quantity="other">%s 次觀看</item>
-</plurals>
-
+        <item quantity="other">%s 次觀看</item>
+    </plurals>
     <string name="no_videos">沒有影片</string>
     <plurals name="videos">
-    <item quantity="other">影片</item>
-</plurals>
-
+        <item quantity="other">影片</item>
+    </plurals>
     <string name="settings_category_downloads_title">下載</string>
     <string name="settings_file_charset_title">檔案名稱中允許的字元</string>
     <string name="settings_file_replacement_character_summary">不符合設定的字元將會被替換為此字串</string>
     <string name="settings_file_replacement_character_title">替換為</string>
-
     <string name="charset_letters_and_digits">字母與數字</string>
     <string name="charset_most_special_characters">大部分的特殊字元</string>
-
     <string name="title_activity_about">關於 NewPipe</string>
     <string name="action_settings">設定</string>
     <string name="action_about">關於</string>
@@ -228,7 +201,6 @@
     <string name="contribution_encouragement">不管你有什麼點子——翻譯、設計、程式碼整理，或者程式碼撰寫——我們永遠歡迎你來幫忙。完成的越多，NewPipe 也會更好！</string>
     <string name="read_full_license">閱讀授權條款</string>
     <string name="contribution_title">貢獻</string>
-
     <string name="title_activity_history">歷史紀錄</string>
     <string name="title_history_search">已搜尋</string>
     <string name="title_history_view">已觀看</string>
@@ -238,7 +210,7 @@
     <string name="history_cleared">已清除歷史紀錄</string>
     <string name="item_deleted">項目已刪除</string>
     <string name="delete_item_search_history">確定要刪除此項搜尋紀錄嗎？</string>
-<string name="no_player_found_toast">找不到串流播放器（您可以安裝 VLC 播放）。</string>
+    <string name="no_player_found_toast">找不到串流播放器（您可以安裝 VLC 播放）。</string>
     <string name="show_hold_to_append_title">顯示「長按以新增」提示</string>
     <string name="default_content_country_title">預設內容國家</string>
     <string name="service_title">服務</string>
@@ -247,14 +219,11 @@
     <string name="play_all">全部播放</string>
     <string name="always">總是</string>
     <string name="just_once">僅一次</string>
-
     <string name="unknown_content">[未知]</string>
-
     <string name="toggle_orientation">切換方向</string>
     <string name="switch_to_background">切換到背景</string>
     <string name="switch_to_popup">切換到懸浮視窗</string>
     <string name="switch_to_main">切換到主介面</string>
-
     <string name="player_stream_failure">無法播放此串流</string>
     <string name="player_unrecoverable_failure">發生無法復原的播放器錯誤</string>
     <string name="player_recoverable_failure">正在從播放器錯誤中復原</string>
@@ -263,7 +232,6 @@
     <string name="invalid_url_toast">無效的 URL</string>
     <string name="video_streams_empty">找不到影片串流</string>
     <string name="audio_streams_empty">找不到音訊串流</string>
-
     <string name="donation_title">贊助</string>
     <string name="website_title">網站</string>
     <string name="import_data_title">匯入資料庫</string>
@@ -286,7 +254,6 @@
     <string name="no_valid_zip_file">無有效的 ZIP 檔案</string>
     <string name="could_not_import_all_files">警告：無法匯入所有檔案。</string>
     <string name="override_current_data">這將覆蓋您目前的設定。</string>
-
     <string name="kiosk">互動導覽</string>
     <string name="trending">動向</string>
     <string name="top_50">前 50</string>
@@ -301,109 +268,82 @@
     <string name="start_here_on_main">從這裡開始播放</string>
     <string name="start_here_on_background">當背景時從這裡開始</string>
     <string name="start_here_on_popup">懸浮視窗時從這裡開始</string>
-
     <string name="hold_to_append">長按以新增至佇列</string>
     <string name="donation_encouragement">NewPipe 由志願者所開發，他們耗費時間務求為您帶來最佳體驗。現在是時候回過頭來，讓我們的開發人員能夠在使 NewPipe 更臻完美的同時，享受一杯咖啡。</string>
     <string name="drawer_open">打開抽屜</string>
     <string name="drawer_close">關閉抽屜</string>
-
     <string name="video_player">影片播放器</string>
     <string name="background_player">背景播放器</string>
     <string name="popup_player">懸浮視窗播放器</string>
     <string name="always_ask_player">總是詢問</string>
-    
     <string name="preferred_player_fetcher_notification_title">正在取得資訊…</string>
     <string name="preferred_player_fetcher_notification_message">正在載入要求的內容</string>
-<string name="controls_download_desc">下載串流檔案</string>
+    <string name="controls_download_desc">下載串流檔案</string>
     <string name="show_info">顯示資訊</string>
-
     <string name="tab_bookmarks">書籤已加入播放清單</string>
-
     <string name="controls_add_to_playlist_title">新增至</string>
-
     <string name="detail_drag_description">拖曳以重新排序</string>
-
     <string name="create">建立</string>
     <string name="delete_one">刪除</string>
     <string name="delete_all">全部刪除</string>
     <string name="dismiss">退出</string>
     <string name="rename">重新命名</string>
-
     <string name="delete_stream_history_prompt">您是否要刪除此項觀看記錄？</string>
     <string name="delete_all_history_prompt">您確定要刪除歷史記錄中的所有項目嗎？</string>
     <string name="title_last_played">上一次播放</string>
     <string name="title_most_played">最常播放</string>
-
     <string name="always_ask_open_action">總是詢問</string>
-    
     <string name="create_playlist">新的播放清單</string>
     <string name="delete_playlist">刪除</string>
     <string name="rename_playlist">重新命名</string>
     <string name="playlist_name_input">名稱</string>
     <string name="append_playlist">新增至播放清單</string>
     <string name="set_as_playlist_thumbnail">設為播放清單縮圖</string>
-
     <string name="bookmark_playlist">將播放清單加入書籤</string>
     <string name="unbookmark_playlist">移除書籤</string>
-
     <string name="delete_playlist_prompt">刪除此播放清單？</string>
     <string name="playlist_creation_success">已建立播放清單</string>
     <string name="playlist_add_stream_success">已增至播放清單</string>
     <string name="playlist_thumbnail_change_success">播放清單縮圖已更改。</string>
     <string name="playlist_delete_failure">無法刪除播放清單。</string>
-
     <string name="caption_none">沒有字幕</string>
-
     <string name="resize_fit">合適的</string>
     <string name="resize_fill">填滿</string>
     <string name="resize_zoom">縮放</string>
-
     <string name="caption_font_size_settings_title">標題字體大小</string>
     <string name="smaller_caption_font_size">縮小字體</string>
     <string name="normal_caption_font_size">正常字體</string>
     <string name="larger_caption_font_size">加大字體</string>
-
     <string name="drawer_header_action_paceholder_text">某些東西即將在此出現 ;D</string>
-
-
     <string name="toggle_leak_canary">監測流失</string>
     <string name="enable_leak_canary_notice">啟用記憶體流失監測技術，當 heap dump 時，應用程式可能會反應遲鈍</string>
     <string name="disable_leak_canary_notice">已停用記憶體流失監測</string>
-<string name="settings_category_debug_title">除錯</string>
+    <string name="settings_category_debug_title">除錯</string>
     <string name="caption_auto_generated">自動產生</string>
     <string name="enable_leak_canary_title">啟用 LeakCanary</string>
     <string name="enable_leak_canary_summary">記憶體洩漏監測，在 heap dumping 時可能導致應用程式無法回應</string>
-
     <string name="enable_disposed_exceptions_title">報告週期不足錯誤</string>
     <string name="enable_disposed_exceptions_summary">強制報告在處理完片段或活動週期外發生的無法傳遞的 Rx 異常</string>
-
-<string name="use_inexact_seek_title">使用粗略但快速的尋找</string>
+    <string name="use_inexact_seek_title">使用粗略但快速的尋找</string>
     <string name="use_inexact_seek_summary">粗略的尋找能讓播放器以降低的精確度更快找到影片的進度位置</string>
     <string name="auto_queue_title">自動將下一部影片新增至佇列</string>
     <string name="auto_queue_summary">在非重複播放佇列中最後一個串流開始播放時，自動新增相關串流。</string>
     <string name="live_sync">同步</string>
-
     <string name="file">檔案</string>
-
     <string name="invalid_directory">無效的資料夾</string>
     <string name="invalid_source">無效的檔案/內容來源</string>
     <string name="file_name_empty_error">檔案名稱不能留空</string>
     <string name="error_occurred_detail">發生錯誤： %1$s</string>
-
     <string name="import_export_title">匯入/匯出</string>
     <string name="import_title">匯入</string>
     <string name="import_from">匯入自</string>
     <string name="export_to">匯出至</string>
-
     <string name="import_ongoing">正在匯入…</string>
     <string name="export_ongoing">正在匯出…</string>
-
     <string name="import_file_title">匯入檔案</string>
     <string name="subscriptions_import_unsuccessful">無法匯入訂閱</string>
     <string name="subscriptions_export_unsuccessful">無法匯出訂閱</string>
-
     <string name="previous_export">之前的匯出</string>
-
     <string name="invalid_file">檔案不存在或讀取或寫入權限不足</string>
     <string name="import_youtube_instructions">透過下載匯出檔來匯入您的 YouTube 訂閱： 
 \n 
@@ -411,11 +351,10 @@
 \n2. 當被提示時登入帳號
 \n3. 應該會開始下載（這就是匯出檔 ）</string>
     <string name="import_soundcloud_instructions_hint">yourID, soundcloud.com/yourid</string>
-
     <string name="import_network_expensive_warning">請記住，此操作可造成昂貴網路花費。 
 \n 
 \n您是否希望繼續？</string>
-<string name="import_soundcloud_instructions">透過輸入 URL 或您的 ID 來匯入 SoundCloud 個人設定檔： 
+    <string name="import_soundcloud_instructions">透過輸入 URL 或您的 ID 來匯入 SoundCloud 個人設定檔： 
 \n 
 \n1. 在瀏覽器中啟用「桌面模式」(該網站不適用於行動裝置) 
 \n2. 移至此網址： %1$s 
@@ -433,16 +372,12 @@
     <string name="unhook_checkbox">解除連結（可能導致失真）</string>
     <string name="playback_nightcore">Nightcore</string>
     <string name="playback_default">預設</string>
-<string name="preferred_open_action_settings_title">偏好的「開啟」動作</string>
+    <string name="preferred_open_action_settings_title">偏好的「開啟」動作</string>
     <string name="preferred_open_action_settings_summary">開啟內容時的預設動作 — %s</string>
-
     <string name="no_streams_available_download">沒有可供下載的串流</string>
-
     <string name="caption_setting_title">字幕</string>
     <string name="caption_setting_description">調整播放器字幕文字大小與背景樣式。必須重新啟動應用程式才會生效。</string>
-
     <string name="toast_no_player">未安裝可播放此檔案的應用程式</string>
-
     <string name="clear_views_history_title">清除觀看歷史</string>
     <string name="clear_views_history_summary">刪除播放過的串流歷史</string>
     <string name="delete_view_history_alert">刪除所有觀看歷史記錄？</string>
@@ -452,10 +387,8 @@
     <string name="delete_search_history_alert">刪除所有搜尋歷史記錄？</string>
     <string name="search_history_deleted">搜尋歷史已刪除。</string>
     <string name="one_item_deleted">已刪除 1 個項目。</string>
-
     <string name="app_license">NewPipe 是一個 Copyleft 的自由軟體：您可以隨意使用、研究、分享並改進它。在遵守由自由軟體基金會所發佈的 GNU 通用公共授權條款的狀況下，您可以自由地再散佈及／或修改它；授權條款預設使用第三版，但您也可以選擇更新的版本。</string>
     <string name="import_settings">您是否要同時匯入設定？</string>
-
     <string name="privacy_policy_title">NewPipe 的隱私政策</string>
     <string name="privacy_policy_encouragement">NewPipe 專案非常重視您的隱私。因此，未經您同意此程式不會收集任何資料。 
 \nNewPipe 的隱私權政策詳細說明了當您發送錯誤回報時，什麼資料會被傳送及儲存。</string>
@@ -464,18 +397,16 @@
 \n您必須接受它才能向我們發送錯誤報告。</string>
     <string name="accept">接受</string>
     <string name="decline">拒絕</string>
-<string name="limit_data_usage_none_description">沒有限制</string>
+    <string name="limit_data_usage_none_description">沒有限制</string>
     <string name="limit_mobile_data_usage_title">使用行動網路時限制解析度</string>
     <string name="minimize_on_exit_title">切換 app 時最小化</string>
     <string name="minimize_on_exit_summary">從主影片播放器切換到其他 app 時要執行的動作 — %s</string>
     <string name="minimize_on_exit_none_description">無</string>
     <string name="minimize_on_exit_background_description">最小化為背景播放器</string>
     <string name="minimize_on_exit_popup_description">最小化為彈出式播放器</string>
-
-<string name="skip_silence_checkbox">靜音時快轉</string>
+    <string name="skip_silence_checkbox">靜音時快轉</string>
     <string name="playback_step">步進</string>
     <string name="playback_reset">重設</string>
-
     <string name="channels">頻道</string>
     <string name="playlists">播放清單</string>
     <string name="tracks">軌</string>
@@ -538,10 +469,10 @@
     <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_msg">最大重試次數</string>
     <string name="max_retry_desc">在取消下載前的最大嘗試數</string>
     <string name="pause_downloads_on_mobile">切換到行動數據時暫停</string>
-    <string name="pause_downloads_on_mobile_desc">無法暫停下載，將重新開始</string>
+    <string name="pause_downloads_on_mobile_desc">無法暫停的下載將會重新開始</string>
     <string name="events">事件</string>
     <string name="conferences">會議</string>
 </resources>
\ No newline at end of file

From 065820ffa45258d19bbd2ec55badfc0418bd85a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=2E=20R=C3=BCdinger?= <Mail-an-CR@web.de>
Date: Sat, 16 Mar 2019 11:54:09 +0000
Subject: [PATCH 027/138] Translated using Weblate (German)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 193fde6bd..70759173c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="view_count_text">%1$s Aufrufe</string>
     <string name="upload_date_text">Veröffentlicht am %1$s</string>
-    <string name="no_player_found">Keinen Stream-Player gefunden. Möchten Sie VLC installieren\?</string>
+    <string name="no_player_found">Keinen Stream-Player gefunden. Möchtest Du VLC installieren\?</string>
     <string name="install">Installieren</string>
     <string name="cancel">Abbrechen 
 \n</string>

From 44e34d084e300a540427e787a8974a498d18f775 Mon Sep 17 00:00:00 2001
From: WaldiS <admin@sto.ugu.pl>
Date: Thu, 14 Mar 2019 19:12:46 +0000
Subject: [PATCH 028/138] Translated using Weblate (Polish)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-pl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index cc4e717c7..d2e2d1f58 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -458,7 +458,7 @@
     <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">Żądany zakres jest niewłaściwy</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>

From a7156f665a6145c250d691a8f92c56a3b1a8e1f4 Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Fri, 15 Mar 2019 21:42:17 +0000
Subject: [PATCH 029/138] Translated using Weblate (Portuguese)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-pt/strings.xml | 114 ++++---------------------
 1 file changed, 17 insertions(+), 97 deletions(-)

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 99156d49f..de0097bb3 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -32,7 +32,6 @@
     <string name="url_not_supported_toast">URL não suportado</string>
     <string name="content_language_title">Idioma padrão do conteúdo</string>
     <string name="settings_category_video_audio_title">Vídeo e áudio</string>
-
     <string name="list_thumbnail_view_description">Miniatura de vídeos</string>
     <string name="detail_thumbnail_view_description">Miniatura de vídeos</string>
     <string name="detail_uploader_thumbnail_view_description">Miniatura da foto do canal</string>
@@ -41,19 +40,16 @@
     <string name="theme_title">Tema</string>
     <string name="dark_theme_title">Escuro</string>
     <string name="light_theme_title">Claro</string>
-
     <string name="settings_category_appearance_title">Aparência</string>
     <string name="settings_category_other_title">Outros</string>
     <string name="background_player_playing_toast">Reprodução em segundo plano</string>
     <string name="play_btn_text">Reproduzir</string>
     <string name="network_error">Erro de rede</string>
-
     <string name="use_tor_title">Usar Tor</string>
     <string name="use_tor_summary">(Experimental) Usar a rede Tor para aumentar a privacidade (ainda não é suportada a emissão de vídeos).</string>
     <string name="download_path_audio_title">Pasta para a descarga de áudio</string>
     <string name="download_path_audio_summary">Local para guardar o áudio descarregado</string>
     <string name="download_path_audio_dialog_title">Digite o caminho para os ficheiros de áudio</string>
-
     <string name="err_dir_create">Não foi possível criar o diretório \'%1$s\'</string>
     <string name="info_dir_created">Diretório \'%1$s\' criado com sucesso</string>
     <string name="general_error">Erro</string>
@@ -62,11 +58,9 @@
     <string name="parsing_error">Incapaz de processar o site</string>
     <string name="content_not_available">Conteúdo não disponível</string>
     <string name="blocked_by_gema">Bloqueado por GEMA</string>
-
     <string name="content">Conteúdo</string>
     <string name="show_age_restricted_content_title">Restringir conteúdo por idade</string>
-    <string name="video_is_age_restricted">Mostrar vídeo com restrição de idade. É possível permitir tal material a nas Opções.</string>
-
+    <string name="video_is_age_restricted">Mostrar vídeo com restrição de idade. É possível permitir tal material nas Configurações.</string>
     <string name="light_parsing_error">Não foi possível processar totalmente o site</string>
     <string name="could_not_setup_download_menu">Não foi possível configurar o menu de descargas</string>
     <string name="live_streams_not_supported">As emissões em direto ainda não são suportadas</string>
@@ -79,8 +73,6 @@
     <string name="what_happened_headline">O que ocorreu:</string>
     <string name="your_comment">Comentários (em inglês):</string>
     <string name="error_details_headline">Detalhes:</string>
-
-
     <string name="video">Vídeo</string>
     <string name="audio">Áudio</string>
     <string name="retry">Tentar novamente</string>
@@ -89,23 +81,17 @@
     <string name="autoplay_by_calling_app_title">Reprodução automática</string>
     <string name="autoplay_by_calling_app_summary">Reproduzir vídeo se o NewPipe for invocado por outra aplicação</string>
     <string name="duration_live">Direto</string>
-
     <string name="report_error">Reportar um erro</string>
     <string name="user_report">Relatório</string>
-
     <string name="downloads">Descargas</string>
     <string name="downloads_title">Descargas</string>
     <string name="error_report_title">Relatório de erro</string>
-
     <string name="start">Iniciar</string>
     <string name="pause">Pausa</string>
     <string name="view">Reproduzir</string>
     <string name="delete">Apagar</string>
     <string name="checksum">Checksum</string>
-
     <string name="add">Nova missão</string>
-
-
     <string name="msg_name">Nome do ficheiro</string>
     <string name="msg_error">Erro</string>
     <string name="msg_server_unsupported">Servidor não suportado</string>
@@ -115,46 +101,34 @@
     <string name="msg_wait">Por favor aguarde…</string>
     <string name="msg_copied">Copiado para a área de transferência</string>
     <string name="no_available_dir">Por favor selecione a pasta para as descargas</string>
-
     <string name="finish">OK</string>
     <string name="msg_threads">Processos</string>
     <string name="msg_running">Descarga do NewPipe</string>
     <string name="could_not_load_image">Não foi possível carregar a imagem</string>
-
     <string name="app_ui_crash">Aplicação encerrada</string>
     <string name="info_labels">O quê:\\nPedido:\\nIdioma do conteúdo:\\nServiço:\\nHora GMT:\\nPacote:\\nVersão:\\nVersão do SO:</string>
     <string name="open_in_popup_mode">Abrir no modo \"popup\"</string>
     <string name="black_theme_title">Preto</string>
-
     <string name="all">Tudo</string>
     <string name="channel">Canais</string>
     <string name="yes">Sim</string>
     <string name="later">Depois</string>
-
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">MM</string>
-
     <string name="msg_popup_permission">Esta permissão é necessária 
 \npara o modo \'popup\'</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">Desafio reCAPTCHA</string>
     <string name="recaptcha_request_toast">Desafio reCAPTCHA solicitado</string>
-
     <string name="popup_mode_share_menu_title">Modo \'popup\' do NewPipe</string>
-
     <string name="popup_playing_toast">Reproduzir em modo \"popup\"</string>
     <string name="default_video_format_title">Formato de vídeo padrão</string>
     <string name="disabled">Desativado</string>
-
-
     <string name="default_popup_resolution_title">Resolução padrão do \'popup\'</string>
     <string name="show_higher_resolutions_title">Mostrar resoluções mais altas</string>
     <string name="show_higher_resolutions_summary">Apenas alguns dispositivos possuem suporte a vídeos 2K/4K</string>
     <string name="controls_popup_title">Popup</string>
-
     <string name="popup_remember_size_pos_title">Lembrar tamanho e posição do \'popup\'</string>
     <string name="settings_category_popup_title">Popup</string>
     <string name="filter">Filtrar</string>
@@ -163,15 +137,12 @@
     <string name="controls_background_title">Segundo plano</string>
     <string name="use_external_video_player_summary">Remove o áudio em algumas resoluções</string>
     <string name="popup_remember_size_pos_summary">Lembrar último tamanho e posição do \'popup\'</string>
-
     <string name="popup_resizing_indicator_title">Redimensionar</string>
-<string name="player_gesture_controls_title">Controlo de reprodução por gestos</string>
+    <string name="player_gesture_controls_title">Controlo de reprodução por gestos</string>
     <string name="player_gesture_controls_summary">Utilizar gestos para controlar o brilho e o volume do reprodutor</string>
     <string name="show_search_suggestions_title">Sugestões de pesquisa</string>
     <string name="show_search_suggestions_summary">Mostrar sugestões ao pesquisar</string>
-
     <string name="best_resolution">Melhor resolução</string>
-
     <string name="title_activity_about">Acerca de NewPipe</string>
     <string name="action_settings">Definições</string>
     <string name="action_about">Sobre</string>
@@ -188,17 +159,14 @@
     <string name="contribution_encouragement">Se tem ideias para: tradução, alterações de design, limpeza de código ou alterações ao código fonte - todas as ajudas são bem-vindas. Quanto mais se faz, melhor ficará!</string>
     <string name="read_full_license">Ler licença</string>
     <string name="contribution_title">Participar</string>
-<string name="subscribe_button_title">Subscrever</string>
+    <string name="subscribe_button_title">Subscrever</string>
     <string name="subscribed_button_title">Subscrito</string>
     <string name="channel_unsubscribed">Canal não subscrito</string>
     <string name="subscription_change_failed">Incapaz de alterar a subscrição</string>
     <string name="subscription_update_failed">Incapaz de atualizar a subscrição</string>
-
     <string name="tab_main">Principal</string>
     <string name="tab_subscriptions">Subscrições</string>
-
     <string name="fragment_whats_new">Novidades</string>
-
     <string name="enable_search_history_title">Histórico de pesquisa</string>
     <string name="enable_search_history_summary">Guardar termos de pesquisa localmente</string>
     <string name="enable_watch_history_title">Histórico e cache</string>
@@ -210,39 +178,31 @@
     <string name="settings_category_history_title">Histórico e cache</string>
     <string name="playlist">Lista de reprodução</string>
     <string name="undo">Desfazer</string>
-
     <string name="notification_channel_name">Notificação NewPipe</string>
     <string name="notification_channel_description">Notificações para o NewPipe e para os reprodutores \"popup\"</string>
-
     <string name="search_no_results">Sem resultados</string>
     <string name="empty_subscription_feed_subtitle">Aqui não há nada para ver</string>
-
     <string name="no_subscribers">Sem subscritores</string>
     <plurals name="subscribers">
-	<item quantity="one">%s subscritor</item>
-	<item quantity="other">%s subscritores</item>
-</plurals>
-
+        <item quantity="one">%s subscritor</item>
+        <item quantity="other">%s subscritores</item>
+    </plurals>
     <string name="no_views">Sem visualizações</string>
     <plurals name="views">
-	<item quantity="one">%s visualização</item>
-	<item quantity="other">%s visualizações</item>
-</plurals>
-
+        <item quantity="one">%s visualização</item>
+        <item quantity="other">%s visualizações</item>
+    </plurals>
     <string name="no_videos">Sem vídeos</string>
     <plurals name="videos">
-    <item quantity="one">vídeo</item>
-    <item quantity="other">vídeos</item>
-</plurals>
-
+        <item quantity="one">vídeo</item>
+        <item quantity="other">vídeos</item>
+    </plurals>
     <string name="settings_category_downloads_title">Descarregar</string>
     <string name="settings_file_charset_title">Caracteres permitidos em nomes de ficheiros</string>
     <string name="settings_file_replacement_character_summary">Caracteres inválidos são substituídos por este valor</string>
     <string name="settings_file_replacement_character_title">Carácter de substituição</string>
-
     <string name="charset_letters_and_digits">Letras e dígitos</string>
     <string name="charset_most_special_characters">Caracteres especiais</string>
-
     <string name="title_activity_history">Histórico</string>
     <string name="title_history_search">Pesquisado</string>
     <string name="title_history_view">Visualizado</string>
@@ -251,14 +211,11 @@
     <string name="history_empty">O histórico está vazio</string>
     <string name="history_cleared">Histórico apagado</string>
     <string name="item_deleted">Item apagado</string>
-<string name="delete_item_search_history">Deseja apagar este item do histórico de pesquisa?</string>
-<string name="play_all">Reproduzir todos</string>
-
+    <string name="delete_item_search_history">Deseja apagar este item do histórico de pesquisa?</string>
+    <string name="play_all">Reproduzir todos</string>
     <string name="unknown_content">[Desconhecido]</string>
-
     <string name="player_unrecoverable_failure">Ocorreu um erro irrecuperável do reprodutor</string>
     <string name="player_recoverable_failure">A recuperar de um erro do reprodutor</string>
-
     <string name="main_page_content">Conteúdo da página principal</string>
     <string name="blank_page_summary">Página vazia</string>
     <string name="subscription_page_summary">Página de subscrições</string>
@@ -266,7 +223,6 @@
     <string name="select_a_channel">Selecione um canal</string>
     <string name="no_channel_subscribed_yet">Não existem canais subscritos</string>
     <string name="select_a_kiosk">Selecione um \"kiosk\"</string>
-
     <string name="kiosk">Kiosk</string>
     <string name="trending">Tendências</string>
     <string name="top_50">Top 50</string>
@@ -279,14 +235,11 @@
     <string name="start_here_on_main">Iniciar reprodução aqui</string>
     <string name="start_here_on_background">Iniciar aqui se em segundo plano</string>
     <string name="start_here_on_popup">Iniciar aqui em novo \'pop-up\'</string>
-<string name="show_info">Mostrar informação</string>
-
+    <string name="show_info">Mostrar informação</string>
     <string name="tab_bookmarks">Listas de reprodução favoritas</string>
-
     <string name="service_title">Serviço</string>
     <string name="always">Sempre</string>
     <string name="just_once">Apenas uma vez</string>
-
     <string name="toggle_orientation">Mudar orientação</string>
     <string name="import_data_title">Importar base de dados</string>
     <string name="export_data_title">Exportar base de dados</string>
@@ -297,22 +250,18 @@
     <string name="switch_to_background">Mudar para segundo plano</string>
     <string name="switch_to_popup">Mudar para \'popup\'</string>
     <string name="switch_to_main">Mudar para principal</string>
-
     <string name="player_stream_failure">Incapaz de reproduzir este vídeo</string>
     <string name="external_player_unsupported_link_type">Reprodutores externos não suportam este tipo de ligações</string>
     <string name="invalid_url_toast">URL inválido</string>
     <string name="detail_drag_description">Arraste para reordenar</string>
-
     <string name="create">Criar</string>
     <string name="delete_one">Apagar um</string>
     <string name="delete_all">Apagar todos</string>
     <string name="rename">Renomear</string>
-
     <string name="donation_title">Doar</string>
     <string name="no_player_found_toast">Nenhum reprodutor encontrado (pode instalar o reprodutor VLC).</string>
     <string name="controls_download_desc">Descarregar ficheiro da emissão</string>
     <string name="controls_add_to_playlist_title">Adicionar a</string>
-
     <string name="use_inexact_seek_title">Utilizar pesquisa rápida</string>
     <string name="use_inexact_seek_summary">Esta opção permite que a pesquisa seja mais rápida mas diminui a qualidade da precisão</string>
     <string name="download_thumbnail_title">Carregar miniaturas</string>
@@ -328,7 +277,6 @@
     <string name="file_name_empty_error">O nome do ficheiro não pode estar vazio</string>
     <string name="error_occurred_detail">Ocorreu um erro: %1$s</string>
     <string name="no_streams_available_download">Não existem emissões para descarregar</string>
-
     <string name="dismiss">Descartar</string>
     <string name="website_title">Site</string>
     <string name="website_encouragement">Visite ao site NewPipe para obter mais informações e saber as novidades.</string>
@@ -339,7 +287,6 @@
     <string name="no_valid_zip_file">Ficheiro ZIP inválido</string>
     <string name="could_not_import_all_files">Aviso: nem todos os ficheiros foram importados.</string>
     <string name="override_current_data">Está prestes a substituir a configuração atual.</string>
-
     <string name="drawer_open">Abrir menu</string>
     <string name="drawer_close">Fechar menu</string>
     <string name="playlist_name_input">Nome</string>
@@ -347,55 +294,41 @@
     <string name="metadata_cache_wipe_summary">Remover todos os dados em cache</string>
     <string name="metadata_cache_wipe_complete_notice">Meta-dados em cache apagados</string>
     <string name="file">Ficheiro</string>
-
     <string name="delete_stream_history_prompt">Deseja apagar este item do histórico de visualizações\?</string>
     <string name="delete_all_history_prompt">Tem a certeza de que deseja apagar todos os itens do histórico\?</string>
     <string name="title_last_played">Última reprodução</string>
     <string name="title_most_played">Mais reproduzido</string>
-
     <string name="drawer_header_action_paceholder_text">Algo vai surgir aqui em breve ;D</string>
-
-
     <string name="video_player">Reprodutor de vídeo</string>
     <string name="background_player">Reprodutor em segundo plano</string>
     <string name="popup_player">Reprodutor \'popup\'</string>
     <string name="always_ask_open_action">Perguntar sempre</string>
-
     <string name="preferred_player_fetcher_notification_title">A obter informação…</string>
     <string name="preferred_player_fetcher_notification_message">A carregar o conteúdo...</string>
-
     <string name="create_playlist">Nova lista de reprodução</string>
     <string name="delete_playlist">Apagar</string>
     <string name="rename_playlist">Renomear</string>
     <string name="append_playlist">Adicionar à lista de reprodução</string>
     <string name="bookmark_playlist">Guardar lista de reprodução como favorita</string>
     <string name="unbookmark_playlist">Remover marcador</string>
-
     <string name="delete_playlist_prompt">Apagar esta lista de reprodução\?</string>
     <string name="playlist_creation_success">Lista de reprodução criada com sucesso</string>
     <string name="playlist_add_stream_success">Colocado na lista de reprodução</string>
     <string name="playlist_thumbnail_change_success">Miniatura alterada.</string>
     <string name="caption_none">Sem legendas</string>
-
     <string name="resize_zoom">Ampliar</string>
-
     <string name="caption_auto_generated">Gerado automaticamente</string>
-
     <string name="caption_setting_title">Legendas</string>
     <string name="import_export_title">Importar/exportar</string>
     <string name="import_title">Importar</string>
     <string name="import_from">Importar de</string>
     <string name="export_to">Exportar para</string>
-
     <string name="import_ongoing">A importar…</string>
     <string name="export_ongoing">A exportar…</string>
-
     <string name="import_file_title">Importar ficheiro</string>
     <string name="previous_export">Exportação anterior</string>
-
     <string name="subscriptions_import_unsuccessful">Não foi possível importar as subscrições</string>
     <string name="subscriptions_export_unsuccessful">Não foi possível exportar as subscrições</string>
-
     <string name="import_youtube_instructions">Importe as subscrições do YouTube descarregando o ficheiro exportado:
 \n 
 \n1. Aceda a este URL: %1$s 
@@ -408,10 +341,9 @@
 \n3. Inicie a sessão
 \n4. Copie o URL do seu perfil.</string>
     <string name="import_soundcloud_instructions_hint">suaID, soundcloud.com/suaID</string>
-
     <string name="playback_speed_control">Controlos para velocidade de reprodução</string>
     <string name="playback_tempo">Ritmo</string>
-<string name="clear_views_history_title">Limpar histórico de visualizações</string>
+    <string name="clear_views_history_title">Limpar histórico de visualizações</string>
     <string name="auto_queue_summary">Adicionar automaticamente à fila uma emissão relacionada se em filas não repetíveis.</string>
     <string name="show_hold_to_append_title">Mostrar dica \"Toque longo para colocar na fila\"</string>
     <string name="show_hold_to_append_summary">Mostrar dica quando o botão de fundo ou de \'popup\' for premido na página de detalhes do vídeo</string>
@@ -427,9 +359,7 @@
     <string name="delete_search_history_alert">Apagar todo o histórico de pesquisa\?</string>
     <string name="search_history_deleted">Histórico de pesquisa apagado.</string>
     <string name="one_item_deleted">1 elemento apagado.</string>
-
     <string name="toast_no_player">Não existe uma aplicação para reproduzir este ficheiro</string>
-
     <string name="donation_encouragement">NewPipe é desenvolvido por voluntários que usam o tempo livre para lhe proporcionar uma melhor experiência. Retribua para ajudar os programadores a tornarem o NewPipe ainda melhor.</string>
     <string name="give_back">Retribuir</string>
     <string name="privacy_policy_title">Política de privacidade do NewPipe</string>
@@ -439,42 +369,32 @@
     <string name="auto_queue_title">Colocar emissão seguinte na fila</string>
     <string name="app_license">NewPipe é copyleft libre software: você pode usar, estudar, partilhar e melhorar a aplicação. Especificamente, você pode redistribuir e/ou modificar a aplicação nos termos da GNU General Public License, conforme publicada pela Free Software Foundation, tanto a versão 3 da licença ou (por sua opção) qualquer versão posterior.</string>
     <string name="import_settings">Deseja também importar as definições\?</string>
-
     <string name="hold_to_append">Toque longo para colocar na fila</string>
     <string name="enqueue_on_background">Colocar em fila se estiver em segundo plano</string>
     <string name="enqueue_on_popup">Colocar em novo \'popup\'</string>
     <string name="preferred_open_action_settings_title">Ação \'abrir\' preferida</string>
     <string name="preferred_open_action_settings_summary">Ação padrão para abrir o conteúdo — %s</string>
-
     <string name="set_as_playlist_thumbnail">Definir como miniatura da lista de reprodução</string>
-
     <string name="playlist_delete_failure">Não foi possível apagar a lista de reprodução.</string>
-
     <string name="resize_fit">Ajustar</string>
     <string name="resize_fill">Preencher</string>
     <string name="caption_setting_description">Modificar escala das legendas e o estilo de fundo. Tem que reiniciar a aplicação para aplicar as alterações.</string>
-
     <string name="enable_leak_canary_title">Ativar LeakCanary</string>
     <string name="enable_leak_canary_summary">A monitorização de memória pode tornar a aplicação instável</string>
-
     <string name="enable_disposed_exceptions_title">Relatar erros \'out-of-lifecycle\'</string>
     <string name="enable_disposed_exceptions_summary">Forçar relatórios de exceções de Rx não entregues fora do ciclo de vida de fragmento ou atividade após a eliminação</string>
-
     <string name="import_network_expensive_warning">Tenha em atenção que esta operação pode sobrecarregar a sua rede.
 \n 
 \nDeseja continuar\?</string>
-
     <string name="playback_pitch">Velocidade</string>
     <string name="unhook_checkbox">Dissociar (pode causar distorção)</string>
     <string name="skip_silence_checkbox">Avanço rápido durante silêncio</string>
     <string name="playback_step">Passo</string>
     <string name="playback_reset">Repor</string>
-
     <string name="start_accept_privacy_policy">Para cumprir o Regulamento Geral sobre a Proteção de Dados (RGPD), chamamos a sua atenção para a política de privacidade do NewPipe. Por favor, leia com atenção. 
 \nTem que aceitar esta política para nos poder enviar o seu relatório.</string>
     <string name="accept">Aceitar</string>
     <string name="decline">Recusar</string>
-
     <string name="limit_data_usage_none_description">Ilimitado</string>
     <string name="limit_mobile_data_usage_title">Limitar resolução se estiver a usar dados móveis</string>
     <string name="minimize_on_exit_title">Minimizar ao trocar de aplicação</string>
@@ -540,7 +460,7 @@
     <string name="clear_finished_download">Limpar descargas terminadas</string>
     <string name="msg_pending_downloads">Continue suas %s transferências pendentes de descarregamentos</string>
     <string name="stop">Parar</string>
-    <string name="max_retry_msg">Máximo de tentativas</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 descarga</string>
     <string name="pause_downloads_on_mobile">Pausa na comutação para dados móveis</string>
     <string name="pause_downloads_on_mobile_desc">Descarregamentos que não podem ser pausados serão reiniciados</string>

From b017e439b152a1c7e2bf9ca64168a6e2d95e1a97 Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <i.nedoboy@mail.ru>
Date: Sun, 17 Mar 2019 19:06:18 +0000
Subject: [PATCH 030/138] Translated using Weblate (Russian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fa388df8b..e83b16772 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -465,7 +465,7 @@
     <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>
+    <string name="pause_downloads_on_mobile_desc">Загрузки, которые невозможно приостановить, будут перезапущены</string>
     <string name="error_ssl_exception">Не удалось установить защищенное соединение</string>
     <string name="error_connect_host">Не удалось соединиться с сервером</string>
     <string name="error_http_no_content">Не удалось получить данные с сервера</string>

From a7d77716f3a47c71521dd22772092d2f6884e7c7 Mon Sep 17 00:00:00 2001
From: WaldiS <admin@sto.ugu.pl>
Date: Mon, 18 Mar 2019 07:26:34 +0000
Subject: [PATCH 031/138] Translated using Weblate (Polish)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-pl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d2e2d1f58..4fedc93d9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -47,7 +47,7 @@
     <string name="play_btn_text">Odtwórz</string>
     <string name="content">Zawartość</string>
     <string name="show_age_restricted_content_title">Treści z ograniczeniem wiekowym</string>
-    <string name="video_is_age_restricted">Pokaż wideo z ograniczeniem wiekowym. Zezwalanie na takie materiały jest możliwe w Ustawieniach.</string>
+    <string name="video_is_age_restricted">Pokaż wideo z ograniczeniami wiekowymi. Dopuszczenie takiego materiału jest możliwe z poziomu Ustawienia.</string>
     <string name="duration_live">Na żywo</string>
     <string name="downloads">Pobrane</string>
     <string name="downloads_title">Pobrane</string>

From a86e8b98fe227cfd4df47f26a05449ebea4ff66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Serdar=20Sa=C4=9Flam?= <teknomobil@msn.com>
Date: Mon, 18 Mar 2019 20:36:16 +0000
Subject: [PATCH 032/138] Translated using Weblate (Turkish)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-tr/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a2dd72807..b7c4b0156 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -47,7 +47,7 @@
     <string name="play_btn_text">Oynat</string>
     <string name="content">İçerik</string>
     <string name="show_age_restricted_content_title">Yaş kısıtlamalı içerik</string>
-    <string name="video_is_age_restricted">Yaş kısıtlamalı videoyu göster. Bu tür materyallere Ayarlar\'dan izin verilebilir.</string>
+    <string name="video_is_age_restricted">Yaş kısıtlamalı videoyu göster. Bu tür malzemelere Ayarlardan izin vermek mümkündür.</string>
     <string name="duration_live">CANLI</string>
     <string name="downloads">İndirilenler</string>
     <string name="downloads_title">İndirilenler</string>
@@ -464,13 +464,13 @@
     <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şılanamaz</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">Maksimum deneme sayısı</string>
+    <string name="max_retry_msg">Azami dene sayısı</string>
     <string name="max_retry_desc">İndirmeyi iptal etmeden önce maksimum deneme sayısı</string>
     <string name="pause_downloads_on_mobile">Mobil veriye geçerken duraklat</string>
     <string name="pause_downloads_on_mobile_desc">Duraklatılamayan indirmeler yeniden başlatılacak</string>

From b141d96e7c3e195550ace5e59363eb9d33b37af4 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Tue, 19 Mar 2019 20:02:45 +0000
Subject: [PATCH 033/138] Translated using Weblate (Basque)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-eu/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index d49af0961..cd0c618ee 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -171,7 +171,7 @@
     <string name="fragment_whats_new">Zer dago berri</string>
     <string name="resume_on_audio_focus_gain_title">Jarraitu fokua irabaztean</string>
     <string name="resume_on_audio_focus_gain_summary">Jarraitu etenaldiak eta gero (adib. telefono deiak)</string>
-    <string name="settings_category_downloads_title">Deskargatu</string>
+    <string name="settings_category_downloads_title">Deskargak</string>
     <string name="settings_file_charset_title">Fitxategi-izenetan baimendutako karaktereak</string>
     <string name="settings_file_replacement_character_summary">Karaktere baliogabeak balio honekin ordezkatzen dira</string>
     <string name="settings_file_replacement_character_title">Ordezko karakterea</string>
@@ -184,7 +184,7 @@
     <string name="notification_channel_name">NewPipe jakinarazpena</string>
     <string name="settings_category_player_title">Erreproduzigailua</string>
     <string name="settings_category_player_behavior_title">Portaera</string>
-    <string name="settings_category_history_title">Historia eta cache-a</string>
+    <string name="settings_category_history_title">Historia eta cachea</string>
     <string name="playlist">Erreprodukzio-zerrenda</string>
     <string name="undo">Desegin</string>
     <string name="notification_channel_description">Atzeko planoko eta laster-leihoko NewPipe erreproduzigailuen jakinarazpenak</string>
@@ -279,10 +279,10 @@
     <string name="controls_add_to_playlist_title">Gehitu hona</string>
     <string name="use_inexact_seek_title">Erabili bilaketa azkar ez zehatza</string>
     <string name="download_thumbnail_title">Kargatu iruditxoak</string>
-    <string name="thumbnail_cache_wipe_complete_notice">Irudien cache-a ezabatuta</string>
-    <string name="metadata_cache_wipe_title">Ezabatu cache-ko metadatuak</string>
-    <string name="metadata_cache_wipe_summary">Kendu cache-ko wegbuneen datu guztiak</string>
-    <string name="metadata_cache_wipe_complete_notice">Metadatuen cache-a ezabatuta</string>
+    <string name="thumbnail_cache_wipe_complete_notice">Irudien cachea ezabatuta</string>
+    <string name="metadata_cache_wipe_title">Ezabatu cacheko metadatuak</string>
+    <string name="metadata_cache_wipe_summary">Kendu cachetik webguneen datu guztiak</string>
+    <string name="metadata_cache_wipe_complete_notice">Metadatuen cachea ezabatuta</string>
     <string name="auto_queue_title">Gehitu ilarara hurrengo jarioa</string>
     <string name="auto_queue_summary">Gehitu erlazionatutako jario bat azken jarioa jo bitartean errepikapenik gabeko ilara batean.</string>
     <string name="settings_category_debug_title">Arazketa</string>
@@ -382,7 +382,7 @@
     <string name="playback_default">Lehenetsia</string>
     <string name="import_settings">Ezarpenak ere inportatu nahi dituzu?</string>
     <string name="use_inexact_seek_summary">Bilaketa ez zehatzak posizioak azkarrago baina prezisio gutxiagoz bilatzea ahalbidetzen du</string>
-    <string name="download_thumbnail_summary">Desgaitu koadro txikiak ez kargatzeko, datuak eta memoria aurreztuz. Aldaketak memoria eta diskoko irudien cache-ak garbituko ditu.</string>
+    <string name="download_thumbnail_summary">Desgaitu koadro txikiak ez kargatzeko, datuak eta memoria aurreztuz. Aldaketak memoria eta diskoko irudien cacheak garbituko ditu.</string>
     <string name="app_license">NewPipe Software Librea eta Copyleft da: Erabili, ikertu, partekatu eta hobetu dezakezu. Zehazki, elkarbanatzea eta aldatzea Free Software Foundation-ek argitaratutako GNU General Public License-ren 3. bertsioa edo berriagoren baten terminoen arabera egiteko baimena duzu.</string>
     <string name="enable_disposed_exceptions_summary">Behartu aktibitatearen bizitza ziklotik kanpo baztertu eta gero entregatu ezin diren Rx salbuespenen inguruko txostena</string>
     <string name="privacy_policy_title">NewPipe pribatutasun politika</string>

From 8073364b7a9743d3b5991af5f2a80f9e1dbc8a02 Mon Sep 17 00:00:00 2001
From: naofum <naofum@gmail.com>
Date: Mon, 18 Mar 2019 13:46:05 +0000
Subject: [PATCH 034/138] Translated using Weblate (Japanese)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ja/strings.xml | 107 +++----------------------
 1 file changed, 11 insertions(+), 96 deletions(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c53c401a0..f704b8dbd 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -38,23 +38,18 @@
     <string name="use_external_video_player_title">外部プレイヤーを使用する</string>
     <string name="use_external_audio_player_title">外部プレイヤーを使用する</string>
     <string name="background_player_playing_toast">バックグラウンドで再生中</string>
-
     <string name="play_btn_text">再生</string>
-
     <string name="use_tor_title">Torを使用する</string>
     <string name="use_tor_summary">(実験的) 強制的に Tor を経由した経路で保存して､匿名性を高めます(動画の同時再生は未だ対応していません)｡</string>
     <string name="theme_title">テーマ</string>
     <string name="dark_theme_title">ダーク</string>
     <string name="light_theme_title">ライト</string>
-
     <string name="settings_category_appearance_title">外観</string>
     <string name="settings_category_other_title">その他</string>
     <string name="network_error">ネットワークエラー</string>
-
     <string name="download_path_audio_title">音楽を保存する場所</string>
     <string name="download_path_audio_summary">ダウンロードした音楽をここに保存します</string>
     <string name="download_path_audio_dialog_title">音楽ファイルをダウンロードする場所を入力して下さい｡</string>
-
     <string name="err_dir_create">保存場所 \'%1$s\' を作成できません</string>
     <string name="info_dir_created">保存場所 \'%1$s\' を作成しました</string>
     <string name="general_error">エラー</string>
@@ -63,17 +58,11 @@
     <string name="parsing_error">Webサイトを解析できませんでした</string>
     <string name="content_not_available">コンテンツが利用できません</string>
     <string name="blocked_by_gema">GEMA にブロックされました</string>
-
     <string name="could_not_setup_download_menu">保存メニューを設定できませんでした</string>
-
-
     <string name="live_streams_not_supported">生放送にはまだ対応していません</string>
-
-
     <string name="content">コンテンツ</string>
     <string name="show_age_restricted_content_title">年齢制限のあるコンテンツ</string>
-    <string name="video_is_age_restricted">この動画には年齢制限があります。視聴するには設定から制限を解除して下さい。</string>
-
+    <string name="video_is_age_restricted">年齢制限のビデオを表示します。そのような素材の許可は、設定から可能です。</string>
     <string name="light_parsing_error">ウェブサイトを完全には解析できませんでした</string>
     <string name="could_not_get_stream">動画を取得できませんでした</string>
     <string name="sorry_string">申し訳ありません。発生すべきでものではありませんでした。</string>
@@ -84,8 +73,6 @@
     <string name="what_happened_headline">何が起こりましたか:</string>
     <string name="your_comment">あなたの意見(英語で):</string>
     <string name="error_details_headline">詳細:</string>
-
-
     <string name="video">動画</string>
     <string name="audio">音楽</string>
     <string name="retry">再試行</string>
@@ -94,19 +81,15 @@
     <string name="autoplay_by_calling_app_summary">NewPipe が他のアプリから呼び出された時､動画を再生します｡</string>
     <string name="report_error">不具合を報告</string>
     <string name="user_report">利用者報告</string>
-
     <string name="duration_live">生放送</string>
-
     <string name="main_bg_subtitle">開始するには検索をタップ</string>
     <string name="start">開始</string>
     <string name="pause">一時停止</string>
     <string name="view">再生</string>
     <string name="delete">削除</string>
     <string name="checksum">チェックサム</string>
-
     <string name="add">新しいミッション</string>
     <string name="finish">OK</string>
-
     <string name="msg_name">ファイル名</string>
     <string name="msg_threads">同時接続数</string>
     <string name="msg_error">エラー</string>
@@ -118,71 +101,50 @@
     <string name="msg_wait">お待ちください…</string>
     <string name="msg_copied">クリップボードにコピーしました</string>
     <string name="no_available_dir">ダウンロードフォルダを選択して下さい</string>
-
     <string name="downloads">ダウンロード</string>
     <string name="downloads_title">ダウンロード</string>
     <string name="error_report_title">不具合報告</string>
-
     <string name="could_not_load_image">画像を読み込みできません</string>
-
     <string name="app_ui_crash">アプリ/UI がクラッシュしました</string>
     <string name="info_labels">何:\\\\n提案:\\\\nコンテンツ言語:\\\\nサービス:\\\\nGMT 時間:\\\\nパッケージ:\\\\nバージョン:\\\\nOSバージョン:</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">reCAPTCHA の要求</string>
-
     <string name="recaptcha_request_toast">reCAPTCHA を要求しました</string>
-
     <string name="black_theme_title">ブラック</string>
-
     <string name="all">すべて</string>
     <string name="channel">チャンネル</string>
-
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-
     <string name="yes">はい</string>
     <string name="later">後で</string>
-
-
     <string name="open_in_popup_mode">ポップアップモードで開く</string>
     <string name="msg_popup_permission">ポップアップモードで開くには
 このアクセス許可が必要です</string>
-
     <string name="popup_mode_share_menu_title">NewPipe ポップアップモード</string>
-
     <string name="popup_playing_toast">ポップアップモードで再生中</string>
     <string name="use_old_player_title">古いプレーヤーを使用する</string>
     <string name="use_old_player_summary">古い内蔵のMediaframeworkプレーヤー</string>
     <string name="disabled">無効</string>
-
     <string name="default_video_format_title">デフォルトの動画形式</string>
-
     <string name="default_popup_resolution_title">デフォルトのポップアップ解像度</string>
     <string name="show_higher_resolutions_title">高い解像度で表示</string>
     <string name="show_higher_resolutions_summary">2K/4K ビデオの再生は一部のデバイスのみサポートしています</string>
     <string name="controls_background_title">背景</string>
     <string name="controls_popup_title">ポップアップ</string>
-
     <string name="filter">フィルター</string>
     <string name="refresh">更新</string>
     <string name="clear">クリア</string>
-
     <string name="popup_remember_size_pos_title">ポップアップのサイズと位置を記憶する</string>
     <string name="popup_remember_size_pos_summary">前回のポップアップしたサイズと位置を記憶する</string>
-
     <string name="settings_category_popup_title">ポップアップ</string>
     <string name="popup_resizing_indicator_title">サイズを変更</string>
-
     <string name="use_external_video_player_summary">一部の解像度では音声がありません</string>
     <string name="player_gesture_controls_title">プレーヤーのジェスチャー コントロール</string>
     <string name="player_gesture_controls_summary">ジェスチャーを使用してプレーヤーの明るさと音量をコントロールする</string>
     <string name="show_search_suggestions_title">検索候補</string>
     <string name="show_search_suggestions_summary">検索時に候補を表示します</string>
-
-<string name="best_resolution">最高の解像度</string>
-
+    <string name="best_resolution">最高の解像度</string>
     <string name="title_activity_about">NewPipe について</string>
     <string name="action_settings">設定</string>
     <string name="action_about">このアプリについて</string>
@@ -199,17 +161,14 @@
     <string name="contribution_encouragement">翻訳、デザインの変更、コードの整理、動作の重いコードの変更など、アイデアをお持ちではありませんか？ヘルプはいつでも歓迎します。より良いものを一緒に作り上げましょう！</string>
     <string name="read_full_license">ライセンスを読む</string>
     <string name="contribution_title">貢献する</string>
-<string name="subscribe_button_title">チャンネル登録</string>
+    <string name="subscribe_button_title">チャンネル登録</string>
     <string name="subscribed_button_title">チャンネル登録しました</string>
     <string name="channel_unsubscribed">チャンネル登録を解除しました</string>
     <string name="subscription_change_failed">チャンネル登録を変更できません</string>
     <string name="subscription_update_failed">チャンネル登録を更新できません</string>
-
     <string name="tab_main">メイン</string>
     <string name="tab_subscriptions">登録リスト</string>
-
     <string name="fragment_whats_new">新着</string>
-
     <string name="enable_search_history_title">検索履歴</string>
     <string name="enable_search_history_summary">検索履歴をローカルに保存します</string>
     <string name="enable_watch_history_title">再生履歴とキャッシュ</string>
@@ -223,10 +182,8 @@
     <string name="playlist">再生リスト</string>
     <string name="undo">元に戻す</string>
     <string name="play_all">すべて再生</string>
-
     <string name="notification_channel_name">通知</string>
     <string name="unknown_content">[不明]</string>
-
     <string name="player_stream_failure">動画の再生ができませんでした</string>
     <string name="player_unrecoverable_failure">回復不能な再生エラーが発生しました</string>
     <string name="search_no_results">何も見つかりませんでした</string>
@@ -236,10 +193,8 @@
     <string name="settings_file_charset_title">ファイル名に使用可能な文字</string>
     <string name="settings_file_replacement_character_summary">無効な文字は次の値で置き換えられます</string>
     <string name="settings_file_replacement_character_title">置換文字</string>
-
     <string name="charset_letters_and_digits">文字と数字</string>
     <string name="charset_most_special_characters">ほとんどの特殊文字</string>
-
     <string name="donation_title">寄付</string>
     <string name="donation_encouragement">NewPipe は、あなたに最高の体験を味わってもらうために、ボランティアが自分たちの時間を使って開発しています。開発者たちがコーヒーを飲みながら NewPipe を継続的に改良できるよう、あなたのご支援をお願いします。</string>
     <string name="website_title">Webサイト</string>
@@ -253,7 +208,6 @@
     <string name="history_cleared">履歴を消去しました</string>
     <string name="item_deleted">アイテムを削除しました</string>
     <string name="delete_item_search_history">このアイテムを検索履歴から削除しますか？</string>
-
     <string name="main_page_content">メインページのコンテンツ</string>
     <string name="blank_page_summary">空白ページ</string>
     <string name="kiosk_page_summary">キオスクページ</string>
@@ -263,7 +217,6 @@
     <string name="select_a_channel">選択したチャンネル</string>
     <string name="no_channel_subscribed_yet">購読しているチャンネルはありません</string>
     <string name="select_a_kiosk">選択したキオスク</string>
-
     <string name="kiosk">キオスク</string>
     <string name="trending">人気</string>
     <string name="top_50">トップ50</string>
@@ -275,13 +228,11 @@
     <string name="switch_to_background">バックグラウンド再生に変更</string>
     <string name="switch_to_popup">ポップアップ再生に変更</string>
     <string name="switch_to_main">メイン再生に変更</string>
-
     <string name="no_player_found_toast">動画プレイヤーが見つかりません (VLCをインストールして再生できます)。</string>
     <string name="default_content_country_title">デフォルトのコンテンツの国</string>
     <string name="service_title">サービス</string>
     <string name="always">常に</string>
     <string name="just_once">一度だけ</string>
-
     <string name="import_data_title">データベースのインポート</string>
     <string name="export_data_title">データベースのエクスポート</string>
     <string name="import_data_summary">既存の履歴と購読リストは上書きされます</string>
@@ -294,25 +245,20 @@
     <string name="no_valid_zip_file">有効な ZIP ファイルではありません</string>
     <string name="could_not_import_all_files">警告: すべてのファイルをインポートできませんでした。</string>
     <string name="override_current_data">これにより、現在の設定が上書きされます。</string>
-
     <string name="title_activity_background_player">バックグラウンド再生</string>
     <string name="start_here_on_main">ここから再生を開始</string>
     <string name="start_here_on_background">ここからバックグランド再生を開始</string>
     <string name="drawer_open">ドロワーを開く</string>
     <string name="drawer_close">ドロワーを閉じる</string>
-
     <string name="video_player">動画プレーヤー</string>
     <string name="background_player">バックグラウンドプレーヤー</string>
     <string name="popup_player">ポップアッププレーヤー</string>
     <string name="always_ask_player">常に尋ねる</string>
-    
     <string name="preferred_player_fetcher_notification_title">情報を取得しています…</string>
     <string name="preferred_player_fetcher_notification_message">コンテンツを読み込んでいます</string>
-<string name="controls_download_desc">動画ファイルをダウンロード</string>
+    <string name="controls_download_desc">動画ファイルをダウンロード</string>
     <string name="show_info">情報を表示</string>
-
     <string name="tab_bookmarks">ブックマーク</string>
-
     <string name="download_thumbnail_title">サムネイルを読み込む</string>
     <string name="thumbnail_cache_wipe_complete_notice">画像キャッシュを消去しました</string>
     <string name="metadata_cache_wipe_title">メタデータのキャッシュを消去</string>
@@ -321,7 +267,6 @@
     <string name="auto_queue_title">次の動画を自動でキューに追加</string>
     <string name="settings_category_debug_title">デバッグ</string>
     <string name="file">ファイル</string>
-
     <string name="video_streams_empty">動画が見つかりません</string>
     <string name="audio_streams_empty">音声が見つかりません</string>
     <string name="invalid_directory">そのフォルダーはありません</string>
@@ -329,56 +274,44 @@
     <string name="file_name_empty_error">ファイル名は空白にできません</string>
     <string name="error_occurred_detail">エラーが発生しました: %1$s</string>
     <string name="no_streams_available_download">ダウンロードできる動画はありません</string>
-
     <string name="detail_drag_description">ドラッグして並べ替え</string>
-
     <string name="create">作成</string>
     <string name="delete_one">削除</string>
     <string name="delete_all">すべて削除</string>
     <string name="dismiss">破棄</string>
     <string name="rename">名前を変更</string>
-
     <string name="delete_stream_history_prompt">このアイテムを再生履歴から削除しますか？</string>
     <string name="delete_all_history_prompt">すべてのアイテムを再生履歴から削除しますか？</string>
     <string name="always_ask_open_action">常に確認</string>
-
     <string name="create_playlist">新規プレイリスト</string>
     <string name="delete_playlist">削除</string>
     <string name="rename_playlist">変更</string>
     <string name="playlist_name_input">プレイリスト名</string>
     <string name="append_playlist">プレイリストに追加</string>
     <string name="set_as_playlist_thumbnail">プレイリストのサムネイルとして設定</string>
-
     <string name="bookmark_playlist">プレイリストをブックマーク</string>
     <string name="unbookmark_playlist">ブックマークを削除</string>
-
     <string name="delete_playlist_prompt">このプレイリストを削除しますか？</string>
     <string name="playlist_creation_success">プレイリストが作成されました</string>
     <string name="playlist_add_stream_success">プレイリストに追加しました</string>
     <string name="playlist_thumbnail_change_success">プレイリストのサムネイルを変更しました。</string>
     <string name="playlist_delete_failure">プレイリストが削除できませんでした。</string>
-
     <string name="caption_none">字幕なし</string>
-
     <string name="caption_font_size_settings_title">字幕の文字サイズ</string>
     <string name="import_export_title">インポート/エクスポート</string>
     <string name="import_title">インポート</string>
     <string name="import_from">インポート元</string>
     <string name="export_to">エクスポート先</string>
-
     <string name="import_ongoing">インポートしています…</string>
     <string name="export_ongoing">エクスポートしています…</string>
-
     <string name="import_file_title">ファイルからインポート</string>
     <string name="previous_export">前回のエクスポート</string>
-
     <string name="subscriptions_import_unsuccessful">購読リストがインポートできませんでした</string>
     <string name="subscriptions_export_unsuccessful">購読リストがエクスポートできませんでした</string>
-
     <string name="playback_tempo">テンポ</string>
     <string name="playback_pitch">音程</string>
     <string name="playback_default">デフォルト</string>
-<string name="background_player_append">バックグラウンド再生の順番待ちに追加</string>
+    <string name="background_player_append">バックグラウンド再生の順番待ちに追加</string>
     <string name="popup_playing_append">ポップアップ再生の順番待ちに追加</string>
     <string name="clear_views_history_title">再生履歴を消去</string>
     <string name="clear_views_history_summary">再生した動画の履歴を削除します</string>
@@ -387,9 +320,7 @@
     <string name="clear_search_history_summary">検索キーワードの履歴を削除します</string>
     <string name="search_history_deleted">検索履歴を削除しました。</string>
     <string name="toast_no_player">このファイルを再生するためのアプリがインストールされていません</string>
-
     <string name="import_settings">設定をインポートしますか？</string>
-
     <string name="caption_setting_title">字幕</string>
     <string name="channels">チャンネル</string>
     <string name="playlists">プレイリスト</string>
@@ -404,52 +335,38 @@
     <string name="delete_search_history_alert">すべての検索履歴を削除します？</string>
     <string name="invalid_source">このファイル/コンテンツはありません</string>
     <plurals name="subscribers">
-	<item quantity="other">登録者数 %s 人</item>
-</plurals>
-
+        <item quantity="other">登録者数 %s 人</item>
+    </plurals>
     <string name="no_views">視聴なし</string>
     <plurals name="views">
-	<item quantity="other">視聴回数 %s 回</item>
-</plurals>
-
+        <item quantity="other">視聴回数 %s 回</item>
+    </plurals>
     <plurals name="videos">
-    <item quantity="other">本の動画</item>
-</plurals>
-
+        <item quantity="other">本の動画</item>
+    </plurals>
     <string name="one_item_deleted">1 つのアイテムが削除されました</string>
-
     <string name="give_back">支援する</string>
     <string name="privacy_policy_encouragement">NewPipe プロジェクトはあなたのプライバシーを非常に大切にしています。あなたの同意がない限り、アプリはいかなるデータも収集しません。NewPipe のプライバシー・ポリシーでは、クラッシュリポート送信時にどのような種類のデータが送信・記録されるかを詳細に説明しています。</string>
     <string name="app_license">NewPipe は著作権が自由のソフトウェアです。あなたは自由にそれを使用し、研究し、そして改善することができます。あなたは、GNU フリーソフトウェア財団が公開する GNU General Public ライセンス バージョン3以降の下に、自由に再配布・修正を行うことができます。</string>
     <string name="title_last_played">最終再生日時</string>
     <string name="title_most_played">最も再生した動画</string>
-
     <string name="resize_zoom">ズーム</string>
-
     <string name="controls_add_to_playlist_title">追加...</string>
-
     <string name="show_hold_to_append_title">「長押しして追加」のヒントを表示</string>
     <string name="tracks">トラック</string>
     <string name="notification_channel_description">NewPipe バックグラウンドおよびポップアップのプレーヤーの通知</string>
-
     <string name="new_and_hot">新しい &amp; ホット</string>
     <string name="hold_to_append">長押ししてキューに入れる</string>
     <string name="enqueue_on_background">バックグラウンド時にキューに入れる</string>
     <string name="enqueue_on_popup">ポップアップ時にキューに入れる</string>
     <string name="start_here_on_popup">新ポップアップ時にここから開始</string>
-
     <string name="drawer_header_action_paceholder_text">すぐにここに表示されます;D</string>
-
-
     <string name="preferred_open_action_settings_title">お好みの \'開く\' アクション</string>
     <string name="preferred_open_action_settings_summary">コンテンツを開くときのデフォルト動作 — %s</string>
-
     <string name="resize_fit">フィット</string>
     <string name="resize_fill">埋める</string>
     <string name="caption_auto_generated">自動生成</string>
-
     <string name="caption_setting_description">プレーヤーのキャプション文字スケールと背景スタイルを変更します。有効にするにはアプリの再起動が必要です。</string>
-
     <string name="empty_subscription_feed_subtitle">何もありません</string>
     <string name="import_youtube_instructions">保存したエクスポートファイルからYoutubeの購読をインポート:
 \n
@@ -457,10 +374,8 @@
 \n2. ログインしていなければログインします
 \n3. ダウンロードが始まります (これがエクスポートファイルです)</string>
     <string name="playback_reset">リセット</string>
-
     <string name="accept">同意する</string>
     <string name="decline">拒否</string>
-
     <string name="limit_data_usage_none_description">制限なし</string>
     <string name="limit_mobile_data_usage_title">モバイルデータ使用時の解像度の制限</string>
     <string name="minimize_on_exit_title">アプリ切り替え時の最小化</string>

From 73a5b6738d455a0f37103f5181b20a3aa935fd19 Mon Sep 17 00:00:00 2001
From: Andrea Gelmini <andrea.gelmini@gelma.net>
Date: Wed, 20 Mar 2019 16:53:19 +0000
Subject: [PATCH 035/138] Translated using Weblate (Italian)

Currently translated at 99.1% (439 of 443 strings)
---
 app/src/main/res/values-it/strings.xml | 141 +++++--------------------
 1 file changed, 25 insertions(+), 116 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b8cebdacb..e75d4f89c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -30,7 +30,6 @@
     <string name="url_not_supported_toast">URL non supportato</string>
     <string name="content_language_title">Lingua predefinita per i contenuti</string>
     <string name="settings_category_video_audio_title">Video e Audio</string>
-
     <string name="list_thumbnail_view_description">Miniatura anteprima video</string>
     <string name="detail_thumbnail_view_description">Miniatura anteprima video</string>
     <string name="detail_uploader_thumbnail_view_description">Miniatura dell\'immagine di profilo dell\'utente</string>
@@ -40,20 +39,16 @@
     <string name="info_dir_created">Creata la cartella per i download \'%1$s\'</string>
     <string name="use_external_video_player_title">Usa un lettore video esterno</string>
     <string name="use_external_audio_player_title">Usa un lettore audio esterno</string>
-
     <string name="download_path_audio_title">Cartella degli audio scaricati</string>
     <string name="download_path_audio_summary">Cartella in cui salvare gli audio scaricati</string>
     <string name="download_path_audio_dialog_title">Inserisci la cartella per gli audio scaricati</string>
-
     <string name="theme_title">Tema</string>
     <string name="dark_theme_title">Scuro</string>
     <string name="light_theme_title">Chiaro</string>
-
     <string name="settings_category_appearance_title">Aspetto</string>
     <string name="settings_category_other_title">Altro</string>
     <string name="background_player_playing_toast">Riproduzione in sottofondo</string>
     <string name="play_btn_text">Riproduci</string>
-
     <string name="general_error">Errore</string>
     <string name="network_error">Errore di connessione</string>
     <string name="could_not_load_thumbnails">Impossibile caricare tutte le miniature</string>
@@ -62,23 +57,16 @@
     <string name="blocked_by_gema">Bloccato da GEMA</string>
     <string name="use_tor_title">Usa Tor</string>
     <string name="use_tor_summary">(Sperimentale) Forza il download tramite Tor per una maggiore riservatezza (lo streaming dei video non è ancora supportato).</string>
-
     <string name="parsing_error">Impossibile analizzare il sito web</string>
     <string name="could_not_setup_download_menu">Impossibile impostare il menu di download</string>
-
-
     <string name="live_streams_not_supported">I contenuti in diretta non sono al momento supportati</string>
-
-
     <string name="content">Contenuti</string>
     <string name="show_age_restricted_content_title">Contenuti vietati ai minori</string>
     <string name="video_is_age_restricted">Mostra video riversati a un pubblico maggiorenne. Si possono abilitare dalle Impostazioni.</string>
-
     <string name="main_bg_subtitle">Tocca Cerca per iniziare</string>
     <string name="autoplay_by_calling_app_title">Riproduzione automatica</string>
     <string name="autoplay_by_calling_app_summary">Riproduci i video quando NewPipe viene aperto da un\'altra app</string>
     <string name="duration_live">IN DIRETTA</string>
-
     <string name="light_parsing_error">Impossibile analizzare completamente il sito web</string>
     <string name="could_not_get_stream">Impossibile ottenere alcun flusso</string>
     <string name="sorry_string">Spiacenti, non sarebbe dovuto succedere.</string>
@@ -89,11 +77,8 @@
     <string name="what_happened_headline">Cosa è successo:</string>
     <string name="your_comment">Il tuo commento (in inglese):</string>
     <string name="error_details_headline">Dettagli:</string>
-
-
     <string name="report_error">Segnala un errore</string>
     <string name="user_report">Segnalazione dell\'utente</string>
-
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Riprova</string>
@@ -101,16 +86,13 @@
     <string name="downloads">Download</string>
     <string name="downloads_title">Download</string>
     <string name="error_report_title">Segnalazione errori</string>
-
     <string name="start">Inizia</string>
     <string name="pause">Pausa</string>
     <string name="view">Riproduci</string>
     <string name="delete">Elimina</string>
     <string name="checksum">Checksum</string>
-
     <string name="add">Nuovo obiettivo</string>
     <string name="finish">OK</string>
-
     <string name="msg_name">Nome del file</string>
     <string name="msg_threads">Thread</string>
     <string name="msg_error">Errore</string>
@@ -122,41 +104,28 @@
     <string name="msg_wait">Attendi…</string>
     <string name="msg_copied">Copiato negli appunti</string>
     <string name="no_available_dir">Seleziona una cartella per il salvataggio dei download</string>
-
     <string name="could_not_load_image">Impossibile caricare l\'immagine</string>
     <string name="app_ui_crash">L\'app/UI si è interrotta</string>
     <string name="info_labels">Cosa:\\nRichiesta:\\nLingua contenuto:\\nServizio:\\nOrario GMT:\\nPacchetto:\\nVersione:\\nVersione SO:</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">Risoluzione reCAPTCHA</string>
-
     <string name="black_theme_title">Nero</string>
-
     <string name="all">Tutto</string>
     <string name="channel">Canale</string>
-
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-
     <string name="recaptcha_request_toast">È richiesta la risoluzione del reCAPTCHA</string>
-
     <string name="yes">Sì</string>
     <string name="later">Più tardi</string>
-
-
     <string name="open_in_popup_mode">Apri in modalità popup</string>
     <string name="popup_mode_share_menu_title">Modalità popup di NewPipe</string>
-
     <string name="popup_playing_toast">Riproduzione in modalità popup</string>
     <string name="disabled">Disattivato</string>
-
     <string name="use_old_player_title">Usa il vecchio lettore multimediale</string>
-<string name="use_external_video_player_summary">Non riproduce l\'audio con ALCUNE risoluzioni</string>
+    <string name="use_external_video_player_summary">Non riproduce l\'audio con ALCUNE risoluzioni</string>
     <string name="controls_background_title">In sottofondo</string>
     <string name="controls_popup_title">Popup</string>
-
     <string name="default_popup_resolution_title">Risoluzione predefinita per la modalità popup</string>
     <string name="show_higher_resolutions_title">Mostra risoluzioni più alte</string>
     <string name="show_higher_resolutions_summary">Solo alcuni dispositivi supportano la riproduzione video in 2K e 4K</string>
@@ -167,19 +136,15 @@
     <string name="player_gesture_controls_summary">Usa i gesti per controllare la luminosità e il volume del lettore multimediale</string>
     <string name="show_search_suggestions_title">Suggerimenti di ricerca</string>
     <string name="show_search_suggestions_summary">Mostra i suggerimenti durante la ricerca</string>
-
     <string name="settings_category_popup_title">Popup</string>
     <string name="filter">Filtra i risultati</string>
     <string name="refresh">Ricarica</string>
     <string name="clear">Cancella</string>
     <string name="popup_resizing_indicator_title">Ridimensionamento</string>
     <string name="best_resolution">Risoluzione migliore</string>
-
     <string name="use_old_player_summary">Precedente lettore multimediale Mediaframework integrato</string>
-
     <string name="msg_popup_permission">Questo permesso è necessario 
 \nper riprodurre in modalità popup</string>
-
     <string name="action_settings">Impostazioni</string>
     <string name="action_about">Informazioni</string>
     <string name="title_licenses">Licenze di terze parti</string>
@@ -195,33 +160,26 @@
     <string name="contribution_encouragement">Un aiuto è sempre il benvenuto: nuove idee e funzionalità, traduzioni, modifiche al design o cambiamenti radicali del codice rendono l\'applicazione sempre migliore!</string>
     <string name="read_full_license">Leggi la licenza</string>
     <string name="contribution_title">Contribuisci</string>
-<string name="title_activity_about">Informazioni su NewPipe</string>
+    <string name="title_activity_about">Informazioni su NewPipe</string>
     <string name="subscribe_button_title">Iscriviti</string>
     <string name="subscribed_button_title">Iscritto</string>
     <string name="channel_unsubscribed">Disiscritto dal canale</string>
     <string name="subscription_change_failed">Impossibile cambiare l\'iscrizione</string>
     <string name="subscription_update_failed">Impossibile aggiornare l\'iscrizione</string>
-
     <string name="tab_subscriptions">Iscrizioni</string>
-
     <string name="fragment_whats_new">Novità</string>
-
     <string name="enable_search_history_title">Cronologia ricerche</string>
     <string name="enable_search_history_summary">Salva le ricerche</string>
     <string name="enable_watch_history_title">Cronologia &amp; Cache</string>
     <string name="enable_watch_history_summary">Salva la cronologia dei video visualizzati</string>
     <string name="resume_on_audio_focus_gain_title">Riprendi tornando in primo piano</string>
     <string name="resume_on_audio_focus_gain_summary">Continua a riprodurre dopo le interruzioni (es. chiamate)</string>
-
-
     <string name="settings_category_downloads_title">Scarica</string>
     <string name="settings_file_charset_title">Caratteri ammessi nei nomi dei file</string>
     <string name="settings_file_replacement_character_summary">I caratteri non validi vengono sostituiti con</string>
     <string name="settings_file_replacement_character_title">Carattere sostitutivo</string>
-
     <string name="charset_letters_and_digits">Lettere e cifre</string>
     <string name="charset_most_special_characters">Caratteri speciali</string>
-
     <string name="title_activity_history">Cronologia</string>
     <string name="title_history_search">Ricerche effettuate</string>
     <string name="title_history_view">Visualizzati</string>
@@ -229,41 +187,34 @@
     <string name="action_history">Cronologia</string>
     <string name="history_empty">La cronologia è vuota</string>
     <string name="history_cleared">Cronologia cancellata</string>
-
-<string name="tab_main">Principale</string>
+    <string name="tab_main">Principale</string>
     <string name="settings_category_player_title">Lettore multimediale</string>
     <string name="settings_category_player_behavior_title">Comportamento</string>
     <string name="settings_category_history_title">Cronologia e cache</string>
     <string name="playlist">Playlist</string>
     <string name="undo">Annulla</string>
-
     <string name="notification_channel_name">Notifiche NewPipe</string>
     <string name="notification_channel_description">Notifiche per NewPipe in background e per il lettore a comparsa</string>
-
     <string name="search_no_results">Nessun risultato</string>
     <string name="no_subscribers">Nessun iscritto</string>
     <plurals name="subscribers">
-	<item quantity="one">%s iscritto</item>
-	<item quantity="other">%s iscritti</item>
-</plurals>
-
+        <item quantity="one">%s iscritto</item>
+        <item quantity="other">%s iscritti</item>
+    </plurals>
     <string name="no_views">Nessuna visualizzazione</string>
     <plurals name="views">
-	<item quantity="one">%s visualizzazione</item>
-	<item quantity="other">%s visualizzazioni</item>
-</plurals>
-
+        <item quantity="one">%s visualizzazione</item>
+        <item quantity="other">%s visualizzazioni</item>
+    </plurals>
     <string name="no_videos">Nessun video</string>
     <plurals name="videos">
-    <item quantity="one">Video</item>
-    <item quantity="other">Video</item>
-</plurals>
-
+        <item quantity="one">Video</item>
+        <item quantity="other">Video</item>
+    </plurals>
     <string name="item_deleted">Elemento eliminato</string>
-<string name="empty_subscription_feed_subtitle">Nulla da mostrare</string>
-
+    <string name="empty_subscription_feed_subtitle">Nulla da mostrare</string>
     <string name="delete_item_search_history">Vuoi eliminare questo elemento dalla cronologia?</string>
-<string name="main_page_content">Contenuto della pagina principale</string>
+    <string name="main_page_content">Contenuto della pagina principale</string>
     <string name="blank_page_summary">Pagina vuota</string>
     <string name="kiosk_page_summary">Locandina</string>
     <string name="subscription_page_summary">Pagina iscrizione</string>
@@ -272,35 +223,31 @@
     <string name="select_a_channel">Seleziona un canale</string>
     <string name="no_channel_subscribed_yet">Nessuna iscrizione ad un canale</string>
     <string name="select_a_kiosk">Seleziona una locandina</string>
-
     <string name="kiosk">Locandina</string>
     <string name="trending">Tendenze</string>
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">New &amp; hot</string>
-<string name="show_hold_to_append_title">Mostra il suggerimento \"Tenere premuto per aggiungere video alla coda\"</string>
+    <string name="show_hold_to_append_title">Mostra il suggerimento \"Tenere premuto per aggiungere video alla coda\"</string>
     <string name="show_hold_to_append_summary">Mostra suggerimento quando il pulsante per la riproduzione popup o in sottofondo viene premuto nella pagina dei dettagli del video</string>
     <string name="background_player_append">In coda al lettore multimediale in sottofondo</string>
     <string name="popup_playing_append">In coda al lettore multimediale a comparsa</string>
     <string name="play_all">Riproduci tutto</string>
-
     <string name="player_stream_failure">Impossibile riprodurre questo flusso</string>
     <string name="player_unrecoverable_failure">Si è verificato un errore irreversibile</string>
     <string name="player_recoverable_failure">Ripristino dell\'errore del lettore multimediale</string>
-
     <string name="title_activity_background_player">Riproduzione in sottofondo</string>
     <string name="title_activity_popup_player">Riproduzione in modalità a comparsa</string>
     <string name="play_queue_remove">Rimuovi</string>
     <string name="play_queue_stream_detail">Dettagli</string>
     <string name="play_queue_audio_settings">Impostazioni audio</string>
     <string name="hold_to_append">Tenere premuto per aggiungere alla coda</string>
-<string name="unknown_content">[Sconosciuto]</string>
-
+    <string name="unknown_content">[Sconosciuto]</string>
     <string name="enqueue_on_background">In coda in sottofondo</string>
     <string name="enqueue_on_popup">In coda nel riproduttore a comparsa</string>
     <string name="start_here_on_main">Inizia la riproduzione qui</string>
     <string name="start_here_on_background">Inizia qui in sottofondo</string>
     <string name="start_here_on_popup">Inizia qui nel riproduttore a comparsa</string>
-<string name="donation_title">Dona</string>
+    <string name="donation_title">Dona</string>
     <string name="website_title">Sito web</string>
     <string name="website_encouragement">Visita il sito web di NewPipe per maggiori informazioni e novità.</string>
     <string name="donation_encouragement">NewPipe è sviluppato da volontari che trascorrono il loro tempo libero per offrire la migliore esperienza. Restituisci il favore per aiutare gli sviluppatori a rendere NewPipe ancora più piacevole mentre si gustano una tazza di caffè.</string>
@@ -310,27 +257,23 @@
     <string name="switch_to_background">Passa alla riproduzione in background</string>
     <string name="switch_to_popup">Passa alla visualizzazione popup</string>
     <string name="switch_to_main">Passa alla produzione predefinita</string>
-
     <string name="service_title">Servizio</string>
     <string name="drawer_open">Apri il menu</string>
     <string name="drawer_close">Chiudi il menu</string>
     <string name="no_player_found_toast">Nessun lettore multimediale trovato. Puoi installare VLC per riprodurlo.</string>
     <string name="always">Sempre</string>
     <string name="just_once">Solo una volta</string>
-
     <string name="external_player_unsupported_link_type">I lettori multimediali esterni non supportano questa tipologia di collegamenti</string>
     <string name="invalid_url_toast">URL non valido</string>
     <string name="video_streams_empty">Nessun flusso video trovato</string>
     <string name="audio_streams_empty">Nessun flusso audio trovato</string>
-
     <string name="video_player">Lettore video</string>
     <string name="background_player">Riproduzione in sottofondo</string>
     <string name="popup_player">Riproduzione in modalità popup</string>
     <string name="always_ask_player">Chiedi sempre</string>
-    
     <string name="preferred_player_fetcher_notification_title">Raccogliendo informazioni…</string>
     <string name="preferred_player_fetcher_notification_message">Caricamento del contenuto richiesto</string>
-<string name="import_data_title">Importa database</string>
+    <string name="import_data_title">Importa database</string>
     <string name="export_data_title">Esporta database</string>
     <string name="import_data_summary">Sovrascrive la cronologia corrente e le iscrizioni</string>
     <string name="export_data_summary">Esporta la cronologia, le iscrizioni e le playlist</string>
@@ -339,94 +282,70 @@
     <string name="no_valid_zip_file">Nessun file ZIP valido</string>
     <string name="could_not_import_all_files">Attenzione: Impossibile importare tutti i file.</string>
     <string name="override_current_data">Questa operazione sostituirà le tue impostazioni attuali.</string>
-
     <string name="controls_download_desc">Scarica il video</string>
     <string name="show_info">Mostra informazioni</string>
-
     <string name="tab_bookmarks">Playlist preferite</string>
-
     <string name="controls_add_to_playlist_title">Aggiungi a</string>
-
     <string name="detail_drag_description">Trascina per riordinare</string>
-
     <string name="create">Crea</string>
     <string name="delete_one">Elimina uno</string>
     <string name="delete_all">Elimina tutti</string>
     <string name="dismiss">Ignora</string>
     <string name="rename">Rinomina</string>
-
     <string name="delete_stream_history_prompt">Vuoi eliminare questo elemento dalla cronologia delle visualizzazioni?</string>
     <string name="delete_all_history_prompt">Sei sicuro di voler eliminare tutti gli elementi dalla cronologia?</string>
     <string name="title_last_played">Ultima riproduzione</string>
     <string name="title_most_played">I più riprodotti</string>
-
     <string name="always_ask_open_action">Chiedi sempre</string>
-    
     <string name="create_playlist">Nuova scaletta</string>
     <string name="delete_playlist">Elimina scaletta</string>
     <string name="rename_playlist">Rinomina scaletta</string>
     <string name="playlist_name_input">Nome</string>
     <string name="append_playlist">Aggiunti alla playlist</string>
     <string name="set_as_playlist_thumbnail">Imposta come miniatura della playlist</string>
-
     <string name="bookmark_playlist">Segnalibri playlist</string>
     <string name="unbookmark_playlist">Rimuovi segnalibro</string>
-
     <string name="delete_playlist_prompt">Eliminare questa scaletta\?</string>
     <string name="playlist_creation_success">Playlist creata</string>
     <string name="playlist_add_stream_success">Aggiunti alla scaletta</string>
     <string name="playlist_thumbnail_change_success">Miniatura della scaletta cambiata.</string>
     <string name="playlist_delete_failure">Impossibile eliminare la scaletta.</string>
-
     <string name="caption_none">No sottotitoli</string>
-
     <string name="resize_fit">Rientrato</string>
     <string name="resize_fill">Pieno</string>
     <string name="resize_zoom">Ingrandito</string>
-
     <string name="caption_font_size_settings_title">Dimensione dei caratteri dei sottotitoli</string>
     <string name="smaller_caption_font_size">Carattere più piccolo</string>
     <string name="normal_caption_font_size">Carattere normale</string>
     <string name="larger_caption_font_size">Carattere più grande</string>
-
-	<string name="drawer_header_action_paceholder_text">A breve qualcosa apparirà qui ;D</string>
-
-<string name="settings_category_debug_title">Debug</string>
+    <string name="drawer_header_action_paceholder_text">A breve qualcosa apparirà qui ;D</string>
+    <string name="settings_category_debug_title">Debug</string>
     <string name="caption_auto_generated">Generato automaticamente</string>
     <string name="enable_leak_canary_title">Abilita LeakCanary</string>
     <string name="enable_leak_canary_summary">Il monitoraggio delle perdite di memoria potrebbe causare la mancata risposta dell\'applicazione durante il dumping dell\'heap</string>
-
     <string name="enable_disposed_exceptions_title">Segnala Errori \"Out-of-lifecycle\"</string>
     <string name="enable_disposed_exceptions_summary">Forza la segnalazione di eccezioni Rx non consegnabili al di fuori del ciclo di vita dell\'attività dopo la chiusura</string>
-
-<string name="use_inexact_seek_title">Usa la ricerca rapida ma imprecisa</string>
+    <string name="use_inexact_seek_title">Usa la ricerca rapida ma imprecisa</string>
     <string name="use_inexact_seek_summary">La ricerca imprecisa permette al lettore multimediale di spostarsi nelle posizioni più velocemente con una precisione ridotta</string>
     <string name="auto_queue_title">Metti in coda automaticamente il prossimo flusso</string>
     <string name="auto_queue_summary">Aggiungi automaticamente un flusso correlato quando è in corso la riproduzione dell\'ultimo flusso in una coda non ripetitiva.</string>
     <string name="live_sync">SINCRONIZZAZIONE</string>
-
     <string name="file">File</string>
-
     <string name="invalid_directory">Nessuna cartella</string>
     <string name="invalid_source">Nessun file o cartella che contiene sorgenti</string>
     <string name="invalid_file">Il file non esiste o non si hanno i permessi sufficienti di scrittura o lettura</string>
     <string name="file_name_empty_error">Il nome del file non può essere vuoto</string>
     <string name="error_occurred_detail">Si è verificato un errore: %1$s</string>
-
     <string name="import_export_title">Importa/esporta</string>
     <string name="import_title">Importa</string>
     <string name="import_from">Importa da</string>
     <string name="export_to">Esporta in</string>
-
     <string name="import_ongoing">Importando…</string>
     <string name="export_ongoing">Esportando…</string>
-
     <string name="import_file_title">Importa file</string>
     <string name="previous_export">Esportazione precedente</string>
-
     <string name="subscriptions_import_unsuccessful">Impossibile importare le iscrizioni</string>
     <string name="subscriptions_export_unsuccessful">Impossibile esportare le iscrizioni</string>
-
     <string name="import_youtube_instructions">Importa le iscrizioni di YouTube scaricando il file d\'esportazione: 
 \n 
 \n1. Vai a questo URL: %1$s 
@@ -439,11 +358,10 @@
 \n3. Accedi quando richiesto
 \n4. Copia l\'URL del profilo a cui vieni indirizzato.</string>
     <string name="import_soundcloud_instructions_hint">iltuoID, soundcloud.com/iltuoid</string>
-
     <string name="import_network_expensive_warning">Tieni presente che questa operazione può consumare una grande quantità di traffico dati.
 \n 
 \nVuoi continuare?</string>
-<string name="download_thumbnail_title">Carica miniature</string>
+    <string name="download_thumbnail_title">Carica miniature</string>
     <string name="download_thumbnail_summary">Disabilita il caricamento delle miniature, risparmiando dati e memoria. La modifica dell\'opzione comporta la cancellazione della cache in memoria e sul disco.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Pulizia della cache delle immagini completata</string>
     <string name="metadata_cache_wipe_title">Pulisci la cache dei metadati</string>
@@ -455,16 +373,12 @@
     <string name="unhook_checkbox">Scollega (può causare distorsione)</string>
     <string name="playback_nightcore">Nightcore</string>
     <string name="playback_default">Valore predefinito</string>
-<string name="no_streams_available_download">Nessun flusso disponibile per il download</string>
-
+    <string name="no_streams_available_download">Nessun flusso disponibile per il download</string>
     <string name="preferred_open_action_settings_title">\'Apri\' preferibilmente con</string>
     <string name="preferred_open_action_settings_summary">Azione predefinita all\'apertura del contenuto — %s</string>
-
     <string name="caption_setting_title">Sottotitoli</string>
     <string name="caption_setting_description">Modifica la dimensione e gli stili di sfondo dei sottotitoli. Per applicare le modifiche è richesto un riavvio.</string>
-
     <string name="toast_no_player">Nessuna app installata per riprodurre questo file</string>
-
     <string name="clear_views_history_title">Pulisci cronologia visualizzazioni</string>
     <string name="clear_views_history_summary">Elimina la cronologia dei flussi riprodotti</string>
     <string name="delete_view_history_alert">Elimina l\'intera cronologia delle visualizzazioni\?</string>
@@ -474,10 +388,8 @@
     <string name="delete_search_history_alert">Elimina l\'intera cronologia delle ricerche\?</string>
     <string name="search_history_deleted">Cronologia delle ricerche eliminata.</string>
     <string name="one_item_deleted">1 elemento eliminato.</string>
-
     <string name="app_license">NewPipe è un software libero con licenza copyleft: si può utilizzarlo, studiarlo, condividerlo e migliorarlo a proprio piacimento. In particolare, è possibile ridistribuirlo e/o modificarlo secondo i termini della GNU General Public License pubblicata dalla Free Software Foundation, sia nella versione 3 della Licenza, sia (a propria discrezione) in qualsiasi versione successiva.</string>
     <string name="import_settings">Vuoi anche importare le impostazioni?</string>
-
     <string name="privacy_policy_title">Informativa sulla privacy</string>
     <string name="privacy_policy_encouragement">Il progetto NewPipe tiene molto alla tua privacy. Perciò, l\'app non raccoglie alcun dato senza il tuo consenso.
 \nL\'informativa sulla privacy di NewPipe spiega in dettaglio quali dati vengono inviati e memorizzati quando si invia un rapporto sugli arresti anomali.</string>
@@ -486,20 +398,17 @@
 \nDevi accettarla per inviarci il bug report.</string>
     <string name="accept">Accetto</string>
     <string name="decline">Rifiuto</string>
-
     <string name="limit_data_usage_none_description">Senza limiti</string>
     <string name="limit_mobile_data_usage_title">Limita la risoluzione quando si utilizzano dati mobili</string>
     <string name="skip_silence_checkbox">Avanzamento veloce durante il silenzio</string>
     <string name="playback_step">Step</string>
     <string name="playback_reset">Reset</string>
-
     <string name="minimize_on_exit_title">Minimizza al cambio dell\'applicazione</string>
     <string name="minimize_on_exit_summary">Azione quando si passa ad un\'altra app dal lettore video principale — %s</string>
     <string name="minimize_on_exit_none_description">Nessuna</string>
     <string name="minimize_on_exit_background_description">Minimizza al lettore in sottofondo</string>
     <string name="minimize_on_exit_popup_description">Minimizza al lettore popup</string>
-
-<string name="channels">Canali</string>
+    <string name="channels">Canali</string>
     <string name="playlists">Playlist</string>
     <string name="tracks">Tracce</string>
     <string name="users">Utenti</string>
@@ -564,7 +473,7 @@
     <string name="max_retry_msg">Tentativi massimi</string>
     <string name="max_retry_desc">Tentativi massimi prima di cancellare il download</string>
     <string name="pause_downloads_on_mobile">Metti in pausa quando si usano i dati mobili</string>
-    <string name="pause_downloads_on_mobile_desc">I download che non possono essere messi in pausa verranno ravviati</string>
+    <string name="pause_downloads_on_mobile_desc">I download che non possono essere messi in pausa verranno riavviati</string>
     <string name="events">Eventi</string>
     <string name="conferences">Conferenze</string>
 </resources>
\ No newline at end of file

From 6a5f2402c767774c90e25315a7022027afd8f924 Mon Sep 17 00:00:00 2001
From: Le Poisson Libre <services@spika.xyz>
Date: Fri, 22 Mar 2019 18:45:30 +0000
Subject: [PATCH 036/138] Translated using Weblate (French)

Currently translated at 97.3% (431 of 443 strings)
---
 app/src/main/res/values-fr/strings.xml | 123 +++++--------------------
 1 file changed, 21 insertions(+), 102 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 98ed64f37..7838e841c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -30,7 +30,6 @@
     <string name="url_not_supported_toast">URL non supportée</string>
     <string name="settings_category_video_audio_title">Vidéo &amp; audio</string>
     <string name="settings_category_other_title">Autre</string>
-
     <string name="list_thumbnail_view_description">Miniature d’aperçu vidéo</string>
     <string name="detail_thumbnail_view_description">Miniature d’aperçu vidéo</string>
     <string name="detail_dislikes_img_view_description">Je n’aime pas</string>
@@ -41,32 +40,26 @@
     <string name="use_external_audio_player_title">Utiliser un lecteur audio externe</string>
     <string name="background_player_playing_toast">Lecture en arrière-plan</string>
     <string name="play_btn_text">Lire</string>
-
     <string name="use_tor_title">Utiliser Tor</string>
     <string name="use_tor_summary">(Expérimental) Rediriger le trafic de téléchargement via Tor pour plus de confidentialité (streaming non supporté pour le moment).</string>
     <string name="theme_title">Thème</string>
     <string name="dark_theme_title">Sombre</string>
     <string name="light_theme_title">Clair</string>
-
     <string name="settings_category_appearance_title">Apparence</string>
     <string name="network_error">Erreur réseau</string>
-
     <string name="download_path_audio_title">Dossier de téléchargement audio</string>
     <string name="download_path_audio_summary">L\'audio téléchargé est stocké ici</string>
     <string name="download_path_audio_dialog_title">Entrez le chemin de téléchargement des fichiers audio</string>
-
     <string name="err_dir_create">Impossible de créer le répertoire de téléchargement « %1$s »</string>
     <string name="info_dir_created">Répertoire de téléchargement « %1$s » créé</string>
     <string name="general_error">Erreur</string>
     <string name="parsing_error">Impossible d\'analyser le site web</string>
     <string name="content_not_available">Contenu non disponible</string>
     <string name="blocked_by_gema">Bloqué par GEMA</string>
-
     <string name="error_snackbar_message">Désolé, des erreurs se sont produites.</string>
     <string name="content">Contenu</string>
     <string name="show_age_restricted_content_title">Contenu avec limite d\'âge</string>
     <string name="duration_live">EN DIRECT</string>
-
     <string name="could_not_load_thumbnails">Impossible de charger toutes les miniatures</string>
     <string name="youtube_signature_decryption_error">Impossible de déchiffrer la signature URL de la vidéo</string>
     <string name="light_parsing_error">Impossible d\'analyser complètement le site web</string>
@@ -78,8 +71,6 @@
     <string name="what_happened_headline">Ce qui s\'est passé :</string>
     <string name="your_comment">Votre commentaire (en anglais) :</string>
     <string name="error_details_headline">Détails :</string>
-
-
     <string name="report_error">Signaler une erreur</string>
     <string name="video">Vidéo</string>
     <string name="audio">Audio</string>
@@ -89,23 +80,19 @@
     <string name="autoplay_by_calling_app_title">Lecture automatique</string>
     <string name="video_is_age_restricted">Afficher les vidéos soumises à une limite d\'âge. Autoriser ce type de contenu est possible depuis les paramètres.</string>
     <string name="user_report">Rapport utilisateur</string>
-
     <string name="error_snackbar_action">SIGNALER</string>
     <string name="could_not_setup_download_menu">Impossible de configurer le menu de téléchargement</string>
     <string name="could_not_get_stream">Impossible d\'obtenir un flux</string>
     <string name="downloads">Téléchargements</string>
     <string name="downloads_title">Téléchargements</string>
     <string name="error_report_title">Rapport d\'erreur</string>
-
     <string name="start">Lire</string>
     <string name="pause">Pause</string>
     <string name="view">Lire</string>
     <string name="delete">Supprimer</string>
     <string name="checksum">Somme de contrôle</string>
-
     <string name="add">Nouveau</string>
     <string name="finish">OK</string>
-
     <string name="msg_name">Nom du fichier</string>
     <string name="msg_threads">Threads</string>
     <string name="msg_error">Erreur</string>
@@ -117,71 +104,53 @@
     <string name="msg_wait">Veuillez patienter…</string>
     <string name="msg_copied">Copié dans le presse-papiers</string>
     <string name="no_available_dir">Sélectionner un dossier de téléchargement disponible</string>
-
     <string name="could_not_load_image">Impossible de charger l\'image</string>
     <string name="app_ui_crash">L’application a crashé</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="black_theme_title">Noir</string>
-
     <string name="all">Tout</string>
     <string name="channel">Chaîne</string>
-
-
     <string name="reCaptcha_title">Défi reCAPTCHA</string>
     <string name="recaptcha_request_toast">Défi reCAPTCHA demandé</string>
-
     <string name="open_in_popup_mode">Ouvrir en mode fenêtré</string>
     <string name="popup_mode_share_menu_title">Mode fenêtré NewPipe</string>
-
     <string name="popup_playing_toast">Lecture en mode fenêtré</string>
     <string name="yes">Oui</string>
     <string name="later">Plus tard</string>
     <string name="disabled">Désactivé</string>
-
     <string name="info_labels">Quoi :\\nRequête :\\nLangue du contenu :\\nService :\\nHeure GMT :\\nPaquet :\\nVersion :\\nVersion du système :</string>
     <string name="use_old_player_title">Utiliser l\'ancien lecteur</string>
     <string name="use_old_player_summary">Ancienne version du lecteur Mediaframework</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
-
     <string name="msg_popup_permission">Cette autorisation est nécessaire pour 
 \nutiliser le mode fenêtré</string>
-
     <string name="controls_background_title">Arrière-plan</string>
     <string name="controls_popup_title">Fenêtre</string>
-
     <string name="default_popup_resolution_title">Résolution de la fenêtre par défaut</string>
     <string name="show_higher_resolutions_title">Afficher résolutions plus élevées</string>
     <string name="show_higher_resolutions_summary">Seulement certains appareils supportent la lecture 2K/4K</string>
     <string name="default_video_format_title">Format vidéo par défaut</string>
     <string name="popup_remember_size_pos_title">Mémoriser la taille et la position de la fenêtre</string>
     <string name="popup_remember_size_pos_summary">Mémoriser la dernière taille et position de la fenêtre</string>
-
     <string name="settings_category_popup_title">Fenêtre</string>
     <string name="filter">Filtre</string>
     <string name="refresh">Actualiser</string>
     <string name="clear">Effacer</string>
     <string name="popup_resizing_indicator_title">Redimensionner</string>
-
     <string name="short_billion">B</string>
-
     <string name="use_external_video_player_summary">Supprime l\'audio à CERTAINES résolutions</string>
     <string name="player_gesture_controls_summary">Utiliser les gestes pour contrôler la luminosité et le volume du lecteur</string>
     <string name="show_search_suggestions_title">Suggestions de recherche</string>
     <string name="show_search_suggestions_summary">Afficher les suggestions lors d\'une recherche</string>
-
-<string name="player_gesture_controls_title">Gestes pour contrôler la lecture</string>
+    <string name="player_gesture_controls_title">Gestes pour contrôler la lecture</string>
     <string name="best_resolution">Meilleure résolution</string>
-
     <string name="subscribe_button_title">S\'abonner</string>
     <string name="subscribed_button_title">Abonné</string>
     <string name="channel_unsubscribed">Désabonné de la chaîne</string>
     <string name="tab_main">Principal</string>
     <string name="tab_subscriptions">Abonnements</string>
-
     <string name="fragment_whats_new">Nouveautés</string>
-
     <string name="settings_category_downloads_title">Téléchargement</string>
     <string name="action_settings">Paramètres</string>
     <string name="action_about">À propos</string>
@@ -196,19 +165,16 @@
     <string name="app_license_title">Licence de NewPipe</string>
     <string name="read_full_license">Lire la licence</string>
     <string name="contribution_title">Contribuer</string>
-<string name="charset_letters_and_digits">Lettres et chiffres</string>
+    <string name="charset_letters_and_digits">Lettres et chiffres</string>
     <string name="title_activity_about">À propos de NewPipe</string>
     <string name="copyright" formatted="true">© %1$s par %2$s sous %3$s</string>
     <string name="contribution_encouragement">Que ce soit pour des idées, traductions, changements de design, nettoyage ou gros changements de code, l\'aide est toujours la bienvenue. Plus on contribue, meilleur il devient !</string>
     <string name="subscription_change_failed">Impossible de modifier l\'abonnement</string>
     <string name="subscription_update_failed">Impossible d\'actualiser l\'abonnement</string>
-
     <string name="resume_on_audio_focus_gain_summary">Continuer la lecture après les interruptions (ex : appels)</string>
-
     <string name="settings_file_charset_title">Caractères autorisés dans les noms de fichiers</string>
     <string name="settings_file_replacement_character_summary">Les caractères invalides sont remplacés par cette valeur</string>
     <string name="settings_file_replacement_character_title">Caractère de remplacement</string>
-
     <string name="enable_search_history_title">Historique de recherche</string>
     <string name="enable_search_history_summary">Conserver les recherches sur l\'appareil</string>
     <string name="enable_watch_history_title">Historique et cache</string>
@@ -219,10 +185,8 @@
     <string name="action_history">Historique</string>
     <string name="history_empty">L\'historique est vide</string>
     <string name="history_cleared">Historique supprimé</string>
-
-<string name="notification_channel_name">Notification NewPipe</string>
+    <string name="notification_channel_name">Notification NewPipe</string>
     <string name="undo">Annuler</string>
-
     <string name="enable_watch_history_summary">Garder une trace des vidéos regardées</string>
     <string name="resume_on_audio_focus_gain_title">Reprendre sur le gain de focus</string>
     <string name="settings_category_player_title">Lecteur</string>
@@ -230,33 +194,27 @@
     <string name="settings_category_history_title">Historique &amp; cache</string>
     <string name="playlist">Liste de lecture</string>
     <string name="notification_channel_description">Notifications pour les lecteurs \"arrière-plan\" et \"fenêtre\" de NewPipe</string>
-
     <string name="search_no_results">Aucun résultat</string>
     <string name="empty_subscription_feed_subtitle">Aucun contenu</string>
-
     <string name="no_subscribers">Aucun abonné</string>
     <plurals name="subscribers">
-	<item quantity="one">%s abonné</item>
-	<item quantity="other">%s abonnés</item>
-</plurals>
-
+        <item quantity="one">%s abonné</item>
+        <item quantity="other">%s abonnés</item>
+    </plurals>
     <string name="no_views">Aucune vue</string>
     <plurals name="views">
-	<item quantity="one">%s vue</item>
-	<item quantity="other">%s vues</item>
-</plurals>
-
+        <item quantity="one">%s vue</item>
+        <item quantity="other">%s vues</item>
+    </plurals>
     <string name="no_videos">Aucune vidéo</string>
     <plurals name="videos">
-    <item quantity="one">Vidéo</item>
-    <item quantity="other">Vidéos</item>
-</plurals>
-
+        <item quantity="one">Vidéo</item>
+        <item quantity="other">Vidéos</item>
+    </plurals>
     <string name="charset_most_special_characters">Caractères spéciaux</string>
-
     <string name="item_deleted">Élément effacé</string>
-<string name="delete_item_search_history">Voulez-vous supprimer cet élément de l\'historique de recherche ?</string>
-<string name="main_page_content">Contenu de la page principale</string>
+    <string name="delete_item_search_history">Voulez-vous supprimer cet élément de l\'historique de recherche ?</string>
+    <string name="main_page_content">Contenu de la page principale</string>
     <string name="blank_page_summary">Page vide</string>
     <string name="subscription_page_summary">Abonnements</string>
     <string name="feed_page_summary">Page de Flux</string>
@@ -265,10 +223,9 @@
     <string name="trending">Populaires</string>
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">Nouveau &amp; populaire</string>
-<string name="background_player_append">En file d\'attente sur le lecteur en arrière-plan</string>
+    <string name="background_player_append">En file d\'attente sur le lecteur en arrière-plan</string>
     <string name="popup_playing_append">En file d\'attente sur le lecteur en fenêtré</string>
     <string name="play_all">Tout lire</string>
-
     <string name="player_stream_failure">Impossible de jouer ce flux</string>
     <string name="player_unrecoverable_failure">Une erreur irrécupérable du lecteur s\'est produite</string>
     <string name="no_channel_subscribed_yet">Pas encore d\'abonnements de chaînes</string>
@@ -280,12 +237,9 @@
     <string name="show_hold_to_append_title">Afficher l\'astuce « Maintenir pour ajouter »</string>
     <string name="show_hold_to_append_summary">Afficher l\'aide \"Appui long pour mettre en file d\'attente\" en appuyant sur les boutons \"Arrière-plan\" et \"Fenêtre\" sur la page de détails d\'une vidéo</string>
     <string name="unknown_content">[Inconnu]</string>
-
     <string name="player_recoverable_failure">Récupération de l\'erreur du lecteur</string>
-
     <string name="kiosk_page_summary">Page Kiosque</string>
     <string name="select_a_kiosk">Sélectionner un kiosque</string>
-
     <string name="kiosk">Kiosque</string>
     <string name="hold_to_append">Appui long pour mettre en file d\'attente</string>
     <string name="enqueue_on_background">Mettre en file d\'attente en arrière-plan</string>
@@ -293,7 +247,7 @@
     <string name="start_here_on_main">Commencer la lecture ici</string>
     <string name="start_here_on_background">Démarrer ici en arrière-plan</string>
     <string name="start_here_on_popup">Démarrer ici en fenêtré</string>
-<string name="donation_title">Donner</string>
+    <string name="donation_title">Donner</string>
     <string name="donation_encouragement">NewPipe est développé par des volontaires sur leur temps libre afin de vous proposer la meilleure expérience possible. Vous pouvez leur offrir un café pour les soutenir dans leurs efforts et rendre NewPipe encore meilleur.</string>
     <string name="website_title">Site</string>
     <string name="website_encouragement">Visitez le site internet de NewPipe pour plus d\'informations et de nouvelles.</string>
@@ -303,24 +257,20 @@
     <string name="switch_to_background">Arrière-plan</string>
     <string name="switch_to_popup">Fenêtré</string>
     <string name="switch_to_main">Normal</string>
-
     <string name="service_title">Service</string>
     <string name="drawer_open">Ouvrir le menu</string>
     <string name="drawer_close">Fermer le menu</string>
     <string name="no_player_found_toast">Aucun lecteur de flux trouvé (vous pouvez installer VLC pour le lire).</string>
     <string name="always">Toujours</string>
     <string name="just_once">Une seule fois</string>
-
     <string name="external_player_unsupported_link_type">Les lecteurs externes ne supportent pas ces types de liens</string>
     <string name="invalid_url_toast">Lien non valide</string>
     <string name="video_streams_empty">Aucun flux vidéo trouvé</string>
     <string name="audio_streams_empty">Aucun flux audio trouvé</string>
-
     <string name="video_player">Lecteur vidéo</string>
     <string name="background_player">Lecteur en arrière-plan</string>
     <string name="popup_player">Lecteur en fenêtré</string>
     <string name="always_ask_player">Toujours demander</string>
-    
     <string name="preferred_player_fetcher_notification_title">Obtention des infos…</string>
     <string name="preferred_player_fetcher_notification_message">Chargement du contenu</string>
     <string name="import_data_title">Importer les données</string>
@@ -332,53 +282,39 @@
     <string name="no_valid_zip_file">Aucun fichier ZIP valide</string>
     <string name="could_not_import_all_files">Avertissement: Impossible d\'importer tous les fichiers.</string>
     <string name="override_current_data">Cela effacera vos paramètres actuels</string>
-
     <string name="show_info">Afficher les infos</string>
-
     <string name="tab_bookmarks">Marque-pages</string>
-
     <string name="controls_add_to_playlist_title">Ajouter à</string>
-
     <string name="detail_drag_description">Faites glisser pour réorganiser</string>
-
     <string name="create">Créer</string>
     <string name="dismiss">Ignorer</string>
     <string name="rename">Renommer</string>
-
     <string name="title_last_played">Dernière lecture</string>
     <string name="delete_all">Tout supprimer</string>
     <string name="delete_stream_history_prompt">Voulez-vous supprimer cet élément de votre historique \?</string>
     <string name="delete_all_history_prompt">Êtes-vous sûr de supprimer tout votre historique \?</string>
     <string name="title_most_played">Vidéos les plus regardées</string>
-
     <string name="always_ask_open_action">Toujours demander</string>
-    
     <string name="create_playlist">Nouvelle liste de lecture</string>
     <string name="delete_playlist">Supprimer</string>
     <string name="rename_playlist">Renommer</string>
     <string name="playlist_name_input">Nom</string>
     <string name="append_playlist">Ajouter à la playlist</string>
     <string name="set_as_playlist_thumbnail">Enregistrer la playlist en local</string>
-
     <string name="bookmark_playlist">Marquer cette playlist</string>
     <string name="unbookmark_playlist">Retirer la marque</string>
-
     <string name="delete_playlist_prompt">Supprimer cette liste de lecture \?</string>
     <string name="playlist_creation_success">Liste de lecture créée</string>
     <string name="playlist_add_stream_success">Ajouté à la liste de lecture</string>
     <string name="playlist_thumbnail_change_success">Miniature de la liste de lecture changée.</string>
     <string name="playlist_delete_failure">Impossible de supprimer la liste de lecture.</string>
-
     <string name="caption_none">Aucuns sous-titres</string>
-
     <string name="resize_fit">Ajuster</string>
     <string name="resize_zoom">Zoom</string>
-
     <string name="caption_font_size_settings_title">Taille des sous-titres</string>
     <string name="smaller_caption_font_size">Petite</string>
     <string name="normal_caption_font_size">Normale</string>
     <string name="larger_caption_font_size">Grande</string>
-
     <string name="use_inexact_seek_title">Recherche rapide approximative</string>
     <string name="use_inexact_seek_summary">Permettre au lecteur d\'accéder plus rapidement à une position au détriment de la précision</string>
     <string name="download_thumbnail_title">Charger les miniatures</string>
@@ -388,44 +324,33 @@
     <string name="metadata_cache_wipe_summary">Effacer toutes les pages web mises en cache</string>
     <string name="metadata_cache_wipe_complete_notice">Données en cache effacées</string>
     <string name="file">Fichier</string>
-
     <string name="invalid_directory">Aucun dossier de ce type</string>
     <string name="invalid_source">Aucun fichier/contenu de ce type</string>
     <string name="invalid_file">Le fichier n’existe pas ou n’est pas accessible en lecture/écriture</string>
     <string name="file_name_empty_error">Le nom du fichier ne peut être vide</string>
     <string name="error_occurred_detail">Une erreur s\'est produite: %1$s</string>
-
     <string name="delete_one">Supprimer un seul média</string>
     <string name="drawer_header_action_paceholder_text">Quelque chose va bien bientôt arriver ;D</string>
-
-
     <string name="controls_download_desc">Télécharger le fichier de flux</string>
     <string name="auto_queue_title">Vidéo suivante en file d\'attente</string>
     <string name="auto_queue_summary">Ajout automatique d\'un morceau suggéré lors de la lecture du dernier morceau dans une file d\'attente non bouclée.</string>
-
     <string name="settings_category_debug_title">Débogage</string>
     <string name="resize_fill">Remplir</string>
     <string name="caption_auto_generated">Générés automatiquement</string>
     <string name="enable_leak_canary_title">Activer LeakCanary</string>
     <string name="enable_leak_canary_summary">La surveillance de la mémoire peut mettre temporairement l\'application en pause pendant les nettoyages</string>
-
     <string name="enable_disposed_exceptions_title">Signaler les erreurs de développement hors cycle</string>
     <string name="enable_disposed_exceptions_summary">Forcer le signalement des exceptions Rx qui surviennent hors activité</string>
-
     <string name="import_export_title">Importer/exporter</string>
     <string name="import_title">Importer</string>
     <string name="import_from">Importer de</string>
     <string name="export_to">Exporter vers</string>
-
     <string name="import_ongoing">Importation en cours…</string>
     <string name="export_ongoing">Exporation en cours…</string>
-
     <string name="import_file_title">Importer fichier</string>
     <string name="previous_export">Export précédent</string>
-
     <string name="subscriptions_import_unsuccessful">Impossible d\'importer des abonnements</string>
     <string name="subscriptions_export_unsuccessful">Impossible d\'exporter les abonnements</string>
-
     <string name="import_youtube_instructions">"Pour importer vos abonnements YouTube vous devez d\'abord télécharger un fichier spécial  de YouTube, selon les modalités suivantes : 
 \n 
 \n1. Suivez ce lien : %1$s 
@@ -438,27 +363,21 @@
 \n3. Connectez-vous à votre compte.
 \n4. Copier l’URL vers lequel vous venez d’être redirigé.</string>
     <string name="import_soundcloud_instructions_hint">votreID, soundcloud.com/votreid</string>
-
     <string name="import_network_expensive_warning">Cette opération peut consommer beaucoup de données mobiles. 
 \n 
 \nSouhaitez-vous continuer ?</string>
-
     <string name="playback_speed_control">Vitesse de lecture</string>
     <string name="playback_tempo">Cadence</string>
     <string name="unhook_checkbox">Détacher (déformations possibles)</string>
     <string name="playback_default">Défaut</string>
-<string name="preferred_open_action_settings_title">Ouvrir de préférence avec</string>
+    <string name="preferred_open_action_settings_title">Ouvrir de préférence avec</string>
     <string name="preferred_open_action_settings_summary">Action par défaut lors de l\'ouverture de contenu - %s</string>
-
     <string name="no_streams_available_download">Aucun flux disponible au téléchargement</string>
-
     <string name="caption_setting_title">Sous-titres</string>
     <string name="caption_setting_description">Modifier la taille du texte et les styles d\'arrière-plan du lecteur. Redémarrage requis pour prendre effet.</string>
-
     <string name="playback_pitch">Ton</string>
     <string name="playback_nightcore">Nightcore</string>
     <string name="toast_no_player">Aucune application installée pour lire ce fichier</string>
-
     <string name="clear_views_history_title">Effacer l\'historique</string>
     <string name="clear_views_history_summary">Supprimer l\'historique des flux regardés</string>
     <string name="delete_view_history_alert">Supprimer tout l\'historique regardé \?</string>
@@ -468,15 +387,13 @@
     <string name="delete_search_history_alert">Supprimer tout l\'historique de recherche \?</string>
     <string name="search_history_deleted">Historique des recherches effacé.</string>
     <string name="one_item_deleted">1 élément supprimé.</string>
-
     <string name="app_license">"NewPipe est un logiciel sous licence libre : Vous pouvez l\'utiliser, l\'étudier, le partager et l\'améliorer  comme bon vous semble. Vous pouvez le redistribuer et/ou le modifier sous les termes de la licence générale publique GNU, comme publiée par la Free Software Foundation, dans sa version 3, ou, à votre convenance, dans une version plus récente."</string>
     <string name="privacy_policy_title">Politique de confidentialité de NewPipe</string>
     <string name="read_privacy_policy">Lire la politique de confidentialité</string>
     <string name="import_settings">Voulez-vous également importer des paramètres \?</string>
-
     <string name="accept">Accepter</string>
     <string name="decline">Refuser</string>
-<string name="privacy_policy_encouragement">Le projet NewPipe prend votre vie privée très à cœur. Ainsi, l’application n’envoie aucune donnée sans votre consentement.
+    <string name="privacy_policy_encouragement">Le projet NewPipe prend votre vie privée très à cœur. Ainsi, l’application n’envoie aucune donnée sans votre consentement.
 \nLa politique de confidentialité de NewPipe explique en détail quelles données sont envoyées et stockées lorsque vous envoyez un rapport de plantage.</string>
     <string name="start_accept_privacy_policy">Afin de se conformer au Règlement Général sur la Protection des Données (RGPD ou GDPR), nous attirons votre attention sur la politique de vie privée de NewPipe. Merci de la lire attentivement.
 \nVous devez l\'accepter pour nous envoyer le rapport de bug.</string>
@@ -489,7 +406,6 @@
     <string name="skip_silence_checkbox">Accélérer pendant les silences</string>
     <string name="playback_step">Étape</string>
     <string name="playback_reset">Réinitialiser</string>
-
     <string name="minimize_on_exit_title">Minimiser lors du changement d\'application</string>
     <string name="minimize_on_exit_summary">Action lors du changement d\'application depuis le lecteur vidéo —%s</string>
     <string name="minimize_on_exit_none_description">Aucune</string>
@@ -527,4 +443,7 @@
     <string name="missions_header_pending">En file</string>
     <string name="paused">En pause</string>
     <string name="download_failed">Téléchargement échoué</string>
+    <string name="conferences">Conférences</string>
+    <string name="download_finished">Téléchargement terminé</string>
+    <string name="download_finished_more">%s téléchargements terminés</string>
 </resources>
\ No newline at end of file

From bef84e9eec5a43bc4e1f92ab07f149cb21fd7694 Mon Sep 17 00:00:00 2001
From: Florian <floflr@zaclys.net>
Date: Fri, 22 Mar 2019 18:49:05 +0000
Subject: [PATCH 037/138] Translated using Weblate (French)

Currently translated at 97.3% (431 of 443 strings)
---
 app/src/main/res/values-fr/strings.xml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7838e841c..c6aa99bfb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -440,10 +440,28 @@
     <string name="app_update_notification_content_title">Une mise à jour de NewPipe disponible !</string>
     <string name="app_update_notification_content_text">Appuyez pour télécharger</string>
     <string name="missions_header_finished">Terminé</string>
-    <string name="missions_header_pending">En file</string>
+    <string name="missions_header_pending">Dans la file d\'attente</string>
     <string name="paused">En pause</string>
     <string name="download_failed">Téléchargement échoué</string>
     <string name="conferences">Conférences</string>
     <string name="download_finished">Téléchargement terminé</string>
     <string name="download_finished_more">%s téléchargements terminés</string>
+    <string name="queued">Ajouté à la file d\'attente</string>
+    <string name="generate_unique_name">Générer un nom unique</string>
+    <string name="overwrite">Écraser</string>
+    <string name="overwrite_warning">Un fichier téléchargé avec ce nom existe déjà</string>
+    <string name="download_already_running">Il y a un téléchargement en cours avec ce nom</string>
+    <string name="show_error">Afficher l\'erreur</string>
+    <string name="label_code">Code</string>
+    <string name="error_path_creation">Le fichier ne peut pas être créé</string>
+    <string name="error_file_creation">Le dossier de destination ne peut pas être créé</string>
+    <string name="error_permission_denied">Autorisation refusée par le système</string>
+    <string name="error_ssl_exception">Échoué de la connexion sécurisée</string>
+    <string name="error_unknown_host">Le serveur est introuvable</string>
+    <string name="error_connect_host">Impossible de se connecter au serveur</string>
+    <string name="error_http_no_content">Le serveur n’envoie pas de données</string>
+    <string name="error_http_not_found">Introuvable</string>
+    <string name="clear_finished_download">Effacer les téléchargements terminés</string>
+    <string name="pause_downloads_on_mobile">Mettre en pause lors du passage en données mobiles</string>
+    <string name="pause_downloads_on_mobile_desc">Les téléchargements qui ne peuvent pas être mis en pause seront redémarrés</string>
 </resources>
\ No newline at end of file

From e92a5414d117c5b2906ffef7123310f69e9958de Mon Sep 17 00:00:00 2001
From: Ahanaf Taskin Ar-Rafee <taskin.ar@protonmail.ch>
Date: Sun, 24 Mar 2019 04:27:36 +0000
Subject: [PATCH 038/138] Translated using Weblate (Bengali (Bangladesh))

Currently translated at 30.5% (135 of 443 strings)
---
 app/src/main/res/values-bn-rBD/strings.xml | 64 +++++++---------------
 1 file changed, 20 insertions(+), 44 deletions(-)

diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 3fb51af36..d6f061888 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="main_bg_subtitle">শুরু করতে অনুসন্ধান এ আলতো চাপ</string>
     <string name="view_count_text">%1$s বার দেখা হয়েছে</string>
@@ -8,30 +8,26 @@
     <string name="cancel">"বাদ দিন "</string>
     <!--     <string name="fdroid_vlc_url" translatable="false">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string> -->
     <string name="open_in_browser">"ব্রাউজারে ওপেন করো "</string>
-    <string name="open_in_popup_mode">"popup মোডে Open করো "</string>
+    <string name="open_in_popup_mode">"পপ-আপ মোডে ওপেন করো "</string>
     <string name="share">শেয়ার</string>
-    <string name="download">ডাউনলোড</string>
-    <string name="search">খোঁজ</string>
-    <string name="settings">"সেটিংস "</string>
+    <string name="download">ডাউনলোউড</string>
+    <string name="search">খুঁজুন</string>
+    <string name="settings">সেটিংস</string>
     <string name="did_you_mean">আপনি কি বুঝিয়েছেনঃ %1$s ?</string>
-    <string name="share_dialog_title">শেয়ার কর</string>
-    <string name="choose_browser">ব্রাউজার পছন্দ কর</string>
+    <string name="share_dialog_title">শেয়ার করুন</string>
+    <string name="choose_browser">ব্রাউজার বাছাই করুন</string>
     <string name="screen_rotation">রোটেশন</string>
-    <string name="use_external_video_player_title">বাহ্যিক ভিডিও প্লেয়ার ব্যবহার করো</string>
-    <string name="use_external_audio_player_title">বাহ্যিক অডিও প্লেয়ার ব্যবহার করো</string>
+    <string name="use_external_video_player_title">বাইরের ভিডিও প্লেয়ার ব্যবহার করুন</string>
+    <string name="use_external_audio_player_title">বহির্গত অডিও প্লেয়ার ব্যবহার করুন</string>
     <string name="popup_mode_share_menu_title">NewPipe পপআপ মোড</string>
-
     <string name="controls_background_title">ব্যাকগ্রাউন্ড</string>
     <string name="controls_popup_title">পপআপ</string>
-
     <string name="download_path_title">ভিডিও ডাউনলোড করার পাথ</string>
     <string name="download_path_summary">ডাউনলোড করা ভিডিওগুলো রাখার ফোল্ডার</string>
     <string name="download_path_dialog_title">ভিডিওগুলির জন্য ডাউনলোডের পাথ প্রবেশ করাও</string>
-
     <string name="download_path_audio_title">অডিও ডাউনলোড পাথ</string>
     <string name="download_path_audio_summary">ডাউনলোড করা অডিও সঞ্চয় করার পাথ</string>
     <string name="download_path_audio_dialog_title">অডিও ফাইলগুলির জন্য ডাউনলোডের পাথ প্রবেশ করাও</string>
-
     <string name="autoplay_by_calling_app_title">স্বয়ংক্রিয়ভাবে প্লে করো যখন অন্য অ্যাপ্লিকেশন থেকে চালু করা হয়</string>
     <string name="autoplay_by_calling_app_summary">স্বয়ংক্রিয়ভাবে একটি ভিডিও প্লে করো যখন NewPipe অন্য অ্যাপ্লিকেশন থেকে চালু করা হয়।</string>
     <string name="default_resolution_title">ডিফল্ট রেজোল্যুশন</string>
@@ -52,7 +48,6 @@
     <string name="black_theme_title">কালো</string>
     <string name="popup_remember_size_pos_title">পপআপ আকার এবং অবস্থান মনে রাখো</string>
     <string name="popup_remember_size_pos_summary">শেষ আকার এবং পপআপ সেট অবস্থান মনে রাখো</string>
-
     <string name="download_dialog_title">ডাউনলোড</string>
     <string name="next_video_title">পরবর্তী ভিডিও</string>
     <string name="show_next_and_similar_title">পরবর্তী এবং অনুরূপ ভিডিওগুলি দেখাও</string>
@@ -83,7 +78,6 @@
     <string name="refresh">রিফ্রেশ</string>
     <string name="clear">পরিষ্কার</string>
     <string name="popup_resizing_indicator_title">আকার পরিবর্তন</string>
-
     <!-- error strings -->
     <string name="general_error">ত্রুটি</string>
     <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
@@ -108,8 +102,6 @@
     <string name="what_happened_headline">কি হয়েছিল:</string>
     <string name="your_comment">তোমার মন্তব্য (ইংরেজিতে):</string>
     <string name="error_details_headline">বর্ণনা:</string>
-
-
     <!-- Content descriptions (for better accessibility) -->
     <string name="list_thumbnail_view_description">ভিডিও প্রাকদর্শন থাম্বনেইল</string>
     <string name="detail_thumbnail_view_description">ভিডিও প্রাকদর্শন থাম্বনেইল</string>
@@ -120,34 +112,26 @@
     <string name="use_tor_summary">(পরীক্ষামূলক) গোপনীয়তা বর্ধিত করতে টর এর মাধ্যমে ডাউনলোড ট্রাফিক জোরপুর্বক পাঠাও (ভিডিওগুলি স্ট্রিমিং এ সমর্থিত নয়)।</string>
     <string name="report_error">একটি ত্রুটি রিপোর্ট করো</string>
     <string name="user_report">ব্যবহারকারীর প্রতিবেদন</string>
-
     <string name="err_dir_create">\'%1$s\' ডাউনলোড ডিরেক্টরি তৈরি করতে পারছে না</string>
     <string name="info_dir_created">\'%1$s\' ডাউনলোড ডিরেক্টরি তৈরি করা হয়েছে</string>
-
     <string name="video">ভিডিও</string>
     <string name="audio">অডিও</string>
     <string name="retry">পুনরায় চেষ্টা করো</string>
     <string name="storage_permission_denied">স্টোরেজ অ্যাক্সেস করার অনুমতি অস্বীকার করা হয়েছে</string>
     <string name="use_old_player_title">পুরানো প্লেয়ার ব্যবহার করো</string>
     <string name="use_old_player_summary">মিডিয়াফ্রেমওয়ার্ক প্লেয়ারের পুরানো বিল্ড।</string>
-
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-
     <!-- Missions -->
     <string name="start">শুরু</string>
     <string name="pause">বিরতি</string>
     <string name="view">প্রদর্শন</string>
     <string name="delete">ডিলেট</string>
     <string name="checksum">চেকসাম</string>
-
     <!-- Fragment -->
     <string name="add">নতুন মিশন</string>
     <string name="finish">ঠিক আছে</string>
-
-
     <!-- Msg -->
     <string name="msg_name">ফাইলের নাম</string>
     <string name="msg_threads">থ্রেড</string>
@@ -161,24 +145,18 @@
     <string name="msg_copied">ক্লিপবোর্ডে অনুলিপি করা হয়েছে।</string>
     <string name="no_available_dir">অনুগ্রহ করে একটি উপলব্ধ ডাউনলোড ডিরেক্টরি নির্বাচন করো।</string>
     <string name="msg_popup_permission">এই অনুমতিটি পপআপ মোডে খুলতে প্রয়োজন</string>
-
     <!-- Checksum types -->
     <!--     <string name="md5" translatable="false">MD5</string> -->
     <!--     <string name="sha1" translatable="false">SHA1</string> -->
     <string name="reCaptchaActivity">রিক্যাপচা</string>
     <string name="reCaptcha_title">reCAPTCHA চ্যালেঞ্জ</string>
     <string name="recaptcha_request_toast">reCAPTCHA চ্যালেঞ্জ অনুরোধ করা হয়েছে</string>
-
     <!-- End of GigaGet's Strings -->
-
     <string name="info_labels">কি:\\nঅনুরোধ:\\nকন্টেন্ট ভাষা:\\nসার্ভিস:\\nসময়(GMT এ):\\nপ্যাকেজ:\\nসংস্করণ:\\nওএস সংস্করণ:\\nআইপি পরিসর:</string>
-<string name="controls_download_desc">Stream file ডাউনলোড করুন।</string>
-    <string name="show_info">তথ্য দেখান</string>
-
+    <string name="controls_download_desc">স্ট্রিম ফাইল ডাউনলোড করুন।</string>
+    <string name="show_info">তথ্য দেখুন</string>
     <string name="fragment_whats_new">কি নতুন</string>
-
     <string name="controls_add_to_playlist_title">যুক্ত করুন</string>
-
     <string name="enable_search_history_title">খোজ ইতিহাস</string>
     <string name="enable_watch_history_title">ইতিহাস</string>
     <string name="service_title">সেবা</string>
@@ -189,25 +167,23 @@
     <string name="playlist">প্লেলিস্ট</string>
     <string name="always">সবসময়</string>
     <string name="just_once">একবার মাত্র</string>
-
     <string name="unknown_content">[অজানা]</string>
-
     <string name="no_views">কোন ভিউ নেই</string>
     <string name="rename">নাম পরিবর্তন করুন</string>
-
     <string name="action_settings">সেটিংস</string>
     <string name="action_open_website">ওয়েব সাইট খুলুন</string>
     <string name="website_title">ওয়েব সাইট</string>
-    <string name="no_player_found_toast">"কোন স্ট্রিম প্লেয়ার পাওয়া যায়নি (প্লে করতে VLC ইন্সটল করতে পারেন)  "</string>
-    <string name="use_external_video_player_summary">যদি এই অপশন অন থাকে তবে কিছু ভিডিওর অডিও কাজ নাও করতে পারে</string>
+    <string name="no_player_found_toast">কোন স্ট্রিম প্লেয়ার পাওয়া যায়নি (প্লে করতে VLC ইন্সটল করতে পারেন)</string>
+    <string name="use_external_video_player_summary">কিছু রেজোলিউশনে ভিডিওর অডিও কাজ করে না</string>
     <string name="subscribe_button_title">সাবস্ক্রাইব</string>
     <string name="subscribed_button_title">সাবস্ক্রাইব করা আছে</string>
-    <string name="channel_unsubscribed">চ্যানেল সাবস্ক্রাইব করা হয়েছে</string>
-    <string name="subscription_change_failed">সাবস্ক্রিপশন পরিবর্তন করা হয়নি</string>
-    <string name="subscription_update_failed">সাবস্ক্রিপশন আপডেট করতে ব্যার্থ হয়েছে</string>
+    <string name="channel_unsubscribed">চ্যানেল থেকে আনসাবস্ক্রাইব্ড</string>
+    <string name="subscription_change_failed">সাবস্ক্রিপশন পরিবর্তন করা যায়নি</string>
+    <string name="subscription_update_failed">সাবস্ক্রিপশন আপডেটে ব্যার্থ</string>
     <string name="tab_main">প্রধান</string>
     <string name="tab_subscriptions">সাবস্ক্রিপশন</string>
-    <string name="tab_bookmarks">বুকমার্কস</string>
-
+    <string name="tab_bookmarks">বুকমার্ককৃত প্লেলিস্টসমূহ</string>
     <string name="use_inexact_seek_title">দ্রুত টানা ব্যাবহার করুন</string>
-    </resources>
+    <string name="unsubscribe">আনসাবস্ক্রাইব</string>
+    <string name="tab_new">নতুন ট্যাব</string>
+</resources>
\ No newline at end of file

From 9bcccc87e6d585c3142438bf5b1af32be7c293d9 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply@github.com>
Date: Tue, 26 Mar 2019 23:35:49 +0100
Subject: [PATCH 039/138] Update README

Add supported services section
Move comment support
---
 README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6c1aa3d4b..d4952b2b8 100644
--- a/README.md
+++ b/README.md
@@ -66,15 +66,22 @@ NewPipe does not use any Google framework libraries, nor the YouTube API. Websit
 * Enqueue videos
 * Local playlists
 * Subtitles
-* Multi-service support (e.g. SoundCloud \[beta\])
 * Livestream support
+* Show comments
 
 ### Coming Features
 
 * Cast to UPnP and Cast
-* Show comments
 * … and many more
 
+### Supported Services
+
+NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/documentation/) provide more info on how a new service can be added to the app and the extractor. Please get in touch with us if you intend to add a new one. Currently supported services are:
+
+* YouTube
+* SoundCloud \[beta\]
+* media.ccc.de \[beta\]
+
 ## Updates
 When a change to the NewPipe code occurs (due to either adding features or bug fixing), eventually a release will occur. These are in the format x.xx.x . In order to get this new version, you can:
  * Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.

From be6bce57711a3d3f32dc4aaaf8640643f5d765a9 Mon Sep 17 00:00:00 2001
From: sherlockbeard <b417044@iiit-bh.ac.in>
Date: Tue, 26 Mar 2019 19:13:38 +0000
Subject: [PATCH 040/138] Translated using Weblate (Hindi)

Currently translated at 74.3% (329 of 443 strings)
---
 app/src/main/res/values-hi/strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 4d7397152..06f53dcd6 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -61,7 +61,7 @@
     <string name="use_external_audio_player_title">अन्य ऑडियो प्लेयर उपयोग करें</string>
     <string name="tab_main">मुख्य</string>
     <string name="subscription_change_failed">"सदस्यता को बदलने में असमर्थ "</string>
-    <string name="subscription_update_failed">सदस्यता को अपडेट करने में असमर्थ है</string>
+    <string name="subscription_update_failed">सदस्यता को अद्यतित नहीं किया जा सका</string>
     <string name="fragment_whats_new">देखे की क्या नया है</string>
     <string name="download_path_title">विडियो को डाउनलोड करने के लिए फाइल की जगह</string>
     <string name="download_path_summary">डाउनलोड किए गए विडियो फाइल को रखने की जगह</string>
@@ -330,7 +330,7 @@
     <string name="download_thumbnail_title">छायाप्रारुप लोड करें</string>
     <string name="use_inexact_seek_title">तेजी से अचूक तलाश का प्रयोग करें</string>
     <string name="use_inexact_seek_summary">अचूक खोज प्लेयर को कम परिशुद्धता के साथ तेजी से पदों की तलाश करने की अनुमति देता है</string>
-    <string name="download_thumbnail_summary">बंद होने पे छोटी छवियां नहीं दिखेंगी। इससे डेटा और मेमोरी की बचत होगी। इसे बदलने से मेमोरी और डिस्क की छवि का भंडार भी साफ़ हो जाएगा।</string>
+    <string name="download_thumbnail_summary">लोडिंग थंबनेल, डेटा और मेमोरी उपयोग को रोकने के लिए बंद करें। इन-मेमोरी और ऑन-डिस्क छवि कैश दोनों को बदलता है</string>
     <string name="thumbnail_cache_wipe_complete_notice">छवि कैश मिटा दिया</string>
     <string name="metadata_cache_wipe_title">कैश मेटाडेटा वाइप करें</string>
     <string name="metadata_cache_wipe_summary">सभी कैश किए गए वेबपृष्ठ डेटा हटाएं</string>
@@ -406,4 +406,5 @@
     <string name="unsubscribe">सदस्यता वापस ले ली</string>
     <string name="tab_new">नया टॅब</string>
     <string name="tab_choose">टॅब चुने</string>
+    <string name="volume_gesture_control_title">वॉल्यूम नियंत्रण</string>
 </resources>
\ No newline at end of file

From c4d451e42011815bd08b39d024aac2fa87d8558d Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <i.nedoboy@mail.ru>
Date: Thu, 28 Mar 2019 23:21:23 +0000
Subject: [PATCH 041/138] Translated using Weblate (Russian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ru/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e83b16772..b151a0f23 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -49,7 +49,7 @@
     <string name="download_path_audio_title">Путь загрузки аудио</string>
     <string name="download_path_audio_summary">Папка для хранения загруженных аудио</string>
     <string name="download_path_audio_dialog_title">Введите путь к папке для загрузки аудио</string>
-    <string name="main_bg_subtitle">Коснитесь поиска, чтобы начать</string>
+    <string name="main_bg_subtitle">Начните с поиска</string>
     <string name="msg_wait">Подождите…</string>
     <string name="msg_exists">Файл уже существует</string>
     <string name="msg_threads">Потоки</string>
@@ -141,7 +141,7 @@
     <string name="best_resolution">Лучшее разрешение</string>
     <string name="reCaptcha_title">Запрос reCAPTCHA</string>
     <string name="recaptcha_request_toast">Запрошен ввод reCAPTCHA</string>
-    <string name="show_higher_resolutions_title">Показывать высокие разрешения</string>
+    <string name="show_higher_resolutions_title">Высокие разрешения</string>
     <string name="popup_mode_share_menu_title">NewPipe в окне</string>
     <string name="title_activity_about">О NewPipe</string>
     <string name="action_settings">Настройки</string>
@@ -470,5 +470,5 @@
     <string name="error_connect_host">Не удалось соединиться с сервером</string>
     <string name="error_http_no_content">Не удалось получить данные с сервера</string>
     <string name="error_postprocessing_failed">Пост-обработка не удалась</string>
-    <string name="pause_downloads_on_mobile">Останавливать скачивание при переходе на мобильную сеть</string>
+    <string name="pause_downloads_on_mobile">Приостановить в мобильной сети</string>
 </resources>
\ No newline at end of file

From c69de107e5b98d6bf759dd4aa1e5efbbbfc2cfb4 Mon Sep 17 00:00:00 2001
From: Stjepan <stjepstjepanovic@gmail.com>
Date: Thu, 28 Mar 2019 13:15:29 +0000
Subject: [PATCH 042/138] Translated using Weblate (Croatian)

Currently translated at 68.8% (305 of 443 strings)
---
 app/src/main/res/values-hr/strings.xml | 131 ++++++++-----------------
 1 file changed, 42 insertions(+), 89 deletions(-)

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index d6972a210..c0cd0cdd1 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,5 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="main_bg_subtitle">Dodirnite pretragu za početak</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="main_bg_subtitle">Dodirnite pretragu za početak</string>
     <string name="view_count_text">%1$s pregleda</string>
     <string name="upload_date_text">Objavljeno %1$s</string>
     <string name="no_player_found">Reproduktor za stream nije pronađen. Želite li instalirati VLC?</string>
@@ -24,23 +25,17 @@
     <string name="channel_unsubscribed">Pretplata na kanalu otkazana</string>
     <string name="subscription_change_failed">Nije moguće promijeniti pretplatu</string>
     <string name="subscription_update_failed">Nije moguće osvježiti pretplatu</string>
-
     <string name="tab_main">Početna</string>
     <string name="tab_subscriptions">Pretplate</string>
-
     <string name="fragment_whats_new">Što je novo</string>
-
     <string name="controls_background_title">Pozadina</string>
     <string name="controls_popup_title">Skočni prozor</string>
-
     <string name="download_path_title">Put za preuzimanje videozapisa</string>
     <string name="download_path_summary">Put za spremanje videozapisa u</string>
     <string name="download_path_dialog_title">Unesi put za preuzimanje videozapisa</string>
-
     <string name="download_path_audio_title">Put za preuzimanje zvuka</string>
     <string name="download_path_audio_summary">Put za spremanje preuzetog zvuka u</string>
     <string name="download_path_audio_dialog_title">Unesi put za preuzimanje zvučne datoteke</string>
-
     <string name="autoplay_by_calling_app_title">Auto. reprod. kada je NewPipe pozvan iz druge apl.</string>
     <string name="autoplay_by_calling_app_summary">Reproducira videozapis kad je NewPipe pozvan iz druge aplikacije</string>
     <string name="default_resolution_title">Zadana razlučivost</string>
@@ -70,10 +65,7 @@
     <string name="enable_watch_history_summary">Pratite pogledane videozapise</string>
     <string name="resume_on_audio_focus_gain_title">Nastavi nakon dobivanja fokusa</string>
     <string name="resume_on_audio_focus_gain_summary">Nastavi reproducirati nakon prekidanja (npr. telefonski pozivi)</string>
-
-
     <string name="download_dialog_title">Preuzmi</string>
-
     <string name="next_video_title">Sljedeći videozapis</string>
     <string name="show_next_and_similar_title">Prikaži \'sljedeće\' i \'slične\' videozapise</string>
     <string name="url_not_supported_toast">URL nije podržan</string>
@@ -102,7 +94,6 @@
     <string name="clear">Očisti</string>
     <string name="popup_resizing_indicator_title">Mijenjanje veličine</string>
     <string name="best_resolution">Najbolja razlučivost</string>
-
     <string name="general_error">Greška</string>
     <string name="network_error">Greška u mreži</string>
     <string name="could_not_load_thumbnails">Nije moguće učitati sve ikone</string>
@@ -125,8 +116,6 @@
     <string name="info_labels">Što:\\nRequest:\\nContent Jezik:\\nService:\\nGMT Vrijeme:\\nPackage:\\nVersion:\\nOS version:</string>
     <string name="your_comment">Vaš komentar (na engleskom):</string>
     <string name="error_details_headline">Detalji:</string>
-
-
     <string name="list_thumbnail_view_description">Sličica pregleda videozapisa</string>
     <string name="detail_thumbnail_view_description">Sličica pregleda videozapisa</string>
     <string name="detail_uploader_thumbnail_view_description">Profilna slika prenositelja</string>
@@ -136,31 +125,24 @@
     <string name="use_tor_summary">(Eksperimentalno) Prisili promet preuzimanja kroz Tor radi povećane privatnosti (streamanje videozapisa još nije podržano).</string>
     <string name="report_error">Prijavi grešku</string>
     <string name="user_report">Korisničke prijave</string>
-
     <string name="err_dir_create">Nije moguće napraviti direktorij za preuzimanje \'%1$s\'</string>
     <string name="info_dir_created">Napravljen direktorij za preuzimanje \'%1$s\'</string>
-
     <string name="video">Videozapis</string>
     <string name="audio">Zvuk</string>
     <string name="retry">Ponovno pokušaj</string>
     <string name="storage_permission_denied">Dozvola za pisanje po pohrani je odbijena</string>
     <string name="use_old_player_title">Koristi stari reproduktor</string>
     <string name="use_old_player_summary">Stari ugrađeni Mediaframework reproduktor</string>
-
-
     <string name="short_thousand">tis</string>
     <string name="short_million">mil</string>
     <string name="short_billion">mlrd</string>
-
     <string name="start">Počni</string>
     <string name="pause">Pauziraj</string>
     <string name="view">Reproduciraj</string>
     <string name="delete">Izbriši</string>
     <string name="checksum">Kontrolna suma</string>
-
     <string name="add">Novi zadatak</string>
     <string name="finish">U redu</string>
-
     <string name="msg_name">Naziv datoteke</string>
     <string name="msg_threads">Niti</string>
     <string name="msg_error">Greška</string>
@@ -174,19 +156,15 @@
     <string name="no_available_dir">Molimo odaberite dostupnu mapu za preuzimanje</string>
     <string name="msg_popup_permission">Ova dozvola je potrebna za
 \notvaranje skočnog prozora</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">reCAPTCHA zadatak</string>
     <string name="recaptcha_request_toast">Traži se reCAPTCHA zadatak</string>
-
     <string name="settings_category_downloads_title">Preuzimanja</string>
     <string name="settings_file_charset_title">Dozvoljeni znakovi u nazivima datoteka</string>
     <string name="settings_file_replacement_character_summary">Nedozvoljeni znakovi su zamjenjeni ovima</string>
     <string name="settings_file_replacement_character_title">Znak za zamjenu</string>
-
     <string name="charset_letters_and_digits">Slova i brojevi</string>
     <string name="charset_most_special_characters">Posebni znakovi</string>
-
     <string name="title_activity_about">O NewPipeu</string>
     <string name="action_settings">Postavke</string>
     <string name="action_about">O aplikaciji</string>
@@ -203,7 +181,6 @@
     <string name="contribution_encouragement">Ako imate ideja za prijevod, promjene u dizajnu, čišćenje koda ili neke veće promjene u kodu, pomoć je uvijek dobro došla. Što više radimo, to bolji postajemo!</string>
     <string name="read_full_license">Pročitaj licencu</string>
     <string name="contribution_title">Doprinos</string>
-
     <string name="title_activity_history">Povijest</string>
     <string name="title_history_search">Pretraživano</string>
     <string name="title_history_view">Gledano</string>
@@ -211,53 +188,43 @@
     <string name="action_history">Povijest</string>
     <string name="history_empty">Povijest je prazna</string>
     <string name="history_cleared">Povijest očišćena</string>
-
-<string name="notification_channel_name">NewPipe obavijest</string>
+    <string name="notification_channel_name">NewPipe obavijest</string>
     <string name="notification_channel_description">Obavijesti za NewPipe pozadinske i skočne reproduktore</string>
-
     <string name="settings_category_player_title">Reproduktor</string>
     <string name="settings_category_player_behavior_title">Ponašanje</string>
     <string name="settings_category_history_title">Povijest</string>
     <string name="playlist">Popis naslova</string>
     <string name="undo">Poništi</string>
-
     <string name="search_no_results">Nema rezultata</string>
     <string name="empty_subscription_feed_subtitle">Ovdje nema ništa osim cvrčaka</string>
-
     <string name="no_subscribers">Nema pretplatnika</string>
     <plurals name="subscribers">
-	<item quantity="one">%s pretplatnik</item>
-	<item quantity="few">%s pretplatnika</item>
-	<item quantity="other">%s pretplatnika</item>
-</plurals>
-
+        <item quantity="one">%s pretplatnik</item>
+        <item quantity="few">%s pretplatnika</item>
+        <item quantity="other">%s pretplatnika</item>
+    </plurals>
     <string name="no_views">Nema pregleda</string>
     <plurals name="views">
-	<item quantity="one">%s pregled</item>
-	<item quantity="few">%s pregleda</item>
-	<item quantity="other">%s pregledi</item>
-</plurals>
-
+        <item quantity="one">%s pregled</item>
+        <item quantity="few">%s pregleda</item>
+        <item quantity="other">%s pregledi</item>
+    </plurals>
     <string name="no_videos">Nema videozapisa</string>
     <plurals name="videos">
-	<item quantity="one">%s video</item>
-	<item quantity="few">%s videozapisa</item>
-	<item quantity="other">%s videozapisi</item>
-</plurals>
-
+        <item quantity="one">%s video</item>
+        <item quantity="few">%s videozapisa</item>
+        <item quantity="other">%s videozapisi</item>
+    </plurals>
     <string name="item_deleted">Stavka je izbrisana</string>
-<string name="background_player_append">U redu čekanja za reprod. u pozadini</string>
+    <string name="background_player_append">U redu čekanja za reprod. u pozadini</string>
     <string name="play_all">Reproduciraj sve</string>
-
     <string name="player_stream_failure">Nije moguće reproducirati ovaj stream</string>
     <string name="player_unrecoverable_failure">Dogodila se neoporavljiva pogreška reproduktora</string>
     <string name="player_recoverable_failure">Oporavljanje od pogreške reproduktora</string>
-
     <string name="show_hold_to_append_title">Prikaži savjet za držanje</string>
     <string name="show_hold_to_append_summary">Prikažite savjet kada je pritisnut gumb za pozadinsku ili skočnu reprodukciju na stranici detalja videozapisa</string>
     <string name="popup_playing_append">U redu čekanja za skočnu reprodukciju</string>
     <string name="delete_item_search_history">Želite li izbrisati ovu stavku iz povijesti pretraživanja?</string>
-
     <string name="main_page_content">Sadržaj</string>
     <string name="blank_page_summary">Prazna stranica</string>
     <string name="kiosk_page_summary">Kiosk stranica</string>
@@ -267,7 +234,6 @@
     <string name="select_a_channel">Odaberite kanal</string>
     <string name="no_channel_subscribed_yet">Niste pretplaćeni na nijedan kanal</string>
     <string name="select_a_kiosk">Odaberite kiosk</string>
-
     <string name="kiosk">Nazivi kioska</string>
     <string name="trending">U trendu</string>
     <string name="top_50">Vrh 50</string>
@@ -278,8 +244,7 @@
     <string name="play_queue_stream_detail">Detalji</string>
     <string name="play_queue_audio_settings">Postavke zvuka</string>
     <string name="hold_to_append">Zadržite za dodavanje u red čekanja</string>
-<string name="unknown_content">[Nepoznato]</string>
-
+    <string name="unknown_content">[Nepoznato]</string>
     <string name="donation_title">Doniraj</string>
     <string name="website_title">Web stranica</string>
     <string name="start_here_on_main">Ovdje započni reprodukciju</string>
@@ -287,58 +252,43 @@
     <string name="enqueue_on_background">Dodaj na red čekanja u pozadini</string>
     <string name="enqueue_on_popup">Dodaj na red u skočnom prozoru</string>
     <string name="start_here_on_popup">Započni ovdje u Skočnom prozoru</string>
-
     <string name="drawer_open">Otvori ladicu</string>
     <string name="drawer_close">Zatvori ladicu</string>
     <string name="drawer_header_action_paceholder_text">Nešto će zasigurno doći ovdje :D</string>
-
-
     <string name="video_player">Video reprodukcija</string>
     <string name="background_player">Pozadinska reprodukcija</string>
     <string name="popup_player">Skočna reprodukcija</string>
     <string name="always_ask_open_action">Uvjek pitaj</string>
-    
     <string name="preferred_player_fetcher_notification_title">Dohvaćam informacije…</string>
     <string name="preferred_player_fetcher_notification_message">Odabrani sadržaj se učitava</string>
-
     <string name="create_playlist">Napravi novu reprodukcijsku listu</string>
     <string name="delete_playlist">Izbriši reprodukcijsku listu</string>
     <string name="rename_playlist">Preimenuj reprodukcijsku listu</string>
     <string name="playlist_name_input">Ime liste</string>
     <string name="append_playlist">Dodaj na reprodukcijsku listu</string>
     <string name="set_as_playlist_thumbnail">Postavi kao sliku na listu</string>
-
     <string name="bookmark_playlist">Markirajte reprodukcijsku listu</string>
     <string name="unbookmark_playlist">"Odmarkirajte "</string>
-
     <string name="delete_playlist_prompt">Želite li izbrisati listu?</string>
     <string name="playlist_creation_success">Reprodukcijska lista je kreirana</string>
     <string name="playlist_add_stream_success">Dodano na listuu</string>
     <string name="playlist_thumbnail_change_success">Slika liste se promjenila</string>
     <string name="playlist_delete_failure">Greška prilikom brisanja liste</string>
-
     <string name="caption_none">Bez naslova</string>
-
     <string name="resize_fit">Podesno</string>
     <string name="resize_fill">Ispuniti</string>
     <string name="resize_zoom">Povećaj</string>
-
     <string name="caption_auto_generated">Auto generirano</string>
     <string name="caption_font_size_settings_title">Veličina fonta naslova</string>
     <string name="smaller_caption_font_size">Manji font</string>
     <string name="normal_caption_font_size">Normalni font</string>
     <string name="larger_caption_font_size">Veći font</string>
-
     <string name="enable_leak_canary_title">Omogući \"LeakCanary\"</string>
     <string name="enable_leak_canary_summary">Monitoring curenja memorije može uzrokovati greške u radu aplikacije prilikom odlaganje gomile</string>
-
     <string name="enable_disposed_exceptions_title">Izvijestite o pogreškama izvan životnog ciklusa</string>
     <string name="show_info">Prikaži informacije</string>
-
     <string name="tab_bookmarks">Oznake</string>
-
     <string name="controls_add_to_playlist_title">Dodaj u</string>
-
     <string name="download_thumbnail_title">Učitaj slike</string>
     <string name="thumbnail_cache_wipe_complete_notice">Slikovna predmemorija obrisana</string>
     <string name="metadata_cache_wipe_title">Obriši predmemorijsku metupodataka</string>
@@ -350,11 +300,9 @@
     <string name="always">Uvijek</string>
     <string name="just_once">Samo jednom</string>
     <string name="file">Datoteka</string>
-
     <string name="switch_to_background">Prijeđi na pozadinu</string>
     <string name="switch_to_popup">Prijeđi na skočni prozor</string>
     <string name="switch_to_main">Prijeđi na glavni</string>
-
     <string name="import_data_title">Uvoz baze podataka</string>
     <string name="export_data_title">Izvoz baze podataka</string>
     <string name="import_data_summary">Poništava vašu trenutnu povijest i pretplate</string>
@@ -371,17 +319,13 @@
     <string name="file_name_empty_error">Naziv datoteke ne može biti prazan</string>
     <string name="error_occurred_detail">Dogodila se greška: %1$s</string>
     <string name="detail_drag_description">Povucite za promjenu redoslijeda</string>
-
     <string name="create">Stvori</string>
     <string name="delete_one">Izbriši jedan</string>
     <string name="delete_all">Izbriši sve</string>
     <string name="dismiss">Odbaci</string>
     <string name="rename">Preimenuj</string>
-
     <string name="one_item_deleted">1 stavka izbrisana.</string>
-
     <string name="toast_no_player">Nijedna aplikacija nije instalirana za reprodukciju te datoteke</string>
-
     <string name="give_back">Vrati</string>
     <string name="website_encouragement">Posjetite web stranicu NewPipe za više informacija i vijesti.</string>
     <string name="privacy_policy_title">NewPipeova pravila o privatnosti</string>
@@ -390,47 +334,37 @@
     <string name="delete_all_history_prompt">Jeste li sigurni da želite izbrisati sve stavke iz povijesti?</string>
     <string name="title_last_played">Zadnje svirano</string>
     <string name="title_most_played">Najviše svirano</string>
-
     <string name="export_complete_toast">Izvoz završen</string>
     <string name="import_complete_toast">Uvoz završen</string>
     <string name="no_valid_zip_file">Nema važeće ZIP datoteke</string>
     <string name="could_not_import_all_files">Upozorenje: Nije moguće uvesti sve datoteke.</string>
     <string name="override_current_data">Ovo će poništiti vaše trenutne postavke.</string>
     <string name="import_settings">Želite li također uvesti postavke?</string>
-
     <string name="import_export_title">Uvoz/Izvoz</string>
     <string name="import_title">Uvoz</string>
     <string name="import_from">Uvoz iz</string>
     <string name="export_to">Izvoz u</string>
-
     <string name="import_ongoing">Uvoz…</string>
     <string name="export_ongoing">Izvoz…</string>
-
     <string name="import_file_title">Uvoz datoteke</string>
     <string name="previous_export">Prethodni izvozi</string>
-
     <string name="subscriptions_import_unsuccessful">Nije moguće uvesti pretplatnike</string>
     <string name="subscriptions_export_unsuccessful">Nije moguće izvesti pretplatnike</string>
-
-    <string name="import_youtube_instructions">Uvezite YouTube pretplatnike preuzimanjem izvozne datoteke:
-\n
-\n1. Idite na ovaj URL: %1%s
-\n2. Ulogirajte se
+    <string name="import_youtube_instructions">Uvezite YouTube pretplatnike preuzimanjem izvozne datoteke: 
+\n 
+\n1. Idite na ovaj URL: %1$s 
+\n2. Ulogirajte se 
 \n3. Preuzimanje bi trebalo početi (to je izvozna datoteka)</string>
     <string name="import_soundcloud_instructions_hint">vašID, soundcloud.com/vašID</string>
-
     <string name="import_network_expensive_warning">Uzmite u obzir da ova operacija može uzrokovat veliku potrošnju prometa.
 \n
 \nŽelite li nastaviti?</string>
-
     <string name="playback_speed_control">Kontrole brzine reprodukcije</string>
     <string name="skip_silence_checkbox">Premotaj naprijed tijekom šutnje</string>
     <string name="playback_step">Korak</string>
     <string name="playback_reset">Resetiraj</string>
-
     <string name="accept">Prihvati</string>
     <string name="decline">Odbij</string>
-
     <string name="limit_data_usage_none_description">Bez ograničenja</string>
     <string name="limit_mobile_data_usage_title">Ograniči rezoluciju tijekom korištenja mobilnih podataka</string>
     <string name="minimize_on_exit_none_description">Nijedan</string>
@@ -438,4 +372,23 @@
     <string name="controls_download_desc">Preuzmite datoteku za stream.</string>
     <string name="use_inexact_seek_title">Koristi brzo netočno premotavanje</string>
     <string name="use_inexact_seek_summary">Netočno premotavanje omogućava reproduktoru da premota na mjesto brže uz manju preciznost</string>
-    </resources>
+    <string name="unsubscribe">Otkaži pretplatu</string>
+    <string name="tab_new">Nova kartica</string>
+    <string name="tab_choose">Odaberi karticu</string>
+    <string name="settings_category_updates_title">Ažuriranja</string>
+    <string name="events">Događaji</string>
+    <string name="file_deleted">Datoteka obrisana</string>
+    <string name="app_update_notification_channel_description">Obavijest za novu verziju NewPipe-a</string>
+    <string name="clear_search_history_summary">Briše povijest ključnih riječi pretraživanja</string>
+    <string name="download_to_sdcard_error_title">Vanjska pohrana nije dostupna</string>
+    <string name="updates_setting_title">Ažuriranja</string>
+    <string name="updates_setting_description">Prikažite obavijest kada je dostupna nova verzija aplikacije</string>
+    <string name="list">Lista</string>
+    <string name="grid">Rešetka</string>
+    <string name="switch_view">Promijeni prikaz</string>
+    <string name="app_update_notification_content_title">NewPipe dostupno ažuriranje!</string>
+    <string name="app_update_notification_content_text">Dodirnite za preuzimanje</string>
+    <string name="download_failed">Preuzimanje nije uspjelo</string>
+    <string name="download_finished">Preuzimanje gotovo</string>
+    <string name="show_error">Prikaži pogrešku</string>
+</resources>
\ No newline at end of file

From 9b6924ec9fc34c591904a6296c140adb4cc72204 Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <i.nedoboy@mail.ru>
Date: Thu, 28 Mar 2019 23:39:16 +0000
Subject: [PATCH 043/138] Translated using Weblate (Russian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b151a0f23..260b73d2b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -458,7 +458,7 @@
     <string name="events">События</string>
     <string name="conferences">Конференции</string>
     <string name="post_processing">Завершающая обработка</string>
-    <string name="missions_header_pending">На очереди</string>
+    <string name="missions_header_pending">В очереди</string>
     <string name="download_finished">Загрузка завершена</string>
     <string name="download_finished_more">" %s загрузок завершено"</string>
     <string name="generate_unique_name">Создать уникальное имя</string>
@@ -466,7 +466,7 @@
     <string name="max_retry_msg">Максимум попыток</string>
     <string name="max_retry_desc">Максимальное число попыток перед отменой загрузки</string>
     <string name="pause_downloads_on_mobile_desc">Загрузки, которые невозможно приостановить, будут перезапущены</string>
-    <string name="error_ssl_exception">Не удалось установить защищенное соединение</string>
+    <string name="error_ssl_exception">Не удалось установить защищённое соединение</string>
     <string name="error_connect_host">Не удалось соединиться с сервером</string>
     <string name="error_http_no_content">Не удалось получить данные с сервера</string>
     <string name="error_postprocessing_failed">Пост-обработка не удалась</string>

From 46b8bdace77cf3dc6a2fdbb342dc49fcf39e76f0 Mon Sep 17 00:00:00 2001
From: Stjepan <stjepstjepanovic@gmail.com>
Date: Fri, 29 Mar 2019 16:03:05 +0000
Subject: [PATCH 044/138] Translated using Weblate (Croatian)

Currently translated at 99.3% (440 of 443 strings)
---
 app/src/main/res/values-hr/strings.xml | 131 ++++++++++++++++++++-----
 1 file changed, 105 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index c0cd0cdd1..9a9bbe004 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -17,7 +17,7 @@
     <string name="choose_browser">Izaberi pretraživač</string>
     <string name="screen_rotation">rotacija</string>
     <string name="use_external_video_player_title">Koristi vanjski reproduktor videozapisa</string>
-    <string name="use_external_video_player_summary">Neke razlučivosti NEĆE imati zvuk kad je ova opcija omogućena</string>
+    <string name="use_external_video_player_summary">Uklanja zvuk na NEKIM rezolucijama</string>
     <string name="use_external_audio_player_title">Koristi vanjski reproduktor za zvuk</string>
     <string name="popup_mode_share_menu_title">NewPipe skočni prozor</string>
     <string name="subscribe_button_title">Pretplati se</string>
@@ -33,8 +33,8 @@
     <string name="download_path_title">Put za preuzimanje videozapisa</string>
     <string name="download_path_summary">Put za spremanje videozapisa u</string>
     <string name="download_path_dialog_title">Unesi put za preuzimanje videozapisa</string>
-    <string name="download_path_audio_title">Put za preuzimanje zvuka</string>
-    <string name="download_path_audio_summary">Put za spremanje preuzetog zvuka u</string>
+    <string name="download_path_audio_title">Mapa za preuzimanje zvuka</string>
+    <string name="download_path_audio_summary">Preuzeti zvuk je spremljen ovdje</string>
     <string name="download_path_audio_dialog_title">Unesi put za preuzimanje zvučne datoteke</string>
     <string name="autoplay_by_calling_app_title">Auto. reprod. kada je NewPipe pozvan iz druge apl.</string>
     <string name="autoplay_by_calling_app_summary">Reproducira videozapis kad je NewPipe pozvan iz druge aplikacije</string>
@@ -61,13 +61,13 @@
     <string name="show_search_suggestions_summary">Prikaži prijedloge pri traženju</string>
     <string name="enable_search_history_title">Povijest pretraživanja</string>
     <string name="enable_search_history_summary">Svaku pretragu spremi lokalno</string>
-    <string name="enable_watch_history_title">Povijest</string>
+    <string name="enable_watch_history_title">Povijest &amp; Predmemorija</string>
     <string name="enable_watch_history_summary">Pratite pogledane videozapise</string>
     <string name="resume_on_audio_focus_gain_title">Nastavi nakon dobivanja fokusa</string>
     <string name="resume_on_audio_focus_gain_summary">Nastavi reproducirati nakon prekidanja (npr. telefonski pozivi)</string>
     <string name="download_dialog_title">Preuzmi</string>
-    <string name="next_video_title">Sljedeći videozapis</string>
-    <string name="show_next_and_similar_title">Prikaži \'sljedeće\' i \'slične\' videozapise</string>
+    <string name="next_video_title">Sljedeće</string>
+    <string name="show_next_and_similar_title">Prikaži \'Sljedeće\' i \'Slične\' videozapise</string>
     <string name="url_not_supported_toast">URL nije podržan</string>
     <string name="content_language_title">Zadani jezik sadržaja</string>
     <string name="settings_category_video_audio_title">Video i zvuk</string>
@@ -80,7 +80,7 @@
     <string name="content">Sadržaj</string>
     <string name="show_age_restricted_content_title">Prikaži eksplicitni sadržaj</string>
     <string name="video_is_age_restricted">Videozapis je dobno ograničen. Dopuštanje takvog sadržaja moguće je u postavkama.</string>
-    <string name="duration_live">uživo</string>
+    <string name="duration_live">UŽIVO</string>
     <string name="downloads">Preuzimanja</string>
     <string name="downloads_title">Preuzimanja</string>
     <string name="error_report_title">Prijavi grešku</string>
@@ -103,7 +103,7 @@
     <string name="content_not_available">Sadržaj nije dostupan</string>
     <string name="blocked_by_gema">Blokirano od GEMA-e</string>
     <string name="could_not_setup_download_menu">Nije moguće postaviti izbornik za preuzimanje</string>
-    <string name="live_streams_not_supported">Ovo je PRIJENOS UŽIVO, koji još nije podržan.</string>
+    <string name="live_streams_not_supported">Prijenos uživo još nije podržan</string>
     <string name="could_not_get_stream">Nije moguće dobaviti stream</string>
     <string name="could_not_load_image">Nije moguće učitati sliku</string>
     <string name="app_ui_crash">Aplikacija/UI se srušio</string>
@@ -184,7 +184,7 @@
     <string name="title_activity_history">Povijest</string>
     <string name="title_history_search">Pretraživano</string>
     <string name="title_history_view">Gledano</string>
-    <string name="history_disabled">Povijest ugašena</string>
+    <string name="history_disabled">Povijest je ugašena</string>
     <string name="action_history">Povijest</string>
     <string name="history_empty">Povijest je prazna</string>
     <string name="history_cleared">Povijest očišćena</string>
@@ -192,7 +192,7 @@
     <string name="notification_channel_description">Obavijesti za NewPipe pozadinske i skočne reproduktore</string>
     <string name="settings_category_player_title">Reproduktor</string>
     <string name="settings_category_player_behavior_title">Ponašanje</string>
-    <string name="settings_category_history_title">Povijest</string>
+    <string name="settings_category_history_title">Povijest &amp; predmemorija</string>
     <string name="playlist">Popis naslova</string>
     <string name="undo">Poništi</string>
     <string name="search_no_results">Nema rezultata</string>
@@ -238,8 +238,8 @@
     <string name="trending">U trendu</string>
     <string name="top_50">Vrh 50</string>
     <string name="new_and_hot">Novo i popularno</string>
-    <string name="title_activity_background_player">Lista čekanja</string>
-    <string name="title_activity_popup_player">Skočni reproduktcija</string>
+    <string name="title_activity_background_player">Pozadinski player</string>
+    <string name="title_activity_popup_player">Skočni reproduktor</string>
     <string name="play_queue_remove">Ukloni</string>
     <string name="play_queue_stream_detail">Detalji</string>
     <string name="play_queue_audio_settings">Postavke zvuka</string>
@@ -250,20 +250,20 @@
     <string name="start_here_on_main">Ovdje započni reprodukciju</string>
     <string name="start_here_on_background">Ovdje započni repr. u pozadini</string>
     <string name="enqueue_on_background">Dodaj na red čekanja u pozadini</string>
-    <string name="enqueue_on_popup">Dodaj na red u skočnom prozoru</string>
+    <string name="enqueue_on_popup">Dodaj na red u novom skočnom prozoru</string>
     <string name="start_here_on_popup">Započni ovdje u Skočnom prozoru</string>
     <string name="drawer_open">Otvori ladicu</string>
     <string name="drawer_close">Zatvori ladicu</string>
-    <string name="drawer_header_action_paceholder_text">Nešto će zasigurno doći ovdje :D</string>
+    <string name="drawer_header_action_paceholder_text">Nešto će se uskoro pojaviti :D</string>
     <string name="video_player">Video reprodukcija</string>
     <string name="background_player">Pozadinska reprodukcija</string>
     <string name="popup_player">Skočna reprodukcija</string>
     <string name="always_ask_open_action">Uvjek pitaj</string>
     <string name="preferred_player_fetcher_notification_title">Dohvaćam informacije…</string>
     <string name="preferred_player_fetcher_notification_message">Odabrani sadržaj se učitava</string>
-    <string name="create_playlist">Napravi novu reprodukcijsku listu</string>
-    <string name="delete_playlist">Izbriši reprodukcijsku listu</string>
-    <string name="rename_playlist">Preimenuj reprodukcijsku listu</string>
+    <string name="create_playlist">Nova reprodukcijska lista</string>
+    <string name="delete_playlist">Izbriši</string>
+    <string name="rename_playlist">Preimenuj</string>
     <string name="playlist_name_input">Ime liste</string>
     <string name="append_playlist">Dodaj na reprodukcijsku listu</string>
     <string name="set_as_playlist_thumbnail">Postavi kao sliku na listu</string>
@@ -271,9 +271,9 @@
     <string name="unbookmark_playlist">"Odmarkirajte "</string>
     <string name="delete_playlist_prompt">Želite li izbrisati listu?</string>
     <string name="playlist_creation_success">Reprodukcijska lista je kreirana</string>
-    <string name="playlist_add_stream_success">Dodano na listuu</string>
-    <string name="playlist_thumbnail_change_success">Slika liste se promjenila</string>
-    <string name="playlist_delete_failure">Greška prilikom brisanja liste</string>
+    <string name="playlist_add_stream_success">Dodano na listu</string>
+    <string name="playlist_thumbnail_change_success">Slika liste se promjenila.</string>
+    <string name="playlist_delete_failure">Greška prilikom brisanja liste.</string>
     <string name="caption_none">Bez naslova</string>
     <string name="resize_fit">Podesno</string>
     <string name="resize_fill">Ispuniti</string>
@@ -287,7 +287,7 @@
     <string name="enable_leak_canary_summary">Monitoring curenja memorije može uzrokovati greške u radu aplikacije prilikom odlaganje gomile</string>
     <string name="enable_disposed_exceptions_title">Izvijestite o pogreškama izvan životnog ciklusa</string>
     <string name="show_info">Prikaži informacije</string>
-    <string name="tab_bookmarks">Oznake</string>
+    <string name="tab_bookmarks">Označene Liste za reprodukciju</string>
     <string name="controls_add_to_playlist_title">Dodaj u</string>
     <string name="download_thumbnail_title">Učitaj slike</string>
     <string name="thumbnail_cache_wipe_complete_notice">Slikovna predmemorija obrisana</string>
@@ -309,13 +309,13 @@
     <string name="export_data_summary">Izvoz povijesti, pretplata i playlisti</string>
     <string name="clear_views_history_title">Očisti povijest gledanja</string>
     <string name="clear_views_history_summary">Briše povijest reproduciranih streamova</string>
-    <string name="delete_view_history_alert">Obriši cijelu povijest gledanja.</string>
+    <string name="delete_view_history_alert">Obriši cijelu povijest gledanja\?</string>
     <string name="view_history_deleted">Povijest gledanja izbrisana.</string>
     <string name="clear_search_history_title">Obriši povijest pretraživanja</string>
-    <string name="delete_search_history_alert">Obriši cijelu povijest pretraživanja.</string>
+    <string name="delete_search_history_alert">Obriši cijelu povijest pretraživanja\?</string>
     <string name="search_history_deleted">Povijest pretraživanja obrisana.</string>
     <string name="invalid_url_toast">Neispravan URL</string>
-    <string name="invalid_directory">Nevažeći direktorij</string>
+    <string name="invalid_directory">Nema takve mape</string>
     <string name="file_name_empty_error">Naziv datoteke ne može biti prazan</string>
     <string name="error_occurred_detail">Dogodila se greška: %1$s</string>
     <string name="detail_drag_description">Povucite za promjenu redoslijeda</string>
@@ -368,8 +368,8 @@
     <string name="limit_data_usage_none_description">Bez ograničenja</string>
     <string name="limit_mobile_data_usage_title">Ograniči rezoluciju tijekom korištenja mobilnih podataka</string>
     <string name="minimize_on_exit_none_description">Nijedan</string>
-    <string name="no_player_found_toast">Reproduktor za stream nije pronađen (možete instalirati VLC za reprodukciju)</string>
-    <string name="controls_download_desc">Preuzmite datoteku za stream.</string>
+    <string name="no_player_found_toast">Reproduktor za stream nije pronađen (možete instalirati VLC za reprodukciju).</string>
+    <string name="controls_download_desc">Preuzmite datoteku za stream</string>
     <string name="use_inexact_seek_title">Koristi brzo netočno premotavanje</string>
     <string name="use_inexact_seek_summary">Netočno premotavanje omogućava reproduktoru da premota na mjesto brže uz manju preciznost</string>
     <string name="unsubscribe">Otkaži pretplatu</string>
@@ -391,4 +391,83 @@
     <string name="download_failed">Preuzimanje nije uspjelo</string>
     <string name="download_finished">Preuzimanje gotovo</string>
     <string name="show_error">Prikaži pogrešku</string>
+    <string name="download_thumbnail_summary">Isključite kako biste spriječili učitavanje sličica, spremanje podataka i korištenja memorije. Promjene čiste predmemoriju i predmemoriju slika.</string>
+    <string name="metadata_cache_wipe_summary">Uklonite sve podatke iz privremenih web-stranica</string>
+    <string name="metadata_cache_wipe_complete_notice">Metapodaci su izbrisani</string>
+    <string name="auto_queue_title">Automatski dodaj u red sljedeće strujanje</string>
+    <string name="auto_queue_summary">Automatsko dodavanje povezanog videozapisa tijekom reprodukcije posljednjeg videozapisa u neponavljajućem redu.</string>
+    <string name="volume_gesture_control_title">Kontrola glasnoće pomoću gesti</string>
+    <string name="volume_gesture_control_summary">Koristi gesture za kontrolu glasnoće</string>
+    <string name="brightness_gesture_control_title">Kontrola svjetline pomoću gesti</string>
+    <string name="brightness_gesture_control_summary">Koristi gesture za kontrolu svjetline</string>
+    <string name="default_content_country_title">Zadana zemlja sadržaja</string>
+    <string name="settings_category_debug_title">Otkrivanje grešaka</string>
+    <string name="app_update_notification_channel_name">Obavijest o ažuriranju aplikacije</string>
+    <string name="toggle_orientation">Uključite ili isključite orijentaciju</string>
+    <string name="download_to_sdcard_error_message">Preuzimanje na vanjsku SD karticu još nije moguće. Poništite lokaciju mape za preuzimanje\?</string>
+    <string name="external_player_unsupported_link_type">Vanjski playeri ne podržavaju ove vrste veza</string>
+    <string name="video_streams_empty">Nije pronađen nijedan videozapis</string>
+    <string name="audio_streams_empty">Nije pronađen nijedan zvuk</string>
+    <string name="invalid_source">Nema takve datoteke/izvora sadržaja</string>
+    <string name="invalid_file">Datoteka ne postoji ili joj nedostaje dopuštenje za čitanje ili pisanje</string>
+    <string name="no_streams_available_download">Nema dostupnih videozapisa za preuzimanje</string>
+    <string name="saved_tabs_invalid_json">Pomoću zadanih kartica pojavljuje se pogreška prilikom čitanja spremljenih kartica</string>
+    <string name="restore_defaults">Vratiti zadane</string>
+    <string name="restore_defaults_confirmation">Želite li vratiti zadane postavke\?</string>
+    <string name="subscribers_count_not_available">Broj pretplatnika nije dostupan</string>
+    <string name="donation_encouragement">NewPipe razvijaju volonteri koji provode vrijeme donoseći vam najbolje iskustvo. Vratite im kako biste programerima učinili da NewPipe bude još bolji dok uživate u šalici kave.</string>
+    <string name="main_page_content_summary">Koje su kartice prikazane na glavnoj stranici</string>
+    <string name="selection">Izbor</string>
+    <string name="conferences">Konferencije</string>
+    <string name="preferred_open_action_settings_title">Preferirana \'otvori\' akcija</string>
+    <string name="preferred_open_action_settings_summary">Zadana radnja pri otvaranju sadržaja — %s</string>
+    <string name="caption_setting_title">Podnaslovi</string>
+    <string name="caption_setting_description">Izmijenite skalu teksta naslova player-a i pozadinske stilove. Potrebno je ponovno pokretanje aplikacije kako bi stupilo na snagu.</string>
+    <string name="enable_disposed_exceptions_summary">Prisilno izvješćivanje o greškama Rx-a koje se ne mogu isporučiti izvan \'fragmenta\' ili životnog ciklusa aktivnosti nakon odlaganja</string>
+    <string name="import_soundcloud_instructions">Uvezite SoundCloud profil tako da upišete URL ili svoj ID:
+\n
+\n1. Omogućite \"način rada na radnoj površini\" u web-pregledniku (stranica nije dostupna na mobilnim uređajima)
+\n2. Idite na ovaj URL: %1$s
+\n3. Ulogirajte se
+\n4. Kopirajte URL profila na koji ste preusmjereni.</string>
+    <string name="playback_tempo">Tempo</string>
+    <string name="playback_pitch">Visina tona</string>
+    <string name="unhook_checkbox">Prekini vezu (može uzrokovati izobličenje)</string>
+    <string name="minimize_on_exit_title">Minimiziraj prilikom mjenjanje aplikacija</string>
+    <string name="minimize_on_exit_summary">Radnja prilikom prebacivanja na drugu aplikaciju iz glavnog videoplayer-a — %s</string>
+    <string name="minimize_on_exit_background_description">Minimiziraj na pozadinski player</string>
+    <string name="minimize_on_exit_popup_description">Minimiziraj na skočni player</string>
+    <string name="list_view_mode">Način prikaza popisa</string>
+    <string name="auto">Automatski</string>
+    <string name="missions_header_finished">Gotovo</string>
+    <string name="missions_header_pending">U redu za čekanje</string>
+    <string name="paused">pauzirano</string>
+    <string name="queued">Na redu za čekanje</string>
+    <string name="post_processing">naknadna obrada</string>
+    <string name="enqueue">Red</string>
+    <string name="permission_denied">Sustav je odbio radnju</string>
+    <string name="download_finished_more">%s preuzimanja dovršeno</string>
+    <string name="generate_unique_name">Generirajte jedinstveni naziv</string>
+    <string name="overwrite">Piši preko</string>
+    <string name="overwrite_warning">Preuzeta datoteka s tim nazivom već postoji</string>
+    <string name="download_already_running">U tijeku je preuzimanje s ovim nazivom</string>
+    <string name="label_code">Kod</string>
+    <string name="error_path_creation">Datoteku nije moguće izraditi</string>
+    <string name="error_file_creation">Odredišnu mapu nije moguće izraditi</string>
+    <string name="error_permission_denied">Sustav je odbio dozvolu</string>
+    <string name="error_ssl_exception">Sigurna veza nije uspjela</string>
+    <string name="error_unknown_host">Nije moguće pronaći server</string>
+    <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>
+    <string name="pause_downloads_on_mobile">Pauziraj prilikom prebacivanja na mobilne podatke</string>
+    <string name="pause_downloads_on_mobile_desc">Preuzimanja koja se ne mogu zaustaviti ponovno će se pokrenuti</string>
 </resources>
\ No newline at end of file

From 29183c10fff1af9661a3aadc271847a3048d4b40 Mon Sep 17 00:00:00 2001
From: Florian <floflr@zaclys.net>
Date: Sun, 31 Mar 2019 14:20:01 +0000
Subject: [PATCH 045/138] Translated using Weblate (French)

Currently translated at 99.1% (439 of 443 strings)
---
 app/src/main/res/values-fr/strings.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c6aa99bfb..bc63d927f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -318,7 +318,7 @@
     <string name="use_inexact_seek_title">Recherche rapide approximative</string>
     <string name="use_inexact_seek_summary">Permettre au lecteur d\'accéder plus rapidement à une position au détriment de la précision</string>
     <string name="download_thumbnail_title">Charger les miniatures</string>
-    <string name="download_thumbnail_summary">Désactivez pour empêcher le chargement des miniatures afin de réduire l’utilisation de bande passante et de mémoire. Modifier cette option vide le cache d’images en mémoire vive et sur le disque.</string>
+    <string name="download_thumbnail_summary">Désactivez pour empêcher le chargement des miniatures afin de réduire l’utilisation de bande passante et de mémoire. Ce changement vide le cache d’images en mémoire vive et sur le disque.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Images en cache effacées</string>
     <string name="metadata_cache_wipe_title">Effacer les données en cache</string>
     <string name="metadata_cache_wipe_summary">Effacer toutes les pages web mises en cache</string>
@@ -464,4 +464,11 @@
     <string name="clear_finished_download">Effacer les téléchargements terminés</string>
     <string name="pause_downloads_on_mobile">Mettre en pause lors du passage en données mobiles</string>
     <string name="pause_downloads_on_mobile_desc">Les téléchargements qui ne peuvent pas être mis en pause seront redémarrés</string>
+    <string name="list_view_mode">Mode liste</string>
+    <string name="post_processing">post-traitement</string>
+    <string name="enqueue">File d’attente</string>
+    <string name="permission_denied">Action refusée par le système</string>
+    <string name="error_postprocessing_failed">Échec du post-traitement</string>
+    <string name="max_retry_msg">Nombre maximum de tentatives</string>
+    <string name="max_retry_desc">Nombre maximum de tentatives avant d\'annuler le téléchargement</string>
 </resources>
\ No newline at end of file

From e5f3b2bf6e397ef2082e2e9e0d50522b3cdc7c36 Mon Sep 17 00:00:00 2001
From: nautilusx <mail.ka@mailbox.org>
Date: Sat, 30 Mar 2019 14:30:57 +0000
Subject: [PATCH 046/138] Translated using Weblate (German)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 70759173c..452fd01bf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -80,7 +80,7 @@
     <string name="your_comment">Dein Kommentar (auf englisch):</string>
     <string name="could_not_get_stream">Konnte keinen Stream abrufen</string>
     <string name="autoplay_by_calling_app_title">Automatische Wiedergabe</string>
-    <string name="autoplay_by_calling_app_summary">Spielt ein Video ab, wenn NewPipe von einer anderen App aufgerufen wurde</string>
+    <string name="autoplay_by_calling_app_summary">Wiedergabe eines Videos, wenn NewPipe von einer anderen App aufgerufen wurde</string>
     <string name="report_error">Einen Fehler melden</string>
     <string name="user_report">Anwenderbericht</string>
     <string name="duration_live">LIVE</string>
@@ -463,7 +463,7 @@
     <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">Angefragter Bereich nicht bedienbar</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>

From 0a1e7a7c864f13763d2d95d49a242e1d6bb36cfe Mon Sep 17 00:00:00 2001
From: Marco Ieni <marcoieni94@gmail.com>
Date: Sat, 30 Mar 2019 22:32:53 +0000
Subject: [PATCH 047/138] Translated using Weblate (Italian)

Currently translated at 99.3% (440 of 443 strings)
---
 app/src/main/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e75d4f89c..b53e82d54 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -62,7 +62,7 @@
     <string name="live_streams_not_supported">I contenuti in diretta non sono al momento supportati</string>
     <string name="content">Contenuti</string>
     <string name="show_age_restricted_content_title">Contenuti vietati ai minori</string>
-    <string name="video_is_age_restricted">Mostra video riversati a un pubblico maggiorenne. Si possono abilitare dalle Impostazioni.</string>
+    <string name="video_is_age_restricted">Mostra video riservati a un pubblico maggiorenne. Si possono abilitare dalle Impostazioni.</string>
     <string name="main_bg_subtitle">Tocca Cerca per iniziare</string>
     <string name="autoplay_by_calling_app_title">Riproduzione automatica</string>
     <string name="autoplay_by_calling_app_summary">Riproduci i video quando NewPipe viene aperto da un\'altra app</string>

From 1e4b1a2c70bb1ecfa7f121ac58577893f8c18a92 Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <i.nedoboy@mail.ru>
Date: Sun, 31 Mar 2019 20:17:28 +0000
Subject: [PATCH 048/138] Translated using Weblate (Russian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ru/strings.xml | 34 +++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 260b73d2b..ce488455c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -7,24 +7,24 @@
     <string name="cancel">Отмена</string>
     <string name="open_in_browser">Открыть в браузере</string>
     <string name="share">Поделиться</string>
-    <string name="download">Скачать</string>
+    <string name="download">Загрузить</string>
     <string name="search">Поиск</string>
     <string name="settings">Настройки</string>
     <string name="did_you_mean">Возможно, вы имели в виду: %1$s?</string>
     <string name="share_dialog_title">Поделиться в</string>
-    <string name="choose_browser">Выбрать браузер</string>
+    <string name="choose_browser">Выбор браузера</string>
     <string name="screen_rotation">поворот</string>
     <string name="download_path_title">Путь загрузки видео</string>
     <string name="download_path_summary">Путь для сохранения загруженных видео</string>
     <string name="download_path_dialog_title">Введите путь к папке для загрузки видео</string>
-    <string name="default_resolution_title">Стандартное качество</string>
+    <string name="default_resolution_title">Разрешение по умолчанию</string>
     <string name="play_with_kodi_title">Воспроизвести в Kodi</string>
     <string name="kore_not_found">Приложение Kore не найдено. Установить его?</string>
     <string name="show_play_with_kodi_title">\"Воспроизвести в Kodi\"</string>
     <string name="show_play_with_kodi_summary">Показать опцию воспроизведения через медиацентр Kodi</string>
     <string name="play_audio">Аудио</string>
     <string name="default_audio_format_title">Формат аудио по умолчанию</string>
-    <string name="download_dialog_title">Скачать</string>
+    <string name="download_dialog_title">Загрузить</string>
     <string name="next_video_title">Следующее видео</string>
     <string name="url_not_supported_toast">URL не поддерживается</string>
     <string name="show_next_and_similar_title">\"Следующее\" и \"Похожие\" видео</string>
@@ -61,7 +61,7 @@
     <string name="msg_name">Имя файла</string>
     <string name="msg_error">Ошибка</string>
     <string name="msg_server_unsupported">Сервер не поддерживается</string>
-    <string name="msg_running">NewPipe скачивает</string>
+    <string name="msg_running">NewPipe загружает</string>
     <string name="msg_url_malform">Неверный URL или нет доступа к интернету</string>
     <string name="msg_running_detail">Подробнее</string>
     <string name="msg_copied">Скопировано в буфер обмена</string>
@@ -273,7 +273,7 @@
     <string name="popup_player">Плеер в окне</string>
     <string name="preferred_player_fetcher_notification_title">Получение сведений…</string>
     <string name="preferred_player_fetcher_notification_message">Загрузка запрошенного контента</string>
-    <string name="controls_download_desc">Скачать файл прямой трансляции</string>
+    <string name="controls_download_desc">Загрузить файл прямой трансляции</string>
     <string name="show_info">Показать сведения</string>
     <string name="tab_bookmarks">Закладки</string>
     <string name="controls_add_to_playlist_title">Добавить к</string>
@@ -432,37 +432,37 @@
     <string name="app_update_notification_channel_name">Уведомление об обновлении</string>
     <string name="app_update_notification_channel_description">Уведомления о новой версии NewPipe</string>
     <string name="updates_setting_title">Обновления</string>
-    <string name="updates_setting_description">Показывать уведомление с подтверждением обновления, когда доступна новая версия</string>
-    <string name="app_update_notification_content_title">Доступна новая версия NewPipe!</string>
-    <string name="app_update_notification_content_text">Нажмите, чтобы скачать</string>
+    <string name="updates_setting_description">Показать уведомление с предложением обновить приложение при наличии новой версии</string>
+    <string name="app_update_notification_content_title">Доступно обновление NewPipe!</string>
+    <string name="app_update_notification_content_text">Нажмите для загрузки</string>
     <string name="missions_header_finished">Завершено</string>
     <string name="paused">приостановлено</string>
-    <string name="queued">Добавлено в очередь</string>
+    <string name="queued">в очереди</string>
     <string name="enqueue">Очередь</string>
     <string name="permission_denied">Действие запрещено системой</string>
-    <string name="download_failed">Ошибка скачивания</string>
+    <string name="download_failed">Ошибка загрузки</string>
     <string name="overwrite">Перезаписать</string>
     <string name="overwrite_warning">Файл с таким именем уже существует</string>
-    <string name="download_already_running">Файл с таким именем уже скачивается</string>
+    <string name="download_already_running">Загрузка с таким именем уже выполняется</string>
     <string name="show_error">Показать текст ошибки</string>
     <string name="label_code">Код</string>
     <string name="error_path_creation">Файл не может быть создан</string>
-    <string name="error_file_creation">Целевая папка не может быть создана</string>
+    <string name="error_file_creation">Папка назначения не может быть создана</string>
     <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_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="clear_finished_download">Очистить завершённые</string>
     <string name="stop">Остановить</string>
     <string name="events">События</string>
     <string name="conferences">Конференции</string>
-    <string name="post_processing">Завершающая обработка</string>
+    <string name="post_processing">пост-обработка</string>
     <string name="missions_header_pending">В очереди</string>
     <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="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>

From 8232a92653e80ceb317bdfc7086d05045b28b3a0 Mon Sep 17 00:00:00 2001
From: Tobias Groza <tooobi14@gmail.com>
Date: Tue, 2 Apr 2019 14:30:54 +0000
Subject: [PATCH 049/138] Translated using Weblate (Romanian)

Currently translated at 75.6% (335 of 443 strings)
---
 app/src/main/res/values-ro/strings.xml | 110 ++++++++-----------------
 1 file changed, 34 insertions(+), 76 deletions(-)

diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 8e9f83fdf..26dcce0c3 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -16,15 +16,12 @@
     <string name="screen_rotation">rotație</string>
     <string name="use_external_video_player_title">Folosește un player video extern</string>
     <string name="use_external_audio_player_title">Folosește un player audio extern</string>
-
     <string name="download_path_title">Locația videoclipurilor descărcate</string>
     <string name="download_path_summary">Locul în care se vor descărca videoclipurile</string>
     <string name="download_path_dialog_title">Introduceți locația în care se vor descărca videoclipurile</string>
-
     <string name="download_path_audio_title">Directorul audio-ului descărcat</string>
     <string name="download_path_audio_summary">Locul în care se va descărca audio-ul</string>
     <string name="download_path_audio_dialog_title">Introduceți locația în care se va descărca fişierele audio</string>
-
     <string name="default_resolution_title">Rezoluție implicită</string>
     <string name="play_with_kodi_title">Redați folosind Kodi</string>
     <string name="kore_not_found">Aplicația Kore nu a fost găsită. Doriți să o instalați?</string>
@@ -36,7 +33,6 @@
     <string name="theme_title">Temă</string>
     <string name="dark_theme_title">Întunecat</string>
     <string name="light_theme_title">Luminos</string>
-
     <string name="download_dialog_title">Descărcați</string>
     <string name="next_video_title">Următorul</string>
     <string name="show_next_and_similar_title">Arată videoclipurile care urmează</string>
@@ -50,7 +46,6 @@
     <string name="content">Conținut</string>
     <string name="show_age_restricted_content_title">Conținut restricționat în funcție de vârstă</string>
     <string name="video_is_age_restricted">Arată videoclipul restricționat în funcție de vârstă. Permiterea vizionării este posibilă din Setări.</string>
-
     <string name="general_error">Eroare</string>
     <string name="network_error">Eroare de rețea</string>
     <string name="could_not_load_thumbnails">Nu s-au putut încărca toate thumbnail-urile</string>
@@ -60,8 +55,6 @@
     <string name="blocked_by_gema">Blocat de către GEMA</string>
     <string name="could_not_setup_download_menu">Imposibil de inițializat meniul pentru descărcări</string>
     <string name="live_streams_not_supported">LIVE STREAM-uri încă nu sunt suportate</string>
-
-
     <string name="list_thumbnail_view_description">Thumbnail-ul videoclipului</string>
     <string name="detail_thumbnail_view_description">Thumbnail de previzualizare al videoclipului</string>
     <string name="detail_uploader_thumbnail_view_description">Thumbnail-ul avatarului autorului</string>
@@ -69,7 +62,6 @@
     <string name="detail_dislikes_img_view_description">Nu au apreciat</string>
     <string name="use_tor_title">Folosește Tor</string>
     <string name="use_tor_summary">(Experimental) Forțează descărcarea traficului prin Tor pentru intimitate crescută (transmiterea în flux a videoclipurilor nu este deocamdată suportată).</string>
-
     <string name="err_dir_create">Nu s-a putut crea directorul de descărcare \'%1$s\'</string>
     <string name="main_bg_subtitle">Apăsați căutare pentru a începe</string>
     <string name="autoplay_by_calling_app_title">Redare automată</string>
@@ -78,7 +70,6 @@
     <string name="downloads">Descărcări</string>
     <string name="downloads_title">Descărcări</string>
     <string name="error_report_title">Raport de erori</string>
-
     <string name="light_parsing_error">Nu s-a putut analiza complet website-ul</string>
     <string name="could_not_get_stream">Nu s-a putut prelua niciun stream</string>
     <string name="sorry_string">Scuze, asta n-ar fi trebui să se întâmple.</string>
@@ -89,26 +80,19 @@
     <string name="what_happened_headline">Ce s-a întâmplat:</string>
     <string name="your_comment">Comentariul tău (în engleză):</string>
     <string name="error_details_headline">Detalii:</string>
-
-
     <string name="report_error">Raportează o eroare</string>
     <string name="user_report">Raportul utilizatorului</string>
-
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Reîncearcă</string>
     <string name="storage_permission_denied">Permisiunea de a accesa mediul de stocare a fost refuzată</string>
-
     <string name="start">Start</string>
     <string name="pause">Pauză</string>
     <string name="view">Redă</string>
     <string name="delete">Șterge</string>
     <string name="checksum">Suma de control</string>
-
     <string name="add">Misiune nouă</string>
     <string name="finish">OK</string>
-
-
     <string name="msg_name">Numele fișierului</string>
     <string name="msg_threads">Thread-uri</string>
     <string name="msg_error">Eroare</string>
@@ -120,68 +104,53 @@
     <string name="msg_wait">Vă rugăm așteptați…</string>
     <string name="msg_copied">Copiat în clipboard</string>
     <string name="no_available_dir">Vă rugăm alegeți un folder pentru descărcări</string>
-
     <string name="open_in_popup_mode">Deschide in modul popup</string>
     <string name="msg_popup_permission">Aceasta permisiune este necesara
 pentru a deschide în mod pop-up</string>
-
     <string name="reCaptchaActivity">ReCAPTCHA</string>
     <string name="reCaptcha_title">reCAPTCHA noua</string>
     <string name="recaptcha_request_toast">reCAPTCHA noua ceruta</string>
-
     <string name="popup_mode_share_menu_title">NewPipe mod pop-up</string>
-
     <string name="default_popup_resolution_title">"Rezoluție pop-up inițială "</string>
     <string name="show_higher_resolutions_title">Afișează rezoluții mai mari</string>
     <string name="show_higher_resolutions_summary">Doar anumite dispozitive suportă redarea videoclipurilor 2K/4K</string>
     <string name="default_video_format_title">Format video implicit</string>
     <string name="black_theme_title">Negru</string>
-
     <string name="popup_playing_toast">Redare în mod pop-up</string>
     <string name="all">Tot</string>
     <string name="channel">Canal</string>
     <string name="yes">Da</string>
     <string name="later">Mai târziu</string>
     <string name="disabled">Dezactivat</string>
-
     <string name="could_not_load_image">Nu s-a putut încărca imaginea</string>
     <string name="app_ui_crash">App/UI eroare</string>
     <string name="info_labels">Ce:\\nCerere:\\nLimba Conținutului:\\nServiciu:\\nTimp GMT:\\nPachet:\\nVersiune:\\nVersiune OS:</string>
-
-
     <string name="short_thousand">K</string>
     <string name="short_million">mil.</string>
     <string name="short_billion">mld.</string>
-
-<string name="use_external_video_player_summary">Anumite rezoluții NU vor avea sunet atunci când această opțiune este activată</string>
+    <string name="use_external_video_player_summary">Anumite rezoluții NU vor avea sunet atunci când această opțiune este activată</string>
     <string name="controls_background_title">Fundal</string>
     <string name="controls_popup_title">Pop-up</string>
-
     <string name="popup_remember_size_pos_title">Reține dimensiunea și poziția pop-up-ului</string>
     <string name="popup_remember_size_pos_summary">Reține ultima dimensiune și poziție a pop-up-ului</string>
     <string name="player_gesture_controls_title">Gesturi player</string>
     <string name="player_gesture_controls_summary">Folosește gesturile pentru a controla luminozitatea și volumul player-ului</string>
     <string name="show_search_suggestions_title">Arată sugestii</string>
     <string name="show_search_suggestions_summary">Arată sugestii în timpul căutării</string>
-
     <string name="settings_category_popup_title">Pop-up</string>
     <string name="filter">Filtru</string>
     <string name="refresh">Reîmprospătează</string>
     <string name="clear">Curăță</string>
     <string name="popup_resizing_indicator_title">Redimensionare</string>
     <string name="best_resolution">Rezoluție maximă</string>
-
     <string name="subscribe_button_title">Abonează-te</string>
     <string name="subscribed_button_title">Abonat(ă)</string>
     <string name="channel_unsubscribed">Canal dezabonat</string>
     <string name="subscription_change_failed">Nu s-a putut modifica abonamentul</string>
     <string name="subscription_update_failed">Nu s-a putut actualiza abonamentul</string>
-
     <string name="tab_main">Principal</string>
     <string name="tab_subscriptions">Abonamente</string>
-
     <string name="fragment_whats_new">Ce este nou</string>
-
     <string name="enable_search_history_title">Istoric de căutări</string>
     <string name="enable_search_history_summary">Stochează local căutările</string>
     <string name="enable_watch_history_title">Istoric și cache</string>
@@ -193,42 +162,34 @@ pentru a deschide în mod pop-up</string>
     <string name="settings_category_history_title">Istoric și cache</string>
     <string name="playlist">Playlist</string>
     <string name="undo">Anulează</string>
-
     <string name="notification_channel_name">Notificare NewPipe</string>
     <string name="notification_channel_description">Notificări pentru playere de fundal și pop-up</string>
-
     <string name="search_no_results">Fără rezultate</string>
     <string name="empty_subscription_feed_subtitle">Nimic aici în afară de sunetul greierilor</string>
-
     <string name="no_subscribers">Niciun abonat</string>
     <plurals name="subscribers">
-	<item quantity="one">%s abonat</item>
-	<item quantity="few">%s abonați</item>
-	<item quantity="other">%s abonați</item>
-</plurals>
-
+        <item quantity="one">%s abonat</item>
+        <item quantity="few">%s abonați</item>
+        <item quantity="other">%s abonați</item>
+    </plurals>
     <string name="no_views">Nicio vizionare</string>
     <plurals name="views">
-	<item quantity="one">%s vizionare</item>
-	<item quantity="few">%s vizionări</item>
-	<item quantity="other">%s vizionări</item>
-</plurals>
-
+        <item quantity="one">%s vizionare</item>
+        <item quantity="few">%s vizionări</item>
+        <item quantity="other">%s vizionări</item>
+    </plurals>
     <string name="no_videos">Niciun videoclip</string>
     <plurals name="videos">
-	<item quantity="one">%s videoclip</item>
-	<item quantity="few">%s videoclipuri</item>
-	<item quantity="other">%s videoclipuri</item>
-</plurals>
-
+        <item quantity="one">%s videoclip</item>
+        <item quantity="few">%s videoclipuri</item>
+        <item quantity="other">%s videoclipuri</item>
+    </plurals>
     <string name="settings_category_downloads_title">Descarcă</string>
     <string name="settings_file_charset_title">Caractere permise în numele fișierelor</string>
     <string name="settings_file_replacement_character_summary">Caracterele invalide sunt înlocuite cu această valoare</string>
     <string name="settings_file_replacement_character_title">Caracter înlocuitor</string>
-
     <string name="charset_letters_and_digits">Litere și cifre</string>
     <string name="charset_most_special_characters">Caracterele cele mai speciale</string>
-
     <string name="title_activity_about">Despre NewPipe</string>
     <string name="action_settings">Setări</string>
     <string name="action_about">Despre</string>
@@ -245,7 +206,6 @@ pentru a deschide în mod pop-up</string>
     <string name="contribution_encouragement">Dacă aveți idei, doriți să traduceți, să schimbați design-ul, să curățați codul sau să schimbați codul, ajutorul este mereu bine primit. Cu cât mai mult, cu atât mai bine!</string>
     <string name="read_full_license">Citiți licența</string>
     <string name="contribution_title">Contribuie</string>
-
     <string name="title_activity_history">Istoric</string>
     <string name="title_history_search">Căutat</string>
     <string name="title_history_view">Vizionat</string>
@@ -255,7 +215,7 @@ pentru a deschide în mod pop-up</string>
     <string name="history_cleared">Istoric curățat</string>
     <string name="item_deleted">Element șters</string>
     <string name="delete_item_search_history">Doriți să ștergeți acest element din istoricul de căutare?</string>
-<string name="main_page_content">Conținutul pagini principale</string>
+    <string name="main_page_content">Conținutul pagini principale</string>
     <string name="blank_page_summary">Pagină Goală</string>
     <string name="kiosk_page_summary">Pagină Chioșc</string>
     <string name="subscription_page_summary">Pagină Abonări</string>
@@ -264,22 +224,18 @@ pentru a deschide în mod pop-up</string>
     <string name="select_a_channel">Alegeți un canal</string>
     <string name="no_channel_subscribed_yet">Nu v-ați abonat la niciun canal deocamdată</string>
     <string name="select_a_kiosk">Alegeți un chioșc</string>
-
     <string name="kiosk">Chioșc</string>
     <string name="trending">Trenduri</string>
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">Tendințe</string>
-<string name="service_title">Serviciu</string>
+    <string name="service_title">Serviciu</string>
     <string name="background_player_append">Adăugat în player de fundal</string>
     <string name="popup_playing_append">Adăugat în player pop-up</string>
     <string name="no_player_found_toast">Niciun player pentru streaming găsit. (Totuși, puteți instala VLC).</string>
     <string name="controls_download_desc">Descărcați fișierul de streaming</string>
     <string name="show_info">Arată informații</string>
-
     <string name="tab_bookmarks">Marcaje lista de vizionare</string>
-
     <string name="controls_add_to_playlist_title">Adaugă La</string>
-
     <string name="use_inexact_seek_title">Folosește parcurgerea inexactă</string>
     <string name="use_inexact_seek_summary">Derularea inexactă permite player-ului să fie poziţionat mai rapid dar cu o precizie mai redusă</string>
     <string name="download_thumbnail_title">Încarcă miniaturi</string>
@@ -298,14 +254,11 @@ pentru a deschide în mod pop-up</string>
     <string name="always">Întotdeauna</string>
     <string name="just_once">Doar Odată</string>
     <string name="file">Fișier</string>
-
     <string name="unknown_content">[Necunoscut]</string>
-
     <string name="toggle_orientation">Activează Orientarea</string>
     <string name="switch_to_background">Schimbă pe Modul fundal</string>
     <string name="switch_to_popup">Schimbă pe modul popup</string>
     <string name="switch_to_main">Schimbă pe modul principal</string>
-
     <string name="import_data_title">Importează baza de date</string>
     <string name="export_data_title">Exportează baza de date</string>
     <string name="import_data_summary">Va înlocui istoricul și abonamentele curente</string>
@@ -322,7 +275,6 @@ pentru a deschide în mod pop-up</string>
     <string name="invalid_file">Fișierul nu există, sau nu dețineți suficiente permisiuni pentru a îl citi sau scrie</string>
     <string name="file_name_empty_error">Numele fișierului nu poate fi gol</string>
     <string name="error_occurred_detail">O eroare a apărut: %1$s</string>
-
     <string name="donation_encouragement">NewPipe este creat de dezvoltatori şi voluntari care îşi petrec timpul liber să vă aducă cea mai buna experienţă. Dați ceva înapoi pentru a ajuta dezvolatorii noştri în a pot face NewPipe şi mai bun în timp ce se bucură de o cană de cafea.</string>
     <string name="give_back">A da înapoi</string>
     <string name="website_title">Site-ul</string>
@@ -331,13 +283,11 @@ pentru a deschide în mod pop-up</string>
     <string name="delete_all_history_prompt">Sunteţi sigur că vreţi să ştergeţi toate elementele din istoric ?</string>
     <string name="title_last_played">Ultimul cântec ascultat</string>
     <string name="title_most_played">"Cel mai ascultat "</string>
-
     <string name="export_complete_toast">Exportat</string>
     <string name="import_complete_toast">Importat</string>
     <string name="no_valid_zip_file">Nici-un fişier ZIP valid</string>
     <string name="could_not_import_all_files">Avertisment: Nu se pot importa fişierele.</string>
     <string name="override_current_data">Acest lucru o să vă reseteze setup-ul curent.</string>
-
     <string name="title_activity_background_player">Player în fundal</string>
     <string name="title_activity_popup_player">Player popup</string>
     <string name="play_queue_remove">Şterge</string>
@@ -349,40 +299,29 @@ pentru a deschide în mod pop-up</string>
     <string name="start_here_on_main">Începeţi să redaţi de aici</string>
     <string name="start_here_on_background">Începeţi de aici în Fundal</string>
     <string name="start_here_on_popup">Începeţi de aici în popup</string>
-
     <string name="drawer_open">Deschdeţi sertarul</string>
     <string name="drawer_close">Închideţi sertarul</string>
     <string name="preferred_open_action_settings_title">Opţiunea de deschidere preferată</string>
     <string name="preferred_open_action_settings_summary">Opţiunea prestabilită când se deschide contentul -%s</string>
-
     <string name="video_player">Player Video</string>
     <string name="background_player">Player Fundal</string>
     <string name="popup_player">Player Popup</string>
     <string name="always_ask_open_action">Întreabă întotdeauna</string>
-
     <string name="no_streams_available_download">Niciun stream disponbil pentru descărcare</string>
-
     <string name="detail_drag_description">Trageţi pentru a reordona</string>
-
     <string name="create">Crează</string>
     <string name="delete_one">Ştergeţi un element</string>
     <string name="delete_all">Ştergeţi toate elementele</string>
     <string name="dismiss">Ignoraţi</string>
     <string name="rename">"Redenumiţi "</string>
-
     <string name="toast_no_player">Niciun player a fost găsit pentru acest fişier</string>
-
     <string name="donation_title">Donaţi</string>
     <string name="drawer_header_action_paceholder_text">Ceva va apărea aici în curând ;D</string>
-
-
     <string name="import_settings">De asemenea, doriți să importați setări?</string>
-
     <string name="playlist_name_input">Nume</string>
     <string name="playlist_creation_success">Listă de redare creată</string>
     <string name="playlist_add_stream_success">Adăugat la lista de redare</string>
     <string name="caption_auto_generated">Generat automat</string>
-
     <string name="import_file_title">Import fișier</string>
     <string name="playback_speed_control">Controlul vitezei de redare</string>
     <string name="channels">Canale</string>
@@ -408,4 +347,23 @@ pentru a deschide în mod pop-up</string>
     <string name="playback_tempo">Viteză</string>
     <string name="accept">Acceptă</string>
     <string name="decline">Refuză</string>
+    <string name="unsubscribe">Dezabonare</string>
+    <string name="tab_new">Panel nou</string>
+    <string name="tab_choose">Alege panel</string>
+    <string name="volume_gesture_control_title">Gesturi control volum</string>
+    <string name="volume_gesture_control_summary">Utilizează gesturi pentru controlul volumului</string>
+    <string name="brightness_gesture_control_title">Gesturi control strălucire</string>
+    <string name="brightness_gesture_control_summary">Utilizează gesturi pentru controlul strălucire</string>
+    <string name="settings_category_updates_title">Actualizări</string>
+    <string name="events">Evenimente</string>
+    <string name="file_deleted">Fișier șters</string>
+    <string name="app_update_notification_channel_name">Notificare actualizare aplicație</string>
+    <string name="app_update_notification_channel_description">Notificări pentru noi versiuni NewPipe</string>
+    <string name="view_history_deleted">Afișare istoric șters.</string>
+    <string name="clear_search_history_title">Șterge istoric căutare</string>
+    <string name="clear_search_history_summary">Ștergere istoric căutare cuvinte cheie</string>
+    <string name="delete_search_history_alert">Șterge întregul istoric căutare\?</string>
+    <string name="search_history_deleted">Istoric căutare șters</string>
+    <string name="download_to_sdcard_error_title">Stocare externă indisponibilă</string>
+    <string name="download_to_sdcard_error_message">Descărcarea pe cardul SD extern nu este încă posibilă. Se resetează locația directorului de descărcări\?</string>
 </resources>
\ No newline at end of file

From de59bf695d841bf5b5017daf19c5eff7ee4424e6 Mon Sep 17 00:00:00 2001
From: ___ <o.kravtsov@ukr.net>
Date: Thu, 4 Apr 2019 06:12:39 +0000
Subject: [PATCH 050/138] Translated using Weblate (Ukrainian)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-uk/strings.xml | 413 +++++++++++++------------
 1 file changed, 210 insertions(+), 203 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 81e25e7be..93dbaf48c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="view_count_text">%1$s переглядів</string>
     <string name="upload_date_text">Опубліковано %1$s</string>
-    <string name="no_player_found">Потокового програвача не знайдено. Чи бажаєте встановити VLC\?</string>
+    <string name="no_player_found">Програвач потокового відео не знайдений. Бажаєте встановити VLC\?</string>
     <string name="install">Встановити</string>
     <string name="cancel">Скасувати</string>
     <string name="open_in_browser">Відкрити у переглядачеві</string>
@@ -11,59 +11,59 @@
     <string name="search">Шукати</string>
     <string name="settings">Налаштування</string>
     <string name="did_you_mean">Чи ви мали на увазі: %1$s\?</string>
-    <string name="share_dialog_title">Поділитись з</string>
+    <string name="share_dialog_title">Поширити через</string>
     <string name="choose_browser">Оберіть переглядач</string>
     <string name="screen_rotation">обертання</string>
-    <string name="use_external_video_player_title">Зовнішній відео-програвач</string>
-    <string name="use_external_audio_player_title">Зовнішній авдіопрогравач</string>
-    <string name="download_path_title">Шлях для завантаження відеозапису</string>
-    <string name="download_path_dialog_title">Вкажіть шлях для завантаження відеозаписів</string>
-    <string name="download_path_audio_dialog_title">Вкажіть шлях для завантаження авдіофайлів</string>
-    <string name="download_path_summary">Шлях де зберігатимуться завантажені відеозаписи</string>
+    <string name="use_external_video_player_title">Використовувати зовнішній відеопрогравач</string>
+    <string name="use_external_audio_player_title">Використовувати зовнішній аудіопрогравач</string>
+    <string name="download_path_title">Місце збереження відеозаписів</string>
+    <string name="download_path_dialog_title">Вкажіть шлях до теки для завантаження відео</string>
+    <string name="download_path_audio_dialog_title">Вкажіть шлях до теки для завантаження аудіо</string>
+    <string name="download_path_summary">Шлях до теки, де зберігатимуться завантажені відео</string>
     <string name="download_path_audio_title">Тека для завантаженого аудіо</string>
-    <string name="download_path_audio_summary">Завантажені авдіофайли зберігатимуться тут</string>
-    <string name="autoplay_by_calling_app_title">Автоматично відтворювати</string>
-    <string name="autoplay_by_calling_app_summary">Відтворює відеозапис коли NewPipe викликано з іншого застосунку</string>
+    <string name="download_path_audio_summary">Завантажене аудіо зберігається тут</string>
+    <string name="autoplay_by_calling_app_title">Автоматичне програвання</string>
+    <string name="autoplay_by_calling_app_summary">Програє відео коли NewPipe викликано з іншого додатку</string>
     <string name="default_resolution_title">Типова роздільна здатність</string>
-    <string name="play_with_kodi_title">Відтворювати за допомогою Kodi</string>
-    <string name="kore_not_found">Застосунок Kore не знайдено. Встановити?</string>
-    <string name="show_play_with_kodi_title">Відтворювати у Kodi</string>
-    <string name="show_play_with_kodi_summary">Показувати опцію відтворення відеозапису за допомогою Kodi media center</string>
+    <string name="play_with_kodi_title">Програти у Kodi</string>
+    <string name="kore_not_found">Додаток Kore не знайдено. Встановити його\?</string>
+    <string name="show_play_with_kodi_title">Показати опцію \"Програти у Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Показати опцію програвання відео у медіацентрі Kodi</string>
     <string name="play_audio">Аудіо</string>
-    <string name="default_audio_format_title">Типовий авдіоформат</string>
+    <string name="default_audio_format_title">Типовий формат аудіо</string>
     <string name="theme_title">Тема</string>
     <string name="dark_theme_title">Темна</string>
     <string name="light_theme_title">Світла</string>
     <string name="download_dialog_title">Завантажити</string>
-    <string name="next_video_title">Наступний відеозапис</string>
-    <string name="show_next_and_similar_title">Являти \"наступні\" й \"схожі\" відео</string>
+    <string name="next_video_title">Наступне відео</string>
+    <string name="show_next_and_similar_title">Показувати \"Наступне\" і \"Схожі\" відео</string>
     <string name="url_not_supported_toast">URL не підтримується</string>
     <string name="content_language_title">Переважна мова контенту</string>
     <string name="settings_category_video_audio_title">Відео та Авдіо</string>
     <string name="settings_category_appearance_title">Зовнішній вигляд</string>
     <string name="settings_category_other_title">Інше</string>
-    <string name="background_player_playing_toast">Відтворення у тловому режимі</string>
-    <string name="play_btn_text">Відтворити</string>
-    <string name="storage_permission_denied">У доступі відмовлено</string>
+    <string name="background_player_playing_toast">Програвання у тлі</string>
+    <string name="play_btn_text">Програти</string>
+    <string name="storage_permission_denied">В доступі до сховища відмовлено</string>
     <string name="content">Контент</string>
     <string name="show_age_restricted_content_title">Контент з віковими обмеженнями</string>
-    <string name="video_is_age_restricted">Показувати відеозаписи, які мають вікові обмеження. Спершу активуйте опцію для програвання таких записів у налаштуваннях.</string>
+    <string name="video_is_age_restricted">Показувати відео з віковими обмеженнями. Дозволити програвання таких записів можна у Налаштуваннях.</string>
     <string name="duration_live">НАЖИВО</string>
     <string name="general_error">Помилка</string>
     <string name="network_error">Помилка мережі</string>
     <string name="could_not_load_thumbnails">Не вдалося завантажити всі ескізи</string>
-    <string name="youtube_signature_decryption_error">Не вдалося розшифрувати URL підпис відеозапису</string>
+    <string name="youtube_signature_decryption_error">Не вдалося розшифрувати URL-підпис відео</string>
     <string name="parsing_error">Не вдалося проаналізувати веб-сайт</string>
     <string name="light_parsing_error">Не вдалося повністю проаналізувати веб-сайт</string>
     <string name="content_not_available">Контент недоступний</string>
     <string name="blocked_by_gema">Заблоковано GEMA</string>
     <string name="could_not_setup_download_menu">Не вдалося налаштувати меню завантаження</string>
-    <string name="live_streams_not_supported">Трансляції НАЖИВО ще не підтримуються</string>
-    <string name="could_not_get_stream">Не вдалося отримати жодного стриму</string>
+    <string name="live_streams_not_supported">Трансляції НАЖИВО поки що не підтримуються</string>
+    <string name="could_not_get_stream">Не вдалося отримати жодного потоку</string>
     <string name="sorry_string">Шкода, цього не мало статися.</string>
-    <string name="error_report_button_text">Повідомити про помилку за допомогою пошти</string>
-    <string name="error_snackbar_message">На жаль, трапилась помилка.</string>
-    <string name="error_snackbar_action">ПОВІДОМИТИ</string>
+    <string name="error_report_button_text">Повідомити про помилку електронною поштою</string>
+    <string name="error_snackbar_message">На жаль, трапились деякі помилки.</string>
+    <string name="error_snackbar_action">ЗВІТ</string>
     <string name="what_device_headline">Інформація:</string>
     <string name="what_happened_headline">Що сталося:</string>
     <string name="main_bg_subtitle">Натисніть на пошук аби почати</string>
@@ -77,124 +77,124 @@
     <string name="later">Пізніше</string>
     <string name="disabled">Вимкнено</string>
     <string name="could_not_load_image">Не вдалося завантажити зображення</string>
-    <string name="app_ui_crash">Застосунок/інтерфейс зазнав краху</string>
+    <string name="app_ui_crash">Додаток/інтерфейс впав</string>
     <string name="your_comment">Ваш коментар (англійською):</string>
-    <string name="error_details_headline">Деталі:</string>
+    <string name="error_details_headline">Подробиці:</string>
     <string name="list_thumbnail_view_description">Ескіз попереднього перегляду відео</string>
     <string name="detail_thumbnail_view_description">Ескіз попереднього перегляду відео</string>
     <string name="use_tor_title">Використовувати Tor</string>
     <string name="use_tor_summary">(Експериментально) Перенаправляти трафік через Tor для підвищення конфіденційності (трансляція відео ще не підтримується).</string>
     <string name="report_error">Повідомити про помилку</string>
-    <string name="err_dir_create">Не вдалося створити теку для завантаження \'%1$s\'</string>
-    <string name="info_dir_created">Створити теку для завантаження \'%1$s\'</string>
+    <string name="err_dir_create">Не вдалося створити теку для завантажень \'%1$s\'</string>
+    <string name="info_dir_created">Створено теку для завантажень \'%1$s\'</string>
     <string name="video">Відео</string>
     <string name="audio">Аудіо</string>
-    <string name="retry">Повторити</string>
+    <string name="retry">Повторити спробу</string>
     <string name="use_old_player_title">Використовувати старий програвач</string>
-    <string name="short_thousand">т</string>
-    <string name="short_million">млн</string>
-    <string name="short_billion">мрд</string>
+    <string name="short_thousand">тис.</string>
+    <string name="short_million">млн.</string>
+    <string name="short_billion">млрд.</string>
     <string name="start">Почати</string>
-    <string name="pause">Павза</string>
-    <string name="view">Відтворити</string>
+    <string name="pause">Пауза</string>
+    <string name="view">Грати</string>
     <string name="delete">Видалити</string>
     <string name="checksum">Контрольна сума</string>
     <string name="finish">ОК</string>
-    <string name="msg_name">Назва файлу</string>
-    <string name="msg_threads">Гілки</string>
+    <string name="msg_name">Ім\'я файлу</string>
+    <string name="msg_threads">Потоки</string>
     <string name="msg_error">Помилка</string>
     <string name="msg_server_unsupported">Сервер не підтримується</string>
-    <string name="msg_exists">Файл уже існує</string>
+    <string name="msg_exists">Файл вже існує</string>
     <string name="msg_running">NewPipe завантажує</string>
-    <string name="msg_running_detail">Натисніть для подробиць</string>
-    <string name="msg_wait">Будь ласка, зачекайте…</string>
-    <string name="msg_copied">Копійовано до сховку</string>
-    <string name="no_available_dir">Будь ласка, оберіть теку для завантаження</string>
-    <string name="no_player_found_toast">Потокового програвача не знайдено (ви можете встановити VLC для відтворення).</string>
+    <string name="msg_running_detail">Подробиці</string>
+    <string name="msg_wait">Зачекайте…</string>
+    <string name="msg_copied">Скопійовано до буферу обміну</string>
+    <string name="no_available_dir">Оберіть доступну теку для завантажень</string>
+    <string name="no_player_found_toast">Програвач потокового відео не знайдений (ви можете встановити VLC для програвання).</string>
     <string name="open_in_popup_mode">Відкрити у віконному режимі</string>
-    <string name="use_external_video_player_summary">Усувається звук ПЕВНИХ роздільностей</string>
-    <string name="popup_mode_share_menu_title">NewPipe у віконному режимі</string>
+    <string name="use_external_video_player_summary">Прибирає звук при ПЕВНИХ роздільних здатностях</string>
+    <string name="popup_mode_share_menu_title">Віконний режим NewPipe</string>
     <string name="subscribe_button_title">Підписатися</string>
     <string name="subscribed_button_title">Ви підписалися</string>
     <string name="channel_unsubscribed">Ви відписалися від каналу</string>
-    <string name="subscription_change_failed">Неможливо змінити підписання</string>
-    <string name="subscription_update_failed">Неможливо оновити підписання</string>
+    <string name="subscription_change_failed">Не вдалося змінити підписку</string>
+    <string name="subscription_update_failed">Не вдалося оновити підписку</string>
     <string name="tab_main">Головна</string>
-    <string name="tab_subscriptions">Підписання</string>
+    <string name="tab_subscriptions">Підписки</string>
     <string name="fragment_whats_new">Новинки</string>
-    <string name="controls_background_title">На тлі</string>
+    <string name="controls_background_title">У тлі</string>
     <string name="controls_popup_title">У вікні</string>
     <string name="default_popup_resolution_title">Типова роздільна здатність вікна</string>
-    <string name="show_higher_resolutions_summary">Не всі пристрої підтримують відтворення 2K/4K відеозаписи</string>
-    <string name="show_higher_resolutions_title">Вищі роздільні здатності</string>
-    <string name="default_video_format_title">Типовий формат відеозапису</string>
-    <string name="popup_remember_size_pos_title">Пам\'ятати розмір та позицію вікна</string>
-    <string name="popup_remember_size_pos_summary">Пам\'ятати останній розмір вікна</string>
-    <string name="player_gesture_controls_title">Керування жестами</string>
-    <string name="player_gesture_controls_summary">Використовувати жести для контролю яскравості та гучності програвача</string>
-    <string name="show_search_suggestions_title">Шукати схожі</string>
+    <string name="show_higher_resolutions_summary">Лише деякі пристрої підтримують програвання 2K/4K-відео</string>
+    <string name="show_higher_resolutions_title">Показувати вищі роздільні здатності</string>
+    <string name="default_video_format_title">Типовий формат відео</string>
+    <string name="popup_remember_size_pos_title">Пам\'ятати розмір і позицію вікна</string>
+    <string name="popup_remember_size_pos_summary">Пам\'ятати останній розмір і позицію вікна</string>
+    <string name="player_gesture_controls_title">Жести керування програвачем</string>
+    <string name="player_gesture_controls_summary">Використовувати жести для контролю яскравості та гучності у програвачі</string>
+    <string name="show_search_suggestions_title">Пошукові пропозиції</string>
     <string name="show_search_suggestions_summary">Показувати пропозиції під час пошуку</string>
     <string name="enable_search_history_title">Історія пошуків</string>
     <string name="enable_search_history_summary">Зберігати пошукові запити локально</string>
     <string name="enable_watch_history_title">Історія та кеш</string>
-    <string name="enable_watch_history_summary">Вести облік перегляду відеозаписів</string>
-    <string name="resume_on_audio_focus_gain_title">Відновити відтворення</string>
-    <string name="resume_on_audio_focus_gain_summary">Продовжувати відтворення опісля переривання (наприклад телефонного дзвінка)</string>
-    <string name="show_hold_to_append_title">\"Утримуй для додавання\" підказка</string>
-    <string name="default_content_country_title">Усталена країна контенту</string>
+    <string name="enable_watch_history_summary">Запам\'ятовувати переглянуті відео</string>
+    <string name="resume_on_audio_focus_gain_title">Відновити програвання при поверненні з тла</string>
+    <string name="resume_on_audio_focus_gain_summary">Продовжувати програвання після переривань (наприклад, телефонних дзвінків)</string>
+    <string name="show_hold_to_append_title">Показати пораду \"Утримуй, щоб додати\"</string>
+    <string name="default_content_country_title">Типова країна контенту</string>
     <string name="service_title">Сервіс</string>
     <string name="settings_category_player_title">Програвач</string>
     <string name="settings_category_player_behavior_title">Поведінка</string>
     <string name="settings_category_history_title">Історія та кеш</string>
     <string name="settings_category_popup_title">Вікно</string>
-    <string name="popup_playing_toast">Відтворення у вікні</string>
-    <string name="background_player_append">Додано до тлового відтворення</string>
-    <string name="popup_playing_append">Додано до черги у вікно</string>
-    <string name="playlist">Плейлист</string>
-    <string name="filter">Фільтрувати</string>
+    <string name="popup_playing_toast">Програвання у віконному режимі</string>
+    <string name="background_player_append">Додано до черги програвання у тлі</string>
+    <string name="popup_playing_append">Додано до черги програвання у вікні</string>
+    <string name="playlist">Список відтворення</string>
+    <string name="filter">Фільтр</string>
     <string name="refresh">Оновити</string>
     <string name="clear">Очистити</string>
     <string name="popup_resizing_indicator_title">Зміна розміру</string>
-    <string name="best_resolution">Найліпша роздільна здатність</string>
-    <string name="undo">Відміна</string>
-    <string name="play_all">Грати всі</string>
+    <string name="best_resolution">Найкраща роздільна здатність</string>
+    <string name="undo">Скасувати</string>
+    <string name="play_all">Грати все</string>
     <string name="always">Завжди</string>
-    <string name="just_once">Тільки тепер</string>
-    <string name="notification_channel_name">NewPipe сповіщення</string>
-    <string name="notification_channel_description">"Сповіщення для NewPipe-ових тлового і віконного програвачів "</string>
+    <string name="just_once">Лише раз</string>
+    <string name="notification_channel_name">Сповіщення NewPipe</string>
+    <string name="notification_channel_description">Сповіщення для програвачів NewPipe у тлі і у вікні</string>
     <string name="unknown_content">[Невідомо]</string>
-    <string name="switch_to_background">Перемкнутися до тла</string>
-    <string name="switch_to_popup">Перемкнутися до вікна</string>
-    <string name="switch_to_main">Перемкнутися на головну</string>
-    <string name="import_data_title">Імпортувати базу</string>
-    <string name="export_data_title">Експортувати базу</string>
-    <string name="import_data_summary">Перепише поточну історію та підписки</string>
-    <string name="export_data_summary">Експортувати історію, підписки та плейлисти</string>
-    <string name="player_stream_failure">Неможливо відтворити цей стрим</string>
-    <string name="player_recoverable_failure">Відновлююсь після помилки програвача</string>
-    <string name="invalid_url_toast">Помилкова URL</string>
-    <string name="video_streams_empty">Відеостримів не знайдено</string>
-    <string name="audio_streams_empty">Не знайдено аудіопотоків</string>
+    <string name="switch_to_background">Перемкнути у тло</string>
+    <string name="switch_to_popup">Перемкнути у вікно</string>
+    <string name="switch_to_main">Перемкнути на головну</string>
+    <string name="import_data_title">Імпортувати базу даних</string>
+    <string name="export_data_title">Експортувати базу даних</string>
+    <string name="import_data_summary">Перезапише вашу поточну історію та підписки</string>
+    <string name="export_data_summary">Експортувати історію, підписки та списки відтворення</string>
+    <string name="player_stream_failure">Не вдалося програти цей потік</string>
+    <string name="player_recoverable_failure">Відновлення після помилки програвача</string>
+    <string name="invalid_url_toast">Недійсний URL</string>
+    <string name="video_streams_empty">Відеопотоки не знайдено</string>
+    <string name="audio_streams_empty">Аудіопотоки не знайдено</string>
     <string name="user_report">Звіт користувача</string>
-    <string name="no_subscribers">Без підписників</string>
+    <string name="no_subscribers">Немає підписників</string>
     <string name="no_videos">Немає відео</string>
-    <string name="msg_url_malform">Помилкова URL або інтернет недоступний</string>
-    <string name="msg_popup_permission">Цей дозвіл має бути відкритим 
-\nу вікні</string>
-    <string name="reCaptchaActivity">«reCAPTCHA»</string>
+    <string name="msg_url_malform">Помилковий URL або немає доступу в Інтернет</string>
+    <string name="msg_popup_permission">Цей дозвіл потрібен для перегляду
+\nу віконному режимі</string>
+    <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="settings_category_downloads_title">Завантаження</string>
-    <string name="settings_file_charset_title">Допустимі символи у назвах файлів</string>
-    <string name="settings_file_replacement_character_summary">"Неправильні символи коригуватимуться цим "</string>
-    <string name="settings_file_replacement_character_title">Символ заміни</string>
+    <string name="settings_file_charset_title">Допустимі символи у іменах файлів</string>
+    <string name="settings_file_replacement_character_summary">Недопустимі символи замінити на цей</string>
+    <string name="settings_file_replacement_character_title">Символ для заміни</string>
     <string name="charset_letters_and_digits">Літери та цифри</string>
-    <string name="charset_most_special_characters">Більш специфічні символи</string>
+    <string name="charset_most_special_characters">Більшість спеціальних символів</string>
     <string name="title_activity_about">Про NewPipe</string>
     <string name="action_settings">Налаштування</string>
-    <string name="action_about">Візитівка</string>
-    <string name="error_unable_to_load_license">Неможливо завантажити ліцензію</string>
+    <string name="action_about">Про додаток</string>
+    <string name="error_unable_to_load_license">Не вдалося завантажити ліцензію</string>
     <string name="tab_licenses">Ліцензії</string>
-    <string name="contribution_title">Зробити внесок</string>
-    <string name="view_on_github">Переглянути на Ґітгаб</string>
+    <string name="contribution_title">Посприяти</string>
+    <string name="view_on_github">Переглянути на GitHub</string>
     <string name="donation_title">Фінансова допомога</string>
     <string name="website_title">Веб-сайт</string>
     <string name="title_activity_history">Історія</string>
@@ -202,136 +202,136 @@
     <string name="export_complete_toast">Експортовано</string>
     <string name="import_complete_toast">Імпортовано</string>
     <string name="top_50">Топ 50</string>
-    <string name="new_and_hot">Новинки</string>
-    <string name="play_queue_stream_detail">Деталі</string>
-    <string name="play_queue_audio_settings">Звукові налаштування</string>
+    <string name="new_and_hot">Нове і гаряче</string>
+    <string name="play_queue_stream_detail">Подробиці</string>
+    <string name="play_queue_audio_settings">Налаштування аудіо</string>
     <string name="video_player">Відеопрогравач</string>
     <string name="background_player">Тловий програвач</string>
     <string name="popup_player">Віконний програвач</string>
-    <string name="preferred_player_fetcher_notification_title">Отримую інформацію…</string>
-    <string name="preferred_player_fetcher_notification_message">Завантажується запитаний контент</string>
+    <string name="preferred_player_fetcher_notification_title">Отримання інформації…</string>
+    <string name="preferred_player_fetcher_notification_message">Завантаження запитаного контенту</string>
     <string name="controls_download_desc">Завантажити потоковий файл</string>
     <string name="show_info">Показати інформацію</string>
-    <string name="tab_bookmarks">Закладкові плейлисти</string>
+    <string name="tab_bookmarks">Закладені списки відтворення</string>
     <string name="controls_add_to_playlist_title">Додати до</string>
-    <string name="show_hold_to_append_summary">Показувати підказку коли натиснута кнопка тла або вікна на сторінці інформації відеозапису</string>
+    <string name="show_hold_to_append_summary">Показати пораду, коли натиснута кнопка \"У тло\" або \"У вікно\" на сторінці з подробицями відео</string>
     <string name="toggle_orientation">Перемкнути орієнтацію</string>
-    <string name="player_unrecoverable_failure">Фатальна помилка програвача</string>
+    <string name="player_unrecoverable_failure">Сталася невиправна помилка програвача</string>
     <string name="external_player_unsupported_link_type">Зовнішні програвачі не підтримують такі види посилань</string>
-    <string name="info_labels">Що:\\nЗапит:\\nМова змісту:\\nСервіс:\\nЧас GMT:\\nПакунок:\\nВерсія:\\nВерсія ОС:</string>
+    <string name="info_labels">Що:\\nЗапит:\\nМова контенту:\\nСервіс:\\nЧас GMT:\\nПакунок:\\nВерсія:\\nВерсія ОС:</string>
     <string name="detail_uploader_thumbnail_view_description">Ескіз аватару користувача</string>
     <string name="detail_likes_img_view_description">Сподобалося</string>
     <string name="detail_dislikes_img_view_description">Не сподобалося</string>
     <string name="search_no_results">Нічого не знайдено</string>
-    <string name="detail_drag_description">Перетягніть для зміни сортування</string>
+    <string name="detail_drag_description">Перетягуйте для впорядкування</string>
     <plurals name="subscribers">
         <item quantity="one">%s підписник</item>
         <item quantity="few">%s підписники</item>
-        <item quantity="many">n &gt; 1</item>
+        <item quantity="many">%s підписників</item>
     </plurals>
     <plurals name="videos">
-        <item quantity="one">Відеозапис</item>
-        <item quantity="few">Відеозаписи</item>
-        <item quantity="many">Відеозаписів</item>
+        <item quantity="one">Відео</item>
+        <item quantity="few">Відео</item>
+        <item quantity="many">Відео</item>
     </plurals>
     <string name="create">Створити</string>
-    <string name="delete_one">Видалення одного</string>
-    <string name="delete_all">Видалити всі</string>
+    <string name="delete_one">Видалити одне</string>
+    <string name="delete_all">Видалити все</string>
     <string name="dismiss">Відхилити</string>
-    <string name="rename">Змінити назву</string>
-    <string name="title_licenses">Сторонні ліцензії</string>
-    <string name="action_open_website">Перейти до сайту</string>
-    <string name="tab_about">Візитівка</string>
-    <string name="app_description">Вільний та легковагий стримінґ для Андроїду.</string>
-    <string name="contribution_encouragement">Які б не були Ваші ідеї: переклад, дизайн, легкий чи глобальний рефакторинґ - будь-яка допомога завжди у нагоді. Що більше зроблено, то ліпшим NewPipe стає!</string>
-    <string name="settings_category_debug_title">Усунення вад</string>
-    <string name="empty_subscription_feed_subtitle">Нічого нема</string>
-    <string name="no_views">Перегляди відсутні</string>
+    <string name="rename">Перейменувати</string>
+    <string name="title_licenses">Ліцензії третіх сторін</string>
+    <string name="action_open_website">Відкрити веб-сайт</string>
+    <string name="tab_about">Про додаток</string>
+    <string name="app_description">Вільне та легке потокове програвання на Android.</string>
+    <string name="contribution_encouragement">Які б не були Ваші ідеї: переклад, дизайн, легкий чи глобальний рефакторинг - будь-яка допомога завжди у нагоді. Що більше зроблено, то ліпшим стає NewPipe!</string>
+    <string name="settings_category_debug_title">Налагодження</string>
+    <string name="empty_subscription_feed_subtitle">Нічого немає... чути лише цвіркунів</string>
+    <string name="no_views">Немає переглядів</string>
     <plurals name="views">
         <item quantity="one">%s перегляд</item>
         <item quantity="few">%s перегляди</item>
         <item quantity="many">%s переглядів</item>
     </plurals>
     <string name="add">Нове завдання</string>
-    <string name="reCaptcha_title">Виклик reCAPTCHA</string>
-    <string name="recaptcha_request_toast">Запит на виклик reCAPTCHA</string>
-    <string name="copyright" formatted="true">© %1$s by %2$s under %3$s</string>
+    <string name="reCaptcha_title">Перевірка reCAPTCHA</string>
+    <string name="recaptcha_request_toast">Запит на перевірку reCAPTCHA</string>
+    <string name="copyright" formatted="true">© %1$s, %2$s під %3$s</string>
     <string name="tab_contributors">Учасники</string>
-    <string name="donation_encouragement">NewPipe розроблений добровольцями, які витрачають власний час заради вашого задоволення. Допоможіть розробникам зробити NewPipe ще ліпшим, насолоджуючись філіжанкою кави.</string>
+    <string name="donation_encouragement">NewPipe розроблений добровольцями, які витрачають власний час заради вашого задоволення. Допоможіть розробникам зробити NewPipe ще кращим, насолоджуючись філіжанкою кави.</string>
     <string name="give_back">Ваша допомога</string>
-    <string name="website_encouragement">Завітайте на офіційний сайт, аби отримати більше інформацій та новин.</string>
+    <string name="website_encouragement">Завітайте на офіційний сайт NewPipe, аби отримати більше інформації та новин.</string>
     <string name="app_license_title">Ліцензія NewPipe</string>
     <string name="read_full_license">Прочитати ліцензію</string>
     <string name="title_history_search">Історія пошуку</string>
-    <string name="title_history_view">Переглянуто</string>
+    <string name="title_history_view">Історія перегляду</string>
     <string name="history_disabled">Історію вимкнено</string>
     <string name="action_history">Історія</string>
     <string name="history_empty">Історія відсутня</string>
     <string name="item_deleted">Елемент видалено</string>
-    <string name="delete_item_search_history">Чи ви хочете видалити цей елемент з історії пошуку\?</string>
-    <string name="delete_stream_history_prompt">Чи ви хочете видалити цей елемент з історії переглядів\?</string>
-    <string name="delete_all_history_prompt">Чи ви впевнені, що хочете видали всі елементи з історії\?</string>
+    <string name="delete_item_search_history">Видалити цей елемент з історії пошуку\?</string>
+    <string name="delete_stream_history_prompt">Видалити цей елемент з історії перегляду\?</string>
+    <string name="delete_all_history_prompt">Дійсно видалити всі елементи з історії\?</string>
     <string name="title_last_played">Програвалося останнім</string>
     <string name="title_most_played">Програвалося найбільше</string>
     <string name="main_page_content">Контент на головній сторінці</string>
     <string name="blank_page_summary">Порожня сторінка</string>
-    <string name="kiosk_page_summary">Kiosk</string>
-    <string name="subscription_page_summary">Підписання</string>
-    <string name="feed_page_summary">Нове</string>
-    <string name="channel_page_summary">Сторінка каналу</string>
+    <string name="kiosk_page_summary">Кіоск-сторінка</string>
+    <string name="subscription_page_summary">Підписки</string>
+    <string name="feed_page_summary">Потоки</string>
+    <string name="channel_page_summary">Канал</string>
     <string name="select_a_channel">Обрати канал</string>
     <string name="no_channel_subscribed_yet">Немає підписок на канали</string>
-    <string name="select_a_kiosk">Обрати kiosk</string>
-    <string name="no_valid_zip_file">Недійсний ZIP-файл</string>
-    <string name="could_not_import_all_files">Увага: не можливо здійснити імпортування всіх файлів.</string>
-    <string name="override_current_data">Це перепише ваші поточні налаштування.</string>
+    <string name="select_a_kiosk">Обрати кіоск</string>
+    <string name="no_valid_zip_file">Немає дійсного ZIP-файлу</string>
+    <string name="could_not_import_all_files">Увага: не вдалося імпортувати всі файли.</string>
+    <string name="override_current_data">Це перезапише ваші поточні налаштування.</string>
     <string name="kiosk">Кіоски</string>
     <string name="trending">Набуває популярності</string>
-    <string name="title_activity_background_player">Тловий програвач</string>
-    <string name="title_activity_popup_player">Віконний програвач</string>
-    <string name="play_queue_remove">Усунути</string>
-    <string name="hold_to_append">Утримуйте, для додавання до черги</string>
-    <string name="enqueue_on_background">Додати до черги тлового відтворення</string>
-    <string name="enqueue_on_popup">Додати до черги нового віконного відтворення</string>
-    <string name="start_here_on_main">Розпочати відтворення звідси</string>
-    <string name="start_here_on_background">Розпочати звідси у тловому програвачеві</string>
-    <string name="start_here_on_popup">Розпочати відтворення у вікні звідси</string>
-    <string name="drawer_open">Відкрити шухляду</string>
-    <string name="drawer_close">Закрити шухляду</string>
-    <string name="drawer_header_action_paceholder_text">Незабаром тут щось буде ;D</string>
+    <string name="title_activity_background_player">Програвач у тлі</string>
+    <string name="title_activity_popup_player">Програвач у вікні</string>
+    <string name="play_queue_remove">Видалити</string>
+    <string name="hold_to_append">Утримуйте, щоб додати до черги</string>
+    <string name="enqueue_on_background">Додати до черги при програванні у тлі</string>
+    <string name="enqueue_on_popup">Додати до черги при програванні у вікні</string>
+    <string name="start_here_on_main">Розпочати програвання звідси</string>
+    <string name="start_here_on_background">Розпочати звідси при програванні у тлі</string>
+    <string name="start_here_on_popup">Розпочати звідси при програванні у вікні</string>
+    <string name="drawer_open">Відкрити бічну панель</string>
+    <string name="drawer_close">Закрити бічну панель</string>
+    <string name="drawer_header_action_paceholder_text">Незабаром тут щось з\'явиться ;D</string>
     <string name="always_ask_open_action">Завжди питати</string>
-    <string name="create_playlist">Новий плейлист</string>
+    <string name="create_playlist">Новий список відтворення</string>
     <string name="delete_playlist">Видалити</string>
     <string name="rename_playlist">Змінити назву</string>
     <string name="playlist_name_input">Назва</string>
-    <string name="append_playlist">Додати до плейлиста</string>
-    <string name="set_as_playlist_thumbnail">Установити як ескіз плейлиста</string>
-    <string name="bookmark_playlist">Додати плейлист до закладок</string>
-    <string name="unbookmark_playlist">Усунути закладку</string>
-    <string name="delete_playlist_prompt">Чи видалити цього плейлиста\?</string>
-    <string name="playlist_creation_success">Плейлист було створено</string>
-    <string name="playlist_add_stream_success">Додано до плейлиста</string>
-    <string name="playlist_thumbnail_change_success">Ескіз плейлиста змінився.</string>
-    <string name="playlist_delete_failure">Неможливо видалити плейлист.</string>
-    <string name="caption_none">Субтитри відсутні</string>
-    <string name="resize_fit">Замостити</string>
+    <string name="append_playlist">Додати до списку відтворення</string>
+    <string name="set_as_playlist_thumbnail">Призначити ескізом списку відтворення</string>
+    <string name="bookmark_playlist">Додати список відтворення до закладок</string>
+    <string name="unbookmark_playlist">Видалити закладку</string>
+    <string name="delete_playlist_prompt">Видалити цей список відтворення\?</string>
+    <string name="playlist_creation_success">Список відтворення створено</string>
+    <string name="playlist_add_stream_success">Додано до списку відтворення</string>
+    <string name="playlist_thumbnail_change_success">Ескіз списку відтворення змінено.</string>
+    <string name="playlist_delete_failure">Не вдалося видалити список відтворення.</string>
+    <string name="caption_none">Без субтитрів</string>
+    <string name="resize_fit">Вписати</string>
     <string name="resize_fill">Заповнити</string>
     <string name="resize_zoom">Збільшити</string>
-    <string name="caption_auto_generated">Створено автоматичним шляхом</string>
+    <string name="caption_auto_generated">Створені автоматично</string>
     <string name="enable_leak_canary_title">Увімкнути LeakCanary</string>
-    <string name="enable_leak_canary_summary">Моніторування витіків пам\'яті може призвести до нереагівності застосунку</string>
+    <string name="enable_leak_canary_summary">Моніторинг втрат пам\'яті може призвести до нереагування додатку під час запису дампу</string>
     <string name="enable_disposed_exceptions_title">Зазвітувати out-of-lifecycle хиби</string>
     <string name="enable_disposed_exceptions_summary">Примусове звітування про неможливість доставлення Rx винятків, які відбуваються за межами фраґменту або діяльності життєвого циклу після усунення</string>
-    <string name="use_inexact_seek_title">Використовувати неточний пошук</string>
+    <string name="use_inexact_seek_title">Використовувати швидкий неточний пошук</string>
     <string name="use_inexact_seek_summary">Неточний пошук дозволяє програвачеві рухатися позиціями швидше, проте з меншою точністю</string>
-    <string name="auto_queue_title">Додавати в чергу наступний стрим</string>
-    <string name="auto_queue_summary">Автоматично додавати пов\'язаний стрим під час відтворення останнього у черзі без повторювань.</string>
+    <string name="auto_queue_title">Автоматично додавати в чергу наступний запис</string>
+    <string name="auto_queue_summary">Автоматично додавати пов\'язаний запис під час відтворення останнього у черзі без повторювань.</string>
     <string name="file">Файл</string>
     <string name="invalid_directory">Такої теки не існує</string>
-    <string name="invalid_source">Не існує файлу/джерела контенту</string>
-    <string name="invalid_file">Файл не існує, або немає дозволу на його запис або читання</string>
-    <string name="file_name_empty_error">Назва файлу не може бути порожньою</string>
-    <string name="error_occurred_detail">Помилка: %1$s</string>
+    <string name="invalid_source">Такого джерела файлу/контенту не існує</string>
+    <string name="invalid_file">Файл не існує або відсутній дозвіл на його читання або запис</string>
+    <string name="file_name_empty_error">Ім\'я файлу не може бути порожнім</string>
+    <string name="error_occurred_detail">Сталася помилка: %1$s</string>
     <string name="import_export_title">Імпортування/експортування</string>
     <string name="import_title">Імпортування</string>
     <string name="import_from">Імпортувати з</string>
@@ -357,36 +357,36 @@
     <string name="import_network_expensive_warning">Майте на увазі: ця операція може потребувати багато трафіку.
 \n
 \nПродовжуватимете?</string>
-    <string name="download_thumbnail_title">Завантажити ескізи</string>
-    <string name="download_thumbnail_summary">Вимкніть завантаженні ескізів, заощаджується трафік та внутрішня пам\'ять. Зміни призведуть очищення кешу зображень.</string>
+    <string name="download_thumbnail_title">Завантажувати ескізи</string>
+    <string name="download_thumbnail_summary">Вимкніть для запобігання завантаженню ескізів, що заощадить трафік та внутрішню пам\'ять. Зміни призведуть до очищення кешу зображень.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Кеш зображень стерто</string>
     <string name="metadata_cache_wipe_title">Стерти кеш метаданих</string>
-    <string name="metadata_cache_wipe_summary">"Усунути всі кешовані дані вебсторінки "</string>
+    <string name="metadata_cache_wipe_summary">Видалити всі кешовані дані веб-сторінок</string>
     <string name="metadata_cache_wipe_complete_notice">Кеш метаданих стерто</string>
     <string name="playback_speed_control">Реґулятори швидкісті відтворення</string>
     <string name="playback_tempo">Темп</string>
     <string name="playback_pitch">Тон</string>
     <string name="unhook_checkbox">Від\'єднати (може спричинити спотворення)</string>
-    <string name="no_streams_available_download">Стрими недоступні для завантаження</string>
-    <string name="preferred_open_action_settings_title">Переважний спосіб \"відкриття\"</string>
+    <string name="no_streams_available_download">Відсутні потоки, доступні для завантаження</string>
+    <string name="preferred_open_action_settings_title">Бажана дія при відкритті</string>
     <string name="preferred_open_action_settings_summary">Типова дія під час відкриття вмісту — %s</string>
     <string name="caption_setting_title">Субтитри</string>
-    <string name="caption_setting_description">Змінення маштабу субтитрового тексту та тлових стилів. Увімкнення функції потребує перезавантаження застосунку.</string>
-    <string name="toast_no_player">Не знайдено відповідного застосунку для відтворення цього файлу</string>
+    <string name="caption_setting_description">Зміна висоти тексту субтитрів та стилів тла. Потребує перезапуску додатку.</string>
+    <string name="toast_no_player">Не встановлено додаток для програвання цього файлу</string>
     <string name="clear_views_history_title">Очистити історію переглядів</string>
     <string name="clear_views_history_summary">Видаляє історію відтворень</string>
-    <string name="delete_view_history_alert">Чи видалити всю історію переглядів\?</string>
-    <string name="view_history_deleted">Історію переглядів було видалено.</string>
-    <string name="clear_search_history_title">Очистити історію пошуків</string>
+    <string name="delete_view_history_alert">Видалити всю історію переглядів\?</string>
+    <string name="view_history_deleted">Історію переглядів видалено.</string>
+    <string name="clear_search_history_title">Очистити історію пошуку</string>
     <string name="clear_search_history_summary">Видаляє історію пошукових ключових слів</string>
-    <string name="delete_search_history_alert">Чи видалити всю пошукову історію\?</string>
-    <string name="search_history_deleted">Пошукову історію видалено.</string>
-    <string name="one_item_deleted">Видалено один фрагмент.</string>
-    <string name="app_license">"NewPipe є вільною копілефт програмою: Ви можете використовувати її, поширювати та вдосконалювати з розсудом. Зокрема ви можете перерозподіляти та/або змінювати її за умов використання GNU General Public License, опублікованою Free Software Foundation,  під 3-ю версією ліцензії, або (на ваш вибір) будь-якою пізнішою версією."</string>
-    <string name="import_settings">Бажаєте імпортувати з налаштуваннями\?</string>
-    <string name="privacy_policy_title">NewPipe\'ова політика приватності</string>
-    <string name="privacy_policy_encouragement">Проєкт NewPipe дуже серйозно ставиться до вашої приватності. Тому застосунок не збирає ніяких даних без вашої згоди 
-\nПолітика приватності NewPipe пояснює у деталях, які дані було відіслано та збережено, під час відсилання крахового звіту.</string>
+    <string name="delete_search_history_alert">Видалити всю історію пошуку\?</string>
+    <string name="search_history_deleted">Історію пошуку видалено.</string>
+    <string name="one_item_deleted">Видалено 1 елемент.</string>
+    <string name="app_license">NewPipe є вільним копілефт додатком: ви можете використовувати, поширювати та вдосконалювати його на власний розсуд. Зокрема, ви можете розповсюджувати та/або змінювати її за умов дотримання вимог GNU General Public License 3-ї версії або (на ваш вибір) будь-якої пізнішої версії, опублікованої Free Software Foundation.</string>
+    <string name="import_settings">Імпортувати разом з налаштуваннями\?</string>
+    <string name="privacy_policy_title">Політика приватності NewPipe</string>
+    <string name="privacy_policy_encouragement">Проект NewPipe дуже серйозно ставиться до вашої приватності. Тому додаток не збирає ніяких даних без вашої згоди.
+\nПолітика приватності NewPipe пояснює у деталях, які дані відсилаються та зберігаються, коли ви надсилаєте звіт про падіння додатку.</string>
     <string name="read_privacy_policy">Читати політику приватності</string>
     <string name="start_accept_privacy_policy">Аби дотриматися Норм загального захисту даних ЄС (General Data Protection Regulation, GDPR), ми просимо звернути вашу увагу на NewPipe\'ову політику приватності. Будь ласка, прочитайте уважно
 \nВи маєте підтвердити її аби надіслати нам баґового звіту.</string>
@@ -403,8 +403,8 @@
     <string name="minimize_on_exit_background_description">До тлового програвача</string>
     <string name="minimize_on_exit_popup_description">Зменшити до віконного програвачу</string>
     <string name="channels">Канали</string>
-    <string name="playlists">Плейлисти</string>
-    <string name="tracks">Стежки</string>
+    <string name="playlists">Списки відтворення</string>
+    <string name="tracks">Треки</string>
     <string name="users">Користувачі</string>
     <string name="list_view_mode">Вигляд списку</string>
     <string name="list">Список</string>
@@ -413,18 +413,18 @@
     <string name="tab_new">Нова вкладка</string>
     <string name="tab_choose">Обрати вкладку</string>
     <string name="volume_gesture_control_title">Жест керування гучністю</string>
-    <string name="volume_gesture_control_summary">Змінювати гучність плеєра жестами</string>
-    <string name="brightness_gesture_control_title">Жест регулювання яскравістю</string>
-    <string name="brightness_gesture_control_summary">Змінювати яскравість жестами</string>
+    <string name="volume_gesture_control_summary">Змінювати гучність звуку жестами</string>
+    <string name="brightness_gesture_control_title">Жест керування яскравістю</string>
+    <string name="brightness_gesture_control_summary">Змінювати яскравість екрану жестами</string>
     <string name="settings_category_updates_title">Оновлення</string>
     <string name="events">Події</string>
     <string name="file_deleted">Файл видалено</string>
-    <string name="app_update_notification_channel_name">Сповіщення про оновлення</string>
+    <string name="app_update_notification_channel_name">Сповіщення про оновлення додатку</string>
     <string name="app_update_notification_channel_description">Сповіщення про нову версію NewPipe</string>
     <string name="download_to_sdcard_error_title">Зовнішнє сховище недоступне</string>
-    <string name="restore_defaults">Відновити на типові</string>
-    <string name="restore_defaults_confirmation">Бажаєте відновити на типові\?</string>
-    <string name="subscribers_count_not_available">Кількість підписників недоступне</string>
+    <string name="restore_defaults">Відновити типові налаштування</string>
+    <string name="restore_defaults_confirmation">Бажаєте відновити типові налаштування\?</string>
+    <string name="subscribers_count_not_available">Кількість підписників недоступна</string>
     <string name="selection">Вибір</string>
     <string name="conferences">Конференції</string>
     <string name="updates_setting_title">Оновлення</string>
@@ -463,4 +463,11 @@
     <string name="max_retry_msg">Максимум спроб</string>
     <string name="max_retry_desc">Максимальна кількість спроб перед скасуванням завантаження</string>
     <string name="pause_downloads_on_mobile">Призупиняти завантаження при переході на стільникові дані</string>
+    <string name="download_to_sdcard_error_message">Завантаження до зовнішньої SD-карти поки що неможливе. Скинути розташування теки для завантажень\?</string>
+    <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>
 </resources>
\ No newline at end of file

From c37b88a23929a2a407497fb85f7ceb1461d53817 Mon Sep 17 00:00:00 2001
From: Stjepan <stjepstjepanovic@gmail.com>
Date: Thu, 4 Apr 2019 12:13:45 +0000
Subject: [PATCH 051/138] Translated using Weblate (Croatian)

Currently translated at 99.3% (440 of 443 strings)
---
 app/src/main/res/values-hr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 9a9bbe004..6e8595010 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -36,7 +36,7 @@
     <string name="download_path_audio_title">Mapa za preuzimanje zvuka</string>
     <string name="download_path_audio_summary">Preuzeti zvuk je spremljen ovdje</string>
     <string name="download_path_audio_dialog_title">Unesi put za preuzimanje zvučne datoteke</string>
-    <string name="autoplay_by_calling_app_title">Auto. reprod. kada je NewPipe pozvan iz druge apl.</string>
+    <string name="autoplay_by_calling_app_title">Automatska reprodukcija</string>
     <string name="autoplay_by_calling_app_summary">Reproducira videozapis kad je NewPipe pozvan iz druge aplikacije</string>
     <string name="default_resolution_title">Zadana razlučivost</string>
     <string name="default_popup_resolution_title">Zadana razlučivost skočnog prozora</string>

From 82cb71bf3f15d6457a964239138bc42471b119d0 Mon Sep 17 00:00:00 2001
From: Florian <floflr@zaclys.net>
Date: Fri, 5 Apr 2019 13:34:21 +0000
Subject: [PATCH 052/138] Translated using Weblate (French)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-fr/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index bc63d927f..6d8d03dec 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -471,4 +471,7 @@
     <string name="error_postprocessing_failed">Échec du post-traitement</string>
     <string name="max_retry_msg">Nombre maximum de tentatives</string>
     <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-threads, réessayez avec @string/msg_threads = 1</string>
+    <string name="msg_pending_downloads">Continuer vos %s transferts en attente depuis Téléchargement</string>
 </resources>
\ No newline at end of file

From 704b8f61dd780d10611c1c5d144917e25b1a2fea Mon Sep 17 00:00:00 2001
From: artik banana <lid@tuta.io>
Date: Sat, 6 Apr 2019 18:42:13 +0000
Subject: [PATCH 053/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 132 +++++++------------------
 1 file changed, 36 insertions(+), 96 deletions(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 5782a1b52..8c23a815c 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">יש ללחוץ על „חיפוש” כדי להתחיל</string>
+    <string name="main_bg_subtitle">לחץ על „חיפוש” כדי להתחיל</string>
     <string name="view_count_text">%1$s צפיות</string>
     <string name="upload_date_text">פורסם ב־%1$s</string>
     <string name="no_player_found">לא נמצאו נגני צפייה ישירה, להתקין את VLC\?</string>
@@ -22,15 +22,12 @@
     <string name="popup_mode_share_menu_title">מצב חלון צף של NewPipe</string>
     <string name="controls_background_title">רקע</string>
     <string name="controls_popup_title">חלון צף</string>
-
     <string name="download_path_title">נתיב להורדת סרטונים</string>
     <string name="download_path_summary">נתיב מיקום לאחסון סרטונים</string>
     <string name="download_path_dialog_title">נא להקליד נתיב לשמירת סרטונים</string>
-
     <string name="download_path_audio_title">תיקיית הורדות שמע</string>
     <string name="download_path_audio_summary">הורדות שמע נשמרות כאן</string>
     <string name="download_path_audio_dialog_title">נא להקליד נתיב לשמירת קובצי שמע</string>
-
     <string name="autoplay_by_calling_app_title">ניגון אוטומטי</string>
     <string name="autoplay_by_calling_app_summary">מנגן סרטון כאשר NewPipe נפתח דרך יישומון אחר</string>
     <string name="default_resolution_title">רזולוציית בררת המחדל</string>
@@ -54,7 +51,6 @@
     <string name="player_gesture_controls_summary">שימוש במחוות כדי לשלוט בבהירות ובעצמת השמע של הנגן</string>
     <string name="show_search_suggestions_title">הצעות חיפוש</string>
     <string name="show_search_suggestions_summary">הצגת הצעות בעת החיפוש</string>
-
     <string name="download_dialog_title">הורדה</string>
     <string name="next_video_title">הבא</string>
     <string name="show_next_and_similar_title">להציג סרטונים דומים ובאים בתור</string>
@@ -69,7 +65,7 @@
     <string name="play_btn_text">נגינה</string>
     <string name="content">תוכן</string>
     <string name="show_age_restricted_content_title">תוכן עם הגבלת גיל</string>
-    <string name="video_is_age_restricted">הצגת סרטונים עם הגבלת גיל. ניתן לאפשר תכנים שכאלה דרך ההגדרות.</string>
+    <string name="video_is_age_restricted">הצגת סרטונים עם הגבלת גיל. ניתן לאפשר תכנים שכאלו דרך ההגדרות.</string>
     <string name="duration_live">חי</string>
     <string name="downloads">הורדות</string>
     <string name="downloads_title">הורדות</string>
@@ -83,7 +79,6 @@
     <string name="refresh">רענון</string>
     <string name="clear">פינוי</string>
     <string name="popup_resizing_indicator_title">שינוי גודל</string>
-
     <string name="general_error">שגיאה</string>
     <string name="network_error">שגיאת רשת</string>
     <string name="could_not_load_thumbnails">אין אפשרות לטעון את כל התמונות הממוזערות</string>
@@ -104,17 +99,14 @@
     <string name="what_device_headline">מידע:</string>
     <string name="what_happened_headline">מה קרה:</string>
     <string name="info_labels">מה:\\nבקשה:\\nשפת התוכן:\\nשירות:\\nשעון גריניץ׳:\\nחבילה:\\nגרסה:\\nגרסת מערכת ההפעלה:</string>
-<string name="subscribe_button_title">עריכת מינוי</string>
-    <string name="subscribed_button_title">נרשמת</string>
+    <string name="subscribe_button_title">הירשם</string>
+    <string name="subscribed_button_title">רשום</string>
     <string name="channel_unsubscribed">ביטול מינוי לערוץ</string>
     <string name="subscription_change_failed">לא הצלחתי לשנות מינוי</string>
     <string name="subscription_update_failed">לא ניתן לעדכן את המינוי</string>
-
     <string name="tab_main">ראשי</string>
     <string name="tab_subscriptions">מינויים</string>
-
     <string name="fragment_whats_new">מה חדש</string>
-
     <string name="enable_search_history_title">היסטוריית חיפוש</string>
     <string name="enable_search_history_summary">שמירת שאילתות החיפוש מקומית</string>
     <string name="enable_watch_history_title">היסטוריה ומטמון</string>
@@ -132,20 +124,14 @@
     <string name="best_resolution">רזולוציה מיטבית</string>
     <string name="undo">ביטול</string>
     <string name="play_all">לנגן הכול</string>
-
     <string name="notification_channel_name">התראה מ־NewPipe</string>
     <string name="notification_channel_description">התראות עבור נגן הרקע והנגן הצף של NewPipe</string>
-
     <string name="unknown_content">[לא ידוע]</string>
-
     <string name="player_stream_failure">נגינת התזרים לא הצליחה</string>
     <string name="player_unrecoverable_failure">אירעה תקלה בנגן ממנה לא ניתן להשתקם</string>
     <string name="player_recoverable_failure">מתבצעת החלמה משגיאת נגן</string>
-
     <string name="your_comment">ההערה שלך (באנגלית):</string>
     <string name="error_details_headline">פרטים:</string>
-
-
     <string name="list_thumbnail_view_description">תמונה ממוזערת לתצוגה המקדימה של הסרטון</string>
     <string name="detail_thumbnail_view_description">תמונות ממוזערות לתצוגה המקדימה של הסרטון</string>
     <string name="detail_uploader_thumbnail_view_description">תמונה ייצוגית של המפרסם</string>
@@ -157,54 +143,45 @@
     <string name="user_report">דוח משתמש</string>
     <string name="search_no_results">אין תוצאות</string>
     <string name="empty_subscription_feed_subtitle">אין כאן כלום מלבד צרצרים</string>
-
     <string name="err_dir_create">לא ניתן ליצור את תיקיית ההורדות ‚%1$s’</string>
     <string name="info_dir_created">תיקיית ההורדות ‚%1$s’ נוצרה</string>
-
     <string name="video">סרטון</string>
     <string name="audio">שמע</string>
     <string name="retry">ניסיון חוזר</string>
     <string name="storage_permission_denied">הגישה לאחסון נדחתה</string>
     <string name="use_old_player_title">השתמש בנגן הישן</string>
     <string name="use_old_player_summary">השתמש בנגן המובנה Mediaframework</string>
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-
     <string name="no_subscribers">אין מנויים</string>
     <plurals name="subscribers">
-	<item quantity="one">מנוי אחד</item>
-	<item quantity="two">שני מנויים</item>
-	<item quantity="many">%s מנויים</item>
-	<item quantity="other">%s מנויים</item>
-</plurals>
-
+        <item quantity="one">מנוי אחד</item>
+        <item quantity="two">שני מנויים</item>
+        <item quantity="many">%s מנויים</item>
+        <item quantity="other">%s מנויים</item>
+    </plurals>
     <string name="no_views">אין צפיות</string>
     <plurals name="views">
-	<item quantity="one">צפייה אחת</item>
-	<item quantity="two">שתי צפיות</item>
-	<item quantity="many">%s צפיות</item>
-	<item quantity="other">%s צפיות</item>
-</plurals>
-
+        <item quantity="one">צפייה אחת</item>
+        <item quantity="two">שתי צפיות</item>
+        <item quantity="many">%s צפיות</item>
+        <item quantity="other">%s צפיות</item>
+    </plurals>
     <string name="no_videos">אין סרטונים</string>
     <plurals name="videos">
-    <item quantity="one">סרטון</item>
-    <item quantity="two">שני סרטונים</item>
-    <item quantity="many">%s סרטונים</item>
-    <item quantity="other">%s סרטונים</item>
-</plurals>
-
+        <item quantity="one">סרטון</item>
+        <item quantity="two">שני סרטונים</item>
+        <item quantity="many">%s סרטונים</item>
+        <item quantity="other">%s סרטונים</item>
+    </plurals>
     <string name="start">התחלה</string>
     <string name="pause">השהיה</string>
     <string name="view">נגינה</string>
     <string name="delete">מחיקה</string>
     <string name="checksum">גיבוב לאימות</string>
-
     <string name="add">משימה חדשה</string>
     <string name="finish">אישור</string>
-
     <string name="msg_name">שם קובץ</string>
     <string name="msg_threads">תת־דיונים</string>
     <string name="msg_error">שגיאה</string>
@@ -218,19 +195,15 @@
     <string name="no_available_dir">נא לבחור תיקיית הורדה זמינה</string>
     <string name="msg_popup_permission">הרשאה זו נדרשת לטובת 
 \nפתיחה בחלון צף</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">אתגר reCAPTCHA</string>
     <string name="recaptcha_request_toast">התקבלה בקשה לאתגר reCAPTCHA</string>
-
     <string name="settings_category_downloads_title">הורדה</string>
     <string name="settings_file_charset_title">רשימת תווים אפשרית בשמות קבצים</string>
     <string name="settings_file_replacement_character_summary">תווים לא נתמכים מוחלפים בערך הזה</string>
     <string name="settings_file_replacement_character_title">תו חלופי</string>
-
     <string name="charset_letters_and_digits">אותיות וספרות</string>
     <string name="charset_most_special_characters">רוב התווים המיוחדים</string>
-
     <string name="title_activity_about">על אודות NewPipe</string>
     <string name="action_settings">הגדרות</string>
     <string name="action_about">על אודות</string>
@@ -252,8 +225,6 @@
     <string name="website_encouragement">מומלץ לבקר באתר של NewPipe לפרטים נוספים ולחדשות.</string>
     <string name="app_license_title">הרישיון של NewPipe</string>
     <string name="read_full_license">הצגת הרישיון</string>
-
-
     <string name="title_activity_history">היסטוריה</string>
     <string name="title_history_search">נשלח כחיפוש</string>
     <string name="title_history_view">נצפו</string>
@@ -263,17 +234,15 @@
     <string name="history_cleared">ההיסטוריה התרוקנה</string>
     <string name="item_deleted">פריט נמחק</string>
     <string name="delete_item_search_history">למחוק את הפריט הזה מהיסטוריית החיפושים\?</string>
-
     <string name="main_page_content">תוכן הדף הראשי</string>
     <string name="blank_page_summary">דף ריק</string>
     <string name="kiosk_page_summary">דף גישה מזדמנת</string>
-    <string name="subscription_page_summary">דף מינויים</string>
+    <string name="subscription_page_summary">דף מנוים</string>
     <string name="feed_page_summary">דף עדכונים</string>
     <string name="channel_page_summary">דף ערוצים</string>
     <string name="select_a_channel">נא לבחור ערוץ</string>
     <string name="no_channel_subscribed_yet">אין עדיין מינויים לערוצים</string>
     <string name="select_a_kiosk">נא לבחור סוג גישה מזדמנת</string>
-
     <string name="kiosk">גישה מזדמנת</string>
     <string name="trending">החמים</string>
     <string name="top_50">50 המובילים</string>
@@ -289,31 +258,26 @@
     <string name="start_here_on_main">להתחיל לנגן מכאן</string>
     <string name="start_here_on_background">"להתחיל מכאן  כאשר נגן הרקע מופעל"</string>
     <string name="start_here_on_popup">להתחיל כאן בנגן הצף</string>
-<string name="controls_download_desc">הורדת קובץ הזרמה</string>
+    <string name="controls_download_desc">הורדת קובץ הזרמה</string>
     <string name="show_info">הצגת מידע</string>
-
     <string name="tab_bookmarks">רשימות נגינה מסומנות</string>
-
-    <string name="controls_add_to_playlist_title">הוספה אל</string>
-
-    <string name="default_content_country_title">מדינת תוכן כבררת מחדל</string>
+    <string name="controls_add_to_playlist_title">הוסף ל</string>
+    <string name="default_content_country_title">מדינת תוכן ברירת המחדל</string>
     <string name="service_title">שירות</string>
     <string name="settings_category_debug_title">ניפוי שגיאות</string>
     <string name="always">תמיד</string>
     <string name="just_once">חד פעמי</string>
-
     <string name="import_data_title">ייבוא מסד נתונים</string>
     <string name="export_data_title">ייצוא מסד נתונים</string>
     <string name="external_player_unsupported_link_type">נגנים חיצוניים לא תומכים בסוגי קישורים כאלה</string>
     <string name="invalid_url_toast">כתובת שגויה</string>
     <string name="file">קובץ</string>
-
     <string name="switch_to_background">העברה לרקע</string>
     <string name="switch_to_popup">העברה לחלון צף</string>
     <string name="no_player_found_toast">לא נמצא נגן צפייה ישירה (ניתן להתקין את VLC כדי לתקן זאת).</string>
-    <string name="thumbnail_cache_wipe_complete_notice">מטמון התמונות התרוקן</string>
-    <string name="metadata_cache_wipe_title">ניקוי מטמון נתוני העל</string>
-    <string name="metadata_cache_wipe_complete_notice">מטמון נתוני העל התרוקן</string>
+    <string name="thumbnail_cache_wipe_complete_notice">תמונות מטמון נמחקו</string>
+    <string name="metadata_cache_wipe_title">מחק מטא-נתונים במטמון</string>
+    <string name="metadata_cache_wipe_complete_notice">מטא-נתונים במטמון נמחקו</string>
     <string name="export_data_summary">ייצוא היסטוריה, מינויים ורשימות נגינה</string>
     <string name="clear_views_history_title">מחיקת היסטוריית הצפייה</string>
     <string name="view_history_deleted">היסטוריית הצפייה נמחקה.</string>
@@ -322,30 +286,24 @@
     <string name="invalid_file">הקובץ אינו קיים או שחסרה הרשאה לקרוא אותו או לכתוב אליו</string>
     <string name="file_name_empty_error">שם הקובץ אינו יכול להיות ריק</string>
     <string name="detail_drag_description">ניתן לסדר מחדש בגרירה</string>
-
     <string name="create">יצירה</string>
     <string name="delete_one">למחוק אחד</string>
     <string name="delete_all">למחוק הכול</string>
     <string name="dismiss">התעלמות</string>
     <string name="rename">שינוי שם</string>
-
     <string name="one_item_deleted">פריט אחד נמחק.</string>
-
     <string name="toast_no_player">לא מותקן יישומון שמתאים לנגינת הקובץ הזה</string>
-
-    <string name="delete_stream_history_prompt">למחוק את הפריט הזה מהיסטוריית הצפייה שלך\?</string>
+    <string name="delete_stream_history_prompt">האם ברצונך למחוק פריט זה מהיסטוריית הצפייה\?</string>
     <string name="delete_all_history_prompt">למחוק את כל הפריטים מההיסטוריה\?</string>
     <string name="export_complete_toast">הייצוא הסתיים</string>
     <string name="import_complete_toast">הייבוא הסתיים</string>
     <string name="no_valid_zip_file">אין קובץ ZIP תקין</string>
-    <string name="video_player">נגן וידאו</string>
+    <string name="video_player">נגן סרטונים</string>
     <string name="background_player">נגן רקע</string>
     <string name="popup_player">נגן צף</string>
     <string name="always_ask_open_action">לשאול תמיד</string>
-
-    <string name="preferred_player_fetcher_notification_title">המידע מתקבל…</string>
+    <string name="preferred_player_fetcher_notification_title">משיג מידע…</string>
     <string name="preferred_player_fetcher_notification_message">התוכן המבוקש בטעינה</string>
-
     <string name="create_playlist">רשימת נגינה חדשה</string>
     <string name="delete_playlist">מחיקה</string>
     <string name="rename_playlist">שינוי שם</string>
@@ -353,30 +311,23 @@
     <string name="append_playlist">הוספה לרשימת נגינה</string>
     <string name="bookmark_playlist">הוספה רשימת השמעה לסימניות</string>
     <string name="unbookmark_playlist">הסרת סימנייה</string>
-
     <string name="delete_playlist_prompt">למחוק רשימת נגינה זו\?</string>
     <string name="playlist_creation_success">רשימת הנגינה נוצרה</string>
     <string name="playlist_add_stream_success">נוסף לרשימת הנגינה</string>
     <string name="playlist_thumbnail_change_success">תמונת רשימת הנגינה הוחלפה.</string>
     <string name="resize_fill">מילוי</string>
     <string name="resize_zoom">תקריב</string>
-
     <string name="caption_auto_generated">נוצרו אוטומטית</string>
-
     <string name="import_export_title">ייבוא/ייצוא</string>
     <string name="import_title">ייבוא</string>
     <string name="import_from">ייבוא מ־</string>
     <string name="export_to">ייצוא אל</string>
-
-    <string name="import_ongoing">מתבצע ייבוא…</string>
-    <string name="export_ongoing">מתבצע ייצוא…</string>
-
+    <string name="import_ongoing">מייבא…</string>
+    <string name="export_ongoing">מייצא…</string>
     <string name="import_file_title">ייבוא קובץ</string>
     <string name="previous_export">ייצוא קודם</string>
-
     <string name="subscriptions_import_unsuccessful">לא ניתן לייבא את המינויים</string>
     <string name="subscriptions_export_unsuccessful">לא ניתן לייצא את המינויים</string>
-
     <string name="import_youtube_instructions">כדי לייבא את רשימת המינויים שלך מ־YouTube עליך להוריד את קובץ הייצוא:
 \n 
 \n1. לעבור לכתובת הזו: %1$s
@@ -384,7 +335,7 @@
 \n3. ההורדה אמורה להתחיל (זה קובץ הייצוא)</string>
     <string name="playback_tempo">קצב</string>
     <string name="playback_default">ברירת מחדל</string>
-<string name="use_inexact_seek_title">שימוש בחיפוש מהיר גס</string>
+    <string name="use_inexact_seek_title">השתמש בחיפוש מהיר, לא מדויק</string>
     <string name="use_inexact_seek_summary">חיפוש גס מאפשר לנגן לחפש נקודת זמן מהר יותר, ברמת דיוק נמוכה יותר</string>
     <string name="download_thumbnail_title">טעינת תמונות ממוזערות</string>
     <string name="download_thumbnail_summary">כיבוי האפשרות מונע את טעינת התמונות הממוזערות, חוסך בתקשורת נתונים ובניצולת הזיכרון. שינויים באפשרות זו מוחקים את המטמון בזיכרון ובכונן.</string>
@@ -393,7 +344,6 @@
     <string name="auto_queue_summary">להוסיף אוטומטית תזרים דומה בעת נגינת התזרים האחרון בתור שאינו מחזורי.</string>
     <string name="toggle_orientation">החלפת כיווניות</string>
     <string name="switch_to_main">העברה לראשי</string>
-
     <string name="import_data_summary">משכתב את ההיסטוריה והמינויים הנוכחיים שלך</string>
     <string name="clear_views_history_summary">מחיקת היסטוריית התזרימים שהתנגנו</string>
     <string name="channels">ערוצים</string>
@@ -409,37 +359,27 @@
     <string name="invalid_source">אין מקור תיקייה/תוכן</string>
     <string name="error_occurred_detail">אירעה שגיאה: %1$s</string>
     <string name="no_streams_available_download">אין תזרימים זמינים להורדה</string>
-
     <string name="privacy_policy_title">מדיניות הפרטיות של NewPipe</string>
     <string name="privacy_policy_encouragement">מיזם NewPipe שומר על הפרטיות שלך בצורה מאוד קפדנית. לפיכך, היישומון אינו אוסף נתונים ללא הסכמתך.
 \nמדיניות הפרטיות של NewPipe מסבירה בפרטי פרטים אילו נתונים נשלחים ומאוחסנים בעת שליחת דיווח על תקלה.</string>
     <string name="read_privacy_policy">הצגת מדיניות הפרטיות</string>
     <string name="app_license">NewPipe הוא יישומון חופשי בהתאם לרישיון קופילפט: מותר לך להשתמש, לחקור, לשתף ולשפר בכל דרך שנראית לך. במיוחד מותר לך להפיץ מחדש ו/או לשנות תחת תנאי הרישיון הציבורי הכללי של GNU כפי שמופץ על ידי קרן התכנה החופשית, בין אם גרסה 3 של הרישיון או (לשיקולך) כל גרסה עדכנית יותר שלו.</string>
-    <string name="title_last_played">התנגנו אחרונים</string>
+    <string name="title_last_played">נוגן אחרון</string>
     <string name="title_most_played">הכי נצפים</string>
-
-    <string name="could_not_import_all_files">אזהרה: ייבוא חלק מהקבצים נכשל.</string>
-    <string name="override_current_data">פעולה זו תדרוס את ההגדרות הקיימות.</string>
+    <string name="could_not_import_all_files">אזהרה: לא יכל לייבא את כל הקבצים</string>
+    <string name="override_current_data">פעולה זו תדרוס את ההתקנה הקיימת.</string>
     <string name="import_settings">לייבא גם הגדרות\?</string>
-
     <string name="drawer_open">פתיחת מגירה</string>
     <string name="drawer_close">סגירת מגירה</string>
     <string name="drawer_header_action_paceholder_text">משהו יופיע כאן בקרוב ‎;D</string>
-
-
     <string name="preferred_open_action_settings_title">פעולת ‚פתיחה’ מועדפת</string>
     <string name="preferred_open_action_settings_summary">פעולת בררת מחדל בעת פתיחת תוכן - %s</string>
-
-    <string name="set_as_playlist_thumbnail">הגדרה כתמונת רשימת הנגינה</string>
-
+    <string name="set_as_playlist_thumbnail">קבע כתמונה לרשימת השמעה</string>
     <string name="playlist_delete_failure">לא ניתן למחוק רשימת נגינה.</string>
-
     <string name="caption_none">אין כתוביות</string>
-
     <string name="resize_fit">התאמה</string>
     <string name="caption_setting_title">כתוביות</string>
     <string name="caption_setting_description">שינוי גודל כותרת הנגן וסגנונות הרקע. נדרשת הפעלה מחדש כדי ששינויים אלה יכנסו לתוקף.</string>
-
     <string name="enable_leak_canary_title">הפעלת LeakCanary</string>
     <string name="enable_leak_canary_summary">מעקב אחר זליגת זיכרון עשויה לגרום ליישומון להיות בלתי זמין בזמן העתקת תוכן הזיכרון לקובץ</string>
     <string name="import_soundcloud_instructions_hint">המזהה שלך, soundcloud.com/המזהה שלך</string>

From eb265300fc17b0719009f00b4b9a03bdefb7d42b Mon Sep 17 00:00:00 2001
From: Yehuda Levy <yudayuda@gmail.com>
Date: Sat, 6 Apr 2019 18:57:47 +0000
Subject: [PATCH 054/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 8c23a815c..419ca8a78 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -419,7 +419,7 @@
     <string name="selection">בחירה</string>
     <string name="events">אירועים</string>
     <string name="conferences">כנסים</string>
-    <string name="enable_disposed_exceptions_title">דיווח על שגיאות של חריגה ממחזור חיים</string>
+    <string name="enable_disposed_exceptions_title">דווח על שגיאות שמחוץ למחזור החיים</string>
     <string name="enable_disposed_exceptions_summary">אילוץ דיווח על חריגות מחוץ למקטעים או למחזור חיי הפעילות לאחר ההשלכה בתשדורת יוצאת</string>
     <string name="import_soundcloud_instructions">ניתן לייבא פרופיל SoundCloud על ידי הקלדת הכתובת או המזהה שלך:
 \n

From 72e30d8e40e49114457ed5fecbf715833338bd6e Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat, 6 Apr 2019 18:59:48 +0000
Subject: [PATCH 055/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 419ca8a78..bad136a23 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -99,7 +99,7 @@
     <string name="what_device_headline">מידע:</string>
     <string name="what_happened_headline">מה קרה:</string>
     <string name="info_labels">מה:\\nבקשה:\\nשפת התוכן:\\nשירות:\\nשעון גריניץ׳:\\nחבילה:\\nגרסה:\\nגרסת מערכת ההפעלה:</string>
-    <string name="subscribe_button_title">הירשם</string>
+    <string name="subscribe_button_title">עריכת מינוי</string>
     <string name="subscribed_button_title">רשום</string>
     <string name="channel_unsubscribed">ביטול מינוי לערוץ</string>
     <string name="subscription_change_failed">לא הצלחתי לשנות מינוי</string>

From f7a534a0d0023ecef9eef685aa6ecb30d5b21ebc Mon Sep 17 00:00:00 2001
From: AB <ao7nro+6ltrjuwxelfo4@sharklasers.com>
Date: Sat, 6 Apr 2019 07:56:01 +0000
Subject: [PATCH 056/138] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-uk/strings.xml | 36 +++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 93dbaf48c..6bd68e049 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -23,10 +23,10 @@
     <string name="download_path_audio_title">Тека для завантаженого аудіо</string>
     <string name="download_path_audio_summary">Завантажене аудіо зберігається тут</string>
     <string name="autoplay_by_calling_app_title">Автоматичне програвання</string>
-    <string name="autoplay_by_calling_app_summary">Програє відео коли NewPipe викликано з іншого додатку</string>
+    <string name="autoplay_by_calling_app_summary">Програє відео коли NewPipe викликано з іншого застосунку</string>
     <string name="default_resolution_title">Типова роздільна здатність</string>
     <string name="play_with_kodi_title">Програти у Kodi</string>
-    <string name="kore_not_found">Додаток Kore не знайдено. Встановити його\?</string>
+    <string name="kore_not_found">Застосунок Kore не знайдено. Встановити його\?</string>
     <string name="show_play_with_kodi_title">Показати опцію \"Програти у Kodi\"</string>
     <string name="show_play_with_kodi_summary">Показати опцію програвання відео у медіацентрі Kodi</string>
     <string name="play_audio">Аудіо</string>
@@ -44,7 +44,7 @@
     <string name="settings_category_other_title">Інше</string>
     <string name="background_player_playing_toast">Програвання у тлі</string>
     <string name="play_btn_text">Програти</string>
-    <string name="storage_permission_denied">В доступі до сховища відмовлено</string>
+    <string name="storage_permission_denied">У доступі до сховища відмовлено</string>
     <string name="content">Контент</string>
     <string name="show_age_restricted_content_title">Контент з віковими обмеженнями</string>
     <string name="video_is_age_restricted">Показувати відео з віковими обмеженнями. Дозволити програвання таких записів можна у Налаштуваннях.</string>
@@ -77,7 +77,7 @@
     <string name="later">Пізніше</string>
     <string name="disabled">Вимкнено</string>
     <string name="could_not_load_image">Не вдалося завантажити зображення</string>
-    <string name="app_ui_crash">Додаток/інтерфейс впав</string>
+    <string name="app_ui_crash">Застосунок/інтерфейс впав</string>
     <string name="your_comment">Ваш коментар (англійською):</string>
     <string name="error_details_headline">Подробиці:</string>
     <string name="list_thumbnail_view_description">Ескіз попереднього перегляду відео</string>
@@ -100,7 +100,7 @@
     <string name="delete">Видалити</string>
     <string name="checksum">Контрольна сума</string>
     <string name="finish">ОК</string>
-    <string name="msg_name">Ім\'я файлу</string>
+    <string name="msg_name">Назва файлу</string>
     <string name="msg_threads">Потоки</string>
     <string name="msg_error">Помилка</string>
     <string name="msg_server_unsupported">Сервер не підтримується</string>
@@ -190,7 +190,7 @@
     <string name="charset_most_special_characters">Більшість спеціальних символів</string>
     <string name="title_activity_about">Про NewPipe</string>
     <string name="action_settings">Налаштування</string>
-    <string name="action_about">Про додаток</string>
+    <string name="action_about">Про застосунок</string>
     <string name="error_unable_to_load_license">Не вдалося завантажити ліцензію</string>
     <string name="tab_licenses">Ліцензії</string>
     <string name="contribution_title">Посприяти</string>
@@ -241,7 +241,7 @@
     <string name="rename">Перейменувати</string>
     <string name="title_licenses">Ліцензії третіх сторін</string>
     <string name="action_open_website">Відкрити веб-сайт</string>
-    <string name="tab_about">Про додаток</string>
+    <string name="tab_about">Про застосунок</string>
     <string name="app_description">Вільне та легке потокове програвання на Android.</string>
     <string name="contribution_encouragement">Які б не були Ваші ідеї: переклад, дизайн, легкий чи глобальний рефакторинг - будь-яка допомога завжди у нагоді. Що більше зроблено, то ліпшим стає NewPipe!</string>
     <string name="settings_category_debug_title">Налагодження</string>
@@ -257,7 +257,7 @@
     <string name="recaptcha_request_toast">Запит на перевірку reCAPTCHA</string>
     <string name="copyright" formatted="true">© %1$s, %2$s під %3$s</string>
     <string name="tab_contributors">Учасники</string>
-    <string name="donation_encouragement">NewPipe розроблений добровольцями, які витрачають власний час заради вашого задоволення. Допоможіть розробникам зробити NewPipe ще кращим, насолоджуючись філіжанкою кави.</string>
+    <string name="donation_encouragement">NewPipe розроблений добровольцями, які витрачають власний час заради вашого задоволення. Допоможіть розробникам зробити NewPipe ще ліпшим, насолоджуючись філіжанкою кави.</string>
     <string name="give_back">Ваша допомога</string>
     <string name="website_encouragement">Завітайте на офіційний сайт NewPipe, аби отримати більше інформації та новин.</string>
     <string name="app_license_title">Ліцензія NewPipe</string>
@@ -319,7 +319,7 @@
     <string name="resize_zoom">Збільшити</string>
     <string name="caption_auto_generated">Створені автоматично</string>
     <string name="enable_leak_canary_title">Увімкнути LeakCanary</string>
-    <string name="enable_leak_canary_summary">Моніторинг втрат пам\'яті може призвести до нереагування додатку під час запису дампу</string>
+    <string name="enable_leak_canary_summary">Моніторинг втрат пам\'яті може призвести до нереагування застосунку під час запису дампу</string>
     <string name="enable_disposed_exceptions_title">Зазвітувати out-of-lifecycle хиби</string>
     <string name="enable_disposed_exceptions_summary">Примусове звітування про неможливість доставлення Rx винятків, які відбуваються за межами фраґменту або діяльності життєвого циклу після усунення</string>
     <string name="use_inexact_seek_title">Використовувати швидкий неточний пошук</string>
@@ -330,7 +330,7 @@
     <string name="invalid_directory">Такої теки не існує</string>
     <string name="invalid_source">Такого джерела файлу/контенту не існує</string>
     <string name="invalid_file">Файл не існує або відсутній дозвіл на його читання або запис</string>
-    <string name="file_name_empty_error">Ім\'я файлу не може бути порожнім</string>
+    <string name="file_name_empty_error">Назва файлу не може бути порожнім</string>
     <string name="error_occurred_detail">Сталася помилка: %1$s</string>
     <string name="import_export_title">Імпортування/експортування</string>
     <string name="import_title">Імпортування</string>
@@ -371,8 +371,8 @@
     <string name="preferred_open_action_settings_title">Бажана дія при відкритті</string>
     <string name="preferred_open_action_settings_summary">Типова дія під час відкриття вмісту — %s</string>
     <string name="caption_setting_title">Субтитри</string>
-    <string name="caption_setting_description">Зміна висоти тексту субтитрів та стилів тла. Потребує перезапуску додатку.</string>
-    <string name="toast_no_player">Не встановлено додаток для програвання цього файлу</string>
+    <string name="caption_setting_description">Зміна висоти тексту субтитрів та стилів тла. Потребує перезапуску застосунку.</string>
+    <string name="toast_no_player">Не встановлено застосунків для програвання цього файлу</string>
     <string name="clear_views_history_title">Очистити історію переглядів</string>
     <string name="clear_views_history_summary">Видаляє історію відтворень</string>
     <string name="delete_view_history_alert">Видалити всю історію переглядів\?</string>
@@ -382,11 +382,11 @@
     <string name="delete_search_history_alert">Видалити всю історію пошуку\?</string>
     <string name="search_history_deleted">Історію пошуку видалено.</string>
     <string name="one_item_deleted">Видалено 1 елемент.</string>
-    <string name="app_license">NewPipe є вільним копілефт додатком: ви можете використовувати, поширювати та вдосконалювати його на власний розсуд. Зокрема, ви можете розповсюджувати та/або змінювати її за умов дотримання вимог GNU General Public License 3-ї версії або (на ваш вибір) будь-якої пізнішої версії, опублікованої Free Software Foundation.</string>
+    <string name="app_license">NewPipe є вільним копілефт застосунком: ви можете використовувати, поширювати та вдосконалювати його на власний розсуд. Зокрема, ви можете розповсюджувати та/або змінювати її за умов дотримання вимог GNU General Public License 3-ї версії або (на ваш вибір) будь-якої пізнішої версії, опублікованої Free Software Foundation.</string>
     <string name="import_settings">Імпортувати разом з налаштуваннями\?</string>
     <string name="privacy_policy_title">Політика приватності NewPipe</string>
-    <string name="privacy_policy_encouragement">Проект NewPipe дуже серйозно ставиться до вашої приватності. Тому додаток не збирає ніяких даних без вашої згоди.
-\nПолітика приватності NewPipe пояснює у деталях, які дані відсилаються та зберігаються, коли ви надсилаєте звіт про падіння додатку.</string>
+    <string name="privacy_policy_encouragement">Проект NewPipe дуже серйозно ставиться до вашої приватності. Тому застосунок не збирає ніяких даних без вашої згоди.
+\nПолітика приватності NewPipe пояснює у деталях, які дані відсилаються та зберігаються, коли ви надсилаєте звіт про падіння застосунку.</string>
     <string name="read_privacy_policy">Читати політику приватності</string>
     <string name="start_accept_privacy_policy">Аби дотриматися Норм загального захисту даних ЄС (General Data Protection Regulation, GDPR), ми просимо звернути вашу увагу на NewPipe\'ову політику приватності. Будь ласка, прочитайте уважно
 \nВи маєте підтвердити її аби надіслати нам баґового звіту.</string>
@@ -419,7 +419,7 @@
     <string name="settings_category_updates_title">Оновлення</string>
     <string name="events">Події</string>
     <string name="file_deleted">Файл видалено</string>
-    <string name="app_update_notification_channel_name">Сповіщення про оновлення додатку</string>
+    <string name="app_update_notification_channel_name">Сповіщення про оновлення застосунку</string>
     <string name="app_update_notification_channel_description">Сповіщення про нову версію NewPipe</string>
     <string name="download_to_sdcard_error_title">Зовнішнє сховище недоступне</string>
     <string name="restore_defaults">Відновити типові налаштування</string>
@@ -433,7 +433,7 @@
     <string name="app_update_notification_content_title">Доступна нова версія NewPipe!</string>
     <string name="app_update_notification_content_text">Натисніть для завантаження</string>
     <string name="missions_header_finished">Завершено</string>
-    <string name="missions_header_pending">В черзі</string>
+    <string name="missions_header_pending">У черзі</string>
     <string name="paused">призупинено</string>
     <string name="queued">додано в чергу</string>
     <string name="post_processing">пост-обробка</string>
@@ -466,7 +466,7 @@
     <string name="download_to_sdcard_error_message">Завантаження до зовнішньої SD-карти поки що неможливе. Скинути розташування теки для завантажень\?</string>
     <string name="saved_tabs_invalid_json">Помилка зчитування збережених вкладок. Використовую типові вкладки.</string>
     <string name="main_page_content_summary">Вкладки, що відображаються на головній сторінці</string>
-    <string name="updates_setting_description">Показувати сповіщення з пропозицією оновити додаток за наявності нової версії</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>

From 943e03f9d84f71800b61c999995a3a5838425038 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat, 6 Apr 2019 19:00:32 +0000
Subject: [PATCH 057/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index bad136a23..88b818190 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">לחץ על „חיפוש” כדי להתחיל</string>
+    <string name="main_bg_subtitle">יש ללחוץ על „חיפוש” כדי להתחיל</string>
     <string name="view_count_text">%1$s צפיות</string>
     <string name="upload_date_text">פורסם ב־%1$s</string>
     <string name="no_player_found">לא נמצאו נגני צפייה ישירה, להתקין את VLC\?</string>
@@ -100,7 +100,7 @@
     <string name="what_happened_headline">מה קרה:</string>
     <string name="info_labels">מה:\\nבקשה:\\nשפת התוכן:\\nשירות:\\nשעון גריניץ׳:\\nחבילה:\\nגרסה:\\nגרסת מערכת ההפעלה:</string>
     <string name="subscribe_button_title">עריכת מינוי</string>
-    <string name="subscribed_button_title">רשום</string>
+    <string name="subscribed_button_title">נרשמת</string>
     <string name="channel_unsubscribed">ביטול מינוי לערוץ</string>
     <string name="subscription_change_failed">לא הצלחתי לשנות מינוי</string>
     <string name="subscription_update_failed">לא ניתן לעדכן את המינוי</string>
@@ -237,7 +237,7 @@
     <string name="main_page_content">תוכן הדף הראשי</string>
     <string name="blank_page_summary">דף ריק</string>
     <string name="kiosk_page_summary">דף גישה מזדמנת</string>
-    <string name="subscription_page_summary">דף מנוים</string>
+    <string name="subscription_page_summary">דף מינויים</string>
     <string name="feed_page_summary">דף עדכונים</string>
     <string name="channel_page_summary">דף ערוצים</string>
     <string name="select_a_channel">נא לבחור ערוץ</string>
@@ -261,8 +261,8 @@
     <string name="controls_download_desc">הורדת קובץ הזרמה</string>
     <string name="show_info">הצגת מידע</string>
     <string name="tab_bookmarks">רשימות נגינה מסומנות</string>
-    <string name="controls_add_to_playlist_title">הוסף ל</string>
-    <string name="default_content_country_title">מדינת תוכן ברירת המחדל</string>
+    <string name="controls_add_to_playlist_title">הוספה אל</string>
+    <string name="default_content_country_title">מדינת תוכן כבררת מחדל</string>
     <string name="service_title">שירות</string>
     <string name="settings_category_debug_title">ניפוי שגיאות</string>
     <string name="always">תמיד</string>
@@ -276,8 +276,8 @@
     <string name="switch_to_popup">העברה לחלון צף</string>
     <string name="no_player_found_toast">לא נמצא נגן צפייה ישירה (ניתן להתקין את VLC כדי לתקן זאת).</string>
     <string name="thumbnail_cache_wipe_complete_notice">תמונות מטמון נמחקו</string>
-    <string name="metadata_cache_wipe_title">מחק מטא-נתונים במטמון</string>
-    <string name="metadata_cache_wipe_complete_notice">מטא-נתונים במטמון נמחקו</string>
+    <string name="metadata_cache_wipe_title">ניקוי מטמון נתוני העל</string>
+    <string name="metadata_cache_wipe_complete_notice">מטמון נתוני העל התרוקן</string>
     <string name="export_data_summary">ייצוא היסטוריה, מינויים ורשימות נגינה</string>
     <string name="clear_views_history_title">מחיקת היסטוריית הצפייה</string>
     <string name="view_history_deleted">היסטוריית הצפייה נמחקה.</string>
@@ -293,7 +293,7 @@
     <string name="rename">שינוי שם</string>
     <string name="one_item_deleted">פריט אחד נמחק.</string>
     <string name="toast_no_player">לא מותקן יישומון שמתאים לנגינת הקובץ הזה</string>
-    <string name="delete_stream_history_prompt">האם ברצונך למחוק פריט זה מהיסטוריית הצפייה\?</string>
+    <string name="delete_stream_history_prompt">למחוק את הפריט הזה מהיסטוריית הצפייה שלך\?</string>
     <string name="delete_all_history_prompt">למחוק את כל הפריטים מההיסטוריה\?</string>
     <string name="export_complete_toast">הייצוא הסתיים</string>
     <string name="import_complete_toast">הייבוא הסתיים</string>
@@ -302,7 +302,7 @@
     <string name="background_player">נגן רקע</string>
     <string name="popup_player">נגן צף</string>
     <string name="always_ask_open_action">לשאול תמיד</string>
-    <string name="preferred_player_fetcher_notification_title">משיג מידע…</string>
+    <string name="preferred_player_fetcher_notification_title">המידע מתקבל…</string>
     <string name="preferred_player_fetcher_notification_message">התוכן המבוקש בטעינה</string>
     <string name="create_playlist">רשימת נגינה חדשה</string>
     <string name="delete_playlist">מחיקה</string>
@@ -322,8 +322,8 @@
     <string name="import_title">ייבוא</string>
     <string name="import_from">ייבוא מ־</string>
     <string name="export_to">ייצוא אל</string>
-    <string name="import_ongoing">מייבא…</string>
-    <string name="export_ongoing">מייצא…</string>
+    <string name="import_ongoing">מתבצע ייבוא…</string>
+    <string name="export_ongoing">מתבצע ייצוא…</string>
     <string name="import_file_title">ייבוא קובץ</string>
     <string name="previous_export">ייצוא קודם</string>
     <string name="subscriptions_import_unsuccessful">לא ניתן לייבא את המינויים</string>
@@ -335,7 +335,7 @@
 \n3. ההורדה אמורה להתחיל (זה קובץ הייצוא)</string>
     <string name="playback_tempo">קצב</string>
     <string name="playback_default">ברירת מחדל</string>
-    <string name="use_inexact_seek_title">השתמש בחיפוש מהיר, לא מדויק</string>
+    <string name="use_inexact_seek_title">שימוש בחיפוש מהיר ולא מדויק</string>
     <string name="use_inexact_seek_summary">חיפוש גס מאפשר לנגן לחפש נקודת זמן מהר יותר, ברמת דיוק נמוכה יותר</string>
     <string name="download_thumbnail_title">טעינת תמונות ממוזערות</string>
     <string name="download_thumbnail_summary">כיבוי האפשרות מונע את טעינת התמונות הממוזערות, חוסך בתקשורת נתונים ובניצולת הזיכרון. שינויים באפשרות זו מוחקים את המטמון בזיכרון ובכונן.</string>
@@ -367,14 +367,14 @@
     <string name="title_last_played">נוגן אחרון</string>
     <string name="title_most_played">הכי נצפים</string>
     <string name="could_not_import_all_files">אזהרה: לא יכל לייבא את כל הקבצים</string>
-    <string name="override_current_data">פעולה זו תדרוס את ההתקנה הקיימת.</string>
+    <string name="override_current_data">פעולה זו תדרוס את ההגדרות הקיימות.</string>
     <string name="import_settings">לייבא גם הגדרות\?</string>
     <string name="drawer_open">פתיחת מגירה</string>
     <string name="drawer_close">סגירת מגירה</string>
     <string name="drawer_header_action_paceholder_text">משהו יופיע כאן בקרוב ‎;D</string>
     <string name="preferred_open_action_settings_title">פעולת ‚פתיחה’ מועדפת</string>
     <string name="preferred_open_action_settings_summary">פעולת בררת מחדל בעת פתיחת תוכן - %s</string>
-    <string name="set_as_playlist_thumbnail">קבע כתמונה לרשימת השמעה</string>
+    <string name="set_as_playlist_thumbnail">הגדרה כתמונת רשימת הנגינה</string>
     <string name="playlist_delete_failure">לא ניתן למחוק רשימת נגינה.</string>
     <string name="caption_none">אין כתוביות</string>
     <string name="resize_fit">התאמה</string>
@@ -419,7 +419,7 @@
     <string name="selection">בחירה</string>
     <string name="events">אירועים</string>
     <string name="conferences">כנסים</string>
-    <string name="enable_disposed_exceptions_title">דווח על שגיאות שמחוץ למחזור החיים</string>
+    <string name="enable_disposed_exceptions_title">דיווח על שגיאות שמחוץ למחזור החיים</string>
     <string name="enable_disposed_exceptions_summary">אילוץ דיווח על חריגות מחוץ למקטעים או למחזור חיי הפעילות לאחר ההשלכה בתשדורת יוצאת</string>
     <string name="import_soundcloud_instructions">ניתן לייבא פרופיל SoundCloud על ידי הקלדת הכתובת או המזהה שלך:
 \n

From 3ff47623d5b421a715f3f0b121deb90da276bd06 Mon Sep 17 00:00:00 2001
From: artik banana <lid@tuta.io>
Date: Sat, 6 Apr 2019 19:00:50 +0000
Subject: [PATCH 058/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 88b818190..d6a59eab4 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -366,7 +366,7 @@
     <string name="app_license">NewPipe הוא יישומון חופשי בהתאם לרישיון קופילפט: מותר לך להשתמש, לחקור, לשתף ולשפר בכל דרך שנראית לך. במיוחד מותר לך להפיץ מחדש ו/או לשנות תחת תנאי הרישיון הציבורי הכללי של GNU כפי שמופץ על ידי קרן התכנה החופשית, בין אם גרסה 3 של הרישיון או (לשיקולך) כל גרסה עדכנית יותר שלו.</string>
     <string name="title_last_played">נוגן אחרון</string>
     <string name="title_most_played">הכי נצפים</string>
-    <string name="could_not_import_all_files">אזהרה: לא יכל לייבא את כל הקבצים</string>
+    <string name="could_not_import_all_files">אזהרה: לא יכל לייבא את כל הקבצים.</string>
     <string name="override_current_data">פעולה זו תדרוס את ההגדרות הקיימות.</string>
     <string name="import_settings">לייבא גם הגדרות\?</string>
     <string name="drawer_open">פתיחת מגירה</string>

From 115b44585ba8c1485dc6521e47787d8fbc03ad6b Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat, 6 Apr 2019 19:10:03 +0000
Subject: [PATCH 059/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index d6a59eab4..e0eae8041 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -366,7 +366,7 @@
     <string name="app_license">NewPipe הוא יישומון חופשי בהתאם לרישיון קופילפט: מותר לך להשתמש, לחקור, לשתף ולשפר בכל דרך שנראית לך. במיוחד מותר לך להפיץ מחדש ו/או לשנות תחת תנאי הרישיון הציבורי הכללי של GNU כפי שמופץ על ידי קרן התכנה החופשית, בין אם גרסה 3 של הרישיון או (לשיקולך) כל גרסה עדכנית יותר שלו.</string>
     <string name="title_last_played">נוגן אחרון</string>
     <string name="title_most_played">הכי נצפים</string>
-    <string name="could_not_import_all_files">אזהרה: לא יכל לייבא את כל הקבצים.</string>
+    <string name="could_not_import_all_files">אזהרה: ייבוא חלק מהקבצים נכשל.</string>
     <string name="override_current_data">פעולה זו תדרוס את ההגדרות הקיימות.</string>
     <string name="import_settings">לייבא גם הגדרות\?</string>
     <string name="drawer_open">פתיחת מגירה</string>

From f86d755890b399bbc7955b1c6db00b87b973fcc3 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sun, 7 Apr 2019 13:59:17 +0000
Subject: [PATCH 060/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index e0eae8041..155c6a223 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -353,8 +353,8 @@
     <string name="delete_view_history_alert">למחוק את כל היסטוריית הצפייה\?</string>
     <string name="clear_search_history_summary">מחיקת היסטוריית מילות החיפוש</string>
     <string name="delete_search_history_alert">למחוק את כל היסטוריית החיפוש\?</string>
-    <string name="video_streams_empty">לא נמצא תזרימי וידאו</string>
-    <string name="audio_streams_empty">לא נמצא תזרימי שמע</string>
+    <string name="video_streams_empty">לא נמצאו תזרימי וידאו</string>
+    <string name="audio_streams_empty">לא נמצאו תזרימי שמע</string>
     <string name="invalid_directory">אין תיקייה כזו</string>
     <string name="invalid_source">אין מקור תיקייה/תוכן</string>
     <string name="error_occurred_detail">אירעה שגיאה: %1$s</string>

From 6cdea85a493e6a1ea248a7cbf432246c85c4b9d5 Mon Sep 17 00:00:00 2001
From: Yoav <gergesh@gmail.com>
Date: Sun, 7 Apr 2019 13:59:45 +0000
Subject: [PATCH 061/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 155c6a223..5738254cb 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -357,7 +357,7 @@
     <string name="audio_streams_empty">לא נמצאו תזרימי שמע</string>
     <string name="invalid_directory">אין תיקייה כזו</string>
     <string name="invalid_source">אין מקור תיקייה/תוכן</string>
-    <string name="error_occurred_detail">אירעה שגיאה: %1$s</string>
+    <string name="error_occurred_detail">נתקלנו בבעיה: %1$s</string>
     <string name="no_streams_available_download">אין תזרימים זמינים להורדה</string>
     <string name="privacy_policy_title">מדיניות הפרטיות של NewPipe</string>
     <string name="privacy_policy_encouragement">מיזם NewPipe שומר על הפרטיות שלך בצורה מאוד קפדנית. לפיכך, היישומון אינו אוסף נתונים ללא הסכמתך.

From 037632fbf06c005217b2ff6df5476d777d34c9eb Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sun, 7 Apr 2019 13:59:50 +0000
Subject: [PATCH 062/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 5738254cb..155c6a223 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -357,7 +357,7 @@
     <string name="audio_streams_empty">לא נמצאו תזרימי שמע</string>
     <string name="invalid_directory">אין תיקייה כזו</string>
     <string name="invalid_source">אין מקור תיקייה/תוכן</string>
-    <string name="error_occurred_detail">נתקלנו בבעיה: %1$s</string>
+    <string name="error_occurred_detail">אירעה שגיאה: %1$s</string>
     <string name="no_streams_available_download">אין תזרימים זמינים להורדה</string>
     <string name="privacy_policy_title">מדיניות הפרטיות של NewPipe</string>
     <string name="privacy_policy_encouragement">מיזם NewPipe שומר על הפרטיות שלך בצורה מאוד קפדנית. לפיכך, היישומון אינו אוסף נתונים ללא הסכמתך.

From e9444e058c03e06c4cc486a3daee4bee2bb80944 Mon Sep 17 00:00:00 2001
From: minsk21 <itlab2012@mail.ru>
Date: Tue, 9 Apr 2019 01:07:06 +0000
Subject: [PATCH 063/138] Translated using Weblate (Belarusian)

Currently translated at 74.3% (329 of 443 strings)
---
 app/src/main/res/values-be/strings.xml | 83 +++++---------------------
 1 file changed, 15 insertions(+), 68 deletions(-)

diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 40c277884..8eface954 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources><string name="main_bg_subtitle">Націсніце пошук, каб пачаць</string>
+<resources>
+    <string name="main_bg_subtitle">Націсніце пошук, каб пачаць</string>
     <string name="view_count_text">%1$s праглядаў</string>
     <string name="upload_date_text">Апублікавана %1$s</string>
     <string name="no_player_found">Патокавы плэер не знойдзены. Усталяваць VLC?</string>
@@ -27,25 +28,19 @@
     <string name="subscription_change_failed">Не атрымалася змяніць падпіску</string>
     <string name="subscription_update_failed">Не атрымалася абнавіць падпіску</string>
     <string name="show_info">Паказаць звесткі</string>
-
     <string name="tab_main">Галоўная</string>
     <string name="tab_subscriptions">Падпіскі</string>
     <string name="tab_bookmarks">Адзначаныя плэйлісты</string>
-
     <string name="fragment_whats_new">Што новага</string>
-
     <string name="controls_background_title">У фоне</string>
     <string name="controls_popup_title">У акне</string>
     <string name="controls_add_to_playlist_title">Дадаць да</string>
-
     <string name="download_path_title">Шлях загрузкі відэа</string>
     <string name="download_path_summary">Папка для захоўвання загружаных відэа</string>
     <string name="download_path_dialog_title">Увядзіце шлях да папкі для загрузкі відэа</string>
-
     <string name="download_path_audio_title">Тэчка загрузкі аўдыё</string>
     <string name="download_path_audio_summary">"Сюды захоўваецца загружанае аўдыё "</string>
     <string name="download_path_audio_dialog_title">Увядзіце шлях да папкі для загрузкі аўдыё</string>
-
     <string name="autoplay_by_calling_app_title">Аўтапрайграванне</string>
     <string name="autoplay_by_calling_app_summary">Прайграваць відэа пры выкліку NewPipe з іншага прыкладання</string>
     <string name="default_resolution_title">Разрознянне па змаўчанні</string>
@@ -136,17 +131,13 @@
     <string name="always">Заўсёды</string>
     <string name="just_once">Толькі цяпер</string>
     <string name="file">Файл</string>
-
     <string name="notification_channel_name">Апавяшчэнне NewPipe</string>
     <string name="notification_channel_description">Апавяшчэнні для NewPipe ў фоне і ва ўсплываючым акне</string>
-
     <string name="unknown_content">[Невядома]</string>
-
     <string name="toggle_orientation">Пераключыць арыентацыю</string>
     <string name="switch_to_background">Перайсці ў фон</string>
     <string name="switch_to_popup">Перайсці ў акно</string>
     <string name="switch_to_main">Перайсці ў галоўнае акно</string>
-
     <string name="import_data_title">Імпарт дадзеных</string>
     <string name="export_data_title">Экспарт дадзеных</string>
     <string name="import_data_summary">Ваша бягучая гісторыя і падпіскі перазапішуцца</string>
@@ -185,7 +176,6 @@
     <string name="file_name_empty_error">Імя файла не можа быць пустым</string>
     <string name="error_occurred_detail">Адбылася памылка: %1$s</string>
     <string name="no_streams_available_download">Няма патокаў, даступных для загрузкі</string>
-
     <string name="sorry_string">Прабачце, гэта не павінна было адбыцца.</string>
     <string name="error_report_button_text">Адправіць справаздачу па e-mail</string>
     <string name="error_snackbar_message">Прабачце, адбыліся памылкі.</string>
@@ -195,8 +185,6 @@
     <string name="info_labels">Што:\\nЗапыт:\\nМова кантэнту:\\nСэрвіс:\\nЧас па Грынвічы:\\nПакет:\\nВерсія:\\nВерсія АС:</string>
     <string name="your_comment">Ваш каментар (English):</string>
     <string name="error_details_headline">Падрабязнасці:</string>
-
-
     <string name="list_thumbnail_view_description">Мініяцюра відэа-прэв\'ю</string>
     <string name="detail_thumbnail_view_description">Мініяцюра відэа-прэв\'ю</string>
     <string name="detail_uploader_thumbnail_view_description">Мініяцюра аватара карыстальніка</string>
@@ -209,42 +197,35 @@
     <string name="search_no_results">Няма вынікаў</string>
     <string name="empty_subscription_feed_subtitle">Нічога няма</string>
     <string name="detail_drag_description">Перацягніце, каб змяніць парадак</string>
-
     <string name="err_dir_create">Не атрымалася стварыць папку для загрузкі \"%1$s\"</string>
     <string name="info_dir_created">Створана папка для загрузак \"%1$s\"</string>
-
     <string name="video">Відэа</string>
     <string name="audio">Аўдыё</string>
     <string name="retry">Паспрабаваць зноў</string>
     <string name="storage_permission_denied">Няма доступу да носьбіта</string>
     <string name="use_old_player_title">Стары плэер</string>
     <string name="use_old_player_summary">Стары убудаваны плэер на Mediaframework</string>
-
     <string name="short_thousand">тыс.</string>
     <string name="short_million">млн.</string>
     <string name="short_billion">млрд.</string>
-
     <string name="no_subscribers">Няма падпісчыкаў</string>
     <plurals name="subscribers">
-	<item quantity="one">%s падпісчык</item>
-	<item quantity="few">%s падпісчыка</item>
-	<item quantity="many">%s падпісчыкаў</item>
-</plurals>
-
+        <item quantity="one">%s падпісчык</item>
+        <item quantity="few">%s падпісчыка</item>
+        <item quantity="many">%s падпісчыкаў</item>
+    </plurals>
     <string name="no_views">Няма праглядаў</string>
     <plurals name="views">
-	<item quantity="one">%s прагляд</item>
-	<item quantity="few">%s прагляда</item>
-	<item quantity="many">%s праглядаў</item>
-</plurals>
-
+        <item quantity="one">%s прагляд</item>
+        <item quantity="few">%s прагляда</item>
+        <item quantity="many">%s праглядаў</item>
+    </plurals>
     <string name="no_videos">Няма відэа</string>
     <plurals name="videos">
-	<item quantity="one">%s відэа</item>
-	<item quantity="few">%s відэа</item>
-	<item quantity="many">%s відэа</item>
-</plurals>
-
+        <item quantity="one">%s відэа</item>
+        <item quantity="few">%s відэа</item>
+        <item quantity="many">%s відэа</item>
+    </plurals>
     <string name="start">Пачаць</string>
     <string name="pause">Паўза</string>
     <string name="view">Прайграць</string>
@@ -255,10 +236,8 @@
     <string name="checksum">Кантрольная сума</string>
     <string name="dismiss">Адхіліць</string>
     <string name="rename">Перайменаваць</string>
-
     <string name="add">Новая мэта</string>
     <string name="finish">ОК</string>
-
     <string name="msg_name">Імя файла</string>
     <string name="msg_threads">Патокі</string>
     <string name="msg_error">Памылка</string>
@@ -273,21 +252,16 @@
     <string name="msg_popup_permission">Гэтае разрозненне трэба для 
 \nпрайгравання ў акне</string>
     <string name="one_item_deleted">1 элемент выдалены.</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">Запыт reCAPTCHA</string>
     <string name="recaptcha_request_toast">Запытаны ўвод reCAPTCHA</string>
-
     <string name="settings_category_downloads_title">Загрузкі</string>
     <string name="settings_file_charset_title">Дапушчальныя сімвалы назвы файлаў</string>
     <string name="settings_file_replacement_character_summary">Недапушчальныя сімвалы замяняюцца на гэтыя</string>
     <string name="settings_file_replacement_character_title">Сімвал для замены</string>
-
     <string name="charset_letters_and_digits">Літары і лічбы</string>
     <string name="charset_most_special_characters">Большасць спецзнакаў</string>
-
     <string name="toast_no_player">Прыкладанне для прайгравання гэтага файла не ўстаноўлена</string>
-
     <string name="title_activity_about">Аб NewPipe</string>
     <string name="action_settings">Налады</string>
     <string name="action_about">Аб дадатку</string>
@@ -314,8 +288,6 @@
     <string name="app_license_title">Ліцэнзія NewPipe</string>
     <string name="app_license">NewPipe - свабоднае праграмнае забеспячэнне: вы можаце выкарыстоўваць, вывучаць і паляпшаць яго па сваім меркаванні. У прыватнасці, вы можаце распаўсюджваць і / або змяняць яго ў адпаведнасці з умовамі GNU General Public License, апублікаванай Free Software Foundation, альбо версіі 3, альбо (па вашаму выбару) любой больш позняй версіі.</string>
     <string name="read_full_license">Прачытаць ліцэнзію</string>
-
-
     <string name="title_activity_history">Гісторыя</string>
     <string name="title_history_search">Гісторыя пошуку</string>
     <string name="title_history_view">Прагледжана</string>
@@ -329,7 +301,6 @@
     <string name="delete_all_history_prompt">Выдаліць усе элементы з гісторыі?</string>
     <string name="title_last_played">Нядаўна прайграныя</string>
     <string name="title_most_played">Часта прайграваемыя</string>
-
     <string name="main_page_content">Кантэнт галоўнай старонкі</string>
     <string name="blank_page_summary">Пустая старонка</string>
     <string name="kiosk_page_summary">Старонка кіёска</string>
@@ -345,7 +316,6 @@
     <string name="could_not_import_all_files">Увага: не ўсе файлы былі імпартаваныя.</string>
     <string name="override_current_data">Бягучыя дадзеныя будуць замененыя.</string>
     <string name="import_settings">Хочаце імпартаваць налады?</string>
-
     <string name="kiosk">Кіёск</string>
     <string name="trending">Трэнды</string>
     <string name="top_50">Топ 50</string>
@@ -361,70 +331,51 @@
     <string name="start_here_on_main">Відэаплэер</string>
     <string name="start_here_on_background">Фонавы плэер</string>
     <string name="start_here_on_popup">Плэер у акне</string>
-
     <string name="drawer_open">Адкрыць бакавую панэль</string>
     <string name="drawer_close">Зачыніць бакавую панэль</string>
     <string name="drawer_header_action_paceholder_text">Хутка тут сёе-тое з\'явіцца ;D</string>
-
-
     <string name="preferred_open_action_settings_title">Пры адкрыцці кантэнту</string>
     <string name="preferred_open_action_settings_summary">Пры адкрыцці спасылкі на кантэнт — %s</string>
-
     <string name="video_player">Відэаплэер</string>
     <string name="background_player">Фонавы плэер</string>
     <string name="popup_player">Плэер у акне</string>
     <string name="always_ask_open_action">Заўсёды пытацца</string>
-
     <string name="preferred_player_fetcher_notification_title">Атрыманне звестак…</string>
     <string name="preferred_player_fetcher_notification_message">Загрузка запытанага кантэнту</string>
-
     <string name="create_playlist">Стварыць плэйліст</string>
     <string name="delete_playlist">Выдаліць плэйліст</string>
     <string name="rename_playlist">Перайменаваць плэйліст</string>
     <string name="playlist_name_input">Імя</string>
     <string name="append_playlist">Дадаць у плэйліст</string>
     <string name="set_as_playlist_thumbnail">На мініяцюру плэйліста</string>
-
     <string name="bookmark_playlist">Дадаць плэйліст у закладкі</string>
     <string name="unbookmark_playlist">Выдаліць закладку</string>
-
     <string name="delete_playlist_prompt">Выдаліць гэты плэйліст?</string>
     <string name="playlist_creation_success">Плэйліст створаны</string>
     <string name="playlist_add_stream_success">Дададзена ў плэйліст</string>
     <string name="playlist_thumbnail_change_success">Мініяцюра плэйліста зменена</string>
     <string name="playlist_delete_failure">Не атрымалася выдаліць плэйліст</string>
-
     <string name="caption_none">Без тытраў</string>
-
     <string name="resize_fit">Падагнаць</string>
     <string name="resize_fill">Запоўніць</string>
     <string name="resize_zoom">Наблізіць</string>
-
     <string name="caption_auto_generated">Створаны аўтаматычна</string>
-
     <string name="caption_setting_title">Тытры</string>
     <string name="caption_setting_description">Змяніць памер і фон тытраў. Змены ўступяць у сілу пасля перазапуску</string>
-
     <string name="enable_leak_canary_title">Уключыць LeakCanary</string>
     <string name="enable_leak_canary_summary">Маніторынг уцечкі памяці можа прывесці да завісання прыкладання</string>
-
     <string name="enable_disposed_exceptions_title">Паведамляць пра памылкі жыццёвага цыклу</string>
     <string name="enable_disposed_exceptions_summary">Прымусова паведамляць пра недастаўляемыя Rx-выключэнні па-за фрагментам або жыццёвым цыкле пасля выдалення</string>
-
     <string name="import_export_title">Імпарт/Экспарт</string>
     <string name="import_title">Імпарт</string>
     <string name="import_from">Імпарт з</string>
     <string name="export_to">Экспарт у</string>
-
     <string name="import_ongoing">Імпарт…</string>
     <string name="export_ongoing">Экспарт…</string>
-
     <string name="import_file_title">Імпарт файла</string>
     <string name="previous_export">Папярэдні экспарт</string>
-
     <string name="subscriptions_import_unsuccessful">Не атрымалася імпартаваць падпіскі</string>
     <string name="subscriptions_export_unsuccessful">Не атрымалася экспартаваць падпіскі</string>
-
     <string name="import_youtube_instructions">Імпарт падпісак з YouTube загрузкай файла экспарту: 
 \n 
 \n1. Перайдзіце на: %1$s 
@@ -437,11 +388,9 @@
 \n3. Увайдзіце, калі неабходна 
 \n4. Скапіруйце адрас з адраснага радка.</string>
     <string name="import_soundcloud_instructions_hint">вашID, soundcloud.com/вашID</string>
-
     <string name="import_network_expensive_warning">Гэтае дзеянне можа выклікаць вялікі расход трафіку. 
 \n 
 \nПрацягнуць?</string>
-
     <string name="playback_speed_control">Кіраванне хуткасцю прайгравання</string>
     <string name="playback_tempo">Тэмп</string>
     <string name="playback_pitch">Тон</string>
@@ -449,12 +398,10 @@
     <string name="skip_silence_checkbox">Прапускаць цішыню</string>
     <string name="playback_step">Крок</string>
     <string name="playback_reset">Скід</string>
-
     <string name="start_accept_privacy_policy">У адпаведнасці з Агульным рэгламентам па абароне дадзеных ЕС (GDPR), звяртаем вашу ўвагу на палітыку прыватнасці NewPipe. Калі ласка, уважліва азнаёмцеся з ёй. 
 \nВам неабходна прыняць яе ўмовы, каб адправіць нам справаздачу пра памылку.</string>
     <string name="accept">Прыняць</string>
     <string name="decline">Адмовіцца</string>
-
     <string name="limit_data_usage_none_description">Без абмежаванняў</string>
     <string name="limit_mobile_data_usage_title">Ліміт разрознення ў мабільнай сетцы</string>
     <string name="minimize_on_exit_title">Пры згортванні плэера</string>
@@ -462,5 +409,5 @@
     <string name="minimize_on_exit_none_description">Нічога не рабіць</string>
     <string name="minimize_on_exit_background_description">Фонавы плэер</string>
     <string name="minimize_on_exit_popup_description">Плэер у акне</string>
-
+    <string name="unsubscribe">Адпісацца</string>
 </resources>
\ No newline at end of file

From e423192265e080f7116dcc9c506a0f763450871c Mon Sep 17 00:00:00 2001
From: ___ <o.kravtsov@ukr.net>
Date: Mon, 8 Apr 2019 08:05:54 +0000
Subject: [PATCH 064/138] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-uk/strings.xml | 80 +++++++++++++-------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 6bd68e049..7ab368400 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -320,8 +320,8 @@
     <string name="caption_auto_generated">Створені автоматично</string>
     <string name="enable_leak_canary_title">Увімкнути LeakCanary</string>
     <string name="enable_leak_canary_summary">Моніторинг втрат пам\'яті може призвести до нереагування застосунку під час запису дампу</string>
-    <string name="enable_disposed_exceptions_title">Зазвітувати out-of-lifecycle хиби</string>
-    <string name="enable_disposed_exceptions_summary">Примусове звітування про неможливість доставлення Rx винятків, які відбуваються за межами фраґменту або діяльності життєвого циклу після усунення</string>
+    <string name="enable_disposed_exceptions_title">Звітувати про помилки життєвого циклу додатку</string>
+    <string name="enable_disposed_exceptions_summary">Примусове звітування про неможливість доставлення Rx-винятків, які відбуваються за межами фрагменту або діяльності життєвого циклу після усунення</string>
     <string name="use_inexact_seek_title">Використовувати швидкий неточний пошук</string>
     <string name="use_inexact_seek_summary">Неточний пошук дозволяє програвачеві рухатися позиціями швидше, проте з меншою точністю</string>
     <string name="auto_queue_title">Автоматично додавати в чергу наступний запис</string>
@@ -332,38 +332,38 @@
     <string name="invalid_file">Файл не існує або відсутній дозвіл на його читання або запис</string>
     <string name="file_name_empty_error">Назва файлу не може бути порожнім</string>
     <string name="error_occurred_detail">Сталася помилка: %1$s</string>
-    <string name="import_export_title">Імпортування/експортування</string>
-    <string name="import_title">Імпортування</string>
+    <string name="import_export_title">Імпорт/експорт</string>
+    <string name="import_title">Імпорт</string>
     <string name="import_from">Імпортувати з</string>
     <string name="export_to">Експортувати до</string>
     <string name="import_ongoing">Імпортування…</string>
     <string name="export_ongoing">Експортування…</string>
-    <string name="import_file_title">Імпортування файлу</string>
-    <string name="previous_export">Попереднього експортування</string>
-    <string name="subscriptions_import_unsuccessful">Неможливо імпортувати підписання</string>
-    <string name="subscriptions_export_unsuccessful">Неможливо експортувати підписання</string>
-    <string name="import_youtube_instructions">Імпортуйте Ютюбові підписання завантаженням файлу еспортування: 
+    <string name="import_file_title">Імпортувати файл</string>
+    <string name="previous_export">Попереднє експортування</string>
+    <string name="subscriptions_import_unsuccessful">Не вдалося імпортувати підписки</string>
+    <string name="subscriptions_export_unsuccessful">Не вдалося експортувати підписки</string>
+    <string name="import_youtube_instructions">Імпортуйте підписки YouTube, завантаживши файл експорту: 
 \n 
-\n1. Перейдіть за цією ланкою: %1$s 
+\n1. Перейдіть за цією адресою: %1$s 
 \n2. За запитом увійдіть до вашої обліківки 
-\n3. Завантаження має початися (це й є файл еспортування)</string>
-    <string name="import_soundcloud_instructions">Імпортуйте SoundCloud\'овий профайл уписавши його URL, або ваш ID:
-\n
-\n1. Увімкніть режимі \"desktop\" у переглядачівеві (сайт не підтримується мобільними ґаджетами) 
-\n2. Перейдіть за цією ланкою: %1$s 
-\n3. За запитом увійдіть до вашої обліківки 
-\n4. Скопіюйте URL профайлу, до якого вас переспрямує.</string>
-    <string name="import_soundcloud_instructions_hint">вашID, soundcloud.com/вашid</string>
+\n3. Завантаження має початися (це й є файл еспорту)</string>
+    <string name="import_soundcloud_instructions">Імпортуйте профіль SoundCloud, вписавши або URL, або ваш ID:
+\n 
+\n1. Увімкніть режим \"настільний комп\'ютер\" у веб-браузері (сайт не підтримується мобільними пристроями)
+\n2. Перейдіть за цим посиланням: %1$s
+\n3. За запитом увійдіть до вашої обліківки
+\n4. Скопіюйте URL профілю, до якого ви будете переспрямовані.</string>
+    <string name="import_soundcloud_instructions_hint">ваш ID, soundcloud.com/yourid</string>
     <string name="import_network_expensive_warning">Майте на увазі: ця операція може потребувати багато трафіку.
 \n
-\nПродовжуватимете?</string>
+\nБажаєте продовжити\?</string>
     <string name="download_thumbnail_title">Завантажувати ескізи</string>
     <string name="download_thumbnail_summary">Вимкніть для запобігання завантаженню ескізів, що заощадить трафік та внутрішню пам\'ять. Зміни призведуть до очищення кешу зображень.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Кеш зображень стерто</string>
     <string name="metadata_cache_wipe_title">Стерти кеш метаданих</string>
     <string name="metadata_cache_wipe_summary">Видалити всі кешовані дані веб-сторінок</string>
     <string name="metadata_cache_wipe_complete_notice">Кеш метаданих стерто</string>
-    <string name="playback_speed_control">Реґулятори швидкісті відтворення</string>
+    <string name="playback_speed_control">Керування швидкістю відтворення</string>
     <string name="playback_tempo">Темп</string>
     <string name="playback_pitch">Тон</string>
     <string name="unhook_checkbox">Від\'єднати (може спричинити спотворення)</string>
@@ -388,25 +388,25 @@
     <string name="privacy_policy_encouragement">Проект NewPipe дуже серйозно ставиться до вашої приватності. Тому застосунок не збирає ніяких даних без вашої згоди.
 \nПолітика приватності NewPipe пояснює у деталях, які дані відсилаються та зберігаються, коли ви надсилаєте звіт про падіння застосунку.</string>
     <string name="read_privacy_policy">Читати політику приватності</string>
-    <string name="start_accept_privacy_policy">Аби дотриматися Норм загального захисту даних ЄС (General Data Protection Regulation, GDPR), ми просимо звернути вашу увагу на NewPipe\'ову політику приватності. Будь ласка, прочитайте уважно
-\nВи маєте підтвердити її аби надіслати нам баґового звіту.</string>
-    <string name="accept">Ухвалити</string>
+    <string name="start_accept_privacy_policy">З метою дотримання Загального регламенту про захист даних ЄС (General Data Protection Regulation, GDPR) ми звертаємо вашу увагу на політику приватності NewPipe. Будь ласка, прочитайте уважно.
+\nВи маєте прийняти її, аби надіслати нам звіт про помилку.</string>
+    <string name="accept">Прийняти</string>
     <string name="decline">Відхилити</string>
-    <string name="limit_data_usage_none_description">Безмежно</string>
-    <string name="limit_mobile_data_usage_title">Обмеження якості відео (мобільний трафік)</string>
-    <string name="skip_silence_checkbox">Перемотувати підчас тиші</string>
+    <string name="limit_data_usage_none_description">Без обмежень</string>
+    <string name="limit_mobile_data_usage_title">Обмежити роздільну здатність при використанні мобільного трафіку</string>
+    <string name="skip_silence_checkbox">Пропускати тихі проміжки</string>
     <string name="playback_step">Крок</string>
     <string name="playback_reset">Скинути</string>
     <string name="minimize_on_exit_title">Зменшити при перемкненні застосунку</string>
-    <string name="minimize_on_exit_summary">Дія при перемкненні до іншого застосунку з головного відеопрогравача — %s</string>
-    <string name="minimize_on_exit_none_description">Жодних</string>
-    <string name="minimize_on_exit_background_description">До тлового програвача</string>
-    <string name="minimize_on_exit_popup_description">Зменшити до віконного програвачу</string>
+    <string name="minimize_on_exit_summary">Дія при перемиканні до іншого застосунку з головного відеопрогравача — %s</string>
+    <string name="minimize_on_exit_none_description">Нічого</string>
+    <string name="minimize_on_exit_background_description">Зменшити до програвача у тлі</string>
+    <string name="minimize_on_exit_popup_description">Зменшити до програвача у вікні</string>
     <string name="channels">Канали</string>
     <string name="playlists">Списки відтворення</string>
     <string name="tracks">Треки</string>
     <string name="users">Користувачі</string>
-    <string name="list_view_mode">Вигляд списку</string>
+    <string name="list_view_mode">Режим перегляду списком</string>
     <string name="list">Список</string>
     <string name="grid">Сiтка</string>
     <string name="unsubscribe">Відписатися</string>
@@ -441,21 +441,21 @@
     <string name="permission_denied">Дію заборонено системою</string>
     <string name="download_failed">Помилка завантаження</string>
     <string name="download_finished">Завантаження завершено</string>
-    <string name="download_finished_more">Завантажень завершено: %s</string>
-    <string name="generate_unique_name">Створення унікального імені</string>
+    <string name="download_finished_more">%s завантажень завершено</string>
+    <string name="generate_unique_name">Згенерувати унікальне ім\'я</string>
     <string name="overwrite">Перезаписати</string>
-    <string name="overwrite_warning">Файл з таким іменем вже існує</string>
-    <string name="download_already_running">Файл з таким іменем вже завантажується</string>
+    <string name="overwrite_warning">Завантажений файл з таким ім\'ям вже існує</string>
+    <string name="download_already_running">Файл з таким ім\'ям вже завантажується</string>
     <string name="show_error">Показати помилку</string>
     <string name="label_code">Код</string>
-    <string name="error_path_creation">Не можливо створити файл</string>
-    <string name="error_file_creation">Не можливо створити теку призначення</string>
-    <string name="error_permission_denied">Не надано доступу системою</string>
+    <string name="error_path_creation">Файл не може бути створений</string>
+    <string name="error_file_creation">Цільова тека не може бути створена</string>
+    <string name="error_permission_denied">Доступ заборонено системою</string>
     <string name="error_ssl_exception">Захищене з\'єднання не встановлено</string>
     <string name="error_unknown_host">Сервер не знайдено</string>
     <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_no_content">Сервер не надсилає дані</string>
+    <string name="error_http_unsupported_range">Сервер не підтримує завантаження у декілька потоків, спробуйте з параметром @string/msg_threads = 1</string>
     <string name="error_http_not_found">Не знайдено</string>
     <string name="error_postprocessing_failed">Невдала пост-обробка</string>
     <string name="clear_finished_download">Очистити завершені завантаження</string>

From f96a371464f2b559a732f3eb21fa6a818a3e725f Mon Sep 17 00:00:00 2001
From: minsk21 <itlab2012@mail.ru>
Date: Tue, 9 Apr 2019 01:18:35 +0000
Subject: [PATCH 065/138] Translated using Weblate (Belarusian)

Currently translated at 74.5% (330 of 443 strings)
---
 app/src/main/res/values-be/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 8eface954..dc9e6b571 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -327,7 +327,7 @@
     <string name="play_queue_audio_settings">Налады аўдыё</string>
     <string name="hold_to_append">Зацісніце, каб дадаць у чаргу</string>
     <string name="enqueue_on_background">У чаргу \"У фоне\"</string>
-    <string name="enqueue_on_popup">У чаргу \"У фоне\"</string>
+    <string name="enqueue_on_popup">У чаргу \"У акне\"</string>
     <string name="start_here_on_main">Відэаплэер</string>
     <string name="start_here_on_background">Фонавы плэер</string>
     <string name="start_here_on_popup">Плэер у акне</string>

From 4751075e879b2bc6aac626b2256244c3a4823aa4 Mon Sep 17 00:00:00 2001
From: Lambda Monad <monad@disroot.org>
Date: Thu, 11 Apr 2019 18:21:39 +0000
Subject: [PATCH 066/138] Translated using Weblate (Indonesian)

Currently translated at 99.3% (440 of 443 strings)
---
 app/src/main/res/values-id/strings.xml | 99 +++-----------------------
 1 file changed, 11 insertions(+), 88 deletions(-)

diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 9e8412e02..66b901ac9 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -14,15 +14,12 @@
     <string name="choose_browser">Pilih peramban</string>
     <string name="use_external_video_player_title">Gunakan pemutar video eksternal</string>
     <string name="use_external_audio_player_title">Gunakan pemutar audio eksternal</string>
-
     <string name="download_path_title">Lokasi unduhan video</string>
     <string name="download_path_summary">Lokasi untuk menyimpan video yang diunduh</string>
     <string name="download_path_dialog_title">Masukkan lokasi unduhan video</string>
-
     <string name="download_path_audio_title">Lokasi unduhan audio</string>
     <string name="download_path_audio_summary">Audio yang diunduh disimpan di sini</string>
     <string name="download_path_audio_dialog_title">Masukkan lokasi unduhan berkas audio</string>
-
     <string name="autoplay_by_calling_app_title">Putar otomatis</string>
     <string name="autoplay_by_calling_app_summary">Putar video ketika NewPipe dijalankan dari aplikasi lain</string>
     <string name="default_resolution_title">Resolusi</string>
@@ -36,7 +33,6 @@
     <string name="m4a_description">M4A — kualitas lebih baik</string>
     <string name="dark_theme_title">Gelap</string>
     <string name="light_theme_title">Terang</string>
-
     <string name="download_dialog_title">Unduh</string>
     <string name="next_video_title">Berikutnya</string>
     <string name="show_next_and_similar_title">Tampilkan video \'Berikutnya\' dan \'Serupa\'</string>
@@ -58,7 +54,6 @@
     <string name="downloads">Unduhan</string>
     <string name="downloads_title">Unduhan</string>
     <string name="error_report_title">Laporan galat</string>
-
     <string name="general_error">Galat</string>
     <string name="parsing_error">Tidak bisa mengurai situs web</string>
     <string name="light_parsing_error">Tidak dapat menguraikan situs web sepenuhnya</string>
@@ -75,8 +70,6 @@
     <string name="what_happened_headline">Yang terjadi:</string>
     <string name="your_comment">Komentar anda (dalam bahasa Inggris):</string>
     <string name="error_details_headline">Detail:</string>
-
-
     <string name="list_thumbnail_view_description">Thumbnail pratinjau video</string>
     <string name="detail_thumbnail_view_description">Thumbnail pratinjau video</string>
     <string name="detail_likes_img_view_description">Suka</string>
@@ -87,21 +80,17 @@
     <string name="report_error">Laporkan Galat</string>
     <string name="err_dir_create">Tidak bisa membuat direktori unduhan \'%1$s\'</string>
     <string name="info_dir_created">Direktori unduhan dibuat \'%1$s\'</string>
-
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Ulangi</string>
     <string name="storage_permission_denied">Izin akses penyimpanan ditolak</string>
-
     <string name="delete">Hapus</string>
     <string name="view">Putar</string>
     <string name="start">Mulai</string>
     <string name="pause">Jeda</string>
     <string name="checksum">Ceksum</string>
-
     <string name="add">Misi baru</string>
     <string name="finish">OK</string>
-
     <string name="msg_name">Nama berkas</string>
     <string name="msg_error">Galat</string>
     <string name="msg_server_unsupported">Server tidak didukung</string>
@@ -112,79 +101,57 @@
     <string name="msg_wait">Mohon tunggu…</string>
     <string name="msg_copied">Disalin ke papan klip</string>
     <string name="no_available_dir">Silakan pilih direktori unduhan yang tersedia</string>
-
     <string name="no_player_found">Pemutar stream tidak ditemukan. Apakah anda ingin memasang VLC\?</string>
     <string name="youtube_signature_decryption_error">Tidak bisa dekripsi tanda tangan URL video</string>
     <string name="app_ui_crash">App/UI rusak</string>
     <string name="could_not_get_stream">Tidak bisa mendapatkan stream apapun</string>
     <string name="info_labels">Apa:\\nPermintaan:\\nBahasa Konten:\\nLayanan:\\nWaktu GMT:\\nPaket:\\nVersi:\\nVersi OS:</string>
     <string name="user_report">Laporan pengguna</string>
-
     <string name="msg_threads">Thread</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">Tantangan reCAPTCHA</string>
-
     <string name="recaptcha_request_toast">Meminta kode reCAPTCHA</string>
-
     <string name="black_theme_title">Hitam</string>
-
     <string name="all">Semua</string>
     <string name="channel">Channel</string>
-
     <string name="short_thousand">R</string>
     <string name="short_million">J</string>
     <string name="short_billion">T</string>
-
-
     <string name="yes">Ya</string>
     <string name="later">Nanti</string>
-
-
     <string name="open_in_popup_mode">Buka di mode popup</string>
     <string name="msg_popup_permission">Izin ini dibutuhkan untuk
 \nmembuka di mode popup</string>
-
     <string name="popup_mode_share_menu_title">Mode popup NewPipe</string>
-
     <string name="popup_playing_toast">Memutar dalam mode popup</string>
     <string name="use_old_player_title">Gunakan pemutar lama</string>
     <string name="use_old_player_summary">Pemutar Mediaframework bawaan versi lama</string>
     <string name="disabled">Dinonaktifkan</string>
-
     <string name="default_video_format_title">Format video</string>
-
     <string name="default_popup_resolution_title">Resolusi popup</string>
     <string name="show_higher_resolutions_title">Tampilkan resolusi yang lebih tinggi</string>
     <string name="show_higher_resolutions_summary">Hanya perangkat tertentu yang mendukung pemutaran video 2K/4K</string>
     <string name="controls_background_title">Latar Belakang</string>
     <string name="controls_popup_title">Popup</string>
-
     <string name="refresh">Segarkan</string>
     <string name="clear">Bersihkan</string>
-
     <string name="filter">Filter</string>
     <string name="use_external_video_player_summary">Menghapus audio pada BEBERAPA resolusi</string>
     <string name="popup_remember_size_pos_title">Ingat ukuran dan posisi popup</string>
     <string name="popup_remember_size_pos_summary">Ingat ukuran dan posisi terakhir popup</string>
-
     <string name="settings_category_popup_title">Popup</string>
     <string name="popup_resizing_indicator_title">Ubah ukuran</string>
-
     <string name="player_gesture_controls_title">Kontrol gestur pemutar</string>
     <string name="player_gesture_controls_summary">Gunakan gestur untuk mengontrol kecerahan dan volume pemutar</string>
     <string name="show_search_suggestions_title">Saran pencarian</string>
     <string name="show_search_suggestions_summary">Tampilkan saran ketika mencari</string>
-
-<string name="best_resolution">Resolusi terbaik</string>
-
+    <string name="best_resolution">Resolusi terbaik</string>
     <string name="settings_category_downloads_title">Unduh</string>
     <string name="settings_file_charset_title">Karakter yang diizinkan sebagai nama berkas</string>
     <string name="settings_file_replacement_character_summary">Karakter yang tidak valid akan diganti dengan karakter ini</string>
     <string name="settings_file_replacement_character_title">Karakter pengganti</string>
-
     <string name="charset_letters_and_digits">Huruf dan angka</string>
     <string name="charset_most_special_characters">Karakter spesial umum</string>
-
     <string name="title_activity_about">Tentang NewPipe</string>
     <string name="action_settings">Pengaturan</string>
     <string name="action_about">Tentang</string>
@@ -195,19 +162,17 @@
     <string name="tab_about">Tentang</string>
     <string name="tab_contributors">Kontributor</string>
     <string name="tab_licenses">Lisensi</string>
-    <string name="app_description">Aplikasi streaming libre dan ringan untuk Android.</string>
+    <string name="app_description">Aplikasi streaming bebas dan ringan untuk Android.</string>
     <string name="view_on_github">Lihat di GitHub</string>
     <string name="app_license_title">Lisensi NewPipe</string>
     <string name="contribution_encouragement">Terlepas apakah anda memiliki ide untuk; terjemahan, perubahan desain, pembersihan kode, atau perubahan kode yang signifikan, segala bantuan akan selalu diterima. Semakin banyak akan semakin baik jadinya!</string>
     <string name="read_full_license">Baca lisensi</string>
     <string name="contribution_title">Kontribusi</string>
-<string name="subscribe_button_title">Subscribe</string>
+    <string name="subscribe_button_title">Subscribe</string>
     <string name="subscribed_button_title">Disubscribe</string>
     <string name="fragment_whats_new">Apa Yang Baru</string>
-
     <string name="resume_on_audio_focus_gain_title">Lanjutkan saat fokus</string>
     <string name="resume_on_audio_focus_gain_summary">Lanjutkan pemutaran setelah interupsi (mis. panggilan telepon)</string>
-
     <string name="tab_main">Utama</string>
     <string name="enable_search_history_title">Riwayat pencarian</string>
     <string name="enable_search_history_summary">Simpan pencarian secara lokal</string>
@@ -241,16 +206,12 @@
     <string name="always">Selalu</string>
     <string name="just_once">Hanya Sekali</string>
     <string name="file">Berkas</string>
-
     <string name="notification_channel_description">Notifikasi untuk pemutar latar belakang dan popup NewPipe</string>
-
     <string name="unknown_content">[Tidak diketahui]</string>
-
     <string name="toggle_orientation">Ubah Orientasi</string>
     <string name="switch_to_background">Alihkan ke Latar Belakang</string>
     <string name="switch_to_popup">Alihkan ke Popup</string>
     <string name="switch_to_main">Alihkan ke Utama</string>
-
     <string name="import_data_title">Impor basis data</string>
     <string name="export_data_title">Ekspor basis data</string>
     <string name="import_data_summary">Timpa riwayat dan subscription anda saat ini</string>
@@ -267,32 +228,26 @@
     <string name="invalid_file">Berkas tidak tersedia atau tidak memiliki izin baca atau tulis</string>
     <string name="file_name_empty_error">Nama berkas tidak boleh kosong</string>
     <string name="error_occurred_detail">Telah terjadi galat: %1$s</string>
-
     <string name="search_no_results">Tidak ada hasil</string>
     <string name="empty_subscription_feed_subtitle">Tidak ada apapun disini selain jangkrik</string>
     <string name="detail_drag_description">Geser untuk ubah urutan</string>
-
     <string name="no_subscribers">Tidak ada subscriber</string>
     <plurals name="subscribers">
-    <item quantity="other">%s subscriber</item>
-</plurals>
-
+        <item quantity="other">%s subscriber</item>
+    </plurals>
     <string name="no_views">Belum ditonton</string>
     <plurals name="views">
-    <item quantity="other">%s ditonton</item>
-</plurals>
-
+        <item quantity="other">%s ditonton</item>
+    </plurals>
     <string name="no_videos">Tidak ada video</string>
     <plurals name="videos">
-    <item quantity="other">Video</item>
-</plurals>
-
+        <item quantity="other">Video</item>
+    </plurals>
     <string name="create">Buat</string>
     <string name="delete_one">Hapus Satu</string>
     <string name="delete_all">Hapus Semua</string>
     <string name="dismiss">Abaikan</string>
     <string name="rename">Ubah nama</string>
-
     <string name="donation_title">Donasi</string>
     <string name="donation_encouragement">NewPipe dikembangkan oleh relawan yang menyisihkan waktu untuk memberi anda pengalaman terbaik. Segala dukungan kepada pengembang akan membuat NewPipe menjadi lebih baik sambil menikmati secangkir kopi.</string>
     <string name="give_back">Beri dukungan</string>
@@ -306,7 +261,6 @@
     <string name="delete_all_history_prompt">Apakah Anda yakin ingin menghapus semua item dari riwayat\?</string>
     <string name="title_last_played">Terakhir Diputar</string>
     <string name="title_most_played">Sering Diputar</string>
-
     <string name="main_page_content">Konten laman utama</string>
     <string name="blank_page_summary">Laman Kosong</string>
     <string name="kiosk_page_summary">Laman Kiosk</string>
@@ -321,7 +275,6 @@
     <string name="no_valid_zip_file">Berkas ZIP tidak valid</string>
     <string name="could_not_import_all_files">Perhatian: Tidak bisa mengimpor semua berkas.</string>
     <string name="override_current_data">Ini akan menimpa pengaturan anda saat ini.</string>
-
     <string name="kiosk">Kiosk</string>
     <string name="trending">Trending</string>
     <string name="top_50">Top 50</string>
@@ -337,58 +290,45 @@
     <string name="start_here_on_main">Mulai putar di sini</string>
     <string name="start_here_on_background">Mulai dari sini ketika di latar belakang</string>
     <string name="start_here_on_popup">Mulai dari sini pada popup baru</string>
-
     <string name="drawer_open">Buka Laci</string>
     <string name="drawer_close">Tutup Laci</string>
     <string name="drawer_header_action_paceholder_text">Sesuatu akan segera muncul di sini ;D</string>
-
-
     <string name="video_player">Pemutar video</string>
     <string name="background_player">Pemutar latar belakang</string>
     <string name="popup_player">Pemutar popup</string>
     <string name="always_ask_open_action">Selalu bertanya</string>
-    
     <string name="preferred_player_fetcher_notification_title">Mendapatkan info…</string>
     <string name="preferred_player_fetcher_notification_message">Memuat konten yang diminta</string>
-
     <string name="create_playlist">Playlist Baru</string>
     <string name="delete_playlist">Hapus</string>
     <string name="rename_playlist">Ubah Nama</string>
     <string name="playlist_name_input">Nama</string>
     <string name="append_playlist">Tambahkan Ke Playlist</string>
     <string name="set_as_playlist_thumbnail">Atur sebagai Thumbnail Playlist</string>
-
     <string name="bookmark_playlist">Markah Playlist</string>
     <string name="unbookmark_playlist">Hapus Markah</string>
-
     <string name="delete_playlist_prompt">Hapus playlist ini\?</string>
     <string name="playlist_creation_success">Playlist dibuat</string>
     <string name="playlist_add_stream_success">Diplaylist</string>
     <string name="playlist_thumbnail_change_success">Thumbnail playlist diubah.</string>
     <string name="playlist_delete_failure">Tidak bisa menghapus playlist.</string>
-
     <string name="caption_none">Tidak ada Takarir</string>
-
     <string name="resize_fit">Pas</string>
     <string name="resize_fill">Isi</string>
     <string name="resize_zoom">Perbesar</string>
-
     <string name="caption_auto_generated">Otomatis dibuat</string>
     <string name="caption_font_size_settings_title">Ukuran fon deskripsi</string>
     <string name="smaller_caption_font_size">Fon lebih kecil</string>
     <string name="normal_caption_font_size">Fon normal</string>
     <string name="larger_caption_font_size">Fon lebih besar</string>
-
     <string name="enable_leak_canary_title">Aktifkan LeakCanary</string>
     <string name="playback_nightcore">Nightcore</string>
     <string name="playback_default">Bawaan</string>
-<string name="no_player_found_toast">Pemutar stream tidak ditemukan (anda bisa memasang VLC untuk memutarnya).</string>
+    <string name="no_player_found_toast">Pemutar stream tidak ditemukan (anda bisa memasang VLC untuk memutarnya).</string>
     <string name="controls_download_desc">Unduh berkas stream</string>
     <string name="subscription_change_failed">Tidak bisa mengubah subscription</string>
     <string name="show_info">Tampilkan info</string>
-
     <string name="controls_add_to_playlist_title">Tambahkan Ke</string>
-
     <string name="clear_views_history_title">Hapus riwayat tontonan</string>
     <string name="clear_views_history_summary">Hapus riwayat stream yang telah diputar</string>
     <string name="delete_view_history_alert">Hapus seluruh riwayat tontonan\?</string>
@@ -398,14 +338,10 @@
     <string name="delete_search_history_alert">Hapus seluruh riwayat pencarian\?</string>
     <string name="search_history_deleted">Riwayat pencarian dihapus.</string>
     <string name="no_streams_available_download">Tidak ada stream yang tersedia untuk diunduh</string>
-
     <string name="one_item_deleted">1 item dihapus.</string>
-
     <string name="toast_no_player">Tidak ada aplikasi terpasang untuk memutar berkas ini</string>
-
     <string name="title_history_view">Ditonton</string>
     <string name="tab_bookmarks">Playlist Disimpan</string>
-
     <string name="auto_queue_title">Antre otomatis stream berikutnya</string>
     <string name="channel_unsubscribed">Channel berhenti disubscribe</string>
     <string name="subscription_update_failed">Tidak bisa memperbarui subscription</string>
@@ -414,32 +350,23 @@
     <string name="use_inexact_seek_summary">Memungkinkan pengguna memilih posisi waktu video dengan cepat tetapi dengan tingkat presisi yang rendah</string>
     <string name="app_license">NewPipe adalah perangkat lunak libre copyleft: Anda bisa menggunakannya, mempelajarinya, berbagi, dan meningkatkannya. Secara khusus anda bisa mendistribusikan ulang dan/atau memodifikasinya dibawah syarat Lisensi Publik Umum GNU yang diterbitkan oleh Free Software Foundation, baik versi 3 dari Lisensi, atau (sesuai pilihan anda) versi yang lebih baru.</string>
     <string name="import_settings">Apakah anda juga ingin mengimpor pengaturan\?</string>
-
     <string name="preferred_open_action_settings_title">Tindakan \'buka\' yang diinginkan</string>
     <string name="preferred_open_action_settings_summary">Tindakan baku ketika membuka konten — %s</string>
-
     <string name="caption_setting_title">Takarir</string>
     <string name="caption_setting_description">Ubah skala teks takarir pemutar dan gaya latar belakang. Perlu memulai ulang apl.</string>
-
     <string name="enable_leak_canary_summary">Pemantauan kebocoran memori dapat menyebabkan apl menjadi tidak responsif saat heap dumping</string>
-
     <string name="enable_disposed_exceptions_title">Laporkan galat out-of-lifecycle</string>
     <string name="enable_disposed_exceptions_summary">Paksa pelaporan eksepsi Rx yang tak terkirim di luar fragmen atau siklus hidup aktivitas setelah dibuang</string>
-
     <string name="import_export_title">Impor/ekspor</string>
     <string name="import_title">Impor</string>
     <string name="import_from">Impor dari</string>
     <string name="export_to">Ekspor ke</string>
-
     <string name="import_ongoing">Mengimpor…</string>
     <string name="export_ongoing">Mengekspor…</string>
-
     <string name="import_file_title">Impor berkas</string>
     <string name="previous_export">Ekspor sebelumnya</string>
-
     <string name="subscriptions_import_unsuccessful">Tidak bisa mengimpor subscription</string>
     <string name="subscriptions_export_unsuccessful">Tidak bisa mengekspor subscription</string>
-
     <string name="import_youtube_instructions">Impor subscription YouTube dengan mengunduh berkas yang diekspor: 
 \n 
 \n1. Kunjungi URL ini: %1$s 
@@ -452,11 +379,9 @@
 \n3. Masuk ketika ditanya
 \n4. Salin URL profil anda ketika dialihkan.</string>
     <string name="import_soundcloud_instructions_hint">idAnda, soundcloud.com/idAnda</string>
-
     <string name="import_network_expensive_warning">Perlu diingat operasi ini membutuhkan bandwidth yang besar.
 \n
 \nApakah anda ingin melanjutkan\?</string>
-
     <string name="playback_speed_control">Kontrol Kecepatan Pemutaran</string>
     <string name="playback_tempo">Tempo</string>
     <string name="playback_pitch">Nada</string>
@@ -472,12 +397,10 @@
     <string name="skip_silence_checkbox">Percepat saat diam</string>
     <string name="playback_step">Langkah</string>
     <string name="playback_reset">Atur ulang</string>
-
     <string name="start_accept_privacy_policy">Agar sesuai dengan Regulasi Perlindungan Data Umum Eropa (GDPR), dengan ini kami tarik perhatian anda ke kebijakan privasi NewPipe. Silakan baca dengan seksama.
 \nAnda harus menerimanya untuk mengirimkan laporan bug kepada kami.</string>
     <string name="accept">Setuju</string>
     <string name="decline">Tolak</string>
-
     <string name="limit_data_usage_none_description">Tanpa batas</string>
     <string name="limit_mobile_data_usage_title">Batasi resolusi saat menggunakan data seluler</string>
     <string name="minimize_on_exit_title">Minimalkan saat beralih apl</string>
@@ -549,5 +472,5 @@
     <string name="max_retry_msg">Percobaan maksimum</string>
     <string name="max_retry_desc">Jumlah upaya maksimum sebelum membatalkan unduhan</string>
     <string name="pause_downloads_on_mobile">Berhenti ketika beralih ke data seluler</string>
-    <string name="pause_downloads_on_mobile_desc">Unduhan yang tidak dapat dijeda akan dimulai kembali</string>
+    <string name="pause_downloads_on_mobile_desc">Unduhan yang tidak dapat dijeda akan diulang dari awal</string>
 </resources>
\ No newline at end of file

From 4e1423d224296e89551636ec5e02ccc94ef7d421 Mon Sep 17 00:00:00 2001
From: Vasiliy <nvasya95@gmail.com>
Date: Sat, 13 Apr 2019 10:31:32 +0300
Subject: [PATCH 067/138] Implement playback state management

---
 .../org/schabi/newpipe/RouterActivity.java    |   8 +-
 .../history/dao/StreamHistoryDAO.java         |   5 +
 .../stream/model/StreamStateEntity.java       |  14 +
 .../fragments/detail/VideoDetailFragment.java |  64 +-
 .../fragments/list/BaseListFragment.java      |   6 +-
 .../list/channel/ChannelFragment.java         |  16 +-
 .../list/playlist/PlaylistFragment.java       |  22 +-
 .../local/history/HistoryRecordManager.java   |  49 +-
 .../history/StatisticsPlaylistFragment.java   |  16 +-
 .../local/playlist/LocalPlaylistFragment.java |  16 +-
 .../newpipe/player/BackgroundPlayer.java      |   1 +
 .../org/schabi/newpipe/player/BasePlayer.java |  71 +-
 .../newpipe/player/MainVideoPlayer.java       |  12 +-
 .../newpipe/player/PopupVideoPlayer.java      |   4 +-
 .../newpipe/player/ServicePlayerActivity.java |   3 +-
 .../schabi/newpipe/player/VideoPlayer.java    |   5 +
 .../util/CommentTextOnTouchListener.java      |   2 +-
 .../schabi/newpipe/util/NavigationHelper.java |  47 +-
 .../newpipe/views/AnimatedProgressBar.java    |  69 ++
 .../progress_soundcloud_horizontal_dark.xml   |  15 +
 .../progress_soundcloud_horizontal_light.xml  |  15 +
 .../progress_youtube_horizontal_dark.xml      |  15 +
 .../progress_youtube_horizontal_light.xml     |  15 +
 .../fragment_video_detail.xml                 |  77 +-
 .../main/res/layout/fragment_video_detail.xml | 913 +++++++++---------
 app/src/main/res/values-ru/strings.xml        |   5 +-
 app/src/main/res/values-uk/strings.xml        |   5 +-
 app/src/main/res/values/attrs.xml             |   1 +
 app/src/main/res/values/settings_keys.xml     |   1 +
 app/src/main/res/values/strings.xml           |   5 +-
 app/src/main/res/values/styles.xml            |   2 +
 app/src/main/res/values/styles_services.xml   |   3 +
 app/src/main/res/xml/history_settings.xml     |  58 +-
 33 files changed, 978 insertions(+), 582 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java
 create mode 100644 app/src/main/res/drawable/progress_soundcloud_horizontal_dark.xml
 create mode 100644 app/src/main/res/drawable/progress_soundcloud_horizontal_light.xml
 create mode 100644 app/src/main/res/drawable/progress_youtube_horizontal_dark.xml
 create mode 100644 app/src/main/res/drawable/progress_youtube_horizontal_light.xml

diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index f040dc8b4..c7bf4c881 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -574,7 +574,7 @@ public class RouterActivity extends AppCompatActivity {
                         playQueue = new SinglePlayQueue((StreamInfo) info);
 
                         if (playerChoice.equals(videoPlayerKey)) {
-                            NavigationHelper.playOnMainPlayer(this, playQueue);
+                            NavigationHelper.playOnMainPlayer(this, playQueue, true);
                         } else if (playerChoice.equals(backgroundPlayerKey)) {
                             NavigationHelper.enqueueOnBackgroundPlayer(this, playQueue, true);
                         } else if (playerChoice.equals(popupPlayerKey)) {
@@ -587,11 +587,11 @@ public class RouterActivity extends AppCompatActivity {
                     playQueue = info instanceof ChannelInfo ? new ChannelPlayQueue((ChannelInfo) info) : new PlaylistPlayQueue((PlaylistInfo) info);
 
                     if (playerChoice.equals(videoPlayerKey)) {
-                        NavigationHelper.playOnMainPlayer(this, playQueue);
+                        NavigationHelper.playOnMainPlayer(this, playQueue, true);
                     } else if (playerChoice.equals(backgroundPlayerKey)) {
-                        NavigationHelper.playOnBackgroundPlayer(this, playQueue);
+                        NavigationHelper.playOnBackgroundPlayer(this, playQueue, true);
                     } else if (playerChoice.equals(popupPlayerKey)) {
-                        NavigationHelper.playOnPopupPlayer(this, playQueue);
+                        NavigationHelper.playOnPopupPlayer(this, playQueue, true);
                     }
                 }
             };
diff --git a/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java b/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
index 847153e12..50d723f1f 100644
--- a/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
@@ -50,6 +50,11 @@ public abstract class StreamHistoryDAO implements HistoryDAO<StreamHistoryEntity
             " ORDER BY " + STREAM_ACCESS_DATE + " DESC")
     public abstract Flowable<List<StreamHistoryEntry>> getHistory();
 
+    @Query("SELECT * FROM " + STREAM_HISTORY_TABLE + " WHERE " + JOIN_STREAM_ID +
+            " = :streamId ORDER BY " + STREAM_ACCESS_DATE + " DESC LIMIT 1")
+    @Nullable
+    public abstract StreamHistoryEntity getLatestEntry(final long streamId);
+
     @Query("DELETE FROM " + STREAM_HISTORY_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
     public abstract int deleteStreamHistory(final long streamId);
 
diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java
index 15940a964..946ee1182 100644
--- a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java
@@ -5,6 +5,8 @@ import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.ForeignKey;
 
+import java.util.concurrent.TimeUnit;
+
 import static android.arch.persistence.room.ForeignKey.CASCADE;
 import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID;
 import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
@@ -22,6 +24,12 @@ public class StreamStateEntity {
     final public static String JOIN_STREAM_ID       = "stream_id";
     final public static String STREAM_PROGRESS_TIME = "progress_time";
 
+
+    /** Playback state will not be saved, if playback time less than this threshold */
+    private static final int PLAYBACK_SAVE_THRESHOLD_START_SECONDS = 5;
+    /** Playback state will not be saved, if time left less than this threshold */
+    private static final int PLAYBACK_SAVE_THRESHOLD_END_SECONDS = 10;
+
     @ColumnInfo(name = JOIN_STREAM_ID)
     private long streamUid;
 
@@ -48,4 +56,10 @@ public class StreamStateEntity {
     public void setProgressTime(long progressTime) {
         this.progressTime = progressTime;
     }
+
+    public boolean isValid(int durationInSeconds) {
+        final int seconds = (int) TimeUnit.MILLISECONDS.toSeconds(progressTime);
+        return seconds > PLAYBACK_SAVE_THRESHOLD_START_SECONDS
+                && seconds < durationInSeconds - PLAYBACK_SAVE_THRESHOLD_END_SECONDS;
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index bbd1a315d..d6630c9c3 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -89,12 +89,14 @@ import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ShareUtils;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
+import org.schabi.newpipe.views.AnimatedProgressBar;
 
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import icepick.State;
 import io.reactivex.Single;
@@ -118,7 +120,7 @@ public class VideoDetailFragment
     private static final int RELATED_STREAMS_UPDATE_FLAG = 0x1;
     private static final int RESOLUTIONS_MENU_UPDATE_FLAG = 0x2;
     private static final int TOOLBAR_ITEMS_UPDATE_FLAG = 0x4;
-    private static final int COMMENTS_UPDATE_FLAG = 0x4;
+    private static final int COMMENTS_UPDATE_FLAG = 0x8;
 
     private boolean autoPlayEnabled;
     private boolean showRelatedStreams;
@@ -136,6 +138,8 @@ public class VideoDetailFragment
     private Disposable currentWorker;
     @NonNull
     private CompositeDisposable disposables = new CompositeDisposable();
+    @Nullable
+    private Disposable positionSubscriber = null;
 
     private List<VideoStream> sortedVideoStreams;
     private int selectedVideoStreamIndex = -1;
@@ -153,6 +157,7 @@ public class VideoDetailFragment
     private View thumbnailBackgroundButton;
     private ImageView thumbnailImageView;
     private ImageView thumbnailPlayButton;
+    private AnimatedProgressBar positionView;
 
     private View videoTitleRoot;
     private TextView videoTitleTextView;
@@ -165,6 +170,7 @@ public class VideoDetailFragment
     private TextView detailControlsDownload;
     private TextView appendControlsDetail;
     private TextView detailDurationView;
+    private TextView detailPositionView;
 
     private LinearLayout videoDescriptionRootLayout;
     private TextView videoUploadDateView;
@@ -259,6 +265,8 @@ public class VideoDetailFragment
         // Check if it was loading when the fragment was stopped/paused,
         if (wasLoading.getAndSet(false)) {
             selectAndLoadVideo(serviceId, url, name);
+        } else if (currentInfo != null) {
+            updateProgressInfo(currentInfo);
         }
     }
 
@@ -268,8 +276,10 @@ public class VideoDetailFragment
         PreferenceManager.getDefaultSharedPreferences(activity)
                 .unregisterOnSharedPreferenceChangeListener(this);
 
+        if (positionSubscriber != null) positionSubscriber.dispose();
         if (currentWorker != null) currentWorker.dispose();
         if (disposables != null) disposables.clear();
+        positionSubscriber = null;
         currentWorker = null;
         disposables = null;
     }
@@ -462,6 +472,7 @@ public class VideoDetailFragment
         videoTitleTextView = rootView.findViewById(R.id.detail_video_title_view);
         videoTitleToggleArrow = rootView.findViewById(R.id.detail_toggle_description_view);
         videoCountView = rootView.findViewById(R.id.detail_view_count_view);
+        positionView = rootView.findViewById(R.id.position_view);
 
         detailControlsBackground = rootView.findViewById(R.id.detail_controls_background);
         detailControlsPopup = rootView.findViewById(R.id.detail_controls_popup);
@@ -469,6 +480,7 @@ public class VideoDetailFragment
         detailControlsDownload = rootView.findViewById(R.id.detail_controls_download);
         appendControlsDetail = rootView.findViewById(R.id.touch_append_detail);
         detailDurationView = rootView.findViewById(R.id.detail_duration_view);
+        detailPositionView = rootView.findViewById(R.id.detail_position_view);
 
         videoDescriptionRootLayout = rootView.findViewById(R.id.detail_description_root_layout);
         videoUploadDateView = rootView.findViewById(R.id.detail_upload_date_view);
@@ -536,10 +548,10 @@ public class VideoDetailFragment
         final DialogInterface.OnClickListener actions = (DialogInterface dialogInterface, int i) -> {
             switch (i) {
                 case 0:
-                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item), true);
                     break;
                 case 1:
-                    NavigationHelper.enqueueOnPopupPlayer(getActivity(), new SinglePlayQueue(item));
+                    NavigationHelper.enqueueOnPopupPlayer(getActivity(), new SinglePlayQueue(item), true);
                     break;
                 case 2:
                     if (getFragmentManager() != null) {
@@ -890,11 +902,11 @@ public class VideoDetailFragment
 
         final PlayQueue itemQueue = new SinglePlayQueue(currentInfo);
         if (append) {
-            NavigationHelper.enqueueOnPopupPlayer(activity, itemQueue);
+            NavigationHelper.enqueueOnPopupPlayer(activity, itemQueue, false);
         } else {
             Toast.makeText(activity, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
             final Intent intent = NavigationHelper.getPlayerIntent(
-                    activity, PopupVideoPlayer.class, itemQueue, getSelectedVideoStream().resolution
+                    activity, PopupVideoPlayer.class, itemQueue, getSelectedVideoStream().resolution, true
             );
             activity.startService(intent);
         }
@@ -914,9 +926,9 @@ public class VideoDetailFragment
     private void openNormalBackgroundPlayer(final boolean append) {
         final PlayQueue itemQueue = new SinglePlayQueue(currentInfo);
         if (append) {
-            NavigationHelper.enqueueOnBackgroundPlayer(activity, itemQueue);
+            NavigationHelper.enqueueOnBackgroundPlayer(activity, itemQueue, false);
         } else {
-            NavigationHelper.playOnBackgroundPlayer(activity, itemQueue);
+            NavigationHelper.playOnBackgroundPlayer(activity, itemQueue, true);
         }
     }
 
@@ -926,7 +938,7 @@ public class VideoDetailFragment
         mIntent = NavigationHelper.getPlayerIntent(activity,
                 MainVideoPlayer.class,
                 playQueue,
-                getSelectedVideoStream().getResolution());
+                getSelectedVideoStream().getResolution(), true);
         startActivity(mIntent);
     }
 
@@ -1032,6 +1044,8 @@ public class VideoDetailFragment
         animateView(spinnerToolbar, false, 200);
         animateView(thumbnailPlayButton, false, 50);
         animateView(detailDurationView, false, 100);
+        animateView(detailPositionView, false, 100);
+        animateView(positionView, false, 50);
 
         videoTitleTextView.setText(name != null ? name : "");
         videoTitleTextView.setMaxLines(1);
@@ -1146,6 +1160,7 @@ public class VideoDetailFragment
             videoUploadDateView.setText(Localization.localizeDate(activity, info.getUploadDate()));
         }
         prepareDescription(info.getDescription());
+        updateProgressInfo(info);
 
         animateView(spinnerToolbar, true, 500);
         setupActionBar(info);
@@ -1250,4 +1265,37 @@ public class VideoDetailFragment
 
         showError(getString(R.string.blocked_by_gema), false, R.drawable.gruese_die_gema);
     }
+
+    private void updateProgressInfo(@NonNull final StreamInfo info) {
+        if (positionSubscriber != null) {
+            positionSubscriber.dispose();
+        }
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+        final boolean playbackResumeEnabled =
+                prefs.getBoolean(activity.getString(R.string.enable_watch_history_key), true)
+                        && prefs.getBoolean(activity.getString(R.string.enable_playback_resume_key), true);
+        if (!playbackResumeEnabled || info.getDuration() <= 0) {
+            positionView.setVisibility(View.INVISIBLE);
+            detailPositionView.setVisibility(View.GONE);
+            return;
+        }
+        final HistoryRecordManager recordManager = new HistoryRecordManager(requireContext());
+        positionSubscriber = recordManager.loadStreamState(info)
+                .subscribeOn(Schedulers.io())
+                .onErrorComplete()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(state -> {
+                    final int seconds = (int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime());
+                    positionView.setMax((int) info.getDuration());
+                    positionView.setProgress(seconds);
+                    detailPositionView.setText(Localization.getDurationString(seconds));
+                    animateView(positionView, true, 500);
+                    animateView(detailPositionView, true, 500);
+                }, e -> {
+                    if (DEBUG) e.printStackTrace();
+                }, () -> {
+                    animateView(positionView, false, 500);
+                    animateView(detailPositionView, false, 500);
+                });
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index dbc3dd8a2..68784852e 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -266,13 +266,13 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
         final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
             switch (i) {
                 case 0:
-                    NavigationHelper.playOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    NavigationHelper.playOnBackgroundPlayer(context, new SinglePlayQueue(item), true);
                     break;
                 case 1:
-                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item), true);
                     break;
                 case 2:
-                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item), true);
                     break;
                 case 3:
                     if (getFragmentManager() != null) {
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index 71865b04d..934e934e9 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -170,19 +170,19 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
             final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0);
             switch (i) {
                 case 0:
-                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item), false);
                     break;
                 case 1:
-                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item), false);
                     break;
                 case 2:
-                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
+                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index), true);
                     break;
                 case 3:
-                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
+                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index), true);
                     break;
                 case 4:
-                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
+                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index), true);
                     break;
                 case 5:
                     if (getFragmentManager() != null) {
@@ -440,11 +440,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
         monitorSubscription(result);
 
         headerPlayAllButton.setOnClickListener(
-                view -> NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+                view -> NavigationHelper.playOnMainPlayer(activity, getPlayQueue(), false));
         headerPopupButton.setOnClickListener(
-                view -> NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+                view -> NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
         headerBackgroundButton.setOnClickListener(
-                view -> NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
+                view -> NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
     }
 
     private PlayQueue getPlayQueue() {
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index 2a775fe8f..77aa0a250 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -154,22 +154,22 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
             final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0);
             switch (i) {
                 case 0:
-                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item), false);
                     break;
                 case 1:
-                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item), false);
                     break;
                 case 2:
-                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
+                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index), true);
                     break;
                 case 3:
-                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
+                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index), true);
                     break;
                 case 4:
-                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
+                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index), true);
                     break;
                 case 5:
-                    ShareUtils.shareUrl(this.getContext(), item.getName(), item.getUrl());
+                    ShareUtils.shareUrl(requireContext(), item.getName(), item.getUrl());
                     break;
                 default:
                     break;
@@ -301,19 +301,19 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                 .subscribe(getPlaylistBookmarkSubscriber());
 
         headerPlayAllButton.setOnClickListener(view ->
-                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue(), false));
         headerPopupButton.setOnClickListener(view ->
-                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
         headerBackgroundButton.setOnClickListener(view ->
-                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
 
         headerPopupButton.setOnLongClickListener(view -> {
-            NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue());
+            NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue(), true);
             return true;
         });
 
         headerBackgroundButton.setOnLongClickListener(view -> {
-            NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue());
+            NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue(), true);
             return true;
         });
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
index 56453773a..f9090128c 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
@@ -37,12 +37,14 @@ import org.schabi.newpipe.database.stream.dao.StreamStateDAO;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
+import io.reactivex.Completable;
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
 import io.reactivex.Single;
@@ -80,9 +82,9 @@ public class HistoryRecordManager {
         final Date currentTime = new Date();
         return Maybe.fromCallable(() -> database.runInTransaction(() -> {
             final long streamId = streamTable.upsert(new StreamEntity(info));
-            StreamHistoryEntity latestEntry = streamHistoryTable.getLatestEntry();
+            StreamHistoryEntity latestEntry = streamHistoryTable.getLatestEntry(streamId);
 
-            if (latestEntry != null && latestEntry.getStreamUid() == streamId) {
+            if (latestEntry != null) {
                 streamHistoryTable.delete(latestEntry);
                 latestEntry.setAccessDate(currentTime);
                 latestEntry.setRepeatCount(latestEntry.getRepeatCount() + 1);
@@ -99,7 +101,7 @@ public class HistoryRecordManager {
     }
 
     public Single<Integer> deleteWholeStreamHistory() {
-        return Single.fromCallable(() -> streamHistoryTable.deleteAll())
+        return Single.fromCallable(streamHistoryTable::deleteAll)
                 .subscribeOn(Schedulers.io());
     }
 
@@ -160,7 +162,7 @@ public class HistoryRecordManager {
     }
 
     public Single<Integer> deleteWholeSearchHistory() {
-        return Single.fromCallable(() -> searchHistoryTable.deleteAll())
+        return Single.fromCallable(searchHistoryTable::deleteAll)
                 .subscribeOn(Schedulers.io());
     }
 
@@ -180,18 +182,41 @@ public class HistoryRecordManager {
     // Stream State History
     ///////////////////////////////////////////////////////
 
-    @SuppressWarnings("unused")
-    public Maybe<StreamStateEntity> loadStreamState(final StreamInfo info) {
-        return Maybe.fromCallable(() -> streamTable.upsert(new StreamEntity(info)))
-                .flatMap(streamId -> streamStateTable.getState(streamId).firstElement())
-                .flatMap(states -> states.isEmpty() ? Maybe.empty() : Maybe.just(states.get(0)))
+    public Maybe<StreamHistoryEntity> getStreamHistory(final StreamInfo info) {
+        return Maybe.fromCallable(() -> {
+            final long streamId = streamTable.upsert(new StreamEntity(info));
+            return streamHistoryTable.getLatestEntry(streamId);
+        }).subscribeOn(Schedulers.io());
+    }
+
+    public Maybe<StreamStateEntity> loadStreamState(final PlayQueueItem queueItem) {
+        return queueItem.getStream()
+                .map((info) -> streamTable.upsert(new StreamEntity(info)))
+                .flatMapPublisher(streamStateTable::getState)
+                .firstElement()
+                .flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0)))
+                .filter(state -> state.isValid((int) queueItem.getDuration()))
                 .subscribeOn(Schedulers.io());
     }
 
-    public Maybe<Long> saveStreamState(@NonNull final StreamInfo info, final long progressTime) {
-        return Maybe.fromCallable(() -> database.runInTransaction(() -> {
+    public Maybe<StreamStateEntity> loadStreamState(final StreamInfo info) {
+        return Single.fromCallable(() -> streamTable.upsert(new StreamEntity(info)))
+                .flatMapPublisher(streamStateTable::getState)
+                .firstElement()
+                .flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0)))
+                .filter(state -> state.isValid((int) info.getDuration()))
+                .subscribeOn(Schedulers.io());
+    }
+
+    public Completable saveStreamState(@NonNull final StreamInfo info, final long progressTime) {
+        return Completable.fromAction(() -> database.runInTransaction(() -> {
             final long streamId = streamTable.upsert(new StreamEntity(info));
-            return streamStateTable.upsert(new StreamStateEntity(streamId, progressTime));
+            final StreamStateEntity state = new StreamStateEntity(streamId, progressTime);
+            if (state.isValid((int) info.getDuration())) {
+                streamStateTable.upsert(state);
+            } else {
+                streamStateTable.deleteState(streamId);
+            }
         })).subscribeOn(Schedulers.io());
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index 5a62a3969..b97fdf8f2 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -310,11 +310,11 @@ public class StatisticsPlaylistFragment
         }
 
         headerPlayAllButton.setOnClickListener(view ->
-                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue(), false));
         headerPopupButton.setOnClickListener(view ->
-                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
         headerBackgroundButton.setOnClickListener(view ->
-                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
         sortButton.setOnClickListener(view -> toggleSortMode());
 
         hideLoading();
@@ -377,19 +377,19 @@ public class StatisticsPlaylistFragment
             final int index = Math.max(itemListAdapter.getItemsList().indexOf(item), 0);
             switch (i) {
                 case 0:
-                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(infoItem));
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(infoItem), false);
                     break;
                 case 1:
-                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(infoItem));
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(infoItem), false);
                     break;
                 case 2:
-                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
+                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index), true);
                     break;
                 case 3:
-                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
+                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index), true);
                     break;
                 case 4:
-                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
+                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index), true);
                     break;
                 case 5:
                     deleteEntry(index);
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index dc101fade..501016642 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -319,11 +319,11 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
         setVideoCount(itemListAdapter.getItemsList().size());
 
         headerPlayAllButton.setOnClickListener(view ->
-                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue(), false));
         headerPopupButton.setOnClickListener(view ->
-                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
         headerBackgroundButton.setOnClickListener(view ->
-                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
 
         hideLoading();
     }
@@ -534,20 +534,20 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
             switch (i) {
                 case 0:
                     NavigationHelper.enqueueOnBackgroundPlayer(context,
-                            new SinglePlayQueue(infoItem));
+                            new SinglePlayQueue(infoItem), false);
                     break;
                 case 1:
                     NavigationHelper.enqueueOnPopupPlayer(activity, new
-                            SinglePlayQueue(infoItem));
+                            SinglePlayQueue(infoItem), false);
                     break;
                 case 2:
-                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
+                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index), true);
                     break;
                 case 3:
-                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
+                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index), true);
                     break;
                 case 4:
-                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
+                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index), true);
                     break;
                 case 5:
                     changeThumbnailUrl(item.thumbnailUrl);
diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
index 3989581fd..c95488541 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
@@ -150,6 +150,7 @@ public final class BackgroundPlayer extends Service {
             lockManager.releaseWifiAndCpu();
         }
         if (basePlayerImpl != null) {
+            basePlayerImpl.savePlaybackState();
             basePlayerImpl.stopActivityBinding();
             basePlayerImpl.destroy();
         }
diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
index 22c69fdd4..2ad5fd9fb 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -23,9 +23,11 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.media.AudioManager;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ -145,6 +147,8 @@ public abstract class BasePlayer implements
     @NonNull
     public static final String APPEND_ONLY = "append_only";
     @NonNull
+    public static final String RESUME_PLAYBACK = "resume_playback";
+    @NonNull
     public static final String SELECT_ON_APPEND = "select_on_append";
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -279,8 +283,23 @@ public abstract class BasePlayer implements
                 ) {
             simpleExoPlayer.seekTo(playQueue.getIndex(), queue.getItem().getRecoveryPosition());
             return;
+        } else if (intent.getBooleanExtra(RESUME_PLAYBACK, false) && isPlaybackResumeEnabled()) {
+            final PlayQueueItem item = queue.getItem();
+            if (item != null && item.getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET && isPlaybackResumeEnabled()) {
+                final Disposable stateLoader = recordManager.loadStreamState(item)
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .doFinally(() -> initPlayback(queue, repeatMode, playbackSpeed, playbackPitch, playbackSkipSilence,
+                                /*playOnInit=*/true))
+                        .subscribe(
+                                state -> queue.setRecovery(queue.getIndex(), state.getProgressTime()),
+                                error -> {
+                                    if (DEBUG) error.printStackTrace();
+                                }
+                        );
+                databaseUpdateReactor.add(stateLoader);
+                return;
+            }
         }
-
         // Good to go...
         initPlayback(queue, repeatMode, playbackSpeed, playbackPitch, playbackSkipSilence,
                 /*playOnInit=*/true);
@@ -615,6 +634,9 @@ public abstract class BasePlayer implements
                 break;
             case Player.STATE_ENDED: // 4
                 changeState(STATE_COMPLETED);
+                if (currentMetadata != null) {
+                    resetPlaybackState(currentMetadata.getMetadata());
+                }
                 isPrepared = false;
                 break;
         }
@@ -721,6 +743,7 @@ public abstract class BasePlayer implements
             case DISCONTINUITY_REASON_SEEK_ADJUSTMENT:
             case DISCONTINUITY_REASON_INTERNAL:
                 if (playQueue.getIndex() != newWindowIndex) {
+                    resetPlaybackState(playQueue.getItem());
                     playQueue.setIndex(newWindowIndex);
                 }
                 break;
@@ -750,6 +773,9 @@ public abstract class BasePlayer implements
     @Override
     public void onSeekProcessed() {
         if (DEBUG) Log.d(TAG, "ExoPlayer - onSeekProcessed() called");
+        if (isPrepared) {
+            savePlaybackState();
+        }
     }
     /*//////////////////////////////////////////////////////////////////////////
     // Playback Listener
@@ -1017,27 +1043,40 @@ public abstract class BasePlayer implements
         }
     }
 
-    protected void savePlaybackState(final StreamInfo info, final long progress) {
+    private void savePlaybackState(final StreamInfo info, final long progress) {
         if (info == null) return;
+        if (DEBUG) Log.d(TAG, "savePlaybackState() called");
         final Disposable stateSaver = recordManager.saveStreamState(info, progress)
                 .observeOn(AndroidSchedulers.mainThread())
+                .doOnError((e) -> {
+                    if (DEBUG) e.printStackTrace();
+                })
                 .onErrorComplete()
-                .subscribe(
-                        ignored -> {/* successful */},
-                        error -> Log.e(TAG, "savePlaybackState() failure: ", error)
-                );
+                .subscribe();
         databaseUpdateReactor.add(stateSaver);
     }
 
-    private void savePlaybackState() {
+    private void resetPlaybackState(final PlayQueueItem queueItem) {
+        if (queueItem == null) return;
+        final Disposable stateSaver = queueItem.getStream()
+                .flatMapCompletable(info -> recordManager.saveStreamState(info, 0))
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnError((e) -> {
+                    if (DEBUG) e.printStackTrace();
+                })
+                .onErrorComplete()
+                .subscribe();
+        databaseUpdateReactor.add(stateSaver);
+    }
+
+    public void resetPlaybackState(final StreamInfo info) {
+        savePlaybackState(info, 0);
+    }
+
+    public void savePlaybackState() {
         if (simpleExoPlayer == null || currentMetadata == null) return;
         final StreamInfo currentInfo = currentMetadata.getMetadata();
-
-        if (simpleExoPlayer.getCurrentPosition() > RECOVERY_SKIP_THRESHOLD_MILLIS &&
-                simpleExoPlayer.getCurrentPosition() <
-                        simpleExoPlayer.getDuration() - RECOVERY_SKIP_THRESHOLD_MILLIS) {
-            savePlaybackState(currentInfo, simpleExoPlayer.getCurrentPosition());
-        }
+        savePlaybackState(currentInfo, simpleExoPlayer.getCurrentPosition());
     }
 
     private void maybeUpdateCurrentMetadata() {
@@ -1225,4 +1264,10 @@ public abstract class BasePlayer implements
     public boolean gotDestroyed() {
         return simpleExoPlayer == null;
     }
+
+    private boolean isPlaybackResumeEnabled() {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        return prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)
+                && prefs.getBoolean(context.getString(R.string.enable_playback_resume_key), true);
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
index cf179917d..902ee5065 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -247,6 +247,12 @@ public final class MainVideoPlayer extends AppCompatActivity
         super.attachBaseContext(AudioServiceLeakFix.preventLeakOf(newBase));
     }
 
+    @Override
+    protected void onPause() {
+        playerImpl.savePlaybackState();
+        super.onPause();
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // State Saving
     //////////////////////////////////////////////////////////////////////////*/
@@ -579,7 +585,8 @@ public final class MainVideoPlayer extends AppCompatActivity
                     this.getPlaybackSpeed(),
                     this.getPlaybackPitch(),
                     this.getPlaybackSkipSilence(),
-                    this.getPlaybackQuality()
+                    this.getPlaybackQuality(),
+                    false
             );
             context.startService(intent);
 
@@ -601,7 +608,8 @@ public final class MainVideoPlayer extends AppCompatActivity
                     this.getPlaybackSpeed(),
                     this.getPlaybackPitch(),
                     this.getPlaybackSkipSilence(),
-                    this.getPlaybackQuality()
+                    this.getPlaybackQuality(),
+                    false
             );
             context.startService(intent);
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
index 7578c444c..3782d85c0 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -325,6 +325,7 @@ public final class PopupVideoPlayer extends Service {
         isPopupClosing = true;
 
         if (playerImpl != null) {
+            playerImpl.savePlaybackState();
             if (playerImpl.getRootView() != null) {
                 windowManager.removeView(playerImpl.getRootView());
             }
@@ -565,7 +566,8 @@ public final class PopupVideoPlayer extends Service {
                     this.getPlaybackSpeed(),
                     this.getPlaybackPitch(),
                     this.getPlaybackSkipSilence(),
-                    this.getPlaybackQuality()
+                    this.getPlaybackQuality(),
+                    false
             );
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);
diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
index 3e04f1e3a..bdd31f21b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -188,7 +188,8 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
                 this.player.getPlaybackSpeed(),
                 this.player.getPlaybackPitch(),
                 this.player.getPlaybackSkipSilence(),
-                null
+                null,
+                false
         ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
index fb60ac473..bbfe805a5 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
@@ -543,6 +543,11 @@ public abstract class VideoPlayer extends BasePlayer
         playbackSpeedTextView.setText(formatSpeed(getPlaybackSpeed()));
 
         super.onPrepared(playWhenReady);
+
+        if (simpleExoPlayer.getCurrentPosition() != 0 && !isControlsVisible()) {
+            controlsVisibilityHandler.removeCallbacksAndMessages(null);
+            controlsVisibilityHandler.postDelayed(this::showControlsThenHide, DEFAULT_CONTROLS_DURATION);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java b/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
index e1ecc662d..ac79fee23 100644
--- a/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
+++ b/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
@@ -124,7 +124,7 @@ public class CommentTextOnTouchListener implements View.OnTouchListener {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(info -> {
                     PlayQueue playQueue = new SinglePlayQueue((StreamInfo) info, seconds*1000);
-                    NavigationHelper.playOnPopupPlayer(context, playQueue);
+                    NavigationHelper.playOnPopupPlayer(context, playQueue, false);
                 });
         return true;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index 98ae3a88a..89c4b33fe 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -69,12 +69,14 @@ public class NavigationHelper {
     public static Intent getPlayerIntent(@NonNull final Context context,
                                          @NonNull final Class targetClazz,
                                          @NonNull final PlayQueue playQueue,
-                                         @Nullable final String quality) {
+                                         @Nullable final String quality,
+                                         final boolean resumePlayback) {
         Intent intent = new Intent(context, targetClazz);
 
         final String cacheKey = SerializedCache.getInstance().put(playQueue, PlayQueue.class);
         if (cacheKey != null) intent.putExtra(VideoPlayer.PLAY_QUEUE_KEY, cacheKey);
         if (quality != null) intent.putExtra(VideoPlayer.PLAYBACK_QUALITY, quality);
+        intent.putExtra(VideoPlayer.RESUME_PLAYBACK, resumePlayback);
 
         return intent;
     }
@@ -82,16 +84,18 @@ public class NavigationHelper {
     @NonNull
     public static Intent getPlayerIntent(@NonNull final Context context,
                                          @NonNull final Class targetClazz,
-                                         @NonNull final PlayQueue playQueue) {
-        return getPlayerIntent(context, targetClazz, playQueue, null);
+                                         @NonNull final PlayQueue playQueue,
+                                         final boolean resumePlayback) {
+        return getPlayerIntent(context, targetClazz, playQueue, null, resumePlayback);
     }
 
     @NonNull
     public static Intent getPlayerEnqueueIntent(@NonNull final Context context,
                                                 @NonNull final Class targetClazz,
                                                 @NonNull final PlayQueue playQueue,
-                                                final boolean selectOnAppend) {
-        return getPlayerIntent(context, targetClazz, playQueue)
+                                                final boolean selectOnAppend,
+                                                final boolean resumePlayback) {
+        return getPlayerIntent(context, targetClazz, playQueue, resumePlayback)
                 .putExtra(BasePlayer.APPEND_ONLY, true)
                 .putExtra(BasePlayer.SELECT_ON_APPEND, selectOnAppend);
     }
@@ -104,40 +108,41 @@ public class NavigationHelper {
                                          final float playbackSpeed,
                                          final float playbackPitch,
                                          final boolean playbackSkipSilence,
-                                         @Nullable final String playbackQuality) {
-        return getPlayerIntent(context, targetClazz, playQueue, playbackQuality)
+                                         @Nullable final String playbackQuality,
+                                         final boolean resumePlayback) {
+        return getPlayerIntent(context, targetClazz, playQueue, playbackQuality, resumePlayback)
                 .putExtra(BasePlayer.REPEAT_MODE, repeatMode)
                 .putExtra(BasePlayer.PLAYBACK_SPEED, playbackSpeed)
                 .putExtra(BasePlayer.PLAYBACK_PITCH, playbackPitch)
                 .putExtra(BasePlayer.PLAYBACK_SKIP_SILENCE, playbackSkipSilence);
     }
 
-    public static void playOnMainPlayer(final Context context, final PlayQueue queue) {
-        final Intent playerIntent = getPlayerIntent(context, MainVideoPlayer.class, queue);
+    public static void playOnMainPlayer(final Context context, final PlayQueue queue, final boolean resumePlayback) {
+        final Intent playerIntent = getPlayerIntent(context, MainVideoPlayer.class, queue, resumePlayback);
         playerIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(playerIntent);
     }
 
-    public static void playOnPopupPlayer(final Context context, final PlayQueue queue) {
+    public static void playOnPopupPlayer(final Context context, final PlayQueue queue, final boolean resumePlayback) {
         if (!PermissionHelper.isPopupEnabled(context)) {
             PermissionHelper.showPopupEnablementToast(context);
             return;
         }
 
         Toast.makeText(context, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
-        startService(context, getPlayerIntent(context, PopupVideoPlayer.class, queue));
+        startService(context, getPlayerIntent(context, PopupVideoPlayer.class, queue, resumePlayback));
     }
 
-    public static void playOnBackgroundPlayer(final Context context, final PlayQueue queue) {
+    public static void playOnBackgroundPlayer(final Context context, final PlayQueue queue, final boolean resumePlayback) {
         Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT).show();
-        startService(context, getPlayerIntent(context, BackgroundPlayer.class, queue));
+        startService(context, getPlayerIntent(context, BackgroundPlayer.class, queue, resumePlayback));
     }
 
-    public static void enqueueOnPopupPlayer(final Context context, final PlayQueue queue) {
-        enqueueOnPopupPlayer(context, queue, false);
+    public static void enqueueOnPopupPlayer(final Context context, final PlayQueue queue, final boolean resumePlayback) {
+        enqueueOnPopupPlayer(context, queue, false, resumePlayback);
     }
 
-    public static void enqueueOnPopupPlayer(final Context context, final PlayQueue queue, boolean selectOnAppend) {
+    public static void enqueueOnPopupPlayer(final Context context, final PlayQueue queue, boolean selectOnAppend, final boolean resumePlayback) {
         if (!PermissionHelper.isPopupEnabled(context)) {
             PermissionHelper.showPopupEnablementToast(context);
             return;
@@ -145,17 +150,17 @@ public class NavigationHelper {
 
         Toast.makeText(context, R.string.popup_playing_append, Toast.LENGTH_SHORT).show();
         startService(context,
-                getPlayerEnqueueIntent(context, PopupVideoPlayer.class, queue, selectOnAppend));
+                getPlayerEnqueueIntent(context, PopupVideoPlayer.class, queue, selectOnAppend, resumePlayback));
     }
 
-    public static void enqueueOnBackgroundPlayer(final Context context, final PlayQueue queue) {
-        enqueueOnBackgroundPlayer(context, queue, false);
+    public static void enqueueOnBackgroundPlayer(final Context context, final PlayQueue queue, final boolean resumePlayback) {
+        enqueueOnBackgroundPlayer(context, queue, false, resumePlayback);
     }
 
-    public static void enqueueOnBackgroundPlayer(final Context context, final PlayQueue queue, boolean selectOnAppend) {
+    public static void enqueueOnBackgroundPlayer(final Context context, final PlayQueue queue, boolean selectOnAppend, final boolean resumePlayback) {
         Toast.makeText(context, R.string.background_player_append, Toast.LENGTH_SHORT).show();
         startService(context,
-                getPlayerEnqueueIntent(context, BackgroundPlayer.class, queue, selectOnAppend));
+                getPlayerEnqueueIntent(context, BackgroundPlayer.class, queue, selectOnAppend, resumePlayback));
     }
 
     public static void startService(@NonNull final Context context, @NonNull final Intent intent) {
diff --git a/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java b/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java
new file mode 100644
index 000000000..39c6e707e
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java
@@ -0,0 +1,69 @@
+package org.schabi.newpipe.views;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+import android.widget.ProgressBar;
+
+public final class AnimatedProgressBar extends ProgressBar {
+
+	@Nullable
+	private ProgressBarAnimation animation = null;
+
+	public AnimatedProgressBar(Context context) {
+		super(context);
+	}
+
+	public AnimatedProgressBar(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public AnimatedProgressBar(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+	}
+
+	@Override
+	public synchronized void setProgress(int progress) {
+		cancelAnimation();
+		animation = new ProgressBarAnimation(this, getProgress(), progress);
+		startAnimation(animation);
+	}
+
+	private void cancelAnimation() {
+		if (animation != null) {
+			animation.cancel();
+			animation = null;
+		}
+		clearAnimation();
+	}
+
+	private void setProgressInternal(int progress) {
+		super.setProgress(progress);
+	}
+
+	private static class ProgressBarAnimation extends Animation {
+
+		private final AnimatedProgressBar progressBar;
+		private final float from;
+		private final float to;
+
+		ProgressBarAnimation(AnimatedProgressBar progressBar, float from, float to) {
+			super();
+			this.progressBar = progressBar;
+			this.from = from;
+			this.to = to;
+			setDuration(500);
+			setInterpolator(new AccelerateDecelerateInterpolator());
+		}
+
+		@Override
+		protected void applyTransformation(float interpolatedTime, Transformation t) {
+			super.applyTransformation(interpolatedTime, t);
+			float value = from + (to - from) * interpolatedTime;
+			progressBar.setProgressInternal((int) value);
+		}
+	}
+}
diff --git a/app/src/main/res/drawable/progress_soundcloud_horizontal_dark.xml b/app/src/main/res/drawable/progress_soundcloud_horizontal_dark.xml
new file mode 100644
index 000000000..1ec9f67b6
--- /dev/null
+++ b/app/src/main/res/drawable/progress_soundcloud_horizontal_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@android:id/background">
+		<shape>
+			<solid android:color="@color/dark_ripple_color" />
+		</shape>
+	</item>
+	<item android:id="@android:id/progress">
+		<clip>
+			<shape>
+				<solid android:color="@color/dark_soundcloud_primary_color" />
+			</shape>
+		</clip>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_soundcloud_horizontal_light.xml b/app/src/main/res/drawable/progress_soundcloud_horizontal_light.xml
new file mode 100644
index 000000000..c326c5c04
--- /dev/null
+++ b/app/src/main/res/drawable/progress_soundcloud_horizontal_light.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@android:id/background">
+		<shape>
+			<solid android:color="@color/light_ripple_color" />
+		</shape>
+	</item>
+	<item android:id="@android:id/progress">
+		<clip>
+			<shape>
+				<solid android:color="@color/light_soundcloud_primary_color" />
+			</shape>
+		</clip>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_youtube_horizontal_dark.xml b/app/src/main/res/drawable/progress_youtube_horizontal_dark.xml
new file mode 100644
index 000000000..404410f98
--- /dev/null
+++ b/app/src/main/res/drawable/progress_youtube_horizontal_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@android:id/background">
+		<shape>
+			<solid android:color="@color/dark_ripple_color" />
+		</shape>
+	</item>
+	<item android:id="@android:id/progress">
+		<clip>
+			<shape>
+				<solid android:color="@color/dark_youtube_primary_color" />
+			</shape>
+		</clip>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_youtube_horizontal_light.xml b/app/src/main/res/drawable/progress_youtube_horizontal_light.xml
new file mode 100644
index 000000000..120a6e5fb
--- /dev/null
+++ b/app/src/main/res/drawable/progress_youtube_horizontal_light.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@android:id/background">
+		<shape>
+			<solid android:color="@color/light_ripple_color" />
+		</shape>
+	</item>
+	<item android:id="@android:id/progress">
+		<clip>
+			<shape>
+				<solid android:color="@color/light_youtube_primary_color" />
+			</shape>
+		</clip>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index 8cdc2f307..a8fbcca89 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/video_item_detail"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -19,6 +19,7 @@
 			android:id="@+id/appbarlayout"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:background="@android:color/transparent"
 			android:fitsSystemWindows="true"
 			app:elevation="0dp"
 			app:layout_behavior="android.support.design.widget.FlingBehavior">
@@ -67,10 +68,10 @@
 						android:layout_height="wrap_content"
 						android:layout_gravity="center"
 						android:background="#64000000"
-						android:paddingBottom="10dp"
 						android:paddingLeft="30dp"
-						android:paddingRight="30dp"
 						android:paddingTop="10dp"
+						android:paddingRight="30dp"
+						android:paddingBottom="10dp"
 						android:text="@string/hold_to_append"
 						android:textColor="@android:color/white"
 						android:textSize="20sp"
@@ -84,17 +85,42 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_gravity="bottom|right"
-						android:layout_marginBottom="8dp"
 						android:layout_marginLeft="12dp"
-						android:layout_marginRight="12dp"
 						android:layout_marginTop="8dp"
+						android:layout_marginRight="12dp"
+						android:layout_marginBottom="8dp"
 						android:alpha=".6"
 						android:background="#23000000"
 						android:gravity="center"
-						android:paddingBottom="2dp"
 						android:paddingLeft="6dp"
-						android:paddingRight="6dp"
 						android:paddingTop="2dp"
+						android:paddingRight="6dp"
+						android:paddingBottom="2dp"
+						android:textAllCaps="true"
+						android:textColor="@android:color/white"
+						android:textSize="12sp"
+						android:textStyle="bold"
+						android:visibility="gone"
+						tools:ignore="RtlHardcoded"
+						tools:text="12:38"
+						tools:visibility="visible" />
+
+					<TextView
+						android:id="@+id/detail_position_view"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="bottom|left"
+						android:layout_marginLeft="12dp"
+						android:layout_marginTop="8dp"
+						android:layout_marginRight="12dp"
+						android:layout_marginBottom="8dp"
+						android:alpha=".6"
+						android:background="?colorPrimary"
+						android:gravity="center"
+						android:paddingLeft="6dp"
+						android:paddingTop="2dp"
+						android:paddingRight="6dp"
+						android:paddingBottom="2dp"
 						android:textAllCaps="true"
 						android:textColor="@android:color/white"
 						android:textSize="12sp"
@@ -107,6 +133,19 @@
 
 			</android.support.design.widget.CollapsingToolbarLayout>
 
+			<org.schabi.newpipe.views.AnimatedProgressBar
+				android:id="@+id/position_view"
+				style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="4dp"
+				android:layout_marginTop="-2dp"
+				android:background="@android:color/transparent"
+				android:progressDrawable="?attr/progress_horizontal_drawable"
+				android:visibility="invisible"
+				tools:max="100"
+				tools:progress="40"
+				tools:visibility="visible" />
+
 			<!-- CONTENT -->
 			<RelativeLayout
 				android:id="@+id/detail_content_root_layout"
@@ -133,8 +172,8 @@
 						android:layout_marginRight="20dp"
 						android:ellipsize="end"
 						android:maxLines="1"
-						android:paddingBottom="8dp"
 						android:paddingTop="12dp"
+						android:paddingBottom="8dp"
 						android:textAppearance="?android:attr/textAppearanceLarge"
 						android:textSize="@dimen/video_item_detail_title_text_size"
 						tools:ignore="RtlHardcoded"
@@ -179,9 +218,9 @@
 					android:id="@+id/detail_content_root_hiding"
 					android:layout_width="match_parent"
 					android:layout_height="match_parent"
-					android:paddingBottom="10dp"
 					android:layout_below="@+id/detail_title_root_layout"
 					android:orientation="vertical"
+					android:paddingBottom="10dp"
 					android:visibility="gone"
 					tools:visibility="visible">
 
@@ -191,8 +230,8 @@
 						android:layout_width="match_parent"
 						android:layout_height="55dp"
 						android:layout_marginLeft="12dp"
-						android:layout_marginRight="12dp"
 						android:layout_marginTop="6dp"
+						android:layout_marginRight="12dp"
 						android:baselineAligned="false"
 						android:orientation="horizontal">
 
@@ -201,8 +240,8 @@
 							android:id="@+id/detail_uploader_root_layout"
 							android:layout_width="match_parent"
 							android:layout_height="match_parent"
-							android:layout_toLeftOf="@id/details_panel"
 							android:layout_toStartOf="@id/details_panel"
+							android:layout_toLeftOf="@id/details_panel"
 							android:background="?attr/selectableItemBackground"
 							android:gravity="center_vertical"
 							android:orientation="horizontal"
@@ -261,8 +300,8 @@
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
 								android:layout_centerHorizontal="true"
-								android:layout_marginBottom="6dp"
 								android:layout_marginTop="6dp"
+								android:layout_marginBottom="6dp"
 								android:lines="1"
 								android:textAppearance="?android:attr/textAppearanceLarge"
 								android:textSize="@dimen/video_item_detail_views_text_size"
@@ -354,8 +393,8 @@
 							android:drawableTop="?attr/ic_playlist_add"
 							android:focusable="true"
 							android:gravity="center"
-							android:paddingBottom="6dp"
 							android:paddingTop="6dp"
+							android:paddingBottom="6dp"
 							android:text="@string/controls_add_to_playlist_title"
 							android:textSize="12sp" />
 
@@ -371,8 +410,8 @@
 							android:drawableTop="?attr/audio"
 							android:focusable="true"
 							android:gravity="center"
-							android:paddingBottom="6dp"
 							android:paddingTop="6dp"
+							android:paddingBottom="6dp"
 							android:text="@string/controls_background_title"
 							android:textSize="12sp" />
 
@@ -388,8 +427,8 @@
 							android:drawableTop="?attr/popup"
 							android:focusable="true"
 							android:gravity="center"
-							android:paddingBottom="6dp"
 							android:paddingTop="6dp"
+							android:paddingBottom="6dp"
 							android:text="@string/controls_popup_title"
 							android:textSize="12sp" />
 
@@ -405,8 +444,8 @@
 							android:drawableTop="?attr/download"
 							android:focusable="true"
 							android:gravity="center"
-							android:paddingBottom="6dp"
 							android:paddingTop="6dp"
+							android:paddingBottom="6dp"
 							android:text="@string/download"
 							android:textSize="12sp" />
 
@@ -444,10 +483,10 @@
 							android:id="@+id/detail_description_view"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:layout_marginBottom="8dp"
 							android:layout_marginLeft="12dp"
-							android:layout_marginRight="12dp"
 							android:layout_marginTop="3dp"
+							android:layout_marginRight="12dp"
+							android:layout_marginBottom="8dp"
 							android:textAppearance="?android:attr/textAppearanceMedium"
 							android:textIsSelectable="true"
 							android:textSize="@dimen/video_item_detail_description_text_size"
@@ -490,7 +529,7 @@
 	</android.support.design.widget.CoordinatorLayout>
 
 	<FrameLayout
-        android:id="@+id/relatedStreamsLayout"
+		android:id="@+id/relatedStreamsLayout"
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
 		android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index b0ee65dde..1dfc61cf7 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -1,489 +1,528 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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/video_item_detail"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusableInTouchMode="true">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/video_item_detail"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:focusableInTouchMode="true">
 
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/detail_main_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+	<android.support.design.widget.CoordinatorLayout
+		android:id="@+id/detail_main_content"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:fitsSystemWindows="true">
 
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbarlayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fitsSystemWindows="true"
-            app:elevation="0dp"
-            app:layout_behavior="android.support.design.widget.FlingBehavior">
+		<android.support.design.widget.AppBarLayout
+			android:id="@+id/appbarlayout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="@android:color/transparent"
+			android:fitsSystemWindows="true"
+			app:elevation="0dp"
+			app:layout_behavior="android.support.design.widget.FlingBehavior">
 
-            <android.support.design.widget.CollapsingToolbarLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll">
+			<android.support.design.widget.CollapsingToolbarLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				app:layout_scrollFlags="scroll">
 
-                <!-- THUMBNAIL -->
-                <FrameLayout
-                    android:id="@+id/detail_thumbnail_root_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/black"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:foreground="?attr/selectableItemBackground"
-                    app:layout_collapseMode="parallax">
+				<!-- THUMBNAIL -->
+				<FrameLayout
+					android:id="@+id/detail_thumbnail_root_layout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@android:color/black"
+					android:clickable="true"
+					android:focusable="true"
+					android:foreground="?attr/selectableItemBackground"
+					app:layout_collapseMode="parallax">
 
-                    <ImageView
-                        android:id="@+id/detail_thumbnail_image_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@android:color/transparent"
-                        android:contentDescription="@string/detail_thumbnail_view_description"
-                        android:scaleType="fitCenter"
-                        tools:ignore="RtlHardcoded"
-                        tools:layout_height="200dp"
-                        tools:src="@drawable/dummy_thumbnail" />
+					<ImageView
+						android:id="@+id/detail_thumbnail_image_view"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:background="@android:color/transparent"
+						android:contentDescription="@string/detail_thumbnail_view_description"
+						android:scaleType="fitCenter"
+						tools:ignore="RtlHardcoded"
+						tools:layout_height="200dp"
+						tools:src="@drawable/dummy_thumbnail" />
 
-                    <ImageView
-                        android:id="@+id/detail_thumbnail_play_button"
-                        android:layout_width="64dp"
-                        android:layout_height="64dp"
-                        android:layout_gravity="center"
-                        android:background="@android:color/transparent"
-                        android:src="@drawable/new_play_arrow"
-                        android:visibility="invisible"
-                        tools:ignore="ContentDescription"
-                        tools:visibility="visible" />
+					<ImageView
+						android:id="@+id/detail_thumbnail_play_button"
+						android:layout_width="64dp"
+						android:layout_height="64dp"
+						android:layout_gravity="center"
+						android:background="@android:color/transparent"
+						android:src="@drawable/new_play_arrow"
+						android:visibility="invisible"
+						tools:ignore="ContentDescription"
+						tools:visibility="visible" />
 
-                    <TextView
-                        android:id="@+id/touch_append_detail"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:background="#64000000"
-                        android:paddingBottom="10dp"
-                        android:paddingLeft="30dp"
-                        android:paddingRight="30dp"
-                        android:paddingTop="10dp"
-                        android:text="@string/hold_to_append"
-                        android:textColor="@android:color/white"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        android:visibility="gone"
-                        tools:ignore="RtlHardcoded"
-                        tools:visibility="visible" />
+					<TextView
+						android:id="@+id/touch_append_detail"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:background="#64000000"
+						android:paddingLeft="30dp"
+						android:paddingTop="10dp"
+						android:paddingRight="30dp"
+						android:paddingBottom="10dp"
+						android:text="@string/hold_to_append"
+						android:textColor="@android:color/white"
+						android:textSize="20sp"
+						android:textStyle="bold"
+						android:visibility="gone"
+						tools:ignore="RtlHardcoded"
+						tools:visibility="visible" />
 
-                    <TextView
-                        android:id="@+id/detail_duration_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom|right"
-                        android:layout_marginBottom="8dp"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginRight="12dp"
-                        android:layout_marginTop="8dp"
-                        android:alpha=".6"
-                        android:background="#23000000"
-                        android:gravity="center"
-                        android:paddingBottom="2dp"
-                        android:paddingLeft="6dp"
-                        android:paddingRight="6dp"
-                        android:paddingTop="2dp"
-                        android:textAllCaps="true"
-                        android:textColor="@android:color/white"
-                        android:textSize="12sp"
-                        android:textStyle="bold"
-                        android:visibility="gone"
-                        tools:ignore="RtlHardcoded"
-                        tools:text="12:38"
-                        tools:visibility="visible" />
-                </FrameLayout>
+					<TextView
+						android:id="@+id/detail_duration_view"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="bottom|right"
+						android:layout_marginLeft="12dp"
+						android:layout_marginTop="8dp"
+						android:layout_marginRight="12dp"
+						android:layout_marginBottom="8dp"
+						android:alpha=".6"
+						android:background="#23000000"
+						android:gravity="center"
+						android:paddingLeft="6dp"
+						android:paddingTop="2dp"
+						android:paddingRight="6dp"
+						android:paddingBottom="2dp"
+						android:textAllCaps="true"
+						android:textColor="@android:color/white"
+						android:textSize="12sp"
+						android:textStyle="bold"
+						android:visibility="gone"
+						tools:ignore="RtlHardcoded"
+						tools:text="12:38"
+						tools:visibility="visible" />
 
-            </android.support.design.widget.CollapsingToolbarLayout>
+					<TextView
+						android:id="@+id/detail_position_view"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="bottom|left"
+						android:layout_marginLeft="12dp"
+						android:layout_marginTop="8dp"
+						android:layout_marginRight="12dp"
+						android:layout_marginBottom="8dp"
+						android:alpha=".6"
+						android:background="?colorPrimary"
+						android:gravity="center"
+						android:paddingLeft="6dp"
+						android:paddingTop="2dp"
+						android:paddingRight="6dp"
+						android:paddingBottom="2dp"
+						android:textAllCaps="true"
+						android:textColor="@android:color/white"
+						android:textSize="12sp"
+						android:textStyle="bold"
+						android:visibility="gone"
+						tools:ignore="RtlHardcoded"
+						tools:text="12:38"
+						tools:visibility="visible" />
 
-            <!-- CONTENT -->
-            <RelativeLayout
-                android:id="@+id/detail_content_root_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?android:windowBackground"
-                app:layout_scrollFlags="scroll">
+				</FrameLayout>
 
-                <!-- TITLE -->
-                <FrameLayout
-                    android:id="@+id/detail_title_root_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:paddingLeft="12dp"
-                    android:paddingRight="12dp">
+			</android.support.design.widget.CollapsingToolbarLayout>
 
-                    <TextView
-                        android:id="@+id/detail_video_title_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginRight="20dp"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:paddingBottom="8dp"
-                        android:paddingTop="12dp"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textSize="@dimen/video_item_detail_title_text_size"
-                        tools:ignore="RtlHardcoded"
-                        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
+			<org.schabi.newpipe.views.AnimatedProgressBar
+				android:id="@+id/position_view"
+				style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="4dp"
+				android:layout_marginTop="-2dp"
+				android:progressDrawable="?attr/progress_horizontal_drawable"
+				android:visibility="invisible"
+				tools:max="100"
+				tools:progress="40"
+				tools:visibility="visible" />
 
-                    <ImageView
-                        android:id="@+id/detail_toggle_description_view"
-                        android:layout_width="15dp"
-                        android:layout_height="15dp"
-                        android:layout_gravity="center_vertical|right"
-                        android:layout_marginLeft="5dp"
-                        android:src="@drawable/arrow_down"
-                        tools:ignore="ContentDescription,RtlHardcoded" />
+			<!-- CONTENT -->
+			<RelativeLayout
+				android:id="@+id/detail_content_root_layout"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="?android:windowBackground"
+				app:layout_scrollFlags="scroll">
 
-                </FrameLayout>
+				<!-- TITLE -->
+				<FrameLayout
+					android:id="@+id/detail_title_root_layout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="?attr/selectableItemBackground"
+					android:clickable="true"
+					android:focusable="true"
+					android:paddingLeft="12dp"
+					android:paddingRight="12dp">
 
-                <!-- 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_below="@id/detail_title_root_layout"
-                    android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
-                    android:indeterminate="true"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
+					<TextView
+						android:id="@+id/detail_video_title_view"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_marginRight="20dp"
+						android:ellipsize="end"
+						android:maxLines="1"
+						android:paddingTop="12dp"
+						android:paddingBottom="8dp"
+						android:textAppearance="?android:attr/textAppearanceLarge"
+						android:textSize="@dimen/video_item_detail_title_text_size"
+						tools:ignore="RtlHardcoded"
+						tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
 
-                <!--ERROR PANEL-->
-                <include
-                    android:id="@+id/error_panel"
-                    layout="@layout/error_retry"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detail_title_root_layout"
-                    android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
+					<ImageView
+						android:id="@+id/detail_toggle_description_view"
+						android:layout_width="15dp"
+						android:layout_height="15dp"
+						android:layout_gravity="center_vertical|right"
+						android:layout_marginLeft="5dp"
+						android:src="@drawable/arrow_down"
+						tools:ignore="ContentDescription,RtlHardcoded" />
 
-                <!--HIDING ROOT-->
-                <LinearLayout
-                    android:id="@+id/detail_content_root_hiding"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:paddingBottom="10dp"
-                    android:layout_below="@+id/detail_title_root_layout"
-                    android:orientation="vertical"
-                    android:visibility="gone"
-                    tools:visibility="visible">
+				</FrameLayout>
 
-                    <!--DETAIL-->
-                    <RelativeLayout
-                        android:id="@+id/detail_root"
-                        android:layout_width="match_parent"
-                        android:layout_height="55dp"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginRight="12dp"
-                        android:layout_marginTop="6dp"
-                        android:baselineAligned="false"
-                        android:orientation="horizontal">
+				<!-- 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_below="@id/detail_title_root_layout"
+					android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+					android:indeterminate="true"
+					android:visibility="gone"
+					tools:visibility="visible" />
 
-                        <!--UPLOADER-->
-                        <LinearLayout
-                            android:id="@+id/detail_uploader_root_layout"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_toLeftOf="@id/details_panel"
-                            android:layout_toStartOf="@id/details_panel"
-                            android:background="?attr/selectableItemBackground"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:padding="6dp">
+				<!--ERROR PANEL-->
+				<include
+					android:id="@+id/error_panel"
+					layout="@layout/error_retry"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/detail_title_root_layout"
+					android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+					android:visibility="gone"
+					tools:visibility="visible" />
 
-                            <de.hdodenhof.circleimageview.CircleImageView
-                                android:id="@+id/detail_uploader_thumbnail_view"
-                                android:layout_width="@dimen/video_item_detail_uploader_image_size"
-                                android:layout_height="@dimen/video_item_detail_uploader_image_size"
-                                android:contentDescription="@string/detail_uploader_thumbnail_view_description"
-                                android:src="@drawable/buddy"
-                                tools:ignore="RtlHardcoded" />
+				<!--HIDING ROOT-->
+				<LinearLayout
+					android:id="@+id/detail_content_root_hiding"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_below="@+id/detail_title_root_layout"
+					android:orientation="vertical"
+					android:paddingBottom="10dp"
+					android:visibility="gone"
+					tools:visibility="visible">
 
-                            <TextView
-                                android:id="@+id/detail_uploader_text_view"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="15dp"
-                                android:ellipsize="marquee"
-                                android:fadingEdge="horizontal"
-                                android:marqueeRepeatLimit="marquee_forever"
-                                android:scrollHorizontally="true"
-                                android:singleLine="true"
-                                android:textAppearance="?android:attr/textAppearanceLarge"
-                                android:textSize="@dimen/video_item_detail_uploader_text_size"
-                                android:textStyle="bold"
-                                tools:ignore="RtlHardcoded"
-                                tools:text="Uploader" />
+					<!--DETAIL-->
+					<RelativeLayout
+						android:id="@+id/detail_root"
+						android:layout_width="match_parent"
+						android:layout_height="55dp"
+						android:layout_marginLeft="12dp"
+						android:layout_marginTop="6dp"
+						android:layout_marginRight="12dp"
+						android:baselineAligned="false"
+						android:orientation="horizontal">
 
-                            <!--<Button
-                                android:id="@+id/detail_uploader_subscribe"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical|right"
-                                android:layout_marginRight="12dp"
-                                android:text="@string/rss_button_title"
-                                android:textSize="12sp"
-                                android:theme="@style/RedButton"
-                                android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
-                                tools:ignore="RtlHardcoded"
-                                android:visibility="gone"/>-->
-                        </LinearLayout>
+						<!--UPLOADER-->
+						<LinearLayout
+							android:id="@+id/detail_uploader_root_layout"
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"
+							android:layout_toStartOf="@id/details_panel"
+							android:layout_toLeftOf="@id/details_panel"
+							android:background="?attr/selectableItemBackground"
+							android:gravity="center_vertical"
+							android:orientation="horizontal"
+							android:padding="6dp">
 
-                        <!-- VIEW & THUMBS -->
-                        <RelativeLayout
-                            android:id="@+id/details_panel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_alignParentEnd="true"
-                            android:layout_alignParentRight="true"
-                            android:paddingLeft="6dp"
-                            android:paddingRight="6dp">
+							<de.hdodenhof.circleimageview.CircleImageView
+								android:id="@+id/detail_uploader_thumbnail_view"
+								android:layout_width="@dimen/video_item_detail_uploader_image_size"
+								android:layout_height="@dimen/video_item_detail_uploader_image_size"
+								android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+								android:src="@drawable/buddy"
+								tools:ignore="RtlHardcoded" />
 
-                            <TextView
-                                android:id="@+id/detail_view_count_view"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:layout_marginBottom="6dp"
-                                android:layout_marginTop="6dp"
-                                android:lines="1"
-                                android:textAppearance="?android:attr/textAppearanceLarge"
-                                android:textSize="@dimen/video_item_detail_views_text_size"
-                                tools:ignore="RtlHardcoded"
-                                tools:text="2,816,821,505 views" />
+							<TextView
+								android:id="@+id/detail_uploader_text_view"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginLeft="15dp"
+								android:ellipsize="marquee"
+								android:fadingEdge="horizontal"
+								android:marqueeRepeatLimit="marquee_forever"
+								android:scrollHorizontally="true"
+								android:singleLine="true"
+								android:textAppearance="?android:attr/textAppearanceLarge"
+								android:textSize="@dimen/video_item_detail_uploader_text_size"
+								android:textStyle="bold"
+								tools:ignore="RtlHardcoded"
+								tools:text="Uploader" />
 
-                            <ImageView
-                                android:id="@+id/detail_thumbs_up_img_view"
-                                android:layout_width="@dimen/video_item_detail_like_image_width"
-                                android:layout_height="@dimen/video_item_detail_like_image_height"
-                                android:layout_below="@id/detail_view_count_view"
-                                android:contentDescription="@string/detail_likes_img_view_description"
-                                android:src="?attr/thumbs_up" />
+							<!--<Button
+								android:id="@+id/detail_uploader_subscribe"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_gravity="center_vertical|right"
+								android:layout_marginRight="12dp"
+								android:text="@string/rss_button_title"
+								android:textSize="12sp"
+								android:theme="@style/RedButton"
+								android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
+								tools:ignore="RtlHardcoded"
+								android:visibility="gone"/>-->
+						</LinearLayout>
 
-                            <TextView
-                                android:id="@+id/detail_thumbs_up_count_view"
-                                android:layout_width="wrap_content"
-                                android:layout_height="@dimen/video_item_detail_like_image_height"
-                                android:layout_below="@id/detail_view_count_view"
-                                android:layout_marginLeft="@dimen/video_item_detail_like_margin"
-                                android:layout_toRightOf="@id/detail_thumbs_up_img_view"
-                                android:gravity="center_vertical"
-                                android:lines="1"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textSize="@dimen/video_item_detail_likes_text_size"
-                                tools:ignore="RtlHardcoded"
-                                tools:text="12M" />
+						<!-- VIEW & THUMBS -->
+						<RelativeLayout
+							android:id="@+id/details_panel"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:layout_alignParentEnd="true"
+							android:layout_alignParentRight="true"
+							android:paddingLeft="6dp"
+							android:paddingRight="6dp">
 
-                            <ImageView
-                                android:id="@+id/detail_thumbs_down_img_view"
-                                android:layout_width="@dimen/video_item_detail_like_image_width"
-                                android:layout_height="@dimen/video_item_detail_like_image_height"
-                                android:layout_below="@id/detail_view_count_view"
-                                android:layout_marginLeft="12dp"
-                                android:layout_toRightOf="@id/detail_thumbs_up_count_view"
-                                android:contentDescription="@string/detail_dislikes_img_view_description"
-                                android:src="?attr/thumbs_down"
-                                tools:ignore="RtlHardcoded" />
+							<TextView
+								android:id="@+id/detail_view_count_view"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_centerHorizontal="true"
+								android:layout_marginTop="6dp"
+								android:layout_marginBottom="6dp"
+								android:lines="1"
+								android:textAppearance="?android:attr/textAppearanceLarge"
+								android:textSize="@dimen/video_item_detail_views_text_size"
+								tools:ignore="RtlHardcoded"
+								tools:text="2,816,821,505 views" />
 
-                            <TextView
-                                android:id="@+id/detail_thumbs_down_count_view"
-                                android:layout_width="wrap_content"
-                                android:layout_height="@dimen/video_item_detail_like_image_height"
-                                android:layout_below="@id/detail_view_count_view"
-                                android:layout_marginLeft="@dimen/video_item_detail_like_margin"
-                                android:layout_toRightOf="@id/detail_thumbs_down_img_view"
-                                android:gravity="center_vertical"
-                                android:lines="1"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textSize="@dimen/video_item_detail_likes_text_size"
-                                tools:ignore="RtlHardcoded"
-                                tools:text="10K" />
+							<ImageView
+								android:id="@+id/detail_thumbs_up_img_view"
+								android:layout_width="@dimen/video_item_detail_like_image_width"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:contentDescription="@string/detail_likes_img_view_description"
+								android:src="?attr/thumbs_up" />
 
-                            <TextView
-                                android:id="@+id/detail_thumbs_disabled_view"
-                                android:layout_width="wrap_content"
-                                android:layout_height="@dimen/video_item_detail_like_image_height"
-                                android:layout_below="@id/detail_view_count_view"
-                                android:layout_marginLeft="12dp"
-                                android:layout_toRightOf="@id/detail_thumbs_down_img_view"
-                                android:gravity="center_vertical"
-                                android:text="@string/disabled"
-                                android:textAppearance="?android:attr/textAppearanceLarge"
-                                android:textSize="@dimen/video_item_detail_likes_text_size"
-                                android:textStyle="bold"
-                                android:visibility="gone"
-                                tools:ignore="RtlHardcoded"
-                                tools:visibility="visible" />
-                        </RelativeLayout>
-                    </RelativeLayout>
+							<TextView
+								android:id="@+id/detail_thumbs_up_count_view"
+								android:layout_width="wrap_content"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+								android:layout_toRightOf="@id/detail_thumbs_up_img_view"
+								android:gravity="center_vertical"
+								android:lines="1"
+								android:textAppearance="?android:attr/textAppearanceMedium"
+								android:textSize="@dimen/video_item_detail_likes_text_size"
+								tools:ignore="RtlHardcoded"
+								tools:text="12M" />
 
-                    <LinearLayout
-                        android:id="@+id/detail_control_panel"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:padding="6dp">
+							<ImageView
+								android:id="@+id/detail_thumbs_down_img_view"
+								android:layout_width="@dimen/video_item_detail_like_image_width"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="12dp"
+								android:layout_toRightOf="@id/detail_thumbs_up_count_view"
+								android:contentDescription="@string/detail_dislikes_img_view_description"
+								android:src="?attr/thumbs_down"
+								tools:ignore="RtlHardcoded" />
 
-                        <!-- CONTROLS -->
-                        <TextView
-                            android:id="@+id/detail_controls_playlist_append"
-                            android:layout_width="80dp"
-                            android:layout_height="55dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_weight="1"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:clickable="true"
-                            android:contentDescription="@string/append_playlist"
-                            android:drawableTop="?attr/ic_playlist_add"
-                            android:focusable="true"
-                            android:gravity="center"
-                            android:paddingBottom="6dp"
-                            android:paddingTop="6dp"
-                            android:text="@string/controls_add_to_playlist_title"
-                            android:textSize="12sp" />
+							<TextView
+								android:id="@+id/detail_thumbs_down_count_view"
+								android:layout_width="wrap_content"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+								android:layout_toRightOf="@id/detail_thumbs_down_img_view"
+								android:gravity="center_vertical"
+								android:lines="1"
+								android:textAppearance="?android:attr/textAppearanceMedium"
+								android:textSize="@dimen/video_item_detail_likes_text_size"
+								tools:ignore="RtlHardcoded"
+								tools:text="10K" />
 
-                        <TextView
-                            android:id="@+id/detail_controls_background"
-                            android:layout_width="80dp"
-                            android:layout_height="55dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_weight="1"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:clickable="true"
-                            android:contentDescription="@string/play_audio"
-                            android:drawableTop="?attr/audio"
-                            android:focusable="true"
-                            android:gravity="center"
-                            android:paddingBottom="6dp"
-                            android:paddingTop="6dp"
-                            android:text="@string/controls_background_title"
-                            android:textSize="12sp" />
+							<TextView
+								android:id="@+id/detail_thumbs_disabled_view"
+								android:layout_width="wrap_content"
+								android:layout_height="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="12dp"
+								android:layout_toRightOf="@id/detail_thumbs_down_img_view"
+								android:gravity="center_vertical"
+								android:text="@string/disabled"
+								android:textAppearance="?android:attr/textAppearanceLarge"
+								android:textSize="@dimen/video_item_detail_likes_text_size"
+								android:textStyle="bold"
+								android:visibility="gone"
+								tools:ignore="RtlHardcoded"
+								tools:visibility="visible" />
+						</RelativeLayout>
+					</RelativeLayout>
 
-                        <TextView
-                            android:id="@+id/detail_controls_popup"
-                            android:layout_width="80dp"
-                            android:layout_height="55dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_weight="1"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:clickable="true"
-                            android:contentDescription="@string/open_in_popup_mode"
-                            android:drawableTop="?attr/popup"
-                            android:focusable="true"
-                            android:gravity="center"
-                            android:paddingBottom="6dp"
-                            android:paddingTop="6dp"
-                            android:text="@string/controls_popup_title"
-                            android:textSize="12sp" />
+					<LinearLayout
+						android:id="@+id/detail_control_panel"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:orientation="horizontal"
+						android:padding="6dp">
 
-                        <TextView
-                            android:id="@+id/detail_controls_download"
-                            android:layout_width="80dp"
-                            android:layout_height="55dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_weight="1"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:clickable="true"
-                            android:contentDescription="@string/controls_download_desc"
-                            android:drawableTop="?attr/download"
-                            android:focusable="true"
-                            android:gravity="center"
-                            android:paddingBottom="6dp"
-                            android:paddingTop="6dp"
-                            android:text="@string/download"
-                            android:textSize="12sp" />
+						<!-- CONTROLS -->
+						<TextView
+							android:id="@+id/detail_controls_playlist_append"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/append_playlist"
+							android:drawableTop="?attr/ic_playlist_add"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingTop="6dp"
+							android:paddingBottom="6dp"
+							android:text="@string/controls_add_to_playlist_title"
+							android:textSize="12sp" />
 
-                    </LinearLayout>
+						<TextView
+							android:id="@+id/detail_controls_background"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/play_audio"
+							android:drawableTop="?attr/audio"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingTop="6dp"
+							android:paddingBottom="6dp"
+							android:text="@string/controls_background_title"
+							android:textSize="12sp" />
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1px"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:background="?attr/separator_color" />
+						<TextView
+							android:id="@+id/detail_controls_popup"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/open_in_popup_mode"
+							android:drawableTop="?attr/popup"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingTop="6dp"
+							android:paddingBottom="6dp"
+							android:text="@string/controls_popup_title"
+							android:textSize="12sp" />
 
-                    <!--DESCRIPTIONS-->
-                    <LinearLayout
-                        android:id="@+id/detail_description_root_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
-                        android:orientation="vertical"
-                        android:visibility="gone"
-                        tools:visibility="visible">
+						<TextView
+							android:id="@+id/detail_controls_download"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/controls_download_desc"
+							android:drawableTop="?attr/download"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingTop="6dp"
+							android:paddingBottom="6dp"
+							android:text="@string/download"
+							android:textSize="12sp" />
 
-                        <TextView
-                            android:id="@+id/detail_upload_date_view"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="12dp"
-                            android:layout_marginRight="12dp"
-                            android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                            android:textStyle="bold"
-                            tools:text="Published on Oct 2, 2009" />
+					</LinearLayout>
 
-                        <TextView
-                            android:id="@+id/detail_description_view"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:layout_marginLeft="12dp"
-                            android:layout_marginRight="12dp"
-                            android:layout_marginTop="3dp"
-                            android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:textIsSelectable="true"
-                            android:textSize="@dimen/video_item_detail_description_text_size"
-                            tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
+					<View
+						android:layout_width="match_parent"
+						android:layout_height="1px"
+						android:layout_marginLeft="8dp"
+						android:layout_marginRight="8dp"
+						android:background="?attr/separator_color" />
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginRight="8dp"
-                            android:background="?attr/separator_color" />
+					<!--DESCRIPTIONS-->
+					<LinearLayout
+						android:id="@+id/detail_description_root_layout"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="5dp"
+						android:orientation="vertical"
+						android:visibility="gone"
+						tools:visibility="visible">
 
-                    </LinearLayout>
+						<TextView
+							android:id="@+id/detail_upload_date_view"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginLeft="12dp"
+							android:layout_marginRight="12dp"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textSize="@dimen/video_item_detail_upload_date_text_size"
+							android:textStyle="bold"
+							tools:text="Published on Oct 2, 2009" />
 
-                </LinearLayout>
-            </RelativeLayout>
+						<TextView
+							android:id="@+id/detail_description_view"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginLeft="12dp"
+							android:layout_marginTop="3dp"
+							android:layout_marginRight="12dp"
+							android:layout_marginBottom="8dp"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textIsSelectable="true"
+							android:textSize="@dimen/video_item_detail_description_text_size"
+							tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
 
-        </android.support.design.widget.AppBarLayout>
+						<View
+							android:layout_width="match_parent"
+							android:layout_height="1px"
+							android:layout_marginLeft="8dp"
+							android:layout_marginRight="8dp"
+							android:background="?attr/separator_color" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+			</RelativeLayout>
+
+		</android.support.design.widget.AppBarLayout>
 
 
-        <android.support.v4.view.ViewPager
-            android:id="@+id/viewpager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+		<android.support.v4.view.ViewPager
+			android:id="@+id/viewpager"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 
-        <android.support.design.widget.TabLayout
-            android:id="@+id/tablayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center"
-            android:background="@color/transparent_background_color"
-            app:tabBackground="@drawable/tab_selector"
-            app:tabGravity="center"
-            app:tabIndicatorHeight="0dp">
+		<android.support.design.widget.TabLayout
+			android:id="@+id/tablayout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="bottom|center"
+			android:background="@color/transparent_background_color"
+			app:tabBackground="@drawable/tab_selector"
+			app:tabGravity="center"
+			app:tabIndicatorHeight="0dp">
 
-        </android.support.design.widget.TabLayout>
+		</android.support.design.widget.TabLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+	</android.support.design.widget.CoordinatorLayout>
 </FrameLayout>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 32d57db8b..759c24460 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -167,7 +167,10 @@
     <string name="fragment_whats_new">Что нового</string>
     <string name="enable_search_history_title">История поиска</string>
     <string name="enable_search_history_summary">Хранить запросы поиска локально</string>
-    <string name="enable_watch_history_title">История и кэш</string>
+    <string name="enable_watch_history_title">История просмотров</string>
+    <string name="enable_playback_resume_title">Продолжать воспроизведение</string>
+    <string name="enable_playback_resume_summary">Восстанавливать с последней позиции</string>
+    <string name="settings_category_clear_data_title">Очистить данные</string>
     <string name="enable_watch_history_summary">Запоминать воспроизведённые потоки</string>
     <string name="resume_on_audio_focus_gain_title">Возобновить при фокусе</string>
     <string name="resume_on_audio_focus_gain_summary">Возобновлять воспроизведение после перерывов (например, телефонных звонков)</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index eaca5719a..41e6f22ba 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -153,7 +153,10 @@
     <string name="show_search_suggestions_summary">Показувати пропозиції під час пошуку</string>
     <string name="enable_search_history_title">Історія пошуків</string>
     <string name="enable_search_history_summary">Зберігати пошукові запити локально</string>
-    <string name="enable_watch_history_title">Історія та кеш</string>
+    <string name="enable_watch_history_title">Історія переглядiв</string>
+    <string name="enable_playback_resume_title">Продовживати перегляд</string>
+    <string name="enable_playback_resume_summary">Відновлювати останню позицію</string>
+    <string name="settings_category_clear_data_title">Очистити дані</string>
     <string name="enable_watch_history_summary">Вести облік перегляду відеозаписів</string>
     <string name="resume_on_audio_focus_gain_title">Відновити відтворення</string>
     <string name="resume_on_audio_focus_gain_summary">Продовжувати відтворення опісля переривання (наприклад телефонного дзвінка)</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 865b68c24..bdf42c4ed 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -43,6 +43,7 @@
     <attr name="ic_delete" format="reference"/>
     <attr name="ic_settings_update" format="reference"/>
 
+    <attr name="progress_horizontal_drawable" format="reference"/>
     <!-- Can't refer to colors directly in drawable's xml-->
     <attr name="toolbar_shadow_drawable" format="reference"/>
     <attr name="selector_drawable" format="reference"/>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 3861f53d5..b70305d56 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -150,6 +150,7 @@
     <string name="enable_search_history_key" translatable="false">enable_search_history</string>
     <string name="enable_watch_history_key" translatable="false">enable_watch_history</string>
     <string name="main_page_content_key" translatable="false">main_page_content</string>
+    <string name="enable_playback_resume_key" translatable="false">enable_playback_resume</string>
 
     <string name="import_data">import_data</string>
     <string name="export_data">export_data</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 98a32d9e6..a84d7db36 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -95,7 +95,10 @@
     <string name="show_search_suggestions_summary">Show suggestions when searching</string>
     <string name="enable_search_history_title">Search history</string>
     <string name="enable_search_history_summary">Store search queries locally</string>
-    <string name="enable_watch_history_title">History &amp; Cache</string>
+    <string name="enable_watch_history_title">Watch history</string>
+    <string name="enable_playback_resume_title">Resume playback</string>
+    <string name="enable_playback_resume_summary">Restore last playback position</string>
+    <string name="settings_category_clear_data_title">Clear data</string>
     <string name="enable_watch_history_summary">Keep track of watched videos</string>
     <string name="resume_on_audio_focus_gain_title">Resume on focus gain</string>
     <string name="resume_on_audio_focus_gain_summary">Continue playing after interruptions (e.g. phone calls)</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a7686dedc..6df9069ff 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,6 +65,7 @@
         <item name="toolbar_shadow_drawable">@drawable/toolbar_shadow_light</item>
         <item name="selector_drawable">@drawable/light_selector</item>
         <item name="colorControlHighlight">@color/light_ripple_color</item>
+        <item name="progress_horizontal_drawable">@drawable/progress_youtube_horizontal_light</item>
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
@@ -128,6 +129,7 @@
         <item name="toolbar_shadow_drawable">@drawable/toolbar_shadow_dark</item>
         <item name="selector_drawable">@drawable/dark_selector</item>
         <item name="colorControlHighlight">@color/dark_ripple_color</item>
+        <item name="progress_horizontal_drawable">@drawable/progress_youtube_horizontal_dark</item>
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
diff --git a/app/src/main/res/values/styles_services.xml b/app/src/main/res/values/styles_services.xml
index 257b1905d..d6ab239e4 100644
--- a/app/src/main/res/values/styles_services.xml
+++ b/app/src/main/res/values/styles_services.xml
@@ -15,18 +15,21 @@
         <item name="colorPrimary">@color/light_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/light_soundcloud_dark_color</item>
         <item name="colorAccent">@color/light_soundcloud_accent_color</item>
+        <item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_light</item>
     </style>
 
     <style name="DarkTheme.SoundCloud" parent="DarkTheme.Switchable">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_dark_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
+        <item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_dark</item>
     </style>
 
     <style name="BlackTheme.SoundCloud" parent="BlackTheme.Switchable">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_dark_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
+        <item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_dark</item>
     </style>
 
     <!-- Media.ccc -->
diff --git a/app/src/main/res/xml/history_settings.xml b/app/src/main/res/xml/history_settings.xml
index a7428d340..305b1c360 100644
--- a/app/src/main/res/xml/history_settings.xml
+++ b/app/src/main/res/xml/history_settings.xml
@@ -1,40 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:key="general_preferences"
     android:title="@string/settings_category_history_title">
 
     <SwitchPreference
-        app:iconSpaceReserved="false"
         android:defaultValue="true"
         android:key="@string/enable_watch_history_key"
         android:summary="@string/enable_watch_history_summary"
-        android:title="@string/enable_watch_history_title"/>
+        android:title="@string/enable_watch_history_title"
+        app:iconSpaceReserved="false" />
+
+    <SwitchPreference
+        android:defaultValue="true"
+        android:dependency="@string/enable_watch_history_key"
+        android:key="@string/enable_playback_resume_key"
+        android:summary="@string/enable_playback_resume_summary"
+        android:title="@string/enable_playback_resume_title"
+        app:iconSpaceReserved="false" />
 
     <SwitchPreference
-        app:iconSpaceReserved="false"
         android:defaultValue="true"
         android:key="@string/enable_search_history_key"
         android:summary="@string/enable_search_history_summary"
-        android:title="@string/enable_search_history_title"/>
+        android:title="@string/enable_search_history_title"
+        app:iconSpaceReserved="false" />
 
-    <Preference
-        app:iconSpaceReserved="false"
-        android:key="@string/metadata_cache_wipe_key"
-        android:summary="@string/metadata_cache_wipe_summary"
-        android:title="@string/metadata_cache_wipe_title"/>
+    <PreferenceCategory
+        android:layout="@layout/settings_category_header_layout"
+        android:title="@string/settings_category_clear_data_title"
+        app:iconSpaceReserved="false">
 
-    <Preference
-        app:iconSpaceReserved="false"
-        android:key="@string/clear_views_history_key"
-        android:title="@string/clear_views_history_title"
-        android:summary="@string/clear_views_history_summary"/>
+        <Preference
+            android:key="@string/metadata_cache_wipe_key"
+            android:summary="@string/metadata_cache_wipe_summary"
+            android:title="@string/metadata_cache_wipe_title"
+            app:iconSpaceReserved="false" />
 
-    <Preference
-        app:iconSpaceReserved="false"
-        android:key="@string/clear_search_history_key"
-        android:title="@string/clear_search_history_title"
-        android:summary="@string/clear_search_history_summary"/>
+        <Preference
+            android:key="@string/clear_views_history_key"
+            android:summary="@string/clear_views_history_summary"
+            android:title="@string/clear_views_history_title"
+            app:iconSpaceReserved="false" />
 
-</PreferenceScreen>
+        <Preference
+            android:key="@string/clear_search_history_key"
+            android:summary="@string/clear_search_history_summary"
+            android:title="@string/clear_search_history_title"
+            app:iconSpaceReserved="false" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file

From 002a1412cbd122328ad14bcfd9d559a40de01de0 Mon Sep 17 00:00:00 2001
From: Vasiliy <nvasya95@gmail.com>
Date: Mon, 15 Apr 2019 21:22:31 +0300
Subject: [PATCH 068/138] Fix scrolling details

---
 app/src/main/res/layout-large-land/fragment_video_detail.xml | 1 +
 app/src/main/res/layout/fragment_video_detail.xml            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index a8fbcca89..f773c69cf 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -142,6 +142,7 @@
 				android:background="@android:color/transparent"
 				android:progressDrawable="?attr/progress_horizontal_drawable"
 				android:visibility="invisible"
+				app:layout_scrollFlags="scroll"
 				tools:max="100"
 				tools:progress="40"
 				tools:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 1dfc61cf7..2139fd0cc 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -140,6 +140,7 @@
 				android:layout_marginTop="-2dp"
 				android:progressDrawable="?attr/progress_horizontal_drawable"
 				android:visibility="invisible"
+				app:layout_scrollFlags="scroll"
 				tools:max="100"
 				tools:progress="40"
 				tools:visibility="visible" />

From 73be8cf074cf164b478d5785dc5c1e40ac14e999 Mon Sep 17 00:00:00 2001
From: Vasiliy <nvasya95@gmail.com>
Date: Mon, 15 Apr 2019 21:19:59 +0300
Subject: [PATCH 069/138] Base implementation of showing playback positions in
 lists

---
 .../fragments/list/BaseListFragment.java      |  6 +++
 .../newpipe/info_list/InfoItemBuilder.java    | 11 +++--
 .../newpipe/info_list/InfoListAdapter.java    | 44 +++++++++++++++++--
 .../holder/ChannelInfoItemHolder.java         |  6 ++-
 .../holder/ChannelMiniInfoItemHolder.java     |  4 +-
 .../holder/CommentsInfoItemHolder.java        |  8 ++--
 .../holder/CommentsMiniInfoItemHolder.java    |  4 +-
 .../info_list/holder/InfoItemHolder.java      |  4 +-
 .../holder/PlaylistMiniInfoItemHolder.java    |  4 +-
 .../holder/StreamInfoItemHolder.java          |  6 ++-
 .../holder/StreamMiniInfoItemHolder.java      | 18 +++++++-
 .../local/history/HistoryRecordManager.java   | 35 +++++++++++++++
 .../subscription/SubscriptionFragment.java    |  9 ++--
 .../main/res/layout/list_stream_grid_item.xml | 12 +++++
 app/src/main/res/layout/list_stream_item.xml  | 12 +++++
 .../main/res/layout/list_stream_mini_item.xml | 12 +++++
 16 files changed, 172 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index 68784852e..5a49cce28 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -65,6 +65,12 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
         infoListAdapter = new InfoListAdapter(activity);
     }
 
+    @Override
+    public void onDetach() {
+        infoListAdapter.dispose();
+        super.onDetach();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
index 0e9fd3277..39f7971dd 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
@@ -2,12 +2,14 @@ package org.schabi.newpipe.info_list;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
@@ -59,13 +61,14 @@ public class InfoItemBuilder {
         this.context = context;
     }
 
-    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem) {
-        return buildView(parent, infoItem, false);
+    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem, @Nullable StreamStateEntity state) {
+        return buildView(parent, infoItem, state, false);
     }
 
-    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem, boolean useMiniVariant) {
+    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem,
+                          @Nullable StreamStateEntity state, boolean useMiniVariant) {
         InfoItemHolder holder = holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant);
-        holder.updateFromItem(infoItem);
+        holder.updateFromItem(infoItem, state);
         return holder.itemView;
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index 5e7095c7d..8e54f582a 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -7,16 +7,17 @@ import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.CommentsInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.CommentsMiniInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
@@ -24,12 +25,16 @@ import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.OnClickGesture;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+
 /*
  * Created by Christian Schabesberger on 01.08.16.
  *
@@ -70,7 +75,10 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     private static final int COMMENT_HOLDER_TYPE = 0x401;
 
     private final InfoItemBuilder infoItemBuilder;
+    private final HistoryRecordManager historyRecordManager;
     private final ArrayList<InfoItem> infoItemList;
+    private final ArrayList<StreamStateEntity> states;
+    private final CompositeDisposable stateLoaders;
     private boolean useMiniVariant = false;
     private boolean useGridVariant = false;
     private boolean showFooter = false;
@@ -88,7 +96,10 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     public InfoListAdapter(Activity a) {
         infoItemBuilder = new InfoItemBuilder(a);
+        historyRecordManager = new HistoryRecordManager(a);
         infoItemList = new ArrayList<>();
+        states = new ArrayList<>();
+        stateLoaders = new CompositeDisposable();
     }
 
     public void setOnStreamSelectedListener(OnClickGesture<StreamInfoItem> listener) {
@@ -115,7 +126,17 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         this.useGridVariant = useGridVariant;
     }
 
-    public void addInfoItemList(List<InfoItem> data) {
+    public void addInfoItemList(final List<InfoItem> data) {
+        stateLoaders.add(
+                historyRecordManager.loadStreamStateBatch(data)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(streamStateEntities -> {
+                    addInfoItemList(data, streamStateEntities);
+                })
+        );
+    }
+
+    private void addInfoItemList(List<InfoItem> data, List<StreamStateEntity> statesEntities) {
         if (data != null) {
             if (DEBUG) {
                 Log.d(TAG, "addInfoItemList() before > infoItemList.size() = " + infoItemList.size() + ", data.size() = " + data.size());
@@ -123,6 +144,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
             int offsetStart = sizeConsideringHeaderOffset();
             infoItemList.addAll(data);
+            states.addAll(statesEntities);
 
             if (DEBUG) {
                 Log.d(TAG, "addInfoItemList() after > offsetStart = " + offsetStart + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
@@ -140,6 +162,16 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     public void addInfoItem(InfoItem data) {
+        stateLoaders.add(
+                historyRecordManager.loadStreamState(data)
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(streamStateEntity -> {
+                            addInfoItem(data, streamStateEntity);
+                        })
+        );
+    }
+
+    private void addInfoItem(InfoItem data, StreamStateEntity state) {
         if (data != null) {
             if (DEBUG) {
                 Log.d(TAG, "addInfoItem() before > infoItemList.size() = " + infoItemList.size() + ", thread = " + Thread.currentThread());
@@ -147,6 +179,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
             int positionInserted = sizeConsideringHeaderOffset();
             infoItemList.add(data);
+            states.add(state);
 
             if (DEBUG) {
                 Log.d(TAG, "addInfoItem() after > position = " + positionInserted + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
@@ -167,6 +200,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             return;
         }
         infoItemList.clear();
+        states.clear();
         notifyDataSetChanged();
     }
 
@@ -284,7 +318,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             // If header isn't null, offset the items by -1
             if (header != null) position--;
 
-            ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position));
+            ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position), states.get(position));
         } else if (holder instanceof HFHolder && position == 0 && header != null) {
             ((HFHolder) holder).view = header;
         } else if (holder instanceof HFHolder && position == sizeConsideringHeaderOffset() && footer != null && showFooter) {
@@ -301,4 +335,8 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             }
         };
     }
+
+    public void dispose() {
+        stateLoaders.clear();
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java
index 1e5c726a4..317934455 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java
@@ -1,9 +1,11 @@
 package org.schabi.newpipe.info_list.holder;
 
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
@@ -38,8 +40,8 @@ public class ChannelInfoItemHolder extends ChannelMiniInfoItemHolder {
     }
 
     @Override
-    public void updateFromItem(final InfoItem infoItem) {
-        super.updateFromItem(infoItem);
+    public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) {
+        super.updateFromItem(infoItem, state);
 
         if (!(infoItem instanceof ChannelInfoItem)) return;
         final ChannelInfoItem item = (ChannelInfoItem) infoItem;
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
index ca783833a..a191707c0 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
@@ -1,9 +1,11 @@
 package org.schabi.newpipe.info_list.holder;
 
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
@@ -30,7 +32,7 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
     }
 
     @Override
-    public void updateFromItem(final InfoItem infoItem) {
+    public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) {
         if (!(infoItem instanceof ChannelInfoItem)) return;
         final ChannelInfoItem item = (ChannelInfoItem) infoItem;
 
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java
index 46e4b4563..4ecf86961 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java
@@ -1,14 +1,14 @@
 package org.schabi.newpipe.info_list.holder;
 
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
-import org.schabi.newpipe.util.Localization;
 
 /*
  * Created by Christian Schabesberger on 12.02.17.
@@ -41,8 +41,8 @@ public class CommentsInfoItemHolder extends CommentsMiniInfoItemHolder {
     }
 
     @Override
-    public void updateFromItem(final InfoItem infoItem) {
-        super.updateFromItem(infoItem);
+    public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) {
+        super.updateFromItem(infoItem, state);
 
         if (!(infoItem instanceof CommentsInfoItem)) return;
         final CommentsInfoItem item = (CommentsInfoItem) infoItem;
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
index ce8412b20..3d3a9bb09 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.info_list.holder;
 
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.text.util.Linkify;
 import android.view.View;
@@ -8,6 +9,7 @@ import android.widget.TextView;
 
 import org.jsoup.helper.StringUtil;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
@@ -65,7 +67,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
     }
 
     @Override
-    public void updateFromItem(final InfoItem infoItem) {
+    public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) {
         if (!(infoItem instanceof CommentsInfoItem)) return;
         final CommentsInfoItem item = (CommentsInfoItem) infoItem;
 
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java
index ebb5b4114..969d2682e 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java
@@ -1,9 +1,11 @@
 package org.schabi.newpipe.info_list.holder;
 
+import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 
@@ -35,5 +37,5 @@ public abstract class InfoItemHolder extends RecyclerView.ViewHolder {
         this.itemBuilder = infoItemBuilder;
     }
 
-    public abstract void updateFromItem(final InfoItem infoItem);
+    public abstract void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state);
 }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java
index b6bd2f389..f9d617e66 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java
@@ -1,10 +1,12 @@
 package org.schabi.newpipe.info_list.holder;
 
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
@@ -30,7 +32,7 @@ public class PlaylistMiniInfoItemHolder extends InfoItemHolder {
     }
 
     @Override
-    public void updateFromItem(final InfoItem infoItem) {
+    public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) {
         if (!(infoItem instanceof PlaylistInfoItem)) return;
         final PlaylistInfoItem item = (PlaylistInfoItem) infoItem;
 
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
index 0a7705427..25502bc81 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
@@ -1,10 +1,12 @@
 package org.schabi.newpipe.info_list.holder;
 
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
@@ -40,8 +42,8 @@ public class StreamInfoItemHolder extends StreamMiniInfoItemHolder {
     }
 
     @Override
-    public void updateFromItem(final InfoItem infoItem) {
-        super.updateFromItem(infoItem);
+    public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) {
+        super.updateFromItem(infoItem, state);
 
         if (!(infoItem instanceof StreamInfoItem)) return;
         final StreamInfoItem item = (StreamInfoItem) infoItem;
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
index 048b907af..a59cb009f 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
@@ -1,12 +1,15 @@
 package org.schabi.newpipe.info_list.holder;
 
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
@@ -14,12 +17,15 @@ import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 
+import java.util.concurrent.TimeUnit;
+
 public class StreamMiniInfoItemHolder extends InfoItemHolder {
 
     public final ImageView itemThumbnailView;
     public final TextView itemVideoTitleView;
     public final TextView itemUploaderView;
     public final TextView itemDurationView;
+    public final ProgressBar itemProgressView;
 
     StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
         super(infoItemBuilder, layoutId, parent);
@@ -28,6 +34,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
         itemVideoTitleView = itemView.findViewById(R.id.itemVideoTitleView);
         itemUploaderView = itemView.findViewById(R.id.itemUploaderView);
         itemDurationView = itemView.findViewById(R.id.itemDurationView);
+        itemProgressView = itemView.findViewById(R.id.itemProgressView);
     }
 
     public StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
@@ -35,7 +42,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
     }
 
     @Override
-    public void updateFromItem(final InfoItem infoItem) {
+    public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) {
         if (!(infoItem instanceof StreamInfoItem)) return;
         final StreamInfoItem item = (StreamInfoItem) infoItem;
 
@@ -47,13 +54,22 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
             itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                     R.color.duration_background_color));
             itemDurationView.setVisibility(View.VISIBLE);
+            if (state != null) {
+                itemProgressView.setVisibility(View.VISIBLE);
+                itemProgressView.setMax((int) item.getDuration());
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setVisibility(View.GONE);
+            }
         } else if (item.getStreamType() == StreamType.LIVE_STREAM) {
             itemDurationView.setText(R.string.duration_live);
             itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                     R.color.live_duration_background_color));
             itemDurationView.setVisibility(View.VISIBLE);
+            itemProgressView.setVisibility(View.GONE);
         } else {
             itemDurationView.setVisibility(View.GONE);
+            itemProgressView.setVisibility(View.GONE);
         }
 
         // Default thumbnail is shown on error, while loading and if the url is empty
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
index f9090128c..1a252a59d 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
@@ -36,6 +36,7 @@ import org.schabi.newpipe.database.stream.dao.StreamDAO;
 import org.schabi.newpipe.database.stream.dao.StreamStateDAO;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 
@@ -220,6 +221,40 @@ public class HistoryRecordManager {
         })).subscribeOn(Schedulers.io());
     }
 
+    public Single<StreamStateEntity> loadStreamState(final InfoItem info) {
+        return Single.fromCallable(() -> {
+            final List<StreamEntity> entities = streamTable.getStream(info.getServiceId(), info.getUrl()).blockingFirst();
+            if (entities.isEmpty()) {
+                return null;
+            }
+            final List<StreamStateEntity> states = streamStateTable.getState(entities.get(0).getUid()).blockingFirst();
+            if (states.isEmpty()) {
+                return null;
+            }
+            return states.get(0);
+        }).subscribeOn(Schedulers.io());
+    }
+
+    public Single<List<StreamStateEntity>> loadStreamStateBatch(final List<InfoItem> infos) {
+        return Single.fromCallable(() -> {
+            final List<StreamStateEntity> result = new ArrayList<>(infos.size());
+            for (InfoItem info : infos) {
+                final List<StreamEntity> entities = streamTable.getStream(info.getServiceId(), info.getUrl()).blockingFirst();
+                if (entities.isEmpty()) {
+                    result.add(null);
+                    continue;
+                }
+                final List<StreamStateEntity> states = streamStateTable.getState(entities.get(0).getUid()).blockingFirst();
+                if (states.isEmpty()) {
+                    result.add(null);
+                    continue;
+                }
+                result.add(states.get(0));
+            }
+            return result;
+        }).subscribeOn(Schedulers.io());
+    }
+
     ///////////////////////////////////////////////////////
     // Utility
     ///////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
index 7d0fc3e61..364d50df6 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
@@ -23,7 +23,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -48,10 +47,8 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.info_list.InfoListAdapter;
-import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService;
-import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -131,6 +128,12 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         subscriptionService = SubscriptionService.getInstance(activity);
     }
 
+    @Override
+    public void onDetach() {
+        infoListAdapter.dispose();
+        super.onDetach();
+    }
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
diff --git a/app/src/main/res/layout/list_stream_grid_item.xml b/app/src/main/res/layout/list_stream_grid_item.xml
index cf73bf9b1..7c918b27f 100644
--- a/app/src/main/res/layout/list_stream_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_grid_item.xml
@@ -66,4 +66,16 @@
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		android:textSize="@dimen/video_item_search_uploader_text_size"
 		tools:text="Uploader"/>
+
+	<ProgressBar
+		android:id="@+id/itemProgressView"
+		style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+		android:progressDrawable="?progress_horizontal_drawable"
+		android:layout_width="wrap_content"
+		android:layout_height="4dp"
+		android:layout_marginTop="-2dp"
+		android:layout_alignStart="@id/itemThumbnailView"
+		android:layout_alignEnd="@id/itemThumbnailView"
+		android:layout_below="@id/itemThumbnailView"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_stream_item.xml b/app/src/main/res/layout/list_stream_item.xml
index db4af7f8c..ccf325592 100644
--- a/app/src/main/res/layout/list_stream_item.xml
+++ b/app/src/main/res/layout/list_stream_item.xml
@@ -79,4 +79,16 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_upload_date_text_size"
         tools:text="2 years ago • 10M views"/>
+
+    <ProgressBar
+        android:id="@+id/itemProgressView"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:progressDrawable="?progress_horizontal_drawable"
+        android:layout_width="wrap_content"
+        android:layout_height="4dp"
+        android:layout_marginTop="-2dp"
+        android:layout_alignStart="@id/itemThumbnailView"
+        android:layout_alignEnd="@id/itemThumbnailView"
+        android:layout_below="@id/itemThumbnailView"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_stream_mini_item.xml b/app/src/main/res/layout/list_stream_mini_item.xml
index bffd13a6f..383580e59 100644
--- a/app/src/main/res/layout/list_stream_mini_item.xml
+++ b/app/src/main/res/layout/list_stream_mini_item.xml
@@ -69,4 +69,16 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_uploader_text_size"
         tools:text="Uploader" />
+
+    <ProgressBar
+        android:id="@+id/itemProgressView"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:progressDrawable="?progress_horizontal_drawable"
+        android:layout_width="wrap_content"
+        android:layout_height="4dp"
+        android:layout_marginTop="-2dp"
+        android:layout_alignStart="@id/itemThumbnailView"
+        android:layout_alignEnd="@id/itemThumbnailView"
+        android:layout_below="@id/itemThumbnailView"/>
+
 </RelativeLayout>
\ No newline at end of file

From a48cbc697151ba4b2aeb20723e1afd7ccc74dc14 Mon Sep 17 00:00:00 2001
From: Vasiliy <nvasya95@gmail.com>
Date: Mon, 15 Apr 2019 22:18:24 +0300
Subject: [PATCH 070/138] Show streams states for local lists

---
 .../newpipe/info_list/InfoListAdapter.java    |  2 +-
 .../newpipe/local/BaseLocalListFragment.java  |  1 +
 .../newpipe/local/LocalItemListAdapter.java   | 28 +++++++++++++-
 .../local/dialog/PlaylistAppendDialog.java    |  5 ++-
 .../local/history/HistoryRecordManager.java   | 37 +++++++++++++++++--
 .../newpipe/local/holder/LocalItemHolder.java |  4 +-
 .../local/holder/LocalPlaylistItemHolder.java |  6 ++-
 .../holder/LocalPlaylistStreamItemHolder.java | 15 +++++++-
 .../LocalStatisticStreamItemHolder.java       | 15 +++++++-
 .../local/holder/PlaylistItemHolder.java      |  4 +-
 .../holder/RemotePlaylistItemHolder.java      |  6 ++-
 .../layout/list_stream_playlist_grid_item.xml | 11 ++++++
 .../res/layout/list_stream_playlist_item.xml  | 11 ++++++
 app/src/main/res/values-land/dimens.xml       |  2 +-
 app/src/main/res/values/dimens.xml            |  2 +-
 15 files changed, 132 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index 8e54f582a..df207abb5 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -166,7 +166,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 historyRecordManager.loadStreamState(data)
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(streamStateEntity -> {
-                            addInfoItem(data, streamStateEntity);
+                            addInfoItem(data, streamStateEntity[0]);
                         })
         );
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
index abdf82353..20676c6db 100644
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -150,6 +150,7 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
     public void onDestroyView() {
         super.onDestroyView();
         itemsList = null;
+        itemListAdapter.dispose();
         itemListAdapter = null;
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index e298dedd3..372392d7b 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -8,6 +8,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.local.holder.LocalItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
@@ -25,6 +27,9 @@ import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+
 /*
  * Created by Christian Schabesberger on 01.08.16.
  *
@@ -63,7 +68,10 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
 	private static final int REMOTE_PLAYLIST_GRID_HOLDER_TYPE = 0x2004;
 
     private final LocalItemBuilder localItemBuilder;
+    private final HistoryRecordManager historyRecordManager;
     private final ArrayList<LocalItem> localItems;
+    private final ArrayList<StreamStateEntity> states;
+    private final CompositeDisposable stateLoaders;
     private final DateFormat dateFormat;
 
     private boolean showFooter = false;
@@ -73,9 +81,12 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     public LocalItemListAdapter(Activity activity) {
         localItemBuilder = new LocalItemBuilder(activity);
+        historyRecordManager = new HistoryRecordManager(activity);
         localItems = new ArrayList<>();
         dateFormat = DateFormat.getDateInstance(DateFormat.SHORT,
                 Localization.getPreferredLocale(activity));
+        states = new ArrayList<>();
+        stateLoaders = new CompositeDisposable();
     }
 
     public void setSelectedListener(OnClickGesture<LocalItem> listener) {
@@ -87,6 +98,15 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     }
 
     public void addItems(List<? extends LocalItem> data) {
+        stateLoaders.add(
+                historyRecordManager.loadLocalStreamStateBatch(data)
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(streamStateEntities ->
+                                addItems(data, streamStateEntities))
+        );
+    }
+
+    private void addItems(List<? extends LocalItem> data, List<StreamStateEntity> streamStates) {
         if (data != null) {
             if (DEBUG) {
                 Log.d(TAG, "addItems() before > localItems.size() = " +
@@ -95,6 +115,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
 
             int offsetStart = sizeConsideringHeader();
             localItems.addAll(data);
+            states.addAll(streamStates);
 
             if (DEBUG) {
                 Log.d(TAG, "addItems() after > offsetStart = " + offsetStart +
@@ -130,6 +151,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         if (actualFrom >= localItems.size() || actualTo >= localItems.size()) return false;
 
         localItems.add(actualTo, localItems.remove(actualFrom));
+        states.add(actualTo, states.remove(actualFrom));
         notifyItemMoved(fromAdapterPosition, toAdapterPosition);
         return true;
     }
@@ -259,7 +281,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
             // If header isn't null, offset the items by -1
             if (header != null) position--;
 
-            ((LocalItemHolder) holder).updateFromItem(localItems.get(position), dateFormat);
+            ((LocalItemHolder) holder).updateFromItem(localItems.get(position), states.get(position), dateFormat);
         } else if (holder instanceof HeaderFooterHolder && position == 0 && header != null) {
             ((HeaderFooterHolder) holder).view = header;
         } else if (holder instanceof HeaderFooterHolder && position == sizeConsideringHeader()
@@ -277,4 +299,8 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
             }
         };
     }
+
+    public void dispose() {
+        stateLoaders.clear();
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
index e422b332a..5973ad920 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
@@ -112,7 +112,10 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
     public void onDestroyView() {
         super.onDestroyView();
         if (playlistReactor != null) playlistReactor.dispose();
-        if (playlistAdapter != null) playlistAdapter.unsetSelectedListener();
+        if (playlistAdapter != null) {
+            playlistAdapter.dispose();
+            playlistAdapter.unsetSelectedListener();
+        }
 
         playlistReactor = null;
         playlistRecyclerView = null;
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
index 1a252a59d..dd2d67e43 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
@@ -26,11 +26,14 @@ import android.support.annotation.NonNull;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.AppDatabase;
+import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.history.dao.SearchHistoryDAO;
 import org.schabi.newpipe.database.history.dao.StreamHistoryDAO;
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
+import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
+import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.database.stream.dao.StreamDAO;
 import org.schabi.newpipe.database.stream.dao.StreamStateDAO;
@@ -221,17 +224,17 @@ public class HistoryRecordManager {
         })).subscribeOn(Schedulers.io());
     }
 
-    public Single<StreamStateEntity> loadStreamState(final InfoItem info) {
+    public Single<StreamStateEntity[]> loadStreamState(final InfoItem info) {
         return Single.fromCallable(() -> {
             final List<StreamEntity> entities = streamTable.getStream(info.getServiceId(), info.getUrl()).blockingFirst();
             if (entities.isEmpty()) {
-                return null;
+                return new StreamStateEntity[]{null};
             }
             final List<StreamStateEntity> states = streamStateTable.getState(entities.get(0).getUid()).blockingFirst();
             if (states.isEmpty()) {
-                return null;
+                return new StreamStateEntity[]{null};
             }
-            return states.get(0);
+            return new StreamStateEntity[]{states.get(0)};
         }).subscribeOn(Schedulers.io());
     }
 
@@ -255,6 +258,32 @@ public class HistoryRecordManager {
         }).subscribeOn(Schedulers.io());
     }
 
+    public Single<List<StreamStateEntity>> loadLocalStreamStateBatch(final List<? extends LocalItem> items) {
+        return Single.fromCallable(() -> {
+            final List<StreamStateEntity> result = new ArrayList<>(items.size());
+            for (LocalItem item : items) {
+                long streamId;
+                if (item instanceof StreamStatisticsEntry) {
+                    streamId = ((StreamStatisticsEntry) item).streamId;
+                } else if (item instanceof PlaylistStreamEntity) {
+                    streamId = ((PlaylistStreamEntity) item).getStreamUid();
+                } else if (item instanceof PlaylistStreamEntry) {
+                    streamId = ((PlaylistStreamEntry) item).streamId;
+                } else {
+                    result.add(null);
+                    continue;
+                }
+                final List<StreamStateEntity> states = streamStateTable.getState(streamId).blockingFirst();
+                if (states.isEmpty()) {
+                    result.add(null);
+                    continue;
+                }
+                result.add(states.get(0));
+            }
+            return result;
+        }).subscribeOn(Schedulers.io());
+    }
+
     ///////////////////////////////////////////////////////
     // Utility
     ///////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java
index 889751afa..01af60f98 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java
@@ -1,10 +1,12 @@
 package org.schabi.newpipe.local.holder;
 
+import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.local.LocalItemBuilder;
 
 import java.text.DateFormat;
@@ -38,5 +40,5 @@ public abstract class LocalItemHolder extends RecyclerView.ViewHolder {
         this.itemBuilder = itemBuilder;
     }
 
-    public abstract void updateFromItem(final LocalItem item, final DateFormat dateFormat);
+    public abstract void updateFromItem(final LocalItem item, @Nullable final StreamStateEntity state, final DateFormat dateFormat);
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
index 8743684ee..0e6eca9ba 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
@@ -1,10 +1,12 @@
 package org.schabi.newpipe.local.holder;
 
+import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 
@@ -21,7 +23,7 @@ public class LocalPlaylistItemHolder extends PlaylistItemHolder {
     }
 
     @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) {
         if (!(localItem instanceof PlaylistMetadataEntry)) return;
         final PlaylistMetadataEntry item = (PlaylistMetadataEntry) localItem;
 
@@ -32,6 +34,6 @@ public class LocalPlaylistItemHolder extends PlaylistItemHolder {
         itemBuilder.displayImage(item.thumbnailUrl, itemThumbnailView,
                 ImageDisplayConstants.DISPLAY_PLAYLIST_OPTIONS);
 
-        super.updateFromItem(localItem, dateFormat);
+        super.updateFromItem(localItem, state, dateFormat);
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
index e591b73e5..48bbbc81d 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
@@ -1,21 +1,25 @@
 package org.schabi.newpipe.local.holder;
 
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 
 import java.text.DateFormat;
+import java.util.concurrent.TimeUnit;
 
 public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
 
@@ -24,6 +28,7 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
     public final TextView itemAdditionalDetailsView;
     public final TextView itemDurationView;
     public final View itemHandleView;
+    public final ProgressBar itemProgressView;
 
     LocalPlaylistStreamItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
         super(infoItemBuilder, layoutId, parent);
@@ -33,6 +38,7 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
         itemAdditionalDetailsView = itemView.findViewById(R.id.itemAdditionalDetails);
         itemDurationView = itemView.findViewById(R.id.itemDurationView);
         itemHandleView = itemView.findViewById(R.id.itemHandle);
+        itemProgressView = itemView.findViewById(R.id.itemProgressView);
     }
 
     public LocalPlaylistStreamItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
@@ -40,7 +46,7 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
     }
 
     @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) {
         if (!(localItem instanceof PlaylistStreamEntry)) return;
         final PlaylistStreamEntry item = (PlaylistStreamEntry) localItem;
 
@@ -53,6 +59,13 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
             itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                     R.color.duration_background_color));
             itemDurationView.setVisibility(View.VISIBLE);
+            if (state != null) {
+                itemProgressView.setVisibility(View.VISIBLE);
+                itemProgressView.setMax((int) item.duration);
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setVisibility(View.GONE);
+            }
         } else {
             itemDurationView.setVisibility(View.GONE);
         }
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
index 57a5794e3..ac194b776 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
@@ -5,17 +5,20 @@ import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 
 import java.text.DateFormat;
+import java.util.concurrent.TimeUnit;
 
 /*
  * Created by Christian Schabesberger on 01.08.16.
@@ -45,6 +48,7 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
     public final TextView itemDurationView;
     @Nullable
     public final TextView itemAdditionalDetails;
+    public final ProgressBar itemProgressView;
 
     public LocalStatisticStreamItemHolder(LocalItemBuilder itemBuilder, ViewGroup parent) {
         this(itemBuilder, R.layout.list_stream_item, parent);
@@ -58,6 +62,7 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
         itemUploaderView = itemView.findViewById(R.id.itemUploaderView);
         itemDurationView = itemView.findViewById(R.id.itemDurationView);
         itemAdditionalDetails = itemView.findViewById(R.id.itemAdditionalDetails);
+        itemProgressView = itemView.findViewById(R.id.itemProgressView);
     }
 
     private String getStreamInfoDetailLine(final StreamStatisticsEntry entry,
@@ -70,7 +75,7 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
     }
 
     @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) {
         if (!(localItem instanceof StreamStatisticsEntry)) return;
         final StreamStatisticsEntry item = (StreamStatisticsEntry) localItem;
 
@@ -82,8 +87,16 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
             itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                     R.color.duration_background_color));
             itemDurationView.setVisibility(View.VISIBLE);
+            if (state != null) {
+                itemProgressView.setVisibility(View.VISIBLE);
+                itemProgressView.setMax((int) item.duration);
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setVisibility(View.GONE);
+            }
         } else {
             itemDurationView.setVisibility(View.GONE);
+            itemProgressView.setVisibility(View.GONE);
         }
 
         if (itemAdditionalDetails != null) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/PlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/PlaylistItemHolder.java
index 5d6f192e1..2a81f9571 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/PlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/PlaylistItemHolder.java
@@ -1,11 +1,13 @@
 package org.schabi.newpipe.local.holder;
 
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.local.LocalItemBuilder;
 
 import java.text.DateFormat;
@@ -31,7 +33,7 @@ public abstract class PlaylistItemHolder extends LocalItemHolder {
     }
 
     @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) {
         itemView.setOnClickListener(view -> {
             if (itemBuilder.getOnItemSelectedListener() != null) {
                 itemBuilder.getOnItemSelectedListener().selected(localItem);
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
index 5b2a88d38..bdcd42f67 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
@@ -1,9 +1,11 @@
 package org.schabi.newpipe.local.holder;
 
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.util.ImageDisplayConstants;
@@ -21,7 +23,7 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
     }
 
     @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) {
         if (!(localItem instanceof PlaylistRemoteEntity)) return;
         final PlaylistRemoteEntity item = (PlaylistRemoteEntity) localItem;
 
@@ -33,6 +35,6 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
         itemBuilder.displayImage(item.getThumbnailUrl(), itemThumbnailView,
                 ImageDisplayConstants.DISPLAY_PLAYLIST_OPTIONS);
 
-        super.updateFromItem(localItem, dateFormat);
+        super.updateFromItem(localItem, state, dateFormat);
     }
 }
diff --git a/app/src/main/res/layout/list_stream_playlist_grid_item.xml b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
index 4b31a452e..ea680c072 100644
--- a/app/src/main/res/layout/list_stream_playlist_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
@@ -81,4 +81,15 @@
 		android:textSize="@dimen/video_item_search_uploader_text_size"
 		tools:text="Uploader" />
 
+	<ProgressBar
+		android:id="@+id/itemProgressView"
+		style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+		android:progressDrawable="?progress_horizontal_drawable"
+		android:layout_width="wrap_content"
+		android:layout_height="4dp"
+		android:layout_marginTop="-2dp"
+		android:layout_alignStart="@id/itemThumbnailView"
+		android:layout_alignEnd="@id/itemThumbnailView"
+		android:layout_below="@id/itemThumbnailView"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_stream_playlist_item.xml b/app/src/main/res/layout/list_stream_playlist_item.xml
index 193b3fea4..47c3ab93d 100644
--- a/app/src/main/res/layout/list_stream_playlist_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_item.xml
@@ -83,4 +83,15 @@
         android:textSize="@dimen/video_item_search_uploader_text_size"
         tools:text="Uploader" />
 
+    <ProgressBar
+        android:id="@+id/itemProgressView"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:progressDrawable="?progress_horizontal_drawable"
+        android:layout_width="wrap_content"
+        android:layout_height="4dp"
+        android:layout_marginTop="-2dp"
+        android:layout_alignStart="@id/itemThumbnailView"
+        android:layout_alignEnd="@id/itemThumbnailView"
+        android:layout_below="@id/itemThumbnailView"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index ee047f0da..eea6c5cf0 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -14,7 +14,7 @@
     <dimen name="video_item_search_thumbnail_image_width">142dp</dimen>
     <dimen name="video_item_search_thumbnail_image_height">80dp</dimen>
     <!-- Calculated: 2*video_item_search_padding + video_item_search_thumbnail_image_height -->
-    <dimen name="video_item_search_height">104dp</dimen>
+    <dimen name="video_item_search_height">106dp</dimen>
     <!-- Paddings & Margins -->
     <dimen name="video_item_search_image_right_margin">10dp</dimen>
     <dimen name="video_item_search_duration_vertical_padding">1sp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 94101cfb0..582c4bade 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -15,7 +15,7 @@
     <dimen name="video_item_grid_thumbnail_image_width">164dp</dimen>
     <dimen name="video_item_grid_thumbnail_image_height">92dp</dimen>
     <!-- Calculated: 2*video_item_search_padding + video_item_search_thumbnail_image_height -->
-    <dimen name="video_item_search_height">94dp</dimen>
+    <dimen name="video_item_search_height">96dp</dimen>
     <!-- Paddings & Margins -->
     <dimen name="video_item_search_padding">12dp</dimen>
     <dimen name="video_item_search_image_right_margin">6dp</dimen>

From 1df8af35d4f7134888577faa2033973351421633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= <kristjanrats@gmail.com>
Date: Mon, 15 Apr 2019 18:52:25 +0000
Subject: [PATCH 071/138] Translated using Weblate (Estonian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-et/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 95065f8e7..b57fdd306 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -103,7 +103,7 @@
     <string name="play_btn_text">Esita</string>
     <string name="content">Sisu</string>
     <string name="show_age_restricted_content_title">Vanusepiiranguga sisu</string>
-    <string name="video_is_age_restricted">Kuva vanusepiiranguga sisu. Sellise materjali saab lubada seadetes.</string>
+    <string name="video_is_age_restricted">Kuva vanusepiiranguga video. Sellist sisu saab lubada seadetes.</string>
     <string name="duration_live">OTSE</string>
     <string name="downloads">Allalaadimised</string>
     <string name="downloads_title">Allalaadimised</string>
@@ -459,13 +459,13 @@
     <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">Mitterahuldav taotletud vahemik</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">Uusi katseid kuni</string>
+    <string name="max_retry_msg">Korduskatseid</string>
     <string name="max_retry_desc">Suurim katsete arv enne allalaadimise tühistamist</string>
     <string name="pause_downloads_on_mobile">Paus üleminekul mobiilsele andmesidele</string>
     <string name="pause_downloads_on_mobile_desc">Allalaadimised, mida ei saa peatada, taaskäivitatakse</string>

From a9c64b2fecacb88ea61cb647aa3f1b32b3d23f94 Mon Sep 17 00:00:00 2001
From: YONGLE <tanyongle0633@gmail.com>
Date: Mon, 22 Apr 2019 20:01:44 +0000
Subject: [PATCH 072/138] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-cmn/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml
index 99ac876a9..858c22b23 100644
--- a/app/src/main/res/values-cmn/strings.xml
+++ b/app/src/main/res/values-cmn/strings.xml
@@ -470,7 +470,7 @@
     <string name="app_update_notification_content_title">NewPipe 更新可用!</string>
     <string name="error_file_creation">无法创建目标文件夹</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_requested_range_not_satisfiable">请求范围无法满足</string>
     <string name="msg_pending_downloads">继续进行%s个待下载转移</string>
-    <string name="pause_downloads_on_mobile_desc">将重新启动无法暂停的下载</string>
+    <string name="pause_downloads_on_mobile_desc">无法暂停的下载将重新开始</string>
 </resources>
\ No newline at end of file

From 08f8b9770af6627568556a56d5572042b8ac53e3 Mon Sep 17 00:00:00 2001
From: yunna <yunna.in@gmail.com>
Date: Mon, 22 Apr 2019 08:38:27 +0000
Subject: [PATCH 073/138] Translated using Weblate (Japanese)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ja/strings.xml | 66 +++++++++++++-------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f704b8dbd..dd229db93 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -21,14 +21,14 @@
     <string name="kore_not_found">Koreが見つかりません｡Kore を入手しますか？</string>
     <string name="show_play_with_kodi_title">\"Kodi で再生\" オプションを表示</string>
     <string name="show_play_with_kodi_summary">Kodi メディアセンター経由で動画を再生するための設定を表示します</string>
-    <string name="play_audio">音楽</string>
-    <string name="default_audio_format_title">デフォルトの音楽形式</string>
+    <string name="play_audio">音声</string>
+    <string name="default_audio_format_title">デフォルトの音声形式</string>
     <string name="download_dialog_title">保存</string>
     <string name="next_video_title">次</string>
     <string name="show_next_and_similar_title">「次の動画」と「関連動画」を表示</string>
     <string name="url_not_supported_toast">URLは使用できません</string>
     <string name="content_language_title">優先言語</string>
-    <string name="settings_category_video_audio_title">動画と音楽</string>
+    <string name="settings_category_video_audio_title">動画と音声</string>
     <string name="view_count_text">%1$s ビュー</string>
     <string name="list_thumbnail_view_description">動画 プレビュー サムネイル</string>
     <string name="detail_thumbnail_view_description">動画 プレビュー サムネイル</string>
@@ -40,10 +40,10 @@
     <string name="background_player_playing_toast">バックグラウンドで再生中</string>
     <string name="play_btn_text">再生</string>
     <string name="use_tor_title">Torを使用する</string>
-    <string name="use_tor_summary">(実験的) 強制的に Tor を経由した経路で保存して､匿名性を高めます(動画の同時再生は未だ対応していません)｡</string>
+    <string name="use_tor_summary">(実験的) 強制的に Tor を経由した経路で保存して､匿名性を高めます(動画の同時再生には、まだ対応していません)｡</string>
     <string name="theme_title">テーマ</string>
-    <string name="dark_theme_title">ダーク</string>
-    <string name="light_theme_title">ライト</string>
+    <string name="dark_theme_title">グレー</string>
+    <string name="light_theme_title">ホワイト</string>
     <string name="settings_category_appearance_title">外観</string>
     <string name="settings_category_other_title">その他</string>
     <string name="network_error">ネットワークエラー</string>
@@ -70,11 +70,11 @@
     <string name="error_snackbar_message">申し訳ありません、不具合が発生しました</string>
     <string name="error_snackbar_action">報告</string>
     <string name="what_device_headline">情報:</string>
-    <string name="what_happened_headline">何が起こりましたか:</string>
-    <string name="your_comment">あなたの意見(英語で):</string>
+    <string name="what_happened_headline">発生した内容:</string>
+    <string name="your_comment">あなたのコメント(英語で):</string>
     <string name="error_details_headline">詳細:</string>
     <string name="video">動画</string>
-    <string name="audio">音楽</string>
+    <string name="audio">音声</string>
     <string name="retry">再試行</string>
     <string name="storage_permission_denied">ストレージへのアクセスが拒否されました</string>
     <string name="autoplay_by_calling_app_title">自動再生</string>
@@ -93,7 +93,7 @@
     <string name="msg_name">ファイル名</string>
     <string name="msg_threads">同時接続数</string>
     <string name="msg_error">エラー</string>
-    <string name="msg_server_unsupported">サーバーが対応していません</string>
+    <string name="msg_server_unsupported">このサーバーには対応していません</string>
     <string name="msg_exists">ファイルが既に存在します</string>
     <string name="msg_url_malform">URL の形式が正しくないか､通信が利用できません</string>
     <string name="msg_running">NewPipeの保存中</string>
@@ -130,17 +130,17 @@
     <string name="default_popup_resolution_title">デフォルトのポップアップ解像度</string>
     <string name="show_higher_resolutions_title">高い解像度で表示</string>
     <string name="show_higher_resolutions_summary">2K/4K ビデオの再生は一部のデバイスのみサポートしています</string>
-    <string name="controls_background_title">背景</string>
+    <string name="controls_background_title">バックグラウンド</string>
     <string name="controls_popup_title">ポップアップ</string>
     <string name="filter">フィルター</string>
     <string name="refresh">更新</string>
     <string name="clear">クリア</string>
     <string name="popup_remember_size_pos_title">ポップアップのサイズと位置を記憶する</string>
-    <string name="popup_remember_size_pos_summary">前回のポップアップしたサイズと位置を記憶する</string>
+    <string name="popup_remember_size_pos_summary">前回ポップアップしたサイズと位置を記憶する</string>
     <string name="settings_category_popup_title">ポップアップ</string>
     <string name="popup_resizing_indicator_title">サイズを変更</string>
     <string name="use_external_video_player_summary">一部の解像度では音声がありません</string>
-    <string name="player_gesture_controls_title">プレーヤーのジェスチャー コントロール</string>
+    <string name="player_gesture_controls_title">プレーヤーのジェスチャー制御</string>
     <string name="player_gesture_controls_summary">ジェスチャーを使用してプレーヤーの明るさと音量をコントロールする</string>
     <string name="show_search_suggestions_title">検索候補</string>
     <string name="show_search_suggestions_summary">検索時に候補を表示します</string>
@@ -179,7 +179,7 @@
     <string name="show_hold_to_append_summary">動画の詳細ページで背景、またはポップアップボタンが押されたときにヒントを表示する</string>
     <string name="settings_category_player_behavior_title">動作</string>
     <string name="settings_category_history_title">履歴とキャッシュ</string>
-    <string name="playlist">再生リスト</string>
+    <string name="playlist">プレイリスト</string>
     <string name="undo">元に戻す</string>
     <string name="play_all">すべて再生</string>
     <string name="notification_channel_name">通知</string>
@@ -191,10 +191,10 @@
     <string name="no_videos">動画がありません</string>
     <string name="settings_category_downloads_title">保存</string>
     <string name="settings_file_charset_title">ファイル名に使用可能な文字</string>
-    <string name="settings_file_replacement_character_summary">無効な文字は次の値で置き換えられます</string>
-    <string name="settings_file_replacement_character_title">置換文字</string>
+    <string name="settings_file_replacement_character_summary">無効な文字はここで指定した文字に置き換えられます</string>
+    <string name="settings_file_replacement_character_title">ファイル名の自動修正</string>
     <string name="charset_letters_and_digits">文字と数字</string>
-    <string name="charset_most_special_characters">ほとんどの特殊文字</string>
+    <string name="charset_most_special_characters">文字と数字に加え、ほとんどの特殊文字</string>
     <string name="donation_title">寄付</string>
     <string name="donation_encouragement">NewPipe は、あなたに最高の体験を味わってもらうために、ボランティアが自分たちの時間を使って開発しています。開発者たちがコーヒーを飲みながら NewPipe を継続的に改良できるよう、あなたのご支援をお願いします。</string>
     <string name="website_title">Webサイト</string>
@@ -225,16 +225,16 @@
     <string name="play_queue_stream_detail">詳細</string>
     <string name="play_queue_audio_settings">音声の設定</string>
     <string name="toggle_orientation">画面を回転</string>
-    <string name="switch_to_background">バックグラウンド再生に変更</string>
-    <string name="switch_to_popup">ポップアップ再生に変更</string>
-    <string name="switch_to_main">メイン再生に変更</string>
+    <string name="switch_to_background">バックグラウンド再生を開始</string>
+    <string name="switch_to_popup">ポップアップ再生を開始</string>
+    <string name="switch_to_main">メイン再生に切り替え</string>
     <string name="no_player_found_toast">動画プレイヤーが見つかりません (VLCをインストールして再生できます)。</string>
-    <string name="default_content_country_title">デフォルトのコンテンツの国</string>
+    <string name="default_content_country_title">デフォルトの地域設定</string>
     <string name="service_title">サービス</string>
     <string name="always">常に</string>
     <string name="just_once">一度だけ</string>
-    <string name="import_data_title">データベースのインポート</string>
-    <string name="export_data_title">データベースのエクスポート</string>
+    <string name="import_data_title">データベースをインポート</string>
+    <string name="export_data_title">データベースをエクスポート</string>
     <string name="import_data_summary">既存の履歴と購読リストは上書きされます</string>
     <string name="export_data_summary">履歴や購読リスト、プレイリストをエクスポートします</string>
     <string name="player_recoverable_failure">再生エラーからの回復中</string>
@@ -269,8 +269,8 @@
     <string name="file">ファイル</string>
     <string name="video_streams_empty">動画が見つかりません</string>
     <string name="audio_streams_empty">音声が見つかりません</string>
-    <string name="invalid_directory">そのフォルダーはありません</string>
-    <string name="invalid_file">ファイルが存在しないか、ファイルへの読み書きができません</string>
+    <string name="invalid_directory">フォルダーが見つかりません</string>
+    <string name="invalid_file">ファイルが存在しないか、読み書きする権限がありません</string>
     <string name="file_name_empty_error">ファイル名は空白にできません</string>
     <string name="error_occurred_detail">エラーが発生しました: %1$s</string>
     <string name="no_streams_available_download">ダウンロードできる動画はありません</string>
@@ -328,11 +328,11 @@
     <string name="privacy_policy_title">NewPipe プライバシーポリシー</string>
     <string name="read_privacy_policy">プライバシーポリシーを確認</string>
     <string name="use_inexact_seek_title">おおまかなシーク</string>
-    <string name="use_inexact_seek_summary">おおまかなシークを使用すると、正確さ下がりますが、高速なシークが可能になります</string>
+    <string name="use_inexact_seek_summary">おおまかなシークを使用すると、正確さが下がりますが高速なシークが可能になります</string>
     <string name="download_thumbnail_summary">すべてのサムネイルの読み込みと保存を無効化します、このオプションを切り替えるとメモリおよびディスク上の画像キャッシュがクリアされます。</string>
     <string name="auto_queue_summary">繰り返しでないキューの最後の動画を再生時、関連動画を自動的にキューに追加する。</string>
-    <string name="delete_view_history_alert">すべての再生履歴を削除します？</string>
-    <string name="delete_search_history_alert">すべての検索履歴を削除します？</string>
+    <string name="delete_view_history_alert">すべての再生履歴を削除しますか？</string>
+    <string name="delete_search_history_alert">すべての検索履歴を削除しますか？</string>
     <string name="invalid_source">このファイル/コンテンツはありません</string>
     <plurals name="subscribers">
         <item quantity="other">登録者数 %s 人</item>
@@ -351,7 +351,7 @@
     <string name="title_last_played">最終再生日時</string>
     <string name="title_most_played">最も再生した動画</string>
     <string name="resize_zoom">ズーム</string>
-    <string name="controls_add_to_playlist_title">追加...</string>
+    <string name="controls_add_to_playlist_title">プレイリスト</string>
     <string name="show_hold_to_append_title">「長押しして追加」のヒントを表示</string>
     <string name="tracks">トラック</string>
     <string name="notification_channel_description">NewPipe バックグラウンドおよびポップアップのプレーヤーの通知</string>
@@ -407,10 +407,10 @@
     <string name="settings_category_updates_title">更新</string>
     <string name="events">催し物</string>
     <string name="app_update_notification_channel_description">新しい NewPipe バージョンの通知</string>
-    <string name="download_to_sdcard_error_title">外部記憶装置きません</string>
+    <string name="download_to_sdcard_error_title">外部記憶装置は利用できません</string>
     <string name="restore_defaults">既定値に戻す</string>
     <string name="restore_defaults_confirmation">既定の設定を復元しますか\?</string>
-    <string name="subscribers_count_not_available">加入者数は利用できません</string>
+    <string name="subscribers_count_not_available">登録者数は表示できません</string>
     <string name="selection">選択</string>
     <string name="conferences">会議</string>
     <string name="start_accept_privacy_policy">ヨーロッパの一般データ保護規制（GDPR）に準拠するために、NewPipeの個人情報保護方針にご注意ください。よく読んでください。
@@ -456,12 +456,12 @@
     <string name="max_retry_desc">ダウンロードをキャンセルする前に試行の最大数</string>
     <string name="volume_gesture_control_title">音量ジェスチャー制御</string>
     <string name="volume_gesture_control_summary">ジェスチャーを使用して、プレーヤーの音量を制御します</string>
-    <string name="brightness_gesture_control_title">明るさジェスチャー制御</string>
+    <string name="brightness_gesture_control_title">明るさのジェスチャー制御</string>
     <string name="brightness_gesture_control_summary">ジェスチャーを使用して、プレーヤーの明るさを制御します</string>
     <string name="file_deleted">ファイルを削除しました</string>
     <string name="app_update_notification_channel_name">アプリの更新通知</string>
     <string name="download_to_sdcard_error_message">まだ外部 SD カードにダウンロードできません。ダウンロードフォルダーの場所をリセットしますか\?</string>
-    <string name="saved_tabs_invalid_json">デフォルトのタブを使用します。保存タブの読み取りエラーが発生しました</string>
+    <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>

From 5314e275bc3209aa837d154fd73e894cadde8e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Strecke?= <soeren.strecke@live.de>
Date: Wed, 24 Apr 2019 06:10:14 +0000
Subject: [PATCH 074/138] Translated using Weblate (German)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 452fd01bf..f83ed7b65 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -410,7 +410,7 @@
     <string name="channels">Kanäle</string>
     <string name="playlists">Wiedergabelisten</string>
     <string name="tracks">Titel</string>
-    <string name="users">Nutzer</string>
+    <string name="users">Benutzer</string>
     <string name="unsubscribe">Deabonnieren</string>
     <string name="tab_new">Neuer Tab</string>
     <string name="tab_choose">Tab wählen</string>

From c300d52b294a8b54feba3663d3fb0b701cc11947 Mon Sep 17 00:00:00 2001
From: Jesper Hertel <jesper.hertel@gmail.com>
Date: Wed, 24 Apr 2019 11:08:12 +0000
Subject: [PATCH 075/138] Translated using Weblate (Danish)

Currently translated at 87.1% (386 of 443 strings)
---
 app/src/main/res/values-da/strings.xml | 136 ++++++++++++++-----------
 1 file changed, 75 insertions(+), 61 deletions(-)

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index bd1e27af9..6143dc6b0 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources><string name="main_bg_subtitle">Tryk søg for at komme i gang</string>
+<resources>
+    <string name="main_bg_subtitle">Tryk søg for at komme i gang</string>
     <string name="view_count_text">%1$s visninger</string>
-    <string name="upload_date_text">Udgivet den %1$s</string>
+    <string name="upload_date_text">Udgivet %1$s</string>
     <string name="no_player_found">Ingen streamafspiller blev fundet. Vil du installere VLC\?</string>
-    <string name="no_player_found_toast">Ingen streamafspiller blev fundet (du kan installere VLC for at afspille den).</string>
+    <string name="no_player_found_toast">Ingen streamafspiller fundet (du kan installere VLC for at afspille den).</string>
     <string name="install">Installer</string>
     <string name="cancel">Annuller</string>
-    <string name="open_in_browser">åben i browser</string>
-    <string name="open_in_popup_mode">Åben i popup tilstand</string>
+    <string name="open_in_browser">Åbn i browser</string>
+    <string name="open_in_popup_mode">Åbn i pop op-tilstand</string>
     <string name="share">Del</string>
     <string name="download">Download</string>
-    <string name="controls_download_desc">Download stream fil</string>
+    <string name="controls_download_desc">Download stream-fil</string>
     <string name="search">Søg</string>
     <string name="settings">Indstillinger</string>
     <string name="did_you_mean">Mente du: %1$s\?</string>
@@ -18,64 +19,64 @@
     <string name="choose_browser">Vælg browser</string>
     <string name="screen_rotation">rotation</string>
     <string name="use_external_video_player_title">Benyt ekstern videoafspiller</string>
-    <string name="use_external_video_player_summary">Fjerner lyd ved nogle opløsninger</string>
+    <string name="use_external_video_player_summary">Fjerner lyd ved NOGLE opløsninger</string>
     <string name="use_external_audio_player_title">Brug ekstern lydafspiller</string>
-    <string name="popup_mode_share_menu_title">NewPipe popup tilstand</string>
+    <string name="popup_mode_share_menu_title">NewPipe pop op-tilstand</string>
     <string name="subscribe_button_title">Abonner</string>
     <string name="subscribed_button_title">Abonneret</string>
-    <string name="unsubscribe">Afmeld Abonnement</string>
-    <string name="channel_unsubscribed">Abonnement afmeldt for kanal</string>
+    <string name="unsubscribe">Afmeld abonnement</string>
+    <string name="channel_unsubscribed">Abonnement afmeldt</string>
     <string name="subscription_change_failed">Kunne ikke ændre abonnement</string>
-    <string name="subscription_update_failed">Kunne ikke opdatere abonnoment</string>
+    <string name="subscription_update_failed">Kunne ikke opdatere abonnement</string>
     <string name="show_info">Vis info</string>
-    <string name="tab_main">Forside</string>
-    <string name="tab_subscriptions">Abbonnomenter</string>
-    <string name="tab_bookmarks">Gemte Playlister</string>
-    <string name="tab_new">Ny Tab</string>
-    <string name="tab_choose">Vælg Tab</string>
+    <string name="tab_main">Primær</string>
+    <string name="tab_subscriptions">Abonnementer</string>
+    <string name="tab_bookmarks">Gemte spillelister</string>
+    <string name="tab_new">Ny fane</string>
+    <string name="tab_choose">Vælg fane</string>
     <string name="fragment_whats_new">Nyheder</string>
     <string name="controls_background_title">Baggrund</string>
-    <string name="controls_popup_title">Popup</string>
-    <string name="controls_add_to_playlist_title">Tilføj Til</string>
-    <string name="download_path_title">Video download sti</string>
-    <string name="download_path_summary">Sti til gemme downloade videoer</string>
-    <string name="download_path_dialog_title">Indtast download mappe for videoer</string>
-    <string name="download_path_audio_title">Lyd download mappe</string>
+    <string name="controls_popup_title">Pop op</string>
+    <string name="controls_add_to_playlist_title">Føj til</string>
+    <string name="download_path_title">Placering af videodownloads</string>
+    <string name="download_path_summary">Mappe som videoer skal downloades til</string>
+    <string name="download_path_dialog_title">Angiv downloadmappe for videoer</string>
+    <string name="download_path_audio_title">Downloadmappe for lydfiler</string>
     <string name="download_path_audio_summary">Downloadede lydfiler bliver gemt her</string>
-    <string name="download_path_audio_dialog_title">Indtast download mappe for lydfiler</string>
+    <string name="download_path_audio_dialog_title">Angiv downloadmappe for lydfiler</string>
     <string name="autoplay_by_calling_app_title">Afspil automatisk</string>
-    <string name="autoplay_by_calling_app_summary">Afspil en video ny NewPipe bliver åbnet fra en anden app</string>
-    <string name="default_resolution_title">Standard opløsning</string>
-    <string name="default_popup_resolution_title">Stadard popup opløsning</string>
+    <string name="autoplay_by_calling_app_summary">Afspiller video automatisk når NewPipe bliver åbnet fra en anden app</string>
+    <string name="default_resolution_title">Standardopløsning</string>
+    <string name="default_popup_resolution_title">Standardopløsning for pop op</string>
     <string name="show_higher_resolutions_title">Vis højere opløsninger</string>
-    <string name="show_higher_resolutions_summary">Ikke alle enheder understøtter afspilning af 2K/4K videoer</string>
+    <string name="show_higher_resolutions_summary">Ikke alle enheder understøtter afspilning af 2K/4K-videoer</string>
     <string name="play_with_kodi_title">Afspil med Kodi</string>
-    <string name="kore_not_found">Kore appen kunne ikke findes. Installer den\?</string>
-    <string name="show_play_with_kodi_title">Vis \"Afspil med Kodi\" valgmulighed</string>
-    <string name="show_play_with_kodi_summary">Vis en knap til at afspille en video via Kode Media Center</string>
+    <string name="kore_not_found">Kore-appen ikke fundet. Installer den\?</string>
+    <string name="show_play_with_kodi_title">Vis valgmuligheden \"Afspil med Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Vis en knap til at afspille en video via Kodi-mediecenteret</string>
     <string name="play_audio">Lyd</string>
-    <string name="default_audio_format_title">Standard lydfilformat</string>
-    <string name="default_video_format_title">Standard videofilformat</string>
+    <string name="default_audio_format_title">Standardformat for lydfiler</string>
+    <string name="default_video_format_title">Standardformat for videofiler</string>
     <string name="theme_title">Tema</string>
-    <string name="light_theme_title">Lys</string>
-    <string name="dark_theme_title">Mørk</string>
+    <string name="light_theme_title">Lyst</string>
+    <string name="dark_theme_title">Mørkt</string>
     <string name="black_theme_title">Sort</string>
-    <string name="popup_remember_size_pos_title">Husk popup størrelse og position</string>
-    <string name="popup_remember_size_pos_summary">Husk sidste størelse og position for popup afspiller</string>
+    <string name="popup_remember_size_pos_title">Husk pop op-størrelse og -position</string>
+    <string name="popup_remember_size_pos_summary">Husk sidste størrelse og placering af pop op-afspiller</string>
     <string name="use_inexact_seek_title">Brug hurtig og upræcis søgning</string>
-    <string name="use_inexact_seek_summary">Upræcis søgning gør det hurtigere at søge i afspilningen, men med dårligere præcision</string>
-    <string name="download_thumbnail_title">Indlæs billeder</string>
-    <string name="download_thumbnail_summary">Når slået fra indlæses billeder ikke, derved spares der på netværks og hukommelses forbrug. Ændringer sletter både cachen i ram og på disk.</string>
-    <string name="thumbnail_cache_wipe_complete_notice">Billed cache slettet</string>
-    <string name="metadata_cache_wipe_title">Slet cached metadata</string>
-    <string name="metadata_cache_wipe_summary">Slet alt cached webside data</string>
-    <string name="metadata_cache_wipe_complete_notice">Metadata cache slettet</string>
-    <string name="auto_queue_title">Tilføj automatisk næste stream til køen</string>
-    <string name="auto_queue_summary">Tilføj relaterede streams til køen automatisk når den sidste stream i køen afspilles. Gælder ikke hvis køen er gentagene.</string>
+    <string name="use_inexact_seek_summary">Upræcis søgning lader afspilleren finde placeringer hurtigere, men mindre præcist</string>
+    <string name="download_thumbnail_title">Indlæs miniaturebilleder</string>
+    <string name="download_thumbnail_summary">Slå fra for at undgå indlæsning af billeder, hvorved der spares data og hukommelse. Ændringer sletter billedcachen i både ram og lager.</string>
+    <string name="thumbnail_cache_wipe_complete_notice">Billedcache slettet</string>
+    <string name="metadata_cache_wipe_title">Slet metadata-cachen</string>
+    <string name="metadata_cache_wipe_summary">Slet alle websidedata fra cachen</string>
+    <string name="metadata_cache_wipe_complete_notice">Metadata-cache slettet</string>
+    <string name="auto_queue_title">Føj automatisk næste stream til køen</string>
+    <string name="auto_queue_summary">Føj automatisk relaterede streams til køen når den sidste stream i en ikke-repeterende kø afspilles.</string>
     <string name="volume_gesture_control_title">Juster lydstyrke ved hjælp af fingerkontrol</string>
     <string name="volume_gesture_control_summary">Brug håndbevægelser til at kontrollere lydstyrke</string>
-    <string name="brightness_gesture_control_title">Lysstyrke håndbævegesleskontorl</string>
-    <string name="brightness_gesture_control_summary">Burg håndbevægelser til at justere lysstyrke</string>
+    <string name="brightness_gesture_control_title">Styr lysstyrken med fingerbevægelser</string>
+    <string name="brightness_gesture_control_summary">Brug fingerbevægelser til at justere afspillerens lysstyrke</string>
     <string name="player_gesture_controls_title">Afspiller håndbevægelseskontol</string>
     <string name="player_gesture_controls_summary">Brug håndbevægelser til at justere lysstyrke og lydstyrke</string>
     <string name="show_search_suggestions_title">Søg i foreslag</string>
@@ -112,7 +113,7 @@
     <string name="play_btn_text">Afspil</string>
     <string name="content">Inhold</string>
     <string name="show_age_restricted_content_title">Aldersbegrænset inhold</string>
-    <string name="video_is_age_restricted">Vis aldersbegrænset video. Det er er muligt at tillade sådanne video under indstillinger.</string>
+    <string name="video_is_age_restricted">Vis aldersbegrænsede videoer. Du kan tillade den slags videoer under Indstillinger.</string>
     <string name="duration_live">LIVE</string>
     <string name="downloads">Downloads</string>
     <string name="downloads_title">Downloads</string>
@@ -123,9 +124,9 @@
     <string name="playlist">Playliste</string>
     <string name="playlists">Playlister</string>
     <plurals name="videos">
-    <item quantity="one">Videoer</item>
-    <item quantity="other"></item>
-</plurals>
+        <item quantity="one">Video</item>
+        <item quantity="other">Videoer</item>
+    </plurals>
     <string name="tracks">Numre</string>
     <string name="users">Brugere</string>
     <string name="yes">Ja</string>
@@ -156,8 +157,8 @@
     <string name="switch_to_main">Skift til Forside</string>
     <string name="import_data_title">Importer database</string>
     <string name="export_data_title">Eksporter database</string>
-    <string name="import_data_summary">Overskriver din nuværende historie og abebonomenter</string>
-    <string name="export_data_summary">Eksporter historie, abebonomenter and playlister</string>
+    <string name="import_data_summary">Overskriver din nuværende historie og abonnementer</string>
+    <string name="export_data_summary">Eksporter historie, abonnementer og spillelister</string>
     <string name="clear_views_history_title">Slet visningshistorik</string>
     <string name="clear_views_history_summary">Sletter historien af viste videoer</string>
     <string name="delete_view_history_alert">Slet hele visningshistorikken\?</string>
@@ -168,7 +169,7 @@
     <string name="search_history_deleted">Søgehistorik slettet.</string>
     <string name="general_error">Fejl</string>
     <string name="download_to_sdcard_error_title">Ekstern lagring utilgængelig</string>
-    <string name="download_to_sdcard_error_message">Download til til eksternt SD kort er ikke muligt i øjeblikket. Genskab download mappe indstilinning\?</string>
+    <string name="download_to_sdcard_error_message">Download til eksternt SD-kort er endnu ikke muligt. Nulstil placering af download-mappe\?</string>
     <string name="network_error">Netwærksfejl</string>
     <string name="could_not_load_thumbnails">Kunne indlæse alle billeder</string>
     <string name="youtube_signature_decryption_error">Kunne ikke dekryptere video URL signatur</string>
@@ -221,13 +222,13 @@
     <string name="audio">Lyd</string>
     <string name="retry">Prøv igen</string>
     <string name="storage_permission_denied">Adgang til hulkomekse nægtet</string>
-    <string name="no_subscribers">Ingen abbonenter</string>
-    <string name="subscribers_count_not_available">Antal af abonnementer er ikke tilgængeligt</string>
+    <string name="no_subscribers">Ingen abonnenter</string>
+    <string name="subscribers_count_not_available">Antallet af abonnenter er ikke tilgængeligt</string>
     <string name="no_views">Ingen visninger</string>
     <plurals name="views">
-    <item quantity="one">%s visning</item>
-    <item quantity="other">%s visninger</item>
-</plurals>
+        <item quantity="one">%s visning</item>
+        <item quantity="other">%s visninger</item>
+    </plurals>
     <string name="no_videos">Ingen Videoer</string>
     <string name="start">Start</string>
     <string name="view">Afspil</string>
@@ -308,10 +309,10 @@
     <string name="selection">Udvalg</string>
     <string name="blank_page_summary">Blank Side</string>
     <string name="kiosk_page_summary">Kiosk Side</string>
-    <string name="subscription_page_summary">Abonnement Side</string>
+    <string name="subscription_page_summary">Abonnementsside</string>
     <string name="channel_page_summary">Kanalside</string>
     <string name="select_a_channel">Vælg en kanal</string>
-    <string name="no_channel_subscribed_yet">Ingen kanal abebonomenter endnu</string>
+    <string name="no_channel_subscribed_yet">Ingen kanalabonnementer endnu</string>
     <string name="select_a_kiosk">Vælg en kiosk</string>
     <string name="export_complete_toast">Eksporteret</string>
     <string name="import_complete_toast">Importeret</string>
@@ -391,4 +392,17 @@
     <string name="error_http_not_found">Ikke fundet</string>
     <string name="error_postprocessing_failed">Efterbehandling fejlede</string>
     <string name="stop">Stop</string>
+    <string name="events">Hændelser</string>
+    <string name="empty_subscription_feed_subtitle">Intet at se her</string>
+    <string name="short_thousand">K</string>
+    <string name="short_million">mio.</string>
+    <string name="short_billion">mia.</string>
+    <plurals name="subscribers">
+        <item quantity="one">%s abonnent</item>
+        <item quantity="other">%s abonnenter</item>
+    </plurals>
+    <string name="pause">Pause</string>
+    <string name="feed_page_summary">Feed-side</string>
+    <string name="subscriptions_import_unsuccessful">Kunne ikke importere abonnementer</string>
+    <string name="subscriptions_export_unsuccessful">Kunne ikke eksportere abonnementer</string>
 </resources>
\ No newline at end of file

From 1d63b395530fb1aef4e77a7ab61662f4e157c886 Mon Sep 17 00:00:00 2001
From: Marc Riera <marc.riera.irigoyen@gmail.com>
Date: Thu, 25 Apr 2019 14:20:12 +0000
Subject: [PATCH 076/138] Translated using Weblate (Catalan)

Currently translated at 91.6% (406 of 443 strings)
---
 app/src/main/res/values-ca/strings.xml | 83 +++++---------------------
 1 file changed, 14 insertions(+), 69 deletions(-)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 78608c2a5..9953766e1 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources><string name="install">Instal·la</string>
+<resources>
+    <string name="install">Instal·la</string>
     <string name="cancel">Cancel·la</string>
     <string name="open_in_browser">Obre al navegador</string>
     <string name="share">Comparteix</string>
@@ -10,12 +11,9 @@
     <string name="subscribe_button_title">Subscriu-t\'hi</string>
     <string name="subscribed_button_title">Subscrit</string>
     <string name="show_info">Mostra la informació</string>
-
     <string name="tab_subscriptions">Subscripcions</string>
     <string name="tab_bookmarks">Llistes de reproducció desades</string>
-
     <string name="fragment_whats_new">Novetats</string>
-
     <string name="download_path_title">Ruta de baixada dels vídeos</string>
     <string name="download_path_audio_title">Carpeta de baixada dels fitxers d\'àudio</string>
     <string name="autoplay_by_calling_app_title">Reproducció automàtica</string>
@@ -54,9 +52,7 @@
     <string name="always">Sempre</string>
     <string name="just_once">Només una vegada</string>
     <string name="file">Fitxer</string>
-
     <string name="unknown_content">[Desconegut]</string>
-
     <string name="import_data_title">Importa una base de dades</string>
     <string name="export_data_title">Exporta una base de dades</string>
     <string name="export_data_summary">Exporta l\'historial, les subscripcions i les llistes de reproducció</string>
@@ -65,12 +61,10 @@
     <string name="video">Vídeo</string>
     <string name="audio">Àudio</string>
     <plurals name="subscribers">
-	<item quantity="one">%s subscriptor</item>
-	<item quantity="other">%s subscriptors</item>
-</plurals>
-
+        <item quantity="one">%s subscriptor</item>
+        <item quantity="other">%s subscriptors</item>
+    </plurals>
     <string name="finish">D\'acord</string>
-
     <string name="msg_name">Nom de fitxer</string>
     <string name="msg_error">Error</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
@@ -87,8 +81,6 @@
     <string name="website_title">Lloc web</string>
     <string name="app_license_title">Llicència del NewPipe</string>
     <string name="read_full_license">Llegeix la llicència</string>
-
-
     <string name="title_activity_history">Historial</string>
     <string name="history_disabled">L\'historial està desactivat</string>
     <string name="action_history">Historial</string>
@@ -111,7 +103,6 @@
     <string name="background_player">Reproductor en segon pla</string>
     <string name="popup_player">Reproductor emergent</string>
     <string name="always_ask_open_action">Demana-ho sempre</string>
-
     <string name="create_playlist">Crea una llista de reproducció</string>
     <string name="delete_playlist">Elimina</string>
     <string name="rename_playlist">Canvia el nom</string>
@@ -120,13 +111,11 @@
     <string name="import_title">Importa</string>
     <string name="import_from">Importa des de</string>
     <string name="export_to">Exporta a</string>
-
     <string name="import_ongoing">S\'està important…</string>
     <string name="export_ongoing">S\'està exportant…</string>
-
     <string name="import_file_title">Importa un fitxer</string>
     <string name="playback_default">Per defecte</string>
-<string name="view_count_text">%1$s reproduccions</string>
+    <string name="view_count_text">%1$s reproduccions</string>
     <string name="upload_date_text">Publicat el %1$s</string>
     <string name="no_player_found">No s\'ha trobat un reproductor de fluxos. Voleu instal·lar el VLC?</string>
     <string name="no_player_found_toast">No s\'ha trobat cap reproductor de fluxos (podeu instal·lar el VLC per reproduir-lo).</string>
@@ -144,13 +133,10 @@
     <string name="controls_background_title">Segon pla</string>
     <string name="controls_popup_title">Emergent</string>
     <string name="controls_add_to_playlist_title">Afegeix a</string>
-
     <string name="download_path_summary">Ruta on es desaran els vídeos baixats</string>
     <string name="download_path_dialog_title">Introduïu una ruta de baixada per als vídeos</string>
-
     <string name="download_path_audio_summary">Els fitxers d\'àudio baixats es desaran aquí</string>
     <string name="download_path_audio_dialog_title">Introduïu una ruta de baixada per als fitxers d\'àudio</string>
-
     <string name="autoplay_by_calling_app_summary">Reprodueix un vídeo quan el NewPipe s\'executa des d\'una altra aplicació</string>
     <string name="default_popup_resolution_title">Resolució per defecte del mode emergent</string>
     <string name="show_higher_resolutions_title">Mostra resolucions superiors</string>
@@ -186,7 +172,6 @@
     <string name="play_btn_text">Reprodueix</string>
     <string name="notification_channel_name">Notificació del NewPipe</string>
     <string name="notification_channel_description">Notificacions dels reproductors en segon pla o emergents del NewPipe</string>
-
     <string name="could_not_load_thumbnails">No s\'han pogut carregar totes les miniatures</string>
     <string name="youtube_signature_decryption_error">No s\'ha pogut desencriptar la signatura de l\'URL del vídeo</string>
     <string name="parsing_error">No s\'ha pogut processar el lloc web</string>
@@ -216,8 +201,6 @@
     <string name="what_happened_headline">Què ha passat:</string>
     <string name="your_comment">Comentari (en anglès):</string>
     <string name="error_details_headline">Detalls:</string>
-
-
     <string name="list_thumbnail_view_description">Miniatura de previsualització del vídeo</string>
     <string name="detail_thumbnail_view_description">Miniatura de previsualització del vídeo</string>
     <string name="detail_uploader_thumbnail_view_description">Miniatura de l\'avatar del propietari</string>
@@ -231,25 +214,21 @@
     <string name="empty_subscription_feed_subtitle">No hi ha res aquí</string>
     <string name="err_dir_create">No s\'ha pogut crear el directori de baixades «%1$s»</string>
     <string name="info_dir_created">S\'ha creat el directori de baixades «%1$s»</string>
-
     <string name="retry">Torna a intentar-ho</string>
     <string name="storage_permission_denied">S\'ha denegat el permís d\'accés a l\'emmagatzematge</string>
     <string name="use_old_player_title">Fes servir el reproductor antic</string>
     <string name="use_old_player_summary">Antic reproductor integrat de Mediaframework</string>
-
     <string name="no_subscribers">Sense subscriptors</string>
     <string name="no_views">Sense reproduccions</string>
     <plurals name="views">
-	<item quantity="one">%s reproducció</item>
-	<item quantity="other">%s reproduccions</item>
-</plurals>
-
+        <item quantity="one">%s reproducció</item>
+        <item quantity="other">%s reproduccions</item>
+    </plurals>
     <string name="no_videos">Sense vídeos</string>
     <plurals name="videos">
-	<item quantity="one">%s vídeo</item>
-	<item quantity="other">%s vídeos</item>
-</plurals>
-
+        <item quantity="one">Vídeo</item>
+        <item quantity="other">Vídeos</item>
+    </plurals>
     <string name="pause">Pausa</string>
     <string name="view">Reprodueix</string>
     <string name="create">Crea</string>
@@ -259,7 +238,6 @@
     <string name="checksum">Suma de verificació</string>
     <string name="dismiss">Tanca</string>
     <string name="rename">Canvia el nom</string>
-
     <string name="msg_threads">Fils</string>
     <string name="msg_server_unsupported">Servidor incompatible</string>
     <string name="msg_exists">El fitxer ja existeix</string>
@@ -276,7 +254,6 @@
     <string name="website_encouragement">Per a més informació i notícies, visiteu el nostre lloc web.</string>
     <string name="title_last_played">Última reproducció</string>
     <string name="title_most_played">Més reproduïts</string>
-
     <string name="kiosk_page_summary">Pàgina d\'un quiosc</string>
     <string name="feed_page_summary">Pàgina de novetats</string>
     <string name="channel_page_summary">Pàgina d\'un canal</string>
@@ -284,7 +261,6 @@
     <string name="no_valid_zip_file">El fitxer no té un format ZIP vàlid</string>
     <string name="could_not_import_all_files">Avís: No s\'han pogut importar tots els fitxers.</string>
     <string name="override_current_data">Això sobreescriurà la configuració actual.</string>
-
     <string name="kiosk">Quiosc</string>
     <string name="trending">Tendències</string>
     <string name="top_50">Els millors 50</string>
@@ -297,10 +273,8 @@
     <string name="drawer_close">Tanca el calaix</string>
     <string name="preferred_player_fetcher_notification_title">S\'està obtenint la informació…</string>
     <string name="preferred_player_fetcher_notification_message">S\'està carregant el contingut seleccionat</string>
-
     <string name="delete_playlist_prompt">Voleu eliminar aquesta llista de reproducció?</string>
     <string name="playlist_delete_failure">No s\'ha pogut eliminar la llista de reproducció.</string>
-
     <string name="import_export_title">Importació i exportació</string>
     <string name="playback_speed_control">Controls de la velocitat de reproducció</string>
     <string name="playback_tempo">Tempo</string>
@@ -323,31 +297,24 @@
     <string name="switch_to_background">Canvia al mode en segon pla</string>
     <string name="switch_to_popup">Canvia al mode emergent</string>
     <string name="switch_to_main">Canvia al mode principal</string>
-
     <string name="import_data_summary">Sobreescriu l\'historial i les subscripcions actuals</string>
     <string name="player_recoverable_failure">S\'està recuperant el reproductor després de l\'error</string>
     <string name="sorry_string">Ho sentim, això no hauria d\'haver ocorregut.</string>
     <string name="detail_drag_description">Arrossegueu per a reordenar la llista</string>
-
     <string name="short_thousand">mil</string>
     <string name="short_million">milions</string>
     <string name="short_billion">mil milions</string>
-
     <string name="start">Inicia</string>
     <string name="add">Nova missió</string>
     <string name="msg_url_malform">L\'URL té un format incorrecte o no hi ha connexió a internet</string>
     <string name="msg_running_detail">Toqueu aquí per a més detalls</string>
     <string name="no_available_dir">Trieu una carpeta de baixades disponible</string>
     <string name="msg_popup_permission">Es necessita aquest permís per a obrir el mode emergent</string>
-
     <string name="reCaptcha_title">Camp reCAPTCHA</string>
     <string name="recaptcha_request_toast">S\'ha sol·licitat l\'emplenament d\'un camp reCAPTCHA</string>
-
     <string name="settings_file_replacement_character_summary">Se substituiran els caràcters no vàlids amb aquest valor</string>
     <string name="settings_file_replacement_character_title">Caràcter de substitució</string>
-
     <string name="charset_most_special_characters">Principals caràcters especials</string>
-
     <string name="contribution_encouragement">Ja siguin idees, traduccions, canvis en el disseny, una neteja del codi o canvis importants de programació, la vostra ajuda sempre és benvinguda. Com més feina feta hi hagi, millor!</string>
     <string name="donation_encouragement">El NewPipe està desenvolupat per voluntaris que fan servir el seu temps lliure per a oferir-vos la millor experiència possible. Feu una aportació per assegurar que els nostres desenvolupadors puguin millorar encara més el NewPipe mentre fan un cafè.</string>
     <string name="give_back">Fes la teva aportació</string>
@@ -358,33 +325,25 @@
     <string name="hold_to_append">Manteniu premut per afegir a la cua</string>
     <string name="start_here_on_background">Reprodueix aquí en segon pla</string>
     <string name="start_here_on_popup">Reprodueix aquí en mode emergent</string>
-
     <string name="set_as_playlist_thumbnail">Defineix com a miniatura de la llista de reproducció</string>
-
     <string name="bookmark_playlist">Afegeix la llista de reproducció a les adreces d\'interès</string>
     <string name="unbookmark_playlist">Elimina l\'adreça d\'interès</string>
-
     <string name="playlist_creation_success">S\'ha creat la llista de reproducció</string>
     <string name="playlist_add_stream_success">S\'ha afegit a la llista de reproducció</string>
     <string name="playlist_thumbnail_change_success">S\'ha canviat la miniatura de la llista de reproducció.</string>
     <string name="caption_none">Sense subtítols</string>
-
     <string name="resize_fit">Ajusta</string>
     <string name="resize_fill">Omple</string>
     <string name="resize_zoom">Escala</string>
-
     <string name="caption_auto_generated">Generats automàticament</string>
     <string name="caption_font_size_settings_title">Mida dels subtítols</string>
     <string name="smaller_caption_font_size">Mida més petita</string>
     <string name="normal_caption_font_size">Mida normal</string>
     <string name="larger_caption_font_size">Mida més gran</string>
-
     <string name="enable_leak_canary_title">Habilita el LeakCanary</string>
     <string name="previous_export">Darrera exportació</string>
-
     <string name="subscriptions_import_unsuccessful">No s\'han pogut importar les subscripcions</string>
     <string name="subscriptions_export_unsuccessful">No s\'han pogut exportar les subscripcions</string>
-
     <string name="unhook_checkbox">Desvincula (pot provocar distorsió)</string>
     <string name="playback_nightcore">Nightcore</string>
     <string name="metadata_cache_wipe_summary">Elimina totes les dades de llocs web de la memòria cau</string>
@@ -393,16 +352,11 @@
     <string name="show_hold_to_append_summary">Mostra un missatge d\'ajuda quan el botó de mode en segon pla o emergent estigui premut a la pàgina de detalls d\'un vídeo</string>
     <string name="info_labels">Què ha passat:\\nPetició:\\nIdioma del contingut:\\nServei:\\nHora GMT:\\nPaquet:\\nVersió:\\nVersió del SO:</string>
     <string name="drawer_header_action_paceholder_text">Aviat hi haurà novetats aquí ;D</string>
-
-
     <string name="preferred_open_action_settings_title">Acció d\'obertura preferida</string>
     <string name="preferred_open_action_settings_summary">Acció per defecte en obrir continguts — %s</string>
-
     <string name="enable_leak_canary_summary">"La supervisió de fugues de memòria pot fer que l\'aplicació deixi de respondre mentre es bolca la memòria "</string>
-
     <string name="enable_disposed_exceptions_title">Informa d\'errors fora del cicle de vida</string>
     <string name="enable_disposed_exceptions_summary">Força l\'informe d\'excepcions Rx que no es puguin transmetre que tinguin lloc fora del cicle de vida d\'un fragment o activitat després de disposar-los</string>
-
     <string name="import_youtube_instructions">Importeu les vostres subscripcions de YouTube mitjançant el fitxer d\'exportació:
 \n 
 \n1. Aneu a aquesta URL: %1$s 
@@ -415,18 +369,13 @@
 \n3. Inicieu sessió al vostre compte quan se us demani 
 \n4. Copieu l\'URL de la pàgina on se us redireccioni</string>
     <string name="import_soundcloud_instructions_hint">identificador, soundcloud.com/identificador</string>
-
     <string name="import_network_expensive_warning">Tingueu en compte que això pot comportar un ús intensiu de la xarxa.
 \n
 \nVoleu continuar?</string>
-
     <string name="no_streams_available_download">No hi ha vídeos que es puguin baixar</string>
-
     <string name="caption_setting_title">Subtítols</string>
     <string name="caption_setting_description">Modifica la mida del text i el fons dels subtítols. Cal reiniciar l\'aplicació per aplicar els canvis.</string>
-
     <string name="toast_no_player">No s\'ha trobat cap aplicació que pugui reproduir aquest fitxer</string>
-
     <string name="clear_views_history_title">Esborra l\'historial de reproduccions</string>
     <string name="clear_views_history_summary">Esborra l\'historial dels vídeos que s\'han reproduït</string>
     <string name="delete_view_history_alert">Voleu esborrar tot l\'historial de reproduccions\?</string>
@@ -436,10 +385,8 @@
     <string name="delete_search_history_alert">Voleu esborrar tot l\'historial de cerca\?</string>
     <string name="search_history_deleted">S\'ha esborrat l\'historial de cerca.</string>
     <string name="one_item_deleted">S\'ha esborrat 1 element.</string>
-
     <string name="app_license">NewPipe és programari lliure sota llicència copyleft: podeu fer-lo servir, estudiar-lo, compartir-lo i millorar-lo al vostre gust. En concret, podeu redistribuir-lo i/o modificar-lo d\'acord amb els termes de la llicència GNU GPL publicada per la Free Software Foundation, ja sigui la versió 3 o (segons vulgueu) qualsevol altra versió posterior.</string>
     <string name="import_settings">Voleu importar també la configuració?</string>
-
     <string name="privacy_policy_title">Política de privacitat del NewPipe</string>
     <string name="privacy_policy_encouragement">El projecte NewPipe es pren molt seriosament la vostra privacitat. Per aquesta raó, l\'aplicació no emmagatzema cap mena de dades sense el vostre consentiment.
 \nLa política de privacitat del NewPipe descriu detalladament quines dades s\'envien i s\'emmagatzemen quan envieu un informe d\'error.</string>
@@ -448,18 +395,16 @@
 \nSi voleu enviar-nos un informe d\'error, l\'haureu d\'acceptar.</string>
     <string name="accept">Accepta</string>
     <string name="decline">Rebutja</string>
-<string name="limit_data_usage_none_description">Sense restriccions</string>
+    <string name="limit_data_usage_none_description">Sense restriccions</string>
     <string name="limit_mobile_data_usage_title">Restringeix la resolució quan es facin servir dades mòbils</string>
     <string name="minimize_on_exit_title">Minimitza en canviar d\'aplicació</string>
     <string name="minimize_on_exit_summary">Acció en canviar a una altra aplicació des del reproductor de vídeo principal — %s</string>
     <string name="minimize_on_exit_none_description">Cap</string>
     <string name="minimize_on_exit_background_description">Minimitza al reproductor en segon pla</string>
     <string name="minimize_on_exit_popup_description">Minimitza al reproductor emergent</string>
-
-<string name="skip_silence_checkbox">Avança ràpid durant el silenci</string>
+    <string name="skip_silence_checkbox">Avança ràpid durant el silenci</string>
     <string name="playback_step">Pas</string>
     <string name="playback_reset">Reinicialitza</string>
-
     <string name="channels">Canals</string>
     <string name="playlists">Llistes de reproducció</string>
     <string name="tracks">Pistes</string>

From a58af1275c94251797fdc03d7a2fce2b90842227 Mon Sep 17 00:00:00 2001
From: pjammo <adrianoghr@hotmail.it>
Date: Thu, 25 Apr 2019 16:46:37 +0000
Subject: [PATCH 077/138] Translated using Weblate (Italian)

Currently translated at 99.5% (441 of 443 strings)
---
 app/src/main/res/values-it/strings.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b53e82d54..ad9021f75 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2,17 +2,17 @@
 <resources>
     <string name="view_count_text">%1$s visualizzazioni</string>
     <string name="upload_date_text">Pubblicato il %1$s</string>
-    <string name="no_player_found">Nessun lettore multimediale trovato. Vuoi installare VLC?</string>
+    <string name="no_player_found">Nessun lettore multimediale trovato. Vuoi installare VLC\?</string>
     <string name="install">Installa</string>
     <string name="cancel">Annulla</string>
-    <string name="open_in_browser">Apri nel browser</string>
+    <string name="open_in_browser">Apri nel Browser</string>
     <string name="share">Condividi</string>
     <string name="download">Scarica</string>
     <string name="search">Cerca</string>
     <string name="settings">Impostazioni</string>
     <string name="did_you_mean">Intendevi: %1$s\?</string>
     <string name="share_dialog_title">Condividi con</string>
-    <string name="choose_browser">Scegli il browser</string>
+    <string name="choose_browser">Scegli Browser</string>
     <string name="screen_rotation">rotazione</string>
     <string name="download_path_title">Percorso dei video scaricati</string>
     <string name="download_path_summary">Cartella in cui salvare i video scaricati</string>
@@ -37,8 +37,8 @@
     <string name="detail_likes_img_view_description">Mi piace</string>
     <string name="err_dir_create">Impossibile creare la cartella di download \'%1$s\'</string>
     <string name="info_dir_created">Creata la cartella per i download \'%1$s\'</string>
-    <string name="use_external_video_player_title">Usa un lettore video esterno</string>
-    <string name="use_external_audio_player_title">Usa un lettore audio esterno</string>
+    <string name="use_external_video_player_title">Usa Lettore Video Esterno</string>
+    <string name="use_external_audio_player_title">Usa Lettore Audio Esterno</string>
     <string name="download_path_audio_title">Cartella degli audio scaricati</string>
     <string name="download_path_audio_summary">Cartella in cui salvare gli audio scaricati</string>
     <string name="download_path_audio_dialog_title">Inserisci la cartella per gli audio scaricati</string>
@@ -118,8 +118,8 @@
     <string name="recaptcha_request_toast">È richiesta la risoluzione del reCAPTCHA</string>
     <string name="yes">Sì</string>
     <string name="later">Più tardi</string>
-    <string name="open_in_popup_mode">Apri in modalità popup</string>
-    <string name="popup_mode_share_menu_title">Modalità popup di NewPipe</string>
+    <string name="open_in_popup_mode">Apri in Modalità Popup</string>
+    <string name="popup_mode_share_menu_title">Modalità Popup di NewPipe</string>
     <string name="popup_playing_toast">Riproduzione in modalità popup</string>
     <string name="disabled">Disattivato</string>
     <string name="use_old_player_title">Usa il vecchio lettore multimediale</string>
@@ -163,7 +163,7 @@
     <string name="title_activity_about">Informazioni su NewPipe</string>
     <string name="subscribe_button_title">Iscriviti</string>
     <string name="subscribed_button_title">Iscritto</string>
-    <string name="channel_unsubscribed">Disiscritto dal canale</string>
+    <string name="channel_unsubscribed">Disiscritto dal Canale</string>
     <string name="subscription_change_failed">Impossibile cambiare l\'iscrizione</string>
     <string name="subscription_update_failed">Impossibile aggiornare l\'iscrizione</string>
     <string name="tab_subscriptions">Iscrizioni</string>

From c47d4fd35ad07ed67622e129da8c2b35c70511b2 Mon Sep 17 00:00:00 2001
From: Chandra Mohan Jha <chandramohanjha@tuta.io>
Date: Sat, 27 Apr 2019 07:55:18 +0000
Subject: [PATCH 078/138] Translated using Weblate (Hindi)

Currently translated at 74.5% (330 of 443 strings)
---
 app/src/main/res/values-hi/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 06f53dcd6..7e8400456 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -6,7 +6,7 @@
     <string name="install">इंस्टॉल करें</string>
     <string name="open_in_browser">ब्राउज़र में खोलें</string>
     <string name="open_in_popup_mode">पॉपअप मोड में खोलें</string>
-    <string name="share">शेयर करें</string>
+    <string name="share">साझा करें</string>
     <string name="download">डाउनलोड</string>
     <string name="search">खोजें</string>
     <string name="settings">सेटिंग्स</string>
@@ -23,7 +23,7 @@
     <string name="play_audio">ऑडियो</string>
     <string name="light_theme_title">हलका</string>
     <string name="black_theme_title">काली</string>
-    <string name="enable_watch_history_title">पूर्व और कैश</string>
+    <string name="enable_watch_history_title">इतिहास व कॅशे</string>
     <string name="download_dialog_title">डाउनलोड</string>
     <string name="next_video_title">अगला</string>
     <string name="settings_category_video_audio_title">वीडियो और ऑडियो</string>
@@ -92,9 +92,9 @@
     <string name="show_search_suggestions_summary">जब कुछ ढूंड रहे हो तो सुझाव दिखाये</string>
     <string name="enable_search_history_title">खोज के इतिहास को देखे</string>
     <string name="enable_search_history_summary">खोज के query को फ़ोन की मेमोरी में ही रखे</string>
-    <string name="enable_watch_history_summary">देखे हुए वीडियोस का रिकॉर्ड रखें</string>
-    <string name="resume_on_audio_focus_gain_title">जब फोकस मिले तो विडियो resume हो</string>
-    <string name="resume_on_audio_focus_gain_summary">रूकावट आने पर भी विडियो को जारी रखे (जैसे - फ़ोन कॉल आये)</string>
+    <string name="enable_watch_history_summary">देखे हुए विडियो की सूची रखे</string>
+    <string name="resume_on_audio_focus_gain_title">फोकस मिलने पर विडियो पुनः आगे चले</string>
+    <string name="resume_on_audio_focus_gain_summary">रूकावट आने पर भी विडियो को जारी रखें (जैसे - फ़ोन कॉल आये)</string>
     <string name="show_next_and_similar_title">\'अगला\' और \'पहले समान\' वीडियो दिखाए</string>
     <string name="show_hold_to_append_title">\"जोड़ने के लिए पकड़ें रहे\" दिखाए</string>
     <string name="show_hold_to_append_summary">जब बैकग्राउंड और पॉपअप बटन विडियो के विवरण पन्ने में दबाई जाए तो tip को दिखाए</string>

From 8b1836d6999632600fa9bacb47e4cfe8688b879b Mon Sep 17 00:00:00 2001
From: sXp <sxp@tuta.io>
Date: Sat, 27 Apr 2019 07:55:35 +0000
Subject: [PATCH 079/138] Translated using Weblate (Hindi)

Currently translated at 74.5% (330 of 443 strings)
---
 app/src/main/res/values-hi/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 7e8400456..f9137430a 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -60,8 +60,8 @@
     <string name="use_external_video_player_summary">कुछ रेसोल्युशनस में नहीं आएगी</string>
     <string name="use_external_audio_player_title">अन्य ऑडियो प्लेयर उपयोग करें</string>
     <string name="tab_main">मुख्य</string>
-    <string name="subscription_change_failed">"सदस्यता को बदलने में असमर्थ "</string>
-    <string name="subscription_update_failed">सदस्यता को अद्यतित नहीं किया जा सका</string>
+    <string name="subscription_change_failed">सदस्यता नहीं बदला जा सका</string>
+    <string name="subscription_update_failed">सदस्यता का नवीनीकरण नहीं हो सका</string>
     <string name="fragment_whats_new">देखे की क्या नया है</string>
     <string name="download_path_title">विडियो को डाउनलोड करने के लिए फाइल की जगह</string>
     <string name="download_path_summary">डाउनलोड किए गए विडियो फाइल को रखने की जगह</string>

From 4a54fbb8729fd450ee0392805007dfe86af18f12 Mon Sep 17 00:00:00 2001
From: Chandra Mohan Jha <chandramohanjha@tuta.io>
Date: Sat, 27 Apr 2019 07:58:08 +0000
Subject: [PATCH 080/138] Translated using Weblate (Hindi)

Currently translated at 74.5% (330 of 443 strings)
---
 app/src/main/res/values-hi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index f9137430a..9755c26fb 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -61,7 +61,7 @@
     <string name="use_external_audio_player_title">अन्य ऑडियो प्लेयर उपयोग करें</string>
     <string name="tab_main">मुख्य</string>
     <string name="subscription_change_failed">सदस्यता नहीं बदला जा सका</string>
-    <string name="subscription_update_failed">सदस्यता का नवीनीकरण नहीं हो सका</string>
+    <string name="subscription_update_failed">सदस्यता का अद्यतन नहीं हो सका</string>
     <string name="fragment_whats_new">देखे की क्या नया है</string>
     <string name="download_path_title">विडियो को डाउनलोड करने के लिए फाइल की जगह</string>
     <string name="download_path_summary">डाउनलोड किए गए विडियो फाइल को रखने की जगह</string>

From aadbfe1eed453a0d43197d797989a90ae72fffea Mon Sep 17 00:00:00 2001
From: sXp <sxp@tuta.io>
Date: Sat, 27 Apr 2019 07:58:26 +0000
Subject: [PATCH 081/138] Translated using Weblate (Hindi)

Currently translated at 74.5% (330 of 443 strings)
---
 app/src/main/res/values-hi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 9755c26fb..b6f63e624 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -6,7 +6,7 @@
     <string name="install">इंस्टॉल करें</string>
     <string name="open_in_browser">ब्राउज़र में खोलें</string>
     <string name="open_in_popup_mode">पॉपअप मोड में खोलें</string>
-    <string name="share">साझा करें</string>
+    <string name="share">बाँटे</string>
     <string name="download">डाउनलोड</string>
     <string name="search">खोजें</string>
     <string name="settings">सेटिंग्स</string>

From e7d0685ebc9c097970e6fdf0905e1de7df39572a Mon Sep 17 00:00:00 2001
From: Chandra Mohan Jha <chandramohanjha@tuta.io>
Date: Sat, 27 Apr 2019 07:58:31 +0000
Subject: [PATCH 082/138] Translated using Weblate (Hindi)

Currently translated at 74.5% (330 of 443 strings)
---
 app/src/main/res/values-hi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index b6f63e624..9755c26fb 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -6,7 +6,7 @@
     <string name="install">इंस्टॉल करें</string>
     <string name="open_in_browser">ब्राउज़र में खोलें</string>
     <string name="open_in_popup_mode">पॉपअप मोड में खोलें</string>
-    <string name="share">बाँटे</string>
+    <string name="share">साझा करें</string>
     <string name="download">डाउनलोड</string>
     <string name="search">खोजें</string>
     <string name="settings">सेटिंग्स</string>

From 41fb6f54642c04ff450a91a051f852efeeaf947a Mon Sep 17 00:00:00 2001
From: Vasiliy <nvasya95@gmail.com>
Date: Sat, 27 Apr 2019 18:01:18 +0300
Subject: [PATCH 083/138] Update states in lists

---
 .../stream/model/StreamStateEntity.java       |  9 +++++++
 .../fragments/list/BaseListFragment.java      |  2 ++
 .../newpipe/info_list/InfoListAdapter.java    | 24 +++++++++++++++++++
 .../newpipe/local/BaseLocalListFragment.java  |  1 +
 .../newpipe/local/LocalItemListAdapter.java   | 22 +++++++++++++++++
 5 files changed, 58 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java
index 946ee1182..d46d5cd74 100644
--- a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java
@@ -4,6 +4,7 @@ package org.schabi.newpipe.database.stream.model;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.ForeignKey;
+import android.support.annotation.Nullable;
 
 import java.util.concurrent.TimeUnit;
 
@@ -62,4 +63,12 @@ public class StreamStateEntity {
         return seconds > PLAYBACK_SAVE_THRESHOLD_START_SECONDS
                 && seconds < durationInSeconds - PLAYBACK_SAVE_THRESHOLD_END_SECONDS;
     }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj instanceof StreamStateEntity) {
+            return ((StreamStateEntity) obj).streamUid == streamUid
+                    && ((StreamStateEntity) obj).progressTime == progressTime;
+        } else return false;
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index 5a49cce28..53d549a46 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -100,6 +100,8 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
             }
             updateFlags = 0;
         }
+
+        infoListAdapter.updateStates();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index df207abb5..8a30c998a 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -31,6 +31,7 @@ import org.schabi.newpipe.util.OnClickGesture;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
@@ -195,6 +196,29 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         }
     }
 
+    public void updateStates() {
+        if (infoItemList.isEmpty()) {
+            return;
+        }
+        stateLoaders.add(
+                historyRecordManager.loadStreamStateBatch(infoItemList)
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe((streamStateEntities) -> {
+                            if (streamStateEntities.size() == states.size()) {
+                                for (int i = 0; i < states.size(); i++) {
+                                    final StreamStateEntity newState = streamStateEntities.get(i);
+                                    if (!Objects.equals(states.get(i), newState)) {
+                                        states.set(i, newState);
+                                        notifyItemChanged(header == null ? i : i + 1);
+                                    }
+                                }
+                            } else {
+                                //oops, something is wrong
+                            }
+                        })
+        );
+    }
+
     public void clearStreamItemList() {
         if (infoItemList.isEmpty()) {
             return;
diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
index 20676c6db..75d49e466 100644
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -76,6 +76,7 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
             }
             updateFlags = 0;
         }
+        itemListAdapter.updateStates();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index 372392d7b..80d008231 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -26,6 +26,7 @@ import org.schabi.newpipe.util.OnClickGesture;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
@@ -136,6 +137,27 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
     }
 
+    public void updateStates() {
+        if (localItems.isEmpty()) return;
+        stateLoaders.add(
+                historyRecordManager.loadLocalStreamStateBatch(localItems)
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe((streamStateEntities) -> {
+                            if (streamStateEntities.size() == states.size()) {
+                                for (int i = 0; i < states.size(); i++) {
+                                    final StreamStateEntity newState = streamStateEntities.get(i);
+                                    if (!Objects.equals(states.get(i), newState)) {
+                                        states.set(i, newState);
+                                        notifyItemChanged(header == null ? i : i + 1);
+                                    }
+                                }
+                            } else {
+                                //oops, something is wrong
+                            }
+                        })
+        );
+    }
+
     public void removeItem(final LocalItem data) {
         final int index = localItems.indexOf(data);
 

From c7cd9e86ac41b08ca742bb583dfb197275e406de Mon Sep 17 00:00:00 2001
From: Vasiliy <nvasya95@gmail.com>
Date: Sat, 27 Apr 2019 19:04:13 +0300
Subject: [PATCH 084/138] Option to disable states indicators

---
 .../newpipe/info_list/InfoListAdapter.java    | 82 ++++++++++++-------
 .../newpipe/local/LocalItemListAdapter.java   | 32 ++++++--
 app/src/main/res/values-ru/strings.xml        |  2 +
 app/src/main/res/values-uk/strings.xml        |  2 +
 app/src/main/res/values/settings_keys.xml     |  1 +
 app/src/main/res/values/strings.xml           |  2 +
 app/src/main/res/xml/history_settings.xml     |  8 ++
 7 files changed, 93 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index 8a30c998a..e74a6f2ba 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -1,12 +1,16 @@
 package org.schabi.newpipe.info_list;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
@@ -128,13 +132,19 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     public void addInfoItemList(final List<InfoItem> data) {
-        stateLoaders.add(
-                historyRecordManager.loadStreamStateBatch(data)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(streamStateEntities -> {
-                    addInfoItemList(data, streamStateEntities);
-                })
-        );
+        if (isPlaybackStatesVisible()) {
+            stateLoaders.add(
+                    historyRecordManager.loadStreamStateBatch(data)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(streamStateEntities -> {
+                                addInfoItemList(data, streamStateEntities);
+                            })
+            );
+        } else {
+            final ArrayList<StreamStateEntity> states = new ArrayList<>(data.size());
+            for (int i = data.size(); i > 0; i--) states.add(null);
+            addInfoItemList(data, states);
+        }
     }
 
     private void addInfoItemList(List<InfoItem> data, List<StreamStateEntity> statesEntities) {
@@ -163,13 +173,17 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     public void addInfoItem(InfoItem data) {
-        stateLoaders.add(
-                historyRecordManager.loadStreamState(data)
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(streamStateEntity -> {
-                            addInfoItem(data, streamStateEntity[0]);
-                        })
-        );
+        if (isPlaybackStatesVisible()) {
+            stateLoaders.add(
+                    historyRecordManager.loadStreamState(data)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(streamStateEntity -> {
+                                addInfoItem(data, streamStateEntity[0]);
+                            })
+            );
+        } else {
+            addInfoItem(data, null);
+        }
     }
 
     private void addInfoItem(InfoItem data, StreamStateEntity state) {
@@ -200,23 +214,25 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         if (infoItemList.isEmpty()) {
             return;
         }
-        stateLoaders.add(
-                historyRecordManager.loadStreamStateBatch(infoItemList)
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe((streamStateEntities) -> {
-                            if (streamStateEntities.size() == states.size()) {
-                                for (int i = 0; i < states.size(); i++) {
-                                    final StreamStateEntity newState = streamStateEntities.get(i);
-                                    if (!Objects.equals(states.get(i), newState)) {
-                                        states.set(i, newState);
-                                        notifyItemChanged(header == null ? i : i + 1);
+        if (isPlaybackStatesVisible()) {
+            stateLoaders.add(
+                    historyRecordManager.loadStreamStateBatch(infoItemList)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe((streamStateEntities) -> {
+                                if (streamStateEntities.size() == states.size()) {
+                                    for (int i = 0; i < states.size(); i++) {
+                                        final StreamStateEntity newState = streamStateEntities.get(i);
+                                        if (!Objects.equals(states.get(i), newState)) {
+                                            states.set(i, newState);
+                                            notifyItemChanged(header == null ? i : i + 1);
+                                        }
                                     }
+                                } else {
+                                    //oops, something is wrong
                                 }
-                            } else {
-                                //oops, something is wrong
-                            }
-                        })
-        );
+                            })
+            );
+        }
     }
 
     public void clearStreamItemList() {
@@ -363,4 +379,12 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     public void dispose() {
         stateLoaders.clear();
     }
+
+    private boolean isPlaybackStatesVisible() {
+        final Context context = infoItemBuilder.getContext();
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        return prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)
+                && prefs.getBoolean(context.getString(R.string.enable_playback_resume_key), true)
+                && prefs.getBoolean(context.getString(R.string.enable_playback_state_lists_key), true);
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index 80d008231..6dddcb714 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -1,12 +1,16 @@
 package org.schabi.newpipe.local;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
@@ -99,12 +103,18 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     }
 
     public void addItems(List<? extends LocalItem> data) {
-        stateLoaders.add(
-                historyRecordManager.loadLocalStreamStateBatch(data)
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(streamStateEntities ->
-                                addItems(data, streamStateEntities))
-        );
+        if (isPlaybackStatesVisible()) {
+            stateLoaders.add(
+                    historyRecordManager.loadLocalStreamStateBatch(data)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(streamStateEntities ->
+                                    addItems(data, streamStateEntities))
+            );
+        } else {
+            final ArrayList<StreamStateEntity> states = new ArrayList<>(data.size());
+            for (int i = data.size(); i > 0; i--) states.add(null);
+            addItems(data, states);
+        }
     }
 
     private void addItems(List<? extends LocalItem> data, List<StreamStateEntity> streamStates) {
@@ -138,7 +148,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     }
 
     public void updateStates() {
-        if (localItems.isEmpty()) return;
+        if (localItems.isEmpty() || !isPlaybackStatesVisible()) return;
         stateLoaders.add(
                 historyRecordManager.loadLocalStreamStateBatch(localItems)
                         .observeOn(AndroidSchedulers.mainThread())
@@ -325,4 +335,12 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     public void dispose() {
         stateLoaders.clear();
     }
+
+    private boolean isPlaybackStatesVisible() {
+        final Context context = localItemBuilder.getContext();
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        return prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)
+                && prefs.getBoolean(context.getString(R.string.enable_playback_resume_key), true)
+                && prefs.getBoolean(context.getString(R.string.enable_playback_state_lists_key), true);
+    }
 }
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ba21b129e..8db28db8b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -170,6 +170,8 @@
     <string name="enable_watch_history_title">История просмотров</string>
     <string name="enable_playback_resume_title">Продолжать воспроизведение</string>
     <string name="enable_playback_resume_summary">Восстанавливать с последней позиции</string>
+    <string name="enable_playback_state_lists_title">Позиции в списках</string>
+    <string name="enable_playback_state_lists_summary">Отображать индикаторы позиций просмотра в списках</string>
     <string name="settings_category_clear_data_title">Очистить данные</string>
     <string name="enable_watch_history_summary">Запоминать воспроизведённые потоки</string>
     <string name="resume_on_audio_focus_gain_title">Возобновить при фокусе</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 41e6f22ba..0ab0ba78d 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -156,6 +156,8 @@
     <string name="enable_watch_history_title">Історія переглядiв</string>
     <string name="enable_playback_resume_title">Продовживати перегляд</string>
     <string name="enable_playback_resume_summary">Відновлювати останню позицію</string>
+    <string name="enable_playback_state_lists_title">Позиції у списках</string>
+    <string name="enable_playback_state_lists_summary">Відображати індикатори позицій переглядів у списках</string>
     <string name="settings_category_clear_data_title">Очистити дані</string>
     <string name="enable_watch_history_summary">Вести облік перегляду відеозаписів</string>
     <string name="resume_on_audio_focus_gain_title">Відновити відтворення</string>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index b70305d56..dd9c30080 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -151,6 +151,7 @@
     <string name="enable_watch_history_key" translatable="false">enable_watch_history</string>
     <string name="main_page_content_key" translatable="false">main_page_content</string>
     <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="import_data">import_data</string>
     <string name="export_data">export_data</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4f2ef075c..d92dbeb09 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -98,6 +98,8 @@
     <string name="enable_watch_history_title">Watch history</string>
     <string name="enable_playback_resume_title">Resume playback</string>
     <string name="enable_playback_resume_summary">Restore last playback position</string>
+    <string name="enable_playback_state_lists_title">Positions in lists</string>
+    <string name="enable_playback_state_lists_summary">Show playback position indicators in lists</string>
     <string name="settings_category_clear_data_title">Clear data</string>
     <string name="enable_watch_history_summary">Keep track of watched videos</string>
     <string name="resume_on_audio_focus_gain_title">Resume on focus gain</string>
diff --git a/app/src/main/res/xml/history_settings.xml b/app/src/main/res/xml/history_settings.xml
index 305b1c360..cae2d56c0 100644
--- a/app/src/main/res/xml/history_settings.xml
+++ b/app/src/main/res/xml/history_settings.xml
@@ -19,6 +19,14 @@
         android:title="@string/enable_playback_resume_title"
         app:iconSpaceReserved="false" />
 
+    <SwitchPreference
+        android:defaultValue="true"
+        android:dependency="@string/enable_playback_resume_key"
+        android:key="@string/enable_playback_state_lists_key"
+        android:summary="@string/enable_playback_state_lists_summary"
+        android:title="@string/enable_playback_state_lists_title"
+        app:iconSpaceReserved="false" />
+
     <SwitchPreference
         android:defaultValue="true"
         android:key="@string/enable_search_history_key"

From 273f731dd5cce8a499e16fa6807c8c2f134c1298 Mon Sep 17 00:00:00 2001
From: Vasiliy <nvasya95@gmail.com>
Date: Sat, 27 Apr 2019 21:23:52 +0300
Subject: [PATCH 085/138] Refactor adapter

---
 .../newpipe/info_list/InfoListAdapter.java    | 173 ++++++----------
 .../info_list/StateObjectsListAdapter.java    | 189 ++++++++++++++++++
 .../newpipe/local/LocalItemListAdapter.java   | 122 ++++-------
 .../schabi/newpipe/util/SparseArrayUtils.java |  30 +++
 4 files changed, 314 insertions(+), 200 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/info_list/StateObjectsListAdapter.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/util/SparseArrayUtils.java

diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index e74a6f2ba..3cd06f3d6 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -1,16 +1,14 @@
 package org.schabi.newpipe.info_list;
 
 import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
@@ -29,16 +27,11 @@ import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.OnClickGesture;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
 
 /*
  * Created by Christian Schabesberger on 01.08.16.
@@ -60,7 +53,7 @@ import io.reactivex.disposables.CompositeDisposable;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class InfoListAdapter extends StateObjectsListAdapter {
     private static final String TAG = InfoListAdapter.class.getSimpleName();
     private static final boolean DEBUG = false;
 
@@ -80,10 +73,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     private static final int COMMENT_HOLDER_TYPE = 0x401;
 
     private final InfoItemBuilder infoItemBuilder;
-    private final HistoryRecordManager historyRecordManager;
     private final ArrayList<InfoItem> infoItemList;
-    private final ArrayList<StreamStateEntity> states;
-    private final CompositeDisposable stateLoaders;
     private boolean useMiniVariant = false;
     private boolean useGridVariant = false;
     private boolean showFooter = false;
@@ -100,11 +90,9 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     public InfoListAdapter(Activity a) {
+        super(a.getApplicationContext());
         infoItemBuilder = new InfoItemBuilder(a);
-        historyRecordManager = new HistoryRecordManager(a);
         infoItemList = new ArrayList<>();
-        states = new ArrayList<>();
-        stateLoaders = new CompositeDisposable();
     }
 
     public void setOnStreamSelectedListener(OnClickGesture<StreamInfoItem> listener) {
@@ -131,107 +119,64 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         this.useGridVariant = useGridVariant;
     }
 
-    public void addInfoItemList(final List<InfoItem> data) {
-        if (isPlaybackStatesVisible()) {
-            stateLoaders.add(
-                    historyRecordManager.loadStreamStateBatch(data)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(streamStateEntities -> {
-                                addInfoItemList(data, streamStateEntities);
-                            })
-            );
-        } else {
-            final ArrayList<StreamStateEntity> states = new ArrayList<>(data.size());
-            for (int i = data.size(); i > 0; i--) states.add(null);
-            addInfoItemList(data, states);
-        }
-    }
-
-    private void addInfoItemList(List<InfoItem> data, List<StreamStateEntity> statesEntities) {
+    public void addInfoItemList(@Nullable final List<InfoItem> data) {
         if (data != null) {
-            if (DEBUG) {
-                Log.d(TAG, "addInfoItemList() before > infoItemList.size() = " + infoItemList.size() + ", data.size() = " + data.size());
-            }
-
-            int offsetStart = sizeConsideringHeaderOffset();
-            infoItemList.addAll(data);
-            states.addAll(statesEntities);
-
-            if (DEBUG) {
-                Log.d(TAG, "addInfoItemList() after > offsetStart = " + offsetStart + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
-            }
-
-            notifyItemRangeInserted(offsetStart, data.size());
-
-            if (footer != null && showFooter) {
-                int footerNow = sizeConsideringHeaderOffset();
-                notifyItemMoved(offsetStart, footerNow);
-
-                if (DEBUG) Log.d(TAG, "addInfoItemList() footer from " + offsetStart + " to " + footerNow);
-            }
+            loadStates(data, infoItemList.size(), () -> addInfoItemListImpl(data));
         }
     }
 
-    public void addInfoItem(InfoItem data) {
-        if (isPlaybackStatesVisible()) {
-            stateLoaders.add(
-                    historyRecordManager.loadStreamState(data)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(streamStateEntity -> {
-                                addInfoItem(data, streamStateEntity[0]);
-                            })
-            );
-        } else {
-            addInfoItem(data, null);
+    private void addInfoItemListImpl(@NonNull List<InfoItem> data) {
+        if (DEBUG) {
+            Log.d(TAG, "addInfoItemList() before > infoItemList.size() = " + infoItemList.size() + ", data.size() = " + data.size());
+        }
+
+        int offsetStart = sizeConsideringHeaderOffset();
+        infoItemList.addAll(data);
+
+        if (DEBUG) {
+            Log.d(TAG, "addInfoItemList() after > offsetStart = " + offsetStart + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
+        }
+
+        notifyItemRangeInserted(offsetStart, data.size());
+
+        if (footer != null && showFooter) {
+            int footerNow = sizeConsideringHeaderOffset();
+            notifyItemMoved(offsetStart, footerNow);
+
+            if (DEBUG) Log.d(TAG, "addInfoItemList() footer from " + offsetStart + " to " + footerNow);
         }
     }
 
-    private void addInfoItem(InfoItem data, StreamStateEntity state) {
+    public void addInfoItem(@Nullable InfoItem data) {
         if (data != null) {
-            if (DEBUG) {
-                Log.d(TAG, "addInfoItem() before > infoItemList.size() = " + infoItemList.size() + ", thread = " + Thread.currentThread());
-            }
+            loadState(data, infoItemList.size(), () -> addInfoItemImpl(data));
+        }
+    }
 
-            int positionInserted = sizeConsideringHeaderOffset();
-            infoItemList.add(data);
-            states.add(state);
+    private void addInfoItemImpl(@NonNull InfoItem data) {
+        if (DEBUG) {
+            Log.d(TAG, "addInfoItem() before > infoItemList.size() = " + infoItemList.size() + ", thread = " + Thread.currentThread());
+        }
 
-            if (DEBUG) {
-                Log.d(TAG, "addInfoItem() after > position = " + positionInserted + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
-            }
-            notifyItemInserted(positionInserted);
+        int positionInserted = sizeConsideringHeaderOffset();
+        infoItemList.add(data);
 
-            if (footer != null && showFooter) {
-                int footerNow = sizeConsideringHeaderOffset();
-                notifyItemMoved(positionInserted, footerNow);
+        if (DEBUG) {
+            Log.d(TAG, "addInfoItem() after > position = " + positionInserted + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
+        }
+        notifyItemInserted(positionInserted);
 
-                if (DEBUG) Log.d(TAG, "addInfoItem() footer from " + positionInserted + " to " + footerNow);
-            }
+        if (footer != null && showFooter) {
+            int footerNow = sizeConsideringHeaderOffset();
+            notifyItemMoved(positionInserted, footerNow);
+
+            if (DEBUG) Log.d(TAG, "addInfoItem() footer from " + positionInserted + " to " + footerNow);
         }
     }
 
     public void updateStates() {
-        if (infoItemList.isEmpty()) {
-            return;
-        }
-        if (isPlaybackStatesVisible()) {
-            stateLoaders.add(
-                    historyRecordManager.loadStreamStateBatch(infoItemList)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe((streamStateEntities) -> {
-                                if (streamStateEntities.size() == states.size()) {
-                                    for (int i = 0; i < states.size(); i++) {
-                                        final StreamStateEntity newState = streamStateEntities.get(i);
-                                        if (!Objects.equals(states.get(i), newState)) {
-                                            states.set(i, newState);
-                                            notifyItemChanged(header == null ? i : i + 1);
-                                        }
-                                    }
-                                } else {
-                                    //oops, something is wrong
-                                }
-                            })
-            );
+        if (!infoItemList.isEmpty()) {
+            updateAllStates(infoItemList);
         }
     }
 
@@ -240,7 +185,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             return;
         }
         infoItemList.clear();
-        states.clear();
+        clearStates();
         notifyDataSetChanged();
     }
 
@@ -314,8 +259,9 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         }
     }
 
+    @NonNull
     @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) {
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int type) {
         if (DEBUG)
             Log.d(TAG, "onCreateViewHolder() called with: parent = [" + parent + "], type = [" + type + "]");
         switch (type) {
@@ -352,13 +298,13 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         if (DEBUG) Log.d(TAG, "onBindViewHolder() called with: holder = [" + holder.getClass().getSimpleName() + "], position = [" + position + "]");
         if (holder instanceof InfoItemHolder) {
             // If header isn't null, offset the items by -1
             if (header != null) position--;
 
-            ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position), states.get(position));
+            ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position), getState(position));
         } else if (holder instanceof HFHolder && position == 0 && header != null) {
             ((HFHolder) holder).view = header;
         } else if (holder instanceof HFHolder && position == sizeConsideringHeaderOffset() && footer != null && showFooter) {
@@ -366,6 +312,11 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         }
     }
 
+    @Override
+    protected void onItemStateChanged(int position, @Nullable StreamStateEntity state) {
+        notifyItemChanged(header == null ? position : position + 1, state);
+    }
+
     public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
         return new GridLayoutManager.SpanSizeLookup() {
             @Override
@@ -375,16 +326,4 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             }
         };
     }
-
-    public void dispose() {
-        stateLoaders.clear();
-    }
-
-    private boolean isPlaybackStatesVisible() {
-        final Context context = infoItemBuilder.getContext();
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)
-                && prefs.getBoolean(context.getString(R.string.enable_playback_resume_key), true)
-                && prefs.getBoolean(context.getString(R.string.enable_playback_state_lists_key), true);
-    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/StateObjectsListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/StateObjectsListAdapter.java
new file mode 100644
index 000000000..23ae17bac
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/StateObjectsListAdapter.java
@@ -0,0 +1,189 @@
+package org.schabi.newpipe.info_list;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.util.SparseArray;
+
+import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.SparseArrayUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+
+public abstract class StateObjectsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+	private final SparseArray<StreamStateEntity> states;
+	private final HistoryRecordManager recordManager;
+	private final CompositeDisposable stateLoaders;
+	private final Context context;
+
+	public StateObjectsListAdapter(Context context) {
+		this.states = new SparseArray<>();
+		this.recordManager = new HistoryRecordManager(context);
+		this.context = context;
+		this.stateLoaders = new CompositeDisposable();
+	}
+
+	@Nullable
+	public StreamStateEntity getState(int position) {
+		return states.get(position);
+	}
+
+	protected void clearStates() {
+		states.clear();
+	}
+
+	private void appendStates(List<StreamStateEntity> statesEntities, int offset) {
+		for (int i = 0; i < statesEntities.size(); i++) {
+			final StreamStateEntity state = statesEntities.get(i);
+			if (state != null) {
+				states.append(offset + i, state);
+			}
+		}
+	}
+
+	private void appendState(StreamStateEntity statesEntity, int offset) {
+		if (statesEntity != null) {
+			states.append(offset, statesEntity);
+		}
+	}
+
+	protected void removeState(int index) {
+		states.remove(index);
+	}
+
+	protected void moveState(int from, int to) {
+		final StreamStateEntity item = states.get(from);
+		if (from < to) {
+			SparseArrayUtils.shiftItemsDown(states, from, to);
+		} else {
+			SparseArrayUtils.shiftItemsUp(states, to, from);
+		}
+		states.put(to, item);
+	}
+
+	protected void loadStates(List<InfoItem> list, int offset, Runnable callback) {
+		if (isPlaybackStatesVisible()) {
+			stateLoaders.add(
+					recordManager.loadStreamStateBatch(list)
+							.observeOn(AndroidSchedulers.mainThread())
+							.subscribe(streamStateEntities -> {
+								appendStates(streamStateEntities, offset);
+								callback.run();
+							}, throwable -> {
+								if (BuildConfig.DEBUG) throwable.printStackTrace();
+								callback.run();
+							})
+			);
+		} else {
+			callback.run();
+		}
+	}
+
+	protected void loadState(InfoItem item, int offset, Runnable callback) {
+		if (isPlaybackStatesVisible()) {
+			stateLoaders.add(
+					recordManager.loadStreamState(item)
+							.observeOn(AndroidSchedulers.mainThread())
+							.subscribe(streamStateEntities -> {
+								appendState(streamStateEntities[0], offset);
+								callback.run();
+							}, throwable -> {
+								if (BuildConfig.DEBUG) throwable.printStackTrace();
+								callback.run();
+							})
+			);
+		} else {
+			callback.run();
+		}
+	}
+
+	protected void loadStatesForLocal(List<? extends LocalItem> list, int offset, Runnable callback) {
+		if (isPlaybackStatesVisible()) {
+			stateLoaders.add(
+					recordManager.loadLocalStreamStateBatch(list)
+							.observeOn(AndroidSchedulers.mainThread())
+							.subscribe(streamStateEntities -> {
+								appendStates(streamStateEntities, offset);
+								callback.run();
+							}, throwable -> {
+								if (BuildConfig.DEBUG) throwable.printStackTrace();
+								callback.run();
+							})
+			);
+		} else {
+			callback.run();
+		}
+	}
+
+	private void processStatesUpdates(List<StreamStateEntity> streamStateEntities) {
+		for (int i = 0; i < streamStateEntities.size(); i++) {
+			final StreamStateEntity newState = streamStateEntities.get(i);
+			if (!Objects.equals(states.get(i), newState)) {
+				if (newState == null) {
+					states.remove(i);
+				} else {
+					states.put(i, newState);
+				}
+				onItemStateChanged(i, newState);
+			}
+		}
+	}
+
+	protected void updateAllStates(List<InfoItem> list) {
+		if (isPlaybackStatesVisible()) {
+			stateLoaders.add(
+					recordManager.loadStreamStateBatch(list)
+							.observeOn(AndroidSchedulers.mainThread())
+							.subscribe(this::processStatesUpdates, throwable -> {
+								if (BuildConfig.DEBUG) throwable.printStackTrace();
+							})
+			);
+		} else {
+			final int[] positions = SparseArrayUtils.getKeys(states);
+			states.clear();
+			for (int pos : positions) onItemStateChanged(pos, null);
+		}
+	}
+
+	protected void updateAllLocalStates(List<? extends LocalItem> list) {
+		if (isPlaybackStatesVisible()) {
+			stateLoaders.add(
+					recordManager.loadLocalStreamStateBatch(list)
+							.observeOn(AndroidSchedulers.mainThread())
+							.subscribe(this::processStatesUpdates, throwable -> {
+								if (BuildConfig.DEBUG) throwable.printStackTrace();
+							})
+			);
+		} else {
+			final int[] positions = SparseArrayUtils.getKeys(states);
+			states.clear();
+			for (int pos : positions) onItemStateChanged(pos, null);
+		}
+	}
+
+	public void dispose() {
+		stateLoaders.dispose();
+	}
+
+	protected boolean isPlaybackStatesVisible() {
+		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+		return prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)
+				&& prefs.getBoolean(context.getString(R.string.enable_playback_resume_key), true)
+				&& prefs.getBoolean(context.getString(R.string.enable_playback_state_lists_key), true);
+	}
+
+	protected abstract void onItemStateChanged(int position, @Nullable StreamStateEntity state);
+
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index 6dddcb714..903712af2 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -1,19 +1,17 @@
 package org.schabi.newpipe.local;
 
 import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.info_list.StateObjectsListAdapter;
 import org.schabi.newpipe.local.holder.LocalItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
@@ -30,10 +28,6 @@ import org.schabi.newpipe.util.OnClickGesture;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
 
 /*
  * Created by Christian Schabesberger on 01.08.16.
@@ -55,7 +49,7 @@ import io.reactivex.disposables.CompositeDisposable;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class LocalItemListAdapter extends StateObjectsListAdapter {
     
     private static final String TAG = LocalItemListAdapter.class.getSimpleName();
     private static final boolean DEBUG = false;
@@ -73,10 +67,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
 	private static final int REMOTE_PLAYLIST_GRID_HOLDER_TYPE = 0x2004;
 
     private final LocalItemBuilder localItemBuilder;
-    private final HistoryRecordManager historyRecordManager;
     private final ArrayList<LocalItem> localItems;
-    private final ArrayList<StreamStateEntity> states;
-    private final CompositeDisposable stateLoaders;
     private final DateFormat dateFormat;
 
     private boolean showFooter = false;
@@ -85,13 +76,11 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     private View footer = null;
 
     public LocalItemListAdapter(Activity activity) {
+        super(activity.getApplicationContext());
         localItemBuilder = new LocalItemBuilder(activity);
-        historyRecordManager = new HistoryRecordManager(activity);
         localItems = new ArrayList<>();
         dateFormat = DateFormat.getDateInstance(DateFormat.SHORT,
                 Localization.getPreferredLocale(activity));
-        states = new ArrayList<>();
-        stateLoaders = new CompositeDisposable();
     }
 
     public void setSelectedListener(OnClickGesture<LocalItem> listener) {
@@ -102,76 +91,49 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         localItemBuilder.setOnItemSelectedListener(null);
     }
 
-    public void addItems(List<? extends LocalItem> data) {
-        if (isPlaybackStatesVisible()) {
-            stateLoaders.add(
-                    historyRecordManager.loadLocalStreamStateBatch(data)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(streamStateEntities ->
-                                    addItems(data, streamStateEntities))
-            );
-        } else {
-            final ArrayList<StreamStateEntity> states = new ArrayList<>(data.size());
-            for (int i = data.size(); i > 0; i--) states.add(null);
-            addItems(data, states);
+    public void addItems(@Nullable List<? extends LocalItem> data) {
+        if (data != null) {
+            loadStatesForLocal(data, localItems.size(), () -> addItemsImpl(data));
         }
     }
 
-    private void addItems(List<? extends LocalItem> data, List<StreamStateEntity> streamStates) {
-        if (data != null) {
-            if (DEBUG) {
-                Log.d(TAG, "addItems() before > localItems.size() = " +
-                        localItems.size() + ", data.size() = " + data.size());
-            }
+    private void addItemsImpl(@NonNull List<? extends LocalItem> data) {
+        if (DEBUG) {
+            Log.d(TAG, "addItems() before > localItems.size() = " +
+                    localItems.size() + ", data.size() = " + data.size());
+        }
 
-            int offsetStart = sizeConsideringHeader();
-            localItems.addAll(data);
-            states.addAll(streamStates);
+        int offsetStart = sizeConsideringHeader();
+        localItems.addAll(data);
 
-            if (DEBUG) {
-                Log.d(TAG, "addItems() after > offsetStart = " + offsetStart +
-                        ", localItems.size() = " + localItems.size() +
-                        ", header = " + header + ", footer = " + footer +
-                        ", showFooter = " + showFooter);
-            }
+        if (DEBUG) {
+            Log.d(TAG, "addItems() after > offsetStart = " + offsetStart +
+                    ", localItems.size() = " + localItems.size() +
+                    ", header = " + header + ", footer = " + footer +
+                    ", showFooter = " + showFooter);
+        }
 
-            notifyItemRangeInserted(offsetStart, data.size());
+        notifyItemRangeInserted(offsetStart, data.size());
 
-            if (footer != null && showFooter) {
-                int footerNow = sizeConsideringHeader();
-                notifyItemMoved(offsetStart, footerNow);
+        if (footer != null && showFooter) {
+            int footerNow = sizeConsideringHeader();
+            notifyItemMoved(offsetStart, footerNow);
 
-                if (DEBUG) Log.d(TAG, "addItems() footer from " + offsetStart +
-                        " to " + footerNow);
-            }
+            if (DEBUG) Log.d(TAG, "addItems() footer from " + offsetStart +
+                    " to " + footerNow);
         }
     }
 
     public void updateStates() {
-        if (localItems.isEmpty() || !isPlaybackStatesVisible()) return;
-        stateLoaders.add(
-                historyRecordManager.loadLocalStreamStateBatch(localItems)
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe((streamStateEntities) -> {
-                            if (streamStateEntities.size() == states.size()) {
-                                for (int i = 0; i < states.size(); i++) {
-                                    final StreamStateEntity newState = streamStateEntities.get(i);
-                                    if (!Objects.equals(states.get(i), newState)) {
-                                        states.set(i, newState);
-                                        notifyItemChanged(header == null ? i : i + 1);
-                                    }
-                                }
-                            } else {
-                                //oops, something is wrong
-                            }
-                        })
-        );
+        if (!localItems.isEmpty()) {
+            updateAllLocalStates(localItems);
+        }
     }
 
     public void removeItem(final LocalItem data) {
         final int index = localItems.indexOf(data);
-
         localItems.remove(index);
+        removeState(index);
         notifyItemRemoved(index + (header != null ? 1 : 0));
     }
 
@@ -183,7 +145,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         if (actualFrom >= localItems.size() || actualTo >= localItems.size()) return false;
 
         localItems.add(actualTo, localItems.remove(actualFrom));
-        states.add(actualTo, states.remove(actualFrom));
+        moveState(actualFrom, actualTo);
         notifyItemMoved(fromAdapterPosition, toAdapterPosition);
         return true;
     }
@@ -193,6 +155,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
             return;
         }
         localItems.clear();
+        clearStates();
         notifyDataSetChanged();
     }
 
@@ -313,7 +276,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
             // If header isn't null, offset the items by -1
             if (header != null) position--;
 
-            ((LocalItemHolder) holder).updateFromItem(localItems.get(position), states.get(position), dateFormat);
+            ((LocalItemHolder) holder).updateFromItem(localItems.get(position), getState(position), dateFormat);
         } else if (holder instanceof HeaderFooterHolder && position == 0 && header != null) {
             ((HeaderFooterHolder) holder).view = header;
         } else if (holder instanceof HeaderFooterHolder && position == sizeConsideringHeader()
@@ -322,6 +285,11 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
     }
 
+    @Override
+    protected void onItemStateChanged(int position, @Nullable StreamStateEntity state) {
+        notifyItemChanged(header == null ? position : position + 1, state);
+    }
+
     public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
         return new GridLayoutManager.SpanSizeLookup() {
             @Override
@@ -331,16 +299,4 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
             }
         };
     }
-
-    public void dispose() {
-        stateLoaders.clear();
-    }
-
-    private boolean isPlaybackStatesVisible() {
-        final Context context = localItemBuilder.getContext();
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)
-                && prefs.getBoolean(context.getString(R.string.enable_playback_resume_key), true)
-                && prefs.getBoolean(context.getString(R.string.enable_playback_state_lists_key), true);
-    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/util/SparseArrayUtils.java b/app/src/main/java/org/schabi/newpipe/util/SparseArrayUtils.java
new file mode 100644
index 000000000..d17c9aa42
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/SparseArrayUtils.java
@@ -0,0 +1,30 @@
+package org.schabi.newpipe.util;
+
+import android.util.SparseArray;
+
+public abstract class SparseArrayUtils {
+
+	public static <T> void shiftItemsDown(SparseArray<T> sparseArray, int lower, int upper) {
+		for (int i = lower + 1; i <= upper; i++) {
+			final T o = sparseArray.get(i);
+			sparseArray.put(i - 1, o);
+			sparseArray.remove(i);
+		}
+	}
+
+	public static <T> void shiftItemsUp(SparseArray<T> sparseArray, int lower, int upper) {
+		for (int i = upper - 1; i >= lower; i--) {
+			final T o = sparseArray.get(i);
+			sparseArray.put(i + 1, o);
+			sparseArray.remove(i);
+		}
+	}
+
+	public static <T> int[] getKeys(SparseArray<T> sparseArray) {
+		final int[] result = new int[sparseArray.size()];
+		for (int i = 0; i < result.length; i++) {
+			result[i] = sparseArray.keyAt(i);
+		}
+		return result;
+	}
+}

From 93f25181596792ed35287cd12fff55d97aa6ffe0 Mon Sep 17 00:00:00 2001
From: Vasiliy <nvasya95@gmail.com>
Date: Sat, 27 Apr 2019 22:27:08 +0300
Subject: [PATCH 086/138] Animate states changed

---
 .../fragments/detail/VideoDetailFragment.java |  2 +-
 .../fragments/list/BaseListFragment.java      |  2 +-
 .../newpipe/info_list/InfoListAdapter.java    | 19 +++++++++++++++-
 .../info_list/holder/InfoItemHolder.java      |  3 +++
 .../holder/StreamMiniInfoItemHolder.java      | 21 ++++++++++++++++--
 .../newpipe/local/BaseLocalListFragment.java  |  3 ++-
 .../newpipe/local/LocalItemListAdapter.java   | 19 +++++++++++++++-
 .../newpipe/local/holder/LocalItemHolder.java |  3 +++
 .../holder/LocalPlaylistStreamItemHolder.java | 22 +++++++++++++++++--
 .../LocalStatisticStreamItemHolder.java       | 22 +++++++++++++++++--
 .../subscription/SubscriptionFragment.java    |  2 ++
 .../newpipe/views/AnimatedProgressBar.java    |  9 ++------
 .../main/res/layout/list_stream_grid_item.xml |  2 +-
 app/src/main/res/layout/list_stream_item.xml  |  2 +-
 .../main/res/layout/list_stream_mini_item.xml |  2 +-
 .../res/layout/list_stream_playlist_item.xml  |  2 +-
 16 files changed, 113 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index d6630c9c3..42ac62c59 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1287,7 +1287,7 @@ public class VideoDetailFragment
                 .subscribe(state -> {
                     final int seconds = (int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime());
                     positionView.setMax((int) info.getDuration());
-                    positionView.setProgress(seconds);
+                    positionView.setProgressAnimated(seconds);
                     detailPositionView.setText(Localization.getDurationString(seconds));
                     animateView(positionView, true, 500);
                     animateView(detailPositionView, true, 500);
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index 53d549a46..d9c58fbf4 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -101,7 +101,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
             updateFlags = 0;
         }
 
-        infoListAdapter.updateStates();
+        itemsList.post(infoListAdapter::updateStates);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index 3cd06f3d6..7f5b07dbe 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -312,9 +312,26 @@ public class InfoListAdapter extends StateObjectsListAdapter {
         }
     }
 
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List<Object> payloads) {
+        if (!payloads.isEmpty() && holder instanceof InfoItemHolder) {
+            for (Object payload : payloads) {
+                if (payload instanceof StreamStateEntity) {
+                    ((InfoItemHolder) holder).updateState(infoItemList.get(header == null ? position : position - 1),
+                            (StreamStateEntity) payload);
+                } else if (payload instanceof Boolean) {
+                    ((InfoItemHolder) holder).updateState(infoItemList.get(header == null ? position : position - 1),
+                            null);
+                }
+            }
+        } else {
+            onBindViewHolder(holder, position);
+        }
+    }
+
     @Override
     protected void onItemStateChanged(int position, @Nullable StreamStateEntity state) {
-        notifyItemChanged(header == null ? position : position + 1, state);
+        notifyItemChanged(header == null ? position : position + 1, state != null ? state : false);
     }
 
     public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java
index 969d2682e..3bc0d9e54 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java
@@ -38,4 +38,7 @@ public abstract class InfoItemHolder extends RecyclerView.ViewHolder {
     }
 
     public abstract void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state);
+
+    public void updateState(final InfoItem infoItem, @Nullable final StreamStateEntity state) {
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
index a59cb009f..aa2a3f878 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
@@ -5,7 +5,6 @@ import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
@@ -14,8 +13,10 @@ import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.views.AnimatedProgressBar;
 
 import java.util.concurrent.TimeUnit;
 
@@ -25,7 +26,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
     public final TextView itemVideoTitleView;
     public final TextView itemUploaderView;
     public final TextView itemDurationView;
-    public final ProgressBar itemProgressView;
+    public final AnimatedProgressBar itemProgressView;
 
     StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
         super(infoItemBuilder, layoutId, parent);
@@ -99,6 +100,22 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
         }
     }
 
+    @Override
+    public void updateState(final InfoItem infoItem, @Nullable final StreamStateEntity state) {
+        final StreamInfoItem item = (StreamInfoItem) infoItem;
+        if (state != null && item.getDuration() > 0 && item.getStreamType() != StreamType.LIVE_STREAM) {
+            itemProgressView.setMax((int) item.getDuration());
+            if (itemProgressView.getVisibility() == View.VISIBLE) {
+                itemProgressView.setProgressAnimated((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+                AnimationUtils.animateView(itemProgressView, true, 500);
+            }
+        } else if (itemProgressView.getVisibility() == View.VISIBLE) {
+            AnimationUtils.animateView(itemProgressView, false, 500);
+        }
+    }
+
     private void enableLongClick(final StreamInfoItem item) {
         itemView.setLongClickable(true);
         itemView.setOnLongClickListener(view -> {
diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
index 75d49e466..94672bd49 100644
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -76,7 +76,8 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
             }
             updateFlags = 0;
         }
-        itemListAdapter.updateStates();
+
+        itemsList.post(itemListAdapter::updateStates);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index 903712af2..d29e85ee3 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -285,9 +285,26 @@ public class LocalItemListAdapter extends StateObjectsListAdapter {
         }
     }
 
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List<Object> payloads) {
+        if (!payloads.isEmpty() && holder instanceof LocalItemHolder) {
+            for (Object payload : payloads) {
+                if (payload instanceof StreamStateEntity) {
+                    ((LocalItemHolder) holder).updateState(localItems.get(header == null ? position : position - 1),
+                            (StreamStateEntity) payload);
+                } else if (payload instanceof Boolean) {
+                    ((LocalItemHolder) holder).updateState(localItems.get(header == null ? position : position - 1),
+                            null);
+                }
+            }
+        } else {
+            onBindViewHolder(holder, position);
+        }
+    }
+
     @Override
     protected void onItemStateChanged(int position, @Nullable StreamStateEntity state) {
-        notifyItemChanged(header == null ? position : position + 1, state);
+        notifyItemChanged(header == null ? position : position + 1, state != null ? state : false);
     }
 
     public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java
index 01af60f98..c00fa1fb4 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java
@@ -41,4 +41,7 @@ public abstract class LocalItemHolder extends RecyclerView.ViewHolder {
     }
 
     public abstract void updateFromItem(final LocalItem item, @Nullable final StreamStateEntity state, final DateFormat dateFormat);
+
+    public void updateState(final LocalItem localItem, @Nullable final StreamStateEntity state) {
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
index 48bbbc81d..0c4e66c9d 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
@@ -6,7 +6,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
@@ -15,8 +14,10 @@ import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.local.LocalItemBuilder;
+import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.views.AnimatedProgressBar;
 
 import java.text.DateFormat;
 import java.util.concurrent.TimeUnit;
@@ -28,7 +29,7 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
     public final TextView itemAdditionalDetailsView;
     public final TextView itemDurationView;
     public final View itemHandleView;
-    public final ProgressBar itemProgressView;
+    public final AnimatedProgressBar itemProgressView;
 
     LocalPlaylistStreamItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
         super(infoItemBuilder, layoutId, parent);
@@ -92,6 +93,23 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
         itemHandleView.setOnTouchListener(getOnTouchListener(item));
     }
 
+    @Override
+    public void updateState(LocalItem localItem, @Nullable StreamStateEntity state) {
+        if (!(localItem instanceof PlaylistStreamEntry)) return;
+        final PlaylistStreamEntry item = (PlaylistStreamEntry) localItem;
+        if (state != null && item.duration > 0) {
+            itemProgressView.setMax((int) item.duration);
+            if (itemProgressView.getVisibility() == View.VISIBLE) {
+                itemProgressView.setProgressAnimated((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+                AnimationUtils.animateView(itemProgressView, true, 500);
+            }
+        } else if (itemProgressView.getVisibility() == View.VISIBLE) {
+            AnimationUtils.animateView(itemProgressView, false, 500);
+        }
+    }
+
     private View.OnTouchListener getOnTouchListener(final PlaylistStreamEntry item) {
         return (view, motionEvent) -> {
             view.performClick();
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
index ac194b776..b24051a4f 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
@@ -5,7 +5,6 @@ import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
@@ -14,8 +13,10 @@ import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.local.LocalItemBuilder;
+import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.views.AnimatedProgressBar;
 
 import java.text.DateFormat;
 import java.util.concurrent.TimeUnit;
@@ -48,7 +49,7 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
     public final TextView itemDurationView;
     @Nullable
     public final TextView itemAdditionalDetails;
-    public final ProgressBar itemProgressView;
+    public final AnimatedProgressBar itemProgressView;
 
     public LocalStatisticStreamItemHolder(LocalItemBuilder itemBuilder, ViewGroup parent) {
         this(itemBuilder, R.layout.list_stream_item, parent);
@@ -121,4 +122,21 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
             return true;
         });
     }
+
+    @Override
+    public void updateState(LocalItem localItem, @Nullable StreamStateEntity state) {
+        if (!(localItem instanceof StreamStatisticsEntry)) return;
+        final StreamStatisticsEntry item = (StreamStatisticsEntry) localItem;
+        if (state != null && item.duration > 0) {
+            itemProgressView.setMax((int) item.duration);
+            if (itemProgressView.getVisibility() == View.VISIBLE) {
+                itemProgressView.setProgressAnimated((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+                AnimationUtils.animateView(itemProgressView, true, 500);
+            }
+        } else if (itemProgressView.getVisibility() == View.VISIBLE) {
+            AnimationUtils.animateView(itemProgressView, false, 500);
+        }
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
index 364d50df6..b00ea05ea 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
@@ -153,6 +153,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
             }
             updateFlags = 0;
         }
+
+        itemsList.post(infoListAdapter::updateStates);
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java b/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java
index 39c6e707e..fe3e0d7bc 100644
--- a/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java
+++ b/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java
@@ -25,8 +25,7 @@ public final class AnimatedProgressBar extends ProgressBar {
 		super(context, attrs, defStyleAttr);
 	}
 
-	@Override
-	public synchronized void setProgress(int progress) {
+	public synchronized void setProgressAnimated(int progress) {
 		cancelAnimation();
 		animation = new ProgressBarAnimation(this, getProgress(), progress);
 		startAnimation(animation);
@@ -40,10 +39,6 @@ public final class AnimatedProgressBar extends ProgressBar {
 		clearAnimation();
 	}
 
-	private void setProgressInternal(int progress) {
-		super.setProgress(progress);
-	}
-
 	private static class ProgressBarAnimation extends Animation {
 
 		private final AnimatedProgressBar progressBar;
@@ -63,7 +58,7 @@ public final class AnimatedProgressBar extends ProgressBar {
 		protected void applyTransformation(float interpolatedTime, Transformation t) {
 			super.applyTransformation(interpolatedTime, t);
 			float value = from + (to - from) * interpolatedTime;
-			progressBar.setProgressInternal((int) value);
+			progressBar.setProgress((int) value);
 		}
 	}
 }
diff --git a/app/src/main/res/layout/list_stream_grid_item.xml b/app/src/main/res/layout/list_stream_grid_item.xml
index 7c918b27f..fc9235e8d 100644
--- a/app/src/main/res/layout/list_stream_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_grid_item.xml
@@ -67,7 +67,7 @@
 		android:textSize="@dimen/video_item_search_uploader_text_size"
 		tools:text="Uploader"/>
 
-	<ProgressBar
+	<org.schabi.newpipe.views.AnimatedProgressBar
 		android:id="@+id/itemProgressView"
 		style="@style/Widget.AppCompat.ProgressBar.Horizontal"
 		android:progressDrawable="?progress_horizontal_drawable"
diff --git a/app/src/main/res/layout/list_stream_item.xml b/app/src/main/res/layout/list_stream_item.xml
index ccf325592..02e8f1531 100644
--- a/app/src/main/res/layout/list_stream_item.xml
+++ b/app/src/main/res/layout/list_stream_item.xml
@@ -80,7 +80,7 @@
         android:textSize="@dimen/video_item_search_upload_date_text_size"
         tools:text="2 years ago • 10M views"/>
 
-    <ProgressBar
+    <org.schabi.newpipe.views.AnimatedProgressBar
         android:id="@+id/itemProgressView"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:progressDrawable="?progress_horizontal_drawable"
diff --git a/app/src/main/res/layout/list_stream_mini_item.xml b/app/src/main/res/layout/list_stream_mini_item.xml
index 383580e59..667798128 100644
--- a/app/src/main/res/layout/list_stream_mini_item.xml
+++ b/app/src/main/res/layout/list_stream_mini_item.xml
@@ -70,7 +70,7 @@
         android:textSize="@dimen/video_item_search_uploader_text_size"
         tools:text="Uploader" />
 
-    <ProgressBar
+    <org.schabi.newpipe.views.AnimatedProgressBar
         android:id="@+id/itemProgressView"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:progressDrawable="?progress_horizontal_drawable"
diff --git a/app/src/main/res/layout/list_stream_playlist_item.xml b/app/src/main/res/layout/list_stream_playlist_item.xml
index 47c3ab93d..2747038f6 100644
--- a/app/src/main/res/layout/list_stream_playlist_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_item.xml
@@ -83,7 +83,7 @@
         android:textSize="@dimen/video_item_search_uploader_text_size"
         tools:text="Uploader" />
 
-    <ProgressBar
+    <org.schabi.newpipe.views.AnimatedProgressBar
         android:id="@+id/itemProgressView"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:progressDrawable="?progress_horizontal_drawable"

From 40efed6580ed4655578cae49032903901b43cc00 Mon Sep 17 00:00:00 2001
From: Tobias Groza <tobigr@users.noreply.github.com>
Date: Sun, 28 Apr 2019 01:29:45 +0200
Subject: [PATCH 087/138] Update version code and name to NewPipe 0.16.2

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ef50820a2..9e6a21063 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 730
-        versionName "0.16.1"
+        versionCode 740
+        versionName "0.16.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

From 46511533aa1c22d04731c8f3d4deabdc9295e0ab Mon Sep 17 00:00:00 2001
From: Jesper Hertel <jesper.hertel@gmail.com>
Date: Sat, 27 Apr 2019 10:31:19 +0000
Subject: [PATCH 088/138] Translated using Weblate (Danish)

Currently translated at 88.7% (393 of 443 strings)
---
 app/src/main/res/values-da/strings.xml | 260 ++++++++++++-------------
 1 file changed, 130 insertions(+), 130 deletions(-)

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 6143dc6b0..d2cfe3ea4 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -53,7 +53,7 @@
     <string name="play_with_kodi_title">Afspil med Kodi</string>
     <string name="kore_not_found">Kore-appen ikke fundet. Installer den\?</string>
     <string name="show_play_with_kodi_title">Vis valgmuligheden \"Afspil med Kodi\"</string>
-    <string name="show_play_with_kodi_summary">Vis en knap til at afspille en video via Kodi-mediecenteret</string>
+    <string name="show_play_with_kodi_summary">Vis en knap til at afspille en video via Kodi</string>
     <string name="play_audio">Lyd</string>
     <string name="default_audio_format_title">Standardformat for lydfiler</string>
     <string name="default_video_format_title">Standardformat for videofiler</string>
@@ -61,7 +61,7 @@
     <string name="light_theme_title">Lyst</string>
     <string name="dark_theme_title">Mørkt</string>
     <string name="black_theme_title">Sort</string>
-    <string name="popup_remember_size_pos_title">Husk pop op-størrelse og -position</string>
+    <string name="popup_remember_size_pos_title">Husk størrelse og placering af pop op</string>
     <string name="popup_remember_size_pos_summary">Husk sidste størrelse og placering af pop op-afspiller</string>
     <string name="use_inexact_seek_title">Brug hurtig og upræcis søgning</string>
     <string name="use_inexact_seek_summary">Upræcis søgning lader afspilleren finde placeringer hurtigere, men mindre præcist</string>
@@ -73,47 +73,46 @@
     <string name="metadata_cache_wipe_complete_notice">Metadata-cache slettet</string>
     <string name="auto_queue_title">Føj automatisk næste stream til køen</string>
     <string name="auto_queue_summary">Føj automatisk relaterede streams til køen når den sidste stream i en ikke-repeterende kø afspilles.</string>
-    <string name="volume_gesture_control_title">Juster lydstyrke ved hjælp af fingerkontrol</string>
-    <string name="volume_gesture_control_summary">Brug håndbevægelser til at kontrollere lydstyrke</string>
+    <string name="volume_gesture_control_title">Juster lydstyrke ved hjælp af fingerbevægelser</string>
+    <string name="volume_gesture_control_summary">Brug fingerbevægelser til at kontrollere lydstyrke</string>
     <string name="brightness_gesture_control_title">Styr lysstyrken med fingerbevægelser</string>
     <string name="brightness_gesture_control_summary">Brug fingerbevægelser til at justere afspillerens lysstyrke</string>
-    <string name="player_gesture_controls_title">Afspiller håndbevægelseskontol</string>
-    <string name="player_gesture_controls_summary">Brug håndbevægelser til at justere lysstyrke og lydstyrke</string>
-    <string name="show_search_suggestions_title">Søg i foreslag</string>
-    <string name="show_search_suggestions_summary">Vis foreslag når der søges</string>
+    <string name="player_gesture_controls_title">Fingerbevægelsesstyring af afspiller</string>
+    <string name="player_gesture_controls_summary">Brug fingerbevægelser til at justere lysstyrke og lydstyrke</string>
+    <string name="show_search_suggestions_title">Søgeforslag</string>
+    <string name="show_search_suggestions_summary">Vis forslag når der søges</string>
     <string name="enable_search_history_title">Søgehistorik</string>
     <string name="enable_search_history_summary">Gem søgninger lokalt</string>
-    <string name="enable_watch_history_title">Historie &amp; Cache</string>
-    <string name="enable_watch_history_summary">Hold styr på sete videoer</string>
-    <string name="resume_on_audio_focus_gain_title">Forsæt når appen kommer i focus</string>
-    <string name="resume_on_audio_focus_gain_summary">Foresæt afspilning efter afbrydelse (fks. telefon opkald)</string>
+    <string name="enable_watch_history_title">Historik og cache</string>
+    <string name="enable_watch_history_summary">Husk sete videoer</string>
+    <string name="resume_on_audio_focus_gain_title">Fortsæt når appen kommer i fokus</string>
+    <string name="resume_on_audio_focus_gain_summary">Fortsæt afspilning efter afbrydelser (fx telefonopkald)</string>
     <string name="download_dialog_title">Download</string>
     <string name="next_video_title">Næste</string>
     <string name="show_next_and_similar_title">Vis \'Næste\' og \'Lignende\' videoer</string>
-    <string name="show_hold_to_append_title">Vis \"Hold for at tiljøje\" tip</string>
-    <string name="show_hold_to_append_summary">Vis et tip når baggrunds eller popup knappen trykkes</string>
-    <string name="url_not_supported_toast">Dette URL er ikke understøttet</string>
-    <string name="default_content_country_title">Standard land for indhold</string>
-    <string name="service_title">Service</string>
-    <string name="content_language_title">Standard sprog for indhold</string>
+    <string name="show_hold_to_append_title">Vis \"Hold for at tilføje\"-tip</string>
+    <string name="show_hold_to_append_summary">Vis et tip når der trykkes på baggrunds- eller pop op-knappen på siden med videodetaljer</string>
+    <string name="url_not_supported_toast">Denne webadresse er ikke understøttet</string>
+    <string name="default_content_country_title">Standardland for indhold</string>
+    <string name="service_title">Tjeneste</string>
+    <string name="content_language_title">Standardsprog for indhold</string>
     <string name="settings_category_player_title">Afspiller</string>
     <string name="settings_category_player_behavior_title">Opførsel</string>
-    <string name="settings_category_video_audio_title">Video &amp; Lyd</string>
-    <string name="settings_category_history_title">Historie &amp; Cache</string>
-    <string name="settings_category_popup_title">Popup</string>
-    <string name="settings_category_appearance_title">"Udseende "</string>
+    <string name="settings_category_video_audio_title">Video og lyd</string>
+    <string name="settings_category_history_title">Historik og cache</string>
+    <string name="settings_category_popup_title">Pop op</string>
+    <string name="settings_category_appearance_title">Udseende</string>
     <string name="settings_category_other_title">Andet</string>
-    <string name="settings_category_debug_title">Debug</string>
+    <string name="settings_category_debug_title">Fejlretning</string>
     <string name="settings_category_updates_title">Opdateringer</string>
     <string name="background_player_playing_toast">Afspiller i baggrunden</string>
-    <string name="popup_playing_toast">Afspiller i popup tilstand
-\n</string>
-    <string name="background_player_append">Tilføjet til køen i baggrundsafspilleren</string>
-    <string name="popup_playing_append">Tilføjet til afspilningskøen</string>
+    <string name="popup_playing_toast">Afspiller i pop op-tilstand</string>
+    <string name="background_player_append">Føjet til køen i baggrundsafspilleren</string>
+    <string name="popup_playing_append">Føjet til pop op-afspilningskøen</string>
     <string name="play_btn_text">Afspil</string>
-    <string name="content">Inhold</string>
-    <string name="show_age_restricted_content_title">Aldersbegrænset inhold</string>
-    <string name="video_is_age_restricted">Vis aldersbegrænsede videoer. Du kan tillade den slags videoer under Indstillinger.</string>
+    <string name="content">Indhold</string>
+    <string name="show_age_restricted_content_title">Aldersbegrænset indhold</string>
+    <string name="video_is_age_restricted">Vis aldersbegrænsede videoer. Du kan tillade denne type videoer under Indstillinger.</string>
     <string name="duration_live">LIVE</string>
     <string name="downloads">Downloads</string>
     <string name="downloads_title">Downloads</string>
@@ -135,93 +134,90 @@
     <string name="filter">Filtrer</string>
     <string name="refresh">Genindlæs</string>
     <string name="clear">Slet</string>
-    <string name="popup_resizing_indicator_title">Ændrer Størrelse</string>
+    <string name="popup_resizing_indicator_title">Ændrer størrelse</string>
     <string name="best_resolution">Bedste opløsning</string>
     <string name="undo">Fortryd</string>
     <string name="file_deleted">Fil slettet</string>
-    <string name="play_all">Afspil Alle</string>
+    <string name="play_all">Afspil alle</string>
     <string name="always">Altid</string>
     <string name="just_once">Kun én gang</string>
     <string name="file">Fil</string>
-    <string name="notification_channel_name">NewPipe Notifikation
-\n</string>
-    <string name="notification_channel_description">Notifikationer for NewPipe backgrunds og popup afspillere
-\n</string>
-    <string name="app_update_notification_channel_name">App Opdaterings Notifikation</string>
-    <string name="app_update_notification_channel_description">Notifikationer for nye NewPipe versioner
-\n</string>
+    <string name="notification_channel_name">NewPipe-notifikation</string>
+    <string name="notification_channel_description">Notifikationer for NewPipes baggrunds- og pop op-afspillere</string>
+    <string name="app_update_notification_channel_name">Notifikation om opdatering af app</string>
+    <string name="app_update_notification_channel_description">Notifikationer for nye NewPipe-versioner</string>
     <string name="unknown_content">[Ukendt]</string>
-    <string name="toggle_orientation">Instill Retning</string>
-    <string name="switch_to_background">Skift til Bagrund</string>
-    <string name="switch_to_popup">Skift til Popup</string>
-    <string name="switch_to_main">Skift til Forside</string>
+    <string name="toggle_orientation">Skift skærmretning</string>
+    <string name="switch_to_background">Skift til baggrund</string>
+    <string name="switch_to_popup">Skift til pop op</string>
+    <string name="switch_to_main">Skift til hovedafspiller</string>
     <string name="import_data_title">Importer database</string>
     <string name="export_data_title">Eksporter database</string>
-    <string name="import_data_summary">Overskriver din nuværende historie og abonnementer</string>
-    <string name="export_data_summary">Eksporter historie, abonnementer og spillelister</string>
+    <string name="import_data_summary">Overskriver din nuværende historik og abonnementer</string>
+    <string name="export_data_summary">Eksporter historik, abonnementer og spillelister</string>
     <string name="clear_views_history_title">Slet visningshistorik</string>
-    <string name="clear_views_history_summary">Sletter historien af viste videoer</string>
+    <string name="clear_views_history_summary">Sletter historikken for viste videoer</string>
     <string name="delete_view_history_alert">Slet hele visningshistorikken\?</string>
     <string name="view_history_deleted">Visningshistorikken blev slettet.</string>
     <string name="clear_search_history_title">Slet søgehistorik</string>
-    <string name="clear_search_history_summary">Sletter gemte søge ord</string>
+    <string name="clear_search_history_summary">Sletter historikken for søgeord</string>
     <string name="delete_search_history_alert">Slet hele søgehistorikken\?</string>
     <string name="search_history_deleted">Søgehistorik slettet.</string>
     <string name="general_error">Fejl</string>
-    <string name="download_to_sdcard_error_title">Ekstern lagring utilgængelig</string>
+    <string name="download_to_sdcard_error_title">Eksternt lager utilgængeligt</string>
     <string name="download_to_sdcard_error_message">Download til eksternt SD-kort er endnu ikke muligt. Nulstil placering af download-mappe\?</string>
-    <string name="network_error">Netwærksfejl</string>
-    <string name="could_not_load_thumbnails">Kunne indlæse alle billeder</string>
-    <string name="youtube_signature_decryption_error">Kunne ikke dekryptere video URL signatur</string>
-    <string name="parsing_error">Kunne ikke indlæse webside</string>
-    <string name="light_parsing_error">Kunne ikke indlæse hele websiden</string>
-    <string name="content_not_available">Indhold utilgængeligt</string>
+    <string name="network_error">Netværksfejl</string>
+    <string name="could_not_load_thumbnails">Kunne ikke indlæse alle miniaturebilleder</string>
+    <string name="youtube_signature_decryption_error">Kunne ikke dekryptere URL-signatur for video</string>
+    <string name="parsing_error">Kunne ikke analysere websted</string>
+    <string name="light_parsing_error">Kunne ikke analysere webstedet fuldstændig</string>
+    <string name="content_not_available">Indhold ikke tilgængeligt</string>
     <string name="blocked_by_gema">Blokeret af GEMA</string>
-    <string name="could_not_setup_download_menu">Kunne ikke oprette download menu</string>
-    <string name="live_streams_not_supported">"Livestreams er ikke undestøttet endnu "</string>
-    <string name="could_not_get_stream">Kunne ikke hente nogen streams</string>
-    <string name="could_not_load_image">Kunne ikke hente billede</string>
-    <string name="app_ui_crash">App/Brugergrænseflade crashede</string>
+    <string name="could_not_setup_download_menu">Kunne ikke oprette downloadmenu</string>
+    <string name="live_streams_not_supported">Livestreams er endnu ikke understøttet</string>
+    <string name="could_not_get_stream">Kunne ikke hente nogen stream</string>
+    <string name="could_not_load_image">Kunne ikke indlæse billede</string>
+    <string name="app_ui_crash">App/brugergrænseflade gik ned</string>
     <string name="player_stream_failure">Kunne ikke afspille denne stream</string>
-    <string name="player_unrecoverable_failure">"Uoprettelig fejl ved opstod ved afspilning "</string>
-    <string name="player_recoverable_failure">Prøver at genoprette efter fejl ved afspilning</string>
-    <string name="external_player_unsupported_link_type">Eksterne afspillere undestøtter ikke disse typer af links</string>
+    <string name="player_unrecoverable_failure">Uoprettelig afspillerfejl opstod</string>
+    <string name="player_recoverable_failure">Prøver at genoprette efter afspillerfejl</string>
+    <string name="external_player_unsupported_link_type">Eksterne afspillere understøtter ikke disse typer af links</string>
     <string name="invalid_url_toast">Ugyldig adresse</string>
-    <string name="video_streams_empty">Ingen video streams blev fundet</string>
-    <string name="audio_streams_empty">Ingen lyd streams blev fundet</string>
-    <string name="invalid_directory">Kunne ikke finde mappe</string>
-    <string name="invalid_source">Kunne ikke finde file/kilde</string>
-    <string name="invalid_file">Filen eksister ikke eller også der er manglende rettigheder til at læse og skrive til den</string>
+    <string name="video_streams_empty">Ingen videostreams fundet</string>
+    <string name="audio_streams_empty">Ingen lydstreams fundet</string>
+    <string name="invalid_directory">Mappen findes ikke</string>
+    <string name="invalid_source">Fil eller indholdskilde findes ikke</string>
+    <string name="invalid_file">Filen eksister ikke eller der mangler rettigheder til at læse eller skrive til den</string>
     <string name="file_name_empty_error">Filavnet kan ikke være tomt</string>
-    <string name="error_occurred_detail">Der skete en fejl: %1$s</string>
-    <string name="no_streams_available_download">Ingen streams er tilgængelige til at downloade</string>
-    <string name="saved_tabs_invalid_json">Bruger standard tabs, fejl ved indlæsning af gemte tabs</string>
+    <string name="error_occurred_detail">Der opstod en fejl: %1$s</string>
+    <string name="no_streams_available_download">Ingen streams er tilgængelige for download</string>
+    <string name="saved_tabs_invalid_json">Bruger standardfaner pga. fejl ved indlæsning af gemte faner</string>
     <string name="restore_defaults">Genskab standardindstillinger</string>
     <string name="restore_defaults_confirmation">Vil du genskabe standardindstillingerne\?</string>
-    <string name="sorry_string">Undskyld, dette skulle ikke have været sket.</string>
-    <string name="error_report_button_text">Rappoter dette via e-mail</string>
-    <string name="error_snackbar_message">Undskyld, der opstod nogle fejl.</string>
+    <string name="sorry_string">Undskyld, dette skulle ikke være sket.</string>
+    <string name="error_report_button_text">Rapporter fejl via e-mail</string>
+    <string name="error_snackbar_message">Undskyld, nogle fejl opstod.</string>
     <string name="error_snackbar_action">RAPPORTER</string>
     <string name="what_device_headline">Information:</string>
     <string name="what_happened_headline">Hvad skete der:</string>
     <string name="your_comment">Din kommentar (på engelsk):</string>
     <string name="error_details_headline">Detaljer:</string>
-    <string name="list_thumbnail_view_description">Video billede</string>
-    <string name="detail_thumbnail_view_description">Video billede</string>
+    <string name="list_thumbnail_view_description">Videominiaturebillede</string>
+    <string name="detail_thumbnail_view_description">Videominiaturebillede</string>
     <string name="detail_uploader_thumbnail_view_description">Uploaders profilbillede</string>
     <string name="detail_likes_img_view_description">Synes godt om</string>
     <string name="detail_dislikes_img_view_description">Kan ikke lide</string>
-    <string name="use_tor_title">Brug TOR</string>
-    <string name="use_tor_summary">(Eksperimentelt) Tving downloads til at bruge TOR (streaming er ikke understøttet endnu).</string>
-    <string name="report_error">Rappoter en Fejl</string>
+    <string name="use_tor_title">Brug Tor</string>
+    <string name="use_tor_summary">(Eksperimentelt) Send downloadtrafik gennem Tor for øget privatliv (videostreaming endnu ikke understøttet).</string>
+    <string name="report_error">Rapporter en fejl</string>
     <string name="search_no_results">Ingen resultater</string>
     <string name="detail_drag_description">Træk for at omarrangere</string>
-    <string name="err_dir_create">Kan ikke oprette download mappe \'%1$s\'</string>
-    <string name="info_dir_created">Oprettede download mappe \'%1$s\'</string>
+    <string name="err_dir_create">Kan ikke oprette downloadmappe \'%1$s\'</string>
+    <string name="info_dir_created">Oprettede downloadmappe \'%1$s\'</string>
     <string name="video">Video</string>
     <string name="audio">Lyd</string>
     <string name="retry">Prøv igen</string>
-    <string name="storage_permission_denied">Adgang til hulkomekse nægtet</string>
+    <string name="storage_permission_denied">Adgang til lager nægtet</string>
     <string name="no_subscribers">Ingen abonnenter</string>
     <string name="subscribers_count_not_available">Antallet af abonnenter er ikke tilgængeligt</string>
     <string name="no_views">Ingen visninger</string>
@@ -229,86 +225,83 @@
         <item quantity="one">%s visning</item>
         <item quantity="other">%s visninger</item>
     </plurals>
-    <string name="no_videos">Ingen Videoer</string>
+    <string name="no_videos">Ingen videoer</string>
     <string name="start">Start</string>
     <string name="view">Afspil</string>
     <string name="create">Opret</string>
     <string name="delete">Slet</string>
     <string name="delete_one">Slet én</string>
-    <string name="delete_all">Slet Alle</string>
-    <string name="checksum">Checksum</string>
+    <string name="delete_all">Slet alle</string>
+    <string name="checksum">Kontrolsum</string>
     <string name="dismiss">Afvis</string>
     <string name="rename">Omdøb</string>
     <string name="add">Ny mission</string>
-    <string name="finish">Ok</string>
+    <string name="finish">OK</string>
     <string name="msg_name">Filnavn</string>
     <string name="msg_threads">Tråde</string>
     <string name="msg_error">Fejl</string>
     <string name="msg_server_unsupported">Server ikke understøttet</string>
     <string name="msg_exists">Filen eksisterer allerede</string>
-    <string name="msg_url_malform">Forkert URL formatering eller manglende internet forbindelse</string>
-    <string name="msg_running">NewPiper Downloader</string>
+    <string name="msg_url_malform">Ugyldig webadresse eller manglende internetforbindelse</string>
+    <string name="msg_running">NewPiper downloader</string>
     <string name="msg_running_detail">Tryk for detaljer</string>
     <string name="msg_wait">Vent venligst…</string>
     <string name="msg_copied">Kopieret til udklipsholderen</string>
-    <string name="no_available_dir">Vælg venligst en ledig download mappe</string>
-    <string name="msg_popup_permission">Denne tilladelse er nødvendig for at kunne åbne i popup tilstand</string>
-    <string name="one_item_deleted">Et element slettet.</string>
-    <string name="reCaptchaActivity">reCAPTCHA
-\n</string>
-    <string name="reCaptcha_title">reCAPTCHA udfordring</string>
-    <string name="recaptcha_request_toast">reCAPTCHA udfordring anmodet</string>
+    <string name="no_available_dir">Vælg venligst en tilgængelig downloadmappe</string>
+    <string name="msg_popup_permission">Denne tilladelse er nødvendig for at kunne åbne i pop op-tilstand</string>
+    <string name="one_item_deleted">1 element slettet.</string>
+    <string name="reCaptchaActivity">reCAPTCHA</string>
+    <string name="reCaptcha_title">reCAPTCHA-udfordring</string>
+    <string name="recaptcha_request_toast">Der blev anmodet om en reCAPTCHA-udfordring</string>
     <string name="settings_category_downloads_title">Download</string>
-    <string name="settings_file_charset_title">Lovlige tegn i filnavne</string>
-    <string name="settings_file_replacement_character_summary">Ugyldige tegn bliver erstattet med dette tegn</string>
-    <string name="settings_file_replacement_character_title">Erstatningskarakter</string>
-    <string name="charset_letters_and_digits">Bogstaver og tal</string>
+    <string name="settings_file_charset_title">Tilladte tegn i filnavne</string>
+    <string name="settings_file_replacement_character_summary">Ugyldige tegn bliver erstattet med denne værdi</string>
+    <string name="settings_file_replacement_character_title">Erstatningstegn</string>
+    <string name="charset_letters_and_digits">Bogstaver og cifre</string>
     <string name="charset_most_special_characters">De fleste specialtegn</string>
     <string name="toast_no_player">Der ingen app installeret der kan afspille denne fil</string>
     <string name="title_activity_about">Om NewPipe</string>
     <string name="action_settings">Indstillinger</string>
     <string name="action_about">Om</string>
     <string name="title_licenses">Tredjepartslicenser</string>
-    <string name="copyright" formatted="true">© %1$s by %2$s under %3$s
-\n</string>
+    <string name="copyright" formatted="true">© %1$s af %2$s under %3$s</string>
     <string name="error_unable_to_load_license">Kunne ikke indlæse licens</string>
-    <string name="action_open_website">Åben webside</string>
+    <string name="action_open_website">Åbn websted</string>
     <string name="tab_about">Om</string>
     <string name="tab_contributors">Bidragsydere</string>
     <string name="tab_licenses">Licenser</string>
-    <string name="app_description">Libre letvægts streaming på Android.</string>
+    <string name="app_description">Åben letvægtsstreaming på Android.</string>
     <string name="contribution_title">Bidrag til projektet</string>
-    <string name="contribution_encouragement">Hvad enten du har idéer til, oversæting, design ændringer, kode refaktorering eller større kode ændringer, så er hjælp altid velkommen. Jo mere der bliver gjort jo bedre bliver det!</string>
-    <string name="view_on_github">Se på Github</string>
+    <string name="contribution_encouragement">Hvad enten du har idéer til oversættelse, designændringer, kodeoprydning eller virkelig tunge kodeændringer, så er hjælp altid velkommen. Jo mere der bliver gjort, jo bedre bliver det!</string>
+    <string name="view_on_github">Se på GitHub</string>
     <string name="donation_title">Doner</string>
-    <string name="donation_encouragement">NewPipe er udviklet af frivillige der bruger tid på at give dig den bedste oplevelse. Giv noget tilbage til NewPipes udviklere så de kan gøre appen endnu bedre, mens de nyder en kop kaffe.</string>
+    <string name="donation_encouragement">NewPipe er udviklet af frivillige der bruger tid på at give dig den bedste oplevelse. Giv noget tilbage for at hjælpe NewPipes udviklere til at gøre appen endnu bedre, mens de nyder en kop kaffe.</string>
     <string name="give_back">Giv noget tilbage</string>
-    <string name="website_title">Webside</string>
-    <string name="website_encouragement">Besøg NewPipes webside for mere information og nyheder.</string>
-    <string name="privacy_policy_title">NewPipes Fortrolighedspolitik
-\n</string>
+    <string name="website_title">Websted</string>
+    <string name="website_encouragement">Besøg NewPipes websted for mere information og nyheder.</string>
+    <string name="privacy_policy_title">NewPipes fortrolighedspolitik</string>
     <string name="read_privacy_policy">Læs fortrolighedspolitik</string>
-    <string name="app_license_title">NewPipe\'s Licens</string>
-    <string name="app_license">NewPipe er copyleft libre software: Du kan bruge, studere, dele og forbedre det som du vi.l Specifikt kan du redistribuere og/eller modificere det under betingelserne i GNU General Public License som udgivet af The Free Software Foundation, version 3 af licensen, eller (efter dit valg) en senere version.</string>
+    <string name="app_license_title">NewPipes licens</string>
+    <string name="app_license">NewPipe er copyleft, fri software: Du kan bruge, studere, dele og forbedre den som du vil. Specifikt kan du redistribuere og/eller ændre den under betingelserne i GNU General Public License som udgivet af Free Software Foundation, enten version 3 af licensen eller (efter dit ønske) en vilkårlig senere version.</string>
     <string name="read_full_license">Læs licens</string>
-    <string name="title_activity_history">Historie</string>
+    <string name="title_activity_history">Historik</string>
     <string name="title_history_search">Søgte</string>
     <string name="title_history_view">Sete</string>
-    <string name="history_disabled">Historie er slået fra</string>
-    <string name="action_history">Historie</string>
-    <string name="history_empty">Historien er tom</string>
-    <string name="history_cleared">Historie slettet</string>
+    <string name="history_disabled">Historik er slået fra</string>
+    <string name="action_history">Historik</string>
+    <string name="history_empty">Historikken er tom</string>
+    <string name="history_cleared">Historik slettet</string>
     <string name="item_deleted">Element slettet</string>
     <string name="delete_item_search_history">Vil du slette dette element fra søgehistorikken\?</string>
     <string name="delete_stream_history_prompt">Vil du slette dette element fra visningshistorikken\?</string>
     <string name="delete_all_history_prompt">Er du sikker på at vil slette alle elementer i historikken\?</string>
-    <string name="title_last_played">Sidst Afspillet</string>
-    <string name="title_most_played">Mest Spillede</string>
-    <string name="main_page_content">Indhold af forsiden</string>
-    <string name="main_page_content_summary">Hvilke tabs vises på forsiden</string>
+    <string name="title_last_played">Sidst afspillet</string>
+    <string name="title_most_played">Mest spillede</string>
+    <string name="main_page_content">Indhold af hovedsiden</string>
+    <string name="main_page_content_summary">Hvilke faner vises på hovedsiden</string>
     <string name="selection">Udvalg</string>
-    <string name="blank_page_summary">Blank Side</string>
-    <string name="kiosk_page_summary">Kiosk Side</string>
+    <string name="blank_page_summary">Tom side</string>
+    <string name="kiosk_page_summary">Kioskside</string>
     <string name="subscription_page_summary">Abonnementsside</string>
     <string name="channel_page_summary">Kanalside</string>
     <string name="select_a_channel">Vælg en kanal</string>
@@ -316,24 +309,24 @@
     <string name="select_a_kiosk">Vælg en kiosk</string>
     <string name="export_complete_toast">Eksporteret</string>
     <string name="import_complete_toast">Importeret</string>
-    <string name="no_valid_zip_file">Ikke en gyldig ZIP fil</string>
+    <string name="no_valid_zip_file">Ikke en gyldig ZIP-fil</string>
     <string name="could_not_import_all_files">Advarsel: Kunne ikke importere alle filer.</string>
     <string name="override_current_data">Dette vil overskrive dine nuværende indstillinger.</string>
     <string name="import_settings">Vil du også importere indstillinger\?</string>
     <string name="kiosk">Kiosk</string>
-    <string name="trending">Populært Lige Nu</string>
+    <string name="trending">Populært lige nu</string>
     <string name="top_50">Top 50</string>
-    <string name="new_and_hot">Nyt &amp; Populært</string>
+    <string name="new_and_hot">Nyt og populært</string>
     <string name="title_activity_background_player">Baggrundsafspiller</string>
-    <string name="title_activity_popup_player">Popup afspiller</string>
+    <string name="title_activity_popup_player">Pop op-afspiller</string>
     <string name="play_queue_remove">Fjern</string>
     <string name="play_queue_stream_detail">Detaljer</string>
     <string name="play_queue_audio_settings">Lydindstillinger</string>
-    <string name="hold_to_append">Hold for at tilføje til kø</string>
-    <string name="enqueue_on_background">Tilføj til kø når baggrunds tilstand aktiveres</string>
+    <string name="hold_to_append">Hold for at føje til kø</string>
+    <string name="enqueue_on_background">Føj til kø når baggrundstilstand aktiveres</string>
     <string name="start_here_on_main">Start afspilning her</string>
     <string name="drawer_header_action_paceholder_text">Noget vil dukke op her snart ;D</string>
-    <string name="preferred_open_action_settings_title">Foretrukket \'åben\' handling</string>
+    <string name="preferred_open_action_settings_title">Foretrukket \'åbn\'-handling</string>
     <string name="video_player">Videoafspiller</string>
     <string name="background_player">baggrundsafspiller</string>
     <string name="popup_player">Popup-afspiller</string>
@@ -394,7 +387,7 @@
     <string name="stop">Stop</string>
     <string name="events">Hændelser</string>
     <string name="empty_subscription_feed_subtitle">Intet at se her</string>
-    <string name="short_thousand">K</string>
+    <string name="short_thousand">T</string>
     <string name="short_million">mio.</string>
     <string name="short_billion">mia.</string>
     <plurals name="subscribers">
@@ -405,4 +398,11 @@
     <string name="feed_page_summary">Feed-side</string>
     <string name="subscriptions_import_unsuccessful">Kunne ikke importere abonnementer</string>
     <string name="subscriptions_export_unsuccessful">Kunne ikke eksportere abonnementer</string>
+    <string name="user_report">Brugerrapport</string>
+    <string name="conferences">Konferencer</string>
+    <string name="enqueue_on_popup">Føj til kø ved ny pop op</string>
+    <string name="start_here_on_background">Start her når i baggrunden</string>
+    <string name="start_here_on_popup">Start her ved ny pop op</string>
+    <string name="drawer_open">Åbn skuffe</string>
+    <string name="drawer_close">Luk skuffe</string>
 </resources>
\ No newline at end of file

From 460610f672c0dfed938c74b40e15e8d1f9086bbd Mon Sep 17 00:00:00 2001
From: Chandra Mohan Jha <chandramohanjha@tuta.io>
Date: Sat, 27 Apr 2019 07:59:41 +0000
Subject: [PATCH 089/138] Translated using Weblate (Hindi)

Currently translated at 77.2% (342 of 443 strings)
---
 app/src/main/res/values-hi/strings.xml | 29 +++++++++++++-------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 9755c26fb..ed2815638 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -57,7 +57,7 @@
     <string name="did_you_mean">क्या आप का मतलब %1$s है?</string>
     <string name="share_dialog_title">शेयर करें</string>
     <string name="use_external_video_player_title">अन्य वीडियो प्लेयर उपयोग करें</string>
-    <string name="use_external_video_player_summary">कुछ रेसोल्युशनस में नहीं आएगी</string>
+    <string name="use_external_video_player_summary">कुछ प्रस्तावों पर ऑडियो निकालता है</string>
     <string name="use_external_audio_player_title">अन्य ऑडियो प्लेयर उपयोग करें</string>
     <string name="tab_main">मुख्य</string>
     <string name="subscription_change_failed">सदस्यता नहीं बदला जा सका</string>
@@ -77,7 +77,7 @@
     <string name="play_with_kodi_title">Kodi से चलाये</string>
     <string name="kore_not_found">Kore एप्प नहीं मिला, इसे इनस्टॉल करें?</string>
     <string name="show_play_with_kodi_title">\"Kodi से चलाये\" वाला विकल्प दिखाए</string>
-    <string name="show_play_with_kodi_summary">उस विकल्प को दिखाए जिसमे Kodi Media Center के जरिये विडियो प्ले किया जाता है</string>
+    <string name="show_play_with_kodi_summary">कोडी मीडिया सेंटर के माध्यम से वीडियो चलाने के लिए एक विकल्प प्रदर्शित करें</string>
     <string name="default_audio_format_title">डिफ़ॉल्ट ऑडियो का फॉर्मेट</string>
     <string name="default_video_format_title">डिफ़ॉल्ट विडियो का फॉर्मेट</string>
     <string name="webm_description">WebM - libre फॉर्मेट</string>
@@ -111,7 +111,7 @@
     <string name="play_btn_text">चलाये</string>
     <string name="content">विषयवस्तु</string>
     <string name="show_age_restricted_content_title">उम्र प्रतिबंधित विषय वस्तु</string>
-    <string name="video_is_age_restricted">उम्र प्रतिबंदित विडियो है .इस प्रकार की विषयवस्तु को अनुमति देने के लिए Setting से संभव है |</string>
+    <string name="video_is_age_restricted">उम्र प्रतिबंदित विडियो है .इस प्रकार की विषयवस्तु को अनुमति देने के लिए सेटिंग से संभव है |</string>
     <string name="duration_live">सीधा प्रसारण</string>
     <string name="downloads">डाउनलोड</string>
     <string name="downloads_title">डाउनलोड</string>
@@ -169,7 +169,7 @@
     <string name="search_no_results">कोई परिणाम नहीं मिला</string>
     <string name="empty_subscription_feed_subtitle">यंहा कुछ नहीं है</string>
     <string name="err_dir_create">"डाउनलोड वाली डायरेक्टरी को बना नहीं सकते  \'%1$s\'"</string>
-    <string name="info_dir_created">डाउनलोड की डायरेक्टरी बना दी गई है \'%1$s\'</string>
+    <string name="info_dir_created">डाउनलोड की निर्देशिका बना दी गई है \'%1$s\'</string>
     <string name="video">विडियो</string>
     <string name="audio">ऑडियो</string>
     <string name="retry">फिर से कोशिश करे</string>
@@ -202,7 +202,7 @@
     <string name="msg_name">फाइल का नाम</string>
     <string name="msg_threads">मेसेज के thread</string>
     <string name="msg_error">त्रुटी</string>
-    <string name="msg_server_unsupported">server ठीक से चल नहीं रहा</string>
+    <string name="msg_server_unsupported">असमर्थित सर्वर</string>
     <string name="msg_exists">फाइल पहले से ही बनी हुई है</string>
     <string name="msg_url_malform">URL सही नहीं है या फिर हो सकता है इन्टरनेट उपलब्ध नहीं है</string>
     <string name="msg_running">न्यूपाइप डाउनलोड हो रहा है</string>
@@ -212,8 +212,8 @@
     <string name="no_available_dir">कृपया उपलब्ध डाउनलोड फोल्डर को चुने</string>
     <string name="msg_popup_permission">पॉपअप के तरीके में खोलने के लिए अनुमति की जरुरत है</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA चुनोती</string>
-    <string name="recaptcha_request_toast">reCAPTCHA चुनोती के लिए निवेदन</string>
+    <string name="reCaptcha_title">reCAPTCHA चुनौती</string>
+    <string name="recaptcha_request_toast">reCAPTCHA चुनौती का अनुरोध किया</string>
     <string name="settings_category_downloads_title">डाउनलोड</string>
     <string name="settings_file_charset_title">फाइल के नाम के लिए आवश्यक characters(जैसे - १२३, abc) की अनुमति है</string>
     <string name="settings_file_replacement_character_summary">अमान्य characters इस value से बदल जायेंगे</string>
@@ -238,7 +238,7 @@
     <string name="kiosk">kiosk</string>
     <string name="top_50">टॉप 50</string>
     <string name="new_and_hot">नया और गरम</string>
-    <string name="title_activity_background_player">बैकग्राउंड प्लेयर</string>
+    <string name="title_activity_background_player">पृष्ठभूमि प्लेयर</string>
     <string name="title_activity_popup_player">पॉपअप प्लेयर</string>
     <string name="play_queue_remove">निकाले</string>
     <string name="play_queue_stream_detail">विवरण</string>
@@ -263,12 +263,12 @@
     <string name="switch_to_main">मुख्य पर स्विच करें</string>
     <string name="import_data_title">डेटाबेस आयात करें</string>
     <string name="export_data_title">डेटाबेस निर्यात करें</string>
-    <string name="import_data_summary">आपके वर्तमान इतिहास और सब्सक्रिप्शन को ओवरराइड करेगा</string>
+    <string name="import_data_summary">आपके वर्तमान इतिहास और सब्सक्रिप्शन को अधिभावी करेगा</string>
     <string name="export_data_summary">इतिहास, सब्सक्रिप्शन और प्लेलिस्ट निर्यात करें</string>
     <string name="external_player_unsupported_link_type">एक्सटर्नल प्लेयर इन प्रकार के लिंक सपोर्ट नहीं करता</string>
     <string name="invalid_url_toast">अमान्य URL</string>
     <string name="video_streams_empty">कोई वीडियो स्ट्रीम नहीं मिला</string>
-    <string name="audio_streams_empty">कोई वीडियो स्ट्रीम नहीं मिला</string>
+    <string name="audio_streams_empty">कोई ऑडियो स्ट्रीम नहीं मिली</string>
     <string name="detail_drag_description">फिर से क्रम देने के लिए खींचें</string>
     <string name="create">बनाइये</string>
     <string name="delete_one">एक को हटाएं</string>
@@ -284,8 +284,8 @@
     <string name="delete_all_history_prompt">क्या आप वाकई इतिहास से सभी आइटंस हटाना चाहते हैं?</string>
     <string name="title_last_played">पिछला चलाया गया</string>
     <string name="title_most_played">अधिकतम चलाए गए</string>
-    <string name="export_complete_toast">निर्यात पूर्ण हुआ</string>
-    <string name="import_complete_toast">आयात पूर्ण हुआ</string>
+    <string name="export_complete_toast">निर्यात किए गए</string>
+    <string name="import_complete_toast">आयातित</string>
     <string name="no_valid_zip_file">कोई मांय ज़िप फ़ाइल नहीं</string>
     <string name="could_not_import_all_files">चेतावनी: सभी फ़ाइलों को आयात नहीं किया जा सका।</string>
     <string name="override_current_data">यह आपके वर्तमान सेटअप को ओवरराइड करेगा ।</string>
@@ -344,14 +344,14 @@
     <string name="users">उपभोगता</string>
     <string name="clear_views_history_title">देखे हुए वीडियो की सूची साफ करें</string>
     <string name="clear_views_history_summary">चलाये गए स्ट्रीम का इतिहास साफ करता है</string>
-    <string name="delete_view_history_alert">देखे गए सभी का इतिहास साफ करें।</string>
+    <string name="delete_view_history_alert">देखे गए सभी का इतिहास साफ करें\?</string>
     <string name="view_history_deleted">देखे हुए का इतिहास साफ कर दिया गया।</string>
     <string name="clear_search_history_title">ढूंढने के इतिहास को साफ करें</string>
     <string name="clear_search_history_summary">ढूंढे गए शब्दो का इतिहास साफ करता है</string>
     <string name="delete_search_history_alert">पूरे खोज इतिहास को मिटा दे \?</string>
     <string name="search_history_deleted">ढूंढने के इतिहास को साफ कर दिया।</string>
     <string name="invalid_directory">एसी कोई भी फ़ोल्डर मौजूद नहीं है</string>
-    <string name="invalid_source">अमान्य फाइल/कॉन्टेंट उदभावस्थान</string>
+    <string name="invalid_source">अमान्य फाइल/विषय - वस्तु का स्रोत</string>
     <string name="invalid_file">फ़ाइल मौजूद नहीं है या उसे पढ़ने या लिखने की पर्याप्त अनुमति नही़ं है</string>
     <string name="file_name_empty_error">फ़ाइल का नाम खाली नहीं हो सकता</string>
     <string name="error_occurred_detail">एक भूल हुई: %1$s</string>
@@ -407,4 +407,5 @@
     <string name="tab_new">नया टॅब</string>
     <string name="tab_choose">टॅब चुने</string>
     <string name="volume_gesture_control_title">वॉल्यूम नियंत्रण</string>
+    <string name="enqueue">कतार</string>
 </resources>
\ No newline at end of file

From c90feaf3dbfdeb68dbe2858b949284bc9f7e156a Mon Sep 17 00:00:00 2001
From: AB <ao7nro+6ltrjuwxelfo4@sharklasers.com>
Date: Sat, 27 Apr 2019 09:39:53 +0000
Subject: [PATCH 090/138] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-uk/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 7ab368400..71606b005 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -320,7 +320,7 @@
     <string name="caption_auto_generated">Створені автоматично</string>
     <string name="enable_leak_canary_title">Увімкнути LeakCanary</string>
     <string name="enable_leak_canary_summary">Моніторинг втрат пам\'яті може призвести до нереагування застосунку під час запису дампу</string>
-    <string name="enable_disposed_exceptions_title">Звітувати про помилки життєвого циклу додатку</string>
+    <string name="enable_disposed_exceptions_title">Звітувати про помилки життєвого циклу застосунку</string>
     <string name="enable_disposed_exceptions_summary">Примусове звітування про неможливість доставлення Rx-винятків, які відбуваються за межами фрагменту або діяльності життєвого циклу після усунення</string>
     <string name="use_inexact_seek_title">Використовувати швидкий неточний пошук</string>
     <string name="use_inexact_seek_summary">Неточний пошук дозволяє програвачеві рухатися позиціями швидше, проте з меншою точністю</string>
@@ -442,10 +442,10 @@
     <string name="download_failed">Помилка завантаження</string>
     <string name="download_finished">Завантаження завершено</string>
     <string name="download_finished_more">%s завантажень завершено</string>
-    <string name="generate_unique_name">Згенерувати унікальне ім\'я</string>
+    <string name="generate_unique_name">Згенерувати унікальну назву</string>
     <string name="overwrite">Перезаписати</string>
     <string name="overwrite_warning">Завантажений файл з таким ім\'ям вже існує</string>
-    <string name="download_already_running">Файл з таким ім\'ям вже завантажується</string>
+    <string name="download_already_running">Файл з такою назвою вже завантажується</string>
     <string name="show_error">Показати помилку</string>
     <string name="label_code">Код</string>
     <string name="error_path_creation">Файл не може бути створений</string>

From a684e380b72fb06bc93fc415b0877d99587b161c Mon Sep 17 00:00:00 2001
From: Jesper Hertel <jesper.hertel@gmail.com>
Date: Sun, 28 Apr 2019 21:18:11 +0000
Subject: [PATCH 091/138] Translated using Weblate (Danish)

Currently translated at 98.9% (438 of 443 strings)
---
 app/src/main/res/values-da/strings.xml | 86 ++++++++++++++++++++------
 1 file changed, 67 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index d2cfe3ea4..4dc81f9c2 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -328,39 +328,39 @@
     <string name="drawer_header_action_paceholder_text">Noget vil dukke op her snart ;D</string>
     <string name="preferred_open_action_settings_title">Foretrukket \'åbn\'-handling</string>
     <string name="video_player">Videoafspiller</string>
-    <string name="background_player">baggrundsafspiller</string>
-    <string name="popup_player">Popup-afspiller</string>
+    <string name="background_player">Baggrundsafspiller</string>
+    <string name="popup_player">Pop op-afspiller</string>
     <string name="always_ask_open_action">Spørg altid</string>
-    <string name="preferred_player_fetcher_notification_title">Henter info…</string>
-    <string name="preferred_player_fetcher_notification_message">Indlæser anmodet indhold</string>
-    <string name="create_playlist">Ny Playliste</string>
+    <string name="preferred_player_fetcher_notification_title">Henter info …</string>
+    <string name="preferred_player_fetcher_notification_message">Indlæser det ønskede indhold</string>
+    <string name="create_playlist">Ny spilleliste</string>
     <string name="delete_playlist">Slet</string>
     <string name="rename_playlist">Omdøb</string>
     <string name="playlist_name_input">Navn</string>
-    <string name="append_playlist">Tilføj Til Playliste</string>
-    <string name="delete_playlist_prompt">Slet denne playliste\?</string>
-    <string name="playlist_creation_success">Playliste oprettet</string>
-    <string name="caption_none">Ingen Undertekster</string>
+    <string name="append_playlist">Føj til spilleliste</string>
+    <string name="delete_playlist_prompt">Slet denne spilleliste\?</string>
+    <string name="playlist_creation_success">Spilleliste oprettet</string>
+    <string name="caption_none">Ingen undertekster</string>
     <string name="resize_fit">Tilpas</string>
     <string name="resize_fill">Udfyld</string>
     <string name="resize_zoom">Zoom</string>
-    <string name="caption_auto_generated">Autogeneret</string>
+    <string name="caption_auto_generated">Autogenereret</string>
     <string name="caption_setting_title">Undertekster</string>
     <string name="export_to">Eksporter til</string>
     <string name="playback_reset">Nulstil</string>
     <string name="accept">Accepter</string>
     <string name="decline">Afvis</string>
     <string name="limit_data_usage_none_description">Ingen begrænsning</string>
-    <string name="limit_mobile_data_usage_title">Begeæns opløsning når der bruges mobil data</string>
+    <string name="limit_mobile_data_usage_title">Begræns opløsning når der bruges mobildata</string>
     <string name="updates_setting_title">Opdateringer</string>
-    <string name="list_view_mode">Liste tilstand</string>
+    <string name="list_view_mode">Listevisning</string>
     <string name="list">Liste</string>
     <string name="grid">Gitter</string>
     <string name="auto">Automatisk</string>
     <string name="app_update_notification_content_text">Tryk for at downloade</string>
     <string name="missions_header_finished">Færdig</string>
-    <string name="missions_header_pending">i kø</string>
-    <string name="post_processing">Efterbehandling</string>
+    <string name="missions_header_pending">I kø</string>
+    <string name="post_processing">efterbehandling</string>
     <string name="enqueue">Kø</string>
     <string name="permission_denied">Handling afvist af systemet</string>
     <string name="download_failed">Download fejlede</string>
@@ -368,19 +368,18 @@
     <string name="download_finished_more">%s downloads færdige</string>
     <string name="generate_unique_name">Generer unikt navn</string>
     <string name="overwrite">Overskriv</string>
-    <string name="overwrite_warning">"En downloadet fil med dette navn eksisterer allerede "</string>
+    <string name="overwrite_warning">En downloadet fil med dette navn eksisterer allerede</string>
     <string name="download_already_running">Der er en download i gang med dette navn</string>
     <string name="show_error">Vis fejl</string>
     <string name="label_code">Kode</string>
     <string name="error_path_creation">Filen kan ikke oprettes</string>
-    <string name="error_file_creation">Destinations mappen kan ikke oprettes</string>
+    <string name="error_file_creation">Destinationsmappen kan ikke oprettes</string>
     <string name="error_permission_denied">Adgang nægtet af systemet</string>
     <string name="error_ssl_exception">Sikker forbindelse fejlede</string>
-    <string name="error_unknown_host">Kan ikke finde serveren</string>
+    <string name="error_unknown_host">Kunne ikke finde serveren</string>
     <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
-\n</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>
@@ -405,4 +404,53 @@
     <string name="start_here_on_popup">Start her ved ny pop op</string>
     <string name="drawer_open">Åbn skuffe</string>
     <string name="drawer_close">Luk skuffe</string>
+    <string name="info_labels">Hvad:\\nForespørgsel:\\nIndholdssprog:\\nTjeneste:\\nGMT-tid:\\nPakke:\\nVersion:\\nOS-version:</string>
+    <string name="preferred_open_action_settings_summary">Standardhandling ved åbning af indhold — %s</string>
+    <string name="set_as_playlist_thumbnail">Angiv som miniaturebillede for spilleliste</string>
+    <string name="bookmark_playlist">Bogmærk spilleliste</string>
+    <string name="unbookmark_playlist">Fjern bogmærke</string>
+    <string name="playlist_add_stream_success">Føjet til spillelisten</string>
+    <string name="playlist_thumbnail_change_success">Miniaturebillede for spilleliste ændret.</string>
+    <string name="playlist_delete_failure">Kunne ikke slette spilleliste.</string>
+    <string name="caption_setting_description">Ændr undertekststørrelse og baggrundsstil. Kræver genstart af appen for at træde i kraft.</string>
+    <string name="enable_leak_canary_title">Aktiver LeakCanary</string>
+    <string name="enable_leak_canary_summary">Monitorering for hukommelseslækager kan få appen til ikke at svare under heap dumping</string>
+    <string name="enable_disposed_exceptions_title">Rapporter out-of-lifecycle-fejl</string>
+    <string name="import_export_title">Importer/eksporter</string>
+    <string name="import_title">Importer</string>
+    <string name="import_from">Importer fra</string>
+    <string name="import_ongoing">Importerer …</string>
+    <string name="export_ongoing">Eksporterer …</string>
+    <string name="import_file_title">Importer fil</string>
+    <string name="previous_export">Forrige eksport</string>
+    <string name="import_youtube_instructions">Importer YouTube-abonnementer ved at downloade eksportfilen:
+\n
+\n1. Gå til denne webadresse: %1$s
+\n2. Log ind når du bliver bedt om det
+\n3. En download bør starte (det er eksportfilen)</string>
+    <string name="import_soundcloud_instructions_hint">ditID, soundcloud.com/ditID</string>
+    <string name="import_network_expensive_warning">Bemærk at denne operation kan kræve meget netværkstrafik.
+\n
+\nVil du fortsætte\?</string>
+    <string name="playback_speed_control">Knapper for afspilningshastighed</string>
+    <string name="playback_tempo">Tempo</string>
+    <string name="playback_pitch">Tonehøjde</string>
+    <string name="skip_silence_checkbox">Spol forbi stilhed</string>
+    <string name="playback_step">Skridt</string>
+    <string name="updates_setting_description">Vis en notifikation for at foreslå opdatering af appen, når en ny version er tilgængelig</string>
+    <string name="minimize_on_exit_title">Minimer ved appskift</string>
+    <string name="minimize_on_exit_summary">Handling når der skiftes til en anden app fra hovedvideoafspilleren — %s</string>
+    <string name="minimize_on_exit_none_description">Ingen</string>
+    <string name="minimize_on_exit_background_description">Minimer til baggrundsafspiller</string>
+    <string name="minimize_on_exit_popup_description">Minimer til pop op-afspiller</string>
+    <string name="switch_view">Skift visning</string>
+    <string name="app_update_notification_content_title">NewPipe-opdatering tilgængelig!</string>
+    <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>
+    <string name="pause_downloads_on_mobile_desc">Downloads som ikke kan sættes på pause vil blive genstartet</string>
 </resources>
\ No newline at end of file

From d742ed7b6542720c903e625d5ae0763b8fc79a24 Mon Sep 17 00:00:00 2001
From: yunna <yunna.in@gmail.com>
Date: Mon, 29 Apr 2019 10:34:14 +0000
Subject: [PATCH 092/138] Translated using Weblate (Japanese)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ja/strings.xml | 110 ++++++++++++-------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index dd229db93..e1e76475e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -40,7 +40,7 @@
     <string name="background_player_playing_toast">バックグラウンドで再生中</string>
     <string name="play_btn_text">再生</string>
     <string name="use_tor_title">Torを使用する</string>
-    <string name="use_tor_summary">(実験的) 強制的に Tor を経由した経路で保存して､匿名性を高めます(動画の同時再生には、まだ対応していません)｡</string>
+    <string name="use_tor_summary">(実験的) 強制的に Tor を経由した経路で保存して､匿名性を高めます(ストリーミング再生には、まだ対応していません)。</string>
     <string name="theme_title">テーマ</string>
     <string name="dark_theme_title">グレー</string>
     <string name="light_theme_title">ホワイト</string>
@@ -62,12 +62,12 @@
     <string name="live_streams_not_supported">生放送にはまだ対応していません</string>
     <string name="content">コンテンツ</string>
     <string name="show_age_restricted_content_title">年齢制限のあるコンテンツ</string>
-    <string name="video_is_age_restricted">年齢制限のビデオを表示します。そのような素材の許可は、設定から可能です。</string>
+    <string name="video_is_age_restricted">年齢制限された動画を表示しています。設定から許可することができます。</string>
     <string name="light_parsing_error">ウェブサイトを完全には解析できませんでした</string>
     <string name="could_not_get_stream">動画を取得できませんでした</string>
     <string name="sorry_string">申し訳ありません。発生すべきでものではありませんでした。</string>
     <string name="error_report_button_text">メールで不具合を報告</string>
-    <string name="error_snackbar_message">申し訳ありません、不具合が発生しました</string>
+    <string name="error_snackbar_message">申し訳ありません、不具合が発生しました。</string>
     <string name="error_snackbar_action">報告</string>
     <string name="what_device_headline">情報:</string>
     <string name="what_happened_headline">発生した内容:</string>
@@ -80,7 +80,7 @@
     <string name="autoplay_by_calling_app_title">自動再生</string>
     <string name="autoplay_by_calling_app_summary">NewPipe が他のアプリから呼び出された時､動画を再生します｡</string>
     <string name="report_error">不具合を報告</string>
-    <string name="user_report">利用者報告</string>
+    <string name="user_report">利用者レポートを送る</string>
     <string name="duration_live">生放送</string>
     <string name="main_bg_subtitle">開始するには検索をタップ</string>
     <string name="start">開始</string>
@@ -96,7 +96,7 @@
     <string name="msg_server_unsupported">このサーバーには対応していません</string>
     <string name="msg_exists">ファイルが既に存在します</string>
     <string name="msg_url_malform">URL の形式が正しくないか､通信が利用できません</string>
-    <string name="msg_running">NewPipeの保存中</string>
+    <string name="msg_running">NewPipeで保存中</string>
     <string name="msg_running_detail">タップして詳細を表示</string>
     <string name="msg_wait">お待ちください…</string>
     <string name="msg_copied">クリップボードにコピーしました</string>
@@ -194,7 +194,7 @@
     <string name="settings_file_replacement_character_summary">無効な文字はここで指定した文字に置き換えられます</string>
     <string name="settings_file_replacement_character_title">ファイル名の自動修正</string>
     <string name="charset_letters_and_digits">文字と数字</string>
-    <string name="charset_most_special_characters">文字と数字に加え、ほとんどの特殊文字</string>
+    <string name="charset_most_special_characters">文字と数字と、多くの特殊文字</string>
     <string name="donation_title">寄付</string>
     <string name="donation_encouragement">NewPipe は、あなたに最高の体験を味わってもらうために、ボランティアが自分たちの時間を使って開発しています。開発者たちがコーヒーを飲みながら NewPipe を継続的に改良できるよう、あなたのご支援をお願いします。</string>
     <string name="website_title">Webサイト</string>
@@ -202,22 +202,22 @@
     <string name="title_activity_history">履歴</string>
     <string name="title_history_search">検索履歴</string>
     <string name="title_history_view">再生履歴</string>
-    <string name="history_disabled">履歴は無効です</string>
+    <string name="history_disabled">履歴は無効になっています</string>
     <string name="action_history">履歴</string>
     <string name="history_empty">履歴に何もありません</string>
-    <string name="history_cleared">履歴を消去しました</string>
+    <string name="history_cleared">履歴を削除しました</string>
     <string name="item_deleted">アイテムを削除しました</string>
     <string name="delete_item_search_history">このアイテムを検索履歴から削除しますか？</string>
     <string name="main_page_content">メインページのコンテンツ</string>
     <string name="blank_page_summary">空白ページ</string>
-    <string name="kiosk_page_summary">キオスクページ</string>
+    <string name="kiosk_page_summary">Kioskページ</string>
     <string name="subscription_page_summary">チャンネル登録ページ</string>
     <string name="feed_page_summary">フィードページ</string>
     <string name="channel_page_summary">チャンネルページ</string>
-    <string name="select_a_channel">選択したチャンネル</string>
+    <string name="select_a_channel">チャンネルを選択</string>
     <string name="no_channel_subscribed_yet">購読しているチャンネルはありません</string>
-    <string name="select_a_kiosk">選択したキオスク</string>
-    <string name="kiosk">キオスク</string>
+    <string name="select_a_kiosk">Kioskを選択</string>
+    <string name="kiosk">Kiosk</string>
     <string name="trending">人気</string>
     <string name="top_50">トップ50</string>
     <string name="title_activity_popup_player">ポップアップ再生</string>
@@ -240,8 +240,8 @@
     <string name="player_recoverable_failure">再生エラーからの回復中</string>
     <string name="external_player_unsupported_link_type">外部プレーヤーは、これらのタイプのリンクをサポートしていません</string>
     <string name="invalid_url_toast">無効なURL</string>
-    <string name="export_complete_toast">エクスポートが完了</string>
-    <string name="import_complete_toast">インポートが完了</string>
+    <string name="export_complete_toast">エクスポートしました</string>
+    <string name="import_complete_toast">インポートしました</string>
     <string name="no_valid_zip_file">有効な ZIP ファイルではありません</string>
     <string name="could_not_import_all_files">警告: すべてのファイルをインポートできませんでした。</string>
     <string name="override_current_data">これにより、現在の設定が上書きされます。</string>
@@ -295,7 +295,7 @@
     <string name="playlist_creation_success">プレイリストが作成されました</string>
     <string name="playlist_add_stream_success">プレイリストに追加しました</string>
     <string name="playlist_thumbnail_change_success">プレイリストのサムネイルを変更しました。</string>
-    <string name="playlist_delete_failure">プレイリストが削除できませんでした。</string>
+    <string name="playlist_delete_failure">プレイリストを削除できませんでした。</string>
     <string name="caption_none">字幕なし</string>
     <string name="caption_font_size_settings_title">字幕の文字サイズ</string>
     <string name="import_export_title">インポート/エクスポート</string>
@@ -308,7 +308,7 @@
     <string name="previous_export">前回のエクスポート</string>
     <string name="subscriptions_import_unsuccessful">購読リストがインポートできませんでした</string>
     <string name="subscriptions_export_unsuccessful">購読リストがエクスポートできませんでした</string>
-    <string name="playback_tempo">テンポ</string>
+    <string name="playback_tempo">速度</string>
     <string name="playback_pitch">音程</string>
     <string name="playback_default">デフォルト</string>
     <string name="background_player_append">バックグラウンド再生の順番待ちに追加</string>
@@ -320,7 +320,7 @@
     <string name="clear_search_history_summary">検索キーワードの履歴を削除します</string>
     <string name="search_history_deleted">検索履歴を削除しました。</string>
     <string name="toast_no_player">このファイルを再生するためのアプリがインストールされていません</string>
-    <string name="import_settings">設定をインポートしますか？</string>
+    <string name="import_settings">設定もインポートしますか？</string>
     <string name="caption_setting_title">字幕</string>
     <string name="channels">チャンネル</string>
     <string name="playlists">プレイリスト</string>
@@ -355,38 +355,38 @@
     <string name="show_hold_to_append_title">「長押しして追加」のヒントを表示</string>
     <string name="tracks">トラック</string>
     <string name="notification_channel_description">NewPipe バックグラウンドおよびポップアップのプレーヤーの通知</string>
-    <string name="new_and_hot">新しい &amp; ホット</string>
+    <string name="new_and_hot">新着 &amp; 人気</string>
     <string name="hold_to_append">長押ししてキューに入れる</string>
     <string name="enqueue_on_background">バックグラウンド時にキューに入れる</string>
     <string name="enqueue_on_popup">ポップアップ時にキューに入れる</string>
-    <string name="start_here_on_popup">新ポップアップ時にここから開始</string>
+    <string name="start_here_on_popup">ポップアップ時にここから開始</string>
     <string name="drawer_header_action_paceholder_text">すぐにここに表示されます;D</string>
     <string name="preferred_open_action_settings_title">お好みの \'開く\' アクション</string>
     <string name="preferred_open_action_settings_summary">コンテンツを開くときのデフォルト動作 — %s</string>
     <string name="resize_fit">フィット</string>
-    <string name="resize_fill">埋める</string>
+    <string name="resize_fill">全画面</string>
     <string name="caption_auto_generated">自動生成</string>
-    <string name="caption_setting_description">プレーヤーのキャプション文字スケールと背景スタイルを変更します。有効にするにはアプリの再起動が必要です。</string>
+    <string name="caption_setting_description">字幕の文字サイズと背景色を変更します。有効にするにはアプリの再起動が必要です。</string>
     <string name="empty_subscription_feed_subtitle">何もありません</string>
-    <string name="import_youtube_instructions">保存したエクスポートファイルからYoutubeの購読をインポート:
-\n
-\n1. このURLを開きます: %1$s
-\n2. ログインしていなければログインします
+    <string name="import_youtube_instructions">保存したエクスポートファイルからYouTubeの購読をインポート: 
+\n 
+\n1. このURLを開きます: %1$s 
+\n2. ログインしていなければログインします 
 \n3. ダウンロードが始まります (これがエクスポートファイルです)</string>
     <string name="playback_reset">リセット</string>
     <string name="accept">同意する</string>
-    <string name="decline">拒否</string>
+    <string name="decline">拒否する</string>
     <string name="limit_data_usage_none_description">制限なし</string>
     <string name="limit_mobile_data_usage_title">モバイルデータ使用時の解像度の制限</string>
     <string name="minimize_on_exit_title">アプリ切り替え時の最小化</string>
-    <string name="minimize_on_exit_summary">プレーヤーから他アプリに切り替え時の動作 — %s</string>
+    <string name="minimize_on_exit_summary">プレーヤーから他のアプリに切り替え時の動作 — %s</string>
     <string name="minimize_on_exit_none_description">何もしない</string>
     <string name="minimize_on_exit_background_description">バックグラウンドに変更</string>
     <string name="minimize_on_exit_popup_description">ポップアップに変更</string>
     <string name="enable_leak_canary_title">LeakCanary を有効にする</string>
-    <string name="enable_leak_canary_summary">メモリリークの監視は、ヒープのダンピング時にアプリが無反応になる原因となります</string>
+    <string name="enable_leak_canary_summary">メモリリークの監視は、ヒープダンピング時にアプリが無反応になる原因となります</string>
     <string name="enable_disposed_exceptions_title">ライフサイクルエラーの報告</string>
-    <string name="enable_disposed_exceptions_summary">破棄後のフラグメントまたはアクティビティライフサイクル外の到達不能RX例外を強制的に報告します</string>
+    <string name="enable_disposed_exceptions_summary">破棄されたフラグメントまたはアクティビティの、ライフサイクル範囲外での配信不能なRx例外を強制的に報告します</string>
     <string name="import_soundcloud_instructions">URL または ID を入力して SoundCloud プロファイルをインポートします:
 \n
 \n1. Web ブラウザーで \"デスクトップモード\" を有効にします (サイトは携帯デバイスで利用できません)
@@ -394,13 +394,13 @@
 \n3. 必要に応じてログインします
 \n4. リダイレクトされたプロファイル URL をコピーします。</string>
     <string name="import_soundcloud_instructions_hint">あなたのID, soundcloud.com/あなたのid</string>
-    <string name="import_network_expensive_warning">この操作により通信料金が増えることがあることにご注意ください。
-\n
+    <string name="import_network_expensive_warning">この操作により通信料金が増えることがあります。ご注意ください。 
+\n 
 \n続行しますか\?</string>
-    <string name="playback_speed_control">再生速度制御</string>
-    <string name="unhook_checkbox">リンク解除 (不備が生じる可能性があります)</string>
+    <string name="playback_speed_control">再生速度を変更</string>
+    <string name="unhook_checkbox">連動しない (歪むかもしれません)</string>
     <string name="skip_silence_checkbox">無音の間に早送り</string>
-    <string name="playback_step">ステップ</string>
+    <string name="playback_step">音程幅</string>
     <string name="unsubscribe">購読解除</string>
     <string name="tab_new">新しいタブ</string>
     <string name="tab_choose">タブを選択</string>
@@ -414,46 +414,46 @@
     <string name="selection">選択</string>
     <string name="conferences">会議</string>
     <string name="start_accept_privacy_policy">ヨーロッパの一般データ保護規制（GDPR）に準拠するために、NewPipeの個人情報保護方針にご注意ください。よく読んでください。
-\nあなたは私たちにバグレポートを送るためにそれを受け入れなければなりません。</string>
+\n私たちに不具合報告を送るためには、これを受け入れなければなりません。</string>
     <string name="updates_setting_title">更新</string>
-    <string name="list_view_mode">リスト ビュー モード</string>
+    <string name="list_view_mode">リストビュー モード</string>
     <string name="list">リスト</string>
     <string name="grid">グリッド</string>
     <string name="auto">自動</string>
     <string name="switch_view">スイッチビュー</string>
-    <string name="app_update_notification_content_title">利用可能なNewPipe更新！</string>
-    <string name="app_update_notification_content_text">ダウンロードするをタップ</string>
+    <string name="app_update_notification_content_title">NewPipeのアップデートがあります！</string>
+    <string name="app_update_notification_content_text">タップでダウンロード</string>
     <string name="missions_header_finished">終了しました</string>
-    <string name="missions_header_pending">順番待ち</string>
+    <string name="missions_header_pending">順番に処理中</string>
     <string name="paused">一時停止</string>
-    <string name="queued">待ち行列</string>
-    <string name="post_processing">後処理</string>
-    <string name="enqueue">キュー</string>
-    <string name="permission_denied">システムによって拒否されたアクション</string>
+    <string name="queued">順番待ちに追加しました</string>
+    <string name="post_processing">保存処理をしています</string>
+    <string name="enqueue">順に処理する</string>
+    <string name="permission_denied">操作がシステムによって拒否されました</string>
     <string name="download_failed">ダウンロードに失敗しました</string>
     <string name="download_finished">ダウンロードが完了しました</string>
     <string name="download_finished_more">%s 件のダウンロード終了</string>
     <string name="generate_unique_name">一意の名前を生成します</string>
     <string name="overwrite">上書き</string>
-    <string name="overwrite_warning">この名前のファイルが既に存在します</string>
-    <string name="download_already_running">この名前を持つ進行中のダウンロードがあります</string>
-    <string name="show_error">エラーを表示します</string>
+    <string name="overwrite_warning">同じ名前のファイルが既に存在します</string>
+    <string name="download_already_running">同じ名前を持つダウンロードが既に進行中です</string>
+    <string name="show_error">エラーを表示する</string>
     <string name="label_code">コード</string>
     <string name="error_path_creation">ファイルを作成できません</string>
     <string name="error_file_creation">宛先フォルダを作成できません</string>
-    <string name="error_permission_denied">システムが拒否する許可</string>
+    <string name="error_permission_denied">権限がシステムによって拒否されました</string>
     <string name="error_ssl_exception">安全な接続に失敗しました</string>
-    <string name="error_unknown_host">サーバが見つからなかった</string>
+    <string name="error_unknown_host">サーバが見つかりませんでした</string>
     <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_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="error_postprocessing_failed">保存処理に失敗しました</string>
+    <string name="clear_finished_download">完了済みのダウンロードを削除</string>
     <string name="stop">停止</string>
     <string name="max_retry_msg">最大再試行回数</string>
-    <string name="max_retry_desc">ダウンロードをキャンセルする前に試行の最大数</string>
+    <string name="max_retry_desc">ダウンロードを中止するまでの最大再試行回数</string>
     <string name="volume_gesture_control_title">音量ジェスチャー制御</string>
     <string name="volume_gesture_control_summary">ジェスチャーを使用して、プレーヤーの音量を制御します</string>
     <string name="brightness_gesture_control_title">明るさのジェスチャー制御</string>
@@ -465,6 +465,6 @@
     <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="pause_downloads_on_mobile">モバイルデータ通信に切替時に、一時停止する</string>
+    <string name="pause_downloads_on_mobile_desc">一時停止できないダウンロードは再開されます</string>
 </resources>
\ No newline at end of file

From 0ab29b7c1f15cbf99ef4edff96c2ba267c189e4a Mon Sep 17 00:00:00 2001
From: Snow K1ng <danmarius2222@gmail.com>
Date: Sun, 28 Apr 2019 20:19:57 +0000
Subject: [PATCH 093/138] Translated using Weblate (Romanian)

Currently translated at 75.8% (336 of 443 strings)
---
 app/src/main/res/values-ro/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 26dcce0c3..5c0f0e41d 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -128,7 +128,7 @@ pentru a deschide în mod pop-up</string>
     <string name="short_thousand">K</string>
     <string name="short_million">mil.</string>
     <string name="short_billion">mld.</string>
-    <string name="use_external_video_player_summary">Anumite rezoluții NU vor avea sunet atunci când această opțiune este activată</string>
+    <string name="use_external_video_player_summary">Elimina sunetul la anumite rezolutii.</string>
     <string name="controls_background_title">Fundal</string>
     <string name="controls_popup_title">Pop-up</string>
     <string name="popup_remember_size_pos_title">Reține dimensiunea și poziția pop-up-ului</string>

From ff52fe4884233049e513d099a4a17050ba1d2cea Mon Sep 17 00:00:00 2001
From: Tobias Groza <tobigr@users.noreply.github.com>
Date: Fri, 3 May 2019 07:58:39 +0200
Subject: [PATCH 094/138] Add changelog for NewPipe 0.16.2

---
 .../metadata/android/en-US/changelogs/740.txt | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/740.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/740.txt b/fastlane/metadata/android/en-US/changelogs/740.txt
new file mode 100644
index 000000000..b0f0538ba
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/740.txt
@@ -0,0 +1,21 @@
+<h4>Improvements</h4>
+<ul>
+<li>make links in comments clickable, increase text size</li>
+<li>seek on clicking timestamp links in comments</li>
+<li>show preferred tab based on recently selected state</li>
+<li>add playlist to queue when long clicking on &#39;Background&#39; in playlist window</li>
+<li>search for shared text when it is not an URL</li>
+<li>add &quot;share at current time&quot; button to the main video player</li>
+<li>add close button to main player when video queue is finished</li>
+<li>add &quot;Play directly in Background&quot; to longpress menu for video list items</li>
+<li>improve English translations for Play/Enqueue commands</li>
+<li>small performance improvements</li>
+<li>remove unused files</li>
+<li>update ExoPlayer to 2.9.6</li>
+<li>add support for Invidious links</li>
+</ul>
+<h4>Fixed</h4>
+<ul>
+<li>fixed scroll w/ comments and related streams disabled</li>
+<li>fixed CheckForNewAppVersionTask being executed when it shouldn&#39;t</li>
+</ul>

From e4f9af70760f819fdd50825fcc390105c0e44eef Mon Sep 17 00:00:00 2001
From: Jonathan Tavares <jonathan199004@gmail.com>
Date: Sun, 5 May 2019 00:57:17 +0000
Subject: [PATCH 095/138] Translated using Weblate (Portuguese (Brazil))

Currently translated at 98.6% (437 of 443 strings)
---
 app/src/main/res/values-pt-rBR/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6ec9ced28..6a874a98e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -7,7 +7,7 @@
     <string name="what_device_headline">Informações:</string>
     <string name="view_count_text">%1$s visualizações</string>
     <string name="view">Reproduzir</string>
-    <string name="video_is_age_restricted">Mostar vídeo com restrição de idade. Permissão para vídeos com essa restrição podem ser feitas no menu Configurações.</string>
+    <string name="video_is_age_restricted">Mostrar vídeo com restrição de idade. Permissão para vídeos com essa restrição podem ser feitas no menu Configurações.</string>
     <string name="video">Vídeo</string>
     <string name="autoplay_by_calling_app_summary">Reproduz o vídeo quando o NewPipe for aberto a partir de outro aplicativo</string>
     <string name="autoplay_by_calling_app_title">Reproduzir automaticamente</string>
@@ -133,7 +133,7 @@ abrir em modo popup</string>
     <string name="refresh">Atualizar</string>
     <string name="clear">Limpar</string>
     <string name="controls_popup_title">Popup</string>
-    <string name="controls_background_title">Plano de fundo</string>
+    <string name="controls_background_title">Segundo plano</string>
     <string name="popup_remember_size_pos_title">Lembrar tamanho e posição do popup</string>
     <string name="popup_remember_size_pos_summary">Lembrar do último tamanho e posição definido para o popup</string>
     <string name="settings_category_popup_title">Popup</string>
@@ -227,8 +227,8 @@ abrir em modo popup</string>
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">Novos e tendências</string>
     <string name="show_hold_to_append_title">Mostrar dica \"Mantenha pressionado para enfileirar\"</string>
-    <string name="show_hold_to_append_summary">Mostrar dica quando o botão de plano de fundo ou de popup for pressionado na página de detalhes do vídeo</string>
-    <string name="background_player_append">Adicionado a fila do reprodutor em plano de fundo</string>
+    <string name="show_hold_to_append_summary">Mostrar dica quando o botão de segundo plano ou de popup for pressionado na página de detalhes do vídeo</string>
+    <string name="background_player_append">Adicionado a fila do reprodutor em segundo plano</string>
     <string name="popup_playing_append">Adicionado a fila no reprodutor popup</string>
     <string name="play_all">Reproduzir tudo</string>
     <string name="player_stream_failure">Não foi possível reproduzir esta stream</string>
@@ -257,7 +257,7 @@ abrir em modo popup</string>
     <string name="always">Sempre</string>
     <string name="just_once">Apenas esta vez</string>
     <string name="toggle_orientation">Alterar a orientação</string>
-    <string name="switch_to_background">Alterar para Plano de Fundo</string>
+    <string name="switch_to_background">Alternar para Segundo Plano</string>
     <string name="switch_to_popup">Alterar para Popup</string>
     <string name="switch_to_main">Alterar para o Principal</string>
     <string name="external_player_unsupported_link_type">Reprodutores externos não suportam estes tipos de links</string>
@@ -458,13 +458,13 @@ 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 satisfazível</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">Máximo de tentativas</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>
     <string name="pause_downloads_on_mobile">Pausar quando trocar para dados móveis</string>
     <string name="pause_downloads_on_mobile_desc">Downloads que não puderem ser pausados serão reiniciados</string>

From 55d6825f63beb374b620a6fcdab15b024d22a0ed Mon Sep 17 00:00:00 2001
From: abvgeej <lzue.github@lf.nx.tc>
Date: Sun, 5 May 2019 11:13:10 +0000
Subject: [PATCH 096/138] Translated using Weblate (Russian)

Currently translated at 99.5% (441 of 443 strings)
---
 app/src/main/res/values-ru/strings.xml | 76 +++++++++++++-------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ce488455c..27d2d9cd6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -7,16 +7,16 @@
     <string name="cancel">Отмена</string>
     <string name="open_in_browser">Открыть в браузере</string>
     <string name="share">Поделиться</string>
-    <string name="download">Загрузить</string>
+    <string name="download">Скачать</string>
     <string name="search">Поиск</string>
     <string name="settings">Настройки</string>
     <string name="did_you_mean">Возможно, вы имели в виду: %1$s?</string>
     <string name="share_dialog_title">Поделиться в</string>
     <string name="choose_browser">Выбор браузера</string>
     <string name="screen_rotation">поворот</string>
-    <string name="download_path_title">Путь загрузки видео</string>
-    <string name="download_path_summary">Путь для сохранения загруженных видео</string>
-    <string name="download_path_dialog_title">Введите путь к папке для загрузки видео</string>
+    <string name="download_path_title">Путь для скачанного видео</string>
+    <string name="download_path_summary">Путь для сохранения скачанного видео</string>
+    <string name="download_path_dialog_title">Введите путь к папке для скачивания видео</string>
     <string name="default_resolution_title">Разрешение по умолчанию</string>
     <string name="play_with_kodi_title">Воспроизвести в Kodi</string>
     <string name="kore_not_found">Приложение Kore не найдено. Установить его?</string>
@@ -24,10 +24,10 @@
     <string name="show_play_with_kodi_summary">Показать опцию воспроизведения через медиацентр Kodi</string>
     <string name="play_audio">Аудио</string>
     <string name="default_audio_format_title">Формат аудио по умолчанию</string>
-    <string name="download_dialog_title">Загрузить</string>
-    <string name="next_video_title">Следующее видео</string>
+    <string name="download_dialog_title">Скачать</string>
+    <string name="next_video_title">Следующее</string>
     <string name="url_not_supported_toast">URL не поддерживается</string>
-    <string name="show_next_and_similar_title">\"Следующее\" и \"Похожие\" видео</string>
+    <string name="show_next_and_similar_title">Показывать \"Следующее\" и \"Похожие\" видео</string>
     <string name="content_language_title">Язык контента по умолчанию</string>
     <string name="settings_category_video_audio_title">Видео и аудио</string>
     <string name="settings_category_appearance_title">Внешний вид</string>
@@ -39,16 +39,16 @@
     <string name="detail_likes_img_view_description">Понравилось</string>
     <string name="use_external_video_player_title">Внешний видеоплеер</string>
     <string name="use_external_audio_player_title">Внешний аудиоплеер</string>
-    <string name="background_player_playing_toast">Воспроизведение в фоновом режиме</string>
+    <string name="background_player_playing_toast">Фоновое воспроизведение</string>
     <string name="theme_title">Тема</string>
     <string name="dark_theme_title">Тёмная</string>
     <string name="light_theme_title">Светлая</string>
     <string name="play_btn_text">Воспроизвести</string>
     <string name="network_error">Ошибка сети</string>
     <string name="use_tor_title">Использовать Tor</string>
-    <string name="download_path_audio_title">Путь загрузки аудио</string>
-    <string name="download_path_audio_summary">Папка для хранения загруженных аудио</string>
-    <string name="download_path_audio_dialog_title">Введите путь к папке для загрузки аудио</string>
+    <string name="download_path_audio_title">Путь для скачанного аудио</string>
+    <string name="download_path_audio_summary">Папка для хранения скачанного аудио</string>
+    <string name="download_path_audio_dialog_title">Введите путь к папке для скачанного аудио</string>
     <string name="main_bg_subtitle">Начните с поиска</string>
     <string name="msg_wait">Подождите…</string>
     <string name="msg_exists">Файл уже существует</string>
@@ -66,9 +66,9 @@
     <string name="msg_running_detail">Подробнее</string>
     <string name="msg_copied">Скопировано в буфер обмена</string>
     <string name="no_available_dir">Выберите доступную папку для загрузки</string>
-    <string name="show_age_restricted_content_title">Контент 18+</string>
+    <string name="show_age_restricted_content_title">Ограниченный контент</string>
     <string name="general_error">Ошибка</string>
-    <string name="your_comment">Ваш комментарий (English):</string>
+    <string name="your_comment">Ваш комментарий (по Английски):</string>
     <string name="err_dir_create">Не удалось создать папку для загрузки \"%1$s\"</string>
     <string name="autoplay_by_calling_app_title">Автовоспроизведение</string>
     <string name="autoplay_by_calling_app_summary">Воспроизводить видео при вызове NewPipe из другого приложения</string>
@@ -83,9 +83,9 @@
     <string name="content_not_available">Контент недоступен</string>
     <string name="blocked_by_gema">Заблокировано GEMA</string>
     <string name="could_not_setup_download_menu">Не удалось создать меню загрузки</string>
-    <string name="live_streams_not_supported">Это прямая трансляция, пока не поддерживается</string>
+    <string name="live_streams_not_supported">Прямые трансляции пока не поддерживается</string>
     <string name="could_not_load_image">Не удалось загрузить изображение</string>
-    <string name="app_ui_crash">Падение приложения/UI</string>
+    <string name="app_ui_crash">Приложение упало</string>
     <string name="sorry_string">Простите, это не должно было произойти.</string>
     <string name="error_report_button_text">Отправить отчёт по e-mail</string>
     <string name="error_snackbar_message">Простите, произошли ошибки.</string>
@@ -105,8 +105,8 @@
     <string name="youtube_signature_decryption_error">Не удалось расшифровать подпись URL у видео</string>
     <string name="could_not_get_stream">Не удалось найти ни одного потока</string>
     <string name="view">Воспроизвести</string>
-    <string name="controls_background_title">В фоне</string>
-    <string name="controls_popup_title">В окне</string>
+    <string name="controls_background_title">Фоновое воспроизведение</string>
+    <string name="controls_popup_title">Всплывающее окно</string>
     <string name="show_higher_resolutions_summary">Только некоторые устройства поддерживают видео в 2K/4K</string>
     <string name="default_video_format_title">Формат видео по умолчанию</string>
     <string name="black_theme_title">Чёрная</string>
@@ -126,23 +126,23 @@
     <string name="msg_popup_permission">Это разрешение нужно для 
 \nвоспроизведения в окне</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="open_in_popup_mode">Открыть в режиме окна</string>
-    <string name="show_search_suggestions_summary">Отображать подсказки при поиске</string>
+    <string name="open_in_popup_mode">Открыть во всплывающем окне</string>
+    <string name="show_search_suggestions_summary">Отображать предложения при поиске</string>
     <string name="later">Позже</string>
     <string name="disabled">Отключено</string>
     <string name="popup_resizing_indicator_title">Изменение размера</string>
-    <string name="use_external_video_player_summary">В некоторых разрешениях НЕ будет звука, если включено</string>
+    <string name="use_external_video_player_summary">Убирает звук в НЕКОТОРЫХ разрешениях</string>
     <string name="short_million"> млн.</string>
     <string name="short_billion"> млрд.</string>
     <string name="short_thousand"> тыс.</string>
-    <string name="default_popup_resolution_title">Разрешение очереди \"В окне\"</string>
-    <string name="popup_remember_size_pos_summary">Помнить последние размер и позицию \"В окне\"</string>
-    <string name="show_search_suggestions_title">Варианты поиска</string>
+    <string name="default_popup_resolution_title">Разрешение очереди всплывающего окна</string>
+    <string name="popup_remember_size_pos_summary">Помнить последние размер и позицию всплывающего окна</string>
+    <string name="show_search_suggestions_title">Поисковые предложения</string>
     <string name="best_resolution">Лучшее разрешение</string>
     <string name="reCaptcha_title">Запрос reCAPTCHA</string>
     <string name="recaptcha_request_toast">Запрошен ввод reCAPTCHA</string>
     <string name="show_higher_resolutions_title">Высокие разрешения</string>
-    <string name="popup_mode_share_menu_title">NewPipe в окне</string>
+    <string name="popup_mode_share_menu_title">NewPipe во всплывающем окне</string>
     <string name="title_activity_about">О NewPipe</string>
     <string name="action_settings">Настройки</string>
     <string name="app_license_title">Лицензия NewPipe</string>
@@ -225,8 +225,8 @@
     <string name="trending">Тренды</string>
     <string name="top_50">Топ 50</string>
     <string name="new_and_hot">Новое и горячее</string>
-    <string name="background_player_append">Добавлено в очередь в фоне</string>
-    <string name="popup_playing_append">Добавлено в очередь в окне</string>
+    <string name="background_player_append">Добавлено в очередь на фоновое воспроизведение</string>
+    <string name="popup_playing_append">Добавлено в очередь во всплывающем окне</string>
     <string name="play_all">Играть всё</string>
     <string name="player_stream_failure">Не удалось воспроизвести этот поток</string>
     <string name="play_queue_stream_detail">Сведения</string>
@@ -235,8 +235,8 @@
     <string name="play_queue_remove">Удалить</string>
     <string name="subscribed_button_title">Вы подписаны</string>
     <string name="channel_unsubscribed">Подписка отменена</string>
-    <string name="show_hold_to_append_title">\"Зажмите, чтобы добавить\"</string>
-    <string name="show_hold_to_append_summary">Показать подсказку при нажатии \"В окне\" или \"В фоне\" на странице сведений о видео</string>
+    <string name="show_hold_to_append_title">Показывать \"Зажмите, чтобы добавить\"</string>
+    <string name="show_hold_to_append_summary">Показывать подсказку при нажатии кнопок всплывающего окна или фонового воспроизведения на странице сведений о видео</string>
     <string name="unknown_content">[Неизвестно]</string>
     <string name="player_recoverable_failure">Восстановление после ошибки плеера</string>
     <string name="title_activity_background_player">В фоне</string>
@@ -259,8 +259,8 @@
     <string name="player_unrecoverable_failure">Ошибка плеера без возможности восстановления</string>
     <string name="external_player_unsupported_link_type">Внешние плееры не поддерживают ссылки этих типов</string>
     <string name="invalid_url_toast">Неверная ссылка</string>
-    <string name="video_streams_empty">Потоки видео не найдены</string>
-    <string name="audio_streams_empty">Потоки аудио не найдены</string>
+    <string name="video_streams_empty">Видеопотоки не найдены</string>
+    <string name="audio_streams_empty">Аудиопотоки не найдены</string>
     <string name="donation_title">Пожертвовать</string>
     <string name="donation_encouragement">Разработчики NewPipe ценой своего свободного времени делают вашу жизнь чуть удобнее. Отплатите им тем же — наслаждаясь чашечкой кофе, они смогут сделать NewPipe ещё лучше.</string>
     <string name="give_back">Воздать должное</string>
@@ -273,22 +273,22 @@
     <string name="popup_player">Плеер в окне</string>
     <string name="preferred_player_fetcher_notification_title">Получение сведений…</string>
     <string name="preferred_player_fetcher_notification_message">Загрузка запрошенного контента</string>
-    <string name="controls_download_desc">Загрузить файл прямой трансляции</string>
+    <string name="controls_download_desc">Скачать файл прямой трансляции</string>
     <string name="show_info">Показать сведения</string>
     <string name="tab_bookmarks">Закладки</string>
     <string name="controls_add_to_playlist_title">Добавить к</string>
     <string name="use_inexact_seek_title">Быстрый поиск позиции</string>
-    <string name="use_inexact_seek_summary">Неточный поиск позволяет плееру искать позицию быстрее, но менее точно</string>
+    <string name="use_inexact_seek_summary">Позволяет искать позицию быстрее, но с меньшей точностью</string>
     <string name="auto_queue_title">Автодополнение очереди</string>
-    <string name="auto_queue_summary">Добавлять похожие потоки в очередь при воспроизведении последнего потока, если не включён повтор</string>
+    <string name="auto_queue_summary">Добавляет похожие потоки в очередь при воспроизведении последнего потока, если не включён повтор</string>
     <string name="settings_category_debug_title">Отладка</string>
     <string name="file">Файл</string>
     <string name="import_data_title">Импорт данных</string>
     <string name="export_data_title">Экспорт данных</string>
     <string name="import_data_summary">Текущие подписки, плейлисты и история будут заменены</string>
     <string name="export_data_summary">Экспорт подписок, плейлистов и истории</string>
-    <string name="invalid_directory">Неверная папка</string>
-    <string name="invalid_source">Неверный файл или источник контента</string>
+    <string name="invalid_directory">Папка не существует</string>
+    <string name="invalid_source">Папка или источник контента не существуют</string>
     <string name="invalid_file">Файл не существует или нет разрешения на его чтение или запись</string>
     <string name="file_name_empty_error">Имя файла не может быть пустым</string>
     <string name="error_occurred_detail">Произошла ошибка: %1$s</string>
@@ -368,7 +368,7 @@
     <string name="unhook_checkbox">Независимо (искажения)</string>
     <string name="metadata_cache_wipe_summary">Удалить все загруженные данные веб-страниц</string>
     <string name="preferred_open_action_settings_summary">При открытии ссылки на контент — %s</string>
-    <string name="no_streams_available_download">Нет потоков, доступных для загрузки</string>
+    <string name="no_streams_available_download">Нет потоков для загрузки</string>
     <string name="caption_setting_title">Титры</string>
     <string name="toast_no_player">Приложение для воспроизведения этого файла не установлено</string>
     <string name="caption_setting_description">Изменить размер текста и стиль титров. Нужен перезапуск</string>
@@ -416,8 +416,8 @@
     <string name="download_to_sdcard_error_message">Загрузка на внешний накопитель пока невозможна. Сбросить расположение папки загрузки\?</string>
     <string name="download_to_sdcard_error_title">Внешний накопитель недоступен</string>
     <string name="main_page_content_summary">Вкладки, видимые на главной странице</string>
-    <string name="restore_defaults">По умолчанию</string>
-    <string name="restore_defaults_confirmation">Хотите восстановить умолчания?</string>
+    <string name="restore_defaults">Восстановить значения по умолчанию</string>
+    <string name="restore_defaults_confirmation">Хотите восстановить значения по умолчанию\?</string>
     <string name="saved_tabs_invalid_json">Ошибка чтения сохранённых вкладок. Используются вкладки по умолчанию</string>
     <string name="selection">Выбор</string>
     <string name="subscribers_count_not_available">Количество подписчиков недоступно</string>

From 312e1378d3510ba9be4a23eba4a5f148163a8ccb Mon Sep 17 00:00:00 2001
From: Vasiliy <nvasya95@gmail.com>
Date: Mon, 6 May 2019 19:16:39 +0300
Subject: [PATCH 097/138] Fix tablet ui

---
 .../res/layout-large-land/fragment_video_detail.xml   | 11 +++++------
 .../res/layout/list_stream_playlist_grid_item.xml     |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index f773c69cf..15d6b7a17 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -6,7 +6,9 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:focusableInTouchMode="true"
-	android:orientation="horizontal">
+	tools:ignore="RtlHardcoded"
+	android:orientation="horizontal"
+	android:baselineAligned="false">
 
 	<android.support.design.widget.CoordinatorLayout
 		android:id="@+id/detail_main_content"
@@ -126,7 +128,6 @@
 						android:textSize="12sp"
 						android:textStyle="bold"
 						android:visibility="gone"
-						tools:ignore="RtlHardcoded"
 						tools:text="12:38"
 						tools:visibility="visible" />
 				</FrameLayout>
@@ -177,7 +178,6 @@
 						android:paddingBottom="8dp"
 						android:textAppearance="?android:attr/textAppearanceLarge"
 						android:textSize="@dimen/video_item_detail_title_text_size"
-						tools:ignore="RtlHardcoded"
 						tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
 
 					<ImageView
@@ -187,7 +187,7 @@
 						android:layout_gravity="center_vertical|right"
 						android:layout_marginLeft="5dp"
 						android:src="@drawable/arrow_down"
-						tools:ignore="ContentDescription,RtlHardcoded" />
+						tools:ignore="ContentDescription" />
 
 				</FrameLayout>
 
@@ -253,8 +253,7 @@
 								android:layout_width="@dimen/video_item_detail_uploader_image_size"
 								android:layout_height="@dimen/video_item_detail_uploader_image_size"
 								android:contentDescription="@string/detail_uploader_thumbnail_view_description"
-								android:src="@drawable/buddy"
-								tools:ignore="RtlHardcoded" />
+								android:src="@drawable/buddy" />
 
 							<TextView
 								android:id="@+id/detail_uploader_text_view"
diff --git a/app/src/main/res/layout/list_stream_playlist_grid_item.xml b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
index ea680c072..1b2ad5dd2 100644
--- a/app/src/main/res/layout/list_stream_playlist_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
@@ -81,7 +81,7 @@
 		android:textSize="@dimen/video_item_search_uploader_text_size"
 		tools:text="Uploader" />
 
-	<ProgressBar
+	<org.schabi.newpipe.views.AnimatedProgressBar
 		android:id="@+id/itemProgressView"
 		style="@style/Widget.AppCompat.ProgressBar.Horizontal"
 		android:progressDrawable="?progress_horizontal_drawable"

From 0a88100b6754e68f6d0deed1e90800a27638c202 Mon Sep 17 00:00:00 2001
From: gabriellluz <andriusgabriel@live.com>
Date: Tue, 7 May 2019 13:56:42 +0000
Subject: [PATCH 098/138] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-pt-rBR/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6a874a98e..616916298 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -7,7 +7,7 @@
     <string name="what_device_headline">Informações:</string>
     <string name="view_count_text">%1$s visualizações</string>
     <string name="view">Reproduzir</string>
-    <string name="video_is_age_restricted">Mostrar vídeo com restrição de idade. Permissão para vídeos com essa restrição podem ser feitas no menu Configurações.</string>
+    <string name="video_is_age_restricted">Exibir vídeo com restrições de idade. Permissão para vídeos com essa restrição pode ser dada no menu Configurações.</string>
     <string name="video">Vídeo</string>
     <string name="autoplay_by_calling_app_summary">Reproduz o vídeo quando o NewPipe for aberto a partir de outro aplicativo</string>
     <string name="autoplay_by_calling_app_title">Reproduzir automaticamente</string>
@@ -227,8 +227,8 @@ abrir em modo popup</string>
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">Novos e tendências</string>
     <string name="show_hold_to_append_title">Mostrar dica \"Mantenha pressionado para enfileirar\"</string>
-    <string name="show_hold_to_append_summary">Mostrar dica quando o botão de segundo plano ou de popup for pressionado na página de detalhes do vídeo</string>
-    <string name="background_player_append">Adicionado a fila do reprodutor em segundo plano</string>
+    <string name="show_hold_to_append_summary">Exibir dica quando o botão de segundo plano ou de popup for pressionado na página de detalhes do vídeo</string>
+    <string name="background_player_append">Adicionado à fila do reprodutor em segundo plano</string>
     <string name="popup_playing_append">Adicionado a fila no reprodutor popup</string>
     <string name="play_all">Reproduzir tudo</string>
     <string name="player_stream_failure">Não foi possível reproduzir esta stream</string>

From b05e3ca8d8c04ded3f4f3b10bc2582f5738c7b72 Mon Sep 17 00:00:00 2001
From: Eduardo Caron <eduardocaron10@gmail.com>
Date: Fri, 10 May 2019 01:01:38 +0000
Subject: [PATCH 099/138] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 616916298..798131f37 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -458,7 +458,7 @@ 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_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>

From d63c18f7f08df6b26a4e3c4421f69afd6e118bdd Mon Sep 17 00:00:00 2001
From: 84436 <thien.bui.84436@gmail.com>
Date: Thu, 9 May 2019 15:28:51 +0000
Subject: [PATCH 100/138] Translated using Weblate (Vietnamese)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-vi/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f200bdd72..af23f383c 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -19,7 +19,7 @@
     <string name="use_external_video_player_summary">Âm thanh có thể không có ở *một vài* độ phân giải video</string>
     <string name="use_external_audio_player_title">Sử dụng trình phát audio bên ngoài</string>
     <string name="popup_mode_share_menu_title">Chế độ popup của NewPipe</string>
-    <string name="controls_popup_title"></string>
+    <string name="controls_popup_title">Trình phát nổi</string>
     <string name="download_path_title">Thư mục tải về video</string>
     <string name="download_path_summary">Đường dẫn để lưu video đã tải về</string>
     <string name="download_path_dialog_title">Nhập đường dẫn tải về cho video</string>
@@ -160,7 +160,7 @@
     <string name="screen_rotation">xoay màn hình</string>
     <string name="content_language_title">Ngôn ngữ nội dung ưu tiên</string>
     <string name="settings_category_video_audio_title">Video &amp; âm thanh</string>
-    <string name="settings_category_popup_title"></string>
+    <string name="settings_category_popup_title">Trình phát nổi</string>
     <string name="enable_watch_history_title">Lịch sử &amp; bộ nhớ cache</string>
     <string name="settings_category_history_title">Lịch sử &amp; bộ nhớ cache</string>
     <string name="playlist">Playlist</string>
@@ -419,7 +419,7 @@
     <string name="subscribers_count_not_available">Số người đăng ký không khả dụng</string>
     <string name="main_page_content_summary">Chọn các tab để hiện trên trang chủ</string>
     <string name="selection">Lựa chọn</string>
-    <string name="top_50"/>
+    <string name="top_50">Top 50 phổ biến</string>
     <string name="import_soundcloud_instructions_hint">Nhập ID SoundCloud hoặc link soundcloud.com/&lt;ID của bạn&gt;</string>
     <string name="updates_setting_title">Cập nhật</string>
     <string name="updates_setting_description">Hiện thông báo khi có bản cập nhật ứng dụng</string>
@@ -453,7 +453,7 @@
     <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">Không thể đáp ứng dãy đã yêu cầu</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>

From 72eae64698aeb6ce2b76ba2c4106b587f678235a Mon Sep 17 00:00:00 2001
From: Tolstovka <tolstovka@tuta.io>
Date: Sun, 12 May 2019 19:13:05 +0000
Subject: [PATCH 101/138] Translated using Weblate (Russian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 27d2d9cd6..cc88743ff 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -32,8 +32,8 @@
     <string name="settings_category_video_audio_title">Видео и аудио</string>
     <string name="settings_category_appearance_title">Внешний вид</string>
     <string name="settings_category_other_title">Другое</string>
-    <string name="list_thumbnail_view_description">Миниатюра видео-превью</string>
-    <string name="detail_thumbnail_view_description">Миниатюра видео-превью</string>
+    <string name="list_thumbnail_view_description">Изображение видео перед его просмотром</string>
+    <string name="detail_thumbnail_view_description">Изображение видео перед его просмотром</string>
     <string name="detail_uploader_thumbnail_view_description">Миниатюра аватара пользователя</string>
     <string name="detail_dislikes_img_view_description">Не понравилось</string>
     <string name="detail_likes_img_view_description">Понравилось</string>

From a758267d724f6f446bbdbd84cddb9fee67a85432 Mon Sep 17 00:00:00 2001
From: Tolstovka <tolstovka@tuta.io>
Date: Sun, 12 May 2019 19:13:40 +0000
Subject: [PATCH 102/138] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-uk/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 71606b005..ffc996f49 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -80,8 +80,8 @@
     <string name="app_ui_crash">Застосунок/інтерфейс впав</string>
     <string name="your_comment">Ваш коментар (англійською):</string>
     <string name="error_details_headline">Подробиці:</string>
-    <string name="list_thumbnail_view_description">Ескіз попереднього перегляду відео</string>
-    <string name="detail_thumbnail_view_description">Ескіз попереднього перегляду відео</string>
+    <string name="list_thumbnail_view_description">Зображення відео перед його переглядом</string>
+    <string name="detail_thumbnail_view_description">Зображення відео перед його переглядом</string>
     <string name="use_tor_title">Використовувати Tor</string>
     <string name="use_tor_summary">(Експериментально) Перенаправляти трафік через Tor для підвищення конфіденційності (трансляція відео ще не підтримується).</string>
     <string name="report_error">Повідомити про помилку</string>
@@ -219,7 +219,7 @@
     <string name="player_unrecoverable_failure">Сталася невиправна помилка програвача</string>
     <string name="external_player_unsupported_link_type">Зовнішні програвачі не підтримують такі види посилань</string>
     <string name="info_labels">Що:\\nЗапит:\\nМова контенту:\\nСервіс:\\nЧас GMT:\\nПакунок:\\nВерсія:\\nВерсія ОС:</string>
-    <string name="detail_uploader_thumbnail_view_description">Ескіз аватару користувача</string>
+    <string name="detail_uploader_thumbnail_view_description">Мініатюрний аватар завантажувача відео</string>
     <string name="detail_likes_img_view_description">Сподобалося</string>
     <string name="detail_dislikes_img_view_description">Не сподобалося</string>
     <string name="search_no_results">Нічого не знайдено</string>

From 66b26e52ce4554c4425d27b0a057d6c69a62b34f Mon Sep 17 00:00:00 2001
From: Tobias Groza <tobigr@users.noreply.github.com>
Date: Tue, 14 May 2019 23:16:43 +0200
Subject: [PATCH 103/138] Update extractor version

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9e6a21063..da735302c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:aa4f03a'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:2ac713e'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'

From 47779106441c693fe184ae4c8841adb75c16c60b Mon Sep 17 00:00:00 2001
From: Tobias Groza <tobigr@users.noreply.github.com>
Date: Tue, 14 May 2019 23:17:04 +0200
Subject: [PATCH 104/138] Update changelog for 0.16.2

---
 fastlane/metadata/android/en-US/changelogs/740.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fastlane/metadata/android/en-US/changelogs/740.txt b/fastlane/metadata/android/en-US/changelogs/740.txt
index b0f0538ba..c795978a8 100644
--- a/fastlane/metadata/android/en-US/changelogs/740.txt
+++ b/fastlane/metadata/android/en-US/changelogs/740.txt
@@ -18,4 +18,6 @@
 <ul>
 <li>fixed scroll w/ comments and related streams disabled</li>
 <li>fixed CheckForNewAppVersionTask being executed when it shouldn&#39;t</li>
+<li>fixed youtube subscription import: ignore ones with invalid url and keep ones with empty title</li>
+<li>fix invalid YouTube url: signature tag name is not always "signature" preventing streams from loading</li>
 </ul>

From bd2c65cd94f5204d1fea30bdb3d887a09095242d Mon Sep 17 00:00:00 2001
From: Marc Riera <marc.riera.irigoyen@gmail.com>
Date: Tue, 14 May 2019 08:40:15 +0000
Subject: [PATCH 105/138] Translated using Weblate (Catalan)

Currently translated at 96.8% (429 of 443 strings)
---
 app/src/main/res/values-ca/strings.xml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 9953766e1..5ac2f2134 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -37,7 +37,7 @@
     <string name="settings_category_debug_title">Depuració</string>
     <string name="content">Contingut</string>
     <string name="show_age_restricted_content_title">Desactiva les restriccions per edat</string>
-    <string name="video_is_age_restricted">Vídeo restringit per edat. Podeu permetre aquesta mena de continguts des de la configuració.</string>
+    <string name="video_is_age_restricted">Mostra el vídeo restringit per edat. Podeu permetre aquesta mena de continguts des de la configuració.</string>
     <string name="duration_live">EN DIRECTE</string>
     <string name="downloads">Baixades</string>
     <string name="downloads_title">Baixades</string>
@@ -437,4 +437,26 @@
     <string name="error_path_creation">No es pot crear el fitxer</string>
     <string name="error_file_creation">No es pot crear la carpeta de destinació</string>
     <string name="stop">Atura</string>
+    <string name="events">Esdeveniments</string>
+    <string name="app_update_notification_channel_description">Notificacions de noves versions del NewPipe</string>
+    <string name="subscribers_count_not_available">El nombre de subscriptors no està disponible</string>
+    <string name="main_page_content_summary">Quines pestanyes es mostren a la pàgina principal</string>
+    <string name="conferences">Conferències</string>
+    <string name="list_view_mode">Mode de vista de llista</string>
+    <string name="missions_header_finished">Finalitzades</string>
+    <string name="post_processing">post-processament</string>
+    <string name="download_failed">Ha fallat la baixada</string>
+    <string name="download_finished">Baixada finalitzada</string>
+    <string name="download_finished_more">%s baixades finalitzades</string>
+    <string name="overwrite_warning">Ja existeix un fitxer baixat amb aquest nom</string>
+    <string name="download_already_running">Hi ha una baixada en curs amb aquest nom</string>
+    <string name="error_ssl_exception">Ha fallat la connexió segura</string>
+    <string name="error_unknown_host">No s\'ha pogut trobar el servidor</string>
+    <string name="error_connect_host">No s\'ha pogut connectar amb el servidor</string>
+    <string name="error_postprocessing_failed">Ha fallat el post-processament</string>
+    <string name="clear_finished_download">Neteja les baixades finalitzades</string>
+    <string name="max_retry_msg">Intents màxims</string>
+    <string name="max_retry_desc">Nombre màxim d\'intents abans de cancel·lar la baixada</string>
+    <string name="pause_downloads_on_mobile">Pausa en canviar a dades mòbils</string>
+    <string name="pause_downloads_on_mobile_desc">Les baixades que no es puguin pausar es tornaran a iniciar</string>
 </resources>
\ No newline at end of file

From f6068dc69d5aae4d94acaee0c8effb984b52c6f4 Mon Sep 17 00:00:00 2001
From: Tobias Groza <tooobi14@gmail.com>
Date: Fri, 24 May 2019 21:45:15 +0000
Subject: [PATCH 106/138] Translated using Weblate (German)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f83ed7b65..4578040d5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -349,7 +349,7 @@
     <string name="unhook_checkbox">Verknüpfung aufheben (kann zu Verzerrungen führen)</string>
     <string name="playback_nightcore">Nightcore</string>
     <string name="playback_default">Standard</string>
-    <string name="download_thumbnail_summary">Abschalten, um das Laden von Miniaturansichten zu verhindern, was Daten- und Speicherverbrauch spart. Änderungen löschen den Bildzwischenspeicher sowohl im Arbeitsspeicher als auch auf der Festplatte.</string>
+    <string name="download_thumbnail_summary">Abschalten, um das Laden von Miniaturansichten zu verhindern, was Daten- und Speicherverbrauch spart. Änderungen löschen den Bildzwischenspeicher sowohl im Arbeitsspeicher als auch auf dem internen Speicher.</string>
     <string name="auto_queue_title">Nächsten Stream automatisch einreihen</string>
     <string name="auto_queue_summary">Automatisches Anhängen eines verwandten Streams beim Abspielen des letzten Streams in einer nicht wiederholten Warteschlange.</string>
     <string name="drawer_header_action_paceholder_text">Hier wird bald etwas stehen ;D</string>

From f26915aab68577460ef77db0d8d7620335ebad18 Mon Sep 17 00:00:00 2001
From: Davide Palma <dpfuturehacker@gmail.com>
Date: Thu, 23 May 2019 11:47:36 +0000
Subject: [PATCH 107/138] Translated using Weblate (Italian)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-it/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ad9021f75..b4bcd2926 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -154,7 +154,7 @@
     <string name="tab_about">Informazioni</string>
     <string name="tab_contributors">Contributori</string>
     <string name="tab_licenses">Licenze</string>
-    <string name="app_description">Interfaccia libera e leggera per lo streaming di YouTube su Android.</string>
+    <string name="app_description">Streaming libero e leggero su Android.</string>
     <string name="view_on_github">Mostra su GitHub</string>
     <string name="app_license_title">Licenza di NewPipe</string>
     <string name="contribution_encouragement">Un aiuto è sempre il benvenuto: nuove idee e funzionalità, traduzioni, modifiche al design o cambiamenti radicali del codice rendono l\'applicazione sempre migliore!</string>
@@ -260,7 +260,7 @@
     <string name="service_title">Servizio</string>
     <string name="drawer_open">Apri il menu</string>
     <string name="drawer_close">Chiudi il menu</string>
-    <string name="no_player_found_toast">Nessun lettore multimediale trovato. Puoi installare VLC per riprodurlo.</string>
+    <string name="no_player_found_toast">Nessun lettore multimediale trovato (puoi installare VLC per riprodurlo).</string>
     <string name="always">Sempre</string>
     <string name="just_once">Solo una volta</string>
     <string name="external_player_unsupported_link_type">I lettori multimediali esterni non supportano questa tipologia di collegamenti</string>
@@ -362,7 +362,7 @@
 \n 
 \nVuoi continuare?</string>
     <string name="download_thumbnail_title">Carica miniature</string>
-    <string name="download_thumbnail_summary">Disabilita il caricamento delle miniature, risparmiando dati e memoria. La modifica dell\'opzione comporta la cancellazione della cache in memoria e sul disco.</string>
+    <string name="download_thumbnail_summary">Disabilita per prevenire il caricamento delle miniature, risparmiando dati e memoria. La modifica di questa opzione cancellerà la cache delle immagini in memoria e sul disco.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Pulizia della cache delle immagini completata</string>
     <string name="metadata_cache_wipe_title">Pulisci la cache dei metadati</string>
     <string name="metadata_cache_wipe_summary">Rimuovi tutti i dati delle pagine web memorizzati nella cache</string>

From 0c354c4fdb2a4cfe4c55f5b7d28814145b488e4a Mon Sep 17 00:00:00 2001
From: Tobias Groza <tobigr@users.noreply.github.com>
Date: Mon, 27 May 2019 00:11:37 +0200
Subject: [PATCH 108/138] Remove old strings

Remove strings which have been deleted from the English strings file during development, but were translated via Weblate, which failed to pull and push our upstream repo.
---
 app/src/main/res/values-b+ast/strings.xml  |  8 ++------
 app/src/main/res/values-be/strings.xml     |  4 ----
 app/src/main/res/values-bg/strings.xml     |  2 --
 app/src/main/res/values-bn-rBD/strings.xml |  2 --
 app/src/main/res/values-ca/strings.xml     |  2 --
 app/src/main/res/values-cmn/strings.xml    |  4 ----
 app/src/main/res/values-cs/strings.xml     | 11 ++---------
 app/src/main/res/values-de/strings.xml     |  3 ---
 app/src/main/res/values-el/strings.xml     |  4 ----
 app/src/main/res/values-es/strings.xml     |  1 -
 app/src/main/res/values-et/strings.xml     |  2 --
 app/src/main/res/values-eu/strings.xml     |  3 ---
 app/src/main/res/values-fa/strings.xml     |  3 ---
 app/src/main/res/values-fi/strings.xml     |  2 --
 app/src/main/res/values-fr/strings.xml     |  3 ---
 app/src/main/res/values-gl/strings.xml     |  4 ----
 app/src/main/res/values-he/strings.xml     |  2 --
 app/src/main/res/values-hi/strings.xml     |  7 -------
 app/src/main/res/values-hr/strings.xml     |  2 --
 app/src/main/res/values-hu/strings.xml     |  5 -----
 app/src/main/res/values-id/strings.xml     |  4 ----
 app/src/main/res/values-it/strings.xml     |  5 +----
 app/src/main/res/values-ja/strings.xml     |  3 ---
 app/src/main/res/values-ko/strings.xml     |  3 ---
 app/src/main/res/values-lt/strings.xml     |  2 --
 app/src/main/res/values-mk/strings.xml     |  2 --
 app/src/main/res/values-nb-rNO/strings.xml |  8 ++------
 app/src/main/res/values-nl-rBE/strings.xml |  2 --
 app/src/main/res/values-nl/strings.xml     |  3 ---
 app/src/main/res/values-sk/strings.xml     |  2 --
 app/src/main/res/values-sl/strings.xml     |  2 --
 app/src/main/res/values-sr/strings.xml     |  2 --
 app/src/main/res/values-ta/strings.xml     |  1 -
 app/src/main/res/values-te/strings.xml     |  1 -
 app/src/main/res/values-tr/strings.xml     |  3 ---
 app/src/main/res/values-uk/strings.xml     |  3 +--
 app/src/main/res/values-vi/strings.xml     |  2 --
 app/src/main/res/values-zh-rCN/strings.xml |  2 --
 app/src/main/res/values-zh-rHK/strings.xml |  2 --
 app/src/main/res/values-zh-rTW/strings.xml |  6 ------
 40 files changed, 8 insertions(+), 124 deletions(-)

diff --git a/app/src/main/res/values-b+ast/strings.xml b/app/src/main/res/values-b+ast/strings.xml
index f9834119d..5f482809a 100644
--- a/app/src/main/res/values-b+ast/strings.xml
+++ b/app/src/main/res/values-b+ast/strings.xml
@@ -134,8 +134,6 @@
     <string name="later">Más sero</string>
     <string name="disabled">Desactivóse</string>
 
-    <string name="use_old_player_title">Usar reproductor vieyu</string>
-
 
     <string name="short_thousand">M</string>
     <string name="short_million">Mill</string>
@@ -168,8 +166,7 @@
     <string name="settings_category_popup_title">Ventanu emerxente</string>
     <string name="popup_resizing_indicator_title">Redimensionáu</string>
 
-    <string name="use_old_player_summary">Reproductor vieyu integráu de Mediaframework</string>
-<string name="subscribe_button_title">Soscribise</string>
+    <string name="subscribe_button_title">Soscribise</string>
     <string name="subscribed_button_title">Soscribiéstite</string>
     <string name="channel_unsubscribed">Desoscribiéstite de la canal</string>
     <string name="subscription_change_failed">Nun pue camudase la resolución</string>
@@ -325,8 +322,7 @@
     <string name="video_player">Reproductor de videu</string>
     <string name="background_player">Reproductor en segundu planu</string>
     <string name="popup_player">Reproductor en ventanu</string>
-    <string name="always_ask_player">Entrugar siempres</string>
-    
+
     <string name="preferred_player_fetcher_notification_title">Consiguiendo información…</string>
     <string name="preferred_player_fetcher_notification_message">Ta cargando\'l conteníu solicitáu</string>
 <string name="controls_download_desc">Baxa\'l ficheru del fluxu.</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index dc9e6b571..fe6dd7fe6 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -54,8 +54,6 @@
     <string name="play_audio">Аўдыё</string>
     <string name="default_audio_format_title">Фармат аўдыё па змаўчанні</string>
     <string name="default_video_format_title">Фармат відэа па змаўчанні</string>
-    <string name="webm_description">WebM - свабодны</string>
-    <string name="m4a_description">M4A - вышэй якасць</string>
     <string name="theme_title">Тэма</string>
     <string name="light_theme_title">Светлая</string>
     <string name="dark_theme_title">Цёмная</string>
@@ -203,8 +201,6 @@
     <string name="audio">Аўдыё</string>
     <string name="retry">Паспрабаваць зноў</string>
     <string name="storage_permission_denied">Няма доступу да носьбіта</string>
-    <string name="use_old_player_title">Стары плэер</string>
-    <string name="use_old_player_summary">Стары убудаваны плэер на Mediaframework</string>
     <string name="short_thousand">тыс.</string>
     <string name="short_million">млн.</string>
     <string name="short_billion">млрд.</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index ce175b28e..9a28dc625 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -156,8 +156,6 @@
     <string name="audio">Аудио</string>
     <string name="retry">Опитай отново</string>
     <string name="storage_permission_denied">Достъпа до хранилището е отказан</string>
-    <string name="use_old_player_title">Използвай стария плейър</string>
-    <string name="use_old_player_summary">Използваю стария вграден Mediaframewoek плейър</string>
 
     <plurals name="subscribers">
 	<item quantity="one">%s абонат</item>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index d6f061888..eaf9eed9a 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -118,8 +118,6 @@
     <string name="audio">অডিও</string>
     <string name="retry">পুনরায় চেষ্টা করো</string>
     <string name="storage_permission_denied">স্টোরেজ অ্যাক্সেস করার অনুমতি অস্বীকার করা হয়েছে</string>
-    <string name="use_old_player_title">পুরানো প্লেয়ার ব্যবহার করো</string>
-    <string name="use_old_player_summary">মিডিয়াফ্রেমওয়ার্ক প্লেয়ারের পুরানো বিল্ড।</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 5ac2f2134..4285a73dc 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -216,8 +216,6 @@
     <string name="info_dir_created">S\'ha creat el directori de baixades «%1$s»</string>
     <string name="retry">Torna a intentar-ho</string>
     <string name="storage_permission_denied">S\'ha denegat el permís d\'accés a l\'emmagatzematge</string>
-    <string name="use_old_player_title">Fes servir el reproductor antic</string>
-    <string name="use_old_player_summary">Antic reproductor integrat de Mediaframework</string>
     <string name="no_subscribers">Sense subscriptors</string>
     <string name="no_views">Sense reproduccions</string>
     <plurals name="views">
diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml
index 858c22b23..abaaa2ed2 100644
--- a/app/src/main/res/values-cmn/strings.xml
+++ b/app/src/main/res/values-cmn/strings.xml
@@ -59,7 +59,6 @@
     <string name="dark_theme_title">酷黑</string>
     <string name="black_theme_title">黑色</string>
     <string name="popup_remember_size_pos_title">记住悬浮窗的尺寸与位置</string>
-    <string name="m4a_description">M4A — 更好的音质</string>
     <string name="popup_remember_size_pos_summary">记住上一次悬浮窗的位置以及大小</string>
     <string name="thumbnail_cache_wipe_complete_notice">已清除图像缓存</string>
     <string name="minimize_on_exit_popup_description">最小化悬浮窗播放器</string>
@@ -108,7 +107,6 @@
     <string name="minimize_on_exit_summary">从主视频播放器切换到其他应用时的操作 - %s</string>
     <string name="minimize_on_exit_none_description">没有</string>
     <string name="minimize_on_exit_background_description">最小化后台播放</string>
-    <string name="webm_description">WebM — 自由视频格式</string>
     <string name="use_inexact_seek_title">使用快速粗略定位</string>
     <string name="use_inexact_seek_summary">粗略定位功能允许播放器以略低的精确度为代价换取更快的定位速度</string>
     <string name="download_thumbnail_title">下载缩略图</string>
@@ -243,8 +241,6 @@
     <string name="audio">音频</string>
     <string name="retry">重试</string>
     <string name="storage_permission_denied">手机存储访问权限被拒绝</string>
-    <string name="use_old_player_title">使用旧的播放器</string>
-    <string name="use_old_player_summary">旧的内置 Mediaframework 播放器</string>
     <string name="short_thousand">千</string>
     <string name="short_million">万</string>
     <string name="short_billion">亿</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1e17f0621..c304d8f59 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -141,8 +141,7 @@
     <string name="msg_popup_permission">Toto oprávnění je vyžadováno pro
 otevření ve vyskakovacím okně</string>
 
-    <string name="use_old_player_title">Použít starý přehrávač</string>
-<string name="use_external_video_player_summary">Odstraňuje zvuk v některých rozlišeních</string>
+    <string name="use_external_video_player_summary">Odstraňuje zvuk v některých rozlišeních</string>
     <string name="show_higher_resolutions_title">Zobrazovat vyšší rozlišení</string>
     <string name="show_higher_resolutions_summary">Pouze některá zařízení podporují přehrávání 2K/4K videí</string>
     <string name="default_video_format_title">Výchozí formát videa</string>
@@ -194,8 +193,6 @@ otevření ve vyskakovacím okně</string>
     <string name="search_no_results">Žádné výsledky</string>
     <string name="empty_subscription_feed_subtitle">Je tu sranda jak v márnici</string>
 
-    <string name="use_old_player_summary">Starý zabudovaný Mediaframework přehrávač</string>
-
     <string name="short_billion">mld.</string>
 
     <string name="no_subscribers">Žádní odběratelé</string>
@@ -327,8 +324,7 @@ otevření ve vyskakovacím okně</string>
     <string name="video_player">Video přehrávač</string>
     <string name="background_player">Přehrávač na pozadí</string>
     <string name="popup_player">Přehrávač v okně</string>
-    <string name="always_ask_player">Vždy se ptát</string>
-    
+
     <string name="preferred_player_fetcher_notification_title">Získávám informace…</string>
     <string name="preferred_player_fetcher_notification_message">Načítání požadovaného obsahu</string>
 <string name="controls_download_desc">Stáhnout soubor streamu</string>
@@ -383,9 +379,6 @@ otevření ve vyskakovacím okně</string>
     <string name="normal_caption_font_size">Normální písmo</string>
     <string name="larger_caption_font_size">Větší písmo</string>
 
-    <string name="toggle_leak_canary">Sledovat únik paměti</string>
-    <string name="disable_leak_canary_notice">Sledování úniku paměti vypnuto</string>
-<string name="enable_leak_canary_notice">Sledování úniku paměti povoleno, aplikace může při zátěži přestat reagovat</string>
     <string name="settings_category_debug_title">Ladění</string>
     <string name="caption_auto_generated">"Automaticky generováno "</string>
     <string name="enable_leak_canary_title">Povolit službu LeakCanary</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4578040d5..621045ed9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -120,13 +120,11 @@
     <string name="all">Alle</string>
     <string name="channel">Kanal</string>
     <string name="disabled">Deaktiviert</string>
-    <string name="use_old_player_title">Alten Player benutzen</string>
     <string name="open_in_popup_mode">Im Pop-up-Modus öffnen</string>
     <string name="default_video_format_title">Bevorzugtes Videoformat</string>
     <string name="popup_playing_toast">Spiele im Pop-up Modus ab</string>
     <string name="popup_mode_share_menu_title">NewPipe-Pop-up-Modus</string>
     <string name="msg_popup_permission">Diese Berechtigung ist für das Öffnen im Pop-up-Modus erforderlich</string>
-    <string name="use_old_player_summary">Alter eingebauter Mediaframework-Player</string>
     <string name="default_popup_resolution_title">Standardauflösung des Pop-ups</string>
     <string name="show_higher_resolutions_title">Höhere Auflösungen anzeigen</string>
     <string name="show_higher_resolutions_summary">Nur manche Geräte unterstützen das Abspielen von 2K-/4K-Videos</string>
@@ -270,7 +268,6 @@
     <string name="video_player">Video-Player</string>
     <string name="background_player">Hintergrund-Player</string>
     <string name="popup_player">Popup-Player</string>
-    <string name="always_ask_player">Immer fragen</string>
     <string name="preferred_player_fetcher_notification_title">Informationen werden abgerufen…</string>
     <string name="preferred_player_fetcher_notification_message">Gewünschten Inhalt laden</string>
     <string name="import_data_title">Datenbank importieren</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 2422a493b..68e93ba58 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -29,8 +29,6 @@
     <string name="show_play_with_kodi_summary">Προβολή μιας επιλογής για αναπαραγωγή με το Kodi media center</string>
     <string name="play_audio">Ήχος</string>
     <string name="default_audio_format_title">Προεπιλεγμένη μορφή ήχου</string>
-    <string name="webm_description">WebM — δωρεάν μορφή</string>
-    <string name="m4a_description">Μ4Α — καλύτερη ποιότητα</string>
     <string name="theme_title">Θέμα</string>
     <string name="dark_theme_title">Σκοτεινό</string>
     <string name="light_theme_title">Φωτεινό</string>
@@ -216,8 +214,6 @@
     <string name="detail_drag_description">Σύρετε για ταξινόμηση</string>
     <string name="retry">Προσπάθεια εκ νέου</string>
     <string name="storage_permission_denied">Δεν δώθηκε άδεια εγγραφής στην εσωτερική μνήμη</string>
-    <string name="use_old_player_title">Χρήση παλαιάς συσκευής αναπαραγωγής</string>
-    <string name="use_old_player_summary">Παλαιά συσκευή αναπαραγωγής Mediaframework</string>
     <string name="short_thousand">χιλ</string>
     <string name="short_million">Εκ</string>
     <string name="no_subscribers">Κανένας εγγεγραμένος χρήστης</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 47748195d..e75d905df 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -268,7 +268,6 @@ abrir en modo popup</string>
     <string name="video_player">Reproductor de vídeo</string>
     <string name="background_player">Reproductor de fondo</string>
     <string name="popup_player">Reproductor de popup</string>
-    <string name="always_ask_player">Preguntar siempre</string>
     <string name="preferred_player_fetcher_notification_title">Obteniendo información…</string>
     <string name="preferred_player_fetcher_notification_message">Cargando contenido solicitado</string>
     <string name="import_data_title">Importar base de datos</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index b57fdd306..a11805f3b 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -195,8 +195,6 @@
     <string name="audio">Audio</string>
     <string name="retry">Proovi uuesti</string>
     <string name="storage_permission_denied">Pääsuõigused salvestile puuduvad</string>
-    <string name="use_old_player_title">Kasuta vana pleierit</string>
-    <string name="use_old_player_summary">Vana sisseehitatud mediaframework pleier</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index cd0c618ee..095bbfe5e 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -117,8 +117,6 @@
     <string name="audio">Audioa</string>
     <string name="retry">Saiatu berriro</string>
     <string name="storage_permission_denied">Biltegia atzitzeko baimena ukatu da</string>
-    <string name="use_old_player_title">Erabili erreproduzigailu zaharra</string>
-    <string name="use_old_player_summary">Barne Media Framework erreproduzigailu zaharra</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">MM</string>
@@ -270,7 +268,6 @@
     <string name="video_player">Bideo erreproduzigailua</string>
     <string name="background_player">Bigarren planoko erreproduzigailua</string>
     <string name="popup_player">Laster-leiho erreproduzigailua</string>
-    <string name="always_ask_player">Galdetu beti</string>
     <string name="preferred_player_fetcher_notification_title">Informazioa eskuratzen…</string>
     <string name="preferred_player_fetcher_notification_message">Kargatzen eskatutako edukia</string>
     <string name="controls_download_desc">Deskargatu jario fitxategia</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 83a076f09..fe5d74088 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -35,8 +35,6 @@
     <string name="show_play_with_kodi_summary">نمایش گزینه‌ای برای پخش ویدیو با مرکز رسانهٔ کودی</string>
     <string name="play_audio">صدا</string>
     <string name="default_audio_format_title">قالب صدای پیش‌گزیده</string>
-    <string name="webm_description">قالب آزاد — WebM</string>
-    <string name="m4a_description">کیفیت بهتر — M4A</string>
     <string name="theme_title">زمینه</string>
     <string name="dark_theme_title">تیره</string>
     <string name="light_theme_title">روشن</string>
@@ -213,7 +211,6 @@
     <string name="no_streams_available_download">جریانی برای بارگیری در دسترس نیست</string>
 
     <string name="search_no_results">بدون نتیجه</string>
-    <string name="use_old_player_title">استفاده از پخش‌کننده قدیمی</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index ead13fb95..2a86445e0 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -148,8 +148,6 @@
     <string name="audio">Ääni</string>
     <string name="retry">Toista uudelleen</string>
     <string name="storage_permission_denied">Oikeus tallennustilan hallintaan evätty</string>
-    <string name="use_old_player_title">Käytä vanhaa soitinta</string>
-    <string name="use_old_player_summary">Käytä vanhaa sisäänrakennettua Mediaframework-soitinta</string>
 
     <string name="short_thousand">t.</string>
     <string name="short_million">milj.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6d8d03dec..b81195d41 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -119,8 +119,6 @@
     <string name="later">Plus tard</string>
     <string name="disabled">Désactivé</string>
     <string name="info_labels">Quoi :\\nRequête :\\nLangue du contenu :\\nService :\\nHeure GMT :\\nPaquet :\\nVersion :\\nVersion du système :</string>
-    <string name="use_old_player_title">Utiliser l\'ancien lecteur</string>
-    <string name="use_old_player_summary">Ancienne version du lecteur Mediaframework</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="msg_popup_permission">Cette autorisation est nécessaire pour 
@@ -270,7 +268,6 @@
     <string name="video_player">Lecteur vidéo</string>
     <string name="background_player">Lecteur en arrière-plan</string>
     <string name="popup_player">Lecteur en fenêtré</string>
-    <string name="always_ask_player">Toujours demander</string>
     <string name="preferred_player_fetcher_notification_title">Obtention des infos…</string>
     <string name="preferred_player_fetcher_notification_message">Chargement du contenu</string>
     <string name="import_data_title">Importer les données</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index f137a092e..68c831b70 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -59,8 +59,6 @@
     <string name="play_audio">Audio</string>
     <string name="default_audio_format_title">Formato de audio predeterminado</string>
     <string name="default_video_format_title">Formato de vídeo predeterminado</string>
-    <string name="webm_description">WebM — formato libre</string>
-    <string name="m4a_description">M4A — mellor calidade</string>
     <string name="theme_title">Tema</string>
     <string name="light_theme_title">Claro</string>
     <string name="dark_theme_title">Escuro</string>
@@ -218,8 +216,6 @@
     <string name="audio">Audio</string>
     <string name="retry">Tentar de novo</string>
     <string name="storage_permission_denied">A permisión de acceso ao almacenamento foi denegada</string>
-    <string name="use_old_player_title">Usar o reprodutor antigo</string>
-    <string name="use_old_player_summary">Versión interna anticuada do reprodutor Mediaframework</string>
 
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 155c6a223..0f48379d5 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -149,8 +149,6 @@
     <string name="audio">שמע</string>
     <string name="retry">ניסיון חוזר</string>
     <string name="storage_permission_denied">הגישה לאחסון נדחתה</string>
-    <string name="use_old_player_title">השתמש בנגן הישן</string>
-    <string name="use_old_player_summary">השתמש בנגן המובנה Mediaframework</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index ed2815638..c872e41b6 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -80,8 +80,6 @@
     <string name="show_play_with_kodi_summary">कोडी मीडिया सेंटर के माध्यम से वीडियो चलाने के लिए एक विकल्प प्रदर्शित करें</string>
     <string name="default_audio_format_title">डिफ़ॉल्ट ऑडियो का फॉर्मेट</string>
     <string name="default_video_format_title">डिफ़ॉल्ट विडियो का फॉर्मेट</string>
-    <string name="webm_description">WebM - libre फॉर्मेट</string>
-    <string name="m4a_description">M4A - बेहतर क्वालिटी</string>
     <string name="theme_title">एप्प का नया रूप</string>
     <string name="dark_theme_title">काला</string>
     <string name="popup_remember_size_pos_title">विडियो पॉपअप की आकर और उसकी स्थति को याद रखे</string>
@@ -174,8 +172,6 @@
     <string name="audio">ऑडियो</string>
     <string name="retry">फिर से कोशिश करे</string>
     <string name="storage_permission_denied">स्टोरेज में प्रवेश के लिए अनुमति नहीं मिली</string>
-    <string name="use_old_player_title">पुराना विडियो प्लेयर प्रयोग करे</string>
-    <string name="use_old_player_summary">पुराना Mediaframework Player जो फ़ोन में बना हुआ है</string>
     <string name="short_thousand">हज़ार</string>
     <string name="short_million">करोड़</string>
     <string name="short_billion">अरब</string>
@@ -319,9 +315,6 @@
     <string name="smaller_caption_font_size">छोटे फ़ॉंट</string>
     <string name="normal_caption_font_size">सामांय फ़ॉंट</string>
     <string name="larger_caption_font_size">बड़ा फ़ॉंट</string>
-    <string name="toggle_leak_canary">मॉनिटर लीक</string>
-    <string name="enable_leak_canary_notice">मेमोरी लीक मॉनिटरिंग सक्षम है, हीप डंपिंग के समय ऐप अप्रतिसादी हो सकती है</string>
-    <string name="disable_leak_canary_notice">मेमोरी लीक मॉनिटरिंग अक्षम है</string>
     <string name="settings_category_debug_title">डीबग करें</string>
     <string name="caption_auto_generated">ऑटो-जनरेटेड</string>
     <string name="enable_leak_canary_title">LeakCanary सक्षम करें</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 6e8595010..e7aeb924a 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -131,8 +131,6 @@
     <string name="audio">Zvuk</string>
     <string name="retry">Ponovno pokušaj</string>
     <string name="storage_permission_denied">Dozvola za pisanje po pohrani je odbijena</string>
-    <string name="use_old_player_title">Koristi stari reproduktor</string>
-    <string name="use_old_player_summary">Stari ugrađeni Mediaframework reproduktor</string>
     <string name="short_thousand">tis</string>
     <string name="short_million">mil</string>
     <string name="short_billion">mlrd</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 24662feed..40593fdbf 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -24,8 +24,6 @@
     <string name="show_play_with_kodi_summary">Opció mutatása a videók Kodi médiaközponttal való lejátszására</string>
     <string name="play_audio">Hang</string>
     <string name="default_audio_format_title">Alapértelmezett hang formátum</string>
-    <string name="webm_description">WebM — szabad formátum</string>
-    <string name="m4a_description">M4A — jobb minőség</string>
     <string name="download_dialog_title">Letöltés</string>
     <string name="next_video_title">Következő</string>
     <string name="url_not_supported_toast">Nem támogatott webcím</string>
@@ -193,7 +191,6 @@
 
     <string name="info_labels">Mi:\\nKérés:\\nTartalom nyelve:\\nSzolgáltatás:\\nGMT Idő:\\nCsomag:\\nVerzió:\\nOperációs Rendszer verzió:</string>
     <string name="search_no_results">Nincs találat</string>
-    <string name="use_old_player_title">Régi lejátszó használata</string>
     <string name="controls_download_desc">Adatfolyam fájl letöltése</string>
     <string name="controls_add_to_playlist_title">Hozzáadás</string>
 
@@ -236,8 +233,6 @@
     <string name="empty_subscription_feed_subtitle">Itt nincs semmi</string>
     <string name="detail_drag_description">Húzza az átrendezéshez</string>
 
-    <string name="use_old_player_summary">Régi beépített Mediaframework lejátszó</string>
-
     <string name="short_thousand">e</string>
     <string name="short_million">M</string>
     <string name="short_billion">Mrd</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 66b901ac9..56f31eac6 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -29,8 +29,6 @@
     <string name="show_play_with_kodi_summary">Tampilkan opsi untuk memutar video via Kodi</string>
     <string name="play_audio">Audio</string>
     <string name="default_audio_format_title">Format audio</string>
-    <string name="webm_description">WebM — format bebas</string>
-    <string name="m4a_description">M4A — kualitas lebih baik</string>
     <string name="dark_theme_title">Gelap</string>
     <string name="light_theme_title">Terang</string>
     <string name="download_dialog_title">Unduh</string>
@@ -124,8 +122,6 @@
 \nmembuka di mode popup</string>
     <string name="popup_mode_share_menu_title">Mode popup NewPipe</string>
     <string name="popup_playing_toast">Memutar dalam mode popup</string>
-    <string name="use_old_player_title">Gunakan pemutar lama</string>
-    <string name="use_old_player_summary">Pemutar Mediaframework bawaan versi lama</string>
     <string name="disabled">Dinonaktifkan</string>
     <string name="default_video_format_title">Format video</string>
     <string name="default_popup_resolution_title">Resolusi popup</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b4bcd2926..9bccc11df 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -122,7 +122,6 @@
     <string name="popup_mode_share_menu_title">Modalità Popup di NewPipe</string>
     <string name="popup_playing_toast">Riproduzione in modalità popup</string>
     <string name="disabled">Disattivato</string>
-    <string name="use_old_player_title">Usa il vecchio lettore multimediale</string>
     <string name="use_external_video_player_summary">Non riproduce l\'audio con ALCUNE risoluzioni</string>
     <string name="controls_background_title">In sottofondo</string>
     <string name="controls_popup_title">Popup</string>
@@ -142,8 +141,7 @@
     <string name="clear">Cancella</string>
     <string name="popup_resizing_indicator_title">Ridimensionamento</string>
     <string name="best_resolution">Risoluzione migliore</string>
-    <string name="use_old_player_summary">Precedente lettore multimediale Mediaframework integrato</string>
-    <string name="msg_popup_permission">Questo permesso è necessario 
+    <string name="msg_popup_permission">Questo permesso è necessario
 \nper riprodurre in modalità popup</string>
     <string name="action_settings">Impostazioni</string>
     <string name="action_about">Informazioni</string>
@@ -270,7 +268,6 @@
     <string name="video_player">Lettore video</string>
     <string name="background_player">Riproduzione in sottofondo</string>
     <string name="popup_player">Riproduzione in modalità popup</string>
-    <string name="always_ask_player">Chiedi sempre</string>
     <string name="preferred_player_fetcher_notification_title">Raccogliendo informazioni…</string>
     <string name="preferred_player_fetcher_notification_message">Caricamento del contenuto richiesto</string>
     <string name="import_data_title">Importa database</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e1e76475e..38acee61d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -123,8 +123,6 @@
 このアクセス許可が必要です</string>
     <string name="popup_mode_share_menu_title">NewPipe ポップアップモード</string>
     <string name="popup_playing_toast">ポップアップモードで再生中</string>
-    <string name="use_old_player_title">古いプレーヤーを使用する</string>
-    <string name="use_old_player_summary">古い内蔵のMediaframeworkプレーヤー</string>
     <string name="disabled">無効</string>
     <string name="default_video_format_title">デフォルトの動画形式</string>
     <string name="default_popup_resolution_title">デフォルトのポップアップ解像度</string>
@@ -253,7 +251,6 @@
     <string name="video_player">動画プレーヤー</string>
     <string name="background_player">バックグラウンドプレーヤー</string>
     <string name="popup_player">ポップアッププレーヤー</string>
-    <string name="always_ask_player">常に尋ねる</string>
     <string name="preferred_player_fetcher_notification_title">情報を取得しています…</string>
     <string name="preferred_player_fetcher_notification_message">コンテンツを読み込んでいます</string>
     <string name="controls_download_desc">動画ファイルをダウンロード</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bcaafbcfc..a3f25b033 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -173,9 +173,6 @@
     <string name="search_no_results">결과 없음</string>
     <string name="empty_subscription_feed_subtitle">구독할 항목을 추가하세요</string>
 
-    <string name="use_old_player_title">구형 플레이어 사용</string>
-    <string name="use_old_player_summary">내장된 구형 Mediaframework 플레이어 사용</string>
-
     <string name="short_thousand">천</string>
     <string name="short_million">백만</string>
     <string name="short_billion">10억</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 4ffcd26d6..4b21a57cd 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -120,8 +120,6 @@
     <string name="video">Vaizdas</string>
     <string name="audio">Muzika</string>
     <string name="retry">Bandyti iš naujo</string>
-    <string name="use_old_player_title">Naudoti seną grotuvą</string>
-    <string name="use_old_player_summary">Senas įtaisytas media grotuvas</string>
 
     <plurals name="subscribers">
 	<item quantity="one">%s prenumeratorius</item>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 47413c6c3..fc941d0db 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -202,8 +202,6 @@
     <string name="audio">Звук</string>
     <string name="retry">Пробај повторно</string>
     <string name="storage_permission_denied">Нема привилегии за пристап</string>
-    <string name="use_old_player_title">Користи го стариот плеер</string>
-    <string name="use_old_player_summary">Користи го стариот Mediaframework плеер</string>
 
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index baaa48ca8..a806df31a 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -141,8 +141,6 @@
     <string name="later">Senere</string>
     <string name="disabled">Avskrudd</string>
 
-    <string name="use_old_player_title">Bruk gammel avspiller</string>
-
 
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
@@ -153,8 +151,7 @@
 
     <string name="recaptcha_request_toast">reCAPTCHA-oppgave forespurt</string>
 
-    <string name="use_old_player_summary">Gammel innebygd Mediaframework-avspiller</string>
-<string name="use_external_video_player_summary">Fjerner lyd ved NOEN oppløsninger</string>
+    <string name="use_external_video_player_summary">Fjerner lyd ved NOEN oppløsninger</string>
     <string name="subscribe_button_title">Abonner</string>
     <string name="subscribed_button_title">Abonnert</string>
     <string name="channel_unsubscribed">Kanalabonnent oppsagt</string>
@@ -315,8 +312,7 @@
     <string name="video_player">Videoavspiller</string>
     <string name="background_player">Bakgrunnsavspiller</string>
     <string name="popup_player">Oppsprettsavspiller</string>
-    <string name="always_ask_player">Spør alltid</string>
-    
+
     <string name="preferred_player_fetcher_notification_title">Henter informasjon…</string>
     <string name="preferred_player_fetcher_notification_message">Laster forespurt innhold</string>
 <string name="import_data_title">Importer database</string>
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 5fb175b3e..51a30aa36 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -189,8 +189,6 @@
     <string name="audio">Geluid</string>
     <string name="retry">Opnieuw proberen</string>
     <string name="storage_permission_denied">Toegang tot opslag geweigerd</string>
-    <string name="use_old_player_title">Gebruik oude speler</string>
-    <string name="use_old_player_summary">Verouderden ingebouwde Mediaframework-speler</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3bf219912..04b47c4c8 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -123,8 +123,6 @@
 \nopenen in pop-upmodus</string>
     <string name="popup_mode_share_menu_title">NewPipe-pop-upmodus</string>
     <string name="popup_playing_toast">Speelt af in pop-upmodus</string>
-    <string name="use_old_player_title">Oude speler gebruiken</string>
-    <string name="use_old_player_summary">Verouderde ingebouwde Mediaframework-speler</string>
     <string name="default_video_format_title">Standaard videoformaat</string>
     <string name="disabled">Uitgeschakeld</string>
     <string name="default_popup_resolution_title">Standaardresolutie van pop-up</string>
@@ -270,7 +268,6 @@
     <string name="video_player">Videospeler</string>
     <string name="background_player">Achtergrondspeler</string>
     <string name="popup_player">Pop-upspeler</string>
-    <string name="always_ask_player">Altijd vragen</string>
     <string name="preferred_player_fetcher_notification_title">Bezig met ophalen van informatie…</string>
     <string name="preferred_player_fetcher_notification_message">Bezig met laden van gevraagde inhoud</string>
     <string name="import_data_title">Databank importeren</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index c33bfde1b..de26a1638 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -125,8 +125,6 @@
     <string name="default_video_format_title">Preferovaný formát videa</string>
     <string name="popup_playing_toast">Prehrávanie v mini okne</string>
     <string name="disabled">Vypnuté</string>
-    <string name="use_old_player_title">Použiť starší prehrávač</string>
-    <string name="use_old_player_summary">Starý zabudovaný prehrávač Mediaframework</string>
     <string name="default_popup_resolution_title">Predvolená veľkosť mini okna</string>
     <string name="show_higher_resolutions_title">Zobraziť vyššie rozlíšenie</string>
     <string name="show_higher_resolutions_summary">Len niektoré zariadenia podporujú videá 2K/4K</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index ec2a0bea5..4f604ae5b 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -153,8 +153,6 @@ odpiranje v pojavnem načinu</string>
     <string name="popup_playing_toast">Predvajanje v pojavnem načinu</string>
     <string name="disabled">Onemogočeno</string>
 
-    <string name="use_old_player_title">Uporabi star predvajalnik</string>
-    <string name="use_old_player_summary">Zastarela različica predvajalnika Mediaframework</string>
     <string name="default_video_format_title">Prednostni zapis video datoteke</string>
     <string name="default_popup_resolution_title">Privzeta ločljivost pojavnega okna</string>
     <string name="show_higher_resolutions_title">Pokaži večje ločljivosti</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 5182144e0..a34cc9e11 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -124,7 +124,6 @@
     <string name="popup_mode_share_menu_title">Режим прозорчета</string>
     <string name="popup_playing_toast">Пуштање у режиму прозорчета</string>
     <string name="disabled">Искључено</string>
-    <string name="use_old_player_title">Користи стари плејер</string>
     <string name="default_video_format_title">Пожељни формат видеа</string>
     <string name="default_popup_resolution_title">Резолуција искачућег прозора</string>
     <string name="show_higher_resolutions_title">Прикажи више резолуције</string>
@@ -143,7 +142,6 @@
     <string name="show_search_suggestions_summary">Приказује предлоге током претраге</string>
     <string name="settings_category_popup_title">Искачући прозор</string>
     <string name="popup_resizing_indicator_title">Мењање величине</string>
-    <string name="use_old_player_summary">Стара градња Медијафрејмворк плејера</string>
     <string name="subscribed_button_title">Претплаћен</string>
     <string name="subscribe_button_title">Претплати</string>
     <string name="tab_main">Главно</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 28c84fc9e..7aa021182 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -51,7 +51,6 @@
     <string name="play_audio">ஒலி</string>
     <string name="default_audio_format_title">முதல் ஒலி வடிவம்</string>
     <string name="default_video_format_title">முதல் காணிலி வடிவம்</string>
-    <string name="m4a_description">M4A - மேம்பட்ட தரம்</string>
     <string name="theme_title">வார்ப்புரு</string>
     <string name="light_theme_title">வெளிர்</string>
     <string name="dark_theme_title">அடர்</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index 5915aee7a..ff9969abc 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -102,7 +102,6 @@
     <string name="audio">ఆడియో</string>
     <string name="retry">మళ్ళీ ప్రయత్నించు</string>
     <string name="storage_permission_denied">నిల్వ అనుమతి తిరస్కరించబడింది</string>
-    <string name="use_old_player_title">పాత ఆటగాడు ఉపయోగించండి</string>
     <string name="short_thousand">కె</string>
     <string name="short_million">ఎం</string>
     <string name="short_billion">బి</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index b7c4b0156..5209fe250 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -120,8 +120,6 @@
     <string name="your_comment">Yorumunuz (İngilizce):</string>
     <string name="error_details_headline">Ayrıntılar:</string>
     <string name="list_thumbnail_view_description">Video ön izleme küçük resmi</string>
-    <string name="use_old_player_title">Eski oynatıcıyı kullan</string>
-    <string name="use_old_player_summary">Eski içe gömülü Mediaframework oynatıcısı</string>
     <string name="short_thousand">B</string>
     <string name="short_million">M</string>
     <string name="short_billion">MR</string>
@@ -270,7 +268,6 @@
     <string name="video_player">Video oynatıcı</string>
     <string name="background_player">Arka plan oynatıcı</string>
     <string name="popup_player">Açılır oynatıcı</string>
-    <string name="always_ask_player">Her zaman sor</string>
     <string name="preferred_player_fetcher_notification_title">Bilgi alınıyor…</string>
     <string name="preferred_player_fetcher_notification_message">İstenen içerik yükleniyor</string>
     <string name="import_data_title">Veri tabanını içe aktar</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ffc996f49..6eca64d34 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -90,7 +90,6 @@
     <string name="video">Відео</string>
     <string name="audio">Аудіо</string>
     <string name="retry">Повторити спробу</string>
-    <string name="use_old_player_title">Використовувати старий програвач</string>
     <string name="short_thousand">тис.</string>
     <string name="short_million">млн.</string>
     <string name="short_billion">млрд.</string>
@@ -245,7 +244,7 @@
     <string name="app_description">Вільне та легке потокове програвання на Android.</string>
     <string name="contribution_encouragement">Які б не були Ваші ідеї: переклад, дизайн, легкий чи глобальний рефакторинг - будь-яка допомога завжди у нагоді. Що більше зроблено, то ліпшим стає NewPipe!</string>
     <string name="settings_category_debug_title">Налагодження</string>
-    <string name="empty_subscription_feed_subtitle">Нічого немає... чути лише цвіркунів</string>
+    <string name="empty_subscription_feed_subtitle">Нічого немає… чути лише цвіркунів</string>
     <string name="no_views">Немає переглядів</string>
     <plurals name="views">
         <item quantity="one">%s перегляд</item>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index af23f383c..b1899622f 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -113,8 +113,6 @@
     <string name="audio">Âm thanh</string>
     <string name="retry">Thử lại</string>
     <string name="storage_permission_denied">Quyền truy cập bộ nhớ đã bị từ chối</string>
-    <string name="use_old_player_title">Sử dụng trình phát cũ</string>
-    <string name="use_old_player_summary">Máy nghe nhạc Mediaframework tích hợp sẵn</string>
     <string name="short_thousand">ngàn</string>
     <string name="short_million">triệu</string>
     <string name="short_billion">tỉ</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 55cfad9ef..8d5701a4f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -175,8 +175,6 @@
     <string name="notification_channel_name">NewPipe 通知</string>
     <string name="notification_channel_description">NewPipe 后台播放和窗口播放器的通知</string>
 
-    <string name="use_old_player_title">使用旧版播放器</string>
-    <string name="use_old_player_summary">旧版本的内置媒体播放器</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index d1b5fde31..3b38daca6 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -119,7 +119,6 @@
     <string name="could_not_load_image">無法取得圖片</string>
     <string name="app_ui_crash">應用程式或介面出現問題</string>
     <string name="info_labels">事件：\\n請求：\\n內容語言：\\n服務：\\nGMT 時間：\\nPackage：\\n版本：\\n作業系統版本：</string>
-    <string name="use_old_player_title">使用舊播放器</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
@@ -142,7 +141,6 @@
     <string name="clear">清除</string>
     <string name="best_resolution">最佳解像度</string>
     <string name="popup_resizing_indicator_title">調整大小</string>
-    <string name="use_old_player_summary">使用舊的內置 Mediaframework 播放器</string>
     <string name="short_billion">B</string>
     <string name="title_activity_about">關於 NewPipe</string>
     <string name="action_settings">設定</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 655cd0dd6..441061657 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -115,8 +115,6 @@
     <string name="audio">音訊</string>
     <string name="retry">重試</string>
     <string name="storage_permission_denied">無法存取儲存空間</string>
-    <string name="use_old_player_title">使用舊式播放器</string>
-    <string name="use_old_player_summary">舊型內建 Mediaframework 播放器</string>
     <string name="short_thousand">千</string>
     <string name="short_million">百萬</string>
     <string name="short_billion">十億</string>
@@ -275,7 +273,6 @@
     <string name="video_player">影片播放器</string>
     <string name="background_player">背景播放器</string>
     <string name="popup_player">懸浮視窗播放器</string>
-    <string name="always_ask_player">總是詢問</string>
     <string name="preferred_player_fetcher_notification_title">正在取得資訊…</string>
     <string name="preferred_player_fetcher_notification_message">正在載入要求的內容</string>
     <string name="controls_download_desc">下載串流檔案</string>
@@ -315,9 +312,6 @@
     <string name="normal_caption_font_size">正常字體</string>
     <string name="larger_caption_font_size">加大字體</string>
     <string name="drawer_header_action_paceholder_text">某些東西即將在此出現 ;D</string>
-    <string name="toggle_leak_canary">監測流失</string>
-    <string name="enable_leak_canary_notice">啟用記憶體流失監測技術，當 heap dump 時，應用程式可能會反應遲鈍</string>
-    <string name="disable_leak_canary_notice">已停用記憶體流失監測</string>
     <string name="settings_category_debug_title">除錯</string>
     <string name="caption_auto_generated">自動產生</string>
     <string name="enable_leak_canary_title">啟用 LeakCanary</string>

From 93edb333d405ab1104dcbd21ff033c5fbc49701a Mon Sep 17 00:00:00 2001
From: Karel S <karelsladek@centrum.cz>
Date: Wed, 29 May 2019 09:50:35 +0000
Subject: [PATCH 109/138] Translated using Weblate (Czech)

Currently translated at 90.3% (400 of 443 strings)
---
 app/src/main/res/values-cs/strings.xml | 132 ++++++-------------------
 1 file changed, 31 insertions(+), 101 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1e17f0621..1a82d2f0d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -15,10 +15,8 @@
     <string name="screen_rotation">otočení</string>
     <string name="use_external_video_player_title">Použít externí video přehrávač</string>
     <string name="use_external_audio_player_title">Použít externí audio přehrávač</string>
-
     <string name="download_path_audio_summary">Stažené audio je uloženo zde</string>
     <string name="download_path_audio_dialog_title">Zadejte umístění pro stažené audio soubory</string>
-
     <string name="download_path_audio_title">Složka pro stažené audio</string>
     <string name="default_resolution_title">Výchozí rozlišení</string>
     <string name="play_with_kodi_title">Přehrát pomocí Kodi</string>
@@ -27,7 +25,6 @@
     <string name="download_path_title">Umístění pro stažené video</string>
     <string name="download_path_summary">Cesta, kam se uloží stažené video</string>
     <string name="download_path_dialog_title">Zadejte umístění pro stažená videa</string>
-
     <string name="show_play_with_kodi_title">Zobrazit možnost \"Přehrát pomocí Kodi\"</string>
     <string name="show_play_with_kodi_summary">Zobrazit možnost přehrání videa pomocí multimediálního centra Kodi</string>
     <string name="play_audio">Zvuk</string>
@@ -35,7 +32,6 @@
     <string name="theme_title">Téma</string>
     <string name="dark_theme_title">Tmavé</string>
     <string name="light_theme_title">Světlé</string>
-
     <string name="download_dialog_title">Stáhnout</string>
     <string name="next_video_title">Další videa</string>
     <string name="show_next_and_similar_title">Zobrazovat \'další\' a \'podobná\' videa</string>
@@ -53,7 +49,6 @@
     <string name="parsing_error">Nebylo možné analyzovat stránku</string>
     <string name="content_not_available">Obsah není k dispozici</string>
     <string name="blocked_by_gema">Obsah blokuje GEMA</string>
-
     <string name="list_thumbnail_view_description">Náhled videa</string>
     <string name="detail_thumbnail_view_description">Náhled videa</string>
     <string name="detail_uploader_thumbnail_view_description">Náhled avataru uploadera</string>
@@ -61,7 +56,6 @@
     <string name="detail_dislikes_img_view_description">To se mi nelíbí</string>
     <string name="use_tor_title">Použít Tor</string>
     <string name="use_tor_summary">(Experimentální) Vynutit stahování skrz Tor pro zvýšené soukromí (streamovaná videa zatím nepodporována).</string>
-
     <string name="err_dir_create">Nebylo možné vytvořit složku pro stažené soubory \'%1$s\'</string>
     <string name="info_dir_created">Vytvořena složka pro stažené soubory \'%1$s\'</string>
     <string name="autoplay_by_calling_app_title">Automaticky přehrávat</string>
@@ -70,7 +64,6 @@
     <string name="show_age_restricted_content_title">Věkově omezený obsah</string>
     <string name="video_is_age_restricted">Zobrazit video s věkovým omezením. Povolit tento obsah lze v \"Nastavení\".</string>
     <string name="duration_live">ŽIVĚ</string>
-
     <string name="light_parsing_error">Nebylo možné kompletně analyzovat stránku</string>
     <string name="main_bg_subtitle">Začni stiskem hledat</string>
     <string name="msg_copied">Zkopírováno do schránky</string>
@@ -85,15 +78,12 @@
     <string name="msg_threads">Vlákna</string>
     <string name="pause">Zastavit</string>
     <string name="delete">Smazat</string>
-
     <string name="start">Start</string>
     <string name="retry">Zkusit znovu</string>
     <string name="video">Video</string>
     <string name="audio">Zvuk</string>
     <string name="report_error">Nahlásit chybu</string>
     <string name="error_details_headline">Podrobnosti:</string>
-
-
     <string name="what_happened_headline">Co se stalo:</string>
     <string name="error_snackbar_action">NAHLÁSIT</string>
     <string name="sorry_string">Omlouváme se, tohle se nemělo stát.</string>
@@ -105,7 +95,6 @@
     <string name="could_not_get_stream">Nepodařilo se dostat žádný stream</string>
     <string name="could_not_setup_download_menu">Nepodařilo se nastavit menu stahování</string>
     <string name="error_report_title">Nahlásit chybu</string>
-
     <string name="downloads">Stažené soubory</string>
     <string name="downloads_title">Stažené soubory</string>
     <string name="what_device_headline">Info:</string>
@@ -114,35 +103,25 @@
     <string name="view">Přehrát</string>
     <string name="add">Nová mise</string>
     <string name="finish">OK</string>
-
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">Výzva reCAPTCHA</string>
     <string name="recaptcha_request_toast">Požadována výzva reCAPTCHA</string>
-
     <string name="black_theme_title">Černé</string>
-
     <string name="checksum">Kontrolní součet</string>
-
     <string name="no_available_dir">Prosím vyberte dostupnou složku pro stahování</string>
-
     <string name="user_report">Hlášení uživatele</string>
-
     <string name="info_labels">Co:\\nŽádost:\\nJazyk obsahu:\\nSlužba:\\nČas GMT:\\nBalíček:\\nVerze:\\nVerze OS:</string>
     <string name="all">Vše</string>
     <string name="channel">Kanál</string>
     <string name="yes">Ano</string>
     <string name="later">Později</string>
-
-
     <string name="short_thousand">tis.</string>
-
     <string name="open_in_popup_mode">Otevřít ve vyskakovacím okně</string>
     <string name="short_million">mil.</string>
     <string name="msg_popup_permission">Toto oprávnění je vyžadováno pro
 otevření ve vyskakovacím okně</string>
-
     <string name="use_old_player_title">Použít starý přehrávač</string>
-<string name="use_external_video_player_summary">Odstraňuje zvuk v některých rozlišeních</string>
+    <string name="use_external_video_player_summary">Odstraňuje zvuk v některých rozlišeních</string>
     <string name="show_higher_resolutions_title">Zobrazovat vyšší rozlišení</string>
     <string name="show_higher_resolutions_summary">Pouze některá zařízení podporují přehrávání 2K/4K videí</string>
     <string name="default_video_format_title">Výchozí formát videa</string>
@@ -154,15 +133,11 @@ otevření ve vyskakovacím okně</string>
     <string name="channel_unsubscribed">Odběr zrušen</string>
     <string name="subscription_change_failed">Nelze změnit odběr</string>
     <string name="subscription_update_failed">Nelze aktualizovat odběr</string>
-
     <string name="tab_main">Hlavní</string>
     <string name="tab_subscriptions">Odběry</string>
-
     <string name="fragment_whats_new">Co je nového</string>
-
     <string name="controls_background_title">Na pozadí</string>
     <string name="controls_popup_title">V okně</string>
-
     <string name="default_popup_resolution_title">Výchozí rozlišení vyskakovacího okna</string>
     <string name="player_gesture_controls_title">Ovládání přehrávače gesty</string>
     <string name="player_gesture_controls_summary">Používat gesta pro nastavení jasu a hlasitosti přehrávače</string>
@@ -187,46 +162,36 @@ otevření ve vyskakovacím okně</string>
     <string name="popup_resizing_indicator_title">Změna velikosti</string>
     <string name="best_resolution">Nejlepší rozlišení</string>
     <string name="undo">Vrátit</string>
-
     <string name="notification_channel_name">NewPipe notifikace</string>
     <string name="notification_channel_description">Notifikace pro NewPipe přehrávače v pozadí a v okně</string>
-
     <string name="search_no_results">Žádné výsledky</string>
     <string name="empty_subscription_feed_subtitle">Je tu sranda jak v márnici</string>
-
     <string name="use_old_player_summary">Starý zabudovaný Mediaframework přehrávač</string>
-
     <string name="short_billion">mld.</string>
-
     <string name="no_subscribers">Žádní odběratelé</string>
     <plurals name="subscribers">
-	<item quantity="one">%s odběratel</item>
-	<item quantity="few">%s odběratelé</item>
-	<item quantity="other">%s odběratelů</item>
-</plurals>
-
+        <item quantity="one">%s odběratel</item>
+        <item quantity="few">%s odběratelé</item>
+        <item quantity="other">%s odběratelů</item>
+    </plurals>
     <string name="no_views">Žádná zhlédnutí</string>
     <plurals name="views">
-	<item quantity="one">%s zhlédnutí</item>
-	<item quantity="few">%s zhlédnutí</item>
-	<item quantity="other">%s zhlédnutí</item>
-</plurals>
-
+        <item quantity="one">%s zhlédnutí</item>
+        <item quantity="few">%s zhlédnutí</item>
+        <item quantity="other">%s zhlédnutí</item>
+    </plurals>
     <string name="no_videos">Žádná videa</string>
     <plurals name="videos">
-	<item quantity="one">%s video</item>
-	<item quantity="few">%s videa</item>
-	<item quantity="other">%s videí</item>
-</plurals>
-
+        <item quantity="one">%s video</item>
+        <item quantity="few">%s videa</item>
+        <item quantity="other">%s videí</item>
+    </plurals>
     <string name="settings_category_downloads_title">Stahování</string>
     <string name="settings_file_charset_title">Povolené znaky v názvech souborů</string>
     <string name="settings_file_replacement_character_summary">Neplatné znaky budou nahrazeny těmito</string>
     <string name="settings_file_replacement_character_title">Náhradní znak</string>
-
     <string name="charset_letters_and_digits">Písmena a číslice</string>
     <string name="charset_most_special_characters">Většina speciálních znaků</string>
-
     <string name="title_activity_about">O NewPipe</string>
     <string name="action_settings">Nastavení</string>
     <string name="action_about">O aplikaci</string>
@@ -243,7 +208,6 @@ otevření ve vyskakovacím okně</string>
     <string name="contribution_encouragement">Pokud máte nápady na zlepšení jako; překlad, změny designu, vylepšování kódu nebo opravdu velké změny kódu - pomoc je vždy vítána. Čím více se udělá, tím lepší to bude!</string>
     <string name="read_full_license">Přečíst licenci</string>
     <string name="contribution_title">Podílet se</string>
-
     <string name="title_activity_history">Historie</string>
     <string name="title_history_search">Vyhledáváno</string>
     <string name="title_history_view">Zhlédnuto</string>
@@ -252,18 +216,15 @@ otevření ve vyskakovacím okně</string>
     <string name="history_empty">Historie je prázdná</string>
     <string name="history_cleared">Historie vymazána</string>
     <string name="item_deleted">Položka byla odstraněna</string>
-<string name="show_hold_to_append_title">Zobrazovat tip \"Podržet pro přidání\"</string>
+    <string name="show_hold_to_append_title">Zobrazovat tip \"Podržet pro přidání\"</string>
     <string name="show_hold_to_append_summary">Zobrazí se po stisku tlačítek přehrát na pozadí nebo přehrát v okně na stránce s videem</string>
     <string name="background_player_append">Ve frontě přehrávače na pozadí</string>
     <string name="popup_playing_append">Ve frontě přehrávače v okně</string>
     <string name="play_all">Přehrát vše</string>
-
     <string name="player_stream_failure">Tento stream nelze přehrát</string>
     <string name="player_unrecoverable_failure">Došlo k neobnovitelné chybě přehrávače</string>
     <string name="player_recoverable_failure">Obnovování z chyby přehrávače</string>
-
     <string name="delete_item_search_history">Odstranit tuto položku z historie vyhledávání?</string>
-
     <string name="main_page_content">Obsah úvodní obrazovky</string>
     <string name="blank_page_summary">Prázdná stránka</string>
     <string name="kiosk_page_summary">Kiosek</string>
@@ -273,7 +234,6 @@ otevření ve vyskakovacím okně</string>
     <string name="select_a_channel">Zvolte kanál</string>
     <string name="no_channel_subscribed_yet">Žádný kanál dosud neodebírán</string>
     <string name="select_a_kiosk">Zvolte kiosek</string>
-
     <string name="kiosk">Kiosek</string>
     <string name="trending">Trendy</string>
     <string name="top_50">Top 50</string>
@@ -284,14 +244,13 @@ otevření ve vyskakovacím okně</string>
     <string name="play_queue_stream_detail">Podrobnosti</string>
     <string name="play_queue_audio_settings">Nastavení zvuku</string>
     <string name="hold_to_append">Podrž pro zařazení do fronty</string>
-<string name="unknown_content">[Neznámý]</string>
-
+    <string name="unknown_content">[Neznámý]</string>
     <string name="enqueue_on_background">Do fronty na pozadí</string>
     <string name="enqueue_on_popup">Do fronty v okně</string>
     <string name="start_here_on_main">Začne hrát zde</string>
     <string name="start_here_on_background">Začne zde, když na pozadí</string>
     <string name="start_here_on_popup">Začne zde v okně</string>
-<string name="donation_title">Donate</string>
+    <string name="donation_title">Donate</string>
     <string name="donation_encouragement">NewPipe je vyvíjen dobrovolníky, kteří tráví svůj čas, aby vaše zkušenost s aplikací byla co nejlepší. Vraťte vývojářům něco zpět, aby mohli NewPipe dále zlepšovat a zároveň si vychutnat šálek kávy.</string>
     <string name="give_back">Daruj</string>
     <string name="website_title">Webová stránka</string>
@@ -302,13 +261,11 @@ otevření ve vyskakovacím okně</string>
     <string name="switch_to_background">Na pozadí</string>
     <string name="switch_to_popup">Do okna</string>
     <string name="switch_to_main">Přepnout na hlavní</string>
-
     <string name="drawer_open">Otevřít Drawer</string>
     <string name="drawer_close">Zavřít Drawer</string>
     <string name="no_player_found_toast">Nenalezen přehrávač streamu (pro přehrání můžete nainstalovat např. VLC).</string>
     <string name="always">Vždy</string>
     <string name="just_once">Pouze jednou</string>
-
     <string name="import_data_title">Importovat databázi</string>
     <string name="export_data_title">Exportovat databázi</string>
     <string name="import_data_summary">Přepíše vaši dosavadní historii a odběry</string>
@@ -317,87 +274,67 @@ otevření ve vyskakovacím okně</string>
     <string name="invalid_url_toast">Neplatná URL</string>
     <string name="video_streams_empty">Nenalezeny žádné video streamy</string>
     <string name="audio_streams_empty">Nenalezeny žádné audio streamy</string>
-
     <string name="export_complete_toast">Exportováno</string>
     <string name="import_complete_toast">Importováno</string>
     <string name="no_valid_zip_file">Žádný platný soubor ZIP</string>
     <string name="could_not_import_all_files">Upozornění: Nelze importovat všechny soubory.</string>
     <string name="override_current_data">Tímto se anuluje vaše aktuální nastavení.</string>
-
     <string name="video_player">Video přehrávač</string>
     <string name="background_player">Přehrávač na pozadí</string>
     <string name="popup_player">Přehrávač v okně</string>
     <string name="always_ask_player">Vždy se ptát</string>
-    
     <string name="preferred_player_fetcher_notification_title">Získávám informace…</string>
     <string name="preferred_player_fetcher_notification_message">Načítání požadovaného obsahu</string>
-<string name="controls_download_desc">Stáhnout soubor streamu</string>
+    <string name="controls_download_desc">Stáhnout soubor streamu</string>
     <string name="show_info">Ukázat informace</string>
-
     <string name="tab_bookmarks">Uložené playlisty</string>
-
     <string name="controls_add_to_playlist_title">Přidat do</string>
-
     <string name="detail_drag_description">Táhnout pro přeskupení</string>
-
     <string name="create">Vytvořit</string>
     <string name="delete_one">Smazat jeden</string>
     <string name="delete_all">Smazat vše</string>
     <string name="dismiss">Zahodit</string>
     <string name="rename">Přejmenovat</string>
-
     <string name="delete_stream_history_prompt">Přejete si smazat tuto položku z historie shlédnutí?</string>
     <string name="delete_all_history_prompt">Jste si jisti, že chcete odstranit všechny položky z historie?</string>
     <string name="title_last_played">Poslední přehráno</string>
     <string name="title_most_played">Nejvíce přehráno</string>
-
     <string name="drawer_header_action_paceholder_text">Zde se brzy něco objeví ;D</string>
-
-
     <string name="always_ask_open_action">Vždy se zeptat</string>
-    
     <string name="create_playlist">Nový playlist</string>
     <string name="delete_playlist">Vymazat</string>
     <string name="rename_playlist">Přejmenovat</string>
     <string name="playlist_name_input">Jméno</string>
     <string name="append_playlist">Přidat do playlistu</string>
     <string name="set_as_playlist_thumbnail">Nastavit jako náhled playlistu</string>
-
     <string name="bookmark_playlist">Založit playlist</string>
     <string name="unbookmark_playlist">Smazat záložku</string>
-
     <string name="delete_playlist_prompt">Smazat tento playlist\?</string>
     <string name="playlist_creation_success">Playlist vytvořen</string>
     <string name="playlist_add_stream_success">V playlistu</string>
     <string name="playlist_thumbnail_change_success">Náhled playlistu změněn.</string>
     <string name="playlist_delete_failure">Playlist nelze smazat.</string>
-
-    <string name="caption_none">Žádné titulky</string>
-
+    <string name="caption_none">Bez titulků</string>
     <string name="resize_fit">Přizpůsobit</string>
     <string name="resize_fill">Vyplnit</string>
     <string name="resize_zoom">Zvětšit</string>
-
     <string name="caption_font_size_settings_title">Velikost písma nadpisu</string>
     <string name="smaller_caption_font_size">Menší písmo</string>
     <string name="normal_caption_font_size">Normální písmo</string>
     <string name="larger_caption_font_size">Větší písmo</string>
-
     <string name="toggle_leak_canary">Sledovat únik paměti</string>
     <string name="disable_leak_canary_notice">Sledování úniku paměti vypnuto</string>
-<string name="enable_leak_canary_notice">Sledování úniku paměti povoleno, aplikace může při zátěži přestat reagovat</string>
+    <string name="enable_leak_canary_notice">Sledování úniku paměti povoleno, aplikace může při zátěži přestat reagovat</string>
     <string name="settings_category_debug_title">Ladění</string>
     <string name="caption_auto_generated">"Automaticky generováno "</string>
     <string name="enable_leak_canary_title">Povolit službu LeakCanary</string>
     <string name="enable_leak_canary_summary">Monitoring úniku paměti může způsobit nereagování aplikace při heap dumpingu</string>
-
     <string name="enable_disposed_exceptions_title">Nahlásit mimo-cyklické chyby</string>
     <string name="enable_disposed_exceptions_summary">Vynutit vykazování výjimek Rx mimo fragment nebo životnost cyklu po odstranění</string>
-
-<string name="use_inexact_seek_title">Použít rychlé nepřesné hledání</string>
+    <string name="use_inexact_seek_title">Použít rychlé nepřesné hledání</string>
     <string name="use_inexact_seek_summary">Nepřesné hledání umožní přehrávači posouvat se rychleji, ale se sníženou přesností</string>
     <string name="download_thumbnail_title">Načítat náhledy</string>
-    <string name="download_thumbnail_summary">Po vypnutí se nestahují náhledy a tím se šetří data a využití paměti. Změna tohoto nastavení vyčistí mezipamět obrázků.</string>
+    <string name="download_thumbnail_summary">Vypnout, aby se zabránilo načítání náhledů a tím se ušetřily data a používání paměti. Změna tohoto nastavení vyčistí mezipamět obrázků v paměti i na disku.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Mezipaměť obrázků vymazána</string>
     <string name="metadata_cache_wipe_title">Vymazat metadata v mezipaměti</string>
     <string name="metadata_cache_wipe_summary">Odebrat všechna data uložená v mezipaměti</string>
@@ -405,13 +342,11 @@ otevření ve vyskakovacím okně</string>
     <string name="auto_queue_title">Automatická fronta dalšího streamu</string>
     <string name="auto_queue_summary">Automaticky připojí související stream při přehrávání posledního streamu v neopakující se frontě.</string>
     <string name="file">Soubor</string>
-
     <string name="invalid_directory">Neexistující složka</string>
     <string name="invalid_source">Neexistující zdroj souboru/obsahu</string>
     <string name="invalid_file">Soubor neexistuje nebo chybí oprávnění k jeho čtení či zápisu</string>
     <string name="file_name_empty_error">Název souboru nesmí být prázdný</string>
     <string name="error_occurred_detail">Došlo k chybě: %1$s</string>
-
     <string name="import_export_title">Import/export 
 \n</string>
     <string name="import_title">Importovat
@@ -419,16 +354,12 @@ otevření ve vyskakovacím okně</string>
     <string name="import_from">Importovat z
 \n</string>
     <string name="export_to">Exportovat do</string>
-
     <string name="import_ongoing">Importuji…</string>
     <string name="export_ongoing">Exportuji…</string>
-
     <string name="import_file_title">Import souboru</string>
     <string name="previous_export">Předchozí export</string>
-
     <string name="subscriptions_import_unsuccessful">Odběry nelze importovat</string>
     <string name="subscriptions_export_unsuccessful">Odběry nelze exportovat</string>
-
     <string name="import_youtube_instructions">Importovat YouTube odběry stáhnutím exportního souboru: 
 \n 
 \n1. Přejděte na tuto URL adresu: %1$s 
@@ -441,27 +372,21 @@ otevření ve vyskakovacím okně</string>
 \n3. Na vyžádání se přihlašte
 \n4. Zkopírujte URL adresu profilu, na kterou jste byli přesměrováni.</string>
     <string name="import_soundcloud_instructions_hint">vašeID, soundcloud.com/yourid</string>
-
     <string name="import_network_expensive_warning">Pamatujte, že tato operace může být náročná na data. 
 \n 
 \nChcete pokračovat?</string>
-
     <string name="playback_speed_control">Ovládání rychlosti přehrávání</string>
     <string name="playback_tempo">Rychlost</string>
     <string name="playback_pitch">Stupeň tónu</string>
     <string name="unhook_checkbox">Rozpojit (může způsobit zkreslení)</string>
     <string name="playback_nightcore">Nightcore mód</string>
     <string name="playback_default">Výchozí nastavení</string>
-<string name="no_streams_available_download">Ke stažení nejsou dostupné žádné streamy</string>
-
+    <string name="no_streams_available_download">Ke stažení nejsou dostupné žádné streamy</string>
     <string name="preferred_open_action_settings_title">Preferovaná \'otevřít\' akce</string>
     <string name="preferred_open_action_settings_summary">Výchozí chování při otevírání obsahu — %s</string>
-
     <string name="caption_setting_title">Titulky</string>
     <string name="caption_setting_description">Upravuje velikost textu titulků a styly pozadí. Změny se projeví po restartu aplikace.</string>
-
     <string name="toast_no_player">K přehrání tohoto souboru chybí vhodná aplikace</string>
-
     <string name="clear_views_history_title">Vymazat historii sledování</string>
     <string name="clear_views_history_summary">Vymaže historii přehrávaných streamů</string>
     <string name="delete_view_history_alert">Vymazat celkovou historii sledování\?</string>
@@ -471,7 +396,6 @@ otevření ve vyskakovacím okně</string>
     <string name="delete_search_history_alert">Vymazat celkovou historii vyhledávání\?</string>
     <string name="search_history_deleted">Historie vyhledávání smazána.</string>
     <string name="one_item_deleted">Jedna položka smazána.</string>
-
     <string name="app_license">NewPipe je copyleft libre software: Můžete jej používat, sdílet a vylepšovat dle vaší vůle. Redistribuovat a/nebo upravovat lze za podmínek GNU General Public Licence zveřejňované nadací Free Software Foundation, a to buď za podmínek licence verze 3 nebo (dle vaší volby) jakékoli pozdější verze.</string>
     <string name="channels">kanály</string>
     <string name="playlists">Playlisty</string>
@@ -482,16 +406,13 @@ otevření ve vyskakovacím okně</string>
 \nZásady ochrany soukromí NewPipe podrobně vysvětlují, jaké údaje jsou odesílány a ukládány, když odešlete zprávu o pádu aplikace.</string>
     <string name="read_privacy_policy">Přečíst zásady ochrany soukromí</string>
     <string name="import_settings">Chcete také přenést nastavení?</string>
-
     <string name="skip_silence_checkbox">Zrychleně vpřed během ticha</string>
     <string name="playback_step">Krok</string>
     <string name="playback_reset">Reset</string>
-
     <string name="start_accept_privacy_policy">Abychom vyhověli Obecnému nařízení o ochraně osobních údajů (GDPR), upozorňujeme vás na zásady ochrany soukromí v NewPipe. Přečtěte si je prosím pozorně.
 \nJe potřeba je odsouhlasit, abyste nám mohli odeslat hlášení chyb.</string>
     <string name="accept">Přijmout</string>
     <string name="decline">Odmítnout</string>
-
     <string name="limit_data_usage_none_description">Bez omezení</string>
     <string name="limit_mobile_data_usage_title">Omezit rozlišení při použití mobilních dat</string>
     <string name="minimize_on_exit_title">Minimalizovat při přepínání aplikací</string>
@@ -511,4 +432,13 @@ otevření ve vyskakovacím okně</string>
     <string name="app_update_notification_channel_name">Notifikace aktualizace aplikace</string>
     <string name="app_update_notification_channel_description">Notifikace pro novou verzi NewPipe</string>
     <string name="download_to_sdcard_error_title">Externí úložiště není k dispozici</string>
+    <string name="saved_tabs_invalid_json">Chyba při načítání uložených karet, použijí se výchozí karty</string>
+    <string name="restore_defaults">Obnovit do výchozího nastavení</string>
+    <string name="restore_defaults_confirmation">Chcete obnovit výchozí nastavení\?</string>
+    <string name="subscribers_count_not_available">Počet odběratelů není k dispozici</string>
+    <string name="main_page_content_summary">Karty, které jsou zobrazeny na hlavní stránce</string>
+    <string name="selection">Výběr</string>
+    <string name="updates_setting_title">Aktualizace</string>
+    <string name="events">Události</string>
+    <string name="conferences">Konference</string>
 </resources>
\ No newline at end of file

From 9395df4cc36463fb8f46946fc70d1987c987ab8d Mon Sep 17 00:00:00 2001
From: Cipisek Rumcajsu <berantomas@gmail.com>
Date: Wed, 29 May 2019 10:08:28 +0000
Subject: [PATCH 110/138] Translated using Weblate (Czech)

Currently translated at 90.3% (400 of 443 strings)
---
 app/src/main/res/values-cs/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1a82d2f0d..a80fef606 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -307,7 +307,7 @@ otevření ve vyskakovacím okně</string>
     <string name="playlist_name_input">Jméno</string>
     <string name="append_playlist">Přidat do playlistu</string>
     <string name="set_as_playlist_thumbnail">Nastavit jako náhled playlistu</string>
-    <string name="bookmark_playlist">Založit playlist</string>
+    <string name="bookmark_playlist">Přidat playlist do záložek</string>
     <string name="unbookmark_playlist">Smazat záložku</string>
     <string name="delete_playlist_prompt">Smazat tento playlist\?</string>
     <string name="playlist_creation_success">Playlist vytvořen</string>
@@ -377,7 +377,7 @@ otevření ve vyskakovacím okně</string>
 \nChcete pokračovat?</string>
     <string name="playback_speed_control">Ovládání rychlosti přehrávání</string>
     <string name="playback_tempo">Rychlost</string>
-    <string name="playback_pitch">Stupeň tónu</string>
+    <string name="playback_pitch">Výška tónu</string>
     <string name="unhook_checkbox">Rozpojit (může způsobit zkreslení)</string>
     <string name="playback_nightcore">Nightcore mód</string>
     <string name="playback_default">Výchozí nastavení</string>

From 359a9a96d6e927a008a92a5f69ca728fe3d42560 Mon Sep 17 00:00:00 2001
From: Karel S <karelsladek@centrum.cz>
Date: Thu, 30 May 2019 06:32:35 +0000
Subject: [PATCH 111/138] Translated using Weblate (Czech)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-cs/strings.xml | 42 ++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a80fef606..ce2943fc4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -441,4 +441,46 @@ otevření ve vyskakovacím okně</string>
     <string name="updates_setting_title">Aktualizace</string>
     <string name="events">Události</string>
     <string name="conferences">Konference</string>
+    <string name="updates_setting_description">Zobrazit oznámení s výzvou k aktualizaci aplikace, když je k dispozici nová verze</string>
+    <string name="list_view_mode">Režim zobrazení seznamu</string>
+    <string name="list">Seznam</string>
+    <string name="grid">Mřížka</string>
+    <string name="auto">Automaticky</string>
+    <string name="switch_view">Přepnout zobrazení</string>
+    <string name="app_update_notification_content_title">K dispozici je aktualizace aplikace NewPipe!</string>
+    <string name="app_update_notification_content_text">Klepněte pro stažení</string>
+    <string name="missions_header_finished">Hotovo</string>
+    <string name="missions_header_pending">Ve frontě</string>
+    <string name="paused">Pozastaveno</string>
+    <string name="queued">ve frontě</string>
+    <string name="post_processing">post-processing</string>
+    <string name="enqueue">Fronta</string>
+    <string name="permission_denied">Akce odmítnuta systémem</string>
+    <string name="download_failed">Stahování se nezdařilo</string>
+    <string name="download_finished">Stahování dokončeno</string>
+    <string name="download_finished_more">% s stahování dokončeno</string>
+    <string name="generate_unique_name">Vytvořit jedinečný název</string>
+    <string name="overwrite">Přepsat</string>
+    <string name="overwrite_warning">Stažený soubor s tímto názvem již existuje</string>
+    <string name="download_already_running">Stahování s tímto názvem již probíhá</string>
+    <string name="show_error">Zobrazit chybu</string>
+    <string name="label_code">Kód</string>
+    <string name="error_path_creation">Soubor nelze vytvořit</string>
+    <string name="error_file_creation">Cílovou složku nelze vytvořit</string>
+    <string name="error_permission_denied">Oprávnění odepřeno systémem</string>
+    <string name="error_ssl_exception">Zabezpečené připojení selhalo</string>
+    <string name="error_unknown_host">Server se nepodařilo najít</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>
+    <string name="pause_downloads_on_mobile">Pozastavit při přepnutí na mobilní data</string>
+    <string name="pause_downloads_on_mobile_desc">Stahování, která nelze pozastavit, budou restartována</string>
 </resources>
\ No newline at end of file

From e1ead9d2efb7c974c3cca9618ca4df830f6d87f6 Mon Sep 17 00:00:00 2001
From: mohammadmdp <mohammadmdp@gmail.com>
Date: Fri, 31 May 2019 00:20:13 +0000
Subject: [PATCH 112/138] Translated using Weblate (Persian)

Currently translated at 58.9% (261 of 443 strings)
---
 app/src/main/res/values-fa/strings.xml | 69 +++++++-------------------
 1 file changed, 18 insertions(+), 51 deletions(-)

diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 83a076f09..f97a85463 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -17,15 +17,12 @@
     <string name="screen_rotation">چرخش</string>
     <string name="use_external_video_player_title">استفاده از پخش‌کنندهٔ ویدیوی خارجی</string>
     <string name="use_external_audio_player_title">استفاده از پخش‌کنندهٔ صدای خارجی</string>
-
     <string name="download_path_title">مسیر بارگیری ویدیو</string>
     <string name="download_path_summary">مسیر ذخیرهٔ ویدیوهای بارگیری شده</string>
     <string name="download_path_dialog_title">مسیر بارگیری را برای ویدیوها وارد کنید</string>
-
     <string name="download_path_audio_title">پوشه بارگیری صدا</string>
     <string name="download_path_audio_summary">صدای بارگیری شده در این‌جا نگه داشته می‌شود</string>
     <string name="download_path_audio_dialog_title">مسیر بارگیری را برای صداها وارد کنید</string>
-
     <string name="autoplay_by_calling_app_title">پخش خودکار</string>
     <string name="autoplay_by_calling_app_summary">هنگامی که نیوپایپ از کارهٔ دیگری فراخوانی می‌شود، ویدیوی به طور خودکار پخش شود</string>
     <string name="default_resolution_title">وضوح پیش‌گزیده</string>
@@ -40,7 +37,6 @@
     <string name="theme_title">زمینه</string>
     <string name="dark_theme_title">تیره</string>
     <string name="light_theme_title">روشن</string>
-
     <string name="download_dialog_title">بارگیری</string>
     <string name="next_video_title">بعدی</string>
     <string name="show_next_and_similar_title">نماش ویدیوهای «بعدی» و «مشابه»</string>
@@ -58,7 +54,6 @@
     <string name="downloads">بارگیری‌ها</string>
     <string name="downloads_title">بارگیری‌ها</string>
     <string name="error_report_title">گزارش خطا</string>
-
     <string name="general_error">خطا</string>
     <string name="network_error">خطای شبکه</string>
     <string name="could_not_load_thumbnails">نمی‌توان تمام بندانگشتی‌ها را بار کرد</string>
@@ -78,8 +73,6 @@
     <string name="what_happened_headline">چه روی داد:</string>
     <string name="your_comment">توضیح شما (به انگلیسی):</string>
     <string name="error_details_headline">جزییات:</string>
-
-
     <string name="list_thumbnail_view_description">بندانگشتی پیش‌نمایش ویدیو</string>
     <string name="detail_thumbnail_view_description">بندانگشتی پیش‌نمایش ویدیو</string>
     <string name="detail_uploader_thumbnail_view_description">بندانگشتی کاربر بارگذار</string>
@@ -89,24 +82,19 @@
     <string name="use_tor_summary">(آزمایشی) اجبار ترافیک بارگیری از مسیر تور برای محرمانگی بیش‌تر (هنوز پخش جریانی پشتیبانی نمی‌شود).</string>
     <string name="report_error">گزارش یک خطا</string>
     <string name="user_report">گزارش کاربر</string>
-
     <string name="err_dir_create">نمی‌توان شاخهٔ بارگیری «%1$s» را ایجاد کرد</string>
     <string name="info_dir_created">شاخهٔ بارگیری «%1$s» ایجاد شد</string>
-
     <string name="video">ویدیو</string>
     <string name="audio">صدا</string>
     <string name="retry">تلاش دوباره</string>
     <string name="storage_permission_denied">اجازهٔ دسترسی به انبار ذخیره رد شد</string>
-
     <string name="start">شروع</string>
     <string name="pause">مکث</string>
     <string name="view">نمایش</string>
     <string name="delete">حذف</string>
     <string name="checksum">مجموع مقابله‌ای</string>
-
     <string name="add">مآموریت جدید</string>
     <string name="finish">قبول</string>
-
     <string name="msg_name">نام پرونده</string>
     <string name="msg_threads">رشته‌ها</string>
     <string name="msg_error">خطا</string>
@@ -118,8 +106,7 @@
     <string name="msg_wait">لطفاً صبر کنید…</string>
     <string name="msg_copied">در حافظه رونوشت شد.</string>
     <string name="no_available_dir">لطفاً یک شاخهٔ بارگیری موجود را برگزینید.</string>
-
-<string name="no_player_found_toast">هیچ پخش کننده جریانی پیدا نشد (شما می‌توانید برنامه وی‌ال‌سی را برای پخش آن نصب کنید).</string>
+    <string name="no_player_found_toast">هیچ پخش کننده جریانی پیدا نشد (شما می‌توانید برنامه وی‌ال‌سی را برای پخش آن نصب کنید).</string>
     <string name="controls_download_desc">بارگیری پرونده جریان</string>
     <string name="use_external_video_player_summary">حذف صدا در برخی کیفیت‌ها</string>
     <string name="subscribe_button_title">اشتراک</string>
@@ -128,16 +115,12 @@
     <string name="subscription_change_failed">ناتوانی در تغییر وضعیت اشتراک</string>
     <string name="subscription_update_failed">ناتوانی در به‌روزرسانی اشتراک</string>
     <string name="show_info">نمایش اطلاعات</string>
-
     <string name="tab_main">اصلی</string>
     <string name="tab_subscriptions">اشتراک‌ها</string>
     <string name="tab_bookmarks">فهرست‌های پخش دارای نشانک</string>
-
     <string name="fragment_whats_new">موارد جدید</string>
-
     <string name="controls_background_title">پس زمینه</string>
     <string name="controls_add_to_playlist_title">افزودن به</string>
-
     <string name="show_higher_resolutions_title">نمایش کیفیت بالاتر</string>
     <string name="show_higher_resolutions_summary">تنها برخی دستگاه‌ها توانایی پخش ویدئوهای 2K و 4K را دارند</string>
     <string name="default_video_format_title">قالب ویدئوی پیش‌فرض</string>
@@ -168,10 +151,8 @@
     <string name="always">همیشه</string>
     <string name="just_once">فقط یک‌بار</string>
     <string name="file">پرونده</string>
-
     <string name="notification_channel_name">اعلان نیوپایپ</string>
     <string name="unknown_content">[ناشناخته]</string>
-
     <string name="import_data_title">وارد کردن پایگاه‌داده</string>
     <string name="export_data_title">"صادرکردن "</string>
     <string name="import_data_summary">تاریخچه و اشتراک‌های شما بازنویسی خواهند شد</string>
@@ -181,17 +162,13 @@
     <string name="import_title">وارد کردن</string>
     <string name="import_from">وارد کردن از</string>
     <string name="export_to">صادر کردن به</string>
-
     <string name="import_ongoing">در حال وارد کردن…</string>
     <string name="export_ongoing">در حال صدور…</string>
-
     <string name="subscriptions_import_unsuccessful">ناتوانی در ورود اشتراک‌ها</string>
     <string name="subscriptions_export_unsuccessful">ناتوانی در صدور اشتراک‌ها</string>
-
     <string name="playback_speed_control">کنترل‌های سرعت پخش</string>
     <string name="accept">قبول</string>
     <string name="decline">رد</string>
-
     <string name="limit_data_usage_none_description">بدون محدودیت</string>
     <string name="minimize_on_exit_none_description">هیچ</string>
     <string name="best_resolution">بهترین وضوح</string>
@@ -211,47 +188,37 @@
     <string name="file_name_empty_error">نام پرونده نمی‌تواند خالی باشد</string>
     <string name="error_occurred_detail">خطایی رخ داد: %1$s</string>
     <string name="no_streams_available_download">جریانی برای بارگیری در دسترس نیست</string>
-
     <string name="search_no_results">بدون نتیجه</string>
     <string name="use_old_player_title">استفاده از پخش‌کننده قدیمی</string>
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-
     <plurals name="subscribers">
-	<item quantity="one">%s مشترک</item>
-	<item quantity="other">%s مشترک</item>
-</plurals>
-
+        <item quantity="one">%s مشترک</item>
+        <item quantity="other">%s مشترک</item>
+    </plurals>
     <string name="no_views">بدون بازدید</string>
     <plurals name="views">
-	<item quantity="one">%s بازدید</item>
-	<item quantity="other">%s بازدید</item>
-</plurals>
-
+        <item quantity="one">%s بازدید</item>
+        <item quantity="other">%s بازدید</item>
+    </plurals>
     <string name="no_videos">بدون ویدئو</string>
     <plurals name="videos">
-    <item quantity="one">ویدئو</item>
-    <item quantity="other">ویدئو</item>
-</plurals>
-
+        <item quantity="one">ویدئو</item>
+        <item quantity="other">ویدئو</item>
+    </plurals>
     <string name="create">ایجاد</string>
     <string name="delete_one">پاک کردن یک مورد</string>
     <string name="delete_all">پاک‌کردن همه</string>
     <string name="dismiss">صرف نظر</string>
     <string name="rename">تغییر نام</string>
-
     <string name="one_item_deleted">یک مورد پاک شد.</string>
-
     <string name="settings_file_charset_title">نویسه‌های مجاز در نام پرونده‌ها</string>
     <string name="settings_file_replacement_character_summary">نویسه‌های نامعتبر با این مقدار جایگزین شدند</string>
     <string name="settings_file_replacement_character_title">نویسه جایگزین</string>
-
     <string name="charset_letters_and_digits">حروف و اعداد</string>
     <string name="charset_most_special_characters">مهم‌ترین نویسه‌های خاص</string>
-
     <string name="toast_no_player">کاره‌ای برای پخش این پرونده نصب نشده است</string>
-
     <string name="title_activity_about">درباره نیوپایپ</string>
     <string name="action_settings">تنظیمات</string>
     <string name="action_about">درباره</string>
@@ -269,8 +236,6 @@
     <string name="read_privacy_policy">خواندن سیاست حریم خصوصی</string>
     <string name="app_license_title">پروانه نیوپایپ</string>
     <string name="read_full_license">خواندن پروانه</string>
-
-
     <string name="title_activity_history">تاریخچه</string>
     <string name="title_history_search">جستجو شده</string>
     <string name="title_history_view">دیده‌شده</string>
@@ -284,7 +249,6 @@
     <string name="delete_all_history_prompt">می‌خواهید همه موارد را از تاریخچه پاک کنید؟</string>
     <string name="title_last_played">آخرین پخش‌شده</string>
     <string name="title_most_played">بیشترین پخش‌شده</string>
-
     <string name="main_page_content">محتوای صفحه اصلی</string>
     <string name="blank_page_summary">صفحه خالی</string>
     <string name="kiosk_page_summary">صفحه کیوسک</string>
@@ -305,25 +269,20 @@
     <string name="video_player">پخش‌کننده ویدئو</string>
     <string name="background_player">پخش‌کننده پس‌زمینه</string>
     <string name="always_ask_open_action">همیشه بپرس</string>
-
     <string name="preferred_player_fetcher_notification_title">در حال دریافت اطلاعات…</string>
     <string name="preferred_player_fetcher_notification_message">بارگذری محتوای درخواستی</string>
-
     <string name="create_playlist">فهرست پخش جدید</string>
     <string name="delete_playlist">پاک‌کردن</string>
     <string name="rename_playlist">تغییر نام</string>
     <string name="playlist_name_input">نام</string>
     <string name="append_playlist">افزودن به فهرست پخش</string>
     <string name="set_as_playlist_thumbnail">استفاده به عنوان تصویر فهرست پخش</string>
-
     <string name="delete_playlist_prompt">این فهرست پخش پاک شود؟</string>
     <string name="playlist_creation_success">فهرست پخش ایجاد شد</string>
     <string name="playlist_add_stream_success">به فهرست پخش افزوده شد</string>
     <string name="playlist_thumbnail_change_success">تصویر فهرست پخش تغییر کرد.</string>
     <string name="playlist_delete_failure">ناتوانی در پاک‌کردن فهرست پخش.</string>
-
     <string name="caption_none">بدون توضیحات</string>
-
     <string name="caption_setting_title">توضحیات</string>
     <string name="unsubscribe">لغو اشتراک</string>
     <string name="tab_new">زبان جدید</string>
@@ -332,4 +291,12 @@
     <string name="settings_category_history_title">تاریخچه و حافظه نهان</string>
     <string name="settings_category_debug_title">اشکال‌زدایی</string>
     <string name="settings_category_updates_title">به‌روزرسانی‌ها</string>
+    <string name="open_in_popup_mode">در پنجره جداگانه باز شود</string>
+    <string name="popup_mode_share_menu_title">حالت پنجره مجزا</string>
+    <string name="default_popup_resolution_title">اندازه پیش فرض پنجره جداگانه</string>
+    <string name="controls_popup_title">پنجره جداگانه</string>
+    <string name="popup_remember_size_pos_title">به یاد داشتن اندازه و موقعیت پنجره جداگانه</string>
+    <string name="popup_remember_size_pos_summary">به یاد داشتن آخرین اندازه و موقعیت قبلی پنجره جداگانه</string>
+    <string name="use_inexact_seek_title">زمان فعلی پخش کننده را به صورت تقریبی و سریع جلو ببر</string>
+    <string name="use_inexact_seek_summary">این گزینه باعث می شود هنگام جلو/عقب کردن زمان تصویر، به جای زمان دقیق انتخاب شده، به زمان غیر دقیق و نزدیک به مکان انتخاب شده برود که این کار سریع تر انجام می شود</string>
 </resources>
\ No newline at end of file

From 1a9922d790d98ce01781baf1af3b0c17ed10a086 Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Sat, 1 Jun 2019 10:16:39 +0000
Subject: [PATCH 113/138] Translated using Weblate (German)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4578040d5..52cca4a3d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -351,7 +351,7 @@
     <string name="playback_default">Standard</string>
     <string name="download_thumbnail_summary">Abschalten, um das Laden von Miniaturansichten zu verhindern, was Daten- und Speicherverbrauch spart. Änderungen löschen den Bildzwischenspeicher sowohl im Arbeitsspeicher als auch auf dem internen Speicher.</string>
     <string name="auto_queue_title">Nächsten Stream automatisch einreihen</string>
-    <string name="auto_queue_summary">Automatisches Anhängen eines verwandten Streams beim Abspielen des letzten Streams in einer nicht wiederholten Warteschlange.</string>
+    <string name="auto_queue_summary">Automatisches Anhängen eines verwandten Streams beim Abspielen des letzten Streams in einer nicht wiederholten Warteschlange</string>
     <string name="drawer_header_action_paceholder_text">Hier wird bald etwas stehen ;D</string>
     <string name="bookmark_playlist">Wiedergabeliste mit Lesezeichen versehen</string>
     <string name="resize_fit">Anpassen</string>

From f766f383ea30bb17825de670a08564197a6b44fe Mon Sep 17 00:00:00 2001
From: yunna <yunna.in@gmail.com>
Date: Sat, 1 Jun 2019 09:18:13 +0000
Subject: [PATCH 114/138] Translated using Weblate (English)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values/strings.xml | 83 +++--------------------------
 1 file changed, 6 insertions(+), 77 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2d12f6ad6..b59a6079a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,27 +32,21 @@
     <string name="subscription_change_failed">Could not change subscription</string>
     <string name="subscription_update_failed">Could not update subscription</string>
     <string name="show_info">Show info</string>
-
     <string name="tab_main">Main</string>
     <string name="tab_subscriptions">Subscriptions</string>
     <string name="tab_bookmarks">Bookmarked Playlists</string>
     <string name="tab_new">New Tab</string>
     <string name="tab_choose">Choose Tab</string>
-
     <string name="fragment_whats_new">What\'s New</string>
-
     <string name="controls_background_title">Background</string>
     <string name="controls_popup_title">Popup</string>
     <string name="controls_add_to_playlist_title">Add To</string>
-
     <string name="download_path_title">Video download path</string>
     <string name="download_path_summary">Path to store downloaded videos in</string>
     <string name="download_path_dialog_title">Enter download path for videos</string>
-
     <string name="download_path_audio_title">Audio download folder</string>
     <string name="download_path_audio_summary">Downloaded audio is stored here</string>
     <string name="download_path_audio_dialog_title">Enter download path for audio files</string>
-
     <string name="autoplay_by_calling_app_title">Autoplay</string>
     <string name="autoplay_by_calling_app_summary">Plays a video when NewPipe is called from another app</string>
     <string name="default_resolution_title">Default resolution</string>
@@ -82,7 +76,7 @@
     <string name="metadata_cache_wipe_summary">Remove all cached webpage data</string>
     <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">Auto-append a related stream when playing the last stream in a non-repeating queue.</string>
+    <string name="auto_queue_summary">Auto-append a related stream when playing the last stream in a non-repeating queue</string>
     <string name="volume_gesture_control_title">Volume gesture control</string>
     <string name="volume_gesture_control_summary">Use gestures to control the volume of the player</string>
     <string name="brightness_gesture_control_title">Brightness gesture control</string>
@@ -152,22 +146,17 @@
     <string name="always">Always</string>
     <string name="just_once">Just Once</string>
     <string name="file">File</string>
-
     <string name="notification_channel_id" translatable="false">newpipe</string>
     <string name="notification_channel_name">NewPipe Notification</string>
     <string name="notification_channel_description">Notifications for NewPipe background and popup players</string>
-
     <string name="app_update_notification_channel_id" translatable="false">newpipeAppUpdate</string>
     <string name="app_update_notification_channel_name">App Update Notification</string>
     <string name="app_update_notification_channel_description">Notifications for new NewPipe version</string>
-
     <string name="unknown_content">[Unknown]</string>
-
     <string name="toggle_orientation">Toggle Orientation</string>
     <string name="switch_to_background">Switch to Background</string>
     <string name="switch_to_popup">Switch to Popup</string>
     <string name="switch_to_main">Switch to Main</string>
-
     <string name="import_data_title">Import database</string>
     <string name="export_data_title">Export database</string>
     <string name="import_data_summary">Overrides your current history and subscriptions</string>
@@ -212,7 +201,6 @@
     <string name="saved_tabs_invalid_json">Using default tabs, error while reading saved tabs</string>
     <string name="restore_defaults">Restore defaults</string>
     <string name="restore_defaults_confirmation">Do you want to restore the defaults?</string>
-
     <!-- error activity -->
     <string name="sorry_string">Sorry, that should not have happened.</string>
     <string name="guru_meditation" translatable="false">Guru Meditation.</string>
@@ -224,8 +212,6 @@
     <string name="info_labels">What:\\nRequest:\\nContent Lang:\\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) -->
     <string name="list_thumbnail_view_description">Video preview thumbnail</string>
     <string name="detail_thumbnail_view_description">Video preview thumbnail</string>
@@ -240,19 +226,15 @@
     <string name="empty_view_no_videos" translatable="false">@string/no_videos</string>
     <string name="empty_subscription_feed_subtitle">Nothing here but crickets</string>
     <string name="detail_drag_description">Drag to reorder</string>
-
     <string name="err_dir_create">Cannot create download directory \'%1$s\'</string>
     <string name="info_dir_created">Created download directory \'%1$s\'</string>
-
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Retry</string>
     <string name="storage_permission_denied">Storage access permission denied</string>
-
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-
     <!--Zero don't get selected (in some languages) as it is not a "special case" for android-->
     <string name="no_subscribers">No subscribers</string>
     <plurals name="subscribers">
@@ -260,19 +242,16 @@
         <item quantity="other">%s subscribers</item>
     </plurals>
     <string name="subscribers_count_not_available">Subscribers count not available</string>
-
     <string name="no_views">No views</string>
     <plurals name="views">
         <item quantity="one">%s view</item>
         <item quantity="other">%s views</item>
     </plurals>
-
     <string name="no_videos">No videos</string>
     <plurals name="videos">
-    <item quantity="one">Video</item>
-    <item quantity="other">Videos</item>
-</plurals>
-
+        <item quantity="one">Video</item>
+        <item quantity="other">Videos</item>
+    </plurals>
     <!-- Missions -->
     <string name="start">Start</string>
     <string name="pause">Pause</string>
@@ -284,11 +263,9 @@
     <string name="checksum">Checksum</string>
     <string name="dismiss">Dismiss</string>
     <string name="rename">Rename</string>
-
     <!-- Fragment -->
     <string name="add">New mission</string>
     <string name="finish">OK</string>
-
     <!-- Msg -->
     <string name="msg_name">Filename</string>
     <string name="msg_threads">Threads</string>
@@ -303,29 +280,23 @@
     <string name="no_available_dir">Please select an available download folder</string>
     <string name="msg_popup_permission">This permission is needed to\nopen in popup mode</string>
     <string name="one_item_deleted">1 item deleted.</string>
-
     <!-- Checksum types -->
     <string name="md5" translatable="false">MD5</string>
     <string name="sha1" translatable="false">SHA-1</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">reCAPTCHA challenge</string>
     <string name="recaptcha_request_toast">reCAPTCHA challenge requested</string>
-
     <!-- End of GigaGet's Strings -->
-
     <!-- Downloads -->
     <string name="settings_category_downloads_title">Download</string>
     <string name="settings_file_charset_title">Allowed characters in filenames</string>
     <string name="settings_file_replacement_character_summary">Invalid characters are replaced with this value</string>
     <string name="settings_file_replacement_character_title">Replacement character</string>
-
     <string name="charset_letters_and_digits_value" translatable="false">[^\\w\\d]+</string>
     <string name="charset_most_special_characters_value" translatable="false">[\\n\\r|\\?*&lt;":&gt;/']+</string>
     <string name="charset_letters_and_digits">Letters and digits</string>
     <string name="charset_most_special_characters">Most special characters</string>
-
     <string name="toast_no_player">No app installed to play this file</string>
-
     <!-- About -->
     <string name="title_activity_about">About NewPipe</string>
     <string name="action_settings">Settings</string>
@@ -356,8 +327,6 @@
     <string name="app_license_title">NewPipe\'s License</string>
     <string name="app_license">NewPipe is copyleft libre software: You can use, study share and improve it at will. Specifically you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
     <string name="read_full_license">Read license</string>
-
-
     <!-- History -->
     <string name="title_activity_history">History</string>
     <string name="title_history_search">Searched</string>
@@ -372,7 +341,6 @@
     <string name="delete_all_history_prompt">Are you sure you want to delete all items from history?</string>
     <string name="title_last_played">Last Played</string>
     <string name="title_most_played">Most Played</string>
-
     <!-- Content -->
     <string name="main_page_content">Content of main page</string>
     <string name="main_page_content_summary">What tabs are shown on the main page</string>
@@ -391,7 +359,6 @@
     <string name="could_not_import_all_files">Warning: Could not import all files.</string>
     <string name="override_current_data">This will override your current setup.</string>
     <string name="import_settings">Do you want to also import settings?</string>
-
     <!-- Kiosk Names -->
     <string name="kiosk">Kiosk</string>
     <string name="trending">Trending</string>
@@ -399,7 +366,6 @@
     <string name="new_and_hot">New &amp; hot</string>
     <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>
@@ -412,28 +378,22 @@
     <string name="start_here_on_main">Start playing here</string>
     <string name="start_here_on_background">Start here when backgrounded</string>
     <string name="start_here_on_popup">Start here on new popup</string>
-
     <!-- Drawer -->
     <string name="drawer_open">Open Drawer</string>
     <string name="drawer_close">Close Drawer</string>
     <string name="youtube" translatable="false">YouTube</string>
     <string name="soundcloud" translatable="false">SoundCloud</string>
     <string name="drawer_header_action_paceholder_text">Something will appear here soon ;D</string>
-
-
     <!-- Preferred player -->
     <string name="preferred_open_action_share_menu_title" translatable="false">NewPipe</string>
     <string name="preferred_open_action_settings_title">Preferred \'open\' action</string>
     <string name="preferred_open_action_settings_summary">Default action when opening content — %s</string>
-
     <string name="video_player">Video player</string>
     <string name="background_player">Background player</string>
     <string name="popup_player">Popup player</string>
     <string name="always_ask_open_action">Always ask</string>
-
     <string name="preferred_player_fetcher_notification_title">Getting info…</string>
     <string name="preferred_player_fetcher_notification_message">"Loading requested content"</string>
-
     <!-- Local Playlist -->
     <string name="create_playlist">New Playlist</string>
     <string name="delete_playlist">Delete</string>
@@ -441,57 +401,42 @@
     <string name="playlist_name_input">Name</string>
     <string name="append_playlist">Add To Playlist</string>
     <string name="set_as_playlist_thumbnail">Set as Playlist Thumbnail</string>
-
     <string name="bookmark_playlist">Bookmark Playlist</string>
     <string name="unbookmark_playlist">Remove Bookmark</string>
-
     <string name="delete_playlist_prompt">Delete this playlist\?</string>
     <string name="playlist_creation_success">Playlist created</string>
     <string name="playlist_add_stream_success">Playlisted</string>
     <string name="playlist_thumbnail_change_success">Playlist thumbnail changed.</string>
     <string name="playlist_delete_failure">Could not delete playlist.</string>
-
     <!-- Players -->
     <string name="caption_none">No Captions</string>
-
     <string name="resize_fit">Fit</string>
     <string name="resize_fill">Fill</string>
     <string name="resize_zoom">Zoom</string>
-
     <string name="caption_auto_generated">Auto-generated</string>
-
     <!-- Caption Settings -->
     <string name="caption_setting_title">Captions</string>
     <string name="caption_setting_description">Modify player caption text scale and background styles. Requires app restart to take effect.</string>
-
     <!-- Debug Settings -->
     <string name="enable_leak_canary_title">Enable LeakCanary</string>
     <string name="enable_leak_canary_summary">Memory leak monitoring may cause the app to become unresponsive when heap dumping</string>
-
     <string name="enable_disposed_exceptions_title">Report out-of-lifecycle errors</string>
     <string name="enable_disposed_exceptions_summary">Force reporting of undeliverable Rx exceptions outside of fragment or activity lifecycle after disposal</string>
-
     <!-- Subscriptions import/export -->
     <string name="import_export_title">Import/export</string>
     <string name="import_title">Import</string>
     <string name="import_from">Import from</string>
     <string name="export_to">Export to</string>
-
     <string name="import_ongoing">Importing…</string>
     <string name="export_ongoing">Exporting…</string>
-
     <string name="import_file_title">Import file</string>
     <string name="previous_export">Previous export</string>
-
     <string name="subscriptions_import_unsuccessful">Could not import subscriptions</string>
     <string name="subscriptions_export_unsuccessful">Could not export subscriptions</string>
-
     <string name="import_youtube_instructions">Import YouTube subscriptions by downloading the export file:\n\n1. Go to this URL: %1$s\n2. Log in when asked\n3. A download should start (that\'s the export file) </string>
     <string name="import_soundcloud_instructions">Import a SoundCloud profile by typing either the URL or your ID:\n\n1. Enable \"desktop mode\" in a web-browser (the site is not available for mobile devices)\n2. Go to this URL: %1$s\n3. Log in when asked\n4. Copy the profile URL you were redirected to.</string>
     <string name="import_soundcloud_instructions_hint">yourID, soundcloud.com/yourid</string>
-
     <string name="import_network_expensive_warning">Keep in mind this operation can be network expensive.\n\nDo you want to continue?</string>
-
     <!-- Playback Parameters -->
     <string name="playback_speed_control">Playback Speed Controls</string>
     <string name="playback_tempo">Tempo</string>
@@ -500,12 +445,10 @@
     <string name="skip_silence_checkbox">Fast-forward during silence</string>
     <string name="playback_step">Step</string>
     <string name="playback_reset">Reset</string>
-
     <!-- GDPR dialog -->
     <string name="start_accept_privacy_policy">In order to comply with the European General Data Protection Regulation (GDPR), we herby draw your attention to NewPipe\'s privacy policy. Please read it carefully.\nYou must accept it to send us the bug report.</string>
     <string name="accept">Accept</string>
     <string name="decline">Decline</string>
-
     <!-- Limit mobile data usage  -->
     <string name="limit_data_usage_none_description">No limit</string>
     <string name="limit_mobile_data_usage_title">Limit resolution when using mobile data</string>
@@ -521,51 +464,39 @@
         <item>240p</item>
         <item>144p</item>
     </string-array>
-
     <!-- Updates Settings -->
     <string name="updates_setting_title">Updates</string>
     <string name="updates_setting_description">Show a notification to prompt app update when a new version is available</string>
-
     <!-- Minimize to exit action -->
     <string name="minimize_on_exit_title">Minimize on app switch</string>
     <string name="minimize_on_exit_summary">Action when switching to other app from main video player — %s</string>
     <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>
-	  <string name="list_view_mode">List view mode</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="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_text">Tap to download</string>
-
-
-
     <string name="missions_header_finished">Finished</string>
     <string name="missions_header_pending">In queue</string>
-
     <string name="paused">paused</string>
     <string name="queued">queued</string>
     <string name="post_processing">post-processing</string>
-
     <string name="enqueue">Queue</string>
-
     <string name="permission_denied">Action denied by the system</string>
-
     <!-- download notifications -->
     <string name="download_failed">Download failed</string>
     <string name="download_finished">Download finished</string>
     <string name="download_finished_more">%s downloads finished</string>
-
     <!-- dialog about existing downloads -->
     <string name="generate_unique_name">Generate unique name</string>
     <string name="overwrite">Overwrite</string>
     <string name="overwrite_warning">A downloaded file with this name already exists</string>
     <string name="download_already_running">There is a download in progress with this name</string>
-
     <!-- message dialog about download error -->
     <string name="show_error">Show error</string>
     <string name="label_code">Code</string>
@@ -580,7 +511,6 @@
     <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="clear_finished_download">Clear finished downloads</string>
     <string name="msg_pending_downloads">Continue your %s pending transfers from Downloads</string>
     <string name="stop">Stop</string>
@@ -588,5 +518,4 @@
     <string name="max_retry_desc">Maximum number of attempts before canceling the download</string>
     <string name="pause_downloads_on_mobile">Pause on switching to mobile data</string>
     <string name="pause_downloads_on_mobile_desc">Downloads that can not be paused will be restarted</string>
-
 </resources>
\ No newline at end of file

From bd42f4188f2792845ca8d7942f01aada11caa017 Mon Sep 17 00:00:00 2001
From: yunna <yunna.in@gmail.com>
Date: Sat, 1 Jun 2019 09:16:39 +0000
Subject: [PATCH 115/138] Translated using Weblate (Japanese)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-ja/strings.xml | 62 +++++++++++++-------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e1e76475e..d4a02c8e6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -3,7 +3,7 @@
     <string name="upload_date_text">%1$s に公開</string>
     <string name="no_player_found">動画プレイヤーが見つかりません｡VLC を入手しますか？</string>
     <string name="install">入手</string>
-    <string name="cancel">取り消し</string>
+    <string name="cancel">キャンセル</string>
     <string name="open_in_browser">ブラウザで開く</string>
     <string name="share">共有</string>
     <string name="download">保存</string>
@@ -47,7 +47,7 @@
     <string name="settings_category_appearance_title">外観</string>
     <string name="settings_category_other_title">その他</string>
     <string name="network_error">ネットワークエラー</string>
-    <string name="download_path_audio_title">音楽を保存する場所</string>
+    <string name="download_path_audio_title">音声を保存する場所</string>
     <string name="download_path_audio_summary">ダウンロードした音楽をここに保存します</string>
     <string name="download_path_audio_dialog_title">音楽ファイルをダウンロードする場所を入力して下さい｡</string>
     <string name="err_dir_create">保存場所 \'%1$s\' を作成できません</string>
@@ -61,7 +61,7 @@
     <string name="could_not_setup_download_menu">保存メニューを設定できませんでした</string>
     <string name="live_streams_not_supported">生放送にはまだ対応していません</string>
     <string name="content">コンテンツ</string>
-    <string name="show_age_restricted_content_title">年齢制限のあるコンテンツ</string>
+    <string name="show_age_restricted_content_title">年齢制限のあるコンテンツを表示する</string>
     <string name="video_is_age_restricted">年齢制限された動画を表示しています。設定から許可することができます。</string>
     <string name="light_parsing_error">ウェブサイトを完全には解析できませんでした</string>
     <string name="could_not_get_stream">動画を取得できませんでした</string>
@@ -86,7 +86,7 @@
     <string name="start">開始</string>
     <string name="pause">一時停止</string>
     <string name="view">再生</string>
-    <string name="delete">削除</string>
+    <string name="delete">削除する</string>
     <string name="checksum">チェックサム</string>
     <string name="add">新しいミッション</string>
     <string name="finish">OK</string>
@@ -120,7 +120,7 @@
     <string name="later">後で</string>
     <string name="open_in_popup_mode">ポップアップモードで開く</string>
     <string name="msg_popup_permission">ポップアップモードで開くには
-このアクセス許可が必要です</string>
+\n権限の許可が必要です</string>
     <string name="popup_mode_share_menu_title">NewPipe ポップアップモード</string>
     <string name="popup_playing_toast">ポップアップモードで再生中</string>
     <string name="use_old_player_title">古いプレーヤーを使用する</string>
@@ -135,14 +135,14 @@
     <string name="filter">フィルター</string>
     <string name="refresh">更新</string>
     <string name="clear">クリア</string>
-    <string name="popup_remember_size_pos_title">ポップアップのサイズと位置を記憶する</string>
-    <string name="popup_remember_size_pos_summary">前回ポップアップしたサイズと位置を記憶する</string>
+    <string name="popup_remember_size_pos_title">ポップアップのサイズと位置を記憶</string>
+    <string name="popup_remember_size_pos_summary">ポップアップしたサイズと位置を記憶します</string>
     <string name="settings_category_popup_title">ポップアップ</string>
     <string name="popup_resizing_indicator_title">サイズを変更</string>
     <string name="use_external_video_player_summary">一部の解像度では音声がありません</string>
     <string name="player_gesture_controls_title">プレーヤーのジェスチャー制御</string>
     <string name="player_gesture_controls_summary">ジェスチャーを使用してプレーヤーの明るさと音量をコントロールする</string>
-    <string name="show_search_suggestions_title">検索候補</string>
+    <string name="show_search_suggestions_title">検索候補の表示</string>
     <string name="show_search_suggestions_summary">検索時に候補を表示します</string>
     <string name="best_resolution">最高の解像度</string>
     <string name="title_activity_about">NewPipe について</string>
@@ -170,13 +170,13 @@
     <string name="tab_subscriptions">登録リスト</string>
     <string name="fragment_whats_new">新着</string>
     <string name="enable_search_history_title">検索履歴</string>
-    <string name="enable_search_history_summary">検索履歴をローカルに保存します</string>
+    <string name="enable_search_history_summary">検索した履歴を記憶します</string>
     <string name="enable_watch_history_title">再生履歴とキャッシュ</string>
-    <string name="enable_watch_history_summary">再生した動画を記録します</string>
-    <string name="resume_on_audio_focus_gain_title">フォーカスで再開</string>
+    <string name="enable_watch_history_summary">再生した履歴を記憶します</string>
+    <string name="resume_on_audio_focus_gain_title">オーディオフォーカス復帰で再開する</string>
     <string name="resume_on_audio_focus_gain_summary">電話などによる中断の後、再生を再開します</string>
     <string name="settings_category_player_title">プレーヤー</string>
-    <string name="show_hold_to_append_summary">動画の詳細ページで背景、またはポップアップボタンが押されたときにヒントを表示する</string>
+    <string name="show_hold_to_append_summary">動画の詳細ページで、背景またはポップアップボタンが押されたときにヒントを表示する</string>
     <string name="settings_category_player_behavior_title">動作</string>
     <string name="settings_category_history_title">履歴とキャッシュ</string>
     <string name="playlist">プレイリスト</string>
@@ -261,10 +261,10 @@
     <string name="tab_bookmarks">ブックマーク</string>
     <string name="download_thumbnail_title">サムネイルを読み込む</string>
     <string name="thumbnail_cache_wipe_complete_notice">画像キャッシュを消去しました</string>
-    <string name="metadata_cache_wipe_title">メタデータのキャッシュを消去</string>
-    <string name="metadata_cache_wipe_summary">ウェブページのキャッシュデータをすべて削除します</string>
-    <string name="metadata_cache_wipe_complete_notice">メタデータのキャッシュを消去しました</string>
-    <string name="auto_queue_title">次の動画を自動でキューに追加</string>
+    <string name="metadata_cache_wipe_title">キャッシュを消去</string>
+    <string name="metadata_cache_wipe_summary">アプリ内のキャッシュをデータすべて削除します</string>
+    <string name="metadata_cache_wipe_complete_notice">キャッシュが消去されました</string>
+    <string name="auto_queue_title">関連動画を自動でキューに追加する</string>
     <string name="settings_category_debug_title">デバッグ</string>
     <string name="file">ファイル</string>
     <string name="video_streams_empty">動画が見つかりません</string>
@@ -284,7 +284,7 @@
     <string name="delete_all_history_prompt">すべてのアイテムを再生履歴から削除しますか？</string>
     <string name="always_ask_open_action">常に確認</string>
     <string name="create_playlist">新規プレイリスト</string>
-    <string name="delete_playlist">削除</string>
+    <string name="delete_playlist">削除する</string>
     <string name="rename_playlist">変更</string>
     <string name="playlist_name_input">プレイリスト名</string>
     <string name="append_playlist">プレイリストに追加</string>
@@ -296,7 +296,7 @@
     <string name="playlist_add_stream_success">プレイリストに追加しました</string>
     <string name="playlist_thumbnail_change_success">プレイリストのサムネイルを変更しました。</string>
     <string name="playlist_delete_failure">プレイリストを削除できませんでした。</string>
-    <string name="caption_none">字幕なし</string>
+    <string name="caption_none">字幕表示なし</string>
     <string name="caption_font_size_settings_title">字幕の文字サイズ</string>
     <string name="import_export_title">インポート/エクスポート</string>
     <string name="import_title">インポート</string>
@@ -305,7 +305,7 @@
     <string name="import_ongoing">インポートしています…</string>
     <string name="export_ongoing">エクスポートしています…</string>
     <string name="import_file_title">ファイルからインポート</string>
-    <string name="previous_export">前回のエクスポート</string>
+    <string name="previous_export">前回のエクスポート先</string>
     <string name="subscriptions_import_unsuccessful">購読リストがインポートできませんでした</string>
     <string name="subscriptions_export_unsuccessful">購読リストがエクスポートできませんでした</string>
     <string name="playback_tempo">速度</string>
@@ -330,7 +330,7 @@
     <string name="use_inexact_seek_title">おおまかなシーク</string>
     <string name="use_inexact_seek_summary">おおまかなシークを使用すると、正確さが下がりますが高速なシークが可能になります</string>
     <string name="download_thumbnail_summary">すべてのサムネイルの読み込みと保存を無効化します、このオプションを切り替えるとメモリおよびディスク上の画像キャッシュがクリアされます。</string>
-    <string name="auto_queue_summary">繰り返しでないキューの最後の動画を再生時、関連動画を自動的にキューに追加する。</string>
+    <string name="auto_queue_summary">繰り返しではないキューの再生後、関連動画を自動的にキューに追加します</string>
     <string name="delete_view_history_alert">すべての再生履歴を削除しますか？</string>
     <string name="delete_search_history_alert">すべての検索履歴を削除しますか？</string>
     <string name="invalid_source">このファイル/コンテンツはありません</string>
@@ -352,13 +352,13 @@
     <string name="title_most_played">最も再生した動画</string>
     <string name="resize_zoom">ズーム</string>
     <string name="controls_add_to_playlist_title">プレイリスト</string>
-    <string name="show_hold_to_append_title">「長押しして追加」のヒントを表示</string>
+    <string name="show_hold_to_append_title">「長押しして追加」のヒントを表示する</string>
     <string name="tracks">トラック</string>
     <string name="notification_channel_description">NewPipe バックグラウンドおよびポップアップのプレーヤーの通知</string>
     <string name="new_and_hot">新着 &amp; 人気</string>
     <string name="hold_to_append">長押ししてキューに入れる</string>
-    <string name="enqueue_on_background">バックグラウンド時にキューに入れる</string>
-    <string name="enqueue_on_popup">ポップアップ時にキューに入れる</string>
+    <string name="enqueue_on_background">バックグラウンド再生のキューに入れる</string>
+    <string name="enqueue_on_popup">ポップアップ再生のキューに入れる</string>
     <string name="start_here_on_popup">ポップアップ時にここから開始</string>
     <string name="drawer_header_action_paceholder_text">すぐにここに表示されます;D</string>
     <string name="preferred_open_action_settings_title">お好みの \'開く\' アクション</string>
@@ -366,7 +366,7 @@
     <string name="resize_fit">フィット</string>
     <string name="resize_fill">全画面</string>
     <string name="caption_auto_generated">自動生成</string>
-    <string name="caption_setting_description">字幕の文字サイズと背景色を変更します。有効にするにはアプリの再起動が必要です。</string>
+    <string name="caption_setting_description">アプリの再起動後、設定した字幕設定が反映されます</string>
     <string name="empty_subscription_feed_subtitle">何もありません</string>
     <string name="import_youtube_instructions">保存したエクスポートファイルからYouTubeの購読をインポート: 
 \n 
@@ -398,13 +398,13 @@
 \n 
 \n続行しますか\?</string>
     <string name="playback_speed_control">再生速度を変更</string>
-    <string name="unhook_checkbox">連動しない (歪むかもしれません)</string>
+    <string name="unhook_checkbox">速度と音程を連動せずに変更 (歪むかもしれません)</string>
     <string name="skip_silence_checkbox">無音の間に早送り</string>
     <string name="playback_step">音程幅</string>
     <string name="unsubscribe">購読解除</string>
     <string name="tab_new">新しいタブ</string>
     <string name="tab_choose">タブを選択</string>
-    <string name="settings_category_updates_title">更新</string>
+    <string name="settings_category_updates_title">アプリの更新</string>
     <string name="events">催し物</string>
     <string name="app_update_notification_channel_description">新しい NewPipe バージョンの通知</string>
     <string name="download_to_sdcard_error_title">外部記憶装置は利用できません</string>
@@ -415,7 +415,7 @@
     <string name="conferences">会議</string>
     <string name="start_accept_privacy_policy">ヨーロッパの一般データ保護規制（GDPR）に準拠するために、NewPipeの個人情報保護方針にご注意ください。よく読んでください。
 \n私たちに不具合報告を送るためには、これを受け入れなければなりません。</string>
-    <string name="updates_setting_title">更新</string>
+    <string name="updates_setting_title">アプリの更新</string>
     <string name="list_view_mode">リストビュー モード</string>
     <string name="list">リスト</string>
     <string name="grid">グリッド</string>
@@ -428,7 +428,7 @@
     <string name="paused">一時停止</string>
     <string name="queued">順番待ちに追加しました</string>
     <string name="post_processing">保存処理をしています</string>
-    <string name="enqueue">順に処理する</string>
+    <string name="enqueue">順番に処理する</string>
     <string name="permission_denied">操作がシステムによって拒否されました</string>
     <string name="download_failed">ダウンロードに失敗しました</string>
     <string name="download_finished">ダウンロードが完了しました</string>
@@ -450,11 +450,11 @@
     <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="clear_finished_download">完了済みを一覧から削除します</string>
     <string name="stop">停止</string>
     <string name="max_retry_msg">最大再試行回数</string>
     <string name="max_retry_desc">ダウンロードを中止するまでの最大再試行回数</string>
-    <string name="volume_gesture_control_title">音量ジェスチャー制御</string>
+    <string name="volume_gesture_control_title">音量のジェスチャー制御</string>
     <string name="volume_gesture_control_summary">ジェスチャーを使用して、プレーヤーの音量を制御します</string>
     <string name="brightness_gesture_control_title">明るさのジェスチャー制御</string>
     <string name="brightness_gesture_control_summary">ジェスチャーを使用して、プレーヤーの明るさを制御します</string>
@@ -466,5 +466,5 @@
     <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="pause_downloads_on_mobile_desc">一時停止できない場合は再開して継続されます</string>
 </resources>
\ No newline at end of file

From d8e6ad48ca16d916964267d0762b5d5d2c05f465 Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Sat, 1 Jun 2019 10:19:15 +0000
Subject: [PATCH 116/138] Translated using Weblate (Portuguese)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-pt/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index de0097bb3..9db2e401a 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -344,7 +344,7 @@
     <string name="playback_speed_control">Controlos para velocidade de reprodução</string>
     <string name="playback_tempo">Ritmo</string>
     <string name="clear_views_history_title">Limpar histórico de visualizações</string>
-    <string name="auto_queue_summary">Adicionar automaticamente à fila uma emissão relacionada se em filas não repetíveis.</string>
+    <string name="auto_queue_summary">Auto-aplicar uma emissão relacionada ao reproduzir a último emissão numa fila não repetitiva</string>
     <string name="show_hold_to_append_title">Mostrar dica \"Toque longo para colocar na fila\"</string>
     <string name="show_hold_to_append_summary">Mostrar dica quando o botão de fundo ou de \'popup\' for premido na página de detalhes do vídeo</string>
     <string name="channels">Canais</string>

From 407c61e212bb6007192d50837c4155627f867695 Mon Sep 17 00:00:00 2001
From: bob mar <casual1dg@gmail.com>
Date: Sun, 2 Jun 2019 10:25:50 +0000
Subject: [PATCH 117/138] Translated using Weblate (Hebrew)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 155c6a223..9ddc13d79 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -98,7 +98,7 @@
     <string name="error_snackbar_action">דיווח</string>
     <string name="what_device_headline">מידע:</string>
     <string name="what_happened_headline">מה קרה:</string>
-    <string name="info_labels">מה:\\nבקשה:\\nשפת התוכן:\\nשירות:\\nשעון גריניץ׳:\\nחבילה:\\nגרסה:\\nגרסת מערכת ההפעלה:</string>
+    <string name="info_labels">מה:\\nבקשה:\\nשפת התוכן:\\nשירות:\\nזמן גריניץ\'GMT:\\nחבילה:\\nגרסה:\\nגרסת מערכת ההפעלה:</string>
     <string name="subscribe_button_title">עריכת מינוי</string>
     <string name="subscribed_button_title">נרשמת</string>
     <string name="channel_unsubscribed">ביטול מינוי לערוץ</string>
@@ -272,7 +272,7 @@
     <string name="external_player_unsupported_link_type">נגנים חיצוניים לא תומכים בסוגי קישורים כאלה</string>
     <string name="invalid_url_toast">כתובת שגויה</string>
     <string name="file">קובץ</string>
-    <string name="switch_to_background">העברה לרקע</string>
+    <string name="switch_to_background">החלף לרקע</string>
     <string name="switch_to_popup">העברה לחלון צף</string>
     <string name="no_player_found_toast">לא נמצא נגן צפייה ישירה (ניתן להתקין את VLC כדי לתקן זאת).</string>
     <string name="thumbnail_cache_wipe_complete_notice">תמונות מטמון נמחקו</string>

From fb18ea7ff88d3cc167e6a4d58d16c69704ed0f95 Mon Sep 17 00:00:00 2001
From: artik banana <lid@tuta.io>
Date: Sun, 2 Jun 2019 10:26:11 +0000
Subject: [PATCH 118/138] Translated using Weblate (Hebrew)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 9ddc13d79..18b12e868 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -267,8 +267,8 @@
     <string name="settings_category_debug_title">ניפוי שגיאות</string>
     <string name="always">תמיד</string>
     <string name="just_once">חד פעמי</string>
-    <string name="import_data_title">ייבוא מסד נתונים</string>
-    <string name="export_data_title">ייצוא מסד נתונים</string>
+    <string name="import_data_title">ייבוא מאגר מידע</string>
+    <string name="export_data_title">ייצוא מאגר מידע</string>
     <string name="external_player_unsupported_link_type">נגנים חיצוניים לא תומכים בסוגי קישורים כאלה</string>
     <string name="invalid_url_toast">כתובת שגויה</string>
     <string name="file">קובץ</string>
@@ -285,7 +285,7 @@
     <string name="search_history_deleted">היסטוריית החיפוש נמחקה.</string>
     <string name="invalid_file">הקובץ אינו קיים או שחסרה הרשאה לקרוא אותו או לכתוב אליו</string>
     <string name="file_name_empty_error">שם הקובץ אינו יכול להיות ריק</string>
-    <string name="detail_drag_description">ניתן לסדר מחדש בגרירה</string>
+    <string name="detail_drag_description">גרור לשינוי הסדר</string>
     <string name="create">יצירה</string>
     <string name="delete_one">למחוק אחד</string>
     <string name="delete_all">למחוק הכול</string>

From aefc51db4b56a2b6f9fa0b6ae1b454aaac1a104b Mon Sep 17 00:00:00 2001
From: AB <ao7nro+6ltrjuwxelfo4@sharklasers.com>
Date: Sun, 2 Jun 2019 06:51:59 +0000
Subject: [PATCH 119/138] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ffc996f49..272ebc3b2 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -325,7 +325,7 @@
     <string name="use_inexact_seek_title">Використовувати швидкий неточний пошук</string>
     <string name="use_inexact_seek_summary">Неточний пошук дозволяє програвачеві рухатися позиціями швидше, проте з меншою точністю</string>
     <string name="auto_queue_title">Автоматично додавати в чергу наступний запис</string>
-    <string name="auto_queue_summary">Автоматично додавати пов\'язаний запис під час відтворення останнього у черзі без повторювань.</string>
+    <string name="auto_queue_summary">Автоматично додавати пов\'язаний запис під час відтворення останнього у черзі без повторювань</string>
     <string name="file">Файл</string>
     <string name="invalid_directory">Такої теки не існує</string>
     <string name="invalid_source">Такого джерела файлу/контенту не існує</string>

From d8cb950248951498c7014a54e581ffffd1ed9e97 Mon Sep 17 00:00:00 2001
From: Joseph Kim <official.jkim@gmail.com>
Date: Sun, 2 Jun 2019 01:41:12 +0000
Subject: [PATCH 120/138] Translated using Weblate (Korean)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-ko/strings.xml | 174 ++++++++++++-------------
 1 file changed, 81 insertions(+), 93 deletions(-)

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bcaafbcfc..068312727 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -30,7 +30,6 @@
     <string name="url_not_supported_toast">지원하지 않는 URL 입니다</string>
     <string name="content_language_title">기본 컨텐츠 언어</string>
     <string name="settings_category_video_audio_title">비디오 &amp; 오디오</string>
-
     <string name="list_thumbnail_view_description">비디오 미리보기 썸네일</string>
     <string name="detail_thumbnail_view_description">비디오 미리보기 썸네일</string>
     <string name="detail_uploader_thumbnail_view_description">업로더 썸네일</string>
@@ -38,24 +37,19 @@
     <string name="detail_likes_img_view_description">좋아요</string>
     <string name="use_external_video_player_title">외부 비디오 플레이어 사용</string>
     <string name="use_external_audio_player_title">외부 오디오 플레이어 사용</string>
-
     <string name="download_path_audio_title">오디오 다운로드 폴더</string>
     <string name="download_path_audio_summary">다운로드된 오디오는 여기에 저장됩니다</string>
     <string name="download_path_audio_dialog_title">오디오 파일 다운로드 경로를 입력하세요</string>
-
     <string name="theme_title">테마</string>
     <string name="dark_theme_title">어두운 테마</string>
     <string name="light_theme_title">밝은 테마</string>
-
     <string name="settings_category_appearance_title">외관</string>
     <string name="settings_category_other_title">기타</string>
     <string name="background_player_playing_toast">백그라운드에서 재생 중</string>
     <string name="play_btn_text">재생</string>
     <string name="network_error">네트워크 오류</string>
-
     <string name="use_tor_title">Tor 사용</string>
     <string name="use_tor_summary">(실험적) 향상된 프라이버시를 위해 다운로드 트래픽을 강제로 Tor를 통해 전송 (스트리밍 비디오는 아직 지원되지 않습니다).</string>
-
     <string name="err_dir_create">다운로드 디렉토리를 만들 수 없습니다 \'%1$s\'</string>
     <string name="info_dir_created">다운로드 디렉토리를 만들었습니다 \'%1$s\'</string>
     <string name="main_bg_subtitle">검색 버튼을 눌러서 시작하세요</string>
@@ -65,7 +59,6 @@
     <string name="show_age_restricted_content_title">연령 제한 컨텐츠</string>
     <string name="video_is_age_restricted">연령 제한 비디오입니다. 설정 메뉴에서 시청 허용 여부를 변경하실 수 있습니다.</string>
     <string name="duration_live">라이브</string>
-
     <string name="general_error">오류</string>
     <string name="could_not_load_thumbnails">모든 썸네일을 불러올 수 없습니다</string>
     <string name="youtube_signature_decryption_error">비디오 URL 서명을 복호화할 수 없습니다</string>
@@ -84,11 +77,8 @@
     <string name="what_happened_headline">다음이 발생함:</string>
     <string name="your_comment">내용 (영어로 작성):</string>
     <string name="error_details_headline">자세한 사항:</string>
-
-
     <string name="report_error">오류 보고</string>
     <string name="user_report">사용자 보고서</string>
-
     <string name="video">비디오</string>
     <string name="audio">오디오</string>
     <string name="retry">재시도</string>
@@ -99,8 +89,7 @@
     <string name="pause">일시정지</string>
     <string name="delete">삭제</string>
     <string name="checksum">체크섬</string>
-
-<string name="open_in_popup_mode">팝업 모드에서 열기</string>
+    <string name="open_in_popup_mode">팝업 모드에서 열기</string>
     <string name="use_external_video_player_summary">일부 해상도에서 소리가 나지 않습니다</string>
     <string name="popup_mode_share_menu_title">뉴파이프 팝업 모드</string>
     <string name="subscribe_button_title">구독</string>
@@ -108,15 +97,11 @@
     <string name="channel_unsubscribed">채널 구독 해제됨</string>
     <string name="subscription_change_failed">구독 여부를 변경할 수 없음</string>
     <string name="subscription_update_failed">구독을 업데이트할 수 없음</string>
-
     <string name="tab_main">메인 화면</string>
     <string name="tab_subscriptions">구독</string>
-
     <string name="fragment_whats_new">새로운 영상</string>
-
     <string name="controls_background_title">배경</string>
     <string name="controls_popup_title">팝업</string>
-
     <string name="default_popup_resolution_title">기본 팝업 해상도</string>
     <string name="show_higher_resolutions_title">높은 해상도 표시</string>
     <string name="show_higher_resolutions_summary">일부 기기에서만 2K/4K 해상도 재생이 지원됩니다</string>
@@ -157,48 +142,37 @@
     <string name="best_resolution">최대 해상도</string>
     <string name="undo">되돌리기</string>
     <string name="play_all">전부 재생</string>
-
     <string name="notification_channel_name">뉴파이프 알림</string>
     <string name="notification_channel_description">뉴파이프 백그라운드 및 팝업 플레이어 알림</string>
-
     <string name="unknown_content">[알 수 없음]</string>
-
     <string name="could_not_load_image">이미지를 불러올 수 없습니다</string>
     <string name="app_ui_crash">앱/UI 충돌</string>
     <string name="player_stream_failure">이 스트림을 재생할 수 없습니다</string>
     <string name="player_unrecoverable_failure">복구할 수 없는 플레이어 오류가 발생했습니다</string>
     <string name="player_recoverable_failure">플레이어 오류로부터 복구 중</string>
-
     <string name="info_labels">무엇을:\\n요청:\\n컨텐츠 언어:\\n서비스:\\nGMT 기준 시간:\\n패키지:\\n버전:\\n안드로이드 버전:</string>
     <string name="search_no_results">결과 없음</string>
     <string name="empty_subscription_feed_subtitle">구독할 항목을 추가하세요</string>
-
     <string name="use_old_player_title">구형 플레이어 사용</string>
     <string name="use_old_player_summary">내장된 구형 Mediaframework 플레이어 사용</string>
-
     <string name="short_thousand">천</string>
     <string name="short_million">백만</string>
     <string name="short_billion">10억</string>
-
     <string name="no_subscribers">구독자 없음</string>
     <plurals name="subscribers">
-	<item quantity="other">%s 구독자</item>
-</plurals>
-
+        <item quantity="other">%s 구독자</item>
+    </plurals>
     <string name="no_views">시청 횟수 없음</string>
     <plurals name="views">
-	<item quantity="other">%s 시청 횟수</item>
-</plurals>
-
+        <item quantity="other">%s 시청 횟수</item>
+    </plurals>
     <string name="no_videos">비디오 없음</string>
     <plurals name="videos">
-    <item quantity="other">비디오</item>
-</plurals>
-
+        <item quantity="other">비디오</item>
+    </plurals>
     <string name="view">재생</string>
     <string name="add">새로운 미션</string>
     <string name="finish">OK</string>
-
     <string name="msg_name">파일명</string>
     <string name="msg_threads">쓰레드</string>
     <string name="msg_error">오류</string>
@@ -212,18 +186,14 @@
     <string name="no_available_dir">다운로드 할 폴더를 선택하세요</string>
     <string name="msg_popup_permission">이 권한은 팝업 모드에서
 \n열기 위해 필요합니다</string>
-
     <string name="reCaptchaActivity">로봇인지 확인 (reCAPTCHA)</string>
     <string name="recaptcha_request_toast">reCAPTCHA challenge 요청됨</string>
-
     <string name="settings_category_downloads_title">다운로드</string>
     <string name="settings_file_charset_title">파일명에 허용되는 문자</string>
     <string name="settings_file_replacement_character_summary">올바르지 않은 문자는 다음 문자로 대체됩니다</string>
     <string name="settings_file_replacement_character_title">대체 문자</string>
-
     <string name="charset_letters_and_digits">문자 및 숫자</string>
     <string name="charset_most_special_characters">가장 특수한 문자</string>
-
     <string name="title_activity_about">뉴파이프에 대해서</string>
     <string name="action_settings">설정</string>
     <string name="action_about">뉴파이프</string>
@@ -245,8 +215,6 @@
     <string name="website_encouragement">뉴파이프에 관한 최신 및 상세 정보를 얻으려면 웹사이트를 방문하세요.</string>
     <string name="app_license_title">뉴파이프가 채택한 라이센스</string>
     <string name="read_full_license">라이센스 읽기</string>
-
-
     <string name="title_activity_history">기록</string>
     <string name="title_history_search">검색함</string>
     <string name="title_history_view">시청함</string>
@@ -256,7 +224,6 @@
     <string name="history_cleared">기록이 삭제되었습니다</string>
     <string name="item_deleted">항목이 삭제되었습니다</string>
     <string name="delete_item_search_history">이 항목을 검색 기록에서 삭제할까요?</string>
-
     <string name="main_page_content">메인 화면의 내용</string>
     <string name="blank_page_summary">빈 페이지</string>
     <string name="kiosk_page_summary">키오스크 페이지</string>
@@ -266,7 +233,6 @@
     <string name="select_a_channel">채널 선택</string>
     <string name="no_channel_subscribed_yet">구독중인 채널이 없습니다</string>
     <string name="select_a_kiosk">키오스크 선택</string>
-
     <string name="kiosk">키오스크</string>
     <string name="trending">인기 급상승</string>
     <string name="top_50">탑 50</string>
@@ -276,20 +242,17 @@
     <string name="play_queue_remove">제거</string>
     <string name="play_queue_stream_detail">상세 정보</string>
     <string name="play_queue_audio_settings">오디오 설정</string>
-    <string name="hold_to_append">눌러서 대기 목록에 추가</string>
-    <string name="enqueue_on_background">백그라운드에 대기</string>
-    <string name="enqueue_on_popup">팝업에 대기</string>
+    <string name="hold_to_append">눌러서 대기열에 추가</string>
+    <string name="enqueue_on_background">백그라운드로 갈 경우 대기</string>
+    <string name="enqueue_on_popup">새 팝업으로 갈 경우 대기</string>
     <string name="start_here_on_main">여기서부터 재생</string>
-    <string name="start_here_on_background">여기서부터 백그라운드에서 재생</string>
-    <string name="start_here_on_popup">여기서부터 팝업에 재생</string>
-<string name="no_player_found_toast">스트리밍 플레이어를 찾을 수 없습니다. VLC를 설치하면 플레이하실 수 있습니다</string>
+    <string name="start_here_on_background">백그라운드로 갈 경우 여기서부터 재생</string>
+    <string name="start_here_on_popup">새 팝업으로 갈 경우 여기서부터 재생</string>
+    <string name="no_player_found_toast">스트리밍 플레이어를 찾을 수 없습니다. VLC를 설치하면 플레이하실 수 있습니다.</string>
     <string name="controls_download_desc">스트리밍 파일 다운로드하기</string>
     <string name="show_info">정보 보기</string>
-
     <string name="tab_bookmarks">플레이리스트 북마크</string>
-
     <string name="controls_add_to_playlist_title">이곳에 추가</string>
-
     <string name="use_inexact_seek_title">정확하지는 않지만 빠른 탐색</string>
     <string name="use_inexact_seek_summary">정확하지 않은 탐색은 빠르게 위치로 탐색할 수 있지만 정확도는 떨어집니다</string>
     <string name="auto_queue_title">다음 스트림을 자동으로 재생열에 추가하기</string>
@@ -300,12 +263,10 @@
     <string name="live">라이브 (LIVE)</string>
     <string name="always">항상</string>
     <string name="just_once">한번만</string>
-
     <string name="toggle_orientation">디바이스 방향 토글</string>
     <string name="switch_to_background">백그라운드로 전환</string>
     <string name="switch_to_popup">팝업으로 전환</string>
     <string name="switch_to_main">기본으로 전환</string>
-
     <string name="import_data_title">데이터베이스 가져오기</string>
     <string name="export_data_title">데이터베이스 내보내기</string>
     <string name="import_data_summary">현재 시청 기록 및 구독 목록을 덮어쓰기 합니다</string>
@@ -314,102 +275,79 @@
     <string name="invalid_url_toast">잘못된 URL</string>
     <string name="video_streams_empty">발견된 비디오 스트림 없음</string>
     <string name="audio_streams_empty">발견된 오디오 스트림 없음</string>
-
     <string name="detail_drag_description">드래그하여 재배열</string>
-
     <string name="create">만들기</string>
     <string name="delete_one">1개 삭제하기</string>
     <string name="delete_all">모두 삭제하기</string>
     <string name="dismiss">취소</string>
     <string name="rename">이름 바꾸기</string>
-
     <string name="reCaptcha_title">로봇인지 확인합니다</string>
     <string name="delete_stream_history_prompt">이 항목을 시청 기록에서 삭제하시겠습니까?</string>
     <string name="delete_all_history_prompt">모든 항목을 시청 기록에서 삭제하시겠습니까?</string>
     <string name="title_last_played">마지막으로 재생</string>
     <string name="title_most_played">가장 많이 재생</string>
-
     <string name="export_complete_toast">내보내기 완료</string>
     <string name="import_complete_toast">가져오기 완료</string>
     <string name="no_valid_zip_file">유효한 ZIP 파일 없음</string>
     <string name="could_not_import_all_files">경고: 모든 파일 가져오기를 실패했습니다.</string>
     <string name="override_current_data">이것은 현재 설정을 덮어쓸 것입니다.</string>
-
     <string name="drawer_open">드로어 열기</string>
     <string name="drawer_close">드로어 닫기</string>
     <string name="drawer_header_action_paceholder_text">여기에 무언가가 추가될 거에요~ :D</string>
-
-
     <string name="video_player">비디오 플레이어</string>
     <string name="background_player">백그라운드 플레이어</string>
     <string name="popup_player">팝업 플레이어</string>
     <string name="always_ask_open_action">항상 묻기</string>
-    
     <string name="preferred_player_fetcher_notification_title">정보 가져오는 중…</string>
     <string name="preferred_player_fetcher_notification_message">요청한 콘텐츠를 로딩 중입니다</string>
-
     <string name="create_playlist">새로운 재생목록</string>
     <string name="delete_playlist">삭제</string>
     <string name="rename_playlist">이름 바꾸기</string>
     <string name="playlist_name_input">이름</string>
     <string name="append_playlist">재생목록에 추가</string>
     <string name="set_as_playlist_thumbnail">재생목록 썸네일로 설정</string>
-
     <string name="bookmark_playlist">재생목록 북마크하기</string>
     <string name="unbookmark_playlist">북마크 제거하기</string>
-
     <string name="delete_playlist_prompt">이 재생목록을 삭제하시겠습니까?</string>
     <string name="playlist_creation_success">재생목록 생성 완료</string>
     <string name="playlist_add_stream_success">재생목록에 추가됨</string>
     <string name="playlist_thumbnail_change_success">재생목록 썸내일이 바뀜.</string>
     <string name="playlist_delete_failure">재생목록을 삭제할 수 없습니다.</string>
-
     <string name="caption_none">자막 없음</string>
-
     <string name="resize_fit">꼭 맞게 하기</string>
     <string name="resize_fill">채우기</string>
     <string name="resize_zoom">확대</string>
-
     <string name="caption_auto_generated">자동 생성됨</string>
     <string name="caption_font_size_settings_title">자막 폰트 크기</string>
     <string name="smaller_caption_font_size">작은 폰트</string>
     <string name="normal_caption_font_size">보통 폰트</string>
     <string name="larger_caption_font_size">큰 폰트</string>
-
     <string name="live_sync">동기화</string>
-
     <string name="enable_leak_canary_title">LeakCanary 할성화</string>
     <string name="enable_leak_canary_summary">힙 덤프 중 메모리 누수 점검으로 앱이 불안정해질 수 있습니다</string>
-
     <string name="enable_disposed_exceptions_title">out-of-lifecycle 오류 보고</string>
     <string name="enable_disposed_exceptions_summary">프래그먼트 또는 버려진 액티비티 주기 밖에서 일어나는 전달할 수 없는 Rx 예외를 강제적으로 보고하기</string>
-
-<string name="file">파일</string>
-
+    <string name="file">파일</string>
     <string name="invalid_directory">폴더가 존재하지 않습니다</string>
-    <string name="invalid_source">잘못된 파일/콘덴츠 소스</string>
+    <string name="invalid_source">잘못된 파일/콘텐츠 소스</string>
     <string name="invalid_file">파일이 존재하지 않거나 읽기/쓰기 권한이 없습니다</string>
     <string name="file_name_empty_error">파일명이 비어 있으면 안됩니다</string>
     <string name="error_occurred_detail">오류 발생: %1$s</string>
-
     <string name="import_export_title">가져오기/내보내기</string>
     <string name="import_title">가져오기</string>
     <string name="import_from">이곳으로부터 가져오기</string>
     <string name="export_to">이곳으로 내보내기</string>
-
     <string name="import_ongoing">가져오는 중.…</string>
     <string name="export_ongoing">내보내는 중…</string>
-
     <string name="import_file_title">파일 가져오기</string>
     <string name="previous_export">이전 내보내기</string>
-
     <string name="subscriptions_import_unsuccessful">구독 목록 가져오기 실패</string>
     <string name="subscriptions_export_unsuccessful">구독 목록 내보내기 실패</string>
-
-    <string name="import_youtube_instructions">YouTube 구독 목록을 가져오려면 내보내기 파일이 필요합니다. 다운로드 하려면
-\n1. 이곳으로 가세요: $1$s
-\n2. 로그인이 필요하면 하세요
-\n3. 다운로드가 곧 시작 됩니다 (이 파일이 내보내기 파일 입니다)</string>
+    <string name="import_youtube_instructions">\'YouTube 구독 파일\'을 다운로드해서 구독 목록을 가져올 수 있습니다:
+\n
+\n1. 이곳으로 가세요: $1$s 
+\n2. 요청에 따라 로그인을 진행합니다
+\n3. 다운로드가 곧 시작 됩니다 (이 파일이 구독 파일입니다)</string>
     <string name="import_soundcloud_instructions">SoundCloud 프로필을 가져오시려면 URL 및 ID를 입력해주세요. 
 \n 
 \n프로필 URL을 찾으시려면 다음 과정을 따라해 주세요.
@@ -418,11 +356,10 @@
 \n3. 로그인이 필요하면 하세요. 
 \n4. 리디렉트된 곳의 URL을 복사하세요. (이 URL이 당신의 프로필 URL 입니다)</string>
     <string name="import_soundcloud_instructions_hint">프로필ID, soundcloud.com/프로필ID</string>
-
     <string name="import_network_expensive_warning">경고: 데이터 소모량이 늘어날 수 있습니다. 
 \n 
 \n계속하시겠습니까?</string>
-<string name="download_thumbnail_title">썸내일 로드하기</string>
+    <string name="download_thumbnail_title">썸내일 로드하기</string>
     <string name="download_thumbnail_summary">동영상 썸네일을 로드하지 않으며, 데이터와 메모리 사용을 최대한 줄입니다. 이 옵션을 
 \n선택 시 모든 메모리 캐시와 저장소 캐시를 삭제합니다.</string>
     <string name="thumbnail_cache_wipe_complete_notice">이미지 캐시 지워짐</string>
@@ -435,16 +372,12 @@
     <string name="unhook_checkbox">영상과 소리 분리 (소리가 깨질 수 있음)</string>
     <string name="playback_nightcore">나이트코어</string>
     <string name="playback_default">기본</string>
-<string name="no_streams_available_download">다운로드 가능한 스트림이 없습니다</string>
-
+    <string name="no_streams_available_download">다운로드 가능한 스트림이 없습니다</string>
     <string name="toast_no_player">이 파일을 재생할 수 있는 플레이어 앱이 없습니다</string>
-
     <string name="preferred_open_action_settings_title">선호하는 열기 동작</string>
     <string name="preferred_open_action_settings_summary">컨텐츠를 열 때 사용할 기본 동작 — %s</string>
-
     <string name="caption_setting_title">자막</string>
     <string name="caption_setting_description">플레이어 자막 텍스트 크기와 배경 스타일을 변경합니다. 효과를 적용하려면 앱을 재시작 해야합니다.</string>
-
     <string name="channels">채널만</string>
     <string name="playlists">재생 목록만</string>
     <string name="clear_views_history_title">시청 기록 삭제하기</string>
@@ -459,15 +392,12 @@
     <string name="privacy_policy_encouragement">뉴파이프 프로젝트는 사용자의 개인 정보 보호를 최우선으로 생각하며, 동의 없이 어떠한 정보도 수집하지 않습니다.
 \n뉴파이프 개인정보 보호 정책에서는 오류 보고 시 어떠한 정보가 수집되고 저장되는지 자세히 명시되어 있습니다.</string>
     <string name="read_privacy_policy">개인정보 보호 정책 읽기</string>
-    <string name="app_license">뉴파이프는 카피레프트 자유 소프트웨어입니다. 사용자는 이 앱을 사용, 공유, 또는 수정하는 것이 가능하고, 수정 후 재배포 시 자유 소프트웨어 재단의 GNU 라이센스 버전
-\n3 또는 그 이상의 버전을 포함해야 합니다.</string>
+    <string name="app_license">뉴파이프는 카피레프트 자유 소프트웨어입니다. 사용자는 이 앱을 사용, 공유, 또는 수정할 수 있고, 수정 후 재배포 시 자유 소프트웨어 재단의 GNU 라이센스 버전 3 또는 그 이상의 버전을 포함해야 합니다.</string>
     <string name="import_settings">앱 설정을 가져오시겠습니까?</string>
-
     <string name="skip_silence_checkbox">무음 구간 스킵</string>
     <string name="start_accept_privacy_policy">유럽 연합 일반 데이터 보호 규정 (GDPR) 에 따라, 사용자는 뉴파이프 개인정보 보호 정책을 읽고 꼼꼼히 확인해야 합니다. 버그 리포트를 보내시려면 개인정보 보호 정책에 동의해주세요.</string>
     <string name="accept">동의</string>
     <string name="decline">동의하지 않음</string>
-
     <string name="limit_data_usage_none_description">데이터 제한 없음</string>
     <string name="limit_mobile_data_usage_title">모바일 데이터 사용 시 화질 제한</string>
     <string name="unsubscribe">구독 해제</string>
@@ -486,4 +416,62 @@
     <string name="app_update_notification_channel_description">새 뉴파이프 버전을 알림</string>
     <string name="download_to_sdcard_error_title">외부 저장소 없음</string>
     <string name="download_to_sdcard_error_message">다운로드할 SD 카드를 찾을 수 없습니다. 다운로드 폴더 경로를 초기화 하시겠습니까\?</string>
+    <string name="one_item_deleted">1개의 항목이 삭제되었습니다.</string>
+    <string name="minimize_on_exit_title">앱 전환시 최소화</string>
+    <string name="minimize_on_exit_summary">비디오 플레이어에서 다른 앱으로 전환 시 다음과 같은 동작 실행 — %s</string>
+    <string name="minimize_on_exit_none_description">없음</string>
+    <string name="minimize_on_exit_background_description">백그라운드 플레이어로 최소화</string>
+    <string name="minimize_on_exit_popup_description">팝업 플레이어로 최소화</string>
+    <string name="playback_step">단계</string>
+    <string name="playback_reset">초기화</string>
+    <string name="saved_tabs_invalid_json">저장된 탭을 읽는 중 오류가 발생하여 기본 탭을 사용합니다</string>
+    <string name="restore_defaults">기본값 복원</string>
+    <string name="restore_defaults_confirmation">기본값을 복원할까요\?</string>
+    <string name="subscribers_count_not_available">구독자 숫자가 없습니다</string>
+    <string name="main_page_content_summary">메인 화면에 표시할 탭</string>
+    <string name="selection">선택</string>
+    <string name="updates_setting_title">업데이트</string>
+    <string name="updates_setting_description">새 버전이 있을 경우 앱을 업데이트하도록 알림 표시</string>
+    <string name="list_view_mode">\'목록으로 보기\' 모드</string>
+    <string name="list">목록</string>
+    <string name="grid">격자</string>
+    <string name="auto">자동</string>
+    <string name="switch_view">보기 방식 전환</string>
+    <string name="app_update_notification_content_title">NewPipe 업데이트가 있습니다!</string>
+    <string name="app_update_notification_content_text">여기를 눌러서 다운로드</string>
+    <string name="missions_header_finished">완료됨</string>
+    <string name="missions_header_pending">대기열에 있음</string>
+    <string name="paused">일시중지됨</string>
+    <string name="queued">대기열에 추가됨</string>
+    <string name="post_processing">후처리 실행 중</string>
+    <string name="enqueue">대기열</string>
+    <string name="permission_denied">시스템에 의해 실행이 거부되었습니다</string>
+    <string name="download_failed">다운로드 실패</string>
+    <string name="download_finished">다운로드 완료</string>
+    <string name="download_finished_more">%s 다운로드 완료됨</string>
+    <string name="generate_unique_name">별개의 이름 생성</string>
+    <string name="overwrite">덮어쓰기</string>
+    <string name="overwrite_warning">해당 이름을 가진 다운로드된 파일이 이미 존재합니다</string>
+    <string name="download_already_running">해당 이름을 가진 다운로드가 이미 진행중입니다</string>
+    <string name="show_error">오류 표시</string>
+    <string name="label_code">코드</string>
+    <string name="error_path_creation">파일을 만들 수 없습니다</string>
+    <string name="error_file_creation">지정한 폴더를 만들 수 없습니다</string>
+    <string name="error_permission_denied">시스템에 의해 권한이 거부되었습니다</string>
+    <string name="error_ssl_exception">보안 연결 실패</string>
+    <string name="error_unknown_host">서버를 찾을 수 없습니다</string>
+    <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>
+    <string name="pause_downloads_on_mobile">모바일 데이터로 전환시 일시정지</string>
+    <string name="pause_downloads_on_mobile_desc">일시정지 할 수 없는 다운로드의 경우에는 다시 시작됩니다</string>
+    <string name="conferences">컨퍼런스</string>
 </resources>
\ No newline at end of file

From a9f3939c8303da44924d537c9ab46f9d13008774 Mon Sep 17 00:00:00 2001
From: artik banana <lid@tuta.io>
Date: Sun, 2 Jun 2019 10:27:07 +0000
Subject: [PATCH 121/138] Translated using Weblate (Hebrew)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 18b12e868..957448045 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -364,7 +364,7 @@
 \nמדיניות הפרטיות של NewPipe מסבירה בפרטי פרטים אילו נתונים נשלחים ומאוחסנים בעת שליחת דיווח על תקלה.</string>
     <string name="read_privacy_policy">הצגת מדיניות הפרטיות</string>
     <string name="app_license">NewPipe הוא יישומון חופשי בהתאם לרישיון קופילפט: מותר לך להשתמש, לחקור, לשתף ולשפר בכל דרך שנראית לך. במיוחד מותר לך להפיץ מחדש ו/או לשנות תחת תנאי הרישיון הציבורי הכללי של GNU כפי שמופץ על ידי קרן התכנה החופשית, בין אם גרסה 3 של הרישיון או (לשיקולך) כל גרסה עדכנית יותר שלו.</string>
-    <string name="title_last_played">נוגן אחרון</string>
+    <string name="title_last_played">התנגן לאחרונה</string>
     <string name="title_most_played">הכי נצפים</string>
     <string name="could_not_import_all_files">אזהרה: ייבוא חלק מהקבצים נכשל.</string>
     <string name="override_current_data">פעולה זו תדרוס את ההגדרות הקיימות.</string>

From 4a8baaef45776712846b94fa4ce088d38fb74086 Mon Sep 17 00:00:00 2001
From: bob mar <casual1dg@gmail.com>
Date: Sun, 2 Jun 2019 10:27:22 +0000
Subject: [PATCH 122/138] Translated using Weblate (Hebrew)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 957448045..2e8626c7f 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -297,7 +297,7 @@
     <string name="delete_all_history_prompt">למחוק את כל הפריטים מההיסטוריה\?</string>
     <string name="export_complete_toast">הייצוא הסתיים</string>
     <string name="import_complete_toast">הייבוא הסתיים</string>
-    <string name="no_valid_zip_file">אין קובץ ZIP תקין</string>
+    <string name="no_valid_zip_file">קובץ ZIP לא תקין</string>
     <string name="video_player">נגן סרטונים</string>
     <string name="background_player">נגן רקע</string>
     <string name="popup_player">נגן צף</string>
@@ -309,7 +309,7 @@
     <string name="rename_playlist">שינוי שם</string>
     <string name="playlist_name_input">שם</string>
     <string name="append_playlist">הוספה לרשימת נגינה</string>
-    <string name="bookmark_playlist">הוספה רשימת השמעה לסימניות</string>
+    <string name="bookmark_playlist">קשר רשימת השמעה למועדפים</string>
     <string name="unbookmark_playlist">הסרת סימנייה</string>
     <string name="delete_playlist_prompt">למחוק רשימת נגינה זו\?</string>
     <string name="playlist_creation_success">רשימת הנגינה נוצרה</string>
@@ -319,9 +319,9 @@
     <string name="resize_zoom">תקריב</string>
     <string name="caption_auto_generated">נוצרו אוטומטית</string>
     <string name="import_export_title">ייבוא/ייצוא</string>
-    <string name="import_title">ייבוא</string>
-    <string name="import_from">ייבוא מ־</string>
-    <string name="export_to">ייצוא אל</string>
+    <string name="import_title">יבא</string>
+    <string name="import_from">יבא מ</string>
+    <string name="export_to">יצא ל</string>
     <string name="import_ongoing">מתבצע ייבוא…</string>
     <string name="export_ongoing">מתבצע ייצוא…</string>
     <string name="import_file_title">ייבוא קובץ</string>

From f8ccc3128e1fcc4b110eec0daf64868d2309b418 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sun, 2 Jun 2019 10:42:11 +0000
Subject: [PATCH 123/138] Translated using Weblate (Hebrew)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 2e8626c7f..83deb2b4f 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -98,7 +98,7 @@
     <string name="error_snackbar_action">דיווח</string>
     <string name="what_device_headline">מידע:</string>
     <string name="what_happened_headline">מה קרה:</string>
-    <string name="info_labels">מה:\\nבקשה:\\nשפת התוכן:\\nשירות:\\nזמן גריניץ\'GMT:\\nחבילה:\\nגרסה:\\nגרסת מערכת ההפעלה:</string>
+    <string name="info_labels">מה:\\nבקשה:\\nשפת התוכן:\\nשירות:\\nשעון גריניץ׳:\\nחבילה:\\nגרסה:\\nגרסת מערכת ההפעלה:</string>
     <string name="subscribe_button_title">עריכת מינוי</string>
     <string name="subscribed_button_title">נרשמת</string>
     <string name="channel_unsubscribed">ביטול מינוי לערוץ</string>
@@ -267,8 +267,8 @@
     <string name="settings_category_debug_title">ניפוי שגיאות</string>
     <string name="always">תמיד</string>
     <string name="just_once">חד פעמי</string>
-    <string name="import_data_title">ייבוא מאגר מידע</string>
-    <string name="export_data_title">ייצוא מאגר מידע</string>
+    <string name="import_data_title">ייבוא מסד נתונים</string>
+    <string name="export_data_title">ייצוא מסד נתונים</string>
     <string name="external_player_unsupported_link_type">נגנים חיצוניים לא תומכים בסוגי קישורים כאלה</string>
     <string name="invalid_url_toast">כתובת שגויה</string>
     <string name="file">קובץ</string>

From c7cb6523225850cfd875ae727eba57de78a9fcc6 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sun, 2 Jun 2019 10:44:08 +0000
Subject: [PATCH 124/138] Translated using Weblate (Hebrew)

Currently translated at 99.8% (442 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 83deb2b4f..80d8daf51 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -320,7 +320,7 @@
     <string name="caption_auto_generated">נוצרו אוטומטית</string>
     <string name="import_export_title">ייבוא/ייצוא</string>
     <string name="import_title">יבא</string>
-    <string name="import_from">יבא מ</string>
+    <string name="import_from">ייבוא מ־</string>
     <string name="export_to">יצא ל</string>
     <string name="import_ongoing">מתבצע ייבוא…</string>
     <string name="export_ongoing">מתבצע ייצוא…</string>

From ce204eba62e06861688d700abff1e158ac427407 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sun, 2 Jun 2019 10:44:25 +0000
Subject: [PATCH 125/138] Translated using Weblate (Hebrew)

Currently translated at 100.0% (443 of 443 strings)
---
 app/src/main/res/values-he/strings.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 80d8daf51..feeb5098b 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -272,7 +272,7 @@
     <string name="external_player_unsupported_link_type">נגנים חיצוניים לא תומכים בסוגי קישורים כאלה</string>
     <string name="invalid_url_toast">כתובת שגויה</string>
     <string name="file">קובץ</string>
-    <string name="switch_to_background">החלף לרקע</string>
+    <string name="switch_to_background">העברה לרקע</string>
     <string name="switch_to_popup">העברה לחלון צף</string>
     <string name="no_player_found_toast">לא נמצא נגן צפייה ישירה (ניתן להתקין את VLC כדי לתקן זאת).</string>
     <string name="thumbnail_cache_wipe_complete_notice">תמונות מטמון נמחקו</string>
@@ -285,7 +285,7 @@
     <string name="search_history_deleted">היסטוריית החיפוש נמחקה.</string>
     <string name="invalid_file">הקובץ אינו קיים או שחסרה הרשאה לקרוא אותו או לכתוב אליו</string>
     <string name="file_name_empty_error">שם הקובץ אינו יכול להיות ריק</string>
-    <string name="detail_drag_description">גרור לשינוי הסדר</string>
+    <string name="detail_drag_description">ניתן לסדר מחדש בגרירה</string>
     <string name="create">יצירה</string>
     <string name="delete_one">למחוק אחד</string>
     <string name="delete_all">למחוק הכול</string>
@@ -297,7 +297,7 @@
     <string name="delete_all_history_prompt">למחוק את כל הפריטים מההיסטוריה\?</string>
     <string name="export_complete_toast">הייצוא הסתיים</string>
     <string name="import_complete_toast">הייבוא הסתיים</string>
-    <string name="no_valid_zip_file">קובץ ZIP לא תקין</string>
+    <string name="no_valid_zip_file">אין קובץ ZIP תקין</string>
     <string name="video_player">נגן סרטונים</string>
     <string name="background_player">נגן רקע</string>
     <string name="popup_player">נגן צף</string>
@@ -309,7 +309,7 @@
     <string name="rename_playlist">שינוי שם</string>
     <string name="playlist_name_input">שם</string>
     <string name="append_playlist">הוספה לרשימת נגינה</string>
-    <string name="bookmark_playlist">קשר רשימת השמעה למועדפים</string>
+    <string name="bookmark_playlist">הוספת רשימת נגינה לסימניות</string>
     <string name="unbookmark_playlist">הסרת סימנייה</string>
     <string name="delete_playlist_prompt">למחוק רשימת נגינה זו\?</string>
     <string name="playlist_creation_success">רשימת הנגינה נוצרה</string>
@@ -319,9 +319,9 @@
     <string name="resize_zoom">תקריב</string>
     <string name="caption_auto_generated">נוצרו אוטומטית</string>
     <string name="import_export_title">ייבוא/ייצוא</string>
-    <string name="import_title">יבא</string>
+    <string name="import_title">ייבוא</string>
     <string name="import_from">ייבוא מ־</string>
-    <string name="export_to">יצא ל</string>
+    <string name="export_to">ייצוא אל</string>
     <string name="import_ongoing">מתבצע ייבוא…</string>
     <string name="export_ongoing">מתבצע ייצוא…</string>
     <string name="import_file_title">ייבוא קובץ</string>
@@ -341,7 +341,7 @@
     <string name="download_thumbnail_summary">כיבוי האפשרות מונע את טעינת התמונות הממוזערות, חוסך בתקשורת נתונים ובניצולת הזיכרון. שינויים באפשרות זו מוחקים את המטמון בזיכרון ובכונן.</string>
     <string name="metadata_cache_wipe_summary">הסרת כל נתוני העמודים שבמטמון</string>
     <string name="auto_queue_title">הוספת התזרים הבא לרשימת הנגינה אוטומטית</string>
-    <string name="auto_queue_summary">להוסיף אוטומטית תזרים דומה בעת נגינת התזרים האחרון בתור שאינו מחזורי.</string>
+    <string name="auto_queue_summary">להוסיף אוטומטית תזרים דומה בעת נגינת התזרים האחרון בתור שאינו מחזורי</string>
     <string name="toggle_orientation">החלפת כיווניות</string>
     <string name="switch_to_main">העברה לראשי</string>
     <string name="import_data_summary">משכתב את ההיסטוריה והמינויים הנוכחיים שלך</string>
@@ -364,7 +364,7 @@
 \nמדיניות הפרטיות של NewPipe מסבירה בפרטי פרטים אילו נתונים נשלחים ומאוחסנים בעת שליחת דיווח על תקלה.</string>
     <string name="read_privacy_policy">הצגת מדיניות הפרטיות</string>
     <string name="app_license">NewPipe הוא יישומון חופשי בהתאם לרישיון קופילפט: מותר לך להשתמש, לחקור, לשתף ולשפר בכל דרך שנראית לך. במיוחד מותר לך להפיץ מחדש ו/או לשנות תחת תנאי הרישיון הציבורי הכללי של GNU כפי שמופץ על ידי קרן התכנה החופשית, בין אם גרסה 3 של הרישיון או (לשיקולך) כל גרסה עדכנית יותר שלו.</string>
-    <string name="title_last_played">התנגן לאחרונה</string>
+    <string name="title_last_played">התנגנו אחרונים</string>
     <string name="title_most_played">הכי נצפים</string>
     <string name="could_not_import_all_files">אזהרה: ייבוא חלק מהקבצים נכשל.</string>
     <string name="override_current_data">פעולה זו תדרוס את ההגדרות הקיימות.</string>

From 1684a2110cfc94ca44bb2c3bbe789a0b9e4d3879 Mon Sep 17 00:00:00 2001
From: Tobias Groza <tobigr@users.noreply.github.com>
Date: Mon, 3 Jun 2019 22:06:58 +0200
Subject: [PATCH 126/138] Update Extractor

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index da735302c..820e02570 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:2ac713e'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:c64c90a'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'

From 9e34fee58c1bd2ba9040a5457f73b9e7cc36a256 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Fri, 22 Mar 2019 22:54:07 -0300
Subject: [PATCH 127/138] New MP4 muxer + Queue changes + Storage fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Main changes:
* correctly check the available space (CircularFile.java)
* misc cleanup (CircularFile.java)
* use the "Error Reporter" for non-http errors
* rewrite network state checking and add better support for API 21 (Lollipop) or higher
* implement "metered networks"
* add buttons in "Downloads" activity to start/pause all pending downloads, ignoring the queue flag or if the network is "metered"
* add workaround for VPN connections and/or network switching. Example: switching WiFi to 3G
* rewrite DataReader ¡Webm muxer is now 57% more faster!
* rewrite CircularFile, use file buffers instead of memory buffers. Less troubles in low-end devices
* fix missing offset for KaxCluster (WebMWriter.java), manifested as no thumbnails on file explorers

Download queue:
* remember queue status, unless the user pause the download (un-queue)
* semi-automatic downloads, between networks. Effective if the user create a new download or the downloads activity is starts
* allow enqueue failed downloads
* new option, queue limit, enabled by default. Used to allow one or multiple downloads at same time

Miscellaneous:
* fix crash while selecting details/error menu (mistake on MissionFragment.java)
* misc serialize changes (DownloadMission.java)
* minor UI tweaks
* allow overwrite paused downloads
* fix wrong icons for grid/list button in downloads
* add share option
* implement #2006
* correct misspelled word in strings.xml (es) (cmn)
* fix MissionAdapter crash during device shutdown

New Mp4Muxer + required changes:
* new mp4 muxer (from dash only) with this, muxing on Android 7 is possible now!!!
* re-work in SharpStream
* drop mp4 dash muxer
* misc changes: add warning in SecondaryStreamHelper.java,
* strip m4a DASH files to normal m4a format (youtube only)

Fix storage issues:
* warn to the user if is choosing a "read only" download directory (for external SD Cards), useless is rooted :)
* "write proof" allow post-processing resuming only if the device ran out of space
* implement "insufficient storage" error for downloads
---
 .../newpipe/download/DownloadDialog.java      |  61 +-
 .../org/schabi/newpipe/report/UserAction.java |   4 +-
 .../settings/DownloadSettingsFragment.java    |  14 +-
 .../schabi/newpipe/streams/DataReader.java    | 237 ++++-
 .../schabi/newpipe/streams/Mp4DashReader.java | 444 +++++++---
 .../schabi/newpipe/streams/Mp4DashWriter.java | 623 --------------
 .../newpipe/streams/Mp4FromDashWriter.java    | 810 ++++++++++++++++++
 .../newpipe/streams/SubtitleConverter.java    |  15 +-
 .../newpipe/streams/TrackDataChunk.java       |  65 --
 .../schabi/newpipe/streams/WebMReader.java    |  16 +-
 .../schabi/newpipe/streams/WebMWriter.java    | 130 ++-
 .../newpipe/streams/io/SharpStream.java       |  22 +-
 .../org/schabi/newpipe/util/ListHelper.java   |  14 +-
 .../newpipe/util/SecondaryStreamHelper.java   |   2 +-
 .../giga/get/DownloadInitializer.java         |   3 -
 .../us/shandian/giga/get/DownloadMission.java | 122 ++-
 .../java/us/shandian/giga/get/Mission.java    |   5 +
 .../giga/postprocessing/M4aNoDash.java        |  43 +
 ...p4DashMuxer.java => Mp4FromDashMuxer.java} |  58 +-
 .../giga/postprocessing/Mp4Muxer.java         | 136 ---
 .../giga/postprocessing/Postprocessing.java   | 118 ++-
 .../io/ChunkFileInputStream.java              |   5 +-
 .../giga/postprocessing/io/CircularFile.java  | 375 --------
 .../postprocessing/io/CircularFileWriter.java | 459 ++++++++++
 .../giga/postprocessing/io/FileStream.java    | 126 ---
 .../postprocessing/io/SharpInputStream.java   |   4 +-
 .../giga/service/DownloadManager.java         | 227 +++--
 .../giga/service/DownloadManagerService.java  | 143 ++--
 .../giga/ui/adapter/MissionAdapter.java       | 255 ++++--
 .../giga/ui/fragment/MissionsFragment.java    |  33 +-
 .../res/drawable-hdpi/ic_pause_black_24dp.png | Bin 0 -> 135 bytes
 .../res/drawable-hdpi/ic_pause_white_24dp.png | Bin 0 -> 138 bytes
 .../res/drawable-mdpi/ic_pause_black_24dp.png | Bin 0 -> 109 bytes
 .../res/drawable-mdpi/ic_pause_white_24dp.png | Bin 0 -> 112 bytes
 .../drawable-xhdpi/ic_pause_black_24dp.png    | Bin 0 -> 162 bytes
 .../drawable-xhdpi/ic_pause_white_24dp.png    | Bin 0 -> 139 bytes
 .../drawable-xxhdpi/ic_pause_black_24dp.png   | Bin 0 -> 196 bytes
 .../drawable-xxhdpi/ic_pause_white_24dp.png   | Bin 0 -> 206 bytes
 .../drawable-xxxhdpi/ic_pause_black_24dp.png  | Bin 0 -> 248 bytes
 .../drawable-xxxhdpi/ic_pause_white_24dp.png  | Bin 0 -> 254 bytes
 app/src/main/res/menu/download_menu.xml       |  12 +
 app/src/main/res/menu/mission.xml             |  13 +-
 app/src/main/res/values-cmn/strings.xml       |   2 +-
 app/src/main/res/values-es/strings.xml        |  30 +-
 app/src/main/res/values/attrs.xml             |   1 +
 app/src/main/res/values/settings_keys.xml     |   1 +
 app/src/main/res/values/strings.xml           |  14 +-
 app/src/main/res/values/styles.xml            |   2 +
 app/src/main/res/xml/download_settings.xml    |   7 +
 49 files changed, 2715 insertions(+), 1936 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/streams/Mp4DashWriter.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
 delete mode 100644 app/src/main/java/org/schabi/newpipe/streams/TrackDataChunk.java
 create mode 100644 app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java
 rename app/src/main/java/us/shandian/giga/postprocessing/{Mp4DashMuxer.java => Mp4FromDashMuxer.java} (60%)
 delete mode 100644 app/src/main/java/us/shandian/giga/postprocessing/Mp4Muxer.java
 delete mode 100644 app/src/main/java/us/shandian/giga/postprocessing/io/CircularFile.java
 create mode 100644 app/src/main/java/us/shandian/giga/postprocessing/io/CircularFileWriter.java
 delete mode 100644 app/src/main/java/us/shandian/giga/postprocessing/io/FileStream.java
 create mode 100644 app/src/main/res/drawable-hdpi/ic_pause_black_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_pause_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_pause_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_pause_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_pause_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png

diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index ec6d42b29..0b4767133 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -7,6 +7,7 @@ import android.preference.PreferenceManager;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
@@ -52,6 +53,7 @@ import icepick.State;
 import io.reactivex.disposables.CompositeDisposable;
 import us.shandian.giga.postprocessing.Postprocessing;
 import us.shandian.giga.service.DownloadManagerService;
+import us.shandian.giga.service.DownloadManagerService.MissionCheck;
 
 public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
     private static final String TAG = "DialogFragment";
@@ -263,7 +265,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         Icepick.saveInstanceState(this, outState);
     }
@@ -476,23 +478,40 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
         final String finalFileName = fileName;
 
-        DownloadManagerService.checkForRunningMission(context, location, fileName, (listed, finished) -> {
-            if (listed) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                builder.setTitle(R.string.download_dialog_title)
-                        .setMessage(finished ? R.string.overwrite_warning : R.string.download_already_running)
-                        .setPositiveButton(
-                                finished ? R.string.overwrite : R.string.generate_unique_name,
-                                (dialog, which) -> downloadSelected(context, stream, location, finalFileName, kind, threads)
-                        )
-                        .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
-                            dialog.cancel();
-                        })
-                        .create()
-                        .show();
-            } else {
-                downloadSelected(context, stream, location, finalFileName, kind, threads);
+        DownloadManagerService.checkForRunningMission(context, location, fileName, (MissionCheck result) -> {
+            @StringRes int msgBtn;
+            @StringRes int msgBody;
+
+            switch (result) {
+                case Finished:
+                    msgBtn = R.string.overwrite;
+                    msgBody = R.string.overwrite_warning;
+                    break;
+                case Pending:
+                    msgBtn = R.string.overwrite;
+                    msgBody = R.string.download_already_pending;
+                    break;
+                case PendingRunning:
+                    msgBtn = R.string.generate_unique_name;
+                    msgBody = R.string.download_already_running;
+                    break;
+                default:
+                    downloadSelected(context, stream, location, finalFileName, kind, threads);
+                    return;
             }
+
+            // overwrite or unique name actions are done by the download manager
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.download_dialog_title)
+                    .setMessage(msgBody)
+                    .setPositiveButton(
+                            msgBtn,
+                            (dialog, which) -> downloadSelected(context, stream, location, finalFileName, kind, threads)
+                    )
+                    .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel())
+                    .create()
+                    .show();
         });
     }
 
@@ -503,14 +522,18 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         String secondaryStreamUrl = null;
         long nearLength = 0;
 
-        if (selectedStream instanceof VideoStream) {
+        if (selectedStream instanceof AudioStream) {
+            if (selectedStream.getFormat() == MediaFormat.M4A) {
+                psName = Postprocessing.ALGORITHM_M4A_NO_DASH;
+            }
+        } else if (selectedStream instanceof VideoStream) {
             SecondaryStreamHelper<AudioStream> secondaryStream = videoStreamsAdapter
                     .getAllSecondary()
                     .get(wrappedVideoStreams.getStreamsList().indexOf(selectedStream));
 
             if (secondaryStream != null) {
                 secondaryStreamUrl = secondaryStream.getStream().getUrl();
-                psName = selectedStream.getFormat() == MediaFormat.MPEG_4 ? Postprocessing.ALGORITHM_MP4_MUXER : Postprocessing.ALGORITHM_WEBM_MUXER;
+                psName = selectedStream.getFormat() == MediaFormat.MPEG_4 ? Postprocessing.ALGORITHM_MP4_FROM_DASH_MUXER : Postprocessing.ALGORITHM_WEBM_MUXER;
                 psArgs = null;
                 long videoSize = wrappedVideoStreams.getSizeInBytes((VideoStream) selectedStream);
 
diff --git a/app/src/main/java/org/schabi/newpipe/report/UserAction.java b/app/src/main/java/org/schabi/newpipe/report/UserAction.java
index 2b2369ad3..2cca9305a 100644
--- a/app/src/main/java/org/schabi/newpipe/report/UserAction.java
+++ b/app/src/main/java/org/schabi/newpipe/report/UserAction.java
@@ -17,7 +17,9 @@ public enum UserAction {
     REQUESTED_KIOSK("requested kiosk"),
     REQUESTED_COMMENTS("requested comments"),
     DELETE_FROM_HISTORY("delete from history"),
-    PLAY_STREAM("Play stream");
+    PLAY_STREAM("Play stream"),
+    DOWNLOAD_POSTPROCESSING("download post-processing"),
+    DOWNLOAD_FAILED("download failed");
 
 
     private final String message;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index 8214d7b4b..82c6853d5 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.settings;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -12,6 +13,8 @@ import com.nononsenseapps.filepicker.Utils;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 
+import java.io.File;
+
 public class DownloadSettingsFragment extends BasePreferenceFragment {
     private static final int REQUEST_DOWNLOAD_PATH = 0x1235;
     private static final int REQUEST_DOWNLOAD_AUDIO_PATH = 0x1236;
@@ -45,7 +48,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (DEBUG) {
-             Log.d(TAG, "onPreferenceTreeClick() called with: preference = [" + preference + "]");
+            Log.d(TAG, "onPreferenceTreeClick() called with: preference = [" + preference + "]");
         }
 
         if (preference.getKey().equals(DOWNLOAD_PATH_PREFERENCE)
@@ -78,6 +81,15 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
 
             defaultPreferences.edit().putString(key, path).apply();
             updatePreferencesSummary();
+
+            File target = new File(path);
+            if (!target.canWrite()) {
+                AlertDialog.Builder msg = new AlertDialog.Builder(getContext());
+                msg.setTitle(R.string.download_to_sdcard_error_title);
+                msg.setMessage(R.string.download_to_sdcard_error_message);
+                msg.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> { });
+                msg.show();
+            }
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
index d0e946eb7..567fa5229 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
@@ -1,9 +1,10 @@
 package org.schabi.newpipe.streams;
 
+import org.schabi.newpipe.streams.io.SharpStream;
+
 import java.io.EOFException;
 import java.io.IOException;
-
-import org.schabi.newpipe.streams.io.SharpStream;
+import java.io.InputStream;
 
 /**
  * @author kapodamy
@@ -15,89 +16,237 @@ public class DataReader {
     public final static int INTEGER_SIZE = 4;
     public final static int FLOAT_SIZE = 4;
 
-    private long pos;
-    public final SharpStream stream;
-    private final boolean rewind;
+    private long position = 0;
+    private final SharpStream stream;
+
+    private InputStream view;
+    private int viewSize;
 
     public DataReader(SharpStream stream) {
-        this.rewind = stream.canRewind();
         this.stream = stream;
-        this.pos = 0L;
+        this.readOffset = this.readBuffer.length;
     }
 
     public long position() {
-        return pos;
+        return position;
     }
 
-    public final int readInt() throws IOException {
+    public int read() throws IOException {
+        if (fillBuffer()) {
+            return -1;
+        }
+
+        position++;
+        readCount--;
+
+        return readBuffer[readOffset++] & 0xFF;
+    }
+
+    public long skipBytes(long amount) throws IOException {
+        if (readCount < 0) {
+            return 0;
+        } else if (readCount == 0) {
+            amount = stream.skip(amount);
+        } else {
+            if (readCount > amount) {
+                readCount -= (int) amount;
+                readOffset += (int) amount;
+            } else {
+                amount = readCount + stream.skip(amount - readCount);
+                readCount = 0;
+                readOffset = readBuffer.length;
+            }
+        }
+
+        position += amount;
+        return amount;
+    }
+
+    public int readInt() throws IOException {
         primitiveRead(INTEGER_SIZE);
         return primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
     }
 
-    public final int read() throws IOException {
-        int value = stream.read();
-        if (value == -1) {
-            throw new EOFException();
-        }
-
-        pos++;
-        return value;
+    public short readShort() throws IOException {
+        primitiveRead(SHORT_SIZE);
+        return (short) (primitive[0] << 8 | primitive[1]);
     }
 
-    public final long skipBytes(long amount) throws IOException {
-        amount = stream.skip(amount);
-        pos += amount;
-        return amount;
-    }
-
-    public final long readLong() throws IOException {
+    public long readLong() throws IOException {
         primitiveRead(LONG_SIZE);
         long high = primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
         long low = primitive[4] << 24 | primitive[5] << 16 | primitive[6] << 8 | primitive[7];
         return high << 32 | low;
     }
 
-    public final short readShort() throws IOException {
-        primitiveRead(SHORT_SIZE);
-        return (short) (primitive[0] << 8 | primitive[1]);
-    }
-
-    public final int read(byte[] buffer) throws IOException {
+    public int read(byte[] buffer) throws IOException {
         return read(buffer, 0, buffer.length);
     }
 
-    public final int read(byte[] buffer, int offset, int count) throws IOException {
-        int res = stream.read(buffer, offset, count);
-        pos += res;
+    public int read(byte[] buffer, int offset, int count) throws IOException {
+        if (readCount < 0) {
+            return -1;
+        }
+        int total = 0;
 
-        return res;
+        if (count >= readBuffer.length) {
+            if (readCount > 0) {
+                System.arraycopy(readBuffer, readOffset, buffer, offset, readCount);
+                readOffset += readCount;
+
+                offset += readCount;
+                count -= readCount;
+
+                total = readCount;
+                readCount = 0;
+            }
+            total += Math.max(stream.read(buffer, offset, count), 0);
+        } else {
+            while (count > 0 && !fillBuffer()) {
+                int read = Math.min(readCount, count);
+                System.arraycopy(readBuffer, readOffset, buffer, offset, read);
+
+                readOffset += read;
+                readCount -= read;
+
+                offset += read;
+                count -= read;
+
+                total += read;
+            }
+        }
+
+        position += total;
+        return total;
     }
 
-    public final boolean available() {
-        return stream.available() > 0;
+    public boolean available() {
+        return readCount > 0 || stream.available() > 0;
     }
 
     public void rewind() throws IOException {
         stream.rewind();
-        pos = 0;
+
+        if ((position - viewSize) > 0) {
+            viewSize = 0;// drop view
+        } else {
+            viewSize += position;
+        }
+
+        position = 0;
+        readOffset = readBuffer.length;
     }
 
     public boolean canRewind() {
-        return rewind;
+        return stream.canRewind();
     }
 
-    private short[] primitive = new short[LONG_SIZE];
+    /**
+     * Wraps this instance of {@code DataReader} into {@code InputStream}
+     * object. Note: Any read in the {@code DataReader} will not modify
+     * (decrease) the view size
+     *
+     * @param size the size of the view
+     * @return the view
+     */
+    public InputStream getView(int size) {
+        if (view == null) {
+            view = new InputStream() {
+                @Override
+                public int read() throws IOException {
+                    if (viewSize < 1) {
+                        return -1;
+                    }
+                    int res = DataReader.this.read();
+                    if (res > 0) {
+                        viewSize--;
+                    }
+                    return res;
+                }
+
+                @Override
+                public int read(byte[] buffer) throws IOException {
+                    return read(buffer, 0, buffer.length);
+                }
+
+                @Override
+                public int read(byte[] buffer, int offset, int count) throws IOException {
+                    if (viewSize < 1) {
+                        return -1;
+                    }
+
+                    int res = DataReader.this.read(buffer, offset, Math.min(viewSize, count));
+                    viewSize -= res;
+
+                    return res;
+                }
+
+                @Override
+                public long skip(long amount) throws IOException {
+                    if (viewSize < 1) {
+                        return 0;
+                    }
+                    int res = (int) DataReader.this.skipBytes(Math.min(amount, viewSize));
+                    viewSize -= res;
+
+                    return res;
+                }
+
+                @Override
+                public int available() {
+                    return viewSize;
+                }
+
+                @Override
+                public void close() {
+                    viewSize = 0;
+                }
+
+                @Override
+                public boolean markSupported() {
+                    return false;
+                }
+
+            };
+        }
+        viewSize = size;
+
+        return view;
+    }
+
+    private final short[] primitive = new short[LONG_SIZE];
 
     private void primitiveRead(int amount) throws IOException {
         byte[] buffer = new byte[amount];
-        int read = stream.read(buffer, 0, amount);
-        pos += read;
+        int read = read(buffer, 0, amount);
+
         if (read != amount) {
-            throw new EOFException("Truncated data, missing " + String.valueOf(amount - read) + " bytes");
+            throw new EOFException("Truncated stream, missing " + String.valueOf(amount - read) + " bytes");
         }
 
-        for (int i = 0; i < buffer.length; i++) {
-            primitive[i] = (short) (buffer[i] & 0xFF);// the "byte" datatype is signed and is very annoying
+        for (int i = 0; i < amount; i++) {
+            primitive[i] = (short) (buffer[i] & 0xFF);// the "byte" data type in java is signed and is very annoying
         }
     }
+
+    private final byte[] readBuffer = new byte[8 * 1024];
+    private int readOffset;
+    private int readCount;
+
+    private boolean fillBuffer() throws IOException {
+        if (readCount < 0) {
+            return true;
+        }
+        if (readOffset >= readBuffer.length) {
+            readCount = stream.read(readBuffer);
+            if (readCount < 1) {
+                readCount = -1;
+                return true;
+            }
+            readOffset = 0;
+        }
+
+        return readCount < 1;
+    }
+
 }
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
index 271929d47..c52ebf3aa 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
@@ -1,17 +1,15 @@
 package org.schabi.newpipe.streams;
 
+import org.schabi.newpipe.streams.io.SharpStream;
+
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-
 import java.nio.ByteBuffer;
-
 import java.util.ArrayList;
 import java.util.NoSuchElementException;
 
-import org.schabi.newpipe.streams.io.SharpStream;
-
 /**
  * @author kapodamy
  */
@@ -35,14 +33,29 @@ public class Mp4DashReader {
     private static final int ATOM_TREX = 0x74726578;
     private static final int ATOM_TKHD = 0x746B6864;
     private static final int ATOM_MFRA = 0x6D667261;
-    private static final int ATOM_TFRA = 0x74667261;
     private static final int ATOM_MDHD = 0x6D646864;
+    private static final int ATOM_EDTS = 0x65647473;
+    private static final int ATOM_ELST = 0x656C7374;
+    private static final int ATOM_HDLR = 0x68646C72;
+    private static final int ATOM_MINF = 0x6D696E66;
+    private static final int ATOM_DINF = 0x64696E66;
+    private static final int ATOM_STBL = 0x7374626C;
+    private static final int ATOM_STSD = 0x73747364;
+    private static final int ATOM_VMHD = 0x766D6864;
+    private static final int ATOM_SMHD = 0x736D6864;
+
     private static final int BRAND_DASH = 0x64617368;
+    private static final int BRAND_ISO5 = 0x69736F35;
+
+    private static final int HANDLER_VIDE = 0x76696465;
+    private static final int HANDLER_SOUN = 0x736F756E;
+    private static final int HANDLER_SUBT = 0x73756274;
     // </editor-fold>
 
     private final DataReader stream;
 
     private Mp4Track[] tracks = null;
+    private int[] brands = null;
 
     private Box box;
     private Moof moof;
@@ -50,9 +63,10 @@ public class Mp4DashReader {
     private boolean chunkZero = false;
 
     private int selectedTrack = -1;
+    private Box backupBox = null;
 
     public enum TrackKind {
-        Audio, Video, Other
+        Audio, Video, Subtitles, Other
     }
 
     public Mp4DashReader(SharpStream source) {
@@ -65,8 +79,15 @@ public class Mp4DashReader {
         }
 
         box = readBox(ATOM_FTYP);
-        if (parse_ftyp() != BRAND_DASH) {
-            throw new NoSuchElementException("Main Brand is not dash");
+        brands = parse_ftyp(box);
+        switch (brands[0]) {
+            case BRAND_DASH:
+            case BRAND_ISO5:// ¿why not?
+                break;
+            default:
+                throw new NoSuchElementException(
+                        "Not a MPEG-4 DASH container, major brand is not 'dash' or 'iso5' is " + boxName(brands[0])
+                );
         }
 
         Moov moov = null;
@@ -84,8 +105,6 @@ public class Mp4DashReader {
                     break;
                 case ATOM_MFRA:
                     break;
-                case ATOM_MDAT:
-                    throw new IOException("Expected moof, found mdat");
             }
         }
 
@@ -107,15 +126,26 @@ public class Mp4DashReader {
                 }
             }
 
-            if (moov.trak[i].tkhd.bHeight == 0 && moov.trak[i].tkhd.bWidth == 0) {
-                tracks[i].kind = moov.trak[i].tkhd.bVolume == 0 ? TrackKind.Other : TrackKind.Audio;
-            } else {
-                tracks[i].kind = TrackKind.Video;
+            switch (moov.trak[i].mdia.hdlr.subType) {
+                case HANDLER_VIDE:
+                    tracks[i].kind = TrackKind.Video;
+                    break;
+                case HANDLER_SOUN:
+                    tracks[i].kind = TrackKind.Audio;
+                    break;
+                case HANDLER_SUBT:
+                    tracks[i].kind = TrackKind.Subtitles;
+                    break;
+                default:
+                    tracks[i].kind = TrackKind.Other;
+                    break;
             }
         }
+
+        backupBox = box;
     }
 
-    public Mp4Track selectTrack(int index) {
+    Mp4Track selectTrack(int index) {
         selectedTrack = index;
         return tracks[index];
     }
@@ -126,7 +156,7 @@ public class Mp4DashReader {
      * @return list with a basic info
      * @throws IOException if the source stream is not seekeable
      */
-    public int getFragmentsCount() throws IOException {
+    int getFragmentsCount() throws IOException {
         if (selectedTrack < 0) {
             throw new IllegalStateException("track no selected");
         }
@@ -136,7 +166,6 @@ public class Mp4DashReader {
 
         Box tmp;
         int count = 0;
-        long orig_offset = stream.position();
 
         if (box.type == ATOM_MOOF) {
             tmp = box;
@@ -162,17 +191,36 @@ public class Mp4DashReader {
             ensure(tmp);
         } while (stream.available() && (tmp = readBox()) != null);
 
-        stream.rewind();
-        stream.skipBytes((int) orig_offset);
+        rewind();
 
         return count;
     }
 
+    public int[] getBrands() {
+        if (brands == null) throw new IllegalStateException("Not parsed");
+        return brands;
+    }
+
+    public void rewind() throws IOException {
+        if (!stream.canRewind()) {
+            throw new IOException("The provided stream doesn't allow seek");
+        }
+        if (box == null) {
+            return;
+        }
+
+        box = backupBox;
+        chunkZero = false;
+
+        stream.rewind();
+        stream.skipBytes(backupBox.offset + (DataReader.INTEGER_SIZE * 2));
+    }
+
     public Mp4Track[] getAvailableTracks() {
         return tracks;
     }
 
-    public Mp4TrackChunk getNextChunk() throws IOException {
+    public Mp4DashChunk getNextChunk(boolean infoOnly) throws IOException {
         Mp4Track track = tracks[selectedTrack];
 
         while (stream.available()) {
@@ -208,7 +256,7 @@ public class Mp4DashReader {
                             if (hasFlag(moof.traf.tfhd.bFlags, 0x10)) {
                                 moof.traf.trun.chunkSize = moof.traf.tfhd.defaultSampleSize * moof.traf.trun.entryCount;
                             } else {
-                                moof.traf.trun.chunkSize = box.size - 8;
+                                moof.traf.trun.chunkSize = (int) (box.size - 8);
                             }
                         }
                         if (!hasFlag(moof.traf.trun.bFlags, 0x900) && moof.traf.trun.chunkDuration == 0) {
@@ -228,9 +276,12 @@ public class Mp4DashReader {
                         continue;// find another chunk
                     }
 
-                    Mp4TrackChunk chunk = new Mp4TrackChunk();
+                    Mp4DashChunk chunk = new Mp4DashChunk();
                     chunk.moof = moof;
-                    chunk.data = new TrackDataChunk(stream, moof.traf.trun.chunkSize);
+                    if (!infoOnly) {
+                        chunk.data = stream.getView(moof.traf.trun.chunkSize);
+                    }
+
                     moof = null;
 
                     stream.skipBytes(chunk.moof.traf.trun.dataOffset);
@@ -269,6 +320,10 @@ public class Mp4DashReader {
         b.size = stream.readInt();
         b.type = stream.readInt();
 
+        if (b.size == 1) {
+            b.size = stream.readLong();
+        }
+
         return b;
     }
 
@@ -280,6 +335,25 @@ public class Mp4DashReader {
         return b;
     }
 
+    private byte[] readFullBox(Box ref) throws IOException {
+        // full box reading is limited to 2 GiB, and should be enough
+        int size = (int) ref.size;
+
+        ByteBuffer buffer = ByteBuffer.allocate(size);
+        buffer.putInt(size);
+        buffer.putInt(ref.type);
+
+        int read = size - 8;
+
+        if (stream.read(buffer.array(), 8, read) != read) {
+            throw new EOFException(
+                    String.format("EOF reached in box: type=%s offset=%s size=%s", boxName(ref.type), ref.offset, ref.size)
+            );
+        }
+
+        return buffer.array();
+    }
+
     private void ensure(Box ref) throws IOException {
         long skip = ref.offset + ref.size - stream.position();
 
@@ -310,6 +384,14 @@ public class Mp4DashReader {
         return null;
     }
 
+    private Box untilAnyBox(Box ref) throws IOException {
+        if (stream.position() >= (ref.offset + ref.size)) {
+            return null;
+        }
+
+        return readBox();
+    }
+
     // </editor-fold>
 
     // <editor-fold defaultState="collapsed" desc="Box readers">
@@ -329,7 +411,7 @@ public class Mp4DashReader {
                 return obj;
             }
         }
-        
+
         return obj;
     }
 
@@ -397,14 +479,14 @@ public class Mp4DashReader {
 
     private long parse_tfdt() throws IOException {
         int version = stream.read();
-        stream.skipBytes(3);// flags     
+        stream.skipBytes(3);// flags
         return version == 0 ? readUint() : stream.readLong();
     }
 
     private Trun parse_trun() throws IOException {
         Trun obj = new Trun();
         obj.bFlags = stream.readInt();
-        obj.entryCount = stream.readInt();// unsigned int    
+        obj.entryCount = stream.readInt();// unsigned int
 
         obj.entries_rowSize = 0;
         if (hasFlag(obj.bFlags, 0x0100)) {
@@ -448,11 +530,18 @@ public class Mp4DashReader {
         return obj;
     }
 
-    private int parse_ftyp() throws IOException {
-        int brand = stream.readInt();
+    private int[] parse_ftyp(Box ref) throws IOException {
+        int i = 0;
+        int[] list = new int[(int) ((ref.offset + ref.size - stream.position() - 4) / 4)];
+
+        list[i++] = stream.readInt();// major brand
+
         stream.skipBytes(4);// minor version
 
-        return brand;
+        for (; i < list.length; i++)
+            list[i] = stream.readInt();// compatible brands
+
+        return list;
     }
 
     private Mvhd parse_mvhd() throws IOException {
@@ -521,32 +610,66 @@ public class Mp4DashReader {
         trak.tkhd = parse_tkhd();
         ensure(b);
 
-        b = untilBox(ref, ATOM_MDIA);
-        trak.mdia = new byte[b.size];
+        while ((b = untilBox(ref, ATOM_MDIA, ATOM_EDTS)) != null) {
+            switch (b.type) {
+                case ATOM_MDIA:
+                    trak.mdia = parse_mdia(b);
+                    break;
+                case ATOM_EDTS:
+                    trak.edst_elst = parse_edts(b);
+                    break;
+            }
 
-        ByteBuffer buffer = ByteBuffer.wrap(trak.mdia);
-        buffer.putInt(b.size);
-        buffer.putInt(ATOM_MDIA);
-        stream.read(trak.mdia, 8, b.size - 8);
-
-        trak.mdia_mdhd_timeScale = parse_mdia(buffer);
+            ensure(b);
+        }
 
         return trak;
     }
 
-    private int parse_mdia(ByteBuffer data) {
-        while (data.hasRemaining()) {
-            int end = data.position() + data.getInt();
-            if (data.getInt() == ATOM_MDHD) {
-                byte version = data.get();
-                data.position(data.position() + 3 + ((version == 0 ? 4 : 8) * 2));
-                return data.getInt();
-            }
+    private Mdia parse_mdia(Box ref) throws IOException {
+        Mdia obj = new Mdia();
 
-            data.position(end);
+        Box b;
+        while ((b = untilBox(ref, ATOM_MDHD, ATOM_HDLR, ATOM_MINF)) != null) {
+            switch (b.type) {
+                case ATOM_MDHD:
+                    obj.mdhd = readFullBox(b);
+
+                    // read time scale
+                    ByteBuffer buffer = ByteBuffer.wrap(obj.mdhd);
+                    byte version = buffer.get(8);
+                    buffer.position(12 + ((version == 0 ? 4 : 8) * 2));
+                    obj.mdhd_timeScale = buffer.getInt();
+                    break;
+                case ATOM_HDLR:
+                    obj.hdlr = parse_hdlr(b);
+                    break;
+                case ATOM_MINF:
+                    obj.minf = parse_minf(b);
+                    break;
+            }
+            ensure(b);
         }
 
-        return 0;// this NEVER should happen
+        return obj;
+    }
+
+    private Hdlr parse_hdlr(Box ref) throws IOException {
+        // version
+        // flags
+        stream.skipBytes(4);
+
+        Hdlr obj = new Hdlr();
+        obj.bReserved = new byte[12];
+
+        obj.type = stream.readInt();
+        obj.subType = stream.readInt();
+        stream.read(obj.bReserved);
+
+        // component name (is a ansi/ascii string)
+        stream.skipBytes((ref.offset + ref.size) - stream.position());
+
+        return obj;
     }
 
     private Moov parse_moov(Box ref) throws IOException {
@@ -570,7 +693,7 @@ public class Mp4DashReader {
             ensure(b);
         }
 
-        moov.trak = tmp.toArray(new Trak[tmp.size()]);
+        moov.trak = tmp.toArray(new Trak[0]);
 
         return moov;
     }
@@ -584,7 +707,7 @@ public class Mp4DashReader {
             ensure(b);
         }
 
-        return tmp.toArray(new Trex[tmp.size()]);
+        return tmp.toArray(new Trex[0]);
     }
 
     private Trex parse_trex() throws IOException {
@@ -602,74 +725,74 @@ public class Mp4DashReader {
         return obj;
     }
 
-    private Tfra parse_tfra() throws IOException {
-        int version = stream.read();
-
-        stream.skipBytes(3);// flags
-
-        Tfra tfra = new Tfra();
-        tfra.trackId = stream.readInt();
-
-        stream.skipBytes(3);// reserved
-        int bFlags = stream.read();
-        int size_tts = ((bFlags >> 4) & 3) + ((bFlags >> 2) & 3) + (bFlags & 3);
-
-        tfra.entries_time = new int[stream.readInt()];
-
-        for (int i = 0; i < tfra.entries_time.length; i++) {
-            tfra.entries_time[i] = version == 0 ? stream.readInt() : (int) stream.readLong();
-            stream.skipBytes(size_tts + (version == 0 ? 4 : 8));
+    private Elst parse_edts(Box ref) throws IOException {
+        Box b = untilBox(ref, ATOM_ELST);
+        if (b == null) {
+            return null;
         }
 
-        return tfra;
-    }
-
-    private Sidx parse_sidx() throws IOException {
-        int version = stream.read();
+        Elst obj = new Elst();
 
+        boolean v1 = stream.read() == 1;
         stream.skipBytes(3);// flags
 
-        Sidx obj = new Sidx();
-        obj.referenceId = stream.readInt();
-        obj.timescale = stream.readInt();
+        int entryCount = stream.readInt();
+        if (entryCount < 1) {
+            obj.bMediaRate = 0x00010000;// default media rate (1.0)
+            return obj;
+        }
 
-        // earliest presentation entries_time
-        // first offset
-        // reserved
-        stream.skipBytes((2 * (version == 0 ? 4 : 8)) + 2);
+        if (v1) {
+            stream.skipBytes(DataReader.LONG_SIZE);// segment duration
+            obj.MediaTime = stream.readLong();
+            // ignore all remain entries
+            stream.skipBytes((entryCount - 1) * (DataReader.LONG_SIZE * 2));
+        } else {
+            stream.skipBytes(DataReader.INTEGER_SIZE);// segment duration
+            obj.MediaTime = stream.readInt();
+        }
 
-        obj.entries_subsegmentDuration = new int[stream.readShort()];
+        obj.bMediaRate = stream.readInt();
 
-        for (int i = 0; i < obj.entries_subsegmentDuration.length; i++) {
-            // reference type
-            // referenced size
-            stream.skipBytes(4);
-            obj.entries_subsegmentDuration[i] = stream.readInt();// unsigned int
+        return obj;
+    }
 
-            // starts with SAP
-            // SAP type
-            // SAP delta entries_time
-            stream.skipBytes(4);
+    private Minf parse_minf(Box ref) throws IOException {
+        Minf obj = new Minf();
+
+        Box b;
+        while ((b = untilAnyBox(ref)) != null) {
+
+            switch (b.type) {
+                case ATOM_DINF:
+                    obj.dinf = readFullBox(b);
+                    break;
+                case ATOM_STBL:
+                    obj.stbl_stsd = parse_stbl(b);
+                    break;
+                case ATOM_VMHD:
+                case ATOM_SMHD:
+                    obj.$mhd = readFullBox(b);
+                    break;
+
+            }
+            ensure(b);
         }
 
         return obj;
     }
 
-    private Tfra[] parse_mfra(Box ref, int trackCount) throws IOException {
-        ArrayList<Tfra> tmp = new ArrayList<>(trackCount);
-        long limit = ref.offset + ref.size;
+    /**
+     * this only read the "stsd" box inside
+     */
+    private byte[] parse_stbl(Box ref) throws IOException {
+        Box b = untilBox(ref, ATOM_STSD);
 
-        while (stream.position() < limit) {
-            box = readBox();
-
-            if (box.type == ATOM_TFRA) {
-                tmp.add(parse_tfra());
-            }
-
-            ensure(box);
+        if (b == null) {
+            return new byte[0];// this never should happens (missing codec startup data)
         }
 
-        return tmp.toArray(new Tfra[tmp.size()]);
+        return readFullBox(b);
     }
 
     // </editor-fold>
@@ -679,14 +802,7 @@ public class Mp4DashReader {
 
         int type;
         long offset;
-        int size;
-    }
-
-    class Sidx {
-
-        int timescale;
-        int referenceId;
-        int[] entries_subsegmentDuration;
+        long size;
     }
 
     public class Moof {
@@ -711,12 +827,16 @@ public class Mp4DashReader {
         int defaultSampleFlags;
     }
 
-    public class TrunEntry {
+    class TrunEntry {
+
+        int sampleDuration;
+        int sampleSize;
+        int sampleFlags;
+        int sampleCompositionTimeOffset;
+
+        boolean hasCompositionTimeOffset;
+        boolean isKeyframe;
 
-        public int sampleDuration;
-        public int sampleSize;
-        public int sampleFlags;
-        public int sampleCompositionTimeOffset;
     }
 
     public class Trun {
@@ -749,6 +869,31 @@ public class Mp4DashReader {
                 entry.sampleCompositionTimeOffset = buffer.getInt();
             }
 
+            entry.hasCompositionTimeOffset = hasFlag(bFlags, 0x0800);
+            entry.isKeyframe = !hasFlag(entry.sampleFlags, 0x10000);
+
+            return entry;
+        }
+
+        public TrunEntry getAbsoluteEntry(int i, Tfhd header) {
+            TrunEntry entry = getEntry(i);
+
+            if (!hasFlag(bFlags, 0x0100) && hasFlag(header.bFlags, 0x20)) {
+                entry.sampleFlags = header.defaultSampleFlags;
+            }
+
+            if (!hasFlag(bFlags, 0x0200) && hasFlag(header.bFlags, 0x10)) {
+                entry.sampleSize = header.defaultSampleSize;
+            }
+
+            if (!hasFlag(bFlags, 0x0100) && hasFlag(header.bFlags, 0x08)) {
+                entry.sampleDuration = header.defaultSampleDuration;
+            }
+
+            if (i == 0 && hasFlag(bFlags, 0x0004)) {
+                entry.sampleFlags = bFirstSampleFlags;
+            }
+
             return entry;
         }
     }
@@ -768,9 +913,9 @@ public class Mp4DashReader {
     public class Trak {
 
         public Tkhd tkhd;
-        public int mdia_mdhd_timeScale;
+        public Elst edst_elst;
+        public Mdia mdia;
 
-        byte[] mdia;
     }
 
     class Mvhd {
@@ -786,12 +931,6 @@ public class Mp4DashReader {
         Trex[] mvex_trex;
     }
 
-    class Tfra {
-
-        int trackId;
-        int[] entries_time;
-    }
-
     public class Trex {
 
         private int trackId;
@@ -801,6 +940,34 @@ public class Mp4DashReader {
         int defaultSampleFlags;
     }
 
+    public class Elst {
+
+        public long MediaTime;
+        public int bMediaRate;
+    }
+
+    public class Mdia {
+
+        public int mdhd_timeScale;
+        public byte[] mdhd;
+        public Hdlr hdlr;
+        public Minf minf;
+    }
+
+    public class Hdlr {
+
+        public int type;
+        public int subType;
+        public byte[] bReserved;
+    }
+
+    public class Minf {
+
+        public byte[] dinf;
+        public byte[] stbl_stsd;
+        public byte[] $mhd;
+    }
+
     public class Mp4Track {
 
         public TrackKind kind;
@@ -808,10 +975,43 @@ public class Mp4DashReader {
         public Trex trex;
     }
 
-    public class Mp4TrackChunk {
+    public class Mp4DashChunk {
 
         public InputStream data;
         public Moof moof;
+        private int i = 0;
+
+        public TrunEntry getNextSampleInfo() {
+            if (i >= moof.traf.trun.entryCount) {
+                return null;
+            }
+            return moof.traf.trun.getAbsoluteEntry(i++, moof.traf.tfhd);
+        }
+
+        public Mp4DashSample getNextSample() throws IOException {
+            if (data == null) {
+                throw new IllegalStateException("This chunk has info only");
+            }
+            if (i >= moof.traf.trun.entryCount) {
+                return null;
+            }
+
+            Mp4DashSample sample = new Mp4DashSample();
+            sample.info = moof.traf.trun.getAbsoluteEntry(i++, moof.traf.tfhd);
+            sample.data = new byte[sample.info.sampleSize];
+
+            if (data.read(sample.data) != sample.info.sampleSize) {
+                throw new EOFException("EOF reached while reading a sample");
+            }
+
+            return sample;
+        }
+    }
+
+    public class Mp4DashSample {
+
+        public TrunEntry info;
+        public byte[] data;
     }
 //</editor-fold>
 }
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashWriter.java
deleted file mode 100644
index babb2e24c..000000000
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashWriter.java
+++ /dev/null
@@ -1,623 +0,0 @@
-package org.schabi.newpipe.streams;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import org.schabi.newpipe.streams.Mp4DashReader.Mp4Track;
-import org.schabi.newpipe.streams.Mp4DashReader.Mp4TrackChunk;
-import org.schabi.newpipe.streams.Mp4DashReader.Trak;
-import org.schabi.newpipe.streams.Mp4DashReader.Trex;
-
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.schabi.newpipe.streams.Mp4DashReader.hasFlag;
-
-/**
- *
- * @author kapodamy
- */
-public class Mp4DashWriter {
-
-    private final static byte DIMENSIONAL_FIVE = 5;
-    private final static byte DIMENSIONAL_TWO = 2;
-    private final static short DEFAULT_TIMESCALE = 1000;
-    private final static int BUFFER_SIZE = 8 * 1024;
-    private final static byte DEFAULT_TREX_SIZE = 32;
-    private final static byte[] TFRA_TTS_DEFAULT = new byte[]{0x01, 0x01, 0x01};
-    private final static int EPOCH_OFFSET = 2082844800;
-
-    private Mp4Track[] infoTracks;
-    private SharpStream[] sourceTracks;
-
-    private Mp4DashReader[] readers;
-    private final long time;
-
-    private boolean done = false;
-    private boolean parsed = false;
-
-    private long written = 0;
-    private ArrayList<ArrayList<Integer>> chunkTimes;
-    private ArrayList<Long> moofOffsets;
-    private ArrayList<Integer> fragSizes;
-
-    public Mp4DashWriter(SharpStream... source) {
-        sourceTracks = source;
-        readers = new Mp4DashReader[sourceTracks.length];
-        infoTracks = new Mp4Track[sourceTracks.length];
-        time = (System.currentTimeMillis() / 1000L) + EPOCH_OFFSET;
-    }
-
-    public Mp4Track[] getTracksFromSource(int sourceIndex) throws IllegalStateException {
-        if (!parsed) {
-            throw new IllegalStateException("All sources must be parsed first");
-        }
-
-        return readers[sourceIndex].getAvailableTracks();
-    }
-
-    public void parseSources() throws IOException, IllegalStateException {
-        if (done) {
-            throw new IllegalStateException("already done");
-        }
-        if (parsed) {
-            throw new IllegalStateException("already parsed");
-        }
-
-        try {
-            for (int i = 0; i < readers.length; i++) {
-                readers[i] = new Mp4DashReader(sourceTracks[i]);
-                readers[i].parse();
-            }
-
-        } finally {
-            parsed = true;
-        }
-    }
-
-    public void selectTracks(int... trackIndex) throws IOException {
-        if (done) {
-            throw new IOException("already done");
-        }
-        if (chunkTimes != null) {
-            throw new IOException("tracks already selected");
-        }
-
-        try {
-            chunkTimes = new ArrayList<>(readers.length);
-            moofOffsets = new ArrayList<>(32);
-            fragSizes = new ArrayList<>(32);
-
-            for (int i = 0; i < readers.length; i++) {
-                infoTracks[i] = readers[i].selectTrack(trackIndex[i]);
-
-                chunkTimes.add(new ArrayList<Integer>(32));
-            }
-
-        } finally {
-            parsed = true;
-        }
-    }
-
-    public long getBytesWritten() {
-        return written;
-    }
-
-    public void build(SharpStream out) throws IOException, RuntimeException {
-        if (done) {
-            throw new RuntimeException("already done");
-        }
-        if (!out.canWrite()) {
-            throw new IOException("the provided output is not writable");
-        }
-
-        long sidxOffsets = -1;
-        int maxFrags = 0;
-
-        for (SharpStream stream : sourceTracks) {
-            if (!stream.canRewind()) {
-                sidxOffsets = -2;// sidx not available
-            }
-        }
-
-        try {
-            dump(make_ftyp(), out);
-            dump(make_moov(), out);
-
-            if (sidxOffsets == -1 && out.canRewind()) {
-                //<editor-fold defaultstate="collapsed" desc="calculate sidx">
-                int reserved = 0;
-                for (Mp4DashReader reader : readers) {
-                    int count = reader.getFragmentsCount();
-                    if (count > maxFrags) {
-                        maxFrags = count;
-                    }
-                    reserved += 12 + calcSidxBodySize(count);
-                }
-                if (maxFrags > 0xFFFF) {
-                    sidxOffsets = -3;// TODO: to many fragments, needs a multi-sidx implementation
-                } else {
-                    sidxOffsets = written;
-                    dump(make_free(reserved), out);
-                }
-                //</editor-fold>
-            }
-            ArrayList<Mp4TrackChunk> chunks = new ArrayList<>(readers.length);
-            chunks.add(null);
-
-            int read;
-            byte[] buffer = new byte[BUFFER_SIZE];
-            int sequenceNumber = 1;
-
-            while (true) {
-                chunks.clear();
-
-                for (int i = 0; i < readers.length; i++) {
-                    Mp4TrackChunk chunk = readers[i].getNextChunk();
-                    if (chunk == null || chunk.moof.traf.trun.chunkSize < 1) {
-                        continue;
-                    }
-                    chunk.moof.traf.tfhd.trackId = i + 1;
-                    chunks.add(chunk);
-
-                    if (sequenceNumber == 1) {
-                        if (chunk.moof.traf.trun.entryCount > 0 && hasFlag(chunk.moof.traf.trun.bFlags, 0x0800)) {
-                            chunkTimes.get(i).add(chunk.moof.traf.trun.getEntry(0).sampleCompositionTimeOffset);
-                        } else {
-                            chunkTimes.get(i).add(0);
-                        }
-                    }
-
-                    chunkTimes.get(i).add(chunk.moof.traf.trun.chunkDuration);
-                }
-
-                if (chunks.size() < 1) {
-                    break;
-                }
-
-                long offset = written;
-                moofOffsets.add(offset);
-
-                dump(make_moof(sequenceNumber++, chunks, offset), out);
-                dump(make_mdat(chunks), out);
-
-                for (Mp4TrackChunk chunk : chunks) {
-                    while ((read = chunk.data.read(buffer)) > 0) {
-                        out.write(buffer, 0, read);
-                        written += read;
-                    }
-                }
-
-                fragSizes.add((int) (written - offset));
-            }
-
-            dump(make_mfra(), out);
-
-            if (sidxOffsets > 0 && moofOffsets.size() == maxFrags) {
-                long len = written;
-
-                out.rewind();
-                out.skip(sidxOffsets);
-
-                written = sidxOffsets;
-                sidxOffsets = moofOffsets.get(0);
-
-                for (int i = 0; i < readers.length; i++) {
-                    dump(make_sidx(i, sidxOffsets - written), out);
-                }
-
-                written = len;
-            }
-        } finally {
-            done = true;
-        }
-    }
-
-    public boolean isDone() {
-        return done;
-    }
-
-    public boolean isParsed() {
-        return parsed;
-    }
-
-    public void close() {
-        done = true;
-        parsed = true;
-
-        for (SharpStream src : sourceTracks) {
-            src.dispose();
-        }
-
-        sourceTracks = null;
-        readers = null;
-        infoTracks = null;
-        moofOffsets = null;
-        chunkTimes = null;
-    }
-
-    // <editor-fold defaultstate="collapsed" desc="Utils">
-    private void dump(byte[][] buffer, SharpStream stream) throws IOException {
-        for (byte[] buff : buffer) {
-            stream.write(buff);
-            written += buff.length;
-        }
-    }
-
-    private byte[][] lengthFor(byte[][] buffer) {
-        int length = 0;
-        for (byte[] buff : buffer) {
-            length += buff.length;
-        }
-
-        ByteBuffer.wrap(buffer[0]).putInt(length);
-
-        return buffer;
-    }
-
-    private int calcSidxBodySize(int entryCount) {
-        return 4 + 4 + 8 + 8 + 4 + (entryCount * 12);
-    }
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Box makers">
-    private byte[][] make_moof(int sequence, ArrayList<Mp4TrackChunk> chunks, long referenceOffset) {
-        int pos = 2;
-        TrunExtra[] extra = new TrunExtra[chunks.size()];
-
-        byte[][] buffer = new byte[pos + (extra.length * DIMENSIONAL_FIVE)][];
-        buffer[0] = new byte[]{
-            0x00, 0x00, 0x00, 0x00, 0x6D, 0x6F, 0x6F, 0x66,// info header
-            0x00, 0x00, 0x00, 0x10, 0x6D, 0x66, 0x68, 0x64, 0x00, 0x00, 0x00, 0x00//mfhd
-        };
-        buffer[1] = new byte[4];
-        ByteBuffer.wrap(buffer[1]).putInt(sequence);
-
-        for (int i = 0; i < extra.length; i++) {
-            extra[i] = new TrunExtra();
-            for (byte[] buff : make_traf(chunks.get(i), extra[i], referenceOffset)) {
-                buffer[pos++] = buff;
-            }
-        }
-
-        lengthFor(buffer);
-
-        int offset = 8 + ByteBuffer.wrap(buffer[0]).getInt();
-
-        for (int i = 0; i < extra.length; i++) {
-            extra[i].byteBuffer.putInt(offset);
-            offset += chunks.get(i).moof.traf.trun.chunkSize;
-        }
-
-        return buffer;
-    }
-
-    private byte[][] make_traf(Mp4TrackChunk chunk, TrunExtra extra, long moofOffset) {
-        byte[][] buffer = new byte[DIMENSIONAL_FIVE][];
-        buffer[0] = new byte[]{
-            0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x66,
-            0x00, 0x00, 0x00, 0x00, 0x74, 0x66, 0x68, 0x64
-        };
-
-        int flags = (chunk.moof.traf.tfhd.bFlags & 0x38) | 0x01;
-        byte tfhdBodySize = 8 + 8;
-        if (hasFlag(flags, 0x08)) {
-            tfhdBodySize += 4;
-        }
-        if (hasFlag(flags, 0x10)) {
-            tfhdBodySize += 4;
-        }
-        if (hasFlag(flags, 0x20)) {
-            tfhdBodySize += 4;
-        }
-        buffer[1] = new byte[tfhdBodySize];
-        ByteBuffer set = ByteBuffer.wrap(buffer[1]);
-        set.position(4);
-        set.putInt(chunk.moof.traf.tfhd.trackId);
-        set.putLong(moofOffset);
-        if (hasFlag(flags, 0x08)) {
-            set.putInt(chunk.moof.traf.tfhd.defaultSampleDuration);
-        }
-        if (hasFlag(flags, 0x10)) {
-            set.putInt(chunk.moof.traf.tfhd.defaultSampleSize);
-        }
-        if (hasFlag(flags, 0x20)) {
-            set.putInt(chunk.moof.traf.tfhd.defaultSampleFlags);
-        }
-        set.putInt(0, flags);
-        ByteBuffer.wrap(buffer[0]).putInt(8, 8 + tfhdBodySize);
-
-        buffer[2] = new byte[]{
-            0x00, 0x00, 0x00, 0x14,
-            0x74, 0x66, 0x64, 0x74,
-            0x01, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00
-        };
-
-        ByteBuffer.wrap(buffer[2]).putLong(12, chunk.moof.traf.tfdt);
-
-        buffer[3] = new byte[]{
-            0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x75, 0x6E,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00
-        };
-
-        buffer[4] = chunk.moof.traf.trun.bEntries;
-
-        lengthFor(buffer);
-
-        set = ByteBuffer.wrap(buffer[3]);
-        set.putInt(buffer[3].length + buffer[4].length);
-        set.position(8);
-        set.putInt((chunk.moof.traf.trun.bFlags | 0x01) & 0x0F01);
-        set.putInt(chunk.moof.traf.trun.entryCount);
-        extra.byteBuffer = set;
-
-        return buffer;
-    }
-
-    private byte[][] make_mdat(ArrayList<Mp4TrackChunk> chunks) {
-        byte[][] buffer = new byte[][]{
-            {
-                0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x61, 0x74
-            }
-        };
-
-        int length = 0;
-
-        for (Mp4TrackChunk chunk : chunks) {
-            length += chunk.moof.traf.trun.chunkSize;
-        }
-
-        ByteBuffer.wrap(buffer[0]).putInt(length + 8);
-
-        return buffer;
-    }
-
-    private byte[][] make_ftyp() {
-        return new byte[][]{
-            {
-                0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70, 0x64, 0x61, 0x73, 0x68, 0x00, 0x00, 0x00, 0x00,
-                0x6D, 0x70, 0x34, 0x31, 0x69, 0x73, 0x6F, 0x6D, 0x69, 0x73, 0x6F, 0x36, 0x69, 0x73, 0x6F, 0x32
-            }
-        };
-    }
-
-    private byte[][] make_mvhd() {
-        byte[][] buffer = new byte[DIMENSIONAL_FIVE][];
-
-        buffer[0] = new byte[]{
-            0x00, 0x00, 0x00, 0x78, 0x6D, 0x76, 0x68, 0x64, 0x01, 0x00, 0x00, 0x00
-        };
-        buffer[1] = new byte[28];
-        buffer[2] = new byte[]{
-            0x00, 0x01, 0x00, 0x00, 0x01, 0x00,// default volume and rate
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,// reserved values
-            // default matrix
-            0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x40, 0x00, 0x00, 0x00
-        };
-        buffer[3] = new byte[24];// predefined
-        buffer[4] = ByteBuffer.allocate(4).putInt(infoTracks.length + 1).array();
-
-        long longestTrack = 0;
-
-        for (Mp4Track track : infoTracks) {
-            long tmp = (long) ((track.trak.tkhd.duration / (double) track.trak.mdia_mdhd_timeScale) * DEFAULT_TIMESCALE);
-            if (tmp > longestTrack) {
-                longestTrack = tmp;
-            }
-        }
-
-        ByteBuffer.wrap(buffer[1])
-                .putLong(time)
-                .putLong(time)
-                .putInt(DEFAULT_TIMESCALE)
-                .putLong(longestTrack);
-
-        return buffer;
-    }
-
-    private byte[][] make_trak(int trackId, Trak trak) throws RuntimeException {
-        if (trak.tkhd.matrix.length != 36) {
-            throw new RuntimeException("bad track matrix length (expected 36)");
-        }
-
-        byte[][] buffer = new byte[DIMENSIONAL_FIVE][];
-
-        buffer[0] = new byte[]{
-            0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x6B,// trak header
-            0x00, 0x00, 0x00, 0x68, 0x74, 0x6B, 0x68, 0x64, 0x01, 0x00, 0x00, 0x03 // tkhd header
-        };
-        buffer[1] = new byte[48];
-        buffer[2] = trak.tkhd.matrix;
-        buffer[3] = new byte[8];
-        buffer[4] = trak.mdia;
-
-        ByteBuffer set = ByteBuffer.wrap(buffer[1]);
-        set.putLong(time);
-        set.putLong(time);
-        set.putInt(trackId);
-        set.position(24);
-        set.putLong(trak.tkhd.duration);
-        set.position(40);
-        set.putShort(trak.tkhd.bLayer);
-        set.putShort(trak.tkhd.bAlternateGroup);
-        set.putShort(trak.tkhd.bVolume);
-
-        ByteBuffer.wrap(buffer[3])
-                .putInt(trak.tkhd.bWidth)
-                .putInt(trak.tkhd.bHeight);
-
-        return lengthFor(buffer);
-    }
-
-    private byte[][] make_moov() throws RuntimeException {
-        int pos = 1;
-        byte[][] buffer = new byte[2 + (DIMENSIONAL_TWO * infoTracks.length) + (DIMENSIONAL_FIVE * infoTracks.length) + DIMENSIONAL_FIVE + 1][];
-
-        buffer[0] = new byte[]{
-            0x00, 0x00, 0x00, 0x00, 0x6D, 0x6F, 0x6F, 0x76
-        };
-
-        for (byte[] buff : make_mvhd()) {
-            buffer[pos++] = buff;
-        }
-
-        for (int i = 0; i < infoTracks.length; i++) {
-            for (byte[] buff : make_trak(i + 1, infoTracks[i].trak)) {
-                buffer[pos++] = buff;
-            }
-        }
-
-        buffer[pos] = new byte[]{
-            0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x65, 0x78
-        };
-
-        ByteBuffer.wrap(buffer[pos++]).putInt((infoTracks.length * DEFAULT_TREX_SIZE) + 8);
-
-        for (int i = 0; i < infoTracks.length; i++) {
-            for (byte[] buff : make_trex(i + 1, infoTracks[i].trex)) {
-                buffer[pos++] = buff;
-            }
-        }
-
-        // default udta
-        buffer[pos] = new byte[]{
-            0x00, 0x00, 0x00, 0x5C, 0x75, 0x64, 0x74, 0x61, 0x00, 0x00, 0x00, 0x54, 0x6D, 0x65, 0x74, 0x61,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x68, 0x64, 0x6C, 0x72, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x69, 0x72, 0x61, 0x70, 0x70, 0x6C, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x69, 0x6C, 0x73, 0x74, 0x00, 0x00, 0x00,
-            0x1F, (byte) 0xA9, 0x63, 0x6D, 0x74, 0x00, 0x00, 0x00, 0x17, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00,
-            0x01, 0x00, 0x00, 0x00, 0x00,
-            0x4E, 0x65, 0x77, 0x50, 0x69, 0x70, 0x65// "NewPipe" binary string
-        };
-
-        return lengthFor(buffer);
-    }
-
-    private byte[][] make_trex(int trackId, Trex trex) {
-        byte[][] buffer = new byte[][]{
-            {
-                0x00, 0x00, 0x00, 0x20, 0x74, 0x72, 0x65, 0x78, 0x00, 0x00, 0x00, 0x00
-            },
-            new byte[20]
-        };
-
-        ByteBuffer.wrap(buffer[1])
-                .putInt(trackId)
-                .putInt(trex.defaultSampleDescriptionIndex)
-                .putInt(trex.defaultSampleDuration)
-                .putInt(trex.defaultSampleSize)
-                .putInt(trex.defaultSampleFlags);
-
-        return buffer;
-    }
-
-    private byte[][] make_tfra(int trackId, List<Integer> times, List<Long> moofOffsets) {
-        int entryCount = times.size() - 1;
-        byte[][] buffer = new byte[DIMENSIONAL_TWO][];
-        buffer[0] = new byte[]{
-            0x00, 0x00, 0x00, 0x00, 0x74, 0x66, 0x72, 0x61, 0x01, 0x00, 0x00, 0x00
-        };
-        buffer[1] = new byte[12 + ((16 + TFRA_TTS_DEFAULT.length) * entryCount)];
-
-        ByteBuffer set = ByteBuffer.wrap(buffer[1]);
-        set.putInt(trackId);
-        set.position(8);
-        set.putInt(entryCount);
-
-        long decodeTime = 0;
-
-        for (int i = 0; i < entryCount; i++) {
-            decodeTime += times.get(i);
-            set.putLong(decodeTime);
-            set.putLong(moofOffsets.get(i));
-            set.put(TFRA_TTS_DEFAULT);// default values: traf number/trun number/sample number
-        }
-
-        return lengthFor(buffer);
-    }
-
-    private byte[][] make_mfra() {
-        byte[][] buffer = new byte[2 + (DIMENSIONAL_TWO * infoTracks.length)][];
-        buffer[0] = new byte[]{
-            0x00, 0x00, 0x00, 0x00, 0x6D, 0x66, 0x72, 0x61
-        };
-        int pos = 1;
-
-        for (int i = 0; i < infoTracks.length; i++) {
-            for (byte[] buff : make_tfra(i + 1, chunkTimes.get(i), moofOffsets)) {
-                buffer[pos++] = buff;
-            }
-        }
-
-        buffer[pos] = new byte[]{// mfro
-            0x00, 0x00, 0x00, 0x10, 0x6D, 0x66, 0x72, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-
-        lengthFor(buffer);
-
-        ByteBuffer set = ByteBuffer.wrap(buffer[pos]);
-        set.position(12);
-        set.put(buffer[0], 0, 4);
-
-        return buffer;
-
-    }
-
-    private byte[][] make_sidx(int internalTrackId, long firstOffset) {
-        List<Integer> times = chunkTimes.get(internalTrackId);
-        int count = times.size() - 1;// the first item is ignored (composition time)
-
-        if (count > 65535) {
-            throw new OutOfMemoryError("to many fragments. sidx limit is 65535, found " + String.valueOf(count));
-        }
-
-        byte[][] buffer = new byte[][]{
-            new byte[]{
-                0x00, 0x00, 0x00, 0x00, 0x73, 0x69, 0x64, 0x78, 0x01, 0x00, 0x00, 0x00
-            },
-            new byte[calcSidxBodySize(count)]
-        };
-
-        lengthFor(buffer);
-
-        ByteBuffer set = ByteBuffer.wrap(buffer[1]);
-        set.putInt(internalTrackId + 1);
-        set.putInt(infoTracks[internalTrackId].trak.mdia_mdhd_timeScale);
-        set.putLong(0);
-        set.putLong(firstOffset - ByteBuffer.wrap(buffer[0]).getInt());
-        set.putInt(0xFFFF & count);// unsigned
-
-        int i = 0;
-        while (i < count) {
-            set.putInt(fragSizes.get(i) & 0x7fffffff);// default reference type is 0
-            set.putInt(times.get(i + 1));
-            set.putInt(0x90000000);// default SAP settings
-            i++;
-        }
-
-        return buffer;
-    }
-
-    private byte[][] make_free(int totalSize) {
-        return lengthFor(new byte[][]{
-            new byte[]{0x00, 0x00, 0x00, 0x00, 0x66, 0x72, 0x65, 0x65},
-            new byte[totalSize - 8]// this is waste of RAM
-        });
-
-    }
-
-//</editor-fold>
-
-    class TrunExtra {
-
-        ByteBuffer byteBuffer;
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
new file mode 100644
index 000000000..5a4efbe32
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -0,0 +1,810 @@
+package org.schabi.newpipe.streams;
+
+import org.schabi.newpipe.streams.Mp4DashReader.Hdlr;
+import org.schabi.newpipe.streams.Mp4DashReader.Mdia;
+import org.schabi.newpipe.streams.Mp4DashReader.Mp4DashChunk;
+import org.schabi.newpipe.streams.Mp4DashReader.Mp4DashSample;
+import org.schabi.newpipe.streams.Mp4DashReader.Mp4Track;
+import org.schabi.newpipe.streams.Mp4DashReader.TrunEntry;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+/**
+ *
+ * @author kapodamy
+ */
+public class Mp4FromDashWriter {
+
+    private final static int EPOCH_OFFSET = 2082844800;
+    private final static short DEFAULT_TIMESCALE = 1000;
+    private final static byte SAMPLES_PER_CHUNK_INIT = 2;
+    private final static byte SAMPLES_PER_CHUNK = 6;// ffmpeg uses 2, basic uses 1 (with 60fps uses 21 or 22). NewPipe will use 6
+    private final static long THRESHOLD_FOR_CO64 = 0xFFFEFFFFL;// near 3.999 GiB
+    private final static int THRESHOLD_MOOV_LENGTH = (256 * 1024) + (2048 * 1024); // 2.2 MiB enough for: 1080p 60fps 00h35m00s
+
+    private final long time;
+
+    private ByteBuffer auxBuffer;
+    private SharpStream outStream;
+
+    private long lastWriteOffset = -1;
+    private long writeOffset;
+
+    private boolean moovSimulation = true;
+
+    private boolean done = false;
+    private boolean parsed = false;
+
+    private Mp4Track[] tracks;
+    private SharpStream[] sourceTracks;
+
+    private Mp4DashReader[] readers;
+    private Mp4DashChunk[] readersChunks;
+
+    private int overrideMainBrand = 0x00;
+
+    public Mp4FromDashWriter(SharpStream... sources) throws IOException {
+        for (SharpStream src : sources) {
+            if (!src.canRewind() && !src.canRead()) {
+                throw new IOException("All sources must be readable and allow rewind");
+            }
+        }
+
+        sourceTracks = sources;
+        readers = new Mp4DashReader[sourceTracks.length];
+        readersChunks = new Mp4DashChunk[readers.length];
+        time = (System.currentTimeMillis() / 1000L) + EPOCH_OFFSET;
+    }
+
+    public Mp4Track[] getTracksFromSource(int sourceIndex) throws IllegalStateException {
+        if (!parsed) {
+            throw new IllegalStateException("All sources must be parsed first");
+        }
+
+        return readers[sourceIndex].getAvailableTracks();
+    }
+
+    public void parseSources() throws IOException, IllegalStateException {
+        if (done) {
+            throw new IllegalStateException("already done");
+        }
+        if (parsed) {
+            throw new IllegalStateException("already parsed");
+        }
+
+        try {
+            for (int i = 0; i < readers.length; i++) {
+                readers[i] = new Mp4DashReader(sourceTracks[i]);
+                readers[i].parse();
+            }
+
+        } finally {
+            parsed = true;
+        }
+    }
+
+    public void selectTracks(int... trackIndex) throws IOException {
+        if (done) {
+            throw new IOException("already done");
+        }
+        if (tracks != null) {
+            throw new IOException("tracks already selected");
+        }
+
+        try {
+            tracks = new Mp4Track[readers.length];
+            for (int i = 0; i < readers.length; i++) {
+                tracks[i] = readers[i].selectTrack(trackIndex[i]);
+            }
+        } finally {
+            parsed = true;
+        }
+    }
+
+    public void setMainBrand(int brandId) {
+        overrideMainBrand = brandId;
+    }
+
+    public boolean isDone() {
+        return done;
+    }
+
+    public boolean isParsed() {
+        return parsed;
+    }
+
+    public void close() throws IOException {
+        done = true;
+        parsed = true;
+
+        for (SharpStream src : sourceTracks) {
+            src.dispose();
+        }
+
+        tracks = null;
+        sourceTracks = null;
+
+        readers = null;
+        readersChunks = null;
+
+        auxBuffer = null;
+        outStream = null;
+    }
+
+    public void build(SharpStream output) throws IOException {
+        if (done) {
+            throw new RuntimeException("already done");
+        }
+        if (!output.canWrite()) {
+            throw new IOException("the provided output is not writable");
+        }
+
+        //
+        // WARNING: the muxer requires at least 8 samples of every track
+        //          not allowed for very short tracks (less than 0.5 seconds)
+        //
+        outStream = output;
+        int read = 8;// mdat box header size
+        long totalSampleSize = 0;
+        int[] sampleExtra = new int[readers.length];
+        int[] defaultMediaTime = new int[readers.length];
+        int[] defaultSampleDuration = new int[readers.length];
+        int[] sampleCount = new int[readers.length];
+
+        TablesInfo[] tablesInfo = new TablesInfo[tracks.length];
+        for (int i = 0; i < tablesInfo.length; i++) {
+            tablesInfo[i] = new TablesInfo();
+        }
+
+        //<editor-fold defaultstate="expanded" desc="calculate stbl sample tables size and required moov values">
+        for (int i = 0; i < readers.length; i++) {
+            int samplesSize = 0;
+            int sampleSizeChanges = 0;
+            int compositionOffsetLast = -1;
+
+            Mp4DashChunk chunk;
+            while ((chunk = readers[i].getNextChunk(true)) != null) {
+
+                if (defaultMediaTime[i] < 1 && chunk.moof.traf.tfhd.defaultSampleDuration > 0) {
+                    defaultMediaTime[i] = chunk.moof.traf.tfhd.defaultSampleDuration;
+                }
+
+                read += chunk.moof.traf.trun.chunkSize;
+                sampleExtra[i] += chunk.moof.traf.trun.chunkDuration;// calculate track duration
+
+                TrunEntry info;
+                while ((info = chunk.getNextSampleInfo()) != null) {
+                    if (info.isKeyframe) {
+                        tablesInfo[i].stss++;
+                    }
+
+                    if (info.sampleDuration > defaultSampleDuration[i]) {
+                        defaultSampleDuration[i] = info.sampleDuration;
+                    }
+
+                    tablesInfo[i].stsz++;
+                    if (samplesSize != info.sampleSize) {
+                        samplesSize = info.sampleSize;
+                        sampleSizeChanges++;
+                    }
+
+                    if (info.hasCompositionTimeOffset) {
+                        if (info.sampleCompositionTimeOffset != compositionOffsetLast) {
+                            tablesInfo[i].ctts++;
+                            compositionOffsetLast = info.sampleCompositionTimeOffset;
+                        }
+                    }
+
+                    totalSampleSize += info.sampleSize;
+                }
+            }
+
+            if (defaultMediaTime[i] < 1) {
+                defaultMediaTime[i] = defaultSampleDuration[i];
+            }
+
+            readers[i].rewind();
+
+            int tmp = tablesInfo[i].stsz - SAMPLES_PER_CHUNK_INIT;
+            tablesInfo[i].stco = (tmp / SAMPLES_PER_CHUNK) + 1;// +1 for samples in first chunk
+
+            tmp = tmp % SAMPLES_PER_CHUNK;
+            if (tmp == 0) {
+                tablesInfo[i].stsc = 2;// first chunk (init) and succesive chunks
+                tablesInfo[i].stsc_bEntries = new int[]{
+                        1, SAMPLES_PER_CHUNK_INIT, 1,
+                        2, SAMPLES_PER_CHUNK, 1
+                };
+            } else {
+                tablesInfo[i].stsc = 3;// first chunk (init) and succesive chunks and remain chunk
+                tablesInfo[i].stsc_bEntries = new int[]{
+                        1, SAMPLES_PER_CHUNK_INIT, 1,
+                        2, SAMPLES_PER_CHUNK, 1,
+                        tablesInfo[i].stco + 1, tmp, 1
+                };
+                tablesInfo[i].stco++;
+            }
+
+            sampleCount[i] = tablesInfo[i].stsz;
+
+            if (sampleSizeChanges == 1) {
+                tablesInfo[i].stsz = 0;
+                tablesInfo[i].stsz_default = samplesSize;
+            } else {
+                tablesInfo[i].stsz_default = 0;
+            }
+
+            if (tablesInfo[i].stss == tablesInfo[i].stsz) {
+                tablesInfo[i].stss = -1;// for audio tracks (all samples are keyframes)
+            }
+
+            // ensure track duration
+            if (tracks[i].trak.tkhd.duration < 1) {
+                tracks[i].trak.tkhd.duration = sampleExtra[i];// this never should happen
+            }
+        }
+        //</editor-fold>
+
+        boolean is64 = read > THRESHOLD_FOR_CO64;
+
+        // calculate the moov size;
+        int auxSize = make_moov(defaultMediaTime, tablesInfo, is64);
+
+        if (auxSize < THRESHOLD_MOOV_LENGTH) {
+            auxBuffer = ByteBuffer.allocate(auxSize);// cache moov in the memory
+        }
+
+        moovSimulation = false;
+        writeOffset = 0;
+
+        final int ftyp_size = make_ftyp();
+
+        // reserve moov space in the output stream
+        if (outStream.canSetLength()) {
+            long length = writeOffset + auxSize;
+            outStream.setLength(length);
+            outSeek(length);
+        } else {
+            // hard way
+            int length = auxSize;
+            byte[] buffer = new byte[8 * 1024];// 8 KiB
+            while (length > 0) {
+                int count = Math.min(length, buffer.length);
+                outWrite(buffer, 0, count);
+                length -= count;
+            }
+        }
+        if (auxBuffer == null) {
+            outSeek(ftyp_size);
+        }
+
+        // tablesInfo contais row counts
+        // and after returning from make_moov() will contain table offsets
+        make_moov(defaultMediaTime, tablesInfo, is64);
+
+        // write tables: stts stsc
+        // reset for ctts table: sampleCount sampleExtra
+        for (int i = 0; i < readers.length; i++) {
+            writeEntryArray(tablesInfo[i].stts, 2, sampleCount[i], defaultSampleDuration[i]);
+            writeEntryArray(tablesInfo[i].stsc, tablesInfo[i].stsc_bEntries.length, tablesInfo[i].stsc_bEntries);
+            tablesInfo[i].stsc_bEntries = null;
+            if (tablesInfo[i].ctts > 0) {
+                sampleCount[i] = 1;// index is not base zero
+                sampleExtra[i] = -1;
+            }
+        }
+
+        if (auxBuffer == null) {
+            outRestore();
+        }
+
+        outWrite(make_mdat(totalSampleSize, is64));
+
+        int[] sampleIndex = new int[readers.length];
+        int[] sizes = new int[SAMPLES_PER_CHUNK];
+        int[] sync = new int[SAMPLES_PER_CHUNK];
+
+        int written = readers.length;
+        while (written > 0) {
+            written = 0;
+
+            for (int i = 0; i < readers.length; i++) {
+                if (sampleIndex[i] < 0) {
+                    continue;// track is done
+                }
+
+                long chunkOffset = writeOffset;
+                int syncCount = 0;
+                int limit = sampleIndex[i] == 0 ? SAMPLES_PER_CHUNK_INIT : SAMPLES_PER_CHUNK;
+
+                int j = 0;
+                for (; j < limit; j++) {
+                    Mp4DashSample sample = getNextSample(i);
+
+                    if (sample == null) {
+                        if (tablesInfo[i].ctts > 0 && sampleExtra[i] >= 0) {
+                            writeEntryArray(tablesInfo[i].ctts, 1, sampleCount[i], sampleExtra[i]);// flush last entries
+                        }
+                        sampleIndex[i] = -1;
+                        break;
+                    }
+
+                    sampleIndex[i]++;
+
+                    if (tablesInfo[i].ctts > 0) {
+                        if (sample.info.sampleCompositionTimeOffset == sampleExtra[i]) {
+                            sampleCount[i]++;
+                        } else {
+                            if (sampleExtra[i] >= 0) {
+                                tablesInfo[i].ctts = writeEntryArray(tablesInfo[i].ctts, 2, sampleCount[i], sampleExtra[i]);
+                                outRestore();
+                            }
+                            sampleCount[i] = 1;
+                            sampleExtra[i] = sample.info.sampleCompositionTimeOffset;
+                        }
+                    }
+
+                    if (tablesInfo[i].stss > 0 && sample.info.isKeyframe) {
+                        sync[syncCount++] = sampleIndex[i];
+                    }
+
+                    if (tablesInfo[i].stsz > 0) {
+                        sizes[j] = sample.data.length;
+                    }
+
+                    outWrite(sample.data, 0, sample.data.length);
+                }
+
+                if (j > 0) {
+                    written++;
+
+                    if (tablesInfo[i].stsz > 0) {
+                        tablesInfo[i].stsz = writeEntryArray(tablesInfo[i].stsz, j, sizes);
+                    }
+
+                    if (syncCount > 0) {
+                        tablesInfo[i].stss = writeEntryArray(tablesInfo[i].stss, syncCount, sync);
+                    }
+
+                    if (is64) {
+                        tablesInfo[i].stco = writeEntry64(tablesInfo[i].stco, chunkOffset);
+                    } else {
+                        tablesInfo[i].stco = writeEntryArray(tablesInfo[i].stco, 1, (int) chunkOffset);
+                    }
+
+                    outRestore();
+                }
+            }
+        }
+
+        if (auxBuffer != null) {
+            // dump moov
+            outSeek(ftyp_size);
+            outStream.write(auxBuffer.array(), 0, auxBuffer.capacity());
+            auxBuffer = null;
+        }
+    }
+
+    private Mp4DashSample getNextSample(int track) throws IOException {
+        if (readersChunks[track] == null) {
+            readersChunks[track] = readers[track].getNextChunk(false);
+            if (readersChunks[track] == null) {
+                return null;// EOF reached
+            }
+        }
+
+        Mp4DashSample sample = readersChunks[track].getNextSample();
+        if (sample == null) {
+            readersChunks[track] = null;
+            return getNextSample(track);
+        } else {
+            return sample;
+        }
+    }
+
+    // <editor-fold defaultstate="expanded" desc="Stbl handling">
+    private int writeEntry64(int offset, long value) throws IOException {
+        outBackup();
+
+        auxSeek(offset);
+        auxWrite(ByteBuffer.allocate(8).putLong(value).array());
+
+        return offset + 8;
+    }
+
+    private int writeEntryArray(int offset, int count, int... values) throws IOException {
+        outBackup();
+
+        auxSeek(offset);
+
+        int size = count * 4;
+        ByteBuffer buffer = ByteBuffer.allocate(size);
+
+        for (int i = 0; i < count; i++) {
+            buffer.putInt(values[i]);
+        }
+
+        auxWrite(buffer.array());
+
+        return offset + size;
+    }
+
+    private void outBackup() {
+        if (auxBuffer == null && lastWriteOffset < 0) {
+            lastWriteOffset = writeOffset;
+        }
+    }
+
+    /**
+     * Restore to the previous position before the first call to writeEntry64()
+     * or writeEntryArray() methods.
+     */
+    private void outRestore() throws IOException {
+        if (lastWriteOffset > 0) {
+            outSeek(lastWriteOffset);
+            lastWriteOffset = -1;
+        }
+    }
+    // </editor-fold>
+
+    // <editor-fold defaultstate="expanded" desc="Utils">
+    private void outWrite(byte[] buffer) throws IOException {
+        outWrite(buffer, 0, buffer.length);
+    }
+
+    private void outWrite(byte[] buffer, int offset, int count) throws IOException {
+        writeOffset += count;
+        outStream.write(buffer, offset, count);
+    }
+
+    private void outSeek(long offset) throws IOException {
+        if (outStream.canSeek()) {
+            outStream.seek(offset);
+            writeOffset = offset;
+        } else if (outStream.canRewind()) {
+            outStream.rewind();
+            writeOffset = 0;
+            outSkip(offset);
+        } else {
+            throw new IOException("cannot seek or rewind the output stream");
+        }
+    }
+
+    private void outSkip(long amount) throws IOException {
+        outStream.skip(amount);
+        writeOffset += amount;
+    }
+
+    private int lengthFor(int offset) throws IOException {
+        int size = auxOffset() - offset;
+
+        if (moovSimulation) {
+            return size;
+        }
+
+        auxSeek(offset);
+        auxWrite(size);
+        auxSkip(size - 4);
+
+        return size;
+    }
+
+    private int make(int type, int extra, int columns, int rows) throws IOException {
+        final byte base = 16;
+        int size = columns * rows * 4;
+        int total = size + base;
+        int offset = auxOffset();
+
+        if (extra >= 0) {
+            total += 4;
+        }
+
+        auxWrite(ByteBuffer.allocate(12)
+                .putInt(total)
+                .putInt(type)
+                .putInt(0x00)// default version & flags
+                .array()
+        );
+
+        if (extra >= 0) {
+            //size += 4;// commented for auxiliar buffer !!!
+            offset += 4;
+            auxWrite(extra);
+        }
+
+        auxWrite(rows);
+        auxSkip(size);
+
+        return offset + base;
+    }
+
+    private void auxWrite(int value) throws IOException {
+        auxWrite(ByteBuffer.allocate(4)
+                .putInt(value)
+                .array()
+        );
+    }
+
+    private void auxWrite(byte[] buffer) throws IOException {
+        if (moovSimulation) {
+            writeOffset += buffer.length;
+        } else if (auxBuffer == null) {
+            outWrite(buffer, 0, buffer.length);
+        } else {
+            auxBuffer.put(buffer);
+        }
+    }
+
+    private void auxSeek(int offset) throws IOException {
+        if (moovSimulation) {
+            writeOffset = offset;
+        } else if (auxBuffer == null) {
+            outSeek(offset);
+        } else {
+            auxBuffer.position(offset);
+        }
+    }
+
+    private void auxSkip(int amount) throws IOException {
+        if (moovSimulation) {
+            writeOffset += amount;
+        } else if (auxBuffer == null) {
+            outSkip(amount);
+        } else {
+            auxBuffer.position(auxBuffer.position() + amount);
+        }
+    }
+
+    private int auxOffset() {
+        return auxBuffer == null ? (int) writeOffset : auxBuffer.position();
+    }
+    // </editor-fold>
+
+    // <editor-fold defaultstate="expanded" desc="Box makers">
+    private int make_ftyp() throws IOException {
+        byte[] buffer = new byte[]{
+                0x00, 0x00, 0x00, 0x1C, 0x66, 0x74, 0x79, 0x70,// ftyp
+                0x6D, 0x70, 0x34, 0x32,// mayor brand (mp42)
+                0x00, 0x00, 0x02, 0x00,// default minor version (512)
+                0x6D, 0x70, 0x34, 0x31, 0x69, 0x73, 0x6F, 0x6D, 0x69, 0x73, 0x6F, 0x32// compatible brands: mp41 isom iso2
+        };
+
+        if (overrideMainBrand != 0)
+            ByteBuffer.wrap(buffer).putInt(8, overrideMainBrand);
+
+        outWrite(buffer);
+
+        return buffer.length;
+    }
+
+    private byte[] make_mdat(long refSize, boolean is64) {
+        if (is64) {
+            refSize += 16;
+        } else {
+            refSize += 8;
+        }
+
+        ByteBuffer buffer = ByteBuffer.allocate(is64 ? 16 : 8)
+                .putInt(is64 ? 0x01 : (int) refSize)
+                .putInt(0x6D646174);// mdat
+
+        if (is64) {
+            buffer.putLong(refSize);
+        }
+
+        return buffer.array();
+    }
+
+    private void make_mvhd(long longestTrack) throws IOException {
+        auxWrite(new byte[]{
+                0x00, 0x00, 0x00, 0x78, 0x6D, 0x76, 0x68, 0x64, 0x01, 0x00, 0x00, 0x00
+        });
+        auxWrite(ByteBuffer.allocate(28)
+                .putLong(time)
+                .putLong(time)
+                .putInt(DEFAULT_TIMESCALE)
+                .putLong(longestTrack)
+                .array()
+        );
+
+        auxWrite(new byte[]{
+                0x00, 0x01, 0x00, 0x00, 0x01, 0x00,// default volume and rate
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,// reserved values
+                // default matrix
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x40, 0x00, 0x00, 0x00
+        });
+        auxWrite(new byte[24]);// predefined
+        auxWrite(ByteBuffer.allocate(4)
+                .putInt(tracks.length + 1)
+                .array()
+        );
+    }
+
+    private int make_moov(int[] defaultMediaTime, TablesInfo[] tablesInfo, boolean is64) throws RuntimeException, IOException {
+        int start = auxOffset();
+
+        auxWrite(new byte[]{
+                0x00, 0x00, 0x00, 0x00, 0x6D, 0x6F, 0x6F, 0x76
+        });
+
+        long longestTrack = 0;
+        long[] durations = new long[tracks.length];
+
+        for (int i = 0; i < durations.length; i++) {
+            durations[i] = (long) Math.ceil(
+                    ((double) tracks[i].trak.tkhd.duration / tracks[i].trak.mdia.mdhd_timeScale) * DEFAULT_TIMESCALE
+            );
+
+            if (durations[i] > longestTrack) {
+                longestTrack = durations[i];
+            }
+        }
+
+        make_mvhd(longestTrack);
+
+        for (int i = 0; i < tracks.length; i++) {
+            if (tracks[i].trak.tkhd.matrix.length != 36) {
+                throw new RuntimeException("bad track matrix length (expected 36) in track n°" + i);
+            }
+            make_trak(i, durations[i], defaultMediaTime[i], tablesInfo[i], is64);
+        }
+
+        // udta/meta/ilst/©too
+        auxWrite(new byte[]{
+                0x00, 0x00, 0x00, 0x5C, 0x75, 0x64, 0x74, 0x61, 0x00, 0x00, 0x00, 0x54, 0x6D, 0x65, 0x74, 0x61,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x68, 0x64, 0x6C, 0x72, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x69, 0x72, 0x61, 0x70, 0x70, 0x6C, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x69, 0x6C, 0x73, 0x74, 0x00, 0x00, 0x00,
+                0x1F, (byte) 0xA9, 0x74, 0x6F, 0x6F, 0x00, 0x00, 0x00, 0x17, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+                0x4E, 0x65, 0x77, 0x50, 0x69, 0x70, 0x65// "NewPipe" binary string
+        });
+
+        return lengthFor(start);
+    }
+
+    private void make_trak(int index, long duration, int defaultMediaTime, TablesInfo tables, boolean is64) throws IOException {
+        int start = auxOffset();
+
+        auxWrite(new byte[]{
+                0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x6B,// trak header
+                0x00, 0x00, 0x00, 0x68, 0x74, 0x6B, 0x68, 0x64, 0x01, 0x00, 0x00, 0x03 // tkhd header
+        });
+
+        ByteBuffer buffer = ByteBuffer.allocate(48);
+        buffer.putLong(time);
+        buffer.putLong(time);
+        buffer.putInt(index + 1);
+        buffer.position(24);
+        buffer.putLong(duration);
+        buffer.position(40);
+        buffer.putShort(tracks[index].trak.tkhd.bLayer);
+        buffer.putShort(tracks[index].trak.tkhd.bAlternateGroup);
+        buffer.putShort(tracks[index].trak.tkhd.bVolume);
+        auxWrite(buffer.array());
+
+        auxWrite(tracks[index].trak.tkhd.matrix);
+        auxWrite(ByteBuffer.allocate(8)
+                .putInt(tracks[index].trak.tkhd.bWidth)
+                .putInt(tracks[index].trak.tkhd.bHeight)
+                .array()
+        );
+
+        auxWrite(new byte[]{
+                0x00, 0x00, 0x00, 0x24, 0x65, 0x64, 0x74, 0x73,// edts header
+                0x00, 0x00, 0x00, 0x1C, 0x65, 0x6C, 0x73, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01// elst header
+        });
+
+        int bMediaRate;
+        int mediaTime;
+
+        if (tracks[index].trak.edst_elst == null) {
+            // is a audio track ¿is edst/elst opcional for audio tracks?
+            mediaTime = 0x00;// ffmpeg set this value as zero, instead of defaultMediaTime
+            bMediaRate = 0x00010000;
+        } else {
+            mediaTime = (int) tracks[index].trak.edst_elst.MediaTime;
+            bMediaRate = tracks[index].trak.edst_elst.bMediaRate;
+        }
+
+        auxWrite(ByteBuffer
+                .allocate(12)
+                .putInt((int) duration)
+                .putInt(mediaTime)
+                .putInt(bMediaRate)
+                .array()
+        );
+
+        make_mdia(tracks[index].trak.mdia, tables, is64);
+
+        lengthFor(start);
+    }
+
+    private void make_mdia(Mdia mdia, TablesInfo tablesInfo, boolean is64) throws IOException {
+
+        int start_mdia = auxOffset();
+        auxWrite(new byte[]{0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x69, 0x61});// mdia
+        auxWrite(mdia.mdhd);
+        auxWrite(make_hdlr(mdia.hdlr));
+
+        int start_minf = auxOffset();
+        auxWrite(new byte[]{0x00, 0x00, 0x00, 0x00, 0x6D, 0x69, 0x6E, 0x66});// minf
+        auxWrite(mdia.minf.$mhd);
+        auxWrite(mdia.minf.dinf);
+
+        int start_stbl = auxOffset();
+        auxWrite(new byte[]{0x00, 0x00, 0x00, 0x00, 0x73, 0x74, 0x62, 0x6C});// stbl
+        auxWrite(mdia.minf.stbl_stsd);
+
+        //
+        // In audio tracks the following tables is not required: ssts ctts
+        // And stsz can be empty if has a default sample size
+        //
+        if (moovSimulation) {
+            make(0x73747473, -1, 2, 1);
+            if (tablesInfo.stss > 0) {
+                make(0x73747373, -1, 1, tablesInfo.stss);
+            }
+            if (tablesInfo.ctts > 0) {
+                make(0x63747473, -1, 2, tablesInfo.ctts);
+            }
+            make(0x73747363, -1, 3, tablesInfo.stsc);
+            make(0x7374737A, tablesInfo.stsz_default, 1, tablesInfo.stsz);
+            make(is64 ? 0x636F3634 : 0x7374636F, -1, is64 ? 2 : 1, tablesInfo.stco);
+        } else {
+            tablesInfo.stts = make(0x73747473, -1, 2, 1);
+            if (tablesInfo.stss > 0) {
+                tablesInfo.stss = make(0x73747373, -1, 1, tablesInfo.stss);
+            }
+            if (tablesInfo.ctts > 0) {
+                tablesInfo.ctts = make(0x63747473, -1, 2, tablesInfo.ctts);
+            }
+            tablesInfo.stsc = make(0x73747363, -1, 3, tablesInfo.stsc);
+            tablesInfo.stsz = make(0x7374737A, tablesInfo.stsz_default, 1, tablesInfo.stsz);
+            tablesInfo.stco = make(is64 ? 0x636F3634 : 0x7374636F, -1, is64 ? 2 : 1, tablesInfo.stco);
+        }
+
+        lengthFor(start_stbl);
+        lengthFor(start_minf);
+        lengthFor(start_mdia);
+    }
+
+    private byte[] make_hdlr(Hdlr hdlr) {
+        ByteBuffer buffer = ByteBuffer.wrap(new byte[]{
+                0x00, 0x00, 0x00, 0x77, 0x68, 0x64, 0x6C, 0x72,// hdlr
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                // binary string "ISO Media file created in NewPipe (A libre lightweight streaming frontend for Android)."
+                0x49, 0x53, 0x4F, 0x20, 0x4D, 0x65, 0x64, 0x69, 0x61, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x63,
+                0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x20, 0x4E, 0x65, 0x77, 0x50, 0x69, 0x70,
+                0x65, 0x20, 0x28, 0x41, 0x20, 0x6C, 0x69, 0x62, 0x72, 0x65, 0x20, 0x6C, 0x69, 0x67, 0x68, 0x74,
+                0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6D, 0x69, 0x6E, 0x67,
+                0x20, 0x66, 0x72, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x41, 0x6E,
+                0x64, 0x72, 0x6F, 0x69, 0x64, 0x29, 0x2E
+        });
+
+        buffer.position(12);
+        buffer.putInt(hdlr.type);
+        buffer.putInt(hdlr.subType);
+        buffer.put(hdlr.bReserved);// always is a zero array
+
+        return buffer.array();
+    }
+    //</editor-fold>
+
+    class TablesInfo {
+
+        public int stts;
+        public int stsc;
+        public int[] stsc_bEntries;
+        public int ctts;
+        public int stsz;
+        public int stsz_default;
+        public int stss;
+        public int stco;
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java b/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java
index 26aaf49a5..c41db4373 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.streams;
 
+import org.schabi.newpipe.streams.io.SharpStream;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -12,8 +13,6 @@ import java.nio.charset.Charset;
 import java.text.ParseException;
 import java.util.Locale;
 
-import org.schabi.newpipe.streams.io.SharpStream;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -27,11 +26,11 @@ public class SubtitleConverter {
 
     public void dumpTTML(SharpStream in, final SharpStream out, final boolean ignoreEmptyFrames, final boolean detectYoutubeDuplicateLines
     ) throws IOException, ParseException, SAXException, ParserConfigurationException, XPathExpressionException {
-        
+
         final FrameWriter callback = new FrameWriter() {
             int frameIndex = 0;
             final Charset charset = Charset.forName("utf-8");
-            
+
             @Override
             public void yield(SubtitleFrame frame) throws IOException {
                 if (ignoreEmptyFrames && frame.isEmptyText()) {
@@ -48,13 +47,13 @@ public class SubtitleConverter {
                 out.write(NEW_LINE.getBytes(charset));
             }
         };
-        
+
         read_xml_based(in, callback, detectYoutubeDuplicateLines,
                 "tt", "xmlns", "http://www.w3.org/ns/ttml",
                 new String[]{"timedtext", "head", "wp"},
                 new String[]{"body", "div", "p"},
                 "begin", "end", true
-        );                  
+        );
     }
 
     private void read_xml_based(SharpStream source, FrameWriter callback, boolean detectYoutubeDuplicateLines,
@@ -70,7 +69,7 @@ public class SubtitleConverter {
          * Language parsing is not supported
          */
 
-        byte[] buffer = new byte[source.available()];
+        byte[] buffer = new byte[(int) source.available()];
         source.read(buffer);
 
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -206,7 +205,7 @@ public class SubtitleConverter {
         }
     }
 
-    private static NodeList selectNodes(Document xml, String[] path, String namespaceUri) throws XPathExpressionException {
+    private static NodeList selectNodes(Document xml, String[] path, String namespaceUri) {
         Element ref = xml.getDocumentElement();
 
         for (int i = 0; i < path.length - 1; i++) {
diff --git a/app/src/main/java/org/schabi/newpipe/streams/TrackDataChunk.java b/app/src/main/java/org/schabi/newpipe/streams/TrackDataChunk.java
deleted file mode 100644
index 86eb5ff4f..000000000
--- a/app/src/main/java/org/schabi/newpipe/streams/TrackDataChunk.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.schabi.newpipe.streams;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-public class TrackDataChunk extends InputStream {
-
-    private final DataReader base;
-    private int size;
-
-    public TrackDataChunk(DataReader base, int size) {
-        this.base = base;
-        this.size = size;
-    }
-
-    @Override
-    public int read() throws IOException {
-        if (size < 1) {
-            return -1;
-        }
-
-        int res = base.read();
-
-        if (res >= 0) {
-            size--;
-        }
-
-        return res;
-    }
-
-    @Override
-    public int read(byte[] buffer) throws IOException {
-        return read(buffer, 0, buffer.length);
-    }
-
-    @Override
-    public int read(byte[] buffer, int offset, int count) throws IOException {
-        count = Math.min(size, count);
-        int read = base.read(buffer, offset, count);
-        size -= count;
-        return read;
-    }
-
-    @Override
-    public long skip(long amount) throws IOException {
-        long res = base.skipBytes(Math.min(amount, size));
-        size -= res;
-        return res;
-    }
-
-    @Override
-    public int available() {
-        return size;
-    }
-
-    @Override
-    public void close() {
-        size = 0;
-    }
-
-    @Override
-    public boolean markSupported() {
-        return false;
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java b/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java
index f61ef14c5..0c635ebe3 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java
@@ -1,12 +1,13 @@
 package org.schabi.newpipe.streams;
 
+import org.schabi.newpipe.streams.io.SharpStream;
+
 import java.io.EOFException;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.NoSuchElementException;
-import java.util.Objects;
-
-import org.schabi.newpipe.streams.io.SharpStream;
 
 /**
  *
@@ -121,7 +122,7 @@ public class WebMReader {
     }
 
     private String readString(Element parent) throws IOException {
-        return new String(readBlob(parent), "utf-8");
+        return new String(readBlob(parent), StandardCharsets.UTF_8);// or use "utf-8"
     }
 
     private byte[] readBlob(Element parent) throws IOException {
@@ -193,6 +194,7 @@ public class WebMReader {
                     return elem;
                 }
             }
+
             ensure(elem);
         }
 
@@ -306,7 +308,7 @@ public class WebMReader {
                         entry.trackNumber = readNumber(elem);
                         break;
                     case ID_TrackType:
-                        entry.trackType = (int)readNumber(elem);
+                        entry.trackType = (int) readNumber(elem);
                         break;
                     case ID_CodecID:
                         entry.codecId = readString(elem);
@@ -445,7 +447,7 @@ public class WebMReader {
 
     public class SimpleBlock {
 
-        public TrackDataChunk data;
+        public InputStream data;
 
         SimpleBlock(Element ref) {
             this.ref = ref;
@@ -492,7 +494,7 @@ public class WebMReader {
 
                 currentSimpleBlock = readSimpleBlock(elem);
                 if (currentSimpleBlock.trackNumber == tracks[selectedTrack].trackNumber) {
-                    currentSimpleBlock.data = new TrackDataChunk(stream, (int) currentSimpleBlock.dataSize);
+                    currentSimpleBlock.data = stream.getView((int) currentSimpleBlock.dataSize);
                     return currentSimpleBlock;
                 }
 
diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
index ea038c607..eba2bbb87 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
@@ -1,20 +1,20 @@
 package org.schabi.newpipe.streams;
 
+import android.support.annotation.NonNull;
+
 import org.schabi.newpipe.streams.WebMReader.Cluster;
 import org.schabi.newpipe.streams.WebMReader.Segment;
 import org.schabi.newpipe.streams.WebMReader.SimpleBlock;
 import org.schabi.newpipe.streams.WebMReader.WebMTrack;
+import org.schabi.newpipe.streams.io.SharpStream;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
-import org.schabi.newpipe.streams.io.SharpStream;
-
 /**
- *
  * @author kapodamy
  */
 public class WebMWriter {
@@ -94,10 +94,6 @@ public class WebMWriter {
         }
     }
 
-    public long getBytesWritten() {
-        return written;
-    }
-
     public boolean isDone() {
         return done;
     }
@@ -138,42 +134,42 @@ public class WebMWriter {
 
         /* segment */
         listBuffer.add(new byte[]{
-            0x18, 0x53, (byte) 0x80, 0x67, 0x01,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00// segment content size
+                0x18, 0x53, (byte) 0x80, 0x67, 0x01,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00// segment content size
         });
 
         long baseSegmentOffset = written + listBuffer.get(0).length;
 
         /* seek head */
         listBuffer.add(new byte[]{
-            0x11, 0x4d, (byte) 0x9b, 0x74, (byte) 0xbe,
-            0x4d, (byte) 0xbb, (byte) 0x8b,
-            0x53, (byte) 0xab, (byte) 0x84, 0x15, 0x49, (byte) 0xa9, 0x66, 0x53,
-            (byte) 0xac, (byte) 0x81, /*info offset*/ 0x43,
-            0x4d, (byte) 0xbb, (byte) 0x8b, 0x53, (byte) 0xab,
-            (byte) 0x84, 0x16, 0x54, (byte) 0xae, 0x6b, 0x53, (byte) 0xac, (byte) 0x81,
-            /*tracks offset*/ 0x6a,
-            0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1f,
-            0x43, (byte) 0xb6, 0x75, 0x53, (byte) 0xac, (byte) 0x84, /*cluster offset [2]*/ 0x00, 0x00, 0x00, 0x00,
-            0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1c, 0x53,
-            (byte) 0xbb, 0x6b, 0x53, (byte) 0xac, (byte) 0x84, /*cues offset [7]*/ 0x00, 0x00, 0x00, 0x00
+                0x11, 0x4d, (byte) 0x9b, 0x74, (byte) 0xbe,
+                0x4d, (byte) 0xbb, (byte) 0x8b,
+                0x53, (byte) 0xab, (byte) 0x84, 0x15, 0x49, (byte) 0xa9, 0x66, 0x53,
+                (byte) 0xac, (byte) 0x81, /*info offset*/ 0x43,
+                0x4d, (byte) 0xbb, (byte) 0x8b, 0x53, (byte) 0xab,
+                (byte) 0x84, 0x16, 0x54, (byte) 0xae, 0x6b, 0x53, (byte) 0xac, (byte) 0x81,
+                /*tracks offset*/ 0x6a,
+                0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1f,
+                0x43, (byte) 0xb6, 0x75, 0x53, (byte) 0xac, (byte) 0x84, /*cluster offset [2]*/ 0x00, 0x00, 0x00, 0x00,
+                0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1c, 0x53,
+                (byte) 0xbb, 0x6b, 0x53, (byte) 0xac, (byte) 0x84, /*cues offset [7]*/ 0x00, 0x00, 0x00, 0x00
         });
 
         /* info */
         listBuffer.add(new byte[]{
-            0x15, 0x49, (byte) 0xa9, 0x66, (byte) 0xa2, 0x2a, (byte) 0xd7, (byte) 0xb1
+                0x15, 0x49, (byte) 0xa9, 0x66, (byte) 0xa2, 0x2a, (byte) 0xd7, (byte) 0xb1
         });
         listBuffer.add(encode(DEFAULT_TIMECODE_SCALE, true));// this value MUST NOT exceed 4 bytes
         listBuffer.add(new byte[]{0x44, (byte) 0x89, (byte) 0x84,
-            0x00, 0x00, 0x00, 0x00,// info.duration
-            
-            /* MuxingApp */
-            0x4d, (byte) 0x80, (byte) 0x87, 0x4E, 
-            0x65, 0x77, 0x50, 0x69, 0x70, 0x65, // "NewPipe" binary string
-            
-            /* WritingApp */ 
-            0x57, 0x41, (byte) 0x87, 0x4E, 
-            0x65, 0x77, 0x50, 0x69, 0x70, 0x65// "NewPipe" binary string
+                0x00, 0x00, 0x00, 0x00,// info.duration
+
+                /* MuxingApp */
+                0x4d, (byte) 0x80, (byte) 0x87, 0x4E,
+                0x65, 0x77, 0x50, 0x69, 0x70, 0x65, // "NewPipe" binary string
+
+                /* WritingApp */
+                0x57, 0x41, (byte) 0x87, 0x4E,
+                0x65, 0x77, 0x50, 0x69, 0x70, 0x65// "NewPipe" binary string
         });
 
         /* tracks */
@@ -200,7 +196,6 @@ public class WebMWriter {
         long nextCueTime = infoTracks[cuesForTrackId].trackType == 1 ? -1 : 0;
         ArrayList<KeyFrame> keyFrames = new ArrayList<>(32);
 
-        //ArrayList<Block> chunks = new ArrayList<>(readers.length);
         ArrayList<Long> clusterOffsets = new ArrayList<>(32);
         ArrayList<Integer> clusterSizes = new ArrayList<>(32);
 
@@ -283,24 +278,21 @@ public class WebMWriter {
 
         long segmentSize = written - offsetSegmentSizeSet - 7;
 
-        // final step write offsets and sizes
-        out.rewind();
-        written = 0;
-
-        skipTo(out, offsetSegmentSizeSet);
+        /* ---- final step write offsets and sizes ---- */
+        seekTo(out, offsetSegmentSizeSet);
         writeLong(out, segmentSize);
 
         if (predefinedDurations[durationFromTrackId] > -1) {
             duration += predefinedDurations[durationFromTrackId];// this value is full-filled in makeTrackEntry() method
         }
-        skipTo(out, offsetInfoDurationSet);
+        seekTo(out, offsetInfoDurationSet);
         writeFloat(out, duration);
 
         firstClusterOffset -= baseSegmentOffset;
-        skipTo(out, offsetClusterSet);
+        seekTo(out, offsetClusterSet);
         writeInt(out, firstClusterOffset);
 
-        skipTo(out, cueReservedOffset);
+        seekTo(out, cueReservedOffset);
 
         /* Cue */
         dump(new byte[]{0x1c, 0x53, (byte) 0xbb, 0x6b, 0x20, 0x00, 0x00}, out);
@@ -321,17 +313,14 @@ public class WebMWriter {
         voidBuffer.putShort((short) (firstClusterOffset - written - 4));
         dump(voidBuffer.array(), out);
 
-        out.rewind();
-        written = 0;
-
-        skipTo(out, offsetCuesSet);
+        seekTo(out, offsetCuesSet);
         writeInt(out, (int) (cueReservedOffset - baseSegmentOffset));
 
-        skipTo(out, cueReservedOffset + 5);
+        seekTo(out, cueReservedOffset + 5);
         writeShort(out, cueSize);
 
         for (int i = 0; i < clusterSizes.size(); i++) {
-            skipTo(out, clusterOffsets.get(i));
+            seekTo(out, clusterOffsets.get(i));
             byte[] size = ByteBuffer.allocate(4).putInt(clusterSizes.get(i) | 0x200000).array();
             out.write(size, 1, 3);
             written += 3;
@@ -365,20 +354,29 @@ public class WebMWriter {
         bloq.dataSize = (int) res.dataSize;
         bloq.trackNumber = internalTrackId;
         bloq.flags = res.flags;
-        bloq.absoluteTimecode = convertTimecode(res.relativeTimeCode, readersSegment[internalTrackId].info.timecodeScale, DEFAULT_TIMECODE_SCALE);
+        bloq.absoluteTimecode = convertTimecode(res.relativeTimeCode, readersSegment[internalTrackId].info.timecodeScale);
         bloq.absoluteTimecode += readersCluter[internalTrackId].timecode;
 
         return bloq;
     }
 
-    private short convertTimecode(int time, long oldTimeScale, int newTimeScale) {
-        return (short) (time * (newTimeScale / oldTimeScale));
+    private short convertTimecode(int time, long oldTimeScale) {
+        return (short) (time * (DEFAULT_TIMECODE_SCALE / oldTimeScale));
     }
 
-    private void skipTo(SharpStream stream, long absoluteOffset) throws IOException {
-        absoluteOffset -= written;
-        written += absoluteOffset;
-        stream.skip(absoluteOffset);
+    private void seekTo(SharpStream stream, long offset) throws IOException {
+        if (stream.canSeek()) {
+            stream.seek(offset);
+        } else {
+            if (offset > written) {
+                stream.skip(offset - written);
+            } else {
+                stream.rewind();
+                stream.skip(offset);
+            }
+        }
+
+        written = offset;
     }
 
     private void writeLong(SharpStream stream, long number) throws IOException {
@@ -468,12 +466,12 @@ public class WebMWriter {
     private void makeEBML(SharpStream stream) throws IOException {
         // deafult values
         dump(new byte[]{
-            0x1A, 0x45, (byte) 0xDF, (byte) 0xA3, 0x01, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x1F, 0x42, (byte) 0x86, (byte) 0x81, 0x01,
-            0x42, (byte) 0xF7, (byte) 0x81, 0x01, 0x42, (byte) 0xF2, (byte) 0x81, 0x04,
-            0x42, (byte) 0xF3, (byte) 0x81, 0x08, 0x42, (byte) 0x82, (byte) 0x84, 0x77,
-            0x65, 0x62, 0x6D, 0x42, (byte) 0x87, (byte) 0x81, 0x02,
-            0x42, (byte) 0x85, (byte) 0x81, 0x02
+                0x1A, 0x45, (byte) 0xDF, (byte) 0xA3, 0x01, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x1F, 0x42, (byte) 0x86, (byte) 0x81, 0x01,
+                0x42, (byte) 0xF7, (byte) 0x81, 0x01, 0x42, (byte) 0xF2, (byte) 0x81, 0x04,
+                0x42, (byte) 0xF3, (byte) 0x81, 0x08, 0x42, (byte) 0x82, (byte) 0x84, 0x77,
+                0x65, 0x62, 0x6D, 0x42, (byte) 0x87, (byte) 0x81, 0x02,
+                0x42, (byte) 0x85, (byte) 0x81, 0x02
         }, stream);
     }
 
@@ -618,9 +616,10 @@ public class WebMWriter {
 
         int offset = withLength ? 1 : 0;
         byte[] buffer = new byte[offset + length];
-        long marker = (long) Math.floor((length - 1) / 8);
+        long marker = (long) Math.floor((length - 1f) / 8f);
 
-        for (int i = length - 1, mul = 1; i >= 0; i--, mul *= 0x100) {
+        float mul = 1;
+        for (int i = length - 1; i >= 0; i--, mul *= 0x100) {
             long b = (long) Math.floor(number / mul);
             if (!withLength && i == marker) {
                 b = b | (0x80 >> (length - 1));
@@ -637,11 +636,7 @@ public class WebMWriter {
 
     private ArrayList<byte[]> encode(String value) {
         byte[] str;
-        try {
-            str = value.getBytes("utf-8");
-        } catch (UnsupportedEncodingException err) {
-            str = value.getBytes();
-        }
+        str = value.getBytes(StandardCharsets.UTF_8);// or use "utf-8"
 
         ArrayList<byte[]> buffer = new ArrayList<>(2);
         buffer.add(encode(str.length, false));
@@ -720,9 +715,10 @@ public class WebMWriter {
             return (flags & 0x80) == 0x80;
         }
 
+        @NonNull
         @Override
         public String toString() {
-            return String.format("trackNumber=%s  isKeyFrame=%S  absoluteTimecode=%s", trackNumber, (flags & 0x80) == 0x80, absoluteTimecode);
+            return String.format("trackNumber=%s  isKeyFrame=%S  absoluteTimecode=%s", trackNumber, isKeyframe(), absoluteTimecode);
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java b/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java
index 48bea06f6..ea2f60837 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java
@@ -3,7 +3,7 @@ package org.schabi.newpipe.streams.io;
 import java.io.IOException;
 
 /**
- * based c#
+ * based on c#
  */
 public abstract class SharpStream {
 
@@ -15,23 +15,27 @@ public abstract class SharpStream {
 
     public abstract long skip(long amount) throws IOException;
 
-
-    public abstract int available();
+    public abstract long available();
 
     public abstract void rewind() throws IOException;
 
-
     public abstract void dispose();
 
     public abstract boolean isDisposed();
 
-
     public abstract boolean canRewind();
 
     public abstract boolean canRead();
 
     public abstract boolean canWrite();
 
+    public boolean canSetLength() {
+        return false;
+    }
+
+    public boolean canSeek() {
+        return false;
+    }
 
     public abstract void write(byte value) throws IOException;
 
@@ -39,9 +43,15 @@ public abstract class SharpStream {
 
     public abstract void write(byte[] buffer, int offset, int count) throws IOException;
 
-    public abstract void flush() throws IOException;
+    public void flush() throws IOException {
+        // STUB
+    }
 
     public void setLength(long length) throws IOException {
         throw new IOException("Not implemented");
     }
+
+    public void seek(long offset) throws IOException {
+        throw new IOException("Not implemented");
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
index 8fc423837..fa5530f12 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -430,24 +430,26 @@ public final class ListHelper {
      */
     private static String getResolutionLimit(Context context) {
         String resolutionLimit = null;
-        if (!isWifiActive(context)) {
+        if (isMeteredNetwork(context)) {
             SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
             String defValue = context.getString(R.string.limit_data_usage_none_key);
             String value = preferences.getString(
                     context.getString(R.string.limit_mobile_data_usage_key), defValue);
-            resolutionLimit = value.equals(defValue) ? null : value;
+            resolutionLimit = defValue.equals(value) ? null : value;
         }
         return resolutionLimit;
     }
 
     /**
-     * Are we connected to wifi?
+     * The current network is metered (like mobile data)?
      * @param context App context
-     * @return {@code true} if connected to wifi
+     * @return {@code true} if connected to a metered network
      */
-    private static boolean isWifiActive(Context context)
+    private static boolean isMeteredNetwork(Context context)
     {
         ConnectivityManager manager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        return manager != null && manager.getActiveNetworkInfo() != null && manager.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI;
+        if (manager == null || manager.getActiveNetworkInfo() == null) return false;
+
+        return manager.isActiveNetworkMetered();
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java b/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java
index b3522aea0..7febfa053 100644
--- a/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java
@@ -38,7 +38,7 @@ public class SecondaryStreamHelper<T extends Stream> {
     public static AudioStream getAudioStreamFor(@NonNull List<AudioStream> audioStreams, @NonNull VideoStream videoStream) {
         switch (videoStream.getFormat()) {
             case WEBM:
-            case MPEG_4:
+            case MPEG_4:// ¿is mpeg-4 DASH?
                 break;
             default:
                 return null;
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
index b864cf4fb..abc934878 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
@@ -164,9 +164,6 @@ public class DownloadInitializer extends Thread {
             }
         }
 
-        // hide marquee in the progress bar
-        mMission.done++;
-
         mMission.start();
     }
 
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index 243a8585a..b8849482a 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -40,6 +40,9 @@ public class DownloadMission extends Mission {
     public static final int ERROR_UNKNOWN_HOST = 1005;
     public static final int ERROR_CONNECT_HOST = 1006;
     public static final int ERROR_POSTPROCESSING = 1007;
+    public static final int ERROR_POSTPROCESSING_STOPPED = 1008;
+    public static final int ERROR_POSTPROCESSING_HOLD = 1009;
+    public static final int ERROR_INSUFFICIENT_STORAGE = 1010;
     public static final int ERROR_HTTP_NO_CONTENT = 204;
     public static final int ERROR_HTTP_UNSUPPORTED_RANGE = 206;
 
@@ -83,8 +86,9 @@ public class DownloadMission extends Mission {
      * 0: ready
      * 1: running
      * 2: completed
+     * 3: hold
      */
-    public int postprocessingState;
+    public volatile int postprocessingState;
 
     /**
      * Indicate if the post-processing algorithm works on the same file
@@ -92,19 +96,19 @@ public class DownloadMission extends Mission {
     public boolean postprocessingThis;
 
     /**
-     * The current resource to download {@code urls[current]}
+     * The current resource to download, see {@code urls[current]} and {@code offsets[current]}
      */
     public int current;
 
     /**
      * Metadata where the mission state is saved
      */
-    public File metadata;
+    public transient File metadata;
 
     /**
      * maximum attempts
      */
-    public int maxRetry;
+    public transient int maxRetry;
 
     /**
      * Approximated final length, this represent the sum of all resources sizes
@@ -115,11 +119,11 @@ public class DownloadMission extends Mission {
     boolean fallback;
     private int finishCount;
     public transient boolean running;
-    public transient boolean enqueued = true;
+    public boolean enqueued;
 
     public int errCode = ERROR_NOTHING;
 
-    public transient Exception errObject = null;
+    public Exception errObject = null;
     public transient boolean recovered;
     public transient Handler mHandler;
     private transient boolean mWritingToFile;
@@ -131,7 +135,7 @@ public class DownloadMission extends Mission {
 
     private transient boolean deleted;
     int currentThreadCount;
-    private transient Thread[] threads = new Thread[0];
+    public transient volatile Thread[] threads = new Thread[0];
     private transient Thread init = null;
 
 
@@ -155,6 +159,8 @@ public class DownloadMission extends Mission {
         this.location = location;
         this.kind = kind;
         this.offsets = new long[urls.length];
+        this.enqueued = true;
+        this.maxRetry = 3;
 
         if (postprocessingName != null) {
             Postprocessing algorithm = Postprocessing.getAlgorithm(postprocessingName, null);
@@ -183,6 +189,7 @@ public class DownloadMission extends Mission {
      */
     boolean isBlockPreserved(long block) {
         checkBlock(block);
+        //noinspection ConstantConditions
         return blockState.containsKey(block) ? blockState.get(block) : false;
     }
 
@@ -247,6 +254,12 @@ public class DownloadMission extends Mission {
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
         conn.setInstanceFollowRedirects(true);
 
+        // BUG workaround: switching between networks can freeze the download forever
+
+        //conn.setRequestProperty("Connection", "close");
+        conn.setConnectTimeout(30000);
+        conn.setReadTimeout(10000);
+
         if (rangeStart >= 0) {
             String req = "bytes=" + rangeStart + "-";
             if (rangeEnd > 0) req += rangeEnd;
@@ -342,11 +355,32 @@ public class DownloadMission extends Mission {
         }
     }
 
-    synchronized void notifyError(int code, Exception err) {
+    public synchronized void notifyError(int code, Exception err) {
         Log.e(TAG, "notifyError() code = " + code, err);
 
+        if (err instanceof IOException) {
+            if (err.getMessage().contains("Permission denied")) {
+                code = ERROR_PERMISSION_DENIED;
+                err = null;
+            } else if (err.getMessage().contains("write failed: ENOSPC")) {
+                code = ERROR_INSUFFICIENT_STORAGE;
+                err = null;
+            } else {
+                try {
+                    File storage = new File(location);
+                    if (storage.canWrite() && storage.getUsableSpace() < (getLength() - done)) {
+                        code = ERROR_INSUFFICIENT_STORAGE;
+                        err = null;
+                    }
+                } catch (SecurityException e) {
+                    // is a permission error
+                }
+            }
+        }
+
         errCode = code;
         errObject = err;
+        enqueued = false;
 
         pause();
 
@@ -378,6 +412,7 @@ public class DownloadMission extends Mission {
 
             if (!doPostprocessing()) return;
 
+            enqueued = false;
             running = false;
             deleteThisFromFile();
 
@@ -386,22 +421,20 @@ public class DownloadMission extends Mission {
     }
 
     private void notifyPostProcessing(int state) {
-        if (DEBUG) {
-            String action;
-            switch (state) {
-                case 1:
-                    action = "Running";
-                    break;
-                case 2:
-                    action = "Completed";
-                    break;
-                default:
-                    action = "Failed";
-            }
-
-            Log.d(TAG, action + " postprocessing on " + location + File.separator + name);
+        String action;
+        switch (state) {
+            case 1:
+                action = "Running";
+                break;
+            case 2:
+                action = "Completed";
+                break;
+            default:
+                action = "Failed";
         }
 
+        Log.d(TAG, action + " postprocessing on " + location + File.separator + name);
+
         synchronized (blockState) {
             // don't return without fully write the current state
             postprocessingState = state;
@@ -420,7 +453,6 @@ public class DownloadMission extends Mission {
         if (threads != null)
             for (Thread thread : threads) joinForThread(thread);
 
-        enqueued = false;
         running = true;
         errCode = ERROR_NOTHING;
 
@@ -463,7 +495,7 @@ public class DownloadMission extends Mission {
     }
 
     /**
-     * Pause the mission, does not affect the blocks that are being downloaded.
+     * Pause the mission
      */
     public synchronized void pause() {
         if (!running) return;
@@ -477,7 +509,6 @@ public class DownloadMission extends Mission {
 
         running = false;
         recovered = true;
-        enqueued = false;
 
         if (init != null && Thread.currentThread() != init && init.isAlive()) {
             init.interrupt();
@@ -514,7 +545,7 @@ public class DownloadMission extends Mission {
     }
 
     /**
-     * Removes the file and the meta file
+     * Removes the downloaded file and the meta file
      */
     @Override
     public boolean delete() {
@@ -580,12 +611,21 @@ public class DownloadMission extends Mission {
      * @return true, otherwise, false
      */
     public boolean isPsRunning() {
-        return postprocessingName != null && postprocessingState == 1;
+        return postprocessingName != null && (postprocessingState == 1 || postprocessingState == 3);
+    }
+
+    /**
+     * Indicated if the mission is ready
+     *
+     * @return true, otherwise, false
+     */
+    public boolean isInitialized() {
+        return blocks >= 0; // DownloadMissionInitializer was executed
     }
 
     public long getLength() {
         long calculated;
-        if (postprocessingState == 1) {
+        if (postprocessingState == 1 || postprocessingState == 3) {
             calculated = length;
         } else {
             calculated = offsets[current < offsets.length ? current : (offsets.length - 1)] + length;
@@ -596,13 +636,37 @@ public class DownloadMission extends Mission {
         return calculated > nearLength ? calculated : nearLength;
     }
 
+    /**
+     * set this mission state on the queue
+     *
+     * @param queue true to add to the queue, otherwise, false
+     */
+    public void setEnqueued(boolean queue) {
+        enqueued = queue;
+        runAsync(-2, this::writeThisToFile);
+    }
+
+    /**
+     * Attempts to continue a blocked post-processing
+     *
+     * @param recover {@code true} to retry, otherwise, {@code false} to cancel
+     */
+    public void psContinue(boolean recover) {
+        postprocessingState = 1;
+        errCode = recover ? ERROR_NOTHING : ERROR_POSTPROCESSING;
+        threads[0].interrupt();
+    }
+
     private boolean doPostprocessing() {
         if (postprocessingName == null || postprocessingState == 2) return true;
 
         notifyPostProcessing(1);
         notifyProgress(0);
 
-        Thread.currentThread().setName("[" + TAG + "]  post-processing = " + postprocessingName + "  filename = " + name);
+        if (DEBUG)
+            Thread.currentThread().setName("[" + TAG + "]  post-processing = " + postprocessingName + "  filename = " + name);
+
+        threads = new Thread[]{Thread.currentThread()};
 
         Exception exception = null;
 
diff --git a/app/src/main/java/us/shandian/giga/get/Mission.java b/app/src/main/java/us/shandian/giga/get/Mission.java
index ec2ddaa26..53c81b08b 100644
--- a/app/src/main/java/us/shandian/giga/get/Mission.java
+++ b/app/src/main/java/us/shandian/giga/get/Mission.java
@@ -47,6 +47,11 @@ public abstract class Mission implements Serializable {
         return new File(location, name);
     }
 
+    /**
+     * Delete the downloaded file
+     *
+     * @return {@code true] if and only if the file is successfully deleted, otherwise, {@code false}
+     */
     public boolean delete() {
         deleted = true;
         return getDownloadedFile().delete();
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java b/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java
new file mode 100644
index 000000000..fa0c2c7ae
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java
@@ -0,0 +1,43 @@
+package us.shandian.giga.postprocessing;
+
+import org.schabi.newpipe.streams.Mp4DashReader;
+import org.schabi.newpipe.streams.Mp4FromDashWriter;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+
+import us.shandian.giga.get.DownloadMission;
+
+public class M4aNoDash extends Postprocessing {
+
+    M4aNoDash(DownloadMission mission) {
+        super(mission, 0, true);
+    }
+
+    @Override
+    boolean test(SharpStream... sources) throws IOException {
+        // check if the mp4 file is DASH (youtube)
+
+        Mp4DashReader reader = new Mp4DashReader(sources[0]);
+        reader.parse();
+
+        switch (reader.getBrands()[0]) {
+            case 0x64617368:// DASH
+            case 0x69736F35:// ISO5
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    int process(SharpStream out, SharpStream... sources) throws IOException {
+        Mp4FromDashWriter muxer = new Mp4FromDashWriter(sources[0]);
+        muxer.setMainBrand(0x4D344120);// binary string "M4A "
+        muxer.parseSources();
+        muxer.selectTracks(0);
+        muxer.build(out);
+
+        return OK_RESULT;
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Mp4DashMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
similarity index 60%
rename from app/src/main/java/us/shandian/giga/postprocessing/Mp4DashMuxer.java
rename to app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
index 45c06dd4b..09f5d9661 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/Mp4DashMuxer.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
@@ -1,29 +1,29 @@
-package us.shandian.giga.postprocessing;
-
-import org.schabi.newpipe.streams.Mp4DashWriter;
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.IOException;
-
-import us.shandian.giga.get.DownloadMission;
-
-/**
- * @author kapodamy
- */
-class Mp4DashMuxer extends Postprocessing {
-
-    Mp4DashMuxer(DownloadMission mission) {
-        super(mission, 15360 * 1024/* 15 MiB */, true);
-    }
-
-    @Override
-    int process(SharpStream out, SharpStream... sources) throws IOException {
-        Mp4DashWriter muxer = new Mp4DashWriter(sources);
-        muxer.parseSources();
-        muxer.selectTracks(0, 0);
-        muxer.build(out);
-
-        return OK_RESULT;
-    }
-
-}
+package us.shandian.giga.postprocessing;
+
+import org.schabi.newpipe.streams.Mp4FromDashWriter;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+
+import us.shandian.giga.get.DownloadMission;
+
+/**
+ * @author kapodamy
+ */
+class Mp4FromDashMuxer extends Postprocessing {
+
+    Mp4FromDashMuxer(DownloadMission mission) {
+        super(mission, 2 * 1024 * 1024/* 2 MiB */, true);
+    }
+
+    @Override
+    int process(SharpStream out, SharpStream... sources) throws IOException {
+        Mp4FromDashWriter muxer = new Mp4FromDashWriter(sources);
+        muxer.parseSources();
+        muxer.selectTracks(0, 0);
+        muxer.build(out);
+
+        return OK_RESULT;
+    }
+
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Mp4Muxer.java b/app/src/main/java/us/shandian/giga/postprocessing/Mp4Muxer.java
deleted file mode 100644
index bf932d5c1..000000000
--- a/app/src/main/java/us/shandian/giga/postprocessing/Mp4Muxer.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package us.shandian.giga.postprocessing;
-
-import android.media.MediaCodec.BufferInfo;
-import android.media.MediaExtractor;
-import android.media.MediaMuxer;
-import android.media.MediaMuxer.OutputFormat;
-import android.util.Log;
-
-import static org.schabi.newpipe.BuildConfig.DEBUG;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import us.shandian.giga.get.DownloadMission;
-
-
-class Mp4Muxer extends Postprocessing {
-    private static final String TAG = "Mp4Muxer";
-    private static final int NOTIFY_BYTES_INTERVAL = 128 * 1024;// 128 KiB
-
-    Mp4Muxer(DownloadMission mission) {
-        super(mission, 0, false);
-    }
-
-    @Override
-    int process(SharpStream out, SharpStream... sources) throws IOException {
-        File dlFile = mission.getDownloadedFile();
-        File tmpFile = new File(mission.location, mission.name.concat(".tmp"));
-
-        if (tmpFile.exists())
-            if (!tmpFile.delete()) return DownloadMission.ERROR_FILE_CREATION;
-
-        if (!tmpFile.createNewFile()) return DownloadMission.ERROR_FILE_CREATION;
-
-        FileInputStream source = null;
-        MediaMuxer muxer = null;
-
-        //noinspection TryFinallyCanBeTryWithResources
-        try {
-            source = new FileInputStream(dlFile);
-            MediaExtractor tracks[] = {
-                    getMediaExtractor(source, mission.offsets[0], mission.offsets[1] - mission.offsets[0]),
-                    getMediaExtractor(source, mission.offsets[1], mission.length - mission.offsets[1])
-            };
-
-            muxer = new MediaMuxer(tmpFile.getAbsolutePath(), OutputFormat.MUXER_OUTPUT_MPEG_4);
-
-            int tracksIndex[] = {
-                    muxer.addTrack(tracks[0].getTrackFormat(0)),
-                    muxer.addTrack(tracks[1].getTrackFormat(0))
-            };
-
-            ByteBuffer buffer = ByteBuffer.allocate(512 * 1024);// 512 KiB
-            BufferInfo info = new BufferInfo();
-
-            long written = 0;
-            long nextReport = NOTIFY_BYTES_INTERVAL;
-
-            muxer.start();
-
-            while (true) {
-                int done = 0;
-
-                for (int i = 0; i < tracks.length; i++) {
-                    if (tracksIndex[i] < 0) continue;
-
-                    info.set(0,
-                            tracks[i].readSampleData(buffer, 0),
-                            tracks[i].getSampleTime(),
-                            tracks[i].getSampleFlags()
-                    );
-
-                    if (info.size >= 0) {
-                        muxer.writeSampleData(tracksIndex[i], buffer, info);
-                        written += info.size;
-                        done++;
-                    }
-                    if (!tracks[i].advance()) {
-                        // EOF reached
-                        tracks[i].release();
-                        tracksIndex[i] = -1;
-                    }
-
-                    if (written > nextReport) {
-                        nextReport = written + NOTIFY_BYTES_INTERVAL;
-                        super.progressReport(written);
-                    }
-                }
-
-                if (done < 1) break;
-            }
-
-            // this part should not fail
-            if (!dlFile.delete()) return DownloadMission.ERROR_FILE_CREATION;
-            if (!tmpFile.renameTo(dlFile)) return DownloadMission.ERROR_FILE_CREATION;
-
-            return OK_RESULT;
-        } finally {
-            try {
-                if (muxer != null) {
-                    muxer.stop();
-                    muxer.release();
-                }
-            } catch (Exception err) {
-                if (DEBUG)
-                    Log.e(TAG, "muxer stop/release failed", err);
-            }
-
-            if (source != null) {
-                try {
-                    source.close();
-                } catch (IOException e) {
-                    // nothing to do
-                }
-            }
-
-            // if the operation fails, delete the temporal file
-            if (tmpFile.exists()) {
-                //noinspection ResultOfMethodCallIgnored
-                tmpFile.delete();
-            }
-        }
-    }
-
-    private MediaExtractor getMediaExtractor(FileInputStream source, long offset, long length) throws IOException {
-        MediaExtractor extractor = new MediaExtractor();
-        extractor.setDataSource(source.getFD(), offset, length);
-        extractor.selectTrack(0);
-
-        return extractor;
-    }
-}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
index 635140bd3..df8549010 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
@@ -1,6 +1,7 @@
 package us.shandian.giga.postprocessing;
 
 import android.os.Message;
+import android.util.Log;
 
 import org.schabi.newpipe.streams.io.SharpStream;
 
@@ -9,17 +10,22 @@ import java.io.IOException;
 
 import us.shandian.giga.get.DownloadMission;
 import us.shandian.giga.postprocessing.io.ChunkFileInputStream;
-import us.shandian.giga.postprocessing.io.CircularFile;
+import us.shandian.giga.postprocessing.io.CircularFileWriter;
+import us.shandian.giga.postprocessing.io.CircularFileWriter.OffsetChecker;
 import us.shandian.giga.service.DownloadManagerService;
 
+import static us.shandian.giga.get.DownloadMission.ERROR_NOTHING;
+import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_HOLD;
+import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION;
+
 public abstract class Postprocessing {
 
-    static final byte OK_RESULT = DownloadMission.ERROR_NOTHING;
+    static final byte OK_RESULT = ERROR_NOTHING;
 
     public static final String ALGORITHM_TTML_CONVERTER = "ttml";
-    public static final String ALGORITHM_MP4_DASH_MUXER = "mp4D";
-    public static final String ALGORITHM_MP4_MUXER = "mp4";
     public static final String ALGORITHM_WEBM_MUXER = "webm";
+    public static final String ALGORITHM_MP4_FROM_DASH_MUXER = "mp4D-mp4";
+    public static final String ALGORITHM_M4A_NO_DASH = "mp4D-m4a";
 
     public static Postprocessing getAlgorithm(String algorithmName, DownloadMission mission) {
         if (null == algorithmName) {
@@ -27,14 +33,14 @@ public abstract class Postprocessing {
         } else switch (algorithmName) {
             case ALGORITHM_TTML_CONVERTER:
                 return new TtmlConverter(mission);
-            case ALGORITHM_MP4_DASH_MUXER:
-                return new Mp4DashMuxer(mission);
-            case ALGORITHM_MP4_MUXER:
-                return new Mp4Muxer(mission);
             case ALGORITHM_WEBM_MUXER:
                 return new WebMMuxer(mission);
+            case ALGORITHM_MP4_FROM_DASH_MUXER:
+                return new Mp4FromDashMuxer(mission);
+            case ALGORITHM_M4A_NO_DASH:
+                return new M4aNoDash(mission);
             /*case "example-algorithm":
-            return new ExampleAlgorithm(mission);*/
+                return new ExampleAlgorithm(mission);*/
             default:
                 throw new RuntimeException("Unimplemented post-processing algorithm: " + algorithmName);
         }
@@ -65,7 +71,8 @@ public abstract class Postprocessing {
 
     public void run() throws IOException {
         File file = mission.getDownloadedFile();
-        CircularFile out = null;
+        File temp = null;
+        CircularFileWriter out = null;
         int result;
         long finalLength = -1;
 
@@ -81,29 +88,54 @@ public abstract class Postprocessing {
                 }
                 sources[i] = new ChunkFileInputStream(file, mission.offsets[i], mission.getDownloadedFile().length(), "rw");
 
-                int[] idx = {0};
-                CircularFile.OffsetChecker checker = () -> {
-                    while (idx[0] < sources.length) {
-                        /*
-                         * WARNING: never use rewind() in any chunk after any writing (especially on first chunks)
-                         *          or the CircularFile can lead to unexpected results
-                         */
-                        if (sources[idx[0]].isDisposed() || sources[idx[0]].available() < 1) {
-                            idx[0]++;
-                            continue;// the selected source is not used anymore
+                if (test(sources)) {
+                    for (SharpStream source : sources) source.rewind();
+
+                    OffsetChecker checker = () -> {
+                        for (ChunkFileInputStream source : sources) {
+                            /*
+                             * WARNING: never use rewind() in any chunk after any writing (especially on first chunks)
+                             *          or the CircularFileWriter can lead to unexpected results
+                             */
+                            if (source.isDisposed() || source.available() < 1) {
+                                continue;// the selected source is not used anymore
+                            }
+
+                            return source.getFilePointer() - 1;
                         }
 
-                        return sources[idx[0]].getFilePointer() - 1;
-                    }
+                        return -1;
+                    };
 
-                    return -1;
-                };
-                out = new CircularFile(file, 0, this::progressReport, checker);
+                    temp = new File(mission.location, mission.name + ".tmp");
 
-                result = process(out, sources);
+                    out = new CircularFileWriter(file, temp, checker);
+                    out.onProgress = this::progressReport;
 
-                if (result == OK_RESULT)
-                    finalLength = out.finalizeFile();
+                    out.onWriteError = (err) -> {
+                        mission.postprocessingState = 3;
+                        mission.notifyError(ERROR_POSTPROCESSING_HOLD, err);
+
+                        try {
+                            synchronized (this) {
+                                while (mission.postprocessingState == 3)
+                                    wait();
+                            }
+                        } catch (InterruptedException e) {
+                            // nothing to do
+                            Log.e(this.getClass().getSimpleName(), "got InterruptedException");
+                        }
+
+                        return mission.errCode == ERROR_NOTHING;
+                    };
+
+                    result = process(out, sources);
+
+                    if (result == OK_RESULT)
+                        finalLength = out.finalizeFile();
+                } else {
+                    result = OK_RESULT;
+                }
             } finally {
                 for (SharpStream source : sources) {
                     if (source != null && !source.isDisposed()) {
@@ -113,17 +145,22 @@ public abstract class Postprocessing {
                 if (out != null) {
                     out.dispose();
                 }
+                if (temp != null) {
+                    //noinspection ResultOfMethodCallIgnored
+                    temp.delete();
+                }
             }
         } else {
-            result = process(null);
+            result = test() ? process(null) : OK_RESULT;
         }
 
         if (result == OK_RESULT) {
-            if (finalLength < 0) finalLength = file.length();
-            mission.done = finalLength;
-            mission.length = finalLength;
+            if (finalLength != -1) {
+                mission.done = finalLength;
+                mission.length = finalLength;
+            }
         } else {
-            mission.errCode = DownloadMission.ERROR_UNKNOWN_EXCEPTION;
+            mission.errCode = ERROR_UNKNOWN_EXCEPTION;
             mission.errObject = new RuntimeException("post-processing algorithm returned " + result);
         }
 
@@ -134,7 +171,18 @@ public abstract class Postprocessing {
     }
 
     /**
-     * Abstract method to execute the pos-processing algorithm
+     * Test if the post-processing algorithm can be skipped
+     *
+     * @param sources files to be processed
+     * @return {@code true} if the post-processing is required, otherwise, {@code false}
+     * @throws IOException if an I/O error occurs.
+     */
+    boolean test(SharpStream... sources) throws IOException {
+        return true;
+    }
+
+    /**
+     * Abstract method to execute the post-processing algorithm
      *
      * @param out     output stream
      * @param sources files to be processed
@@ -151,7 +199,7 @@ public abstract class Postprocessing {
         return mission.postprocessingArgs[index];
     }
 
-    void progressReport(long done) {
+    private void progressReport(long done) {
         mission.done = done;
         if (mission.length < mission.done) mission.length = mission.done;
 
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java b/app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java
index cd62c5d22..ee2fcddd5 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java
@@ -94,7 +94,7 @@ public class ChunkFileInputStream extends SharpStream {
     }
 
     @Override
-    public int available() {
+    public long available() {
         return (int) (length - position);
     }
 
@@ -147,7 +147,4 @@ public class ChunkFileInputStream extends SharpStream {
     public void write(byte[] buffer, int offset, int count) {
     }
 
-    @Override
-    public void flush() {
-    }
 }
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFile.java b/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFile.java
deleted file mode 100644
index d2fc82d33..000000000
--- a/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFile.java
+++ /dev/null
@@ -1,375 +0,0 @@
-package us.shandian.giga.postprocessing.io;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.ArrayList;
-
-public class CircularFile extends SharpStream {
-
-    private final static int AUX_BUFFER_SIZE = 1024 * 1024;// 1 MiB
-    private final static int AUX_BUFFER_SIZE2 = 512 * 1024;// 512 KiB
-    private final static int NOTIFY_BYTES_INTERVAL = 64 * 1024;// 64 KiB
-    private final static int QUEUE_BUFFER_SIZE = 8 * 1024;// 8 KiB
-    private final static boolean IMMEDIATE_AUX_BUFFER_FLUSH = false;
-
-    private RandomAccessFile out;
-    private long position;
-    private long maxLengthKnown = -1;
-
-    private ArrayList<ManagedBuffer> auxiliaryBuffers;
-    private OffsetChecker callback;
-    private ManagedBuffer queue;
-    private long startOffset;
-    private ProgressReport onProgress;
-    private long reportPosition;
-
-    public CircularFile(File file, long offset, ProgressReport progressReport, OffsetChecker checker) throws IOException {
-        if (checker == null) {
-            throw new NullPointerException("checker is null");
-        }
-
-        try {
-            queue = new ManagedBuffer(QUEUE_BUFFER_SIZE);
-            out = new RandomAccessFile(file, "rw");
-            out.seek(offset);
-            position = offset;
-        } catch (IOException err) {
-            try {
-                if (out != null) {
-                    out.close();
-                }
-            } catch (IOException e) {
-                // nothing to do
-            }
-            throw err;
-        }
-
-        auxiliaryBuffers = new ArrayList<>(15);
-        callback = checker;
-        startOffset = offset;
-        reportPosition = offset;
-        onProgress = progressReport;
-
-    }
-
-    /**
-     * Close the file without flushing any buffer
-     */
-    @Override
-    public void dispose() {
-        try {
-            auxiliaryBuffers = null;
-            if (out != null) {
-                out.close();
-                out = null;
-            }
-        } catch (IOException err) {
-            // nothing to do
-        }
-    }
-
-    /**
-     * Flush any buffer and close the output file. Use this method if the
-     * operation is successful
-     *
-     * @return the final length of the file
-     * @throws IOException if an I/O error occurs
-     */
-    public long finalizeFile() throws IOException {
-        flushEverything();
-
-        if (maxLengthKnown > -1) {
-            position = maxLengthKnown;
-        }
-        if (position < out.length()) {
-            out.setLength(position);
-        }
-
-        dispose();
-
-        return position;
-    }
-
-    @Override
-    public void write(byte b) throws IOException {
-        write(new byte[]{b}, 0, 1);
-    }
-
-    @Override
-    public void write(byte b[]) throws IOException {
-        write(b, 0, b.length);
-    }
-
-    @Override
-    public void write(byte b[], int off, int len) throws IOException {
-        if (len == 0) {
-            return;
-        }
-
-        long end = callback.check();
-        long available;
-
-        if (end == -1) {
-            available = Long.MAX_VALUE;
-        } else {
-            if (end < startOffset) {
-                throw new IOException("The reported offset is invalid. reported offset is " + String.valueOf(end));
-            }
-            available = end - position;
-        }
-
-        // Check if possible flush one or more auxiliary buffer
-        if (auxiliaryBuffers.size() > 0) {
-            ManagedBuffer aux = auxiliaryBuffers.get(0);
-
-            // check if there is enough space to flush it completely
-            while (available >= (aux.size + queue.size)) {
-                available -= aux.size;
-                writeQueue(aux.buffer, 0, aux.size);
-                aux.dereference();
-                auxiliaryBuffers.remove(0);
-
-                if (auxiliaryBuffers.size() < 1) {
-                    aux = null;
-                    break;
-                }
-                aux = auxiliaryBuffers.get(0);
-            }
-
-            if (IMMEDIATE_AUX_BUFFER_FLUSH) {
-                // try partial flush to avoid allocate another auxiliary buffer
-                if (aux != null && aux.available() < len && available > queue.size) {
-                    int size = Math.min(aux.size, (int) available - queue.size);
-
-                    writeQueue(aux.buffer, 0, size);
-                    aux.dereference(size);
-
-                    available -= size;
-                }
-            }
-        }
-
-        if (auxiliaryBuffers.size() < 1 && available > (len + queue.size)) {
-            writeQueue(b, off, len);
-        } else {
-            int i = auxiliaryBuffers.size() - 1;
-            while (len > 0) {
-                if (i < 0) {
-                    // allocate a new auxiliary buffer
-                    auxiliaryBuffers.add(new ManagedBuffer(AUX_BUFFER_SIZE));
-                    i++;
-                }
-
-                ManagedBuffer aux = auxiliaryBuffers.get(i);
-                available = aux.available();
-
-                if (available < 1) {
-                    // secondary auxiliary buffer
-                    available = len;
-                    aux = new ManagedBuffer(Math.max(len, AUX_BUFFER_SIZE2));
-                    auxiliaryBuffers.add(aux);
-                    i++;
-                } else {
-                    available = Math.min(len, available);
-                }
-
-                aux.write(b, off, (int) available);
-
-                len -= available;
-                if (len > 0) off += available;
-            }
-        }
-    }
-
-    private void writeOutside(byte buffer[], int offset, int length) throws IOException {
-        out.write(buffer, offset, length);
-        position += length;
-
-        if (onProgress != null && position > reportPosition) {
-            reportPosition = position + NOTIFY_BYTES_INTERVAL;
-            onProgress.report(position);
-        }
-    }
-
-    private void writeQueue(byte[] buffer, int offset, int length) throws IOException {
-        while (length > 0) {
-            if (queue.available() < length) {
-                flushQueue();
-
-                if (length >= queue.buffer.length) {
-                    writeOutside(buffer, offset, length);
-                    return;
-                }
-            }
-
-            int size = Math.min(queue.available(), length);
-            queue.write(buffer, offset, size);
-
-            offset += size;
-            length -= size;
-        }
-
-        if (queue.size >= queue.buffer.length) {
-            flushQueue();
-        }
-    }
-
-    private void flushQueue() throws IOException {
-        writeOutside(queue.buffer, 0, queue.size);
-        queue.size = 0;
-    }
-
-    private void flushEverything() throws IOException {
-        flushQueue();
-
-        if (auxiliaryBuffers.size() > 0) {
-            for (ManagedBuffer aux : auxiliaryBuffers) {
-                writeOutside(aux.buffer, 0, aux.size);
-                aux.dereference();
-            }
-            auxiliaryBuffers.clear();
-        }
-    }
-
-    /**
-     * Flush any buffer directly to the file. Warning: use this method ONLY if
-     * all read dependencies are disposed
-     *
-     * @throws IOException if the dependencies are not disposed
-     */
-    @Override
-    public void flush() throws IOException {
-        if (callback.check() != -1) {
-            throw new IOException("All read dependencies of this file must be disposed first");
-        }
-        flushEverything();
-
-        // Save the current file length in case the method {@code rewind()} is called
-        if (position > maxLengthKnown) {
-            maxLengthKnown = position;
-        }
-    }
-
-    @Override
-    public void rewind() throws IOException {
-        flush();
-        out.seek(startOffset);
-
-        if (onProgress != null) {
-            onProgress.report(-position);
-        }
-
-        position = startOffset;
-        reportPosition = startOffset;
-
-    }
-
-    @Override
-    public long skip(long amount) throws IOException {
-        flush();
-        position += amount;
-
-        out.seek(position);
-
-        return amount;
-    }
-
-    @Override
-    public boolean isDisposed() {
-        return out == null;
-    }
-
-    @Override
-    public boolean canRewind() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-
-    //<editor-fold defaultState="collapsed" desc="stub read methods">
-    @Override
-    public boolean canRead() {
-        return false;
-    }
-
-    @Override
-    public int read() {
-        throw new UnsupportedOperationException("write-only");
-    }
-
-    @Override
-    public int read(byte[] buffer) {
-        throw new UnsupportedOperationException("write-only");
-    }
-
-    @Override
-    public int read(byte[] buffer, int offset, int count) {
-        throw new UnsupportedOperationException("write-only");
-    }
-
-    @Override
-    public int available() {
-        throw new UnsupportedOperationException("write-only");
-    }
-//</editor-fold>
-
-    public interface OffsetChecker {
-
-        /**
-         * Checks the amount of available space ahead
-         *
-         * @return absolute offset in the file where no more data SHOULD NOT be
-         * written. If the value is -1 the whole file will be used
-         */
-        long check();
-    }
-
-    public interface ProgressReport {
-
-        void report(long progress);
-    }
-
-    class ManagedBuffer {
-
-        byte[] buffer;
-        int size;
-
-        ManagedBuffer(int length) {
-            buffer = new byte[length];
-        }
-
-        void dereference() {
-            buffer = null;
-            size = 0;
-        }
-
-        void dereference(int amount) {
-            if (amount > size) {
-                throw new IndexOutOfBoundsException("Invalid dereference amount (" + amount + ">=" + size + ")");
-            }
-            size -= amount;
-            System.arraycopy(buffer, amount, buffer, 0, size);
-        }
-
-        protected int available() {
-            return buffer.length - size;
-        }
-
-        private void write(byte[] b, int off, int len) {
-            System.arraycopy(b, off, buffer, size, len);
-            size += len;
-        }
-
-        @Override
-        public String toString() {
-            return "holding: " + String.valueOf(size) + " length: " + String.valueOf(buffer.length) + " available: " + String.valueOf(available());
-        }
-
-    }
-}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFileWriter.java b/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFileWriter.java
new file mode 100644
index 000000000..4c4160fa3
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFileWriter.java
@@ -0,0 +1,459 @@
+package us.shandian.giga.postprocessing.io;
+
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+public class CircularFileWriter extends SharpStream {
+
+    private final static int QUEUE_BUFFER_SIZE = 8 * 1024;// 8 KiB
+    private final static int NOTIFY_BYTES_INTERVAL = 64 * 1024;// 64 KiB
+    private final static int THRESHOLD_AUX_LENGTH = 3 * 1024 * 1024;// 3 MiB
+
+    private OffsetChecker callback;
+
+    public ProgressReport onProgress;
+    public WriteErrorHandle onWriteError;
+
+    private long reportPosition;
+    private long maxLengthKnown = -1;
+
+    private BufferedFile out;
+    private BufferedFile aux;
+
+    public CircularFileWriter(File source, File temp, OffsetChecker checker) throws IOException {
+        if (checker == null) {
+            throw new NullPointerException("checker is null");
+        }
+
+        if (!temp.exists()) {
+            if (!temp.createNewFile()) {
+                throw new IOException("Cannot create a temporal file");
+            }
+        }
+
+        aux = new BufferedFile(temp);
+        out = new BufferedFile(source);
+
+        callback = checker;
+
+        reportPosition = NOTIFY_BYTES_INTERVAL;
+    }
+
+    private void flushAuxiliar() throws IOException {
+        if (aux.length < 1) {
+            return;
+        }
+
+        boolean underflow = out.getOffset() >= out.length;
+
+        out.flush();
+        aux.flush();
+
+        aux.target.seek(0);
+        out.target.seek(out.length);
+
+        long length = aux.length;
+        out.length += aux.length;
+
+        while (length > 0) {
+            int read = (int) Math.min(length, Integer.MAX_VALUE);
+            read = aux.target.read(aux.queue, 0, Math.min(read, aux.queue.length));
+
+            out.writeProof(aux.queue, read);
+            length -= read;
+        }
+
+        if (underflow) {
+            out.offset += aux.offset;
+            out.target.seek(out.offset);
+        } else {
+            out.offset = out.length;
+        }
+
+        if (out.length > maxLengthKnown) {
+            maxLengthKnown = out.length;
+        }
+
+        if (aux.length > THRESHOLD_AUX_LENGTH) {
+            aux.target.setLength(THRESHOLD_AUX_LENGTH);// or setLength(0);
+        }
+
+        aux.reset();
+    }
+
+    /**
+     * Flush any buffer and close the output file. Use this method if the
+     * operation is successful
+     *
+     * @return the final length of the file
+     * @throws IOException if an I/O error occurs
+     */
+    public long finalizeFile() throws IOException {
+        flushAuxiliar();
+
+        out.flush();
+
+        // change file length (if required)
+        long length = Math.max(maxLengthKnown, out.length);
+        if (length != out.target.length()) {
+            out.target.setLength(length);
+        }
+
+        dispose();
+
+        return length;
+    }
+
+    /**
+     * Close the file without flushing any buffer
+     */
+    @Override
+    public void dispose() {
+        if (out != null) {
+            out.dispose();
+            out = null;
+        }
+        if (aux != null) {
+            aux.dispose();
+            aux = null;
+        }
+    }
+
+    @Override
+    public void write(byte b) throws IOException {
+        write(new byte[]{b}, 0, 1);
+    }
+
+    @Override
+    public void write(byte b[]) throws IOException {
+        write(b, 0, b.length);
+    }
+
+    @Override
+    public void write(byte b[], int off, int len) throws IOException {
+        if (len == 0) {
+            return;
+        }
+
+        long available;
+        long offsetOut = out.getOffset();
+        long offsetAux = aux.getOffset();
+        long end = callback.check();
+
+        if (end == -1) {
+            available = Integer.MAX_VALUE;
+        } else if (end < offsetOut) {
+            throw new IOException("The reported offset is invalid: " + String.valueOf(offsetOut));
+        } else {
+            available = end - offsetOut;
+        }
+
+        boolean usingAux = aux.length > 0 && offsetOut >= out.length;
+        boolean underflow = offsetAux < aux.length || offsetOut < out.length;
+
+        if (usingAux) {
+            // before continue calculate the final length of aux
+            long length = offsetAux + len;
+            if (underflow) {
+                if (aux.length > length) {
+                    length = aux.length;// the length is not changed
+                }
+            } else {
+                length = aux.length + len;
+            }
+
+            if (length > available || length < THRESHOLD_AUX_LENGTH) {
+                aux.write(b, off, len);
+            } else {
+                if (underflow) {
+                    aux.write(b, off, len);
+                    flushAuxiliar();
+                } else {
+                    flushAuxiliar();
+                    out.write(b, off, len);// write directly on the output
+                }
+            }
+        } else {
+            if (underflow) {
+                available = out.length - offsetOut;
+            }
+
+            int length = Math.min(len, (int) available);
+            out.write(b, off, length);
+
+            len -= length;
+            off += length;
+
+            if (len > 0) {
+                aux.write(b, off, len);
+            }
+        }
+
+        if (onProgress != null) {
+            long absoluteOffset = out.getOffset() + aux.getOffset();
+            if (absoluteOffset > reportPosition) {
+                reportPosition = absoluteOffset + NOTIFY_BYTES_INTERVAL;
+                onProgress.report(absoluteOffset);
+            }
+        }
+    }
+
+    @Override
+    public void flush() throws IOException {
+        aux.flush();
+        out.flush();
+
+        long total = out.length + aux.length;
+        if (total > maxLengthKnown) {
+            maxLengthKnown = total;// save the current file length in case the method {@code rewind()} is called
+        }
+    }
+
+    @Override
+    public long skip(long amount) throws IOException {
+        seek(out.getOffset() + aux.getOffset() + amount);
+        return amount;
+    }
+
+    @Override
+    public void rewind() throws IOException {
+        if (onProgress != null) {
+            onProgress.report(-out.length - aux.length);// rollback the whole progress
+        }
+
+        seek(0);
+
+        reportPosition = NOTIFY_BYTES_INTERVAL;
+    }
+
+    @Override
+    public void seek(long offset) throws IOException {
+        long total = out.length + aux.length;
+        if (offset == total) {
+            return;// nothing to do
+        }
+
+        // flush everything, avoid any underflow
+        flush();
+
+        if (offset < 0 || offset > total) {
+            throw new IOException("desired offset is outside of range=0-" + total + " offset=" + offset);
+        }
+
+        if (offset > out.length) {
+            out.seek(out.length);
+            aux.seek(offset - out.length);
+        } else {
+            out.seek(offset);
+            aux.seek(0);
+        }
+    }
+
+    @Override
+    public boolean isDisposed() {
+        return out == null;
+    }
+
+    @Override
+    public boolean canRewind() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    @Override
+    public boolean canSeek() {
+        return true;
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="stub read methods">
+    @Override
+    public boolean canRead() {
+        return false;
+    }
+
+    @Override
+    public int read() {
+        throw new UnsupportedOperationException("write-only");
+    }
+
+    @Override
+    public int read(byte[] buffer
+    ) {
+        throw new UnsupportedOperationException("write-only");
+    }
+
+    @Override
+    public int read(byte[] buffer, int offset, int count
+    ) {
+        throw new UnsupportedOperationException("write-only");
+    }
+
+    @Override
+    public long available() {
+        throw new UnsupportedOperationException("write-only");
+    }
+    //</editor-fold>
+
+    public interface OffsetChecker {
+
+        /**
+         * Checks the amount of available space ahead
+         *
+         * @return absolute offset in the file where no more data SHOULD NOT be
+         * written. If the value is -1 the whole file will be used
+         */
+        long check();
+    }
+
+    public interface ProgressReport {
+
+        /**
+         * Report the size of the new file
+         *
+         * @param progress the new size
+         */
+        void report(long progress);
+    }
+
+    public interface WriteErrorHandle {
+
+        /**
+         * Attempts to handle a I/O exception
+         *
+         * @param err the cause
+         * @return {@code true} to retry and continue, otherwise, {@code false}
+         * and throw the exception
+         */
+        boolean handle(Exception err);
+    }
+
+    class BufferedFile {
+
+        protected final RandomAccessFile target;
+
+        private long offset;
+        protected long length;
+
+        private byte[] queue;
+        private int queueSize;
+
+        BufferedFile(File file) throws FileNotFoundException {
+            queue = new byte[QUEUE_BUFFER_SIZE];
+            target = new RandomAccessFile(file, "rw");
+        }
+
+        protected long getOffset() {
+            return offset + queueSize;// absolute offset in the file
+        }
+
+        protected void dispose() {
+            try {
+                queue = null;
+                target.close();
+            } catch (IOException e) {
+                // nothing to do
+            }
+        }
+
+        protected void write(byte b[], int off, int len) throws IOException {
+            while (len > 0) {
+                // if the queue is full, the method available() will flush the queue
+                int read = Math.min(available(), len);
+
+                // enqueue incoming buffer
+                System.arraycopy(b, off, queue, queueSize, read);
+                queueSize += read;
+
+                len -= read;
+                off += read;
+            }
+
+            long total = offset + queueSize;
+            if (total > length) {
+                length = total;// save length
+            }
+        }
+
+        protected void flush() throws IOException {
+            writeProof(queue, queueSize);
+            offset += queueSize;
+            queueSize = 0;
+        }
+
+        protected void rewind() throws IOException {
+            offset = 0;
+            target.seek(0);
+        }
+
+        protected int available() throws IOException {
+            if (queueSize >= queue.length) {
+                flush();
+                return queue.length;
+            }
+
+            return queue.length - queueSize;
+        }
+
+        protected void reset() throws IOException {
+            offset = 0;
+            length = 0;
+            target.seek(0);
+        }
+
+        protected void seek(long absoluteOffset) throws IOException {
+            offset = absoluteOffset;
+            target.seek(absoluteOffset);
+        }
+
+        protected void writeProof(byte[] buffer, int length) throws IOException {
+            if (onWriteError == null) {
+                target.write(buffer, 0, length);
+                return;
+            }
+
+            while (true) {
+                try {
+                    target.write(buffer, 0, length);
+                    return;
+                } catch (Exception e) {
+                    if (!onWriteError.handle(e)) {
+                        throw e;// give up
+                    }
+                }
+            }
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            String absOffset;
+            String absLength;
+
+            try {
+                absOffset = Long.toString(target.getFilePointer());
+            } catch (IOException e) {
+                absOffset = "[" + e.getLocalizedMessage() + "]";
+            }
+            try {
+                absLength = Long.toString(target.length());
+            } catch (IOException e) {
+                absLength = "[" + e.getLocalizedMessage() + "]";
+            }
+
+            return String.format(
+                    "offset=%s  length=%s queue=%s  absOffset=%s  absLength=%s",
+                    offset, length, queueSize, absOffset, absLength
+            );
+        }
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/FileStream.java b/app/src/main/java/us/shandian/giga/postprocessing/io/FileStream.java
deleted file mode 100644
index c1b675eef..000000000
--- a/app/src/main/java/us/shandian/giga/postprocessing/io/FileStream.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package us.shandian.giga.postprocessing.io;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
-
-/**
- * @author kapodamy
- */
-public class FileStream extends SharpStream {
-
-    public enum Mode {
-        Read,
-        ReadWrite
-    }
-
-    public RandomAccessFile source;
-    private final Mode mode;
-
-    public FileStream(String path, Mode mode) throws IOException {
-        String flags;
-
-        if (mode == Mode.Read) {
-            flags = "r";
-        } else {
-            flags = "rw";
-        }
-
-        this.mode = mode;
-        source = new RandomAccessFile(path, flags);
-    }
-
-    @Override
-    public int read() throws IOException {
-        return source.read();
-    }
-
-    @Override
-    public int read(byte b[]) throws IOException {
-        return read(b, 0, b.length);
-    }
-
-    @Override
-    public int read(byte b[], int off, int len) throws IOException {
-        return source.read(b, off, len);
-    }
-
-    @Override
-    public long skip(long pos) throws IOException {
-        FileChannel fc = source.getChannel();
-        fc.position(fc.position() + pos);
-        return pos;
-    }
-
-    @Override
-    public int available() {
-        try {
-            return (int) (source.length() - source.getFilePointer());
-        } catch (IOException ex) {
-            return 0;
-        }
-    }
-
-    @SuppressWarnings("EmptyCatchBlock")
-    @Override
-    public void dispose() {
-        try {
-            source.close();
-        } catch (IOException err) {
-
-        } finally {
-            source = null;
-        }
-    }
-
-    @Override
-    public boolean isDisposed() {
-        return source == null;
-    }
-
-    @Override
-    public void rewind() throws IOException {
-        source.getChannel().position(0);
-    }
-
-    @Override
-    public boolean canRewind() {
-        return true;
-    }
-
-    @Override
-    public boolean canRead() {
-        return mode == Mode.Read || mode == Mode.ReadWrite;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return mode == Mode.ReadWrite;
-    }
-
-    @Override
-    public void write(byte value) throws IOException {
-        source.write(value);
-    }
-
-    @Override
-    public void write(byte[] buffer) throws IOException {
-        source.write(buffer);
-    }
-
-    @Override
-    public void write(byte[] buffer, int offset, int count) throws IOException {
-        source.write(buffer, offset, count);
-    }
-
-    @Override
-    public void flush() {
-    }
-
-    @Override
-    public void setLength(long length) throws IOException {
-        source.setLength(length);
-    }
-}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java b/app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java
index 52e0775da..586456d98 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java
@@ -14,6 +14,7 @@ import java.io.InputStream;
 
 /**
  * Wrapper for the classic {@link java.io.InputStream}
+ *
  * @author kapodamy
  */
 public class SharpInputStream extends InputStream {
@@ -49,7 +50,8 @@ public class SharpInputStream extends InputStream {
 
     @Override
     public int available() {
-        return base.available();
+        long res = base.available();
+        return res > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) res;
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManager.java b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
index 883c26850..58246beb1 100644
--- a/app/src/main/java/us/shandian/giga/service/DownloadManager.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
@@ -21,6 +21,8 @@ import us.shandian.giga.get.DownloadMission;
 import us.shandian.giga.get.FinishedMission;
 import us.shandian.giga.get.Mission;
 import us.shandian.giga.get.sqlite.DownloadDataSource;
+import us.shandian.giga.service.DownloadManagerService.DMChecker;
+import us.shandian.giga.service.DownloadManagerService.MissionCheck;
 import us.shandian.giga.util.Utility;
 
 import static org.schabi.newpipe.BuildConfig.DEBUG;
@@ -28,7 +30,7 @@ import static org.schabi.newpipe.BuildConfig.DEBUG;
 public class DownloadManager {
     private static final String TAG = DownloadManager.class.getSimpleName();
 
-    enum NetworkState {Unavailable, WifiOperating, MobileOperating, OtherOperating}
+    enum NetworkState {Unavailable, Operating, MeteredOperating}
 
     public final static int SPECIAL_NOTHING = 0;
     public final static int SPECIAL_PENDING = 1;
@@ -45,7 +47,9 @@ public class DownloadManager {
     private NetworkState mLastNetworkStatus = NetworkState.Unavailable;
 
     int mPrefMaxRetry;
-    boolean mPrefCrossNetwork;
+    boolean mPrefMeteredDownloads;
+    boolean mPrefQueueLimit;
+    private boolean mSelfMissionsControl;
 
     /**
      * Create a new instance
@@ -152,8 +156,8 @@ public class DownloadManager {
                         }
 
                         mis.postprocessingState = 0;
-                        mis.errCode = DownloadMission.ERROR_POSTPROCESSING;
-                        mis.errObject = new RuntimeException("stopped unexpectedly");
+                        mis.errCode = DownloadMission.ERROR_POSTPROCESSING_STOPPED;
+                        mis.errObject = null;
                     } else if (exists && !dl.isFile()) {
                         // probably a folder, this should never happens
                         if (!sub.delete()) {
@@ -162,20 +166,21 @@ public class DownloadManager {
                         continue;
                     }
 
-                    if (!exists) {
+                    if (!exists && mis.isInitialized()) {
                         // downloaded file deleted, reset mission state
                         DownloadMission m = new DownloadMission(mis.urls, mis.name, mis.location, mis.kind, mis.postprocessingName, mis.postprocessingArgs);
                         m.timestamp = mis.timestamp;
                         m.threadCount = mis.threadCount;
                         m.source = mis.source;
-                        m.maxRetry = mis.maxRetry;
                         m.nearLength = mis.nearLength;
+                        m.setEnqueued(mis.enqueued);
                         mis = m;
                     }
 
                     mis.running = false;
                     mis.recovered = exists;
                     mis.metadata = sub;
+                    mis.maxRetry = mPrefMaxRetry;
                     mis.mHandler = mHandler;
 
                     mMissionsPending.add(mis);
@@ -205,17 +210,25 @@ public class DownloadManager {
         synchronized (this) {
             // check for existing pending download
             DownloadMission pendingMission = getPendingMission(location, name);
+
             if (pendingMission != null) {
-                // generate unique filename (?)
-                try {
-                    name = generateUniqueName(location, name);
-                } catch (Exception e) {
-                    Log.e(TAG, "Unable to generate unique name", e);
-                    name = System.currentTimeMillis() + name;
-                    Log.i(TAG, "Using " + name);
+                if (pendingMission.running) {
+                    // generate unique filename (?)
+                    try {
+                        name = generateUniqueName(location, name);
+                    } catch (Exception e) {
+                        Log.e(TAG, "Unable to generate unique name", e);
+                        name = System.currentTimeMillis() + name;
+                        Log.i(TAG, "Using " + name);
+                    }
+                } else {
+                    // dispose the mission
+                    mMissionsPending.remove(pendingMission);
+                    mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_DELETED);
+                    pendingMission.delete();
                 }
             } else {
-                // check for existing finished download
+                // check for existing finished download and dispose (if exists)
                 int index = getFinishedMissionIndex(location, name);
                 if (index >= 0) mDownloadDataSource.deleteMission(mMissionsFinished.remove(index));
             }
@@ -242,14 +255,17 @@ public class DownloadManager {
                 mission.timestamp = System.currentTimeMillis();
             }
 
+            mSelfMissionsControl = true;
             mMissionsPending.add(mission);
 
-            // Before starting, save the state in case the internet connection is not available
+            // Before continue, save the metadata in case the internet connection is not available
             Utility.writeToFile(mission.metadata, mission);
 
-            if (canDownloadInCurrentNetwork() && (getRunningMissionsCount() < 1)) {
+            boolean start = !mPrefQueueLimit || getRunningMissionsCount() < 1;
+
+            if (canDownloadInCurrentNetwork() && start) {
+                mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PROGRESS);
                 mission.start();
-                mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_RUNNING);
             }
         }
     }
@@ -257,13 +273,14 @@ public class DownloadManager {
 
     public void resumeMission(DownloadMission mission) {
         if (!mission.running) {
+            mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PROGRESS);
             mission.start();
-            mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_RUNNING);
         }
     }
 
     public void pauseMission(DownloadMission mission) {
         if (mission.running) {
+            mission.setEnqueued(false);
             mission.pause();
             mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PAUSED);
         }
@@ -335,7 +352,7 @@ public class DownloadManager {
         int count = 0;
         synchronized (this) {
             for (DownloadMission mission : mMissionsPending) {
-                if (mission.running && !mission.isFinished() && !mission.isPsFailed())
+                if (mission.running && !mission.isPsFailed() && !mission.isFinished())
                     count++;
             }
         }
@@ -343,10 +360,36 @@ public class DownloadManager {
         return count;
     }
 
-    void pauseAllMissions() {
+    public void pauseAllMissions(boolean force) {
+        boolean flag = false;
+
         synchronized (this) {
-            for (DownloadMission mission : mMissionsPending) mission.pause();
+            for (DownloadMission mission : mMissionsPending) {
+                if (!mission.running || mission.isPsRunning() || mission.isFinished()) continue;
+
+                if (force) mission.threads = null;// avoid waiting for threads
+
+                mission.pause();
+                flag = true;
+            }
         }
+
+        if (flag) mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PAUSED);
+    }
+
+    public void startAllMissions() {
+        boolean flag = false;
+
+        synchronized (this) {
+            for (DownloadMission mission : mMissionsPending) {
+                if (mission.running || mission.isPsFailed() || mission.isFinished()) continue;
+
+                flag = true;
+                mission.start();
+            }
+        }
+
+        if (flag) mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PROGRESS);
     }
 
 
@@ -415,31 +458,35 @@ public class DownloadManager {
     }
 
     /**
-     * runs another mission in queue if possible
+     * runs one or multiple missions in from queue if possible
      *
-     * @return true if exits pending missions running or a mission was started, otherwise, false
+     * @return true if one or multiple missions are running, otherwise, false
      */
-    boolean runAnotherMission() {
+    boolean runMissions() {
         synchronized (this) {
             if (mMissionsPending.size() < 1) return false;
-
-            int i = getRunningMissionsCount();
-            if (i > 0) return true;
-
             if (!canDownloadInCurrentNetwork()) return false;
 
-            for (DownloadMission mission : mMissionsPending) {
-                if (!mission.running && mission.errCode == DownloadMission.ERROR_NOTHING && mission.enqueued) {
-                    resumeMission(mission);
-                    return true;
-                }
+            if (mPrefQueueLimit) {
+                for (DownloadMission mission : mMissionsPending)
+                    if (!mission.isFinished() && mission.running) return true;
             }
 
-            return false;
+            boolean flag = false;
+            for (DownloadMission mission : mMissionsPending) {
+                if (mission.running || !mission.enqueued || mission.isFinished()) continue;
+
+                resumeMission(mission);
+                if (mPrefQueueLimit) return true;
+                flag = true;
+            }
+
+            return flag;
         }
     }
 
     public MissionIterator getIterator() {
+        mSelfMissionsControl = true;
         return new MissionIterator();
     }
 
@@ -457,31 +504,43 @@ public class DownloadManager {
 
     private boolean canDownloadInCurrentNetwork() {
         if (mLastNetworkStatus == NetworkState.Unavailable) return false;
-        return !(mPrefCrossNetwork && mLastNetworkStatus == NetworkState.MobileOperating);
+        return !(mPrefMeteredDownloads && mLastNetworkStatus == NetworkState.MeteredOperating);
     }
 
-    void handleConnectivityChange(NetworkState currentStatus) {
+    void handleConnectivityState(NetworkState currentStatus, boolean updateOnly) {
         if (currentStatus == mLastNetworkStatus) return;
 
         mLastNetworkStatus = currentStatus;
+        if (currentStatus == NetworkState.Unavailable) return;
 
-        if (currentStatus == NetworkState.Unavailable) {
-            return;
-        } else if (currentStatus != NetworkState.MobileOperating || !mPrefCrossNetwork) {
-            return;
+        if (!mSelfMissionsControl || updateOnly) {
+            return;// don't touch anything without the user interaction
         }
 
-        boolean flag = false;
+        boolean isMetered = mPrefMeteredDownloads && mLastNetworkStatus == NetworkState.MeteredOperating;
+
+        int running = 0;
+        int paused = 0;
         synchronized (this) {
             for (DownloadMission mission : mMissionsPending) {
-                if (mission.running && !mission.isFinished() && !mission.isPsRunning()) {
-                    flag = true;
+                if (mission.isFinished() || mission.isPsRunning()) continue;
+
+                if (mission.running && isMetered) {
+                    paused++;
                     mission.pause();
+                } else if (!mission.running && !isMetered && mission.enqueued) {
+                    running++;
+                    mission.start();
+                    if (mPrefQueueLimit) break;
                 }
             }
         }
 
-        if (flag) mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PAUSED);
+        if (running > 0) {
+            mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PROGRESS);
+            return;
+        }
+        if (paused > 0) mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PAUSED);
     }
 
     void updateMaximumAttempts() {
@@ -506,21 +565,24 @@ public class DownloadManager {
         ), Toast.LENGTH_LONG).show();
     }
 
-    void checkForRunningMission(String location, String name, DownloadManagerService.DMChecker check) {
-        boolean listed;
-        boolean finished = false;
+    void checkForRunningMission(String location, String name, DMChecker check) {
+        MissionCheck result = MissionCheck.None;
 
         synchronized (this) {
-            DownloadMission mission = getPendingMission(location, name);
-            if (mission != null) {
-                listed = true;
+            DownloadMission pending = getPendingMission(location, name);
+
+            if (pending == null) {
+                if (getFinishedMissionIndex(location, name) >= 0) result = MissionCheck.Finished;
             } else {
-                listed = getFinishedMissionIndex(location, name) >= 0;
-                finished = listed;
+                if (pending.isFinished()) {
+                    result = MissionCheck.Finished;// this never should happen (race-condition)
+                } else {
+                    result = pending.running ? MissionCheck.PendingRunning : MissionCheck.Pending;
+                }
             }
         }
 
-        check.callback(listed, finished);
+        check.callback(result);
     }
 
     public class MissionIterator extends DiffUtil.Callback {
@@ -592,39 +654,6 @@ public class DownloadManager {
             return SPECIAL_NOTHING;
         }
 
-        public MissionItem getItemUnsafe(int position) {
-            synchronized (DownloadManager.this) {
-                int count = mMissionsPending.size();
-                int count2 = mMissionsFinished.size();
-
-                if (count > 0) {
-                    position--;
-                    if (position == -1)
-                        return new MissionItem(SPECIAL_PENDING);
-                    else if (position < count)
-                        return new MissionItem(SPECIAL_NOTHING, mMissionsPending.get(position));
-                    else if (position == count && count2 > 0)
-                        return new MissionItem(SPECIAL_FINISHED);
-                    else
-                        position -= count;
-                } else {
-                    if (count2 > 0 && position == 0) {
-                        return new MissionItem(SPECIAL_FINISHED);
-                    }
-                }
-
-                position--;
-
-                if (count2 < 1) {
-                    throw new RuntimeException(
-                            String.format("Out of range. pending_count=%s  finished_count=%s  position=%s", count, count2, position)
-                    );
-                }
-
-                return new MissionItem(SPECIAL_NOTHING, mMissionsFinished.get(position));
-            }
-        }
-
 
         public void start() {
             current = getSpecialItems();
@@ -647,6 +676,32 @@ public class DownloadManager {
             return hasFinished;
         }
 
+        /**
+         * Check if exists missions running and paused. Corrupted and hidden missions are not counted
+         *
+         * @return two-dimensional array contains the current missions state.
+         * 1° entry: true if has at least one mission running
+         * 2° entry: true if has at least one mission paused
+         */
+        public boolean[] hasValidPendingMissions() {
+            boolean running = false;
+            boolean paused = false;
+
+            synchronized (DownloadManager.this) {
+                for (DownloadMission mission : mMissionsPending) {
+                    if (hidden.contains(mission) || mission.isPsFailed() || mission.isFinished())
+                        continue;
+
+                    if (mission.running)
+                        paused = true;
+                    else
+                        running = true;
+                }
+            }
+
+            return new boolean[]{running, paused};
+        }
+
 
         @Override
         public int getOldListSize() {
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index a57fe1734..be1e20dd6 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -15,7 +15,9 @@ import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.ConnectivityManager;
+import android.net.Network;
 import android.net.NetworkInfo;
+import android.net.NetworkRequest;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
@@ -24,6 +26,7 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationCompat.Builder;
 import android.support.v4.content.PermissionChecker;
@@ -48,7 +51,6 @@ public class DownloadManagerService extends Service {
 
     private static final String TAG = "DownloadManagerService";
 
-    public static final int MESSAGE_RUNNING = 0;
     public static final int MESSAGE_PAUSED = 1;
     public static final int MESSAGE_FINISHED = 2;
     public static final int MESSAGE_PROGRESS = 3;
@@ -76,7 +78,7 @@ public class DownloadManagerService extends Service {
     private Notification mNotification;
     private Handler mHandler;
     private boolean mForeground = false;
-    private NotificationManager notificationManager = null;
+    private NotificationManager mNotificationManager = null;
     private boolean mDownloadNotificationEnable = true;
 
     private int downloadDoneCount = 0;
@@ -85,7 +87,9 @@ public class DownloadManagerService extends Service {
 
     private final ArrayList<Handler> mEchoObservers = new ArrayList<>(1);
 
-    private BroadcastReceiver mNetworkStateListener;
+    private ConnectivityManager mConnectivityManager;
+    private BroadcastReceiver mNetworkStateListener = null;
+    private ConnectivityManager.NetworkCallback mNetworkStateListenerL = null;
 
     private SharedPreferences mPrefs = null;
     private final SharedPreferences.OnSharedPreferenceChangeListener mPrefChangeListener = this::handlePreferenceChange;
@@ -147,25 +151,39 @@ public class DownloadManagerService extends Service {
                 .setContentText(getString(R.string.msg_running_detail));
 
         mNotification = builder.build();
-        notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 
-        mNetworkStateListener = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)) {
-                    handleConnectivityChange(null);
-                    return;
+        mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        mConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            mNetworkStateListenerL = new ConnectivityManager.NetworkCallback() {
+                @Override
+                public void onAvailable(Network network) {
+                    handleConnectivityState(false);
                 }
-                handleConnectivityChange(intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO));
-            }
-        };
-        registerReceiver(mNetworkStateListener, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
+
+                @Override
+                public void onLost(Network network) {
+                    handleConnectivityState(false);
+                }
+            };
+            mConnectivityManager.registerNetworkCallback(new NetworkRequest.Builder().build(), mNetworkStateListenerL);
+        } else {
+            mNetworkStateListener = new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    handleConnectivityState(false);
+                }
+            };
+            registerReceiver(mNetworkStateListener, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
+        }
 
         mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         mPrefs.registerOnSharedPreferenceChangeListener(mPrefChangeListener);
 
         handlePreferenceChange(mPrefs, getString(R.string.downloads_cross_network));
         handlePreferenceChange(mPrefs, getString(R.string.downloads_maximum_retry));
+        handlePreferenceChange(mPrefs, getString(R.string.downloads_queue_limit));
 
         mLock = new LockManager(this);
     }
@@ -173,12 +191,11 @@ public class DownloadManagerService extends Service {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (DEBUG) {
-            if (intent == null) {
-                Log.d(TAG, "Restarting");
-                return START_NOT_STICKY;
-            }
-            Log.d(TAG, "Starting");
+            Log.d(TAG, intent == null ? "Restarting" : "Starting");
         }
+
+        if (intent == null) return START_NOT_STICKY;
+
         Log.i(TAG, "Got intent: " + intent);
         String action = intent.getAction();
         if (action != null) {
@@ -193,6 +210,8 @@ public class DownloadManagerService extends Service {
                 String source = intent.getStringExtra(EXTRA_SOURCE);
                 long nearLength = intent.getLongExtra(EXTRA_NEAR_LENGTH, 0);
 
+                handleConnectivityState(true);// first check the actual network status
+
                 mHandler.post(() -> mManager.startMission(urls, location, name, kind, threads, source, psName, psArgs, nearLength));
 
             } else if (downloadDoneNotification != null) {
@@ -221,21 +240,25 @@ public class DownloadManagerService extends Service {
 
         stopForeground(true);
 
-        if (notificationManager != null && downloadDoneNotification != null) {
+        if (mNotificationManager != null && downloadDoneNotification != null) {
             downloadDoneNotification.setDeleteIntent(null);// prevent NewPipe running when is killed, cleared from recent, etc
-            notificationManager.notify(DOWNLOADS_NOTIFICATION_ID, downloadDoneNotification.build());
+            mNotificationManager.notify(DOWNLOADS_NOTIFICATION_ID, downloadDoneNotification.build());
         }
 
-        mManager.pauseAllMissions();
-
         manageLock(false);
 
-        unregisterReceiver(mNetworkStateListener);
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+            mConnectivityManager.unregisterNetworkCallback(mNetworkStateListenerL);
+        else
+            unregisterReceiver(mNetworkStateListener);
+
         mPrefs.unregisterOnSharedPreferenceChangeListener(mPrefChangeListener);
 
         if (icDownloadDone != null) icDownloadDone.recycle();
         if (icDownloadFailed != null) icDownloadFailed.recycle();
         if (icLauncher != null) icLauncher.recycle();
+
+        mManager.pauseAllMissions(true);
     }
 
     @Override
@@ -264,15 +287,16 @@ public class DownloadManagerService extends Service {
                 notifyMediaScanner(mission.getDownloadedFile());
                 notifyFinishedDownload(mission.name);
                 mManager.setFinished(mission);
-                updateForegroundState(mManager.runAnotherMission());
+                handleConnectivityState(false);
+                updateForegroundState(mManager.runMissions());
                 break;
-            case MESSAGE_RUNNING:
             case MESSAGE_PROGRESS:
                 updateForegroundState(true);
                 break;
             case MESSAGE_ERROR:
                 notifyFailedDownload(mission);
-                updateForegroundState(mManager.runAnotherMission());
+                handleConnectivityState(false);
+                updateForegroundState(mManager.runMissions());
                 break;
             case MESSAGE_PAUSED:
                 updateForegroundState(mManager.getRunningMissionsCount() > 0);
@@ -293,36 +317,30 @@ public class DownloadManagerService extends Service {
         }
     }
 
-    private void handleConnectivityChange(NetworkInfo info) {
+    private void handleConnectivityState(boolean updateOnly) {
+        NetworkInfo info = mConnectivityManager.getActiveNetworkInfo();
         NetworkState status;
 
         if (info == null) {
             status = NetworkState.Unavailable;
-            Log.i(TAG, "actual connectivity status is unavailable");
-        } else if (!info.isAvailable() || !info.isConnected()) {
-            status = NetworkState.Unavailable;
-            Log.i(TAG, "actual connectivity status is not available and not connected");
+            Log.i(TAG, "Active network [connectivity is unavailable]");
         } else {
-            int type = info.getType();
-            if (type == ConnectivityManager.TYPE_MOBILE || type == ConnectivityManager.TYPE_MOBILE_DUN) {
-                status = NetworkState.MobileOperating;
-            } else if (type == ConnectivityManager.TYPE_WIFI) {
-                status = NetworkState.WifiOperating;
-            } else if (type == ConnectivityManager.TYPE_WIMAX ||
-                    type == ConnectivityManager.TYPE_ETHERNET ||
-                    type == ConnectivityManager.TYPE_BLUETOOTH) {
-                status = NetworkState.OtherOperating;
-            } else {
+            boolean connected = info.isConnected();
+            boolean metered = mConnectivityManager.isActiveNetworkMetered();
+
+            if (connected)
+                status = metered ? NetworkState.MeteredOperating : NetworkState.Operating;
+            else
                 status = NetworkState.Unavailable;
-            }
-            Log.i(TAG, "actual connectivity status is " + status.name());
+
+            Log.i(TAG, "Active network [connected=" + connected + " metered=" + metered + "] " + info.toString());
         }
 
         if (mManager == null) return;// avoid race-conditions while the service is starting
-        mManager.handleConnectivityChange(status);
+        mManager.handleConnectivityState(status, updateOnly);
     }
 
-    private void handlePreferenceChange(SharedPreferences prefs, String key) {
+    private void handlePreferenceChange(SharedPreferences prefs, @NonNull String key) {
         if (key.equals(getString(R.string.downloads_maximum_retry))) {
             try {
                 String value = prefs.getString(key, getString(R.string.downloads_maximum_retry_default));
@@ -332,7 +350,9 @@ public class DownloadManagerService extends Service {
             }
             mManager.updateMaximumAttempts();
         } else if (key.equals(getString(R.string.downloads_cross_network))) {
-            mManager.mPrefCrossNetwork = prefs.getBoolean(key, false);
+            mManager.mPrefMeteredDownloads = prefs.getBoolean(key, false);
+        } else if (key.equals(getString(R.string.downloads_queue_limit))) {
+            mManager.mPrefQueueLimit = prefs.getBoolean(key, true);
         }
     }
 
@@ -366,19 +386,20 @@ public class DownloadManagerService extends Service {
         context.startService(intent);
     }
 
-    public static void checkForRunningMission(Context context, String location, String name, DMChecker check) {
+    public static void checkForRunningMission(Context context, String location, String name, DMChecker checker) {
         Intent intent = new Intent();
         intent.setClass(context, DownloadManagerService.class);
+        context.startService(intent);
+
         context.bindService(intent, new ServiceConnection() {
             @Override
             public void onServiceConnected(ComponentName cname, IBinder service) {
                 try {
-                    ((DMBinder) service).getDownloadManager().checkForRunningMission(location, name, check);
+                    ((DMBinder) service).getDownloadManager().checkForRunningMission(location, name, checker);
                 } catch (Exception err) {
                     Log.w(TAG, "checkForRunningMission() callback is defective", err);
                 }
 
-                // TODO: find a efficient way to unbind the service. This destroy the service due idle, but is started again when the user start a download.
                 context.unbindService(this);
             }
 
@@ -389,7 +410,7 @@ public class DownloadManagerService extends Service {
     }
 
     public void notifyFinishedDownload(String name) {
-        if (!mDownloadNotificationEnable || notificationManager == null) {
+        if (!mDownloadNotificationEnable || mNotificationManager == null) {
             return;
         }
 
@@ -428,7 +449,7 @@ public class DownloadManagerService extends Service {
             downloadDoneNotification.setContentText(downloadDoneList);
         }
 
-        notificationManager.notify(DOWNLOADS_NOTIFICATION_ID, downloadDoneNotification.build());
+        mNotificationManager.notify(DOWNLOADS_NOTIFICATION_ID, downloadDoneNotification.build());
         downloadDoneCount++;
     }
 
@@ -458,7 +479,7 @@ public class DownloadManagerService extends Service {
                     .bigText(mission.name));
         }
 
-        notificationManager.notify(id, downloadFailedNotification.build());
+        mNotificationManager.notify(id, downloadFailedNotification.build());
     }
 
     private PendingIntent makePendingIntent(String action) {
@@ -487,7 +508,11 @@ public class DownloadManagerService extends Service {
         mLockAcquired = acquire;
     }
 
-    // Wrapper of DownloadManager
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+    // Wrappers for DownloadManager
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
     public class DMBinder extends Binder {
         public DownloadManager getDownloadManager() {
             return mManager;
@@ -502,15 +527,15 @@ public class DownloadManagerService extends Service {
         }
 
         public void clearDownloadNotifications() {
-            if (notificationManager == null) return;
+            if (mNotificationManager == null) return;
             if (downloadDoneNotification != null) {
-                notificationManager.cancel(DOWNLOADS_NOTIFICATION_ID);
+                mNotificationManager.cancel(DOWNLOADS_NOTIFICATION_ID);
                 downloadDoneList.setLength(0);
                 downloadDoneCount = 0;
             }
             if (downloadFailedNotification != null) {
                 for (; downloadFailedNotificationID > DOWNLOADS_NOTIFICATION_ID; downloadFailedNotificationID--) {
-                    notificationManager.cancel(downloadFailedNotificationID);
+                    mNotificationManager.cancel(downloadFailedNotificationID);
                 }
                 mFailedDownloads.clear();
                 downloadFailedNotificationID++;
@@ -524,7 +549,9 @@ public class DownloadManagerService extends Service {
     }
 
     public interface DMChecker {
-        void callback(boolean listed, boolean finished);
+        void callback(MissionCheck result);
     }
 
+    public enum MissionCheck {None, Pending, PendingRunning, Finished}
+
 }
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index 4a35aa166..cada3aeb8 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -14,15 +14,17 @@ import android.os.Looper;
 import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.support.v4.content.FileProvider;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.util.DiffUtil;
 import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.support.v7.widget.RecyclerView.Adapter;
+import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.util.Log;
 import android.util.SparseArray;
+import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -36,14 +38,17 @@ import android.widget.Toast;
 
 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.NavigationHelper;
 
-import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Collections;
 
 import us.shandian.giga.get.DownloadMission;
 import us.shandian.giga.get.FinishedMission;
+import us.shandian.giga.get.Mission;
 import us.shandian.giga.service.DownloadManager;
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.common.Deleter;
@@ -57,10 +62,13 @@ import static us.shandian.giga.get.DownloadMission.ERROR_CONNECT_HOST;
 import static us.shandian.giga.get.DownloadMission.ERROR_FILE_CREATION;
 import static us.shandian.giga.get.DownloadMission.ERROR_HTTP_NO_CONTENT;
 import static us.shandian.giga.get.DownloadMission.ERROR_HTTP_UNSUPPORTED_RANGE;
+import static us.shandian.giga.get.DownloadMission.ERROR_INSUFFICIENT_STORAGE;
 import static us.shandian.giga.get.DownloadMission.ERROR_NOTHING;
 import static us.shandian.giga.get.DownloadMission.ERROR_PATH_CREATION;
 import static us.shandian.giga.get.DownloadMission.ERROR_PERMISSION_DENIED;
 import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING;
+import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_HOLD;
+import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_STOPPED;
 import static us.shandian.giga.get.DownloadMission.ERROR_SSL_EXCEPTION;
 import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION;
 import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_HOST;
@@ -69,6 +77,7 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     private static final SparseArray<String> ALGORITHMS = new SparseArray<>();
     private static final String TAG = "MissionAdapter";
     private static final String UNDEFINED_PROGRESS = "--.-%";
+    private static final String DEFAULT_MIME_TYPE = "*/*";
 
 
     static {
@@ -85,9 +94,11 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     private ArrayList<ViewHolderItem> mPendingDownloadsItems = new ArrayList<>();
     private Handler mHandler;
     private MenuItem mClear;
+    private MenuItem mStartButton;
+    private MenuItem mPauseButton;
     private View mEmptyMessage;
 
-    public MissionAdapter(Context context, DownloadManager downloadManager, MenuItem clearButton, View emptyMessage) {
+    public MissionAdapter(Context context, DownloadManager downloadManager, View emptyMessage) {
         mContext = context;
         mDownloadManager = downloadManager;
         mDeleter = null;
@@ -105,10 +116,18 @@ public class MissionAdapter extends Adapter<ViewHolder> {
                         onServiceMessage(msg);
                         break;
                 }
+
+                if (mStartButton != null && mPauseButton != null) switch (msg.what) {
+                    case DownloadManagerService.MESSAGE_DELETED:
+                    case DownloadManagerService.MESSAGE_ERROR:
+                    case DownloadManagerService.MESSAGE_FINISHED:
+                    case DownloadManagerService.MESSAGE_PAUSED:
+                        checkMasterButtonsVisibility();
+                        break;
+                }
             }
         };
 
-        mClear = clearButton;
         mEmptyMessage = emptyMessage;
 
         mIterator = downloadManager.getIterator();
@@ -225,8 +244,10 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         long deltaDone = mission.done - h.lastDone;
         boolean hasError = mission.errCode != ERROR_NOTHING;
 
-        // on error hide marquee or show if condition (mission.done < 1 || mission.unknownLength) is true
-        h.progress.setMarquee(!hasError && (mission.done < 1 || mission.unknownLength));
+        // hide on error
+        // show if current resource length is not fetched
+        // show if length is unknown
+        h.progress.setMarquee(!hasError && (!mission.isInitialized() || mission.unknownLength));
 
         float progress;
         if (mission.unknownLength) {
@@ -305,36 +326,64 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         }
     }
 
-    private boolean viewWithFileProvider(@NonNull File file) {
-        if (!file.exists()) return true;
+    private void viewWithFileProvider(Mission mission) {
+        if (checkInvalidFile(mission)) return;
 
-        String ext = Utility.getFileExt(file.getName());
-        if (ext == null) return false;
+        String mimeType = resolveMimeType(mission);
 
-        String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
-        Log.v(TAG, "Mime: " + mimeType + " package: " + BuildConfig.APPLICATION_ID + ".provider");
+        if (BuildConfig.DEBUG)
+            Log.v(TAG, "Mime: " + mimeType + " package: " + BuildConfig.APPLICATION_ID + ".provider");
 
-        Uri uri = FileProvider.getUriForFile(mContext, BuildConfig.APPLICATION_ID + ".provider", file);
+        Uri uri = FileProvider.getUriForFile(
+                mContext,
+                BuildConfig.APPLICATION_ID + ".provider",
+                mission.getDownloadedFile()
+        );
 
         Intent intent = new Intent();
         intent.setAction(Intent.ACTION_VIEW);
         intent.setDataAndType(uri, mimeType);
         intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             intent.addFlags(FLAG_GRANT_PREFIX_URI_PERMISSION);
         }
-        if(Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
             intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
         }
+
         //mContext.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        Log.v(TAG, "Starting intent: " + intent);
+
         if (intent.resolveActivity(mContext.getPackageManager()) != null) {
             mContext.startActivity(intent);
         } else {
-            Toast noPlayerToast = Toast.makeText(mContext, R.string.toast_no_player, Toast.LENGTH_LONG);
-            noPlayerToast.show();
+            Toast.makeText(mContext, R.string.toast_no_player, Toast.LENGTH_LONG).show();
         }
+    }
 
+    private void shareFile(Mission mission) {
+        if (checkInvalidFile(mission)) return;
+
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType(resolveMimeType(mission));
+        intent.putExtra(Intent.EXTRA_STREAM, mission.getDownloadedFile().toURI());
+
+        mContext.startActivity(Intent.createChooser(intent, null));
+    }
+
+    private static String resolveMimeType(@NonNull Mission mission) {
+        String ext = Utility.getFileExt(mission.getDownloadedFile().getName());
+        if (ext == null) return DEFAULT_MIME_TYPE;
+
+        String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
+
+        return mimeType == null ? DEFAULT_MIME_TYPE : mimeType;
+    }
+
+    private boolean checkInvalidFile(@NonNull Mission mission) {
+        if (mission.getDownloadedFile().exists()) return false;
+
+        Toast.makeText(mContext, R.string.missing_file, Toast.LENGTH_SHORT).show();
         return true;
     }
 
@@ -343,15 +392,9 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     }
 
     private void onServiceMessage(@NonNull Message msg) {
-        switch (msg.what) {
-            case DownloadManagerService.MESSAGE_PROGRESS:
-                setAutoRefresh(true);
-                return;
-            case DownloadManagerService.MESSAGE_ERROR:
-            case DownloadManagerService.MESSAGE_FINISHED:
-                break;
-            default:
-                return;
+        if (msg.what == DownloadManagerService.MESSAGE_PROGRESS) {
+            setAutoRefresh(true);
+            return;
         }
 
         for (int i = 0; i < mPendingDownloadsItems.size(); i++) {
@@ -370,74 +413,98 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     }
 
     private void showError(@NonNull DownloadMission mission) {
-        StringBuilder str = new StringBuilder();
-        str.append(mContext.getString(R.string.label_code));
-        str.append(": ");
-        str.append(mission.errCode);
-        str.append('\n');
+        @StringRes int msg = R.string.general_error;
+        String msgEx = null;
 
         switch (mission.errCode) {
             case 416:
-                str.append(mContext.getString(R.string.error_http_requested_range_not_satisfiable));
+                msg = R.string.error_http_requested_range_not_satisfiable;
                 break;
             case 404:
-                str.append(mContext.getString(R.string.error_http_not_found));
+                msg = R.string.error_http_not_found;
                 break;
             case ERROR_NOTHING:
-                str.append("¿?");
-                break;
+                return;// this never should happen
             case ERROR_FILE_CREATION:
-                str.append(mContext.getString(R.string.error_file_creation));
+                msg = R.string.error_file_creation;
                 break;
             case ERROR_HTTP_NO_CONTENT:
-                str.append(mContext.getString(R.string.error_http_no_content));
+                msg = R.string.error_http_no_content;
                 break;
             case ERROR_HTTP_UNSUPPORTED_RANGE:
-                str.append(mContext.getString(R.string.error_http_unsupported_range));
+                msg = R.string.error_http_unsupported_range;
                 break;
             case ERROR_PATH_CREATION:
-                str.append(mContext.getString(R.string.error_path_creation));
+                msg = R.string.error_path_creation;
                 break;
             case ERROR_PERMISSION_DENIED:
-                str.append(mContext.getString(R.string.permission_denied));
+                msg = R.string.permission_denied;
                 break;
             case ERROR_SSL_EXCEPTION:
-                str.append(mContext.getString(R.string.error_ssl_exception));
+                msg = R.string.error_ssl_exception;
                 break;
             case ERROR_UNKNOWN_HOST:
-                str.append(mContext.getString(R.string.error_unknown_host));
+                msg = R.string.error_unknown_host;
                 break;
             case ERROR_CONNECT_HOST:
-                str.append(mContext.getString(R.string.error_connect_host));
+                msg = R.string.error_connect_host;
+                break;
+            case ERROR_POSTPROCESSING_STOPPED:
+                msg = R.string.error_postprocessing_stopped;
                 break;
             case ERROR_POSTPROCESSING:
-                str.append(mContext.getString(R.string.error_postprocessing_failed));
-            case ERROR_UNKNOWN_EXCEPTION:
+            case ERROR_POSTPROCESSING_HOLD:
+                showError(mission.errObject, UserAction.DOWNLOAD_POSTPROCESSING, R.string.error_postprocessing_failed);
+                return;
+            case ERROR_INSUFFICIENT_STORAGE:
+                msg = R.string.error_insufficient_storage;
                 break;
+            case ERROR_UNKNOWN_EXCEPTION:
+                showError(mission.errObject, UserAction.DOWNLOAD_FAILED, R.string.general_error);
+                return;
             default:
                 if (mission.errCode >= 100 && mission.errCode < 600) {
-                    str = new StringBuilder(8);
-                    str.append("HTTP ");
-                    str.append(mission.errCode);
+                    msgEx = "HTTP " + mission.errCode;
                 } else if (mission.errObject == null) {
-                    str.append("(not_decelerated_error_code)");
+                    msgEx = "(not_decelerated_error_code)";
+                } else {
+                    showError(mission.errObject, UserAction.DOWNLOAD_FAILED, msg);
+                    return;
                 }
                 break;
         }
 
-        if (mission.errObject != null) {
-            str.append("\n\n");
-            str.append(mission.errObject.toString());
+        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
+
+        if (msgEx != null)
+            builder.setMessage(msgEx);
+        else
+            builder.setMessage(msg);
+
+        // add report button for non-HTTP errors (range 100-599)
+        if (mission.errObject != null && (mission.errCode < 100 || mission.errCode >= 600)) {
+            @StringRes final int mMsg = msg;
+            builder.setPositiveButton(R.string.error_report_title, (dialog, which) ->
+                    showError(mission.errObject, UserAction.DOWNLOAD_FAILED, mMsg)
+            );
         }
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-        builder.setTitle(mission.name)
-                .setMessage(str)
-                .setNegativeButton(android.R.string.ok, (dialog, which) -> dialog.cancel())
+        builder.setNegativeButton(android.R.string.ok, (dialog, which) -> dialog.cancel())
+                .setTitle(mission.name)
                 .create()
                 .show();
     }
 
+    private void showError(Exception exception, UserAction action, @StringRes int reason) {
+        ErrorActivity.reportError(
+                mContext,
+                Collections.singletonList(exception),
+                null,
+                null,
+                ErrorActivity.ErrorInfo.make(action, "-", "-", reason)
+        );
+    }
+
     public void clearFinishedDownloads() {
         mDownloadManager.forgetFinishedDownloads();
         applyChanges();
@@ -466,16 +533,24 @@ public class MissionAdapter extends Adapter<ViewHolder> {
                     showError(mission);
                     return true;
                 case R.id.queue:
-                    h.queue.setChecked(!h.queue.isChecked());
-                    mission.enqueued = h.queue.isChecked();
+                    boolean flag = !h.queue.isChecked();
+                    h.queue.setChecked(flag);
+                    mission.setEnqueued(flag);
                     updateProgress(h);
                     return true;
+                case R.id.retry:
+                    mission.psContinue(true);
+                    return true;
+                case R.id.cancel:
+                    mission.psContinue(false);
+                    return false;
             }
         }
 
         switch (id) {
-            case R.id.open:
-                return viewWithFileProvider(h.item.mission.getDownloadedFile());
+            case R.id.menu_item_share:
+                shareFile(h.item.mission);
+                return true;
             case R.id.delete:
                 if (mDeleter == null) {
                     mDownloadManager.deleteMission(h.item.mission);
@@ -529,15 +604,42 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     }
 
     public void setClearButton(MenuItem clearButton) {
-        if (mClear == null) clearButton.setVisible(mIterator.hasFinishedMissions());
+        if (mClear == null)
+            clearButton.setVisible(mIterator.hasFinishedMissions());
+
         mClear = clearButton;
     }
 
+    public void setMasterButtons(MenuItem startButton, MenuItem pauseButton) {
+        boolean init = mStartButton == null || mPauseButton == null;
+
+        mStartButton = startButton;
+        mPauseButton = pauseButton;
+
+        if (init) checkMasterButtonsVisibility();
+    }
+
     private void checkEmptyMessageVisibility() {
         int flag = mIterator.getOldListSize() > 0 ? View.GONE : View.VISIBLE;
         if (mEmptyMessage.getVisibility() != flag) mEmptyMessage.setVisibility(flag);
     }
 
+    private void checkMasterButtonsVisibility() {
+        boolean[] state = mIterator.hasValidPendingMissions();
+
+        mStartButton.setVisible(state[0]);
+        mPauseButton.setVisible(state[1]);
+    }
+
+    public void ensurePausedMissions() {
+        for (ViewHolderItem h : mPendingDownloadsItems) {
+            if (((DownloadMission) h.item.mission).running) continue;
+            updateProgress(h);
+            h.lastTimeStamp = -1;
+            h.lastDone = -1;
+        }
+    }
+
 
     public void deleterDispose(Bundle bundle) {
         if (mDeleter != null) mDeleter.dispose(bundle);
@@ -604,6 +706,8 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         ProgressDrawable progress;
 
         PopupMenu popupMenu;
+        MenuItem retry;
+        MenuItem cancel;
         MenuItem start;
         MenuItem pause;
         MenuItem open;
@@ -636,22 +740,34 @@ public class MissionAdapter extends Adapter<ViewHolder> {
             button.setOnClickListener(v -> showPopupMenu());
 
             Menu menu = popupMenu.getMenu();
+            retry = menu.findItem(R.id.retry);
+            cancel = menu.findItem(R.id.cancel);
             start = menu.findItem(R.id.start);
             pause = menu.findItem(R.id.pause);
-            open = menu.findItem(R.id.open);
+            open = menu.findItem(R.id.menu_item_share);
             queue = menu.findItem(R.id.queue);
             showError = menu.findItem(R.id.error_message_view);
             delete = menu.findItem(R.id.delete);
             source = menu.findItem(R.id.source);
             checksum = menu.findItem(R.id.checksum);
 
-            itemView.setOnClickListener((v) -> {
+            itemView.setHapticFeedbackEnabled(true);
+
+            itemView.setOnClickListener(v -> {
                 if (item.mission instanceof FinishedMission)
-                    viewWithFileProvider(item.mission.getDownloadedFile());
+                    viewWithFileProvider(item.mission);
+            });
+
+            itemView.setOnLongClickListener(v -> {
+                v.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                showPopupMenu();
+                return true;
             });
         }
 
         private void showPopupMenu() {
+            retry.setVisible(false);
+            cancel.setVisible(false);
             start.setVisible(false);
             pause.setVisible(false);
             open.setVisible(false);
@@ -664,7 +780,16 @@ public class MissionAdapter extends Adapter<ViewHolder> {
             DownloadMission mission = item.mission instanceof DownloadMission ? (DownloadMission) item.mission : null;
 
             if (mission != null) {
-                if (!mission.isPsRunning()) {
+                if (mission.isPsRunning()) {
+                    switch (mission.errCode) {
+                        case ERROR_INSUFFICIENT_STORAGE:
+                        case ERROR_POSTPROCESSING_HOLD:
+                            retry.setVisible(true);
+                            cancel.setVisible(true);
+                            showError.setVisible(true);
+                            break;
+                    }
+                } else {
                     if (mission.running) {
                         pause.setVisible(true);
                     } else {
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index c4fd3b5fd..a3786a5e6 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -35,6 +35,8 @@ public class MissionsFragment extends Fragment {
     private boolean mLinear;
     private MenuItem mSwitch;
     private MenuItem mClear = null;
+    private MenuItem mStart = null;
+    private MenuItem mPause = null;
 
     private RecyclerView mList;
     private View mEmpty;
@@ -54,9 +56,11 @@ public class MissionsFragment extends Fragment {
             mBinder = (DownloadManagerService.DMBinder) binder;
             mBinder.clearDownloadNotifications();
 
-            mAdapter = new MissionAdapter(mContext, mBinder.getDownloadManager(), mClear, mEmpty);
+            mAdapter = new MissionAdapter(mContext, mBinder.getDownloadManager(), mEmpty);
             mAdapter.deleterLoad(mBundle, getView());
 
+            setAdapterButtons();
+
             mBundle = null;
 
             mBinder.addMissionEventListener(mAdapter.getMessenger());
@@ -132,7 +136,7 @@ public class MissionsFragment extends Fragment {
     public void onAttach(Activity activity) {
         super.onAttach(activity);
 
-        mContext = activity.getApplicationContext();
+        mContext = activity;
     }
 
 
@@ -154,7 +158,11 @@ public class MissionsFragment extends Fragment {
     public void onPrepareOptionsMenu(Menu menu) {
         mSwitch = menu.findItem(R.id.switch_mode);
         mClear = menu.findItem(R.id.clear_list);
-        if (mAdapter != null) mAdapter.setClearButton(mClear);
+        mStart = menu.findItem(R.id.start_downloads);
+        mPause = menu.findItem(R.id.pause_downloads);
+
+        if (mAdapter != null) setAdapterButtons();
+
         super.onPrepareOptionsMenu(menu);
     }
 
@@ -168,6 +176,14 @@ public class MissionsFragment extends Fragment {
             case R.id.clear_list:
                 mAdapter.clearFinishedDownloads();
                 return true;
+            case R.id.start_downloads:
+                item.setVisible(false);
+                mBinder.getDownloadManager().startAllMissions();
+                return true;
+            case R.id.pause_downloads:
+                item.setVisible(false);
+                mBinder.getDownloadManager().pauseAllMissions(false);
+                mAdapter.ensurePausedMissions();// update items view
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -193,9 +209,9 @@ public class MissionsFragment extends Fragment {
             int icon;
 
             if (mLinear)
-                icon = isLight ? R.drawable.ic_list_black_24dp : R.drawable.ic_list_white_24dp;
-            else
                 icon = isLight ? R.drawable.ic_grid_black_24dp : R.drawable.ic_grid_white_24dp;
+            else
+                icon = isLight ? R.drawable.ic_list_black_24dp : R.drawable.ic_list_white_24dp;
 
             mSwitch.setIcon(icon);
             mSwitch.setTitle(mLinear ? R.string.grid : R.string.list);
@@ -203,6 +219,13 @@ public class MissionsFragment extends Fragment {
         }
     }
 
+    private void setAdapterButtons() {
+        if (mClear == null || mStart == null || mPause == null) return;
+
+        mAdapter.setClearButton(mClear);
+        mAdapter.setMasterButtons(mStart, mPause);
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
diff --git a/app/src/main/res/drawable-hdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_pause_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3770b9124c41ecdf986c9f15ebc9d33f4d308449
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB{5)M8Ln2z=PBY|UFyLUW-FBh<
z^_6eTubwCrvELNhVW`Bwps3y<R_kk)dq*Mci|)-WADb#Jeotu@aN<yG0TUO(78Z(^
e-8sqLU|Lge`ZHEQ<XbM#WCl-HKbLh*2~7Y!*(^E$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e3de2dce427e2212fed0597d9d2beaf36be9f6d
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB0zF+ELn2z=UfamYV8Fq8u}3$h
zU~LlHiQ}i74$0oo+;eGbN5?&*;_i(}_pkV>zv%dwbpNWax`*h|x)sb04GfG-EF1y~
m4)V>%_HNibuSV(DN^Z6)zQ%0|Gu8tQXYh3Ob6Mw<&;$UCzc1YY

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_pause_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e81d3ad4f2029f7a521349688dff470b5858019
GIT binary patch
literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjCY~;iAs(H{2@<TzQh(eI-QRek
z-aXja=tqCcM#&G-zGqjkE*9&FGRR`o)mc!PXwKEf$-uDaVBSNiIeagH`WZZ3{an^L
HB{Ts570n>4

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5236e8aa89c24a1f42dbd298dbb08b871a05722
GIT binary patch
literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj=AJH&As(H{2@<Tz;(z}C|8Fkz
zug~?L^(Ltz9S1fEHV59e=0I*YU5Tv;SD2(C9c~}W6XB6(V91`fcY)7yu@^ui7(8A5
KT-G@yGywodsUWNX

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6de3973a1a1cac6ad519a99dcbeab696636c2fd
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtOivfbkc`H+Hx}|TC^8%k_!ckL
zx#xC+(h7x_-V;n}PD^-BdZL?M{OsUgPTsrQE!FuWE?h8WklMxO;C!7S<AoFhZ!GhI
wh1m=yCA<x7>lo1`?|x>U_dm*KlFIf!UpaSA_<7IjIM7lCPgg&ebxsLQ02LECbpQYW

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b94b2ae40da8a50607f4dbb92efc57ea7fac9e4d
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtAWs*^kc`H+Hx#)T6a-uy-`C&l
zJ+?I>mRE`6^MMtAR&G=CoMfkETwVC+L0w4x9)^%y_A?7l12v+9F2?_Lx?Yo(bn_}W
Vew)4B;Nvfl3Qt!*mvv4FO#oAVDPsTt

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2691adeb30e1ada4ed84340315848782199c6ceb
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!-JULvAr*7p-rC4}K!Jzh;G6yG
z+#4K>9KRTe9-aF{>~#ER8=xwNKR22q+25~!*!Ox*v!!JMe|e1i0)+qp4Gs|&E+*E-
jCI?6Ix&2Q-Hhllhz@PfGi~DL_K8Wk->gTe~DWM4fwX--o

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..15cb0b51ce27438dd5cfa97a2a8f84c456647ec5
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Q$1ZALn`LHy=BOC*g%BU@&5mL
zyBzdBT;9R6M)dI^1LiE%d)KV^fC?GvX3ji+EVBO2{<3=&Nso0mr&k}a{If~j?4DA9
wfCh&M3l|e>W0Qm90tK?Ui8U(hK#MAx_0^?T<!zYwZU@L-Pgg&ebxsLQ06Hu^1ONa4

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fbcd0326db7615ed3375c9674263fe7851145e3
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGo`#oJ8Ln`LHy>pQBfB_G~#&`Cq
zW+yn_@)bVN@OZG@_uc&Gj6hXD&`?}$@cPg{(>)Kr-#d7xqQMr(VCmo#5LQrg@M)OA
vV91!nbcDtNH=dk6QJVN)>K?>N3=HmeHaFkJH)U`C2NLmg^>bP0l+XkKR3S{3

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..12a49bc12b8a00c5acdbcac690d1a3cc266c466f
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoM?GB}Ln`LHy>pQBh=Bl$<8%3?
z#swVJ^6n2rP1r*hY(MfP{yHmA9SF#uJ+s;3d*ko-XQlakF3g(ymErw_`Eze5s5<yG
z%wRBNOkz61(!nVpte{3?fwYgQPkw9@g1D-|{u{GX(ydvV8cGvEBA%{(F6*2UngEcb
BO4$Ga

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/download_menu.xml b/app/src/main/res/menu/download_menu.xml
index 02efde55b..4e4549957 100644
--- a/app/src/main/res/menu/download_menu.xml
+++ b/app/src/main/res/menu/download_menu.xml
@@ -7,6 +7,18 @@
         android:title="@string/grid"
         app:showAsAction="ifRoom" />
 
+    <item android:id="@+id/start_downloads"
+        android:visible="false"
+        android:icon="?attr/play"
+        android:title="@string/start_downloads"
+        app:showAsAction="ifRoom" />
+
+    <item android:id="@+id/pause_downloads"
+        android:visible="false"
+        android:icon="?attr/pause"
+        android:title="@string/pause_downloads"
+        app:showAsAction="ifRoom" />
+
     <item android:id="@+id/clear_list"
         android:visible="false"
         android:icon="?attr/ic_delete"
diff --git a/app/src/main/res/menu/mission.xml b/app/src/main/res/menu/mission.xml
index 961e12fd0..ac77da8c8 100644
--- a/app/src/main/res/menu/mission.xml
+++ b/app/src/main/res/menu/mission.xml
@@ -1,4 +1,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/retry"
+        android:title="@string/retry" />
+
+    <item
+        android:id="@+id/cancel"
+        android:title="@string/cancel" />
+
     <item
         android:id="@+id/start"
         android:title="@string/start" />
@@ -13,8 +22,8 @@
         android:checkable="true"/>
 
     <item
-        android:id="@+id/open"
-        android:title="@string/view" />
+        android:id="@+id/menu_item_share"
+        android:title="@string/share" />
 
     <item
         android:id="@+id/delete"
diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml
index abaaa2ed2..f6c8e3e4a 100644
--- a/app/src/main/res/values-cmn/strings.xml
+++ b/app/src/main/res/values-cmn/strings.xml
@@ -434,7 +434,7 @@
     <string name="permission_denied">系统拒绝该行动</string>
     <string name="download_failed">下载失败</string>
     <string name="download_finished">下载完成</string>
-    <string name="download_finished_more">%已下载完毕</string>
+    <string name="download_finished_more">%s已下载完毕</string>
     <string name="generate_unique_name">生成独特的名字</string>
     <string name="overwrite">覆写</string>
     <string name="overwrite_warning">同名的已下载文件已经存在</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e75d905df..818efc74c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -159,7 +159,7 @@ abrir en modo popup</string>
     <string name="contribution_encouragement">Si tienes ideas de; traducción, cambios de diseño, limpieza de código o cambios de código realmente fuertes—la ayuda siempre es bienvenida. Cuanto más se hace, mejor se pone!</string>
     <string name="read_full_license">Leer licencia</string>
     <string name="contribution_title">Contribuir</string>
-    <string name="subscribe_button_title">Suscribirse</string>
+<string name="subscribe_button_title">Suscribirse</string>
     <string name="subscribed_button_title">Suscrito</string>
     <string name="channel_unsubscribed">Canal no suscrito</string>
     <string name="subscription_change_failed">No se pudo cambiar la suscripción</string>
@@ -211,8 +211,8 @@ abrir en modo popup</string>
         <item quantity="other">Vídeos</item>
     </plurals>
     <string name="item_deleted">Elemento eliminado</string>
-    <string name="delete_item_search_history">¿Desea eliminar este elemento del historial de búsqueda?</string>
-    <string name="main_page_content">Contenido de la página principal</string>
+<string name="delete_item_search_history">¿Desea eliminar este elemento del historial de búsqueda?</string>
+<string name="main_page_content">Contenido de la página principal</string>
     <string name="blank_page_summary">Página en blanco</string>
     <string name="kiosk_page_summary">Página del kiosco</string>
     <string name="subscription_page_summary">Página de suscripción</string>
@@ -224,7 +224,7 @@ abrir en modo popup</string>
     <string name="kiosk">Kiosco</string>
     <string name="trending">Tendencias</string>
     <string name="top_50">Top 50</string>
-    <string name="show_hold_to_append_summary">Mostrar sugerencia cuando se presiona el botón de segundo plano o popup en la página de detalles del vídeo</string>
+<string name="show_hold_to_append_summary">Mostrar sugerencia cuando se presiona el botón de segundo plano o popup en la página de detalles del vídeo</string>
     <string name="background_player_append">En cola en el reproductor de fondo</string>
     <string name="popup_playing_append">En cola en el reproductor popup</string>
     <string name="play_all">Reproducir todo</string>
@@ -242,7 +242,7 @@ abrir en modo popup</string>
     <string name="start_here_on_main">Comenzar a reproducir aquí</string>
     <string name="start_here_on_background">Comenzar aquí en segundo plano</string>
     <string name="start_here_on_popup">Comenzar aquí en popup</string>
-    <string name="show_hold_to_append_title">Mostrar consejo \"Mantener para poner en la cola\"</string>
+<string name="show_hold_to_append_title">Mostrar consejo \"Mantener para poner en la cola\"</string>
     <string name="new_and_hot">Nuevo y popular</string>
     <string name="hold_to_append">Mantener para poner en la cola</string>
     <string name="donation_title">Donar</string>
@@ -270,7 +270,7 @@ abrir en modo popup</string>
     <string name="popup_player">Reproductor de popup</string>
     <string name="preferred_player_fetcher_notification_title">Obteniendo información…</string>
     <string name="preferred_player_fetcher_notification_message">Cargando contenido solicitado</string>
-    <string name="import_data_title">Importar base de datos</string>
+<string name="import_data_title">Importar base de datos</string>
     <string name="export_data_title">Exportar base de datos</string>
     <string name="import_data_summary">Reemplazará su historial actual y sus suscripciones</string>
     <string name="export_data_summary">Exportar historial, suscripciones y listas de reproducción</string>
@@ -325,6 +325,7 @@ abrir en modo popup</string>
     <string name="live">DIRECTO</string>
     <string name="live_sync">SINCRONIZAR</string>
     <string name="file">Archivo</string>
+    <string name="missing_file">Archivo movido o eliminado</string>
     <string name="invalid_directory">No existe el directorio</string>
     <string name="invalid_source">No existe la fuente del archivo/contenido</string>
     <string name="invalid_file">El archivo no existe o insuficientes permisos para leerlo o escribir en él</string>
@@ -419,6 +420,8 @@ abrir en modo popup</string>
     <string name="overwrite">Sobrescribir</string>
     <string name="overwrite_warning">Ya existe un archivo descargado con este nombre</string>
     <string name="download_already_running">Hay una descarga en curso con este nombre</string>
+    <string name="download_already_pending">Hay una descarga pendiente con este nombre</string>
+
     <string name="grid">Mostrar como grilla</string>
     <string name="list">Mostrar como lista</string>
     <string name="clear_finished_download">Limpiar descargas finalizadas</string>
@@ -426,8 +429,14 @@ abrir en modo popup</string>
     <string name="stop">Detener</string>
     <string name="max_retry_msg">Intentos máximos</string>
     <string name="max_retry_desc">Cantidad máxima de intentos antes de cancelar la descarga</string>
-    <string name="pause_downloads_on_mobile">Pausar al cambiar a datos moviles</string>
-    <string name="pause_downloads_on_mobile_desc">Las descargas que no se pueden pausar serán reiniciadas</string>
+    <string name="pause_downloads_on_mobile">Interrumpir en redes medidas</string>
+    <string name="pause_downloads_on_mobile_desc">Útil al cambiar a Datos Móviles, solo algunas descargas no se pueden suspender</string>
+    <string name="enable_queue_limit">Limitar cola de descarga</string>
+    <string name="enable_queue_limit_desc">Solo se permitirá una descarga a la vez</string>
+    <string name="start_downloads">Iniciar descargas</string>
+    <string name="pause_downloads">Pausar descargas</string>
+
+
     <!-- message dialog about download error -->
     <string name="show_error">Mostrar error</string>
     <string name="label_code">Codigo</string>
@@ -439,9 +448,12 @@ abrir en modo popup</string>
     <string name="error_connect_host">No se puede conectar con el servidor</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">El rango solicitado no se puede satisfacer</string>
+    <string name="error_http_requested_range_not_satisfiable">No se logro obtener el rango solicitado</string>
     <string name="error_http_not_found">No encontrado</string>
     <string name="error_postprocessing_failed">Fallo el post-procesado</string>
+    <string name="error_postprocessing_stopped">NewPipe se cerro mientras se trabajaba en el archivo</string>
+    <string name="error_insufficient_storage">No hay suficiente espacio disponible en el dispositivo</string>
+
     <string name="unsubscribe">Desuscribirse</string>
     <string name="tab_new">Nueva pestaña</string>
     <string name="tab_choose">Elige la pestaña</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 865b68c24..37bc9eec6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -25,6 +25,7 @@
     <attr name="search_add" format="reference"/>
     <attr name="options" format="reference"/>
     <attr name="play" format="reference"/>
+    <attr name="pause" format="reference"/>
     <attr name="bug" format="reference"/>
     <attr name="settings" format="reference"/>
     <attr name="ic_hot" format="reference"/>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 3861f53d5..214a074c4 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -192,6 +192,7 @@
     </string-array>
 
     <string name="downloads_cross_network" translatable="false">cross_network_downloads</string>
+    <string name="downloads_queue_limit" translatable="false">downloads_queue_limit</string>
 
     <string name="default_download_threads" translatable="false">default_download_threads</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 154b8e0c4..afc6afeb3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -196,6 +196,7 @@
     <string name="invalid_url_toast">Invalid URL</string>
     <string name="video_streams_empty">No video streams found</string>
     <string name="audio_streams_empty">No audio streams found</string>
+    <string name="missing_file">File moved or deleted</string>
     <string name="invalid_directory">No such folder</string>
     <string name="invalid_source">No such file/content source</string>
     <string name="invalid_file">The file doesn\'t exist or permission to read or write to it is lacking</string>
@@ -513,6 +514,8 @@
     <string name="overwrite">Overwrite</string>
     <string name="overwrite_warning">A downloaded file with this name already exists</string>
     <string name="download_already_running">There is a download in progress with this name</string>
+    <string name="download_already_pending">There is a pending download with this name</string>
+
     <!-- message dialog about download error -->
     <string name="show_error">Show error</string>
     <string name="label_code">Code</string>
@@ -527,13 +530,20 @@
     <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="clear_finished_download">Clear finished downloads</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>
-    <string name="pause_downloads_on_mobile">Pause on switching to mobile data</string>
-    <string name="pause_downloads_on_mobile_desc">Downloads that can not be paused will be restarted</string>
+    <string name="pause_downloads_on_mobile">Interrupt on metered networks</string>
+    <string name="pause_downloads_on_mobile_desc">Useful when switching to mobile data, although some downloads cannot be suspended</string>
     <string name="close">Close</string>
+    <string name="enable_queue_limit">Limit download queue</string>
+    <string name="enable_queue_limit_desc">One download will run at the same time</string>
+    <string name="start_downloads">Start downloads</string>
+    <string name="pause_downloads">Pause downloads</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a7686dedc..51043718a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,6 +41,7 @@
         <item name="search_add">@drawable/ic_arrow_top_left_black_24dp</item>
         <item name="options">@drawable/ic_more_vert_black_24dp</item>
         <item name="play">@drawable/ic_play_arrow_black_24dp</item>
+        <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_channel">@drawable/ic_channel_black_24dp</item>
@@ -119,6 +120,7 @@
         <item name="ic_list">@drawable/ic_list_white_24dp</item>
         <item name="ic_grid">@drawable/ic_grid_white_24dp</item>
         <item name="ic_delete">@drawable/ic_delete_white_24dp</item>
+        <item name="pause">@drawable/ic_pause_white_24dp</item>
         <item name="ic_settings_update">@drawable/ic_settings_update_white</item>
 
         <item name="separator_color">@color/dark_separator_color</item>
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index be015018a..9f32e7f2f 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -50,4 +50,11 @@
         android:summary="@string/pause_downloads_on_mobile_desc"
         android:title="@string/pause_downloads_on_mobile" />
 
+    <SwitchPreference
+        app:iconSpaceReserved="false"
+        android:defaultValue="true"
+        android:key="@string/downloads_queue_limit"
+        android:summary="@string/enable_queue_limit_desc"
+        android:title="@string/enable_queue_limit" />
+
 </PreferenceScreen>

From f6b32823ba525c62241c65ba2327bc10a9cc107a Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Fri, 5 Apr 2019 14:45:39 -0300
Subject: [PATCH 128/138] Implement Storage Access Framework * re-work finished
 mission database * re-work DownloadMission and bump it Serializable version *
 keep the classic Java IO API * SAF Tree API support on Android Lollipop or
 higher * add wrapper for SAF stream opening * implement Closeable in
 SharpStream to replace the dispose() method

* do required changes for this API:
** remove any file creation logic from DownloadInitializer
** make PostProcessing Serializable and reduce the number of iterations
** update all strings.xml files
** storage helpers: StoredDirectoryHelper & StoredFileHelper
** best effort to handle any kind of SAF errors/exceptions
---
 .../newpipe/download/DownloadActivity.java    |   2 +-
 .../newpipe/download/DownloadDialog.java      | 414 +++++++++++++-----
 .../newpipe/local/feed/FeedFragment.java      |   4 +-
 .../player/playback/MediaSourceManager.java   |   2 +-
 .../settings/DownloadSettingsFragment.java    | 201 +++++++--
 .../newpipe/settings/NewPipeSettings.java     |  35 +-
 .../newpipe/streams/Mp4FromDashWriter.java    |   2 +-
 .../schabi/newpipe/streams/WebMWriter.java    |   2 +-
 .../newpipe/streams/io/SharpStream.java       |  12 +-
 .../giga/get/DownloadInitializer.java         |  36 +-
 .../us/shandian/giga/get/DownloadMission.java | 132 +++---
 .../shandian/giga/get/DownloadRunnable.java   |  11 +-
 .../giga/get/DownloadRunnableFallback.java    |  16 +-
 .../us/shandian/giga/get/FinishedMission.java |   6 +-
 .../java/us/shandian/giga/get/Mission.java    |  35 +-
 .../giga/get/sqlite/DownloadDataSource.java   |  73 ---
 .../get/sqlite/DownloadMissionHelper.java     | 112 -----
 .../giga/get/sqlite/FinishedMissionStore.java | 223 ++++++++++
 .../io/ChunkFileInputStream.java              | 298 +++++++------
 .../io/CircularFileWriter.java                |  54 +--
 .../java/us/shandian/giga/io/FileStream.java  | 131 ++++++
 .../us/shandian/giga/io/FileStreamSAF.java    | 140 ++++++
 .../io/SharpInputStream.java                  | 122 +++---
 .../giga/io/StoredDirectoryHelper.java        | 175 ++++++++
 .../us/shandian/giga/io/StoredFileHelper.java | 301 +++++++++++++
 .../giga/postprocessing/M4aNoDash.java        |   6 +-
 .../giga/postprocessing/Mp4FromDashMuxer.java |   6 +-
 .../giga/postprocessing/Postprocessing.java   | 108 +++--
 .../giga/postprocessing/TtmlConverter.java    |   9 +-
 .../giga/postprocessing/WebMMuxer.java        |   6 +-
 .../giga/service/DownloadManager.java         | 298 ++++++-------
 .../giga/service/DownloadManagerService.java  | 204 ++++++---
 .../shandian/giga/service/MissionState.java   |   5 +
 .../giga/ui/adapter/MissionAdapter.java       |  97 +++-
 .../us/shandian/giga/ui/common/Deleter.java   |  52 +--
 .../giga/ui/fragment/MissionsFragment.java    |  57 ++-
 .../java/us/shandian/giga/util/Utility.java   |  23 +-
 app/src/main/res/values-ar/strings.xml        |   6 +-
 app/src/main/res/values-ca/strings.xml        |   4 +-
 app/src/main/res/values-cmn/strings.xml       |   6 +-
 app/src/main/res/values-da/strings.xml        |   4 +-
 app/src/main/res/values-de/strings.xml        |   6 +-
 app/src/main/res/values-es/strings.xml        |  25 +-
 app/src/main/res/values-eu/strings.xml        |   6 +-
 app/src/main/res/values-he/strings.xml        |   6 +-
 app/src/main/res/values-id/strings.xml        |   6 +-
 app/src/main/res/values-it/strings.xml        |   6 +-
 app/src/main/res/values-ja/strings.xml        |  12 +-
 app/src/main/res/values-ms/strings.xml        |   6 +-
 app/src/main/res/values-nb-rNO/strings.xml    |   6 +-
 app/src/main/res/values-nl-rBE/strings.xml    |   6 +-
 app/src/main/res/values-nl/strings.xml        |   6 +-
 app/src/main/res/values-pl/strings.xml        |   6 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   6 +-
 app/src/main/res/values-pt/strings.xml        |   6 +-
 app/src/main/res/values-ru/strings.xml        |   6 +-
 app/src/main/res/values-tr/strings.xml        |   6 +-
 app/src/main/res/values-vi/strings.xml        |   6 +-
 app/src/main/res/values-zh-rTW/strings.xml    |   6 +-
 app/src/main/res/values/settings_keys.xml     |  17 +-
 app/src/main/res/values/strings.xml           |  21 +-
 app/src/main/res/xml/download_settings.xml    |  18 +-
 62 files changed, 2439 insertions(+), 1180 deletions(-)
 delete mode 100644 app/src/main/java/us/shandian/giga/get/sqlite/DownloadDataSource.java
 delete mode 100644 app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionHelper.java
 create mode 100644 app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
 rename app/src/main/java/us/shandian/giga/{postprocessing => }/io/ChunkFileInputStream.java (80%)
 rename app/src/main/java/us/shandian/giga/{postprocessing => }/io/CircularFileWriter.java (89%)
 create mode 100644 app/src/main/java/us/shandian/giga/io/FileStream.java
 create mode 100644 app/src/main/java/us/shandian/giga/io/FileStreamSAF.java
 rename app/src/main/java/us/shandian/giga/{postprocessing => }/io/SharpInputStream.java (91%)
 create mode 100644 app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
 create mode 100644 app/src/main/java/us/shandian/giga/io/StoredFileHelper.java
 create mode 100644 app/src/main/java/us/shandian/giga/service/MissionState.java

diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index 7ee686a66..41971dfd4 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -55,7 +55,7 @@ public class DownloadActivity extends AppCompatActivity {
     private void updateFragments() {
         MissionsFragment fragment = new MissionsFragment();
 
-        getFragmentManager().beginTransaction()
+        getSupportFragmentManager().beginTransaction()
                 .replace(R.id.frame, fragment, MISSIONS_FRAGMENT_TAG)
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .commit();
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 0b4767133..4525c5988 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -1,8 +1,14 @@
 package org.schabi.newpipe.download;
 
+import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
@@ -14,6 +20,7 @@ import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -35,7 +42,8 @@ import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.extractor.utils.Localization;
-import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.FilenameUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.PermissionHelper;
@@ -44,20 +52,27 @@ import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
 import icepick.Icepick;
 import icepick.State;
 import io.reactivex.disposables.CompositeDisposable;
+import us.shandian.giga.io.StoredDirectoryHelper;
+import us.shandian.giga.io.StoredFileHelper;
 import us.shandian.giga.postprocessing.Postprocessing;
+import us.shandian.giga.service.DownloadManager;
 import us.shandian.giga.service.DownloadManagerService;
-import us.shandian.giga.service.DownloadManagerService.MissionCheck;
+import us.shandian.giga.service.DownloadManagerService.DownloadManagerBinder;
+import us.shandian.giga.service.MissionState;
 
 public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
     private static final String TAG = "DialogFragment";
     private static final boolean DEBUG = MainActivity.DEBUG;
+    private static final int REQUEST_DOWNLOAD_PATH_SAF = 0x1230;
 
     @State
     protected StreamInfo currentInfo;
@@ -82,7 +97,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
     private EditText nameEditText;
     private Spinner streamsSpinner;
-    private RadioGroup radioVideoAudioGroup;
+    private RadioGroup radioStreamsGroup;
     private TextView threadsCountTextView;
     private SeekBar threadsSeekBar;
 
@@ -162,7 +177,11 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             return;
         }
 
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(getContext()));
+        final Context context = getContext();
+        if (context == null)
+            throw new RuntimeException("Context was null");
+
+        setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context));
         Icepick.restoreInstanceState(this, savedInstanceState);
 
         SparseArray<SecondaryStreamHelper<AudioStream>> secondaryStreams = new SparseArray<>(4);
@@ -179,9 +198,32 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             }
         }
 
-        this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, secondaryStreams);
-        this.audioStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedAudioStreams);
-        this.subtitleStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedSubtitleStreams);
+        this.videoStreamsAdapter = new StreamItemAdapter<>(context, wrappedVideoStreams, secondaryStreams);
+        this.audioStreamsAdapter = new StreamItemAdapter<>(context, wrappedAudioStreams);
+        this.subtitleStreamsAdapter = new StreamItemAdapter<>(context, wrappedSubtitleStreams);
+
+        Intent intent = new Intent(context, DownloadManagerService.class);
+        context.startService(intent);
+
+        context.bindService(intent, new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName cname, IBinder service) {
+                DownloadManagerBinder mgr = (DownloadManagerBinder) service;
+
+                mainStorageAudio = mgr.getMainStorageAudio();
+                mainStorageVideo = mgr.getMainStorageVideo();
+                downloadManager = mgr.getDownloadManager();
+
+                okButton.setEnabled(true);
+
+                context.unbindService(this);
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                // nothing to do
+            }
+        }, Context.BIND_AUTO_CREATE);
     }
 
     @Override
@@ -206,8 +248,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         threadsCountTextView = view.findViewById(R.id.threads_count);
         threadsSeekBar = view.findViewById(R.id.threads);
 
-        radioVideoAudioGroup = view.findViewById(R.id.video_audio_group);
-        radioVideoAudioGroup.setOnCheckedChangeListener(this);
+        radioStreamsGroup = view.findViewById(R.id.video_audio_group);
+        radioStreamsGroup.setOnCheckedChangeListener(this);
 
         initToolbar(view.findViewById(R.id.toolbar));
         setupDownloadOptions();
@@ -242,17 +284,17 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         disposables.clear();
 
         disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedVideoStreams).subscribe(result -> {
-            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.video_button) {
+            if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.video_button) {
                 setupVideoSpinner();
             }
         }));
         disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedAudioStreams).subscribe(result -> {
-            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button) {
+            if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.audio_button) {
                 setupAudioSpinner();
             }
         }));
         disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams).subscribe(result -> {
-            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+            if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
                 setupSubtitleSpinner();
             }
         }));
@@ -270,17 +312,40 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         Icepick.saveInstanceState(this, outState);
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == REQUEST_DOWNLOAD_PATH_SAF && resultCode == Activity.RESULT_OK) {
+            if (data.getData() == null) {
+                showFailedDialog(R.string.general_error);
+                return;
+            }
+            try {
+                continueSelectedDownload(new StoredFileHelper(getContext(), data.getData(), ""));
+            } catch (IOException e) {
+                showErrorActivity(e);
+            }
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Inits
     //////////////////////////////////////////////////////////////////////////*/
 
     private void initToolbar(Toolbar toolbar) {
         if (DEBUG) Log.d(TAG, "initToolbar() called with: toolbar = [" + toolbar + "]");
+
+        boolean isLight = ThemeHelper.isLightThemeSelected(getActivity());
+        okButton = toolbar.findViewById(R.id.okay);
+        okButton.setEnabled(false);// disable until the download service connection is done
+
         toolbar.setTitle(R.string.download_dialog_title);
-        toolbar.setNavigationIcon(ThemeHelper.isLightThemeSelected(getActivity()) ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp);
+        toolbar.setNavigationIcon(isLight ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp);
         toolbar.inflateMenu(R.menu.dialog_url);
         toolbar.setNavigationOnClickListener(v -> getDialog().dismiss());
 
+
         toolbar.setOnMenuItemClickListener(item -> {
             if (item.getItemId() == R.id.okay) {
                 prepareSelectedDownload();
@@ -348,7 +413,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         if (DEBUG)
             Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
-        switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
+        switch (radioStreamsGroup.getCheckedRadioButtonId()) {
             case R.id.audio_button:
                 selectedAudioIndex = position;
                 break;
@@ -372,9 +437,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     protected void setupDownloadOptions() {
         setRadioButtonsState(false);
 
-        final RadioButton audioButton = radioVideoAudioGroup.findViewById(R.id.audio_button);
-        final RadioButton videoButton = radioVideoAudioGroup.findViewById(R.id.video_button);
-        final RadioButton subtitleButton = radioVideoAudioGroup.findViewById(R.id.subtitle_button);
+        final RadioButton audioButton = radioStreamsGroup.findViewById(R.id.audio_button);
+        final RadioButton videoButton = radioStreamsGroup.findViewById(R.id.video_button);
+        final RadioButton subtitleButton = radioStreamsGroup.findViewById(R.id.subtitle_button);
         final boolean isVideoStreamsAvailable = videoStreamsAdapter.getCount() > 0;
         final boolean isAudioStreamsAvailable = audioStreamsAdapter.getCount() > 0;
         final boolean isSubtitleStreamsAvailable = subtitleStreamsAdapter.getCount() > 0;
@@ -399,9 +464,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     }
 
     private void setRadioButtonsState(boolean enabled) {
-        radioVideoAudioGroup.findViewById(R.id.audio_button).setEnabled(enabled);
-        radioVideoAudioGroup.findViewById(R.id.video_button).setEnabled(enabled);
-        radioVideoAudioGroup.findViewById(R.id.subtitle_button).setEnabled(enabled);
+        radioStreamsGroup.findViewById(R.id.audio_button).setEnabled(enabled);
+        radioStreamsGroup.findViewById(R.id.video_button).setEnabled(enabled);
+        radioStreamsGroup.findViewById(R.id.subtitle_button).setEnabled(enabled);
     }
 
     private int getSubtitleIndexBy(List<SubtitlesStream> streams) {
@@ -436,119 +501,248 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         return 0;
     }
 
+    StoredDirectoryHelper mainStorageAudio = null;
+    StoredDirectoryHelper mainStorageVideo = null;
+    DownloadManager downloadManager = null;
+
+    MenuItem okButton = null;
+
+    private String getNameEditText() {
+        return nameEditText.getText().toString().trim();
+    }
+
+    private void showFailedDialog(@StringRes int msg) {
+        new AlertDialog.Builder(getContext())
+                .setMessage(msg)
+                .setNegativeButton(android.R.string.ok, null)
+                .create()
+                .show();
+    }
+
+    private void showErrorActivity(Exception e) {
+        ErrorActivity.reportError(
+                getContext(),
+                Collections.singletonList(e),
+                null,
+                null,
+                ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "-", "-", R.string.general_error)
+        );
+    }
+
     private void prepareSelectedDownload() {
         final Context context = getContext();
-        Stream stream;
-        String location;
-        char kind;
+        StoredDirectoryHelper mainStorage;
+        MediaFormat format;
+        String mime;
 
-        String fileName = nameEditText.getText().toString().trim();
-        if (fileName.isEmpty())
-            fileName = FilenameUtils.createFilename(context, currentInfo.getName());
+        // first, build the filename and get the output folder (if possible)
 
-        switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
+        String filename = getNameEditText() + ".";
+        if (filename.isEmpty()) {
+            filename = FilenameUtils.createFilename(context, currentInfo.getName());
+        }
+        filename += ".";
+
+        switch (radioStreamsGroup.getCheckedRadioButtonId()) {
             case R.id.audio_button:
-                stream = audioStreamsAdapter.getItem(selectedAudioIndex);
-                location = NewPipeSettings.getAudioDownloadPath(context);
-                kind = 'a';
+                mainStorage = mainStorageAudio;
+                format = audioStreamsAdapter.getItem(selectedAudioIndex).getFormat();
+                mime = format.mimeType;
+                filename += format.suffix;
                 break;
             case R.id.video_button:
-                stream = videoStreamsAdapter.getItem(selectedVideoIndex);
-                location = NewPipeSettings.getVideoDownloadPath(context);
-                kind = 'v';
+                mainStorage = mainStorageVideo;
+                format = videoStreamsAdapter.getItem(selectedVideoIndex).getFormat();
+                mime = format.mimeType;
+                filename += format.suffix;
                 break;
             case R.id.subtitle_button:
-                stream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex);
-                location = NewPipeSettings.getVideoDownloadPath(context);// assume that subtitle & video files go together
-                kind = 's';
+                mainStorage = mainStorageVideo;// subtitle & video files go together
+                format = subtitleStreamsAdapter.getItem(selectedSubtitleIndex).getFormat();
+                mime = format.mimeType;
+                filename += format == MediaFormat.TTML ? MediaFormat.SRT.suffix : format.suffix;
+                break;
+            default:
+                throw new RuntimeException("No stream selected");
+        }
+
+        if (mainStorage == null) {
+            // this part is called if...
+            //                          older android version running with SAF preferred
+            //                          save path not defined (via download settings)
+
+            StoredFileHelper.requestSafWithFileCreation(this, REQUEST_DOWNLOAD_PATH_SAF, filename, mime);
+            return;
+        }
+
+        // check for existing file with the same name
+        Uri result = mainStorage.findFile(filename);
+
+        if (result == null) {
+            // the file does not exists, create
+            StoredFileHelper storage = mainStorage.createFile(filename, mime);
+            if (storage == null || !storage.canWrite()) {
+                showFailedDialog(R.string.error_file_creation);
+                return;
+            }
+
+            continueSelectedDownload(storage);
+            return;
+        }
+
+        // the target filename is already use, try load
+        StoredFileHelper storage;
+        try {
+            storage = new StoredFileHelper(context, result, mime);
+        } catch (IOException e) {
+            showErrorActivity(e);
+            return;
+        }
+
+        // check if is our file
+        MissionState state = downloadManager.checkForExistingMission(storage);
+        @StringRes int msgBtn;
+        @StringRes int msgBody;
+
+        switch (state) {
+            case Finished:
+                msgBtn = R.string.overwrite;
+                msgBody = R.string.overwrite_finished_warning;
+                break;
+            case Pending:
+                msgBtn = R.string.overwrite;
+                msgBody = R.string.download_already_pending;
+                break;
+            case PendingRunning:
+                msgBtn = R.string.generate_unique_name;
+                msgBody = R.string.download_already_running;
+                break;
+            case None:
+                msgBtn = R.string.overwrite;
+                msgBody = R.string.overwrite_unrelated_warning;
                 break;
             default:
                 return;
         }
 
-        int threads;
+        // handle user answer (overwrite or create another file with different name)
+        final String finalFilename = filename;
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setTitle(R.string.download_dialog_title)
+                .setMessage(msgBody)
+                .setPositiveButton(msgBtn, (dialog, which) -> {
+                    dialog.dismiss();
 
-        if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
-            threads = 1;// use unique thread for subtitles due small file size
-            fileName += ".srt";// final subtitle format
-        } else {
-            threads = threadsSeekBar.getProgress() + 1;
-            fileName += "." + stream.getFormat().getSuffix();
-        }
-
-        final String finalFileName = fileName;
-
-        DownloadManagerService.checkForRunningMission(context, location, fileName, (MissionCheck result) -> {
-            @StringRes int msgBtn;
-            @StringRes int msgBody;
-
-            switch (result) {
-                case Finished:
-                    msgBtn = R.string.overwrite;
-                    msgBody = R.string.overwrite_warning;
-                    break;
-                case Pending:
-                    msgBtn = R.string.overwrite;
-                    msgBody = R.string.download_already_pending;
-                    break;
-                case PendingRunning:
-                    msgBtn = R.string.generate_unique_name;
-                    msgBody = R.string.download_already_running;
-                    break;
-                default:
-                    downloadSelected(context, stream, location, finalFileName, kind, threads);
-                    return;
-            }
-
-            // overwrite or unique name actions are done by the download manager
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setTitle(R.string.download_dialog_title)
-                    .setMessage(msgBody)
-                    .setPositiveButton(
-                            msgBtn,
-                            (dialog, which) -> downloadSelected(context, stream, location, finalFileName, kind, threads)
-                    )
-                    .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel())
-                    .create()
-                    .show();
-        });
+                    StoredFileHelper storageNew;
+                    switch (state) {
+                        case Finished:
+                        case Pending:
+                            downloadManager.forgetMission(storage);
+                        case None:
+                            // try take (or steal) the file permissions
+                            try {
+                                storageNew = new StoredFileHelper(context, result, mainStorage.getTag());
+                                if (storageNew.canWrite())
+                                    continueSelectedDownload(storageNew);
+                                else
+                                    showFailedDialog(R.string.error_file_creation);
+                            } catch (IOException e) {
+                                showErrorActivity(e);
+                            }
+                            break;
+                        case PendingRunning:
+                            // FIXME: createUniqueFile() is not tested properly
+                            storageNew = mainStorage.createUniqueFile(finalFilename, mime);
+                            if (storageNew == null)
+                                showFailedDialog(R.string.error_file_creation);
+                            else
+                                continueSelectedDownload(storageNew);
+                            break;
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel, null)
+                .create()
+                .show();
     }
 
-    private void downloadSelected(Context context, Stream selectedStream, String location, String fileName, char kind, int threads) {
+    private void continueSelectedDownload(@NonNull StoredFileHelper storage) {
+        final Context context = getContext();
+
+        if (!storage.canWrite()) {
+            showFailedDialog(R.string.permission_denied);
+            return;
+        }
+
+        // check if the selected file has to be overwritten, by simply checking its length
+        try {
+            if (storage.length() > 0) storage.truncate();
+        } catch (IOException e) {
+            Log.e(TAG, "failed to overwrite the file: " + storage.getUri().toString(), e);
+            //showErrorActivity(e);
+            showFailedDialog(R.string.overwrite_failed);
+            return;
+        }
+
+        Stream selectedStream;
+        char kind;
+        int threads = threadsSeekBar.getProgress() + 1;
         String[] urls;
         String psName = null;
         String[] psArgs = null;
         String secondaryStreamUrl = null;
         long nearLength = 0;
 
-        if (selectedStream instanceof AudioStream) {
-            if (selectedStream.getFormat() == MediaFormat.M4A) {
-                psName = Postprocessing.ALGORITHM_M4A_NO_DASH;
-            }
-        } else if (selectedStream instanceof VideoStream) {
-            SecondaryStreamHelper<AudioStream> secondaryStream = videoStreamsAdapter
-                    .getAllSecondary()
-                    .get(wrappedVideoStreams.getStreamsList().indexOf(selectedStream));
+        // more download logic: select muxer, subtitle converter, etc.
+        switch (radioStreamsGroup.getCheckedRadioButtonId()) {
+            case R.id.audio_button:
+                threads = 1;// use unique thread for subtitles due small file size
+                kind = 'a';
+                selectedStream = audioStreamsAdapter.getItem(selectedAudioIndex);
 
-            if (secondaryStream != null) {
-                secondaryStreamUrl = secondaryStream.getStream().getUrl();
-                psName = selectedStream.getFormat() == MediaFormat.MPEG_4 ? Postprocessing.ALGORITHM_MP4_FROM_DASH_MUXER : Postprocessing.ALGORITHM_WEBM_MUXER;
-                psArgs = null;
-                long videoSize = wrappedVideoStreams.getSizeInBytes((VideoStream) selectedStream);
-
-                // set nearLength, only, if both sizes are fetched or known. this probably does not work on slow networks
-                if (secondaryStream.getSizeInBytes() > 0 && videoSize > 0) {
-                    nearLength = secondaryStream.getSizeInBytes() + videoSize;
+                if (selectedStream.getFormat() == MediaFormat.M4A) {
+                    psName = Postprocessing.ALGORITHM_M4A_NO_DASH;
                 }
-            }
-        } else if ((selectedStream instanceof SubtitlesStream) && selectedStream.getFormat() == MediaFormat.TTML) {
-            psName = Postprocessing.ALGORITHM_TTML_CONVERTER;
-            psArgs = new String[]{
-                    selectedStream.getFormat().getSuffix(),
-                    "false",// ignore empty frames
-                    "false",// detect youtube duplicate lines
-            };
+                break;
+            case R.id.video_button:
+                kind = 'v';
+                selectedStream = videoStreamsAdapter.getItem(selectedVideoIndex);
+
+                SecondaryStreamHelper<AudioStream> secondaryStream = videoStreamsAdapter
+                        .getAllSecondary()
+                        .get(wrappedVideoStreams.getStreamsList().indexOf(selectedStream));
+
+                if (secondaryStream != null) {
+                    secondaryStreamUrl = secondaryStream.getStream().getUrl();
+
+                    if (selectedStream.getFormat() == MediaFormat.MPEG_4)
+                        psName = Postprocessing.ALGORITHM_MP4_FROM_DASH_MUXER;
+                    else
+                        psName = Postprocessing.ALGORITHM_WEBM_MUXER;
+
+                    psArgs = null;
+                    long videoSize = wrappedVideoStreams.getSizeInBytes((VideoStream) selectedStream);
+
+                    // set nearLength, only, if both sizes are fetched or known. this probably does not work on slow networks
+                    if (secondaryStream.getSizeInBytes() > 0 && videoSize > 0) {
+                        nearLength = secondaryStream.getSizeInBytes() + videoSize;
+                    }
+                }
+                break;
+            case R.id.subtitle_button:
+                kind = 's';
+                selectedStream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex);
+
+                if (selectedStream.getFormat() == MediaFormat.TTML) {
+                    psName = Postprocessing.ALGORITHM_TTML_CONVERTER;
+                    psArgs = new String[]{
+                            selectedStream.getFormat().getSuffix(),
+                            "false",// ignore empty frames
+                            "false",// detect youtube duplicate lines
+                    };
+                }
+                break;
+            default:
+                return;
         }
 
         if (secondaryStreamUrl == null) {
@@ -557,8 +751,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
         }
 
-        DownloadManagerService.startMission(context, urls, location, fileName, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
+        DownloadManagerService.startMission(context, urls, storage, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
 
-        getDialog().dismiss();
+        dismiss();
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java
index f1bb01734..475627c08 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java
@@ -21,8 +21,8 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
-import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.local.subscription.SubscriptionService;
+import org.schabi.newpipe.report.UserAction;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -262,7 +262,7 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
      * If chosen feed already displayed, then we request another feed from another
      * subscription, until the subscription table runs out of new items.
      * <p>
-     * This Observer is self-contained and will dispose itself when complete. However, this
+     * This Observer is self-contained and will close itself when complete. However, this
      * does not obey the fragment lifecycle and may continue running in the background
      * until it is complete. This is done due to RxJava2 no longer propagate errors once
      * an observer is unsubscribed while the thread process is still running.
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
index db8cc797e..fb1a609cc 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
@@ -158,7 +158,7 @@ public class MediaSourceManager {
      * Dispose the manager and releases all message buses and loaders.
      * */
     public void dispose() {
-        if (DEBUG) Log.d(TAG, "dispose() called.");
+        if (DEBUG) Log.d(TAG, "close() called.");
 
         debouncedSignal.onComplete();
         debouncedLoader.dispose();
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index 82c6853d5..3737d1c17 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -2,26 +2,42 @@ package org.schabi.newpipe.settings;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.annotation.StringRes;
 import android.support.v7.preference.Preference;
 import android.util.Log;
-
-import com.nononsenseapps.filepicker.Utils;
+import android.widget.Toast;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 
 import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+
+import us.shandian.giga.io.StoredDirectoryHelper;
 
 public class DownloadSettingsFragment extends BasePreferenceFragment {
-    private static final int REQUEST_DOWNLOAD_PATH = 0x1235;
+    private static final int REQUEST_DOWNLOAD_VIDEO_PATH = 0x1235;
     private static final int REQUEST_DOWNLOAD_AUDIO_PATH = 0x1236;
 
-    private String DOWNLOAD_PATH_PREFERENCE;
+    private String DOWNLOAD_PATH_VIDEO_PREFERENCE;
     private String DOWNLOAD_PATH_AUDIO_PREFERENCE;
 
+    private String DOWNLOAD_STORAGE_API;
+    private String DOWNLOAD_STORAGE_API_DEFAULT;
+
+    private Preference prefPathVideo;
+    private Preference prefPathAudio;
+    
+    private Context ctx;
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -33,16 +49,100 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.download_settings);
+
+        prefPathVideo = findPreference(DOWNLOAD_PATH_VIDEO_PREFERENCE);
+        prefPathAudio = findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+
+        updatePathPickers(usingJavaIO());
+
+        findPreference(DOWNLOAD_STORAGE_API).setOnPreferenceChangeListener((preference, value) -> {
+            boolean javaIO = DOWNLOAD_STORAGE_API_DEFAULT.equals(value);
+
+            if (!javaIO && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                Toast.makeText(ctx, R.string.download_pick_path, Toast.LENGTH_LONG).show();
+
+                // forget save paths
+                forgetSAFTree(DOWNLOAD_PATH_VIDEO_PREFERENCE);
+                forgetSAFTree(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+
+                defaultPreferences.edit()
+                        .putString(DOWNLOAD_PATH_VIDEO_PREFERENCE, "")
+                        .putString(DOWNLOAD_PATH_AUDIO_PREFERENCE, "")
+                        .apply();
+
+                updatePreferencesSummary();
+            }
+
+            updatePathPickers(javaIO);
+            return true;
+        });
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        ctx = context;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        ctx = null;
+        findPreference(DOWNLOAD_STORAGE_API).setOnPreferenceChangeListener(null);
     }
 
     private void initKeys() {
-        DOWNLOAD_PATH_PREFERENCE = getString(R.string.download_path_key);
+        DOWNLOAD_PATH_VIDEO_PREFERENCE = getString(R.string.download_path_video_key);
         DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
+        DOWNLOAD_STORAGE_API = getString(R.string.downloads_storage_api);
+        DOWNLOAD_STORAGE_API_DEFAULT = getString(R.string.downloads_storage_api_default);
     }
 
     private void updatePreferencesSummary() {
-        findPreference(DOWNLOAD_PATH_PREFERENCE).setSummary(defaultPreferences.getString(DOWNLOAD_PATH_PREFERENCE, getString(R.string.download_path_summary)));
-        findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE).setSummary(defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE, getString(R.string.download_path_audio_summary)));
+        prefPathVideo.setSummary(
+                defaultPreferences.getString(DOWNLOAD_PATH_VIDEO_PREFERENCE, getString(R.string.download_path_summary))
+        );
+        prefPathAudio.setSummary(
+                defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE, getString(R.string.download_path_audio_summary))
+        );
+    }
+
+    private void updatePathPickers(boolean useJavaIO) {
+        boolean enabled = useJavaIO || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+        prefPathVideo.setEnabled(enabled);
+        prefPathAudio.setEnabled(enabled);
+    }
+
+    private boolean usingJavaIO() {
+        return DOWNLOAD_STORAGE_API_DEFAULT.equals(
+                defaultPreferences.getString(DOWNLOAD_STORAGE_API, DOWNLOAD_STORAGE_API_DEFAULT)
+        );
+    }
+
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    private void forgetSAFTree(String prefKey) {
+
+        String oldPath = defaultPreferences.getString(prefKey, "");
+
+        if (oldPath != null && !oldPath.isEmpty() && oldPath.charAt(0) != File.separatorChar) {
+            try {
+                StoredDirectoryHelper mainStorage = new StoredDirectoryHelper(ctx, Uri.parse(oldPath), null);
+                if (!mainStorage.isDirect()) {
+                    mainStorage.revokePermissions();
+                    Log.i(TAG, "revokePermissions()  [uri=" + oldPath + "]  ¡success!");
+                }
+            } catch (IOException err) {
+                Log.e(TAG, "Error revoking Tree uri permissions  [uri=" + oldPath + "]", err);
+            }
+        }
+    }
+
+    private void showMessageDialog(@StringRes int title, @StringRes int message) {
+        AlertDialog.Builder msg = new AlertDialog.Builder(ctx);
+        msg.setTitle(title);
+        msg.setMessage(message);
+        msg.setPositiveButton(android.R.string.ok, null);
+        msg.show();
     }
 
     @Override
@@ -51,17 +151,31 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
             Log.d(TAG, "onPreferenceTreeClick() called with: preference = [" + preference + "]");
         }
 
-        if (preference.getKey().equals(DOWNLOAD_PATH_PREFERENCE)
-                || preference.getKey().equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
-            Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
-                    .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
-                    .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
-                    .putExtra(FilePickerActivityHelper.EXTRA_MODE, FilePickerActivityHelper.MODE_DIR);
-            if (preference.getKey().equals(DOWNLOAD_PATH_PREFERENCE)) {
-                startActivityForResult(i, REQUEST_DOWNLOAD_PATH);
-            } else if (preference.getKey().equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
-                startActivityForResult(i, REQUEST_DOWNLOAD_AUDIO_PATH);
+        String key = preference.getKey();
+
+        if (key.equals(DOWNLOAD_PATH_VIDEO_PREFERENCE) || key.equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
+            boolean safPick = !usingJavaIO();
+
+            int request = 0;
+            if (key.equals(DOWNLOAD_PATH_VIDEO_PREFERENCE)) {
+                request = REQUEST_DOWNLOAD_VIDEO_PATH;
+            } else if (key.equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
+                request = REQUEST_DOWNLOAD_AUDIO_PATH;
             }
+
+            Intent i;
+            if (safPick && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
+                        .putExtra("android.content.extra.SHOW_ADVANCED", true)
+                        .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | StoredDirectoryHelper.PERMISSION_FLAGS);
+            } else {
+                i = new Intent(getActivity(), FilePickerActivityHelper.class)
+                        .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
+                        .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
+                        .putExtra(FilePickerActivityHelper.EXTRA_MODE, FilePickerActivityHelper.MODE_DIR);
+            }
+
+            startActivityForResult(i, request);
         }
 
         return super.onPreferenceTreeClick(preference);
@@ -71,25 +185,50 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (DEBUG) {
-            Log.d(TAG, "onActivityResult() called with: requestCode = [" + requestCode + "], resultCode = [" + resultCode + "], data = [" + data + "]");
+            Log.d(TAG, "onActivityResult() called with: requestCode = [" + requestCode + "], " +
+                    "resultCode = [" + resultCode + "], data = [" + data + "]"
+            );
         }
 
-        if ((requestCode == REQUEST_DOWNLOAD_PATH || requestCode == REQUEST_DOWNLOAD_AUDIO_PATH)
-                && resultCode == Activity.RESULT_OK && data.getData() != null) {
-            String key = getString(requestCode == REQUEST_DOWNLOAD_PATH ? R.string.download_path_key : R.string.download_path_audio_key);
-            String path = Utils.getFileForUri(data.getData()).getAbsolutePath();
+        if (resultCode != Activity.RESULT_OK) return;
 
-            defaultPreferences.edit().putString(key, path).apply();
+        String key;
+        if (requestCode == REQUEST_DOWNLOAD_VIDEO_PATH)
+            key = DOWNLOAD_PATH_VIDEO_PREFERENCE;
+        else if (requestCode == REQUEST_DOWNLOAD_AUDIO_PATH)
+            key = DOWNLOAD_PATH_AUDIO_PREFERENCE;
+        else
+            return;
+
+        Uri uri = data.getData();
+        if (uri == null) {
+            showMessageDialog(R.string.general_error, R.string.invalid_directory);
+            return;
+        }
+
+        if (!usingJavaIO() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            // steps:
+            //       1. acquire permissions on the new save path
+            //       2. save the new path, if step(1) was successful
+
+            try {
+                StoredDirectoryHelper mainStorage = new StoredDirectoryHelper(ctx, uri, null);
+                mainStorage.acquirePermissions();
+                Log.i(TAG, "acquirePermissions()  [uri=" + uri.toString() + "]  ¡success!");
+            } catch (IOException err) {
+                Log.e(TAG, "Error acquiring permissions on " + uri.toString());
+                showMessageDialog(R.string.general_error, R.string.no_available_dir);
+                return;
+            }
+
+            defaultPreferences.edit().putString(key, uri.toString()).apply();
+        } else {
+            defaultPreferences.edit().putString(key, uri.toString()).apply();
             updatePreferencesSummary();
 
-            File target = new File(path);
-            if (!target.canWrite()) {
-                AlertDialog.Builder msg = new AlertDialog.Builder(getContext());
-                msg.setTitle(R.string.download_to_sdcard_error_title);
-                msg.setMessage(R.string.download_to_sdcard_error_message);
-                msg.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> { });
-                msg.show();
-            }
+            File target = new File(URI.create(uri.toString()));
+            if (!target.canWrite())
+                showMessageDialog(R.string.download_to_sdcard_error_title, R.string.download_to_sdcard_error_message);
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
index 2a0e2645b..f153cf23a 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
@@ -70,37 +70,23 @@ public class NewPipeSettings {
         getAudioDownloadFolder(context);
     }
 
-    public static File getVideoDownloadFolder(Context context) {
-        return getDir(context, R.string.download_path_key, Environment.DIRECTORY_MOVIES);
+    private static void getVideoDownloadFolder(Context context) {
+        getDir(context, R.string.download_path_video_key, Environment.DIRECTORY_MOVIES);
     }
 
-    public static String getVideoDownloadPath(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        final String key = context.getString(R.string.download_path_key);
-        return prefs.getString(key, Environment.DIRECTORY_MOVIES);
+    private static void getAudioDownloadFolder(Context context) {
+        getDir(context, R.string.download_path_audio_key, Environment.DIRECTORY_MUSIC);
     }
 
-    public static File getAudioDownloadFolder(Context context) {
-        return getDir(context, R.string.download_path_audio_key, Environment.DIRECTORY_MUSIC);
-    }
-
-    public static String getAudioDownloadPath(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        final String key = context.getString(R.string.download_path_audio_key);
-        return prefs.getString(key, Environment.DIRECTORY_MUSIC);
-    }
-
-    private static File getDir(Context context, int keyID, String defaultDirectoryName) {
+    private static void getDir(Context context, int keyID, String defaultDirectoryName) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final String key = context.getString(keyID);
         String downloadPath = prefs.getString(key, null);
-        if ((downloadPath != null) && (!downloadPath.isEmpty())) return new File(downloadPath.trim());
+        if ((downloadPath != null) && (!downloadPath.isEmpty())) return;
 
-        final File dir = getDir(defaultDirectoryName);
         SharedPreferences.Editor spEditor = prefs.edit();
-        spEditor.putString(key, getNewPipeChildFolderPathForDir(dir));
+        spEditor.putString(key, getNewPipeChildFolderPathForDir(getDir(defaultDirectoryName)));
         spEditor.apply();
-        return dir;
     }
 
     @NonNull
@@ -110,8 +96,13 @@ public class NewPipeSettings {
 
     public static void resetDownloadFolders(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+        prefs.edit()
+                .putString(context.getString(R.string.downloads_storage_api), context.getString(R.string.downloads_storage_api_default))
+                .apply();
+
         resetDownloadFolder(prefs, context.getString(R.string.download_path_audio_key), Environment.DIRECTORY_MUSIC);
-        resetDownloadFolder(prefs, context.getString(R.string.download_path_key), Environment.DIRECTORY_MOVIES);
+        resetDownloadFolder(prefs, context.getString(R.string.download_path_video_key), Environment.DIRECTORY_MOVIES);
     }
 
     private static void resetDownloadFolder(SharedPreferences prefs, String key, String defaultDirectoryName) {
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
index 5a4efbe32..61f793e5d 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -120,7 +120,7 @@ public class Mp4FromDashWriter {
         parsed = true;
 
         for (SharpStream src : sourceTracks) {
-            src.dispose();
+            src.close();
         }
 
         tracks = null;
diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
index eba2bbb87..26b9cbebf 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
@@ -107,7 +107,7 @@ public class WebMWriter {
         parsed = true;
 
         for (SharpStream src : sourceTracks) {
-            src.dispose();
+            src.close();
         }
 
         sourceTracks = null;
diff --git a/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java b/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java
index ea2f60837..5950ba3dd 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java
@@ -1,11 +1,12 @@
 package org.schabi.newpipe.streams.io;
 
+import java.io.Closeable;
 import java.io.IOException;
 
 /**
  * based on c#
  */
-public abstract class SharpStream {
+public abstract class SharpStream  implements Closeable {
 
     public abstract int read() throws IOException;
 
@@ -19,9 +20,10 @@ public abstract class SharpStream {
 
     public abstract void rewind() throws IOException;
 
-    public abstract void dispose();
+    public abstract boolean isClosed();
 
-    public abstract boolean isDisposed();
+    @Override
+    public abstract void close();
 
     public abstract boolean canRewind();
 
@@ -54,4 +56,8 @@ public abstract class SharpStream {
     public void seek(long offset) throws IOException {
         throw new IOException("Not implemented");
     }
+
+    public long length() throws IOException {
+        throw new UnsupportedOperationException("Unsupported operation");
+    }
 }
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
index abc934878..1e05983d8 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
@@ -3,10 +3,10 @@ package us.shandian.giga.get;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
-import java.io.File;
+import org.schabi.newpipe.streams.io.SharpStream;
+
 import java.io.IOException;
 import java.io.InterruptedIOException;
-import java.io.RandomAccessFile;
 import java.net.HttpURLConnection;
 import java.nio.channels.ClosedByInterruptException;
 
@@ -111,34 +111,10 @@ public class DownloadInitializer extends Thread {
                     if (!mMission.running || Thread.interrupted()) return;
                 }
 
-                File file;
-                if (mMission.current == 0) {
-                    file = new File(mMission.location);
-                    if (!Utility.mkdir(file, true)) {
-                        mMission.notifyError(DownloadMission.ERROR_PATH_CREATION, null);
-                        return;
-                    }
-
-                    file = new File(file, mMission.name);
-
-                    // if the name is used by another process, delete it
-                    if (file.exists() && !file.isFile() && !file.delete()) {
-                        mMission.notifyError(DownloadMission.ERROR_FILE_CREATION, null);
-                        return;
-                    }
-
-                    if (!file.exists() && !file.createNewFile()) {
-                        mMission.notifyError(DownloadMission.ERROR_FILE_CREATION, null);
-                        return;
-                    }
-                } else {
-                    file = new File(mMission.location, mMission.name);
-                }
-
-                RandomAccessFile af = new RandomAccessFile(file, "rw");
-                af.setLength(mMission.offsets[mMission.current] + mMission.length);
-                af.seek(mMission.offsets[mMission.current]);
-                af.close();
+                SharpStream fs = mMission.storage.getStream();
+                fs.setLength(mMission.offsets[mMission.current] + mMission.length);
+                fs.seek(mMission.offsets[mMission.current]);
+                fs.close();
 
                 if (!mMission.running || Thread.interrupted()) return;
 
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index b8849482a..9ec3418b0 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -2,6 +2,7 @@ package us.shandian.giga.get;
 
 import android.os.Handler;
 import android.os.Message;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import java.io.File;
@@ -17,6 +18,7 @@ import java.util.List;
 
 import javax.net.ssl.SSLException;
 
+import us.shandian.giga.io.StoredFileHelper;
 import us.shandian.giga.postprocessing.Postprocessing;
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.util.Utility;
@@ -24,7 +26,7 @@ import us.shandian.giga.util.Utility;
 import static org.schabi.newpipe.BuildConfig.DEBUG;
 
 public class DownloadMission extends Mission {
-    private static final long serialVersionUID = 3L;// last bump: 8 november 2018
+    private static final long serialVersionUID = 4L;// last bump: 27 march 2019
 
     static final int BUFFER_SIZE = 64 * 1024;
     final static int BLOCK_SIZE = 512 * 1024;
@@ -43,6 +45,7 @@ public class DownloadMission extends Mission {
     public static final int ERROR_POSTPROCESSING_STOPPED = 1008;
     public static final int ERROR_POSTPROCESSING_HOLD = 1009;
     public static final int ERROR_INSUFFICIENT_STORAGE = 1010;
+    public static final int ERROR_PROGRESS_LOST = 1011;
     public static final int ERROR_HTTP_NO_CONTENT = 204;
     public static final int ERROR_HTTP_UNSUPPORTED_RANGE = 206;
 
@@ -71,16 +74,6 @@ public class DownloadMission extends Mission {
      */
     public long[] offsets;
 
-    /**
-     * The post-processing algorithm arguments
-     */
-    public String[] postprocessingArgs;
-
-    /**
-     * The post-processing algorithm name
-     */
-    public String postprocessingName;
-
     /**
      * Indicates if the post-processing state:
      * 0: ready
@@ -88,12 +81,12 @@ public class DownloadMission extends Mission {
      * 2: completed
      * 3: hold
      */
-    public volatile int postprocessingState;
+    public volatile int psState;
 
     /**
-     * Indicate if the post-processing algorithm works on the same file
+     * the post-processing algorithm instance
      */
-    public boolean postprocessingThis;
+    public transient Postprocessing psAlgorithm;
 
     /**
      * The current resource to download, see {@code urls[current]} and {@code offsets[current]}
@@ -138,36 +131,23 @@ public class DownloadMission extends Mission {
     public transient volatile Thread[] threads = new Thread[0];
     private transient Thread init = null;
 
-
     protected DownloadMission() {
 
     }
 
-    public DownloadMission(String url, String name, String location, char kind) {
-        this(new String[]{url}, name, location, kind, null, null);
-    }
-
-    public DownloadMission(String[] urls, String name, String location, char kind, String postprocessingName, String[] postprocessingArgs) {
-        if (name == null) throw new NullPointerException("name is null");
-        if (name.isEmpty()) throw new IllegalArgumentException("name is empty");
+    public DownloadMission(String[] urls, StoredFileHelper storage, char kind, Postprocessing psInstance) {
         if (urls == null) throw new NullPointerException("urls is null");
         if (urls.length < 1) throw new IllegalArgumentException("urls is empty");
-        if (location == null) throw new NullPointerException("location is null");
-        if (location.isEmpty()) throw new IllegalArgumentException("location is empty");
         this.urls = urls;
-        this.name = name;
-        this.location = location;
         this.kind = kind;
         this.offsets = new long[urls.length];
         this.enqueued = true;
         this.maxRetry = 3;
+        this.storage = storage;
 
-        if (postprocessingName != null) {
-            Postprocessing algorithm = Postprocessing.getAlgorithm(postprocessingName, null);
-            this.postprocessingThis = algorithm.worksOnSameFile;
-            this.offsets[0] = algorithm.recommendedReserve;
-            this.postprocessingName = postprocessingName;
-            this.postprocessingArgs = postprocessingArgs;
+        if (psInstance != null) {
+            this.psAlgorithm = psInstance;
+            this.offsets[0] = psInstance.recommendedReserve;
         } else {
             if (DEBUG && urls.length > 1) {
                 Log.w(TAG, "mission created with multiple urls ¿missing post-processing algorithm?");
@@ -359,22 +339,12 @@ public class DownloadMission extends Mission {
         Log.e(TAG, "notifyError() code = " + code, err);
 
         if (err instanceof IOException) {
-            if (err.getMessage().contains("Permission denied")) {
+            if (storage.canWrite() || err.getMessage().contains("Permission denied")) {
                 code = ERROR_PERMISSION_DENIED;
                 err = null;
-            } else if (err.getMessage().contains("write failed: ENOSPC")) {
+            } else if (err.getMessage().contains("ENOSPC")) {
                 code = ERROR_INSUFFICIENT_STORAGE;
                 err = null;
-            } else {
-                try {
-                    File storage = new File(location);
-                    if (storage.canWrite() && storage.getUsableSpace() < (getLength() - done)) {
-                        code = ERROR_INSUFFICIENT_STORAGE;
-                        err = null;
-                    }
-                } catch (SecurityException e) {
-                    // is a permission error
-                }
             }
         }
 
@@ -433,11 +403,11 @@ public class DownloadMission extends Mission {
                 action = "Failed";
         }
 
-        Log.d(TAG, action + " postprocessing on " + location + File.separator + name);
+        Log.d(TAG, action + " postprocessing on " + storage.getName());
 
         synchronized (blockState) {
             // don't return without fully write the current state
-            postprocessingState = state;
+            psState = state;
             Utility.writeToFile(metadata, DownloadMission.this);
         }
     }
@@ -456,7 +426,7 @@ public class DownloadMission extends Mission {
         running = true;
         errCode = ERROR_NOTHING;
 
-        if (current >= urls.length && postprocessingName != null) {
+        if (current >= urls.length && psAlgorithm != null) {
             runAsync(1, () -> {
                 if (doPostprocessing()) {
                     running = false;
@@ -593,7 +563,7 @@ public class DownloadMission extends Mission {
      * @return true, otherwise, false
      */
     public boolean isFinished() {
-        return current >= urls.length && (postprocessingName == null || postprocessingState == 2);
+        return current >= urls.length && (psAlgorithm == null || psState == 2);
     }
 
     /**
@@ -602,7 +572,13 @@ public class DownloadMission extends Mission {
      * @return {@code true} if this mission is unrecoverable
      */
     public boolean isPsFailed() {
-        return postprocessingName != null && errCode == DownloadMission.ERROR_POSTPROCESSING && postprocessingThis;
+        switch (errCode) {
+            case ERROR_POSTPROCESSING:
+            case ERROR_POSTPROCESSING_STOPPED:
+                return psAlgorithm.worksOnSameFile;
+        }
+
+        return false;
     }
 
     /**
@@ -611,7 +587,7 @@ public class DownloadMission extends Mission {
      * @return true, otherwise, false
      */
     public boolean isPsRunning() {
-        return postprocessingName != null && (postprocessingState == 1 || postprocessingState == 3);
+        return psAlgorithm != null && (psState == 1 || psState == 3);
     }
 
     /**
@@ -625,7 +601,7 @@ public class DownloadMission extends Mission {
 
     public long getLength() {
         long calculated;
-        if (postprocessingState == 1 || postprocessingState == 3) {
+        if (psState == 1 || psState == 3) {
             calculated = length;
         } else {
             calculated = offsets[current < offsets.length ? current : (offsets.length - 1)] + length;
@@ -652,38 +628,60 @@ public class DownloadMission extends Mission {
      * @param recover {@code true} to retry, otherwise, {@code false} to cancel
      */
     public void psContinue(boolean recover) {
-        postprocessingState = 1;
+        psState = 1;
         errCode = recover ? ERROR_NOTHING : ERROR_POSTPROCESSING;
         threads[0].interrupt();
     }
 
+    /**
+     * changes the StoredFileHelper for another and saves the changes to the metadata file
+     *
+     * @param newStorage the new StoredFileHelper instance to use
+     */
+    public void changeStorage(@NonNull StoredFileHelper newStorage) {
+        storage = newStorage;
+        // commit changes on the metadata file
+        runAsync(-2, this::writeThisToFile);
+    }
+
+    /**
+     * Indicates whatever the backed storage is invalid
+     *
+     * @return {@code true}, if storage is invalid and cannot be used
+     */
+    public boolean hasInvalidStorage() {
+        return errCode == ERROR_PROGRESS_LOST || storage == null || storage.isInvalid();
+    }
+
+    /**
+     * Indicates whatever is possible to start the mission
+     *
+     * @return {@code true} is this mission is "sane", otherwise, {@code false}
+     */
+    public boolean canDownload() {
+        return !(isPsFailed() || errCode == ERROR_POSTPROCESSING_HOLD) && !isFinished() && !hasInvalidStorage();
+    }
+
     private boolean doPostprocessing() {
-        if (postprocessingName == null || postprocessingState == 2) return true;
+        if (psAlgorithm == null || psState == 2) return true;
 
         notifyPostProcessing(1);
         notifyProgress(0);
 
         if (DEBUG)
-            Thread.currentThread().setName("[" + TAG + "]  post-processing = " + postprocessingName + "  filename = " + name);
+            Thread.currentThread().setName("[" + TAG + "]  ps = " +
+                    psAlgorithm.getClass().getSimpleName() +
+                    "  filename = " + storage.getName()
+            );
 
         threads = new Thread[]{Thread.currentThread()};
 
         Exception exception = null;
 
         try {
-            Postprocessing
-                    .getAlgorithm(postprocessingName, this)
-                    .run();
+            psAlgorithm.run(this);
         } catch (Exception err) {
-            StringBuilder args = new StringBuilder("  ");
-            if (postprocessingArgs != null) {
-                for (String arg : postprocessingArgs) {
-                    args.append(", ");
-                    args.append(arg);
-                }
-                args.delete(0, 1);
-            }
-            Log.e(TAG, String.format("Post-processing failed. algorithm = %s  args = [%s]", postprocessingName, args), err);
+            Log.e(TAG, "Post-processing failed. " + psAlgorithm.toString(), err);
 
             if (errCode == ERROR_NOTHING) errCode = ERROR_POSTPROCESSING;
 
@@ -733,7 +731,7 @@ public class DownloadMission extends Mission {
         //  >=1:     any download thread
 
         if (DEBUG) {
-            who.setName(String.format("%s[%s] %s", TAG, id, name));
+            who.setName(String.format("%s[%s] %s", TAG, id, storage.getName()));
         }
 
         who.start();
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index 244fbd47a..ced579b20 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -2,9 +2,10 @@ package us.shandian.giga.get;
 
 import android.util.Log;
 
-import java.io.FileNotFoundException;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.RandomAccessFile;
 import java.net.HttpURLConnection;
 import java.nio.channels.ClosedByInterruptException;
 
@@ -40,12 +41,12 @@ public class DownloadRunnable extends Thread {
             Log.d(TAG, mId + ":recovered: " + mMission.recovered);
         }
 
-        RandomAccessFile f;
+        SharpStream f;
         InputStream is = null;
 
         try {
-            f = new RandomAccessFile(mMission.getDownloadedFile(), "rw");
-        } catch (FileNotFoundException e) {
+            f = mMission.storage.getStream();
+        } catch (IOException e) {
             mMission.notifyError(e);// this never should happen
             return;
         }
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
index 4bcaeaf85..1a4b5d5b6 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
@@ -4,13 +4,13 @@ import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
+import org.schabi.newpipe.streams.io.SharpStream;
+
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.RandomAccessFile;
 import java.net.HttpURLConnection;
 import java.nio.channels.ClosedByInterruptException;
 
-
 import us.shandian.giga.util.Utility;
 
 import static org.schabi.newpipe.BuildConfig.DEBUG;
@@ -22,11 +22,10 @@ public class DownloadRunnableFallback extends Thread {
     private static final String TAG = "DownloadRunnableFallback";
 
     private final DownloadMission mMission;
-    private final int mId = 1;
 
     private int mRetryCount = 0;
     private InputStream mIs;
-    private RandomAccessFile mF;
+    private SharpStream mF;
     private HttpURLConnection mConn;
 
     DownloadRunnableFallback(@NonNull DownloadMission mission) {
@@ -43,11 +42,7 @@ public class DownloadRunnableFallback extends Thread {
             // nothing to do
         }
 
-        try {
-            if (mF != null) mF.close();
-        } catch (IOException e) {
-            // ¿ejected media storage? ¿file deleted? ¿storage ran out of space?
-        }
+        if (mF != null) mF.close();
     }
 
     @Override
@@ -67,6 +62,7 @@ public class DownloadRunnableFallback extends Thread {
         try {
             long rangeStart = (mMission.unknownLength || start < 1) ? -1 : start;
 
+            int mId = 1;
             mConn = mMission.openConnection(mId, rangeStart, -1);
             mMission.establishConnection(mId, mConn);
 
@@ -81,7 +77,7 @@ public class DownloadRunnableFallback extends Thread {
             if (!mMission.unknownLength)
                 mMission.unknownLength = Utility.getContentLength(mConn) == -1;
 
-            mF = new RandomAccessFile(mMission.getDownloadedFile(), "rw");
+            mF = mMission.storage.getStream();
             mF.seek(mMission.offsets[mMission.current] + start);
 
             mIs = mConn.getInputStream();
diff --git a/app/src/main/java/us/shandian/giga/get/FinishedMission.java b/app/src/main/java/us/shandian/giga/get/FinishedMission.java
index b7d6908a5..5540b44a1 100644
--- a/app/src/main/java/us/shandian/giga/get/FinishedMission.java
+++ b/app/src/main/java/us/shandian/giga/get/FinishedMission.java
@@ -1,16 +1,16 @@
 package us.shandian.giga.get;
 
+import android.support.annotation.NonNull;
+
 public class FinishedMission extends  Mission {
 
     public FinishedMission() {
     }
 
-    public FinishedMission(DownloadMission mission) {
+    public FinishedMission(@NonNull DownloadMission mission) {
         source = mission.source;
         length = mission.length;// ¿or mission.done?
         timestamp = mission.timestamp;
-        name = mission.name;
-        location = mission.location;
         kind = mission.kind;
     }
 }
diff --git a/app/src/main/java/us/shandian/giga/get/Mission.java b/app/src/main/java/us/shandian/giga/get/Mission.java
index 53c81b08b..ce201d960 100644
--- a/app/src/main/java/us/shandian/giga/get/Mission.java
+++ b/app/src/main/java/us/shandian/giga/get/Mission.java
@@ -1,12 +1,15 @@
 package us.shandian.giga.get;
 
-import java.io.File;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+
 import java.io.Serializable;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
+import us.shandian.giga.io.StoredFileHelper;
+
 public abstract class Mission implements Serializable {
-    private static final long serialVersionUID = 0L;// last bump: 5 october 2018
+    private static final long serialVersionUID = 1L;// last bump: 27 march 2019
 
     /**
      * Source url of the resource
@@ -23,28 +26,23 @@ public abstract class Mission implements Serializable {
      */
     public long timestamp;
 
-    /**
-     * The filename
-     */
-    public String name;
-
-    /**
-     * The directory to store the download
-     */
-    public String location;
-
     /**
      * pre-defined content type
      */
     public char kind;
 
+    /**
+     * The downloaded file
+     */
+    public StoredFileHelper storage;
+
     /**
      * get the target file on the storage
      *
      * @return File object
      */
-    public File getDownloadedFile() {
-        return new File(location, name);
+    public Uri getDownloadedFileUri() {
+        return storage.getUri();
     }
 
     /**
@@ -53,8 +51,8 @@ public abstract class Mission implements Serializable {
      * @return {@code true] if and only if the file is successfully deleted, otherwise, {@code false}
      */
     public boolean delete() {
-        deleted = true;
-        return getDownloadedFile().delete();
+        if (storage != null) return storage.delete();
+        return  true;
     }
 
     /**
@@ -62,10 +60,11 @@ public abstract class Mission implements Serializable {
      */
     public transient boolean deleted = false;
 
+    @NonNull
     @Override
     public String toString() {
         Calendar calendar = Calendar.getInstance();
         calendar.setTimeInMillis(timestamp);
-        return "[" + calendar.getTime().toString() + "] " + location + File.separator + name;
+        return "[" + calendar.getTime().toString() + "] " + getDownloadedFileUri().getPath();
     }
 }
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadDataSource.java b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadDataSource.java
deleted file mode 100644
index 4b4d5d733..000000000
--- a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadDataSource.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package us.shandian.giga.get.sqlite;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import us.shandian.giga.get.DownloadMission;
-import us.shandian.giga.get.FinishedMission;
-import us.shandian.giga.get.Mission;
-
-import static us.shandian.giga.get.sqlite.DownloadMissionHelper.KEY_LOCATION;
-import static us.shandian.giga.get.sqlite.DownloadMissionHelper.KEY_NAME;
-import static us.shandian.giga.get.sqlite.DownloadMissionHelper.MISSIONS_TABLE_NAME;
-
-public class DownloadDataSource {
-
-    private static final String TAG = "DownloadDataSource";
-    private final DownloadMissionHelper downloadMissionHelper;
-
-    public DownloadDataSource(Context context) {
-        downloadMissionHelper = new DownloadMissionHelper(context);
-    }
-
-    public ArrayList<FinishedMission> loadFinishedMissions() {
-        SQLiteDatabase database = downloadMissionHelper.getReadableDatabase();
-        Cursor cursor = database.query(MISSIONS_TABLE_NAME, null, null,
-                null, null, null, DownloadMissionHelper.KEY_TIMESTAMP);
-
-        int count = cursor.getCount();
-        if (count == 0) return new ArrayList<>(1);
-
-        ArrayList<FinishedMission> result = new ArrayList<>(count);
-        while (cursor.moveToNext()) {
-            result.add(DownloadMissionHelper.getMissionFromCursor(cursor));
-        }
-
-        return result;
-    }
-
-    public void addMission(DownloadMission downloadMission) {
-        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
-        SQLiteDatabase database = downloadMissionHelper.getWritableDatabase();
-        ContentValues values = DownloadMissionHelper.getValuesOfMission(downloadMission);
-        database.insert(MISSIONS_TABLE_NAME, null, values);
-    }
-
-    public void deleteMission(Mission downloadMission) {
-        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
-        SQLiteDatabase database = downloadMissionHelper.getWritableDatabase();
-        database.delete(MISSIONS_TABLE_NAME,
-                KEY_LOCATION + " = ? AND " +
-                        KEY_NAME + " = ?",
-                new String[]{downloadMission.location, downloadMission.name});
-    }
-
-    public void updateMission(DownloadMission downloadMission) {
-        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
-        SQLiteDatabase database = downloadMissionHelper.getWritableDatabase();
-        ContentValues values = DownloadMissionHelper.getValuesOfMission(downloadMission);
-        String whereClause = KEY_LOCATION + " = ? AND " +
-                KEY_NAME + " = ?";
-        int rowsAffected = database.update(MISSIONS_TABLE_NAME, values,
-                whereClause, new String[]{downloadMission.location, downloadMission.name});
-        if (rowsAffected != 1) {
-            Log.e(TAG, "Expected 1 row to be affected by update but got " + rowsAffected);
-        }
-    }
-}
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionHelper.java b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionHelper.java
deleted file mode 100644
index 6dadc98c8..000000000
--- a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionHelper.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package us.shandian.giga.get.sqlite;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-import us.shandian.giga.get.DownloadMission;
-import us.shandian.giga.get.FinishedMission;
-
-/**
- * SQLiteHelper to store finished {@link us.shandian.giga.get.DownloadMission}'s
- */
-public class DownloadMissionHelper extends SQLiteOpenHelper {
-    private final String TAG = "DownloadMissionHelper";
-
-    // TODO: use NewPipeSQLiteHelper ('s constants) when playlist branch is merged (?)
-    private static final String DATABASE_NAME = "downloads.db";
-
-    private static final int DATABASE_VERSION = 3;
-
-    /**
-     * The table name of download missions
-     */
-    static final String MISSIONS_TABLE_NAME = "download_missions";
-
-    /**
-     * The key to the directory location of the mission
-     */
-    static final String KEY_LOCATION = "location";
-    /**
-     * The key to the urls of a mission
-     */
-    static final String KEY_SOURCE_URL = "url";
-    /**
-     * The key to the name of a mission
-     */
-    static final String KEY_NAME = "name";
-
-    /**
-     * The key to the done.
-     */
-    static final String KEY_DONE = "bytes_downloaded";
-
-    static final String KEY_TIMESTAMP = "timestamp";
-
-    static  final String KEY_KIND = "kind";
-
-    /**
-     * The statement to create the table
-     */
-    private static final String MISSIONS_CREATE_TABLE =
-            "CREATE TABLE " + MISSIONS_TABLE_NAME + " (" +
-                    KEY_LOCATION + " TEXT NOT NULL, " +
-                    KEY_NAME + " TEXT NOT NULL, " +
-                    KEY_SOURCE_URL + " TEXT NOT NULL, " +
-                    KEY_DONE + " INTEGER NOT NULL, " +
-                    KEY_TIMESTAMP + " INTEGER NOT NULL, " +
-                    KEY_KIND + " TEXT NOT NULL, " +
-                    " UNIQUE(" + KEY_LOCATION + ", " + KEY_NAME + "));";
-
-    public DownloadMissionHelper(Context context) {
-        super(context, DATABASE_NAME, null, DATABASE_VERSION);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(MISSIONS_CREATE_TABLE);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        if (oldVersion == 2) {
-            db.execSQL("ALTER TABLE " + MISSIONS_TABLE_NAME + " ADD COLUMN " + KEY_KIND + " TEXT;");
-        }
-    }
-
-    /**
-     * Returns all values of the download mission as ContentValues.
-     *
-     * @param downloadMission the download mission
-     * @return the content values
-     */
-    public static ContentValues getValuesOfMission(DownloadMission downloadMission) {
-        ContentValues values = new ContentValues();
-        values.put(KEY_SOURCE_URL, downloadMission.source);
-        values.put(KEY_LOCATION, downloadMission.location);
-        values.put(KEY_NAME, downloadMission.name);
-        values.put(KEY_DONE, downloadMission.done);
-        values.put(KEY_TIMESTAMP, downloadMission.timestamp);
-        values.put(KEY_KIND, String.valueOf(downloadMission.kind));
-        return values;
-    }
-
-    public static FinishedMission getMissionFromCursor(Cursor cursor) {
-        if (cursor == null) throw new NullPointerException("cursor is null");
-
-        String kind = cursor.getString(cursor.getColumnIndex(KEY_KIND));
-        if (kind == null || kind.isEmpty()) kind = "?";
-
-        FinishedMission mission = new FinishedMission();
-        mission.name = cursor.getString(cursor.getColumnIndexOrThrow(KEY_NAME));
-        mission.location = cursor.getString(cursor.getColumnIndexOrThrow(KEY_LOCATION));
-        mission.source = cursor.getString(cursor.getColumnIndexOrThrow(KEY_SOURCE_URL));;
-        mission.length = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_DONE));
-        mission.timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_TIMESTAMP));
-        mission.kind = kind.charAt(0);
-
-        return mission;
-    }
-}
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
new file mode 100644
index 000000000..6d63b9ff7
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
@@ -0,0 +1,223 @@
+package us.shandian.giga.get.sqlite;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.FinishedMission;
+import us.shandian.giga.get.Mission;
+import us.shandian.giga.io.StoredFileHelper;
+
+/**
+ * SQLite helper to store finished {@link us.shandian.giga.get.FinishedMission}'s
+ */
+public class FinishedMissionStore extends SQLiteOpenHelper {
+
+    // TODO: use NewPipeSQLiteHelper ('s constants) when playlist branch is merged (?)
+    private static final String DATABASE_NAME = "downloads.db";
+
+    private static final int DATABASE_VERSION = 4;
+
+    /**
+     * The table name of download missions (old)
+     */
+    private static final String MISSIONS_TABLE_NAME_v2 = "download_missions";
+
+    /**
+     * The table name of download missions
+     */
+    private static final String FINISHED_MISSIONS_TABLE_NAME = "finished_missions";
+
+    /**
+     * The key to the urls of a mission
+     */
+    private static final String KEY_SOURCE = "url";
+
+
+    /**
+     * The key to the done.
+     */
+    private static final String KEY_DONE = "bytes_downloaded";
+
+    private static final String KEY_TIMESTAMP = "timestamp";
+
+    private static final String KEY_KIND = "kind";
+
+    private static final String KEY_PATH = "path";
+
+    /**
+     * The statement to create the table
+     */
+    private static final String MISSIONS_CREATE_TABLE =
+            "CREATE TABLE " + FINISHED_MISSIONS_TABLE_NAME + " (" +
+                    KEY_PATH + " TEXT NOT NULL, " +
+                    KEY_SOURCE + " TEXT NOT NULL, " +
+                    KEY_DONE + " INTEGER NOT NULL, " +
+                    KEY_TIMESTAMP + " INTEGER NOT NULL, " +
+                    KEY_KIND + " TEXT NOT NULL, " +
+                    " UNIQUE(" + KEY_TIMESTAMP + ", " + KEY_PATH + "));";
+
+
+    private Context context;
+
+    public FinishedMissionStore(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        this.context = context;
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(MISSIONS_CREATE_TABLE);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (oldVersion == 2) {
+            db.execSQL("ALTER TABLE " + MISSIONS_TABLE_NAME_v2 + " ADD COLUMN " + KEY_KIND + " TEXT;");
+            oldVersion++;
+        }
+
+        if (oldVersion == 3) {
+            final String KEY_LOCATION = "location";
+            final String KEY_NAME = "name";
+
+            db.execSQL(MISSIONS_CREATE_TABLE);
+
+            Cursor cursor = db.query(MISSIONS_TABLE_NAME_v2, null, null,
+                    null, null, null, KEY_TIMESTAMP);
+
+            int count = cursor.getCount();
+            if (count > 0) {
+                db.beginTransaction();
+                while (cursor.moveToNext()) {
+                    ContentValues values = new ContentValues();
+                    values.put(KEY_SOURCE, cursor.getString(cursor.getColumnIndex(KEY_SOURCE)));
+                    values.put(KEY_DONE, cursor.getString(cursor.getColumnIndex(KEY_DONE)));
+                    values.put(KEY_TIMESTAMP, cursor.getLong(cursor.getColumnIndex(KEY_TIMESTAMP)));
+                    values.put(KEY_KIND, cursor.getString(cursor.getColumnIndex(KEY_KIND)));
+                    values.put(KEY_PATH, Uri.fromFile(
+                            new File(
+                                    cursor.getString(cursor.getColumnIndex(KEY_LOCATION)),
+                                    cursor.getString(cursor.getColumnIndex(KEY_NAME))
+                            )
+                    ).toString());
+
+                    db.insert(FINISHED_MISSIONS_TABLE_NAME, null, values);
+                }
+                db.setTransactionSuccessful();
+                db.endTransaction();
+            }
+
+            cursor.close();
+            db.execSQL("DROP TABLE " + MISSIONS_TABLE_NAME_v2);
+        }
+    }
+
+    /**
+     * Returns all values of the download mission as ContentValues.
+     *
+     * @param downloadMission the download mission
+     * @return the content values
+     */
+    private ContentValues getValuesOfMission(@NonNull Mission downloadMission) {
+        ContentValues values = new ContentValues();
+        values.put(KEY_SOURCE, downloadMission.source);
+        values.put(KEY_PATH, downloadMission.storage.getUri().toString());
+        values.put(KEY_DONE, downloadMission.length);
+        values.put(KEY_TIMESTAMP, downloadMission.timestamp);
+        values.put(KEY_KIND, String.valueOf(downloadMission.kind));
+        return values;
+    }
+
+    private FinishedMission getMissionFromCursor(Cursor cursor) {
+        if (cursor == null) throw new NullPointerException("cursor is null");
+
+        String kind = cursor.getString(cursor.getColumnIndex(KEY_KIND));
+        if (kind == null || kind.isEmpty()) kind = "?";
+
+        String path = cursor.getString(cursor.getColumnIndexOrThrow(KEY_PATH));
+
+        FinishedMission mission = new FinishedMission();
+
+        mission.source = cursor.getString(cursor.getColumnIndexOrThrow(KEY_SOURCE));
+        mission.length = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_DONE));
+        mission.timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_TIMESTAMP));
+        mission.kind = kind.charAt(0);
+
+        try {
+            mission.storage = new StoredFileHelper(context, Uri.parse(path), "");
+        } catch (Exception e) {
+            Log.e("FinishedMissionStore", "failed to load the storage path of: " + path, e);
+            mission.storage = new StoredFileHelper(path, "", "");
+        }
+
+        return mission;
+    }
+
+
+    //////////////////////////////////
+    // Data source methods
+    ///////////////////////////////////
+
+    public ArrayList<FinishedMission> loadFinishedMissions() {
+        SQLiteDatabase database = getReadableDatabase();
+        Cursor cursor = database.query(FINISHED_MISSIONS_TABLE_NAME, null, null,
+                null, null, null, KEY_TIMESTAMP + " DESC");
+
+        int count = cursor.getCount();
+        if (count == 0) return new ArrayList<>(1);
+
+        ArrayList<FinishedMission> result = new ArrayList<>(count);
+        while (cursor.moveToNext()) {
+            result.add(getMissionFromCursor(cursor));
+        }
+
+        return result;
+    }
+
+    public void addFinishedMission(DownloadMission downloadMission) {
+        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = getWritableDatabase();
+        ContentValues values = getValuesOfMission(downloadMission);
+        database.insert(FINISHED_MISSIONS_TABLE_NAME, null, values);
+    }
+
+    public void deleteMission(Mission mission) {
+        if (mission == null) throw new NullPointerException("mission is null");
+        String path = mission.getDownloadedFileUri().toString();
+
+        SQLiteDatabase database = getWritableDatabase();
+
+        if (mission instanceof FinishedMission)
+            database.delete(FINISHED_MISSIONS_TABLE_NAME, KEY_TIMESTAMP + " = ?, " + KEY_PATH + " = ?", new String[]{path});
+        else
+            throw new UnsupportedOperationException("DownloadMission");
+    }
+
+    public void updateMission(Mission mission) {
+        if (mission == null) throw new NullPointerException("mission is null");
+        SQLiteDatabase database = getWritableDatabase();
+        ContentValues values = getValuesOfMission(mission);
+        String path = mission.getDownloadedFileUri().toString();
+
+        int rowsAffected;
+
+        if (mission instanceof FinishedMission)
+            rowsAffected = database.update(FINISHED_MISSIONS_TABLE_NAME, values, KEY_PATH + " = ?", new String[]{path});
+        else
+            throw new UnsupportedOperationException("DownloadMission");
+
+        if (rowsAffected != 1) {
+            Log.e("FinishedMissionStore", "Expected 1 row to be affected by update but got " + rowsAffected);
+        }
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java b/app/src/main/java/us/shandian/giga/io/ChunkFileInputStream.java
similarity index 80%
rename from app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java
rename to app/src/main/java/us/shandian/giga/io/ChunkFileInputStream.java
index ee2fcddd5..16a90fcee 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java
+++ b/app/src/main/java/us/shandian/giga/io/ChunkFileInputStream.java
@@ -1,150 +1,148 @@
-package us.shandian.giga.postprocessing.io;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-public class ChunkFileInputStream extends SharpStream {
-
-    private RandomAccessFile source;
-    private final long offset;
-    private final long length;
-    private long position;
-
-    public ChunkFileInputStream(File file, long start, long end, String mode) throws IOException {
-        source = new RandomAccessFile(file, mode);
-        offset = start;
-        length = end - start;
-        position = 0;
-
-        if (length < 1) {
-            source.close();
-            throw new IOException("The chunk is empty or invalid");
-        }
-        if (source.length() < end) {
-            try {
-                throw new IOException(String.format("invalid file length. expected = %s  found = %s", end, source.length()));
-            } finally {
-                source.close();
-            }
-        }
-
-        source.seek(offset);
-    }
-
-    /**
-     * Get absolute position on file
-     *
-     * @return the position
-     */
-    public long getFilePointer() {
-        return offset + position;
-    }
-
-    @Override
-    public int read() throws IOException {
-        if ((position + 1) > length) {
-            return 0;
-        }
-
-        int res = source.read();
-        if (res >= 0) {
-            position++;
-        }
-
-        return res;
-    }
-
-    @Override
-    public int read(byte b[]) throws IOException {
-        return read(b, 0, b.length);
-    }
-
-    @Override
-    public int read(byte b[], int off, int len) throws IOException {
-        if ((position + len) > length) {
-            len = (int) (length - position);
-        }
-        if (len == 0) {
-            return 0;
-        }
-
-        int res = source.read(b, off, len);
-        position += res;
-
-        return res;
-    }
-
-    @Override
-    public long skip(long pos) throws IOException {
-        pos = Math.min(pos + position, length);
-
-        if (pos == 0) {
-            return 0;
-        }
-
-        source.seek(offset + pos);
-
-        long oldPos = position;
-        position = pos;
-
-        return pos - oldPos;
-    }
-
-    @Override
-    public long available() {
-        return (int) (length - position);
-    }
-
-    @SuppressWarnings("EmptyCatchBlock")
-    @Override
-    public void dispose() {
-        try {
-            source.close();
-        } catch (IOException err) {
-        } finally {
-            source = null;
-        }
-    }
-
-    @Override
-    public boolean isDisposed() {
-        return source == null;
-    }
-
-    @Override
-    public void rewind() throws IOException {
-        position = 0;
-        source.seek(offset);
-    }
-
-    @Override
-    public boolean canRewind() {
-        return true;
-    }
-
-    @Override
-    public boolean canRead() {
-        return true;
-    }
-
-    @Override
-    public boolean canWrite() {
-        return false;
-    }
-
-    @Override
-    public void write(byte value) {
-    }
-
-    @Override
-    public void write(byte[] buffer) {
-    }
-
-    @Override
-    public void write(byte[] buffer, int offset, int count) {
-    }
-
-}
+package us.shandian.giga.io;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+
+public class ChunkFileInputStream extends SharpStream {
+
+    private SharpStream source;
+    private final long offset;
+    private final long length;
+    private long position;
+
+    public ChunkFileInputStream(SharpStream target, long start) throws IOException {
+        this(target, start, target.length());
+    }
+
+    public ChunkFileInputStream(SharpStream target, long start, long end) throws IOException {
+        source = target;
+        offset = start;
+        length = end - start;
+        position = 0;
+
+        if (length < 1) {
+            source.close();
+            throw new IOException("The chunk is empty or invalid");
+        }
+        if (source.length() < end) {
+            try {
+                throw new IOException(String.format("invalid file length. expected = %s  found = %s", end, source.length()));
+            } finally {
+                source.close();
+            }
+        }
+
+        source.seek(offset);
+    }
+
+    /**
+     * Get absolute position on file
+     *
+     * @return the position
+     */
+    public long getFilePointer() {
+        return offset + position;
+    }
+
+    @Override
+    public int read() throws IOException {
+        if ((position + 1) > length) {
+            return 0;
+        }
+
+        int res = source.read();
+        if (res >= 0) {
+            position++;
+        }
+
+        return res;
+    }
+
+    @Override
+    public int read(byte b[]) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    @Override
+    public int read(byte b[], int off, int len) throws IOException {
+        if ((position + len) > length) {
+            len = (int) (length - position);
+        }
+        if (len == 0) {
+            return 0;
+        }
+
+        int res = source.read(b, off, len);
+        position += res;
+
+        return res;
+    }
+
+    @Override
+    public long skip(long pos) throws IOException {
+        pos = Math.min(pos + position, length);
+
+        if (pos == 0) {
+            return 0;
+        }
+
+        source.seek(offset + pos);
+
+        long oldPos = position;
+        position = pos;
+
+        return pos - oldPos;
+    }
+
+    @Override
+    public long available() {
+        return (int) (length - position);
+    }
+
+    @SuppressWarnings("EmptyCatchBlock")
+    @Override
+    public void close() {
+        source.close();
+        source = null;
+    }
+
+    @Override
+    public boolean isClosed() {
+        return source == null;
+    }
+
+    @Override
+    public void rewind() throws IOException {
+        position = 0;
+        source.seek(offset);
+    }
+
+    @Override
+    public boolean canRewind() {
+        return true;
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return false;
+    }
+
+    @Override
+    public void write(byte value) {
+    }
+
+    @Override
+    public void write(byte[] buffer) {
+    }
+
+    @Override
+    public void write(byte[] buffer, int offset, int count) {
+    }
+
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFileWriter.java b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
similarity index 89%
rename from app/src/main/java/us/shandian/giga/postprocessing/io/CircularFileWriter.java
rename to app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
index 4c4160fa3..650725a76 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFileWriter.java
+++ b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
@@ -1,4 +1,4 @@
-package us.shandian.giga.postprocessing.io;
+package us.shandian.giga.io;
 
 import android.support.annotation.NonNull;
 
@@ -7,7 +7,6 @@ import org.schabi.newpipe.streams.io.SharpStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.RandomAccessFile;
 
 public class CircularFileWriter extends SharpStream {
 
@@ -26,7 +25,7 @@ public class CircularFileWriter extends SharpStream {
     private BufferedFile out;
     private BufferedFile aux;
 
-    public CircularFileWriter(File source, File temp, OffsetChecker checker) throws IOException {
+    public CircularFileWriter(SharpStream target, File temp, OffsetChecker checker) throws IOException {
         if (checker == null) {
             throw new NullPointerException("checker is null");
         }
@@ -38,7 +37,7 @@ public class CircularFileWriter extends SharpStream {
         }
 
         aux = new BufferedFile(temp);
-        out = new BufferedFile(source);
+        out = new BufferedFile(target);
 
         callback = checker;
 
@@ -105,7 +104,7 @@ public class CircularFileWriter extends SharpStream {
             out.target.setLength(length);
         }
 
-        dispose();
+        close();
 
         return length;
     }
@@ -114,13 +113,13 @@ public class CircularFileWriter extends SharpStream {
      * Close the file without flushing any buffer
      */
     @Override
-    public void dispose() {
+    public void close() {
         if (out != null) {
-            out.dispose();
+            out.close();
             out = null;
         }
         if (aux != null) {
-            aux.dispose();
+            aux.close();
             aux = null;
         }
     }
@@ -256,7 +255,7 @@ public class CircularFileWriter extends SharpStream {
     }
 
     @Override
-    public boolean isDisposed() {
+    public boolean isClosed() {
         return out == null;
     }
 
@@ -339,30 +338,29 @@ public class CircularFileWriter extends SharpStream {
 
     class BufferedFile {
 
-        protected final RandomAccessFile target;
+        protected final SharpStream target;
 
         private long offset;
         protected long length;
 
-        private byte[] queue;
+        private byte[] queue = new byte[QUEUE_BUFFER_SIZE];
         private int queueSize;
 
         BufferedFile(File file) throws FileNotFoundException {
-            queue = new byte[QUEUE_BUFFER_SIZE];
-            target = new RandomAccessFile(file, "rw");
+            this.target = new FileStream(file);
+        }
+
+        BufferedFile(SharpStream target) {
+            this.target = target;
         }
 
         protected long getOffset() {
             return offset + queueSize;// absolute offset in the file
         }
 
-        protected void dispose() {
-            try {
-                queue = null;
-                target.close();
-            } catch (IOException e) {
-                // nothing to do
-            }
+        protected void close() {
+            queue = null;
+            target.close();
         }
 
         protected void write(byte b[], int off, int len) throws IOException {
@@ -384,7 +382,7 @@ public class CircularFileWriter extends SharpStream {
             }
         }
 
-        protected void flush() throws IOException {
+        void flush() throws IOException {
             writeProof(queue, queueSize);
             offset += queueSize;
             queueSize = 0;
@@ -404,7 +402,7 @@ public class CircularFileWriter extends SharpStream {
             return queue.length - queueSize;
         }
 
-        protected void reset() throws IOException {
+        void reset() throws IOException {
             offset = 0;
             length = 0;
             target.seek(0);
@@ -415,7 +413,7 @@ public class CircularFileWriter extends SharpStream {
             target.seek(absoluteOffset);
         }
 
-        protected void writeProof(byte[] buffer, int length) throws IOException {
+        void writeProof(byte[] buffer, int length) throws IOException {
             if (onWriteError == null) {
                 target.write(buffer, 0, length);
                 return;
@@ -436,14 +434,8 @@ public class CircularFileWriter extends SharpStream {
         @NonNull
         @Override
         public String toString() {
-            String absOffset;
             String absLength;
 
-            try {
-                absOffset = Long.toString(target.getFilePointer());
-            } catch (IOException e) {
-                absOffset = "[" + e.getLocalizedMessage() + "]";
-            }
             try {
                 absLength = Long.toString(target.length());
             } catch (IOException e) {
@@ -451,8 +443,8 @@ public class CircularFileWriter extends SharpStream {
             }
 
             return String.format(
-                    "offset=%s  length=%s queue=%s  absOffset=%s  absLength=%s",
-                    offset, length, queueSize, absOffset, absLength
+                    "offset=%s  length=%s  queue=%s  absLength=%s",
+                    offset, length, queueSize, absLength
             );
         }
     }
diff --git a/app/src/main/java/us/shandian/giga/io/FileStream.java b/app/src/main/java/us/shandian/giga/io/FileStream.java
new file mode 100644
index 000000000..5b2033324
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/io/FileStream.java
@@ -0,0 +1,131 @@
+package us.shandian.giga.io;
+
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+/**
+ * @author kapodamy
+ */
+public class FileStream extends SharpStream {
+
+    public RandomAccessFile source;
+
+    public FileStream(@NonNull File target) throws FileNotFoundException {
+        this.source = new RandomAccessFile(target, "rw");
+    }
+
+    public FileStream(@NonNull String path) throws FileNotFoundException {
+        this.source = new RandomAccessFile(path, "rw");
+    }
+
+    @Override
+    public int read() throws IOException {
+        return source.read();
+    }
+
+    @Override
+    public int read(byte b[]) throws IOException {
+        return source.read(b);
+    }
+
+    @Override
+    public int read(byte b[], int off, int len) throws IOException {
+        return source.read(b, off, len);
+    }
+
+    @Override
+    public long skip(long pos) throws IOException {
+        return source.skipBytes((int) pos);
+    }
+
+    @Override
+    public long available() {
+        try {
+            return source.length() - source.getFilePointer();
+        } catch (IOException e) {
+            return 0;
+        }
+    }
+
+    @Override
+    public void close() {
+        if (source == null) return;
+        try {
+            source.close();
+        } catch (IOException err) {
+            // nothing to do
+        }
+        source = null;
+    }
+
+    @Override
+    public boolean isClosed() {
+        return source == null;
+    }
+
+    @Override
+    public void rewind() throws IOException {
+        source.seek(0);
+    }
+
+    @Override
+    public boolean canRewind() {
+        return true;
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    @Override
+    public boolean canSeek() {
+        return true;
+    }
+
+    @Override
+    public boolean canSetLength() {
+        return true;
+    }
+
+    @Override
+    public void write(byte value) throws IOException {
+        source.write(value);
+    }
+
+    @Override
+    public void write(byte[] buffer) throws IOException {
+        source.write(buffer);
+    }
+
+    @Override
+    public void write(byte[] buffer, int offset, int count) throws IOException {
+        source.write(buffer, offset, count);
+    }
+
+    @Override
+    public void setLength(long length) throws IOException {
+        source.setLength(length);
+    }
+
+    @Override
+    public void seek(long offset) throws IOException {
+        source.seek(offset);
+    }
+
+    @Override
+    public long length() throws IOException {
+        return source.length();
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java b/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java
new file mode 100644
index 000000000..cb4786280
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java
@@ -0,0 +1,140 @@
+package us.shandian.giga.io;
+
+import android.content.ContentResolver;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+
+public class FileStreamSAF extends SharpStream {
+
+    private final FileInputStream in;
+    private final FileOutputStream out;
+    private final FileChannel channel;
+    private final ParcelFileDescriptor file;
+
+    private boolean disposed;
+
+    public FileStreamSAF(@NonNull ContentResolver contentResolver, Uri fileUri) throws IOException {
+        // Notes:
+        // the file must exists first
+        // ¡read-write mode must allow seek!
+        // It is not guaranteed to work with files in the cloud (virtual files), tested in local storage devices
+
+        file = contentResolver.openFileDescriptor(fileUri, "rw");
+
+        if (file == null) {
+            throw new IOException("Cannot get the ParcelFileDescriptor for " + fileUri.toString());
+        }
+
+        in = new FileInputStream(file.getFileDescriptor());
+        out = new FileOutputStream(file.getFileDescriptor());
+        channel = out.getChannel();// or use in.getChannel()
+    }
+
+    @Override
+    public int read() throws IOException {
+        return in.read();
+    }
+
+    @Override
+    public int read(byte[] buffer) throws IOException {
+        return in.read(buffer);
+    }
+
+    @Override
+    public int read(byte[] buffer, int offset, int count) throws IOException {
+        return in.read(buffer, offset, count);
+    }
+
+    @Override
+    public long skip(long amount) throws IOException {
+        return in.skip(amount);// ¿or use channel.position(channel.position() + amount)?
+    }
+
+    @Override
+    public long available() {
+        try {
+            return in.available();
+        } catch (IOException e) {
+            return 0;// ¡but not -1!
+        }
+    }
+
+    @Override
+    public void rewind() throws IOException {
+        seek(0);
+    }
+
+    @Override
+    public void close() {
+        try {
+            disposed = true;
+
+            file.close();
+            in.close();
+            out.close();
+            channel.close();
+        } catch (IOException e) {
+            Log.e("FileStreamSAF", "close() error", e);
+        }
+    }
+
+    @Override
+    public boolean isClosed() {
+        return disposed;
+    }
+
+    @Override
+    public boolean canRewind() {
+        return true;
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    public boolean canSetLength() {
+        return true;
+    }
+
+    public boolean canSeek() {
+        return true;
+    }
+
+    @Override
+    public void write(byte value) throws IOException {
+        out.write(value);
+    }
+
+    @Override
+    public void write(byte[] buffer) throws IOException {
+        out.write(buffer);
+    }
+
+    @Override
+    public void write(byte[] buffer, int offset, int count) throws IOException {
+        out.write(buffer, offset, count);
+    }
+
+    public void setLength(long length) throws IOException {
+        channel.truncate(length);
+    }
+
+    public void seek(long offset) throws IOException {
+        channel.position(offset);
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java b/app/src/main/java/us/shandian/giga/io/SharpInputStream.java
similarity index 91%
rename from app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java
rename to app/src/main/java/us/shandian/giga/io/SharpInputStream.java
index 586456d98..089101dfe 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java
+++ b/app/src/main/java/us/shandian/giga/io/SharpInputStream.java
@@ -1,61 +1,61 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package us.shandian.giga.postprocessing.io;
-
-import android.support.annotation.NonNull;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Wrapper for the classic {@link java.io.InputStream}
- *
- * @author kapodamy
- */
-public class SharpInputStream extends InputStream {
-
-    private final SharpStream base;
-
-    public SharpInputStream(SharpStream base) throws IOException {
-        if (!base.canRead()) {
-            throw new IOException("The provided stream is not readable");
-        }
-        this.base = base;
-    }
-
-    @Override
-    public int read() throws IOException {
-        return base.read();
-    }
-
-    @Override
-    public int read(@NonNull byte[] bytes) throws IOException {
-        return base.read(bytes);
-    }
-
-    @Override
-    public int read(@NonNull byte[] bytes, int i, int i1) throws IOException {
-        return base.read(bytes, i, i1);
-    }
-
-    @Override
-    public long skip(long l) throws IOException {
-        return base.skip(l);
-    }
-
-    @Override
-    public int available() {
-        long res = base.available();
-        return res > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) res;
-    }
-
-    @Override
-    public void close() {
-        base.dispose();
-    }
-}
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package us.shandian.giga.io;
+
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Wrapper for the classic {@link java.io.InputStream}
+ *
+ * @author kapodamy
+ */
+public class SharpInputStream extends InputStream {
+
+    private final SharpStream base;
+
+    public SharpInputStream(SharpStream base) throws IOException {
+        if (!base.canRead()) {
+            throw new IOException("The provided stream is not readable");
+        }
+        this.base = base;
+    }
+
+    @Override
+    public int read() throws IOException {
+        return base.read();
+    }
+
+    @Override
+    public int read(@NonNull byte[] bytes) throws IOException {
+        return base.read(bytes);
+    }
+
+    @Override
+    public int read(@NonNull byte[] bytes, int i, int i1) throws IOException {
+        return base.read(bytes, i, i1);
+    }
+
+    @Override
+    public long skip(long l) throws IOException {
+        return base.skip(l);
+    }
+
+    @Override
+    public int available() {
+        long res = base.available();
+        return res > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) res;
+    }
+
+    @Override
+    public void close() {
+        base.close();
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
new file mode 100644
index 000000000..f5c2fd3f5
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
@@ -0,0 +1,175 @@
+package us.shandian.giga.io;
+
+import android.annotation.TargetApi;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v4.provider.DocumentFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class StoredDirectoryHelper {
+    public final static int PERMISSION_FLAGS = Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
+
+    private File ioTree;
+    private DocumentFile docTree;
+
+    private ContentResolver contentResolver;
+
+    private String tag;
+
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    public StoredDirectoryHelper(@NonNull Context context, @NonNull Uri path, String tag) throws IOException {
+        this.contentResolver = context.getContentResolver();
+        this.tag = tag;
+        this.docTree = DocumentFile.fromTreeUri(context, path);
+
+        if (this.docTree == null)
+            throw new IOException("Failed to create the tree from Uri");
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    public StoredDirectoryHelper(@NonNull String location, String tag) {
+        ioTree = new File(location);
+        this.tag = tag;
+    }
+
+    @Nullable
+    public StoredFileHelper createFile(String filename, String mime) {
+        StoredFileHelper storage;
+
+        try {
+            if (docTree == null) {
+                storage = new StoredFileHelper(ioTree, filename, tag);
+                storage.sourceTree = Uri.fromFile(ioTree).toString();
+            } else {
+                storage = new StoredFileHelper(docTree, contentResolver, filename, mime, tag);
+                storage.sourceTree = docTree.getUri().toString();
+            }
+        } catch (IOException e) {
+            return null;
+        }
+
+        storage.tag = tag;
+
+        return storage;
+    }
+
+    public StoredFileHelper createUniqueFile(String filename, String mime) {
+        ArrayList<String> existingNames = new ArrayList<>(50);
+
+        String ext;
+
+        int dotIndex = filename.lastIndexOf('.');
+        if (dotIndex < 0 || (dotIndex == filename.length() - 1)) {
+            ext = "";
+        } else {
+            ext = filename.substring(dotIndex);
+            filename = filename.substring(0, dotIndex - 1);
+        }
+
+        String name;
+        if (docTree == null) {
+            for (File file : ioTree.listFiles()) {
+                name = file.getName().toLowerCase();
+                if (name.startsWith(filename)) existingNames.add(name);
+            }
+        } else {
+            for (DocumentFile file : docTree.listFiles()) {
+                name = file.getName();
+                if (name == null) continue;
+                name = name.toLowerCase();
+                if (name.startsWith(filename)) existingNames.add(name);
+            }
+        }
+
+        boolean free = true;
+        String lwFilename = filename.toLowerCase();
+        for (String testName : existingNames) {
+            if (testName.equals(lwFilename)) {
+                free = false;
+                break;
+            }
+        }
+
+        if (free) return createFile(filename, mime);
+
+        String[] sortedNames = existingNames.toArray(new String[0]);
+        Arrays.sort(sortedNames);
+
+        String newName;
+        int downloadIndex = 0;
+        do {
+            newName = filename + " (" + downloadIndex + ")" + ext;
+            ++downloadIndex;
+            if (downloadIndex == 1000) {  // Probably an error on our side
+                newName = System.currentTimeMillis() + ext;
+                break;
+            }
+        } while (Arrays.binarySearch(sortedNames, newName) >= 0);
+
+
+        return createFile(newName, mime);
+    }
+
+    public boolean isDirect() {
+        return docTree == null;
+    }
+
+    public Uri getUri() {
+        return docTree == null ? Uri.fromFile(ioTree) : docTree.getUri();
+    }
+
+    public boolean exists() {
+        return docTree == null ? ioTree.exists() : docTree.exists();
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void acquirePermissions() throws IOException {
+        if (docTree == null) return;
+
+        try {
+            contentResolver.takePersistableUriPermission(docTree.getUri(), PERMISSION_FLAGS);
+        } catch (Throwable e) {
+            throw new IOException(e);
+        }
+    }
+
+    public void revokePermissions() throws IOException {
+        if (docTree == null) return;
+
+        try {
+            contentResolver.releasePersistableUriPermission(docTree.getUri(), PERMISSION_FLAGS);
+        } catch (Throwable e) {
+            throw new IOException(e);
+        }
+    }
+
+    public Uri findFile(String filename) {
+        if (docTree == null)
+            return Uri.fromFile(new File(ioTree, filename));
+
+        // findFile() method is very slow
+        DocumentFile file = docTree.findFile(filename);
+
+        return file == null ? null : file.getUri();
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return docTree == null ? Uri.fromFile(ioTree).toString() : docTree.getUri().toString();
+    }
+
+}
diff --git a/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java b/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java
new file mode 100644
index 000000000..0db442f1c
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java
@@ -0,0 +1,301 @@
+package us.shandian.giga.io;
+
+import android.annotation.TargetApi;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.DocumentsContract;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.support.v4.provider.DocumentFile;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URI;
+
+public class StoredFileHelper implements Serializable {
+    private static final long serialVersionUID = 0L;
+    public static final String DEFAULT_MIME = "application/octet-stream";
+
+    private transient DocumentFile docFile;
+    private transient DocumentFile docTree;
+    private transient File ioFile;
+    private transient ContentResolver contentResolver;
+
+    protected String source;
+    String sourceTree;
+
+    protected String tag;
+
+    private String srcName;
+    private String srcType;
+
+    public StoredFileHelper(String filename, String mime, String tag) {
+        this.source = null;// this instance will be "invalid" see invalidate()/isInvalid() methods
+
+        this.srcName = filename;
+        this.srcType = mime == null ? DEFAULT_MIME : mime;
+
+        this.tag = tag;
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    StoredFileHelper(DocumentFile tree, ContentResolver contentResolver, String filename, String mime, String tag) throws IOException {
+        this.docTree = tree;
+        this.contentResolver = contentResolver;
+
+        // this is very slow, because SAF does not allow overwrite
+        DocumentFile res = this.docTree.findFile(filename);
+
+        if (res != null && res.exists() && res.isDirectory()) {
+            if (!res.delete())
+                throw new IOException("Directory with the same name found but cannot delete");
+            res = null;
+        }
+
+        if (res == null) {
+            res = this.docTree.createFile(mime == null ? DEFAULT_MIME : mime, filename);
+            if (res == null) throw new IOException("Cannot create the file");
+        }
+
+        this.docFile = res;
+        this.source = res.getUri().toString();
+        this.srcName = getName();
+        this.srcType = getType();
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    public StoredFileHelper(Context context, @NonNull Uri path, String tag) throws IOException {
+        this.source = path.toString();
+        this.tag = tag;
+
+        if (path.getScheme() == null || path.getScheme().equalsIgnoreCase("file")) {
+            this.ioFile = new File(URI.create(this.source));
+        } else {
+            DocumentFile file = DocumentFile.fromSingleUri(context, path);
+            if (file == null)
+                throw new UnsupportedOperationException("Cannot get the file via SAF");
+
+            this.contentResolver = context.getContentResolver();
+            this.docFile = file;
+
+            try {
+                this.contentResolver.takePersistableUriPermission(docFile.getUri(), StoredDirectoryHelper.PERMISSION_FLAGS);
+            } catch (Exception e) {
+                throw new IOException(e);
+            }
+        }
+
+        this.srcName = getName();
+        this.srcType = getType();
+    }
+
+    public StoredFileHelper(File location, String filename, String tag) throws IOException {
+        this.ioFile = new File(location, filename);
+        this.tag = tag;
+
+        if (this.ioFile.exists()) {
+            if (!this.ioFile.isFile() && !this.ioFile.delete())
+                throw new IOException("The filename is already in use by non-file entity and cannot overwrite it");
+        } else {
+            if (!this.ioFile.createNewFile())
+                throw new IOException("Cannot create the file");
+        }
+
+        this.source = Uri.fromFile(this.ioFile).toString();
+        this.srcName = getName();
+        this.srcType = getType();
+    }
+
+    public static StoredFileHelper deserialize(@NonNull StoredFileHelper storage, Context context) throws IOException {
+        if (storage.isInvalid())
+            return new StoredFileHelper(storage.srcName, storage.srcType, storage.tag);
+
+        StoredFileHelper instance = new StoredFileHelper(context, Uri.parse(storage.source), storage.tag);
+
+        if (storage.sourceTree != null) {
+            instance.docTree = DocumentFile.fromTreeUri(context, Uri.parse(instance.sourceTree));
+
+            if (instance.docTree == null)
+                throw new IOException("Cannot deserialize the tree, ¿revoked permissions?");
+        }
+
+        return instance;
+    }
+
+    public static void requestSafWithFileCreation(@NonNull Fragment who, int requestCode, String filename, String mime) {
+        // SAF notes:
+        //           ACTION_OPEN_DOCUMENT       Do not let you create the file, useful for overwrite files
+        //           ACTION_CREATE_DOCUMENT     No overwrite support, useless the file provider resolve the conflict
+
+        Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
+                .addCategory(Intent.CATEGORY_OPENABLE)
+                .setType(mime)
+                .putExtra(Intent.EXTRA_TITLE, filename)
+                .addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | StoredDirectoryHelper.PERMISSION_FLAGS)
+                .putExtra("android.content.extra.SHOW_ADVANCED", true);// hack, show all storage disks
+
+        who.startActivityForResult(intent, requestCode);
+    }
+
+    public SharpStream getStream() throws IOException {
+        invalid();
+
+        if (docFile == null)
+            return new FileStream(ioFile);
+        else
+            return new FileStreamSAF(contentResolver, docFile.getUri());
+    }
+
+    /**
+     * Indicates whatever if is possible access using the {@code java.io} API
+     *
+     * @return {@code true} for Java I/O API, otherwise, {@code false} for Storage Access Framework
+     */
+    public boolean isDirect() {
+        invalid();
+
+        return docFile == null;
+    }
+
+    public boolean isInvalid() {
+        return source == null;
+    }
+
+    public Uri getUri() {
+        invalid();
+
+        return docFile == null ? Uri.fromFile(ioFile) : docFile.getUri();
+    }
+
+    public void truncate() throws IOException {
+        invalid();
+
+        try (SharpStream fs = getStream()) {
+            fs.setLength(0);
+        }
+    }
+
+    public boolean delete() {
+        invalid();
+
+        if (docFile == null) return ioFile.delete();
+
+        boolean res = docFile.delete();
+
+        try {
+            int flags = Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
+            contentResolver.releasePersistableUriPermission(docFile.getUri(), flags);
+        } catch (Exception ex) {
+            // ¿what happen?
+        }
+
+        return res;
+    }
+
+    public long length() {
+        invalid();
+
+        return docFile == null ? ioFile.length() : docFile.length();
+    }
+
+    public boolean canWrite() {
+        if (source == null) return false;
+        return docFile == null ? ioFile.canWrite() : docFile.canWrite();
+    }
+
+    public File getIOFile() {
+        return ioFile;
+    }
+
+    public String getName() {
+        if (source == null) return srcName;
+        return docFile == null ? ioFile.getName() : docFile.getName();
+    }
+
+    public String getType() {
+        if (source == null) return srcType;
+        return docFile == null ? DEFAULT_MIME : docFile.getType();// not obligatory for Java IO
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public boolean existsAsFile() {
+        if (source == null) return false;
+
+        boolean exists = docFile == null ? ioFile.exists() : docFile.exists();
+        boolean asFile = docFile == null ? ioFile.isFile() : docFile.isFile();// ¿docFile.isVirtual() means is no-physical?
+
+        return exists && asFile;
+    }
+
+    public boolean create() {
+        invalid();
+
+        if (docFile == null) {
+            try {
+                return ioFile.createNewFile();
+            } catch (IOException e) {
+                return false;
+            }
+        }
+
+        if (docTree == null || docFile.getName() == null) return false;
+
+        DocumentFile res = docTree.createFile(docFile.getName(), docFile.getType() == null ? DEFAULT_MIME : docFile.getType());
+        if (res == null) return false;
+
+        docFile = res;
+        return true;
+    }
+
+    public void invalidate() {
+        if (source == null) return;
+
+        srcName = getName();
+        srcType = getType();
+
+        source = null;
+
+        sourceTree = null;
+        docTree = null;
+        docFile = null;
+        ioFile = null;
+        contentResolver = null;
+    }
+
+    private void invalid() {
+        if (source == null)
+            throw new IllegalStateException("In invalid state");
+    }
+
+    public boolean equals(StoredFileHelper storage) {
+        if (this.isInvalid() != storage.isInvalid()) return false;
+        if (this.isDirect() != storage.isDirect()) return false;
+
+        if (this.isDirect())
+            return this.ioFile.getPath().equalsIgnoreCase(storage.ioFile.getPath());
+
+        return DocumentsContract.getDocumentId(
+                this.docFile.getUri()
+        ).equalsIgnoreCase(DocumentsContract.getDocumentId(
+                storage.docFile.getUri()
+        ));
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        if (source == null)
+            return "[Invalid state] name=" + srcName + "  type=" + srcType + "  tag=" + tag;
+        else
+            return "sourceFile=" + source + "  treeSource=" + (sourceTree == null ? "" : sourceTree) + "  tag=" + tag;
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java b/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java
index fa0c2c7ae..ee7e4cba1 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java
@@ -6,12 +6,10 @@ import org.schabi.newpipe.streams.io.SharpStream;
 
 import java.io.IOException;
 
-import us.shandian.giga.get.DownloadMission;
-
 public class M4aNoDash extends Postprocessing {
 
-    M4aNoDash(DownloadMission mission) {
-        super(mission, 0, true);
+    M4aNoDash() {
+        super(0, true);
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
index 09f5d9661..98ab29dbb 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
@@ -5,15 +5,13 @@ import org.schabi.newpipe.streams.io.SharpStream;
 
 import java.io.IOException;
 
-import us.shandian.giga.get.DownloadMission;
-
 /**
  * @author kapodamy
  */
 class Mp4FromDashMuxer extends Postprocessing {
 
-    Mp4FromDashMuxer(DownloadMission mission) {
-        super(mission, 2 * 1024 * 1024/* 2 MiB */, true);
+    Mp4FromDashMuxer() {
+        super(2 * 1024 * 1024/* 2 MiB */, true);
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
index df8549010..7bc32ea05 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
@@ -1,6 +1,7 @@
 package us.shandian.giga.postprocessing;
 
 import android.os.Message;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import org.schabi.newpipe.streams.io.SharpStream;
@@ -9,9 +10,9 @@ import java.io.File;
 import java.io.IOException;
 
 import us.shandian.giga.get.DownloadMission;
-import us.shandian.giga.postprocessing.io.ChunkFileInputStream;
-import us.shandian.giga.postprocessing.io.CircularFileWriter;
-import us.shandian.giga.postprocessing.io.CircularFileWriter.OffsetChecker;
+import us.shandian.giga.io.ChunkFileInputStream;
+import us.shandian.giga.io.CircularFileWriter;
+import us.shandian.giga.io.CircularFileWriter.OffsetChecker;
 import us.shandian.giga.service.DownloadManagerService;
 
 import static us.shandian.giga.get.DownloadMission.ERROR_NOTHING;
@@ -20,30 +21,41 @@ import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION;
 
 public abstract class Postprocessing {
 
-    static final byte OK_RESULT = ERROR_NOTHING;
+    static transient final byte OK_RESULT = ERROR_NOTHING;
 
-    public static final String ALGORITHM_TTML_CONVERTER = "ttml";
-    public static final String ALGORITHM_WEBM_MUXER = "webm";
-    public static final String ALGORITHM_MP4_FROM_DASH_MUXER = "mp4D-mp4";
-    public static final String ALGORITHM_M4A_NO_DASH = "mp4D-m4a";
+    public transient static final String ALGORITHM_TTML_CONVERTER = "ttml";
+    public transient static final String ALGORITHM_WEBM_MUXER = "webm";
+    public transient static final String ALGORITHM_MP4_FROM_DASH_MUXER = "mp4D-mp4";
+    public transient static final String ALGORITHM_M4A_NO_DASH = "mp4D-m4a";
+
+    public static Postprocessing getAlgorithm(String algorithmName, String[] args) {
+        Postprocessing instance;
 
-    public static Postprocessing getAlgorithm(String algorithmName, DownloadMission mission) {
         if (null == algorithmName) {
             throw new NullPointerException("algorithmName");
         } else switch (algorithmName) {
             case ALGORITHM_TTML_CONVERTER:
-                return new TtmlConverter(mission);
+                instance = new TtmlConverter();
+                break;
             case ALGORITHM_WEBM_MUXER:
-                return new WebMMuxer(mission);
+                instance = new WebMMuxer();
+                break;
             case ALGORITHM_MP4_FROM_DASH_MUXER:
-                return new Mp4FromDashMuxer(mission);
+                instance = new Mp4FromDashMuxer();
+                break;
             case ALGORITHM_M4A_NO_DASH:
-                return new M4aNoDash(mission);
+                instance = new M4aNoDash();
+                break;
             /*case "example-algorithm":
-                return new ExampleAlgorithm(mission);*/
+                instance = new ExampleAlgorithm(mission);*/
             default:
                 throw new RuntimeException("Unimplemented post-processing algorithm: " + algorithmName);
         }
+
+        instance.args = args;
+        instance.name = algorithmName;
+
+        return instance;
     }
 
     /**
@@ -61,32 +73,38 @@ public abstract class Postprocessing {
     /**
      * the download to post-process
      */
-    protected DownloadMission mission;
+    protected transient DownloadMission mission;
 
-    Postprocessing(DownloadMission mission, int recommendedReserve, boolean worksOnSameFile) {
-        this.mission = mission;
+    public transient File cacheDir;
+
+    private String[] args;
+
+    private String name;
+
+    Postprocessing(int recommendedReserve, boolean worksOnSameFile) {
         this.recommendedReserve = recommendedReserve;
         this.worksOnSameFile = worksOnSameFile;
     }
 
-    public void run() throws IOException {
-        File file = mission.getDownloadedFile();
+    public void run(DownloadMission target) throws IOException {
+        this.mission = target;
+
         File temp = null;
         CircularFileWriter out = null;
         int result;
         long finalLength = -1;
 
         mission.done = 0;
-        mission.length = file.length();
+        mission.length = mission.storage.length();
 
         if (worksOnSameFile) {
             ChunkFileInputStream[] sources = new ChunkFileInputStream[mission.urls.length];
             try {
                 int i = 0;
                 for (; i < sources.length - 1; i++) {
-                    sources[i] = new ChunkFileInputStream(file, mission.offsets[i], mission.offsets[i + 1], "rw");
+                    sources[i] = new ChunkFileInputStream(mission.storage.getStream(), mission.offsets[i], mission.offsets[i + 1]);
                 }
-                sources[i] = new ChunkFileInputStream(file, mission.offsets[i], mission.getDownloadedFile().length(), "rw");
+                sources[i] = new ChunkFileInputStream(mission.storage.getStream(), mission.offsets[i]);
 
                 if (test(sources)) {
                     for (SharpStream source : sources) source.rewind();
@@ -97,7 +115,7 @@ public abstract class Postprocessing {
                              * WARNING: never use rewind() in any chunk after any writing (especially on first chunks)
                              *          or the CircularFileWriter can lead to unexpected results
                              */
-                            if (source.isDisposed() || source.available() < 1) {
+                            if (source.isClosed() || source.available() < 1) {
                                 continue;// the selected source is not used anymore
                             }
 
@@ -107,18 +125,19 @@ public abstract class Postprocessing {
                         return -1;
                     };
 
-                    temp = new File(mission.location, mission.name + ".tmp");
+                    // TODO: use Context.getCache() for this operation
+                    temp = new File(cacheDir, mission.storage.getName() + ".tmp");
 
-                    out = new CircularFileWriter(file, temp, checker);
+                    out = new CircularFileWriter(mission.storage.getStream(), temp, checker);
                     out.onProgress = this::progressReport;
 
                     out.onWriteError = (err) -> {
-                        mission.postprocessingState = 3;
+                        mission.psState = 3;
                         mission.notifyError(ERROR_POSTPROCESSING_HOLD, err);
 
                         try {
                             synchronized (this) {
-                                while (mission.postprocessingState == 3)
+                                while (mission.psState == 3)
                                     wait();
                             }
                         } catch (InterruptedException e) {
@@ -138,12 +157,12 @@ public abstract class Postprocessing {
                 }
             } finally {
                 for (SharpStream source : sources) {
-                    if (source != null && !source.isDisposed()) {
-                        source.dispose();
+                    if (source != null && !source.isClosed()) {
+                        source.close();
                     }
                 }
                 if (out != null) {
-                    out.dispose();
+                    out.close();
                 }
                 if (temp != null) {
                     //noinspection ResultOfMethodCallIgnored
@@ -164,10 +183,9 @@ public abstract class Postprocessing {
             mission.errObject = new RuntimeException("post-processing algorithm returned " + result);
         }
 
-        if (result != OK_RESULT && worksOnSameFile) {
-            //noinspection ResultOfMethodCallIgnored
-            file.delete();
-        }
+        if (result != OK_RESULT && worksOnSameFile) mission.storage.delete();
+
+        this.mission = null;
     }
 
     /**
@@ -192,11 +210,11 @@ public abstract class Postprocessing {
     abstract int process(SharpStream out, SharpStream... sources) throws IOException;
 
     String getArgumentAt(int index, String defaultValue) {
-        if (mission.postprocessingArgs == null || index >= mission.postprocessingArgs.length) {
+        if (args == null || index >= args.length) {
             return defaultValue;
         }
 
-        return mission.postprocessingArgs[index];
+        return args[index];
     }
 
     private void progressReport(long done) {
@@ -209,4 +227,22 @@ public abstract class Postprocessing {
 
         mission.mHandler.sendMessage(m);
     }
+
+    @NonNull
+    @Override
+    public String toString() {
+        StringBuilder str = new StringBuilder();
+
+        str.append("name=").append(name).append('[');
+
+        if (args != null) {
+            for (String arg : args) {
+                str.append(", ");
+                str.append(arg);
+            }
+            str.delete(0, 1);
+        }
+
+        return str.append(']').toString();
+    }
 }
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java b/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java
index 390061840..bba0b299a 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java
@@ -2,8 +2,8 @@ package us.shandian.giga.postprocessing;
 
 import android.util.Log;
 
-import org.schabi.newpipe.streams.io.SharpStream;
 import org.schabi.newpipe.streams.SubtitleConverter;
+import org.schabi.newpipe.streams.io.SharpStream;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
@@ -12,18 +12,15 @@ import java.text.ParseException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPathExpressionException;
 
-import us.shandian.giga.get.DownloadMission;
-import us.shandian.giga.postprocessing.io.SharpInputStream;
-
 /**
  * @author kapodamy
  */
 class TtmlConverter extends Postprocessing {
     private static final String TAG = "TtmlConverter";
 
-    TtmlConverter(DownloadMission mission) {
+    TtmlConverter() {
         // due how XmlPullParser works, the xml is fully loaded on the ram
-        super(mission, 0, true);
+        super(0, true);
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
index 2ffb0f08d..37295f2e3 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
@@ -7,15 +7,13 @@ import org.schabi.newpipe.streams.io.SharpStream;
 
 import java.io.IOException;
 
-import us.shandian.giga.get.DownloadMission;
-
 /**
  * @author kapodamy
  */
 class WebMMuxer extends Postprocessing {
 
-    WebMMuxer(DownloadMission mission) {
-        super(mission, 2048 * 1024/* 2 MiB */, true);
+    WebMMuxer() {
+        super(2048 * 1024/* 2 MiB */, true);
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManager.java b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
index 58246beb1..3624fb6c2 100644
--- a/app/src/main/java/us/shandian/giga/service/DownloadManager.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
@@ -13,16 +13,15 @@ import org.schabi.newpipe.R;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 
 import us.shandian.giga.get.DownloadMission;
 import us.shandian.giga.get.FinishedMission;
 import us.shandian.giga.get.Mission;
-import us.shandian.giga.get.sqlite.DownloadDataSource;
-import us.shandian.giga.service.DownloadManagerService.DMChecker;
-import us.shandian.giga.service.DownloadManagerService.MissionCheck;
+import us.shandian.giga.get.sqlite.FinishedMissionStore;
+import us.shandian.giga.io.StoredDirectoryHelper;
+import us.shandian.giga.io.StoredFileHelper;
 import us.shandian.giga.util.Utility;
 
 import static org.schabi.newpipe.BuildConfig.DEBUG;
@@ -36,7 +35,10 @@ public class DownloadManager {
     public final static int SPECIAL_PENDING = 1;
     public final static int SPECIAL_FINISHED = 2;
 
-    private final DownloadDataSource mDownloadDataSource;
+    static final String TAG_AUDIO = "audio";
+    static final String TAG_VIDEO = "video";
+
+    private final FinishedMissionStore mFinishedMissionStore;
 
     private final ArrayList<DownloadMission> mMissionsPending = new ArrayList<>();
     private final ArrayList<FinishedMission> mMissionsFinished;
@@ -51,6 +53,9 @@ public class DownloadManager {
     boolean mPrefQueueLimit;
     private boolean mSelfMissionsControl;
 
+    StoredDirectoryHelper mMainStorageAudio;
+    StoredDirectoryHelper mMainStorageVideo;
+
     /**
      * Create a new instance
      *
@@ -62,7 +67,7 @@ public class DownloadManager {
             Log.d(TAG, "new DownloadManager instance. 0x" + Integer.toHexString(this.hashCode()));
         }
 
-        mDownloadDataSource = new DownloadDataSource(context);
+        mFinishedMissionStore = new FinishedMissionStore(context);
         mHandler = handler;
         mMissionsFinished = loadFinishedMissions();
         mPendingMissionsDir = getPendingDir(context);
@@ -71,7 +76,7 @@ public class DownloadManager {
             throw new RuntimeException("failed to create pending_downloads in data directory");
         }
 
-        loadPendingMissions();
+        loadPendingMissions(context);
     }
 
     private static File getPendingDir(@NonNull Context context) {
@@ -92,29 +97,24 @@ public class DownloadManager {
      * Loads finished missions from the data source
      */
     private ArrayList<FinishedMission> loadFinishedMissions() {
-        ArrayList<FinishedMission> finishedMissions = mDownloadDataSource.loadFinishedMissions();
+        ArrayList<FinishedMission> finishedMissions = mFinishedMissionStore.loadFinishedMissions();
 
-        // missions always is stored by creation order, simply reverse the list
-        ArrayList<FinishedMission> result = new ArrayList<>(finishedMissions.size());
+        // check if the files exists, otherwise, forget the download
         for (int i = finishedMissions.size() - 1; i >= 0; i--) {
             FinishedMission mission = finishedMissions.get(i);
-            File file = mission.getDownloadedFile();
 
-            if (!file.isFile()) {
-                if (DEBUG) {
-                    Log.d(TAG, "downloaded file removed: " + file.getAbsolutePath());
-                }
-                mDownloadDataSource.deleteMission(mission);
-                continue;
+            if (!mission.storage.existsAsFile()) {
+                if (DEBUG) Log.d(TAG, "downloaded file removed: " + mission.storage.getName());
+
+                mFinishedMissionStore.deleteMission(mission);
+                finishedMissions.remove(i);
             }
-
-            result.add(mission);
         }
 
-        return result;
+        return finishedMissions;
     }
 
-    private void loadPendingMissions() {
+    private void loadPendingMissions(Context ctx) {
         File[] subs = mPendingMissionsDir.listFiles();
 
         if (subs == null) {
@@ -142,40 +142,63 @@ public class DownloadManager {
                         continue;
                     }
 
-                    File dl = mis.getDownloadedFile();
-                    boolean exists = dl.exists();
+                    boolean exists;
+                    try {
+                        mis.storage = StoredFileHelper.deserialize(mis.storage, ctx);
+                        exists = !mis.storage.isInvalid() && mis.storage.existsAsFile();
+
+                    } catch (Exception ex) {
+                        Log.e(TAG, "Failed to load the file source of " + mis.storage.toString());
+                        mis.storage.invalidate();
+                        exists = false;
+                    }
 
                     if (mis.isPsRunning()) {
-                        if (mis.postprocessingThis) {
+                        if (mis.psAlgorithm.worksOnSameFile) {
                             // Incomplete post-processing results in a corrupted download file
                             // because the selected algorithm works on the same file to save space.
-                            if (exists && dl.isFile() && !dl.delete())
+                            if (exists && !mis.storage.delete())
                                 Log.w(TAG, "Unable to delete incomplete download file: " + sub.getPath());
 
                             exists = true;
                         }
 
-                        mis.postprocessingState = 0;
+                        mis.psState = 0;
                         mis.errCode = DownloadMission.ERROR_POSTPROCESSING_STOPPED;
                         mis.errObject = null;
-                    } else if (exists && !dl.isFile()) {
-                        // probably a folder, this should never happens
-                        if (!sub.delete()) {
-                            Log.w(TAG, "Unable to delete serialized file: " + sub.getPath());
+                    } else if (!exists) {
+
+                        StoredDirectoryHelper mainStorage = getMainStorage(mis.storage.getTag());
+
+                        if (!mis.storage.isInvalid() && !mis.storage.create()) {
+                            // using javaIO cannot recreate the file
+                            // using SAF in older devices (no tree available)
+                            //
+                            // force the user to pick again the save path
+                            mis.storage.invalidate();
+                        } else if (mainStorage != null) {
+                            // if the user has changed the save path before this download, the original save path will be lost
+                            StoredFileHelper newStorage = mainStorage.createFile(mis.storage.getName(), mis.storage.getType());
+                            if (newStorage == null)
+                                mis.storage.invalidate();
+                            else
+                                mis.storage = newStorage;
+                        }
+
+                        if (mis.isInitialized()) {
+                            // the progress is lost, reset mission state
+                            DownloadMission m = new DownloadMission(mis.urls, mis.storage, mis.kind, mis.psAlgorithm);
+                            m.timestamp = mis.timestamp;
+                            m.threadCount = mis.threadCount;
+                            m.source = mis.source;
+                            m.nearLength = mis.nearLength;
+                            m.enqueued = mis.enqueued;
+                            m.errCode = DownloadMission.ERROR_PROGRESS_LOST;
+                            mis = m;
                         }
-                        continue;
                     }
 
-                    if (!exists && mis.isInitialized()) {
-                        // downloaded file deleted, reset mission state
-                        DownloadMission m = new DownloadMission(mis.urls, mis.name, mis.location, mis.kind, mis.postprocessingName, mis.postprocessingArgs);
-                        m.timestamp = mis.timestamp;
-                        m.threadCount = mis.threadCount;
-                        m.source = mis.source;
-                        m.nearLength = mis.nearLength;
-                        m.setEnqueued(mis.enqueued);
-                        mis = m;
-                    }
+                    if (mis.psAlgorithm != null) mis.psAlgorithm.cacheDir = ctx.getCacheDir();
 
                     mis.running = false;
                     mis.recovered = exists;
@@ -196,51 +219,15 @@ public class DownloadManager {
     /**
      * Start a new download mission
      *
-     * @param urls     the list of urls to download
-     * @param location the location
-     * @param name     the name of the file to create
-     * @param kind     type of file (a: audio  v: video  s: subtitle ?: file-extension defined)
-     * @param threads  the number of threads maximal used to download chunks of the file.
-     * @param psName   the name of the required post-processing algorithm, or {@code null} to ignore.
-     * @param source   source url of the resource
-     * @param psArgs   the arguments for the post-processing algorithm.
+     * @param mission the new download mission to add and run (if possible)
      */
-    void startMission(String[] urls, String location, String name, char kind, int threads,
-                      String source, String psName, String[] psArgs, long nearLength) {
+    void startMission(DownloadMission mission) {
         synchronized (this) {
-            // check for existing pending download
-            DownloadMission pendingMission = getPendingMission(location, name);
-
-            if (pendingMission != null) {
-                if (pendingMission.running) {
-                    // generate unique filename (?)
-                    try {
-                        name = generateUniqueName(location, name);
-                    } catch (Exception e) {
-                        Log.e(TAG, "Unable to generate unique name", e);
-                        name = System.currentTimeMillis() + name;
-                        Log.i(TAG, "Using " + name);
-                    }
-                } else {
-                    // dispose the mission
-                    mMissionsPending.remove(pendingMission);
-                    mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_DELETED);
-                    pendingMission.delete();
-                }
-            } else {
-                // check for existing finished download and dispose (if exists)
-                int index = getFinishedMissionIndex(location, name);
-                if (index >= 0) mDownloadDataSource.deleteMission(mMissionsFinished.remove(index));
-            }
-
-            DownloadMission mission = new DownloadMission(urls, name, location, kind, psName, psArgs);
             mission.timestamp = System.currentTimeMillis();
-            mission.threadCount = threads;
-            mission.source = source;
             mission.mHandler = mHandler;
             mission.maxRetry = mPrefMaxRetry;
-            mission.nearLength = nearLength;
 
+            // create metadata file
             while (true) {
                 mission.metadata = new File(mPendingMissionsDir, String.valueOf(mission.timestamp));
                 if (!mission.metadata.isFile() && !mission.metadata.exists()) {
@@ -261,6 +248,14 @@ public class DownloadManager {
             // Before continue, save the metadata in case the internet connection is not available
             Utility.writeToFile(mission.metadata, mission);
 
+            if (mission.storage == null) {
+                // noting to do here
+                mission.errCode = DownloadMission.ERROR_FILE_CREATION;
+                if (mission.errObject != null)
+                    mission.errObject = new IOException("DownloadMission.storage == NULL");
+                return;
+            }
+
             boolean start = !mPrefQueueLimit || getRunningMissionsCount() < 1;
 
             if (canDownloadInCurrentNetwork() && start) {
@@ -292,7 +287,7 @@ public class DownloadManager {
                 mMissionsPending.remove(mission);
             } else if (mission instanceof FinishedMission) {
                 mMissionsFinished.remove(mission);
-                mDownloadDataSource.deleteMission(mission);
+                mFinishedMissionStore.deleteMission(mission);
             }
 
             mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_DELETED);
@@ -300,18 +295,35 @@ public class DownloadManager {
         }
     }
 
+    public void forgetMission(StoredFileHelper storage) {
+        synchronized (this) {
+            Mission mission = getAnyMission(storage);
+            if (mission == null) return;
+
+            if (mission instanceof DownloadMission) {
+                mMissionsPending.remove(mission);
+            } else if (mission instanceof FinishedMission) {
+                mMissionsFinished.remove(mission);
+                mFinishedMissionStore.deleteMission(mission);
+            }
+
+            mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_DELETED);
+            mission.storage = null;
+            mission.delete();
+        }
+    }
+
 
     /**
-     * Get a pending mission by its location and name
+     * Get a pending mission by its path
      *
-     * @param location the location
-     * @param name     the name
+     * @param storage where the file possible is stored
      * @return the mission or null if no such mission exists
      */
     @Nullable
-    private DownloadMission getPendingMission(String location, String name) {
+    private DownloadMission getPendingMission(StoredFileHelper storage) {
         for (DownloadMission mission : mMissionsPending) {
-            if (location.equalsIgnoreCase(mission.location) && name.equalsIgnoreCase(mission.name)) {
+            if (mission.storage.equals(storage)) {
                 return mission;
             }
         }
@@ -319,16 +331,14 @@ public class DownloadManager {
     }
 
     /**
-     * Get a finished mission by its location and name
+     * Get a finished mission by its path
      *
-     * @param location the location
-     * @param name     the name
+     * @param storage where the file possible is stored
      * @return the mission index or -1 if no such mission exists
      */
-    private int getFinishedMissionIndex(String location, String name) {
+    private int getFinishedMissionIndex(StoredFileHelper storage) {
         for (int i = 0; i < mMissionsFinished.size(); i++) {
-            FinishedMission mission = mMissionsFinished.get(i);
-            if (location.equalsIgnoreCase(mission.location) && name.equalsIgnoreCase(mission.name)) {
+            if (mMissionsFinished.get(i).storage.equals(storage)) {
                 return i;
             }
         }
@@ -336,12 +346,12 @@ public class DownloadManager {
         return -1;
     }
 
-    public Mission getAnyMission(String location, String name) {
+    private Mission getAnyMission(StoredFileHelper storage) {
         synchronized (this) {
-            Mission mission = getPendingMission(location, name);
+            Mission mission = getPendingMission(storage);
             if (mission != null) return mission;
 
-            int idx = getFinishedMissionIndex(location, name);
+            int idx = getFinishedMissionIndex(storage);
             if (idx >= 0) return mMissionsFinished.get(idx);
         }
 
@@ -382,7 +392,7 @@ public class DownloadManager {
 
         synchronized (this) {
             for (DownloadMission mission : mMissionsPending) {
-                if (mission.running || mission.isPsFailed() || mission.isFinished()) continue;
+                if (mission.running || !mission.canDownload()) continue;
 
                 flag = true;
                 mission.start();
@@ -392,58 +402,6 @@ public class DownloadManager {
         if (flag) mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PROGRESS);
     }
 
-
-    /**
-     * Splits the filename into name and extension
-     * <p>
-     * Dots are ignored if they appear: not at all, at the beginning of the file,
-     * at the end of the file
-     *
-     * @param name the name to split
-     * @return a string array with a length of 2 containing the name and the extension
-     */
-    private static String[] splitName(String name) {
-        int dotIndex = name.lastIndexOf('.');
-        if (dotIndex <= 0 || (dotIndex == name.length() - 1)) {
-            return new String[]{name, ""};
-        } else {
-            return new String[]{name.substring(0, dotIndex), name.substring(dotIndex + 1)};
-        }
-    }
-
-    /**
-     * Generates a unique file name.
-     * <p>
-     * e.g. "myName (1).txt" if the name "myName.txt" exists.
-     *
-     * @param location the location (to check for existing files)
-     * @param name     the name of the file
-     * @return the unique file name
-     * @throws IllegalArgumentException if the location is not a directory
-     * @throws SecurityException        if the location is not readable
-     */
-    private static String generateUniqueName(String location, String name) {
-        if (location == null) throw new NullPointerException("location is null");
-        if (name == null) throw new NullPointerException("name is null");
-        File destination = new File(location);
-        if (!destination.isDirectory()) {
-            throw new IllegalArgumentException("location is not a directory: " + location);
-        }
-        final String[] nameParts = splitName(name);
-        String[] existingName = destination.list((dir, name1) -> name1.startsWith(nameParts[0]));
-        Arrays.sort(existingName);
-        String newName;
-        int downloadIndex = 0;
-        do {
-            newName = nameParts[0] + " (" + downloadIndex + ")." + nameParts[1];
-            ++downloadIndex;
-            if (downloadIndex == 1000) {  // Probably an error on our side
-                throw new RuntimeException("Too many existing files");
-            }
-        } while (Arrays.binarySearch(existingName, newName) >= 0);
-        return newName;
-    }
-
     /**
      * Set a pending download as finished
      *
@@ -453,7 +411,7 @@ public class DownloadManager {
         synchronized (this) {
             mMissionsPending.remove(mission);
             mMissionsFinished.add(0, new FinishedMission(mission));
-            mDownloadDataSource.addMission(mission);
+            mFinishedMissionStore.addFinishedMission(mission);
         }
     }
 
@@ -474,7 +432,8 @@ public class DownloadManager {
 
             boolean flag = false;
             for (DownloadMission mission : mMissionsPending) {
-                if (mission.running || !mission.enqueued || mission.isFinished()) continue;
+                if (mission.running || !mission.enqueued || mission.isFinished() || mission.hasInvalidStorage())
+                    continue;
 
                 resumeMission(mission);
                 if (mPrefQueueLimit) return true;
@@ -496,7 +455,7 @@ public class DownloadManager {
     public void forgetFinishedDownloads() {
         synchronized (this) {
             for (FinishedMission mission : mMissionsFinished) {
-                mDownloadDataSource.deleteMission(mission);
+                mFinishedMissionStore.deleteMission(mission);
             }
             mMissionsFinished.clear();
         }
@@ -523,7 +482,7 @@ public class DownloadManager {
         int paused = 0;
         synchronized (this) {
             for (DownloadMission mission : mMissionsPending) {
-                if (mission.isFinished() || mission.isPsRunning()) continue;
+                if (!mission.canDownload() || mission.isPsRunning()) continue;
 
                 if (mission.running && isMetered) {
                     paused++;
@@ -565,24 +524,32 @@ public class DownloadManager {
         ), Toast.LENGTH_LONG).show();
     }
 
-    void checkForRunningMission(String location, String name, DMChecker check) {
-        MissionCheck result = MissionCheck.None;
-
+    public MissionState checkForExistingMission(StoredFileHelper storage) {
         synchronized (this) {
-            DownloadMission pending = getPendingMission(location, name);
+            DownloadMission pending = getPendingMission(storage);
 
             if (pending == null) {
-                if (getFinishedMissionIndex(location, name) >= 0) result = MissionCheck.Finished;
+                if (getFinishedMissionIndex(storage) >= 0) return MissionState.Finished;
             } else {
                 if (pending.isFinished()) {
-                    result = MissionCheck.Finished;// this never should happen (race-condition)
+                    return MissionState.Finished;// this never should happen (race-condition)
                 } else {
-                    result = pending.running ? MissionCheck.PendingRunning : MissionCheck.Pending;
+                    return pending.running ? MissionState.PendingRunning : MissionState.Pending;
                 }
             }
         }
 
-        check.callback(result);
+        return MissionState.None;
+    }
+
+    @Nullable
+    private StoredDirectoryHelper getMainStorage(@NonNull String tag) {
+        if (tag.equals(TAG_AUDIO)) return mMainStorageAudio;
+        if (tag.equals(TAG_VIDEO)) return mMainStorageVideo;
+
+        Log.w(TAG, "Unknown download category, not [audio video]: " + String.valueOf(tag));
+
+        return null;// this never should happen
     }
 
     public class MissionIterator extends DiffUtil.Callback {
@@ -689,7 +656,7 @@ public class DownloadManager {
 
             synchronized (DownloadManager.this) {
                 for (DownloadMission mission : mMissionsPending) {
-                    if (hidden.contains(mission) || mission.isPsFailed() || mission.isFinished())
+                    if (hidden.contains(mission) || mission.canDownload())
                         continue;
 
                     if (mission.running)
@@ -720,7 +687,14 @@ public class DownloadManager {
 
         @Override
         public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
-            return areItemsTheSame(oldItemPosition, newItemPosition);
+            Object x = snapshot.get(oldItemPosition);
+            Object y = current.get(newItemPosition);
+
+            if (x instanceof Mission && y instanceof Mission) {
+                return ((Mission) x).storage.equals(((Mission) y).storage);
+            }
+
+            return false;
         }
     }
 
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index be1e20dd6..deed9e8e3 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -6,11 +6,9 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -21,12 +19,14 @@ import android.net.NetworkRequest;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationCompat.Builder;
 import android.support.v4.content.PermissionChecker;
@@ -39,9 +39,13 @@ import org.schabi.newpipe.download.DownloadActivity;
 import org.schabi.newpipe.player.helper.LockManager;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 
 import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.io.StoredDirectoryHelper;
+import us.shandian.giga.io.StoredFileHelper;
+import us.shandian.giga.postprocessing.Postprocessing;
 import us.shandian.giga.service.DownloadManager.NetworkState;
 
 import static org.schabi.newpipe.BuildConfig.APPLICATION_ID;
@@ -61,19 +65,19 @@ public class DownloadManagerService extends Service {
     private static final int DOWNLOADS_NOTIFICATION_ID = 1001;
 
     private static final String EXTRA_URLS = "DownloadManagerService.extra.urls";
-    private static final String EXTRA_NAME = "DownloadManagerService.extra.name";
-    private static final String EXTRA_LOCATION = "DownloadManagerService.extra.location";
+    private static final String EXTRA_PATH = "DownloadManagerService.extra.path";
     private static final String EXTRA_KIND = "DownloadManagerService.extra.kind";
     private static final String EXTRA_THREADS = "DownloadManagerService.extra.threads";
     private static final String EXTRA_POSTPROCESSING_NAME = "DownloadManagerService.extra.postprocessingName";
     private static final String EXTRA_POSTPROCESSING_ARGS = "DownloadManagerService.extra.postprocessingArgs";
     private static final String EXTRA_SOURCE = "DownloadManagerService.extra.source";
     private static final String EXTRA_NEAR_LENGTH = "DownloadManagerService.extra.nearLength";
+    private static final String EXTRA_MAIN_STORAGE_TAG = "DownloadManagerService.extra.tag";
 
     private static final String ACTION_RESET_DOWNLOAD_FINISHED = APPLICATION_ID + ".reset_download_finished";
     private static final String ACTION_OPEN_DOWNLOADS_FINISHED = APPLICATION_ID + ".open_downloads_finished";
 
-    private DMBinder mBinder;
+    private DownloadManagerBinder mBinder;
     private DownloadManager mManager;
     private Notification mNotification;
     private Handler mHandler;
@@ -110,10 +114,10 @@ public class DownloadManagerService extends Service {
     /**
      * notify media scanner on downloaded media file ...
      *
-     * @param file the downloaded file
+     * @param file the downloaded file uri
      */
-    private void notifyMediaScanner(File file) {
-        sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(file)));
+    private void notifyMediaScanner(Uri file) {
+        sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, file));
     }
 
     @Override
@@ -124,7 +128,7 @@ public class DownloadManagerService extends Service {
             Log.d(TAG, "onCreate");
         }
 
-        mBinder = new DMBinder();
+        mBinder = new DownloadManagerBinder();
         mHandler = new Handler(Looper.myLooper()) {
             @Override
             public void handleMessage(Message msg) {
@@ -186,10 +190,12 @@ public class DownloadManagerService extends Service {
         handlePreferenceChange(mPrefs, getString(R.string.downloads_queue_limit));
 
         mLock = new LockManager(this);
+
+        setupStorageAPI(true);
     }
 
     @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
+    public int onStartCommand(final Intent intent, int flags, int startId) {
         if (DEBUG) {
             Log.d(TAG, intent == null ? "Restarting" : "Starting");
         }
@@ -200,20 +206,7 @@ public class DownloadManagerService extends Service {
         String action = intent.getAction();
         if (action != null) {
             if (action.equals(Intent.ACTION_RUN)) {
-                String[] urls = intent.getStringArrayExtra(EXTRA_URLS);
-                String name = intent.getStringExtra(EXTRA_NAME);
-                String location = intent.getStringExtra(EXTRA_LOCATION);
-                int threads = intent.getIntExtra(EXTRA_THREADS, 1);
-                char kind = intent.getCharExtra(EXTRA_KIND, '?');
-                String psName = intent.getStringExtra(EXTRA_POSTPROCESSING_NAME);
-                String[] psArgs = intent.getStringArrayExtra(EXTRA_POSTPROCESSING_ARGS);
-                String source = intent.getStringExtra(EXTRA_SOURCE);
-                long nearLength = intent.getLongExtra(EXTRA_NEAR_LENGTH, 0);
-
-                handleConnectivityState(true);// first check the actual network status
-
-                mHandler.post(() -> mManager.startMission(urls, location, name, kind, threads, source, psName, psArgs, nearLength));
-
+                mHandler.post(() -> startMission(intent));
             } else if (downloadDoneNotification != null) {
                 if (action.equals(ACTION_RESET_DOWNLOAD_FINISHED) || action.equals(ACTION_OPEN_DOWNLOADS_FINISHED)) {
                     downloadDoneCount = 0;
@@ -264,12 +257,12 @@ public class DownloadManagerService extends Service {
     @Override
     public IBinder onBind(Intent intent) {
         int permissionCheck;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
-            permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
-            if (permissionCheck == PermissionChecker.PERMISSION_DENIED) {
-                Toast.makeText(this, "Permission denied (read)", Toast.LENGTH_SHORT).show();
-            }
-        }
+//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+//            permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
+//            if (permissionCheck == PermissionChecker.PERMISSION_DENIED) {
+//                Toast.makeText(this, "Permission denied (read)", Toast.LENGTH_SHORT).show();
+//            }
+//        }
 
         permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
         if (permissionCheck == PermissionChecker.PERMISSION_DENIED) {
@@ -284,8 +277,8 @@ public class DownloadManagerService extends Service {
 
         switch (msg.what) {
             case MESSAGE_FINISHED:
-                notifyMediaScanner(mission.getDownloadedFile());
-                notifyFinishedDownload(mission.name);
+                notifyMediaScanner(mission.storage.getUri());
+                notifyFinishedDownload(mission.storage.getName());
                 mManager.setFinished(mission);
                 handleConnectivityState(false);
                 updateForegroundState(mManager.runMissions());
@@ -344,7 +337,7 @@ public class DownloadManagerService extends Service {
         if (key.equals(getString(R.string.downloads_maximum_retry))) {
             try {
                 String value = prefs.getString(key, getString(R.string.downloads_maximum_retry_default));
-                mManager.mPrefMaxRetry = Integer.parseInt(value);
+                mManager.mPrefMaxRetry = value == null ? 0 : Integer.parseInt(value);
             } catch (Exception e) {
                 mManager.mPrefMaxRetry = 0;
             }
@@ -353,6 +346,12 @@ public class DownloadManagerService extends Service {
             mManager.mPrefMeteredDownloads = prefs.getBoolean(key, false);
         } else if (key.equals(getString(R.string.downloads_queue_limit))) {
             mManager.mPrefQueueLimit = prefs.getBoolean(key, true);
+        } else if (key.equals(getString(R.string.downloads_storage_api))) {
+            setupStorageAPI(false);
+        } else if (key.equals(getString(R.string.download_path_video_key))) {
+            loadMainStorage(key, DownloadManager.TAG_VIDEO, false);
+        } else if (key.equals(getString(R.string.download_path_audio_key))) {
+            loadMainStorage(key, DownloadManager.TAG_AUDIO, false);
         }
     }
 
@@ -370,43 +369,61 @@ public class DownloadManagerService extends Service {
         mForeground = state;
     }
 
-    public static void startMission(Context context, String urls[], String location, String name, char kind,
+    /**
+     * Start a new download mission
+     *
+     * @param context    the activity context
+     * @param urls       the list of urls to download
+     * @param storage    where the file is saved
+     * @param kind       type of file (a: audio  v: video  s: subtitle ?: file-extension defined)
+     * @param threads    the number of threads maximal used to download chunks of the file.
+     * @param psName     the name of the required post-processing algorithm, or {@code null} to ignore.
+     * @param source     source url of the resource
+     * @param psArgs     the arguments for the post-processing algorithm.
+     * @param nearLength the approximated final length of the file
+     */
+    public static void startMission(Context context, String urls[], StoredFileHelper storage, char kind,
                                     int threads, String source, String psName, String[] psArgs, long nearLength) {
         Intent intent = new Intent(context, DownloadManagerService.class);
         intent.setAction(Intent.ACTION_RUN);
         intent.putExtra(EXTRA_URLS, urls);
-        intent.putExtra(EXTRA_NAME, name);
-        intent.putExtra(EXTRA_LOCATION, location);
+        intent.putExtra(EXTRA_PATH, storage.getUri());
         intent.putExtra(EXTRA_KIND, kind);
         intent.putExtra(EXTRA_THREADS, threads);
         intent.putExtra(EXTRA_SOURCE, source);
         intent.putExtra(EXTRA_POSTPROCESSING_NAME, psName);
         intent.putExtra(EXTRA_POSTPROCESSING_ARGS, psArgs);
         intent.putExtra(EXTRA_NEAR_LENGTH, nearLength);
+        intent.putExtra(EXTRA_MAIN_STORAGE_TAG, storage.getTag());
         context.startService(intent);
     }
 
-    public static void checkForRunningMission(Context context, String location, String name, DMChecker checker) {
-        Intent intent = new Intent();
-        intent.setClass(context, DownloadManagerService.class);
-        context.startService(intent);
+    public void startMission(Intent intent) {
+        String[] urls = intent.getStringArrayExtra(EXTRA_URLS);
+        Uri path = intent.getParcelableExtra(EXTRA_PATH);
+        int threads = intent.getIntExtra(EXTRA_THREADS, 1);
+        char kind = intent.getCharExtra(EXTRA_KIND, '?');
+        String psName = intent.getStringExtra(EXTRA_POSTPROCESSING_NAME);
+        String[] psArgs = intent.getStringArrayExtra(EXTRA_POSTPROCESSING_ARGS);
+        String source = intent.getStringExtra(EXTRA_SOURCE);
+        long nearLength = intent.getLongExtra(EXTRA_NEAR_LENGTH, 0);
+        String tag = intent.getStringExtra(EXTRA_MAIN_STORAGE_TAG);
 
-        context.bindService(intent, new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName cname, IBinder service) {
-                try {
-                    ((DMBinder) service).getDownloadManager().checkForRunningMission(location, name, checker);
-                } catch (Exception err) {
-                    Log.w(TAG, "checkForRunningMission() callback is defective", err);
-                }
+        StoredFileHelper storage;
+        try {
+            storage = new StoredFileHelper(this, path, tag);
+        } catch (IOException e) {
+            throw new RuntimeException(e);// this never should happen
+        }
 
-                context.unbindService(this);
-            }
+        final DownloadMission mission = new DownloadMission(urls, storage, kind, Postprocessing.getAlgorithm(psName, psArgs));
+        mission.threadCount = threads;
+        mission.source = source;
+        mission.nearLength = nearLength;
 
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-            }
-        }, Context.BIND_AUTO_CREATE);
+        handleConnectivityState(true);// first check the actual network status
+
+        mManager.startMission(mission);
     }
 
     public void notifyFinishedDownload(String name) {
@@ -471,12 +488,12 @@ public class DownloadManagerService extends Service {
         if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             downloadFailedNotification.setContentTitle(getString(R.string.app_name));
             downloadFailedNotification.setStyle(new NotificationCompat.BigTextStyle()
-                    .bigText(getString(R.string.download_failed).concat(": ").concat(mission.name)));
+                    .bigText(getString(R.string.download_failed).concat(": ").concat(mission.storage.getName())));
         } else {
             downloadFailedNotification.setContentTitle(getString(R.string.download_failed));
-            downloadFailedNotification.setContentText(mission.name);
+            downloadFailedNotification.setContentText(mission.storage.getName());
             downloadFailedNotification.setStyle(new NotificationCompat.BigTextStyle()
-                    .bigText(mission.name));
+                    .bigText(mission.storage.getName()));
         }
 
         mNotificationManager.notify(id, downloadFailedNotification.build());
@@ -508,16 +525,81 @@ public class DownloadManagerService extends Service {
         mLockAcquired = acquire;
     }
 
+    private void setupStorageAPI(boolean acquire) {
+        loadMainStorage(getString(R.string.download_path_audio_key), DownloadManager.TAG_VIDEO, acquire);
+        loadMainStorage(getString(R.string.download_path_video_key), DownloadManager.TAG_AUDIO, acquire);
+    }
+
+    void loadMainStorage(String prefKey, String tag, boolean acquire) {
+        String path = mPrefs.getString(prefKey, null);
+
+        final String JAVA_IO = getString(R.string.downloads_storage_api_default);
+        boolean useJavaIO = JAVA_IO.equals(mPrefs.getString(getString(R.string.downloads_storage_api), JAVA_IO));
+
+        final String defaultPath;
+        if (tag.equals(DownloadManager.TAG_VIDEO))
+            defaultPath = Environment.DIRECTORY_MOVIES;
+        else// if (tag.equals(DownloadManager.TAG_AUDIO))
+            defaultPath = Environment.DIRECTORY_MUSIC;
+
+        StoredDirectoryHelper mainStorage;
+        if (path == null || path.isEmpty()) {
+            mainStorage = useJavaIO ? new StoredDirectoryHelper(defaultPath, tag) : null;
+        } else {
+
+            if (path.charAt(0) == File.separatorChar) {
+                Log.i(TAG, "Migrating old save path: " + path);
+
+                useJavaIO = true;
+                path = Uri.fromFile(new File(path)).toString();
+
+                mPrefs.edit().putString(prefKey, path).apply();
+            }
+
+            if (useJavaIO) {
+                mainStorage = new StoredDirectoryHelper(path, tag);
+            } else {
+
+                // tree api is not available in older versions
+                if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                    mainStorage = null;
+                } else {
+                    try {
+                        mainStorage = new StoredDirectoryHelper(this, Uri.parse(path), tag);
+                        if (acquire) mainStorage.acquirePermissions();
+                    } catch (IOException e) {
+                        Log.e(TAG, "Failed to load the storage of " + tag + " from path: " + path, e);
+                        mainStorage = null;
+                    }
+                }
+            }
+        }
+
+        if (tag.equals(DownloadManager.TAG_VIDEO))
+            mManager.mMainStorageVideo = mainStorage;
+        else// if (tag.equals(DownloadManager.TAG_AUDIO))
+            mManager.mMainStorageAudio = mainStorage;
+    }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     // Wrappers for DownloadManager
     ////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public class DMBinder extends Binder {
+    public class DownloadManagerBinder extends Binder {
         public DownloadManager getDownloadManager() {
             return mManager;
         }
 
+        @Nullable
+        public StoredDirectoryHelper getMainStorageVideo() {
+            return mManager.mMainStorageVideo;
+        }
+
+        @Nullable
+        public StoredDirectoryHelper getMainStorageAudio() {
+            return mManager.mMainStorageAudio;
+        }
+
         public void addMissionEventListener(Handler handler) {
             manageObservers(handler, true);
         }
@@ -548,10 +630,4 @@ public class DownloadManagerService extends Service {
 
     }
 
-    public interface DMChecker {
-        void callback(MissionCheck result);
-    }
-
-    public enum MissionCheck {None, Pending, PendingRunning, Finished}
-
 }
diff --git a/app/src/main/java/us/shandian/giga/service/MissionState.java b/app/src/main/java/us/shandian/giga/service/MissionState.java
new file mode 100644
index 000000000..2d7802ff5
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/service/MissionState.java
@@ -0,0 +1,5 @@
+package us.shandian.giga.service;
+
+public enum MissionState {
+    None, Pending, PendingRunning, Finished
+}
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index cada3aeb8..4d80588e0 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -49,6 +48,7 @@ import java.util.Collections;
 import us.shandian.giga.get.DownloadMission;
 import us.shandian.giga.get.FinishedMission;
 import us.shandian.giga.get.Mission;
+import us.shandian.giga.io.StoredFileHelper;
 import us.shandian.giga.service.DownloadManager;
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.common.Deleter;
@@ -69,6 +69,7 @@ import static us.shandian.giga.get.DownloadMission.ERROR_PERMISSION_DENIED;
 import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING;
 import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_HOLD;
 import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_STOPPED;
+import static us.shandian.giga.get.DownloadMission.ERROR_PROGRESS_LOST;
 import static us.shandian.giga.get.DownloadMission.ERROR_SSL_EXCEPTION;
 import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION;
 import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_HOST;
@@ -97,8 +98,9 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     private MenuItem mStartButton;
     private MenuItem mPauseButton;
     private View mEmptyMessage;
+    private RecoverHelper mRecover;
 
-    public MissionAdapter(Context context, DownloadManager downloadManager, View emptyMessage) {
+    public MissionAdapter(Context context, @NonNull DownloadManager downloadManager, View emptyMessage) {
         mContext = context;
         mDownloadManager = downloadManager;
         mDeleter = null;
@@ -156,7 +158,11 @@ public class MissionAdapter extends Adapter<ViewHolder> {
 
         if (h.item.mission instanceof DownloadMission) {
             mPendingDownloadsItems.remove(h);
-            if (mPendingDownloadsItems.size() < 1) setAutoRefresh(false);
+            if (mPendingDownloadsItems.size() < 1) {
+                setAutoRefresh(false);
+                if (mStartButton != null) mStartButton.setVisible(false);
+                if (mPauseButton != null) mPauseButton.setVisible(false);
+            }
         }
 
         h.popupMenu.dismiss();
@@ -189,10 +195,10 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         ViewHolderItem h = (ViewHolderItem) view;
         h.item = item;
 
-        Utility.FileType type = Utility.getFileType(item.mission.kind, item.mission.name);
+        Utility.FileType type = Utility.getFileType(item.mission.kind, item.mission.storage.getName());
 
         h.icon.setImageResource(Utility.getIconForFileType(type));
-        h.name.setText(item.mission.name);
+        h.name.setText(item.mission.storage.getName());
 
         h.progress.setColors(Utility.getBackgroundForFileType(mContext, type), Utility.getForegroundForFileType(mContext, type));
 
@@ -273,7 +279,7 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         long length = mission.getLength();
 
         int state;
-        if (mission.isPsFailed()) {
+        if (mission.isPsFailed() || mission.errCode == ERROR_POSTPROCESSING_HOLD) {
             state = 0;
         } else if (!mission.running) {
             state = mission.enqueued ? 1 : 2;
@@ -334,11 +340,17 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         if (BuildConfig.DEBUG)
             Log.v(TAG, "Mime: " + mimeType + " package: " + BuildConfig.APPLICATION_ID + ".provider");
 
-        Uri uri = FileProvider.getUriForFile(
-                mContext,
-                BuildConfig.APPLICATION_ID + ".provider",
-                mission.getDownloadedFile()
-        );
+        Uri uri;
+
+        if (mission.storage.isDirect()) {
+            uri = FileProvider.getUriForFile(
+                    mContext,
+                    BuildConfig.APPLICATION_ID + ".provider",
+                    mission.storage.getIOFile()
+            );
+        } else {
+            uri = mission.storage.getUri();
+        }
 
         Intent intent = new Intent();
         intent.setAction(Intent.ACTION_VIEW);
@@ -366,13 +378,13 @@ public class MissionAdapter extends Adapter<ViewHolder> {
 
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.setType(resolveMimeType(mission));
-        intent.putExtra(Intent.EXTRA_STREAM, mission.getDownloadedFile().toURI());
+        intent.putExtra(Intent.EXTRA_STREAM, mission.storage.getUri());
 
         mContext.startActivity(Intent.createChooser(intent, null));
     }
 
     private static String resolveMimeType(@NonNull Mission mission) {
-        String ext = Utility.getFileExt(mission.getDownloadedFile().getName());
+        String ext = Utility.getFileExt(mission.storage.getName());
         if (ext == null) return DEFAULT_MIME_TYPE;
 
         String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
@@ -381,7 +393,7 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     }
 
     private boolean checkInvalidFile(@NonNull Mission mission) {
-        if (mission.getDownloadedFile().exists()) return false;
+        if (mission.storage.existsAsFile()) return false;
 
         Toast.makeText(mContext, R.string.missing_file, Toast.LENGTH_SHORT).show();
         return true;
@@ -462,6 +474,8 @@ public class MissionAdapter extends Adapter<ViewHolder> {
             case ERROR_UNKNOWN_EXCEPTION:
                 showError(mission.errObject, UserAction.DOWNLOAD_FAILED, R.string.general_error);
                 return;
+            case ERROR_PROGRESS_LOST:
+                msg = R.string.error_progress_lost;
             default:
                 if (mission.errCode >= 100 && mission.errCode < 600) {
                     msgEx = "HTTP " + mission.errCode;
@@ -490,7 +504,7 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         }
 
         builder.setNegativeButton(android.R.string.ok, (dialog, which) -> dialog.cancel())
-                .setTitle(mission.name)
+                .setTitle(mission.storage.getName())
                 .create()
                 .show();
     }
@@ -539,6 +553,10 @@ public class MissionAdapter extends Adapter<ViewHolder> {
                     updateProgress(h);
                     return true;
                 case R.id.retry:
+                    if (mission.hasInvalidStorage()) {
+                        mRecover.tryRecover(mission);
+                        return true;
+                    }
                     mission.psContinue(true);
                     return true;
                 case R.id.cancel:
@@ -561,7 +579,7 @@ public class MissionAdapter extends Adapter<ViewHolder> {
                 return true;
             case R.id.md5:
             case R.id.sha1:
-                new ChecksumTask(mContext).execute(h.item.mission.getDownloadedFile().getAbsolutePath(), ALGORITHMS.get(id));
+                new ChecksumTask(mContext).execute(h.item.mission.storage, ALGORITHMS.get(id));
                 return true;
             case R.id.source:
                 /*Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(h.item.mission.source));
@@ -641,19 +659,38 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     }
 
 
-    public void deleterDispose(Bundle bundle) {
-        if (mDeleter != null) mDeleter.dispose(bundle);
+    public void deleterDispose(boolean commitChanges) {
+        if (mDeleter != null) mDeleter.dispose(commitChanges);
     }
 
-    public void deleterLoad(Bundle bundle, View view) {
+    public void deleterLoad(View view) {
         if (mDeleter == null)
-            mDeleter = new Deleter(bundle, view, mContext, this, mDownloadManager, mIterator, mHandler);
+            mDeleter = new Deleter(view, mContext, this, mDownloadManager, mIterator, mHandler);
     }
 
     public void deleterResume() {
         if (mDeleter != null) mDeleter.resume();
     }
 
+    public void recoverMission(DownloadMission mission, StoredFileHelper newStorage) {
+        for (ViewHolderItem h : mPendingDownloadsItems) {
+            if (mission != h.item.mission) continue;
+
+            mission.changeStorage(newStorage);
+            mission.errCode = DownloadMission.ERROR_NOTHING;
+            mission.errObject = null;
+
+            h.status.setText(UNDEFINED_PROGRESS);
+            h.state = -1;
+            h.size.setText(Utility.formatBytes(mission.getLength()));
+            h.progress.setMarquee(true);
+
+            mDownloadManager.resumeMission(mission);
+            return;
+        }
+
+    }
+
 
     private boolean mUpdaterRunning = false;
     private final Runnable rUpdater = this::updater;
@@ -695,6 +732,10 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         return Float.isNaN(value) || Float.isInfinite(value);
     }
 
+    public void setRecover(@NonNull RecoverHelper callback) {
+        mRecover = callback;
+    }
+
 
     class ViewHolderItem extends RecyclerView.ViewHolder {
         DownloadManager.MissionItem item;
@@ -780,7 +821,11 @@ public class MissionAdapter extends Adapter<ViewHolder> {
             DownloadMission mission = item.mission instanceof DownloadMission ? (DownloadMission) item.mission : null;
 
             if (mission != null) {
-                if (mission.isPsRunning()) {
+                if (mission.hasInvalidStorage()) {
+                    retry.setEnabled(true);
+                    delete.setEnabled(true);
+                    showError.setEnabled(true);
+                } else if (mission.isPsRunning()) {
                     switch (mission.errCode) {
                         case ERROR_INSUFFICIENT_STORAGE:
                         case ERROR_POSTPROCESSING_HOLD:
@@ -838,7 +883,7 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     }
 
 
-    static class ChecksumTask extends AsyncTask<String, Void, String> {
+    static class ChecksumTask extends AsyncTask<Object, Void, String> {
         ProgressDialog progressDialog;
         WeakReference<Activity> weakReference;
 
@@ -861,8 +906,8 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         }
 
         @Override
-        protected String doInBackground(String... params) {
-            return Utility.checksum(params[0], params[1]);
+        protected String doInBackground(Object... params) {
+            return Utility.checksum((StoredFileHelper) params[0], (String) params[1]);
         }
 
         @Override
@@ -889,4 +934,8 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         }
     }
 
+    public interface RecoverHelper {
+        void tryRecover(DownloadMission mission);
+    }
+
 }
diff --git a/app/src/main/java/us/shandian/giga/ui/common/Deleter.java b/app/src/main/java/us/shandian/giga/ui/common/Deleter.java
index 6407ab019..573bead94 100644
--- a/app/src/main/java/us/shandian/giga/ui/common/Deleter.java
+++ b/app/src/main/java/us/shandian/giga/ui/common/Deleter.java
@@ -3,8 +3,6 @@ package us.shandian.giga.ui.common;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
-import android.net.Uri;
-import android.os.Bundle;
 import android.os.Handler;
 import android.support.design.widget.Snackbar;
 import android.view.View;
@@ -23,8 +21,6 @@ public class Deleter {
     private static final int TIMEOUT = 5000;// ms
     private static final int DELAY = 350;// ms
     private static final int DELAY_RESUME = 400;// ms
-    private static final String BUNDLE_NAMES = "us.shandian.giga.ui.common.deleter.names";
-    private static final String BUNDLE_LOCATIONS = "us.shandian.giga.ui.common.deleter.locations";
 
     private Snackbar snackbar;
     private ArrayList<Mission> items;
@@ -41,7 +37,7 @@ public class Deleter {
     private final Runnable rNext;
     private final Runnable rCommit;
 
-    public Deleter(Bundle b, View v, Context c, MissionAdapter a, DownloadManager d, MissionIterator i, Handler h) {
+    public Deleter(View v, Context c, MissionAdapter a, DownloadManager d, MissionIterator i, Handler h) {
         mView = v;
         mContext = c;
         mAdapter = a;
@@ -55,27 +51,6 @@ public class Deleter {
         rCommit = this::commit;
 
         items = new ArrayList<>(2);
-
-        if (b != null) {
-            String[] names = b.getStringArray(BUNDLE_NAMES);
-            String[] locations = b.getStringArray(BUNDLE_LOCATIONS);
-
-            if (names == null || locations == null) return;
-            if (names.length < 1 || locations.length < 1) return;
-            if (names.length != locations.length) return;
-
-            items.ensureCapacity(names.length);
-
-            for (int j = 0; j < locations.length; j++) {
-                Mission mission = mDownloadManager.getAnyMission(locations[j], names[j]);
-                if (mission == null) continue;
-
-                items.add(mission);
-                mIterator.hide(mission);
-            }
-
-            if (items.size() > 0) resume();
-        }
     }
 
     public void append(Mission item) {
@@ -104,7 +79,7 @@ public class Deleter {
     private void next() {
         if (items.size() < 1) return;
 
-        String msg = mContext.getString(R.string.file_deleted).concat(":\n").concat(items.get(0).name);
+        String msg = mContext.getString(R.string.file_deleted).concat(":\n").concat(items.get(0).storage.getName());
 
         snackbar = Snackbar.make(mView, msg, Snackbar.LENGTH_INDEFINITE);
         snackbar.setAction(R.string.undo, s -> forget());
@@ -125,7 +100,7 @@ public class Deleter {
             mDownloadManager.deleteMission(mission);
 
             if (mission instanceof FinishedMission) {
-                mContext.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(mission.getDownloadedFile())));
+                mContext.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, mission.storage.getUri()));
             }
             break;
         }
@@ -151,27 +126,14 @@ public class Deleter {
         mHandler.postDelayed(rShow, DELAY_RESUME);
     }
 
-    public void dispose(Bundle bundle) {
+    public void dispose(boolean commitChanges) {
         if (items.size() < 1) return;
 
         pause();
 
-        if (bundle == null) {
-            for (Mission mission : items) mDownloadManager.deleteMission(mission);
-            items = null;
-            return;
-        }
+        if (!commitChanges) return;
 
-        String[] names = new String[items.size()];
-        String[] locations = new String[items.size()];
-
-        for (int i = 0; i < items.size(); i++) {
-            Mission mission = items.get(i);
-            names[i] = mission.name;
-            locations[i] = mission.location;
-        }
-
-        bundle.putStringArray(BUNDLE_NAMES, names);
-        bundle.putStringArray(BUNDLE_LOCATIONS, locations);
+        for (Mission mission : items) mDownloadManager.deleteMission(mission);
+        items = null;
     }
 }
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index a3786a5e6..82ab777b0 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -1,7 +1,6 @@
 package us.shandian.giga.ui.fragment;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -10,6 +9,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -18,18 +18,24 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.io.IOException;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.io.StoredFileHelper;
 import us.shandian.giga.service.DownloadManager;
 import us.shandian.giga.service.DownloadManagerService;
-import us.shandian.giga.service.DownloadManagerService.DMBinder;
+import us.shandian.giga.service.DownloadManagerService.DownloadManagerBinder;
 import us.shandian.giga.ui.adapter.MissionAdapter;
 
 public class MissionsFragment extends Fragment {
 
     private static final int SPAN_SIZE = 2;
+    private static final int REQUEST_DOWNLOAD_PATH_SAF = 0x1230;
 
     private SharedPreferences mPrefs;
     private boolean mLinear;
@@ -45,24 +51,32 @@ public class MissionsFragment extends Fragment {
     private LinearLayoutManager mLinearManager;
     private Context mContext;
 
-    private DMBinder mBinder;
-    private Bundle mBundle;
+    private DownloadManagerBinder mBinder;
     private boolean mForceUpdate;
 
+    private DownloadMission unsafeMissionTarget = null;
+
     private ServiceConnection mConnection = new ServiceConnection() {
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder binder) {
-            mBinder = (DownloadManagerService.DMBinder) binder;
+            mBinder = (DownloadManagerBinder) binder;
             mBinder.clearDownloadNotifications();
 
             mAdapter = new MissionAdapter(mContext, mBinder.getDownloadManager(), mEmpty);
-            mAdapter.deleterLoad(mBundle, getView());
+            mAdapter.deleterLoad(getView());
+
+            mAdapter.setRecover(mission ->
+                    StoredFileHelper.requestSafWithFileCreation(
+                            MissionsFragment.this,
+                            REQUEST_DOWNLOAD_PATH_SAF,
+                            mission.storage.getName(),
+                            mission.storage.getType()
+                    )
+            );
 
             setAdapterButtons();
 
-            mBundle = null;
-
             mBinder.addMissionEventListener(mAdapter.getMessenger());
             mBinder.enableNotifications(false);
 
@@ -84,9 +98,6 @@ public class MissionsFragment extends Fragment {
         mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
         mLinear = mPrefs.getBoolean("linear", false);
 
-        //mContext = getActivity().getApplicationContext();
-        mBundle = savedInstanceState;
-
         // Bind the service
         mContext.bindService(new Intent(mContext, DownloadManagerService.class), mConnection, Context.BIND_AUTO_CREATE);
 
@@ -148,7 +159,7 @@ public class MissionsFragment extends Fragment {
         mBinder.removeMissionEventListener(mAdapter.getMessenger());
         mBinder.enableNotifications(true);
         mContext.unbindService(mConnection);
-        mAdapter.deleterDispose(null);
+        mAdapter.deleterDispose(true);
 
         mBinder = null;
         mAdapter = null;
@@ -178,10 +189,12 @@ public class MissionsFragment extends Fragment {
                 return true;
             case R.id.start_downloads:
                 item.setVisible(false);
+                mPause.setVisible(true);
                 mBinder.getDownloadManager().startAllMissions();
                 return true;
             case R.id.pause_downloads:
                 item.setVisible(false);
+                mStart.setVisible(true);
                 mBinder.getDownloadManager().pauseAllMissions(false);
                 mAdapter.ensurePausedMissions();// update items view
             default:
@@ -231,7 +244,7 @@ public class MissionsFragment extends Fragment {
         super.onSaveInstanceState(outState);
 
         if (mAdapter != null) {
-            mAdapter.deleterDispose(outState);
+            mAdapter.deleterDispose(false);
             mForceUpdate = true;
             mBinder.removeMissionEventListener(mAdapter.getMessenger());
         }
@@ -260,4 +273,22 @@ public class MissionsFragment extends Fragment {
         if (mAdapter != null) mAdapter.onPaused();
         if (mBinder != null) mBinder.enableNotifications(true);
     }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode != REQUEST_DOWNLOAD_PATH_SAF || resultCode != Activity.RESULT_OK) return;
+
+        if (unsafeMissionTarget == null || data.getData() == null) {
+            return;// unsafeMissionTarget cannot be null
+        }
+
+        try {
+            StoredFileHelper storage = new StoredFileHelper(mContext, data.getData(), unsafeMissionTarget.storage.getTag());
+            mAdapter.recoverMission(unsafeMissionTarget, storage);
+        } catch (IOException e) {
+            Toast.makeText(mContext, R.string.general_error, Toast.LENGTH_LONG).show();
+        }
+    }
 }
diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
index e5149cf9b..d77e598d8 100644
--- a/app/src/main/java/us/shandian/giga/util/Utility.java
+++ b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -12,11 +12,11 @@ import android.support.v4.content.ContextCompat;
 import android.widget.Toast;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.streams.io.SharpStream;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -25,7 +25,8 @@ import java.io.Serializable;
 import java.net.HttpURLConnection;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Locale;
+
+import us.shandian.giga.io.StoredFileHelper;
 
 public class Utility {
 
@@ -206,7 +207,7 @@ public class Utility {
         Toast.makeText(context, R.string.msg_copied, Toast.LENGTH_SHORT).show();
     }
 
-    public static String checksum(String path, String algorithm) {
+    public static String checksum(StoredFileHelper source, String algorithm) {
         MessageDigest md;
 
         try {
@@ -215,11 +216,11 @@ public class Utility {
             throw new RuntimeException(e);
         }
 
-        FileInputStream i;
+        SharpStream i;
 
         try {
-            i = new FileInputStream(path);
-        } catch (FileNotFoundException e) {
+            i = source.getStream();
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
 
@@ -247,15 +248,15 @@ public class Utility {
     }
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
-    public static boolean mkdir(File path, boolean allDirs) {
-        if (path.exists()) return true;
+    public static boolean mkdir(File p, boolean allDirs) {
+        if (p.exists()) return true;
 
         if (allDirs)
-            path.mkdirs();
+            p.mkdirs();
         else
-            path.mkdir();
+            p.mkdir();
 
-        return path.exists();
+        return p.exists();
     }
 
     public static long getContentLength(HttpURLConnection connection) {
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b7a0ec7b0..dbf015c87 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -462,12 +462,12 @@
     <string name="download_finished_more">%s أنتهى التحميل</string>
     <string name="generate_unique_name">إنشاء اسم فريد</string>
     <string name="overwrite">الكتابة فوق</string>
-    <string name="overwrite_warning">يوجد ملف تحميل بهذا الاسم موجود مسبقاً</string>
+    <string name="overwrite_finished_warning">يوجد ملف تحميل بهذا الاسم موجود مسبقاً</string>
     <string name="download_already_running">هنالك تحميل قيد التقدم بهذا الاسم</string>
     <string name="show_error">إظهار خطأ</string>
     <string name="label_code">كود</string>
-    <string name="error_path_creation">لا يمكن إنشاء الملف</string>
-    <string name="error_file_creation">لا يمكن إنشاء المجلد الوجهة</string>
+    <string name="error_file_creation">لا يمكن إنشاء الملف</string>
+    <string name="error_path_creation">لا يمكن إنشاء المجلد الوجهة</string>
     <string name="error_permission_denied">تم رفضها من قبل النظام</string>
     <string name="error_ssl_exception">فشل اتصال الأمن</string>
     <string name="error_unknown_host">تعذر العثور على الخادم</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 4285a73dc..f606281f4 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -432,8 +432,8 @@
     <string name="generate_unique_name">Genera un nom únic</string>
     <string name="show_error">Mostra l\'error</string>
     <string name="label_code">Codi</string>
-    <string name="error_path_creation">No es pot crear el fitxer</string>
-    <string name="error_file_creation">No es pot crear la carpeta de destinació</string>
+    <string name="error_file_creation">No es pot crear el fitxer</string>
+    <string name="error_path_creation">No es pot crear la carpeta de destinació</string>
     <string name="stop">Atura</string>
     <string name="events">Esdeveniments</string>
     <string name="app_update_notification_channel_description">Notificacions de noves versions del NewPipe</string>
diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml
index f6c8e3e4a..73eb43c36 100644
--- a/app/src/main/res/values-cmn/strings.xml
+++ b/app/src/main/res/values-cmn/strings.xml
@@ -437,11 +437,11 @@
     <string name="download_finished_more">%s已下载完毕</string>
     <string name="generate_unique_name">生成独特的名字</string>
     <string name="overwrite">覆写</string>
-    <string name="overwrite_warning">同名的已下载文件已经存在</string>
+    <string name="overwrite_finished_warning">同名的已下载文件已经存在</string>
     <string name="download_already_running">同名下载进行中</string>
     <string name="show_error">显示错误</string>
     <string name="label_code">代码</string>
-    <string name="error_path_creation">无法创建该文件</string>
+    <string name="error_file_creation">无法创建该文件</string>
     <string name="error_permission_denied">系统拒绝此批准</string>
     <string name="error_ssl_exception">安全连接失败</string>
     <string name="error_unknown_host">找不到服务器</string>
@@ -464,7 +464,7 @@
     <string name="grid">网格</string>
     <string name="switch_view">切换视图</string>
     <string name="app_update_notification_content_title">NewPipe 更新可用!</string>
-    <string name="error_file_creation">无法创建目标文件夹</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>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 4dc81f9c2..92535310e 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -372,8 +372,8 @@
     <string name="download_already_running">Der er en download i gang med dette navn</string>
     <string name="show_error">Vis fejl</string>
     <string name="label_code">Kode</string>
-    <string name="error_path_creation">Filen kan ikke oprettes</string>
-    <string name="error_file_creation">Destinationsmappen kan ikke oprettes</string>
+    <string name="error_file_creation">Filen kan ikke oprettes</string>
+    <string name="error_path_creation">Destinationsmappen kan ikke oprettes</string>
     <string name="error_permission_denied">Adgang nægtet af systemet</string>
     <string name="error_ssl_exception">Sikker forbindelse fejlede</string>
     <string name="error_unknown_host">Kunne ikke finde serveren</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dada4e80f..ef2789846 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -448,12 +448,12 @@
     <string name="download_finished_more">%s heruntergeladen</string>
     <string name="generate_unique_name">Eindeutigen Namen erzeugen</string>
     <string name="overwrite">Überschreiben</string>
-    <string name="overwrite_warning">Eine heruntergeladene Datei dieses Namens existiert bereits</string>
+    <string name="overwrite_finished_warning">Eine heruntergeladene Datei dieses Namens existiert bereits</string>
     <string name="download_already_running">Eine Datei dieses Namens wird gerade heruntergeladen</string>
     <string name="show_error">Fehler anzeigen</string>
     <string name="label_code">Code</string>
-    <string name="error_path_creation">Die Datei kann nicht erstellt werden</string>
-    <string name="error_file_creation">Der Zielordner kann nicht erstellt werden</string>
+    <string name="error_file_creation">Die Datei kann nicht erstellt werden</string>
+    <string name="error_path_creation">Der Zielordner kann nicht erstellt werden</string>
     <string name="error_permission_denied">System verweigert den Zugriff</string>
     <string name="error_ssl_exception">Sichere Verbindung fehlgeschlagen</string>
     <string name="error_unknown_host">Der Server konnte nicht gefunden werden</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 818efc74c..eee110474 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -14,7 +14,7 @@
     <string name="share_dialog_title">Compartir con</string>
     <string name="choose_browser">Elegir navegador</string>
     <string name="screen_rotation">rotación</string>
-    <string name="download_path_title">Ruta de descarga de vídeo</string>
+    <string name="download_path_title">Carpeta de descarga de vídeo</string>
     <string name="download_path_summary">Ruta para almacenar los vídeos descargados</string>
     <string name="download_path_dialog_title">Introducir directorio de descargas para vídeos</string>
     <string name="default_resolution_title">Resolución por defecto de vídeo</string>
@@ -40,7 +40,7 @@
     <string name="use_tor_summary">(Experimental) Forzar la descarga a través de Tor para una mayor privacidad (transmisión de vídeos aún no compatible).</string>
     <string name="err_dir_create">No se puede crear la carpeta de descarga \'%1$s\'</string>
     <string name="info_dir_created">Carpeta de descarga creada \'%1$s\'</string>
-    <string name="download_path_audio_summary">Los audios descargados se almacenan aquí</string>
+    <string name="download_path_audio_summary">Ruta para almacenar los audios descargados</string>
     <string name="download_path_audio_dialog_title">Introducir ruta de descarga para archivos de audio</string>
     <string name="blocked_by_gema">Bloqueado por GEMA</string>
     <string name="download_path_audio_title">Carpeta de descarga de audio</string>
@@ -418,7 +418,9 @@ abrir en modo popup</string>
     <!-- dialog about existing downloads -->
     <string name="generate_unique_name">Generar nombre único</string>
     <string name="overwrite">Sobrescribir</string>
-    <string name="overwrite_warning">Ya existe un archivo descargado con este nombre</string>
+    <string name="overwrite_unrelated_warning">Ya existe un archivo con este nombre</string>
+    <string name="overwrite_finished_warning">Ya existe un archivo descargado con este nombre</string>
+    <string name="overwrite_failed">No se puede sobrescribir el archivo</string>
     <string name="download_already_running">Hay una descarga en curso con este nombre</string>
     <string name="download_already_pending">Hay una descarga pendiente con este nombre</string>
 
@@ -440,8 +442,8 @@ abrir en modo popup</string>
     <!-- message dialog about download error -->
     <string name="show_error">Mostrar error</string>
     <string name="label_code">Codigo</string>
-    <string name="error_path_creation">No se puede crear la carpeta de destino</string>
-    <string name="error_file_creation">No se puede crear el archivo</string>
+    <string name="error_file_creation">No se puede crear la carpeta de destino</string>
+    <string name="error_path_creation">No se puede crear el archivo</string>
     <string name="error_permission_denied">Permiso denegado por el sistema</string>
     <string name="error_ssl_exception">Fallo la conexión segura</string>
     <string name="error_unknown_host">No se pudo encontrar el servidor</string>
@@ -453,6 +455,19 @@ abrir en modo popup</string>
     <string name="error_postprocessing_failed">Fallo el post-procesado</string>
     <string name="error_postprocessing_stopped">NewPipe se cerro mientras se trabajaba en el archivo</string>
     <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="downloads_storage">API de almacenamiento</string>
+    <string name="downloads_storage_desc">Seleccione que API utilizar para almacenar las descargas</string>
+
+    <string name="storage_access_framework_description">Framework de acceso a almacenamiento</string>
+    <string name="java_io_description">Java I/O</string>
+
+    <string name="save_as">Guardar como…</string>
+
+    <string name="download_to_sdcard_error_message">No es posible descargar a una tarjeta SD externa. \¿Restablecer la ubicación de la carpeta de descarga\?</string>
+
+    <string name="download_pick_path">Seleccione los directorios de descarga</string>
 
     <string name="unsubscribe">Desuscribirse</string>
     <string name="tab_new">Nueva pestaña</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 095bbfe5e..2868528e9 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -446,12 +446,12 @@
     <string name="download_finished_more">%s deskarga amaituta</string>
     <string name="generate_unique_name">Sortu izen bakana</string>
     <string name="overwrite">Gainidatzi</string>
-    <string name="overwrite_warning">Badago izen bera duen deskargatutako fitxategi bat</string>
+    <string name="overwrite_finished_warning">Badago izen bera duen deskargatutako fitxategi bat</string>
     <string name="download_already_running">Badago izen bera duen deskarga bat abian</string>
     <string name="show_error">Erakutsi errorea</string>
     <string name="label_code">Kodea</string>
-    <string name="error_path_creation">Ezin da fitxategia sortu</string>
-    <string name="error_file_creation">Ezin da helburu karpeta sortu</string>
+    <string name="error_file_creation">Ezin da fitxategia sortu</string>
+    <string name="error_path_creation">Ezin da helburu karpeta sortu</string>
     <string name="error_permission_denied">Sistemak baimena ukatu du</string>
     <string name="error_ssl_exception">Konexio seguruak huts egin du</string>
     <string name="error_unknown_host">Ezin izan da zerbitzaria aurkitu</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 9edee2411..41569ff0c 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -451,12 +451,12 @@
     <string name="download_finished_more">%s הורדות הסתיימו</string>
     <string name="generate_unique_name">יצירת שם ייחודי</string>
     <string name="overwrite">שכתוב</string>
-    <string name="overwrite_warning">כבר קיים קובץ בשם הזה</string>
+    <string name="overwrite_finished_warning">כבר קיים קובץ בשם הזה</string>
     <string name="download_already_running">אחת ההורדות הפעילות כבר נושאת את השם הזה</string>
     <string name="show_error">הצגת שגיאה</string>
     <string name="label_code">קוד</string>
-    <string name="error_path_creation">לא ניתן ליצור את הקובץ</string>
-    <string name="error_file_creation">לא ניתן ליצור את תיקיית היעד</string>
+    <string name="error_file_creation">לא ניתן ליצור את הקובץ</string>
+    <string name="error_path_creation">לא ניתן ליצור את תיקיית היעד</string>
     <string name="error_permission_denied">ההרשאה נדחתה על ידי המערכת</string>
     <string name="error_ssl_exception">החיבור המאובטח נכשל</string>
     <string name="error_unknown_host">לא ניתן למצוא את השרת</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 56f31eac6..31801434b 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -447,12 +447,12 @@
     <string name="download_finished_more">%s unduhan selesai</string>
     <string name="generate_unique_name">Hasilkan nama unik</string>
     <string name="overwrite">Timpa</string>
-    <string name="overwrite_warning">File yang diunduh dengan nama ini sudah ada</string>
+    <string name="overwrite_finished_warning">File yang diunduh dengan nama ini sudah ada</string>
     <string name="download_already_running">Ada unduhan yang sedang berlangsung dengan nama ini</string>
     <string name="show_error">Tunjukkan kesalahan</string>
     <string name="label_code">Kode</string>
-    <string name="error_path_creation">File tidak dapat dibuat</string>
-    <string name="error_file_creation">Folder tujuan tidak dapat dibuat</string>
+    <string name="error_file_creation">File tidak dapat dibuat</string>
+    <string name="error_path_creation">Folder tujuan tidak dapat dibuat</string>
     <string name="error_permission_denied">Izin ditolak oleh sistem</string>
     <string name="error_ssl_exception">Koneksi aman gagal</string>
     <string name="error_unknown_host">Tidak dapat menemukan server</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9bccc11df..4ff8de734 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -449,12 +449,12 @@
     <string name="download_finished_more">%s download finiti</string>
     <string name="generate_unique_name">Genera un nome unico</string>
     <string name="overwrite">Sovrascrivi</string>
-    <string name="overwrite_warning">Esiste già un file scaricato con lo stesso nome</string>
+    <string name="overwrite_finished_warning">Esiste già un file scaricato con lo stesso nome</string>
     <string name="download_already_running">C\'è un download in progresso con questo nome</string>
     <string name="show_error">Mostra errore</string>
     <string name="label_code">Codice</string>
-    <string name="error_path_creation">Impossibile creare il file</string>
-    <string name="error_file_creation">Impossibile creare la cartella di destinazione</string>
+    <string name="error_file_creation">Impossibile creare il file</string>
+    <string name="error_path_creation">Impossibile creare la cartella di destinazione</string>
     <string name="error_permission_denied">Permesso negato dal sistema</string>
     <string name="error_ssl_exception">Connessione sicura fallita</string>
     <string name="error_unknown_host">Impossibile trovare il server</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 124c3580b..78a20b1ab 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -365,10 +365,10 @@
     <string name="caption_auto_generated">自動生成</string>
     <string name="caption_setting_description">アプリの再起動後、設定した字幕設定が反映されます</string>
     <string name="empty_subscription_feed_subtitle">何もありません</string>
-    <string name="import_youtube_instructions">保存したエクスポートファイルからYouTubeの購読をインポート: 
-\n 
-\n1. このURLを開きます: %1$s 
-\n2. ログインしていなければログインします 
+    <string name="import_youtube_instructions">保存したエクスポートファイルからYouTubeの購読をインポート:
+\n
+\n1. このURLを開きます: %1$s
+\n2. ログインしていなければログインします
 \n3. ダウンロードが始まります (これがエクスポートファイルです)</string>
     <string name="playback_reset">リセット</string>
     <string name="accept">同意する</string>
@@ -391,8 +391,8 @@
 \n3. 必要に応じてログインします
 \n4. リダイレクトされたプロファイル URL をコピーします。</string>
     <string name="import_soundcloud_instructions_hint">あなたのID, soundcloud.com/あなたのid</string>
-    <string name="import_network_expensive_warning">この操作により通信料金が増えることがあります。ご注意ください。 
-\n 
+    <string name="import_network_expensive_warning">この操作により通信料金が増えることがあります。ご注意ください。
+\n
 \n続行しますか\?</string>
     <string name="playback_speed_control">再生速度を変更</string>
     <string name="unhook_checkbox">速度と音程を連動せずに変更 (歪むかもしれません)</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 7c8b56bec..ced8235f7 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -443,12 +443,12 @@
     <string name="download_finished_more">%s muat turun selesai</string>
     <string name="generate_unique_name">Menjana nama yang unik</string>
     <string name="overwrite">Timpa</string>
-    <string name="overwrite_warning">Fail yang dimuat turun dengan nama ini sudah wujud</string>
+    <string name="overwrite_finished_warning">Fail yang dimuat turun dengan nama ini sudah wujud</string>
     <string name="download_already_running">Terdapat muat turun yang sedang berjalan dengan nama ini</string>
     <string name="show_error">Tunjukkan kesilapan</string>
     <string name="label_code">Kod</string>
-    <string name="error_path_creation">Fail tidak boleh dibuat</string>
-    <string name="error_file_creation">Folder destinasi tidak boleh dibuat</string>
+    <string name="error_file_creation">Fail tidak boleh dibuat</string>
+    <string name="error_path_creation">Folder destinasi tidak boleh dibuat</string>
     <string name="error_permission_denied">Kebenaran ditolak oleh sistem</string>
     <string name="error_ssl_exception">Sambungan selamat gagal</string>
     <string name="error_unknown_host">Tidak dapat mencari server</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index a806df31a..2f5d19c67 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -526,12 +526,12 @@
     <string name="download_finished_more">%s nedlastinger fullført</string>
     <string name="generate_unique_name">Generer unikt navn</string>
     <string name="overwrite">Overskriv</string>
-    <string name="overwrite_warning">Nedlastet fil ved dette navnet finnes allerede</string>
+    <string name="overwrite_finished_warning">Nedlastet fil ved dette navnet finnes allerede</string>
     <string name="download_already_running">Nedlasting med dette navnet underveis allerede</string>
     <string name="show_error">Vis feil</string>
     <string name="label_code">Kode</string>
-    <string name="error_path_creation">Filen kan ikke opprettes</string>
-    <string name="error_file_creation">Målmappen kan ikke opprettes</string>
+    <string name="error_file_creation">Filen kan ikke opprettes</string>
+    <string name="error_path_creation">Målmappen kan ikke opprettes</string>
     <string name="error_permission_denied">Tilgang nektet av systemet</string>
     <string name="error_ssl_exception">Sikker tilkobling mislyktes</string>
     <string name="error_unknown_host">Fant ikke tjeneren</string>
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 51a30aa36..44b2ef6ab 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -445,12 +445,12 @@
     <string name="download_finished_more">%s downloads voltooid</string>
     <string name="generate_unique_name">Unieke naam genereren</string>
     <string name="overwrite">Overschrijven</string>
-    <string name="overwrite_warning">Der bestaat al een gedownload bestand met deze naam</string>
+    <string name="overwrite_finished_warning">Der bestaat al een gedownload bestand met deze naam</string>
     <string name="download_already_running">Der is al een download met deze naam bezig</string>
     <string name="show_error">Foutmelding weergeven</string>
     <string name="label_code">Code</string>
-    <string name="error_path_creation">Het bestand kan niet aangemaakt worden</string>
-    <string name="error_file_creation">De doelmap kan niet aangemaakt worden</string>
+    <string name="error_file_creation">Het bestand kan niet aangemaakt worden</string>
+    <string name="error_path_creation">De doelmap kan niet aangemaakt worden</string>
     <string name="error_permission_denied">Toelating geweigerd door het systeem</string>
     <string name="error_ssl_exception">Beveiligde verbinding is mislukt</string>
     <string name="error_unknown_host">Kon de server niet vinden</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 04b47c4c8..96de68b57 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -449,12 +449,12 @@
     <string name="download_finished_more">%s downloads voltooid</string>
     <string name="generate_unique_name">Genereer een unieke naam</string>
     <string name="overwrite">Overschrijven</string>
-    <string name="overwrite_warning">Er bestaat al een gedownload bestand met deze naam</string>
+    <string name="overwrite_finished_warning">Er bestaat al een gedownload bestand met deze naam</string>
     <string name="download_already_running">Er is een download aan de gang met deze naam</string>
     <string name="show_error">Toon foutmelding</string>
     <string name="label_code">Code</string>
-    <string name="error_path_creation">Het bestand kan niet worden gemaakt</string>
-    <string name="error_file_creation">De doelmap kan niet worden gemaakt</string>
+    <string name="error_file_creation">Het bestand kan niet worden gemaakt</string>
+    <string name="error_path_creation">De doelmap kan niet worden gemaakt</string>
     <string name="error_permission_denied">Toestemming door het systeem geweigerd</string>
     <string name="error_ssl_exception">Beveiligde connectie is mislukt</string>
     <string name="error_unknown_host">Kon de server niet vinden</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4fedc93d9..29070990f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -446,12 +446,12 @@
     <string name="download_finished_more">%s pobieranie zostało zakończone</string>
     <string name="generate_unique_name">Wygeneruj unikalną nazwę</string>
     <string name="overwrite">Zastąp</string>
-    <string name="overwrite_warning">Pobrany plik o tej nazwie już istnieje</string>
+    <string name="overwrite_finished_warning">Pobrany plik o tej nazwie już istnieje</string>
     <string name="download_already_running">Trwa pobieranie z tą nazwą</string>
     <string name="show_error">Pokaż błąd</string>
     <string name="label_code">Kod</string>
-    <string name="error_path_creation">Nie można utworzyć pliku</string>
-    <string name="error_file_creation">Nie można utworzyć folderu docelowego</string>
+    <string name="error_file_creation">Nie można utworzyć pliku</string>
+    <string name="error_path_creation">Nie można utworzyć folderu docelowego</string>
     <string name="error_permission_denied">Odmowa dostępu do systemu</string>
     <string name="error_ssl_exception">Bezpieczne połączenie nie powiodło się</string>
     <string name="error_unknown_host">Nie można znaleźć serwera</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 798131f37..8a16b752d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -446,12 +446,12 @@ abrir em modo popup</string>
     <string name="download_finished_more">%s downloads terminados</string>
     <string name="generate_unique_name">Gerar nome único</string>
     <string name="overwrite">"Sobrescrever "</string>
-    <string name="overwrite_warning">Um arquivo baixado com esse nome já existe</string>
+    <string name="overwrite_finished_warning">Um arquivo baixado com esse nome já existe</string>
     <string name="download_already_running">Existe um download em progresso com esse nome</string>
     <string name="show_error">Mostrar erro</string>
     <string name="label_code">Código</string>
-    <string name="error_path_creation">O arquivo não pode ser criado</string>
-    <string name="error_file_creation">A pasta de destino não pode ser criada</string>
+    <string name="error_file_creation">O arquivo não pode ser criado</string>
+    <string name="error_path_creation">A pasta de destino não pode ser criada</string>
     <string name="error_permission_denied">Permissão negada pelo sistema</string>
     <string name="error_ssl_exception">"Falha na conexão segura "</string>
     <string name="error_unknown_host">Não foi possível encontrar o servidor</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 9db2e401a..a86c5b809 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -442,12 +442,12 @@
     <string name="download_finished_more">%s descargas terminadas</string>
     <string name="generate_unique_name">Gerar nome único</string>
     <string name="overwrite">Sobrescrever</string>
-    <string name="overwrite_warning">Um ficheiro descarregado com este nome já existe</string>
+    <string name="overwrite_finished_warning">Um ficheiro descarregado com este nome já existe</string>
     <string name="download_already_running">Já existe uma descarga em curso com este nome</string>
     <string name="show_error">Mostrar erro</string>
     <string name="label_code">Código</string>
-    <string name="error_path_creation">O ficheiro não pode ser criado</string>
-    <string name="error_file_creation">A pasta de destino não pode ser criada</string>
+    <string name="error_file_creation">O ficheiro não pode ser criado</string>
+    <string name="error_path_creation">A pasta de destino não pode ser criada</string>
     <string name="error_permission_denied">Permissão negada pelo sistema</string>
     <string name="error_ssl_exception">Ligação segura falhou</string>
     <string name="error_unknown_host">Não foi possível encontrar o servidor</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d4bf5d803..620ca5619 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -442,12 +442,12 @@
     <string name="permission_denied">Действие запрещено системой</string>
     <string name="download_failed">Ошибка загрузки</string>
     <string name="overwrite">Перезаписать</string>
-    <string name="overwrite_warning">Файл с таким именем уже существует</string>
+    <string name="overwrite_finished_warning">Файл с таким именем уже существует</string>
     <string name="download_already_running">Загрузка с таким именем уже выполняется</string>
     <string name="show_error">Показать текст ошибки</string>
     <string name="label_code">Код</string>
-    <string name="error_path_creation">Файл не может быть создан</string>
-    <string name="error_file_creation">Папка назначения не может быть создана</string>
+    <string name="error_path_creation">Папка назначения не может быть создана</string>
+    <string name="error_file_creation">Файл не может быть создан</string>
     <string name="error_permission_denied">Доступ запрещен системой</string>
     <string name="error_unknown_host">Сервер не найден</string>
     <string name="error_http_unsupported_range">"Сервер не поддерживает многопотоковую  загрузку, попробуйте с @string/msg_threads = 1"</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5209fe250..e518a1c0f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -449,12 +449,12 @@
     <string name="download_finished_more">%s indirme bitti</string>
     <string name="generate_unique_name">Benzersiz ad oluştur</string>
     <string name="overwrite">Üzerine yaz</string>
-    <string name="overwrite_warning">Bu ada sahip indirilen bir dosya zaten var</string>
+    <string name="overwrite_finished_warning">Bu ada sahip indirilen bir dosya zaten var</string>
     <string name="download_already_running">Bu ad ile devam eden bir indirme var</string>
     <string name="show_error">Hatayı göster</string>
     <string name="label_code">Kod</string>
-    <string name="error_path_creation">Dosya oluşturulamıyor</string>
-    <string name="error_file_creation">Hedef klasör oluşturulamıyor</string>
+    <string name="error_file_creation">Dosya oluşturulamıyor</string>
+    <string name="error_path_creation">Hedef klasör oluşturulamıyor</string>
     <string name="error_permission_denied">İzin sistem tarafından reddedildi</string>
     <string name="error_ssl_exception">Güvenli bağlantı başarısız</string>
     <string name="error_unknown_host">Sunucu bulunamadı</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index b1899622f..ff247c579 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -440,11 +440,11 @@
     <string name="download_finished_more">%s tải về đã xong</string>
     <string name="generate_unique_name">Tạo tên riêng biệt</string>
     <string name="overwrite">Ghi đè</string>
-    <string name="overwrite_warning">Có một tệp đã tải về trùng tên</string>
+    <string name="overwrite_finished_warning">Có một tệp đã tải về trùng tên</string>
     <string name="download_already_running">Có một tệp trùng tên đang tải về</string>
     <string name="show_error">Hiện lỗi</string>
-    <string name="error_path_creation">Không thể tạo tệp</string>
-    <string name="error_file_creation">Không thể tạo thư mục đích</string>
+    <string name="error_file_creation">Không thể tạo tệp</string>
+    <string name="error_path_creation">Không thể tạo thư mục đích</string>
     <string name="error_permission_denied">Quyền bị từ chối bởi hệ thống</string>
     <string name="error_ssl_exception">Không thể tạo kết nối an toàn</string>
     <string name="error_unknown_host">Không thể tìm máy chủ</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 441061657..0194418cf 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -445,12 +445,12 @@
     <string name="download_finished_more">%s 個下載已結束</string>
     <string name="generate_unique_name">生成獨特的名稱</string>
     <string name="overwrite">覆寫</string>
-    <string name="overwrite_warning">已有此名稱的已下載檔案</string>
+    <string name="overwrite_finished_warning">已有此名稱的已下載檔案</string>
     <string name="download_already_running">已有此名稱的當案的下載正在進行</string>
     <string name="show_error">顯示錯誤</string>
     <string name="label_code">代碼</string>
-    <string name="error_path_creation">無法建立檔案</string>
-    <string name="error_file_creation">無法建立目的地資料夾</string>
+    <string name="error_file_creation">無法建立檔案</string>
+    <string name="error_path_creation">無法建立目的地資料夾</string>
     <string name="error_permission_denied">被系統拒絕的權限</string>
     <string name="error_ssl_exception">安全連線失敗</string>
     <string name="error_unknown_host">找不到伺服器</string>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 214a074c4..b2be3135b 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -11,7 +11,7 @@
     <string name="saved_tabs_key" translatable="false">saved_tabs_key</string>
 
     <!-- Key values -->
-    <string name="download_path_key" translatable="false">download_path</string>
+    <string name="download_path_video_key" translatable="false">download_path</string>
     <string name="download_path_audio_key" translatable="false">download_path_audio</string>
 
     <string name="use_external_video_player_key" translatable="false">use_external_video_player</string>
@@ -160,6 +160,21 @@
     <string name="clear_views_history_key" translatable="false">clear_play_history</string>
     <string name="clear_search_history_key" translatable="false">clear_search_history</string>
 
+    <string name="downloads_storage_api" translatable="false">downloads_storage_api</string>
+
+    <!-- WARNING: changing the default value will require update the code too  -->
+    <string name="downloads_storage_api_default" translatable="false">javaIO</string>
+
+    <string-array name="downloads_storage_api_values" translatable="false">
+        <item translatable="false">SAF</item>
+        <item translatable="false">javaIO</item>
+    </string-array>
+
+    <string-array name="downloads_storage_api_description" translatable="true">
+        <item translatable="true">@string/storage_access_framework_description</item>
+        <item translatable="true">@string/java_io_description</item>
+    </string-array>
+
     <!-- FileName Downloads  -->
     <string name="settings_file_charset_key" translatable="false">file_rename</string>
     <string name="settings_file_replacement_character_key" translatable="false">file_replacement_character</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index afc6afeb3..7907d2974 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -176,7 +176,7 @@
     <!-- error strings -->
     <string name="general_error">Error</string>
     <string name="download_to_sdcard_error_title">External storage unavailable</string>
-    <string name="download_to_sdcard_error_message">Downloading to external SD card not yet possible. Reset download folder location\?</string>
+    <string name="download_to_sdcard_error_message">Downloading to external SD card not possible. Reset download folder location\?</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>
@@ -512,15 +512,17 @@
     <!-- dialog about existing downloads -->
     <string name="generate_unique_name">Generate unique name</string>
     <string name="overwrite">Overwrite</string>
-    <string name="overwrite_warning">A downloaded file with this name already exists</string>
+    <string name="overwrite_unrelated_warning">A file with this name already exists</string>
+    <string name="overwrite_finished_warning">A downloaded file with this name already exists</string>
+    <string name="overwrite_failed">cannot overwrite the file</string>
     <string name="download_already_running">There is a download in progress with this name</string>
     <string name="download_already_pending">There is a pending download with this name</string>
 
     <!-- message dialog about download error -->
     <string name="show_error">Show error</string>
     <string name="label_code">Code</string>
-    <string name="error_path_creation">The file can not be created</string>
-    <string name="error_file_creation">The destination folder can not be created</string>
+    <string name="error_file_creation">The file can not be created</string>
+    <string name="error_path_creation">The destination folder can not be created</string>
     <string name="error_permission_denied">Permission denied by the system</string>
     <string name="error_ssl_exception">Secure connection failed</string>
     <string name="error_unknown_host">Could not find the server</string>
@@ -532,6 +534,7 @@
     <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="clear_finished_download">Clear finished downloads</string>
     <string name="msg_pending_downloads">Continue your %s pending transfers from Downloads</string>
@@ -546,4 +549,14 @@
     <string name="start_downloads">Start downloads</string>
     <string name="pause_downloads">Pause downloads</string>
 
+    <string name="downloads_storage">Storage API</string>
+    <string name="downloads_storage_desc">Select which API use to store the downloads</string>
+
+    <string name="storage_access_framework_description">Storage Access Framework</string>
+    <string name="java_io_description">Java I/O</string>
+
+    <string name="save_as">Save as…</string>
+
+    <string name="download_pick_path">Select the downloads save path</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index 9f32e7f2f..bbb91acac 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -4,10 +4,26 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_category_downloads_title">
 
+
+    <Preference
+        app:iconSpaceReserved="false"
+        android:key="saf_test"
+        android:summary="Realiza una prueba del Storage Access Framework de Android"
+        android:title="Probar SAF"/>
+
+    <ListPreference
+        app:iconSpaceReserved="false"
+        android:defaultValue="@string/downloads_storage_api_default"
+        android:entries="@array/downloads_storage_api_description"
+        android:entryValues="@array/downloads_storage_api_values"
+        android:key="@string/downloads_storage_api"
+        android:summary="@string/downloads_storage_desc"
+        android:title="@string/downloads_storage" />
+
     <Preference
         app:iconSpaceReserved="false"
         android:dialogTitle="@string/download_path_dialog_title"
-        android:key="@string/download_path_key"
+        android:key="@string/download_path_video_key"
         android:summary="@string/download_path_summary"
         android:title="@string/download_path_title"/>
 

From d00dc798f468cf1e9f47ad8703b866259ebfdd32 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Tue, 9 Apr 2019 18:38:34 -0300
Subject: [PATCH 129/138] more SAF implementation * full support for Directory
 API (Android Lollipop or later) * best effort to handle any kind errors
 (missing file, revoked permissions, etc) and recover the download *
 implemented directory choosing * fix download database version upgrading *
 misc. cleanup * do not release permission on the old save path (if the user
 change the download directory) under SAF api

---
 .../newpipe/download/DownloadDialog.java      | 202 ++++++++------
 .../settings/DownloadSettingsFragment.java    | 164 +++++++----
 .../schabi/newpipe/streams/DataReader.java    |   4 +-
 .../newpipe/streams/Mp4FromDashWriter.java    |   8 +-
 .../schabi/newpipe/util/FilenameUtils.java    |  26 +-
 .../giga/get/DownloadInitializer.java         |   2 +-
 .../us/shandian/giga/get/DownloadMission.java |  41 ++-
 .../shandian/giga/get/DownloadRunnable.java   |   8 +-
 .../us/shandian/giga/get/FinishedMission.java |   2 +
 .../java/us/shandian/giga/get/Mission.java    |  14 +-
 .../giga/get/sqlite/FinishedMissionStore.java |  44 ++-
 .../shandian/giga/io/CircularFileWriter.java  |  91 ++++--
 .../us/shandian/giga/io/FileStreamSAF.java    |   5 +
 .../giga/io/StoredDirectoryHelper.java        | 263 +++++++++++-------
 .../us/shandian/giga/io/StoredFileHelper.java | 248 +++++++++++------
 .../giga/postprocessing/Mp4FromDashMuxer.java |   2 +-
 .../giga/postprocessing/Postprocessing.java   |  15 +-
 .../giga/postprocessing/WebMMuxer.java        |   2 +-
 .../giga/service/DownloadManager.java         | 171 ++++++------
 .../giga/service/DownloadManagerService.java  | 134 +++++----
 .../giga/ui/adapter/MissionAdapter.java       |  33 ++-
 .../giga/ui/fragment/MissionsFragment.java    |  29 +-
 .../java/us/shandian/giga/util/Utility.java   |   2 +
 app/src/main/res/values-es/strings.xml        |   4 +-
 app/src/main/res/values/settings_keys.xml     |  12 +-
 app/src/main/res/values/strings.xml           |   3 +-
 app/src/main/res/xml/download_settings.xml    |   6 -
 assets/db.dia                                 | Bin 2520 -> 2508 bytes
 28 files changed, 946 insertions(+), 589 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 4525c5988..8f4b569cd 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -15,12 +15,13 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.app.DialogFragment;
+import android.support.v4.provider.DocumentFile;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.view.menu.ActionMenuItemView;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -177,9 +178,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             return;
         }
 
-        final Context context = getContext();
-        if (context == null)
-            throw new RuntimeException("Context was null");
+        context = getContext();
 
         setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context));
         Icepick.restoreInstanceState(this, savedInstanceState);
@@ -321,11 +320,15 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                 showFailedDialog(R.string.general_error);
                 return;
             }
-            try {
-                continueSelectedDownload(new StoredFileHelper(getContext(), data.getData(), ""));
-            } catch (IOException e) {
-                showErrorActivity(e);
+
+            DocumentFile docFile = DocumentFile.fromSingleUri(context, data.getData());
+            if (docFile == null) {
+                showFailedDialog(R.string.general_error);
+                return;
             }
+
+            // check if the selected file was previously used
+            checkSelectedDownload(null, data.getData(), docFile.getName(), docFile.getType());
         }
     }
 
@@ -337,14 +340,14 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         if (DEBUG) Log.d(TAG, "initToolbar() called with: toolbar = [" + toolbar + "]");
 
         boolean isLight = ThemeHelper.isLightThemeSelected(getActivity());
-        okButton = toolbar.findViewById(R.id.okay);
-        okButton.setEnabled(false);// disable until the download service connection is done
 
         toolbar.setTitle(R.string.download_dialog_title);
         toolbar.setNavigationIcon(isLight ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp);
         toolbar.inflateMenu(R.menu.dialog_url);
         toolbar.setNavigationOnClickListener(v -> getDialog().dismiss());
 
+        okButton = toolbar.findViewById(R.id.okay);
+        okButton.setEnabled(false);// disable until the download service connection is done
 
         toolbar.setOnMenuItemClickListener(item -> {
             if (item.getItemId() == R.id.okay) {
@@ -504,15 +507,17 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     StoredDirectoryHelper mainStorageAudio = null;
     StoredDirectoryHelper mainStorageVideo = null;
     DownloadManager downloadManager = null;
-
-    MenuItem okButton = null;
+    ActionMenuItemView okButton = null;
+    Context context;
 
     private String getNameEditText() {
-        return nameEditText.getText().toString().trim();
+        String str = nameEditText.getText().toString().trim();
+
+        return FilenameUtils.createFilename(context, str.isEmpty() ? currentInfo.getName() : str);
     }
 
     private void showFailedDialog(@StringRes int msg) {
-        new AlertDialog.Builder(getContext())
+        new AlertDialog.Builder(context)
                 .setMessage(msg)
                 .setNegativeButton(android.R.string.ok, null)
                 .create()
@@ -521,7 +526,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
     private void showErrorActivity(Exception e) {
         ErrorActivity.reportError(
-                getContext(),
+                context,
                 Collections.singletonList(e),
                 null,
                 null,
@@ -530,18 +535,14 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     }
 
     private void prepareSelectedDownload() {
-        final Context context = getContext();
         StoredDirectoryHelper mainStorage;
         MediaFormat format;
         String mime;
 
         // first, build the filename and get the output folder (if possible)
+        // later, run a very very very large file checking logic
 
-        String filename = getNameEditText() + ".";
-        if (filename.isEmpty()) {
-            filename = FilenameUtils.createFilename(context, currentInfo.getName());
-        }
-        filename += ".";
+        String filename = getNameEditText().concat(".");
 
         switch (radioStreamsGroup.getCheckedRadioButtonId()) {
             case R.id.audio_button:
@@ -567,34 +568,33 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         }
 
         if (mainStorage == null) {
-            // this part is called if...
-            //                          older android version running with SAF preferred
-            //                          save path not defined (via download settings)
+            // This part is called if with SAF preferred:
+            //  * older android version running
+            //  * save path not defined (via download settings)
 
             StoredFileHelper.requestSafWithFileCreation(this, REQUEST_DOWNLOAD_PATH_SAF, filename, mime);
             return;
         }
 
         // check for existing file with the same name
-        Uri result = mainStorage.findFile(filename);
+        checkSelectedDownload(mainStorage, mainStorage.findFile(filename), filename, mime);
+    }
 
-        if (result == null) {
-            // the file does not exists, create
-            StoredFileHelper storage = mainStorage.createFile(filename, mime);
-            if (storage == null || !storage.canWrite()) {
-                showFailedDialog(R.string.error_file_creation);
-                return;
-            }
-
-            continueSelectedDownload(storage);
-            return;
-        }
-
-        // the target filename is already use, try load
+    private void checkSelectedDownload(StoredDirectoryHelper mainStorage, Uri targetFile, String filename, String mime) {
         StoredFileHelper storage;
+
         try {
-            storage = new StoredFileHelper(context, result, mime);
-        } catch (IOException e) {
+            if (mainStorage == null) {
+                // using SAF on older android version
+                storage = new StoredFileHelper(context, null, targetFile, "");
+            } else if (targetFile == null) {
+                // the file does not exist, but it is probably used in a pending download
+                storage = new StoredFileHelper(mainStorage.getUri(), filename, mime, mainStorage.getTag());
+            } else {
+                // the target filename is already use, attempt to use it
+                storage = new StoredFileHelper(context, mainStorage.getUri(), targetFile, mainStorage.getTag());
+            }
+        } catch (Exception e) {
             showErrorActivity(e);
             return;
         }
@@ -618,6 +618,25 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                 msgBody = R.string.download_already_running;
                 break;
             case None:
+                if (mainStorage == null) {
+                    // This part is called if:
+                    // * using SAF on older android version
+                    // * save path not defined
+                    continueSelectedDownload(storage);
+                    return;
+                } else if (targetFile == null) {
+                    // This part is called if:
+                    // * the filename is not used in a pending/finished download
+                    // * the file does not exists, create
+                    storage = mainStorage.createFile(filename, mime);
+                    if (storage == null || !storage.canWrite()) {
+                        showFailedDialog(R.string.error_file_creation);
+                        return;
+                    }
+
+                    continueSelectedDownload(storage);
+                    return;
+                }
                 msgBtn = R.string.overwrite;
                 msgBody = R.string.overwrite_unrelated_warning;
                 break;
@@ -625,49 +644,73 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                 return;
         }
 
-        // handle user answer (overwrite or create another file with different name)
-        final String finalFilename = filename;
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle(R.string.download_dialog_title)
-                .setMessage(msgBody)
-                .setPositiveButton(msgBtn, (dialog, which) -> {
-                    dialog.dismiss();
 
-                    StoredFileHelper storageNew;
-                    switch (state) {
-                        case Finished:
-                        case Pending:
-                            downloadManager.forgetMission(storage);
-                        case None:
-                            // try take (or steal) the file permissions
-                            try {
-                                storageNew = new StoredFileHelper(context, result, mainStorage.getTag());
-                                if (storageNew.canWrite())
-                                    continueSelectedDownload(storageNew);
-                                else
-                                    showFailedDialog(R.string.error_file_creation);
-                            } catch (IOException e) {
-                                showErrorActivity(e);
-                            }
-                            break;
-                        case PendingRunning:
-                            // FIXME: createUniqueFile() is not tested properly
-                            storageNew = mainStorage.createUniqueFile(finalFilename, mime);
-                            if (storageNew == null)
-                                showFailedDialog(R.string.error_file_creation);
-                            else
-                                continueSelectedDownload(storageNew);
-                            break;
+        AlertDialog.Builder askDialog = new AlertDialog.Builder(context)
+                .setTitle(R.string.download_dialog_title)
+                .setMessage(msgBody)
+                .setNegativeButton(android.R.string.cancel, null);
+        final StoredFileHelper finalStorage = storage;
+
+
+        if (mainStorage == null) {
+            // This part is called if:
+            // * using SAF on older android version
+            // * save path not defined
+            switch (state) {
+                case Pending:
+                case Finished:
+                    askDialog.setPositiveButton(msgBtn, (dialog, which) -> {
+                        dialog.dismiss();
+                        downloadManager.forgetMission(finalStorage);
+                        continueSelectedDownload(finalStorage);
+                    });
+                    break;
+            }
+
+            askDialog.create().show();
+            return;
+        }
+
+        askDialog.setPositiveButton(msgBtn, (dialog, which) -> {
+            dialog.dismiss();
+
+            StoredFileHelper storageNew;
+            switch (state) {
+                case Finished:
+                case Pending:
+                    downloadManager.forgetMission(finalStorage);
+                case None:
+                    if (targetFile == null) {
+                        storageNew = mainStorage.createFile(filename, mime);
+                    } else {
+                        try {
+                            // try take (or steal) the file
+                            storageNew = new StoredFileHelper(context, mainStorage.getUri(), targetFile, mainStorage.getTag());
+                        } catch (IOException e) {
+                            Log.e(TAG, "Failed to take (or steal) the file in " + targetFile.toString());
+                            storageNew = null;
+                        }
                     }
-                })
-                .setNegativeButton(android.R.string.cancel, null)
-                .create()
-                .show();
+
+                    if (storageNew != null && storageNew.canWrite())
+                        continueSelectedDownload(storageNew);
+                    else
+                        showFailedDialog(R.string.error_file_creation);
+                    break;
+                case PendingRunning:
+                    storageNew = mainStorage.createUniqueFile(filename, mime);
+                    if (storageNew == null)
+                        showFailedDialog(R.string.error_file_creation);
+                    else
+                        continueSelectedDownload(storageNew);
+                    break;
+            }
+        });
+
+        askDialog.create().show();
     }
 
     private void continueSelectedDownload(@NonNull StoredFileHelper storage) {
-        final Context context = getContext();
-
         if (!storage.canWrite()) {
             showFailedDialog(R.string.permission_denied);
             return;
@@ -678,7 +721,6 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             if (storage.length() > 0) storage.truncate();
         } catch (IOException e) {
             Log.e(TAG, "failed to overwrite the file: " + storage.getUri().toString(), e);
-            //showErrorActivity(e);
             showFailedDialog(R.string.overwrite_failed);
             return;
         }
@@ -748,7 +790,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         if (secondaryStreamUrl == null) {
             urls = new String[]{selectedStream.getUrl()};
         } else {
-            urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
+            urls = new String[]{secondaryStreamUrl, selectedStream.getUrl()};
         }
 
         DownloadManagerService.startMission(context, urls, storage, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index 3737d1c17..5d4ccf3f8 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -14,18 +14,23 @@ import android.support.v7.preference.Preference;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.nononsenseapps.filepicker.Utils;
+
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 
 import us.shandian.giga.io.StoredDirectoryHelper;
 
 public class DownloadSettingsFragment extends BasePreferenceFragment {
     private static final int REQUEST_DOWNLOAD_VIDEO_PATH = 0x1235;
     private static final int REQUEST_DOWNLOAD_AUDIO_PATH = 0x1236;
+    public static final boolean IGNORE_RELEASE_OLD_PATH = true;
 
     private String DOWNLOAD_PATH_VIDEO_PREFERENCE;
     private String DOWNLOAD_PATH_AUDIO_PREFERENCE;
@@ -35,41 +40,46 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
 
     private Preference prefPathVideo;
     private Preference prefPathAudio;
-    
+
     private Context ctx;
 
+    private boolean lastAPIJavaIO;
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        initKeys();
-        updatePreferencesSummary();
-    }
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        addPreferencesFromResource(R.xml.download_settings);
+        DOWNLOAD_PATH_VIDEO_PREFERENCE = getString(R.string.download_path_video_key);
+        DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
+        DOWNLOAD_STORAGE_API = getString(R.string.downloads_storage_api);
+        DOWNLOAD_STORAGE_API_DEFAULT = getString(R.string.downloads_storage_api_default);
 
         prefPathVideo = findPreference(DOWNLOAD_PATH_VIDEO_PREFERENCE);
         prefPathAudio = findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
 
-        updatePathPickers(usingJavaIO());
+        lastAPIJavaIO = usingJavaIO();
+
+        updatePreferencesSummary();
+        updatePathPickers(lastAPIJavaIO);
 
         findPreference(DOWNLOAD_STORAGE_API).setOnPreferenceChangeListener((preference, value) -> {
             boolean javaIO = DOWNLOAD_STORAGE_API_DEFAULT.equals(value);
 
-            if (!javaIO && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (javaIO == lastAPIJavaIO) return true;
+            lastAPIJavaIO = javaIO;
+
+            boolean res;
+
+            if (javaIO && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                // forget save paths (if necessary)
+                res = forgetPath(DOWNLOAD_PATH_VIDEO_PREFERENCE);
+                res |= forgetPath(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+            } else {
+                res = hasInvalidPath(DOWNLOAD_PATH_VIDEO_PREFERENCE) || hasInvalidPath(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+            }
+
+            if (res) {
                 Toast.makeText(ctx, R.string.download_pick_path, Toast.LENGTH_LONG).show();
-
-                // forget save paths
-                forgetSAFTree(DOWNLOAD_PATH_VIDEO_PREFERENCE);
-                forgetSAFTree(DOWNLOAD_PATH_AUDIO_PREFERENCE);
-
-                defaultPreferences.edit()
-                        .putString(DOWNLOAD_PATH_VIDEO_PREFERENCE, "")
-                        .putString(DOWNLOAD_PATH_AUDIO_PREFERENCE, "")
-                        .apply();
-
                 updatePreferencesSummary();
             }
 
@@ -78,6 +88,30 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         });
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    private boolean forgetPath(String prefKey) {
+        String path = defaultPreferences.getString(prefKey, "");
+        if (path == null || path.isEmpty()) return true;
+
+        if (path.startsWith("file://")) return false;
+
+        // forget SAF path (file:// is compatible with the SAF wrapper)
+        forgetSAFTree(getContext(), prefKey);
+        defaultPreferences.edit().putString(prefKey, "").apply();
+
+        return true;
+    }
+
+    private boolean hasInvalidPath(String prefKey) {
+        String value = defaultPreferences.getString(prefKey, null);
+        return value == null || value.isEmpty();
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        addPreferencesFromResource(R.xml.download_settings);
+    }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -91,20 +125,25 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         findPreference(DOWNLOAD_STORAGE_API).setOnPreferenceChangeListener(null);
     }
 
-    private void initKeys() {
-        DOWNLOAD_PATH_VIDEO_PREFERENCE = getString(R.string.download_path_video_key);
-        DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
-        DOWNLOAD_STORAGE_API = getString(R.string.downloads_storage_api);
-        DOWNLOAD_STORAGE_API_DEFAULT = getString(R.string.downloads_storage_api_default);
+    private void updatePreferencesSummary() {
+        showPathInSummary(DOWNLOAD_PATH_VIDEO_PREFERENCE, R.string.download_path_summary, prefPathVideo);
+        showPathInSummary(DOWNLOAD_PATH_AUDIO_PREFERENCE, R.string.download_path_audio_summary, prefPathAudio);
     }
 
-    private void updatePreferencesSummary() {
-        prefPathVideo.setSummary(
-                defaultPreferences.getString(DOWNLOAD_PATH_VIDEO_PREFERENCE, getString(R.string.download_path_summary))
-        );
-        prefPathAudio.setSummary(
-                defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE, getString(R.string.download_path_audio_summary))
-        );
+    private void showPathInSummary(String prefKey, @StringRes int defaultString, Preference target) {
+        String rawUri = defaultPreferences.getString(prefKey, null);
+        if (rawUri == null || rawUri.isEmpty()) {
+            target.setSummary(getString(defaultString));
+            return;
+        }
+
+        try {
+            rawUri = URLDecoder.decode(rawUri, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException e) {
+            // nothing to do
+        }
+
+        target.setSummary(rawUri);
     }
 
     private void updatePathPickers(boolean useJavaIO) {
@@ -119,20 +158,25 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         );
     }
 
+    // FIXME: after releasing the old path, all downloads created on the folder becomes inaccessible
     @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    private void forgetSAFTree(String prefKey) {
+    private void forgetSAFTree(Context ctx, String prefKey) {
+        if (IGNORE_RELEASE_OLD_PATH) {
+            return;
+        }
 
         String oldPath = defaultPreferences.getString(prefKey, "");
 
-        if (oldPath != null && !oldPath.isEmpty() && oldPath.charAt(0) != File.separatorChar) {
+        if (oldPath != null && !oldPath.isEmpty() && oldPath.charAt(0) != File.separatorChar && !oldPath.startsWith("file://")) {
             try {
-                StoredDirectoryHelper mainStorage = new StoredDirectoryHelper(ctx, Uri.parse(oldPath), null);
-                if (!mainStorage.isDirect()) {
-                    mainStorage.revokePermissions();
-                    Log.i(TAG, "revokePermissions()  [uri=" + oldPath + "]  ¡success!");
-                }
-            } catch (IOException err) {
-                Log.e(TAG, "Error revoking Tree uri permissions  [uri=" + oldPath + "]", err);
+                Uri uri = Uri.parse(oldPath);
+
+                ctx.getContentResolver().releasePersistableUriPermission(uri, StoredDirectoryHelper.PERMISSION_FLAGS);
+                ctx.revokeUriPermission(uri, StoredDirectoryHelper.PERMISSION_FLAGS);
+
+                Log.i(TAG, "Revoke old path permissions success on " + oldPath);
+            } catch (Exception err) {
+                Log.e(TAG, "Error revoking old path permissions on " + oldPath, err);
             }
         }
     }
@@ -167,7 +211,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
             if (safPick && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
                         .putExtra("android.content.extra.SHOW_ADVANCED", true)
-                        .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | StoredDirectoryHelper.PERMISSION_FLAGS);
+                        .addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | StoredDirectoryHelper.PERMISSION_FLAGS);
             } else {
                 i = new Intent(getActivity(), FilePickerActivityHelper.class)
                         .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
@@ -208,27 +252,37 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
 
         if (!usingJavaIO() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             // steps:
-            //       1. acquire permissions on the new save path
-            //       2. save the new path, if step(1) was successful
+            //       1. revoke permissions on the old save path
+            //       2. acquire permissions on the new save path
+            //       3. save the new path, if step(2) was successful
+            final Context ctx = getContext();
+            if (ctx == null) throw new NullPointerException("getContext()");
+
+            forgetSAFTree(ctx, key);
 
             try {
+                ctx.grantUriPermission(ctx.getPackageName(), uri, StoredDirectoryHelper.PERMISSION_FLAGS);
+
                 StoredDirectoryHelper mainStorage = new StoredDirectoryHelper(ctx, uri, null);
-                mainStorage.acquirePermissions();
-                Log.i(TAG, "acquirePermissions()  [uri=" + uri.toString() + "]  ¡success!");
+                Log.i(TAG, "Acquiring tree success from " + uri.toString());
+
+                if (!mainStorage.canWrite())
+                    throw new IOException("No write permissions on " + uri.toString());
             } catch (IOException err) {
-                Log.e(TAG, "Error acquiring permissions on " + uri.toString());
+                Log.e(TAG, "Error acquiring tree from " + uri.toString(), err);
                 showMessageDialog(R.string.general_error, R.string.no_available_dir);
                 return;
             }
-
-            defaultPreferences.edit().putString(key, uri.toString()).apply();
         } else {
-            defaultPreferences.edit().putString(key, uri.toString()).apply();
-            updatePreferencesSummary();
-
-            File target = new File(URI.create(uri.toString()));
-            if (!target.canWrite())
+            File target = Utils.getFileForUri(data.getData());
+            if (!target.canWrite()) {
                 showMessageDialog(R.string.download_to_sdcard_error_title, R.string.download_to_sdcard_error_message);
+                return;
+            }
+            uri = Uri.fromFile(target);
         }
+
+        defaultPreferences.edit().putString(key, uri.toString()).apply();
+        updatePreferencesSummary();
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
index 567fa5229..0e62810c5 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
@@ -16,6 +16,8 @@ public class DataReader {
     public final static int INTEGER_SIZE = 4;
     public final static int FLOAT_SIZE = 4;
 
+    private final static int BUFFER_SIZE = 128 * 1024;// 128 KiB
+
     private long position = 0;
     private final SharpStream stream;
 
@@ -229,7 +231,7 @@ public class DataReader {
         }
     }
 
-    private final byte[] readBuffer = new byte[8 * 1024];
+    private final byte[] readBuffer = new byte[BUFFER_SIZE];
     private int readOffset;
     private int readCount;
 
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
index 61f793e5d..03aab447c 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -12,7 +12,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 
 /**
- *
  * @author kapodamy
  */
 public class Mp4FromDashWriter {
@@ -262,12 +261,12 @@ public class Mp4FromDashWriter {
         final int ftyp_size = make_ftyp();
 
         // reserve moov space in the output stream
-        if (outStream.canSetLength()) {
+        /*if (outStream.canSetLength()) {
             long length = writeOffset + auxSize;
             outStream.setLength(length);
             outSeek(length);
-        } else {
-            // hard way
+        } else {*/
+        if (auxSize > 0) {
             int length = auxSize;
             byte[] buffer = new byte[8 * 1024];// 8 KiB
             while (length > 0) {
@@ -276,6 +275,7 @@ public class Mp4FromDashWriter {
                 length -= count;
             }
         }
+
         if (auxBuffer == null) {
             outSeek(ftyp_size);
         }
diff --git a/app/src/main/java/org/schabi/newpipe/util/FilenameUtils.java b/app/src/main/java/org/schabi/newpipe/util/FilenameUtils.java
index b874a9eca..37d94cd16 100644
--- a/app/src/main/java/org/schabi/newpipe/util/FilenameUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/FilenameUtils.java
@@ -10,6 +10,9 @@ import java.util.regex.Pattern;
 
 public class FilenameUtils {
 
+    private static final String CHARSET_MOST_SPECIAL = "[\\n\\r|?*<\":\\\\>/']+";
+    private static final String CHARSET_ONLY_LETTERS_AND_DIGITS = "[^\\w\\d]+";
+
     /**
      * #143 #44 #42 #22: make sure that the filename does not contain illegal chars.
      * @param context the context to retrieve strings and preferences from
@@ -18,11 +21,28 @@ public class FilenameUtils {
      */
     public static String createFilename(Context context, String title) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        final String key = context.getString(R.string.settings_file_charset_key);
-        final String value = sharedPreferences.getString(key, context.getString(R.string.default_file_charset_value));
-        Pattern pattern = Pattern.compile(value);
+
+        final String charset_ld = context.getString(R.string.charset_letters_and_digits_value);
+        final String charset_ms = context.getString(R.string.charset_most_special_value);
+        final String defaultCharset = context.getString(R.string.default_file_charset_value);
 
         final String replacementChar = sharedPreferences.getString(context.getString(R.string.settings_file_replacement_character_key), "_");
+        String selectedCharset = sharedPreferences.getString(context.getString(R.string.settings_file_charset_key), null);
+
+        final String charset;
+
+        if (selectedCharset == null || selectedCharset.isEmpty()) selectedCharset = defaultCharset;
+
+        if (selectedCharset.equals(charset_ld)) {
+            charset = CHARSET_ONLY_LETTERS_AND_DIGITS;
+        } else if (selectedCharset.equals(charset_ms)) {
+            charset = CHARSET_MOST_SPECIAL;
+        } else {
+            charset = selectedCharset;// ¿is the user using a custom charset?
+        }
+
+        Pattern pattern = Pattern.compile(charset);
+
         return createFilename(title, pattern, replacementChar);
     }
 
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
index 1e05983d8..f6b6b459a 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
@@ -28,7 +28,7 @@ public class DownloadInitializer extends Thread {
 
     @Override
     public void run() {
-        if (mMission.current > 0) mMission.resetState();
+        if (mMission.current > 0) mMission.resetState(false,true, DownloadMission.ERROR_NOTHING);
 
         int retryCount = 0;
         while (true) {
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index 9ec3418b0..838acc162 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -2,7 +2,6 @@ package us.shandian.giga.get;
 
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import java.io.File;
@@ -86,7 +85,7 @@ public class DownloadMission extends Mission {
     /**
      * the post-processing algorithm instance
      */
-    public transient Postprocessing psAlgorithm;
+    public Postprocessing psAlgorithm;
 
     /**
      * The current resource to download, see {@code urls[current]} and {@code offsets[current]}
@@ -483,7 +482,7 @@ public class DownloadMission extends Mission {
         if (init != null && Thread.currentThread() != init && init.isAlive()) {
             init.interrupt();
             synchronized (blockState) {
-                resetState();
+                resetState(false, true, ERROR_NOTHING);
             }
             return;
         }
@@ -525,10 +524,18 @@ public class DownloadMission extends Mission {
         return res;
     }
 
-    void resetState() {
+
+    /**
+     * Resets the mission state
+     *
+     * @param rollback       {@code true} true to forget all progress, otherwise, {@code false}
+     * @param persistChanges {@code true} to commit changes to the metadata file, otherwise, {@code false}
+     */
+    public void resetState(boolean rollback, boolean persistChanges, int errorCode) {
         done = 0;
         blocks = -1;
-        errCode = ERROR_NOTHING;
+        errCode = errorCode;
+        errObject = null;
         fallback = false;
         unknownLength = false;
         finishCount = 0;
@@ -537,7 +544,10 @@ public class DownloadMission extends Mission {
         blockState.clear();
         threads = new Thread[0];
 
-        Utility.writeToFile(metadata, DownloadMission.this);
+        if (rollback) current = 0;
+
+        if (persistChanges)
+            Utility.writeToFile(metadata, DownloadMission.this);
     }
 
     private void initializer() {
@@ -633,33 +643,22 @@ public class DownloadMission extends Mission {
         threads[0].interrupt();
     }
 
-    /**
-     * changes the StoredFileHelper for another and saves the changes to the metadata file
-     *
-     * @param newStorage the new StoredFileHelper instance to use
-     */
-    public void changeStorage(@NonNull StoredFileHelper newStorage) {
-        storage = newStorage;
-        // commit changes on the metadata file
-        runAsync(-2, this::writeThisToFile);
-    }
-
     /**
      * Indicates whatever the backed storage is invalid
      *
      * @return {@code true}, if storage is invalid and cannot be used
      */
     public boolean hasInvalidStorage() {
-        return errCode == ERROR_PROGRESS_LOST || storage == null || storage.isInvalid();
+        return errCode == ERROR_PROGRESS_LOST || storage == null || storage.isInvalid() || !storage.existsAsFile();
     }
 
     /**
      * Indicates whatever is possible to start the mission
      *
-     * @return {@code true} is this mission is "sane", otherwise, {@code false}
+     * @return {@code true} is this mission its "healthy", otherwise, {@code false}
      */
-    public boolean canDownload() {
-        return !(isPsFailed() || errCode == ERROR_POSTPROCESSING_HOLD) && !isFinished() && !hasInvalidStorage();
+    public boolean isCorrupt() {
+        return (isPsFailed() || errCode == ERROR_POSTPROCESSING_HOLD) || isFinished() || hasInvalidStorage();
     }
 
     private boolean doPostprocessing() {
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index ced579b20..7a68cd778 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -137,6 +137,10 @@ public class DownloadRunnable extends Thread {
                     mMission.setThreadBytePosition(mId, total);// download paused, save progress for this block
 
             } catch (Exception e) {
+                if (DEBUG) {
+                    Log.d(TAG, mId + ": position=" + blockPosition + " total=" + total + " stopped due exception", e);
+                }
+
                 mMission.setThreadBytePosition(mId, total);
 
                 if (!mMission.running || e instanceof ClosedByInterruptException) break;
@@ -146,10 +150,6 @@ public class DownloadRunnable extends Thread {
                     break;
                 }
 
-                if (DEBUG) {
-                    Log.d(TAG, mId + ":position " + blockPosition + " retrying due exception", e);
-                }
-
                 retry = true;
             }
         }
diff --git a/app/src/main/java/us/shandian/giga/get/FinishedMission.java b/app/src/main/java/us/shandian/giga/get/FinishedMission.java
index 5540b44a1..2a01896fe 100644
--- a/app/src/main/java/us/shandian/giga/get/FinishedMission.java
+++ b/app/src/main/java/us/shandian/giga/get/FinishedMission.java
@@ -12,5 +12,7 @@ public class FinishedMission extends  Mission {
         length = mission.length;// ¿or mission.done?
         timestamp = mission.timestamp;
         kind = mission.kind;
+        storage = mission.storage;
+
     }
 }
diff --git a/app/src/main/java/us/shandian/giga/get/Mission.java b/app/src/main/java/us/shandian/giga/get/Mission.java
index ce201d960..a9ed08fc2 100644
--- a/app/src/main/java/us/shandian/giga/get/Mission.java
+++ b/app/src/main/java/us/shandian/giga/get/Mission.java
@@ -1,6 +1,5 @@
 package us.shandian.giga.get;
 
-import android.net.Uri;
 import android.support.annotation.NonNull;
 
 import java.io.Serializable;
@@ -36,15 +35,6 @@ public abstract class Mission implements Serializable {
      */
     public StoredFileHelper storage;
 
-    /**
-     * get the target file on the storage
-     *
-     * @return File object
-     */
-    public Uri getDownloadedFileUri() {
-        return storage.getUri();
-    }
-
     /**
      * Delete the downloaded file
      *
@@ -52,7 +42,7 @@ public abstract class Mission implements Serializable {
      */
     public boolean delete() {
         if (storage != null) return storage.delete();
-        return  true;
+        return true;
     }
 
     /**
@@ -65,6 +55,6 @@ public abstract class Mission implements Serializable {
     public String toString() {
         Calendar calendar = Calendar.getInstance();
         calendar.setTimeInMillis(timestamp);
-        return "[" + calendar.getTime().toString() + "] " + getDownloadedFileUri().getPath();
+        return "[" + calendar.getTime().toString() + "] " + (storage.isInvalid() ? storage.getName() : storage.getUri());
     }
 }
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
index 6d63b9ff7..4650f75d0 100644
--- a/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
@@ -35,7 +35,7 @@ public class FinishedMissionStore extends SQLiteOpenHelper {
     /**
      * The table name of download missions
      */
-    private static final String FINISHED_MISSIONS_TABLE_NAME = "finished_missions";
+    private static final String FINISHED_TABLE_NAME = "finished_missions";
 
     /**
      * The key to the urls of a mission
@@ -58,7 +58,7 @@ public class FinishedMissionStore extends SQLiteOpenHelper {
      * The statement to create the table
      */
     private static final String MISSIONS_CREATE_TABLE =
-            "CREATE TABLE " + FINISHED_MISSIONS_TABLE_NAME + " (" +
+            "CREATE TABLE " + FINISHED_TABLE_NAME + " (" +
                     KEY_PATH + " TEXT NOT NULL, " +
                     KEY_SOURCE + " TEXT NOT NULL, " +
                     KEY_DONE + " INTEGER NOT NULL, " +
@@ -111,7 +111,7 @@ public class FinishedMissionStore extends SQLiteOpenHelper {
                             )
                     ).toString());
 
-                    db.insert(FINISHED_MISSIONS_TABLE_NAME, null, values);
+                    db.insert(FINISHED_TABLE_NAME, null, values);
                 }
                 db.setTransactionSuccessful();
                 db.endTransaction();
@@ -154,10 +154,10 @@ public class FinishedMissionStore extends SQLiteOpenHelper {
         mission.kind = kind.charAt(0);
 
         try {
-            mission.storage = new StoredFileHelper(context, Uri.parse(path), "");
+            mission.storage = new StoredFileHelper(context,null, Uri.parse(path), "");
         } catch (Exception e) {
             Log.e("FinishedMissionStore", "failed to load the storage path of: " + path, e);
-            mission.storage = new StoredFileHelper(path, "", "");
+            mission.storage = new StoredFileHelper(null, path, "", "");
         }
 
         return mission;
@@ -170,7 +170,7 @@ public class FinishedMissionStore extends SQLiteOpenHelper {
 
     public ArrayList<FinishedMission> loadFinishedMissions() {
         SQLiteDatabase database = getReadableDatabase();
-        Cursor cursor = database.query(FINISHED_MISSIONS_TABLE_NAME, null, null,
+        Cursor cursor = database.query(FINISHED_TABLE_NAME, null, null,
                 null, null, null, KEY_TIMESTAMP + " DESC");
 
         int count = cursor.getCount();
@@ -188,33 +188,47 @@ public class FinishedMissionStore extends SQLiteOpenHelper {
         if (downloadMission == null) throw new NullPointerException("downloadMission is null");
         SQLiteDatabase database = getWritableDatabase();
         ContentValues values = getValuesOfMission(downloadMission);
-        database.insert(FINISHED_MISSIONS_TABLE_NAME, null, values);
+        database.insert(FINISHED_TABLE_NAME, null, values);
     }
 
     public void deleteMission(Mission mission) {
         if (mission == null) throw new NullPointerException("mission is null");
-        String path = mission.getDownloadedFileUri().toString();
+        String ts = String.valueOf(mission.timestamp);
 
         SQLiteDatabase database = getWritableDatabase();
 
-        if (mission instanceof FinishedMission)
-            database.delete(FINISHED_MISSIONS_TABLE_NAME, KEY_TIMESTAMP + " = ?, " + KEY_PATH + " = ?", new String[]{path});
-        else
+        if (mission instanceof FinishedMission) {
+            if (mission.storage.isInvalid()) {
+                database.delete(FINISHED_TABLE_NAME, KEY_TIMESTAMP + " = ?", new String[]{ts});
+            } else {
+                database.delete(FINISHED_TABLE_NAME, KEY_TIMESTAMP + " = ? AND " + KEY_PATH + " = ?", new String[]{
+                        ts, mission.storage.getUri().toString()
+                });
+            }
+        } else {
             throw new UnsupportedOperationException("DownloadMission");
+        }
     }
 
     public void updateMission(Mission mission) {
         if (mission == null) throw new NullPointerException("mission is null");
         SQLiteDatabase database = getWritableDatabase();
         ContentValues values = getValuesOfMission(mission);
-        String path = mission.getDownloadedFileUri().toString();
+        String ts = String.valueOf(mission.timestamp);
 
         int rowsAffected;
 
-        if (mission instanceof FinishedMission)
-            rowsAffected = database.update(FINISHED_MISSIONS_TABLE_NAME, values, KEY_PATH + " = ?", new String[]{path});
-        else
+        if (mission instanceof FinishedMission) {
+            if (mission.storage.isInvalid()) {
+                rowsAffected = database.update(FINISHED_TABLE_NAME, values, KEY_TIMESTAMP + " = ?", new String[]{ts});
+            } else {
+                rowsAffected = database.update(FINISHED_TABLE_NAME, values, KEY_PATH + " = ?", new String[]{
+                        mission.storage.getUri().toString()
+                });
+            }
+        } else {
             throw new UnsupportedOperationException("DownloadMission");
+        }
 
         if (rowsAffected != 1) {
             Log.e("FinishedMissionStore", "Expected 1 row to be affected by update but got " + rowsAffected);
diff --git a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
index 650725a76..327b9149e 100644
--- a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
+++ b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
@@ -12,7 +12,7 @@ public class CircularFileWriter extends SharpStream {
 
     private final static int QUEUE_BUFFER_SIZE = 8 * 1024;// 8 KiB
     private final static int NOTIFY_BYTES_INTERVAL = 64 * 1024;// 64 KiB
-    private final static int THRESHOLD_AUX_LENGTH = 3 * 1024 * 1024;// 3 MiB
+    private final static int THRESHOLD_AUX_LENGTH = 15 * 1024 * 1024;// 15 MiB
 
     private OffsetChecker callback;
 
@@ -44,41 +44,84 @@ public class CircularFileWriter extends SharpStream {
         reportPosition = NOTIFY_BYTES_INTERVAL;
     }
 
-    private void flushAuxiliar() throws IOException {
+    private void flushAuxiliar(long amount) throws IOException {
         if (aux.length < 1) {
             return;
         }
 
-        boolean underflow = out.getOffset() >= out.length;
-
         out.flush();
         aux.flush();
 
+        boolean underflow = aux.offset < aux.length || out.offset < out.length;
+
         aux.target.seek(0);
         out.target.seek(out.length);
 
-        long length = aux.length;
-        out.length += aux.length;
-
+        long length = amount;
         while (length > 0) {
             int read = (int) Math.min(length, Integer.MAX_VALUE);
             read = aux.target.read(aux.queue, 0, Math.min(read, aux.queue.length));
 
+            if (read < 1) {
+                amount -= length;
+                break;
+            }
+
             out.writeProof(aux.queue, read);
             length -= read;
         }
 
         if (underflow) {
-            out.offset += aux.offset;
-            out.target.seek(out.offset);
+            if (out.offset >= out.length) {
+                // calculate the aux underflow pointer
+                if (aux.offset < amount) {
+                    out.offset += aux.offset;
+                    aux.offset = 0;
+                    out.target.seek(out.offset);
+                } else {
+                    aux.offset -= amount;
+                    out.offset = out.length + amount;
+                }
+            } else {
+                aux.offset = 0;
+            }
         } else {
-            out.offset = out.length;
+            out.offset += amount;
+            aux.offset -= amount;
         }
 
+        out.length += amount;
+
         if (out.length > maxLengthKnown) {
             maxLengthKnown = out.length;
         }
 
+        if (amount < aux.length) {
+            // move the excess data to the beginning of the file
+            long readOffset = amount;
+            long writeOffset = 0;
+            byte[] buffer = new byte[128 * 1024]; // 128 KiB
+
+            aux.length -= amount;
+            length = aux.length;
+            while (length > 0) {
+                int read = (int) Math.min(length, Integer.MAX_VALUE);
+                read = aux.target.read(buffer, 0, Math.min(read, buffer.length));
+
+                aux.target.seek(writeOffset);
+                aux.writeProof(buffer, read);
+
+                writeOffset += read;
+                readOffset += read;
+                length -= read;
+
+                aux.target.seek(readOffset);
+            }
+
+            aux.target.setLength(aux.length);
+            return;
+        }
+
         if (aux.length > THRESHOLD_AUX_LENGTH) {
             aux.target.setLength(THRESHOLD_AUX_LENGTH);// or setLength(0);
         }
@@ -94,7 +137,7 @@ public class CircularFileWriter extends SharpStream {
      * @throws IOException if an I/O error occurs
      */
     public long finalizeFile() throws IOException {
-        flushAuxiliar();
+        flushAuxiliar(aux.length);
 
         out.flush();
 
@@ -148,7 +191,7 @@ public class CircularFileWriter extends SharpStream {
         if (end == -1) {
             available = Integer.MAX_VALUE;
         } else if (end < offsetOut) {
-            throw new IOException("The reported offset is invalid: " + String.valueOf(offsetOut));
+            throw new IOException("The reported offset is invalid: " + end + "<" + offsetOut);
         } else {
             available = end - offsetOut;
         }
@@ -167,16 +210,10 @@ public class CircularFileWriter extends SharpStream {
                 length = aux.length + len;
             }
 
-            if (length > available || length < THRESHOLD_AUX_LENGTH) {
-                aux.write(b, off, len);
-            } else {
-                if (underflow) {
-                    aux.write(b, off, len);
-                    flushAuxiliar();
-                } else {
-                    flushAuxiliar();
-                    out.write(b, off, len);// write directly on the output
-                }
+            aux.write(b, off, len);
+
+            if (length >= THRESHOLD_AUX_LENGTH && length <= available) {
+                flushAuxiliar(available);
             }
         } else {
             if (underflow) {
@@ -234,8 +271,13 @@ public class CircularFileWriter extends SharpStream {
     @Override
     public void seek(long offset) throws IOException {
         long total = out.length + aux.length;
+
         if (offset == total) {
-            return;// nothing to do
+            // do not ignore the seek offset if a underflow exists
+            long relativeOffset = out.getOffset() + aux.getOffset();
+            if (relativeOffset == total) {
+                return;
+            }
         }
 
         // flush everything, avoid any underflow
@@ -409,6 +451,9 @@ public class CircularFileWriter extends SharpStream {
         }
 
         protected void seek(long absoluteOffset) throws IOException {
+            if (absoluteOffset == offset) {
+                return;// nothing to do
+            }
             offset = absoluteOffset;
             target.seek(absoluteOffset);
         }
diff --git a/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java b/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java
index cb4786280..ec6629268 100644
--- a/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java
+++ b/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java
@@ -137,4 +137,9 @@ public class FileStreamSAF extends SharpStream {
     public void seek(long offset) throws IOException {
         channel.position(offset);
     }
+
+    @Override
+    public long length() throws IOException {
+        return channel.size();
+    }
 }
diff --git a/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
index f5c2fd3f5..eb3c9b817 100644
--- a/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
+++ b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
@@ -4,8 +4,10 @@ import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
+import android.provider.DocumentsContract;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
@@ -13,8 +15,13 @@ import android.support.v4.provider.DocumentFile;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
+
+import static android.provider.DocumentsContract.Document.COLUMN_DISPLAY_NAME;
+import static android.provider.DocumentsContract.Root.COLUMN_DOCUMENT_ID;
+
 
 public class StoredDirectoryHelper {
     public final static int PERMISSION_FLAGS = Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
@@ -22,14 +29,27 @@ public class StoredDirectoryHelper {
     private File ioTree;
     private DocumentFile docTree;
 
-    private ContentResolver contentResolver;
+    private Context context;
 
     private String tag;
 
     @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     public StoredDirectoryHelper(@NonNull Context context, @NonNull Uri path, String tag) throws IOException {
-        this.contentResolver = context.getContentResolver();
         this.tag = tag;
+
+        if (ContentResolver.SCHEME_FILE.equalsIgnoreCase(path.getScheme())) {
+            this.ioTree = new File(URI.create(path.toString()));
+            return;
+        }
+
+        this.context = context;
+
+        try {
+            this.context.getContentResolver().takePersistableUriPermission(path, PERMISSION_FLAGS);
+        } catch (Exception e) {
+            throw new IOException(e);
+        }
+
         this.docTree = DocumentFile.fromTreeUri(context, path);
 
         if (this.docTree == null)
@@ -37,23 +57,75 @@ public class StoredDirectoryHelper {
     }
 
     @TargetApi(Build.VERSION_CODES.KITKAT)
-    public StoredDirectoryHelper(@NonNull String location, String tag) {
+    public StoredDirectoryHelper(@NonNull URI location, String tag) {
         ioTree = new File(location);
         this.tag = tag;
     }
 
-    @Nullable
     public StoredFileHelper createFile(String filename, String mime) {
+        return createFile(filename, mime, false);
+    }
+
+    public StoredFileHelper createUniqueFile(String name, String mime) {
+        ArrayList<String> matches = new ArrayList<>();
+        String[] filename = splitFilename(name);
+        String lcFilename = filename[0].toLowerCase();
+
+        if (docTree == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            for (File file : ioTree.listFiles())
+                addIfStartWith(matches, lcFilename, file.getName());
+        } else {
+            // warning: SAF file listing is very slow
+            Uri docTreeChildren = DocumentsContract.buildChildDocumentsUriUsingTree(
+                    docTree.getUri(), DocumentsContract.getDocumentId(docTree.getUri())
+            );
+
+            String[] projection = new String[]{COLUMN_DISPLAY_NAME};
+            String selection = "(LOWER(" + COLUMN_DISPLAY_NAME + ") LIKE ?%";
+            ContentResolver cr = context.getContentResolver();
+
+            try (Cursor cursor = cr.query(docTreeChildren, projection, selection, new String[]{lcFilename}, null)) {
+                if (cursor != null) {
+                    while (cursor.moveToNext())
+                        addIfStartWith(matches, lcFilename, cursor.getString(0));
+                }
+            }
+        }
+
+        if (matches.size() < 1) {
+            return createFile(name, mime, true);
+        } else {
+            // check if the filename is in use
+            String lcName = name.toLowerCase();
+            for (String testName : matches) {
+                if (testName.equals(lcName)) {
+                    lcName = null;
+                    break;
+                }
+            }
+
+            // check if not in use
+            if (lcName != null) return createFile(name, mime, true);
+        }
+
+        Collections.sort(matches, String::compareTo);
+
+        for (int i = 1; i < 1000; i++) {
+            if (Collections.binarySearch(matches, makeFileName(lcFilename, i, filename[1])) < 0)
+                return createFile(makeFileName(filename[0], i, filename[1]), mime, true);
+        }
+
+        return createFile(String.valueOf(System.currentTimeMillis()).concat(filename[1]), mime, false);
+    }
+
+    private StoredFileHelper createFile(String filename, String mime, boolean safe) {
         StoredFileHelper storage;
 
         try {
-            if (docTree == null) {
-                storage = new StoredFileHelper(ioTree, filename, tag);
-                storage.sourceTree = Uri.fromFile(ioTree).toString();
-            } else {
-                storage = new StoredFileHelper(docTree, contentResolver, filename, mime, tag);
-                storage.sourceTree = docTree.getUri().toString();
-            }
+            if (docTree == null)
+                storage = new StoredFileHelper(ioTree, filename, mime);
+            else
+                storage = new StoredFileHelper(context, docTree, filename, mime, safe);
         } catch (IOException e) {
             return null;
         }
@@ -63,67 +135,6 @@ public class StoredDirectoryHelper {
         return storage;
     }
 
-    public StoredFileHelper createUniqueFile(String filename, String mime) {
-        ArrayList<String> existingNames = new ArrayList<>(50);
-
-        String ext;
-
-        int dotIndex = filename.lastIndexOf('.');
-        if (dotIndex < 0 || (dotIndex == filename.length() - 1)) {
-            ext = "";
-        } else {
-            ext = filename.substring(dotIndex);
-            filename = filename.substring(0, dotIndex - 1);
-        }
-
-        String name;
-        if (docTree == null) {
-            for (File file : ioTree.listFiles()) {
-                name = file.getName().toLowerCase();
-                if (name.startsWith(filename)) existingNames.add(name);
-            }
-        } else {
-            for (DocumentFile file : docTree.listFiles()) {
-                name = file.getName();
-                if (name == null) continue;
-                name = name.toLowerCase();
-                if (name.startsWith(filename)) existingNames.add(name);
-            }
-        }
-
-        boolean free = true;
-        String lwFilename = filename.toLowerCase();
-        for (String testName : existingNames) {
-            if (testName.equals(lwFilename)) {
-                free = false;
-                break;
-            }
-        }
-
-        if (free) return createFile(filename, mime);
-
-        String[] sortedNames = existingNames.toArray(new String[0]);
-        Arrays.sort(sortedNames);
-
-        String newName;
-        int downloadIndex = 0;
-        do {
-            newName = filename + " (" + downloadIndex + ")" + ext;
-            ++downloadIndex;
-            if (downloadIndex == 1000) {  // Probably an error on our side
-                newName = System.currentTimeMillis() + ext;
-                break;
-            }
-        } while (Arrays.binarySearch(sortedNames, newName) >= 0);
-
-
-        return createFile(newName, mime);
-    }
-
-    public boolean isDirect() {
-        return docTree == null;
-    }
-
     public Uri getUri() {
         return docTree == null ? Uri.fromFile(ioTree) : docTree.getUri();
     }
@@ -136,34 +147,18 @@ public class StoredDirectoryHelper {
         return tag;
     }
 
-    public void acquirePermissions() throws IOException {
-        if (docTree == null) return;
-
-        try {
-            contentResolver.takePersistableUriPermission(docTree.getUri(), PERMISSION_FLAGS);
-        } catch (Throwable e) {
-            throw new IOException(e);
-        }
-    }
-
-    public void revokePermissions() throws IOException {
-        if (docTree == null) return;
-
-        try {
-            contentResolver.releasePersistableUriPermission(docTree.getUri(), PERMISSION_FLAGS);
-        } catch (Throwable e) {
-            throw new IOException(e);
-        }
-    }
-
     public Uri findFile(String filename) {
-        if (docTree == null)
-            return Uri.fromFile(new File(ioTree, filename));
+        if (docTree == null) {
+            File res = new File(ioTree, filename);
+            return res.exists() ? Uri.fromFile(res) : null;
+        }
 
-        // findFile() method is very slow
-        DocumentFile file = docTree.findFile(filename);
+        DocumentFile res = findFileSAFHelper(context, docTree, filename);
+        return res == null ? null : res.getUri();
+    }
 
-        return file == null ? null : file.getUri();
+    public boolean canWrite() {
+        return docTree == null ? ioTree.canWrite() : docTree.canWrite();
     }
 
     @NonNull
@@ -172,4 +167,76 @@ public class StoredDirectoryHelper {
         return docTree == null ? Uri.fromFile(ioTree).toString() : docTree.getUri().toString();
     }
 
+
+    ////////////////////
+    //      Utils
+    ///////////////////
+
+    private static void addIfStartWith(ArrayList<String> list, @NonNull String base, String str) {
+        if (str == null || str.isEmpty()) return;
+        str = str.toLowerCase();
+        if (str.startsWith(base)) list.add(str);
+    }
+
+    private static String[] splitFilename(@NonNull String filename) {
+        int dotIndex = filename.lastIndexOf('.');
+
+        if (dotIndex < 0 || (dotIndex == filename.length() - 1))
+            return new String[]{filename, ""};
+
+        return new String[]{filename.substring(0, dotIndex), filename.substring(dotIndex)};
+    }
+
+    private static String makeFileName(String name, int idx, String ext) {
+        return name.concat(" (").concat(String.valueOf(idx)).concat(")").concat(ext);
+    }
+
+    /**
+     * Fast (but not enough) file/directory finder under the storage access framework
+     *
+     * @param context  The context
+     * @param tree     Directory where search
+     * @param filename Target filename
+     * @return A {@link android.support.v4.provider.DocumentFile} contain the reference, otherwise, null
+     */
+    static DocumentFile findFileSAFHelper(@Nullable Context context, DocumentFile tree, String filename) {
+        if (context == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return tree.findFile(filename);// warning: this is very slow
+        }
+
+        if (!tree.canRead()) return null;// missing read permission
+
+        final int name = 0;
+        final int documentId = 1;
+
+        // LOWER() SQL function is not supported
+        String selection = COLUMN_DISPLAY_NAME + " = ?";
+        //String selection = COLUMN_DISPLAY_NAME + " LIKE ?%";
+
+        Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(
+                tree.getUri(), DocumentsContract.getDocumentId(tree.getUri())
+        );
+        String[] projection = {COLUMN_DISPLAY_NAME, COLUMN_DOCUMENT_ID};
+        ContentResolver contentResolver = context.getContentResolver();
+
+        filename = filename.toLowerCase();
+
+        try (Cursor cursor = contentResolver.query(childrenUri, projection, selection, new String[]{filename}, null)) {
+            if (cursor == null) return null;
+
+            while (cursor.moveToNext()) {
+                if (cursor.isNull(name) || !cursor.getString(name).toLowerCase().startsWith(filename))
+                    continue;
+
+                return DocumentFile.fromSingleUri(
+                        context, DocumentsContract.buildDocumentUriUsingTree(
+                                tree.getUri(), cursor.getString(documentId)
+                        )
+                );
+            }
+        }
+
+        return null;
+    }
+
 }
diff --git a/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java b/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java
index 0db442f1c..f90a756a9 100644
--- a/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java
+++ b/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java
@@ -8,6 +8,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.provider.DocumentsContract;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.provider.DocumentFile;
 
@@ -25,79 +26,52 @@ public class StoredFileHelper implements Serializable {
     private transient DocumentFile docFile;
     private transient DocumentFile docTree;
     private transient File ioFile;
-    private transient ContentResolver contentResolver;
+    private transient Context context;
 
     protected String source;
-    String sourceTree;
+    private String sourceTree;
 
     protected String tag;
 
     private String srcName;
     private String srcType;
 
-    public StoredFileHelper(String filename, String mime, String tag) {
+    public StoredFileHelper(@Nullable Uri parent, String filename, String mime, String tag) {
         this.source = null;// this instance will be "invalid" see invalidate()/isInvalid() methods
 
         this.srcName = filename;
         this.srcType = mime == null ? DEFAULT_MIME : mime;
+        if (parent != null) this.sourceTree = parent.toString();
 
         this.tag = tag;
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    StoredFileHelper(DocumentFile tree, ContentResolver contentResolver, String filename, String mime, String tag) throws IOException {
+    StoredFileHelper(@Nullable Context context, DocumentFile tree, String filename, String mime, boolean safe) throws IOException {
         this.docTree = tree;
-        this.contentResolver = contentResolver;
+        this.context = context;
 
-        // this is very slow, because SAF does not allow overwrite
-        DocumentFile res = this.docTree.findFile(filename);
+        DocumentFile res;
 
-        if (res != null && res.exists() && res.isDirectory()) {
-            if (!res.delete())
-                throw new IOException("Directory with the same name found but cannot delete");
-            res = null;
-        }
-
-        if (res == null) {
-            res = this.docTree.createFile(mime == null ? DEFAULT_MIME : mime, filename);
+        if (safe) {
+            // no conflicts (the filename is not in use)
+            res = this.docTree.createFile(mime, filename);
             if (res == null) throw new IOException("Cannot create the file");
+        } else {
+            res = createSAF(context, mime, filename);
         }
 
         this.docFile = res;
-        this.source = res.getUri().toString();
-        this.srcName = getName();
-        this.srcType = getType();
+
+        this.source = docFile.getUri().toString();
+        this.sourceTree = docTree.getUri().toString();
+
+        this.srcName = this.docFile.getName();
+        this.srcType = this.docFile.getType();
     }
 
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    public StoredFileHelper(Context context, @NonNull Uri path, String tag) throws IOException {
-        this.source = path.toString();
-        this.tag = tag;
-
-        if (path.getScheme() == null || path.getScheme().equalsIgnoreCase("file")) {
-            this.ioFile = new File(URI.create(this.source));
-        } else {
-            DocumentFile file = DocumentFile.fromSingleUri(context, path);
-            if (file == null)
-                throw new UnsupportedOperationException("Cannot get the file via SAF");
-
-            this.contentResolver = context.getContentResolver();
-            this.docFile = file;
-
-            try {
-                this.contentResolver.takePersistableUriPermission(docFile.getUri(), StoredDirectoryHelper.PERMISSION_FLAGS);
-            } catch (Exception e) {
-                throw new IOException(e);
-            }
-        }
-
-        this.srcName = getName();
-        this.srcType = getType();
-    }
-
-    public StoredFileHelper(File location, String filename, String tag) throws IOException {
+    StoredFileHelper(File location, String filename, String mime) throws IOException {
         this.ioFile = new File(location, filename);
-        this.tag = tag;
 
         if (this.ioFile.exists()) {
             if (!this.ioFile.isFile() && !this.ioFile.delete())
@@ -108,22 +82,58 @@ public class StoredFileHelper implements Serializable {
         }
 
         this.source = Uri.fromFile(this.ioFile).toString();
+        this.sourceTree = Uri.fromFile(location).toString();
+
+        this.srcName = ioFile.getName();
+        this.srcType = mime;
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    public StoredFileHelper(Context context, @Nullable Uri parent, @NonNull Uri path, String tag) throws IOException {
+        this.tag = tag;
+        this.source = path.toString();
+
+        if (path.getScheme() == null || path.getScheme().equalsIgnoreCase(ContentResolver.SCHEME_FILE)) {
+            this.ioFile = new File(URI.create(this.source));
+        } else {
+            DocumentFile file = DocumentFile.fromSingleUri(context, path);
+
+            if (file == null) throw new RuntimeException("SAF not available");
+
+            this.context = context;
+
+            if (file.getName() == null) {
+                this.source = null;
+                return;
+            } else {
+                this.docFile = file;
+                takePermissionSAF();
+            }
+        }
+
+        if (parent != null) {
+            if (!ContentResolver.SCHEME_FILE.equals(parent.getScheme()))
+                this.docTree = DocumentFile.fromTreeUri(context, parent);
+
+            this.sourceTree = parent.toString();
+        }
+
         this.srcName = getName();
         this.srcType = getType();
     }
 
+
     public static StoredFileHelper deserialize(@NonNull StoredFileHelper storage, Context context) throws IOException {
+        Uri treeUri = storage.sourceTree == null ? null : Uri.parse(storage.sourceTree);
+
         if (storage.isInvalid())
-            return new StoredFileHelper(storage.srcName, storage.srcType, storage.tag);
+            return new StoredFileHelper(treeUri, storage.srcName, storage.srcType, storage.tag);
 
-        StoredFileHelper instance = new StoredFileHelper(context, Uri.parse(storage.source), storage.tag);
+        StoredFileHelper instance = new StoredFileHelper(context, treeUri, Uri.parse(storage.source), storage.tag);
 
-        if (storage.sourceTree != null) {
-            instance.docTree = DocumentFile.fromTreeUri(context, Uri.parse(instance.sourceTree));
-
-            if (instance.docTree == null)
-                throw new IOException("Cannot deserialize the tree, ¿revoked permissions?");
-        }
+        // under SAF, if the target document is deleted, conserve the filename and mime
+        if (instance.srcName == null) instance.srcName = storage.srcName;
+        if (instance.srcType == null) instance.srcType = storage.srcType;
 
         return instance;
     }
@@ -143,13 +153,14 @@ public class StoredFileHelper implements Serializable {
         who.startActivityForResult(intent, requestCode);
     }
 
+
     public SharpStream getStream() throws IOException {
         invalid();
 
         if (docFile == null)
             return new FileStream(ioFile);
         else
-            return new FileStreamSAF(contentResolver, docFile.getUri());
+            return new FileStreamSAF(context.getContentResolver(), docFile.getUri());
     }
 
     /**
@@ -173,6 +184,12 @@ public class StoredFileHelper implements Serializable {
         return docFile == null ? Uri.fromFile(ioFile) : docFile.getUri();
     }
 
+    public Uri getParentUri() {
+        invalid();
+
+        return sourceTree == null ? null : Uri.parse(sourceTree);
+    }
+
     public void truncate() throws IOException {
         invalid();
 
@@ -182,17 +199,17 @@ public class StoredFileHelper implements Serializable {
     }
 
     public boolean delete() {
-        invalid();
-
+        if (source == null) return true;
         if (docFile == null) return ioFile.delete();
 
+
         boolean res = docFile.delete();
 
         try {
             int flags = Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
-            contentResolver.releasePersistableUriPermission(docFile.getUri(), flags);
+            context.getContentResolver().releasePersistableUriPermission(docFile.getUri(), flags);
         } catch (Exception ex) {
-            // ¿what happen?
+            // nothing to do
         }
 
         return res;
@@ -209,18 +226,22 @@ public class StoredFileHelper implements Serializable {
         return docFile == null ? ioFile.canWrite() : docFile.canWrite();
     }
 
-    public File getIOFile() {
-        return ioFile;
-    }
-
     public String getName() {
-        if (source == null) return srcName;
-        return docFile == null ? ioFile.getName() : docFile.getName();
+        if (source == null)
+            return srcName;
+        else if (docFile == null)
+            return ioFile.getName();
+
+        String name = docFile.getName();
+        return name == null ? srcName : name;
     }
 
     public String getType() {
-        if (source == null) return srcType;
-        return docFile == null ? DEFAULT_MIME : docFile.getType();// not obligatory for Java IO
+        if (source == null || docFile == null)
+            return srcType;
+
+        String type = docFile.getType();
+        return type == null ? srcType : type;
     }
 
     public String getTag() {
@@ -231,29 +252,41 @@ public class StoredFileHelper implements Serializable {
         if (source == null) return false;
 
         boolean exists = docFile == null ? ioFile.exists() : docFile.exists();
-        boolean asFile = docFile == null ? ioFile.isFile() : docFile.isFile();// ¿docFile.isVirtual() means is no-physical?
+        boolean isFile = docFile == null ? ioFile.isFile() : docFile.isFile();// ¿docFile.isVirtual() means is no-physical?
 
-        return exists && asFile;
+        return exists && isFile;
     }
 
     public boolean create() {
         invalid();
+        boolean result;
 
         if (docFile == null) {
             try {
-                return ioFile.createNewFile();
+                result = ioFile.createNewFile();
+            } catch (IOException e) {
+                return false;
+            }
+        } else if (docTree == null) {
+            result = false;
+        } else {
+            if (!docTree.canRead() || !docTree.canWrite()) return false;
+            try {
+                docFile = createSAF(context, srcType, srcName);
+                if (docFile == null || docFile.getName() == null) return false;
+                result = true;
             } catch (IOException e) {
                 return false;
             }
         }
 
-        if (docTree == null || docFile.getName() == null) return false;
+        if (result) {
+            source = (docFile == null ? Uri.fromFile(ioFile) : docFile.getUri()).toString();
+            srcName = getName();
+            srcType = getType();
+        }
 
-        DocumentFile res = docTree.createFile(docFile.getName(), docFile.getType() == null ? DEFAULT_MIME : docFile.getType());
-        if (res == null) return false;
-
-        docFile = res;
-        return true;
+        return result;
     }
 
     public void invalidate() {
@@ -264,20 +297,25 @@ public class StoredFileHelper implements Serializable {
 
         source = null;
 
-        sourceTree = null;
         docTree = null;
         docFile = null;
         ioFile = null;
-        contentResolver = null;
-    }
-
-    private void invalid() {
-        if (source == null)
-            throw new IllegalStateException("In invalid state");
+        context = null;
     }
 
     public boolean equals(StoredFileHelper storage) {
-        if (this.isInvalid() != storage.isInvalid()) return false;
+        if (this == storage) return true;
+
+        // note: do not compare tags, files can have the same parent folder
+        //if (stringMismatch(this.tag, storage.tag)) return false;
+
+        if (stringMismatch(getLowerCase(this.sourceTree), getLowerCase(this.sourceTree)))
+            return false;
+
+        if (this.isInvalid() || storage.isInvalid()) {
+            return this.srcName.equalsIgnoreCase(storage.srcName) && this.srcType.equalsIgnoreCase(storage.srcType);
+        }
+
         if (this.isDirect() != storage.isDirect()) return false;
 
         if (this.isDirect())
@@ -298,4 +336,46 @@ public class StoredFileHelper implements Serializable {
         else
             return "sourceFile=" + source + "  treeSource=" + (sourceTree == null ? "" : sourceTree) + "  tag=" + tag;
     }
+
+
+    private void invalid() {
+        if (source == null)
+            throw new IllegalStateException("In invalid state");
+    }
+
+    private void takePermissionSAF() throws IOException {
+        try {
+            context.getContentResolver().takePersistableUriPermission(docFile.getUri(), StoredDirectoryHelper.PERMISSION_FLAGS);
+        } catch (Exception e) {
+            if (docFile.getName() == null) throw new IOException(e);
+        }
+    }
+
+    private DocumentFile createSAF(@Nullable Context context, String mime, String filename) throws IOException {
+        DocumentFile res = StoredDirectoryHelper.findFileSAFHelper(context, docTree, filename);
+
+        if (res != null && res.exists() && res.isDirectory()) {
+            if (!res.delete())
+                throw new IOException("Directory with the same name found but cannot delete");
+            res = null;
+        }
+
+        if (res == null) {
+            res = this.docTree.createFile(srcType == null ? DEFAULT_MIME : mime, filename);
+            if (res == null) throw new IOException("Cannot create the file");
+        }
+
+        return res;
+    }
+
+    private String getLowerCase(String str) {
+        return str == null ? null : str.toLowerCase();
+    }
+
+    private boolean stringMismatch(String str1, String str2) {
+        if (str1 == null && str2 == null) return false;
+        if ((str1 == null) != (str2 == null)) return true;
+
+        return !str1.equals(str2);
+    }
 }
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
index 98ab29dbb..f12c1c2d2 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
@@ -11,7 +11,7 @@ import java.io.IOException;
 class Mp4FromDashMuxer extends Postprocessing {
 
     Mp4FromDashMuxer() {
-        super(2 * 1024 * 1024/* 2 MiB */, true);
+        super(3 * 1024 * 1024/* 3 MiB */, true);
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
index 7bc32ea05..3d10628e7 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
@@ -8,6 +8,7 @@ import org.schabi.newpipe.streams.io.SharpStream;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.Serializable;
 
 import us.shandian.giga.get.DownloadMission;
 import us.shandian.giga.io.ChunkFileInputStream;
@@ -19,7 +20,7 @@ import static us.shandian.giga.get.DownloadMission.ERROR_NOTHING;
 import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_HOLD;
 import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION;
 
-public abstract class Postprocessing {
+public abstract class Postprocessing implements Serializable {
 
     static transient final byte OK_RESULT = ERROR_NOTHING;
 
@@ -28,12 +29,10 @@ public abstract class Postprocessing {
     public transient static final String ALGORITHM_MP4_FROM_DASH_MUXER = "mp4D-mp4";
     public transient static final String ALGORITHM_M4A_NO_DASH = "mp4D-m4a";
 
-    public static Postprocessing getAlgorithm(String algorithmName, String[] args) {
+    public static Postprocessing getAlgorithm(@NonNull String algorithmName, String[] args, @NonNull File cacheDir) {
         Postprocessing instance;
 
-        if (null == algorithmName) {
-            throw new NullPointerException("algorithmName");
-        } else switch (algorithmName) {
+        switch (algorithmName) {
             case ALGORITHM_TTML_CONVERTER:
                 instance = new TtmlConverter();
                 break;
@@ -47,13 +46,14 @@ public abstract class Postprocessing {
                 instance = new M4aNoDash();
                 break;
             /*case "example-algorithm":
-                instance = new ExampleAlgorithm(mission);*/
+                instance = new ExampleAlgorithm();*/
             default:
                 throw new RuntimeException("Unimplemented post-processing algorithm: " + algorithmName);
         }
 
         instance.args = args;
-        instance.name = algorithmName;
+        instance.name = algorithmName;// for debug only, maybe remove this field in the future
+        instance.cacheDir = cacheDir;
 
         return instance;
     }
@@ -125,7 +125,6 @@ public abstract class Postprocessing {
                         return -1;
                     };
 
-                    // TODO: use Context.getCache() for this operation
                     temp = new File(cacheDir, mission.storage.getName() + ".tmp");
 
                     out = new CircularFileWriter(mission.storage.getStream(), temp, checker);
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
index 37295f2e3..3d5ecb3cd 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
@@ -13,7 +13,7 @@ import java.io.IOException;
 class WebMMuxer extends Postprocessing {
 
     WebMMuxer() {
-        super(2048 * 1024/* 2 MiB */, true);
+        super(5 * 1024 * 1024/* 5 MiB */, true);
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManager.java b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
index 3624fb6c2..479c4b92f 100644
--- a/app/src/main/java/us/shandian/giga/service/DownloadManager.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
@@ -62,13 +62,15 @@ public class DownloadManager {
      * @param context Context for the data source for finished downloads
      * @param handler Thread required for Messaging
      */
-    DownloadManager(@NonNull Context context, Handler handler) {
+    DownloadManager(@NonNull Context context, Handler handler, StoredDirectoryHelper storageVideo, StoredDirectoryHelper storageAudio) {
         if (DEBUG) {
             Log.d(TAG, "new DownloadManager instance. 0x" + Integer.toHexString(this.hashCode()));
         }
 
         mFinishedMissionStore = new FinishedMissionStore(context);
         mHandler = handler;
+        mMainStorageAudio = storageAudio;
+        mMainStorageVideo = storageVideo;
         mMissionsFinished = loadFinishedMissions();
         mPendingMissionsDir = getPendingDir(context);
 
@@ -129,91 +131,59 @@ public class DownloadManager {
         }
 
         for (File sub : subs) {
-            if (sub.isFile()) {
-                DownloadMission mis = Utility.readFromFile(sub);
+            if (!sub.isFile()) continue;
 
-                if (mis == null) {
-                    //noinspection ResultOfMethodCallIgnored
-                    sub.delete();
-                } else {
-                    if (mis.isFinished()) {
-                        //noinspection ResultOfMethodCallIgnored
-                        sub.delete();
-                        continue;
-                    }
-
-                    boolean exists;
-                    try {
-                        mis.storage = StoredFileHelper.deserialize(mis.storage, ctx);
-                        exists = !mis.storage.isInvalid() && mis.storage.existsAsFile();
-
-                    } catch (Exception ex) {
-                        Log.e(TAG, "Failed to load the file source of " + mis.storage.toString());
-                        mis.storage.invalidate();
-                        exists = false;
-                    }
-
-                    if (mis.isPsRunning()) {
-                        if (mis.psAlgorithm.worksOnSameFile) {
-                            // Incomplete post-processing results in a corrupted download file
-                            // because the selected algorithm works on the same file to save space.
-                            if (exists && !mis.storage.delete())
-                                Log.w(TAG, "Unable to delete incomplete download file: " + sub.getPath());
-
-                            exists = true;
-                        }
-
-                        mis.psState = 0;
-                        mis.errCode = DownloadMission.ERROR_POSTPROCESSING_STOPPED;
-                        mis.errObject = null;
-                    } else if (!exists) {
-
-                        StoredDirectoryHelper mainStorage = getMainStorage(mis.storage.getTag());
-
-                        if (!mis.storage.isInvalid() && !mis.storage.create()) {
-                            // using javaIO cannot recreate the file
-                            // using SAF in older devices (no tree available)
-                            //
-                            // force the user to pick again the save path
-                            mis.storage.invalidate();
-                        } else if (mainStorage != null) {
-                            // if the user has changed the save path before this download, the original save path will be lost
-                            StoredFileHelper newStorage = mainStorage.createFile(mis.storage.getName(), mis.storage.getType());
-                            if (newStorage == null)
-                                mis.storage.invalidate();
-                            else
-                                mis.storage = newStorage;
-                        }
-
-                        if (mis.isInitialized()) {
-                            // the progress is lost, reset mission state
-                            DownloadMission m = new DownloadMission(mis.urls, mis.storage, mis.kind, mis.psAlgorithm);
-                            m.timestamp = mis.timestamp;
-                            m.threadCount = mis.threadCount;
-                            m.source = mis.source;
-                            m.nearLength = mis.nearLength;
-                            m.enqueued = mis.enqueued;
-                            m.errCode = DownloadMission.ERROR_PROGRESS_LOST;
-                            mis = m;
-                        }
-                    }
-
-                    if (mis.psAlgorithm != null) mis.psAlgorithm.cacheDir = ctx.getCacheDir();
-
-                    mis.running = false;
-                    mis.recovered = exists;
-                    mis.metadata = sub;
-                    mis.maxRetry = mPrefMaxRetry;
-                    mis.mHandler = mHandler;
-
-                    mMissionsPending.add(mis);
-                }
+            DownloadMission mis = Utility.readFromFile(sub);
+            if (mis == null || mis.isFinished()) {
+                //noinspection ResultOfMethodCallIgnored
+                sub.delete();
+                continue;
             }
+
+            boolean exists;
+            try {
+                mis.storage = StoredFileHelper.deserialize(mis.storage, ctx);
+                exists = !mis.storage.isInvalid() && mis.storage.existsAsFile();
+            } catch (Exception ex) {
+                Log.e(TAG, "Failed to load the file source of " + mis.storage.toString(), ex);
+                mis.storage.invalidate();
+                exists = false;
+            }
+
+            if (mis.isPsRunning()) {
+                if (mis.psAlgorithm.worksOnSameFile) {
+                    // Incomplete post-processing results in a corrupted download file
+                    // because the selected algorithm works on the same file to save space.
+                    if (exists && !mis.storage.delete())
+                        Log.w(TAG, "Unable to delete incomplete download file: " + sub.getPath());
+
+                    exists = true;
+                }
+
+                mis.psState = 0;
+                mis.errCode = DownloadMission.ERROR_POSTPROCESSING_STOPPED;
+                mis.errObject = null;
+            } else if (!exists) {
+                tryRecover(mis);
+
+                // the progress is lost, reset mission state
+                if (mis.isInitialized())
+                    mis.resetState(true, true, DownloadMission.ERROR_PROGRESS_LOST);
+            }
+
+            if (mis.psAlgorithm != null)
+                mis.psAlgorithm.cacheDir = pickAvailableCacheDir(ctx);
+
+            mis.recovered = exists;
+            mis.metadata = sub;
+            mis.maxRetry = mPrefMaxRetry;
+            mis.mHandler = mHandler;
+
+            mMissionsPending.add(mis);
         }
 
-        if (mMissionsPending.size() > 1) {
+        if (mMissionsPending.size() > 1)
             Collections.sort(mMissionsPending, (mission1, mission2) -> Long.compare(mission1.timestamp, mission2.timestamp));
-        }
     }
 
     /**
@@ -313,6 +283,25 @@ public class DownloadManager {
         }
     }
 
+    public void tryRecover(DownloadMission mission) {
+        StoredDirectoryHelper mainStorage = getMainStorage(mission.storage.getTag());
+
+        if (!mission.storage.isInvalid() && mission.storage.create()) return;
+
+        // using javaIO cannot recreate the file
+        // using SAF in older devices (no tree available)
+        //
+        // force the user to pick again the save path
+        mission.storage.invalidate();
+
+        if (mainStorage == null) return;
+
+        // if the user has changed the save path before this download, the original save path will be lost
+        StoredFileHelper newStorage = mainStorage.createFile(mission.storage.getName(), mission.storage.getType());
+
+        if (newStorage != null) mission.storage = newStorage;
+    }
+
 
     /**
      * Get a pending mission by its path
@@ -392,7 +381,7 @@ public class DownloadManager {
 
         synchronized (this) {
             for (DownloadMission mission : mMissionsPending) {
-                if (mission.running || !mission.canDownload()) continue;
+                if (mission.running || mission.isCorrupt()) continue;
 
                 flag = true;
                 mission.start();
@@ -482,7 +471,7 @@ public class DownloadManager {
         int paused = 0;
         synchronized (this) {
             for (DownloadMission mission : mMissionsPending) {
-                if (!mission.canDownload() || mission.isPsRunning()) continue;
+                if (mission.isCorrupt() || mission.isPsRunning()) continue;
 
                 if (mission.running && isMetered) {
                     paused++;
@@ -542,6 +531,20 @@ public class DownloadManager {
         return MissionState.None;
     }
 
+    private static boolean isDirectoryAvailable(File directory) {
+        return directory != null && directory.canWrite();
+    }
+
+    static File pickAvailableCacheDir(@NonNull Context ctx) {
+        if (isDirectoryAvailable(ctx.getExternalCacheDir()))
+            return ctx.getExternalCacheDir();
+        else if (isDirectoryAvailable(ctx.getCacheDir()))
+            return ctx.getCacheDir();
+
+        // this never should happen
+        return ctx.getDir("tmp", Context.MODE_PRIVATE);
+    }
+
     @Nullable
     private StoredDirectoryHelper getMainStorage(@NonNull String tag) {
         if (tag.equals(TAG_AUDIO)) return mMainStorageAudio;
@@ -656,7 +659,7 @@ public class DownloadManager {
 
             synchronized (DownloadManager.this) {
                 for (DownloadMission mission : mMissionsPending) {
-                    if (hidden.contains(mission) || mission.canDownload())
+                    if (hidden.contains(mission) || mission.isCorrupt())
                         continue;
 
                     if (mission.running)
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index deed9e8e3..da63cb545 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -6,6 +6,7 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -40,6 +41,7 @@ import org.schabi.newpipe.player.helper.LockManager;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.util.ArrayList;
 
 import us.shandian.giga.get.DownloadMission;
@@ -65,14 +67,15 @@ public class DownloadManagerService extends Service {
     private static final int DOWNLOADS_NOTIFICATION_ID = 1001;
 
     private static final String EXTRA_URLS = "DownloadManagerService.extra.urls";
-    private static final String EXTRA_PATH = "DownloadManagerService.extra.path";
     private static final String EXTRA_KIND = "DownloadManagerService.extra.kind";
     private static final String EXTRA_THREADS = "DownloadManagerService.extra.threads";
     private static final String EXTRA_POSTPROCESSING_NAME = "DownloadManagerService.extra.postprocessingName";
     private static final String EXTRA_POSTPROCESSING_ARGS = "DownloadManagerService.extra.postprocessingArgs";
     private static final String EXTRA_SOURCE = "DownloadManagerService.extra.source";
     private static final String EXTRA_NEAR_LENGTH = "DownloadManagerService.extra.nearLength";
-    private static final String EXTRA_MAIN_STORAGE_TAG = "DownloadManagerService.extra.tag";
+    private static final String EXTRA_PATH = "DownloadManagerService.extra.storagePath";
+    private static final String EXTRA_PARENT_PATH = "DownloadManagerService.extra.storageParentPath";
+    private static final String EXTRA_STORAGE_TAG = "DownloadManagerService.extra.storageTag";
 
     private static final String ACTION_RESET_DOWNLOAD_FINISHED = APPLICATION_ID + ".reset_download_finished";
     private static final String ACTION_OPEN_DOWNLOADS_FINISHED = APPLICATION_ID + ".open_downloads_finished";
@@ -136,7 +139,9 @@ public class DownloadManagerService extends Service {
             }
         };
 
-        mManager = new DownloadManager(this, mHandler);
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+
+        mManager = new DownloadManager(this, mHandler, getVideoStorage(), getAudioStorage());
 
         Intent openDownloadListIntent = new Intent(this, DownloadActivity.class)
                 .setAction(Intent.ACTION_MAIN);
@@ -182,7 +187,6 @@ public class DownloadManagerService extends Service {
             registerReceiver(mNetworkStateListener, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
         }
 
-        mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         mPrefs.registerOnSharedPreferenceChangeListener(mPrefChangeListener);
 
         handlePreferenceChange(mPrefs, getString(R.string.downloads_cross_network));
@@ -190,8 +194,6 @@ public class DownloadManagerService extends Service {
         handlePreferenceChange(mPrefs, getString(R.string.downloads_queue_limit));
 
         mLock = new LockManager(this);
-
-        setupStorageAPI(true);
     }
 
     @Override
@@ -347,11 +349,12 @@ public class DownloadManagerService extends Service {
         } else if (key.equals(getString(R.string.downloads_queue_limit))) {
             mManager.mPrefQueueLimit = prefs.getBoolean(key, true);
         } else if (key.equals(getString(R.string.downloads_storage_api))) {
-            setupStorageAPI(false);
+            mManager.mMainStorageVideo = loadMainStorage(getString(R.string.download_path_video_key), DownloadManager.TAG_VIDEO);
+            mManager.mMainStorageAudio = loadMainStorage(getString(R.string.download_path_audio_key), DownloadManager.TAG_AUDIO);
         } else if (key.equals(getString(R.string.download_path_video_key))) {
-            loadMainStorage(key, DownloadManager.TAG_VIDEO, false);
+            mManager.mMainStorageVideo = loadMainStorage(key, DownloadManager.TAG_VIDEO);
         } else if (key.equals(getString(R.string.download_path_audio_key))) {
-            loadMainStorage(key, DownloadManager.TAG_AUDIO, false);
+            mManager.mMainStorageAudio = loadMainStorage(key, DownloadManager.TAG_AUDIO);
         }
     }
 
@@ -387,36 +390,46 @@ public class DownloadManagerService extends Service {
         Intent intent = new Intent(context, DownloadManagerService.class);
         intent.setAction(Intent.ACTION_RUN);
         intent.putExtra(EXTRA_URLS, urls);
-        intent.putExtra(EXTRA_PATH, storage.getUri());
         intent.putExtra(EXTRA_KIND, kind);
         intent.putExtra(EXTRA_THREADS, threads);
         intent.putExtra(EXTRA_SOURCE, source);
         intent.putExtra(EXTRA_POSTPROCESSING_NAME, psName);
         intent.putExtra(EXTRA_POSTPROCESSING_ARGS, psArgs);
         intent.putExtra(EXTRA_NEAR_LENGTH, nearLength);
-        intent.putExtra(EXTRA_MAIN_STORAGE_TAG, storage.getTag());
+
+        intent.putExtra(EXTRA_PARENT_PATH, storage.getParentUri());
+        intent.putExtra(EXTRA_PATH, storage.getUri());
+        intent.putExtra(EXTRA_STORAGE_TAG, storage.getTag());
+
         context.startService(intent);
     }
 
-    public void startMission(Intent intent) {
+    private void startMission(Intent intent) {
         String[] urls = intent.getStringArrayExtra(EXTRA_URLS);
         Uri path = intent.getParcelableExtra(EXTRA_PATH);
+        Uri parentPath = intent.getParcelableExtra(EXTRA_PARENT_PATH);
         int threads = intent.getIntExtra(EXTRA_THREADS, 1);
         char kind = intent.getCharExtra(EXTRA_KIND, '?');
         String psName = intent.getStringExtra(EXTRA_POSTPROCESSING_NAME);
         String[] psArgs = intent.getStringArrayExtra(EXTRA_POSTPROCESSING_ARGS);
         String source = intent.getStringExtra(EXTRA_SOURCE);
         long nearLength = intent.getLongExtra(EXTRA_NEAR_LENGTH, 0);
-        String tag = intent.getStringExtra(EXTRA_MAIN_STORAGE_TAG);
+        String tag = intent.getStringExtra(EXTRA_STORAGE_TAG);
 
         StoredFileHelper storage;
         try {
-            storage = new StoredFileHelper(this, path, tag);
+            storage = new StoredFileHelper(this, parentPath, path, tag);
         } catch (IOException e) {
             throw new RuntimeException(e);// this never should happen
         }
 
-        final DownloadMission mission = new DownloadMission(urls, storage, kind, Postprocessing.getAlgorithm(psName, psArgs));
+        Postprocessing ps;
+        if (psName == null)
+            ps = null;
+        else
+            ps = Postprocessing.getAlgorithm(psName, psArgs, DownloadManager.pickAvailableCacheDir(this));
+
+        final DownloadMission mission = new DownloadMission(urls, storage, kind, ps);
         mission.threadCount = threads;
         mission.source = source;
         mission.nearLength = nearLength;
@@ -525,60 +538,63 @@ public class DownloadManagerService extends Service {
         mLockAcquired = acquire;
     }
 
-    private void setupStorageAPI(boolean acquire) {
-        loadMainStorage(getString(R.string.download_path_audio_key), DownloadManager.TAG_VIDEO, acquire);
-        loadMainStorage(getString(R.string.download_path_video_key), DownloadManager.TAG_AUDIO, acquire);
+    private StoredDirectoryHelper getVideoStorage() {
+        return loadMainStorage(getString(R.string.download_path_video_key), DownloadManager.TAG_VIDEO);
     }
 
-    void loadMainStorage(String prefKey, String tag, boolean acquire) {
+    private StoredDirectoryHelper getAudioStorage() {
+        return loadMainStorage(getString(R.string.download_path_audio_key), DownloadManager.TAG_AUDIO);
+    }
+
+
+    private StoredDirectoryHelper loadMainStorage(String prefKey, String tag) {
         String path = mPrefs.getString(prefKey, null);
 
         final String JAVA_IO = getString(R.string.downloads_storage_api_default);
         boolean useJavaIO = JAVA_IO.equals(mPrefs.getString(getString(R.string.downloads_storage_api), JAVA_IO));
 
         final String defaultPath;
-        if (tag.equals(DownloadManager.TAG_VIDEO))
-            defaultPath = Environment.DIRECTORY_MOVIES;
-        else// if (tag.equals(DownloadManager.TAG_AUDIO))
-            defaultPath = Environment.DIRECTORY_MUSIC;
-
-        StoredDirectoryHelper mainStorage;
-        if (path == null || path.isEmpty()) {
-            mainStorage = useJavaIO ? new StoredDirectoryHelper(defaultPath, tag) : null;
-        } else {
-
-            if (path.charAt(0) == File.separatorChar) {
-                Log.i(TAG, "Migrating old save path: " + path);
-
-                useJavaIO = true;
-                path = Uri.fromFile(new File(path)).toString();
-
-                mPrefs.edit().putString(prefKey, path).apply();
-            }
-
-            if (useJavaIO) {
-                mainStorage = new StoredDirectoryHelper(path, tag);
-            } else {
-
-                // tree api is not available in older versions
-                if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                    mainStorage = null;
-                } else {
-                    try {
-                        mainStorage = new StoredDirectoryHelper(this, Uri.parse(path), tag);
-                        if (acquire) mainStorage.acquirePermissions();
-                    } catch (IOException e) {
-                        Log.e(TAG, "Failed to load the storage of " + tag + " from path: " + path, e);
-                        mainStorage = null;
-                    }
-                }
-            }
+        switch (tag) {
+            case DownloadManager.TAG_VIDEO:
+                defaultPath = Environment.DIRECTORY_MOVIES;
+                break;
+            case DownloadManager.TAG_AUDIO:
+                defaultPath = Environment.DIRECTORY_MUSIC;
+                break;
+            default:
+                return null;
         }
 
-        if (tag.equals(DownloadManager.TAG_VIDEO))
-            mManager.mMainStorageVideo = mainStorage;
-        else// if (tag.equals(DownloadManager.TAG_AUDIO))
-            mManager.mMainStorageAudio = mainStorage;
+        if (path == null || path.isEmpty()) {
+            return useJavaIO ? new StoredDirectoryHelper(new File(defaultPath).toURI(), tag) : null;
+        }
+
+        if (path.charAt(0) == File.separatorChar) {
+            Log.i(TAG, "Migrating old save path: " + path);
+
+            useJavaIO = true;
+            path = Uri.fromFile(new File(path)).toString();
+
+            mPrefs.edit().putString(prefKey, path).apply();
+        }
+
+        boolean override = path.startsWith(ContentResolver.SCHEME_FILE) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+        if (useJavaIO || override) {
+            return new StoredDirectoryHelper(URI.create(path), tag);
+        }
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return null;// SAF Directory API is not available in older versions
+        }
+
+        try {
+            return new StoredDirectoryHelper(this, Uri.parse(path), tag);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to load the storage of " + tag + " from " + path, e);
+            Toast.makeText(this, R.string.no_available_dir, Toast.LENGTH_LONG).show();
+        }
+
+        return null;
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index 4d80588e0..1892f4437 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -41,7 +41,9 @@ import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.NavigationHelper;
 
+import java.io.File;
 import java.lang.ref.WeakReference;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 
@@ -346,7 +348,7 @@ public class MissionAdapter extends Adapter<ViewHolder> {
             uri = FileProvider.getUriForFile(
                     mContext,
                     BuildConfig.APPLICATION_ID + ".provider",
-                    mission.storage.getIOFile()
+                    new File(URI.create(mission.storage.getUri().toString()))
             );
         } else {
             uri = mission.storage.getUri();
@@ -384,10 +386,18 @@ public class MissionAdapter extends Adapter<ViewHolder> {
     }
 
     private static String resolveMimeType(@NonNull Mission mission) {
+        String mimeType;
+
+        if (!mission.storage.isInvalid()) {
+            mimeType = mission.storage.getType();
+            if (mimeType != null && mimeType.length() > 0 && !mimeType.equals(StoredFileHelper.DEFAULT_MIME))
+                return mimeType;
+        }
+
         String ext = Utility.getFileExt(mission.storage.getName());
         if (ext == null) return DEFAULT_MIME_TYPE;
 
-        String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
+        mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
 
         return mimeType == null ? DEFAULT_MIME_TYPE : mimeType;
     }
@@ -476,6 +486,7 @@ public class MissionAdapter extends Adapter<ViewHolder> {
                 return;
             case ERROR_PROGRESS_LOST:
                 msg = R.string.error_progress_lost;
+                break;
             default:
                 if (mission.errCode >= 100 && mission.errCode < 600) {
                     msgEx = "HTTP " + mission.errCode;
@@ -554,7 +565,12 @@ public class MissionAdapter extends Adapter<ViewHolder> {
                     return true;
                 case R.id.retry:
                     if (mission.hasInvalidStorage()) {
-                        mRecover.tryRecover(mission);
+                        mDownloadManager.tryRecover(mission);
+                        if (mission.storage.isInvalid())
+                            mRecover.tryRecover(mission);
+                        else
+                            recoverMission(mission);
+
                         return true;
                     }
                     mission.psContinue(true);
@@ -672,13 +688,12 @@ public class MissionAdapter extends Adapter<ViewHolder> {
         if (mDeleter != null) mDeleter.resume();
     }
 
-    public void recoverMission(DownloadMission mission, StoredFileHelper newStorage) {
+    public void recoverMission(DownloadMission mission) {
         for (ViewHolderItem h : mPendingDownloadsItems) {
             if (mission != h.item.mission) continue;
 
-            mission.changeStorage(newStorage);
-            mission.errCode = DownloadMission.ERROR_NOTHING;
             mission.errObject = null;
+            mission.resetState(true, false, DownloadMission.ERROR_NOTHING);
 
             h.status.setText(UNDEFINED_PROGRESS);
             h.state = -1;
@@ -822,9 +837,9 @@ public class MissionAdapter extends Adapter<ViewHolder> {
 
             if (mission != null) {
                 if (mission.hasInvalidStorage()) {
-                    retry.setEnabled(true);
-                    delete.setEnabled(true);
-                    showError.setEnabled(true);
+                    retry.setVisible(true);
+                    delete.setVisible(true);
+                    showError.setVisible(true);
                 } else if (mission.isPsRunning()) {
                     switch (mission.errCode) {
                         case ERROR_INSUFFICIENT_STORAGE:
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index 82ab777b0..bd5ce9215 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -9,6 +9,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
@@ -66,14 +67,7 @@ public class MissionsFragment extends Fragment {
             mAdapter = new MissionAdapter(mContext, mBinder.getDownloadManager(), mEmpty);
             mAdapter.deleterLoad(getView());
 
-            mAdapter.setRecover(mission ->
-                    StoredFileHelper.requestSafWithFileCreation(
-                            MissionsFragment.this,
-                            REQUEST_DOWNLOAD_PATH_SAF,
-                            mission.storage.getName(),
-                            mission.storage.getType()
-                    )
-            );
+            mAdapter.setRecover(MissionsFragment.this::recoverMission);
 
             setAdapterButtons();
 
@@ -92,7 +86,7 @@ public class MissionsFragment extends Fragment {
     };
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.missions, container, false);
 
         mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
@@ -239,8 +233,18 @@ public class MissionsFragment extends Fragment {
         mAdapter.setMasterButtons(mStart, mPause);
     }
 
+    private void recoverMission(@NonNull DownloadMission mission) {
+        unsafeMissionTarget = mission;
+        StoredFileHelper.requestSafWithFileCreation(
+                MissionsFragment.this,
+                REQUEST_DOWNLOAD_PATH_SAF,
+                mission.storage.getName(),
+                mission.storage.getType()
+        );
+    }
+
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
 
         if (mAdapter != null) {
@@ -285,8 +289,9 @@ public class MissionsFragment extends Fragment {
         }
 
         try {
-            StoredFileHelper storage = new StoredFileHelper(mContext, data.getData(), unsafeMissionTarget.storage.getTag());
-            mAdapter.recoverMission(unsafeMissionTarget, storage);
+            String tag = unsafeMissionTarget.storage.getTag();
+            unsafeMissionTarget.storage = new StoredFileHelper(mContext, null, data.getData(), tag);
+            mAdapter.recoverMission(unsafeMissionTarget);
         } catch (IOException e) {
             Toast.makeText(mContext, R.string.general_error, Toast.LENGTH_LONG).show();
         }
diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
index d77e598d8..793cbea18 100644
--- a/app/src/main/java/us/shandian/giga/util/Utility.java
+++ b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -9,6 +9,7 @@ import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.util.Log;
 import android.widget.Toast;
 
 import org.schabi.newpipe.R;
@@ -81,6 +82,7 @@ public class Utility {
             objectInputStream = new ObjectInputStream(new FileInputStream(file));
             object = (T) objectInputStream.readObject();
         } catch (Exception e) {
+            Log.e("Utility", "Failed to deserialize the object", e);
             object = null;
         }
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index eee110474..4cc394357 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -442,8 +442,8 @@ abrir en modo popup</string>
     <!-- message dialog about download error -->
     <string name="show_error">Mostrar error</string>
     <string name="label_code">Codigo</string>
-    <string name="error_file_creation">No se puede crear la carpeta de destino</string>
-    <string name="error_path_creation">No se puede crear el archivo</string>
+    <string name="error_file_creation">No se puede crear el archivo</string>
+    <string name="error_path_creation">No se puede crear la carpeta de destino</string>
     <string name="error_permission_denied">Permiso denegado por el sistema</string>
     <string name="error_ssl_exception">Fallo la conexión segura</string>
     <string name="error_unknown_host">No se pudo encontrar el servidor</string>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index b2be3135b..42df857c1 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -176,13 +176,17 @@
     </string-array>
 
     <!-- FileName Downloads  -->
-    <string name="settings_file_charset_key" translatable="false">file_rename</string>
+    <string name="settings_file_charset_key" translatable="false">file_rename_charset</string>
     <string name="settings_file_replacement_character_key" translatable="false">file_replacement_character</string>
     <string name="settings_file_replacement_character_default_value" translatable="false">_</string>
 
+
+    <string name="charset_letters_and_digits_value" translatable="false">CHARSET_LETTERS_AND_DIGITS</string>
+    <string name="charset_most_special_value" translatable="false">CHARSET_MOST_SPECIAL</string>
+
     <string-array name="settings_filename_charset" translatable="false">
         <item>@string/charset_letters_and_digits_value</item>
-        <item>@string/charset_most_special_characters_value</item>
+        <item>@string/charset_most_special_value</item>
     </string-array>
 
     <string-array name="settings_filename_charset_name" translatable="false">
@@ -190,8 +194,8 @@
         <item>@string/charset_most_special_characters</item>
     </string-array>
 
-    <string name="default_file_charset_value" translatable="false">@string/charset_most_special_characters_value</string>
-    
+    <string name="default_file_charset_value" translatable="false">@string/charset_most_special_value</string>
+
     <string name="downloads_maximum_retry" translatable="false">downloads_max_retry</string>
     <string name="downloads_maximum_retry_default" translatable="false">3</string>
     <string-array name="downloads_maximum_retry_list" translatable="false">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7907d2974..10b36c1c7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -305,8 +305,7 @@
     <string name="settings_file_charset_title">Allowed characters in filenames</string>
     <string name="settings_file_replacement_character_summary">Invalid characters are replaced with this value</string>
     <string name="settings_file_replacement_character_title">Replacement character</string>
-    <string name="charset_letters_and_digits_value" translatable="false">[^\\w\\d]+</string>
-    <string name="charset_most_special_characters_value" translatable="false">[\\n\\r|\\?*&lt;":&gt;/']+</string>
+
     <string name="charset_letters_and_digits">Letters and digits</string>
     <string name="charset_most_special_characters">Most special characters</string>
     <string name="toast_no_player">No app installed to play this file</string>
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index bbb91acac..2f62aa89e 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -5,12 +5,6 @@
     android:title="@string/settings_category_downloads_title">
 
 
-    <Preference
-        app:iconSpaceReserved="false"
-        android:key="saf_test"
-        android:summary="Realiza una prueba del Storage Access Framework de Android"
-        android:title="Probar SAF"/>
-
     <ListPreference
         app:iconSpaceReserved="false"
         android:defaultValue="@string/downloads_storage_api_default"
diff --git a/assets/db.dia b/assets/db.dia
index 59b090c882231a47746e961a41c36b1c82b238b0..349163d775a129e881de40dd6a0ad7be898e458b 100644
GIT binary patch
literal 2508
zcmV;-2{ZN|iwFP!000023+-LYlHxcP-PczT)HX}$_oL~oj-Kh5=*2{I#7y<tA+QqE
zWo$+knZ;(ly=5TDG{#{3Ai;Tvs0Sc)?8`yA_uMP#=U;xzqrnpsDNo{up-!~nfW?y}
z<ni=j_~*BOees6BeEsxu$mvh&&s5O)Kz$-kvu6*(nUss4?(d(UpGmYzsZ0ck_>!dT
z{{J+J=)G!mKm7V>FnHTRNF~i)+rCPr6nwmtY!K5qdl-)C<oi@4%QzfvT5a1+k|+^_
zCmKBrKR>P?!~1PF_ql$K^u3@{HWrM2FYj7Y58toT^@550Zs&_6<*JEXEecIa`pN!&
z(`MT$RgL25*U!INpEsAZec`pQLl;^KBIi_0d0fO%wuv@|Fo<UuhBAijd%oscuKr?^
z^Wnyqg^Ml=CoT)e(_oPZDJYjk$Z?WHjK&*ODVD50PCB8HqS&$9YH$~iT*~Cc^*_=m
zt#SjKmv_ImbAP#0!NcP}++2&2UY>a<XTgt-%(dx#)lu(HJmuqv9lClR%htMIwbT9n
zx3eC-Uq9ZE4V&Idr-#sEHnY#49;Qnkvh)Pa@@-0bnr)lipR)RXyQ+rSytFr2uOTA3
zVq)9<@9L{#Vk)wEda(V5w?oc=P9%SNdG^LA$@niek=widP4zscDI0tle52~a!&f&%
zIUziJ82+K<?X`c0syj6l77VsXURh-k&9L1&hq%7uTKl#rjwEF;<MBR<P<KM(X~Yg9
zjSN%$M?Kd~VyPGEA<vnl!xQWe`9#+1okeUOOcD_noszaqxQ1GfVMQ~(j9)%+9slja
zX@E6jd^(fmU=GP+`DQ&Z$$rQn8y}XU_(kQNN=>T=p(bJ0F~lQ}q6!dsue-)woM3=P
zbS?kT>w)e0&^Zq}U5?X<;0vinn)IMEeGZcPHO^Tq%fK4<|1x!!;2d+8&Z04$Di3zr
zHH?}om{>DmA-M9ISHX9-ItrF|Vb8%DCsFtoChh8`;zR`iQSg`)?UubZc%*Y4t<+$i
z#7VlK6E)GLa+OV%YMR@0@lW-`<4n{i`)Tx)#_0~&+adqXq9-Q#gns#lvRAze*plYl
zYbajAALEGsZ`u57I63-j#M>KatcJF)0J%5e)ScemTKjUSyXWaCe?(@!T(E0jbooyT
z9(!Y`@?uLgk0XIX**K>z@fcQ=#M9Qmii2sj`JoQh;qkPZEO0(ryo{o?%YF)~5W%01
zwT#zeLW?(bFb=vLpHn8D_=E))q_uM9d(Y|?sCI?4J_qTYdA$_T#R&c1^}paWINdF$
zv-d%2kh)i-rcYE-5n#Lqwfjcxt++R4BA6u07QJ2sj-dDZ(>r84=^8^fxP1|BA5L-K
zzov5=<ahO^`CY>%zU{boF41h?@;c1#?jem#lX#l$-uc9>k9-aJ-BwIkCBN$u&$8Z1
z(O!r7U4yuJf!{!W_k-kjr2?D>sicx2y^HiN(z{6SBE5UP>D}#kjU+FUynPDQ7b2Mo
zmZpK^7fc~QhC-;`O{i`(4%IE<dA7bTh}J#7%TPU!G%{_XS(<)lXvD9Ld=;U38z!t0
zs_QCJvvaX}hoQPlY{cdtDK<ydHNtX)<p|3WmZRz#0XeF!QFV=296A%KuEA+=di||S
zE+dp(gVjB&P2D8AvfeMrZH4)*O-S$?{61Wqx)k)Hm8nQ}fz}sruoqE6Lnh#lfY|-=
zvS-WrIHo+pN-(gy7c~lI;~E9xn40U~={9k6&F!*AA&)fDbz)eycc=SAuZ?^aH41H*
zuu6@Br~0>BsPL~;qhO*&;iJ?jEF!v!cq&n(fFcDHDWFIJMG7cVK#>B96tLY8B5~+U
z(3!yQ53e&>O?4)d=uWnf!y%sKn_cQmdq|ni<a(x^Eg`Wj-@09$sTC7moz8?~2|lXq
zB-lKWEP(n1^$F?|)F-G<P@kYaL4E4`5}6PYI`k)qsvtE;jb&fpG!g|!6oB1WM*w1j
z*f+MW5$A1y+I>jw+Ktbgw~1-kW>x|3>Rs-0m<Jje2C+2F%$5)s`VH@L*oOV8okyU#
zSU`YGZWjv({>@VvY$wLQ6t$7gMLHMhT%>c6&b{7r?n~(njv_!>w^wOh9I%1lyob6|
z=2r(?d3ryvqbEk|u1D)OB&YwdM<!T2IV3wdjrXp2k$+sGcPcyWfE;2u{%Ch7g-eVp
zJzXOaau%#jRmXq_&*8A#%`I1NnK#an!#$eVaeb$Wit&mO5{sAft+QUZjMw+{BkySq
zu8A&XB9i>L->$OI3!UtuBGwvg9VMT`l{crv)D0{%0XPse<jeHPZPrv{<1nB?B+upd
zWEc&*4k8v$kAFpWQ;3r!sELqDD&%G`46@_I%M``tl4W);r*ZVgIPb2Doh1m_dpb$Q
zLy#v)9II(qxeRGx=y`c(Fr#s}y)T)pQ(1%8ch&FJEc}=cd|2Op*x37U;X(_S)S@@!
zwvdD~9N);C6yNfkF0*hiJ9jz6@I7a=Lw1RFr8{|5^M^`Jc%Z3C4BNHOYPxTp15IBn
z+r*ML?h)0`OTZz5Lj;Ei4iOxpSD(f#cZj<8X}rb?k54>TO~^iRZ8gnyDe>fyMy8sH
z&CC^Oa`5O?Xgp;mEN`m35Zm*O6HR@`aL#Jl=oH*4K21fx<=E%o)4->JPt#+cMk7Rr
zTXXX|kDhmH{01_Q(Y8laR%Y!t->cnqEYr?Tb=UN|`y^G|t38L5?V)A5zIA6<#H@{c
z9ecI6V8W~0LrZ-t`I*y2<@E<SUY=1gnFTYRDmQe6nrqZtqvjel*QmL^-kNI^rJ{JR
zPc^9%_4CYPr68p8a+?nQ)+QM0t-<Z9*&gl#)LVns@6PKiYQ(lIp!Ln~U7>4@>*g%t
zn4X?Vg05$GSvHpg$~Ldi{OqYkjJmj2v3W%c_N%seh2>zo3W%l<O(B{>G=*pi(e&ep
zrdZGq?X-t+IGs#bnnF1Rv3o{r!4`~4Y>*0(>83=cV`~|7y@l;6HiC~q^iGAQ9gs$R
z-SbDLMl9QKGGO1dZ+g3mg9bd>((p~c%JPJBnr`g+Ay+bBzX~j6z)}V*&%`>0cGfXy
zEpAxhUuq?TZZtj)+_~%Y3~<%`$g+v+-s#F&xZyLuYul+xO3f#((}prwDZyqdm#hsi
z<lAm7-}cC3p3Ybp%z2s(Bq>sENVy^9_AV*6;w2!}hE&_zJ>jWDWgtY`UhM~u!!<$a
zo>6+dQj<dvCeQKuj7=0qfZe@17@5ymD(QRyUW3;?;`MhPhj2we>gy?q*gTKuiixkE
WHc!-_si5<(pZ*5+VQC&K{Qv;aZ3ZF$

literal 2520
zcmV;}2`Ba+iwFP!000021MOYga;rENeLr8}@_9`Z?w3v{T{F`))elqERWoOvDH#--
zJ{UYgB*!oF?Je2l0vO)_cSx42asdl1NoYx%rM<<^zx-GxlSjt$I7{!QI?<*RmWEjr
zr}Mk%f4}|n+ME7z|K;Z>ra#G_Ij75sydurj(cN?*#OkM;o2REIlB{zoGES1XAUV7F
zKTQ&PBNN?B@4rkYZ!?Ifpz2(CmI}e+Ss~aYrAu}<ozd|7oM%NEO}DAabYYfceDX+>
zyXn`5@-w|DGrFndv?uo!owFHd^m}{en*8|wd6};muV=hmWqB-<i1n(Gq$MBq`%RiM
zRW1{y^ZT!Vv%YSNRGxUvYga*ALBx{sd7L(JWa}i`rZ9+S7=~;P+xL9UwOswVO-_fK
zT^266EF8ZqT$~51j0;X<(S)33S;A<#MHReY=i}rdO=K6_SFH}Uc!-6_4wV0aCiyWH
z*q(l2+o{Z*^Eld1+)9d;T%xu78;675lBYNli{QsVw`809dZ64N<2;@vY**>yRP>hp
zx}WUpJzz6Oyk6e1$8B?KorEHf*~~s?5}Frr#PS23xtgXWr$w3U=1{xW({*f`D9%?2
zUGJ|#JyA<uG!?NN!)VT;o<^Fsp)#ebYmr^o#)$!uve_Rj9C-X+WKYM`s0WlVOH)}L
zX@*{}GD+9GAIM|7;`UU{LfxRsPR4jy(%)pk7@u=xoKDK&rYy>&tN?v;ipu&tJ|Dg5
z@Y_3AcI00r*i81%$@S!$x_J6(j!R=aj_#(vYgH=L+fQaE&4C7;H_cd%dKS?P+r4s#
z>pQMhXKJ(6+F)k0Ito{HPUi{RiF9k2@*jDuo5YeQ&O=@@L8k{s=O~t3I4gISuw@Wt
zJZ&20eK+9-YBR?+oAG&m^@;2FZ$C~4tObkb3(*edkSdmMo(EQYVyQf@<i#uxdAw5G
z&UZe#oPs3p`;w)i4Xkti&qhQG&c1>C6c{;zFfMIt7OZ$IA0F1hcedUORvqw8!4h;X
zpH1dNS80|d(c9YOLjk=U=Z6M`&1f9Fq;F0s2cNua-AfueEf3#&CcU=XB8#{WE6LJ%
zZ(z-Pe;jqr!P?!UkDJC%M@x$&+02`Vpc-b^=~zV?|F2*ds8qxrXpx9OW>>I&Z`w|a
z=yD9o8GnpJ7F>`>at{CSJnEryze6JRfOIsIuJzGzso=@QNc5l0U+@S#`e-wf`W`d_
zjX<MLG@_4GP#$1T0+~Rj&QD2O&1}Ya5N1V>&o2-iK&a11sEEC2(3qaUrVq-dla_2U
zzNAU;kTq8X)Vaw6UB=1!Zo16UEML)(O((fntHn)iT4wQ&tl%-@=Pwx@M$c)QzW{qL
z$iK1Vk%>5@*MHBF=)3}yd^)uZ%_96hOEz8VrsHimxLT(XPpf{cj%|MgWNm@)+~vr(
zt$jIE!G4H9`PCG>xmHwl`P8&mZ=2IVHp_TJgFM7Zas)`-Gxm&{99W;$h+gZ2`T?-*
z$*t2v2QLV{s~3b}6W?~+E0<`tZ+QcHLDZ0LO;a*gcdvZno{#(<ydZjM!ehK3T;f^Q
z+X28E&<nyKZnZ}n19(9QiMI@LK?Q>o1e_p7>;zGEWw=7X6#}9}7b2~AHs>tQ0})?v
z2?`P)*aT4mq69<<h!PMbI*JlTXHmi;o@eWu014gmhZH5MNVld<G)vR342}3_Bfkq#
zqK_s#MwHNHH?u3M#DJoNOYEUk2t;8(fIt)mo|X`WfhY__VL)|&hKCpoum~*r>sTaW
zkst^IJOYn;S(;V3Uy@A{^IM;gU=$ejUL3~@PA}>;j^$Yp=|es!t&)sJjKj(Ul|ZF#
zPfLqpIZJ7rAlepug69xChu}E`&mnjYjmvY$?Cd#298+`sE8QlJuDL^c4potEb)6WN
z?Oo|U(a%PH7oJ0XG~qFxL!Qjv?jgeHD9<5t2+tw4*>)1=0<J@F9fIo+lsvc&VY@tN
z4$vH+;X%U#pTH+*c+l{m;X%XuR2rVuRl_rh?x@f;hj^B64yobQkd%h!dZw*{=4{Ki
z#;f7=(uD6$!@I<bnK)Z!f(20apzJ}}gR%!@4?%$!4+@N+ML>&yL=H(0Gy;tfS_>9|
zMObJ8pTH-?F@Z{;(x-@4#~aQ-COAOA0Rj#XaDadV#Hbt~?5++Fx=l>OHdO?Us}H&R
zaTVy+Fo>mTrV3#)^bzlU+(-Kz_dX`g9e)7Rzv5g3rPcX|Y(%&`z~y1YE)UP1J9rfn
zTp!^2(1Q{I9zlkHrq_u{%B%`vX;1vX&f=JnKHiK3IS+Ck<UGiEqn7jj%^nzMX}C+$
zb2{%!^enBpL?2YrlR&1efE;2u{;gpV*@=CHYkTi=SE7uIMX+hAa~g2xo6js)z4`2v
zlt$$pX?tF$R!@3zO*1)lH3xo{7R$1qH;VE4oxbNgtwWh;Au^s-P2FDgppP>i4l`8k
z1KSt?r}URM@8&yq&Qt<>z-bg0`JQT?sdlGPKsnEz+UsN(9kUJ+md^LzBD*WZ!A@`{
zLM|v5+W|3%SRS_N=-q{SRhPp!dS{%!+~hyW*0pOUpm!W-n5C(lily0*HwK^QZzc<x
zMrFN3wpl8iynZYBYBtEc<6^zM*r;9HC}^WdJz7L=4~v|J;~UCQ@h#68a+Omjx@jpO
z!}pw9wK}LPV3(M#VUO1&YHh(CNljwdu6<HcmuQvkA9o~u-tw}Z^b;9H9oGC{6Tv2e
zO$3_=Hc`c_G23mT;msPav(V!c&y|z1Ph4A0wL>aBK5;b7Q%IUbx;5o&Y$|iWB(^zf
zsi&<8+mlL5#P)pSKvLf^oRgB8#2QxYIns97cOC2+*fp?gKDb?@5u(Gi8NJ-2S4|tg
zgW6;CZ56e7v-{m&$>BPdX<r!{(e!h-Y&-Im92F$BouBFY)|Fu?#m5};D>-^-!gsfw
zpS&y8nbYmx!98b`hl^kl=hEm|!?hi*?IU(=hbJ!l2jPg@g+Za5eUyn5L{waEH?m**
z1cO^U*z}3_#{2|s?O@U;WRiMJ!R|>Q5;lB6ga{%;5FvsHk@0N!qHCR<AuZyVo~{I5
z*RzN8g{%On9bYtG9a_Zj>=Ezy(nI?lx8sZDjBSq>NZ^pbKa2#9Jt?4sLviSVNHh#t
zo<j!*l|ZGARN`#KsKAcR5bz-2LBNB62LTTP-uSk7(e)noc-e|+2GIu<@f47?Rl7XR
z)o)FWShnFPVBfSyy~oSW2Hcy{@J;`iV4hQwYQ+DnaX;AP1%W>Z{6Ro7qJH{|`q6sa
i<;6ca?q_?P&^6=tU$zJGXU^&J{>z`GBdjay_y7Pr;@O)3


From 1089de6321ccce883fbd5bf9fe8a7c1c2db1febb Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Sun, 14 Apr 2019 22:51:59 -0300
Subject: [PATCH 130/138] Add confirm dialog before clear the finished download
 list

---
 .../us/shandian/giga/ui/fragment/MissionsFragment.java    | 8 +++++++-
 app/src/main/res/values-es/strings.xml                    | 3 ++-
 app/src/main/res/values/strings.xml                       | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index bd5ce9215..f8cecbed9 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -1,6 +1,7 @@
 package us.shandian.giga.ui.fragment;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -179,7 +180,12 @@ public class MissionsFragment extends Fragment {
                 updateList();
                 return true;
             case R.id.clear_list:
-                mAdapter.clearFinishedDownloads();
+                AlertDialog.Builder prompt = new AlertDialog.Builder(mContext);
+                prompt.setTitle(R.string.clear_finished_download);
+                prompt.setMessage(R.string.confirm_prompt);
+                prompt.setPositiveButton(android.R.string.ok, (dialog, which) -> mAdapter.clearFinishedDownloads());
+                prompt.setNegativeButton(R.string.cancel, null);
+                prompt.create().show();
                 return true;
             case R.id.start_downloads:
                 item.setVisible(false);
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4cc394357..af5b8b213 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -427,7 +427,8 @@ abrir en modo popup</string>
     <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">Continúa tus %s transferencias pendientes desde Descargas</string>
+    <string name="confirm_prompt">¿Estas seguro?</string>
+    <string name="msg_pending_downloads">Tienes %s descargas pendientes, ve a Descargas para continuarlas</string>
     <string name="stop">Detener</string>
     <string name="max_retry_msg">Intentos máximos</string>
     <string name="max_retry_desc">Cantidad máxima de intentos antes de cancelar la descarga</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 10b36c1c7..9df9bd051 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -536,6 +536,7 @@
     <string name="error_progress_lost">Progress lost, because the file was deleted</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>

From 4b3eb2ece58cf35a930293d6a1e60961337f28d9 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Mon, 15 Apr 2019 21:31:33 -0300
Subject: [PATCH 131/138] Forget the download save path if the storage API is
 changed

---
 .../settings/DownloadSettingsFragment.java    | 92 ++++++++++---------
 .../giga/service/DownloadManagerService.java  |  5 +-
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index 5d4ccf3f8..9fbf7dbea 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -2,6 +2,7 @@ package org.schabi.newpipe.settings;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -22,6 +23,7 @@ import org.schabi.newpipe.util.FilePickerActivityHelper;
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URI;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 
@@ -30,7 +32,7 @@ import us.shandian.giga.io.StoredDirectoryHelper;
 public class DownloadSettingsFragment extends BasePreferenceFragment {
     private static final int REQUEST_DOWNLOAD_VIDEO_PATH = 0x1235;
     private static final int REQUEST_DOWNLOAD_AUDIO_PATH = 0x1236;
-    public static final boolean IGNORE_RELEASE_OLD_PATH = true;
+    public static final boolean IGNORE_RELEASE_ON_OLD_PATH = true;
 
     private String DOWNLOAD_PATH_VIDEO_PREFERENCE;
     private String DOWNLOAD_PATH_AUDIO_PREFERENCE;
@@ -68,19 +70,14 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
             if (javaIO == lastAPIJavaIO) return true;
             lastAPIJavaIO = javaIO;
 
-            boolean res;
-
-            if (javaIO && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                // forget save paths (if necessary)
-                res = forgetPath(DOWNLOAD_PATH_VIDEO_PREFERENCE);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                boolean res = forgetPath(DOWNLOAD_PATH_VIDEO_PREFERENCE);
                 res |= forgetPath(DOWNLOAD_PATH_AUDIO_PREFERENCE);
-            } else {
-                res = hasInvalidPath(DOWNLOAD_PATH_VIDEO_PREFERENCE) || hasInvalidPath(DOWNLOAD_PATH_AUDIO_PREFERENCE);
-            }
 
-            if (res) {
-                Toast.makeText(ctx, R.string.download_pick_path, Toast.LENGTH_LONG).show();
-                updatePreferencesSummary();
+                if (res) {
+                    Toast.makeText(ctx, R.string.download_pick_path, Toast.LENGTH_SHORT).show();
+                    updatePreferencesSummary();
+                }
             }
 
             updatePathPickers(javaIO);
@@ -88,25 +85,6 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         });
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    private boolean forgetPath(String prefKey) {
-        String path = defaultPreferences.getString(prefKey, "");
-        if (path == null || path.isEmpty()) return true;
-
-        if (path.startsWith("file://")) return false;
-
-        // forget SAF path (file:// is compatible with the SAF wrapper)
-        forgetSAFTree(getContext(), prefKey);
-        defaultPreferences.edit().putString(prefKey, "").apply();
-
-        return true;
-    }
-
-    private boolean hasInvalidPath(String prefKey) {
-        String value = defaultPreferences.getString(prefKey, null);
-        return value == null || value.isEmpty();
-    }
-
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.download_settings);
@@ -137,6 +115,15 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
             return;
         }
 
+        if (rawUri.charAt(0) == File.separatorChar) {
+            target.setSummary(rawUri);
+            return;
+        }
+        if (rawUri.startsWith(ContentResolver.SCHEME_FILE)) {
+            target.setSummary(new File(URI.create(rawUri)).getPath());
+            return;
+        }
+
         try {
             rawUri = URLDecoder.decode(rawUri, StandardCharsets.UTF_8.name());
         } catch (UnsupportedEncodingException e) {
@@ -146,6 +133,24 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         target.setSummary(rawUri);
     }
 
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    private boolean forgetPath(String prefKey) {
+        String path = defaultPreferences.getString(prefKey, "");
+        if (path == null || path.isEmpty()) return true;
+
+        // forget SAF path if necessary
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+            forgetSAFTree(getContext(), path);
+
+        defaultPreferences.edit().putString(prefKey, "").apply();
+
+        return true;
+    }
+
+    private boolean isFileUri(String path) {
+        return path.charAt(0) == File.separatorChar || path.startsWith(ContentResolver.SCHEME_FILE);
+    }
+
     private void updatePathPickers(boolean useJavaIO) {
         boolean enabled = useJavaIO || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
         prefPathVideo.setEnabled(enabled);
@@ -159,25 +164,22 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
     }
 
     // FIXME: after releasing the old path, all downloads created on the folder becomes inaccessible
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    private void forgetSAFTree(Context ctx, String prefKey) {
-        if (IGNORE_RELEASE_OLD_PATH) {
+    private void forgetSAFTree(Context ctx, String oldPath) {
+        if (IGNORE_RELEASE_ON_OLD_PATH) {
             return;
         }
 
-        String oldPath = defaultPreferences.getString(prefKey, "");
+        if (oldPath == null || oldPath.isEmpty() || isFileUri(oldPath)) return;
 
-        if (oldPath != null && !oldPath.isEmpty() && oldPath.charAt(0) != File.separatorChar && !oldPath.startsWith("file://")) {
-            try {
-                Uri uri = Uri.parse(oldPath);
+        try {
+            Uri uri = Uri.parse(oldPath);
 
-                ctx.getContentResolver().releasePersistableUriPermission(uri, StoredDirectoryHelper.PERMISSION_FLAGS);
-                ctx.revokeUriPermission(uri, StoredDirectoryHelper.PERMISSION_FLAGS);
+            ctx.getContentResolver().releasePersistableUriPermission(uri, StoredDirectoryHelper.PERMISSION_FLAGS);
+            ctx.revokeUriPermission(uri, StoredDirectoryHelper.PERMISSION_FLAGS);
 
-                Log.i(TAG, "Revoke old path permissions success on " + oldPath);
-            } catch (Exception err) {
-                Log.e(TAG, "Error revoking old path permissions on " + oldPath, err);
-            }
+            Log.i(TAG, "Revoke old path permissions success on " + oldPath);
+        } catch (Exception err) {
+            Log.e(TAG, "Error revoking old path permissions on " + oldPath, err);
         }
     }
 
@@ -258,7 +260,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
             final Context ctx = getContext();
             if (ctx == null) throw new NullPointerException("getContext()");
 
-            forgetSAFTree(ctx, key);
+            forgetSAFTree(ctx, defaultPreferences.getString(key, ""));
 
             try {
                 ctx.grantUriPermission(ctx.getPackageName(), uri, StoredDirectoryHelper.PERMISSION_FLAGS);
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index da63cb545..8d838ccc2 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -566,7 +566,10 @@ public class DownloadManagerService extends Service {
         }
 
         if (path == null || path.isEmpty()) {
-            return useJavaIO ? new StoredDirectoryHelper(new File(defaultPath).toURI(), tag) : null;
+            if (useJavaIO)
+                return new StoredDirectoryHelper(new File(defaultPath).toURI(), tag);
+            else
+                return null;
         }
 
         if (path.charAt(0) == File.separatorChar) {

From 16d6bda85d7c487086c574e44250badd315a6cdf Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Tue, 16 Apr 2019 23:28:03 -0300
Subject: [PATCH 132/138] Webm muxer fixes and strings.xml changes * replace
 "In queue" to "Pending" in the downloads header to avoid confusions (all
 languages) * use 29bits Clusters size to support huge video resolutions
 (fixes #2291) (WebmWriter.java) * add missing changes to WebmMuxer.java (i
 forget select the audio track)

---
 .../org/schabi/newpipe/streams/WebMWriter.java |  7 +++----
 .../giga/postprocessing/WebMMuxer.java         | 18 +++++++++++-------
 app/src/main/res/values-ar/strings.xml         |  2 +-
 app/src/main/res/values-ca/strings.xml         |  2 +-
 app/src/main/res/values-cmn/strings.xml        |  2 +-
 app/src/main/res/values-da/strings.xml         |  1 +
 app/src/main/res/values-de/strings.xml         |  2 +-
 app/src/main/res/values-es/strings.xml         |  1 +
 app/src/main/res/values-eu/strings.xml         |  2 +-
 app/src/main/res/values-he/strings.xml         |  2 +-
 app/src/main/res/values-id/strings.xml         |  2 +-
 app/src/main/res/values-it/strings.xml         |  2 +-
 app/src/main/res/values-ja/strings.xml         |  6 +++---
 app/src/main/res/values-ms/strings.xml         |  2 +-
 app/src/main/res/values-nb-rNO/strings.xml     |  1 -
 app/src/main/res/values-nl-rBE/strings.xml     |  1 -
 app/src/main/res/values-nl/strings.xml         |  2 +-
 app/src/main/res/values-pl/strings.xml         |  2 +-
 app/src/main/res/values-pt-rBR/strings.xml     |  2 +-
 app/src/main/res/values-pt/strings.xml         |  2 +-
 app/src/main/res/values-ru/strings.xml         |  1 +
 app/src/main/res/values-sq/strings.xml         |  1 +
 app/src/main/res/values-tr/strings.xml         |  2 +-
 app/src/main/res/values-vi/strings.xml         |  2 +-
 app/src/main/res/values-zh-rTW/strings.xml     |  2 +-
 app/src/main/res/values/strings.xml            |  2 +-
 26 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
index 26b9cbebf..98261b0c9 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
@@ -321,9 +321,8 @@ public class WebMWriter {
 
         for (int i = 0; i < clusterSizes.size(); i++) {
             seekTo(out, clusterOffsets.get(i));
-            byte[] size = ByteBuffer.allocate(4).putInt(clusterSizes.get(i) | 0x200000).array();
-            out.write(size, 1, 3);
-            written += 3;
+            byte[] buffer = ByteBuffer.allocate(4).putInt(clusterSizes.get(i) | 0x10000000).array();
+            dump(buffer, out);
         }
     }
 
@@ -451,7 +450,7 @@ public class WebMWriter {
             /* cluster */
             dump(new byte[]{0x1f, 0x43, (byte) 0xb6, 0x75}, stream);
             clusterOffsets.add(written);// warning: max cluster size is 256 MiB
-            dump(new byte[]{0x20, 0x00, 0x00}, stream);
+            dump(new byte[]{0x10, 0x00, 0x00, 0x00}, stream);
 
             startOffset = written;// size for the this cluster
 
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
index 3d5ecb3cd..618c1ec5a 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
@@ -22,16 +22,20 @@ class WebMMuxer extends Postprocessing {
         muxer.parseSources();
 
         // youtube uses a webm with a fake video track that acts as a "cover image"
-        WebMTrack[] tracks = muxer.getTracksFromSource(1);
-        int audioTrackIndex = 0;
-        for (int i = 0; i < tracks.length; i++) {
-            if (tracks[i].kind == TrackKind.Audio) {
-                audioTrackIndex = i;
-                break;
+        int[] indexes = new int[sources.length];
+
+        for (int i = 0; i < sources.length; i++) {
+            WebMTrack[] tracks = muxer.getTracksFromSource(i);
+            for (int j = 0; j < tracks.length; j++) {
+                if (tracks[j].kind == TrackKind.Audio) {
+                    indexes[i] = j;
+                    i = sources.length;
+                    break;
+                }
             }
         }
 
-        muxer.selectTracks(0, audioTrackIndex);
+        muxer.selectTracks(indexes);
         muxer.build(out);
 
         return OK_RESULT;
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index dbf015c87..cc36e40bf 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -451,7 +451,7 @@
     <string name="app_update_notification_content_title">يتوفر تحديث ل newpipe!</string>
     <string name="app_update_notification_content_text">اضغط لتنزيل</string>
     <string name="missions_header_finished">انتهى</string>
-    <string name="missions_header_pending">في قائمة الانتظار</string>
+    <string name="missions_header_pending">ريثما</string>
     <string name="paused">متوقف</string>
     <string name="queued">في قائمة الانتظار</string>
     <string name="post_processing">قيد المعالجة</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index f606281f4..04bb36ea3 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -425,7 +425,7 @@
     <string name="auto">Automàtic</string>
     <string name="switch_view">Canvia la vista</string>
     <string name="app_update_notification_content_title">Està disponible una nova actualització del NewPipe!</string>
-    <string name="missions_header_pending">A la cua</string>
+    <string name="missions_header_pending">Pendent</string>
     <string name="paused">en pausa</string>
     <string name="queued">a la cua</string>
     <string name="enqueue">Afegeix a la cua</string>
diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml
index 73eb43c36..7be9efc04 100644
--- a/app/src/main/res/values-cmn/strings.xml
+++ b/app/src/main/res/values-cmn/strings.xml
@@ -426,7 +426,7 @@
     <string name="auto">自动</string>
     <string name="app_update_notification_content_text">轻按以下载</string>
     <string name="missions_header_finished">已完成</string>
-    <string name="missions_header_pending">于队列中</string>
+    <string name="missions_header_pending">有待</string>
     <string name="paused">已暂停</string>
     <string name="queued">已加入队列</string>
     <string name="post_processing">后处理</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 92535310e..0c699cf0e 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -453,4 +453,5 @@
     <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>
     <string name="pause_downloads_on_mobile_desc">Downloads som ikke kan sættes på pause vil blive genstartet</string>
+    <string name="missions_header_pending">Afventning</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ef2789846..ae4fda922 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -437,7 +437,7 @@
     <string name="app_update_notification_content_title">NewPipe-Aktualisierung verfügbar!</string>
     <string name="app_update_notification_content_text">Zum Herunterladen antippen</string>
     <string name="missions_header_finished">Fertig</string>
-    <string name="missions_header_pending">In der Warteschlange</string>
+    <string name="missions_header_pending">Ausstehend</string>
     <string name="paused">pausiert</string>
     <string name="queued">eingereiht</string>
     <string name="post_processing">Nachbearbeitung</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index af5b8b213..6a493892d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -469,6 +469,7 @@ abrir en modo popup</string>
     <string name="download_to_sdcard_error_message">No es posible descargar a una tarjeta SD externa. \¿Restablecer la ubicación de la carpeta de descarga\?</string>
 
     <string name="download_pick_path">Seleccione los directorios de descarga</string>
+    <string name="missions_header_pending">Pendiente</string>
 
     <string name="unsubscribe">Desuscribirse</string>
     <string name="tab_new">Nueva pestaña</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 2868528e9..fb41bf8ae 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -435,7 +435,7 @@
     <string name="app_update_notification_content_title">NewPipe eguneraketa eskuragarri!</string>
     <string name="app_update_notification_content_text">Sakatu deskargatzeko</string>
     <string name="missions_header_finished">Amaituta</string>
-    <string name="missions_header_pending">Ilaran</string>
+    <string name="missions_header_pending">Zain</string>
     <string name="paused">pausatuta</string>
     <string name="queued">ilaran</string>
     <string name="post_processing">post-prozesua</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 41569ff0c..99f02dde8 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -440,7 +440,6 @@
     <string name="app_update_notification_content_title">יצא עדכון ל־NewPipe!</string>
     <string name="app_update_notification_content_text">יש לגעת כדי להוריד</string>
     <string name="missions_header_finished">הסתיים</string>
-    <string name="missions_header_pending">בתור</string>
     <string name="paused">מושהה</string>
     <string name="queued">בתור</string>
     <string name="post_processing">עיבוד מאוחר</string>
@@ -473,4 +472,5 @@
     <string name="max_retry_desc">מספר הניסיונות החוזרים המרבי בטרם ביטול ההורדה</string>
     <string name="pause_downloads_on_mobile">להשהות בעת מעבר לתקשורת נתונים סלולרית</string>
     <string name="pause_downloads_on_mobile_desc">הורדות שלא ניתן להשהות יופעלו מחדש</string>
+    <string name="missions_header_pending">בהמתנה</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 31801434b..c1eb3870d 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -436,7 +436,7 @@
     <string name="app_update_notification_content_title">Pembaruan NewPipe Tersedia!</string>
     <string name="app_update_notification_content_text">Ketuk untuk mengunduh</string>
     <string name="missions_header_finished">Selesai</string>
-    <string name="missions_header_pending">Di antrian</string>
+    <string name="missions_header_pending">Tertunda</string>
     <string name="paused">dijeda</string>
     <string name="queued">antri</string>
     <string name="post_processing">pengolahan-pasca</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4ff8de734..f6d6e42f7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -438,7 +438,7 @@
     <string name="app_update_notification_content_title">Aggiornamento di NewPipe disponibile!</string>
     <string name="app_update_notification_content_text">Premi per scaricare</string>
     <string name="missions_header_finished">Finito</string>
-    <string name="missions_header_pending">In coda</string>
+    <string name="missions_header_pending">In attesa di</string>
     <string name="paused">in pausa</string>
     <string name="queued">in coda</string>
     <string name="post_processing">post-processo</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 78a20b1ab..76ccfd2dd 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -421,7 +421,7 @@
     <string name="app_update_notification_content_title">NewPipeのアップデートがあります！</string>
     <string name="app_update_notification_content_text">タップでダウンロード</string>
     <string name="missions_header_finished">終了しました</string>
-    <string name="missions_header_pending">順番に処理中</string>
+    <string name="missions_header_pending">保留中</string>
     <string name="paused">一時停止</string>
     <string name="queued">順番待ちに追加しました</string>
     <string name="post_processing">保存処理をしています</string>
@@ -462,6 +462,6 @@
     <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="pause_downloads_on_mobile">モバイルデータ通信に切り替え時に休止</string>
+    <string name="pause_downloads_on_mobile_desc">休止できないダウンロードが再開されます</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index ced8235f7..1f0dc3968 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -432,7 +432,6 @@
     <string name="app_update_notification_content_title">Kemas kini NewPipe Tersedia!</string>
     <string name="app_update_notification_content_text">Ketik untuk muat turun</string>
     <string name="missions_header_finished">Selesai</string>
-    <string name="missions_header_pending">Dalam barisan</string>
     <string name="paused">dijeda</string>
     <string name="queued">telah beratur</string>
     <string name="post_processing">pemprosesan-pasca</string>
@@ -465,4 +464,5 @@
     <string name="max_retry_desc">Jumlah percubaan maksimum sebelum membatalkan muat turun</string>
     <string name="pause_downloads_on_mobile">Jeda semasa beralih ke data mudah alih</string>
     <string name="pause_downloads_on_mobile_desc">Muat turun yang tidak dapat dihentikan akan dimulakan semula</string>
+    <string name="missions_header_pending">Menunggu</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 2f5d19c67..1c81feae5 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -515,7 +515,6 @@
     <string name="app_update_notification_content_title">Ny NewPipe-versjon tilgjengelig.</string>
     <string name="app_update_notification_content_text">Trykk for å laste ned</string>
     <string name="missions_header_finished">Fullført</string>
-    <string name="missions_header_pending">I kø</string>
     <string name="paused">pauset</string>
     <string name="queued">i kø</string>
     <string name="post_processing">etterbehandling</string>
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 44b2ef6ab..eac4114ff 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -434,7 +434,6 @@
     <string name="app_update_notification_content_title">NewPipe-update beschikbaar!</string>
     <string name="app_update_notification_content_text">Tikt voor te downloaden</string>
     <string name="missions_header_finished">Voltooid</string>
-    <string name="missions_header_pending">In wachtrij</string>
     <string name="paused">gepauzeerd</string>
     <string name="queued">toegevoegd aan wachtrij</string>
     <string name="post_processing">nabewerking</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 96de68b57..4e88b6b48 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -438,7 +438,7 @@
     <string name="app_update_notification_content_title">NewPipe-update beschikbaar!</string>
     <string name="app_update_notification_content_text">Tik om te downloaden</string>
     <string name="missions_header_finished">Voltooid</string>
-    <string name="missions_header_pending">In de wachtrij</string>
+    <string name="missions_header_pending">In afwachting van</string>
     <string name="paused">gepauzeerd</string>
     <string name="queued">aan de wachtrij toegevoegd</string>
     <string name="post_processing">nabewerking</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 29070990f..d4a56256e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -435,7 +435,6 @@
     <string name="app_update_notification_content_title">Dostępna jest aktualizacja NewPipe!</string>
     <string name="app_update_notification_content_text">Stuknij, aby pobrać</string>
     <string name="missions_header_finished">Gotowe</string>
-    <string name="missions_header_pending">W kolejce</string>
     <string name="paused">wstrzymane</string>
     <string name="queued">w kolejce</string>
     <string name="post_processing">przetwarzanie końcowe</string>
@@ -470,4 +469,5 @@
     <string name="pause_downloads_on_mobile_desc">Pobierane pliki, których nie można wstrzymać, zostaną zrestartowane</string>
     <string name="events">Zdarzenia</string>
     <string name="conferences">Konferencje</string>
+    <string name="missions_header_pending">Oczekuje</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8a16b752d..097ad1288 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -435,7 +435,6 @@ abrir em modo popup</string>
     <string name="app_update_notification_content_title">Atualização do NewPipe Disponivel!</string>
     <string name="app_update_notification_content_text">Toque para baixar</string>
     <string name="missions_header_finished">Finalizado</string>
-    <string name="missions_header_pending">Na fila</string>
     <string name="paused">pausado</string>
     <string name="queued">adicionado na fila</string>
     <string name="post_processing">pós processamento</string>
@@ -468,4 +467,5 @@ abrir em modo popup</string>
     <string name="max_retry_desc">Número máximo de tentativas antes de cancelar o download</string>
     <string name="pause_downloads_on_mobile">Pausar quando trocar para dados móveis</string>
     <string name="pause_downloads_on_mobile_desc">Downloads que não puderem ser pausados serão reiniciados</string>
+    <string name="missions_header_pending">Pendente</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a86c5b809..ddc9d503c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -431,7 +431,6 @@
     <string name="app_update_notification_content_title">Atualização do NewPipe disponível!</string>
     <string name="app_update_notification_content_text">Toque para descarregar</string>
     <string name="missions_header_finished">Terminada</string>
-    <string name="missions_header_pending">Na fila</string>
     <string name="paused">em pausa</string>
     <string name="queued">na fila</string>
     <string name="post_processing">pós-processamento</string>
@@ -466,4 +465,5 @@
     <string name="pause_downloads_on_mobile_desc">Descarregamentos que não podem ser pausados serão reiniciados</string>
     <string name="events">Eventos</string>
     <string name="conferences">Conferências</string>
+    <string name="missions_header_pending">Pendente</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 620ca5619..374b9921f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -472,4 +472,5 @@
     <string name="error_postprocessing_failed">Пост-обработка не удалась</string>
     <string name="pause_downloads_on_mobile">Останавливать скачивание при переходе на мобильную сеть</string>
     <string name="close">Закрыть</string>
+    <string name="missions_header_pending">в ожидании</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index ec31c4a97..74bf10804 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -48,4 +48,5 @@
     <string name="yes">Po</string>
     <string name="later">Më vonë</string>
     <string name="playback_default">Standard</string>
+    <string name="missions_header_pending">në pritje të</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e518a1c0f..dd7974af2 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -438,7 +438,6 @@
     <string name="app_update_notification_content_title">NewPipe Güncellemesi Var!</string>
     <string name="app_update_notification_content_text">İndirmek için dokunun</string>
     <string name="missions_header_finished">Tamamlandı</string>
-    <string name="missions_header_pending">Sırada</string>
     <string name="paused">durdurulmuş</string>
     <string name="queued">sırada</string>
     <string name="post_processing">son işlemler uygulanıyor</string>
@@ -473,4 +472,5 @@
     <string name="pause_downloads_on_mobile_desc">Duraklatılamayan indirmeler yeniden başlatılacak</string>
     <string name="events">Olaylar</string>
     <string name="conferences">Konferanslar</string>
+    <string name="missions_header_pending">Kadar</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ff247c579..4c9f9c7d0 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -429,7 +429,6 @@
     <string name="app_update_notification_content_title">Đã có bản cập nhật NewPipe!</string>
     <string name="app_update_notification_content_text">Nhấn để tải về</string>
     <string name="missions_header_finished">Xong</string>
-    <string name="missions_header_pending">Trong hàng chờ</string>
     <string name="paused">đã tạm dừng</string>
     <string name="queued">trong hàng đợi</string>
     <string name="post_processing">đang xử lý</string>
@@ -461,6 +460,7 @@
     <string name="max_retry_desc">Số lượt thử lại trước khi hủy tải về</string>
     <string name="pause_downloads_on_mobile">Tạm dừng tải khi chuyển qua dữ liệu di động</string>
     <string name="pause_downloads_on_mobile_desc">Các tải về không thể tạm dừng được sẽ bắt đầu lại từ đầu</string>
+    <string name="missions_header_pending">Đang chờ xử lý</string>
     <string name="conferences">Hội thảo</string>
     <string name="label_code">Mã</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0194418cf..023cd00c8 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -434,7 +434,7 @@
     <string name="app_update_notification_content_title">有可用的 NewPipe 更新！</string>
     <string name="app_update_notification_content_text">輕觸以下載</string>
     <string name="missions_header_finished">結束</string>
-    <string name="missions_header_pending">在佇列中</string>
+    <string name="missions_header_pending">有待</string>
     <string name="paused">已暫停</string>
     <string name="queued">已排入佇列</string>
     <string name="post_processing">正在後處理</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9df9bd051..8433f909d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -498,7 +498,7 @@
     <string name="app_update_notification_content_title">NewPipe Update 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">In queue</string>
+    <string name="missions_header_pending">Pending</string>
     <string name="paused">paused</string>
     <string name="queued">queued</string>
     <string name="post_processing">post-processing</string>

From d1573a0a6e9e409df3bb8c780a4bf2222dca6272 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Wed, 17 Apr 2019 18:17:24 -0300
Subject: [PATCH 133/138] misc changes * implement socket timeout error * use
 128k buffer size for copy * use NewPipe HTTP user agent in the downloads *
 automatically recover downloads with network errors that are queued

---
 .../giga/get/DownloadInitializer.java         |  2 +-
 .../us/shandian/giga/get/DownloadMission.java | 25 ++++++++++++++++---
 .../shandian/giga/get/DownloadRunnable.java   |  1 -
 .../giga/get/DownloadRunnableFallback.java    | 11 ++++----
 .../shandian/giga/io/CircularFileWriter.java  |  7 +++---
 .../giga/ui/adapter/MissionAdapter.java       |  4 +++
 app/src/main/res/values-de/strings.xml        |  1 +
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values-eu/strings.xml        |  1 +
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values-it/strings.xml        |  1 +
 app/src/main/res/values-ja/strings.xml        |  2 ++
 app/src/main/res/values-nl/strings.xml        |  1 +
 app/src/main/res/values-ru/strings.xml        |  1 +
 app/src/main/res/values-zh-rTW/strings.xml    |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 16 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
index f6b6b459a..590c3704c 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
@@ -28,7 +28,7 @@ public class DownloadInitializer extends Thread {
 
     @Override
     public void run() {
-        if (mMission.current > 0) mMission.resetState(false,true, DownloadMission.ERROR_NOTHING);
+        if (mMission.current > 0) mMission.resetState(false, true, DownloadMission.ERROR_NOTHING);
 
         int retryCount = 0;
         while (true) {
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index 838acc162..9bc46e3af 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -4,11 +4,14 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 
+import org.schabi.newpipe.Downloader;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
+import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -45,6 +48,7 @@ public class DownloadMission extends Mission {
     public static final int ERROR_POSTPROCESSING_HOLD = 1009;
     public static final int ERROR_INSUFFICIENT_STORAGE = 1010;
     public static final int ERROR_PROGRESS_LOST = 1011;
+    public static final int ERROR_TIMEOUT = 1012;
     public static final int ERROR_HTTP_NO_CONTENT = 204;
     public static final int ERROR_HTTP_UNSUPPORTED_RANGE = 206;
 
@@ -232,10 +236,9 @@ public class DownloadMission extends Mission {
         URL url = new URL(urls[current]);
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
         conn.setInstanceFollowRedirects(true);
+        conn.setRequestProperty("User-Agent", Downloader.USER_AGENT);
 
         // BUG workaround: switching between networks can freeze the download forever
-
-        //conn.setRequestProperty("Connection", "close");
         conn.setConnectTimeout(30000);
         conn.setReadTimeout(10000);
 
@@ -329,6 +332,8 @@ public class DownloadMission extends Mission {
             notifyError(ERROR_CONNECT_HOST, null);
         } else if (err instanceof UnknownHostException) {
             notifyError(ERROR_UNKNOWN_HOST, null);
+        } else if (err instanceof SocketTimeoutException) {
+            notifyError(ERROR_TIMEOUT, null);
         } else {
             notifyError(ERROR_UNKNOWN_EXCEPTION, err);
         }
@@ -338,7 +343,7 @@ public class DownloadMission extends Mission {
         Log.e(TAG, "notifyError() code = " + code, err);
 
         if (err instanceof IOException) {
-            if (storage.canWrite() || err.getMessage().contains("Permission denied")) {
+            if (!storage.canWrite() || err.getMessage().contains("Permission denied")) {
                 code = ERROR_PERMISSION_DENIED;
                 err = null;
             } else if (err.getMessage().contains("ENOSPC")) {
@@ -349,7 +354,19 @@ public class DownloadMission extends Mission {
 
         errCode = code;
         errObject = err;
-        enqueued = false;
+
+        switch (code) {
+            case ERROR_SSL_EXCEPTION:
+            case ERROR_UNKNOWN_HOST:
+            case ERROR_CONNECT_HOST:
+            case ERROR_TIMEOUT:
+                // do not change the queue flag for network errors, can be
+                // recovered silently without the user interaction
+                break;
+            default:
+                // also checks for server errors
+                if (code < 500 || code > 599) enqueued = false;
+        }
 
         pause();
 
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index 7a68cd778..4380c0c68 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -27,7 +27,6 @@ public class DownloadRunnable extends Thread {
         if (mission == null) throw new NullPointerException("mission is null");
         mMission = mission;
         mId = id;
-        mConn = null;
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
index 1a4b5d5b6..d7ff208ce 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
@@ -1,6 +1,5 @@
 package us.shandian.giga.get;
 
-import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
@@ -19,7 +18,7 @@ import static org.schabi.newpipe.BuildConfig.DEBUG;
  * Single-threaded fallback mode
  */
 public class DownloadRunnableFallback extends Thread {
-    private static final String TAG = "DownloadRunnableFallback";
+    private static final String TAG = "DownloadRunnableFallbac";
 
     private final DownloadMission mMission;
 
@@ -30,9 +29,6 @@ public class DownloadRunnableFallback extends Thread {
 
     DownloadRunnableFallback(@NonNull DownloadMission mission) {
         mMission = mission;
-        mIs = null;
-        mF = null;
-        mConn = null;
     }
 
     private void dispose() {
@@ -46,7 +42,6 @@ public class DownloadRunnableFallback extends Thread {
     }
 
     @Override
-    @SuppressLint("LongLogTag")
     public void run() {
         boolean done;
 
@@ -106,6 +101,10 @@ public class DownloadRunnableFallback extends Thread {
                 return;
             }
 
+            if (DEBUG) {
+                Log.e(TAG, "got exception, retrying...", e);
+            }
+
             run();// try again
             return;
         }
diff --git a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
index 327b9149e..f9ceca6ad 100644
--- a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
+++ b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
@@ -11,6 +11,7 @@ import java.io.IOException;
 public class CircularFileWriter extends SharpStream {
 
     private final static int QUEUE_BUFFER_SIZE = 8 * 1024;// 8 KiB
+    private final static int COPY_BUFFER_SIZE = 128 * 1024; // 128 KiB
     private final static int NOTIFY_BYTES_INTERVAL = 64 * 1024;// 64 KiB
     private final static int THRESHOLD_AUX_LENGTH = 15 * 1024 * 1024;// 15 MiB
 
@@ -53,6 +54,7 @@ public class CircularFileWriter extends SharpStream {
         aux.flush();
 
         boolean underflow = aux.offset < aux.length || out.offset < out.length;
+        byte[] buffer = new byte[COPY_BUFFER_SIZE];
 
         aux.target.seek(0);
         out.target.seek(out.length);
@@ -60,14 +62,14 @@ public class CircularFileWriter extends SharpStream {
         long length = amount;
         while (length > 0) {
             int read = (int) Math.min(length, Integer.MAX_VALUE);
-            read = aux.target.read(aux.queue, 0, Math.min(read, aux.queue.length));
+            read = aux.target.read(buffer, 0, Math.min(read, buffer.length));
 
             if (read < 1) {
                 amount -= length;
                 break;
             }
 
-            out.writeProof(aux.queue, read);
+            out.writeProof(buffer, read);
             length -= read;
         }
 
@@ -100,7 +102,6 @@ public class CircularFileWriter extends SharpStream {
             // move the excess data to the beginning of the file
             long readOffset = amount;
             long writeOffset = 0;
-            byte[] buffer = new byte[128 * 1024]; // 128 KiB
 
             aux.length -= amount;
             length = aux.length;
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index 1892f4437..21cae1835 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -73,6 +73,7 @@ import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_HOLD;
 import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_STOPPED;
 import static us.shandian.giga.get.DownloadMission.ERROR_PROGRESS_LOST;
 import static us.shandian.giga.get.DownloadMission.ERROR_SSL_EXCEPTION;
+import static us.shandian.giga.get.DownloadMission.ERROR_TIMEOUT;
 import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION;
 import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_HOST;
 
@@ -487,6 +488,9 @@ public class MissionAdapter extends Adapter<ViewHolder> {
             case ERROR_PROGRESS_LOST:
                 msg = R.string.error_progress_lost;
                 break;
+            case ERROR_TIMEOUT:
+                msg = R.string.error_timeout;
+                break;
             default:
                 if (mission.errCode >= 100 && mission.errCode < 600) {
                     msgEx = "HTTP " + mission.errCode;
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ae4fda922..9a2518652 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -472,4 +472,5 @@
     <string name="pause_downloads_on_mobile_desc">Downloads, die nicht pausiert werden können, werden wiederholt</string>
     <string name="conferences">Konferenzen</string>
     <string name="events">Ereignisse</string>
+    <string name="error_timeout">Verbindungszeitüberschreitung</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6a493892d..2e8c62bce 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -457,6 +457,7 @@ abrir en modo popup</string>
     <string name="error_postprocessing_stopped">NewPipe se cerro mientras se trabajaba en el archivo</string>
     <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="downloads_storage">API de almacenamiento</string>
     <string name="downloads_storage_desc">Seleccione que API utilizar para almacenar las descargas</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index fb41bf8ae..11fed8e64 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -468,4 +468,5 @@
     <string name="max_retry_desc">Deskarga ezeztatu aurretik saiatu beharreko aldi kopurua</string>
     <string name="pause_downloads_on_mobile">Pausatu datu mugikorretara aldatzean</string>
     <string name="pause_downloads_on_mobile_desc">Pausatu ezin daitezkeen deskargak berrekingo dira</string>
+    <string name="error_timeout">Konexioaren denbora muga</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b81195d41..ca9682fdb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -440,6 +440,7 @@
     <string name="missions_header_pending">Dans la file d\'attente</string>
     <string name="paused">En pause</string>
     <string name="download_failed">Téléchargement échoué</string>
+    <string name="error_timeout">Délai de connection dépassé</string>
     <string name="conferences">Conférences</string>
     <string name="download_finished">Téléchargement terminé</string>
     <string name="download_finished_more">%s téléchargements terminés</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f6d6e42f7..d61b26cfb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -473,4 +473,5 @@
     <string name="pause_downloads_on_mobile_desc">I download che non possono essere messi in pausa verranno riavviati</string>
     <string name="events">Eventi</string>
     <string name="conferences">Conferenze</string>
+    <string name="error_timeout">Connesione finita</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 76ccfd2dd..be243bffd 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -464,4 +464,6 @@
     <string name="msg_pending_downloads">ダウンロードから %s の保留中の転送を続行します</string>
     <string name="pause_downloads_on_mobile">モバイルデータ通信に切り替え時に休止</string>
     <string name="pause_downloads_on_mobile_desc">休止できないダウンロードが再開されます</string>
+    <string name="missions_header_pending">保留中</string>
+    <string name="error_timeout">接続タイムアウト</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4e88b6b48..915111043 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -473,4 +473,5 @@
     <string name="pause_downloads_on_mobile_desc">Downloads die niet kunnen worden gepauzeerd zullen worden herstart</string>
     <string name="events">Gebeurtenissen</string>
     <string name="conferences">Conferenties</string>
+    <string name="error_timeout">Time-out van verbinding</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 374b9921f..c75af14e2 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -473,4 +473,5 @@
     <string name="pause_downloads_on_mobile">Останавливать скачивание при переходе на мобильную сеть</string>
     <string name="close">Закрыть</string>
     <string name="missions_header_pending">в ожидании</string>
+    <string name="error_timeout">Время соединения вышло</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 023cd00c8..9b58bb79f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -469,4 +469,5 @@
     <string name="pause_downloads_on_mobile_desc">無法暫停的下載將會重新開始</string>
     <string name="events">事件</string>
     <string name="conferences">會議</string>
+    <string name="error_timeout">連接超時</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8433f909d..f10a9f589 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -534,6 +534,7 @@
     <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="clear_finished_download">Clear finished downloads</string>
     <string name="confirm_prompt">Are you sure?</string>

From 34b2b9615832a9e1846b6dcfd2b8b6a0e656f162 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Fri, 19 Apr 2019 16:18:19 -0300
Subject: [PATCH 134/138] Simplify the storage APIs use * use Java I/O (classic
 way) on older android versions * use Storage Access Framework on newer
 android versions (Android Lollipop or later) * both changes have the external
 SD Card write permission * add option to ask the save path on each download *
 warn the user if the save paths are not defined, this only happens on the
 first NewPipe run (Android Lollipop or later)

---
 .../newpipe/download/DownloadDialog.java      |   5 +-
 .../settings/DownloadSettingsFragment.java    | 117 +++++++-----------
 .../newpipe/settings/NewPipeSettings.java     |  19 +--
 .../giga/io/StoredDirectoryHelper.java        |   5 +-
 .../giga/service/DownloadManagerService.java  | 104 ++++++++--------
 app/src/main/res/values-es/strings.xml        |  12 +-
 app/src/main/res/values/settings_keys.xml     |  15 +--
 app/src/main/res/values/strings.xml           |  12 +-
 app/src/main/res/xml/download_settings.xml    |  12 +-
 9 files changed, 119 insertions(+), 182 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 8f4b569cd..f27e7467e 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -212,6 +212,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                 mainStorageAudio = mgr.getMainStorageAudio();
                 mainStorageVideo = mgr.getMainStorageVideo();
                 downloadManager = mgr.getDownloadManager();
+                askForSavePath = mgr.askForSavePath();
 
                 okButton.setEnabled(true);
 
@@ -509,6 +510,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     DownloadManager downloadManager = null;
     ActionMenuItemView okButton = null;
     Context context;
+    boolean askForSavePath;
 
     private String getNameEditText() {
         String str = nameEditText.getText().toString().trim();
@@ -567,10 +569,11 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                 throw new RuntimeException("No stream selected");
         }
 
-        if (mainStorage == null) {
+        if (mainStorage == null || askForSavePath) {
             // This part is called if with SAF preferred:
             //  * older android version running
             //  * save path not defined (via download settings)
+            //  * the user as checked the "ask where to download" option
 
             StoredFileHelper.requestSafWithFileCreation(this, REQUEST_DOWNLOAD_PATH_SAF, filename, mime);
             return;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index 9fbf7dbea..e671e4d3a 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -9,7 +9,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 import android.support.annotation.StringRes;
 import android.support.v7.preference.Preference;
 import android.util.Log;
@@ -37,50 +36,40 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
     private String DOWNLOAD_PATH_VIDEO_PREFERENCE;
     private String DOWNLOAD_PATH_AUDIO_PREFERENCE;
 
-    private String DOWNLOAD_STORAGE_API;
-    private String DOWNLOAD_STORAGE_API_DEFAULT;
+    private String DOWNLOAD_STORAGE_ASK;
 
     private Preference prefPathVideo;
     private Preference prefPathAudio;
+    private Preference prefStorageAsk;
 
     private Context ctx;
 
-    private boolean lastAPIJavaIO;
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         DOWNLOAD_PATH_VIDEO_PREFERENCE = getString(R.string.download_path_video_key);
         DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
-        DOWNLOAD_STORAGE_API = getString(R.string.downloads_storage_api);
-        DOWNLOAD_STORAGE_API_DEFAULT = getString(R.string.downloads_storage_api_default);
+        DOWNLOAD_STORAGE_ASK = getString(R.string.downloads_storage_ask);
 
         prefPathVideo = findPreference(DOWNLOAD_PATH_VIDEO_PREFERENCE);
         prefPathAudio = findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
-
-        lastAPIJavaIO = usingJavaIO();
+        prefStorageAsk = findPreference(DOWNLOAD_STORAGE_ASK);
 
         updatePreferencesSummary();
-        updatePathPickers(lastAPIJavaIO);
+        updatePathPickers(!defaultPreferences.getBoolean(DOWNLOAD_STORAGE_ASK, false));
 
-        findPreference(DOWNLOAD_STORAGE_API).setOnPreferenceChangeListener((preference, value) -> {
-            boolean javaIO = DOWNLOAD_STORAGE_API_DEFAULT.equals(value);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            prefStorageAsk.setSummary(R.string.downloads_storage_ask_summary);
+        }
 
-            if (javaIO == lastAPIJavaIO) return true;
-            lastAPIJavaIO = javaIO;
+        if (hasInvalidPath(DOWNLOAD_PATH_VIDEO_PREFERENCE) || hasInvalidPath(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
+            Toast.makeText(ctx, R.string.download_pick_path, Toast.LENGTH_SHORT).show();
+            updatePreferencesSummary();
+        }
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                boolean res = forgetPath(DOWNLOAD_PATH_VIDEO_PREFERENCE);
-                res |= forgetPath(DOWNLOAD_PATH_AUDIO_PREFERENCE);
-
-                if (res) {
-                    Toast.makeText(ctx, R.string.download_pick_path, Toast.LENGTH_SHORT).show();
-                    updatePreferencesSummary();
-                }
-            }
-
-            updatePathPickers(javaIO);
+        prefStorageAsk.setOnPreferenceChangeListener((preference, value) -> {
+            updatePathPickers(!(boolean) value);
             return true;
         });
     }
@@ -100,7 +89,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
     public void onDetach() {
         super.onDetach();
         ctx = null;
-        findPreference(DOWNLOAD_STORAGE_API).setOnPreferenceChangeListener(null);
+        prefStorageAsk.setOnPreferenceChangeListener(null);
     }
 
     private void updatePreferencesSummary() {
@@ -133,34 +122,18 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         target.setSummary(rawUri);
     }
 
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    private boolean forgetPath(String prefKey) {
-        String path = defaultPreferences.getString(prefKey, "");
-        if (path == null || path.isEmpty()) return true;
-
-        // forget SAF path if necessary
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-            forgetSAFTree(getContext(), path);
-
-        defaultPreferences.edit().putString(prefKey, "").apply();
-
-        return true;
-    }
-
     private boolean isFileUri(String path) {
         return path.charAt(0) == File.separatorChar || path.startsWith(ContentResolver.SCHEME_FILE);
     }
 
-    private void updatePathPickers(boolean useJavaIO) {
-        boolean enabled = useJavaIO || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
-        prefPathVideo.setEnabled(enabled);
-        prefPathAudio.setEnabled(enabled);
+    private boolean hasInvalidPath(String prefKey) {
+        String value = defaultPreferences.getString(prefKey, null);
+        return value == null || value.isEmpty();
     }
 
-    private boolean usingJavaIO() {
-        return DOWNLOAD_STORAGE_API_DEFAULT.equals(
-                defaultPreferences.getString(DOWNLOAD_STORAGE_API, DOWNLOAD_STORAGE_API_DEFAULT)
-        );
+    private void updatePathPickers(boolean enabled) {
+        prefPathVideo.setEnabled(enabled);
+        prefPathAudio.setEnabled(enabled);
     }
 
     // FIXME: after releasing the old path, all downloads created on the folder becomes inaccessible
@@ -198,33 +171,31 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         }
 
         String key = preference.getKey();
+        int request;
 
-        if (key.equals(DOWNLOAD_PATH_VIDEO_PREFERENCE) || key.equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
-            boolean safPick = !usingJavaIO();
-
-            int request = 0;
-            if (key.equals(DOWNLOAD_PATH_VIDEO_PREFERENCE)) {
-                request = REQUEST_DOWNLOAD_VIDEO_PATH;
-            } else if (key.equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
-                request = REQUEST_DOWNLOAD_AUDIO_PATH;
-            }
-
-            Intent i;
-            if (safPick && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
-                        .putExtra("android.content.extra.SHOW_ADVANCED", true)
-                        .addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | StoredDirectoryHelper.PERMISSION_FLAGS);
-            } else {
-                i = new Intent(getActivity(), FilePickerActivityHelper.class)
-                        .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
-                        .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
-                        .putExtra(FilePickerActivityHelper.EXTRA_MODE, FilePickerActivityHelper.MODE_DIR);
-            }
-
-            startActivityForResult(i, request);
+        if (key.equals(DOWNLOAD_PATH_VIDEO_PREFERENCE)) {
+            request = REQUEST_DOWNLOAD_VIDEO_PATH;
+        } else if (key.equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
+            request = REQUEST_DOWNLOAD_AUDIO_PATH;
+        } else {
+            return super.onPreferenceTreeClick(preference);
         }
 
-        return super.onPreferenceTreeClick(preference);
+        Intent i;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
+                    .putExtra("android.content.extra.SHOW_ADVANCED", true)
+                    .addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | StoredDirectoryHelper.PERMISSION_FLAGS);
+        } else {
+            i = new Intent(getActivity(), FilePickerActivityHelper.class)
+                    .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
+                    .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
+                    .putExtra(FilePickerActivityHelper.EXTRA_MODE, FilePickerActivityHelper.MODE_DIR);
+        }
+
+        startActivityForResult(i, request);
+
+        return true;
     }
 
     @Override
@@ -252,7 +223,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
             return;
         }
 
-        if (!usingJavaIO() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             // steps:
             //       1. revoke permissions on the old save path
             //       2. acquire permissions on the new save path
diff --git a/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
index f153cf23a..f18d90a95 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
@@ -94,24 +94,7 @@ public class NewPipeSettings {
         return new File(Environment.getExternalStorageDirectory(), defaultDirectoryName);
     }
 
-    public static void resetDownloadFolders(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        prefs.edit()
-                .putString(context.getString(R.string.downloads_storage_api), context.getString(R.string.downloads_storage_api_default))
-                .apply();
-
-        resetDownloadFolder(prefs, context.getString(R.string.download_path_audio_key), Environment.DIRECTORY_MUSIC);
-        resetDownloadFolder(prefs, context.getString(R.string.download_path_video_key), Environment.DIRECTORY_MOVIES);
-    }
-
-    private static void resetDownloadFolder(SharedPreferences prefs, String key, String defaultDirectoryName) {
-        SharedPreferences.Editor spEditor = prefs.edit();
-        spEditor.putString(key, getNewPipeChildFolderPathForDir(getDir(defaultDirectoryName)));
-        spEditor.apply();
-    }
-
     private static String getNewPipeChildFolderPathForDir(File dir) {
-        return new File(dir, "NewPipe").getAbsolutePath();
+        return new File(dir, "NewPipe").toURI().toString();
     }
 }
diff --git a/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
index eb3c9b817..a65c4dff3 100644
--- a/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
+++ b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
@@ -10,7 +10,6 @@ import android.os.Build;
 import android.provider.DocumentsContract;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 import android.support.v4.provider.DocumentFile;
 
 import java.io.File;
@@ -33,7 +32,6 @@ public class StoredDirectoryHelper {
 
     private String tag;
 
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     public StoredDirectoryHelper(@NonNull Context context, @NonNull Uri path, String tag) throws IOException {
         this.tag = tag;
 
@@ -50,6 +48,9 @@ public class StoredDirectoryHelper {
             throw new IOException(e);
         }
 
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
+            throw new IOException("Storage Access Framework with Directory API is not available");
+
         this.docTree = DocumentFile.fromTreeUri(context, path);
 
         if (this.docTree == null)
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index 8d838ccc2..f25147507 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -1,12 +1,12 @@
 package us.shandian.giga.service;
 
 import android.Manifest;
+import android.app.AlertDialog;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -20,7 +20,6 @@ import android.net.NetworkRequest;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
-import android.os.Environment;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
@@ -28,6 +27,7 @@ import android.os.Message;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationCompat.Builder;
 import android.support.v4.content.PermissionChecker;
@@ -41,7 +41,6 @@ import org.schabi.newpipe.player.helper.LockManager;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.util.ArrayList;
 
 import us.shandian.giga.get.DownloadMission;
@@ -141,7 +140,7 @@ public class DownloadManagerService extends Service {
 
         mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
 
-        mManager = new DownloadManager(this, mHandler, getVideoStorage(), getAudioStorage());
+        mManager = new DownloadManager(this, mHandler, loadMainVideoStorage(), loadMainAudioStorage());
 
         Intent openDownloadListIntent = new Intent(this, DownloadActivity.class)
                 .setAction(Intent.ACTION_MAIN);
@@ -271,6 +270,33 @@ public class DownloadManagerService extends Service {
             Toast.makeText(this, "Permission denied (write)", Toast.LENGTH_SHORT).show();
         }
 
+        // Check download save paths
+
+        String msg = "";
+        if (mManager.mMainStorageVideo == null)
+            msg += getString(R.string.download_path_title);
+        else if (mManager.mMainStorageAudio == null)
+            msg += getString(R.string.download_path_audio_title);
+
+        if (!msg.isEmpty()) {
+            String title;
+            if (mManager.mMainStorageVideo == null && mManager.mMainStorageAudio == null) {
+                title = getString(R.string.general_error);
+                msg = getString(R.string.no_available_dir) + ":\n" + msg;
+            } else {
+                title = msg;
+                msg = getString(R.string.no_available_dir);
+            }
+
+            new AlertDialog.Builder(this)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .setTitle(title)
+                    .setMessage(msg)
+                    .create()
+                    .show();
+        }
+
+
         return mBinder;
     }
 
@@ -348,13 +374,10 @@ public class DownloadManagerService extends Service {
             mManager.mPrefMeteredDownloads = prefs.getBoolean(key, false);
         } else if (key.equals(getString(R.string.downloads_queue_limit))) {
             mManager.mPrefQueueLimit = prefs.getBoolean(key, true);
-        } else if (key.equals(getString(R.string.downloads_storage_api))) {
-            mManager.mMainStorageVideo = loadMainStorage(getString(R.string.download_path_video_key), DownloadManager.TAG_VIDEO);
-            mManager.mMainStorageAudio = loadMainStorage(getString(R.string.download_path_audio_key), DownloadManager.TAG_AUDIO);
         } else if (key.equals(getString(R.string.download_path_video_key))) {
-            mManager.mMainStorageVideo = loadMainStorage(key, DownloadManager.TAG_VIDEO);
+            mManager.mMainStorageVideo = loadMainVideoStorage();
         } else if (key.equals(getString(R.string.download_path_audio_key))) {
-            mManager.mMainStorageAudio = loadMainStorage(key, DownloadManager.TAG_AUDIO);
+            mManager.mMainStorageAudio = loadMainAudioStorage();
         }
     }
 
@@ -385,7 +408,7 @@ public class DownloadManagerService extends Service {
      * @param psArgs     the arguments for the post-processing algorithm.
      * @param nearLength the approximated final length of the file
      */
-    public static void startMission(Context context, String urls[], StoredFileHelper storage, char kind,
+    public static void startMission(Context context, String[] urls, StoredFileHelper storage, char kind,
                                     int threads, String source, String psName, String[] psArgs, long nearLength) {
         Intent intent = new Intent(context, DownloadManagerService.class);
         intent.setAction(Intent.ACTION_RUN);
@@ -538,56 +561,28 @@ public class DownloadManagerService extends Service {
         mLockAcquired = acquire;
     }
 
-    private StoredDirectoryHelper getVideoStorage() {
-        return loadMainStorage(getString(R.string.download_path_video_key), DownloadManager.TAG_VIDEO);
+    private StoredDirectoryHelper loadMainVideoStorage() {
+        return loadMainStorage(R.string.download_path_video_key, DownloadManager.TAG_VIDEO);
     }
 
-    private StoredDirectoryHelper getAudioStorage() {
-        return loadMainStorage(getString(R.string.download_path_audio_key), DownloadManager.TAG_AUDIO);
+    private StoredDirectoryHelper loadMainAudioStorage() {
+        return loadMainStorage(R.string.download_path_audio_key, DownloadManager.TAG_AUDIO);
     }
 
+    private StoredDirectoryHelper loadMainStorage(@StringRes int prefKey, String tag) {
+        String path = mPrefs.getString(getString(prefKey), null);
 
-    private StoredDirectoryHelper loadMainStorage(String prefKey, String tag) {
-        String path = mPrefs.getString(prefKey, null);
-
-        final String JAVA_IO = getString(R.string.downloads_storage_api_default);
-        boolean useJavaIO = JAVA_IO.equals(mPrefs.getString(getString(R.string.downloads_storage_api), JAVA_IO));
-
-        final String defaultPath;
-        switch (tag) {
-            case DownloadManager.TAG_VIDEO:
-                defaultPath = Environment.DIRECTORY_MOVIES;
-                break;
-            case DownloadManager.TAG_AUDIO:
-                defaultPath = Environment.DIRECTORY_MUSIC;
-                break;
-            default:
-                return null;
-        }
-
-        if (path == null || path.isEmpty()) {
-            if (useJavaIO)
-                return new StoredDirectoryHelper(new File(defaultPath).toURI(), tag);
-            else
-                return null;
-        }
+        if (path == null || path.isEmpty()) return null;
 
         if (path.charAt(0) == File.separatorChar) {
-            Log.i(TAG, "Migrating old save path: " + path);
+            Log.i(TAG, "Old save path style present: " + path);
 
-            useJavaIO = true;
-            path = Uri.fromFile(new File(path)).toString();
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
+                path = Uri.fromFile(new File(path)).toString();
+            else
+                path = "";
 
-            mPrefs.edit().putString(prefKey, path).apply();
-        }
-
-        boolean override = path.startsWith(ContentResolver.SCHEME_FILE) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
-        if (useJavaIO || override) {
-            return new StoredDirectoryHelper(URI.create(path), tag);
-        }
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            return null;// SAF Directory API is not available in older versions
+            mPrefs.edit().putString(getString(prefKey), "").apply();
         }
 
         try {
@@ -619,6 +614,13 @@ public class DownloadManagerService extends Service {
             return mManager.mMainStorageAudio;
         }
 
+        public boolean askForSavePath() {
+            return DownloadManagerService.this.mPrefs.getBoolean(
+                    DownloadManagerService.this.getString(R.string.downloads_storage_ask),
+                    false
+            );
+        }
+
         public void addMissionEventListener(Handler handler) {
             manageObservers(handler, true);
         }
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2e8c62bce..890755845 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -459,19 +459,15 @@ abrir en modo popup</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="downloads_storage">API de almacenamiento</string>
-    <string name="downloads_storage_desc">Seleccione que API utilizar para almacenar las descargas</string>
-
-    <string name="storage_access_framework_description">Framework de acceso a almacenamiento</string>
-    <string name="java_io_description">Java I/O</string>
-
-    <string name="save_as">Guardar como…</string>
-
     <string name="download_to_sdcard_error_message">No es posible descargar a una tarjeta SD externa. \¿Restablecer la ubicación de la carpeta de descarga\?</string>
 
     <string name="download_pick_path">Seleccione los directorios de descarga</string>
     <string name="missions_header_pending">Pendiente</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 preguntará dónde guardar cada descarga.\nHabilita esta opción si quieres descargar en la tarjeta SD externa</string>
+
     <string name="unsubscribe">Desuscribirse</string>
     <string name="tab_new">Nueva pestaña</string>
     <string name="tab_choose">Elige la pestaña</string>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 42df857c1..ec288bb18 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -160,20 +160,7 @@
     <string name="clear_views_history_key" translatable="false">clear_play_history</string>
     <string name="clear_search_history_key" translatable="false">clear_search_history</string>
 
-    <string name="downloads_storage_api" translatable="false">downloads_storage_api</string>
-
-    <!-- WARNING: changing the default value will require update the code too  -->
-    <string name="downloads_storage_api_default" translatable="false">javaIO</string>
-
-    <string-array name="downloads_storage_api_values" translatable="false">
-        <item translatable="false">SAF</item>
-        <item translatable="false">javaIO</item>
-    </string-array>
-
-    <string-array name="downloads_storage_api_description" translatable="true">
-        <item translatable="true">@string/storage_access_framework_description</item>
-        <item translatable="true">@string/java_io_description</item>
-    </string-array>
+    <string name="downloads_storage_ask" translatable="false">downloads_storage_ask</string>
 
     <!-- FileName Downloads  -->
     <string name="settings_file_charset_key" translatable="false">file_rename_charset</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f10a9f589..fb154313e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -550,14 +550,10 @@
     <string name="start_downloads">Start downloads</string>
     <string name="pause_downloads">Pause downloads</string>
 
-    <string name="downloads_storage">Storage API</string>
-    <string name="downloads_storage_desc">Select which API use to store the downloads</string>
-
-    <string name="storage_access_framework_description">Storage Access Framework</string>
-    <string name="java_io_description">Java I/O</string>
-
-    <string name="save_as">Save as…</string>
-
     <string name="download_pick_path">Select the downloads save path</string>
 
+    <string name="downloads_storage_ask_title">Ask where to download</string>
+    <string name="downloads_storage_ask_summary">You will be asked where to save each download</string>
+    <string name="downloads_storage_ask_summary_kitkat">You will be asked where to save each download.\nEnable this option if you want download to the external SD Card</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index 2f62aa89e..7a6fab841 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -5,14 +5,12 @@
     android:title="@string/settings_category_downloads_title">
 
 
-    <ListPreference
+    <CheckBoxPreference
         app:iconSpaceReserved="false"
-        android:defaultValue="@string/downloads_storage_api_default"
-        android:entries="@array/downloads_storage_api_description"
-        android:entryValues="@array/downloads_storage_api_values"
-        android:key="@string/downloads_storage_api"
-        android:summary="@string/downloads_storage_desc"
-        android:title="@string/downloads_storage" />
+        android:defaultValue="false"
+        android:key="@string/downloads_storage_ask"
+        android:summary="@string/downloads_storage_ask_summary_kitkat"
+        android:title="@string/downloads_storage_ask_title" />
 
     <Preference
         app:iconSpaceReserved="false"

From 7b948f83c37879de114ac0cbac83ba9b7af80973 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Thu, 25 Apr 2019 00:34:29 -0300
Subject: [PATCH 135/138] Space reserving tweaks for huge video resolutions *
 improve space reserving, allows write better 4K/8K video data * do not use
 cache dirs in the muxers, Android can force close NewPipe if the device is
 running out of storage. Is a aggressive cache cleaning >:/ * (for devs) webm
 & mkv are the same thing * calculate the final file size inside of the
 mission, instead getting from the UI * simplify ps algorithms constructors *
 [missing old commit message] simplify the loading of pending downloads

---
 .../newpipe/download/DownloadDialog.java      |   5 +-
 .../giga/get/DownloadInitializer.java         | 349 ++++++------
 .../us/shandian/giga/get/DownloadMission.java |  30 +-
 .../giga/postprocessing/M4aNoDash.java        |   4 +-
 .../giga/postprocessing/Mp4FromDashMuxer.java |   2 +-
 .../giga/postprocessing/Postprocessing.java   | 503 +++++++++---------
 .../giga/postprocessing/TtmlConverter.java    | 144 ++---
 .../giga/postprocessing/WebMMuxer.java        |  88 +--
 .../giga/service/DownloadManager.java         |  25 +-
 .../giga/service/DownloadManagerService.java  |   5 +-
 .../java/us/shandian/giga/util/Utility.java   |   3 +-
 11 files changed, 608 insertions(+), 550 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index f27e7467e..8fef9a995 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -767,7 +767,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                     psArgs = null;
                     long videoSize = wrappedVideoStreams.getSizeInBytes((VideoStream) selectedStream);
 
-                    // set nearLength, only, if both sizes are fetched or known. this probably does not work on slow networks
+                    // set nearLength, only, if both sizes are fetched or known. This probably
+                    // does not work on slow networks but is later updated in the downloader
                     if (secondaryStream.getSizeInBytes() > 0 && videoSize > 0) {
                         nearLength = secondaryStream.getSizeInBytes() + videoSize;
                     }
@@ -793,7 +794,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         if (secondaryStreamUrl == null) {
             urls = new String[]{selectedStream.getUrl()};
         } else {
-            urls = new String[]{secondaryStreamUrl, selectedStream.getUrl()};
+            urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
         }
 
         DownloadManagerService.startMission(context, urls, storage, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
index 590c3704c..5239c5bb7 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
@@ -1,158 +1,191 @@
-package us.shandian.giga.get;
-
-import android.support.annotation.NonNull;
-import android.util.Log;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.HttpURLConnection;
-import java.nio.channels.ClosedByInterruptException;
-
-import us.shandian.giga.util.Utility;
-
-import static org.schabi.newpipe.BuildConfig.DEBUG;
-
-public class DownloadInitializer extends Thread {
-    private final static String TAG = "DownloadInitializer";
-    final static int mId = 0;
-
-    private DownloadMission mMission;
-    private HttpURLConnection mConn;
-
-    DownloadInitializer(@NonNull DownloadMission mission) {
-        mMission = mission;
-        mConn = null;
-    }
-
-    @Override
-    public void run() {
-        if (mMission.current > 0) mMission.resetState(false, true, DownloadMission.ERROR_NOTHING);
-
-        int retryCount = 0;
-        while (true) {
-            try {
-                mMission.currentThreadCount = mMission.threadCount;
-
-                mConn = mMission.openConnection(mId, -1, -1);
-                mMission.establishConnection(mId, mConn);
-
-                if (!mMission.running || Thread.interrupted()) return;
-
-                mMission.length = Utility.getContentLength(mConn);
-
-
-                if (mMission.length == 0) {
-                    mMission.notifyError(DownloadMission.ERROR_HTTP_NO_CONTENT, null);
-                    return;
-                }
-
-                // check for dynamic generated content
-                if (mMission.length == -1 && mConn.getResponseCode() == 200) {
-                    mMission.blocks = 0;
-                    mMission.length = 0;
-                    mMission.fallback = true;
-                    mMission.unknownLength = true;
-                    mMission.currentThreadCount = 1;
-
-                    if (DEBUG) {
-                        Log.d(TAG, "falling back (unknown length)");
-                    }
-                } else {
-                    // Open again
-                    mConn = mMission.openConnection(mId, mMission.length - 10, mMission.length);
-                    mMission.establishConnection(mId, mConn);
-
-                    if (!mMission.running || Thread.interrupted()) return;
-
-                    synchronized (mMission.blockState) {
-                        if (mConn.getResponseCode() == 206) {
-                            if (mMission.currentThreadCount > 1) {
-                                mMission.blocks = mMission.length / DownloadMission.BLOCK_SIZE;
-
-                                if (mMission.currentThreadCount > mMission.blocks) {
-                                    mMission.currentThreadCount = (int) mMission.blocks;
-                                }
-                                if (mMission.currentThreadCount <= 0) {
-                                    mMission.currentThreadCount = 1;
-                                }
-                                if (mMission.blocks * DownloadMission.BLOCK_SIZE < mMission.length) {
-                                    mMission.blocks++;
-                                }
-                            } else {
-                                // if one thread is solicited don't calculate blocks, is useless
-                                mMission.blocks = 1;
-                                mMission.fallback = true;
-                                mMission.unknownLength = false;
-                            }
-
-                            if (DEBUG) {
-                                Log.d(TAG, "http response code = " + mConn.getResponseCode());
-                            }
-                        } else {
-                            // Fallback to single thread
-                            mMission.blocks = 0;
-                            mMission.fallback = true;
-                            mMission.unknownLength = false;
-                            mMission.currentThreadCount = 1;
-
-                            if (DEBUG) {
-                                Log.d(TAG, "falling back due http response code = " + mConn.getResponseCode());
-                            }
-                        }
-
-                        for (long i = 0; i < mMission.currentThreadCount; i++) {
-                            mMission.threadBlockPositions.add(i);
-                            mMission.threadBytePositions.add(0L);
-                        }
-                    }
-
-                    if (!mMission.running || Thread.interrupted()) return;
-                }
-
-                SharpStream fs = mMission.storage.getStream();
-                fs.setLength(mMission.offsets[mMission.current] + mMission.length);
-                fs.seek(mMission.offsets[mMission.current]);
-                fs.close();
-
-                if (!mMission.running || Thread.interrupted()) return;
-
-                mMission.running = false;
-                break;
-            } catch (InterruptedIOException | ClosedByInterruptException e) {
-                return;
-            } catch (Exception e) {
-                if (!mMission.running) return;
-
-                if (e instanceof IOException && e.getMessage().contains("Permission denied")) {
-                    mMission.notifyError(DownloadMission.ERROR_PERMISSION_DENIED, e);
-                    return;
-                }
-
-                if (retryCount++ > mMission.maxRetry) {
-                    Log.e(TAG, "initializer failed", e);
-                    mMission.notifyError(e);
-                    return;
-                }
-
-                Log.e(TAG, "initializer failed, retrying", e);
-            }
-        }
-
-        mMission.start();
-    }
-
-    @Override
-    public void interrupt() {
-        super.interrupt();
-
-        if (mConn != null) {
-            try {
-                mConn.disconnect();
-            } catch (Exception e) {
-                // nothing to do
-            }
-        }
-    }
-}
+package us.shandian.giga.get;
+
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.HttpURLConnection;
+import java.nio.channels.ClosedByInterruptException;
+
+import us.shandian.giga.util.Utility;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+public class DownloadInitializer extends Thread {
+    private final static String TAG = "DownloadInitializer";
+    final static int mId = 0;
+    private final static int RESERVE_SPACE_DEFAULT = 5 * 1024 * 1024;// 5 MiB
+    private final static int RESERVE_SPACE_MAXIMUM = 150 * 1024 * 1024;// 150 MiB
+
+    private DownloadMission mMission;
+    private HttpURLConnection mConn;
+
+    DownloadInitializer(@NonNull DownloadMission mission) {
+        mMission = mission;
+        mConn = null;
+    }
+
+    @Override
+    public void run() {
+        if (mMission.current > 0) mMission.resetState(false, true, DownloadMission.ERROR_NOTHING);
+
+        int retryCount = 0;
+        while (true) {
+            try {
+                mMission.currentThreadCount = mMission.threadCount;
+
+                if (mMission.blocks < 0 && mMission.current == 0) {
+                    // calculate the whole size of the mission
+                    long finalLength = 0;
+                    long lowestSize = Long.MAX_VALUE;
+
+                    for (int i = 0; i < mMission.urls.length && mMission.running; i++) {
+                        mConn = mMission.openConnection(mMission.urls[i], mId, -1, -1);
+                        mMission.establishConnection(mId, mConn);
+
+                        if (Thread.interrupted()) return;
+                        long length = Utility.getContentLength(mConn);
+
+                        if (i == 0) mMission.length = length;
+                        if (length > 0) finalLength += length;
+                        if (length < lowestSize) lowestSize = length;
+                    }
+
+                    mMission.nearLength = finalLength;
+
+                    // reserve space at the start of the file
+                    if (mMission.psAlgorithm != null && mMission.psAlgorithm.reserveSpace) {
+                        if (lowestSize < 1) {
+                            // the length is unknown use the default size
+                            mMission.offsets[0] = RESERVE_SPACE_DEFAULT;
+                        } else {
+                            // use the smallest resource size to download, otherwise, use the maximum
+                            mMission.offsets[0] = lowestSize < RESERVE_SPACE_MAXIMUM ? lowestSize : RESERVE_SPACE_MAXIMUM;
+                        }
+                    }
+                } else {
+                    // ask for the current resource length
+                    mConn = mMission.openConnection(mId, -1, -1);
+                    mMission.establishConnection(mId, mConn);
+
+                    if (!mMission.running || Thread.interrupted()) return;
+
+                    mMission.length = Utility.getContentLength(mConn);
+                }
+
+                if (mMission.length == 0 || mConn.getResponseCode() == 204) {
+                    mMission.notifyError(DownloadMission.ERROR_HTTP_NO_CONTENT, null);
+                    return;
+                }
+
+                // check for dynamic generated content
+                if (mMission.length == -1 && mConn.getResponseCode() == 200) {
+                    mMission.blocks = 0;
+                    mMission.length = 0;
+                    mMission.fallback = true;
+                    mMission.unknownLength = true;
+                    mMission.currentThreadCount = 1;
+
+                    if (DEBUG) {
+                        Log.d(TAG, "falling back (unknown length)");
+                    }
+                } else {
+                    // Open again
+                    mConn = mMission.openConnection(mId, mMission.length - 10, mMission.length);
+                    mMission.establishConnection(mId, mConn);
+
+                    if (!mMission.running || Thread.interrupted()) return;
+
+                    synchronized (mMission.blockState) {
+                        if (mConn.getResponseCode() == 206) {
+                            if (mMission.currentThreadCount > 1) {
+                                mMission.blocks = mMission.length / DownloadMission.BLOCK_SIZE;
+
+                                if (mMission.currentThreadCount > mMission.blocks) {
+                                    mMission.currentThreadCount = (int) mMission.blocks;
+                                }
+                                if (mMission.currentThreadCount <= 0) {
+                                    mMission.currentThreadCount = 1;
+                                }
+                                if (mMission.blocks * DownloadMission.BLOCK_SIZE < mMission.length) {
+                                    mMission.blocks++;
+                                }
+                            } else {
+                                // if one thread is solicited don't calculate blocks, is useless
+                                mMission.blocks = 1;
+                                mMission.fallback = true;
+                                mMission.unknownLength = false;
+                            }
+
+                            if (DEBUG) {
+                                Log.d(TAG, "http response code = " + mConn.getResponseCode());
+                            }
+                        } else {
+                            // Fallback to single thread
+                            mMission.blocks = 0;
+                            mMission.fallback = true;
+                            mMission.unknownLength = false;
+                            mMission.currentThreadCount = 1;
+
+                            if (DEBUG) {
+                                Log.d(TAG, "falling back due http response code = " + mConn.getResponseCode());
+                            }
+                        }
+
+                        for (long i = 0; i < mMission.currentThreadCount; i++) {
+                            mMission.threadBlockPositions.add(i);
+                            mMission.threadBytePositions.add(0L);
+                        }
+                    }
+
+                    if (!mMission.running || Thread.interrupted()) return;
+                }
+
+                SharpStream fs = mMission.storage.getStream();
+                fs.setLength(mMission.offsets[mMission.current] + mMission.length);
+                fs.seek(mMission.offsets[mMission.current]);
+                fs.close();
+
+                if (!mMission.running || Thread.interrupted()) return;
+
+                mMission.running = false;
+                break;
+            } catch (InterruptedIOException | ClosedByInterruptException e) {
+                return;
+            } catch (Exception e) {
+                if (!mMission.running) return;
+
+                if (e instanceof IOException && e.getMessage().contains("Permission denied")) {
+                    mMission.notifyError(DownloadMission.ERROR_PERMISSION_DENIED, e);
+                    return;
+                }
+
+                if (retryCount++ > mMission.maxRetry) {
+                    Log.e(TAG, "initializer failed", e);
+                    mMission.notifyError(e);
+                    return;
+                }
+
+                Log.e(TAG, "initializer failed, retrying", e);
+            }
+        }
+
+        mMission.start();
+    }
+
+    @Override
+    public void interrupt() {
+        super.interrupt();
+
+        if (mConn != null) {
+            try {
+                mConn.disconnect();
+            } catch (Exception e) {
+                // nothing to do
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index 9bc46e3af..b3e32a43c 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -147,14 +147,10 @@ public class DownloadMission extends Mission {
         this.enqueued = true;
         this.maxRetry = 3;
         this.storage = storage;
+        this.psAlgorithm = psInstance;
 
-        if (psInstance != null) {
-            this.psAlgorithm = psInstance;
-            this.offsets[0] = psInstance.recommendedReserve;
-        } else {
-            if (DEBUG && urls.length > 1) {
-                Log.w(TAG, "mission created with multiple urls ¿missing post-processing algorithm?");
-            }
+        if (DEBUG && psInstance == null && urls.length > 1) {
+            Log.w(TAG, "mission created with multiple urls ¿missing post-processing algorithm?");
         }
     }
 
@@ -233,10 +229,14 @@ public class DownloadMission extends Mission {
      * @throws IOException if an I/O exception occurs.
      */
     HttpURLConnection openConnection(int threadId, long rangeStart, long rangeEnd) throws IOException {
-        URL url = new URL(urls[current]);
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        return openConnection(urls[current], threadId, rangeStart, rangeEnd);
+    }
+
+    HttpURLConnection openConnection(String url, int threadId, long rangeStart, long rangeEnd) throws IOException {
+        HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
         conn.setInstanceFollowRedirects(true);
         conn.setRequestProperty("User-Agent", Downloader.USER_AGENT);
+        conn.setRequestProperty("Accept", "*/*");
 
         // BUG workaround: switching between networks can freeze the download forever
         conn.setConnectTimeout(30000);
@@ -536,8 +536,11 @@ public class DownloadMission extends Mission {
     @Override
     public boolean delete() {
         deleted = true;
+        if (psAlgorithm != null) psAlgorithm.cleanupTemporalDir();
+
         boolean res = deleteThisFromFile();
-        if (!super.delete()) res = false;
+
+        if (!super.delete()) return false;
         return res;
     }
 
@@ -626,6 +629,11 @@ public class DownloadMission extends Mission {
         return blocks >= 0; // DownloadMissionInitializer was executed
     }
 
+    /**
+     * Gets the approximated final length of the file
+     *
+     * @return the length in bytes
+     */
     public long getLength() {
         long calculated;
         if (psState == 1 || psState == 3) {
@@ -681,6 +689,8 @@ public class DownloadMission extends Mission {
     private boolean doPostprocessing() {
         if (psAlgorithm == null || psState == 2) return true;
 
+        errObject = null;
+
         notifyPostProcessing(1);
         notifyProgress(0);
 
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java b/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java
index ee7e4cba1..aa5170908 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/M4aNoDash.java
@@ -6,10 +6,10 @@ import org.schabi.newpipe.streams.io.SharpStream;
 
 import java.io.IOException;
 
-public class M4aNoDash extends Postprocessing {
+class M4aNoDash extends Postprocessing {
 
     M4aNoDash() {
-        super(0, true);
+        super(false, true, ALGORITHM_M4A_NO_DASH);
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
index f12c1c2d2..74cb43116 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Mp4FromDashMuxer.java
@@ -11,7 +11,7 @@ import java.io.IOException;
 class Mp4FromDashMuxer extends Postprocessing {
 
     Mp4FromDashMuxer() {
-        super(3 * 1024 * 1024/* 3 MiB */, true);
+        super(true, true, ALGORITHM_MP4_FROM_DASH_MUXER);
     }
 
     @Override
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
index 3d10628e7..15c4f575d 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
@@ -1,247 +1,256 @@
-package us.shandian.giga.postprocessing;
-
-import android.os.Message;
-import android.support.annotation.NonNull;
-import android.util.Log;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-
-import us.shandian.giga.get.DownloadMission;
-import us.shandian.giga.io.ChunkFileInputStream;
-import us.shandian.giga.io.CircularFileWriter;
-import us.shandian.giga.io.CircularFileWriter.OffsetChecker;
-import us.shandian.giga.service.DownloadManagerService;
-
-import static us.shandian.giga.get.DownloadMission.ERROR_NOTHING;
-import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_HOLD;
-import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION;
-
-public abstract class Postprocessing implements Serializable {
-
-    static transient final byte OK_RESULT = ERROR_NOTHING;
-
-    public transient static final String ALGORITHM_TTML_CONVERTER = "ttml";
-    public transient static final String ALGORITHM_WEBM_MUXER = "webm";
-    public transient static final String ALGORITHM_MP4_FROM_DASH_MUXER = "mp4D-mp4";
-    public transient static final String ALGORITHM_M4A_NO_DASH = "mp4D-m4a";
-
-    public static Postprocessing getAlgorithm(@NonNull String algorithmName, String[] args, @NonNull File cacheDir) {
-        Postprocessing instance;
-
-        switch (algorithmName) {
-            case ALGORITHM_TTML_CONVERTER:
-                instance = new TtmlConverter();
-                break;
-            case ALGORITHM_WEBM_MUXER:
-                instance = new WebMMuxer();
-                break;
-            case ALGORITHM_MP4_FROM_DASH_MUXER:
-                instance = new Mp4FromDashMuxer();
-                break;
-            case ALGORITHM_M4A_NO_DASH:
-                instance = new M4aNoDash();
-                break;
-            /*case "example-algorithm":
-                instance = new ExampleAlgorithm();*/
-            default:
-                throw new RuntimeException("Unimplemented post-processing algorithm: " + algorithmName);
-        }
-
-        instance.args = args;
-        instance.name = algorithmName;// for debug only, maybe remove this field in the future
-        instance.cacheDir = cacheDir;
-
-        return instance;
-    }
-
-    /**
-     * Get a boolean value that indicate if the given algorithm work on the same
-     * file
-     */
-    public boolean worksOnSameFile;
-
-    /**
-     * Get the recommended space to reserve for the given algorithm. The amount
-     * is in bytes
-     */
-    public int recommendedReserve;
-
-    /**
-     * the download to post-process
-     */
-    protected transient DownloadMission mission;
-
-    public transient File cacheDir;
-
-    private String[] args;
-
-    private String name;
-
-    Postprocessing(int recommendedReserve, boolean worksOnSameFile) {
-        this.recommendedReserve = recommendedReserve;
-        this.worksOnSameFile = worksOnSameFile;
-    }
-
-    public void run(DownloadMission target) throws IOException {
-        this.mission = target;
-
-        File temp = null;
-        CircularFileWriter out = null;
-        int result;
-        long finalLength = -1;
-
-        mission.done = 0;
-        mission.length = mission.storage.length();
-
-        if (worksOnSameFile) {
-            ChunkFileInputStream[] sources = new ChunkFileInputStream[mission.urls.length];
-            try {
-                int i = 0;
-                for (; i < sources.length - 1; i++) {
-                    sources[i] = new ChunkFileInputStream(mission.storage.getStream(), mission.offsets[i], mission.offsets[i + 1]);
-                }
-                sources[i] = new ChunkFileInputStream(mission.storage.getStream(), mission.offsets[i]);
-
-                if (test(sources)) {
-                    for (SharpStream source : sources) source.rewind();
-
-                    OffsetChecker checker = () -> {
-                        for (ChunkFileInputStream source : sources) {
-                            /*
-                             * WARNING: never use rewind() in any chunk after any writing (especially on first chunks)
-                             *          or the CircularFileWriter can lead to unexpected results
-                             */
-                            if (source.isClosed() || source.available() < 1) {
-                                continue;// the selected source is not used anymore
-                            }
-
-                            return source.getFilePointer() - 1;
-                        }
-
-                        return -1;
-                    };
-
-                    temp = new File(cacheDir, mission.storage.getName() + ".tmp");
-
-                    out = new CircularFileWriter(mission.storage.getStream(), temp, checker);
-                    out.onProgress = this::progressReport;
-
-                    out.onWriteError = (err) -> {
-                        mission.psState = 3;
-                        mission.notifyError(ERROR_POSTPROCESSING_HOLD, err);
-
-                        try {
-                            synchronized (this) {
-                                while (mission.psState == 3)
-                                    wait();
-                            }
-                        } catch (InterruptedException e) {
-                            // nothing to do
-                            Log.e(this.getClass().getSimpleName(), "got InterruptedException");
-                        }
-
-                        return mission.errCode == ERROR_NOTHING;
-                    };
-
-                    result = process(out, sources);
-
-                    if (result == OK_RESULT)
-                        finalLength = out.finalizeFile();
-                } else {
-                    result = OK_RESULT;
-                }
-            } finally {
-                for (SharpStream source : sources) {
-                    if (source != null && !source.isClosed()) {
-                        source.close();
-                    }
-                }
-                if (out != null) {
-                    out.close();
-                }
-                if (temp != null) {
-                    //noinspection ResultOfMethodCallIgnored
-                    temp.delete();
-                }
-            }
-        } else {
-            result = test() ? process(null) : OK_RESULT;
-        }
-
-        if (result == OK_RESULT) {
-            if (finalLength != -1) {
-                mission.done = finalLength;
-                mission.length = finalLength;
-            }
-        } else {
-            mission.errCode = ERROR_UNKNOWN_EXCEPTION;
-            mission.errObject = new RuntimeException("post-processing algorithm returned " + result);
-        }
-
-        if (result != OK_RESULT && worksOnSameFile) mission.storage.delete();
-
-        this.mission = null;
-    }
-
-    /**
-     * Test if the post-processing algorithm can be skipped
-     *
-     * @param sources files to be processed
-     * @return {@code true} if the post-processing is required, otherwise, {@code false}
-     * @throws IOException if an I/O error occurs.
-     */
-    boolean test(SharpStream... sources) throws IOException {
-        return true;
-    }
-
-    /**
-     * Abstract method to execute the post-processing algorithm
-     *
-     * @param out     output stream
-     * @param sources files to be processed
-     * @return a error code, 0 means the operation was successful
-     * @throws IOException if an I/O error occurs.
-     */
-    abstract int process(SharpStream out, SharpStream... sources) throws IOException;
-
-    String getArgumentAt(int index, String defaultValue) {
-        if (args == null || index >= args.length) {
-            return defaultValue;
-        }
-
-        return args[index];
-    }
-
-    private void progressReport(long done) {
-        mission.done = done;
-        if (mission.length < mission.done) mission.length = mission.done;
-
-        Message m = new Message();
-        m.what = DownloadManagerService.MESSAGE_PROGRESS;
-        m.obj = mission;
-
-        mission.mHandler.sendMessage(m);
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        StringBuilder str = new StringBuilder();
-
-        str.append("name=").append(name).append('[');
-
-        if (args != null) {
-            for (String arg : args) {
-                str.append(", ");
-                str.append(arg);
-            }
-            str.delete(0, 1);
-        }
-
-        return str.append(']').toString();
-    }
-}
+package us.shandian.giga.postprocessing;
+
+import android.os.Message;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.io.ChunkFileInputStream;
+import us.shandian.giga.io.CircularFileWriter;
+import us.shandian.giga.io.CircularFileWriter.OffsetChecker;
+import us.shandian.giga.service.DownloadManagerService;
+
+import static us.shandian.giga.get.DownloadMission.ERROR_NOTHING;
+import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING_HOLD;
+import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION;
+
+public abstract class Postprocessing implements Serializable {
+
+    static transient final byte OK_RESULT = ERROR_NOTHING;
+
+    public transient static final String ALGORITHM_TTML_CONVERTER = "ttml";
+    public transient static final String ALGORITHM_WEBM_MUXER = "webm";
+    public transient static final String ALGORITHM_MP4_FROM_DASH_MUXER = "mp4D-mp4";
+    public transient static final String ALGORITHM_M4A_NO_DASH = "mp4D-m4a";
+
+    public static Postprocessing getAlgorithm(@NonNull String algorithmName, String[] args) {
+        Postprocessing instance;
+
+        switch (algorithmName) {
+            case ALGORITHM_TTML_CONVERTER:
+                instance = new TtmlConverter();
+                break;
+            case ALGORITHM_WEBM_MUXER:
+                instance = new WebMMuxer();
+                break;
+            case ALGORITHM_MP4_FROM_DASH_MUXER:
+                instance = new Mp4FromDashMuxer();
+                break;
+            case ALGORITHM_M4A_NO_DASH:
+                instance = new M4aNoDash();
+                break;
+            /*case "example-algorithm":
+                instance = new ExampleAlgorithm();*/
+            default:
+                throw new UnsupportedOperationException("Unimplemented post-processing algorithm: " + algorithmName);
+        }
+
+        instance.args = args;
+        return instance;
+    }
+
+    /**
+     * Get a boolean value that indicate if the given algorithm work on the same
+     * file
+     */
+    public final boolean worksOnSameFile;
+
+    /**
+     * Indicates whether the selected algorithm needs space reserved at the beginning of the file
+     */
+    public final boolean reserveSpace;
+
+    /**
+     * Gets the given algorithm short name
+     */
+    private final String name;
+
+
+    private String[] args;
+
+    protected transient DownloadMission mission;
+
+    private File tempFile;
+
+    Postprocessing(boolean reserveSpace, boolean worksOnSameFile, String algorithmName) {
+        this.reserveSpace = reserveSpace;
+        this.worksOnSameFile = worksOnSameFile;
+        this.name = algorithmName;// for debugging only
+    }
+
+    public void setTemporalDir(@NonNull File directory) {
+        long rnd = (int) (Math.random() * 100000f);
+        tempFile = new File(directory, rnd + "_" + System.nanoTime() + ".tmp");
+    }
+
+    public void cleanupTemporalDir() {
+        if (tempFile != null && tempFile.exists()) {
+            //noinspection ResultOfMethodCallIgnored
+            tempFile.delete();
+        }
+    }
+
+
+    public void run(DownloadMission target) throws IOException {
+        this.mission = target;
+
+        CircularFileWriter out = null;
+        int result;
+        long finalLength = -1;
+
+        mission.done = 0;
+        mission.length = mission.storage.length();
+
+        if (worksOnSameFile) {
+            ChunkFileInputStream[] sources = new ChunkFileInputStream[mission.urls.length];
+            try {
+                int i = 0;
+                for (; i < sources.length - 1; i++) {
+                    sources[i] = new ChunkFileInputStream(mission.storage.getStream(), mission.offsets[i], mission.offsets[i + 1]);
+                }
+                sources[i] = new ChunkFileInputStream(mission.storage.getStream(), mission.offsets[i]);
+
+                if (test(sources)) {
+                    for (SharpStream source : sources) source.rewind();
+
+                    OffsetChecker checker = () -> {
+                        for (ChunkFileInputStream source : sources) {
+                            /*
+                             * WARNING: never use rewind() in any chunk after any writing (especially on first chunks)
+                             *          or the CircularFileWriter can lead to unexpected results
+                             */
+                            if (source.isClosed() || source.available() < 1) {
+                                continue;// the selected source is not used anymore
+                            }
+
+                            return source.getFilePointer() - 1;
+                        }
+
+                        return -1;
+                    };
+
+                    out = new CircularFileWriter(mission.storage.getStream(), tempFile, checker);
+                    out.onProgress = this::progressReport;
+
+                    out.onWriteError = (err) -> {
+                        mission.psState = 3;
+                        mission.notifyError(ERROR_POSTPROCESSING_HOLD, err);
+
+                        try {
+                            synchronized (this) {
+                                while (mission.psState == 3)
+                                    wait();
+                            }
+                        } catch (InterruptedException e) {
+                            // nothing to do
+                            Log.e(this.getClass().getSimpleName(), "got InterruptedException");
+                        }
+
+                        return mission.errCode == ERROR_NOTHING;
+                    };
+
+                    result = process(out, sources);
+
+                    if (result == OK_RESULT)
+                        finalLength = out.finalizeFile();
+                } else {
+                    result = OK_RESULT;
+                }
+            } finally {
+                for (SharpStream source : sources) {
+                    if (source != null && !source.isClosed()) {
+                        source.close();
+                    }
+                }
+                if (out != null) {
+                    out.close();
+                }
+                if (tempFile != null) {
+                    //noinspection ResultOfMethodCallIgnored
+                    tempFile.delete();
+                    tempFile = null;
+                }
+            }
+        } else {
+            result = test() ? process(null) : OK_RESULT;
+        }
+
+        if (result == OK_RESULT) {
+            if (finalLength != -1) {
+                mission.done = finalLength;
+                mission.length = finalLength;
+            }
+        } else {
+            mission.errCode = ERROR_UNKNOWN_EXCEPTION;
+            mission.errObject = new RuntimeException("post-processing algorithm returned " + result);
+        }
+
+        if (result != OK_RESULT && worksOnSameFile) mission.storage.delete();
+
+        this.mission = null;
+    }
+
+    /**
+     * Test if the post-processing algorithm can be skipped
+     *
+     * @param sources files to be processed
+     * @return {@code true} if the post-processing is required, otherwise, {@code false}
+     * @throws IOException if an I/O error occurs.
+     */
+    boolean test(SharpStream... sources) throws IOException {
+        return true;
+    }
+
+    /**
+     * Abstract method to execute the post-processing algorithm
+     *
+     * @param out     output stream
+     * @param sources files to be processed
+     * @return a error code, 0 means the operation was successful
+     * @throws IOException if an I/O error occurs.
+     */
+    abstract int process(SharpStream out, SharpStream... sources) throws IOException;
+
+    String getArgumentAt(int index, String defaultValue) {
+        if (args == null || index >= args.length) {
+            return defaultValue;
+        }
+
+        return args[index];
+    }
+
+    private void progressReport(long done) {
+        mission.done = done;
+        if (mission.length < mission.done) mission.length = mission.done;
+
+        Message m = new Message();
+        m.what = DownloadManagerService.MESSAGE_PROGRESS;
+        m.obj = mission;
+
+        mission.mHandler.sendMessage(m);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        StringBuilder str = new StringBuilder();
+
+        str.append("name=").append(name).append('[');
+
+        if (args != null) {
+            for (String arg : args) {
+                str.append(", ");
+                str.append(arg);
+            }
+            str.delete(0, 1);
+        }
+
+        return str.append(']').toString();
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java b/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java
index bba0b299a..5a5b687f7 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java
@@ -1,72 +1,72 @@
-package us.shandian.giga.postprocessing;
-
-import android.util.Log;
-
-import org.schabi.newpipe.streams.SubtitleConverter;
-import org.schabi.newpipe.streams.io.SharpStream;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.text.ParseException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathExpressionException;
-
-/**
- * @author kapodamy
- */
-class TtmlConverter extends Postprocessing {
-    private static final String TAG = "TtmlConverter";
-
-    TtmlConverter() {
-        // due how XmlPullParser works, the xml is fully loaded on the ram
-        super(0, true);
-    }
-
-    @Override
-    int process(SharpStream out, SharpStream... sources) throws IOException {
-        // check if the subtitle is already in srt and copy, this should never happen
-        String format = getArgumentAt(0, null);
-
-        if (format == null || format.equals("ttml")) {
-            SubtitleConverter ttmlDumper = new SubtitleConverter();
-
-            try {
-                ttmlDumper.dumpTTML(
-                        sources[0],
-                        out,
-                        getArgumentAt(1, "true").equals("true"),
-                        getArgumentAt(2, "true").equals("true")
-                );
-            } catch (Exception err) {
-                Log.e(TAG, "subtitle parse failed", err);
-
-                if (err instanceof IOException) {
-                    return 1;
-                } else if (err instanceof ParseException) {
-                    return 2;
-                } else if (err instanceof SAXException) {
-                    return 3;
-                } else if (err instanceof ParserConfigurationException) {
-                    return 4;
-                } else if (err instanceof XPathExpressionException) {
-                    return 7;
-                }
-
-                return 8;
-            }
-
-            return OK_RESULT;
-        } else if (format.equals("srt")) {
-            byte[] buffer = new byte[8 * 1024];
-            int read;
-            while ((read = sources[0].read(buffer)) > 0) {
-                out.write(buffer, 0, read);
-            }
-            return OK_RESULT;
-        }
-
-        throw new UnsupportedOperationException("Can't convert this subtitle, unimplemented format: " + format);
-    }
-
-}
+package us.shandian.giga.postprocessing;
+
+import android.util.Log;
+
+import org.schabi.newpipe.streams.SubtitleConverter;
+import org.schabi.newpipe.streams.io.SharpStream;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathExpressionException;
+
+/**
+ * @author kapodamy
+ */
+class TtmlConverter extends Postprocessing {
+    private static final String TAG = "TtmlConverter";
+
+    TtmlConverter() {
+        // due how XmlPullParser works, the xml is fully loaded on the ram
+        super(false, true, ALGORITHM_TTML_CONVERTER);
+    }
+
+    @Override
+    int process(SharpStream out, SharpStream... sources) throws IOException {
+        // check if the subtitle is already in srt and copy, this should never happen
+        String format = getArgumentAt(0, null);
+
+        if (format == null || format.equals("ttml")) {
+            SubtitleConverter ttmlDumper = new SubtitleConverter();
+
+            try {
+                ttmlDumper.dumpTTML(
+                        sources[0],
+                        out,
+                        getArgumentAt(1, "true").equals("true"),
+                        getArgumentAt(2, "true").equals("true")
+                );
+            } catch (Exception err) {
+                Log.e(TAG, "subtitle parse failed", err);
+
+                if (err instanceof IOException) {
+                    return 1;
+                } else if (err instanceof ParseException) {
+                    return 2;
+                } else if (err instanceof SAXException) {
+                    return 3;
+                } else if (err instanceof ParserConfigurationException) {
+                    return 4;
+                } else if (err instanceof XPathExpressionException) {
+                    return 7;
+                }
+
+                return 8;
+            }
+
+            return OK_RESULT;
+        } else if (format.equals("srt")) {
+            byte[] buffer = new byte[8 * 1024];
+            int read;
+            while ((read = sources[0].read(buffer)) > 0) {
+                out.write(buffer, 0, read);
+            }
+            return OK_RESULT;
+        }
+
+        throw new UnsupportedOperationException("Can't convert this subtitle, unimplemented format: " + format);
+    }
+
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
index 618c1ec5a..ea1676482 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
@@ -1,44 +1,44 @@
-package us.shandian.giga.postprocessing;
-
-import org.schabi.newpipe.streams.WebMReader.TrackKind;
-import org.schabi.newpipe.streams.WebMReader.WebMTrack;
-import org.schabi.newpipe.streams.WebMWriter;
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.IOException;
-
-/**
- * @author kapodamy
- */
-class WebMMuxer extends Postprocessing {
-
-    WebMMuxer() {
-        super(5 * 1024 * 1024/* 5 MiB */, true);
-    }
-
-    @Override
-    int process(SharpStream out, SharpStream... sources) throws IOException {
-        WebMWriter muxer = new WebMWriter(sources);
-        muxer.parseSources();
-
-        // youtube uses a webm with a fake video track that acts as a "cover image"
-        int[] indexes = new int[sources.length];
-
-        for (int i = 0; i < sources.length; i++) {
-            WebMTrack[] tracks = muxer.getTracksFromSource(i);
-            for (int j = 0; j < tracks.length; j++) {
-                if (tracks[j].kind == TrackKind.Audio) {
-                    indexes[i] = j;
-                    i = sources.length;
-                    break;
-                }
-            }
-        }
-
-        muxer.selectTracks(indexes);
-        muxer.build(out);
-
-        return OK_RESULT;
-    }
-
-}
+package us.shandian.giga.postprocessing;
+
+import org.schabi.newpipe.streams.WebMReader.TrackKind;
+import org.schabi.newpipe.streams.WebMReader.WebMTrack;
+import org.schabi.newpipe.streams.WebMWriter;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+
+/**
+ * @author kapodamy
+ */
+class WebMMuxer extends Postprocessing {
+
+    WebMMuxer() {
+        super(true, true, ALGORITHM_WEBM_MUXER);
+    }
+
+    @Override
+    int process(SharpStream out, SharpStream... sources) throws IOException {
+        WebMWriter muxer = new WebMWriter(sources);
+        muxer.parseSources();
+
+        // youtube uses a webm with a fake video track that acts as a "cover image"
+        int[] indexes = new int[sources.length];
+
+        for (int i = 0; i < sources.length; i++) {
+            WebMTrack[] tracks = muxer.getTracksFromSource(i);
+            for (int j = 0; j < tracks.length; j++) {
+                if (tracks[j].kind == TrackKind.Audio) {
+                    indexes[i] = j;
+                    i = sources.length;
+                    break;
+                }
+            }
+        }
+
+        muxer.selectTracks(indexes);
+        muxer.build(out);
+
+        return OK_RESULT;
+    }
+
+}
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManager.java b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
index 479c4b92f..c2bba7396 100644
--- a/app/src/main/java/us/shandian/giga/service/DownloadManager.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
@@ -154,7 +154,9 @@ public class DownloadManager {
                 if (mis.psAlgorithm.worksOnSameFile) {
                     // Incomplete post-processing results in a corrupted download file
                     // because the selected algorithm works on the same file to save space.
-                    if (exists && !mis.storage.delete())
+                    // the file will be deleted if the storage API
+                    // is Java IO (avoid showing the "Save as..." dialog)
+                    if (exists && mis.storage.isDirect() && !mis.storage.delete())
                         Log.w(TAG, "Unable to delete incomplete download file: " + sub.getPath());
 
                     exists = true;
@@ -162,7 +164,6 @@ public class DownloadManager {
 
                 mis.psState = 0;
                 mis.errCode = DownloadMission.ERROR_POSTPROCESSING_STOPPED;
-                mis.errObject = null;
             } else if (!exists) {
                 tryRecover(mis);
 
@@ -171,8 +172,10 @@ public class DownloadManager {
                     mis.resetState(true, true, DownloadMission.ERROR_PROGRESS_LOST);
             }
 
-            if (mis.psAlgorithm != null)
-                mis.psAlgorithm.cacheDir = pickAvailableCacheDir(ctx);
+            if (mis.psAlgorithm != null) {
+                mis.psAlgorithm.cleanupTemporalDir();
+                mis.psAlgorithm.setTemporalDir(pickAvailableTemporalDir(ctx));
+            }
 
             mis.recovered = exists;
             mis.metadata = sub;
@@ -532,14 +535,14 @@ public class DownloadManager {
     }
 
     private static boolean isDirectoryAvailable(File directory) {
-        return directory != null && directory.canWrite();
+        return directory != null && directory.canWrite() && directory.exists();
     }
 
-    static File pickAvailableCacheDir(@NonNull Context ctx) {
-        if (isDirectoryAvailable(ctx.getExternalCacheDir()))
-            return ctx.getExternalCacheDir();
-        else if (isDirectoryAvailable(ctx.getCacheDir()))
-            return ctx.getCacheDir();
+    static File pickAvailableTemporalDir(@NonNull Context ctx) {
+        if (isDirectoryAvailable(ctx.getExternalFilesDir(null)))
+            return ctx.getExternalFilesDir(null);
+        else if (isDirectoryAvailable(ctx.getFilesDir()))
+            return ctx.getFilesDir();
 
         // this never should happen
         return ctx.getDir("tmp", Context.MODE_PRIVATE);
@@ -550,7 +553,7 @@ public class DownloadManager {
         if (tag.equals(TAG_AUDIO)) return mMainStorageAudio;
         if (tag.equals(TAG_VIDEO)) return mMainStorageVideo;
 
-        Log.w(TAG, "Unknown download category, not [audio video]: " + String.valueOf(tag));
+        Log.w(TAG, "Unknown download category, not [audio video]: " + tag);
 
         return null;// this never should happen
     }
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index f25147507..aab0257db 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -450,13 +450,16 @@ public class DownloadManagerService extends Service {
         if (psName == null)
             ps = null;
         else
-            ps = Postprocessing.getAlgorithm(psName, psArgs, DownloadManager.pickAvailableCacheDir(this));
+            ps = Postprocessing.getAlgorithm(psName, psArgs);
 
         final DownloadMission mission = new DownloadMission(urls, storage, kind, ps);
         mission.threadCount = threads;
         mission.source = source;
         mission.nearLength = nearLength;
 
+        if (ps != null)
+            ps.setTemporalDir(DownloadManager.pickAvailableTemporalDir(this));
+
         handleConnectivityState(true);// first check the actual network status
 
         mManager.startMission(mission);
diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
index 793cbea18..dc6a67b4b 100644
--- a/app/src/main/java/us/shandian/giga/util/Utility.java
+++ b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -267,8 +267,7 @@ public class Utility {
         }
 
         try {
-            long length = Long.parseLong(connection.getHeaderField("Content-Length"));
-            if (length >= 0) return length;
+            return Long.parseLong(connection.getHeaderField("Content-Length"));
         } catch (Exception err) {
             // nothing to do
         }

From cdc8fe86cee3f344f4a54d2fdca1f6f296e62c27 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Mon, 3 Jun 2019 18:39:56 -0300
Subject: [PATCH 136/138] amend rebase resolve inconsistency in string.xml
 files

---
 app/src/main/res/values-ca/strings.xml |  3 ++-
 app/src/main/res/values-cs/strings.xml |  3 ++-
 app/src/main/res/values-da/strings.xml |  6 +++---
 app/src/main/res/values-de/strings.xml |  4 ++--
 app/src/main/res/values-el/strings.xml |  3 ++-
 app/src/main/res/values-es/strings.xml | 23 +++++++++--------------
 app/src/main/res/values-et/strings.xml |  3 ++-
 app/src/main/res/values-fr/strings.xml |  3 ++-
 app/src/main/res/values-hr/strings.xml |  3 ++-
 app/src/main/res/values-ja/strings.xml |  4 ++--
 app/src/main/res/values-ko/strings.xml |  3 ++-
 app/src/main/res/values-ru/strings.xml |  1 -
 app/src/main/res/values-sk/strings.xml |  3 ++-
 app/src/main/res/values-uk/strings.xml |  3 ++-
 14 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 04bb36ea3..e631c4fe0 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -446,7 +446,8 @@
     <string name="download_failed">Ha fallat la baixada</string>
     <string name="download_finished">Baixada finalitzada</string>
     <string name="download_finished_more">%s baixades finalitzades</string>
-    <string name="overwrite_warning">Ja existeix un fitxer baixat amb aquest nom</string>
+    <string name="overwrite_finished_warning">Ja existeix un fitxer baixat amb aquest nom</string>
+    <string name="overwrite_unrelated_warning">Ja existeix un fitxer amb aquest nom</string>
     <string name="download_already_running">Hi ha una baixada en curs amb aquest nom</string>
     <string name="error_ssl_exception">Ha fallat la connexió segura</string>
     <string name="error_unknown_host">No s\'ha pogut trobar el servidor</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 306fb4ccd..97326bfdc 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -459,7 +459,8 @@ otevření ve vyskakovacím okně</string>
     <string name="download_finished_more">% s stahování dokončeno</string>
     <string name="generate_unique_name">Vytvořit jedinečný název</string>
     <string name="overwrite">Přepsat</string>
-    <string name="overwrite_warning">Stažený soubor s tímto názvem již existuje</string>
+    <string name="overwrite_unrelated_warning">Stažený soubor s tímto názvem již existuje</string>
+    <string name="overwrite_finished_warning">Stažený soubor s tímto názvem již existuje</string>
     <string name="download_already_running">Stahování s tímto názvem již probíhá</string>
     <string name="show_error">Zobrazit chybu</string>
     <string name="label_code">Kód</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 0c699cf0e..919cef47b 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -359,7 +359,7 @@
     <string name="auto">Automatisk</string>
     <string name="app_update_notification_content_text">Tryk for at downloade</string>
     <string name="missions_header_finished">Færdig</string>
-    <string name="missions_header_pending">I kø</string>
+    <string name="missions_header_pending">Afventning</string>
     <string name="post_processing">efterbehandling</string>
     <string name="enqueue">Kø</string>
     <string name="permission_denied">Handling afvist af systemet</string>
@@ -368,7 +368,8 @@
     <string name="download_finished_more">%s downloads færdige</string>
     <string name="generate_unique_name">Generer unikt navn</string>
     <string name="overwrite">Overskriv</string>
-    <string name="overwrite_warning">En downloadet fil med dette navn eksisterer allerede</string>
+    <string name="overwrite_unrelated_warning">En fil med dette navn eksisterer allerede</string>
+    <string name="overwrite_finished_warning">En downloadet fil med dette navn eksisterer allerede</string>
     <string name="download_already_running">Der er en download i gang med dette navn</string>
     <string name="show_error">Vis fejl</string>
     <string name="label_code">Kode</string>
@@ -453,5 +454,4 @@
     <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>
     <string name="pause_downloads_on_mobile_desc">Downloads som ikke kan sættes på pause vil blive genstartet</string>
-    <string name="missions_header_pending">Afventning</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9a2518652..7c131eac4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -448,8 +448,8 @@
     <string name="download_finished_more">%s heruntergeladen</string>
     <string name="generate_unique_name">Eindeutigen Namen erzeugen</string>
     <string name="overwrite">Überschreiben</string>
-    <string name="overwrite_finished_warning">Eine heruntergeladene Datei dieses Namens existiert bereits</string>
-    <string name="download_already_running">Eine Datei dieses Namens wird gerade heruntergeladen</string>
+    <string name="overwrite_unrelated_warning">Eine Datei mit diesem Namen existiert bereits</string>
+    <string name="download_already_running">Eine heruntergeladene Datei mit diesem Namen existiert bereits</string>
     <string name="show_error">Fehler anzeigen</string>
     <string name="label_code">Code</string>
     <string name="error_file_creation">Die Datei kann nicht erstellt werden</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 68e93ba58..aa87c9c32 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -444,7 +444,8 @@
     <string name="download_finished_more">%s λήψεις ολοκρηρώθηκαν</string>
     <string name="generate_unique_name">Δημιουργία μοναδικού ονόματος</string>
     <string name="overwrite">Αντικατάσταση</string>
-    <string name="overwrite_warning">Ένα αρχείο με το ίδιο όνομα υπάρχει ήδη</string>
+    <string name="overwrite_unrelated_warning">Ένα αρχείο με αυτό το όνομα υπάρχει ήδη</string>
+    <string name="overwrite_finished_warning">Ένα αρχείο που έχει ληφθεί με αυτό το όνομα υπάρχει ήδη</string>
     <string name="download_already_running">Υπάρχει μια λήψη σε εξέλιξη με αυτό το όνομα</string>
     <string name="show_error">Εμφάνιση σφάλματος</string>
     <string name="label_code">Κωδικός</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 890755845..8f4375033 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -159,7 +159,7 @@ abrir en modo popup</string>
     <string name="contribution_encouragement">Si tienes ideas de; traducción, cambios de diseño, limpieza de código o cambios de código realmente fuertes—la ayuda siempre es bienvenida. Cuanto más se hace, mejor se pone!</string>
     <string name="read_full_license">Leer licencia</string>
     <string name="contribution_title">Contribuir</string>
-<string name="subscribe_button_title">Suscribirse</string>
+    <string name="subscribe_button_title">Suscribirse</string>
     <string name="subscribed_button_title">Suscrito</string>
     <string name="channel_unsubscribed">Canal no suscrito</string>
     <string name="subscription_change_failed">No se pudo cambiar la suscripción</string>
@@ -211,8 +211,8 @@ abrir en modo popup</string>
         <item quantity="other">Vídeos</item>
     </plurals>
     <string name="item_deleted">Elemento eliminado</string>
-<string name="delete_item_search_history">¿Desea eliminar este elemento del historial de búsqueda?</string>
-<string name="main_page_content">Contenido de la página principal</string>
+    <string name="delete_item_search_history">¿Desea eliminar este elemento del historial de búsqueda?</string>
+    <string name="main_page_content">Contenido de la página principal</string>
     <string name="blank_page_summary">Página en blanco</string>
     <string name="kiosk_page_summary">Página del kiosco</string>
     <string name="subscription_page_summary">Página de suscripción</string>
@@ -224,7 +224,7 @@ abrir en modo popup</string>
     <string name="kiosk">Kiosco</string>
     <string name="trending">Tendencias</string>
     <string name="top_50">Top 50</string>
-<string name="show_hold_to_append_summary">Mostrar sugerencia cuando se presiona el botón de segundo plano o popup en la página de detalles del vídeo</string>
+    <string name="show_hold_to_append_summary">Mostrar sugerencia cuando se presiona el botón de segundo plano o popup en la página de detalles del vídeo</string>
     <string name="background_player_append">En cola en el reproductor de fondo</string>
     <string name="popup_playing_append">En cola en el reproductor popup</string>
     <string name="play_all">Reproducir todo</string>
@@ -242,7 +242,7 @@ abrir en modo popup</string>
     <string name="start_here_on_main">Comenzar a reproducir aquí</string>
     <string name="start_here_on_background">Comenzar aquí en segundo plano</string>
     <string name="start_here_on_popup">Comenzar aquí en popup</string>
-<string name="show_hold_to_append_title">Mostrar consejo \"Mantener para poner en la cola\"</string>
+    <string name="show_hold_to_append_title">Mostrar consejo \"Mantener para poner en la cola\"</string>
     <string name="new_and_hot">Nuevo y popular</string>
     <string name="hold_to_append">Mantener para poner en la cola</string>
     <string name="donation_title">Donar</string>
@@ -270,7 +270,7 @@ abrir en modo popup</string>
     <string name="popup_player">Reproductor de popup</string>
     <string name="preferred_player_fetcher_notification_title">Obteniendo información…</string>
     <string name="preferred_player_fetcher_notification_message">Cargando contenido solicitado</string>
-<string name="import_data_title">Importar base de datos</string>
+    <string name="import_data_title">Importar base de datos</string>
     <string name="export_data_title">Exportar base de datos</string>
     <string name="import_data_summary">Reemplazará su historial actual y sus suscripciones</string>
     <string name="export_data_summary">Exportar historial, suscripciones y listas de reproducción</string>
@@ -404,7 +404,7 @@ abrir en modo popup</string>
     <string name="playlists">Listas de reproducción</string>
     <string name="tracks">Pistas</string>
     <string name="missions_header_finished">Finalizadas</string>
-    <string name="missions_header_pending">En cola</string>
+    <string name="missions_header_pending">Pendientes</string>
     <string name="paused">pausado</string>
     <string name="queued">en cola</string>
     <string name="post_processing">post-procesado</string>
@@ -423,12 +423,11 @@ abrir en modo popup</string>
     <string name="overwrite_failed">No se puede sobrescribir el archivo</string>
     <string name="download_already_running">Hay una descarga en curso con este nombre</string>
     <string name="download_already_pending">Hay una descarga pendiente con este nombre</string>
-
     <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="confirm_prompt">¿Estas seguro?</string>
     <string name="msg_pending_downloads">Tienes %s descargas pendientes, ve a Descargas para continuarlas</string>
+    <string name="confirm_prompt">¿Estas seguro?</string>
     <string name="stop">Detener</string>
     <string name="max_retry_msg">Intentos máximos</string>
     <string name="max_retry_desc">Cantidad máxima de intentos antes de cancelar la descarga</string>
@@ -459,11 +458,7 @@ abrir en modo popup</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="download_to_sdcard_error_message">No es posible descargar a una tarjeta SD externa. \¿Restablecer la ubicación de la carpeta de descarga\?</string>
-
     <string name="download_pick_path">Seleccione los directorios de descarga</string>
-    <string name="missions_header_pending">Pendiente</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 preguntará dónde guardar cada descarga.\nHabilita esta opción si quieres descargar en la tarjeta SD externa</string>
@@ -480,7 +475,7 @@ abrir en modo popup</string>
     <string name="app_update_notification_channel_name">Notificación de actualización de la aplicación</string>
     <string name="app_update_notification_channel_description">Notificaciones para nueva versión de NewPipe</string>
     <string name="download_to_sdcard_error_title">Almacenamiento externo no disponible</string>
-    <string name="download_to_sdcard_error_message">Todavía no es posible descargar a una tarjeta SD externa. ¿Restablecer la ubicación de la carpeta de descarga\?</string>
+    <string name="download_to_sdcard_error_message">No es posible descargar a una tarjeta SD externa. \¿Restablecer la ubicación de la carpeta de descarga\?</string>
     <string name="saved_tabs_invalid_json">Usando las pestañas por defecto, error al leer las pestañas guardadas</string>
     <string name="restore_defaults">Restaurar valores por defecto</string>
     <string name="restore_defaults_confirmation">¿Quieres restaurar los valores por defecto\?</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index a11805f3b..35e2a7695 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -445,7 +445,8 @@
     <string name="download_finished_more">%s allalaadimist lõppenud</string>
     <string name="generate_unique_name">Loo kordumatu nimi</string>
     <string name="overwrite">Kirjuta üle</string>
-    <string name="overwrite_warning">Selle nimega allalaetud fail on juba olemas</string>
+    <string name="overwrite_unrelated_warning">Sellise nimega fail on juba olemas</string>
+    <string name="overwrite_finished_warning">Selle nimega allalaaditud fail on juba olemas</string>
     <string name="download_already_running">Selle nimega allalaadimine on käimas</string>
     <string name="show_error">Näita viga</string>
     <string name="label_code">Kood</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ca9682fdb..301d41d36 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -447,7 +447,8 @@
     <string name="queued">Ajouté à la file d\'attente</string>
     <string name="generate_unique_name">Générer un nom unique</string>
     <string name="overwrite">Écraser</string>
-    <string name="overwrite_warning">Un fichier téléchargé avec ce nom existe déjà</string>
+    <string name="overwrite_unrelated_warning">Un fichier avec ce nom existe déjà</string>
+    <string name="overwrite_finished_warning">Un fichier téléchargé avec ce nom existe déjà</string>
     <string name="download_already_running">Il y a un téléchargement en cours avec ce nom</string>
     <string name="show_error">Afficher l\'erreur</string>
     <string name="label_code">Code</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index e7aeb924a..3d7601895 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -447,7 +447,8 @@
     <string name="download_finished_more">%s preuzimanja dovršeno</string>
     <string name="generate_unique_name">Generirajte jedinstveni naziv</string>
     <string name="overwrite">Piši preko</string>
-    <string name="overwrite_warning">Preuzeta datoteka s tim nazivom već postoji</string>
+    <string name="overwrite_unrelated_warning">Datoteka s tim nazivom već postoji</string>
+    <string name="overwrite_finished_warning">Preuzeta datoteka s tim nazivom već postoji</string>
     <string name="download_already_running">U tijeku je preuzimanje s ovim nazivom</string>
     <string name="label_code">Kod</string>
     <string name="error_path_creation">Datoteku nije moguće izraditi</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index be243bffd..ba0e7b1ba 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -432,7 +432,8 @@
     <string name="download_finished_more">%s 件のダウンロード終了</string>
     <string name="generate_unique_name">一意の名前を生成します</string>
     <string name="overwrite">上書き</string>
-    <string name="overwrite_warning">同じ名前のファイルが既に存在します</string>
+    <string name="overwrite_unrelated_warning">この名前のファイルは既に存在します</string>
+    <string name="overwrite_finished_warning">この名前のダウンロードファイルは既に存在します</string>
     <string name="download_already_running">同じ名前を持つダウンロードが既に進行中です</string>
     <string name="show_error">エラーを表示する</string>
     <string name="label_code">コード</string>
@@ -464,6 +465,5 @@
     <string name="msg_pending_downloads">ダウンロードから %s の保留中の転送を続行します</string>
     <string name="pause_downloads_on_mobile">モバイルデータ通信に切り替え時に休止</string>
     <string name="pause_downloads_on_mobile_desc">休止できないダウンロードが再開されます</string>
-    <string name="missions_header_pending">保留中</string>
     <string name="error_timeout">接続タイムアウト</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 1bb71650d..c02b7270e 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -450,7 +450,8 @@
     <string name="download_finished_more">%s 다운로드 완료됨</string>
     <string name="generate_unique_name">별개의 이름 생성</string>
     <string name="overwrite">덮어쓰기</string>
-    <string name="overwrite_warning">해당 이름을 가진 다운로드된 파일이 이미 존재합니다</string>
+    <string name="overwrite_unrelated_warning">이 이름을 가진 파일이 이미 있습니다.</string>
+    <string name="overwrite_finished_warning">이 이름을 가진 다운로드 된 파일이 이미 있습니다.</string>
     <string name="download_already_running">해당 이름을 가진 다운로드가 이미 진행중입니다</string>
     <string name="show_error">오류 표시</string>
     <string name="label_code">코드</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c75af14e2..b5e3769ad 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -472,6 +472,5 @@
     <string name="error_postprocessing_failed">Пост-обработка не удалась</string>
     <string name="pause_downloads_on_mobile">Останавливать скачивание при переходе на мобильную сеть</string>
     <string name="close">Закрыть</string>
-    <string name="missions_header_pending">в ожидании</string>
     <string name="error_timeout">Время соединения вышло</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index de26a1638..dc53835e4 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -456,7 +456,8 @@
     <string name="download_finished_more">%s sťahovania skončené</string>
     <string name="generate_unique_name">Vytvoriť jedinečný názov</string>
     <string name="overwrite">Prepísať</string>
-    <string name="overwrite_warning">Stiahnutý súbor s týmto menom už existuje</string>
+    <string name="overwrite_unrelated_warning">Súbor s týmto názvom už existuje</string>
+    <string name="overwrite_finished_warning">Stiahnutý súbor s týmto názvom už existuje</string>
     <string name="download_already_running">Sťahovanie s týmto názvom už prebieha</string>
     <string name="show_error">Zobraziť chybu</string>
     <string name="label_code">Kód</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 60934ebb1..1577371ef 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -443,7 +443,8 @@
     <string name="download_finished_more">%s завантажень завершено</string>
     <string name="generate_unique_name">Згенерувати унікальну назву</string>
     <string name="overwrite">Перезаписати</string>
-    <string name="overwrite_warning">Завантажений файл з таким ім\'ям вже існує</string>
+    <string name="overwrite_unrelated_warning">Файл з такою назвою вже існує</string>
+    <string name="overwrite_finished_warning">Завантажений файл з такою назвою вже існує</string>
     <string name="download_already_running">Файл з такою назвою вже завантажується</string>
     <string name="show_error">Показати помилку</string>
     <string name="label_code">Код</string>

From af971b6a1930bfa59cde473f015826a69c2d44b8 Mon Sep 17 00:00:00 2001
From: Redirion <redirion@web.de>
Date: Wed, 12 Jun 2019 14:44:36 +0200
Subject: [PATCH 137/138] Fixed selected subtitle stream not being shown

closes #2393
this ammends my obviously incomplete fix in PR #2311.

This is just an UI issue. Subtitle track selection works, it just shows "No Captions" unfortunately.
---
 app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
index 4dbbc571d..d15dc8b28 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
@@ -297,6 +297,7 @@ public abstract class VideoPlayer extends BasePlayer
             return true;
         });
 
+        // Add all available captions
         for (int i = 0; i < availableLanguages.size(); i++) {
             final String captionLanguage = availableLanguages.get(i);
             MenuItem captionItem = captionPopupMenu.getMenu().add(captionPopupMenuGroupId,
@@ -506,7 +507,7 @@ public abstract class VideoPlayer extends BasePlayer
         }
 
         // Normalize mismatching language strings
-        final String preferredLanguage = trackSelector.getParameters().preferredTextLanguage;
+        final String preferredLanguage = trackSelector.getPreferredTextLanguage();
         // Build UI
         buildCaptionMenu(availableLanguages);
         if (trackSelector.getParameters().getRendererDisabled(textRenderer) ||

From ac5e2e0532abe876bedee8984235a92a29345053 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Fri, 14 Jun 2019 12:19:50 -0300
Subject: [PATCH 138/138] bugs fixes * fix storage warning dialogs created on
 invalid contexts * implement mkdirs in StoredDirectoryHelper

---
 .../newpipe/download/DownloadDialog.java      | 33 +++++++++++++
 .../fragments/detail/VideoDetailFragment.java |  2 +-
 .../giga/io/StoredDirectoryHelper.java        | 46 +++++++++++++++++++
 .../giga/service/DownloadManagerService.java  | 27 -----------
 4 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 8fef9a995..56ea9366d 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -217,6 +217,32 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                 okButton.setEnabled(true);
 
                 context.unbindService(this);
+
+                // check of download paths are defined
+                if (!askForSavePath) {
+                    String msg = "";
+                    if (mainStorageVideo == null) msg += getString(R.string.download_path_title);
+                    if (mainStorageAudio == null)
+                        msg += getString(R.string.download_path_audio_title);
+
+                    if (!msg.isEmpty()) {
+                        String title;
+                        if (mainStorageVideo == null && mainStorageAudio == null) {
+                            title = getString(R.string.general_error);
+                            msg = getString(R.string.no_available_dir) + ":\n" + msg;
+                        } else {
+                            title = msg;
+                            msg = getString(R.string.no_available_dir);
+                        }
+
+                        new AlertDialog.Builder(context)
+                                .setPositiveButton(android.R.string.ok, null)
+                                .setTitle(title)
+                                .setMessage(msg)
+                                .create()
+                                .show();
+                    }
+                }
             }
 
             @Override
@@ -520,6 +546,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
     private void showFailedDialog(@StringRes int msg) {
         new AlertDialog.Builder(context)
+                .setTitle(R.string.general_error)
                 .setMessage(msg)
                 .setNegativeButton(android.R.string.ok, null)
                 .create()
@@ -631,6 +658,12 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                     // This part is called if:
                     // * the filename is not used in a pending/finished download
                     // * the file does not exists, create
+
+                    if (!mainStorage.mkdirs()) {
+                        showFailedDialog(R.string.error_path_creation);
+                        return;
+                    }
+
                     storage = mainStorage.createFile(filename, mime);
                     if (storage == null || !storage.canWrite()) {
                         showFailedDialog(R.string.error_file_creation);
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index bbd1a315d..c89e773f4 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1195,7 +1195,7 @@ public class VideoDetailFragment
                 downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
                 downloadDialog.setSubtitleStreams(currentInfo.getSubtitles());
 
-                downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
+                downloadDialog.show(getActivity().getSupportFragmentManager(), "downloadDialog");
             } catch (Exception e) {
                 ErrorActivity.ErrorInfo info = ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
                         ServiceList.all()
diff --git a/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
index a65c4dff3..aeb810479 100644
--- a/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
+++ b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java
@@ -144,6 +144,52 @@ public class StoredDirectoryHelper {
         return docTree == null ? ioTree.exists() : docTree.exists();
     }
 
+    /**
+     * Indicates whatever if is possible access using the {@code java.io} API
+     *
+     * @return {@code true} for Java I/O API, otherwise, {@code false} for Storage Access Framework
+     */
+    public boolean isDirect() {
+        return docTree == null;
+    }
+
+    /**
+     * Only using Java I/O. Creates the directory named by this abstract pathname, including any
+     * necessary but nonexistent parent directories.  Note that if this
+     * operation fails it may have succeeded in creating some of the necessary
+     * parent directories.
+     *
+     * @return <code>true</code> if and only if the directory was created,
+     * along with all necessary parent directories or already exists; <code>false</code>
+     * otherwise
+     */
+    public boolean mkdirs() {
+        if (docTree == null) {
+            return ioTree.exists() || ioTree.mkdirs();
+        }
+
+        if (docTree.exists()) return true;
+
+        try {
+            DocumentFile parent;
+            String child = docTree.getName();
+
+            while (true) {
+                parent = docTree.getParentFile();
+                if (parent == null || child == null) break;
+                if (parent.exists()) return true;
+
+                parent.createDirectory(child);
+
+                child = parent.getName();// for the next iteration
+            }
+        } catch (Exception e) {
+            // no more parent directories or unsupported by the storage provider
+        }
+
+        return false;
+    }
+
     public String getTag() {
         return tag;
     }
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index aab0257db..7f3a4bde1 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -270,33 +270,6 @@ public class DownloadManagerService extends Service {
             Toast.makeText(this, "Permission denied (write)", Toast.LENGTH_SHORT).show();
         }
 
-        // Check download save paths
-
-        String msg = "";
-        if (mManager.mMainStorageVideo == null)
-            msg += getString(R.string.download_path_title);
-        else if (mManager.mMainStorageAudio == null)
-            msg += getString(R.string.download_path_audio_title);
-
-        if (!msg.isEmpty()) {
-            String title;
-            if (mManager.mMainStorageVideo == null && mManager.mMainStorageAudio == null) {
-                title = getString(R.string.general_error);
-                msg = getString(R.string.no_available_dir) + ":\n" + msg;
-            } else {
-                title = msg;
-                msg = getString(R.string.no_available_dir);
-            }
-
-            new AlertDialog.Builder(this)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .setTitle(title)
-                    .setMessage(msg)
-                    .create()
-                    .show();
-        }
-
-
         return mBinder;
     }