From 8e45296826c5b8e449a6e157f71ed3b60a81c686 Mon Sep 17 00:00:00 2001
From: chr_56 <chr0056@gmail.com>
Date: Sat, 14 Dec 2019 21:16:40 +0800
Subject: [PATCH 001/199] remove values-cmn/strings.xml (useless)

---
 app/src/main/res/values-cmn/strings.xml | 504 ------------------------
 1 file changed, 504 deletions(-)
 delete mode 100644 app/src/main/res/values-cmn/strings.xml

diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml
deleted file mode 100644
index 3ff479bfd..000000000
--- a/app/src/main/res/values-cmn/strings.xml
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-    <string name="no_player_found_toast">找不到媒体播放器（您可以安装 VLC 来播放）。</string>
-    <string name="install">安装</string>
-    <string name="cancel">取消</string>
-    <string name="open_in_browser">在浏览器中打开</string>
-    <string name="open_in_popup_mode">在悬浮窗模式下打开</string>
-    <string name="share">分享</string>
-    <string name="download">下载</string>
-    <string name="controls_download_desc">下载媒体文件</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="use_external_video_player_title">使用外部视频播放器</string>
-    <string name="use_external_video_player_summary">删除某些分辨率下的音频</string>
-    <string name="use_external_audio_player_title">使用外部音频播放器</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="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>
-    <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="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_video_format_title">默认视频格式</string>
-    <string name="theme_title">主题</string>
-    <string name="light_theme_title">亮色</string>
-    <string name="dark_theme_title">酷黑</string>
-    <string name="black_theme_title">黑色</string>
-    <string name="popup_remember_size_pos_title">记住悬浮窗的尺寸与位置</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>
-    <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>
-    <string name="search_no_results">没有结果</string>
-    <string name="start">开始</string>
-    <string name="pause">暂停</string>
-    <string name="view">播放</string>
-    <string name="create">创建</string>
-    <string name="delete">删除</string>
-    <string name="delete_all">删除所有</string>
-    <string name="add">新任务</string>
-    <string name="finish">好
-\n</string>
-    <string name="msg_error">错误
-\n</string>
-    <string name="msg_server_unsupported">不支持的服务器</string>
-    <string name="msg_exists">文件已存在</string>
-    <string name="msg_running">NewPipe 下载中</string>
-    <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>
-    <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="use_inexact_seek_title">使用快速粗略定位</string>
-    <string name="use_inexact_seek_summary">粗略定位功能允许播放器以略低的精确度为代价换取更快的定位速度</string>
-    <string name="download_thumbnail_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="download_thumbnail_summary">不加载缩略图时，可以节省数据和存储空间。更改后将清除存储空间和扩展空间的缓存。</string>
-    <string name="auto_queue_title">自动排列下一个媒体</string>
-    <string name="auto_queue_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="download_dialog_title">下载</string>
-    <string name="next_video_title">下一部</string>
-    <string name="show_next_and_similar_title">显示「下一部」及「相关」的视频</string>
-    <string name="show_hold_to_append_title">显示「长按以新增」的提示</string>
-    <string name="show_hold_to_append_summary">在视频详细信息页按下后台播放或悬浮窗按钮时提示</string>
-    <string name="url_not_supported_toast">不支持该网址</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_video_audio_title">视频与音频</string>
-    <string name="settings_category_history_title">历史记录和缓存数据</string>
-    <string name="settings_category_popup_title">悬浮窗</string>
-    <string name="settings_category_appearance_title">外观</string>
-    <string name="settings_category_other_title">其他</string>
-    <string name="settings_category_debug_title">调试</string>
-    <string name="background_player_playing_toast">在后台播放</string>
-    <string name="popup_playing_toast">在悬浮窗下播放</string>
-    <string name="background_player_append">已添加到后台播放队列</string>
-    <string name="popup_playing_append">已添加到悬浮窗播放队列</string>
-    <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="duration_live">直播</string>
-    <string name="downloads">下载</string>
-    <string name="downloads_title">下载</string>
-    <string name="error_report_title">错误报告</string>
-    <string name="all">所有</string>
-    <string name="channel">频道</string>
-    <string name="channels">频道</string>
-    <string name="playlist">播放列表</string>
-    <string name="playlists">播放列表</string>
-    <string name="tracks">曲目</string>
-    <string name="users">用户</string>
-    <string name="yes">是的</string>
-    <string name="later">稍等</string>
-    <string name="disabled">不适用</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="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>
-    <string name="export_data_summary">导出历史记录、订阅和播放列表</string>
-    <string name="clear_views_history_summary">删除播放过的媒体的历史记录及回放位置</string>
-    <string name="delete_view_history_alert">确定要清除所有观看历史记录吗？</string>
-    <string name="watch_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="could_not_load_thumbnails">无法加载所有缩略图</string>
-    <string name="youtube_signature_decryption_error">无法解析视频网址签名</string>
-    <string name="parsing_error">无法解析网站</string>
-    <string name="light_parsing_error">无法完全解析网站</string>
-    <string name="content_not_available">内容不可用</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="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="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="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="no_streams_available_download">没有可供下载的串流</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="what_device_headline">信息：</string>
-    <string name="what_happened_headline">发生了什么：</string>
-    <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="list_thumbnail_view_description">视频预览缩略图</string>
-    <string name="detail_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="use_tor_title">使用 Tor</string>
-    <string name="use_tor_summary">（实验性）通过 Tor 强制下载流量以增加隐私（暂不支持视频媒体）。</string>
-    <string name="user_report">用户报告</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="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"/>
-    </plurals>
-    <string name="no_views">无观看次数</string>
-    <plurals name="views">
-        <item quantity="one">%s 次观看</item>
-        <item quantity="other"/>
-    </plurals>
-    <string name="no_videos">没有视频</string>
-    <string name="delete_one">删除</string>
-    <string name="checksum">校验</string>
-    <string name="dismiss">退出</string>
-    <string name="rename">重命名</string>
-    <string name="msg_name">文件名</string>
-    <string name="msg_threads">线程</string>
-    <string name="msg_url_malform">错误的网址或网络不可用</string>
-    <string name="msg_running_detail">点按以查看详细信息</string>
-    <string name="msg_copied">复制到剪贴板</string>
-    <string name="no_available_dir">请稍后在设置中定义一个下载文件夹</string>
-    <string name="msg_popup_permission">在悬浮窗模式打开
-\n需要此权限</string>
-    <string name="one_item_deleted">已删除一个项目。</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="copyright" formatted="true">© %1$s 由 %2$s 使用 %3$s 版权所有</string>
-    <string name="error_unable_to_load_license">无法加载许可证</string>
-    <string name="tab_about">关于</string>
-    <string name="tab_contributors">贡献者</string>
-    <string name="tab_licenses">许可证</string>
-    <string name="app_description">安卓上开源且轻便的媒体播放器。</string>
-    <string name="contribution_title">贡献</string>
-    <string name="contribution_encouragement">您是否有想法帮助我们：翻译、界面设计、代码优化以及真正繁重的功能扩展 - 我们随时欢迎您提供帮助。让 NewPipe 越变越好！</string>
-    <string name="view_on_github">在 GitHub 上查看</string>
-    <string name="donation_title">捐赠</string>
-    <string name="donation_encouragement">NewPipe 由社区人员维护和开发额，他们耗费时间务求为您带来最佳体验。现在是时候回过头来，让我们的开发人员能够在使 NewPipe 更加完美的同时，享受一杯咖啡。</string>
-    <string name="give_back">回馈</string>
-    <string name="website_title">网站</string>
-    <string name="website_encouragement">访问 NewPipe 网站了解更多信息和新闻。</string>
-    <string name="privacy_policy_title">NewPipe 的隐私政策</string>
-    <string name="privacy_policy_encouragement">NewPipe 项目是非常重视您的隐私。因此，未经您的同意，该应用程序不会收集任何数据。
-\nNewPipe 的隐私政策详细说明了当您发送崩溃报告时，什么资料会被传送及储存。</string>
-    <string name="read_privacy_policy">阅读隐私政策</string>
-    <string name="app_license_title">NewPipe 的许可证</string>
-    <string name="app_license">NewPipe 是一个 Copyleft 的自由软件：您可以随意使用、研究、分享或改进它。在遵守由自由软件基金会所发布的 GNU 通用公共授权条款的状况下，您可以自由地再发布或修改它；授权条款预设使用第三版，但您也可以选择更新的版本。</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>
-    <string name="history_disabled">历史记录被关闭了</string>
-    <string name="action_history">历史记录</string>
-    <string name="history_empty">没有历史记录</string>
-    <string name="history_cleared">清除历史记录</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="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>
-    <string name="subscription_page_summary">订阅页面</string>
-    <string name="feed_page_summary">Feed 页面</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="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="import_settings">您是否要导入设定？</string>
-    <string name="kiosk">互动</string>
-    <string name="trending">趋势</string>
-    <string name="top_50">前 50</string>
-    <string name="new_and_hot">最新和热门</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>
-    <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="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="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
-\n2.当被询问时登入帐号
-\n3.应该开始下载（这是导出文件）</string>
-    <string name="import_soundcloud_instructions">通过输入 URL 或 ID 来导入 SoundCloud的配置文件：
-\n
-\n1.在浏览器中启用「桌面模式」（该网站不适用于移动设备）
-\n2.移至该网址：%1$s
-\n3.当被询问时登入帐号
-\n4.复制您重定向的配置文件到网址。</string>
-    <string name="import_soundcloud_instructions_hint">您的 ID，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>
-    <string name="unhook_checkbox">取消链接（可能会导致扭曲）</string>
-    <string name="skip_silence_checkbox">静音时快进</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="content_language_title">默认的内容语言</string>
-    <string name="settings_category_updates_title">升级</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">无法下载到外部SD卡。重置下载文件夹位置？</string>
-    <string name="restore_defaults">恢复默认</string>
-    <string name="restore_defaults_confirmation">您真的要恢复至默认吗？</string>
-    <string name="selection">选择</string>
-    <string name="updates_setting_title">升级</string>
-    <string name="list">列表</string>
-    <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="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_finished_warning">同名的已下载文件已经存在</string>
-    <string name="download_already_running">同名下载进行中</string>
-    <string name="show_error">显示错误</string>
-    <string name="label_code">代码</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_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>
-    <string name="events">事件</string>
-    <string name="saved_tabs_invalid_json">使用默认选项卡, 读取保存的选项卡时出错</string>
-    <string name="subscribers_count_not_available">订阅者计数不可用</string>
-    <string name="main_page_content_summary">主页上显示的选项卡</string>
-    <string name="conferences">会议</string>
-    <string name="updates_setting_description">显示通知, 以便在新版本可用时提示应用更新</string>
-    <string name="list_view_mode">列表视图模式</string>
-    <string name="grid">网格</string>
-    <string name="switch_view">切换视图</string>
-    <string name="app_update_notification_content_title">NewPipe 更新可用!</string>
-    <string name="error_path_creation">无法创建目标文件夹</string>
-    <string name="error_http_unsupported_range">服务器不接受多线程下载, 请使用 @string/msg_threads = 1重试</string>
-    <string name="pause_downloads_on_mobile_desc">切换至移动数据时有用，尽管一些下载无法被暂停</string>
-    <string name="show_comments_title">显示评论</string>
-    <string name="show_comments_summary">禁用停止显示评论</string>
-    <string name="autoplay_title">自动播放</string>
-    <plurals name="comments">
-        <item quantity="one">评论</item>
-        <item quantity="other"/>
-    </plurals>
-    <string name="no_comments">没有评论</string>
-    <string name="error_unable_to_load_comments">无法加载评论</string>
-    <string name="close">关闭</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="watch_history_states_deleted">播放位置已删除。</string>
-    <string name="missing_file">文件被移动或删除</string>
-    <string name="overwrite_unrelated_warning">已存在具有此名称的文件</string>
-    <string name="overwrite_failed">无法覆盖该文件</string>
-    <string name="download_already_pending">同名文件正在等待下载</string>
-    <string name="error_postprocessing_stopped">处理此文件时 NewPipe 已关闭</string>
-    <string name="error_insufficient_storage">设备上没有剩余空间</string>
-    <string name="error_progress_lost">进度丢失，因为文件已被删除</string>
-    <string name="error_timeout">连接超时</string>
-    <string name="confirm_prompt">你确定吗？</string>
-    <string name="enable_queue_limit">限制下载队列</string>
-    <string name="enable_queue_limit_desc">同时只有一个下载进行</string>
-    <string name="start_downloads">开始全部下载</string>
-    <string name="pause_downloads">暂停全部下载</string>
-    <string name="downloads_storage_ask_title">询问下载位置</string>
-    <string name="downloads_storage_ask_summary">每次下载将询问保存的位置</string>
-    <string name="downloads_storage_ask_summary_kitkat">每次下载将询问保存的位置.
-\n如果要下载到外部SD卡，请选择外部存储访问框架</string>
-    <string name="downloads_storage_use_saf_title">使用存储访问框架</string>
-    <string name="downloads_storage_use_saf_summary">存储访问框架(SAF)允许下载文件到外部SD卡。
-\n注：一些设备不兼容SAF</string>
-    <string name="clear_playback_states_title">删除回放位置</string>
-    <string name="clear_playback_states_summary">删除所有回放位置</string>
-    <string name="delete_playback_states_alert">删除所有的回放位置吗？</string>
-    <string name="download_choose_new_path">更改要生效的下载文件夹</string>
-</resources>
\ No newline at end of file

From 9309159c387662242f8083ea0545200b8fb8cffa Mon Sep 17 00:00:00 2001
From: chr_56 <chr0056@gmail.com>
Date: Sat, 14 Dec 2019 21:25:19 +0800
Subject: [PATCH 002/199] copy file in /values-b+zh+HANS+CN to /values-zh-rCN
 ,in order to manually update the lang file.

---
 app/src/main/res/values-zh-rCN/strings.xml | 845 +++++++++++----------
 1 file changed, 453 insertions(+), 392 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9aa4b9245..8714c6aca 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,457 +1,518 @@
-<?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>
-    <string name="no_player_found">找不到播放器。您是否要安装 VLC？</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="open_in_browser">在浏览器中打开</string>
+    <string name="open_in_popup_mode">在悬浮窗模式下打开</string>
+    <string name="did_you_mean">您是不是要找：%1$s？</string>
+    <string name="no_player_found_toast">找不到串流播放器 （您可以安裝并使用VLC播放）。</string>
+    <string name="controls_download_desc">下载串流文件</string>
     <string name="install">安装</string>
     <string name="cancel">取消</string>
-    <string name="open_in_browser">用浏览器打开</string>
     <string name="share">分享</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="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_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，您要安装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_path_title">视频下载文件夹</string>
+    <string name="download_path_summary">已下载的视频存储在这里</string>
+    <string name="download_path_dialog_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">使用Kodi播放</string>
     <string name="theme_title">主题</string>
-    <string name="dark_theme_title">灰暗</string>
-    <string name="light_theme_title">明亮</string>
-
+    <string name="light_theme_title">浅色</string>
+    <string name="dark_theme_title">暗黑</string>
+    <string name="black_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="url_not_supported_toast">不支援此网址</string>
-    <string name="content_language_title">默认内容语言</string>
-    <string name="settings_category_video_audio_title">视频和音频</string>
+    <string name="next_video_title">下一个</string>
+    <string name="url_not_supported_toast">不支持的 URL</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="all">全部</string>
+    <string name="channel">频道</string>
+    <string name="yes">是</string>
+    <string name="later">稍后</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>
+    <plurals name="videos">
+        <item quantity="one">视频</item>
+        <item quantity="other"></item>
+    </plurals>
+    <string name="disabled">禁用</string>
+    <string name="controls_background_title">背景</string>
+    <string name="filter">过滤器</string>
+    <string name="refresh">刷新</string>
+    <string name="show_search_suggestions_title">搜索建议</string>
+    <string name="subscribe_button_title">订阅</string>
+    <string name="subscribed_button_title">已订阅</string>
+    <string name="enable_watch_history_title">观看历史</string>
+    <string name="settings_category_player_title">播放器</string>
+    <string name="settings_category_history_title">历史记录与缓存</string>
+    <string name="playlist">播放列表</string>
+    <string name="undo">撤销</string>
+    <string name="play_all">全部播放</string>
+    <string name="always">总是</string>
+    <string name="just_once">仅一次</string>
+    <string name="controls_add_to_playlist_title">添加至</string>
+    <string name="file">文件</string>
+    <string name="download_thumbnail_title">加载缩略图</string>
+    <string name="clear_views_history_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="channels">频道</string>
+    <string name="playlists">播放列表</string>
+    <string name="unsubscribe">取消订阅</string>
+    <string name="tab_new">新标签</string>
+    <string name="settings_category_updates_title">更新</string>
+    <string name="file_deleted">文件已删除</string>
+    <string name="subscribers_count_not_available">无法得知订阅人数</string>
+    <string name="updates_setting_description">每推出新版本时，弹出应用升级通知</string>
+    <string name="grid">网格</string>
+    <string name="app_update_notification_content_title">新版 NewPipe 已可升级！</string>
+    <string name="error_http_unsupported_range">服务器不接受 接收 multi-threaded 下载, 以 @string/msg_threads = 1 重试</string>
+    <string name="autoplay_title">自动播放</string>
+    <string name="settings_category_clear_data_title">清除数据</string>
+    <string name="watch_history_deleted">观看记录已删除</string>
     <string name="detail_likes_img_view_description">喜欢</string>
     <string name="detail_dislikes_img_view_description">不喜欢</string>
-    <string name="use_tor_title">使用 Tor</string>
-    <string name="use_tor_summary">（实验性）强制下载流量使用 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="err_dir_create">未能建立下载路径 “%1$s”</string>
-    <string name="info_dir_created">已创建下载目录 “%1$s”</string>
-    <string name="content">内容</string>
-    <string name="show_age_restricted_content_title">显示年龄限制内容</string>
-    <string name="video_is_age_restricted">视频有年龄限制。请先在设置中启用\"显示年龄限制内容\"。</string>
-    <string name="general_error">错误</string>
-    <string name="could_not_load_thumbnails">无法加载所有缩略图</string>
-    <string name="youtube_signature_decryption_error">无法解密视频网址签名</string>
-    <string name="parsing_error">无法解析网站</string>
-    <string name="light_parsing_error">无法完全解析网站</string>
-    <string name="content_not_available">内容不可用</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="sorry_string">抱歉，这本不应该发生。</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="your_comment">您的注释（英文）：</string>
-    <string name="error_details_headline">详细信息：</string>
-
-
+    <string name="use_tor_title">使用Tor</string>
+    <string name="use_tor_summary">（实验性）通过 Tor 强制下载流量以增强隐私（暂不支持串流视频）。</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="autoplay_by_calling_app_title">自动播放</string>
-    <string name="autoplay_by_calling_app_summary">当NewPipe被其他应用调用时，自动播放视频</string>
-    <string name="duration_live">直播</string>
-
-    <string name="main_bg_subtitle">点击搜索开始NewPipe</string>
+    <string name="storage_permission_denied">存储访问权限已被拒绝</string>
+    <plurals name="views">
+        <item quantity="one">%1$s 次观看</item>
+        <item quantity="other"/>
+    </plurals>
+    <string name="short_thousand">千</string>
+    <string name="short_million">百万</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>
-    <string name="msg_error">错误</string>
-    <string name="msg_server_unsupported">服务器不支持</string>
-    <string name="msg_exists">文件已经存在</string>
-    <string name="msg_url_malform">网址不正确或网络不可用</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="checksum">校验</string>
     <string name="add">新任务</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服务：\\nGMT时间：\\n包：\\n版本：\\n操作系统版本：</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA 验证</string>
-
-    <string name="recaptcha_request_toast">需要 reCAPTCHA 验证</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="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="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>
-    <string name="default_video_format_title">首选视频格式</string>
-    <string name="black_theme_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="settings_category_popup_title">窗口模式</string>
-    <string name="popup_playing_toast">以窗口模式播放</string>
-    <string name="all">所有</string>
-    <string name="channel">频道</string>
-    <string name="yes">是的</string>
-    <string name="later">稍后</string>
-    <string name="disabled">已禁用</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="notification_channel_name">NewPipe 通知</string>
-    <string name="notification_channel_description">NewPipe 后台播放和窗口播放器的通知</string>
-
-    <string name="short_thousand">K</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
-
-    <string name="msg_popup_permission">该项权限用于
-\n以窗口模式打开</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="finish">OK</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_running_detail">点击了解详情</string>
+    <string name="msg_wait">请稍候…</string>
+    <string name="msg_copied">复制至剪贴板</string>
+    <string name="reCaptchaActivity">reCAPTCHA验证码</string>
+    <string name="controls_popup_title">悬浮窗播放</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="copyright" formatted="true">© %1$s by %2$s under %3$s</string>
-    <string name="error_unable_to_load_license">无法加载许可</string>
+    <string name="copyright" formatted="true">© %1$s :作者 %2$s (使用 %3$s )</string>
+    <string name="error_unable_to_load_license">无法加载许可证</string>
     <string name="action_open_website">打开网站</string>
     <string name="tab_about">关于</string>
     <string name="tab_contributors">贡献者</string>
-    <string name="tab_licenses">许可</string>
-    <string name="app_description">开源的轻量级流媒体Android客户端。</string>
-    <string name="view_on_github">在 GitHub 上查看</string>
-    <string name="app_license_title">NewPipe 许可</string>
-    <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>
-    <string name="history_disabled">历史记录已禁用</string>
-    <string name="action_history">历史记录</string>
-    <string name="history_empty">没有历史记录</string>
-    <string name="history_cleared">历史记录已清除</string>
-
-<string name="settings_category_player_title">播放器</string>
-    <string name="settings_category_player_behavior_title">行为</string>
-    <string name="settings_category_history_title">历史记录 &amp; 缓存</string>
-    <string name="background_player_append">在后台播放器上排队</string>
-    <string name="popup_playing_append">在弹出播放器上排队</string>
-    <string name="playlist">播放列表</string>
-    <string name="undo">撤销</string>
-    <string name="play_all">全部播放</string>
-
-    <string name="unknown_content">[未知]</string>
-
-    <string name="player_stream_failure">无法播放此流媒体</string>
-    <string name="player_unrecoverable_failure">发生无法解决的播放器错误</string>
+    <string name="tab_licenses">许可证</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="charset_letters_and_digits">字母和数字</string>
+    <string name="charset_most_special_characters">最特殊字符</string>
     <string name="search_no_results">没有结果</string>
-    <string name="empty_subscription_feed_subtitle">空空如也</string>
-
-    <string name="no_subscribers">无订阅者</string>
+    <string name="no_subscribers">没有订阅者</string>
     <plurals name="subscribers">
-	<item quantity="other">%s 位订阅者</item>
-</plurals>
-
-    <string name="no_views">无观看次数</string>
-    <plurals name="views">
-	<item quantity="other">%s 次观看</item>
-</plurals>
-
+        <item quantity="one">%s个订阅者</item>
+        <item quantity="other"/>
+    </plurals>
     <string name="no_videos">没有视频</string>
-    <plurals name="videos">
-	<item quantity="other">%s 部视频</item>
-</plurals>
-
-    <string name="item_deleted">项目已删除</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="download_thumbnail_title">加载缩略图</string>
-    <string name="download_thumbnail_summary">停用后，NewPipe將不再加载缩略图，减少数据使用和腾空存储空间，亦会清除内存和内存卡上的缩略图缓存</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="auto_queue_summary">当播放完非循环列表中的最后一个视频时，自动加入一个相关视频到播放列表</string>
-    <string name="show_hold_to_append_title">显示\"长按添加\"提示</string>
-    <string name="show_hold_to_append_summary">当视频详情页中的背景或悬浮按钮被按下的时候显示提示</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="file">文件</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>
-    <string name="export_data_summary">导出历史记录，订阅和播放列表</string>
-    <string name="player_recoverable_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="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="no_streams_available_download">无视频媒体可以下载</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>
+    <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 是一群志愿者花费业余时间开发的，目的是为您带来最佳体验。你的一点心意，可以让开发者们在享受一杯 Java 的咖啡的同时让 NewPipe 变得更好用。</string>
-    <string name="give_back">捐赠</string>
-    <string name="website_title">网页</string>
-    <string name="website_encouragement">访问 NewPipe 网站以获取更多的信息和新闻。</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="rename">重 命名</string>
+    <string name="toast_no_player">未安装用于播放此文件的应用程序</string>
+    <string name="one_item_deleted">已删除1个项目。</string>
+    <string name="main_page_content_summary">哪些标签需要在主页上展示</string>
+    <string name="list_view_mode">列表视图模式</string>
+    <string name="missions_header_finished">已完成</string>
+    <string name="missions_header_pending">等待中…</string>
+    <string name="paused">已暂停</string>
+    <string name="queued">排队中</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="no_comments">没有评论</string>
+    <string name="drawer_header_description">切换服务，当前选择：</string>
+    <string name="no_player_found">找不到串流播放器。您想安装 VLC 吗？</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_audio_title">音频下载文件夹</string>
+    <string name="autoplay_by_calling_app_summary">从其他应用打开 NewPipe 时就播放视频</string>
+    <string name="default_resolution_title">默认分辨率</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_audio">音频</string>
+    <string name="default_audio_format_title">默认音频格式</string>
+    <string name="show_next_and_similar_title">显示“下一个”和“类似的”视频</string>
+    <string name="settings_category_video_audio_title">视频和音频</string>
+    <string name="background_player_playing_toast">在后台播放</string>
+    <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="duration_live">直播</string>
+    <string name="downloads">下载</string>
+    <string name="downloads_title">下载</string>
+    <string name="error_report_title">错误报告</string>
+    <string name="general_error">错误</string>
+    <string name="could_not_load_thumbnails">无法加载所有缩略图</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="could_not_setup_download_menu">无法设置下载菜单</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">App UI 崩溃</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="what_device_headline">信息：</string>
+    <string name="what_happened_headline">发生了什么：</string>
+    <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="list_thumbnail_view_description">视频预览缩略图</string>
+    <string name="detail_thumbnail_view_description">播放视频，时长：</string>
+    <string name="detail_uploader_thumbnail_view_description">视频上传者的头像缩略图</string>
+    <string name="short_billion">字节</string>
+    <string name="msg_url_malform">错误的 URL 或未联网</string>
+    <string name="msg_running">NewPipe下载中</string>
+    <string name="no_available_dir">请稍后在设置中设定下载目录</string>
+    <string name="msg_popup_permission">用悬浮窗模式
+\n需要此权限</string>
+    <string name="reCaptcha_title">reCAPTCHA验证</string>
+    <string name="recaptcha_request_toast">请求的新的CAPTCHA验证</string>
+    <string name="popup_mode_share_menu_title">NewPipe悬浮窗模式</string>
+    <string name="popup_playing_toast">在悬浮窗中播放</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="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_summary">显示搜索建议</string>
+    <string name="best_resolution">最佳分辨率</string>
+    <string name="app_description">开源小巧的Android媒体播放器。</string>
+    <string name="view_on_github">在GitHub上查看</string>
+    <string name="app_license_title">NewPipe开源许可证</string>
+    <string name="contribution_encouragement">你是否有想:翻译、设计、清理或重型代码更改 ——我们始终欢迎你来贡献！</string>
+    <string name="read_full_license">阅读许可证</string>
+    <string name="contribution_title">贡献</string>
+    <string name="settings_file_replacement_character_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="resume_on_audio_focus_gain_title">恢复前台焦点</string>
+    <string name="resume_on_audio_focus_gain_summary">中断后继续播放（例如突然来电后）</string>
+    <string name="enable_search_history_title">搜索历史记录</string>
+    <string name="enable_search_history_summary">在本地存储搜索查询记录</string>
+    <string name="enable_watch_history_summary">记录已观看视频</string>
+    <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="action_history">历史</string>
+    <string name="history_empty">历史记录为空</string>
+    <string name="history_cleared">清除历史记录</string>
+    <string name="notification_channel_name">NewPipe 通知</string>
+    <string name="notification_channel_description">NewPipe 后台播放和悬浮窗播放的通知</string>
+    <string name="default_video_format_title">默认视频格式</string>
+    <string name="settings_category_player_behavior_title">行为</string>
+    <string name="empty_subscription_feed_subtitle">空空如也...</string>
+    <string name="no_views">0次观看</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">Kiosk 页</string>
+    <string name="kiosk_page_summary">『时下流行』页-自定义</string>
     <string name="subscription_page_summary">订阅页</string>
-    <string name="feed_page_summary">Feed 页</string>
+    <string name="feed_page_summary">Feed 页面</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="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="kiosk">Kiosk</string>
-    <string name="trending">流行的</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>
-    <string name="new_and_hot">最新 &amp; 最热</string>
-    <string name="title_activity_background_player">后台播放器</string>
+    <string name="new_and_hot">最新与热门</string>
+    <string name="show_hold_to_append_title">显示 \"长按添加\" 说明</string>
+    <string name="show_hold_to_append_summary">在视频详情页中，按下背景播放或悬浮窗播放按钮时显示提示</string>
+    <string name="background_player_append">已加入后台播放播放列表</string>
+    <string name="popup_playing_append">已加入悬浮窗播放列表</string>
+    <string name="player_stream_failure">无法播放此串流</string>
+    <string name="player_unrecoverable_failure">发生无法恢复播放器错误</string>
+    <string name="player_recoverable_failure">恢复播放器错误</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>
     <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="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="hold_to_append">长按队列</string>
+    <string name="unknown_content">[未知]</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="donation_title">捐赠</string>
+    <string name="donation_encouragement">NewPipe 是由志愿者花费时间为您带来最佳体验开发的。回馈帮助开发人员在享用一杯咖啡的同时，让 NewPipe 变得更好。</string>
+    <string name="give_back">回馈</string>
+    <string name="website_title">网站</string>
+    <string name="website_encouragement">请访问 NewPipe 网站了解更多信息和讯息。</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="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="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="preferred_player_fetcher_notification_title">正在获取信息…</string>
+    <string name="preferred_player_fetcher_notification_message">正在加载请求的内容</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="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="show_info">显示信息</string>
+    <string name="tab_bookmarks">已收藏</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="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="resize_zoom">缩放</string>
+    <string name="drawer_header_action_paceholder_text">敬请等待</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">处理完无法送达的、发生在Fragment或activity生命周期之外的Rx异常后强制报告</string>
-
+    <string name="enable_leak_canary_title">启用LeakCanary</string>
+    <string name="enable_leak_canary_summary">『内存泄漏监视』可能导致应用在『核心转储』时无响应</string>
+    <string name="enable_disposed_exceptions_title">报告『提前结束Android生命周期』错误</string>
+    <string name="enable_disposed_exceptions_summary">强制报告处理后的未送达的Activity或Fragment生命周期之外的Rx异常</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="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_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="previous_export">以前的导出</string>
     <string name="subscriptions_import_unsuccessful">无法导入订阅</string>
     <string name="subscriptions_export_unsuccessful">无法导出订阅</string>
-
-    <string name="import_youtube_instructions">通过下载导出文件导入 YouTube 订阅： 
-\n1. 在浏览器打开URL：%1$s 
-\n2. 登录账户 
-\n3. 下载应该会马上开始（这个就是导出文件）</string>
-    <string name="import_soundcloud_instructions">通过输入URL或您的ID导入SoundCloud配置： 
-\n1. 在浏览器中开启\"桌面模式\"（该网站不适用于移动设备）
-\n2. 打开URL：%1$s 
-\n3. 登录账号
-\n3. 复制重定向后的URL。</string>
-    <string name="import_soundcloud_instructions_hint">你的ID 或 soundcloud.com/你的ID</string>
-
-    <string name="import_network_expensive_warning">请注意该操作可能消耗大量网络流量。 
-\n您希望继续吗？</string>
-
+    <string name="import_youtube_instructions">通过下载导出文件来导入 YouTube 订阅：
+\n
+\n1. 转到此网站： %1$s
+\n2. 登录（如果需要）
+\n3. 应该立即开始下载（即导出文件）</string>
+    <string name="import_soundcloud_instructions">通过键入网址或你的 ID 导入 SoundCloud 配置文件：
+\n
+\n1. 在浏览器中启用\"电脑模式\"（该网站不适用于移动设备）
+\n2. 转到此 URL： %1$s
+\n3. 登录（如果需要）
+\n4. 复制重定向的配置文件下载地址。</string>
+    <string name="import_soundcloud_instructions_hint">你的 ID：soundcloud.com/［你的ID］</string>
+    <string name="import_network_expensive_warning">该操作消耗大量流量，
+\n你想继续吗？</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_tempo">速度</string>
+    <string name="playback_tempo">节奏</string>
     <string name="playback_pitch">音调</string>
-    <string name="unhook_checkbox">Unhook（可能导致失真）</string>
-    <string name="playback_default">默认</string>
-<string name="toast_no_player">未安装能播放此文件的应用</string>
-
+    <string name="unhook_checkbox">解除关联（可能导致失真）</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="clear_views_history_title">清除观看记录</string>
-    <string name="clear_views_history_summary">删除视频观看记录</string>
-    <string name="delete_view_history_alert">删除全部观看记录。</string>
-    <string name="watch_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">已删除1项。</string>
-
-    <string name="privacy_policy_title">NewPipe的隐私策略</string>
-    <string name="privacy_policy_encouragement">NewPipe 项目非常重视您的隐私。因此, 未经您的同意，应用程序不会收集任何您的数据。 NewPipe 的隐私策略详细解释了您在发送崩溃报告时会发送和存储的哪些数据。</string>
-    <string name="read_privacy_policy">阅读隐私策略</string>
-    <string name="app_license">NewPipe 是 copyleft 的自由软件: 你可以按照自己的意愿使用、学习、分享和改进它。具体地说, 您可以根据自由软件基金会发布的 GNU 通用公共许可证的条款（第3版或者任何更高版本）, 重新发布和/或修改本软件。</string>
-    <string name="import_settings">您是否希望同时导入设置？</string>
-
-    <string name="start_accept_privacy_policy">为了遵守欧洲通用数据保护条例（GDPR），我们提醒您注意NewPipe的隐私政策。 请仔细阅读。
+    <string name="caption_setting_description">修改播放器字幕比例和背景样式。需要重新启动应用程序才能生效。</string>
+    <string name="clear_views_history_summary">删除串流的播放历史和播放位置</string>
+    <string name="delete_view_history_alert">删除全部观看记录？</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="app_license">NewPipe 是版权自由软件：您可以随时使用、研究共享和改进它。您可以根据自由软件基金会发布的 GNU 通用公共许可证GPLv3或（由您选择的）任何更高版本的许可证重新分发或修改该许可证。</string>
+    <string name="import_settings">是否要同时导入设置？</string>
+    <string name="privacy_policy_title">NewPipe的隐私政策</string>
+    <string name="privacy_policy_encouragement">NewPipe 项目非常重视您的隐私。因此，未经您的同意，应用程序不会收集任何数据。
+\nNewPipe 的隐私政策详细解释了在发送崩溃报告时发送和存储的数据。</string>
+    <string name="read_privacy_policy">阅读隐私政策</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_data_usage_none_description">无限制</string>
     <string name="limit_mobile_data_usage_title">使用移动数据时限制分辨率</string>
-    <string name="channels">更多频道</string>
-    <string name="playlists">更多频道</string>
-    <string name="users">用户们</string>
-    </resources>
+    <string name="minimize_on_exit_title">切换应用时最小化</string>
+    <string name="minimize_on_exit_summary">从主播放器切换到其他应用时的操作 - %s</string>
+    <string name="skip_silence_checkbox">静音时快进</string>
+    <string name="playback_step">滑块[比例尺]</string>
+    <string name="playback_reset">重 置</string>
+    <string name="tracks">曲目</string>
+    <string name="users">用户</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="content_language_title">视频默认语言</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">无法下载到外部 SD 卡。重置下载文件夹位置？</string>
+    <string name="saved_tabs_invalid_json">读取已保存标签时发生错误，因此使用者默认标签</string>
+    <string name="restore_defaults">恢复默认</string>
+    <string name="restore_defaults_confirmation">是否恢复默认值？</string>
+    <string name="selection">选择</string>
+    <string name="updates_setting_title">更新</string>
+    <string name="list">列表</string>
+    <string name="auto">自动</string>
+    <string name="switch_view">切换视图</string>
+    <string name="app_update_notification_content_text">点击下载</string>
+    <string name="post_processing">后期处理</string>
+    <string name="generate_unique_name">生成唯一名称</string>
+    <string name="overwrite">覆盖</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_not_found">找不到 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>
+    <string name="pause_downloads_on_mobile_desc">切换至移动数据时可能有用，尽管一些下载无法被暂停</string>
+    <string name="events">事件</string>
+    <string name="conferences">近期大会</string>
+    <string name="show_comments_title">显示评论</string>
+    <string name="show_comments_summary">禁用，以停止显示评论</string>
+    <plurals name="comments">
+        <item quantity="one">评论</item>
+        <item quantity="other"/>
+    </plurals>
+    <string name="error_unable_to_load_comments">无法加载评论</string>
+    <string name="close">关闭</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="watch_history_states_deleted">已删除播放位置记录。</string>
+    <string name="missing_file">文件被已移动或删除</string>
+    <string name="overwrite_unrelated_warning">该名称的文件已经存在</string>
+    <string name="overwrite_finished_warning">命名冲突，已存在具有此名称文件</string>
+    <string name="overwrite_failed">无法覆盖文件</string>
+    <string name="download_already_pending">有此名称的已暂停下载</string>
+    <string name="error_postprocessing_stopped">处理文件时，NewPipe 已关闭</string>
+    <string name="error_insufficient_storage">设备上没有剩余储存空间</string>
+    <string name="error_progress_lost">进度丢失，文件已被删除</string>
+    <string name="error_timeout">连接超时</string>
+    <string name="confirm_prompt">你确定吗？</string>
+    <string name="enable_queue_limit">最大下载队列</string>
+    <string name="enable_queue_limit_desc">同时只允许一个下载进行</string>
+    <string name="start_downloads">开始下载</string>
+    <string name="pause_downloads">暂停下载</string>
+    <string name="downloads_storage_ask_title">询问下载位置</string>
+    <string name="downloads_storage_ask_summary">系统将询问您将每次下载的保存位置</string>
+    <string name="downloads_storage_ask_summary_kitkat">系统将询问您将每次下载的保存位置。
+\n（如果要下载到外部 SD 卡，请选择 SAF）</string>
+    <string name="downloads_storage_use_saf_title">使用 SAF</string>
+    <string name="downloads_storage_use_saf_summary">存储访问框架(SAF)允许下载文件到外部SD卡。
+\n注：一些设备不兼容SAF</string>
+    <string name="clear_playback_states_title">删除播放位置记录</string>
+    <string name="clear_playback_states_summary">删除所有播放位置记录</string>
+    <string name="delete_playback_states_alert">删除所有播放位置记录？</string>
+    <string name="download_choose_new_path">更改下载目录让内容生效</string>
+    <string name="default_kiosk_page_summary">『时下流行』页-默认</string>
+    <string name="no_one_watching">无人在线观看</string>
+    <plurals name="watching">
+        <item quantity="one">%s 人在观看</item>
+        <item quantity="other"></item>
+    </plurals>
+    <string name="no_one_listening">没人在听</string>
+    <plurals name="listening">
+        <item quantity="one">％s个听众</item>
+        <item quantity="other"/>
+    </plurals>
+    <string name="localization_changes_requires_app_restart">重新启动应用后，语言将更改。</string>
+</resources>
\ No newline at end of file

From dea1e0dcb9652dbaddcd1f1de68d8a5d340426a2 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 4 Jan 2020 21:38:27 +0100
Subject: [PATCH 003/199] Update localizations settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1) now, on « content language » change, it will also change the app language
2) added Esperanto to the list of language in content language
---
 app/src/main/java/org/schabi/newpipe/MainActivity.java |  5 +++++
 .../java/org/schabi/newpipe/util/Localization.java     | 10 ++++++++++
 app/src/main/res/values/settings_keys.xml              |  2 ++
 3 files changed, 17 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 90d299c7f..cac814085 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -67,6 +67,7 @@ import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.KioskTranslator;
+import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PeertubeHelper;
 import org.schabi.newpipe.util.PermissionHelper;
@@ -78,6 +79,8 @@ import org.schabi.newpipe.util.ThemeHelper;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
@@ -116,6 +119,8 @@ public class MainActivity extends AppCompatActivity {
 
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
+        changeAppLanguage(Localization.getPreferredLocale(getApplicationContext()), getResources());
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index 9274df848..6b0b4cd0c 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -2,8 +2,11 @@ package org.schabi.newpipe.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 
 import org.ocpsoft.prettytime.PrettyTime;
 import org.ocpsoft.prettytime.units.Decade;
@@ -216,4 +219,11 @@ public class Localization {
     public static String relativeTime(Calendar calendarTime) {
         return getPrettyTime().formatUnrounded(calendarTime);
     }
+
+    public static void changeAppLanguage(Locale loc, Resources res) {
+        DisplayMetrics dm = res.getDisplayMetrics();
+        Configuration conf = res.getConfiguration();
+        conf.setLocale(loc);
+        res.updateConfiguration(conf, dm);
+    }
 }
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 6aaaa0630..3f361226d 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -272,6 +272,7 @@
         <item>cs</item>
         <item>da</item>
         <item>de</item>
+        <item>eo</item>
         <item>et</item>
         <item>en-GB</item>
         <item>en</item>
@@ -351,6 +352,7 @@
         <item>Čeština</item>
         <item>Dansk</item>
         <item>Deutsch</item>
+        <item>Esperanto</item>
         <item>Eesti</item>
         <item>English (UK)</item>
         <item>English (US)</item>

From 694013c9df5c4ace38ca4a825b38e9db9c3b487b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 8 Jan 2020 21:55:17 +0100
Subject: [PATCH 004/199] Spelling: Language reworked 2

---
 app/src/main/res/values/strings.xml | 74 ++++++++++++++---------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 54ae40d1d..0b20edd7d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name" translatable="false">NewPipe</string>
-    <string name="main_bg_subtitle">Tap search to get started</string>
+    <string name="main_bg_subtitle">Tap \"Search\" to get started</string>
     <string name="view_count_text">%1$s views</string>
     <string name="upload_date_text">Published on %1$s</string>
-    <string name="no_player_found">No stream player found. Do you want to install VLC?</string>
+    <string name="no_player_found">No stream player found. Install VLC?</string>
     <string name="no_player_found_toast">No stream player found (you can install VLC to play it).</string>
     <string name="install">Install</string>
     <string name="cancel">Cancel</string>
@@ -16,14 +16,14 @@
     <string name="controls_download_desc">Download stream file</string>
     <string name="search">Search</string>
     <string name="settings">Settings</string>
-    <string name="did_you_mean">Did you mean: %1$s\?</string>
+    <string name="did_you_mean">Did you mean: %1$s?</string>
     <string name="share_dialog_title">Share with</string>
     <string name="choose_browser">Choose browser</string>
     <string name="screen_rotation">rotation</string>
     <string name="use_external_video_player_title">Use external video player</string>
-    <string name="use_external_video_player_summary">Removes audio at SOME resolutions</string>
+    <string name="use_external_video_player_summary">Removes audio at some resolutions</string>
     <string name="use_external_audio_player_title">Use external audio player</string>
-    <string name="popup_mode_share_menu_title">NewPipe popup mode</string>
+    <string name="popup_mode_share_menu_title">Popup mode</string>
     <string name="rss_button_title" translatable="false">RSS</string>
     <string name="subscribe_button_title">Subscribe</string>
     <string name="subscribed_button_title">Subscribed</string>
@@ -43,24 +43,24 @@
     <string name="controls_add_to_playlist_title">Add To</string>
     <string name="download_path_title">Video download folder</string>
     <string name="download_path_summary">Downloaded video files are stored here</string>
-    <string name="download_path_dialog_title">Choose the download folder for video files</string>
+    <string name="download_path_dialog_title">Choose download folder for video files</string>
     <string name="download_path_audio_title">Audio download folder</string>
     <string name="download_path_audio_summary">Downloaded audio files are stored here</string>
-    <string name="download_path_audio_dialog_title">Choose the download folder for audio files</string>
+    <string name="download_path_audio_dialog_title">Choose download folder for audio files</string>
     <string name="download_choose_new_path">Change the download folders to take effect</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>
     <string name="default_popup_resolution_title">Default popup resolution</string>
     <string name="show_higher_resolutions_title">Show higher resolutions</string>
-    <string name="show_higher_resolutions_summary">Only some devices support playing 2K/4K videos</string>
+    <string name="show_higher_resolutions_summary">Only some devices can play 2K/4K videos</string>
     <string name="play_with_kodi_title">Play with Kodi</string>
-    <string name="kore_not_found">Kore app not found. Install it?</string>
+    <string name="kore_not_found">Install missing Kore app?</string>
     <string name="kore_package" translatable="false">org.xbmc.kore</string>
     <string name="show_play_with_kodi_title">Show \"Play with Kodi\" option</string>
-    <string name="enable_lock_screen_video_thumbnail_title">Enable lock screen video thumbnail</string>
-    <string name="show_play_with_kodi_summary">Display an option to play a video via Kodi media center</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">When using the background player a video thumbnail will be displayed on the lock screen</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Lock screen video thumbnail</string>
+    <string name="show_play_with_kodi_summary">Displayed option to play a video via Kodi media center</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Using the background player displays a video thumbnail on the lock screen</string>
     <string name="play_audio">Audio</string>
     <string name="default_audio_format_title">Default audio format</string>
     <string name="default_video_format_title">Default video format</string>
@@ -75,20 +75,20 @@
     <string name="seek_duration_title">Fast-forward/-rewind seek duration</string>
     <string name="download_thumbnail_title">Load thumbnails</string>
     <string name="show_comments_title">Show comments</string>
-    <string name="show_comments_summary">Disable to stop showing comments</string>
+    <string name="show_comments_summary">Turn off to hide comments</string>
     <string name="download_thumbnail_summary">Turn off to prevent loading thumbnails, saving data and memory usage. Changes clear both in-memory and on-disk image cache.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Image cache wiped</string>
     <string name="metadata_cache_wipe_title">Wipe cached metadata</string>
     <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 (to non-repeating queue) after last file</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="volume_gesture_control_summary">Use gestures to control player volume</string>
     <string name="brightness_gesture_control_title">Brightness gesture control</string>
-    <string name="brightness_gesture_control_summary">Use gestures to control the brightness of the player</string>
+    <string name="brightness_gesture_control_summary">Use gestures to control player brightness</string>
     <string name="player_gesture_controls_title">Player gesture controls</string>
-    <string name="player_gesture_controls_summary">Use gestures to control the brightness and volume of the player</string>
+    <string name="player_gesture_controls_summary">Use gestures to control player brightness and volume</string>
     <string name="show_search_suggestions_title">Search suggestions</string>
     <string name="show_search_suggestions_summary">Show suggestions when searching</string>
     <string name="enable_search_history_title">Search history</string>
@@ -100,21 +100,21 @@
     <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>
-    <string name="resume_on_audio_focus_gain_summary">Continue playing after interruptions (e.g. phone calls)</string>
+    <string name="resume_on_audio_focus_gain_title">Resumed playing</string>
+    <string name="resume_on_audio_focus_gain_summary">Continue playing after interruptions (e.g. phonecalls)</string>
     <string name="download_dialog_title">Download</string>
     <string name="next_video_title">Next</string>
     <string name="autoplay_title">Autoplay</string>
     <string name="show_next_and_similar_title">Show \'Next\' and \'Similar\' videos</string>
     <string name="show_hold_to_append_title">Show \"Hold to append\" tip</string>
-    <string name="show_hold_to_append_summary">Show tip when background or popup button is pressed on video details page</string>
+    <string name="show_hold_to_append_summary">Show tip when pressing the background or the popup button in video \"Details:\"</string>
     <string name="url_not_supported_toast">Unsupported URL</string>
     <string name="default_content_country_title">Default content country</string>
     <string name="service_title">Service</string>
     <string name="content_language_title">Default content language</string>
     <string name="peertube_instance_url_title">PeerTube instances</string>
     <string name="peertube_instance_url_summary">Select your favorite PeerTube instances</string>
-    <string name="peertube_instance_url_help">Find the instances that best suit you on %s</string>
+    <string name="peertube_instance_url_help">Find the instances you like on %s</string>
     <string name="peertube_instance_list_url" translatable="false">https://joinpeertube.org/instances#instances-list</string>
     <string name="peertube_instance_add_title">Add instance</string>
     <string name="peertube_instance_add_help">Enter instance URL</string>
@@ -138,9 +138,9 @@
     <string name="play_btn_text">Play</string>
     <string name="content">Content</string>
     <string name="show_age_restricted_content_title">Age restricted content</string>
-    <string name="video_is_age_restricted">Show age restricted video. Allowing such material is possible from Settings.</string>
-    <string name="duration_live">LIVE</string>
-    <string name="duration_live_button" translatable="false">LIVE</string>
+    <string name="video_is_age_restricted">Show age restricted video. Future changes are possible from \"Settings\".</string>
+    <string name="duration_live">Live</string>
+    <string name="duration_live_button" translatable="false">Live</string>
     <string name="downloads">Downloads</string>
     <string name="downloads_title">Downloads</string>
     <string name="error_report_title">Error report</string>
@@ -198,7 +198,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 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>
@@ -224,15 +224,15 @@
     <string name="file_name_empty_error">Filename cannot be empty</string>
     <string name="error_occurred_detail">An error occurred: %1$s</string>
     <string name="no_streams_available_download">No streams available to download</string>
-    <string name="saved_tabs_invalid_json">Using default tabs, error while reading saved tabs</string>
+    <string name="saved_tabs_invalid_json">Could not read saved tabs, so using default ones</string>
     <string name="restore_defaults">Restore defaults</string>
-    <string name="restore_defaults_confirmation">Do you want to restore the defaults?</string>
+    <string name="restore_defaults_confirmation">Do you want to restore defaults?</string>
     <!-- error activity -->
     <string name="sorry_string">Sorry, that should not have happened.</string>
     <string name="guru_meditation" translatable="false">Guru Meditation.</string>
-    <string name="error_report_button_text">Report error via e-mail</string>
+    <string name="error_report_button_text">Report this per e-mail</string>
     <string name="error_snackbar_message">Sorry, some errors occurred.</string>
-    <string name="error_snackbar_action">REPORT</string>
+    <string name="error_snackbar_action">Report</string>
     <string name="what_device_headline">Info:</string>
     <string name="what_happened_headline">What happened:</string>
     <string name="info_labels">What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:</string>
@@ -246,7 +246,7 @@
     <string name="detail_dislikes_img_view_description">Dislikes</string>
     <string name="use_tor_title">Use Tor</string>
     <string name="use_tor_summary">(Experimental) Force download traffic through Tor for increased privacy (streaming videos not yet supported).</string>
-    <string name="report_error">Report an Error</string>
+    <string name="report_error">Report Error</string>
     <string name="user_report">User report</string>
     <string name="search_no_results">No results</string>
     <string name="empty_view_no_videos" translatable="false">@string/no_videos</string>
@@ -258,7 +258,7 @@
     <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="storage_permission_denied">Grant access to storage first</string>
     <string name="short_thousand">k</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
@@ -269,7 +269,7 @@
         <item quantity="one">%s subscriber</item>
         <item quantity="other">%s subscribers</item>
     </plurals>
-    <string name="subscribers_count_not_available">Subscribers count not available</string>
+    <string name="subscribers_count_not_available">Subscriber count unavailable</string>
     <string name="no_views">No views</string>
     <plurals name="views">
         <item quantity="one">%s view</item>
@@ -355,7 +355,7 @@
     <string name="github_url" translatable="false">https://github.com/TeamNewPipe/NewPipe</string>
     <string name="view_on_github">View on GitHub</string>
     <string name="donation_title">Donate</string>
-    <string name="donation_encouragement">NewPipe is developed by volunteers spending time bringing you the best experience. Give back to help developers make NewPipe even better while enjoying a cup of coffee.</string>
+    <string name="donation_encouragement">NewPipe is developed by volunteers spending time bringing you the best experience. Give back to help make NewPipe even better.</string>
     <string name="donation_url" translatable="false">https://newpipe.schabi.org/donate</string>
     <string name="give_back">Give back</string>
     <string name="website_title">Website</string>
@@ -466,7 +466,7 @@
     <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_title">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>
@@ -529,7 +529,7 @@
     <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_title">There is a fresh NewPipe version 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">Pending</string>
@@ -557,7 +557,7 @@
     <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_ssl_exception">Could not connect securely</string>
     <string name="error_unknown_host">Could not find the server</string>
     <string name="error_connect_host">Can not connect to the server</string>
     <string name="error_http_no_content">The server does not send data</string>
@@ -585,7 +585,7 @@
     <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.\nChoose SAF if you want to download to an external SD card</string>
     <string name="downloads_storage_use_saf_title">Use SAF</string>
-    <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
+    <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: Some devices are incompatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
 
 </resources>

From 6bc697f92601b966702fc15a30add41b7772ce51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Thu, 9 Jan 2020 04:36:39 +0100
Subject: [PATCH 005/199] Continue ending playback queue

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0b20edd7d..f1896c7ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,7 +82,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 (to non-repeating queue) after last file</string>
+    <string name="auto_queue_summary">Continue ending (non-repeating) playback queue by appending a related stream</string>
     <string name="volume_gesture_control_title">Volume gesture control</string>
     <string name="volume_gesture_control_summary">Use gestures to control player volume</string>
     <string name="brightness_gesture_control_title">Brightness gesture control</string>

From bca547ce44021c32a6b99a1ab059174a2f215177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Thu, 9 Jan 2020 04:38:47 +0100
Subject: [PATCH 006/199] \'Storage Access Framework\'

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f1896c7ba..940008aae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -585,7 +585,7 @@
     <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.\nChoose SAF if you want to download to an external SD card</string>
     <string name="downloads_storage_use_saf_title">Use SAF</string>
-    <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: Some devices are incompatible</string>
+    <string name="downloads_storage_use_saf_summary">The \'Storage Access Framework\' allows downloads to an external SD card.\nNote: Some devices are incompatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
 
 </resources>

From 3ad0e313caee037d42ea9a4ef89e80fbd04d9a2f Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Thu, 9 Jan 2020 09:40:05 +0100
Subject: [PATCH 007/199] =?UTF-8?q?changed=20the=20way=20to=20change=20lan?=
 =?UTF-8?q?guage,=20now=20is=20=C2=ABNewPipe's=20language=C2=BB=20selector?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/schabi/newpipe/MainActivity.java |   8 +-
 .../schabi/newpipe/about/AboutActivity.java   |   6 +
 .../newpipe/download/DownloadActivity.java    |   6 +
 .../settings/ContentSettingsFragment.java     |   5 +-
 .../newpipe/settings/SettingsActivity.java    |   7 +-
 .../org/schabi/newpipe/util/Localization.java |  26 ++-
 app/src/main/res/values-ur/strings.xml        |  10 +-
 app/src/main/res/values/settings_keys.xml     | 159 ++++++++++++++++--
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/xml/content_settings.xml     |  10 ++
 10 files changed, 209 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index cac814085..05e224013 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -56,7 +56,6 @@ import androidx.fragment.app.FragmentManager;
 import com.google.android.material.navigation.NavigationView;
 
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;
@@ -67,7 +66,6 @@ import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.KioskTranslator;
-import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PeertubeHelper;
 import org.schabi.newpipe.util.PermissionHelper;
@@ -78,8 +76,10 @@ import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLanguage;
 
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
@@ -116,10 +116,9 @@ public class MainActivity extends AppCompatActivity {
         if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
             TLSSocketFactoryCompat.setAsDefault();
         }
-
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
-        changeAppLanguage(Localization.getPreferredLocale(getApplicationContext()), getResources());
+        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
@@ -424,6 +423,7 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onResume() {
+        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
         super.onResume();
 
         // close drawer on return, and don't show animation, so its looks like the drawer isn't open
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 2326e795e..4da1611d3 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -25,6 +25,11 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.util.Locale;
+
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLanguage;
+
 public class AboutActivity extends AppCompatActivity {
 
     /**
@@ -62,6 +67,7 @@ public class AboutActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this);
 
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 449a790e8..b8bfcf480 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -15,9 +15,14 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.util.Locale;
+
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLanguage;
+
 public class DownloadActivity extends AppCompatActivity {
 
     private static final String MISSIONS_FRAGMENT_TAG = "fragment_tag";
@@ -29,6 +34,7 @@ public class DownloadActivity extends AppCompatActivity {
         i.setClass(this, DownloadManagerService.class);
         startService(i);
 
+        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
         ThemeHelper.setTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_downloader);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index 0c7a4b46e..88c700582 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -56,6 +56,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
     private Localization initialSelectedLocalization;
     private ContentCountry initialSelectedContentCountry;
+    private String initialLanguage;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -64,6 +65,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
         initialSelectedLocalization = org.schabi.newpipe.util.Localization.getPreferredLocalization(requireContext());
         initialSelectedContentCountry = org.schabi.newpipe.util.Localization.getPreferredContentCountry(requireContext());
+        initialLanguage = androidx.preference.PreferenceManager.getDefaultSharedPreferences(getContext()).getString("newpipes_language_key", "en");
     }
 
     @Override
@@ -125,9 +127,10 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                 .getPreferredLocalization(requireContext());
         final ContentCountry selectedContentCountry = org.schabi.newpipe.util.Localization
                 .getPreferredContentCountry(requireContext());
+        final String selectedLanguage = androidx.preference.PreferenceManager.getDefaultSharedPreferences(getContext()).getString("newpipes_language_key", "en");
 
         if (!selectedLocalization.equals(initialSelectedLocalization)
-                || !selectedContentCountry.equals(initialSelectedContentCountry)) {
+                || !selectedContentCountry.equals(initialSelectedContentCountry) || !selectedLanguage.equals(initialLanguage)) {
             Toast.makeText(requireContext(), R.string.localization_changes_requires_app_restart, Toast.LENGTH_LONG).show();
 
             NewPipe.setupLocalization(selectedLocalization, selectedContentCountry);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index a3f218074..40af9f460 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -14,6 +14,11 @@ import android.view.MenuItem;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.util.Locale;
+
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLanguage;
+
 
 /*
  * Created by Christian Schabesberger on 31.08.15.
@@ -44,7 +49,7 @@ public class SettingsActivity extends AppCompatActivity implements BasePreferenc
     @Override
     protected void onCreate(Bundle savedInstanceBundle) {
         setTheme(ThemeHelper.getSettingsThemeStyle(this));
-
+        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
         super.onCreate(savedInstanceBundle);
         setContentView(R.layout.settings_layout);
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index 6b0b4cd0c..7d742b04a 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -7,6 +7,11 @@ import android.content.res.Resources;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.PluralsRes;
+import androidx.annotation.StringRes;
 
 import org.ocpsoft.prettytime.PrettyTime;
 import org.ocpsoft.prettytime.units.Decade;
@@ -21,10 +26,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.PluralsRes;
-import androidx.annotation.StringRes;
-
 /*
  * Created by chschtsch on 12/29/15.
  *
@@ -226,4 +227,21 @@ public class Localization {
         conf.setLocale(loc);
         res.updateConfiguration(conf, dm);
     }
+
+    public static Locale getAppLanguage(Context context) {
+        SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context);
+        String lang = prefs.getString("newpipes_language_key", "en");
+        Locale loc;
+        if (lang.equals("system")) {
+            loc = Locale.getDefault();
+        } else if (lang.matches(".*-.*")) {
+            String[] localisation = lang.split("-");
+            lang = localisation[0];
+            String country = localisation[1];
+            loc = new Locale(lang, country);
+        } else {
+            loc = new Locale(lang);
+        }
+        return loc;
+    }
 }
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 089b793c8..ce6f3f651 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -193,13 +193,13 @@
     <string name="short_billion">بی</string>
     <string name="no_subscribers">کوئی صارفین نہیں</string>
     <plurals name="subscribers">
-        <item quantity="one">% s صارف</item>
-        <item quantity="other">% s صارفین</item>
+        <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>
+        <item quantity="one">%s منظر</item>
+        <item quantity="other">%s مناظر</item>
     </plurals>
     <string name="no_videos">ویڈیوز دستیاب نہیں</string>
     <plurals name="videos">
@@ -388,7 +388,7 @@
     <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>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 3f361226d..299803a43 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -31,20 +31,20 @@
     <string name="seek_duration_key" translatable="false">seek_duration</string>
     <string name="seek_duration_default_value" translatable="false">10000</string>
     <string-array name="seek_duration_description" translatable="false">
-      <item>5 seconds</item>
-      <item>10 seconds</item>
-      <item>15 seconds</item>
-      <item>20 seconds</item>
-      <item>25 seconds</item>
-      <item>30 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+        <item>15 seconds</item>
+        <item>20 seconds</item>
+        <item>25 seconds</item>
+        <item>30 seconds</item>
     </string-array>
     <string-array name="seek_duration_value" translatable="false">
-      <item>5000</item>
-      <item>10000</item>
-      <item>15000</item>
-      <item>20000</item>
-      <item>25000</item>
-      <item>30000</item>
+        <item>5000</item>
+        <item>10000</item>
+        <item>15000</item>
+        <item>20000</item>
+        <item>25000</item>
+        <item>30000</item>
     </string-array>
 
     <string name="minimize_on_exit_key" translatable="false">minimize_on_exit_key</string>
@@ -175,6 +175,7 @@
     <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="newpipes_language_key" translatable="false">newpipes_language_key</string>
 
     <string name="import_data" translatable="false">import_data</string>
     <string name="export_data" translatable="false">export_data</string>
@@ -272,7 +273,6 @@
         <item>cs</item>
         <item>da</item>
         <item>de</item>
-        <item>eo</item>
         <item>et</item>
         <item>en-GB</item>
         <item>en</item>
@@ -352,7 +352,6 @@
         <item>Čeština</item>
         <item>Dansk</item>
         <item>Deutsch</item>
-        <item>Esperanto</item>
         <item>Eesti</item>
         <item>English (UK)</item>
         <item>English (US)</item>
@@ -925,6 +924,137 @@
         <item>ZW</item>
     </string-array>
 
+    <!--The next two arrays are set to change the NewPipe language-->
+    <string-array name="language_code_np" translatable="false">
+        <item>system</item>
+        <item>ar</item>
+        <item>az</item>
+        <item>ast</item>
+        <item>be</item>
+        <item>bg-bd</item>
+        <item>bn</item>
+        <item>ca</item>
+        <item>cs</item>
+        <item>da</item>
+        <item>de</item>
+        <item>el</item>
+        <item>en</item>
+        <item>eo</item>
+        <item>es</item>
+        <item>et</item>
+        <item>eu</item>
+        <item>fa</item>
+        <item>fi</item>
+        <item>fil</item>
+        <item>fr</item>
+        <item>gl</item>
+        <item>he</item>
+        <item>hi</item>
+        <item>hr</item>
+        <item>hu</item>
+        <item>hy</item>
+        <item>ia</item>
+        <item>ind</item>
+        <item>it</item>
+        <item>ja</item>
+        <item>ko</item>
+        <item>ku</item>
+        <item>lt</item>
+        <item>mk</item>
+        <item>ms</item>
+        <item>nb-no</item>
+        <item>ne</item>
+        <item>nl</item>
+        <item>nl-be</item>
+        <item>pa</item>
+        <item>pl</item>
+        <item>pr</item>
+        <item>pt</item>
+        <item>pt-br</item>
+        <item>ro</item>
+        <item>ru</item>
+        <item>sk</item>
+        <item>sl</item>
+        <item>sq</item>
+        <item>sr</item>
+        <item>sv</item>
+        <item>ta</item>
+        <item>te</item>
+        <item>th</item>
+        <item>tr</item>
+        <item>uk</item>
+        <item>ur</item>
+        <item>vi</item>
+        <item>zh</item>
+        <item>zh-hans</item>
+        <item>zh-tw</item>
+    </string-array>
+    <string-array name="language_name_np" translatable="false">
+        <item>@string/system</item>
+        <item>العربية</item>
+        <item>Azərbaycan dili</item>
+        <item>Asturianu</item>
+        <item>Беларуская</item>
+        <item>български език</item>
+        <item>বাংলা</item>
+        <item>Català</item>
+        <item>Čeština</item>
+        <item>Dansk</item>
+        <item>Deutsch</item>
+        <item>Ελληνικά</item>
+        <item>English</item>
+        <item>Esperanto</item>
+        <item>Español</item>
+        <item>Eesti keel</item>
+        <item>Euskara</item>
+        <item>فارسی</item>
+        <item>Suomen kieli</item>
+        <item>Wikang Filipino</item>
+        <item>Français</item>
+        <item>Galego</item>
+        <item>עברית</item>
+        <item>हिन्दी</item>
+        <item>Hrvatski</item>
+        <item>magyar</item>
+        <item>Հայերեն</item>
+        <item>Interlingua</item>
+        <item>Bahasa Indonesia</item>
+        <item>Italiano</item>
+        <item>日本語</item>
+        <item>한국어</item>
+        <item>کوردی</item>
+        <item>Lietuvių kalba</item>
+        <item>македонски јазик</item>
+        <item>Bahasa Melayu</item>
+        <item>Norsk bokmål</item>
+        <item>Nनेपाली</item>
+        <item>Nederlands (NL)</item>
+        <item>Nederlands (BE)</item>
+        <item>ਪੰਜਾਬੀ</item>
+        <item>Polski</item>
+        <item>Pirate Language</item>
+        <item>Português (PT)</item>
+        <item>Português (BR)</item>
+        <item>Română</item>
+        <item>русский язык</item>
+        <item>Slovenčina</item>
+        <item>Slovenščina</item>
+        <item>Shqip</item>
+        <item>Српски</item>
+        <item>Svenska</item>
+        <item>தமிழ்</item>
+        <item>తెలుగు</item>
+        <item>ไทย</item>
+        <item>Türkçe</item>
+        <item>українська мова</item>
+        <item>اردو</item>
+        <item>Tiếng Việt</item>
+        <item>官话</item>
+        <item>简化字</item>
+        <item>臺灣華語</item>
+        <!--todo : fix ia, ind, see why it crashes for ur-->
+    </string-array>
+
     <!-- Limit mobile data usage  -->
     <string name="limit_mobile_data_usage_key" translatable="false">limit_mobile_data_usage</string>
     <string name="limit_data_usage_none_key" translatable="false">limit_data_usage_none</string>
@@ -943,6 +1073,7 @@
 
     <string name="list_view_mode_key" translatable="false">list_view_mode</string>
     <string name="list_view_mode_value" translatable="false">auto</string>
+    <string name="system">System</string>
 
     <string-array name="list_view_mode_values" translatable="false">
         <item>auto</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6021df15e..12a96fe74 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -585,5 +585,6 @@
     <string name="downloads_storage_use_saf_title">Use SAF</string>
     <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
+    <string name="newpipes_language_title">NewPipe\'s language</string>
 
 </resources>
diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml
index 4044e92d8..ab9896cde 100644
--- a/app/src/main/res/xml/content_settings.xml
+++ b/app/src/main/res/xml/content_settings.xml
@@ -3,6 +3,16 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/content">
+
+    <ListPreference
+        app:iconSpaceReserved="false"
+        android:defaultValue="system"
+        android:entries="@array/language_name_np"
+        android:entryValues="@array/language_code_np"
+        android:key="@string/newpipes_language_key"
+        android:summary="%s"
+        android:title="@string/newpipes_language_title"/>
+
     <ListPreference
         app:iconSpaceReserved="false"
         android:defaultValue="@string/default_language_value"

From ed9a3517c63708a613373ff274cd6eeec63f79ff Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Thu, 9 Jan 2020 12:15:01 +0100
Subject: [PATCH 008/199] removed unused imports

---
 app/src/main/java/org/schabi/newpipe/MainActivity.java          | 1 -
 app/src/main/java/org/schabi/newpipe/about/AboutActivity.java   | 2 --
 .../main/java/org/schabi/newpipe/download/DownloadActivity.java | 2 --
 .../main/java/org/schabi/newpipe/settings/SettingsActivity.java | 2 --
 4 files changed, 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 05e224013..eb5f11987 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -76,7 +76,6 @@ import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import static org.schabi.newpipe.util.Localization.changeAppLanguage;
 import static org.schabi.newpipe.util.Localization.getAppLanguage;
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 4da1611d3..3555ecefe 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -25,8 +25,6 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.util.Locale;
-
 import static org.schabi.newpipe.util.Localization.changeAppLanguage;
 import static org.schabi.newpipe.util.Localization.getAppLanguage;
 
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 b8bfcf480..bf546bf85 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -15,8 +15,6 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.util.Locale;
-
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index 40af9f460..781c033b8 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -14,8 +14,6 @@ import android.view.MenuItem;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.util.Locale;
-
 import static org.schabi.newpipe.util.Localization.changeAppLanguage;
 import static org.schabi.newpipe.util.Localization.getAppLanguage;
 

From b32935a1b087bbc6d19fb7e50493273796d2ffb4 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Thu, 9 Jan 2020 15:51:41 +0100
Subject: [PATCH 009/199] app language now changes time formatting (3hrs ago),
 was system language b4

---
 app/src/main/java/org/schabi/newpipe/App.java   |  2 +-
 .../java/org/schabi/newpipe/MainActivity.java   |  8 +++++---
 .../org/schabi/newpipe/about/AboutActivity.java |  4 ++--
 .../newpipe/download/DownloadActivity.java      |  4 ++--
 .../newpipe/settings/SettingsActivity.java      |  4 ++--
 .../org/schabi/newpipe/util/Localization.java   | 17 ++++++++---------
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index 7f050e6c7..dae143b6c 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -99,7 +99,7 @@ public class App extends Application {
         NewPipe.init(getDownloader(),
                 Localization.getPreferredLocalization(this),
                 Localization.getPreferredContentCountry(this));
-        Localization.init();
+        Localization.init(getApplicationContext());
 
         StateSaver.init(this);
         initNotificationChannel();
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index eb5f11987..d48db1035 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -66,6 +66,7 @@ import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.KioskTranslator;
+import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PeertubeHelper;
 import org.schabi.newpipe.util.PermissionHelper;
@@ -78,7 +79,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
 
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
@@ -117,7 +118,7 @@ public class MainActivity extends AppCompatActivity {
         }
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
-        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
@@ -422,7 +423,8 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onResume() {
-        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        Localization.init(getApplicationContext()); //change the date format to match the selected language on resume
         super.onResume();
 
         // close drawer on return, and don't show animation, so its looks like the drawer isn't open
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 3555ecefe..795feceb0 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -26,7 +26,7 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
 
 public class AboutActivity extends AppCompatActivity {
 
@@ -65,7 +65,7 @@ public class AboutActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this);
 
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 bf546bf85..fd0d28a0e 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -19,7 +19,7 @@ import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 
 import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
 
 public class DownloadActivity extends AppCompatActivity {
 
@@ -32,7 +32,7 @@ public class DownloadActivity extends AppCompatActivity {
         i.setClass(this, DownloadManagerService.class);
         startService(i);
 
-        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         ThemeHelper.setTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_downloader);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index 781c033b8..6804f9831 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -15,7 +15,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
 
 
 /*
@@ -47,7 +47,7 @@ public class SettingsActivity extends AppCompatActivity implements BasePreferenc
     @Override
     protected void onCreate(Bundle savedInstanceBundle) {
         setTheme(ThemeHelper.getSettingsThemeStyle(this));
-        changeAppLanguage(getAppLanguage(getApplicationContext()), getResources());
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         super.onCreate(savedInstanceBundle);
         setContentView(R.layout.settings_layout);
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index 7d742b04a..695a73295 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -7,7 +7,6 @@ import android.content.res.Resources;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.PluralsRes;
@@ -54,8 +53,8 @@ public class Localization {
     private Localization() {
     }
 
-    public static void init() {
-        initPrettyTime();
+    public static void init(Context context) {
+        initPrettyTime(context);
     }
 
     @NonNull
@@ -203,17 +202,17 @@ public class Localization {
     // Pretty Time
     //////////////////////////////////////////////////////////////////////////*/
 
-    private static void initPrettyTime() {
-        prettyTime = new PrettyTime(Locale.getDefault());
+    private static void initPrettyTime(Context context) {
+        prettyTime = new PrettyTime(getAppLocale(context));
         // Do not use decades as YouTube doesn't either.
         prettyTime.removeUnit(Decade.class);
     }
 
     private static PrettyTime getPrettyTime() {
         // If pretty time's Locale is different, init again with the new one.
-        if (!prettyTime.getLocale().equals(Locale.getDefault())) {
-            initPrettyTime();
-        }
+//        if (!prettyTime.getLocale().equals(Locale.getDefault())) {
+//            initPrettyTime();
+//        }
         return prettyTime;
     }
 
@@ -228,7 +227,7 @@ public class Localization {
         res.updateConfiguration(conf, dm);
     }
 
-    public static Locale getAppLanguage(Context context) {
+    public static Locale getAppLocale(Context context) {
         SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context);
         String lang = prefs.getString("newpipes_language_key", "en");
         Locale loc;

From 8f46432391578b6602cea69ef344817857f75a7e Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Fri, 10 Jan 2020 15:50:15 +0100
Subject: [PATCH 010/199] fixed some activities where the wrong languages would
 be set

---
 app/src/main/java/org/schabi/newpipe/MainActivity.java   | 1 -
 .../java/org/schabi/newpipe/about/AboutActivity.java     | 1 +
 .../java/org/schabi/newpipe/player/BackgroundPlayer.java | 4 +++-
 .../java/org/schabi/newpipe/player/MainVideoPlayer.java  | 9 +++++++--
 .../java/org/schabi/newpipe/player/PopupVideoPlayer.java | 3 +++
 .../org/schabi/newpipe/player/ServicePlayerActivity.java | 3 +++
 .../java/org/schabi/newpipe/report/ErrorActivity.java    | 4 ++++
 .../main/java/org/schabi/newpipe/util/Localization.java  | 4 ----
 8 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index d48db1035..c5aedb85b 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -119,7 +119,6 @@ public class MainActivity extends AppCompatActivity {
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
         changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 795feceb0..c8c62bbe7 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -68,6 +68,7 @@ public class AboutActivity extends AppCompatActivity {
         changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this);
+        this.setTitle(getString(R.string.title_activity_about));
 
         setContentView(R.layout.activity_about);
 
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 76da7da36..c74882161 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
@@ -58,6 +58,8 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
 
 
 /**
@@ -115,7 +117,7 @@ public final class BackgroundPlayer extends Service {
         notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
         lockManager = new LockManager(this);
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         ThemeHelper.setTheme(this);
         basePlayerImpl = new BasePlayerImpl(this);
         basePlayerImpl.setup();
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 7a3e60c66..284d10b42 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -93,6 +93,8 @@ import static org.schabi.newpipe.util.AnimationUtils.Type.SCALE_AND_ALPHA;
 import static org.schabi.newpipe.util.AnimationUtils.Type.SLIDE_AND_ALPHA;
 import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
 import static org.schabi.newpipe.util.StateSaver.KEY_SAVED_STATE;
 
 /**
@@ -123,6 +125,7 @@ public final class MainVideoPlayer extends AppCompatActivity
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         super.onCreate(savedInstanceState);
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
         defaultPreferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -190,6 +193,7 @@ public final class MainVideoPlayer extends AppCompatActivity
     @Override
     protected void onResume() {
         if (DEBUG) Log.d(TAG, "onResume() called");
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         super.onResume();
 
         if (globalScreenOrientationLocked()) {
@@ -220,6 +224,7 @@ public final class MainVideoPlayer extends AppCompatActivity
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
 
         if (playerImpl.isSomePopupMenuVisible()) {
             playerImpl.getQualityPopupMenu().dismiss();
@@ -364,8 +369,8 @@ public final class MainVideoPlayer extends AppCompatActivity
     }
 
     private boolean globalScreenOrientationLocked() {
-        // 1: Screen orientation changes using acelerometer
-        // 0: Screen orientatino is locked
+        // 1: Screen orientation changes using accelerometer
+        // 0: Screen orientation is locked
         return !(android.provider.Settings.System.getInt(getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0) == 1);
     }
 
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 969c47990..b173448d0 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -80,6 +80,8 @@ import static org.schabi.newpipe.player.BasePlayer.STATE_PLAYING;
 import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_DURATION;
 import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
 
 /**
  * Service Popup Player implementing VideoPlayer
@@ -142,6 +144,7 @@ public final class PopupVideoPlayer extends Service {
 
     @Override
     public void onCreate() {
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
         notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
 
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 2207808ac..d5ee59a7e 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -46,6 +46,8 @@ import java.util.List;
 
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatPitch;
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
 
 public abstract class ServicePlayerActivity extends AppCompatActivity
         implements PlayerEventListener, SeekBar.OnSeekBarChangeListener,
@@ -116,6 +118,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this);
         setContentView(R.layout.activity_player_queue_control);
diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index e7a6319e3..05dfe33ca 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -46,6 +46,9 @@ import java.util.List;
 import java.util.TimeZone;
 import java.util.Vector;
 
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
+
 /*
  * Created by Christian Schabesberger on 24.10.15.
  *
@@ -171,6 +174,7 @@ public class ErrorActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this);
         setContentView(R.layout.activity_error);
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index 695a73295..3f555fcfd 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -209,10 +209,6 @@ public class Localization {
     }
 
     private static PrettyTime getPrettyTime() {
-        // If pretty time's Locale is different, init again with the new one.
-//        if (!prettyTime.getLocale().equals(Locale.getDefault())) {
-//            initPrettyTime();
-//        }
         return prettyTime;
     }
 

From 11d06dc86d8e1f0e2614251a1359e36dd537a81c Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Fri, 10 Jan 2020 16:03:24 +0100
Subject: [PATCH 011/199] remove todo as it's already done

---
 app/src/main/res/values/settings_keys.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 4bb66bf62..18f42fe46 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -1054,7 +1054,6 @@
         <item>官话</item>
         <item>简化字</item>
         <item>臺灣華語</item>
-        <!--todo : fix ia, ind, see why it crashes for ur-->
     </string-array>
 
     <!-- Limit mobile data usage  -->

From 9d773d6e8aa892e929439ba62d2a0985f4e8deb4 Mon Sep 17 00:00:00 2001
From: Karol Kaminski <karkaminski@gmail.com>
Date: Mon, 13 Jan 2020 20:28:32 +0100
Subject: [PATCH 012/199] removed dot menu where its no longer needed

---
 app/src/main/java/org/schabi/newpipe/MainActivity.java | 10 ----------
 .../java/org/schabi/newpipe/about/AboutActivity.java   |  5 -----
 .../org/schabi/newpipe/download/DownloadActivity.java  |  6 +-----
 .../schabi/newpipe/player/ServicePlayerActivity.java   |  4 ----
 app/src/main/res/menu/download_menu.xml                |  4 ----
 app/src/main/res/menu/menu_about.xml                   | 10 ----------
 app/src/main/res/menu/menu_play_queue.xml              |  5 -----
 7 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 90d299c7f..2dfbb9c69 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -551,8 +551,6 @@ public class MainActivity extends AppCompatActivity {
         if (!(fragment instanceof SearchFragment)) {
             findViewById(R.id.toolbar).findViewById(R.id.toolbar_search_container).setVisibility(View.GONE);
 
-            MenuInflater inflater = getMenuInflater();
-            inflater.inflate(R.menu.main_menu, menu);
         }
 
         ActionBar actionBar = getSupportActionBar();
@@ -574,14 +572,6 @@ public class MainActivity extends AppCompatActivity {
             case android.R.id.home:
                 onHomeButtonPressed();
                 return true;
-            case R.id.action_show_downloads:
-                    return NavigationHelper.openDownloads(this);
-            case R.id.action_history:
-                    NavigationHelper.openStatisticFragment(getSupportFragmentManager());
-                    return true;
-            case R.id.action_settings:
-                    NavigationHelper.openSettings(this);
-                    return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 2326e795e..e028c0322 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -99,11 +99,6 @@ public class AboutActivity extends AppCompatActivity {
             case android.R.id.home:
                 finish();
                 return true;
-            case R.id.action_settings:
-                NavigationHelper.openSettings(this);
-                return true;
-            case R.id.action_show_downloads:
-                return NavigationHelper.openDownloads(this);
         }
 
         return super.onOptionsItemSelected(item);
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 449a790e8..26e5d94be 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -78,11 +78,7 @@ public class DownloadActivity extends AppCompatActivity {
                 onBackPressed();
                 return true;
             }
-            case R.id.action_settings: {
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivity(intent);
-                return true;
-            }
+
             default:
                 return super.onOptionsItemSelected(item);
         }
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 2207808ac..7b9120783 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -157,10 +157,6 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             case R.id.action_append_playlist:
                 appendAllToPlaylist();
                 return true;
-            case R.id.action_settings:
-                NavigationHelper.openSettings(this);
-                redraw = true;
-                return true;
             case R.id.action_system_audio:
                 startActivity(new Intent(Settings.ACTION_SOUND_SETTINGS));
                 return true;
diff --git a/app/src/main/res/menu/download_menu.xml b/app/src/main/res/menu/download_menu.xml
index f91f8ad7b..0ffb3a580 100644
--- a/app/src/main/res/menu/download_menu.xml
+++ b/app/src/main/res/menu/download_menu.xml
@@ -27,8 +27,4 @@
         android:title="@string/clear_finished_download"
         app:showAsAction="ifRoom" />
 
-    <item android:id="@+id/action_settings"
-        android:title="@string/settings"
-        app:showAsAction="never" />
-
 </menu>
diff --git a/app/src/main/res/menu/menu_about.xml b/app/src/main/res/menu/menu_about.xml
index 673cef94b..dbe91a04f 100644
--- a/app/src/main/res/menu/menu_about.xml
+++ b/app/src/main/res/menu/menu_about.xml
@@ -3,14 +3,4 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="org.schabi.newpipe.about.AboutActivity">
 
-    <item android:id="@+id/action_show_downloads"
-        android:orderInCategory="980"
-        android:title="@string/downloads"
-        app:showAsAction="never"/>
-
-    <item android:id="@+id/action_settings"
-        android:orderInCategory="990"
-        android:title="@string/settings"
-        app:showAsAction="never"/>
-
 </menu>
diff --git a/app/src/main/res/menu/menu_play_queue.xml b/app/src/main/res/menu/menu_play_queue.xml
index 6261b8c18..5413794be 100644
--- a/app/src/main/res/menu/menu_play_queue.xml
+++ b/app/src/main/res/menu/menu_play_queue.xml
@@ -10,11 +10,6 @@
         android:visible="true"
         app:showAsAction="ifRoom"/>
 
-    <item android:id="@+id/action_settings"
-        android:orderInCategory="990"
-        android:title="@string/settings"
-        app:showAsAction="never"/>
-
     <item android:id="@+id/action_system_audio"
         android:orderInCategory="996"
         android:title="@string/play_queue_audio_settings"

From 42ec6f0810332904fbb22d1d3dd87a8ce442c655 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Tue, 14 Jan 2020 00:00:45 -0300
Subject: [PATCH 013/199] ttml to srt conversion rewrite SubtitleConverter (use
 JSoup library instead, remove unused methods)

---
 .../newpipe/download/DownloadDialog.java      |   1 -
 .../newpipe/streams/SrtFromTtmlWriter.java    |  95 +++++
 .../newpipe/streams/SubtitleConverter.java    | 369 ------------------
 .../giga/postprocessing/TtmlConverter.java    |  32 +-
 4 files changed, 100 insertions(+), 397 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
 delete mode 100644 app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java

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 853bb6d68..44966744b 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -832,7 +832,6 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                     psArgs = new String[]{
                             selectedStream.getFormat().getSuffix(),
                             "false",// ignore empty frames
-                            "false",// detect youtube duplicate lines
                     };
                 }
                 break;
diff --git a/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java b/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
new file mode 100644
index 000000000..75e16edad
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
@@ -0,0 +1,95 @@
+package org.schabi.newpipe.streams;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+import org.jsoup.parser.Parser;
+import org.jsoup.select.Elements;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.text.ParseException;
+
+/**
+ * @author kapodamy
+ */
+public class SrtFromTtmlWriter {
+    private static final String NEW_LINE = "\r\n";
+
+    private SharpStream out;
+    private boolean ignoreEmptyFrames;
+    private final Charset charset = Charset.forName("utf-8");
+
+    private int frameIndex = 0;
+
+    public SrtFromTtmlWriter(SharpStream out, boolean ignoreEmptyFrames) {
+        this.out = out;
+        this.ignoreEmptyFrames = true;
+    }
+
+    private static String getTimestamp(Element frame, String attr) {
+        return frame
+                .attr(attr)
+                .replace('.', ',');// Str uses comma as decimal separator
+    }
+
+    private void writeFrame(String begin, String end, StringBuilder text) throws IOException {
+        writeString(String.valueOf(frameIndex++));
+        writeString(NEW_LINE);
+        writeString(begin);
+        writeString(" --> ");
+        writeString(end);
+        writeString(NEW_LINE);
+        writeString(text.toString());
+        writeString(NEW_LINE);
+        writeString(NEW_LINE);
+    }
+
+    private void writeString(String text) throws IOException {
+        out.write(text.getBytes(charset));
+    }
+
+    public void build(SharpStream ttml) throws IOException {
+        /*
+         * TTML parser with BASIC support
+         * multiple CUE is not supported
+         * styling is not supported
+         * tag timestamps (in auto-generated subtitles) are not supported, maybe in the future
+         * also TimestampTagOption enum is not applicable
+         * Language parsing is not supported
+         */
+
+        // parse XML
+        byte[] buffer = new byte[(int) ttml.available()];
+        ttml.read(buffer);
+        Document doc = Jsoup.parse(new ByteArrayInputStream(buffer), "UTF-8", "", Parser.xmlParser());
+
+        StringBuilder text = new StringBuilder(128);
+        Elements paragraph_list = doc.select("body>div>p");
+
+        // check if has frames
+        if (paragraph_list.size() < 1) return;
+
+        for (Element paragraph : paragraph_list) {
+            text.setLength(0);
+
+            for (Node children : paragraph.childNodes()) {
+                if (children instanceof TextNode)
+                    text.append(((TextNode) children).text());
+                else if (children instanceof Element && ((Element) children).tagName().equalsIgnoreCase("br"))
+                    text.append(NEW_LINE);
+            }
+
+            if (ignoreEmptyFrames && text.length() < 1) continue;
+
+            String begin = getTimestamp(paragraph, "begin");
+            String end = getTimestamp(paragraph, "end");
+
+            writeFrame(begin, end, text);
+        }
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java b/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java
deleted file mode 100644
index c41db4373..000000000
--- a/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java
+++ /dev/null
@@ -1,369 +0,0 @@
-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;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.text.ParseException;
-import java.util.Locale;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathExpressionException;
-
-/**
- * @author kapodamy
- */
-public class SubtitleConverter {
-    private static final String NEW_LINE = "\r\n";
-
-    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()) {
-                    return;
-                }
-                out.write(String.valueOf(frameIndex++).getBytes(charset));
-                out.write(NEW_LINE.getBytes(charset));
-                out.write(getTime(frame.start, true).getBytes(charset));
-                out.write(" --> ".getBytes(charset));
-                out.write(getTime(frame.end, true).getBytes(charset));
-                out.write(NEW_LINE.getBytes(charset));
-                out.write(frame.text.getBytes(charset));
-                out.write(NEW_LINE.getBytes(charset));
-                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,
-                                String root, String formatAttr, String formatVersion, String[] cuePath, String[] framePath,
-                                String timeAttr, String durationAttr, boolean hasTimestamp
-    ) throws IOException, ParseException, SAXException, ParserConfigurationException, XPathExpressionException {
-        /*
-         * XML based subtitles parser with BASIC support
-         * multiple CUE is not supported
-         * styling is not supported
-         * tag timestamps (in auto-generated subtitles) are not supported, maybe in the future
-         * also TimestampTagOption enum is not applicable
-         * Language parsing is not supported
-         */
-
-        byte[] buffer = new byte[(int) source.available()];
-        source.read(buffer);
-
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        Document xml = builder.parse(new ByteArrayInputStream(buffer));
-
-        String attr;
-
-        // get the format version or namespace
-        Element node = xml.getDocumentElement();
-
-        if (node == null) {
-            throw new ParseException("Can't get the format version. ¿wrong namespace?", -1);
-        } else if (!node.getNodeName().equals(root)) {
-            throw new ParseException("Invalid root", -1);
-        }
-
-        if (formatAttr.equals("xmlns")) {
-            if (!node.getNamespaceURI().equals(formatVersion)) {
-                throw new UnsupportedOperationException("Expected xml namespace: " + formatVersion);
-            }
-        } else {
-            attr = node.getAttributeNS(formatVersion, formatAttr);
-            if (attr == null) {
-                throw new ParseException("Can't get the format attribute", -1);
-            }
-            if (!attr.equals(formatVersion)) {
-                throw new ParseException("Invalid format version : " + attr, -1);
-            }
-        }
-
-        NodeList node_list;
-
-        int line_break = 0;// Maximum characters per line if present (valid for TranScript v3)
-
-        if (!hasTimestamp) {
-            node_list = selectNodes(xml, cuePath, formatVersion);
-
-            if (node_list != null) {
-                // if the subtitle has multiple CUEs, use the highest value
-                for (int i = 0; i < node_list.getLength(); i++) {
-                    try {
-                        int tmp = Integer.parseInt(((Element) node_list.item(i)).getAttributeNS(formatVersion, "ah"));
-                        if (tmp > line_break) {
-                            line_break = tmp;
-                        }
-                    } catch (Exception err) {
-                    }
-                }
-            }
-        }
-
-        // parse every frame
-        node_list = selectNodes(xml, framePath, formatVersion);
-
-        if (node_list == null) {
-            return;// no frames detected
-        }
-
-        int fs_ff = -1;// first timestamp of first frame
-        boolean limit_lines = false;
-
-        for (int i = 0; i < node_list.getLength(); i++) {
-            Element elem = (Element) node_list.item(i);
-            SubtitleFrame obj = new SubtitleFrame();
-            obj.text = elem.getTextContent();
-
-            attr = elem.getAttribute(timeAttr);// ¡this cant be null!
-            obj.start = hasTimestamp ? parseTimestamp(attr) : Integer.parseInt(attr);
-
-            attr = elem.getAttribute(durationAttr);
-            if (obj.text == null || attr == null) {
-                continue;// normally is a blank line (on auto-generated subtitles) ignore
-            }
-
-            if (hasTimestamp) {
-                obj.end = parseTimestamp(attr);
-
-                if (detectYoutubeDuplicateLines) {
-                    if (limit_lines) {
-                        int swap = obj.end;
-                        obj.end = fs_ff;
-                        fs_ff = swap;
-                    } else {
-                        if (fs_ff < 0) {
-                            fs_ff = obj.end;
-                        } else {
-                            if (fs_ff < obj.start) {
-                                limit_lines = true;// the subtitles has duplicated lines
-                            } else {
-                                detectYoutubeDuplicateLines = false;
-                            }
-                        }
-                    }
-                }
-            } else {
-                obj.end = obj.start + Integer.parseInt(attr);
-            }
-
-            if (/*node.getAttribute("w").equals("1") &&*/line_break > 1 && obj.text.length() > line_break) {
-
-                // implement auto line breaking (once)
-                StringBuilder text = new StringBuilder(obj.text);
-                obj.text = null;
-
-                switch (text.charAt(line_break)) {
-                    case ' ':
-                    case '\t':
-                        putBreakAt(line_break, text);
-                        break;
-                    default:// find the word start position
-                        for (int j = line_break - 1; j > 0; j--) {
-                            switch (text.charAt(j)) {
-                                case ' ':
-                                case '\t':
-                                    putBreakAt(j, text);
-                                    j = -1;
-                                    break;
-                                case '\r':
-                                case '\n':
-                                    j = -1;// long word, just ignore
-                                    break;
-                            }
-                        }
-                        break;
-                }
-
-                obj.text = text.toString();// set the processed text
-            }
-
-            callback.yield(obj);
-        }
-    }
-
-    private static NodeList selectNodes(Document xml, String[] path, String namespaceUri) {
-        Element ref = xml.getDocumentElement();
-
-        for (int i = 0; i < path.length - 1; i++) {
-            NodeList nodes = ref.getChildNodes();
-            if (nodes.getLength() < 1) {
-                return null;
-            }
-
-            Element elem;
-            for (int j = 0; j < nodes.getLength(); j++) {
-                if (nodes.item(j).getNodeType() == Node.ELEMENT_NODE) {
-                    elem = (Element) nodes.item(j);
-                    if (elem.getNodeName().equals(path[i]) && elem.getNamespaceURI().equals(namespaceUri)) {
-                        ref = elem;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return ref.getElementsByTagNameNS(namespaceUri, path[path.length - 1]);
-    }
-
-    private static int parseTimestamp(String multiImpl) throws NumberFormatException, ParseException {
-        if (multiImpl.length() < 1) {
-            return 0;
-        } else if (multiImpl.length() == 1) {
-            return Integer.parseInt(multiImpl) * 1000;// ¡this must be a number in seconds!
-        }
-
-        // detect wallclock-time
-        if (multiImpl.startsWith("wallclock(")) {
-            throw new UnsupportedOperationException("Parsing wallclock timestamp is not implemented");
-        }
-
-        // detect offset-time
-        if (multiImpl.indexOf(':') < 0) {
-            int multiplier = 1000;
-            char metric = multiImpl.charAt(multiImpl.length() - 1);
-            switch (metric) {
-                case 'h':
-                    multiplier *= 3600000;
-                    break;
-                case 'm':
-                    multiplier *= 60000;
-                    break;
-                case 's':
-                    if (multiImpl.charAt(multiImpl.length() - 2) == 'm') {
-                        multiplier = 1;// ms
-                    }
-                    break;
-                default:
-                    if (!Character.isDigit(metric)) {
-                        throw new NumberFormatException("Invalid metric suffix found on : " + multiImpl);
-                    }
-                    metric = '\0';
-                    break;
-            }
-            try {
-                String offset_time = multiImpl;
-
-                if (multiplier == 1) {
-                    offset_time = offset_time.substring(0, offset_time.length() - 2);
-                } else if (metric != '\0') {
-                    offset_time = offset_time.substring(0, offset_time.length() - 1);
-                }
-
-                double time_metric_based = Double.parseDouble(offset_time);
-                if (Math.abs(time_metric_based) <= Double.MAX_VALUE) {
-                    return (int) (time_metric_based * multiplier);
-                }
-            } catch (Exception err) {
-                throw new UnsupportedOperationException("Invalid or not implemented timestamp on: " + multiImpl);
-            }
-        }
-
-        // detect clock-time
-        int time = 0;
-        String[] units = multiImpl.split(":");
-
-        if (units.length < 3) {
-            throw new ParseException("Invalid clock-time timestamp", -1);
-        }
-
-        time += Integer.parseInt(units[0]) * 3600000;// hours
-        time += Integer.parseInt(units[1]) * 60000;//minutes
-        time += Float.parseFloat(units[2]) * 1000f;// seconds and milliseconds (if present)
-
-        // frames and sub-frames are ignored (not implemented)
-        // time += units[3] * fps;
-        return time;
-    }
-
-    private static void putBreakAt(int idx, StringBuilder str) {
-        // this should be optimized at compile time
-
-        if (NEW_LINE.length() > 1) {
-            str.delete(idx, idx + 1);// remove after replace
-            str.insert(idx, NEW_LINE);
-        } else {
-            str.setCharAt(idx, NEW_LINE.charAt(0));
-        }
-    }
-
-    private static String getTime(int time, boolean comma) {
-        // cast every value to integer to avoid auto-round in ToString("00").
-        StringBuilder str = new StringBuilder(12);
-        str.append(numberToString(time / 1000 / 3600, 2));// hours
-        str.append(':');
-        str.append(numberToString(time / 1000 / 60 % 60, 2));// minutes
-        str.append(':');
-        str.append(numberToString(time / 1000 % 60, 2));// seconds
-        str.append(comma ? ',' : '.');
-        str.append(numberToString(time % 1000, 3));// miliseconds
-
-        return str.toString();
-    }
-
-    private static String numberToString(int nro, int pad) {
-        return String.format(Locale.ENGLISH, "%0".concat(String.valueOf(pad)).concat("d"), nro);
-    }
-
-
-    /******************
-     * helper classes *
-     ******************/
-
-    private interface FrameWriter {
-
-        void yield(SubtitleFrame frame) throws IOException;
-    }
-
-    private static class SubtitleFrame {
-        //Java no support unsigned int
-
-        public int end;
-        public int start;
-        public String text = "";
-
-        private boolean isEmptyText() {
-            if (text == null) {
-                return true;
-            }
-
-            for (int i = 0; i < text.length(); i++) {
-                switch (text.charAt(i)) {
-                    case ' ':
-                    case '\t':
-                    case '\r':
-                    case '\n':
-                        break;
-                    default:
-                        return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-}
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 5a5b687f7..8ed0dfae5 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java
@@ -2,15 +2,10 @@ package us.shandian.giga.postprocessing;
 
 import android.util.Log;
 
-import org.schabi.newpipe.streams.SubtitleConverter;
+import org.schabi.newpipe.streams.SrtFromTtmlWriter;
 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
@@ -27,33 +22,16 @@ class TtmlConverter extends Postprocessing {
     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);
+        boolean ignoreEmptyFrames = getArgumentAt(1, "true").equals("true");
 
         if (format == null || format.equals("ttml")) {
-            SubtitleConverter ttmlDumper = new SubtitleConverter();
+            SrtFromTtmlWriter writer = new SrtFromTtmlWriter(out, ignoreEmptyFrames);
 
             try {
-                ttmlDumper.dumpTTML(
-                        sources[0],
-                        out,
-                        getArgumentAt(1, "true").equals("true"),
-                        getArgumentAt(2, "true").equals("true")
-                );
+                writer.build(sources[0]);
             } 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 err instanceof IOException ? 1 : 8;
             }
 
             return OK_RESULT;

From 49cc643dccefc66585b883d6ce8b1db858f88ef0 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Mon, 13 Jan 2020 21:25:26 -0300
Subject: [PATCH 014/199] decrease the size of samples per chunk

---
 .../newpipe/streams/Mp4FromDashWriter.java    | 179 +++++++++++++-----
 1 file changed, 129 insertions(+), 50 deletions(-)

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 818f6148e..f94ebefb0 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -11,6 +11,7 @@ import org.schabi.newpipe.streams.io.SharpStream;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * @author kapodamy
@@ -23,7 +24,6 @@ public class Mp4FromDashWriter {
     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 static short SINGLE_CHUNK_SAMPLE_BUFFER = 256;
 
     private final long time;
 
@@ -46,6 +46,8 @@ public class Mp4FromDashWriter {
 
     private int overrideMainBrand = 0x00;
 
+    private ArrayList<Integer> compatibleBrands = new ArrayList<>(5);
+
     public Mp4FromDashWriter(SharpStream... sources) throws IOException {
         for (SharpStream src : sources) {
             if (!src.canRewind() && !src.canRead()) {
@@ -57,6 +59,10 @@ public class Mp4FromDashWriter {
         readers = new Mp4DashReader[sourceTracks.length];
         readersChunks = new Mp4DashChunk[readers.length];
         time = (System.currentTimeMillis() / 1000L) + EPOCH_OFFSET;
+
+        compatibleBrands.add(0x6D703431);// mp41
+        compatibleBrands.add(0x69736F6D);// isom
+        compatibleBrands.add(0x69736F32);// iso2
     }
 
     public Mp4Track[] getTracksFromSource(int sourceIndex) throws IllegalStateException {
@@ -104,8 +110,8 @@ public class Mp4FromDashWriter {
         }
     }
 
-    public void setMainBrand(int brandId) {
-        overrideMainBrand = brandId;
+    public void setMainBrand(int brand) {
+        overrideMainBrand = brand;
     }
 
     public boolean isDone() {
@@ -159,7 +165,13 @@ public class Mp4FromDashWriter {
             tablesInfo[i] = new TablesInfo();
         }
 
-        boolean singleChunk = tracks.length == 1 && tracks[0].kind == TrackKind.Audio;
+        int single_sample_buffer;
+        if (tracks.length == 1 && tracks[0].kind == TrackKind.Audio) {
+            // near 1 second of audio data per chunk, avoid split the audio stream in large chunks
+            single_sample_buffer = tracks[0].trak.mdia.mdhd_timeScale / 1000;
+        } else {
+            single_sample_buffer = -1;
+        }
 
 
         for (int i = 0; i < readers.length; i++) {
@@ -210,31 +222,10 @@ public class Mp4FromDashWriter {
 
             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 (singleChunk) {
-                // avoid split audio streams in chunks
-                tablesInfo[i].stsc = 1;
-                tablesInfo[i].stsc_bEntries = new int[]{
-                        1, tablesInfo[i].stsz, 1
-                };
-                tablesInfo[i].stco = 1;
-            } else 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
-                };
+            if (single_sample_buffer > 0) {
+                initChunkTables(tablesInfo[i], single_sample_buffer, single_sample_buffer);
             } else {
-                tablesInfo[i].stsc = 3;// first chunk (init) and successive 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++;
+                initChunkTables(tablesInfo[i], SAMPLES_PER_CHUNK_INIT, SAMPLES_PER_CHUNK);
             }
 
             sampleCount[i] = tablesInfo[i].stsz;
@@ -274,6 +265,7 @@ public class Mp4FromDashWriter {
         // reserve moov space in the output stream
         /*if (outStream.canSetLength()) {
             long length = writeOffset + auxSize;
+            // warning: setLength() does not fill the unused space with zeros
             outStream.setLength(length);
             outSeek(length);
         } else {*/
@@ -292,10 +284,10 @@ public class Mp4FromDashWriter {
         }
 
         // tablesInfo contains row counts
-        // and after returning from make_moov() will contain table offsets
+        // and after returning from make_moov() will contain those table offsets
         make_moov(defaultMediaTime, tablesInfo, is64);
 
-        // write tables: stts stsc
+        // write tables: stts stsc sbgp
         // reset for ctts table: sampleCount sampleExtra
         for (int i = 0; i < readers.length; i++) {
             writeEntryArray(tablesInfo[i].stts, 2, sampleCount[i], defaultSampleDuration[i]);
@@ -305,6 +297,7 @@ public class Mp4FromDashWriter {
                 sampleCount[i] = 1;// the index is not base zero
                 sampleExtra[i] = -1;
             }
+            writeEntryArray(tablesInfo[i].sbgp, 1, sampleCount[i]);
         }
 
         if (auxBuffer == null) {
@@ -314,8 +307,8 @@ public class Mp4FromDashWriter {
         outWrite(make_mdat(totalSampleSize, is64));
 
         int[] sampleIndex = new int[readers.length];
-        int[] sizes = new int[singleChunk ? SINGLE_CHUNK_SAMPLE_BUFFER : SAMPLES_PER_CHUNK];
-        int[] sync = new int[singleChunk ? SINGLE_CHUNK_SAMPLE_BUFFER : SAMPLES_PER_CHUNK];
+        int[] sizes = new int[single_sample_buffer > 0 ? single_sample_buffer : SAMPLES_PER_CHUNK];
+        int[] sync = new int[single_sample_buffer > 0 ? single_sample_buffer : SAMPLES_PER_CHUNK];
 
         int written = readers.length;
         while (written > 0) {
@@ -329,8 +322,8 @@ public class Mp4FromDashWriter {
                 long chunkOffset = writeOffset;
                 int syncCount = 0;
                 int limit;
-                if (singleChunk) {
-                    limit = SINGLE_CHUNK_SAMPLE_BUFFER;
+                if (single_sample_buffer > 0) {
+                    limit = single_sample_buffer;
                 } else {
                     limit = sampleIndex[i] == 0 ? SAMPLES_PER_CHUNK_INIT : SAMPLES_PER_CHUNK;
                 }
@@ -390,10 +383,6 @@ public class Mp4FromDashWriter {
                         } else {
                             tablesInfo[i].stco = writeEntryArray(tablesInfo[i].stco, 1, (int) chunkOffset);
                         }
-
-                        if (singleChunk) {
-                            tablesInfo[i].stco = -1;
-                        }
                     }
 
                     outRestore();
@@ -470,7 +459,42 @@ public class Mp4FromDashWriter {
         }
     }
 
+    private void initChunkTables(TablesInfo tables, int firstCount, int succesiveCount) {
+        // tables.stsz holds amount of samples of the track (total)
+        int totalSamples = (tables.stsz - firstCount);
+        float chunkAmount = totalSamples / (float) succesiveCount;
+        int remainChunkOffset = (int) Math.ceil(chunkAmount);
+        boolean remain = remainChunkOffset != (int) chunkAmount;
+        int index = 0;
 
+        tables.stsc = 1;
+        if (firstCount != succesiveCount) {
+            tables.stsc++;
+        }
+        if (remain) {
+            tables.stsc++;
+        }
+
+        // stsc_table_entry = [first_chunk, samples_per_chunk, sample_description_index]
+        tables.stsc_bEntries = new int[tables.stsc * 3];
+        tables.stco = remainChunkOffset + 1;// total entrys in chunk offset box
+
+        tables.stsc_bEntries[index++] = 1;
+        tables.stsc_bEntries[index++] = firstCount;
+        tables.stsc_bEntries[index++] = 1;
+
+        if (firstCount != succesiveCount) {
+            tables.stsc_bEntries[index++] = 2;
+            tables.stsc_bEntries[index++] = succesiveCount;
+            tables.stsc_bEntries[index++] = 1;
+        }
+
+        if (remain) {
+            tables.stsc_bEntries[index++] = remainChunkOffset + 1;
+            tables.stsc_bEntries[index++] = totalSamples % succesiveCount;
+            tables.stsc_bEntries[index] = 1;
+        }
+    }
 
     private void outWrite(byte[] buffer) throws IOException {
         outWrite(buffer, buffer.length);
@@ -585,19 +609,29 @@ public class Mp4FromDashWriter {
 
 
     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
-        };
+        int size = 16 + (compatibleBrands.size() * 4);
+        if (overrideMainBrand != 0) size += 4;
 
-        if (overrideMainBrand != 0)
-            ByteBuffer.wrap(buffer).putInt(8, overrideMainBrand);
+        ByteBuffer buffer = ByteBuffer.allocate(size);
+        buffer.putInt(size);
+        buffer.putInt(0x66747970);// "ftyp"
 
-        outWrite(buffer);
+        if (overrideMainBrand == 0) {
+            buffer.putInt(0x6D703432);// mayor brand "mp42"
+            buffer.putInt(512);// default minor version
+        } else {
+            buffer.putInt(overrideMainBrand);
+            buffer.putInt(0);
+            buffer.putInt(0x6D703432);// "mp42" compatible brand
+        }
 
-        return buffer.length;
+        for (Integer brand : compatibleBrands) {
+            buffer.putInt(brand);// compatible brand
+        }
+
+        outWrite(buffer.array());
+
+        return size;
     }
 
     private byte[] make_mdat(long refSize, boolean is64) {
@@ -746,7 +780,6 @@ public class Mp4FromDashWriter {
     }
 
     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);
@@ -766,7 +799,7 @@ public class Mp4FromDashWriter {
         // And stsz can be empty if has a default sample size
         //
         if (moovSimulation) {
-            make(0x73747473, -1, 2, 1);
+            make(0x73747473, -1, 2, 1);// stts
             if (tablesInfo.stss > 0) {
                 make(0x73747373, -1, 1, tablesInfo.stss);
             }
@@ -789,6 +822,9 @@ public class Mp4FromDashWriter {
             tablesInfo.stco = make(is64 ? 0x636F3634 : 0x7374636F, -1, is64 ? 2 : 1, tablesInfo.stco);
         }
 
+        auxWrite(make_sgpd());
+        tablesInfo.sbgp = make_sbgp();// during simulation the returned offset is ignored
+
         lengthFor(start_stbl);
         lengthFor(start_minf);
         lengthFor(start_mdia);
@@ -816,6 +852,48 @@ public class Mp4FromDashWriter {
         return buffer.array();
     }
 
+    private int make_sbgp() throws IOException {
+        int offset = auxOffset();
+
+        auxWrite(new byte[] {
+                0x00, 0x00, 0x00, 0x1C,// box size
+                0x73, 0x62, 0x67, 0x70,// "sbpg"
+                0x00, 0x00, 0x00, 0x00,// default box flags
+                0x72, 0x6F, 0x6C, 0x6C,// group type "roll"
+                0x00, 0x00, 0x00, 0x01,// group table size
+                0x00, 0x00, 0x00, 0x00,// group[0] total samples (to be set later)
+                0x00, 0x00, 0x00, 0x01// group[0] description index
+        });
+
+        return offset + 0x14;
+    }
+
+    private byte[] make_sgpd() {
+        /*
+         * Sample Group Description Box
+         *
+         * ¿whats does?
+         * the table inside of this box gives information about the
+         * characteristics of sample groups. The descriptive information is any other
+         * information needed to define or characterize the sample group.
+         *
+         * ¿is replicabled this box?
+         * NO due lacks of documentation about this box but...
+         * most of m4a encoders and ffmpeg uses this box with dummy values (same values)
+         */
+
+        ByteBuffer buffer = ByteBuffer.wrap(new byte[] {
+                0x00, 0x00, 0x00, 0x1A,// box size
+                0x73, 0x67, 0x70, 0x64,// "sgpd"
+                0x01, 0x00, 0x00, 0x00,// box flags (unknown flag sets)
+                0x72, 0x6F, 0x6C, 0x6C, // ¿¿group type??
+                0x00, 0x00, 0x00, 0x02,// ¿¿??
+                0x00, 0x00, 0x00, 0x01,// ¿¿??
+                (byte)0xFF, (byte)0xFF// ¿¿??
+        });
+
+        return buffer.array();
+    }
 
     class TablesInfo {
 
@@ -827,5 +905,6 @@ public class Mp4FromDashWriter {
         int stsz_default;
         int stss;
         int stco;
+        int sbgp;
     }
 }

From 00eddcb2378c6788e1ef00d375ce9ef49747e4b5 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Wed, 8 Jan 2020 14:36:31 -0300
Subject: [PATCH 015/199] android 5 (lollipop) fixup this commit attempts to
 fix the pickAvailableTemporalDir() method in ROMS that not are CTS compliant.

---
 .../giga/postprocessing/Postprocessing.java   | 10 +++++---
 .../giga/service/DownloadManager.java         | 23 ++++++++++++++-----
 2 files changed, 24 insertions(+), 9 deletions(-)

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 773ff92d1..e93e83a87 100644
--- a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
@@ -80,7 +80,7 @@ public abstract class Postprocessing implements Serializable {
 
     private transient DownloadMission mission;
 
-    private File tempFile;
+    private transient File tempFile;
 
     Postprocessing(boolean reserveSpace, boolean worksOnSameFile, String algorithmName) {
         this.reserveSpace = reserveSpace;
@@ -95,8 +95,12 @@ public abstract class Postprocessing implements Serializable {
 
     public void cleanupTemporalDir() {
         if (tempFile != null && tempFile.exists()) {
-            //noinspection ResultOfMethodCallIgnored
-            tempFile.delete();
+            try {
+                //noinspection ResultOfMethodCallIgnored
+                tempFile.delete();
+            } catch (Exception e) {
+                // nothing to do
+            }
         }
     }
 
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 e8bc468e9..994c6ee63 100644
--- a/app/src/main/java/us/shandian/giga/service/DownloadManager.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
@@ -139,6 +139,9 @@ public class DownloadManager {
             Log.d(TAG, "Loading pending downloads from directory: " + mPendingMissionsDir.getAbsolutePath());
         }
 
+        File tempDir = pickAvailableTemporalDir(ctx);
+        Log.i(TAG, "using '" + tempDir + "' as temporal directory");
+
         for (File sub : subs) {
             if (!sub.isFile()) continue;
             if (sub.getName().equals(".tmp")) continue;
@@ -184,7 +187,7 @@ public class DownloadManager {
 
             if (mis.psAlgorithm != null) {
                 mis.psAlgorithm.cleanupTemporalDir();
-                mis.psAlgorithm.setTemporalDir(pickAvailableTemporalDir(ctx));
+                mis.psAlgorithm.setTemporalDir(tempDir);
             }
 
             mis.metadata = sub;
@@ -513,13 +516,21 @@ public class DownloadManager {
     }
 
     static File pickAvailableTemporalDir(@NonNull Context ctx) {
-        if (isDirectoryAvailable(ctx.getExternalFilesDir(null)))
-            return ctx.getExternalFilesDir(null);
-        else if (isDirectoryAvailable(ctx.getFilesDir()))
-            return ctx.getFilesDir();
+        File dir = ctx.getExternalFilesDir(null);
+        if (isDirectoryAvailable(dir)) return dir;
+
+        dir = ctx.getFilesDir();
+        if (isDirectoryAvailable(dir)) return dir;
 
         // this never should happen
-        return ctx.getDir("tmp", Context.MODE_PRIVATE);
+        dir = ctx.getDir("muxing_tmp", Context.MODE_PRIVATE);
+        if (isDirectoryAvailable(dir)) return dir;
+
+        // fallback to cache dir
+        dir = ctx.getCacheDir();
+        if (isDirectoryAvailable(dir)) return dir;
+
+        throw new RuntimeException("Not temporal directories are available");
     }
 
     @Nullable

From 9b71828b97a46227f214b76cf99e53bb1884a7ee Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Tue, 14 Jan 2020 01:08:46 -0300
Subject: [PATCH 016/199] implement sgpd and sbgp boxes in audio tracks

---
 .../org/schabi/newpipe/streams/Mp4FromDashWriter.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 f94ebefb0..963d84b40 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -774,12 +774,12 @@ public class Mp4FromDashWriter {
                 .array()
         );
 
-        make_mdia(tracks[index].trak.mdia, tables, is64);
+        make_mdia(tracks[index].trak.mdia, tables, is64, tracks[index].kind == TrackKind.Audio);
 
         lengthFor(start);
     }
 
-    private void make_mdia(Mdia mdia, TablesInfo tablesInfo, boolean is64) throws IOException {
+    private void make_mdia(Mdia mdia, TablesInfo tablesInfo, boolean is64, boolean isAudio) throws IOException {
         int start_mdia = auxOffset();
         auxWrite(new byte[]{0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x69, 0x61});// mdia
         auxWrite(mdia.mdhd);
@@ -822,8 +822,10 @@ public class Mp4FromDashWriter {
             tablesInfo.stco = make(is64 ? 0x636F3634 : 0x7374636F, -1, is64 ? 2 : 1, tablesInfo.stco);
         }
 
-        auxWrite(make_sgpd());
-        tablesInfo.sbgp = make_sbgp();// during simulation the returned offset is ignored
+        if (isAudio) {
+            auxWrite(make_sgpd());
+            tablesInfo.sbgp = make_sbgp();// during simulation the returned offset is ignored
+        }
 
         lengthFor(start_stbl);
         lengthFor(start_minf);

From f8a7aac40d0e7e1a6558753e012dabd6f97d7df7 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Tue, 14 Jan 2020 14:15:42 +0100
Subject: [PATCH 017/199] fixed indonesian, see
 https://stackoverflow.com/questions/13291578/how-to-localize-an-android-app-in-indonesian-language

---
 app/src/main/res/{values-id => values-in}/strings.xml | 0
 app/src/main/res/values/settings_keys.xml             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/src/main/res/{values-id => values-in}/strings.xml (100%)

diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-in/strings.xml
similarity index 100%
rename from app/src/main/res/values-id/strings.xml
rename to app/src/main/res/values-in/strings.xml
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 18f42fe46..88da3afe5 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -956,7 +956,7 @@
         <item>hu</item>
         <item>hy</item>
         <item>ia</item>
-        <item>ind</item>
+        <item>in</item>
         <item>it</item>
         <item>ja</item>
         <item>ko</item>

From 055365a44931b65e9fffd0d5d57595fe3be40abb Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Tue, 14 Jan 2020 14:26:53 +0100
Subject: [PATCH 018/199] added Occitan to the selector

---
 app/src/main/res/values/settings_keys.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 88da3afe5..08b18f49b 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -968,6 +968,7 @@
         <item>ne</item>
         <item>nl</item>
         <item>nl-be</item>
+        <item>oc</item>
         <item>pa</item>
         <item>pl</item>
         <item>pr</item>
@@ -1032,6 +1033,7 @@
         <item>Nनेपाली</item>
         <item>Nederlands (NL)</item>
         <item>Nederlands (BE)</item>
+        <item>Occitan</item>
         <item>ਪੰਜਾਬੀ</item>
         <item>Polski</item>
         <item>Pirate Language</item>

From 105981b2eb426b598f81694442621e8b695a642e Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Tue, 14 Jan 2020 19:11:46 +0100
Subject: [PATCH 019/199] made system translatable + renamed it to system's
 language

---
 app/src/main/res/values/settings_keys.xml | 3 +--
 app/src/main/res/values/strings.xml       | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 08b18f49b..ed3c454b8 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -993,7 +993,7 @@
         <item>zh-tw</item>
     </string-array>
     <string-array name="language_name_np" translatable="false">
-        <item>@string/system</item>
+        <item>@string/systems_language</item>
         <item>العربية</item>
         <item>Azərbaycan dili</item>
         <item>Asturianu</item>
@@ -1076,7 +1076,6 @@
 
     <string name="list_view_mode_key" translatable="false">list_view_mode</string>
     <string name="list_view_mode_value" translatable="false">auto</string>
-    <string name="system">System</string>
 
     <string-array name="list_view_mode_values" translatable="false">
         <item>auto</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8a44fdc64..c5a59abe7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -590,4 +590,5 @@
     <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
     <string name="newpipes_language_title">NewPipe\'s language</string>
+    <string name="systems_language">System\'s language</string>
 </resources>

From a228e702daee7024ac88f3cbfadba031ce5b6951 Mon Sep 17 00:00:00 2001
From: Karol Kaminski <karkaminski@gmail.com>
Date: Tue, 14 Jan 2020 19:30:36 +0100
Subject: [PATCH 020/199] menu-item History visibility accordingly to settings

---
 app/src/main/java/org/schabi/newpipe/MainActivity.java | 10 ++++++++++
 .../main/java/org/schabi/newpipe/util/Constants.java   |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 2dfbb9c69..cce02f526 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -449,6 +449,16 @@ public class MainActivity extends AppCompatActivity {
             sharedPreferences.edit().putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
             NavigationHelper.openMainActivity(this);
         }
+
+        if (sharedPreferences.getBoolean(Constants.KEY_ENABLE_WATCH_HISTORY, true)) {
+            if (DEBUG) Log.d(TAG, "do not show History-menu as its disabled in settings");
+            drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(true);
+        }
+
+        if (!sharedPreferences.getBoolean(Constants.KEY_ENABLE_WATCH_HISTORY, true)) {
+            if (DEBUG) Log.d(TAG, "show History-menu as its enabled in settings");
+            drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(false);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/util/Constants.java b/app/src/main/java/org/schabi/newpipe/util/Constants.java
index b01b6df6a..50350651d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Constants.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Constants.java
@@ -11,5 +11,7 @@ public class Constants {
     public static final String KEY_THEME_CHANGE = "key_theme_change";
     public static final String KEY_MAIN_PAGE_CHANGE = "key_main_page_change";
 
+    public static final String KEY_ENABLE_WATCH_HISTORY = "enable_watch_history";
+
     public static final int NO_SERVICE_ID = -1;
 }

From b965f88eb206f9f6348018df2a1628985679b95d Mon Sep 17 00:00:00 2001
From: Karol Kaminski <karkaminski@gmail.com>
Date: Tue, 14 Jan 2020 22:08:07 +0100
Subject: [PATCH 021/199] removed main_menu.xml

---
 app/src/main/res/menu/main_menu.xml | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 app/src/main/res/menu/main_menu.xml

diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
deleted file mode 100644
index 05920099a..000000000
--- a/app/src/main/res/menu/main_menu.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_show_downloads"
-        android:orderInCategory="980"
-        android:title="@string/downloads"
-        app:showAsAction="never"/>
-
-    <item
-        android:id="@+id/action_history"
-        android:orderInCategory="981"
-        android:title="@string/action_history"
-        app:showAsAction="never"/>
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="990"
-        android:title="@string/settings"
-        app:showAsAction="never"/>
-</menu>
\ No newline at end of file

From 590722d929893308b1acbbec71322576510cf416 Mon Sep 17 00:00:00 2001
From: chr56 <chr0056@gmail.com>
Date: Wed, 15 Jan 2020 12:30:17 +0800
Subject: [PATCH 022/199] manually update the Simplified Chinese lang file.

/values-b+zh+HANS+CN was updated.
Action: copy file in /values-b+zh+HANS+CN to /values-zh-rCN
---
 app/src/main/res/values-zh-rCN/strings.xml | 30 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8714c6aca..cfa443afc 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -39,7 +39,7 @@
     <string name="network_error">网络错误</string>
     <plurals name="videos">
         <item quantity="one">视频</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <string name="disabled">禁用</string>
     <string name="controls_background_title">背景</string>
@@ -160,7 +160,7 @@
     <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="autoplay_by_calling_app_summary">从其他应用打开 NewPipe 时就播放视频</string>
+    <string name="autoplay_by_calling_app_summary">从其他应用调用 NewPipe 时播放视频</string>
     <string name="default_resolution_title">默认分辨率</string>
     <string name="kore_not_found">找不到Kore。是否安装？</string>
     <string name="show_play_with_kodi_title">显示“用Kodi播放”选项</string>
@@ -180,7 +180,7 @@
     <string name="error_report_title">错误报告</string>
     <string name="general_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>
@@ -483,7 +483,7 @@
     <string name="overwrite_finished_warning">命名冲突，已存在具有此名称文件</string>
     <string name="overwrite_failed">无法覆盖文件</string>
     <string name="download_already_pending">有此名称的已暂停下载</string>
-    <string name="error_postprocessing_stopped">处理文件时，NewPipe 已关闭</string>
+    <string name="error_postprocessing_stopped">NewPipe 在处理文件时被关闭</string>
     <string name="error_insufficient_storage">设备上没有剩余储存空间</string>
     <string name="error_progress_lost">进度丢失，文件已被删除</string>
     <string name="error_timeout">连接超时</string>
@@ -507,12 +507,30 @@
     <string name="no_one_watching">无人在线观看</string>
     <plurals name="watching">
         <item quantity="one">%s 人在观看</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <string name="no_one_listening">没人在听</string>
     <plurals name="listening">
-        <item quantity="one">％s个听众</item>
+        <item quantity="one">％s 人在听</item>
         <item quantity="other"/>
     </plurals>
     <string name="localization_changes_requires_app_restart">重新启动应用后，语言将更改。</string>
+    <string name="peertube_instance_url_title">PeerTube 服务器</string>
+    <string name="peertube_instance_url_summary">设置自己喜欢的peertube服务器</string>
+    <string name="peertube_instance_url_help">查找最适合你的服务器https://joinpeertube.org/instances#instances-list</string>
+    <string name="peertube_instance_add_title">添加服务器</string>
+    <string name="peertube_instance_add_help">输入服务器网址</string>
+    <string name="peertube_instance_add_fail">无法验证服务器</string>
+    <string name="peertube_instance_add_https_only">仅支持 https URL</string>
+    <string name="peertube_instance_add_exists">该服务器已存在</string>
+    <string name="local">本地</string>
+    <string name="recently_added">最近添加</string>
+    <string name="most_liked">最喜欢的</string>
+    <string name="playlist_no_uploader">自动生成的（未找到上传者）</string>
+    <string name="recovering">正在恢复</string>
+    <string name="error_download_resource_gone">无法恢复此下载</string>
+    <string name="choose_instance_prompt">选择一个服务器</string>
+    <string name="seek_duration_title">快进 / 快退的单位时间</string>
+    <string name="enable_lock_screen_video_thumbnail_title">在锁屏界面显示视频缩略图</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">在后台播放时，锁屏界面将会显示视频的缩略图</string>
 </resources>
\ No newline at end of file

From 9d8fcbbffe7ade9e662ab94e1a5a539a7e4e7d04 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Wed, 15 Jan 2020 08:33:57 +0100
Subject: [PATCH 023/199] fix: wrong language shown when rotating screen in
 popup player

---
 .../main/java/org/schabi/newpipe/player/PopupVideoPlayer.java    | 1 +
 1 file changed, 1 insertion(+)

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 b173448d0..c0ac95445 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -172,6 +172,7 @@ public final class PopupVideoPlayer extends Service {
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
+        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
         if (DEBUG) Log.d(TAG, "onConfigurationChanged() called with: newConfig = [" + newConfig + "]");
         updateScreenSize();
         updatePopupSize(popupLayoutParams.width, -1);

From 570dded8d601ea86ec92038283a65774fed8fb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Jakse?= <raphael.github@jakse.fr>
Date: Thu, 16 Jan 2020 20:44:08 +0100
Subject: [PATCH 024/199] Add field START_PAUSED to the Player Intent

This allows fixing spurious playback resume when minimizing to the background player.
---
 .../org/schabi/newpipe/player/BackgroundPlayerActivity.java | 5 ++++-
 app/src/main/java/org/schabi/newpipe/player/BasePlayer.java | 4 +++-
 .../java/org/schabi/newpipe/player/MainVideoPlayer.java     | 6 ++++--
 .../java/org/schabi/newpipe/player/PopupVideoPlayer.java    | 5 +++--
 .../org/schabi/newpipe/player/PopupVideoPlayerActivity.java | 5 ++++-
 .../org/schabi/newpipe/player/ServicePlayerActivity.java    | 6 +++++-
 .../main/java/org/schabi/newpipe/util/NavigationHelper.java | 6 ++++--
 7 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
index 761b50d85..59f6e1e6d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
@@ -57,7 +57,10 @@ public final class BackgroundPlayerActivity extends ServicePlayerActivity {
 
             this.player.setRecovery();
             getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
-            getApplicationContext().startService(getSwitchIntent(PopupVideoPlayer.class));
+            getApplicationContext().startService(
+                getSwitchIntent(PopupVideoPlayer.class)
+                    .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
+            );
             return true;
         }
         return false;
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 6452a9850..cd1ec07f9 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -150,6 +150,8 @@ public abstract class BasePlayer implements
     @NonNull
     public static final String RESUME_PLAYBACK = "resume_playback";
     @NonNull
+    public static final String START_PAUSED = "start_paused";
+    @NonNull
     public static final String SELECT_ON_APPEND = "select_on_append";
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -304,7 +306,7 @@ public abstract class BasePlayer implements
         }
         // Good to go...
         initPlayback(queue, repeatMode, playbackSpeed, playbackPitch, playbackSkipSilence,
-                /*playOnInit=*/true);
+                /*playOnInit=*/!intent.getBooleanExtra(START_PAUSED, false));
     }
 
     protected void initPlayback(@NonNull final PlayQueue queue,
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 7a3e60c66..9ccf5b9d3 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -614,7 +614,8 @@ public final class MainVideoPlayer extends AppCompatActivity
                     this.getPlaybackPitch(),
                     this.getPlaybackSkipSilence(),
                     this.getPlaybackQuality(),
-                    false
+                    false,
+                    !isPlaying()
             );
             context.startService(intent);
 
@@ -637,7 +638,8 @@ public final class MainVideoPlayer extends AppCompatActivity
                     this.getPlaybackPitch(),
                     this.getPlaybackSkipSilence(),
                     this.getPlaybackQuality(),
-                    false
+                    false,
+                    !isPlaying()
             );
             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 969c47990..70fb77060 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -567,7 +567,8 @@ public final class PopupVideoPlayer extends Service {
                     this.getPlaybackPitch(),
                     this.getPlaybackSkipSilence(),
                     this.getPlaybackQuality(),
-                    false
+                    false,
+                    !isPlaying()
             );
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);
@@ -1123,4 +1124,4 @@ public final class PopupVideoPlayer extends Service {
             return distanceFromCloseButton(popupMotionEvent) <= getClosingRadius();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java
index 44fcdb8dd..5000d07e2 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java
@@ -50,7 +50,10 @@ public final class PopupVideoPlayerActivity extends ServicePlayerActivity {
         if (item.getItemId() == R.id.action_switch_background) {
             this.player.setRecovery();
             getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
-            getApplicationContext().startService(getSwitchIntent(BackgroundPlayer.class));
+            getApplicationContext().startService(
+                getSwitchIntent(BackgroundPlayer.class)
+                    .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
+            );
             return true;
         }
         return false;
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 2207808ac..a7b3006a1 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -167,7 +167,10 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             case R.id.action_switch_main:
                 this.player.setRecovery();
                 getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
-                getApplicationContext().startActivity(getSwitchIntent(MainVideoPlayer.class));
+                getApplicationContext().startActivity(
+                    getSwitchIntent(MainVideoPlayer.class)
+                        .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
+                );
                 return true;
         }
         return onPlayerOptionSelected(item) || super.onOptionsItemSelected(item);
@@ -189,6 +192,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
                 this.player.getPlaybackPitch(),
                 this.player.getPlaybackSkipSilence(),
                 null,
+                false,
                 false
         ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     }
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 e2b03c8e8..a19aa92ae 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -109,12 +109,14 @@ public class NavigationHelper {
                                          final float playbackPitch,
                                          final boolean playbackSkipSilence,
                                          @Nullable final String playbackQuality,
-                                         final boolean resumePlayback) {
+                                         final boolean resumePlayback,
+                                         final boolean startPaused) {
         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);
+                .putExtra(BasePlayer.PLAYBACK_SKIP_SILENCE, playbackSkipSilence)
+                .putExtra(BasePlayer.START_PAUSED, startPaused);
     }
 
     public static void playOnMainPlayer(final Context context, final PlayQueue queue, final boolean resumePlayback) {

From ef90493c27af898d8e79adbb5e8d449ef5d0ae35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Jakse?= <raphael.github@jakse.fr>
Date: Thu, 16 Jan 2020 20:46:11 +0100
Subject: [PATCH 025/199] Deduplicate code switching to another player into a
 function

---
 .../player/BackgroundPlayerActivity.java       |  8 +-------
 .../player/PopupVideoPlayerActivity.java       |  8 +-------
 .../newpipe/player/ServicePlayerActivity.java  | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
index 59f6e1e6d..1b5b5d07c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
@@ -55,13 +55,7 @@ public final class BackgroundPlayerActivity extends ServicePlayerActivity {
                 return true;
             }
 
-            this.player.setRecovery();
-            getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
-            getApplicationContext().startService(
-                getSwitchIntent(PopupVideoPlayer.class)
-                    .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
-            );
-            return true;
+            return switchTo(PopupVideoPlayer.class);
         }
         return false;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java
index 5000d07e2..b2af6d9d8 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java
@@ -48,13 +48,7 @@ public final class PopupVideoPlayerActivity extends ServicePlayerActivity {
     @Override
     public boolean onPlayerOptionSelected(MenuItem item) {
         if (item.getItemId() == R.id.action_switch_background) {
-            this.player.setRecovery();
-            getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
-            getApplicationContext().startService(
-                getSwitchIntent(BackgroundPlayer.class)
-                    .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
-            );
-            return true;
+            return switchTo(BackgroundPlayer.class);
         }
         return false;
     }
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 a7b3006a1..b5a697d05 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -165,13 +165,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
                 startActivity(new Intent(Settings.ACTION_SOUND_SETTINGS));
                 return true;
             case R.id.action_switch_main:
-                this.player.setRecovery();
-                getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
-                getApplicationContext().startActivity(
-                    getSwitchIntent(MainVideoPlayer.class)
-                        .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
-                );
-                return true;
+                return switchTo(MainVideoPlayer.class);
         }
         return onPlayerOptionSelected(item) || super.onOptionsItemSelected(item);
     }
@@ -194,7 +188,15 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
                 null,
                 false,
                 false
-        ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying());
+    }
+
+    protected boolean switchTo(final Class clazz) {
+        this.player.setRecovery();
+        getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
+        getApplicationContext().startActivity(getSwitchIntent(clazz));
+        return true;
     }
 
     ////////////////////////////////////////////////////////////////////////////

From 7dbb2b206c438078676f668a9a779537730143fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Jakse?= <raphael.github@jakse.fr>
Date: Thu, 16 Jan 2020 20:46:52 +0100
Subject: [PATCH 026/199] Simplify an if expression

---
 app/src/main/java/org/schabi/newpipe/player/BasePlayer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 cd1ec07f9..46ca3921d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -946,10 +946,10 @@ public abstract class BasePlayer implements
     public void onPlayPause() {
         if (DEBUG) Log.d(TAG, "onPlayPause() called");
 
-        if (!isPlaying()) {
-            onPlay();
-        } else {
+        if (isPlaying()) {
             onPause();
+        } else {
+            onPlay();
         }
     }
 

From 845767e2f8f62dc34452e54723a2dd3670c93ff7 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Sat, 18 Jan 2020 00:43:38 -0300
Subject: [PATCH 027/199] StandardCharsets.UTF_8 instead of
 Charset.forName("utf-8")

---
 .../main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java b/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
index 75e16edad..696f24d05 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
@@ -22,7 +22,7 @@ public class SrtFromTtmlWriter {
 
     private SharpStream out;
     private boolean ignoreEmptyFrames;
-    private final Charset charset = Charset.forName("utf-8");
+    private final Charset charset = StandardCharsets.UTF_8;
 
     private int frameIndex = 0;
 

From a2d3e2c7e0799fbc9fba717d7cc586dbf63ac241 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Sat, 18 Jan 2020 01:10:25 -0300
Subject: [PATCH 028/199] 2 typo fixup * add missing namespace of
 StandardCharsets * use an unused constructor argument

---
 .../java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java b/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
index 696f24d05..e20b06352 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
@@ -12,7 +12,7 @@ import org.schabi.newpipe.streams.io.SharpStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.text.ParseException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * @author kapodamy
@@ -28,7 +28,7 @@ public class SrtFromTtmlWriter {
 
     public SrtFromTtmlWriter(SharpStream out, boolean ignoreEmptyFrames) {
         this.out = out;
-        this.ignoreEmptyFrames = true;
+        this.ignoreEmptyFrames = ignoreEmptyFrames;
     }
 
     private static String getTimestamp(Element frame, String attr) {

From b155f23d276ebc48ffe5fe86759320b6751ac512 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 18 Jan 2020 09:46:38 +0100
Subject: [PATCH 029/199] fix: wrong language shown in playback parameters
 dialog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a hardly reproduceable bug that I hopefully fixed. After a long time of watching videos, you could have your system language shown in playback parameters dialog.
Calling changeAppLanguage(getAppLocale(…),…) onCreate will most certainly fix this bug
---
 .../schabi/newpipe/player/helper/PlaybackParameterDialog.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
index 4feed74fe..2aefa675e 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
@@ -17,6 +17,8 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.SliderStrategy;
 
 import static org.schabi.newpipe.player.BasePlayer.DEBUG;
+import static org.schabi.newpipe.util.Localization.changeAppLanguage;
+import static org.schabi.newpipe.util.Localization.getAppLocale;
 
 public class PlaybackParameterDialog extends DialogFragment {
     @NonNull private static final String TAG = "PlaybackParameterDialog";
@@ -108,6 +110,7 @@ public class PlaybackParameterDialog extends DialogFragment {
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
+        changeAppLanguage(getAppLocale(getContext()), getResources());
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
             initialTempo = savedInstanceState.getDouble(INITIAL_TEMPO_KEY, DEFAULT_TEMPO);
@@ -137,6 +140,7 @@ public class PlaybackParameterDialog extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        changeAppLanguage(getAppLocale(getContext()), getResources());
         final View view = View.inflate(getContext(), R.layout.dialog_playback_parameter, null);
         setupControlViews(view);
 

From e08e7245738ca8ee5dab4dc5801dc6d35399873a Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 18 Jan 2020 10:46:53 +0100
Subject: [PATCH 030/199] upload date in description now matches newpipe's
 language

---
 .../main/java/org/schabi/newpipe/util/Localization.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index 3f555fcfd..d2fbd3a65 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.util;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
@@ -118,12 +119,13 @@ public class Localization {
         return nf.format(number);
     }
 
-    public static String formatDate(Date date) {
-        return DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault()).format(date);
+    public static String formatDate(Date date, Context context) {
+        return DateFormat.getDateInstance(DateFormat.MEDIUM, getAppLocale(context)).format(date);
     }
 
+    @SuppressLint("StringFormatInvalid")
     public static String localizeUploadDate(Context context, Date date) {
-        return context.getString(R.string.upload_date_text, formatDate(date));
+        return context.getString(R.string.upload_date_text, formatDate(date, context));
     }
 
     public static String localizeViewCount(Context context, long viewCount) {

From 77aa12dd8195dae7a2f782f97d3439e4e39fd1a1 Mon Sep 17 00:00:00 2001
From: Xiang Rong Lin <41164160+XiangRongLin@users.noreply.github.com>
Date: Mon, 13 Jan 2020 20:24:24 +0100
Subject: [PATCH 031/199] Rename local playlist by long-clicking in
 BookmarkFragment.

After long clicking on a local playlist, show a dialog with 2 options for "rename" and "delete"
Rename shows another dialog to let the user rename the playlist.
Delete lets the user delete a playlist like before.
---
 .../local/bookmark/BookmarkFragment.java      | 67 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
index 8f67367aa..6a7f16025 100644
--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -1,8 +1,13 @@
 package org.schabi.newpipe.local.bookmark;
 
 import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.util.Log;
+import android.widget.EditText;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
@@ -10,6 +15,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import io.reactivex.disposables.Disposable;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.schabi.newpipe.NewPipeDatabase;
@@ -118,7 +124,33 @@ public final class BookmarkFragment
             @Override
             public void held(LocalItem selectedItem) {
                 if (selectedItem instanceof PlaylistMetadataEntry) {
-                    showLocalDeleteDialog((PlaylistMetadataEntry) selectedItem);
+                    final Resources resources = getContext().getResources();
+                    String[] commands = new String[]{
+                        resources.getString(R.string.rename_playlist),
+                        resources.getString(R.string.delete_playlist)
+                    };
+
+                    final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+                        switch (i) {
+                            case 0:
+                                showLocalRenameDialog((PlaylistMetadataEntry) selectedItem);
+                                break;
+                            case 1:
+                                showLocalDeleteDialog((PlaylistMetadataEntry) selectedItem);
+                                break;
+                        }
+                    };
+
+                    final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
+                    bannerView.setSelected(true);
+                    TextView titleView = bannerView.findViewById(R.id.itemTitleView);
+                    titleView.setText(((PlaylistMetadataEntry) selectedItem).name);
+
+                    new AlertDialog.Builder(getActivity())
+                        .setCustomTitle(bannerView)
+                        .setItems(commands, actions)
+                        .create()
+                        .show();
 
                 } else if (selectedItem instanceof PlaylistRemoteEntity) {
                     showRemoteDeleteDialog((PlaylistRemoteEntity) selectedItem);
@@ -271,6 +303,39 @@ public final class BookmarkFragment
                 .show();
     }
 
+    private void showLocalRenameDialog(PlaylistMetadataEntry selectedItem) {
+        final View dialogView = View.inflate(getContext(), R.layout.dialog_playlist_name, null);
+        EditText nameEdit = dialogView.findViewById(R.id.playlist_name);
+        nameEdit.setText(selectedItem.name);
+        nameEdit.setSelection(nameEdit.getText().length());
+
+        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(
+            getContext())
+            .setTitle(R.string.rename_playlist)
+            .setView(dialogView)
+            .setCancelable(true)
+            .setNegativeButton(R.string.cancel, null)
+            .setPositiveButton(R.string.rename, (dialogInterface, i) -> {
+                changeLocalPlaylistName(selectedItem.uid, nameEdit.getText().toString());
+            });
+        dialogBuilder.show();
+    }
+
+    private void changeLocalPlaylistName(long id, String name) {
+        if (localPlaylistManager == null) {
+            return;
+        }
+
+        Log.d(TAG, "Updating playlist id=[" + id +
+            "] with new name=[" + name + "] items");
+
+        localPlaylistManager.renamePlaylist(id, name);
+        final Disposable disposable = localPlaylistManager.renamePlaylist(id, name)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(longs -> {/*Do nothing on success*/}, this::onError);
+        disposables.add(disposable);
+    }
+
     private static List<PlaylistLocalItem> merge(final List<PlaylistMetadataEntry> localPlaylists,
                                                  final List<PlaylistRemoteEntity> remotePlaylists) {
         List<PlaylistLocalItem> items = new ArrayList<>(

From 9d5612d1046b08ae9c03d75e561868ce73c66604 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Sat, 18 Jan 2020 19:34:22 +0000
Subject: [PATCH 032/199] Translated using Weblate (German)

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

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 53b9a52eb..9a2482814 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -155,7 +155,7 @@
     <string name="tab_about">Über</string>
     <string name="app_description">Freies und schlankes Streaming für Android.</string>
     <string name="app_license_title">NewPipes Lizenz</string>
-    <string name="contribution_encouragement">Ob Ideen, Übersetzungen, Design-Änderungen, Code-Aufräumung oder richtig große Code-Änderungen – Hilfe ist immer willkommen. Je mehr geholfen wird, desto besser wird NewPipe!</string>
+    <string name="contribution_encouragement">Ob Ideen, Übersetzungen, Design-Änderungen, Code-Aufräumung oder richtig große Code-Änderungen — Hilfe ist immer willkommen. Je mehr geholfen wird, desto besser wird NewPipe!</string>
     <string name="title_licenses">Drittanbieter-Lizenzen</string>
     <string name="view_on_github">Auf GitHub ansehen</string>
     <string name="contribution_title">Beitragen</string>
@@ -366,7 +366,7 @@
     <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="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>
@@ -392,7 +392,7 @@
     <string name="limit_data_usage_none_description">Unbegrenzt</string>
     <string name="limit_mobile_data_usage_title">Auflösung bei Verwendung mobiler Daten begrenzen</string>
     <string name="minimize_on_exit_title">Minimieren beim Appwechsel</string>
-    <string name="minimize_on_exit_summary">Aktion beim Umschalten auf eine andere App vom Haupt-Videoplayer - %s</string>
+    <string name="minimize_on_exit_summary">Aktion beim Umschalten auf eine andere App vom Haupt-Videoplayer — %s</string>
     <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>

From 6b7043fb9d7aa50ecf47b691f908ee70e8c56572 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Fri, 17 Jan 2020 08:52:56 +0000
Subject: [PATCH 033/199] Translated using Weblate (French)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-fr/strings.xml | 31 ++++++++++++++------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 444310aef..7695fe31c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -19,14 +19,14 @@
     <string name="share">Partager</string>
     <string name="share_dialog_title">Partager avec</string>
     <string name="show_play_with_kodi_summary">Affiche une option pour lire une vidéo via Kodi</string>
-    <string name="show_play_with_kodi_title">Afficher l’option « Lire avec Kodi »</string>
+    <string name="show_play_with_kodi_title">Afficher l’option « Lire avec Kodi »</string>
     <string name="upload_date_text">Publiée le %1$s</string>
     <string name="view_count_text">%1$s vues</string>
     <string name="play_audio">Audio</string>
     <string name="default_audio_format_title">Format audio par défaut</string>
     <string name="download_dialog_title">Télécharger</string>
     <string name="next_video_title">Suivant</string>
-    <string name="show_next_and_similar_title">Afficher les vidéos « Suivantes » et « Similaires »</string>
+    <string name="show_next_and_similar_title">Afficher les vidéos « Suivantes » et « Similaires »</string>
     <string name="url_not_supported_toast">URL non pris en charge</string>
     <string name="settings_category_video_audio_title">Vidéo et audio</string>
     <string name="settings_category_other_title">Autre</string>
@@ -50,8 +50,8 @@
     <string name="download_path_audio_title">Dossier de téléchargement audio</string>
     <string name="download_path_audio_summary">Les fichiers audio téléchargés sont stockés ici</string>
     <string name="download_path_audio_dialog_title">Choisissez le dossier 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="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 indisponible</string>
@@ -231,8 +231,8 @@
     <string name="play_queue_remove">Retirer</string>
     <string name="play_queue_stream_detail">Détails</string>
     <string name="play_queue_audio_settings">Paramètres audios</string>
-    <string name="show_hold_to_append_title">Afficher l’astuce « Maintenir pour ajouter »</string>
-    <string name="show_hold_to_append_summary">Affiche l’astuce lors de l’appui du bouton « Arrière-plan » ou « Mode flottant » sur la page de détails d’une vidéo</string>
+    <string name="show_hold_to_append_title">Afficher l’astuce « Maintenir pour ajouter »</string>
+    <string name="show_hold_to_append_summary">Affiche l’astuce lors de l’appui du bouton « Arrière-plan » ou « Mode flottant » 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 depuis l’erreur du lecteur</string>
     <string name="kiosk_page_summary">Kiosque</string>
@@ -348,11 +348,11 @@
 \n1. Suivez ce lien : %1$s.
 \n2. Connectez-vous à votre compte.
 \n3. Un téléchargement va démarrer (celui du fichier d’exportation).</string>
-    <string name="import_soundcloud_instructions">Veuillez importer un profil SoundCloud en saisissant l’URL de votre profil ou votre identifiant.
-\n
-\n1. Activez le « mode bureau » dans votre navigateur web (le site n’est pas disponible pour les appareils mobiles).
-\n2. Suivez cette URL : %1$s.
-\n3. Connectez-vous à votre compte.
+    <string name="import_soundcloud_instructions">Veuillez importer un profil SoundCloud en saisissant l’URL de votre profil ou votre identifiant. 
+\n 
+\n1. Activez le « mode bureau » dans votre navigateur web (le site n’est pas disponible pour les appareils mobiles). 
+\n2. Suivez cette URL : %1$s. 
+\n3. Connectez-vous à votre compte. 
 \n4. Copiez l’URL du profil vers lequel vous venez d’être redirigé.</string>
     <string name="import_soundcloud_instructions_hint">votre identifiant, soundcloud.com/votreidentifiant</string>
     <string name="import_network_expensive_warning">Cette opération peut charger énormément la connexion réseau.
@@ -484,7 +484,7 @@
     <string name="error_postprocessing_stopped">NewPipe a été fermé alors qu’il travaillait sur le fichier</string>
     <string name="error_insufficient_storage">Aucun espace disponible sur le périphérique</string>
     <string name="error_progress_lost">Progression perdue, car le fichier a été effacé</string>
-    <string name="confirm_prompt">Êtes-vous sûr \?</string>
+    <string name="confirm_prompt">Voulez-vous effacer l\'historique de téléchargement ou supprimer tous les fichiers téléchargés \?</string>
     <string name="enable_queue_limit">Limiter la file d’attente de téléchargement</string>
     <string name="enable_queue_limit_desc">Un téléchargement s’exécutera en même temps</string>
     <string name="start_downloads">Démarrer les téléchargements</string>
@@ -508,8 +508,8 @@
     <string name="default_kiosk_page_summary">Kiosque par défaut</string>
     <string name="no_one_watching">Personne ne regarde</string>
     <plurals name="watching">
-        <item quantity="one">%s regarde</item>
-        <item quantity="other">%s regardent</item>
+        <item quantity="one">%s spectateur</item>
+        <item quantity="other">%s spectateurs</item>
     </plurals>
     <string name="no_one_listening">Personne n\'écoute</string>
     <plurals name="listening">
@@ -535,4 +535,7 @@
     <string name="playlist_no_uploader">Généré automatiquement (pas de téléverseur trouvé)</string>
     <string name="enable_lock_screen_video_thumbnail_title">Activer la vidéo miniaturisée sur l\'écran de verrouillage</string>
     <string name="enable_lock_screen_video_thumbnail_summary">En utilisant le lecteur audio, la miniature de la vidéo sera affichée sur l\'écran de verrouillage</string>
+    <string name="clear_download_history">Effacer l\'historique de téléchargement</string>
+    <string name="delete_downloaded_files">Supprimer les fichiers téléchargés</string>
+    <string name="deleted_downloads">%1$s téléchargements supprimés</string>
 </resources>
\ No newline at end of file

From 2873f723e88c4c9b41928082e1969df101b19e04 Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <i.nedoboy@mail.ru>
Date: Thu, 16 Jan 2020 20:12:21 +0000
Subject: [PATCH 034/199] Translated using Weblate (Russian)

Currently translated at 100.0% (527 of 527 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 1da98cc74..975a9479b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -330,7 +330,7 @@
     <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_disposed_exceptions_title">Сообщать об ошибках жизненного цикла</string>

From 5dbab85505a1f20255dcc8cd566057f2fb12221d Mon Sep 17 00:00:00 2001
From: pjammo <adrianoghr@hotmail.it>
Date: Thu, 16 Jan 2020 16:07:08 +0000
Subject: [PATCH 035/199] Translated using Weblate (Italian)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-it/strings.xml | 87 ++++++++++++++------------
 1 file changed, 46 insertions(+), 41 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4942f4720..9d9241045 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -30,9 +30,9 @@
     <string name="url_not_supported_toast">URL non supportato</string>
     <string name="content_language_title">Lingua Predefinita per 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="list_thumbnail_view_description">Copertina di anteprima video</string>
     <string name="detail_thumbnail_view_description">Riproduci video, durata:</string>
-    <string name="detail_uploader_thumbnail_view_description">Miniatura dell\'immagine di profilo dell\'utente</string>
+    <string name="detail_uploader_thumbnail_view_description">Immagine di profilo dell\'utente</string>
     <string name="detail_dislikes_img_view_description">Non mi piace</string>
     <string name="detail_likes_img_view_description">Mi piace</string>
     <string name="err_dir_create">Impossibile creare la cartella di download \'%1$s\'</string>
@@ -51,7 +51,7 @@
     <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>
+    <string name="could_not_load_thumbnails">Impossibile caricare tutte le copertine</string>
     <string name="youtube_signature_decryption_error">Impossibile decriptare la firma dell\'URL del video</string>
     <string name="content_not_available">Contenuto non disponibile</string>
     <string name="use_tor_title">Usa Tor</string>
@@ -117,19 +117,19 @@
     <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="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_external_video_player_summary">L\'audio potrebbe non essere disponibile per ALCUNE risoluzioni</string>
-    <string name="controls_background_title">In sottofondo</string>
+    <string name="controls_background_title">In Sottofondo</string>
     <string name="controls_popup_title">Popup</string>
     <string name="default_popup_resolution_title">Risoluzione Predefinita Popup</string>
     <string name="show_higher_resolutions_title">Mostra Altre Risoluzioni</string>
     <string name="show_higher_resolutions_summary">Solo alcuni dispositivi supportano la riproduzione video in 2K e 4K</string>
     <string name="default_video_format_title">Formato Video Predefinito</string>
     <string name="popup_remember_size_pos_title">Ricorda Dimensione e Posizione Popup</string>
-    <string name="popup_remember_size_pos_summary">Ricorda l\'ultima dimensione e posizione della finestra popup</string>
+    <string name="popup_remember_size_pos_summary">Ricorda dimensione e posizione della finestra Popup</string>
     <string name="player_gesture_controls_title">Controllo Movimenti Lettore Multimediale</string>
     <string name="player_gesture_controls_summary">Usa i movimenti per controllare luminosità e volume del lettore multimediale</string>
     <string name="show_search_suggestions_title">Suggerimenti Ricerca</string>
@@ -140,8 +140,8 @@
     <string name="clear">Cancella</string>
     <string name="popup_resizing_indicator_title">Ridimensionamento</string>
     <string name="best_resolution">Risoluzione migliore</string>
-    <string name="msg_popup_permission">Questo permesso è necessario
-\nper riprodurre in modalità popup</string>
+    <string name="msg_popup_permission">Questo permesso è necessario 
+\nper utilizzare il lettore Popup</string>
     <string name="action_settings">Impostazioni</string>
     <string name="action_about">Informazioni</string>
     <string name="title_licenses">Licenze di Terze Parti</string>
@@ -191,7 +191,7 @@
     <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="notification_channel_description">Notifiche per lettore in Sottofondo e Popup</string>
     <string name="search_no_results">Nessun risultato</string>
     <string name="no_subscribers">Nessun iscritto</string>
     <plurals name="subscribers">
@@ -225,25 +225,25 @@
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">New &amp; hot</string>
     <string name="show_hold_to_append_title">Mostra Suggerimento \"Tieni Premuto per Accocodare\"</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 in Sottofondo</string>
-    <string name="popup_playing_append">In Coda in Modalità Popup</string>
+    <string name="show_hold_to_append_summary">Nella pagina dei dettagli del video, mostra un suggerimento alla pressione dei pulsanti per la riproduzione Popup o in Sottofondo</string>
+    <string name="background_player_append">Accoda in Sottofondo</string>
+    <string name="popup_playing_append">Accodato in Popup</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="title_activity_background_player">Riproduzione in Sottofondo</string>
+    <string name="title_activity_popup_player">Lettore Popup</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="play_queue_audio_settings">Impostazioni Audio</string>
+    <string name="hold_to_append">Tenere premuto per accodare</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="enqueue_on_background">Accoda in Sottofondo</string>
+    <string name="enqueue_on_popup">Accoda in Popup</string>
     <string name="start_here_on_main">Inizia la riproduzione qui</string>
     <string name="start_here_on_background">Avvia riproduzione in sottofondo</string>
-    <string name="start_here_on_popup">Avvia riproduzione a comparsa</string>
+    <string name="start_here_on_popup">Avvia subito in Popup</string>
     <string name="donation_title">Dona</string>
     <string name="website_title">Sito</string>
     <string name="website_encouragement">Visita il sito di NewPipe per informazioni e novità.</string>
@@ -251,9 +251,9 @@
     <string name="give_back">Restituisci</string>
     <string name="default_content_country_title">Paese Predefinito per Contenuti</string>
     <string name="toggle_orientation">Cambia orientamento</string>
-    <string name="switch_to_background">Passa alla riproduzione in background</string>
+    <string name="switch_to_background">Passa in Sottofondo</string>
     <string name="switch_to_popup">Passa a Popup</string>
-    <string name="switch_to_main">Passa alla produzione predefinita</string>
+    <string name="switch_to_main">Passa a Principale</string>
     <string name="service_title">Servizio</string>
     <string name="drawer_open">Apri il menu</string>
     <string name="drawer_close">Chiudi il menu</string>
@@ -265,8 +265,8 @@
     <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="background_player">Riproduzione in Sottofondo</string>
+    <string name="popup_player">Lettore Popup</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>
@@ -298,13 +298,13 @@
     <string name="rename_playlist">Rinomina</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="set_as_playlist_thumbnail">Imposta come Copertina della Playlist</string>
     <string name="bookmark_playlist">Segnalibri playlist</string>
     <string name="unbookmark_playlist">Rimuovi segnalibro</string>
     <string name="delete_playlist_prompt">Eliminare la playlist\?</string>
     <string name="playlist_creation_success">Playlist creata</string>
     <string name="playlist_add_stream_success">Aggiunto alla Playlist</string>
-    <string name="playlist_thumbnail_change_success">Miniatura della Playlist cambiata.</string>
+    <string name="playlist_thumbnail_change_success">Copertina playlist cambiata.</string>
     <string name="playlist_delete_failure">Impossibile eliminare la Playlist.</string>
     <string name="caption_none">Nessun Sottotitolo</string>
     <string name="resize_fit">Rientrato</string>
@@ -352,7 +352,7 @@
     <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 Anteprime</string>
+    <string name="download_thumbnail_title">Carica Copertine</string>
     <string name="download_thumbnail_summary">Disabilita per prevenire il caricamento delle anteprime, 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">Cache immagini svuotata</string>
     <string name="metadata_cache_wipe_title">Pulisci Cache Metadati</string>
@@ -393,11 +393,11 @@
     <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="minimize_on_exit_title">Riduci Cambiando App</string>
+    <string name="minimize_on_exit_summary">Azione da eseguire cambiando app dal lettore video principale — %s</string>
+    <string name="minimize_on_exit_none_description">Niente</string>
+    <string name="minimize_on_exit_background_description">Riduci in Sottofondo</string>
+    <string name="minimize_on_exit_popup_description">Riduci a Popup</string>
     <string name="channels">Canali</string>
     <string name="playlists">Playlist</string>
     <string name="tracks">Tracce</string>
@@ -423,7 +423,7 @@
     <string name="selection">Selezione</string>
     <string name="updates_setting_title">Aggiornamenti</string>
     <string name="updates_setting_description">Mostra una notifica per suggerire l\'aggiornamento dell\'app se una nuova versione è disponibile</string>
-    <string name="list_view_mode">Visualizzazione a lista</string>
+    <string name="list_view_mode">Modalità Visualizzazione Lista</string>
     <string name="list">Lista</string>
     <string name="grid">Griglia</string>
     <string name="auto">Automatica</string>
@@ -433,14 +433,14 @@
     <string name="missions_header_finished">Finito</string>
     <string name="missions_header_pending">In attesa</string>
     <string name="paused">in pausa</string>
-    <string name="queued">in coda</string>
+    <string name="queued">accodato</string>
     <string name="post_processing">post-processo</string>
     <string name="enqueue">Accoda</string>
     <string name="permission_denied">Azione negata dal sistema</string>
     <string name="download_failed">Download fallito</string>
     <string name="download_finished">Download terminato</string>
     <string name="download_finished_more">%s download terminati</string>
-    <string name="generate_unique_name">Genera un nome unico</string>
+    <string name="generate_unique_name">Genera Nome Univoco</string>
     <string name="overwrite">Sovrascrivi</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 corso con questo nome</string>
@@ -484,11 +484,11 @@
     <string name="missing_file">File spostato o cancellato</string>
     <string name="overwrite_unrelated_warning">Esiste già un file con questo nome</string>
     <string name="overwrite_failed">impossibile sovrascrivere il file</string>
-    <string name="download_already_pending">C\'è un download in corso con questo nome</string>
+    <string name="download_already_pending">C\'è un download in attesa con questo nome</string>
     <string name="error_postprocessing_stopped">NewPipe è stato chiuso mentre lavorava sul file</string>
     <string name="error_insufficient_storage">Spazio insufficiente sul dispositivo</string>
     <string name="error_progress_lost">Progresso perso poiché il file è stato eliminato</string>
-    <string name="confirm_prompt">Sei sicuro\?</string>
+    <string name="confirm_prompt">Pulire la cronologia dei download o eliminare tutti i file scaricati\?</string>
     <string name="enable_queue_limit_desc">Sarà avviato un solo dowload per volta</string>
     <string name="start_downloads">Avvia downloads</string>
     <string name="pause_downloads">Metti in pausa i downloads</string>
@@ -519,10 +519,10 @@
     <string name="default_kiosk_page_summary">Contenuti in Evidenza Predefiniti</string>
     <string name="seek_duration_title">Durata Avanzamento e Riavvolgimento Rapidi</string>
     <string name="peertube_instance_url_title">Istanze PeerTube</string>
-    <string name="peertube_instance_url_summary">Imposta le tue istanze PeerTube preferite</string>
-    <string name="peertube_instance_url_help">Trova le istanze più adatte a te su https://joinpeertube.org/instances#instances-list</string>
+    <string name="peertube_instance_url_summary">Seleziona le istanze PeerTube preferite</string>
+    <string name="peertube_instance_url_help">Trova le istanze più adatte a te su %s</string>
     <string name="peertube_instance_add_title">Aggiungi Istanza</string>
-    <string name="peertube_instance_add_help">Inserisci URL Istanza</string>
+    <string name="peertube_instance_add_help">Inserisci URL istanza</string>
     <string name="peertube_instance_add_fail">Impossibile convalidare l\'istanza</string>
     <string name="peertube_instance_add_https_only">Sono supportati solo gli URL HTTPS</string>
     <string name="peertube_instance_add_exists">L\'istanza esiste già</string>
@@ -533,4 +533,9 @@
     <string name="recovering">recupero</string>
     <string name="error_download_resource_gone">Impossibile recuperare questo download</string>
     <string name="choose_instance_prompt">Scegli un\'Istanza</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Abilita Copertine sulla Schermata di Blocco</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Durante la riproduzione in sottofondo, verrà mostrata la copertina del video sulla schermata di blocco</string>
+    <string name="clear_download_history">Svuota Cronologia Download</string>
+    <string name="delete_downloaded_files">Elimina File Scaricati</string>
+    <string name="deleted_downloads">%1$s download eliminati</string>
 </resources>
\ No newline at end of file

From 1c53b22239b1ef4595a68a7f19390b86b206947a Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Wed, 15 Jan 2020 20:13:19 +0000
Subject: [PATCH 036/199] Translated using Weblate (Portuguese)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-pt/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 98b85bcab..7d3fb68e3 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -487,7 +487,7 @@
     <string name="error_insufficient_storage">Não há espaço disponível no dispositivo</string>
     <string name="error_progress_lost">Progresso perdido, porque o ficheiro foi eliminado</string>
     <string name="error_timeout">Tempo limite de conexão</string>
-    <string name="confirm_prompt">Tem a certeza\?</string>
+    <string name="confirm_prompt">Quer limpar o seu histórico de descarregamentos ou apagar todos os ficheiros descarregados\?</string>
     <string name="enable_queue_limit">Limitar a fila de transferências</string>
     <string name="enable_queue_limit_desc">Uma transferências será executada ao mesmo tempo</string>
     <string name="start_downloads">Iniciar transferências</string>
@@ -534,4 +534,7 @@
     <string name="choose_instance_prompt">Escolha uma instância</string>
     <string name="enable_lock_screen_video_thumbnail_title">Ativar miniatura do vídeo no ecrã de bloqueio</string>
     <string name="enable_lock_screen_video_thumbnail_summary">Ao usar o reprodutor de fundo, uma miniatura de vídeo será exibida no ecrã de bloqueio</string>
+    <string name="clear_download_history">Limpar histórico de descarregamentos</string>
+    <string name="delete_downloaded_files">Apagar ficheiros descarregados</string>
+    <string name="deleted_downloads">%1$s descarregamentos apagados</string>
 </resources>
\ No newline at end of file

From 9c9a432ea0240d33d43a9733ec08251c1c824b91 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 18 Jan 2020 11:53:19 +0000
Subject: [PATCH 037/199] Translated using Weblate (Basque)

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

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index b376f1f6d..7563e1be5 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -488,7 +488,7 @@
     <string name="error_postprocessing_stopped">NewPipe itxi egin da fitxategian lanean zegoela</string>
     <string name="error_insufficient_storage">Ez dago lekurik gailuan</string>
     <string name="error_progress_lost">Progresioa galdu da, fitxategia ezabatu delako</string>
-    <string name="confirm_prompt">Ziur al zaude\?</string>
+    <string name="confirm_prompt">Zure deskargen historiala garbitu nahi duzu ala deskargatutako fitxategi guztiak ezabatu\?</string>
     <string name="enable_queue_limit">Mugatu deskargen ilara</string>
     <string name="enable_queue_limit_desc">Deskarga bakarra aldi berean</string>
     <string name="start_downloads">Hasi deskargak</string>
@@ -533,4 +533,9 @@
     <string name="recovering">berreskuratzen</string>
     <string name="error_download_resource_gone">Ezin da deskarga hau berreskuratu</string>
     <string name="choose_instance_prompt">Aukeratu instantzia</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Gaitu bideoaren iruditxoa blokeo pantailan</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Bigarren planoko erreproduzigailua erabiltzean bideoaren iruditxo bat bistaratuko da blokeo pantailan</string>
+    <string name="clear_download_history">Garbitu deskargen historiala</string>
+    <string name="delete_downloaded_files">Ezabatu deskargatutako fitxategiak</string>
+    <string name="deleted_downloads">%1$s deskarga ezabatuta</string>
 </resources>
\ No newline at end of file

From 36c4063db681c8769ed31d75a9d42f796badec88 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Fri, 17 Jan 2020 08:55:28 +0000
Subject: [PATCH 038/199] Translated using Weblate (Esperanto)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-eo/strings.xml | 63 ++++++++++++++------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 224e8837e..c6ce250e6 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -4,14 +4,14 @@
     <string name="upload_date_text">Eldonita je %1$s</string>
     <string name="install">Instali</string>
     <string name="cancel">Nuligi</string>
-    <string name="open_in_browser">Malfermi per krozilo</string>
+    <string name="open_in_browser">Malfermi en retumilo</string>
     <string name="share">Konigi</string>
     <string name="download">Elŝuti</string>
     <string name="search">Serĉi</string>
     <string name="settings">Agordoj</string>
     <string name="did_you_mean">Ĉu vi signifis: %1$s\?</string>
     <string name="share_dialog_title">Konigi kun</string>
-    <string name="choose_browser">Elekti krozilon</string>
+    <string name="choose_browser">Elekti retumilon</string>
     <string name="screen_rotation">turno</string>
     <string name="use_external_video_player_title">Uzi eksteran filmetoludilon</string>
     <string name="use_external_audio_player_title">Uzi eksteran sonludilon</string>
@@ -66,7 +66,7 @@
     <string name="report_error">Signali eraron</string>
     <string name="video">Filmeto</string>
     <string name="retry">Reprovi</string>
-    <string name="main_bg_subtitle">Premu serĉo por komenci</string>
+    <string name="main_bg_subtitle">Premi serĉon por komenci</string>
     <string name="no_player_found_toast">Neniu elsendlflua ludilo trovita (instalu VLC por ludi ĝin).</string>
     <string name="open_in_popup_mode">Malfermi en ŝprucfenestron modon</string>
     <string name="use_external_video_player_summary">Forigas aŭdon ĉe KELKAJ rezolucioj</string>
@@ -144,7 +144,7 @@
     <string name="enable_search_history_summary">Konservi la historio de serĉo lokale</string>
     <string name="enable_watch_history_title">Rigardu historion</string>
     <string name="enable_watch_history_summary">Spuri la viditajn filmetojn</string>
-    <string name="notification_channel_name">Newpipe Sciifo</string>
+    <string name="notification_channel_name">NewPipe Sciigo</string>
     <string name="notification_channel_description">Sciigoj por NewPipe fono kaj ŝprucfenestroj ludiloj</string>
     <string name="settings_category_player_title">Ludilo</string>
     <string name="settings_category_player_behavior_title">Konduto</string>
@@ -159,7 +159,7 @@
     <string name="show_hold_to_append_summary">Montri indikon kiam la fono aŭ ŝprucfenestro butono estas premita en la retpaĝo de dalatadoj de la filmeto</string>
     <string name="background_player_append">Viciĝita en la ludilo en fono</string>
     <string name="popup_playing_append">Viciĝita en ŝprucfenestro ludilo</string>
-    <string name="play_all">Ludi ĉiuj</string>
+    <string name="play_all">Ludi ĉiujn</string>
     <string name="player_stream_failure">Ne povis ludi tion torenton</string>
     <string name="player_unrecoverable_failure">Neatendebla eraro de ludilo okazis</string>
     <string name="player_recoverable_failure">Reakiri el eraro de la ludilo</string>
@@ -180,7 +180,7 @@
     <string name="switch_to_main">Ŝangi al Ĉefa</string>
     <string name="service_title">Servo</string>
     <string name="always">Ĉiam</string>
-    <string name="just_once">Nur unfoje</string>
+    <string name="just_once">Nur unufoje</string>
     <string name="invalid_url_toast">Nevalida ligilo</string>
     <string name="video_streams_empty">Neniuj filmeta torentoj trovitaj</string>
     <string name="audio_streams_empty">Neniuj sonaj torentoj trovis</string>
@@ -191,18 +191,18 @@
     <string name="export_data_summary">Eksporti historion, abonojn kaj ludlistoj</string>
     <string name="always_ask_open_action">Ĉiam peti</string>
     <string name="create_playlist">Nova ludlisto</string>
-    <string name="delete_playlist">Forigi</string>
+    <string name="delete_playlist">Forviŝi</string>
     <string name="rename_playlist">Alinomi</string>
     <string name="playlist_name_input">Nomo</string>
     <string name="append_playlist">Aldoni al la ludlisto</string>
     <string name="set_as_playlist_thumbnail">Meti kiel bildeto de ludlisto</string>
     <string name="bookmark_playlist">Legosigno Ludlisto</string>
-    <string name="unbookmark_playlist">Forigi Legosignon</string>
-    <string name="delete_playlist_prompt">Ĉu forigi ĉi tiun ludliston \?</string>
+    <string name="unbookmark_playlist">Forviŝi Legosignon</string>
+    <string name="delete_playlist_prompt">Ĉu forviŝi ĉi tiun ludliston \?</string>
     <string name="playlist_creation_success">Ludlisto kreita</string>
     <string name="playlist_add_stream_success">Ludlistita</string>
     <string name="playlist_thumbnail_change_success">Bildeto de ludlisto ŝanĝiĝita.</string>
-    <string name="playlist_delete_failure">Ne povis forigi ludlisto.</string>
+    <string name="playlist_delete_failure">Ne povis forviŝi ludliston.</string>
     <string name="settings_category_debug_title">Malcimigi</string>
     <string name="auto_queue_title">Auto-vico sekva fluo</string>
     <string name="auto_queue_summary">Aŭto-aldoni rilatan enhavon kiam ludanta la lasta enhavo en malrepetita atendovico</string>
@@ -218,7 +218,7 @@
 \n3. Elŝuto devus komenci (ĝi estas la dosiero de eksporto)</string>
     <string name="import_soundcloud_instructions">Importu Soundcloud-n profilon tajpante ĉu la ligilon, ĉu vian ID : 
 \n 
-\n1. Ebligu komputilon modon en krozilo (la retejo malhaveblas por poŝtelefonoj) 
+\n1. Ebligu komputilon modon en retumilon (la retejo malhaveblas por poŝtelefonoj) 
 \n2. Iru tien: %1$s 
 \n3. Ensalutu kiam oni petas vin 
 \n4. Kopiu la ligilon de profilo ke oni kondikis vin.</string>
@@ -252,7 +252,7 @@
     <string name="settings_category_updates_title">Ĝisdatigoj</string>
     <string name="file_deleted">Dosiero forviŝita</string>
     <string name="app_update_notification_channel_name">Sciigo por ĝisdatigi apon</string>
-    <string name="app_update_notification_channel_description">Sciigo por nova versio de Newpipe</string>
+    <string name="app_update_notification_channel_description">Sciigo por nova versio de NewPipe</string>
     <string name="download_to_sdcard_error_title">Ekstera konservejo malhavebla</string>
     <string name="download_to_sdcard_error_message">Elŝuti al ekstera SD-karto ne eblas. Ĉu vi volas restarigi la elŝutan dosierujon \?</string>
     <string name="queued">viciĝita</string>
@@ -281,7 +281,7 @@
     <string name="watch_history_states_deleted">Ludaj pozicioj forviŝitaj.</string>
     <string name="missing_file">Dosiero movita aŭ forviŝita</string>
     <string name="overwrite_failed">ne povas dispremi la dosieron</string>
-    <string name="confirm_prompt">Ĉu vi certas\?</string>
+    <string name="confirm_prompt">Ĉu vi volas forviŝi vian historion de elŝutoj aŭ forviŝi la tutajn elŝutitajn dosierojn\?</string>
     <string name="enable_queue_limit">Limigi la elŝutan atendovicon</string>
     <string name="enable_queue_limit_desc">Unu elŝuto ruliĝos en la sama tempo</string>
     <string name="start_downloads">Komenci elŝutojn</string>
@@ -307,7 +307,7 @@
     <string name="start">Komenci</string>
     <string name="pause">Paŭzigi</string>
     <string name="view">Ludi</string>
-    <string name="delete">Forigi</string>
+    <string name="delete">Forviŝi</string>
     <string name="checksum">Kontrolsumo</string>
     <string name="add">Nova misio</string>
     <string name="finish">Bone</string>
@@ -341,7 +341,7 @@
     <string name="tab_licenses">Permesiloj</string>
     <string name="view_on_github">Rigardu ĉe GitHub</string>
     <string name="app_license_title">Permesilo de NewPipe</string>
-    <string name="contribution_encouragement">Ĉu vi havas ideojn pri; traduko, desegnaĵoj ŝanĝoj, purigado de kodo, aŭ realaj masivaj ŝanĝoj—helpo estas ĉiam bonvena. Ju pli oni faras, des pli bonas!</string>
+    <string name="contribution_encouragement">Ĉu vi havas ideojn pri; traduko, desegnaĵoj ŝanĝoj, purigado de kodo, aŭ realaj masivaj ŝanĝoj—helpo ĉiam estas bonvena. Ju pli oni faras, des pli bonas!</string>
     <string name="read_full_license">Legi permesilon</string>
     <string name="contribution_title">Kontribui</string>
     <string name="settings_file_charset_title">Permesitaj karakteroj en dosiernomoj</string>
@@ -353,7 +353,7 @@
     <string name="history_disabled">La historio estas malŝatita</string>
     <string name="action_history">Historio</string>
     <string name="history_empty">La historio estas malplena</string>
-    <string name="history_cleared">Historio vakigita</string>
+    <string name="history_cleared">Historio forviŝita</string>
     <string name="search_no_results">Neniuj rezultoj</string>
     <string name="empty_subscription_feed_subtitle">Neniu enhavo</string>
     <string name="no_subscribers">Neniuj abonantoj</string>
@@ -377,10 +377,10 @@
     <string name="start_here_on_main">Komenci ludi ĉi tie</string>
     <string name="start_here_on_background">Komenci ludi fone</string>
     <string name="donation_title">Donaci</string>
-    <string name="donation_encouragement">NewPipe estas programada par volontuoj, elspezante tempo por alporti vin la plej bona sperto. Redonu por helpi programistojn plibonigi NewPipe dum ĝuante tason da kafo.</string>
+    <string name="donation_encouragement">NewPipe estas programadita par volontuoj, elspezante tempo por alporti vin la plej bona sperto. Redoni por helpi programistojn plibonigi NewPipe dum ĝuante tason da kafo.</string>
     <string name="give_back">Redoni</string>
     <string name="website_title">Retejo</string>
-    <string name="website_encouragement">Vizitu la retejon de NewPipe por pli da informoj kaj novaĵoj.</string>
+    <string name="website_encouragement">Viziti la retejon de NewPipe por pli da informoj kaj novaĵoj.</string>
     <string name="drawer_open">Malfermi la tirkeston</string>
     <string name="drawer_close">Fermi la tirtekston</string>
     <string name="external_player_unsupported_link_type">Ekstaraj ludantoj ne suportas tiajn ligilojn</string>
@@ -395,8 +395,8 @@
     <string name="override_current_data">Ĉi tio nuligos vian nunan aranĝon.</string>
     <string name="detail_drag_description">Trenu por reorgidi</string>
     <string name="create">Krei</string>
-    <string name="delete_one">Forigi Unu</string>
-    <string name="delete_all">Forigi ĉiujn</string>
+    <string name="delete_one">Forviŝi Unu</string>
+    <string name="delete_all">Forviŝi ĉiujn</string>
     <string name="dismiss">Rezigni</string>
     <string name="rename">Alinomi</string>
     <string name="delete_stream_history_prompt">Ĉu vi volas forviŝi tion eron el la spekta historio \?</string>
@@ -440,11 +440,11 @@
     <string name="app_license">NewPipe estas programaro sub rajtoceda permesilo: Vi povas uzi, studi, komuniki kaj plibonigi ĝin kiel vi volas. Precize, vi povas redistribui kaj/aŭ modifi ĝin sub la kondiĉoj de la Ĝenerala Publika Permesilo de GNU, kiel publikigita per la Free Software Foundation, ĉu en la versio 3, ĉu (se vi volas) ajna posta versio.</string>
     <string name="import_settings">Ĉu vi volas ankaŭ importi agordojn\?</string>
     <string name="privacy_policy_title">Privateca politiko de NewPipe</string>
-    <string name="privacy_policy_encouragement">La NewPipe projekto serioze respektas vian privatecon. Konsekvence, la apo ne kolektas ajnan datumo sen via konsento. 
-\nLa privateco politiko de Newpipe detale eksplikas kion datumon estas sendita kaj stokita kiam vi sendas falegosignalon.</string>
+    <string name="privacy_policy_encouragement">La NewPipe projekto serioze respektas vian privatecon. Konsekvence, la apo ne kolektas ajnan datumon sen via konsento. 
+\nLa privateco politiko de NewPipe detale eksplikas kion datumon estas sendita kaj stokita kiam vi sendas falegosignalon.</string>
     <string name="read_privacy_policy">Legi la privatecan politikon</string>
     <string name="start_accept_privacy_policy">Por konformiĝi al la Ĝenerala Datum-Protekta Regularon (GDPR), ni allogas vian atenton al la privateca politiko de NewPipe. Bonvolu atentive legi ĝin. 
-\nVi devas akcepti ĝin por sendi nin la cimsignalo.</string>
+\nVi devas akcepti ĝin por sendi la cimsignalon al ni.</string>
     <string name="accept">Akcepti</string>
     <string name="decline">Rifuzi</string>
     <string name="limit_data_usage_none_description">Neniu limo</string>
@@ -468,8 +468,8 @@
     <string name="grid">Krado</string>
     <string name="auto">Aŭto</string>
     <string name="switch_view">Ŝanĝi vidon</string>
-    <string name="app_update_notification_content_title">Ĝisdatigo de NewPipe havebla !</string>
-    <string name="app_update_notification_content_text">Premu por elŝuti</string>
+    <string name="app_update_notification_content_title">Ĝisdatigo de NewPipe havebla!</string>
+    <string name="app_update_notification_content_text">Premi por elŝuti</string>
     <string name="missions_header_finished">Finita</string>
     <string name="missions_header_pending">Pritraktata</string>
     <string name="paused">Paŭzigita</string>
@@ -507,8 +507,8 @@
     <string name="default_kiosk_page_summary">Defaŭlta Kiosko</string>
     <string name="no_one_watching">Neniu spektas</string>
     <plurals name="watching">
-        <item quantity="one">%s spektanta</item>
-        <item quantity="other">%s spektanta</item>
+        <item quantity="one">%s spektanto</item>
+        <item quantity="other">%s spektantoj</item>
     </plurals>
     <string name="no_one_listening">Neniu aŭskultas</string>
     <plurals name="listening">
@@ -525,13 +525,16 @@
     <string name="peertube_instance_add_fail">Ne povis validigi instanco</string>
     <string name="peertube_instance_add_https_only">Nur HTTPS ligiloj estas subtenitaj</string>
     <string name="peertube_instance_add_exists">La instanco jam ekzistas</string>
-    <string name="local">Loka</string>
-    <string name="recently_added">Freŝdate ĝisdatigita</string>
-    <string name="most_liked">La plej ŝatitatj</string>
+    <string name="local">Lokaj</string>
+    <string name="recently_added">Freŝe aldonitaj</string>
+    <string name="most_liked">La plej ŝatitaj</string>
     <string name="playlist_no_uploader">Aŭtomate generita (neniu alŝutilo trovita)</string>
     <string name="recovering">Reakiranta</string>
     <string name="error_download_resource_gone">Ne povas reakiri tion elŝuton</string>
     <string name="choose_instance_prompt">Elektu instancon</string>
     <string name="enable_lock_screen_video_thumbnail_title">Enablu bildeta filmeton ĉe ŝlosita ekrano</string>
     <string name="enable_lock_screen_video_thumbnail_summary">Uzante la fona ludilo, bildeta filmeto vidiĝos ĉe ŝlosita ekrano</string>
+    <string name="clear_download_history">Forviŝi la historion de elŝutoj</string>
+    <string name="delete_downloaded_files">Forviŝi elŝutitajn dosierojn</string>
+    <string name="deleted_downloads">%1$s elŝutoj forviŝitaj</string>
 </resources>
\ No newline at end of file

From 84dd1a688eb5d7329289384b00bc2460e84c6aea Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Fri, 17 Jan 2020 21:40:15 +0000
Subject: [PATCH 039/199] Translated using Weblate (Czech)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-cs/strings.xml | 35 ++++++++++++++++++++------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 66c952a26..548358473 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -143,7 +143,7 @@ otevření ve vyskakovacím okně</string>
     <string name="show_search_suggestions_summary">Zobrazovat návrhy při vyhledávání</string>
     <string name="enable_search_history_title">Historie vyhledávání</string>
     <string name="enable_search_history_summary">Hledané výrazy lokálně uchovávat</string>
-    <string name="enable_watch_history_title">Historie zhlédnutí</string>
+    <string name="enable_watch_history_title">Historie sledování</string>
     <string name="enable_watch_history_summary">Evidovat zhlédnutá videa</string>
     <string name="resume_on_audio_focus_gain_title">Přehrávat po přechodu do popředí</string>
     <string name="resume_on_audio_focus_gain_summary">Pokračovat v přehrávání po přerušení (např. hovor)</string>
@@ -319,7 +319,7 @@ otevření ve vyskakovacím okně</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="enable_disposed_exceptions_summary">Vynutit hlášení nedoručitelných výjimek Rx mimo fragment nebo trvání činnosti po odstraně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>
@@ -365,7 +365,7 @@ otevření ve vyskakovacím okně</string>
 \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_tempo">Tempo</string>
     <string name="playback_pitch">Výška tónu</string>
     <string name="unhook_checkbox">Rozpojit (může způsobit zkreslení)</string>
     <string name="playback_default">Výchozí nastavení</string>
@@ -483,8 +483,8 @@ otevření ve vyskakovacím okně</string>
     <string name="close">Zavřít</string>
     <string name="download_to_sdcard_error_message">Stahování na externí SD kartu není možné. Resetovat umístění složky pro stahování\?</string>
     <string name="enable_playback_resume_title">Pokračovat v přehrávání</string>
-    <string name="enable_playback_resume_summary">Obnovit poslední přehrávanou pozici</string>
-    <string name="enable_playback_state_lists_title">Pořadí v seznamech</string>
+    <string name="enable_playback_resume_summary">Obnovit poslední pozici přehrávání</string>
+    <string name="enable_playback_state_lists_title">Pozice v seznamech</string>
     <string name="settings_category_clear_data_title">Vymazat data</string>
     <string name="missing_file">Soubor přemístěn nebo smazán</string>
     <string name="overwrite_failed">soubor nelze přepsat</string>
@@ -492,7 +492,7 @@ otevření ve vyskakovacím okně</string>
     <string name="error_postprocessing_stopped">NewPipe byl ukončen v průběhu zpracovávání souboru</string>
     <string name="error_insufficient_storage">V zařízení nezbývá žádné místo</string>
     <string name="error_progress_lost">Postup ztracen, protože soubor byl smazán</string>
-    <string name="confirm_prompt">Jste si jisti\?</string>
+    <string name="confirm_prompt">Jste si jisti smazáním své historie stahování nebo smazáním všech stažených souborů\?</string>
     <string name="enable_queue_limit">Omezit frontu stahování</string>
     <string name="enable_queue_limit_desc">Najednou se bude stahovat pouze jeden soubor</string>
     <string name="start_downloads">Začít stahování</string>
@@ -504,7 +504,7 @@ otevření ve vyskakovacím okně</string>
     <string name="downloads_storage_use_saf_title">Použít SAF</string>
     <string name="downloads_storage_use_saf_summary">Storage Access Framework umožňuje stahovat na externí SD kartu.
 \nUpozornění: některá zařízení jsou nekompatibilní</string>
-    <string name="enable_playback_state_lists_summary">Ukázat poziční indikátory playbacku v seznamech</string>
+    <string name="enable_playback_state_lists_summary">Zobrazit pozici přehrávání v seznamech</string>
     <string name="watch_history_states_deleted">Pozice playbacku smazány.</string>
     <string name="error_timeout">Timeout spojení</string>
     <string name="clear_playback_states_title">Smazat pozice playbacku</string>
@@ -526,4 +526,25 @@ otevření ve vyskakovacím okně</string>
     </plurals>
     <string name="localization_changes_requires_app_restart">Ke změně jazyka dojde po restartu aplikace.</string>
     <string name="default_kiosk_page_summary">Výchozí kiosek</string>
+    <string name="seek_duration_title">Délka přetočení vpřed/zpět</string>
+    <string name="peertube_instance_url_title">Instance PeerTube</string>
+    <string name="peertube_instance_url_summary">Vybrat oblíbené instance PeerTube</string>
+    <string name="peertube_instance_url_help">Vyhledat nejvhodnější instance na %s</string>
+    <string name="peertube_instance_add_title">Přidat instanci</string>
+    <string name="peertube_instance_add_help">Zadat URL instance</string>
+    <string name="peertube_instance_add_fail">Instanci nebylo možno potvrdit</string>
+    <string name="peertube_instance_add_https_only">Podporujeme pouze URL s HTTPS</string>
+    <string name="peertube_instance_add_exists">Instance již existuje</string>
+    <string name="local">Místní</string>
+    <string name="recently_added">Přidány nedávno</string>
+    <string name="most_liked">Nejoblíbenější</string>
+    <string name="playlist_no_uploader">Autogenerovány (uploader nenalezen)</string>
+    <string name="recovering">obnovuji</string>
+    <string name="error_download_resource_gone">Toto stahování nelze obnovit</string>
+    <string name="choose_instance_prompt">Vyberte instanci</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Zapnout náhled videa na zamknuté obrazovce</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Hraje-li video na pozadí, náhled videa se ukáže na zamknuté obrazovce</string>
+    <string name="clear_download_history">Smazat historii stahování</string>
+    <string name="delete_downloaded_files">Smazat stažené soubory</string>
+    <string name="deleted_downloads">Smazat %1$s stahování</string>
 </resources>
\ No newline at end of file

From de1a92539a658e77bbbc59716c40be4a38c48d22 Mon Sep 17 00:00:00 2001
From: thami simo <simo.azad@gmail.com>
Date: Thu, 16 Jan 2020 04:11:00 +0000
Subject: [PATCH 040/199] Translated using Weblate (Arabic)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-ar/strings.xml | 62 ++++++++++++++------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b1dad5672..02f79c8ab 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -20,7 +20,7 @@
     <string name="download_path_summary">يتم تخزين ملفات الفيديو التي تم تنزيلها هنا</string>
     <string name="download_path_title">مجلد تحميل الفيديو</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="install">تثبيت</string>
     <string name="kore_not_found">تطبيق Kore غير موجود. هل تريد تثبيته ؟</string>
     <string name="light_theme_title">مضيء</string>
@@ -42,7 +42,7 @@
     <string name="share">مشاركة</string>
     <string name="share_dialog_title">مشاركة بواسطة</string>
     <string name="show_next_and_similar_title">عرض مقاطع الفيديو \"التالية\" و \"المشابهة\"</string>
-    <string name="show_play_with_kodi_summary">عرض خيارات تشغيل الفيديو من خلال مركز كودي ميديا</string>
+    <string name="show_play_with_kodi_summary">اعرض خيار لتشغيل الفيديو عبر مركز وسائط Kodi</string>
     <string name="show_play_with_kodi_title">عرض خيار التشغيل بواسطة كودي</string>
     <string name="theme_title">السمة</string>
     <string name="upload_date_text">تم النشر يوم %1$s</string>
@@ -57,7 +57,7 @@
     <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>
@@ -69,8 +69,8 @@
     <string name="enable_watch_history_title">مراقبة السجل</string>
     <string name="settings_category_history_title">التاريخ و ذاكرة التخزين المؤقت</string>
     <string name="content">محتوى</string>
-    <string name="downloads">الملفات المحملة</string>
-    <string name="downloads_title">الملفات المحملة</string>
+    <string name="downloads">التحميلات</string>
+    <string name="downloads_title">التحميلات</string>
     <string name="all">الجميع</string>
     <string name="channel">القناة</string>
     <string name="video">الفيديو</string>
@@ -80,7 +80,7 @@
     <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>
@@ -113,7 +113,7 @@
     <string name="show_age_restricted_content_title">محتوى مقيد بحسب العمر</string>
     <string name="video_is_age_restricted">"إظهار الفيديو  المقيد بحسب العمر. يمكن السماح باستخدام هذه المواد من \"الإعدادات\"."</string>
     <string name="duration_live">بث مباشر</string>
-    <string name="error_report_title">تقرير عن مشكلة</string>
+    <string name="error_report_title">تقرير خطأ</string>
     <string name="playlist">قائمة التشغيل</string>
     <string name="yes">نعم</string>
     <string name="later">لاحقاً</string>
@@ -155,15 +155,15 @@
     <string name="storage_permission_denied">تم رفض إذن الوصول إلى التخزين</string>
     <string name="short_thousand">ألف</string>
     <string name="short_million">مليون</string>
-    <string name="short_billion">G</string>
+    <string name="short_billion">B</string>
     <string name="no_subscribers">ليس هناك مشترِكون</string>
     <plurals name="subscribers">
-        <item quantity="zero">%s لا يوجد مشاركين</item>
+        <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>
+        <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>
@@ -200,7 +200,7 @@
     <string name="action_open_website">فتح الموقع</string>
     <string name="tab_contributors">المساهمون</string>
     <string name="tab_licenses">التراخيص</string>
-    <string name="app_description">تطبيق مجاني خفيف الوزن وبث حي على نظام أندرويد.</string>
+    <string name="app_description">تطبيق مجاني خفيف البث على أندرويد.</string>
     <string name="contribution_title">ساهم</string>
     <string name="contribution_encouragement">إذا كانت لديك أفكار؛ أو ترجمة، أو تغييرات تخص التصميم، أو تنظيف و تحسين الشفرة البرمجية ، أو تعديلات عميقة عليها، فتذكر أنّ مساعدتك دائما موضع ترحيب. وكلما أتممنا شيئا كلما كان ذلك أفضل !</string>
     <string name="view_on_github">عرض على GitHub</string>
@@ -238,12 +238,12 @@
     <string name="reCaptcha_title">تحدي الكابتشا</string>
     <string name="hold_to_append">ضغط مطول للإدراج الى قائمة الانتظار</string>
     <plurals name="views">
-        <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>
+        <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>
     <plurals name="videos">
         <item quantity="zero">فيديوهات</item>
@@ -425,7 +425,7 @@
     <string name="app_update_notification_channel_name">تتبيه تحديث التطبيق</string>
     <string name="volume_gesture_control_title">إيماءة التحكم بالصوت</string>
     <string name="events">الأحداث</string>
-    <string name="app_update_notification_channel_description">إخطارات لنسخة NewPipe الجديدة</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="saved_tabs_invalid_json">باستخدام علامات التبويب الافتراضية ، خطأ أثناء قراءة علامات التبويب المحفوظة</string>
@@ -449,7 +449,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>
@@ -504,7 +504,7 @@
     <string name="error_insufficient_storage">لم يتبقى مساحة في الجهاز</string>
     <string name="error_progress_lost">تم فقد التقدم بسبب حذف الملف</string>
     <string name="error_timeout">انتهى وقت الاتصال</string>
-    <string name="confirm_prompt">هل أنت واثق؟</string>
+    <string name="confirm_prompt">هل تريد محو سجل التنزيل أو حذف جميع الملفات التي تم تنزيلها؟</string>
     <string name="enable_queue_limit">حد قائمة انتظار التنزيل</string>
     <string name="enable_queue_limit_desc">سيتم تشغيل تنزيل واحد في نفس الوقت</string>
     <string name="start_downloads">بدء التنزيلات</string>
@@ -542,11 +542,11 @@
     </plurals>
     <string name="seek_duration_title">تسريع إلى الأمام/-ترجيع وقت البحث</string>
     <string name="peertube_instance_url_title">مثيلات خوادم پيرتيوب</string>
-    <string name="peertube_instance_url_summary">عيّن مثيلات خوادم پيرتيوب التي تُفضّلها</string>
+    <string name="peertube_instance_url_summary">حدد مثيلات PeerTube المفضلة لديك</string>
     <string name="peertube_instance_add_title">إضافة نموذج</string>
-    <string name="peertube_instance_add_help">أدخل رابط مثيل الخادم</string>
-    <string name="peertube_instance_add_fail">فشل في التحقق من مثيل الخادم</string>
-    <string name="peertube_instance_add_https_only">فقط عناوين https المدعومة</string>
+    <string name="peertube_instance_add_help">أدخل عنوان URL للمثيل</string>
+    <string name="peertube_instance_add_fail">لا يمكن التحقق من صحة المثال</string>
+    <string name="peertube_instance_add_https_only">يتم دعم عناوين URL HTTPS فقط</string>
     <string name="peertube_instance_add_exists">مثيل الخادم موجود بالفعل</string>
     <string name="local">محلي</string>
     <string name="recently_added">أضيف مؤخرا</string>
@@ -554,5 +554,11 @@
     <string name="playlist_no_uploader">تم إنشاؤه-تلقائيًا (لم يتم العثور على برنامج تحميل)</string>
     <string name="recovering">استرد</string>
     <string name="error_download_resource_gone">لا يمكن استرداد هذا التنزيل</string>
-    <string name="choose_instance_prompt">اختيار مثيل خادم</string>
+    <string name="choose_instance_prompt">اختيار مثيل</string>
+    <string name="peertube_instance_url_help">ابحث عن الحالات التي تناسبك على %s</string>
+    <string name="enable_lock_screen_video_thumbnail_title">تمكين صور مصغرة قفل شاشة فيديو</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">عند استخدام مشغل الخلفية ، سيتم عرض صورة مصغرة للفيديو على شاشة القفل</string>
+    <string name="clear_download_history">تنظيف تاريخ التحميل</string>
+    <string name="delete_downloaded_files">حذف الملفات التي تم تنزيلها</string>
+    <string name="deleted_downloads">التنزيلات %1$s المحذوفة</string>
 </resources>
\ No newline at end of file

From 7e9345680578174a24043e89fb47eebb03600fd2 Mon Sep 17 00:00:00 2001
From: zmni <zmni@outlook.com>
Date: Fri, 17 Jan 2020 16:25:26 +0000
Subject: [PATCH 041/199] Translated using Weblate (Indonesian)

Currently translated at 99.8% (526 of 527 strings)
---
 app/src/main/res/values-id/strings.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 8677df678..dd8413be8 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -480,7 +480,7 @@
     <string name="error_postprocessing_stopped">NewPipe telah ditutup saat sedang memproses berkas</string>
     <string name="error_insufficient_storage">Tidak ada ruang kosong tersisa pada perangkat</string>
     <string name="error_progress_lost">Kehilangan laju, karena berkas telah dihapus</string>
-    <string name="confirm_prompt">Apakah anda yakin\?</string>
+    <string name="confirm_prompt">Apakah anda yakin ingin menghapus semua riwayat unduhan dan berkas yang telah diunduh\?</string>
     <string name="enable_queue_limit">Batasi antrean unduhan</string>
     <string name="enable_queue_limit_desc">Satu unduhan akan berjalan pada waktu yang bersamaan</string>
     <string name="start_downloads">Mulai unduh</string>
@@ -527,4 +527,8 @@
     <string name="choose_instance_prompt">Pilih situs</string>
     <string name="enable_lock_screen_video_thumbnail_title">Aktifkan kunci layar thumbnail video</string>
     <string name="enable_lock_screen_video_thumbnail_summary">Ketika menggunakan pemutar latar belakang, thumbnail video akan ditampilkan di tampilan kunci layar</string>
+    <string name="default_kiosk_page_summary">Kiosk Default</string>
+    <string name="clear_download_history">Hapus riwayat unduhan</string>
+    <string name="delete_downloaded_files">Hapus berkas yang diunduh</string>
+    <string name="deleted_downloads">%1$s unduhan dihapus</string>
 </resources>
\ No newline at end of file

From 366c55c8f49b9578b5ef6fcfe9ff1d2aa01bfc6a Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Fri, 17 Jan 2020 09:02:16 +0000
Subject: [PATCH 042/199] Translated using Weblate (Polish)

Currently translated at 100.0% (527 of 527 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 0da89ad48..4d2b38b5f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -543,5 +543,5 @@
     <string name="enable_lock_screen_video_thumbnail_summary">Podczas korzystania z odtwarzacza w tle na ekranie blokady zostanie wyświetlona miniatura filmu</string>
     <string name="clear_download_history">Wyczyść historię pobierania</string>
     <string name="delete_downloaded_files">Usuń pobrane pliki</string>
-    <string name="deleted_downloads">Usunięte% 1$s pobrania</string>
+    <string name="deleted_downloads">Usunięte %1$s pobrania</string>
 </resources>
\ No newline at end of file

From 4797cd91840a51e26728a97d111af002282da97c Mon Sep 17 00:00:00 2001
From: Matsuri <srb12345@vip.qq.com>
Date: Sat, 18 Jan 2020 03:50:06 +0000
Subject: [PATCH 043/199] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.5% (519 of 527 strings)
---
 .../main/res/values-b+zh+HANS+CN/strings.xml   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
index 078379683..4538fc184 100644
--- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml
+++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
@@ -130,8 +130,8 @@
     <string name="search_no_results">没有结果</string>
     <string name="no_subscribers">没有订阅者</string>
     <plurals name="subscribers">
-        <item quantity="one">%s个订阅者</item>
-        <item quantity="other"/>
+        <item quantity="one">%s 位订阅者</item>
+        <item quantity="other"></item>
     </plurals>
     <string name="no_videos">没有视频</string>
     <string name="detail_drag_description">拖动以重新排序</string>
@@ -410,8 +410,8 @@
     <string name="privacy_policy_encouragement">NewPipe 项目非常重视您的隐私。因此，未经您的同意，应用程序不会收集任何数据。
 \nNewPipe 的隐私政策详细解释了在发送崩溃报告时发送和存储的数据。</string>
     <string name="read_privacy_policy">阅读隐私政策</string>
-    <string name="start_accept_privacy_policy">为了遵守欧洲一般数据保护条例 （GDPR），我们提请您注意 NewPipe 的隐私政策。请仔细阅读。
-\n您必须接受它才能向我们发送错误报告。</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>
@@ -504,15 +504,15 @@
     <string name="delete_playback_states_alert">删除所有播放位置记录？</string>
     <string name="download_choose_new_path">更改下载目录让内容生效</string>
     <string name="default_kiosk_page_summary">『时下流行』页-默认</string>
-    <string name="no_one_watching">无人在线观看</string>
+    <string name="no_one_watching">没有人在观看</string>
     <plurals name="watching">
         <item quantity="one">%s 人在观看</item>
         <item quantity="other"/>
     </plurals>
-    <string name="no_one_listening">没人在听</string>
+    <string name="no_one_listening">没有人在听</string>
     <plurals name="listening">
         <item quantity="one">％s 人在听</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <string name="localization_changes_requires_app_restart">重新启动应用后，语言将更改。</string>
     <string name="peertube_instance_url_title">PeerTube 服务器</string>
@@ -531,8 +531,8 @@
     <string name="error_download_resource_gone">无法恢复此下载</string>
     <string name="choose_instance_prompt">选择一个服务器</string>
     <string name="seek_duration_title">快进 / 快退的单位时间</string>
-    <string name="enable_lock_screen_video_thumbnail_title">在锁屏界面显示视频缩略图</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">在后台播放时，锁屏界面将会显示视频的缩略图</string>
+    <string name="enable_lock_screen_video_thumbnail_title">在锁屏上显示视频缩略图</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">在后台播放时，锁屏上将会显示视频的缩略图</string>
     <string name="clear_download_history">清除下载历史记录</string>
     <string name="delete_downloaded_files">删除下载了的文件</string>
     <string name="deleted_downloads">已删除 %1$s 下载</string>

From 62906fb84a294fd847274b0f7e9ed10136915bfe Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 17 Jan 2020 03:52:10 +0000
Subject: [PATCH 044/199] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-zh-rTW/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6cb16623f..b82736f90 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -480,7 +480,7 @@
     <string name="error_postprocessing_stopped">NewPipe 在處理檔案時被關閉</string>
     <string name="error_insufficient_storage">裝置上沒有剩餘的空間</string>
     <string name="error_progress_lost">進度遺失，因為檔案已被刪除</string>
-    <string name="confirm_prompt">您確定？</string>
+    <string name="confirm_prompt">您想要清除您的下載歷史紀錄或刪除所有已下載的檔案嗎？</string>
     <string name="enable_queue_limit">限制下載佇列</string>
     <string name="enable_queue_limit_desc">一次執行一個下載</string>
     <string name="start_downloads">開始下載</string>
@@ -531,4 +531,7 @@
     <string name="choose_instance_prompt">選擇一個站臺</string>
     <string name="enable_lock_screen_video_thumbnail_title">啟用鎖定畫面影片縮圖</string>
     <string name="enable_lock_screen_video_thumbnail_summary">使用背景播放器時，鎖定畫面上將會顯示影片縮圖</string>
+    <string name="clear_download_history">清除下載歷史紀錄</string>
+    <string name="delete_downloaded_files">刪除已下載的檔案</string>
+    <string name="deleted_downloads">已刪除 %1$s 個下載</string>
 </resources>
\ No newline at end of file

From b6028cef5bf2df810774396cd1e19ef316a18785 Mon Sep 17 00:00:00 2001
From: MohammedSR Vevo <mohammednajmidin@gmail.com>
Date: Fri, 17 Jan 2020 16:14:04 +0000
Subject: [PATCH 045/199] Translated using Weblate (Kurdish)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-ku/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 50350e1b3..b6d8bb877 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -517,7 +517,7 @@
     <string name="error_insufficient_storage">بیرگەی ناوەکیت پڕبووە</string>
     <string name="error_progress_lost">کردارەکە شکستی هێنا, چونکە ئەو فایلە سڕاوەتەوە</string>
     <string name="error_timeout">هێڵی ئینتەرنێت نەما</string>
-    <string name="confirm_prompt">ئایا دڵنیای؟</string>
+    <string name="confirm_prompt">ئایا دەتەوێ مێژووی داگرتنەکانت بسڕدرێنەوە یان هەموو فایلە داگیراوەکان بسڕدرێنەوە؟</string>
     <string name="enable_queue_limit">سنوری ڕیزبوونی داگرتنەکان</string>
     <string name="enable_queue_limit_desc">تەنها یەک داگرتن کاردەکات لەیەک کاتدا</string>
     <string name="start_downloads">دەستپێکردنەوەی داگرتنەکان</string>
@@ -538,4 +538,7 @@
     <string name="choose_instance_prompt">دۆخێک هەڵبژێرە</string>
     <string name="enable_lock_screen_video_thumbnail_title">چالاککردنی وێنۆچکەی ڤیدیۆی داخستنی ڕوونما</string>
     <string name="enable_lock_screen_video_thumbnail_summary">کاتێ کارپێکەری پاشبنەما کاردەکات ئەوا وێنۆچکەی ڤیدیۆکە لە ڕوونما داخراوەکەدا نیشاندەدرێت</string>
+    <string name="clear_download_history">سڕینەوەی مێژووی داگرتن</string>
+    <string name="delete_downloaded_files">سڕینەوەی فایلە داگیراوەکان</string>
+    <string name="deleted_downloads">%1$ لە داگرتنەکان سڕانەوە</string>
 </resources>
\ No newline at end of file

From 0e39071b5e19df627b416cdf1aae143f125bb99c Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Fri, 17 Jan 2020 23:18:47 +0000
Subject: [PATCH 046/199] Translated using Weblate (Urdu)

Currently translated at 94.3% (497 of 527 strings)
---
 app/src/main/res/values-ur/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 724c9c3ed..d885cb915 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="main_bg_subtitle">شروع کرنے کے لیے تلاش پر ٹیپ کریں</string>
-    <string name="view_count_text">ملاحظات</string>
+    <string name="view_count_text">ملاحظات s$1%</string>
     <string name="upload_date_text">کوشائع ہوا</string>
     <string name="install">انسٹال</string>
     <string name="cancel">منسوخ کریں</string>
@@ -193,13 +193,13 @@
     <string name="short_billion">بی</string>
     <string name="no_subscribers">کوئی صارفین نہیں</string>
     <plurals name="subscribers">
-        <item quantity="one">s% صارف</item>
-        <item quantity="other">s% صارفین</item>
+        <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>
+        <item quantity="one">%s منظر</item>
+        <item quantity="other">%s مناظر</item>
     </plurals>
     <string name="no_videos">ویڈیوز دستیاب نہیں</string>
     <plurals name="videos">
@@ -306,7 +306,7 @@
     <string name="drawer_close">دراز بند کریں</string>
     <string name="drawer_header_action_paceholder_text">یہاں جلد ہی کچھ نظر آئے گا D D</string>
     <string name="preferred_open_action_settings_title">ترجیح \' کھلی \' عمل</string>
-    <string name="preferred_open_action_settings_summary">مواد کھولنے پر ڈیفالٹ کارروائی — s%</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>
@@ -437,7 +437,7 @@
     <string name="permission_denied">سسٹم نےکارروائی سے انکار کیا گیا</string>
     <string name="download_failed">ڈاؤن لوڈ ناکام</string>
     <string name="download_finished">ڈاؤن لوڈ تکمیل</string>
-    <string name="download_finished_more">s% ڈاؤن لوڈ مکمل ہوگئے</string>
+    <string name="download_finished_more">%s ڈاؤن لوڈ مکمل ہوگئے</string>
     <string name="generate_unique_name">منفرد نام بنائیں</string>
     <string name="overwrite">برتحریر</string>
     <string name="download_already_running">اس نام کے ساتھ ایک ڈاؤن لوڈ جاری ہے</string>

From cf60033424888963c07a3327913d8371a0dafe95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Thu, 16 Jan 2020 05:28:38 +0000
Subject: [PATCH 047/199] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 96.4% (508 of 527 strings)
---
 app/src/main/res/values-nb-rNO/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index d01647f5d..0c4ee8dde 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -524,6 +524,6 @@
     <string name="clear_download_history">Tøm nedlastingshistorikk</string>
     <string name="delete_downloaded_files">Slett nedlastede filer</string>
     <string name="deleted_downloads">Slettet %1$s nedlastninger</string>
-    <string name="enable_lock_screen_video_thumbnail_title">Aktiver videominiatyrbilde med låseskjerm</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">Når du bruker bakgrunnsspilleren, vises en videominiaturbilde på låseskjermen</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Aktiver videominiatyrbilde på låseskjerm</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Når du bruker bakgrunnsspilleren, vises ent videominiatyrbilde på låseskjermen</string>
 </resources>
\ No newline at end of file

From afc362d2b613773df1896dbb1a3f6179f2d7beb6 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Mon, 20 Jan 2020 23:33:30 -0300
Subject: [PATCH 048/199] readability changes

---
 .../java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java b/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
index e20b06352..6f1cceeed 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/SrtFromTtmlWriter.java
@@ -34,7 +34,7 @@ public class SrtFromTtmlWriter {
     private static String getTimestamp(Element frame, String attr) {
         return frame
                 .attr(attr)
-                .replace('.', ',');// Str uses comma as decimal separator
+                .replace('.', ',');// SRT subtitles uses comma as decimal separator
     }
 
     private void writeFrame(String begin, String end, StringBuilder text) throws IOException {
@@ -69,7 +69,7 @@ public class SrtFromTtmlWriter {
         Document doc = Jsoup.parse(new ByteArrayInputStream(buffer), "UTF-8", "", Parser.xmlParser());
 
         StringBuilder text = new StringBuilder(128);
-        Elements paragraph_list = doc.select("body>div>p");
+        Elements paragraph_list = doc.select("body > div > p");
 
         // check if has frames
         if (paragraph_list.size() < 1) return;

From 0ed3354cee6e4e3021263ecdd1b2253dfe144838 Mon Sep 17 00:00:00 2001
From: Xiang Rong Lin <41164160+XiangRongLin@users.noreply.github.com>
Date: Tue, 21 Jan 2020 20:56:06 +0100
Subject: [PATCH 049/199] Use custom dialog to edit and delete local playlists
 at once

---
 .../local/bookmark/BookmarkFragment.java      | 73 +++++--------------
 .../newpipe/local/dialog/BookmarkDialog.kt    | 47 ++++++++++++
 app/src/main/res/layout/dialog_bookmark.xml   | 51 +++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 118 insertions(+), 54 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/local/dialog/BookmarkDialog.kt
 create mode 100644 app/src/main/res/layout/dialog_bookmark.xml

diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
index 6a7f16025..bfd90acda 100644
--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -1,13 +1,9 @@
 package org.schabi.newpipe.local.bookmark;
 
 import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.Log;
-import android.widget.EditText;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
@@ -26,6 +22,7 @@ import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
 import org.schabi.newpipe.local.BaseLocalListFragment;
+import org.schabi.newpipe.local.dialog.BookmarkDialog;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.report.UserAction;
@@ -124,34 +121,7 @@ public final class BookmarkFragment
             @Override
             public void held(LocalItem selectedItem) {
                 if (selectedItem instanceof PlaylistMetadataEntry) {
-                    final Resources resources = getContext().getResources();
-                    String[] commands = new String[]{
-                        resources.getString(R.string.rename_playlist),
-                        resources.getString(R.string.delete_playlist)
-                    };
-
-                    final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
-                        switch (i) {
-                            case 0:
-                                showLocalRenameDialog((PlaylistMetadataEntry) selectedItem);
-                                break;
-                            case 1:
-                                showLocalDeleteDialog((PlaylistMetadataEntry) selectedItem);
-                                break;
-                        }
-                    };
-
-                    final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
-                    bannerView.setSelected(true);
-                    TextView titleView = bannerView.findViewById(R.id.itemTitleView);
-                    titleView.setText(((PlaylistMetadataEntry) selectedItem).name);
-
-                    new AlertDialog.Builder(getActivity())
-                        .setCustomTitle(bannerView)
-                        .setItems(commands, actions)
-                        .create()
-                        .show();
-
+                    showLocalDialog((PlaylistMetadataEntry) selectedItem);
                 } else if (selectedItem instanceof PlaylistRemoteEntity) {
                     showRemoteDeleteDialog((PlaylistRemoteEntity) selectedItem);
                 }
@@ -279,14 +249,27 @@ public final class BookmarkFragment
     // Utils
     ///////////////////////////////////////////////////////////////////////////
 
-    private void showLocalDeleteDialog(final PlaylistMetadataEntry item) {
-        showDeleteDialog(item.name, localPlaylistManager.deletePlaylist(item.uid));
-    }
-
     private void showRemoteDeleteDialog(final PlaylistRemoteEntity item) {
         showDeleteDialog(item.getName(), remotePlaylistManager.deletePlaylist(item.getUid()));
     }
 
+    private void showLocalDialog(PlaylistMetadataEntry selectedItem) {
+        BookmarkDialog dialog = new BookmarkDialog(getContext(),
+            selectedItem.name, new BookmarkDialog.OnClickListener() {
+            @Override
+            public void onDeleteClicked() {
+                showDeleteDialog(selectedItem.name,
+                    localPlaylistManager.deletePlaylist(selectedItem.uid));
+            }
+
+            @Override
+            public void onSaveClicked(@NonNull String name) {
+                changeLocalPlaylistName(selectedItem.uid, name);
+            }
+        });
+        dialog.show();
+    }
+
     private void showDeleteDialog(final String name, final Single<Integer> deleteReactor) {
         if (activity == null || disposables == null) return;
 
@@ -303,24 +286,6 @@ public final class BookmarkFragment
                 .show();
     }
 
-    private void showLocalRenameDialog(PlaylistMetadataEntry selectedItem) {
-        final View dialogView = View.inflate(getContext(), R.layout.dialog_playlist_name, null);
-        EditText nameEdit = dialogView.findViewById(R.id.playlist_name);
-        nameEdit.setText(selectedItem.name);
-        nameEdit.setSelection(nameEdit.getText().length());
-
-        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(
-            getContext())
-            .setTitle(R.string.rename_playlist)
-            .setView(dialogView)
-            .setCancelable(true)
-            .setNegativeButton(R.string.cancel, null)
-            .setPositiveButton(R.string.rename, (dialogInterface, i) -> {
-                changeLocalPlaylistName(selectedItem.uid, nameEdit.getText().toString());
-            });
-        dialogBuilder.show();
-    }
-
     private void changeLocalPlaylistName(long id, String name) {
         if (localPlaylistManager == null) {
             return;
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/BookmarkDialog.kt b/app/src/main/java/org/schabi/newpipe/local/dialog/BookmarkDialog.kt
new file mode 100644
index 000000000..dd20e88a0
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/BookmarkDialog.kt
@@ -0,0 +1,47 @@
+package org.schabi.newpipe.local.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.Window
+import android.widget.Button
+import android.widget.EditText
+import org.schabi.newpipe.R
+
+class BookmarkDialog(
+        context: Context,
+        private val playlistName: String,
+        val listener: OnClickListener)
+    : Dialog(context) {
+
+    private lateinit var editText: EditText
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        setContentView(R.layout.dialog_bookmark)
+        initListeners()
+    }
+
+    private fun initListeners() {
+        editText = findViewById(R.id.playlist_name_edit_text);
+        editText.setText(playlistName)
+
+        findViewById<Button>(R.id.bookmark_delete).setOnClickListener {
+            listener.onDeleteClicked()
+            dismiss()
+        }
+        findViewById<Button>(R.id.bookmark_cancel).setOnClickListener {
+            dismiss()
+        }
+        findViewById<Button>(R.id.bookmark_save).setOnClickListener {
+            listener.onSaveClicked(editText.text.toString())
+            dismiss()
+        }
+    }
+
+    interface OnClickListener {
+        fun onDeleteClicked()
+        fun onSaveClicked(name: String)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_bookmark.xml b/app/src/main/res/layout/dialog_bookmark.xml
new file mode 100644
index 000000000..798a8f4c8
--- /dev/null
+++ b/app/src/main/res/layout/dialog_bookmark.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
+
+  <EditText
+    android:id="@+id/playlist_name_edit_text"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:importantForAutofill="no"
+    android:inputType="text"
+    android:maxLines="1"
+    android:layout_margin="10dp"
+    android:hint="@string/playlist_name_input"/>
+
+
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:paddingTop="10dp"
+    android:padding="5dp">
+
+    <Button
+      android:id="@+id/bookmark_delete"
+      style="@style/Widget.AppCompat.Button.Borderless"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentStart="true"
+      android:layout_centerVertical="true"
+      android:text="@string/delete" />
+
+    <Button
+      android:id="@+id/bookmark_cancel"
+      style="@style/Widget.AppCompat.Button.Borderless"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_toStartOf="@+id/bookmark_save"
+      android:text="@android:string/cancel" />
+
+    <Button
+      android:id="@+id/bookmark_save"
+      style="@style/Widget.AppCompat.Button.Borderless"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:text="@string/save" />
+  </RelativeLayout>
+
+</LinearLayout>
\ 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 e1b2cc0a4..1b1fc9704 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -589,4 +589,5 @@
     <string name="downloads_storage_use_saf_title">Use SAF</string>
     <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
+    <string name="save">save</string>
 </resources>

From ee0f94c2325bcc276c784ede77e719f367878b52 Mon Sep 17 00:00:00 2001
From: chr56 <chr0056@gmail.com>
Date: Wed, 22 Jan 2020 03:44:23 +0000
Subject: [PATCH 050/199] Translated using Weblate (Chinese (Simplified))

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

diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
index 4538fc184..9fbc08493 100644
--- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml
+++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
@@ -131,7 +131,7 @@
     <string name="no_subscribers">没有订阅者</string>
     <plurals name="subscribers">
         <item quantity="one">%s 位订阅者</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <string name="no_videos">没有视频</string>
     <string name="detail_drag_description">拖动以重新排序</string>
@@ -148,7 +148,7 @@
     <string name="missions_header_pending">等待中…</string>
     <string name="paused">已暂停</string>
     <string name="queued">排队中</string>
-    <string name="enqueue">已加入队列</string>
+    <string name="enqueue">加入队列</string>
     <string name="permission_denied">操作已被系统拒绝</string>
     <string name="download_failed">下载失败</string>
     <string name="download_finished">下载完成</string>
@@ -219,7 +219,7 @@
     <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="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_summary">显示搜索建议</string>
@@ -416,7 +416,7 @@
     <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_title">退出应用时最小化</string>
     <string name="minimize_on_exit_summary">从主播放器切换到其他应用时的操作 - %s</string>
     <string name="skip_silence_checkbox">静音时快进</string>
     <string name="playback_step">滑块[比例尺]</string>
@@ -487,7 +487,7 @@
     <string name="error_insufficient_storage">设备上没有剩余储存空间</string>
     <string name="error_progress_lost">进度丢失，文件已被删除</string>
     <string name="error_timeout">连接超时</string>
-    <string name="confirm_prompt">你确定吗？</string>
+    <string name="confirm_prompt">是否要清除下载历史记录或删除所有下载的文件？</string>
     <string name="enable_queue_limit">最大下载队列</string>
     <string name="enable_queue_limit_desc">同时只允许一个下载进行</string>
     <string name="start_downloads">开始下载</string>
@@ -512,16 +512,16 @@
     <string name="no_one_listening">没有人在听</string>
     <plurals name="listening">
         <item quantity="one">％s 人在听</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <string name="localization_changes_requires_app_restart">重新启动应用后，语言将更改。</string>
     <string name="peertube_instance_url_title">PeerTube 服务器</string>
     <string name="peertube_instance_url_summary">设置自己喜欢的PeerTube服务器</string>
     <string name="peertube_instance_url_help">查找最适合你的服务器%s</string>
     <string name="peertube_instance_add_title">添加服务器</string>
-    <string name="peertube_instance_add_help">输入服务器网址</string>
+    <string name="peertube_instance_add_help">输入服务器网址(URL)</string>
     <string name="peertube_instance_add_fail">无法验证服务器</string>
-    <string name="peertube_instance_add_https_only">仅支持 https URL</string>
+    <string name="peertube_instance_add_https_only">仅支持 HTTPS和URL</string>
     <string name="peertube_instance_add_exists">该服务器已存在</string>
     <string name="local">本地</string>
     <string name="recently_added">最近添加</string>

From 167653ac603835c260b8785e3d79d5577c3516dc Mon Sep 17 00:00:00 2001
From: chr56 <chr0056@gmail.com>
Date: Wed, 22 Jan 2020 13:00:00 +0800
Subject: [PATCH 051/199] fix wrong strings in values-zh-rCN.

---
 app/src/main/res/values-zh-rCN/strings.xml | 63 +++++++++++-----------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index cfa443afc..54f58a5bb 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -6,7 +6,7 @@
     <string name="open_in_browser">在浏览器中打开</string>
     <string name="open_in_popup_mode">在悬浮窗模式下打开</string>
     <string name="did_you_mean">您是不是要找：%1$s？</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="install">安装</string>
     <string name="cancel">取消</string>
@@ -16,7 +16,7 @@
     <string name="settings">设置</string>
     <string name="share_dialog_title">分享给...</string>
     <string name="choose_browser">选择浏览器</string>
-    <string name="download_path_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_summary">已下载的音频存储在这里</string>
@@ -39,10 +39,10 @@
     <string name="network_error">网络错误</string>
     <plurals name="videos">
         <item quantity="one">视频</item>
-        <item quantity="other"/>
+        <item quantity="other">视频</item>
     </plurals>
     <string name="disabled">禁用</string>
-    <string name="controls_background_title">背景</string>
+    <string name="controls_background_title">后台播放</string>
     <string name="filter">过滤器</string>
     <string name="refresh">刷新</string>
     <string name="show_search_suggestions_title">搜索建议</string>
@@ -91,7 +91,7 @@
     <string name="storage_permission_denied">存储访问权限已被拒绝</string>
     <plurals name="views">
         <item quantity="one">%1$s 次观看</item>
-        <item quantity="other"/>
+        <item quantity="other">%1$s 次观看</item>
     </plurals>
     <string name="short_thousand">千</string>
     <string name="short_million">百万</string>
@@ -130,8 +130,8 @@
     <string name="search_no_results">没有结果</string>
     <string name="no_subscribers">没有订阅者</string>
     <plurals name="subscribers">
-        <item quantity="one">%s个订阅者</item>
-        <item quantity="other"/>
+        <item quantity="one">%s 位订阅者</item>
+        <item quantity="other">%s 位订阅者</item>
     </plurals>
     <string name="no_videos">没有视频</string>
     <string name="detail_drag_description">拖动以重新排序</string>
@@ -148,7 +148,7 @@
     <string name="missions_header_pending">等待中…</string>
     <string name="paused">已暂停</string>
     <string name="queued">排队中</string>
-    <string name="enqueue">已加入队列</string>
+    <string name="enqueue">加入队列</string>
     <string name="permission_denied">操作已被系统拒绝</string>
     <string name="download_failed">下载失败</string>
     <string name="download_finished">下载完成</string>
@@ -157,8 +157,8 @@
     <string name="drawer_header_description">切换服务，当前选择：</string>
     <string name="no_player_found">找不到串流播放器。您想安装 VLC 吗？</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="download_path_audio_title">音频下载文件夹</string>
     <string name="autoplay_by_calling_app_summary">从其他应用调用 NewPipe 时播放视频</string>
     <string name="default_resolution_title">默认分辨率</string>
@@ -209,7 +209,7 @@
 \n需要此权限</string>
     <string name="reCaptcha_title">reCAPTCHA验证</string>
     <string name="recaptcha_request_toast">请求的新的CAPTCHA验证</string>
-    <string name="popup_mode_share_menu_title">NewPipe悬浮窗模式</string>
+    <string name="popup_mode_share_menu_title">NewPipe 悬浮窗模式</string>
     <string name="popup_playing_toast">在悬浮窗中播放</string>
     <string name="default_popup_resolution_title">默认悬浮窗分辨率</string>
     <string name="show_higher_resolutions_title">使用更高的分辨率</string>
@@ -219,7 +219,7 @@
     <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="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_summary">显示搜索建议</string>
@@ -234,9 +234,9 @@
     <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_main">主页</string>
     <string name="tab_subscriptions">订阅</string>
-    <string name="fragment_whats_new">新增功能</string>
+    <string name="fragment_whats_new">最新</string>
     <string name="resume_on_audio_focus_gain_title">恢复前台焦点</string>
     <string name="resume_on_audio_focus_gain_summary">中断后继续播放（例如突然来电后）</string>
     <string name="enable_search_history_title">搜索历史记录</string>
@@ -321,7 +321,7 @@
     <string name="could_not_import_all_files">警告：无法导入所有文件。</string>
     <string name="override_current_data">这将覆盖当前设置。</string>
     <string name="show_info">显示信息</string>
-    <string name="tab_bookmarks">已收藏</string>
+    <string name="tab_bookmarks">书签</string>
     <string name="delete_stream_history_prompt">确定要从观看历史记录中删除该项吗？</string>
     <string name="delete_all_history_prompt">是否确实要从历史记录中删除所有项目？</string>
     <string name="title_last_played">最后播放</string>
@@ -410,13 +410,13 @@
     <string name="privacy_policy_encouragement">NewPipe 项目非常重视您的隐私。因此，未经您的同意，应用程序不会收集任何数据。
 \nNewPipe 的隐私政策详细解释了在发送崩溃报告时发送和存储的数据。</string>
     <string name="read_privacy_policy">阅读隐私政策</string>
-    <string name="start_accept_privacy_policy">为了遵守欧洲一般数据保护条例 （GDPR），我们提请您注意 NewPipe 的隐私政策。请仔细阅读。
-\n您必须接受它才能向我们发送错误报告。</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_title">退出应用时最小化</string>
     <string name="minimize_on_exit_summary">从主播放器切换到其他应用时的操作 - %s</string>
     <string name="skip_silence_checkbox">静音时快进</string>
     <string name="playback_step">滑块[比例尺]</string>
@@ -469,7 +469,7 @@
     <string name="show_comments_summary">禁用，以停止显示评论</string>
     <plurals name="comments">
         <item quantity="one">评论</item>
-        <item quantity="other"/>
+        <item quantity="other">评论</item>
     </plurals>
     <string name="error_unable_to_load_comments">无法加载评论</string>
     <string name="close">关闭</string>
@@ -487,7 +487,7 @@
     <string name="error_insufficient_storage">设备上没有剩余储存空间</string>
     <string name="error_progress_lost">进度丢失，文件已被删除</string>
     <string name="error_timeout">连接超时</string>
-    <string name="confirm_prompt">你确定吗？</string>
+    <string name="confirm_prompt">是否要清除下载历史记录或删除所有下载的文件？</string>
     <string name="enable_queue_limit">最大下载队列</string>
     <string name="enable_queue_limit_desc">同时只允许一个下载进行</string>
     <string name="start_downloads">开始下载</string>
@@ -504,24 +504,24 @@
     <string name="delete_playback_states_alert">删除所有播放位置记录？</string>
     <string name="download_choose_new_path">更改下载目录让内容生效</string>
     <string name="default_kiosk_page_summary">『时下流行』页-默认</string>
-    <string name="no_one_watching">无人在线观看</string>
+    <string name="no_one_watching">没有人在观看</string>
     <plurals name="watching">
         <item quantity="one">%s 人在观看</item>
-        <item quantity="other"/>
+        <item quantity="other">%s 人在观看</item>
     </plurals>
-    <string name="no_one_listening">没人在听</string>
+    <string name="no_one_listening">没有人在听</string>
     <plurals name="listening">
         <item quantity="one">％s 人在听</item>
-        <item quantity="other"/>
+        <item quantity="other">％s 人在听</item>
     </plurals>
     <string name="localization_changes_requires_app_restart">重新启动应用后，语言将更改。</string>
     <string name="peertube_instance_url_title">PeerTube 服务器</string>
-    <string name="peertube_instance_url_summary">设置自己喜欢的peertube服务器</string>
-    <string name="peertube_instance_url_help">查找最适合你的服务器https://joinpeertube.org/instances#instances-list</string>
+    <string name="peertube_instance_url_summary">设置自己喜欢的PeerTube服务器</string>
+    <string name="peertube_instance_url_help">查找最适合你的服务器%s</string>
     <string name="peertube_instance_add_title">添加服务器</string>
-    <string name="peertube_instance_add_help">输入服务器网址</string>
+    <string name="peertube_instance_add_help">输入服务器网址(URL)</string>
     <string name="peertube_instance_add_fail">无法验证服务器</string>
-    <string name="peertube_instance_add_https_only">仅支持 https URL</string>
+    <string name="peertube_instance_add_https_only">仅支持 HTTPS和URL</string>
     <string name="peertube_instance_add_exists">该服务器已存在</string>
     <string name="local">本地</string>
     <string name="recently_added">最近添加</string>
@@ -531,6 +531,9 @@
     <string name="error_download_resource_gone">无法恢复此下载</string>
     <string name="choose_instance_prompt">选择一个服务器</string>
     <string name="seek_duration_title">快进 / 快退的单位时间</string>
-    <string name="enable_lock_screen_video_thumbnail_title">在锁屏界面显示视频缩略图</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">在后台播放时，锁屏界面将会显示视频的缩略图</string>
+    <string name="enable_lock_screen_video_thumbnail_title">在锁屏上显示视频缩略图</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">在后台播放时，锁屏上将会显示视频的缩略图</string>
+    <string name="clear_download_history">清除下载历史记录</string>
+    <string name="delete_downloaded_files">删除下载了的文件</string>
+    <string name="deleted_downloads">已删除 %1$s 下载</string>
 </resources>
\ No newline at end of file

From ce075395a1b72b2c1db53ff6921ed4b70123d86d Mon Sep 17 00:00:00 2001
From: MohammedSR Vevo <mohammednajmidin@gmail.com>
Date: Tue, 21 Jan 2020 16:37:53 +0000
Subject: [PATCH 052/199] Translated using Weblate (Kurdish)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-ku/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index b6d8bb877..9a061bab7 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -3,20 +3,20 @@
     <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>
-    <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="install">دامەزراندن</string>
     <string name="cancel">پاشگه‌زبوونه‌وه‌</string>
     <string name="open_in_browser">كردنه‌وه‌ له‌ وێبگه‌ر</string>
     <string name="open_in_popup_mode">كردنه‌وه‌ له‌ په‌نجه‌ره‌ی بچووک</string>
     <string name="share">هاوبه‌شپێكردن</string>
     <string name="download">داگرتن</string>
-    <string name="controls_download_desc">داگرتنی فایلی پەخش</string>
+    <string name="controls_download_desc">داگرتنی پەڕگەی پەخش</string>
     <string name="search">گه‌ڕان</string>
     <string name="settings">ڕێكخستنه‌كان</string>
     <string name="did_you_mean">مەبەستت ئەمەیە:
 \n%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>
@@ -31,7 +31,7 @@
     <string name="show_info">پیشاندانی زانیاری</string>
     <string name="tab_main">سه‌ره‌كی</string>
     <string name="tab_subscriptions">به‌شدارییه‌كان</string>
-    <string name="tab_bookmarks">لیستی کارپێکردنەکان نیشانەکران</string>
+    <string name="tab_bookmarks">خشتەی کارپێکردنەکان نیشانەکران</string>
     <string name="fragment_whats_new">چی نوێ هه‌یه‌</string>
     <string name="controls_background_title">لە پاشبنەما</string>
     <string name="controls_popup_title">په‌نجه‌ره‌ی بچووک</string>

From 1f975c0a3ac677cbc2829c0e80ce36bd7553fcd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Tue, 21 Jan 2020 15:55:32 +0000
Subject: [PATCH 053/199] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 98.1% (517 of 527 strings)
---
 app/src/main/res/values-nb-rNO/strings.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 0c4ee8dde..28a11185d 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -526,4 +526,14 @@
     <string name="deleted_downloads">Slettet %1$s nedlastninger</string>
     <string name="enable_lock_screen_video_thumbnail_title">Aktiver videominiatyrbilde på låseskjerm</string>
     <string name="enable_lock_screen_video_thumbnail_summary">Når du bruker bakgrunnsspilleren, vises ent videominiatyrbilde på låseskjermen</string>
+    <string name="peertube_instance_url_summary">Velg dine favoritter blandt PeerTube-instansene</string>
+    <string name="peertube_instance_url_help">Finn instansene som passer deg best på %s</string>
+    <string name="peertube_instance_add_title">Legg til instans</string>
+    <string name="peertube_instance_add_help">Skriv inn nettadresse til instans</string>
+    <string name="peertube_instance_add_fail">Kunne ikke bekrefte instans</string>
+    <string name="peertube_instance_add_https_only">Kun HTTPS-nettadresser støttes</string>
+    <string name="peertube_instance_add_exists">Instansen finnes allerede</string>
+    <string name="playlist_no_uploader">Autogenerert (fant ingen opplaster)</string>
+    <string name="recovering">gjenoppretter</string>
+    <string name="error_download_resource_gone">Kan ikke gjenopprette denne nedlastingen</string>
 </resources>
\ No newline at end of file

From e224f8ca288b0f4d0a0d088b22a82bec2ae31d0a Mon Sep 17 00:00:00 2001
From: Abu Sarim Hindi <sarfaraz.ahmed78@gmail.com>
Date: Thu, 23 Jan 2020 14:31:20 +0000
Subject: [PATCH 054/199] Translated using Weblate (Urdu)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-ur/strings.xml | 188 +++++++++++++++----------
 1 file changed, 110 insertions(+), 78 deletions(-)

diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index d885cb915..8ddc28711 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -1,79 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="main_bg_subtitle">شروع کرنے کے لیے تلاش پر ٹیپ کریں</string>
-    <string name="view_count_text">ملاحظات s$1%</string>
-    <string name="upload_date_text">کوشائع ہوا</string>
+    <string name="view_count_text">s$1% ملاحظات</string>
+    <string name="upload_date_text">%1$s کو شائع ہوا</string>
     <string name="install">انسٹال</string>
     <string name="cancel">منسوخ کریں</string>
-    <string name="share">بانٹیں</string>
-    <string name="download">ڈاؤن لوڈکریں</string>
+    <string name="share">اشتراک کریں</string>
+    <string name="download">ڈاؤن لوڈ</string>
     <string name="search">تلاش کریں</string>
-    <string name="did_you_mean">کیا آپ کا مطلب تھا: s$1%\?</string>
-    <string name="open_in_browser">انٹرنیٹ میں کھولیں</string>
+    <string name="did_you_mean">کیا آپ کا مطلب یہ ہے: s$1%\?</string>
+    <string name="open_in_browser">براؤزر میں کھولیں</string>
     <string name="settings">ترتیبات</string>
-    <string name="no_player_found">کوئیstream پلیئر نہیں ملا.کیا آپ VLC انسٹال کرنا چاہتے ہیں؟</string>
-    <string name="no_player_found_toast">کوئیstream پلیئر نہیں ملا(آپ VLC انسٹال کر سکتے ہیے)۔</string>
-    <string name="open_in_popup_mode">PopUp موڈ میں کھولیں</string>
-    <string name="controls_download_desc">سٹریم فائل ڈاؤن لوڈ کریں</string>
-    <string name="share_dialog_title">کے ساتھ بانٹیں</string>
-    <string name="choose_browser">Internet Browser منتخب کریں
-\n</string>
-    <string name="screen_rotation">rotation کرو</string>
-    <string name="use_external_video_player_title">external video player استعمال کریں</string>
-    <string name="use_external_video_player_summary">کچھ ریذولوشن پر آڈیو ہٹاتا ہے</string>
-    <string name="use_external_audio_player_title">بیرونی سوتی عامل ایپ استعمال کریں</string>
-    <string name="popup_mode_share_menu_title">NewPipe ابھاری اسلوب</string>
-    <string name="subscribe_button_title">سبسکرائیب کریں</string>
-    <string name="subscribed_button_title">سبسکرائیب کر لیا</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="controls_download_desc">اسٹریم فائل ڈاؤن لوڈ کریں</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_video_player_summary">کچھ ریزولوشن پر آڈیو ہٹاتا ہے</string>
+    <string name="use_external_audio_player_title">خارجی آڈیو پلیر استعمال کریں</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="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="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_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>
-    <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="autoplay_by_calling_app_summary">جب دوسرے ایپ سے نیو پائپ کال کی جاتی ہے تو ویڈیو چلاتا ہے</string>
+    <string name="default_resolution_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="play_with_kodi_title">کوڈی کے ساتھ استعمال کریں</string>
     <string name="kore_not_found">کور ایپ نہیں ملی۔ اسے انسٹال کریں؟</string>
-    <string name="show_play_with_kodi_title">\"کودی کے ساتھ کھیلیں\" کا آپشن دکھائیں</string>
-    <string name="show_play_with_kodi_summary">کوڈی میڈیا سنٹر کے ذریعے ویڈیو چلانے کا آپشن دکھائیں</string>
+    <string name="show_play_with_kodi_title">\"کودی کے ساتھ چلائیں\" آپشن دکھائیں</string>
+    <string name="show_play_with_kodi_summary">کوڈی کے ذریعے ویڈیو چلانے کا آپشن دکھائیں</string>
     <string name="play_audio">آڈیو</string>
-    <string name="default_audio_format_title">پہلے سے طے شدہ آڈیو فارمیٹ</string>
-    <string name="default_video_format_title">طے شدہ وڈیو وضع</string>
+    <string name="default_audio_format_title">طے شدہ آڈیو فارمیٹ</string>
+    <string name="default_video_format_title">طے شدہ وڈیو فارمیٹ</string>
     <string name="theme_title">خیالیہ</string>
-    <string name="light_theme_title">روشنی</string>
+    <string name="light_theme_title">روشن</string>
     <string name="dark_theme_title">تاریک</string>
     <string name="black_theme_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>
-    <string name="download_thumbnail_title">Thumbnailلوڈکریں</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="auto_queue_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>
+    <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="auto_queue_title">اگلا سلسلہ خود قطار</string>
     <string name="auto_queue_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="enable_search_history_title">تاریخ تلاش کریں</string>
     <string name="enable_search_history_summary">تلاش کے استفسارات کو مقامی طور پر ذخیرہ کریں</string>
@@ -138,7 +137,7 @@
     <string name="export_data_summary">تاریخ ، خریداری اور پلے لسٹ برآمد کریں</string>
     <string name="general_error">خرابی</string>
     <string name="network_error">نیٹ ورک کی خرابی</string>
-    <string name="could_not_load_thumbnails">تمام تمبنیلذلوڈ نہیں کر سکے</string>
+    <string name="could_not_load_thumbnails">تمام نظرِ انگشتی لوڈ نہیں کر سکے</string>
     <string name="youtube_signature_decryption_error">ویڈیو یو آر ایل کے دستخط ڈکرپٹ نہیں ہو سکے</string>
     <string name="parsing_error">ویب سائٹ کو تجزیہ نہیں کیا جاسکا</string>
     <string name="light_parsing_error">ویب سائٹ کو مکمل طور پر تجزیہ نہیں کرسکے</string>
@@ -188,9 +187,9 @@
     <string name="audio">آڈیو</string>
     <string name="retry">دوبارہ کوشش کریں</string>
     <string name="storage_permission_denied">ذخیرہ رسائی اجازت مسترد</string>
-    <string name="short_thousand">K</string>
+    <string name="short_thousand">ہزار</string>
     <string name="short_million">ایم</string>
-    <string name="short_billion">بی</string>
+    <string name="short_billion">ارب</string>
     <string name="no_subscribers">کوئی صارفین نہیں</string>
     <plurals name="subscribers">
         <item quantity="one">%s صارف</item>
@@ -203,8 +202,8 @@
     </plurals>
     <string name="no_videos">ویڈیوز دستیاب نہیں</string>
     <plurals name="videos">
-        <item quantity="one">ویڈیوز</item>
-        <item quantity="other"/>
+        <item quantity="one">ویڈیو</item>
+        <item quantity="other">ویڈیوز</item>
     </plurals>
     <string name="start">شروع کریں</string>
     <string name="pause">توقف</string>
@@ -243,13 +242,13 @@
     <string name="action_settings">ترتیبات</string>
     <string name="action_about">کے بارے میں</string>
     <string name="title_licenses">تیسری پارٹی کے لائسنس</string>
-    <string name="copyright" formatted="true">3٪ 1 $ s بذریعہ٪ 2 $ s٪ 3 $ s کے تحت</string>
+    <string name="copyright" formatted="true">© %1$s بذریعہ %2$s %3$s کے تحت</string>
     <string name="error_unable_to_load_license">لائسنس لوڈ نہیں کر سکا</string>
     <string name="action_open_website">ویب سائٹ کھولیں</string>
     <string name="tab_about">کے بارے میں</string>
     <string name="tab_contributors">معاونین</string>
     <string name="tab_licenses">لائسنس</string>
-    <string name="app_description">لوڈ ، اتارنا Android پر ہلکا پھلکا اسٹریمنگ۔</string>
+    <string name="app_description">لِبرے کی اینڈروئیڈ پر کم وزنی اسٹریمنگ</string>
     <string name="contribution_title">تعاون کریں</string>
     <string name="contribution_encouragement">چاہے آپ کے خیالات ہوں؛ ترجمہ ، ڈیزائن میں تبدیلیاں ، کوڈ صاف کرنا ، یا حقیقی ہیوی کوڈ میں تبدیلی — مدد کا ہمیشہ خیرمقدم کیا جاتا ہے۔ جتنا زیادہ ہوتا ہے اتنا ہی بہتر ہوتا ہے!</string>
     <string name="view_on_github">گٹ ہب پر دیکھیں</string>
@@ -276,17 +275,17 @@
     <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="no_channel_subscribed_yet">اب تک چینل کی رکنیت نہیں</string>
     <string name="select_a_kiosk">ایک کیوسک منتخب کریں</string>
-    <string name="export_complete_toast">برآمدشدہ</string>
+    <string name="export_complete_toast">برآمد شدہ</string>
     <string name="import_complete_toast">درآمدشدہ</string>
-    <string name="no_valid_zip_file">کوئی درست زپ فائل نہیں ہے</string>
+    <string name="no_valid_zip_file">درست زپ فائل نہیں ہے</string>
     <string name="could_not_import_all_files">انتباہ: تمام فائلوں کو درآمد نہیں کیا جاسکا۔</string>
-    <string name="override_current_data">یہ آپ کے موجودہ سیٹ اپ کو اوور رائڈ کرے گا۔</string>
+    <string name="override_current_data">یہ آپ کی موجودہ سیٹ اپ کو رد کر دے گا۔</string>
     <string name="kiosk">کیوسک</string>
     <string name="trending">رجحان سازی</string>
     <string name="top_50">Top 50</string>
@@ -305,8 +304,8 @@
     <string name="drawer_open">دراز کھولیں</string>
     <string name="drawer_close">دراز بند کریں</string>
     <string name="drawer_header_action_paceholder_text">یہاں جلد ہی کچھ نظر آئے گا D D</string>
-    <string name="preferred_open_action_settings_title">ترجیح \' کھلی \' عمل</string>
-    <string name="preferred_open_action_settings_summary">مواد کھولنے پر ڈیفالٹ کارروائی — %s</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>
@@ -347,7 +346,7 @@
     <string name="subscriptions_export_unsuccessful">رکنیت برآمد نہیں کر سکا</string>
     <string name="import_youtube_instructions">برآمد فائل کو ڈاؤن لوڈ کرکے YouTube کی رکنیت کو درآمد کریں: 
 \n 
-\n1. اس یو آر ایل پر جائیں:s$1% 
+\n1. اس یو آر ایل پر جائیں: %1$s 
 \n2. جب پوچھا جائے تو لاگ ان کریں 
 \nA. ڈاؤن لوڈ شروع ہونا چاہئے (یہ برآمد فائل ہے)</string>
     <string name="import_soundcloud_instructions">URL یا آپ کی ID ٹائپ کرکے ایک SoundCloud پروفائل درآمد کریں: 
@@ -361,7 +360,7 @@
 \n
 \nکیا آپ جاری رکھنا چاہتے ہیں؟</string>
     <string name="playback_speed_control">پلے بیک رفتار کنٹرول</string>
-    <string name="playback_tempo">Tempo</string>
+    <string name="playback_tempo">ٹیمپو</string>
     <string name="playback_pitch">"آواز کو  موٹا کرنا"</string>
     <string name="unhook_checkbox">ختم (مسخ کا سبب بن سکتا ہے)</string>
     <string name="caption_setting_title">کیپشن</string>
@@ -376,7 +375,7 @@
     <string name="search_history_deleted">تلاش کی تاریخ حذف ہوگئی۔</string>
     <string name="one_item_deleted">1 شے حذف کر دی گئی ۔</string>
     <string name="app_license">نیو پائپ کاپلیفٹ فری سافٹ ویئر ہے: آپ استعمال کرسکتے ہیں ، مطالعہ شیئر کرسکتے ہیں اور اپنی مرضی سے اسے بہتر کرسکتے ہیں۔ خاص طور پر آپ اسے مفت سافٹ ویئر فاؤنڈیشن کے ذریعہ شائع کردہ GNU جنرل پبلک لائسنس کی شرائط کے تحت دوبارہ تقسیم اور / یا ترمیم کرسکتے ہیں ، جو لائسنس کا ورژن 3 ، یا (آپ کے اختیار پر) کسی بھی بعد کا ورژن ہے۔</string>
-    <string name="import_settings">کیا آپ سیٹنگیں بھی درآمد کرنا چاہتے ہیں؟</string>
+    <string name="import_settings">کیا آپ ترتیبات بھی درآمد کرنا چاہتے ہیں؟</string>
     <string name="privacy_policy_title">نیو پائپ کی رازداری کی پالیسی</string>
     <string name="privacy_policy_encouragement">نیوپی پائپ منصوبہ آپ کی رازداری کو بہت سنجیدگی سے لیتا ہے. لہذا ، اپلی کیشن آپ کی رضامندی کے بغیر کسی بھی ڈیٹا کو جمع نہیں کرتا.
 \nنیو پائپ کی رازداری کی پالیسی تفصیل سے وضاحت کرتی ہے کہ آپ کو کریش رپورٹ بھیجنے پر کیا ڈیٹا بھیجا جاتا ہے اور ذخیرہ کیا جاتا ہے ۔</string>
@@ -399,13 +398,13 @@
     <string name="playlists">پلے لسٹس</string>
     <string name="tracks">ویڈیو ذ</string>
     <string name="users">صارفین</string>
-    <string name="unsubscribe">اندراج خارج کریں</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="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="content_language_title">ڈیفالٹ مواد کی زبان</string>
     <string name="settings_category_updates_title">تازہ کاریاں</string>
     <string name="file_deleted">فائل حذف ہوگئی</string>
@@ -436,8 +435,8 @@
     <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="download_finished">ڈاؤن لوڈ مکمل</string>
+    <string name="download_finished_more">%s ڈاؤن لوڈ مکمل ہوا</string>
     <string name="generate_unique_name">منفرد نام بنائیں</string>
     <string name="overwrite">برتحریر</string>
     <string name="download_already_running">اس نام کے ساتھ ایک ڈاؤن لوڈ جاری ہے</string>
@@ -462,14 +461,14 @@
     <string name="events">تقریبات</string>
     <string name="conferences">کانفرنسیں</string>
     <string name="show_comments_title">تبصرے دکھائیں</string>
-    <string name="show_comments_summary">تبصرے دکھانا بند کرو</string>
+    <string name="show_comments_summary">تبصرے دکھانا بند کریں</string>
     <string name="autoplay_title">آٹوپلے</string>
     <plurals name="comments">
         <item quantity="one">تبصرے</item>
         <item quantity="other"/>
     </plurals>
     <string name="no_comments">کوئی تبصرہ نہیں</string>
-    <string name="error_unable_to_load_comments">تبصرے لوڈ نہیں ہوسکے</string>
+    <string name="error_unable_to_load_comments">تبصرے لوڈ نہیں ہو سکے</string>
     <string name="close">بند کریں</string>
     <string name="enable_playback_resume_title">پلے بیک دوبارہ شروع کریں</string>
     <string name="enable_playback_resume_summary">آخری پلے بیک پوزیشن بحال کریں</string>
@@ -487,7 +486,7 @@
     <string name="error_insufficient_storage">آلے میں کوئی جگہ نہیں بچی</string>
     <string name="error_progress_lost">پیشرفت ختم ہوگئی ، کیونکہ فائل کو حذف کردیا گیا تھا</string>
     <string name="error_timeout">رابطے کا وقت ختم</string>
-    <string name="confirm_prompt">کیا تمہیں یقین ہے؟</string>
+    <string name="confirm_prompt">کیا آپ اپنی ڈاؤن لوڈ کی سرگزشت کو صاف کرنا چاہتے ہیں یا ڈاؤن لوڈ کی گئی تمام فائلوں کو حذف کرنا چاہتے ہیں؟</string>
     <string name="enable_queue_limit">ڈاؤن لوڈ کی قطار کو محدود کریں</string>
     <string name="enable_queue_limit_desc">ایک ڈاؤن لوڈ ایک ہی وقت میں چلے گا</string>
     <string name="start_downloads">ڈاؤن لوڈ شروع کریں</string>
@@ -502,6 +501,39 @@
     <string name="clear_playback_states_title">پلے بیک پوزیشن حذف کریں</string>
     <string name="clear_playback_states_summary">تمام پلے بیک پوزیشن حذف کریں</string>
     <string name="delete_playback_states_alert">تمام پلے بیک پوزیشنوں کو حذف کریں ؟</string>
-    <string name="download_choose_new_path">اثر لینے کے لئے ڈاؤن لوڈ فولڈرز کو تبدیل کریں</string>
+    <string name="download_choose_new_path">مؤثر بنانے کے لئے ڈاؤن لوڈ فولڈرز کو تبدیل کریں</string>
     <string name="drawer_header_description">ٹوگل خدمت ، حالیہ منتخب:</string>
+    <string name="no_one_watching">کوئی نہیں دیکھ رہا ہے</string>
+    <plurals name="watching">
+        <item quantity="one">% s دیکھ رہا</item>
+        <item quantity="other">%s دیکھ رہے</item>
+    </plurals>
+    <string name="no_one_listening">کوئی نہیں سن رہا ہے</string>
+    <plurals name="listening">
+        <item quantity="one">%s سننے والا</item>
+        <item quantity="other">%s سننے والے</item>
+    </plurals>
+    <string name="localization_changes_requires_app_restart">جب ایپ دوبارہ شروع ہو گی تو زبان تبدیل ہو جائے گی۔</string>
+    <string name="default_kiosk_page_summary">طے شدہ کیوسک</string>
+    <string name="seek_duration_title">آگے بھگانے /- پیچھے کرنے کی مدت</string>
+    <string name="peertube_instance_url_title">پیر ٹیوب واقعات</string>
+    <string name="peertube_instance_url_summary">اپنے پسندیدہ پیر ٹیوب کی مثالیں منتخب کریں</string>
+    <string name="peertube_instance_url_help">ایسی مثالوں کی تلاش کریں جو آپ کو ٪s پر موزوں بنائیں</string>
+    <string name="peertube_instance_add_title">مثال شامل کریں</string>
+    <string name="peertube_instance_add_help">مثال کا URL درج کریں</string>
+    <string name="peertube_instance_add_fail">مثال کی توثیق نہیں کی جاسکی</string>
+    <string name="peertube_instance_add_https_only">صرف HTTPS URLs موافق ہیں</string>
+    <string name="peertube_instance_add_exists">مثال پہلے سے موجود ہے</string>
+    <string name="local">مقامی</string>
+    <string name="recently_added">حال ہی میں شامل</string>
+    <string name="most_liked">زیادہ پسندیدہ</string>
+    <string name="playlist_no_uploader">خود سے بنا (کوئی اپ لوڈر نہیں ملا)</string>
+    <string name="recovering">بازیافتی ہو رہی</string>
+    <string name="error_download_resource_gone">یہ ڈاؤن لوڈ بازیافت نہیں ہو سکتا</string>
+    <string name="choose_instance_prompt">ایک مثال منتخب کریں</string>
+    <string name="enable_lock_screen_video_thumbnail_title">لاک اسکرین ویڈیو تھمب نیل کو فعال کریں</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">بیک گراؤنڈ پلیئر استعمال کرتے وقت ایک ویڈیو تھمب نیل کو لاک اسکرین پر دکھایا جائے گا</string>
+    <string name="clear_download_history">ڈاؤن لوڈ کی سرگزشت صاف کریں</string>
+    <string name="delete_downloaded_files">ڈاؤن لوڈ شدہ فائلیں حذف کریں</string>
+    <string name="deleted_downloads">%1$s ڈاؤن لوڈز کو حذف کیا گیا</string>
 </resources>
\ No newline at end of file

From c21ccef7bc4b71636829110cb4d8548e8a007b14 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Wed, 22 Jan 2020 23:50:53 +0000
Subject: [PATCH 055/199] Translated using Weblate (Esperanto)

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

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index c6ce250e6..fe63caf1b 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -68,9 +68,9 @@
     <string name="retry">Reprovi</string>
     <string name="main_bg_subtitle">Premi serĉon por komenci</string>
     <string name="no_player_found_toast">Neniu elsendlflua ludilo trovita (instalu VLC por ludi ĝin).</string>
-    <string name="open_in_popup_mode">Malfermi en ŝprucfenestron modon</string>
+    <string name="open_in_popup_mode">Malfermi en ŝprucfenestran modon</string>
     <string name="use_external_video_player_summary">Forigas aŭdon ĉe KELKAJ rezolucioj</string>
-    <string name="popup_mode_share_menu_title">NewPipe ŝprucfenestron modon</string>
+    <string name="popup_mode_share_menu_title">NewPipe ŝprucfenestran modon</string>
     <string name="subscribe_button_title">Aboni</string>
     <string name="subscribed_button_title">Abonita</string>
     <string name="channel_unsubscribed">Kanalo malabonita</string>
@@ -87,12 +87,12 @@
     <string name="controls_add_to_playlist_title">Aldonu al</string>
     <string name="autoplay_by_calling_app_title">Aŭtomata play</string>
     <string name="autoplay_by_calling_app_summary">Ludas filmeton kiam NewPipe vokas el alia programo</string>
-    <string name="default_popup_resolution_title">Defaŭlta rezolucio de la ŝprucfenestro</string>
+    <string name="default_popup_resolution_title">Defaŭlta rezolucio de la ŝprucfenestra ludilo</string>
     <string name="show_higher_resolutions_title">Montri pli altajn rezoluciojn</string>
     <string name="show_higher_resolutions_summary">Nur kelkaj aparatoj subtenas ludi 2K / 4K filmetojn</string>
     <string name="default_video_format_title">Defaŭlta fomato de filmeto</string>
     <string name="black_theme_title">Nigra</string>
-    <string name="popup_remember_size_pos_title">Memoru ŝprucfenestron kaj pozicion</string>
+    <string name="popup_remember_size_pos_title">Memoru ŝprucfenestran grandecon kaj pozicion</string>
     <string name="popup_remember_size_pos_summary">Memoru lastan grandecon kaj pozicion de ŝprucfenestro</string>
     <string name="use_inexact_seek_title">Uzu rapide, ne preciza serĉon</string>
     <string name="use_inexact_seek_summary">Ne preciza serĉo permesas al la ludanto serĉi poziciojn pli rapide kun malalta precizeco</string>
@@ -120,9 +120,9 @@
     </plurals>
     <string name="yes">Jes</string>
     <string name="later">Poste</string>
-    <string name="msg_popup_permission">Tiu permeso estas necesa por
-\nmalfermi en ŝprucfenestro modo</string>
-    <string name="popup_playing_toast">Ludanta en ŝprucfenestro modo</string>
+    <string name="msg_popup_permission">Tiu permeso estas necesa por 
+\nmalfermi en ŝprucfenestra modo</string>
+    <string name="popup_playing_toast">Ludante en ŝprucfenestra modo</string>
     <string name="disabled">Malaktiva</string>
     <string name="filter">Filtri</string>
     <string name="refresh">Aktualigi</string>
@@ -145,7 +145,7 @@
     <string name="enable_watch_history_title">Rigardu historion</string>
     <string name="enable_watch_history_summary">Spuri la viditajn filmetojn</string>
     <string name="notification_channel_name">NewPipe Sciigo</string>
-    <string name="notification_channel_description">Sciigoj por NewPipe fono kaj ŝprucfenestroj ludiloj</string>
+    <string name="notification_channel_description">Sciigoj por NewPipe fonaj kaj ŝprucfenestraj ludiloj</string>
     <string name="settings_category_player_title">Ludilo</string>
     <string name="settings_category_player_behavior_title">Konduto</string>
     <string name="settings_category_history_title">Historio kaj kaŝmemoro</string>
@@ -156,21 +156,21 @@
     <string name="top_50">Supro 50</string>
     <string name="new_and_hot">Nova &amp; varma</string>
     <string name="show_hold_to_append_title">Montri la indiko « Tenu por aldoni »</string>
-    <string name="show_hold_to_append_summary">Montri indikon kiam la fono aŭ ŝprucfenestro butono estas premita en la retpaĝo de dalatadoj de la filmeto</string>
-    <string name="background_player_append">Viciĝita en la ludilo en fono</string>
-    <string name="popup_playing_append">Viciĝita en ŝprucfenestro ludilo</string>
+    <string name="show_hold_to_append_summary">Montri indikon kiam la fona aŭ ŝprucfenestra butono estas premita en la retpaĝo de dalatadoj de la filmeto</string>
+    <string name="background_player_append">Viciĝita en la fona ludilo</string>
+    <string name="popup_playing_append">Viciĝita en ŝprucfenestra ludilo</string>
     <string name="play_all">Ludi ĉiujn</string>
     <string name="player_stream_failure">Ne povis ludi tion torenton</string>
     <string name="player_unrecoverable_failure">Neatendebla eraro de ludilo okazis</string>
     <string name="player_recoverable_failure">Reakiri el eraro de la ludilo</string>
     <string name="title_activity_background_player">Fona ludilo</string>
-    <string name="title_activity_popup_player">Ŝprucfenestro ludilo</string>
+    <string name="title_activity_popup_player">Ŝprucfenestra ludilo</string>
     <string name="play_queue_remove">Retiri</string>
     <string name="play_queue_stream_detail">Detalado</string>
     <string name="play_queue_audio_settings">Sonaj parametroj</string>
     <string name="hold_to_append">Teni por viciĝi</string>
     <string name="unknown_content">[Nekonata]</string>
-    <string name="enqueue_on_background">Viciĝi en la fono</string>
+    <string name="enqueue_on_background">Viciĝi en la fona ludilo</string>
     <string name="enqueue_on_popup">Viciĝi en nova ŝprucfenestro</string>
     <string name="start_here_on_popup">Komencu ludi en nova ŝprucfenestro</string>
     <string name="default_content_country_title">Defaŭlta enhava lando</string>
@@ -184,7 +184,7 @@
     <string name="invalid_url_toast">Nevalida ligilo</string>
     <string name="video_streams_empty">Neniuj filmeta torentoj trovitaj</string>
     <string name="audio_streams_empty">Neniuj sonaj torentoj trovis</string>
-    <string name="popup_player">Ŝprucfenestro ludilo</string>
+    <string name="popup_player">Ŝprucfenestra ludilo</string>
     <string name="import_data_title">Importi la datumbazon</string>
     <string name="export_data_title">Eksporti la datumbazon</string>
     <string name="import_data_summary">Anstataŭigas vian aktualan historion kaj abonojn</string>
@@ -237,7 +237,7 @@
     <string name="delete_search_history_alert">Ĉu vi volas forviŝi la totalon de la historio de serĉo \?</string>
     <string name="search_history_deleted">Historio de serĉo forviŝita.</string>
     <string name="limit_mobile_data_usage_title">Limigi rezolucio kiam uzanta moveblan datumon</string>
-    <string name="minimize_on_exit_popup_description">Minimumigi al ŝprucfenestro ludilo</string>
+    <string name="minimize_on_exit_popup_description">Minimumigi al ŝprucfenestra ludilo</string>
     <string name="channels">Kanaloj</string>
     <string name="playlists">Ludlistoj</string>
     <string name="tracks">Spuroj</string>

From d3aadc71b182e432a65d34e2113bc933784d8f15 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Fri, 24 Jan 2020 00:21:51 +0000
Subject: [PATCH 056/199] Translated using Weblate (Urdu)

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

diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 8ddc28711..4c622a193 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="main_bg_subtitle">شروع کرنے کے لیے تلاش پر ٹیپ کریں</string>
-    <string name="view_count_text">s$1% ملاحظات</string>
+    <string name="view_count_text">%1$s ملاحظات</string>
     <string name="upload_date_text">%1$s کو شائع ہوا</string>
     <string name="install">انسٹال</string>
     <string name="cancel">منسوخ کریں</string>
@@ -505,7 +505,7 @@
     <string name="drawer_header_description">ٹوگل خدمت ، حالیہ منتخب:</string>
     <string name="no_one_watching">کوئی نہیں دیکھ رہا ہے</string>
     <plurals name="watching">
-        <item quantity="one">% s دیکھ رہا</item>
+        <item quantity="one">%s دیکھ رہا</item>
         <item quantity="other">%s دیکھ رہے</item>
     </plurals>
     <string name="no_one_listening">کوئی نہیں سن رہا ہے</string>
@@ -518,7 +518,7 @@
     <string name="seek_duration_title">آگے بھگانے /- پیچھے کرنے کی مدت</string>
     <string name="peertube_instance_url_title">پیر ٹیوب واقعات</string>
     <string name="peertube_instance_url_summary">اپنے پسندیدہ پیر ٹیوب کی مثالیں منتخب کریں</string>
-    <string name="peertube_instance_url_help">ایسی مثالوں کی تلاش کریں جو آپ کو ٪s پر موزوں بنائیں</string>
+    <string name="peertube_instance_url_help">ایسی مثالوں کی تلاش کریں جو آپ کو %s پر موزوں بنائیں</string>
     <string name="peertube_instance_add_title">مثال شامل کریں</string>
     <string name="peertube_instance_add_help">مثال کا URL درج کریں</string>
     <string name="peertube_instance_add_fail">مثال کی توثیق نہیں کی جاسکی</string>

From 64b0ccd574c0a0b5968129891fcd39534f335a31 Mon Sep 17 00:00:00 2001
From: Abu Sarim Hindi <sarfaraz.ahmed78@gmail.com>
Date: Fri, 24 Jan 2020 00:50:40 +0000
Subject: [PATCH 057/199] Translated using Weblate (Urdu)

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

diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 4c622a193..68fb80c84 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -73,24 +73,24 @@
     <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="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="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="resume_on_audio_focus_gain_summary">مداخلت کے بعد چلانا جاری رکھیں (جیسے فون کالز)</string>
     <string name="download_dialog_title">ڈاؤن لوڈ</string>
     <string name="next_video_title">اگلا</string>
-    <string name="show_next_and_similar_title">\'اگلا\' اور \'ملتے جلتے\' ویڈیوز دکھائیں</string>
-    <string name="show_hold_to_append_title">\"الحاق کرنے کے لئے منعقد\" ٹپ دکھائیں</string>
+    <string name="show_next_and_similar_title">\'اگلی\' اور \'ملتی جلتی\' ویڈیوز دکھائیں</string>
+    <string name="show_hold_to_append_title">\"شامل کرنے کے لئے پکڑیں\" ٹپ دکھائیں</string>
     <string name="show_hold_to_append_summary">ویڈیو تفصیلات کے صفحے پر جب بیک گراؤنڈ یا پاپ اپ بٹن دبائے جاتے ہیں تو ٹپ دکھائیں</string>
     <string name="url_not_supported_toast">غیر معاون URL</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_video_audio_title">ویڈیو &amp; آڈیو</string>
+    <string name="settings_category_video_audio_title">ویڈیو اور آڈیو</string>
     <string name="settings_category_history_title">تاریخ اور کیشے</string>
     <string name="settings_category_popup_title">پوپ اپ</string>
     <string name="settings_category_appearance_title">ظہور</string>
@@ -349,12 +349,12 @@
 \n1. اس یو آر ایل پر جائیں: %1$s 
 \n2. جب پوچھا جائے تو لاگ ان کریں 
 \nA. ڈاؤن لوڈ شروع ہونا چاہئے (یہ برآمد فائل ہے)</string>
-    <string name="import_soundcloud_instructions">URL یا آپ کی ID ٹائپ کرکے ایک SoundCloud پروفائل درآمد کریں: 
+    <string name="import_soundcloud_instructions">۔URL یا آپ کی ID ٹائپ کرکے ایک SoundCloud پروفائل درآمد کریں: 
 \n 
-\n1. ویب براؤزر میں \"ڈیسک ٹاپ موڈ\" کو فعال کریں (سائٹ موبائل آلات کے لئے دستیاب نہیں ہے) 
-\n2. اس URL پر جائیں: s$1% 
-\n3. پوچھا گیا میں لاگ ان کریں 
-\n4. پروفائل یو آر ایل کاپی کریں جو آپ کو ہدایت کی گئی تھی.</string>
+\n1. ویب براؤزر میں \"ڈیسک ٹاپ موڈ\" کو فعال کریں (یہ سائٹ موبائل آلات کے لئے دستیاب نہیں ہے) 
+\n2. اس URL پر جائیں: %1$s 
+\n3. جب پوچھا جائے تو لاگ ان کریں 
+\n4. پروفائل یو آر ایل کاپی کریں جہاں تک آپ کی رہنمائی کی گئی تھی۔</string>
     <string name="import_soundcloud_instructions_hint">yourID، soundcloud.com/yourid</string>
     <string name="import_network_expensive_warning">یاد رکھیں کہ یہ آپریشن نیٹ ورک مہنگا ہوسکتا ہے۔
 \n
@@ -472,8 +472,8 @@
     <string name="close">بند کریں</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="enable_playback_state_lists_title">فہرست میں مقامات</string>
+    <string name="enable_playback_state_lists_summary">فہرستوں میں پلے بیک مقامات کے اشارے دکھائیں</string>
     <string name="settings_category_clear_data_title">کوائف صاف کریں</string>
     <string name="watch_history_deleted">دیکھنے کی تاریخ حذف ہوگئی۔</string>
     <string name="watch_history_states_deleted">پلے بیک پوزیشنیں حذف ہوگئیں۔</string>

From e9fda96aa1c42fd5244b7ebaae6f8a2904a9810a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Thu, 23 Jan 2020 05:51:46 +0000
Subject: [PATCH 058/199] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 98.3% (518 of 527 strings)
---
 app/src/main/res/values-nb-rNO/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 28a11185d..61e4b4574 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -536,4 +536,5 @@
     <string name="playlist_no_uploader">Autogenerert (fant ingen opplaster)</string>
     <string name="recovering">gjenoppretter</string>
     <string name="error_download_resource_gone">Kan ikke gjenopprette denne nedlastingen</string>
+    <string name="seek_duration_title">Hurtigframoverspoling/-tilbakeblafringsvarighet</string>
 </resources>
\ No newline at end of file

From b2d78786c23b35db6d7de828f9e9f800bdad816e Mon Sep 17 00:00:00 2001
From: Abu Sarim Hindi <sarfaraz.ahmed78@gmail.com>
Date: Fri, 24 Jan 2020 16:26:56 +0000
Subject: [PATCH 059/199] Translated using Weblate (Urdu)

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

diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 68fb80c84..cebcdc0ae 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -287,7 +287,7 @@
     <string name="could_not_import_all_files">انتباہ: تمام فائلوں کو درآمد نہیں کیا جاسکا۔</string>
     <string name="override_current_data">یہ آپ کی موجودہ سیٹ اپ کو رد کر دے گا۔</string>
     <string name="kiosk">کیوسک</string>
-    <string name="trending">رجحان سازی</string>
+    <string name="trending">رجحان میں</string>
     <string name="top_50">Top 50</string>
     <string name="new_and_hot">نیا اور تاذہ</string>
     <string name="title_activity_background_player">پس منظر پلیئر</string>

From e1145f16f2b49b07d6a74d3ebe1fe6e22095ec3b Mon Sep 17 00:00:00 2001
From: Harshal Lele <harshallele97@gmail.com>
Date: Sat, 25 Jan 2020 22:30:49 +0530
Subject: [PATCH 060/199] ask for display over other apps permission in
 settings

---
 .../settings/VideoAudioSettingsFragment.java  | 56 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 57 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
index 9bbdd650d..64ff23140 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
@@ -1,12 +1,68 @@
 package org.schabi.newpipe.settings;
 
+import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.google.android.material.snackbar.Snackbar;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.PermissionHelper;
 
 public class VideoAudioSettingsFragment extends BasePreferenceFragment {
+
+    private SharedPreferences.OnSharedPreferenceChangeListener listener;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        listener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+            @Override
+            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+                if(s.equals(getString(R.string.minimize_on_exit_key))){
+                    String newSetting = sharedPreferences.getString(s,null);
+                    if(newSetting != null){
+                        if(newSetting.equals(getString(R.string.minimize_on_exit_popup_key))){
+                            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !Settings.canDrawOverlays(getContext())){
+                                Snackbar.make(getListView(),R.string.permission_display_over_apps,Snackbar.LENGTH_INDEFINITE)
+                                        .setAction(R.string.settings, new View.OnClickListener() {
+                                            @Override
+                                            public void onClick(View view) {
+                                                PermissionHelper.checkSystemAlertWindowPermission(getContext());
+                                            }
+                                        })
+                                        .show();
+
+                            }
+                        }
+                    }
+                }
+            }
+        };
+    }
+
+
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.video_audio_settings);
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(listener);
+
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(listener);
+    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e1b2cc0a4..2d69ea402 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -227,6 +227,7 @@
     <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>
+    <string name="permission_display_over_apps">Give permission to display over other apps</string>
     <!-- error activity -->
     <string name="sorry_string">Sorry, that should not have happened.</string>
     <string name="guru_meditation" translatable="false">Guru Meditation.</string>

From 7f7bf8474e0f8cdbc730cfaab80d3a0ffce4dfbe Mon Sep 17 00:00:00 2001
From: Tobias Groza <TobiGr@users.noreply.github.com>
Date: Sat, 25 Jan 2020 21:35:07 +0100
Subject: [PATCH 061/199] Add link to FAQ in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f78725338..987327ab8 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 </p>
 <hr>
 <p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#updates">Updates</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
-<p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a>  &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
+<p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a> &bull; <a href="https://newpipe.schabi.org/FAQ/">FAQ</a> &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
 <hr>
 
 <b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>

From 9c58a07a72b4b69d14d9b2c51762fd27aa92ea95 Mon Sep 17 00:00:00 2001
From: AioiLight <info@aioilight.space>
Date: Sat, 25 Jan 2020 17:06:03 +0000
Subject: [PATCH 062/199] Translated using Weblate (Japanese)

Currently translated at 99.8% (526 of 527 strings)
---
 app/src/main/res/values-ja/strings.xml | 54 ++++++++++++++++++--------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 553a54f1e..fdab646b2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -212,7 +212,7 @@
     <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="no_channel_subscribed_yet">登録しているチャンネルはありません</string>
     <string name="select_a_kiosk">Kioskを選択</string>
     <string name="kiosk">Kiosk</string>
     <string name="trending">人気</string>
@@ -232,8 +232,8 @@
     <string name="just_once">一度だけ</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="import_data_summary">既存の履歴と登録リストは上書きされます</string>
+    <string name="export_data_summary">履歴や登録リスト、プレイリストをエクスポートします</string>
     <string name="player_recoverable_failure">再生エラーからの回復中</string>
     <string name="external_player_unsupported_link_type">外部プレイヤーは、これらのタイプのリンクをサポートしていません</string>
     <string name="invalid_url_toast">無効なURL</string>
@@ -254,7 +254,7 @@
     <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="download_thumbnail_title">サムネイルを読み込む</string>
     <string name="thumbnail_cache_wipe_complete_notice">画像キャッシュを消去しました</string>
     <string name="metadata_cache_wipe_title">キャッシュを消去</string>
@@ -301,8 +301,8 @@
     <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="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>
@@ -330,7 +330,7 @@
     <string name="delete_search_history_alert">すべての検索履歴を削除しますか？</string>
     <string name="invalid_source">このファイル/コンテンツはありません</string>
     <plurals name="subscribers">
-        <item quantity="other">登録者数 %s 人</item>
+        <item quantity="other">%s を登録しています</item>
     </plurals>
     <string name="no_views">視聴なし</string>
     <plurals name="views">
@@ -339,7 +339,7 @@
     <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="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>
@@ -360,10 +360,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>
@@ -393,7 +393,7 @@
     <string name="unhook_checkbox">速度と音程を連動せずに変更 (歪むかもしれません)</string>
     <string name="skip_silence_checkbox">無音の間に早送り</string>
     <string name="playback_step">音程幅</string>
-    <string name="unsubscribe">購読解除</string>
+    <string name="unsubscribe">登録解除</string>
     <string name="tab_new">新しいタブ</string>
     <string name="tab_choose">タブを選択</string>
     <string name="settings_category_updates_title">アプリの更新</string>
@@ -402,7 +402,7 @@
     <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の個人情報保護方針にご注意ください。よく読んでください。
@@ -415,7 +415,7 @@
     <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_finished">完了</string>
     <string name="missions_header_pending">保留中</string>
     <string name="paused">一時停止</string>
     <string name="queued">順番待ちに追加しました</string>
@@ -480,7 +480,7 @@
     <string name="error_postprocessing_stopped">ファイルの作業中に NewPipe が閉じられました</string>
     <string name="error_insufficient_storage">デバイスに空き容量がありません</string>
     <string name="error_progress_lost">ファイルが削除されたため、進行状況が失われました</string>
-    <string name="confirm_prompt">よろしいですか\?</string>
+    <string name="confirm_prompt">ダウンロード履歴、またはダウンロードしたファイルを消去しますか\?</string>
     <string name="enable_queue_limit">ダウンロード キューの制限</string>
     <string name="enable_queue_limit_desc">同時に１つのダウンロードが実行されます</string>
     <string name="start_downloads">ダウンロードの開始</string>
@@ -503,11 +503,31 @@
     <string name="default_kiosk_page_summary">デフォルトのキオスク</string>
     <string name="no_one_watching">誰も見ていません</string>
     <plurals name="watching">
-        <item quantity="other">%s 見ています</item>
+        <item quantity="other">%s 視聴中</item>
     </plurals>
     <string name="no_one_listening">誰も聞いていません</string>
     <plurals name="listening">
         <item quantity="other">%s リスナー</item>
     </plurals>
     <string name="localization_changes_requires_app_restart">アプリを再起動すると、言語が変更されます。</string>
+    <string name="seek_duration_title">高速早送り/巻き戻し時間</string>
+    <string name="peertube_instance_url_title">PeerTube インスタンス</string>
+    <string name="peertube_instance_url_summary">PeerTube インスタンスを選択する</string>
+    <string name="peertube_instance_url_help">あなたに最適なインスタンスを探せます: %s</string>
+    <string name="peertube_instance_add_title">インスタンスを追加</string>
+    <string name="peertube_instance_add_help">インスタンスの URL を入力</string>
+    <string name="peertube_instance_add_fail">インスタンスを検証することができませんでした</string>
+    <string name="peertube_instance_add_https_only">HTTPS な URL のみがサポートされています</string>
+    <string name="peertube_instance_add_exists">インスタンスはすでに存在しています</string>
+    <string name="local">ローカル</string>
+    <string name="recently_added">最近追加された</string>
+    <string name="most_liked">高評価</string>
+    <string name="recovering">修復中</string>
+    <string name="error_download_resource_gone">ダウンロードが修復できません</string>
+    <string name="choose_instance_prompt">インスタンスを選択</string>
+    <string name="enable_lock_screen_video_thumbnail_title">ロック画面の動画サムネイルを有効にする</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">バックグラウンドプレイヤーを使用中、ロック画面に動画のサムネイルが表示されるようになります</string>
+    <string name="clear_download_history">ダウンロード履歴を消去</string>
+    <string name="delete_downloaded_files">ダウンロードしたファイルを消去</string>
+    <string name="deleted_downloads">%1$s 個削除しました</string>
 </resources>
\ No newline at end of file

From 14b3cf7ccd9491719d20f63cce2fbf7a56890b19 Mon Sep 17 00:00:00 2001
From: "Ian Emmanuel M. Enanoria" <secrettech221@gmail.com>
Date: Sat, 25 Jan 2020 04:50:59 +0000
Subject: [PATCH 063/199] Translated using Weblate (Filipino)

Currently translated at 12.7% (67 of 527 strings)
---
 app/src/main/res/values-fil/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index 40412ac11..9813b6922 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -39,4 +39,7 @@
     <string name="controls_popup_title">Popup</string>
     <string name="controls_add_to_playlist_title">Idagdag sa</string>
     <string name="download_path_title">Folder ng pag-download ng video</string>
+    <string name="download_path_dialog_title">Pumili ng folder kung saan ido-download ang mga bidyo</string>
+    <string name="download_path_audio_summary">Nakaimbak sa folder na ito ang mga nai-download na mga audio files</string>
+    <string name="download_path_audio_dialog_title">Pumili ng folder kung saan ido-download ang mga audio files</string>
 </resources>
\ No newline at end of file

From 94403a9c3c137d3911fa205f8d039527f64d8f12 Mon Sep 17 00:00:00 2001
From: Christophe <contact2@c-henry.fr>
Date: Thu, 25 Apr 2019 20:47:39 +0200
Subject: [PATCH 064/199] Add send to Kodi button to player next to share
 button

---
 .../fragments/detail/VideoDetailFragment.java | 13 ++---------
 .../newpipe/player/MainVideoPlayer.java       | 21 +++++++++++++++++
 .../org/schabi/newpipe/util/KoreUtil.java     | 23 +++++++++++++++++++
 .../activity_main_player.xml                  | 21 ++++++++++++++++-
 .../main/res/layout/activity_main_player.xml  | 21 ++++++++++++++++-
 5 files changed, 86 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/util/KoreUtil.java

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 14e989625..f59cfaef0 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
@@ -79,6 +79,7 @@ import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.InfoCache;
+import org.schabi.newpipe.util.KoreUtil;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -624,7 +625,7 @@ public class VideoDetailFragment
                             url.replace("https", "http")));
                 } catch (Exception e) {
                     if (DEBUG) Log.i(TAG, "Failed to start kore", e);
-                    showInstallKoreDialog(activity);
+                    KoreUtil.showInstallKoreDialog(activity);
                 }
                 return true;
             default:
@@ -632,16 +633,6 @@ public class VideoDetailFragment
         }
     }
 
-    private static void showInstallKoreDialog(final Context context) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setMessage(R.string.kore_not_found)
-                .setPositiveButton(R.string.install, (DialogInterface dialog, int which) ->
-                        NavigationHelper.installKore(context))
-                .setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> {
-                });
-        builder.create().show();
-    }
-
     private void setupActionBarOnError(final String url) {
         if (DEBUG) Log.d(TAG, "setupActionBarHandlerOnError() called with: url = [" + url + "]");
         Log.e("-----", "missing code");
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 9ccf5b9d3..1153c41fd 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -28,6 +28,7 @@ import android.database.ContentObserver;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.media.AudioManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -75,6 +76,7 @@ import org.schabi.newpipe.player.playqueue.PlayQueueItemTouchCallback;
 import org.schabi.newpipe.player.resolver.MediaSourceTag;
 import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
 import org.schabi.newpipe.util.AnimationUtils;
+import org.schabi.newpipe.util.KoreUtil;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
@@ -435,6 +437,7 @@ public final class MainVideoPlayer extends AppCompatActivity
         private boolean queueVisible;
 
         private ImageButton moreOptionsButton;
+        private ImageButton kodiButton;
         private ImageButton shareButton;
         private ImageButton toggleOrientationButton;
         private ImageButton switchPopupButton;
@@ -471,6 +474,7 @@ public final class MainVideoPlayer extends AppCompatActivity
 
             this.moreOptionsButton = rootView.findViewById(R.id.moreOptionsButton);
             this.secondaryControls = rootView.findViewById(R.id.secondaryControls);
+            this.kodiButton = rootView.findViewById(R.id.kodi);
             this.shareButton = rootView.findViewById(R.id.share);
             this.toggleOrientationButton = rootView.findViewById(R.id.toggleOrientation);
             this.switchBackgroundButton = rootView.findViewById(R.id.switchBackground);
@@ -482,6 +486,9 @@ public final class MainVideoPlayer extends AppCompatActivity
 
             titleTextView.setSelected(true);
             channelTextView.setSelected(true);
+            boolean showKodiButton = PreferenceManager.getDefaultSharedPreferences(this.context).getBoolean(
+					this.context.getString(R.string.show_play_with_kodi_key), false);
+            kodiButton.setVisibility(showKodiButton ? View.VISIBLE : View.GONE);
 
             getRootView().setKeepScreenOn(true);
         }
@@ -518,6 +525,7 @@ public final class MainVideoPlayer extends AppCompatActivity
             closeButton.setOnClickListener(this);
 
             moreOptionsButton.setOnClickListener(this);
+            kodiButton.setOnClickListener(this);
             shareButton.setOnClickListener(this);
             toggleOrientationButton.setOnClickListener(this);
             switchBackgroundButton.setOnClickListener(this);
@@ -588,6 +596,17 @@ public final class MainVideoPlayer extends AppCompatActivity
             finish();
         }
 
+        public void onKodiShare() {
+            onPause();
+            try {
+                NavigationHelper.playWithKore(this.context, Uri.parse(
+                        playerImpl.getVideoUrl().replace("https", "http")));
+            } catch (Exception e) {
+                if (DEBUG) Log.i(TAG, "Failed to start kore", e);
+                KoreUtil.showInstallKoreDialog(this.context);
+            }
+        }
+
         /*//////////////////////////////////////////////////////////////////////////
         // Player Overrides
         //////////////////////////////////////////////////////////////////////////*/
@@ -688,6 +707,8 @@ public final class MainVideoPlayer extends AppCompatActivity
             } else if (v.getId() == closeButton.getId()) {
                 onPlaybackShutdown();
                 return;
+            } else if (v.getId() == kodiButton.getId()) {
+            	onKodiShare();
             }
 
             if (getCurrentState() != STATE_COMPLETED) {
diff --git a/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java b/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java
new file mode 100644
index 000000000..2ed3c698d
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/KoreUtil.java
@@ -0,0 +1,23 @@
+package org.schabi.newpipe.util;
+
+
+import android.content.Context;
+import android.content.DialogInterface;
+import androidx.appcompat.app.AlertDialog;
+
+import org.schabi.newpipe.R;
+
+
+public class KoreUtil {
+    private KoreUtil() { }
+
+    public static void showInstallKoreDialog(final Context context) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setMessage(R.string.kore_not_found)
+               .setPositiveButton(R.string.install,
+                   (DialogInterface dialog, int which) -> NavigationHelper.installKore(context))
+               .setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> {
+               });
+        builder.create().show();
+    }
+}
diff --git a/app/src/main/res/layout-large-land/activity_main_player.xml b/app/src/main/res/layout-large-land/activity_main_player.xml
index b535db2b8..98017b132 100644
--- a/app/src/main/res/layout-large-land/activity_main_player.xml
+++ b/app/src/main/res/layout-large-land/activity_main_player.xml
@@ -305,7 +305,7 @@
                     tools:text="English" />
 
                 <ImageButton
-                    android:id="@+id/share"
+                    android:id="@+id/kodi"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
                     android:layout_marginLeft="4dp"
@@ -316,6 +316,25 @@
                     android:focusable="true"
                     android:padding="5dp"
                     android:scaleType="fitXY"
+                    android:src="@drawable/ic_cast_white_24dp"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/play_with_kodi_title"
+                    tools:ignore="RtlHardcoded"
+                    android:visibility="visible"/>
+
+                <ImageButton
+                    android:id="@+id/share"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@id/kodi"
+                    android:layout_alignWithParentIfMissing="true"
+                    android:layout_centerVertical="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:scaleType="fitXY"
                     android:src="@drawable/ic_share_white_24dp"
                     android:background="?attr/selectableItemBackground"
                     android:contentDescription="@string/share"
diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/activity_main_player.xml
index f2b204b75..ab9eb8a61 100644
--- a/app/src/main/res/layout/activity_main_player.xml
+++ b/app/src/main/res/layout/activity_main_player.xml
@@ -303,7 +303,7 @@
                     tools:text="English" />
 
                 <ImageButton
-                    android:id="@+id/share"
+                    android:id="@+id/kodi"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
                     android:layout_marginLeft="4dp"
@@ -314,6 +314,25 @@
                     android:focusable="true"
                     android:padding="5dp"
                     android:scaleType="fitXY"
+                    android:src="@drawable/ic_cast_white_24dp"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/play_with_kodi_title"
+                    tools:ignore="RtlHardcoded"
+                    android:visibility="visible"/>
+
+                <ImageButton
+                    android:id="@+id/share"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@id/kodi"
+                    android:layout_alignWithParentIfMissing="true"
+                    android:layout_centerVertical="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:scaleType="fitXY"
                     android:src="@drawable/ic_share_white_24dp"
                     android:background="?attr/selectableItemBackground"
                     android:contentDescription="@string/share"

From 156a2eb4ffe7479333536f3195ed3ceee63fa7f1 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Mon, 27 Jan 2020 19:32:40 +0100
Subject: [PATCH 065/199] update prettytime dependency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

see https://github.com/TeamNewPipe/NewPipe/pull/2921#issuecomment-572601812
It will add Esperanto, add bengali, update vietnamese
pretty time is the library used in the home page: … days ago
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0ca03f158..f8fc1565f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -94,7 +94,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
-    implementation 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.3.Final'
 
     implementation "androidx.room:room-runtime:${roomDbLibVersion}"
     implementation "androidx.room:room-rxjava2:${roomDbLibVersion}"

From e0829769141cb959b9d5a6d78e7e694af618e274 Mon Sep 17 00:00:00 2001
From: Sithananthan <lsithananthan@gmail.com>
Date: Mon, 27 Jan 2020 08:59:46 +0000
Subject: [PATCH 066/199] Translated using Weblate (Tamil)

Currently translated at 43.3% (228 of 527 strings)
---
 app/src/main/res/values-ta/strings.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 0dee99ad0..41e683545 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -36,10 +36,10 @@
     <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_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="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>
@@ -180,7 +180,7 @@
     </plurals>
     <plurals name="videos">
         <item quantity="one">காணொளிகள்</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <string name="switch_to_main">முதற்பக்கத்துக்கு மாற்று</string>
     <string name="invalid_url_toast">சரியில்லாத URL</string>
@@ -208,7 +208,7 @@
     <string name="autoplay_title">தானாக ஓட்டு</string>
     <plurals name="comments">
         <item quantity="one">கருத்துக்கள்</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <string name="enable_playback_resume_title">திரையிடலை தொடங்கு</string>
     <string name="enable_playback_state_lists_title">பட்டியலில் இடங்கள்</string>
@@ -220,4 +220,7 @@
         <item quantity="one">%s பார்க்கிறார்</item>
         <item quantity="other">%s பார்க்கிறார்கள்</item>
     </plurals>
+    <string name="seek_duration_title">வேகமாக முன்னோக்கி / திரும்பத் தேடும் காலம்</string>
+    <string name="enable_lock_screen_video_thumbnail_title">பூட்டு திரை வீடியோ சிறுபடத்தை இயக்கவும்</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">பின்னணி பிளேயரைப் பயன்படுத்தும் போது பூட்டுத் திரையில் வீடியோ சிறுபடம் காண்பிக்கப்படும்</string>
 </resources>
\ No newline at end of file

From 42bb96af23a3550285b432c46b46d3563d08454b Mon Sep 17 00:00:00 2001
From: Laura Arjona Reina <larjona@larjona.net>
Date: Mon, 27 Jan 2020 14:37:13 +0000
Subject: [PATCH 067/199] Translated using Weblate (Spanish)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-es/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9f25208bb..5b3265cd7 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -425,7 +425,7 @@
     <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">¿Lo confirma\?</string>
+    <string name="confirm_prompt">¿Quiere limpiar su historial de descargas o eliminar todos los ficheros descargados\?</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>
@@ -534,4 +534,7 @@
     <string name="choose_instance_prompt">Elige una instancia</string>
     <string name="enable_lock_screen_video_thumbnail_title">Habilitar miniatura de video de la pantalla de bloqueo</string>
     <string name="enable_lock_screen_video_thumbnail_summary">Al usar el reproductor de fondo, se mostrará una miniatura de video en la pantalla de bloqueo</string>
+    <string name="clear_download_history">Limpiar historial de descargas</string>
+    <string name="delete_downloaded_files">Eliminar archivos descargados</string>
+    <string name="deleted_downloads">Eliminadas %1$s descargas</string>
 </resources>
\ No newline at end of file

From c486368b9b8caaf6955b8656f4ce9b4ae2df7f8d Mon Sep 17 00:00:00 2001
From: Ryan <twobox0@gmail.com>
Date: Mon, 27 Jan 2020 01:23:37 +0000
Subject: [PATCH 068/199] Translated using Weblate (Korean)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-ko/strings.xml | 34 ++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index e8a2a9c51..e2010c50f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -482,7 +482,7 @@
     <string name="error_insufficient_storage">남은 저장공간이 없습니다</string>
     <string name="error_progress_lost">파일이 삭제되어 진행이 중지되었습니다</string>
     <string name="error_timeout">연결시간 초과</string>
-    <string name="confirm_prompt">확실합니까\?</string>
+    <string name="confirm_prompt">모든 다운로드 기록과 파일을 삭제합니다.확실합니까\?</string>
     <string name="enable_queue_limit">다운로드 대기 제한</string>
     <string name="start_downloads">다운로드 시작</string>
     <string name="pause_downloads">다운로드 일시정지</string>
@@ -497,10 +497,40 @@
     <string name="downloads_storage_ask_summary_kitkat">매 다운로드 마다 저장경로를 묻습니다.
 \n외장 SD카드에 다운로드 하고자 한다면 SAF를 선택하십시오</string>
     <plurals name="videos">
-        <item quantity="other">%s개의 동영상</item>
+        <item quantity="other">동영상</item>
     </plurals>
     <string name="enable_queue_limit_desc">하나의 다운로드가 동시에 진행됩니다</string>
     <string name="download_choose_new_path">적용하려면 다운로드 폴더를 변경하세요</string>
     <string name="drawer_header_description">서비스 토글, 현재 선택된 서비스:</string>
     <string name="default_kiosk_page_summary">기본 키오스크</string>
+    <string name="no_one_watching">시청자가 없습니다.</string>
+    <plurals name="watching">
+        <item quantity="other">%s 시청</item>
+    </plurals>
+    <string name="no_one_listening">듣고 있는 사람이 없습니다.</string>
+    <plurals name="listening">
+        <item quantity="other">%s 듣는사람</item>
+    </plurals>
+    <string name="localization_changes_requires_app_restart">앱을 재시작하면 언어가 변경됩니다.</string>
+    <string name="seek_duration_title">빠른-감기/되감기 찾는 시간</string>
+    <string name="peertube_instance_url_title">피어튜브 인스턴스</string>
+    <string name="peertube_instance_url_summary">당신이 선호하는 피어튜브 인스턴스를 선택하세요.</string>
+    <string name="peertube_instance_url_help">%s에서 당신에게 가장 잘 어울리는 인스턴스를 찾으세요.</string>
+    <string name="peertube_instance_add_title">인스턴스 추가하기</string>
+    <string name="peertube_instance_add_help">인스턴스 URL을 입력하세요.</string>
+    <string name="peertube_instance_add_fail">인스턴스를 검증할 수 없습니다.</string>
+    <string name="peertube_instance_add_https_only">오직 HTTPS URL들만 지원합니다.</string>
+    <string name="peertube_instance_add_exists">인스턴스가 이미 존재합니다.</string>
+    <string name="local">로컬</string>
+    <string name="recently_added">최근에 추가됨.</string>
+    <string name="most_liked">가장 선호하는</string>
+    <string name="playlist_no_uploader">자동생성된(업로더를 찾지못함)</string>
+    <string name="recovering">복구하기</string>
+    <string name="error_download_resource_gone">이 다운로드를 복구할 수 없습니다</string>
+    <string name="choose_instance_prompt">인스턴스를 선택하세요</string>
+    <string name="enable_lock_screen_video_thumbnail_title">비디어 썸네일 화면 고정을 가능하게 한다</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">백그라운드 플레이어를 사용하는 경우 비디오 썸네일은 고정된 스크린 위에 표시됩니다.</string>
+    <string name="clear_download_history">다운로드 기록 삭제</string>
+    <string name="delete_downloaded_files">다운로드된 파일 삭제</string>
+    <string name="deleted_downloads">%1$s 다운로드 삭제</string>
 </resources>
\ No newline at end of file

From c17d80948cdeadfacf476f5c9361d83d15a142df Mon Sep 17 00:00:00 2001
From: Abu Sarim Hindi <sarfaraz.ahmed78@gmail.com>
Date: Sun, 26 Jan 2020 22:29:45 +0000
Subject: [PATCH 069/199] Translated using Weblate (Urdu)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-ur/strings.xml | 56 +++++++++++++-------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index cebcdc0ae..375c0d6fd 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -79,55 +79,55 @@
     <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="resume_on_audio_focus_gain_summary">مداخلت کے بعد چلانا جاری رکھیں (مثلاً فون کالز)</string>
     <string name="download_dialog_title">ڈاؤن لوڈ</string>
-    <string name="next_video_title">اگلا</string>
+    <string name="next_video_title">اگلی</string>
     <string name="show_next_and_similar_title">\'اگلی\' اور \'ملتی جلتی\' ویڈیوز دکھائیں</string>
-    <string name="show_hold_to_append_title">\"شامل کرنے کے لئے پکڑیں\" ٹپ دکھائیں</string>
-    <string name="show_hold_to_append_summary">ویڈیو تفصیلات کے صفحے پر جب بیک گراؤنڈ یا پاپ اپ بٹن دبائے جاتے ہیں تو ٹپ دکھائیں</string>
-    <string name="url_not_supported_toast">غیر معاون URL</string>
-    <string name="default_content_country_title">طے شدہ مواد والا ملک</string>
+    <string name="show_hold_to_append_title">’’شامل کرنے کے لئے پکڑیں‘‘ اشارہ دکھائیں</string>
+    <string name="show_hold_to_append_summary">ویڈیو تفصیلات کے صفحے پر جب پس منظر یا پاپ اپ بٹن دبائے جانے پر ٹپ دکھائیں</string>
+    <string name="url_not_supported_toast">غیر موافق URL</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_video_audio_title">ویڈیو اور آڈیو</string>
-    <string name="settings_category_history_title">تاریخ اور کیشے</string>
+    <string name="settings_category_history_title">سرگزشت اور کیشے</string>
     <string name="settings_category_popup_title">پوپ اپ</string>
-    <string name="settings_category_appearance_title">ظہور</string>
+    <string name="settings_category_appearance_title">ظاہر</string>
     <string name="settings_category_other_title">دیگر</string>
-    <string name="settings_category_debug_title">ڈیبگ</string>
+    <string name="settings_category_debug_title">ڈِیبَگ</string>
     <string name="background_player_playing_toast">پس منظر میں چلائیں</string>
-    <string name="popup_playing_toast">پوپ اپ موڈ میں چلائیں</string>
-    <string name="background_player_append">بیک گراؤنڈ پلیئر پر قطار ہے</string>
-    <string name="popup_playing_append">پاپ اپ پلیئر پر قطارہے</string>
+    <string name="popup_playing_toast">پوپ اپ اسلوب میں چلائیں</string>
+    <string name="background_player_append">پس منظر پلیئر میں شامل ہوئی</string>
+    <string name="popup_playing_append">پاپ اپ پلیئر میں شامل ہوئی</string>
     <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="content">مشمول</string>
+    <string name="show_age_restricted_content_title">نازیبا مشمولات</string>
+    <string name="video_is_age_restricted">نازیبا ویڈیو دکھائی دے گی۔ ترتیبات سے اس طرح کے مشمولات کی اجازت ممکن ہے۔</string>
     <string name="duration_live">براہ راست</string>
     <string name="downloads">ڈاؤن لوڈ</string>
     <string name="downloads_title">ڈاؤن لوڈ</string>
-    <string name="error_report_title">غلطی کی اطلاع</string>
+    <string name="error_report_title">خرابی کی اطلاع</string>
     <string name="all">تمام</string>
-    <string name="channel">چینل(ذریعہ)</string>
+    <string name="channel">چینل</string>
     <string name="playlist">پلے لسٹ</string>
     <string name="yes">ہاں</string>
     <string name="later">بعد میں</string>
     <string name="disabled">غیر فعال</string>
     <string name="filter">فلٹر</string>
-    <string name="refresh">تازہ</string>
+    <string name="refresh">ازسرنو</string>
     <string name="clear">صاف</string>
-    <string name="popup_resizing_indicator_title">سائز تبدیل کریں</string>
+    <string name="popup_resizing_indicator_title">جسامت بدلیں</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="file">فائل</string>
-    <string name="notification_channel_name">نیو پائپ نوٹیفیکیشن</string>
+    <string name="notification_channel_name">نیو پائپ اطلاعات</string>
     <string name="notification_channel_description">نیو پائپ کے پس منظر اور پاپ اپ پلیئرز کیلئے اطلاعات</string>
     <string name="unknown_content">[نامعلوم]</string>
-    <string name="toggle_orientation">ترتیب وضع کریں</string>
+    <string name="toggle_orientation">سمت بندی بدلیں</string>
     <string name="switch_to_background">پس منظر پر جائیں</string>
     <string name="switch_to_popup">پاپ اپ پر جائیں</string>
     <string name="switch_to_main">مین پر سوئچ کریں</string>
@@ -396,7 +396,7 @@
     <string name="playback_reset">ری سیٹ کریں</string>
     <string name="channels">چینلز</string>
     <string name="playlists">پلے لسٹس</string>
-    <string name="tracks">ویڈیو ذ</string>
+    <string name="tracks">ویڈیوز</string>
     <string name="users">صارفین</string>
     <string name="unsubscribe">رکنیت چھوڑیں</string>
     <string name="tab_new">نیا ٹیب</string>
@@ -405,11 +405,11 @@
     <string name="volume_gesture_control_summary">پلیئر کی آواز کنٹرول کرنے کے لیے اشاروں کا استعمال کریں</string>
     <string name="brightness_gesture_control_title">چمک کا متحرک کنٹرول</string>
     <string name="brightness_gesture_control_summary">پلیئرکی چمک کو کنٹرول کرنے کیلئے اشاروں کا استعمال کریں</string>
-    <string name="content_language_title">ڈیفالٹ مواد کی زبان</string>
+    <string name="content_language_title">مشمولات کی طےشدہ زبان</string>
     <string name="settings_category_updates_title">تازہ کاریاں</string>
     <string name="file_deleted">فائل حذف ہوگئی</string>
-    <string name="app_update_notification_channel_name">ایپ اپ ڈیٹ نوٹیفکیشن</string>
-    <string name="app_update_notification_channel_description">نئے نیو پائپ ورژن کیلئے نوٹیفیکیشن</string>
+    <string name="app_update_notification_channel_name">ایپ کی تازہ کاری کی اطلاع</string>
+    <string name="app_update_notification_channel_description">جدید نیو پائپ ورژن کیلئے اطلاعات</string>
     <string name="download_to_sdcard_error_title">بیرونی اسٹوریج دستیاب نہیں</string>
     <string name="download_to_sdcard_error_message">بیرونی ایسڈی کارڈ پر ڈاؤن لوڈ ممکن نہیں۔ ڈاؤن لوڈ فولڈر کے مقام کو دوبارہ ترتیب دیں؟</string>
     <string name="saved_tabs_invalid_json">پہلے سے طے شدہ ٹیبز کا استعمال ، محفوظ ٹیبز کو پڑھنے کے دوران خرابی</string>
@@ -464,8 +464,8 @@
     <string name="show_comments_summary">تبصرے دکھانا بند کریں</string>
     <string name="autoplay_title">آٹوپلے</string>
     <plurals name="comments">
-        <item quantity="one">تبصرے</item>
-        <item quantity="other"/>
+        <item quantity="one">تبصرہ</item>
+        <item quantity="other">تبصرے</item>
     </plurals>
     <string name="no_comments">کوئی تبصرہ نہیں</string>
     <string name="error_unable_to_load_comments">تبصرے لوڈ نہیں ہو سکے</string>
@@ -521,7 +521,7 @@
     <string name="peertube_instance_url_help">ایسی مثالوں کی تلاش کریں جو آپ کو %s پر موزوں بنائیں</string>
     <string name="peertube_instance_add_title">مثال شامل کریں</string>
     <string name="peertube_instance_add_help">مثال کا URL درج کریں</string>
-    <string name="peertube_instance_add_fail">مثال کی توثیق نہیں کی جاسکی</string>
+    <string name="peertube_instance_add_fail">مثال کی توثیق نہیں کی جا سکی</string>
     <string name="peertube_instance_add_https_only">صرف HTTPS URLs موافق ہیں</string>
     <string name="peertube_instance_add_exists">مثال پہلے سے موجود ہے</string>
     <string name="local">مقامی</string>

From 153790d80a506d748269b979f34919e937df989f Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <i.nedoboy@mail.ru>
Date: Tue, 28 Jan 2020 11:44:29 +0000
Subject: [PATCH 070/199] Translated using Weblate (Russian)

Currently translated at 100.0% (527 of 527 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 975a9479b..63d0e7699 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -313,7 +313,7 @@
     <string name="override_current_data">Текущие данные будут заменены</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>
@@ -534,7 +534,7 @@
     <string name="local">Локальное</string>
     <string name="recently_added">Новое</string>
     <string name="most_liked">Популярное</string>
-    <string name="playlist_no_uploader">Создан автоматически (автор не найден)</string>
+    <string name="playlist_no_uploader">Создано автоматически (автор не найден)</string>
     <string name="recovering">восстановление</string>
     <string name="error_download_resource_gone">Не удалось восстановить загрузку</string>
     <string name="choose_instance_prompt">Выберите сервер</string>

From 1f24c186146c17f6fe5e140539cc7e56b2266062 Mon Sep 17 00:00:00 2001
From: Harshal Lele <harshallele97@gmail.com>
Date: Tue, 28 Jan 2020 20:14:35 +0530
Subject: [PATCH 071/199] reformatted and commented code

---
 .../newpipe/settings/VideoAudioSettingsFragment.java       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
index 64ff23140..86b04c4a7 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
@@ -24,11 +24,18 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
         listener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+
+                //on M and above, if user chooses to minimise to popup player on exit and the app doesn't have
+                //display over other apps permission, show a snackbar to let the user give permission
                 if(s.equals(getString(R.string.minimize_on_exit_key))){
+
                     String newSetting = sharedPreferences.getString(s,null);
                     if(newSetting != null){
+
                         if(newSetting.equals(getString(R.string.minimize_on_exit_popup_key))){
+
                             if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !Settings.canDrawOverlays(getContext())){
+
                                 Snackbar.make(getListView(),R.string.permission_display_over_apps,Snackbar.LENGTH_INDEFINITE)
                                         .setAction(R.string.settings, new View.OnClickListener() {
                                             @Override

From a78762756a68b8db5fd711f461e53b8aed0a3c48 Mon Sep 17 00:00:00 2001
From: Harshal Lele <harshallele97@gmail.com>
Date: Tue, 28 Jan 2020 20:54:24 +0530
Subject: [PATCH 072/199] reformatted code

---
 .../settings/VideoAudioSettingsFragment.java  | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
index 86b04c4a7..6d32fb39f 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
@@ -27,29 +27,27 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
 
                 //on M and above, if user chooses to minimise to popup player on exit and the app doesn't have
                 //display over other apps permission, show a snackbar to let the user give permission
-                if(s.equals(getString(R.string.minimize_on_exit_key))){
+                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+                        s.equals(getString(R.string.minimize_on_exit_key))){
 
                     String newSetting = sharedPreferences.getString(s,null);
-                    if(newSetting != null){
+                    if(newSetting != null
+                            && newSetting.equals(getString(R.string.minimize_on_exit_popup_key))
+                            && !Settings.canDrawOverlays(getContext())){
 
-                        if(newSetting.equals(getString(R.string.minimize_on_exit_popup_key))){
+                            Snackbar.make(getListView(),R.string.permission_display_over_apps,Snackbar.LENGTH_INDEFINITE)
+                                    .setAction(R.string.settings, new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View view) {
+                                            PermissionHelper.checkSystemAlertWindowPermission(getContext());
+                                        }
+                                    })
+                                    .show();
 
-                            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !Settings.canDrawOverlays(getContext())){
-
-                                Snackbar.make(getListView(),R.string.permission_display_over_apps,Snackbar.LENGTH_INDEFINITE)
-                                        .setAction(R.string.settings, new View.OnClickListener() {
-                                            @Override
-                                            public void onClick(View view) {
-                                                PermissionHelper.checkSystemAlertWindowPermission(getContext());
-                                            }
-                                        })
-                                        .show();
-
-                            }
-                        }
                     }
                 }
             }
+
         };
     }
 

From fbf6351b993638040ac1df767ce63cf8b6c67a18 Mon Sep 17 00:00:00 2001
From: Abu Sarim Hindi <sarfaraz.ahmed78@gmail.com>
Date: Tue, 28 Jan 2020 19:36:53 +0000
Subject: [PATCH 073/199] Translated using Weblate (Urdu)

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

diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 375c0d6fd..fe3108a5d 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -248,7 +248,7 @@
     <string name="tab_about">کے بارے میں</string>
     <string name="tab_contributors">معاونین</string>
     <string name="tab_licenses">لائسنس</string>
-    <string name="app_description">لِبرے کی اینڈروئیڈ پر کم وزنی اسٹریمنگ</string>
+    <string name="app_description">لِبرے کی اینڈروئیڈ پر کم وزنی اسٹریمنگ۔</string>
     <string name="contribution_title">تعاون کریں</string>
     <string name="contribution_encouragement">چاہے آپ کے خیالات ہوں؛ ترجمہ ، ڈیزائن میں تبدیلیاں ، کوڈ صاف کرنا ، یا حقیقی ہیوی کوڈ میں تبدیلی — مدد کا ہمیشہ خیرمقدم کیا جاتا ہے۔ جتنا زیادہ ہوتا ہے اتنا ہی بہتر ہوتا ہے!</string>
     <string name="view_on_github">گٹ ہب پر دیکھیں</string>

From fd3d61c6a0ecdec689c450aefeb1470c8e27fa58 Mon Sep 17 00:00:00 2001
From: Markus Richter <8398165+mqus@users.noreply.github.com>
Date: Wed, 29 Jan 2020 13:48:02 +0100
Subject: [PATCH 074/199] fixes #3021, see also
 https://github.com/TeamNewPipe/NewPipe-legacy/pull/21

---
 app/src/main/java/us/shandian/giga/get/DownloadMission.java | 1 +
 1 file changed, 1 insertion(+)

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 c0f85b321..9ad73050b 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -223,6 +223,7 @@ public class DownloadMission extends Mission {
         conn.setInstanceFollowRedirects(true);
         conn.setRequestProperty("User-Agent", DownloaderImpl.USER_AGENT);
         conn.setRequestProperty("Accept", "*/*");
+        conn.setRequestProperty("Accept-Encoding", "*");
 
         if (headRequest) conn.setRequestMethod("HEAD");
 

From 342377e69ae3157c0b11a03d32721b80844a0b7b Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Wed, 29 Jan 2020 16:04:24 -0300
Subject: [PATCH 075/199] restore offset after writting lastest CTTS entries

---
 .../org/schabi/newpipe/streams/Mp4FromDashWriter.java     | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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 963d84b40..3dfba8b2d 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -262,13 +262,6 @@ public class Mp4FromDashWriter {
 
         final int ftyp_size = make_ftyp();
 
-        // reserve moov space in the output stream
-        /*if (outStream.canSetLength()) {
-            long length = writeOffset + auxSize;
-            // warning: setLength() does not fill the unused space with zeros
-            outStream.setLength(length);
-            outSeek(length);
-        } else {*/
         if (auxSize > 0) {
             int length = auxSize;
             byte[] buffer = new byte[64 * 1024];// 64 KiB
@@ -335,6 +328,7 @@ public class Mp4FromDashWriter {
                     if (sample == null) {
                         if (tablesInfo[i].ctts > 0 && sampleExtra[i] >= 0) {
                             writeEntryArray(tablesInfo[i].ctts, 1, sampleCount[i], sampleExtra[i]);// flush last entries
+							outRestore();
                         }
                         sampleIndex[i] = -1;
                         break;

From 0c5608506e9a2887b86cf6907e3c593efb442308 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Wed, 29 Jan 2020 16:06:40 -0300
Subject: [PATCH 076/199] typo fixup

---
 .../java/org/schabi/newpipe/streams/Mp4FromDashWriter.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 3dfba8b2d..57a7aaa9c 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -250,7 +250,7 @@ public class Mp4FromDashWriter {
 
         boolean is64 = read > THRESHOLD_FOR_CO64;
 
-        // calculate the moov size;
+        // calculate the moov size
         int auxSize = make_moov(defaultMediaTime, tablesInfo, is64);
 
         if (auxSize < THRESHOLD_MOOV_LENGTH) {
@@ -262,6 +262,7 @@ public class Mp4FromDashWriter {
 
         final int ftyp_size = make_ftyp();
 
+        // reserve moov space in the output stream
         if (auxSize > 0) {
             int length = auxSize;
             byte[] buffer = new byte[64 * 1024];// 64 KiB
@@ -328,7 +329,7 @@ public class Mp4FromDashWriter {
                     if (sample == null) {
                         if (tablesInfo[i].ctts > 0 && sampleExtra[i] >= 0) {
                             writeEntryArray(tablesInfo[i].ctts, 1, sampleCount[i], sampleExtra[i]);// flush last entries
-							outRestore();
+                            outRestore();
                         }
                         sampleIndex[i] = -1;
                         break;

From edc9d47da795efbc1606efae50788bdc81f4468b Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Tue, 28 Jan 2020 20:48:42 +0100
Subject: [PATCH 077/199] app language: refactoring
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

renamed NewPipe's language into App language, and same for all the
concerning thing (keys, comments…)

we now call assureCorrectAppLanguage(CONTEXT) in activities needing it
instead of changeAppLanguage(getAppLocale(CONTEXT), RESOURCES)
changeAppLanguage becomes private.
---
 app/src/main/java/org/schabi/newpipe/MainActivity.java |  8 +++-----
 .../java/org/schabi/newpipe/about/AboutActivity.java   |  6 ++----
 .../org/schabi/newpipe/download/DownloadActivity.java  |  6 ++----
 .../org/schabi/newpipe/player/BackgroundPlayer.java    |  6 ++----
 .../org/schabi/newpipe/player/MainVideoPlayer.java     |  9 ++++-----
 .../org/schabi/newpipe/player/PopupVideoPlayer.java    |  7 +++----
 .../schabi/newpipe/player/ServicePlayerActivity.java   |  5 ++---
 .../newpipe/player/helper/PlaybackParameterDialog.java |  7 +++----
 .../java/org/schabi/newpipe/report/ErrorActivity.java  |  5 ++---
 .../org/schabi/newpipe/settings/SettingsActivity.java  |  6 ++----
 .../java/org/schabi/newpipe/util/Localization.java     | 10 ++++++++--
 app/src/main/res/values/settings_keys.xml              |  8 ++++----
 app/src/main/res/values/strings.xml                    |  4 ++--
 app/src/main/res/xml/content_settings.xml              |  8 ++++----
 14 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 63bc8df15..7cd620faa 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -31,7 +31,6 @@ import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
@@ -78,8 +77,7 @@ import org.schabi.newpipe.util.ThemeHelper;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
@@ -118,7 +116,7 @@ public class MainActivity extends AppCompatActivity {
         }
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
@@ -422,7 +420,7 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onResume() {
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         Localization.init(getApplicationContext()); //change the date format to match the selected language on resume
         super.onResume();
 
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 4d9cfc7e1..9e23d9d3d 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -22,11 +22,9 @@ import android.widget.TextView;
 
 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 public class AboutActivity extends AppCompatActivity {
 
@@ -65,7 +63,7 @@ public class AboutActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this);
         this.setTitle(getString(R.string.title_activity_about));
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 7aaaeeb17..00dd45ac9 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -12,14 +12,12 @@ import android.view.MenuItem;
 import android.view.ViewTreeObserver;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 public class DownloadActivity extends AppCompatActivity {
 
@@ -32,7 +30,7 @@ public class DownloadActivity extends AppCompatActivity {
         i.setClass(this, DownloadManagerService.class);
         startService(i);
 
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         ThemeHelper.setTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_downloader);
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 c74882161..9e23d9145 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
@@ -58,9 +58,7 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
-
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 /**
  * Base players joining the common properties
@@ -117,7 +115,7 @@ public final class BackgroundPlayer extends Service {
         notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
         lockManager = new LockManager(this);
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         ThemeHelper.setTheme(this);
         basePlayerImpl = new BasePlayerImpl(this);
         basePlayerImpl.setup();
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 487629c12..31f7dd74a 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -95,8 +95,7 @@ import static org.schabi.newpipe.util.AnimationUtils.Type.SCALE_AND_ALPHA;
 import static org.schabi.newpipe.util.AnimationUtils.Type.SLIDE_AND_ALPHA;
 import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 import static org.schabi.newpipe.util.StateSaver.KEY_SAVED_STATE;
 
 /**
@@ -127,7 +126,7 @@ public final class MainVideoPlayer extends AppCompatActivity
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
         defaultPreferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -195,7 +194,7 @@ public final class MainVideoPlayer extends AppCompatActivity
     @Override
     protected void onResume() {
         if (DEBUG) Log.d(TAG, "onResume() called");
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         super.onResume();
 
         if (globalScreenOrientationLocked()) {
@@ -226,7 +225,7 @@ public final class MainVideoPlayer extends AppCompatActivity
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
 
         if (playerImpl.isSomePopupMenuVisible()) {
             playerImpl.getQualityPopupMenu().dismiss();
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 96bc606cc..fc14e8d51 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -80,8 +80,7 @@ import static org.schabi.newpipe.player.BasePlayer.STATE_PLAYING;
 import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_DURATION;
 import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 /**
  * Service Popup Player implementing VideoPlayer
@@ -144,7 +143,7 @@ public final class PopupVideoPlayer extends Service {
 
     @Override
     public void onCreate() {
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
         notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
 
@@ -172,7 +171,7 @@ public final class PopupVideoPlayer extends Service {
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         if (DEBUG) Log.d(TAG, "onConfigurationChanged() called with: newConfig = [" + newConfig + "]");
         updateScreenSize();
         updatePopupSize(popupLayoutParams.width, -1);
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 1c6d786cd..669d1c16c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -46,8 +46,7 @@ import java.util.List;
 
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatPitch;
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 public abstract class ServicePlayerActivity extends AppCompatActivity
         implements PlayerEventListener, SeekBar.OnSeekBarChangeListener,
@@ -118,7 +117,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this);
         setContentView(R.layout.activity_player_queue_control);
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
index 2aefa675e..3ada3a6be 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
@@ -17,8 +17,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.SliderStrategy;
 
 import static org.schabi.newpipe.player.BasePlayer.DEBUG;
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 public class PlaybackParameterDialog extends DialogFragment {
     @NonNull private static final String TAG = "PlaybackParameterDialog";
@@ -110,7 +109,7 @@ public class PlaybackParameterDialog extends DialogFragment {
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
-        changeAppLanguage(getAppLocale(getContext()), getResources());
+        assureCorrectAppLanguage(getContext());
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
             initialTempo = savedInstanceState.getDouble(INITIAL_TEMPO_KEY, DEFAULT_TEMPO);
@@ -140,7 +139,7 @@ public class PlaybackParameterDialog extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        changeAppLanguage(getAppLocale(getContext()), getResources());
+        assureCorrectAppLanguage(getContext());
         final View view = View.inflate(getContext(), R.layout.dialog_playback_parameter, null);
         setupControlViews(view);
 
diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index 05dfe33ca..4512ab3a6 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -46,8 +46,7 @@ import java.util.List;
 import java.util.TimeZone;
 import java.util.Vector;
 
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 /*
  * Created by Christian Schabesberger on 24.10.15.
@@ -174,7 +173,7 @@ public class ErrorActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this);
         setContentView(R.layout.activity_error);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index 6804f9831..53d60f86c 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -14,9 +14,7 @@ import android.view.MenuItem;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import static org.schabi.newpipe.util.Localization.changeAppLanguage;
-import static org.schabi.newpipe.util.Localization.getAppLocale;
-
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 /*
  * Created by Christian Schabesberger on 31.08.15.
@@ -47,7 +45,7 @@ public class SettingsActivity extends AppCompatActivity implements BasePreferenc
     @Override
     protected void onCreate(Bundle savedInstanceBundle) {
         setTheme(ThemeHelper.getSettingsThemeStyle(this));
-        changeAppLanguage(getAppLocale(getApplicationContext()), getResources());
+        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceBundle);
         setContentView(R.layout.settings_layout);
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index d2fbd3a65..6149118cc 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -218,7 +218,7 @@ public class Localization {
         return getPrettyTime().formatUnrounded(calendarTime);
     }
 
-    public static void changeAppLanguage(Locale loc, Resources res) {
+    private static void changeAppLanguage(Locale loc, Resources res) {
         DisplayMetrics dm = res.getDisplayMetrics();
         Configuration conf = res.getConfiguration();
         conf.setLocale(loc);
@@ -227,11 +227,13 @@ public class Localization {
 
     public static Locale getAppLocale(Context context) {
         SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context);
-        String lang = prefs.getString("newpipes_language_key", "en");
+        String lang = prefs.getString("app_language_key", "en");
         Locale loc;
         if (lang.equals("system")) {
             loc = Locale.getDefault();
         } else if (lang.matches(".*-.*")) {
+            //to differentiate different versions of the language
+            //for example, pt (portuguese in Portugal) and pt-br (portuguese in Brazil)
             String[] localisation = lang.split("-");
             lang = localisation[0];
             String country = localisation[1];
@@ -241,4 +243,8 @@ public class Localization {
         }
         return loc;
     }
+
+    public static void assureCorrectAppLanguage(Context c) {
+        changeAppLanguage(getAppLocale(c), c.getResources());
+    }
 }
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index ed3c454b8..1a7d61dae 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -176,7 +176,7 @@
     <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="newpipes_language_key" translatable="false">newpipes_language_key</string>
+    <string name="app_language_key" translatable="false">app_language_key</string>
     <string name="enable_lock_screen_video_thumbnail_key" translatable="false">enable_lock_screen_video_thumbnail</string>
 
     <string name="import_data" translatable="false">import_data</string>
@@ -926,8 +926,8 @@
         <item>ZW</item>
     </string-array>
 
-    <!--The next two arrays are set to change the NewPipe language-->
-    <string-array name="language_code_np" translatable="false">
+    <!--The next two arrays are set to change the app language-->
+    <string-array name="app_language_code" translatable="false">
         <item>system</item>
         <item>ar</item>
         <item>az</item>
@@ -992,7 +992,7 @@
         <item>zh-hans</item>
         <item>zh-tw</item>
     </string-array>
-    <string-array name="language_name_np" translatable="false">
+    <string-array name="app_language_name" translatable="false">
         <item>@string/systems_language</item>
         <item>العربية</item>
         <item>Azərbaycan dili</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c5a59abe7..29864963f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -589,6 +589,6 @@
     <string name="downloads_storage_use_saf_title">Use SAF</string>
     <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
-    <string name="newpipes_language_title">NewPipe\'s language</string>
-    <string name="systems_language">System\'s language</string>
+    <string name="app_language_title">App language</string>
+    <string name="systems_language">System default</string>
 </resources>
diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml
index ab9896cde..197c14487 100644
--- a/app/src/main/res/xml/content_settings.xml
+++ b/app/src/main/res/xml/content_settings.xml
@@ -7,11 +7,11 @@
     <ListPreference
         app:iconSpaceReserved="false"
         android:defaultValue="system"
-        android:entries="@array/language_name_np"
-        android:entryValues="@array/language_code_np"
-        android:key="@string/newpipes_language_key"
+        android:entries="@array/app_language_name"
+        android:entryValues="@array/app_language_code"
+        android:key="@string/app_language_key"
         android:summary="%s"
-        android:title="@string/newpipes_language_title"/>
+        android:title="@string/app_language_title"/>
 
     <ListPreference
         app:iconSpaceReserved="false"

From d34e5f78a980e897d6554b1f2154c4bccee776df Mon Sep 17 00:00:00 2001
From: Gergely Szarka <szarka.honved@gmail.com>
Date: Tue, 28 Jan 2020 21:11:12 +0000
Subject: [PATCH 078/199] Translated using Weblate (Hungarian)

Currently translated at 67.4% (355 of 527 strings)
---
 app/src/main/res/values-hu/strings.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 4d7ff986e..3587ad136 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -14,9 +14,9 @@
     <string name="share_dialog_title">Megosztás ezzel</string>
     <string name="choose_browser">Válasszon böngészőt</string>
     <string name="screen_rotation">forgatás</string>
-    <string name="download_path_title">Videófájlok letöltési helye</string>
-    <string name="download_path_summary">Útvonal a letöltött videók tárolásához</string>
-    <string name="download_path_dialog_title">Adja meg a videófájlok letöltési helyét</string>
+    <string name="download_path_title">Videók letöltési helye</string>
+    <string name="download_path_summary">Ide kerülnek a letöltött videók</string>
+    <string name="download_path_dialog_title">Válassza ki a videófájlok letöltési helyét</string>
     <string name="default_resolution_title">Alapértelmezett felbontás</string>
     <string name="play_with_kodi_title">Lejátszás Kodi-val</string>
     <string name="kore_not_found">A Kore alkalmazás nem található. Telepíted a Kore lejátszót?</string>
@@ -29,7 +29,7 @@
     <string name="url_not_supported_toast">Nem támogatott webcím</string>
     <string name="use_external_video_player_title">Külső videólejátszó használata</string>
     <string name="use_external_audio_player_title">Külső hanglejátszó használata</string>
-    <string name="download_path_audio_dialog_title">Add meg a hangfájlok letöltési helyét</string>
+    <string name="download_path_audio_dialog_title">Válaszd ki a hangfájlok letöltési helyét</string>
     <string name="use_tor_title">Tor használata</string>
     <string name="use_tor_summary">(Kísérleti) Adatforgalom Tor-on keresztüli kényszerítése a biztonság fokozása érdekében (a videó stream-elés még nem támogatott).</string>
     <string name="play_btn_text">Lejátszás</string>
@@ -44,7 +44,7 @@
     <string name="light_theme_title">Világos</string>
     <string name="theme_title">Téma</string>
     <string name="download_path_audio_title">Hangfájlok letöltési helye</string>
-    <string name="download_path_audio_summary">Letöltött hangfájlok itt találhatók</string>
+    <string name="download_path_audio_summary">A letöltött hangfájlok itt találhatóak</string>
     <string name="detail_likes_img_view_description">Tetszik</string>
     <string name="detail_dislikes_img_view_description">Nem tetszik</string>
     <string name="list_thumbnail_view_description">Előnézeti kép</string>
@@ -123,8 +123,7 @@
     <string name="show_higher_resolutions_title">Mutassa a magasabb felbontásokat</string>
     <string name="show_higher_resolutions_summary">Csak néhány eszköz támogatja a 2K/4K videók lejátszását</string>
     <string name="default_video_format_title">Alapértelmezett videó formátum</string>
-    <string name="black_theme_title">Fekete
-\n</string>
+    <string name="black_theme_title">Fekete</string>
     <string name="popup_remember_size_pos_title">Jegyezze meg a felugró ablak helyét és méretét</string>
     <string name="popup_remember_size_pos_summary">Jegyezze meg a felugró ablak előző helyét és méretét</string>
     <string name="show_search_suggestions_title">Keresési javaslatok</string>
@@ -382,4 +381,8 @@
     <string name="dismiss">Figyelmen kívül hagy</string>
     <string name="bookmark_playlist">Lejátszási lista könyvjelzők közé</string>
     <string name="auto_queue_summary">Hasonló videó beadása az utolsó videó után egy nem ismétlődő sorban</string>
+    <string name="enqueue">Sor</string>
+    <string name="overwrite_failed">a fájl nem írható felül</string>
+    <string name="seek_duration_title">Az előre- és visszatekerés időtartama</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Videó előnézet megjelenítése a lezárási képernyőn</string>
 </resources>
\ No newline at end of file

From d686a2c9dc8555c917739ada61ccd4a9f99773ee Mon Sep 17 00:00:00 2001
From: Abu Sarim Hindi <sarfaraz.ahmed78@gmail.com>
Date: Wed, 29 Jan 2020 18:12:14 +0000
Subject: [PATCH 079/199] Translated using Weblate (Urdu)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-ur/strings.xml | 52 +++++++++++++-------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index fe3108a5d..55a0963d2 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -89,24 +89,24 @@
     <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_player_behavior_title">برتاؤ</string>
     <string name="settings_category_video_audio_title">ویڈیو اور آڈیو</string>
     <string name="settings_category_history_title">سرگزشت اور کیشے</string>
     <string name="settings_category_popup_title">پوپ اپ</string>
-    <string name="settings_category_appearance_title">ظاہر</string>
+    <string name="settings_category_appearance_title">اظہار</string>
     <string name="settings_category_other_title">دیگر</string>
     <string name="settings_category_debug_title">ڈِیبَگ</string>
     <string name="background_player_playing_toast">پس منظر میں چلائیں</string>
-    <string name="popup_playing_toast">پوپ اپ اسلوب میں چلائیں</string>
+    <string name="popup_playing_toast">پوپ اپ اسلوب میں جاری</string>
     <string name="background_player_append">پس منظر پلیئر میں شامل ہوئی</string>
     <string name="popup_playing_append">پاپ اپ پلیئر میں شامل ہوئی</string>
     <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>
+    <string name="downloads">ڈاؤن لوڈز</string>
+    <string name="downloads_title">ڈاؤن لوڈز</string>
     <string name="error_report_title">خرابی کی اطلاع</string>
     <string name="all">تمام</string>
     <string name="channel">چینل</string>
@@ -130,11 +130,11 @@
     <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>
-    <string name="export_data_summary">تاریخ ، خریداری اور پلے لسٹ برآمد کریں</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="general_error">خرابی</string>
     <string name="network_error">نیٹ ورک کی خرابی</string>
     <string name="could_not_load_thumbnails">تمام نظرِ انگشتی لوڈ نہیں کر سکے</string>
@@ -143,10 +143,10 @@
     <string name="light_parsing_error">ویب سائٹ کو مکمل طور پر تجزیہ نہیں کرسکے</string>
     <string name="content_not_available">مواد دستیاب نہیں ہے</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="could_not_load_image">تصویر کو لوڈ نہیں کر سکتا</string>
-    <string name="app_ui_crash">ایپ/UI کریش</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>
@@ -366,13 +366,13 @@
     <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>
-    <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="clear_views_history_title">دیکھنے کی سرگزشت صاف کریں</string>
+    <string name="clear_views_history_summary">چلائے گئے سلسلوں اور پلے بیک پوزیشنز کی سرگزشت کو حذف کیا گیا</string>
+    <string name="delete_view_history_alert">دیکھے جانے کی تمام سرگزشت حذف کریں؟</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">1 شے حذف کر دی گئی ۔</string>
     <string name="app_license">نیو پائپ کاپلیفٹ فری سافٹ ویئر ہے: آپ استعمال کرسکتے ہیں ، مطالعہ شیئر کرسکتے ہیں اور اپنی مرضی سے اسے بہتر کرسکتے ہیں۔ خاص طور پر آپ اسے مفت سافٹ ویئر فاؤنڈیشن کے ذریعہ شائع کردہ GNU جنرل پبلک لائسنس کی شرائط کے تحت دوبارہ تقسیم اور / یا ترمیم کرسکتے ہیں ، جو لائسنس کا ورژن 3 ، یا (آپ کے اختیار پر) کسی بھی بعد کا ورژن ہے۔</string>
     <string name="import_settings">کیا آپ ترتیبات بھی درآمد کرنا چاہتے ہیں؟</string>
@@ -410,7 +410,7 @@
     <string name="file_deleted">فائل حذف ہوگئی</string>
     <string name="app_update_notification_channel_name">ایپ کی تازہ کاری کی اطلاع</string>
     <string name="app_update_notification_channel_description">جدید نیو پائپ ورژن کیلئے اطلاعات</string>
-    <string name="download_to_sdcard_error_title">بیرونی اسٹوریج دستیاب نہیں</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>
@@ -475,8 +475,8 @@
     <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="watch_history_deleted">دیکھنے کی تاریخ حذف ہوگئی۔</string>
-    <string name="watch_history_states_deleted">پلے بیک پوزیشنیں حذف ہوگئیں۔</string>
+    <string name="watch_history_deleted">دیکھے جانے کی سرگزشت حذف ہوگئی۔</string>
+    <string name="watch_history_states_deleted">پلے بیک پوزیشنس حذف ہوئیں۔</string>
     <string name="missing_file">فائل منتقل یا حذف ہوگئی</string>
     <string name="overwrite_unrelated_warning">اس نام والی فائل پہلے سے موجود ہے</string>
     <string name="overwrite_finished_warning">اس نام والی ڈاؤن لوڈ کی فائل پہلے سے موجود ہے</string>
@@ -499,8 +499,8 @@
     <string name="downloads_storage_use_saf_summary">اسٹوریج ایکسیس فریم ورک ایک بیرونی SD کارڈ میں ڈاؤن لوڈ کی اجازت دیتا ہے۔
 \nنوٹ: کچھ آلات مطابقت نہیں رکھتے ہیں</string>
     <string name="clear_playback_states_title">پلے بیک پوزیشن حذف کریں</string>
-    <string name="clear_playback_states_summary">تمام پلے بیک پوزیشن حذف کریں</string>
-    <string name="delete_playback_states_alert">تمام پلے بیک پوزیشنوں کو حذف کریں ؟</string>
+    <string name="clear_playback_states_summary">تمام پلے بیک پوزیشن حذف کی گئی</string>
+    <string name="delete_playback_states_alert">تمام پلے بیک پوزیشنس حذف کریں؟</string>
     <string name="download_choose_new_path">مؤثر بنانے کے لئے ڈاؤن لوڈ فولڈرز کو تبدیل کریں</string>
     <string name="drawer_header_description">ٹوگل خدمت ، حالیہ منتخب:</string>
     <string name="no_one_watching">کوئی نہیں دیکھ رہا ہے</string>

From 2977de1df22b879e1e455a0002ed01ca7ea29042 Mon Sep 17 00:00:00 2001
From: Abu Sarim Hindi <sarfaraz.ahmed78@gmail.com>
Date: Wed, 29 Jan 2020 21:50:19 +0000
Subject: [PATCH 080/199] Translated using Weblate (Urdu)

Currently translated at 100.0% (527 of 527 strings)
---
 app/src/main/res/values-ur/strings.xml | 249 +++++++++++++------------
 1 file changed, 125 insertions(+), 124 deletions(-)

diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 55a0963d2..e0149f2d8 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -147,39 +147,39 @@
     <string name="could_not_get_stream">کوئی سلسلہ حاصل نہیں کر سکے</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="external_player_unsupported_link_type">بیرونی پلیراس قسم کے لنکس کی حمایت نہیں کرتے</string>
+    <string name="player_stream_failure">یہ سلسلہ نہیں چل سکا</string>
+    <string name="player_unrecoverable_failure">پلیئر میں نا قابلِ تلافی نقص واقع ہوئی</string>
+    <string name="player_recoverable_failure">پلیر نقص سے بازیافت کیا جارہا ہے</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="video_streams_empty">کوئی ویڈیو سلسلے نہیں ملے</string>
+    <string name="audio_streams_empty">کوئی آڈیو سلسلے نہیں ملے</string>
     <string name="invalid_directory">ایسا کوئی فولڈر نہیں</string>
-    <string name="invalid_source">ایسی کوئی فائل / مواد کا ذریعہ نہیں</string>
-    <string name="invalid_file">فائل موجود نہیں ہے اور نہ ہی اسے پڑھنے یا لکھنے کی اجازت ہے</string>
+    <string name="invalid_source">ایسی کوئی فائل/مواد کا ذریعہ نہیں</string>
+    <string name="invalid_file">فائل موجود نہیں ہے یا اسے پڑھنے یا لکھنے کی اجازت کا فقدان ہے</string>
     <string name="file_name_empty_error">فائل کا نام ضروری ہے</string>
-    <string name="error_occurred_detail">ایک خامی پیش آگئی: s$1%</string>
-    <string name="no_streams_available_download">کوئی اسٹریمز ڈاؤن لوڈ کرنے کے لئے دستیاب نہیں</string>
-    <string name="sorry_string">معذرت ، ایسا نہیں ہونا چاہئے تھا۔</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>
+    <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="info_labels">What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:</string>
+    <string name="what_happened_headline">کیا ہوا:</string>
+    <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="list_thumbnail_view_description">ویڈیو پیش نظارہ تھمب نیل</string>
-    <string name="detail_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="list_thumbnail_view_description">ویڈیو پیش منظر انگشتی</string>
+    <string name="detail_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="use_tor_title">Tor کا استعمال</string>
-    <string name="use_tor_summary">(تجرباتی) بڑھتی ہوئی رازداری کے لئے ٹور کے ذریعہ ٹریفک کو ڈاؤن لوڈ کرنے پر مجبور کریں (ویڈیوز کو ابھی تک سپورٹ نہیں کیا گیا ہے)۔</string>
+    <string name="use_tor_summary">(تجرباتی) بڑھتی ہوئی رازداری کے لئے ٹور کے ذریعہ ٹریفک کو ڈاؤن لوڈ کرنے پر مجبور کریں (سلسلے کی ویڈیوز ابھی تک غیر موافق ہے)۔</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="search_no_results">کوئی نتائج نہیں</string>
+    <string name="empty_subscription_feed_subtitle">یہاں کچھ نہیں سوائے میرے</string>
     <string name="detail_drag_description">دوبارہ ترتیب دینے کیلئے کھینچں</string>
     <string name="err_dir_create">ڈاؤن لوڈ ڈائریکٹری \'s$1%\' تشکیل نہیں دے سکتے</string>
     <string name="info_dir_created">ڈاؤن لوڈ ڈائریکٹری \'s$1%\' بن گئی</string>
@@ -188,7 +188,7 @@
     <string name="retry">دوبارہ کوشش کریں</string>
     <string name="storage_permission_denied">ذخیرہ رسائی اجازت مسترد</string>
     <string name="short_thousand">ہزار</string>
-    <string name="short_million">ایم</string>
+    <string name="short_million">دہ لاکھ</string>
     <string name="short_billion">ارب</string>
     <string name="no_subscribers">کوئی صارفین نہیں</string>
     <plurals name="subscribers">
@@ -215,7 +215,7 @@
     <string name="checksum">تشخیص کریں</string>
     <string name="dismiss">برخاست کریں</string>
     <string name="rename">نام تبدیل کریں</string>
-    <string name="add">نیا حدف</string>
+    <string name="add">نیا مشن</string>
     <string name="finish">ٹھيک ہے</string>
     <string name="msg_name">فائل کا نام</string>
     <string name="msg_threads">موضوعات</string>
@@ -226,52 +226,52 @@
     <string name="msg_running">نیو پائپ ڈاؤن لوڈ ہو رہا ہے</string>
     <string name="msg_running_detail">تفصیلات کے لیے ٹیپ کریں</string>
     <string name="msg_wait">براۓ مہربانی انتظار کريں…</string>
-    <string name="msg_copied">کلپ بورڈ میں کاپی کریں</string>
+    <string name="msg_copied">کلپ بورڈ میں نقل ہوا</string>
     <string name="no_available_dir">براہ کرم بعد میں ترتیبات میں ڈاؤن لوڈ فولڈر کی وضاحت رکھیں</string>
-    <string name="msg_popup_permission">پوپ اپ موڈ میں کھولنے کیلئے اس اجازت کی ضرورت ہے</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_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_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>
-    <string name="title_licenses">تیسری پارٹی کے لائسنس</string>
+    <string name="title_licenses">تیسری پارٹی کی لائسنس</string>
     <string name="copyright" formatted="true">© %1$s بذریعہ %2$s %3$s کے تحت</string>
     <string name="error_unable_to_load_license">لائسنس لوڈ نہیں کر سکا</string>
     <string name="action_open_website">ویب سائٹ کھولیں</string>
     <string name="tab_about">کے بارے میں</string>
     <string name="tab_contributors">معاونین</string>
     <string name="tab_licenses">لائسنس</string>
-    <string name="app_description">لِبرے کی اینڈروئیڈ پر کم وزنی اسٹریمنگ۔</string>
+    <string name="app_description">اینڈروئیڈ پر لِبرے کی ہلکی اسٹریمنگ۔</string>
     <string name="contribution_title">تعاون کریں</string>
-    <string name="contribution_encouragement">چاہے آپ کے خیالات ہوں؛ ترجمہ ، ڈیزائن میں تبدیلیاں ، کوڈ صاف کرنا ، یا حقیقی ہیوی کوڈ میں تبدیلی — مدد کا ہمیشہ خیرمقدم کیا جاتا ہے۔ جتنا زیادہ ہوتا ہے اتنا ہی بہتر ہوتا ہے!</string>
+    <string name="contribution_encouragement">جو بھی آپ کے خیالات ہوں؛ ترجمہ، ڈیزائن میں تبدیلیاں، کوڈ کی درستی، یا حقیقتاً کوڈ میں بڑی تبدیلی—مدد کا ہمیشہ خیرمقدم ہے۔ جتنا زیادہ ہوگا اتنی ہی بہتری ہو گی!</string>
     <string name="view_on_github">گٹ ہب پر دیکھیں</string>
     <string name="donation_title">عطیہ</string>
-    <string name="donation_encouragement">نیا پائپ رضاکاروں کے ذریعہ تیار کیا گیا ہے جو آپ کو بہترین تجربہ فراہم کرنے میں وقت گزارتے ہیں۔ ایک کپ کافی سے لطف اندوز ہوتے ہوئے ڈویلپرز کو نیو پائپ کو اور بہتر بنانے میں مدد دینے کے لئے واپس دیں۔</string>
-    <string name="give_back">واپس دو</string>
+    <string name="donation_encouragement">نیو پائپ رضاکاروں کے ذریعہ تیار کیا گیا ہے جو آپ کو بہترین تجربہ فراہم کرنے میں وقت صرف کرتے ہیں۔ ایک کپ کافی سے لطف اندوز ہوتے ہوئے ڈویلپرز کو نیو پائپ کو اور بہتر بنانے میں مدد دینے کے لئے بہتر بدلہ دیں۔</string>
+    <string name="give_back">بدلہ دیں</string>
     <string name="website_title">ویب سائٹ</string>
     <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_activity_history">سرگزشت</string>
     <string name="title_history_search">تلاش کیا گیا</string>
-    <string name="title_history_view">دیکھاھوا</string>
-    <string name="history_disabled">تاریخ آف کردی گئی ہے</string>
-    <string name="action_history">تاریخ</string>
-    <string name="history_empty">تاریخ خالی ہے</string>
-    <string name="history_cleared">تاریخ صاف ہوگئی</string>
+    <string name="title_history_view">دیکھا ہوا</string>
+    <string name="history_disabled">سرگزشت بند کر دی گئی</string>
+    <string name="action_history">سرگزشت</string>
+    <string name="history_empty">سرگزشت خالی ہے</string>
+    <string name="history_cleared">سرگزشت مٹائی گئی</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="title_last_played">آخری پلے کیا گیا</string>
-    <string name="title_most_played">سب سے زیادہ دیکھاگیا</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">رجحان صفحہ</string>
@@ -285,11 +285,11 @@
     <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="override_current_data">یہ آپ کی موجودہ سیٹ اپ کو باطل کر دے گا۔</string>
     <string name="kiosk">کیوسک</string>
     <string name="trending">رجحان میں</string>
-    <string name="top_50">Top 50</string>
-    <string name="new_and_hot">نیا اور تاذہ</string>
+    <string name="top_50">اوّل 50</string>
+    <string name="new_and_hot">نیا اور تازہ</string>
     <string name="title_activity_background_player">پس منظر پلیئر</string>
     <string name="title_activity_popup_player">پوپ اپ پلیئر</string>
     <string name="play_queue_remove">ہٹائیں</string>
@@ -298,12 +298,12 @@
     <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="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 D</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>
@@ -317,53 +317,55 @@
     <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="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="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">لیک کینری کو قابل بنائیں</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="enable_leak_canary_title">لیک کیناری کو فعال کریں</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="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 
+\n1. اس URL پر جائیں:
+\n%1$s 
 \n2. جب پوچھا جائے تو لاگ ان کریں 
-\nA. ڈاؤن لوڈ شروع ہونا چاہئے (یہ برآمد فائل ہے)</string>
+\n3. ڈاؤن لوڈ شروع ہونا چاہئے (یہ برآمد فائل ہے)</string>
     <string name="import_soundcloud_instructions">۔URL یا آپ کی ID ٹائپ کرکے ایک SoundCloud پروفائل درآمد کریں: 
 \n 
 \n1. ویب براؤزر میں \"ڈیسک ٹاپ موڈ\" کو فعال کریں (یہ سائٹ موبائل آلات کے لئے دستیاب نہیں ہے) 
-\n2. اس URL پر جائیں: %1$s 
+\n2. اس URL پر جائیں:
+\n%1$s 
 \n3. جب پوچھا جائے تو لاگ ان کریں 
-\n4. پروفائل یو آر ایل کاپی کریں جہاں تک آپ کی رہنمائی کی گئی تھی۔</string>
-    <string name="import_soundcloud_instructions_hint">yourID، soundcloud.com/yourid</string>
-    <string name="import_network_expensive_warning">یاد رکھیں کہ یہ آپریشن نیٹ ورک مہنگا ہوسکتا ہے۔
+\n4. پروفائل URL کاپی کریں جہاں تک آپ کی رہنمائی کی گئی تھی۔</string>
+    <string name="import_soundcloud_instructions_hint">آپ کی آئی ڈی، soundcloud.com/yourid</string>
+    <string name="import_network_expensive_warning">اس بات کو ذہن میں رکھیں کہ اس عملیہ کا نیٹ ورک مہنگا ہو سکتا ہے۔
 \n
-\nکیا آپ جاری رکھنا چاہتے ہیں؟</string>
+\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="caption_setting_title">کیپشن</string>
+    <string name="playback_pitch">موٹی آواز</string>
+    <string name="unhook_checkbox">غیر مربوط (مسخ کا سبب بن سکتا ہے)</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>
@@ -373,24 +375,23 @@
     <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">1 شے حذف کر دی گئی ۔</string>
-    <string name="app_license">نیو پائپ کاپلیفٹ فری سافٹ ویئر ہے: آپ استعمال کرسکتے ہیں ، مطالعہ شیئر کرسکتے ہیں اور اپنی مرضی سے اسے بہتر کرسکتے ہیں۔ خاص طور پر آپ اسے مفت سافٹ ویئر فاؤنڈیشن کے ذریعہ شائع کردہ GNU جنرل پبلک لائسنس کی شرائط کے تحت دوبارہ تقسیم اور / یا ترمیم کرسکتے ہیں ، جو لائسنس کا ورژن 3 ، یا (آپ کے اختیار پر) کسی بھی بعد کا ورژن ہے۔</string>
+    <string name="one_item_deleted">1 شے حذف کر دی گئی۔</string>
+    <string name="app_license">نیو پائپ کاپلیفٹ فری سافٹ ویئر ہے: آپ استعمال کرسکتے ہیں، مطالعہ شیئر کرسکتے ہیں اور اپنی مرضی سے اسے بہتر کرسکتے ہیں۔ خاص طور پر آپ اسے مفت سافٹ ویئر فاؤنڈیشن کے ذریعہ شائع کردہ GNU جنرل پبلک لائسنس کی شرائط کے تحت دوبارہ تقسیم اور / یا ترمیم کرسکتے ہیں، خواہ لائسنس کا ورژن 3، یا (آپ کے اختیار پر) کسی بھی بعد کا ورژن۔</string>
     <string name="import_settings">کیا آپ ترتیبات بھی درآمد کرنا چاہتے ہیں؟</string>
     <string name="privacy_policy_title">نیو پائپ کی رازداری کی پالیسی</string>
-    <string name="privacy_policy_encouragement">نیوپی پائپ منصوبہ آپ کی رازداری کو بہت سنجیدگی سے لیتا ہے. لہذا ، اپلی کیشن آپ کی رضامندی کے بغیر کسی بھی ڈیٹا کو جمع نہیں کرتا.
-\nنیو پائپ کی رازداری کی پالیسی تفصیل سے وضاحت کرتی ہے کہ آپ کو کریش رپورٹ بھیجنے پر کیا ڈیٹا بھیجا جاتا ہے اور ذخیرہ کیا جاتا ہے ۔</string>
+    <string name="privacy_policy_encouragement">نیو پائپ منصوبہ آپ کی رازداری کو بہت سنجیدگی سے لیتا ہے. لہذا، ایپلی کیشن آپ کی رضامندی کے بغیر کسی بھی ڈیٹا کو جمع نہیں کرتا./nنیو پائپ کی رازداری پالیسی تفصیل سے وضاحت کرتی ہے کہ آپ کے کریش رپورٹ بھیجنے پر کیا ڈیٹا بھیجا جاتا ہے اور ذخیرہ کیا جاتا ہے ۔</string>
     <string name="read_privacy_policy">رازداری کی پالیسی پڑھیں</string>
-    <string name="start_accept_privacy_policy">یورپی جنرل ڈیٹا پروٹیکشن ریگولیشن (جی ڈی پی آر) کی تعمیل کرنے کیلئے ، ہم آپ کی توجہ نیو پائپ کی رازداری کی پالیسی کی طرف مبذول کراتے ہیں۔ برائے مہربانی اسے غور سے پڑھیں۔
-\nہمیں بگ رپورٹ بھیجنے کے ل it آپ کو اسے قبول کرنا چاہئے۔</string>
-    <string name="accept">قبول کریں</string>
+    <string name="start_accept_privacy_policy">یورپی جنرل ڈیٹا پروٹیکشن ریگولیشن (جی ڈی پی آر) کی تعمیل کرنے کیلئے، ہم آپ کی توجہ نیو پائپ کی رازداری کی پالیسی کی طرف مبذول کراتے ہیں۔ برائے مہربانی اسے غور سے پڑھیں۔ 
+\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_summary">اہم ویڈیو پلیئر سے دوسرے ایپ میں سوئچنگ کرتے وقت کارروائی — %s</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_none_description">کوئی نہیں</string>
-    <string name="minimize_on_exit_background_description">پس منظری پلیر میں کم کریں</string>
-    <string name="minimize_on_exit_popup_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="playback_step">قدم</string>
     <string name="playback_reset">ری سیٹ کریں</string>
@@ -412,28 +413,28 @@
     <string name="app_update_notification_channel_description">جدید نیو پائپ ورژن کیلئے اطلاعات</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="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="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="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">نیو پائپ اپ ڈیٹ دستیاب!</string>
+    <string name="switch_view">منظر بدلیں</string>
+    <string name="app_update_notification_content_title">نیو پائپ کی تازہ کاری دستیاب!</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="paused">توقف</string>
+    <string name="queued">قطار میں</string>
+    <string name="post_processing">بعد کا عمل جاری</string>
     <string name="enqueue">قطار</string>
-    <string name="permission_denied">سسٹم نےکارروائی سے انکار کیا گیا</string>
+    <string name="permission_denied">سسٹم کے ذریعہ کارروائی سے انکار کیا گیا</string>
     <string name="download_failed">ڈاؤن لوڈ ناکام</string>
     <string name="download_finished">ڈاؤن لوڈ مکمل</string>
     <string name="download_finished_more">%s ڈاؤن لوڈ مکمل ہوا</string>
@@ -442,22 +443,22 @@
     <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_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_connect_host">سرور سے متصل نہیں ہوسکتا</string>
+    <string name="error_connect_host">سرور سے متصل نہیں ہو سکتا</string>
     <string name="error_http_no_content">سرور ڈیٹا نہیں بھیجتا ہے</string>
-    <string name="error_http_unsupported_range">سرور ملٹی تھریڈڈ ڈاؤن لوڈز کو قبول نہیں کرتا ہے ، @ سٹرنگ / msg_threads = 1 کے ساتھ دوبارہ کوشش کریں</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="error_postprocessing_failed">بعد کا عمل نا کام</string>
     <string name="clear_finished_download">ختم شدہ ڈاؤن لوڈ صاف کریں</string>
-    <string name="stop">رکو</string>
-    <string name="max_retry_msg">زیادہ سے زیادہ دوبارہ کوشش کریں</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="pause_downloads_on_mobile">میٹر والی نیٹ ورک پر مداخلت</string>
+    <string name="pause_downloads_on_mobile_desc">موبائل ڈیٹا پر بدلتے وقت مفید ہے، اگرچہ کچھ ڈاؤن لوڈ معطل نہیں ہوسکتی ہیں</string>
     <string name="events">تقریبات</string>
     <string name="conferences">کانفرنسیں</string>
     <string name="show_comments_title">تبصرے دکھائیں</string>
@@ -479,20 +480,20 @@
     <string name="watch_history_states_deleted">پلے بیک پوزیشنس حذف ہوئیں۔</string>
     <string name="missing_file">فائل منتقل یا حذف ہوگئی</string>
     <string name="overwrite_unrelated_warning">اس نام والی فائل پہلے سے موجود ہے</string>
-    <string name="overwrite_finished_warning">اس نام والی ڈاؤن لوڈ کی فائل پہلے سے موجود ہے</string>
+    <string name="overwrite_finished_warning">اس نام کی ڈاؤن لوڈ کی گئی فائل پہلے سے موجود ہے</string>
     <string name="overwrite_failed">فائل برتحریر نہیں کر سکتا</string>
     <string name="download_already_pending">اس نام کے ساتھ ڈاؤن لوڈ زیر التوا ہے</string>
     <string name="error_postprocessing_stopped">فائل پر کام کرنے کے دوران نیو پائپ بند کردی گئی تھی</string>
-    <string name="error_insufficient_storage">آلے میں کوئی جگہ نہیں بچی</string>
-    <string name="error_progress_lost">پیشرفت ختم ہوگئی ، کیونکہ فائل کو حذف کردیا گیا تھا</string>
+    <string name="error_insufficient_storage">آلہ میں کوئی جگہ نہیں بچی</string>
+    <string name="error_progress_lost">پیشرفت ختم ہوگئی، کیونکہ فائل کو حذف کردیا گیا تھا</string>
     <string name="error_timeout">رابطے کا وقت ختم</string>
     <string name="confirm_prompt">کیا آپ اپنی ڈاؤن لوڈ کی سرگزشت کو صاف کرنا چاہتے ہیں یا ڈاؤن لوڈ کی گئی تمام فائلوں کو حذف کرنا چاہتے ہیں؟</string>
     <string name="enable_queue_limit">ڈاؤن لوڈ کی قطار کو محدود کریں</string>
     <string name="enable_queue_limit_desc">ایک ڈاؤن لوڈ ایک ہی وقت میں چلے گا</string>
     <string name="start_downloads">ڈاؤن لوڈ شروع کریں</string>
     <string name="pause_downloads">ڈاؤن لوڈ روکیں</string>
-    <string name="downloads_storage_ask_title">کہاں پرڈاؤن لوڈ کریں</string>
-    <string name="downloads_storage_ask_summary">آپ سے پوچھا جائے گا کہ ہر ڈاؤن لوڈ کو کہاں محفوظ کرنا ہے</string>
+    <string name="downloads_storage_ask_title">ڈاؤن لوڈ کہاں کریں، پوچھیں</string>
+    <string name="downloads_storage_ask_summary">ہر ڈاؤن لوڈ کو کہاں محفوظ کرنا ہے آپ سے پوچھا جائے گا</string>
     <string name="downloads_storage_ask_summary_kitkat">آپ سے پوچھا جائے گا کہ ہر ڈاؤن لوڈ کو کہاں محفوظ کرنا ہے۔
 \nاگر آپ کسی بیرونی SD کارڈ پر ڈاؤن لوڈ کرنا چاہتے ہیں تو SAF کا انتخاب کریں</string>
     <string name="downloads_storage_use_saf_title">SAF استعمال کریں</string>
@@ -502,7 +503,7 @@
     <string name="clear_playback_states_summary">تمام پلے بیک پوزیشن حذف کی گئی</string>
     <string name="delete_playback_states_alert">تمام پلے بیک پوزیشنس حذف کریں؟</string>
     <string name="download_choose_new_path">مؤثر بنانے کے لئے ڈاؤن لوڈ فولڈرز کو تبدیل کریں</string>
-    <string name="drawer_header_description">ٹوگل خدمت ، حالیہ منتخب:</string>
+    <string name="drawer_header_description">ٹوگل خدمت، حالیہ منتخب:</string>
     <string name="no_one_watching">کوئی نہیں دیکھ رہا ہے</string>
     <plurals name="watching">
         <item quantity="one">%s دیکھ رہا</item>

From 089a9f1a9c650a814692fb926820376d61b21708 Mon Sep 17 00:00:00 2001
From: nautilusx <mail.ka@mailbox.org>
Date: Fri, 31 Jan 2020 15:37:13 +0000
Subject: [PATCH 081/199] Translated using Weblate (German)

Currently translated at 100.0% (527 of 527 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 9a2482814..1fab90386 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -484,7 +484,7 @@
     <string name="watch_history_states_deleted">Wiedergabeposition gelöscht.</string>
     <string name="missing_file">Datei verschoben oder gelöscht</string>
     <string name="overwrite_finished_warning">Eine heruntergeladene Datei mit diesem Namen existiert bereits</string>
-    <string name="overwrite_failed">kann die Datei nicht überschreiben</string>
+    <string name="overwrite_failed">Datei kann nicht überschreiben werden</string>
     <string name="download_already_pending">Es gibt einen ausstehenden Download mit diesem Namen</string>
     <string name="error_postprocessing_stopped">NewPipe wurde während der Verarbeitung der Datei geschlossen</string>
     <string name="error_insufficient_storage">Kein Speicherplatz mehr auf dem Gerät</string>
@@ -506,7 +506,7 @@
     <string name="delete_playback_states_alert">Alle Wiedergabepositionen löschen\?</string>
     <string name="download_choose_new_path">Ändere die Downloadordner, damit sie wirksam werden</string>
     <string name="drawer_header_description">Dienst umschalten, aktuell ausgewählt:</string>
-    <string name="default_kiosk_page_summary">Quiosque Predefinido</string>
+    <string name="default_kiosk_page_summary">Standard-Kiosk</string>
     <string name="no_one_watching">Niemand schaut zu</string>
     <plurals name="watching">
         <item quantity="one">%s Zuschauer</item>

From 6be23a0a6fd7ea3ced7efed21c5b8e4b8321a7ec Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Fri, 31 Jan 2020 22:49:43 +0100
Subject: [PATCH 082/199] fix wrong language shown many popup dialogs

Changed android.R.string.ok, which is "OK", into R.string.finish, which is also OK, but from our strings
Then for a small amount of languages that don't have Android translation, it will show the good string.
---
 .../newpipe/about/LicenseFragmentHelper.java  | 15 +++++++-----
 .../newpipe/download/DownloadDialog.java      | 24 +++++++++++--------
 .../ImportConfirmationDialog.java             |  5 +++-
 .../settings/ContentSettingsFragment.java     | 12 ++++++----
 .../settings/DownloadSettingsFragment.java    | 10 +++++---
 .../giga/ui/adapter/MissionAdapter.java       |  2 +-
 6 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
index eeafc1f57..9a11b19cc 100644
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
@@ -3,6 +3,7 @@ package org.schabi.newpipe.about;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Resources;
 import android.os.AsyncTask;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -14,6 +15,8 @@ import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
 
     final WeakReference<Activity> weakReference;
@@ -55,15 +58,15 @@ public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
         wv.loadData(webViewData, "text/html; charset=UTF-8", null);
 
         alert.setView(wv);
-        alert.setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.dismiss();
-            }
-        });
+        assureCorrectAppLanguage(activity.getApplicationContext());
+        alert.setNegativeButton(getFinishString(activity), (dialog, which) -> dialog.dismiss());
         alert.show();
     }
 
+    private static String getFinishString(Activity activity) {
+        return activity.getApplicationContext().getResources().getString(R.string.finish);
+    }
+
     /**
      * @param context the context to use
      * @param license the license
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 44966744b..c78e68597 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -11,15 +11,6 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import androidx.annotation.IdRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.fragment.app.DialogFragment;
-import androidx.documentfile.provider.DocumentFile;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.view.menu.ActionMenuItemView;
-import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -34,6 +25,16 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.view.menu.ActionMenuItemView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.documentfile.provider.DocumentFile;
+import androidx.fragment.app.DialogFragment;
+
 import com.nononsenseapps.filepicker.Utils;
 
 import org.schabi.newpipe.MainActivity;
@@ -78,6 +79,8 @@ import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.service.DownloadManagerService.DownloadManagerBinder;
 import us.shandian.giga.service.MissionState;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
     private static final String TAG = "DialogFragment";
     private static final boolean DEBUG = MainActivity.DEBUG;
@@ -527,10 +530,11 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     }
 
     private void showFailedDialog(@StringRes int msg) {
+        assureCorrectAppLanguage(getContext());
         new AlertDialog.Builder(context)
                 .setTitle(R.string.general_error)
                 .setMessage(msg)
-                .setNegativeButton(android.R.string.ok, null)
+                .setNegativeButton(getString(R.string.finish), null)
                 .create()
                 .show();
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java
index fbcf5d70e..a44efa1d3 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java
@@ -15,6 +15,8 @@ import org.schabi.newpipe.util.ThemeHelper;
 import icepick.Icepick;
 import icepick.State;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 public class ImportConfirmationDialog extends DialogFragment {
     @State
     protected Intent resultServiceIntent;
@@ -34,11 +36,12 @@ public class ImportConfirmationDialog extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        assureCorrectAppLanguage(getContext());
         return new AlertDialog.Builder(getContext(), ThemeHelper.getDialogTheme(getContext()))
                 .setMessage(R.string.import_network_expensive_warning)
                 .setCancelable(true)
                 .setNegativeButton(R.string.cancel, null)
-                .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
+                .setPositiveButton(R.string.finish, (dialogInterface, i) -> {
                     if (resultServiceIntent != null && getContext() != null) {
                         getContext().startService(resultServiceIntent);
                     }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index 88c700582..dc6ccb0a0 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -7,11 +7,12 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.util.Log;
+import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.Preference;
-import android.util.Log;
-import android.widget.Toast;
 
 import com.nononsenseapps.filepicker.Utils;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -40,6 +41,8 @@ import java.util.Map;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 public class ContentSettingsFragment extends BasePreferenceFragment {
 
     private static final int REQUEST_IMPORT_PATH = 8945;
@@ -139,6 +142,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, @NonNull Intent data) {
+        assureCorrectAppLanguage(getContext());
         super.onActivityResult(requestCode, resultCode, data);
         if (DEBUG) {
             Log.d(TAG, "onActivityResult() called with: requestCode = [" + requestCode + "], resultCode = [" + resultCode + "], data = [" + data + "]");
@@ -153,7 +157,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
             } else {
                 AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
                 builder.setMessage(R.string.override_current_data)
-                        .setPositiveButton(android.R.string.ok,
+                        .setPositiveButton(getString(R.string.finish),
                                 (DialogInterface d, int id) -> importDatabase(path))
                         .setNegativeButton(android.R.string.cancel,
                                 (DialogInterface d, int id) -> d.cancel());
@@ -248,7 +252,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                     // restart app to properly load db
                     System.exit(0);
                 });
-                alert.setPositiveButton(android.R.string.yes, (dialog, which) -> {
+                alert.setPositiveButton(getString(R.string.finish), (dialog, which) -> {
                     dialog.dismiss();
                     loadSharedPreferences(newpipe_settings);
                     // restart app to properly load db
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 8becc79a8..b8ce0ec18 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -8,11 +8,12 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.preference.Preference;
-import android.util.Log;
-import android.widget.Toast;
 
 import com.nononsenseapps.filepicker.Utils;
 
@@ -28,6 +29,8 @@ import java.nio.charset.StandardCharsets;
 
 import us.shandian.giga.io.StoredDirectoryHelper;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 public class DownloadSettingsFragment extends BasePreferenceFragment {
     private static final int REQUEST_DOWNLOAD_VIDEO_PATH = 0x1235;
     private static final int REQUEST_DOWNLOAD_AUDIO_PATH = 0x1236;
@@ -159,7 +162,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         AlertDialog.Builder msg = new AlertDialog.Builder(ctx);
         msg.setTitle(title);
         msg.setMessage(message);
-        msg.setPositiveButton(android.R.string.ok, null);
+        msg.setPositiveButton(getString(R.string.finish), null);
         msg.show();
     }
 
@@ -202,6 +205,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        assureCorrectAppLanguage(getContext());
         super.onActivityResult(requestCode, resultCode, data);
         if (DEBUG) {
             Log.d(TAG, "onActivityResult() called with: requestCode = [" + requestCode + "], " +
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 aaf7826ef..852c29835 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
@@ -534,7 +534,7 @@ public class MissionAdapter extends Adapter<ViewHolder> implements Handler.Callb
             );
         }
 
-        builder.setNegativeButton(android.R.string.ok, (dialog, which) -> dialog.cancel())
+        builder.setNegativeButton(R.string.finish, (dialog, which) -> dialog.cancel())
                 .setTitle(mission.storage.getName())
                 .create()
                 .show();

From f7203d4ac9666c1eee10374210c2f92ec50a2eba Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sat, 1 Feb 2020 13:41:03 +0100
Subject: [PATCH 083/199] Fix formatting and use lamda functions

---
 .../settings/VideoAudioSettingsFragment.java  | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
index 6d32fb39f..7bb931309 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
@@ -21,38 +21,29 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        listener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-            @Override
-            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+        listener = (sharedPreferences, s) -> {
 
-                //on M and above, if user chooses to minimise to popup player on exit and the app doesn't have
-                //display over other apps permission, show a snackbar to let the user give permission
-                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-                        s.equals(getString(R.string.minimize_on_exit_key))){
+            // on M and above, if user chooses to minimise to popup player on exit and the app doesn't have
+            // display over other apps permission, show a snackbar to let the user give permission
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+                    s.equals(getString(R.string.minimize_on_exit_key))) {
 
-                    String newSetting = sharedPreferences.getString(s,null);
-                    if(newSetting != null
-                            && newSetting.equals(getString(R.string.minimize_on_exit_popup_key))
-                            && !Settings.canDrawOverlays(getContext())){
+                String newSetting = sharedPreferences.getString(s, null);
+                if (newSetting != null
+                        && newSetting.equals(getString(R.string.minimize_on_exit_popup_key))
+                        && !Settings.canDrawOverlays(getContext())) {
 
-                            Snackbar.make(getListView(),R.string.permission_display_over_apps,Snackbar.LENGTH_INDEFINITE)
-                                    .setAction(R.string.settings, new View.OnClickListener() {
-                                        @Override
-                                        public void onClick(View view) {
-                                            PermissionHelper.checkSystemAlertWindowPermission(getContext());
-                                        }
-                                    })
-                                    .show();
+                    Snackbar.make(getListView(), R.string.permission_display_over_apps, Snackbar.LENGTH_INDEFINITE)
+                            .setAction(R.string.settings,
+                                    view -> PermissionHelper.checkSystemAlertWindowPermission(getContext()))
+                            .show();
 
-                    }
                 }
             }
-
         };
     }
 
 
-
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.video_audio_settings);

From 55a138e8da10ffb7b9a18b9ee602c20f2ef4b307 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 1 Feb 2020 15:30:51 +0100
Subject: [PATCH 084/199] fix toast on app language change

I forgot to change the key here when I renamed it
---
 .../org/schabi/newpipe/settings/ContentSettingsFragment.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index dc6ccb0a0..5abdd6806 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -68,7 +68,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
         initialSelectedLocalization = org.schabi.newpipe.util.Localization.getPreferredLocalization(requireContext());
         initialSelectedContentCountry = org.schabi.newpipe.util.Localization.getPreferredContentCountry(requireContext());
-        initialLanguage = androidx.preference.PreferenceManager.getDefaultSharedPreferences(getContext()).getString("newpipes_language_key", "en");
+        initialLanguage = PreferenceManager.getDefaultSharedPreferences(getContext()).getString("app_language_key", "en");
     }
 
     @Override
@@ -130,7 +130,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                 .getPreferredLocalization(requireContext());
         final ContentCountry selectedContentCountry = org.schabi.newpipe.util.Localization
                 .getPreferredContentCountry(requireContext());
-        final String selectedLanguage = androidx.preference.PreferenceManager.getDefaultSharedPreferences(getContext()).getString("newpipes_language_key", "en");
+        final String selectedLanguage = PreferenceManager.getDefaultSharedPreferences(getContext()).getString("app_language_key", "en");
 
         if (!selectedLocalization.equals(initialSelectedLocalization)
                 || !selectedContentCountry.equals(initialSelectedContentCountry) || !selectedLanguage.equals(initialLanguage)) {

From d36ac7a5dee1c460e5bf06dd291f292830e77dd4 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sat, 1 Feb 2020 15:35:33 +0100
Subject: [PATCH 085/199] Improve formatting

---
 .../schabi/newpipe/settings/ContentSettingsFragment.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index 5abdd6806..03d48ca5b 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -196,7 +196,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
             e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
-        }finally {
+        } finally {
             try {
                 if (output != null) {
                     output.flush();
@@ -243,7 +243,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
             }
 
             //If settings file exist, ask if it should be imported.
-            if(ZipHelper.extractFileFromZip(filePath, newpipe_settings.getPath(), "newpipe.settings")) {
+            if (ZipHelper.extractFileFromZip(filePath, newpipe_settings.getPath(), "newpipe.settings")) {
                 AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
                 alert.setTitle(R.string.import_settings);
 
@@ -298,7 +298,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
             e.printStackTrace();
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
-        }finally {
+        } finally {
             try {
                 if (input != null) {
                     input.close();

From 90c20f124b16ebe5531f40fc06494fa1b5c9a0aa Mon Sep 17 00:00:00 2001
From: Xiang Rong Lin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 1 Feb 2020 16:27:53 +0100
Subject: [PATCH 086/199] Move log statement into "if (DEBUG)"

---
 .../org/schabi/newpipe/local/bookmark/BookmarkFragment.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
index bfd90acda..ea9655921 100644
--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -291,8 +291,10 @@ public final class BookmarkFragment
             return;
         }
 
-        Log.d(TAG, "Updating playlist id=[" + id +
-            "] with new name=[" + name + "] items");
+        if (DEBUG) {
+            Log.d(TAG, "Updating playlist id=[" + id +
+                "] with new name=[" + name + "] items");
+        }
 
         localPlaylistManager.renamePlaylist(id, name);
         final Disposable disposable = localPlaylistManager.renamePlaylist(id, name)

From 8712310ad93738d3d663da87dbd38ec0ebf92177 Mon Sep 17 00:00:00 2001
From: Xiang Rong Lin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 1 Feb 2020 16:36:45 +0100
Subject: [PATCH 087/199] Move more log statements into "if (DEBUG)"

---
 .../local/playlist/LocalPlaylistFragment.java        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 9f21e05ff..17599a1ca 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
@@ -388,8 +388,10 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
         this.name = name;
         setTitle(name);
 
-        Log.d(TAG, "Updating playlist id=[" + playlistId +
+        if (DEBUG) {
+            Log.d(TAG, "Updating playlist id=[" + playlistId +
                 "] with new name=[" + name + "] items");
+        }
 
         final Disposable disposable = playlistManager.renamePlaylist(playlistId, name)
                 .observeOn(AndroidSchedulers.mainThread())
@@ -404,8 +406,10 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                 R.string.playlist_thumbnail_change_success,
                 Toast.LENGTH_SHORT);
 
-        Log.d(TAG, "Updating playlist id=[" + playlistId +
+        if (DEBUG) {
+            Log.d(TAG, "Updating playlist id=[" + playlistId +
                 "] with new thumbnail url=[" + thumbnailUrl + "]");
+        }
 
         final Disposable disposable = playlistManager
                 .changePlaylistThumbnail(playlistId, thumbnailUrl)
@@ -472,8 +476,10 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
             }
         }
 
-        Log.d(TAG, "Updating playlist id=[" + playlistId +
+        if (DEBUG) {
+            Log.d(TAG, "Updating playlist id=[" + playlistId +
                 "] with [" + streamIds.size() + "] items");
+        }
 
         final Disposable disposable = playlistManager.updateJoin(playlistId, streamIds)
                 .observeOn(AndroidSchedulers.mainThread())

From 2a903f66dd978bd856d59377110caae7d1246207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=2E=20R=C3=BCdinger?= <Mail-an-CR@web.de>
Date: Fri, 31 Jan 2020 17:06:47 +0000
Subject: [PATCH 088/199] Translated using Weblate (German)

Currently translated at 99.8% (526 of 527 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 1fab90386..3ae7552bb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -484,7 +484,7 @@
     <string name="watch_history_states_deleted">Wiedergabeposition gelöscht.</string>
     <string name="missing_file">Datei verschoben oder gelöscht</string>
     <string name="overwrite_finished_warning">Eine heruntergeladene Datei mit diesem Namen existiert bereits</string>
-    <string name="overwrite_failed">Datei kann nicht überschreiben werden</string>
+    <string name="overwrite_failed">Datei kann nicht überschrieben werden</string>
     <string name="download_already_pending">Es gibt einen ausstehenden Download mit diesem Namen</string>
     <string name="error_postprocessing_stopped">NewPipe wurde während der Verarbeitung der Datei geschlossen</string>
     <string name="error_insufficient_storage">Kein Speicherplatz mehr auf dem Gerät</string>

From 766326ad8c243ff3685a41ef4e53693e174bebd3 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Sat, 1 Feb 2020 14:40:14 +0000
Subject: [PATCH 089/199] Translated using Weblate (French)

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

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7695fe31c..5f9dc0b18 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -205,8 +205,8 @@
     </plurals>
     <string name="no_videos">Aucune vidéo</string>
     <plurals name="videos">
-        <item quantity="one">Vidéo</item>
-        <item quantity="other">Vidéos</item>
+        <item quantity="one">%s vidéo</item>
+        <item quantity="other">%s vidéos</item>
     </plurals>
     <string name="charset_most_special_characters">Caractères spéciaux</string>
     <string name="item_deleted">Élément supprimé</string>

From fb0d626cb27638754ee8a25634cac3a9c8e7a4e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isak=20Holmstr=C3=B6m?= <isak@kajko.se>
Date: Fri, 31 Jan 2020 07:17:18 +0000
Subject: [PATCH 090/199] Translated using Weblate (Swedish)

Currently translated at 88.2% (465 of 527 strings)
---
 app/src/main/res/values-sv/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 89d51493e..90e976823 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -463,4 +463,8 @@
     <string name="enable_playback_resume_summary">Återställ den senaste uppspelningspositionen</string>
     <string name="enable_playback_state_lists_title">Positioner i listor</string>
     <string name="download_choose_new_path">Ändra nedladdningsmapp för att träda i kraft</string>
+    <string name="autoplay_title">Spela automatiskt</string>
+    <string name="settings_category_clear_data_title">Töm data</string>
+    <string name="seek_duration_title">Snabb spola -framåt/-bakåt</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Aktivera video på låsskärmen</string>
 </resources>
\ No newline at end of file

From c0519d8313505b5b074e17906edadacfb276484a Mon Sep 17 00:00:00 2001
From: Markus Richter <8398165+mqus@users.noreply.github.com>
Date: Wed, 29 Jan 2020 13:48:02 +0100
Subject: [PATCH 091/199] fixes #3021, see also
 https://github.com/TeamNewPipe/NewPipe-legacy/pull/21

---
 app/src/main/java/us/shandian/giga/get/DownloadMission.java | 1 +
 1 file changed, 1 insertion(+)

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 c0f85b321..9ad73050b 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -223,6 +223,7 @@ public class DownloadMission extends Mission {
         conn.setInstanceFollowRedirects(true);
         conn.setRequestProperty("User-Agent", DownloaderImpl.USER_AGENT);
         conn.setRequestProperty("Accept", "*/*");
+        conn.setRequestProperty("Accept-Encoding", "*");
 
         if (headRequest) conn.setRequestMethod("HEAD");
 

From 61d102dc75a1a1470adab17edcf5d251c67e2549 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Wed, 29 Jan 2020 18:43:44 +0100
Subject: [PATCH 092/199] Change recaptcha string names to match style

---
 app/src/main/AndroidManifest.xml                 | 2 +-
 app/src/main/res/values-ar/strings.xml           | 4 ++--
 app/src/main/res/values-b+ast/strings.xml        | 4 ++--
 app/src/main/res/values-b+zh+HANS+CN/strings.xml | 4 ++--
 app/src/main/res/values-be/strings.xml           | 4 ++--
 app/src/main/res/values-bg/strings.xml           | 4 ++--
 app/src/main/res/values-bn-rBD/strings.xml       | 4 ++--
 app/src/main/res/values-ca/strings.xml           | 4 ++--
 app/src/main/res/values-cmn/strings.xml          | 4 ++--
 app/src/main/res/values-cs/strings.xml           | 4 ++--
 app/src/main/res/values-da/strings.xml           | 4 ++--
 app/src/main/res/values-de/strings.xml           | 4 ++--
 app/src/main/res/values-el/strings.xml           | 4 ++--
 app/src/main/res/values-eo/strings.xml           | 4 ++--
 app/src/main/res/values-es/strings.xml           | 4 ++--
 app/src/main/res/values-et/strings.xml           | 4 ++--
 app/src/main/res/values-eu/strings.xml           | 4 ++--
 app/src/main/res/values-fa/strings.xml           | 4 ++--
 app/src/main/res/values-fi/strings.xml           | 4 ++--
 app/src/main/res/values-fr/strings.xml           | 4 ++--
 app/src/main/res/values-gl/strings.xml           | 4 ++--
 app/src/main/res/values-he/strings.xml           | 4 ++--
 app/src/main/res/values-hi/strings.xml           | 4 ++--
 app/src/main/res/values-hr/strings.xml           | 4 ++--
 app/src/main/res/values-hu/strings.xml           | 4 ++--
 app/src/main/res/values-id/strings.xml           | 4 ++--
 app/src/main/res/values-it/strings.xml           | 4 ++--
 app/src/main/res/values-ja/strings.xml           | 4 ++--
 app/src/main/res/values-ko/strings.xml           | 4 ++--
 app/src/main/res/values-ku/strings.xml           | 4 ++--
 app/src/main/res/values-lt/strings.xml           | 4 ++--
 app/src/main/res/values-mk/strings.xml           | 4 ++--
 app/src/main/res/values-ms/strings.xml           | 4 ++--
 app/src/main/res/values-nb-rNO/strings.xml       | 4 ++--
 app/src/main/res/values-nl-rBE/strings.xml       | 4 ++--
 app/src/main/res/values-nl/strings.xml           | 4 ++--
 app/src/main/res/values-pa/strings.xml           | 4 ++--
 app/src/main/res/values-pl/strings.xml           | 4 ++--
 app/src/main/res/values-pt-rBR/strings.xml       | 4 ++--
 app/src/main/res/values-pt/strings.xml           | 4 ++--
 app/src/main/res/values-ro/strings.xml           | 4 ++--
 app/src/main/res/values-ru/strings.xml           | 4 ++--
 app/src/main/res/values-sk/strings.xml           | 4 ++--
 app/src/main/res/values-sl/strings.xml           | 4 ++--
 app/src/main/res/values-sr/strings.xml           | 4 ++--
 app/src/main/res/values-sv/strings.xml           | 4 ++--
 app/src/main/res/values-tr/strings.xml           | 4 ++--
 app/src/main/res/values-uk/strings.xml           | 4 ++--
 app/src/main/res/values-ur/strings.xml           | 4 ++--
 app/src/main/res/values-vi/strings.xml           | 4 ++--
 app/src/main/res/values-zh-rCN/strings.xml       | 4 ++--
 app/src/main/res/values-zh-rHK/strings.xml       | 4 ++--
 app/src/main/res/values-zh-rTW/strings.xml       | 4 ++--
 app/src/main/res/values/strings.xml              | 7 ++++---
 54 files changed, 109 insertions(+), 108 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 21a846494..f27f4bad0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -112,7 +112,7 @@
 
         <activity
             android:name=".ReCaptchaActivity"
-            android:label="@string/reCaptchaActivity"/>
+            android:label="@string/recaptcha"/>
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b1dad5672..f8c48321d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -187,7 +187,7 @@
     <string name="no_available_dir">يرجى تحديد مجلد التنزيل لاحقا في الإعدادات</string>
     <string name="msg_popup_permission">هذا الإذن مطلوب
 \nللفتح في وضع النافذة المنبثقة</string>
-    <string name="reCaptchaActivity">اختبار reCAPTCHA</string>
+    <string name="recaptcha">اختبار 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>
@@ -235,7 +235,7 @@
     <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="title_activity_recaptcha">تحدي الكابتشا</string>
     <string name="hold_to_append">ضغط مطول للإدراج الى قائمة الانتظار</string>
     <plurals name="views">
         <item quantity="zero">%s بدون مشهد</item>
diff --git a/app/src/main/res/values-b+ast/strings.xml b/app/src/main/res/values-b+ast/strings.xml
index 08b22c616..5ddfa7ead 100644
--- a/app/src/main/res/values-b+ast/strings.xml
+++ b/app/src/main/res/values-b+ast/strings.xml
@@ -58,8 +58,8 @@
     <string name="short_billion">Mil mill.</string>
     <string name="msg_popup_permission">Precísase esti permisu
 \np\'abrir nel mou ventanu</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">Retu de reCAPTCHA</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Retu de reCAPTCHA</string>
     <string name="recaptcha_request_toast">Solicitóse\'l retu de reCAPTCHA</string>
     <string name="controls_background_title">En segundu planu</string>
     <string name="controls_popup_title">Ventanu</string>
diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
index 078379683..5fb13d968 100644
--- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml
+++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
@@ -110,7 +110,7 @@
     <string name="msg_running_detail">点击了解详情</string>
     <string name="msg_wait">请稍候…</string>
     <string name="msg_copied">复制至剪贴板</string>
-    <string name="reCaptchaActivity">reCAPTCHA验证码</string>
+    <string name="recaptcha">reCAPTCHA验证码</string>
     <string name="controls_popup_title">悬浮窗播放</string>
     <string name="title_activity_about">关于NewPipe</string>
     <string name="action_settings">设置</string>
@@ -207,7 +207,7 @@
     <string name="no_available_dir">请稍后在设置中设定下载目录</string>
     <string name="msg_popup_permission">用悬浮窗模式
 \n需要此权限</string>
-    <string name="reCaptcha_title">reCAPTCHA验证</string>
+    <string name="title_activity_recaptcha">reCAPTCHA验证</string>
     <string name="recaptcha_request_toast">请求的新的CAPTCHA验证</string>
     <string name="popup_mode_share_menu_title">NewPipe 悬浮窗模式</string>
     <string name="popup_playing_toast">在悬浮窗中播放</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 1cf3abd7e..b3a09cb8f 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -247,8 +247,8 @@
     <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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Запыт reCAPTCHA</string>
     <string name="recaptcha_request_toast">Запытаны ўвод reCAPTCHA</string>
     <string name="settings_category_downloads_title">Загрузкі</string>
     <string name="settings_file_charset_title">Дапушчальныя сімвалы назвы файлаў</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 1eb9222ec..7c813d0a9 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -269,8 +269,8 @@
     <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">преКАПЧА</string>
+    <string name="title_activity_recaptcha">reCAPTCHA заявка</string>
     <string name="recaptcha_request_toast">Изисква се въвеждане на reCAPTCHA</string>
     <string name="settings_category_downloads_title">Изтегляне</string>
     <string name="charset_most_special_characters">Повечето специални символи</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 3a623f2c3..37938334c 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -145,8 +145,8 @@
     <!-- 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">রিক্যাপচা</string>
+    <string name="title_activity_recaptcha">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>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index bcc816577..20deb3160 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -67,7 +67,7 @@
     <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>
+    <string name="recaptcha">reCAPTCHA</string>
     <string name="settings_category_downloads_title">Baixades</string>
     <string name="action_settings">Paràmetres</string>
     <string name="action_about">Quant a</string>
@@ -307,7 +307,7 @@
     <string name="msg_running_detail">Feu un toc aquí per a més detalls</string>
     <string name="no_available_dir">Defineix una carpeta de baixades més endavant als paràmetres</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="title_activity_recaptcha">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>
diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml
index 3ff479bfd..878efa9f2 100644
--- a/app/src/main/res/values-cmn/strings.xml
+++ b/app/src/main/res/values-cmn/strings.xml
@@ -266,8 +266,8 @@
     <string name="msg_popup_permission">在悬浮窗模式打开
 \n需要此权限</string>
     <string name="one_item_deleted">已删除一个项目。</string>
-    <string name="reCaptchaActivity">reCAPTCHA 验证</string>
-    <string name="reCaptcha_title">reCAPTCHA 验证</string>
+    <string name="recaptcha">reCAPTCHA 验证</string>
+    <string name="title_activity_recaptcha">reCAPTCHA 验证</string>
     <string name="recaptcha_request_toast">需完成 reCAPTCHA 验证</string>
     <string name="settings_category_downloads_title">下载</string>
     <string name="settings_file_charset_title">文件名中允许的字符</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 66c952a26..044d908c4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -102,8 +102,8 @@
     <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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">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>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 5e44aab61..ff2fea8c9 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -249,8 +249,8 @@
     <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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">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">Tilladte tegn i filnavne</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 53b9a52eb..fa5e798a4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -110,9 +110,9 @@
     <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="recaptcha">reCAPTCHA</string>
     <string name="black_theme_title">Schwarz</string>
-    <string name="reCaptcha_title">reCAPTCHA-Aufgabe</string>
+    <string name="title_activity_recaptcha">reCAPTCHA-Aufgabe</string>
     <string name="recaptcha_request_toast">reCAPTCHA-Aufgabe angefordert</string>
     <string name="later">Später</string>
     <string name="yes">Ja</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 3d2397a0c..915e1902d 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -251,8 +251,8 @@
     <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">Αυτόματο τεστ</string>
+    <string name="title_activity_recaptcha">Πρόκληση reCAPTCHA</string>
     <string name="recaptcha_request_toast">Ζητήθηκε πρόκληση reCAPTCHA</string>
     <string name="settings_file_charset_title">Επιτρεπόμενοι χαρακτήρες σε ονόματα αρχείων</string>
     <string name="settings_file_replacement_character_summary">Οι μη έγκυροι χαρακτήρες αντικαθίστανται με αυτήν την τιμή</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 224e8837e..754df0784 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -109,8 +109,8 @@
     <string name="error_report_title">Erarosignalo</string>
     <string name="could_not_load_image">Ne povis ŝarĝi bildon</string>
     <string name="app_ui_crash">Apo kraŝis</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA defio</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA defio</string>
     <string name="recaptcha_request_toast">reCAPTCHA defio petita</string>
     <string name="all">Ĉiuj</string>
     <string name="channel">Kanalo</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9f25208bb..d7a9bc2e8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -115,11 +115,11 @@
     <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="recaptcha">reCAPTCHA</string>
     <string name="open_in_popup_mode">Abrir en modo emergente</string>
     <string name="msg_popup_permission">Se necesita este permiso
 \npara abrir en modo emergente</string>
-    <string name="reCaptcha_title">Reto reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Reto reCAPTCHA</string>
     <string name="recaptcha_request_toast">Reto reCAPTCHA requerido</string>
     <string name="popup_mode_share_menu_title">Modo emergente de NewPipe</string>
     <string name="popup_playing_toast">Reproduciendo en modo emergente</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 99dc6cc80..79442f421 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -238,7 +238,7 @@
     <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="recaptcha">"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>
@@ -370,7 +370,7 @@
     <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="title_activity_recaptcha">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>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index b376f1f6d..1ec970d5f 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -139,8 +139,8 @@
     <string name="no_available_dir">Ezarri deskargetarako karpeta bat ezarpenetan geroago</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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">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>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index b2a04e14c..790c47669 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -296,7 +296,7 @@
     <string name="use_inexact_seek_title">زمان فعلی پخش کننده را به صورت تقریبی و سریع جلو ببر</string>
     <string name="use_inexact_seek_summary">این گزینه باعث می شود هنگام جلو/عقب کردن زمان تصویر، به جای زمان دقیق انتخاب شده، به زمان غیر دقیق و نزدیک به مکان انتخاب شده برود که این کار سریع تر انجام می شود</string>
     <string name="app_ui_crash">کاره یا رابط کاربری با خطا مواجه شد</string>
-    <string name="reCaptchaActivity">ریکپچا</string>
+    <string name="recaptcha">ریکپچا</string>
     <string name="settings_category_downloads_title">بارگیری</string>
     <string name="toggle_orientation">تغییر جهت</string>
     <string name="switch_to_background">تغییر وضعیت به پس‌زمینه</string>
@@ -361,7 +361,7 @@
     <string name="undo">بازگردانی</string>
     <string name="background_player_append">در صف پخش کننده پس‌زمینه قرار گرفت</string>
     <string name="info_labels">چه:\\nدرخواست:\\nزبان درخواست:\\nخدمت:\\nزمان GMT:\\nنگارش:\\nنگارش س.ع:\\nبازه آی‌پی:</string>
-    <string name="reCaptcha_title">چالش ری‌کپچا</string>
+    <string name="title_activity_recaptcha">چالش ری‌کپچا</string>
     <string name="recaptcha_request_toast">نیاز به چالش ری‌کپچا است</string>
     <string name="msg_popup_permission">این مجوز مورد نیاز است
 \nتا بتوان به حالت تصویر در تصویر رفت</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 1e91fa55a..edf10c6f0 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -173,8 +173,8 @@
     <string name="msg_copied">Kopioitu leikepöydälle</string>
     <string name="no_available_dir">Valitse saatavilla oleva latauskansio</string>
     <string name="msg_popup_permission">Tämä käyttöoikeus tarvitaan ponnahdusikkunan käytölle</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA Haaste</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA Haaste</string>
     <string name="recaptcha_request_toast">reCAPTCHA Haaste pyydetty</string>
     <string name="settings_category_downloads_title">Lataus</string>
     <string name="settings_file_charset_title">Sallitut merkit tiedostonimissä</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 444310aef..6b86cd2b4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -105,11 +105,11 @@
     <string name="no_available_dir">Veuillez définir ultérieurement un dossier de téléchargement dans les paramètres</string>
     <string name="could_not_load_image">Impossible de charger l’image</string>
     <string name="app_ui_crash">L’application a planté</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
+    <string name="recaptcha">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="title_activity_recaptcha">Défi reCAPTCHA</string>
     <string name="recaptcha_request_toast">Défi reCAPTCHA demandé</string>
     <string name="open_in_popup_mode">Ouvrir en mode flottant</string>
     <string name="popup_mode_share_menu_title">Mode flottant NewPipe</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 899a9be10..6427e1378 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -266,8 +266,8 @@
 \npara abrir o vídeo no modo «popup»</string>
     <string name="one_item_deleted">1 elemento foi eliminado.</string>
 
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">Desafío reCAPTCHA</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Desafío reCAPTCHA</string>
     <string name="recaptcha_request_toast">Desafío reCAPTCHA solicitado</string>
 
     <string name="settings_category_downloads_title">Descarregar</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 7a1338f60..35b86ec2d 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -192,8 +192,8 @@
     <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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">אתגר reCAPTCHA</string>
     <string name="recaptcha_request_toast">התקבלה בקשה לאתגר reCAPTCHA</string>
     <string name="settings_category_downloads_title">הורדה</string>
     <string name="settings_file_charset_title">רשימת תווים אפשרית בשמות קבצים</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 82b2db1b5..a7746330a 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -206,8 +206,8 @@
     <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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">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>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a981dcf5e..beb2bdd02 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -153,8 +153,8 @@
     <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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">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>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 4d7ff986e..dc1021adb 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -233,8 +233,8 @@
     <string name="rename">Átnevezés</string>
     <string name="msg_popup_permission">Ez az engedély szükséges a felugró ablakban történő megnyitáshoz</string>
     <string name="one_item_deleted">1 elem törölve.</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA rejtvény</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA rejtvény</string>
     <string name="recaptcha_request_toast">reCAPTCHA rejtvény igényelve</string>
     <string name="settings_category_downloads_title">Letöltés</string>
     <string name="settings_file_charset_title">Fájlnevekben engedélyezett karakterek</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 8677df678..ffcacdd6d 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -105,8 +105,8 @@
     <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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Tantangan reCAPTCHA</string>
     <string name="recaptcha_request_toast">Meminta kode reCAPTCHA</string>
     <string name="black_theme_title">Hitam</string>
     <string name="all">Semua</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4942f4720..7ab68268f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -106,8 +106,8 @@
     <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="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Risoluzione reCAPTCHA</string>
     <string name="black_theme_title">Nero</string>
     <string name="all">Tutto</string>
     <string name="channel">Canale</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 553a54f1e..7980645e2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -106,8 +106,8 @@
     <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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA の要求</string>
     <string name="recaptcha_request_toast">reCAPTCHA を要求しました</string>
     <string name="black_theme_title">ブラック</string>
     <string name="all">すべて</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index e8a2a9c51..630abcdaa 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -180,7 +180,7 @@
     <string name="no_available_dir">다운로드 할 폴더를 설정에서 지정하세요</string>
     <string name="msg_popup_permission">이 권한은 팝업 모드에서
 \n열기 위해 필요합니다</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
+    <string name="recaptcha">reCAPTCHA</string>
     <string name="recaptcha_request_toast">reCAPTCHA 확인 요청됨</string>
     <string name="settings_category_downloads_title">다운로드</string>
     <string name="settings_file_charset_title">파일명에 허용되는 문자</string>
@@ -274,7 +274,7 @@
     <string name="delete_all">모두 삭제하기</string>
     <string name="dismiss">취소</string>
     <string name="rename">이름 바꾸기</string>
-    <string name="reCaptcha_title">reCAPTCHA 확인</string>
+    <string name="title_activity_recaptcha">reCAPTCHA 확인</string>
     <string name="delete_stream_history_prompt">이 항목을 시청 기록에서 삭제하시겠습니까?</string>
     <string name="delete_all_history_prompt">모든 항목을 시청 기록에서 삭제하시겠습니까?</string>
     <string name="title_last_played">마지막으로 재생</string>
diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 50350e1b3..2f39136e2 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -215,8 +215,8 @@
     <string name="no_available_dir">تکایە فۆڵدەرێک بۆ شوێنی داگرتن دیاریبکە لە ڕێکخستنەکان</string>
     <string name="msg_popup_permission">ئەم دەسەڵاتە پێویستە بۆ
 \nکردنەوەی پەنجەرەی بچووک</string>
-    <string name="reCaptchaActivity" translatable="false">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA داواکاری</string>
+    <string name="recaptcha" translatable="false">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA داواکاری</string>
     <string name="recaptcha_request_toast">reCAPTCHA داواکراوە</string>
     <string name="settings_category_downloads_title">داگرتن</string>
     <string name="charset_letters_and_digits">پیت و ژمارەکان</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 43fe9d862..f84a3c23c 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -153,8 +153,8 @@
     <string name="no_available_dir">Prašome pasirinkti galimą atsisiuntimų aplankalą</string>
     <string name="msg_popup_permission">Šis leidimas nereikalingas, kad atidarytiviššokančio lango rėžime</string>
 
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA iššūkis</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA iššūkis</string>
     <string name="recaptcha_request_toast">reCAPTCHA prašomas iššūkis</string>
 
     <string name="subscribe_button_title">Prenumeruoti</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index c9388a78a..96b4c8819 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -230,8 +230,8 @@
     <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">„reCAPTCHA“</string>
+    <string name="title_activity_recaptcha">reCAPTCHA Предизвик</string>
     <string name="recaptcha_request_toast">Потребен е reCAPTCHA предизвик</string>
     <string name="settings_category_downloads_title">Превземања</string>
     <string name="settings_file_charset_title">Дозволени знаци во имињата на датотеките</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 354e7b7de..f53450e13 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -258,8 +258,8 @@
     <string name="msg_popup_permission">Kebenaran ini diperlukan untuk
 \nbuka dalam mod popup</string>
     <string name="one_item_deleted">1 item dipadamkan.</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">Cabaran reCAPTCHA</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Cabaran reCAPTCHA</string>
     <string name="recaptcha_request_toast">Meminta kod reCAPTCHA</string>
     <string name="settings_category_downloads_title">Muat turun</string>
     <string name="settings_file_charset_title">Karakter yang dibenarkan dalam nama fail</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index d01647f5d..c20161f7d 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -106,8 +106,8 @@
     <string name="add">Nytt mål</string>
     <string name="msg_url_malform">Feilaktig nettadresse eller manglende internettilknytning</string>
     <string name="no_available_dir">Definer en nedlastingsmappe senere i innstillingene</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA-oppgave</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA-oppgave</string>
     <string name="open_in_popup_mode">Åpne i oppsprettsmodus</string>
     <string name="popup_mode_share_menu_title">NewPipe oppsprettsmodus</string>
     <string name="default_popup_resolution_title">Forvalgt oppsprettsoppløsning</string>
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 198979def..de96152ec 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -230,8 +230,8 @@
     <string name="msg_copied">Gekopieerd naar klembord</string>
     <string name="no_available_dir">Kies een beschikbare downloadmap</string>
     <string name="msg_popup_permission">Deze toestemming is vereist voor te openen in pop-upmodus</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA-uitdaging</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA-uitdaging</string>
     <string name="recaptcha_request_toast">reCAPTCHA-uitdaging gevraagd</string>
     <string name="settings_category_downloads_title">Download</string>
     <string name="settings_file_charset_title">Toegelaten tekens in bestandsnamen</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 9ecc936eb..1cd1391a0 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -107,8 +107,8 @@
     <string name="msg_copied">Gekopieerd naar klembord</string>
     <string name="no_available_dir">Kies een beschikbare downloadmap</string>
     <string name="black_theme_title">Zwart</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA-uitdaging</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA-uitdaging</string>
     <string name="recaptcha_request_toast">reCAPTCHA-uitdaging gevraagd</string>
     <string name="open_in_popup_mode">Openen in pop-upmodus</string>
     <string name="all">Alles</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 0e579720a..7e39321e0 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -237,8 +237,8 @@
     <string name="no_available_dir">ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿਚੋਂ ਇੱਕ ਡਾਉਨਲੋਡ ਫੋਲਡਰ ਨੂੰ ਚੁਣੋ</string>
     <string name="msg_popup_permission">ਪੌਪ-ਅਪ ਮੋਡ ਵਿੱਚ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਇਸ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ</string>
     <string name="one_item_deleted">1 ਆਈਟਮ ਮਿਟਾਈ ਗਈ.</string>
-    <string name="reCaptchaActivity">ReCaptcha</string>
-    <string name="reCaptcha_title">ReCaptcha ਚੁਣੌਤੀ</string>
+    <string name="recaptcha">ReCaptcha</string>
+    <string name="title_activity_recaptcha">ReCaptcha ਚੁਣੌਤੀ</string>
     <string name="recaptcha_request_toast">ReCaptcha ਚੁਣੌਤੀ ਲਈ ਬੇਨਤੀ</string>
     <string name="settings_category_downloads_title">ਡਾਊਨਲੋਡ</string>
     <string name="settings_file_charset_title">ਫਾਈਲ ਨਾਮ ਵਿੱਚ ਪ੍ਰਵਾਨਿਤ ਅੱਖਰ</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0da89ad48..0009fa8d1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -106,8 +106,8 @@
     <string name="app_ui_crash">Awaria aplikacji/interfejsu</string>
     <string name="use_tor_summary">(Eksperymentalne) Wymuś pobieranie przez Tora w celu zwiększenia prywatności (strumieniowe wideo nie jest jeszcze obsługiwane).</string>
     <string name="start">Start</string>
-    <string name="reCaptchaActivity">CAPTCHA</string>
-    <string name="reCaptcha_title">Wyzwanie reCAPTCHA</string>
+    <string name="recaptcha">CAPTCHA</string>
+    <string name="title_activity_recaptcha">Wyzwanie reCAPTCHA</string>
     <string name="recaptcha_request_toast">Wymagane wyzwanie dotyczące reCAPTCHA</string>
     <string name="use_external_video_player_summary">Usuwa dźwięk w niektórych rozdzielczościach</string>
     <string name="controls_background_title">Tło</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 45fe51010..04c4e3960 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -50,8 +50,8 @@
     <string name="next_video_title">Próximo</string>
     <string name="open_in_browser">Abrir no navegador</string>
     <string name="pause">Pausar</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">Desafio reCAPTCHA</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Desafio reCAPTCHA</string>
     <string name="recaptcha_request_toast">Desafio reCAPTCHA solicitado</string>
     <string name="report_error">Reportar um erro</string>
     <string name="retry">Tentar novamente</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 98b85bcab..64de827bf 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -117,8 +117,8 @@
     <string name="short_billion">B</string>
     <string name="msg_popup_permission">Esta permissão é necessária 
 \npara o modo de janela</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">Desafio reCAPTCHA</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Desafio reCAPTCHA</string>
     <string name="recaptcha_request_toast">Desafio reCAPTCHA solicitado</string>
     <string name="popup_mode_share_menu_title">Modo de janela autónoma do NewPipe</string>
     <string name="popup_playing_toast">Reproduzir no modo de janela autónoma</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 358de0ca8..e304e862d 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -106,8 +106,8 @@
     <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">Provocare reCAPTCHA</string>
+    <string name="recaptcha">ReCAPTCHA</string>
+    <string name="title_activity_recaptcha">Provocare reCAPTCHA</string>
     <string name="recaptcha_request_toast">reCAPTCHA nouă cerută</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>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1da98cc74..c2e8b4d4e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -124,7 +124,7 @@
     <string name="info_labels">Что:\\nЗапрос:\\nЯзык контента:\\nСервис:\\nВремя по Гринвичу:\\nПакет:\\nВерсия:\\nВерсия ОС:</string>
     <string name="msg_popup_permission">Это разрешение нужно для
 \nвоспроизведения в окне</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
+    <string name="recaptcha">reCAPTCHA</string>
     <string name="open_in_popup_mode">Открыть во всплывающем окне</string>
     <string name="show_search_suggestions_summary">Предлагать варианты при поиске</string>
     <string name="later">Позже</string>
@@ -138,7 +138,7 @@
     <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="title_activity_recaptcha">Запрос 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>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6624f7a3b..1652aefa1 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -106,8 +106,8 @@
     <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="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Výzva reCAPTCHA</string>
     <string name="black_theme_title">Čierna</string>
     <string name="all">Všetko</string>
     <string name="channel">Kanál</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index a67b48a62..f318ca77e 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -124,8 +124,8 @@
 
     <string name="could_not_load_image">Slike ni mogoče naložiti</string>
     <string name="app_ui_crash">Program se je sesul!</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">Izziv reCAPTCHA</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Izziv reCAPTCHA</string>
     <string name="recaptcha_request_toast">Zahteva izziva reCAPTCHA</string>
 
     <string name="info_labels">Predmet:\\nZahteva:\\nJezik vsebine:\\nStoritev:\\nČas v GMT:\\nPaket:\\nRazličica:\\nRazličica OS:</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index d5f031ad8..a8abb98e9 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -107,8 +107,8 @@
     <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">Стопка</string>
+    <string name="title_activity_recaptcha">reCAPTCHA стопка</string>
     <string name="recaptcha_request_toast">Решите reCAPTCHA стопку</string>
     <string name="black_theme_title">Црна</string>
     <string name="all">Сви</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 89d51493e..e130ae1de 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -186,8 +186,8 @@
     <string name="no_available_dir">Ange en hämtningsmapp senare i inställningar</string>
     <string name="msg_popup_permission">Denna tillåtelse behövs för att
 \nöppna i popup-läge</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA utmaning</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA utmaning</string>
     <string name="recaptcha_request_toast">reCAPTCHA utmaning begärd</string>
     <string name="settings_category_downloads_title">Nedladdning</string>
     <string name="settings_file_charset_title">Tillåtna tecken i filnamn</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c6603382d..ee070eb81 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -124,8 +124,8 @@
     <string name="short_billion">B</string>
     <string name="msg_popup_permission">Bu izin, açılır pencere modunda 
 \naçmak için gereklidir</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA formu</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA formu</string>
     <string name="recaptcha_request_toast">reCAPTCHA formu istendi</string>
     <string name="controls_background_title">Arka plan</string>
     <string name="controls_popup_title">Açılır pencere</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 6aea1ad79..ef5dbee53 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -184,7 +184,7 @@
     <string name="msg_url_malform">Помилковий URL або немає доступу в Інтернет</string>
     <string name="msg_popup_permission">Цей дозвіл потрібен для перегляду
 \nу віконному режимі</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
+    <string name="recaptcha">reCAPTCHA</string>
     <string name="settings_category_downloads_title">Завантаження</string>
     <string name="settings_file_charset_title">Допустимі символи у іменах файлів</string>
     <string name="settings_file_replacement_character_summary">Недопустимі символи замінити на цей</string>
@@ -256,7 +256,7 @@
         <item quantity="many">%s переглядів</item>
     </plurals>
     <string name="add">Нове завдання</string>
-    <string name="reCaptcha_title">Перевірка reCAPTCHA</string>
+    <string name="title_activity_recaptcha">Перевірка 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>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 724c9c3ed..ba8aa6b82 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -230,8 +230,8 @@
     <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">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA چیلنج</string>
     <string name="recaptcha_request_toast">reCAPTCHA چیلینج کی درخواست کی گئی</string>
     <string name="settings_category_downloads_title">ڈاؤن لوڈ</string>
     <string name="settings_file_charset_title">فائل ناموں میں حروف کی اجازت ہے</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ab0983e7a..bfde056b0 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -135,8 +135,8 @@
     <string name="no_available_dir">Chọn một thư mục tải về có sẵn trong cài đặt</string>
     <string name="msg_popup_permission">Cần quyền này để 
 \nmở trong chế độ popup</string>
-    <string name="reCaptchaActivity">ReCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA</string>
+    <string name="recaptcha">ReCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA</string>
     <string name="recaptcha_request_toast">Yêu cầu reCAPTCHA</string>
     <string name="title_activity_about">Giới thiệu về NewPipe</string>
     <string name="action_settings">Cài đặ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 9aa4b9245..0282e6c92 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -117,8 +117,8 @@
     <string name="could_not_load_image">无法加载图像</string>
     <string name="app_ui_crash">应用/界面已崩溃</string>
     <string name="info_labels">原因：\\n请求：\\n内容语言：\\n服务：\\nGMT时间：\\n包：\\n版本：\\n操作系统版本：</string>
-    <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA 验证</string>
+    <string name="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA 验证</string>
 
     <string name="recaptcha_request_toast">需要 reCAPTCHA 验证</string>
 
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 3294094dc..20b14d7ea 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -120,8 +120,8 @@
     <string name="info_labels">事件：\\n請求：\\n內容語言：\\n服務：\\nGMT 時間：\\nPackage：\\n版本：\\n作業系統版本：</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="recaptcha">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA 挑戰</string>
     <string name="msg_popup_permission">畫中畫模式需要此權限</string>
     <string name="recaptcha_request_toast">需完成 reCAPTCHA 挑戰</string>
     <string name="use_external_video_player_summary">啟用此選項將導致某些解像度的影片失去聲音</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6cb16623f..388f4a8cd 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -136,8 +136,8 @@
     <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">reCAPTCHA 驗證</string>
+    <string name="title_activity_recaptcha">reCAPTCHA 驗證</string>
     <string name="recaptcha_request_toast">已請求 reCAPTCHA 驗證</string>
     <string name="controls_popup_title">懸浮視窗</string>
     <string name="duration_live">直播</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e1b2cc0a4..56ecc3356 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -326,10 +326,11 @@
     <!-- Checksum types -->
     <string name="md5" translatable="false">MD5</string>
     <string name="sha1" translatable="false">SHA-1</string>
-    <string name="reCaptchaActivity" translatable="false">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA challenge</string>
+    <!-- reCAPTCHA -->
+    <string name="recaptcha" translatable="false">reCAPTCHA</string>
+    <string name="title_activity_recaptcha">reCAPTCHA challenge</string>
+    <string name="subtitle_activity_recaptcha">Press \"Done\" when solved</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>

From a3d8848825d52226479f7d14d5ddbb7c0d3bf605 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Wed, 29 Jan 2020 18:44:46 +0100
Subject: [PATCH 093/199] Add "Done" drawable (only white since it is used on
 toolbar)

---
 app/src/main/res/drawable/ic_done_white_24dp.xml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_done_white_24dp.xml

diff --git a/app/src/main/res/drawable/ic_done_white_24dp.xml b/app/src/main/res/drawable/ic_done_white_24dp.xml
new file mode 100644
index 000000000..cab2aed1a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_done_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+</vector>

From daa4fd510320f2ee8a898a38b3851d6408e50a93 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Wed, 29 Jan 2020 19:36:57 +0100
Subject: [PATCH 094/199] Fix ReCaptchaActivity crash and save cookies
 correctly

---
 .../org/schabi/newpipe/ReCaptchaActivity.java | 155 ++++++++++--------
 1 file changed, 86 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index 0a2d51b53..533379dbb 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Build;
@@ -9,12 +8,18 @@ import androidx.core.app.NavUtils;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+
+import android.util.Log;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.webkit.CookieManager;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /*
  * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
  *
@@ -37,18 +42,17 @@ import android.webkit.WebViewClient;
 public class ReCaptchaActivity extends AppCompatActivity {
     public static final int RECAPTCHA_REQUEST = 10;
     public static final String RECAPTCHA_URL_EXTRA = "recaptcha_url_extra";
-
     public static final String TAG = ReCaptchaActivity.class.toString();
     public static final String YT_URL = "https://www.youtube.com";
 
-    private String url;
+    private String foundCookies = "";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_recaptcha);
 
-        url = getIntent().getStringExtra(RECAPTCHA_URL_EXTRA);
+        String url = getIntent().getStringExtra(RECAPTCHA_URL_EXTRA);
         if (url == null || url.isEmpty()) {
             url = YT_URL;
         }
@@ -60,26 +64,24 @@ public class ReCaptchaActivity extends AppCompatActivity {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(R.string.reCaptcha_title);
-            actionBar.setDisplayShowTitleEnabled(true);
-        }
-
         WebView myWebView = findViewById(R.id.reCaptchaWebView);
 
         // Enable Javascript
         WebSettings webSettings = myWebView.getSettings();
         webSettings.setJavaScriptEnabled(true);
 
-        ReCaptchaWebViewClient webClient = new ReCaptchaWebViewClient(this);
-        myWebView.setWebViewClient(webClient);
+        myWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+                handleCookies(CookieManager.getInstance().getCookie(url));
+            }
+        });
 
         // Cleaning cache, history and cookies from webView
         myWebView.clearCache(true);
         myWebView.clearHistory();
-        android.webkit.CookieManager cookieManager = CookieManager.getInstance();
+        android.webkit.CookieManager cookieManager = CookieManager .getInstance();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             cookieManager.removeAllCookies(aBoolean -> {});
         } else {
@@ -89,74 +91,89 @@ public class ReCaptchaActivity extends AppCompatActivity {
         myWebView.loadUrl(url);
     }
 
-    private class ReCaptchaWebViewClient extends WebViewClient {
-        private final Activity context;
-        private String mCookies;
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        boolean ret = super.onCreateOptionsMenu(menu);
 
-        ReCaptchaWebViewClient(Activity ctx) {
-            context = ctx;
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setHomeAsUpIndicator(getResources().getDrawable(R.drawable.ic_done_white_24dp));
+            actionBar.setTitle(R.string.title_activity_recaptcha);
+            actionBar.setSubtitle(R.string.subtitle_activity_recaptcha);
         }
 
-        @Override
-        public void onPageStarted(WebView view, String url, Bitmap favicon) {
-            // TODO: Start Loader
-            super.onPageStarted(view, url, favicon);
-        }
+        return ret;
+    }
 
-        @Override
-        public void onPageFinished(WebView view, String url) {
-            String cookies = CookieManager.getInstance().getCookie(url);
-
-            // TODO: Stop Loader
-
-            // find cookies : s_gl & goojf and Add cookies to Downloader
-            if (find_access_cookies(cookies)) {
-                // Give cookies to Downloader class
-                DownloaderImpl.getInstance().setCookies(mCookies);
-
-                // Closing activity and return to parent
-                setResult(RESULT_OK);
-                finish();
-            }
-        }
-
-        private boolean find_access_cookies(String cookies) {
-            boolean ret = false;
-            String c_s_gl = "";
-            String c_goojf = "";
-
-            String[] parts = cookies.split("; ");
-            for (String part : parts) {
-                if (part.trim().startsWith("s_gl")) {
-                    c_s_gl = part.trim();
-                }
-                if (part.trim().startsWith("goojf")) {
-                    c_goojf = part.trim();
-                }
-            }
-            if (c_s_gl.length() > 0 && c_goojf.length() > 0) {
-                ret = true;
-                //mCookies = c_s_gl + "; " + c_goojf;
-                // Youtube seems to also need the other cookies:
-                mCookies = cookies;
-            }
-
-            return ret;
-        }
+    @Override
+    public void onBackPressed() {
+        saveCookiesAndFinish();
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         switch (id) {
-            case android.R.id.home: {
-                Intent intent = new Intent(this, org.schabi.newpipe.MainActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                NavUtils.navigateUpTo(this, intent);
+            case android.R.id.home:
+                saveCookiesAndFinish();
                 return true;
-            }
             default:
                 return false;
         }
     }
+
+    private void saveCookiesAndFinish() {
+        if (!foundCookies.isEmpty()) {
+            // Give cookies to Downloader class
+            DownloaderImpl.getInstance().setCookies(foundCookies);
+            setResult(RESULT_OK);
+        }
+
+        Intent intent = new Intent(this, org.schabi.newpipe.MainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        NavUtils.navigateUpTo(this, intent);
+    }
+
+
+
+    private void handleCookies(@Nullable String cookies) {
+        if (MainActivity.DEBUG) Log.d(TAG, "handleCookies: cookies=" + (cookies == null ? "null" : cookies));
+        if (cookies == null) return;
+
+        addYoutubeCookies(cookies);
+        // add other methods to extract cookies here
+    }
+
+    private void addYoutubeCookies(@Nonnull String cookies) {
+        String c_s_gl = "";
+        String c_goojf = "";
+
+        String[] parts = cookies.split(";");
+        for (String part : parts) {
+            String trimmedPart = part.trim();
+            if (trimmedPart.startsWith("s_gl")) {
+                c_s_gl = trimmedPart;
+            }
+            if (trimmedPart.startsWith("goojf")) {
+                c_goojf = trimmedPart;
+            }
+        }
+        if (c_s_gl.length() > 0 && c_goojf.length() > 0) {
+            // addCookie(c_s_gl);
+            // addCookie(c_goojf);
+            // Youtube seems to also need the other cookies:
+            addCookie(cookies);
+        }
+    }
+
+    private void addCookie(String cookie) {
+        if (foundCookies.isEmpty() || foundCookies.endsWith("; ")) {
+            foundCookies += cookie;
+        } else if (foundCookies.endsWith(";")) {
+            foundCookies += " " + cookie;
+        } else {
+            foundCookies += "; " + cookie;
+        }
+    }
 }

From 4e1638f86e75d546154b28714fd1bd2f9a426e9a Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Wed, 29 Jan 2020 19:37:43 +0100
Subject: [PATCH 095/199] Remove space between "Done" button and
 ReCaptchaActivity title

---
 app/src/main/res/layout/activity_recaptcha.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/activity_recaptcha.xml b/app/src/main/res/layout/activity_recaptcha.xml
index 411ada498..8e277d0c5 100644
--- a/app/src/main/res/layout/activity_recaptcha.xml
+++ b/app/src/main/res/layout/activity_recaptcha.xml
@@ -14,9 +14,8 @@
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
         app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"
-        app:titleTextAppearance="@style/Toolbar.Title">
-
-    </androidx.appcompat.widget.Toolbar>
+        app:titleTextAppearance="@style/Toolbar.Title"
+        app:contentInsetStartWithNavigation="0dp" />
 
     <WebView
         android:id="@+id/reCaptchaWebView"

From fe138f6d611d4a182db9ddec902f1d4c471752b1 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 30 Jan 2020 21:05:57 +0100
Subject: [PATCH 096/199] Improve formatting

---
 .../main/java/org/schabi/newpipe/ReCaptchaActivity.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index 533379dbb..7bd632f39 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -51,18 +51,17 @@ public class ReCaptchaActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_recaptcha);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
 
         String url = getIntent().getStringExtra(RECAPTCHA_URL_EXTRA);
         if (url == null || url.isEmpty()) {
             url = YT_URL;
         }
 
-
         // Set return to Cancel by default
         setResult(RESULT_CANCELED);
 
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
 
         WebView myWebView = findViewById(R.id.reCaptchaWebView);
 
@@ -81,7 +80,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
         // Cleaning cache, history and cookies from webView
         myWebView.clearCache(true);
         myWebView.clearHistory();
-        android.webkit.CookieManager cookieManager = CookieManager .getInstance();
+        android.webkit.CookieManager cookieManager = CookieManager.getInstance();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             cookieManager.removeAllCookies(aBoolean -> {});
         } else {

From 0cc890a1d1384266916a9382309fcaa3cdbb0115 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sat, 1 Feb 2020 17:53:43 +0100
Subject: [PATCH 097/199] Move "Done" button and make it theme conpliant in
 ReCaptcha

---
 .../java/org/schabi/newpipe/ReCaptchaActivity.java   | 12 +++++++-----
 app/src/main/res/drawable/ic_done_black_24dp.xml     |  9 +++++++++
 app/src/main/res/layout/activity_recaptcha.xml       |  3 +--
 app/src/main/res/menu/menu_recaptcha.xml             | 10 ++++++++++
 app/src/main/res/values/attrs.xml                    |  1 +
 app/src/main/res/values/strings.xml                  |  1 +
 app/src/main/res/values/styles.xml                   |  2 ++
 7 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_done_black_24dp.xml
 create mode 100644 app/src/main/res/menu/menu_recaptcha.xml

diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index 7bd632f39..f2970345f 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -17,6 +17,8 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import org.schabi.newpipe.util.ThemeHelper;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -49,6 +51,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        ThemeHelper.setTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_recaptcha);
         Toolbar toolbar = findViewById(R.id.toolbar);
@@ -92,17 +95,16 @@ public class ReCaptchaActivity extends AppCompatActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        boolean ret = super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.menu_recaptcha, menu);
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeAsUpIndicator(getResources().getDrawable(R.drawable.ic_done_white_24dp));
+            actionBar.setDisplayHomeAsUpEnabled(false);
             actionBar.setTitle(R.string.title_activity_recaptcha);
             actionBar.setSubtitle(R.string.subtitle_activity_recaptcha);
         }
 
-        return ret;
+        return true;
     }
 
     @Override
@@ -114,7 +116,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         switch (id) {
-            case android.R.id.home:
+            case R.id.menu_item_done:
                 saveCookiesAndFinish();
                 return true;
             default:
diff --git a/app/src/main/res/drawable/ic_done_black_24dp.xml b/app/src/main/res/drawable/ic_done_black_24dp.xml
new file mode 100644
index 000000000..7affe9ba9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_done_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_recaptcha.xml b/app/src/main/res/layout/activity_recaptcha.xml
index 8e277d0c5..759e1f296 100644
--- a/app/src/main/res/layout/activity_recaptcha.xml
+++ b/app/src/main/res/layout/activity_recaptcha.xml
@@ -14,8 +14,7 @@
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
         app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"
-        app:titleTextAppearance="@style/Toolbar.Title"
-        app:contentInsetStartWithNavigation="0dp" />
+        app:titleTextAppearance="@style/Toolbar.Title"/>
 
     <WebView
         android:id="@+id/reCaptchaWebView"
diff --git a/app/src/main/res/menu/menu_recaptcha.xml b/app/src/main/res/menu/menu_recaptcha.xml
new file mode 100644
index 000000000..07ad07b38
--- /dev/null
+++ b/app/src/main/res/menu/menu_recaptcha.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_done"
+        android:title="@string/recaptcha_done_button"
+        android:icon="?attr/ic_done"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c64ed1256..88925a598 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -45,6 +45,7 @@
     <attr name="ic_grid" format="reference"/>
     <attr name="ic_delete" format="reference"/>
     <attr name="ic_settings_update" format="reference"/>
+    <attr name="ic_done" format="reference"/>
 
     <attr name="progress_horizontal_drawable" format="reference"/>
     <!-- Can't refer to colors directly in drawable's xml-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 56ecc3356..b16713172 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -331,6 +331,7 @@
     <string name="title_activity_recaptcha">reCAPTCHA challenge</string>
     <string name="subtitle_activity_recaptcha">Press \"Done\" when solved</string>
     <string name="recaptcha_request_toast">reCAPTCHA challenge requested</string>
+    <string name="recaptcha_done_button">Done</string>
     <!-- Downloads -->
     <string name="settings_category_downloads_title">Download</string>
     <string name="settings_file_charset_title">Allowed characters in filenames</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 679d4d1cd..8047ef7f4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -60,6 +60,7 @@
         <item name="ic_grid">@drawable/ic_grid_black_24dp</item>
         <item name="ic_delete">@drawable/ic_delete_black_24dp</item>
         <item name="ic_settings_update">@drawable/ic_settings_update_black</item>
+        <item name="ic_done">@drawable/ic_done_black_24dp</item>
 
         <item name="separator_color">@color/light_separator_color</item>
         <item name="contrast_background_color">@color/light_contrast_background_color</item>
@@ -129,6 +130,7 @@
         <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="ic_done">@drawable/ic_done_white_24dp</item>
 
         <item name="separator_color">@color/dark_separator_color</item>
         <item name="contrast_background_color">@color/dark_contrast_background_color</item>

From 9b09028440b2b12b9dfdac786d6489bdbbff131c Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sat, 1 Feb 2020 17:59:16 +0100
Subject: [PATCH 098/199] Try to extract cookies just before closing recaptcha
 activity

Even if the page didn't auto-close
---
 .../org/schabi/newpipe/ReCaptchaActivity.java | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index f2970345f..06094cebd 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -47,6 +47,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
     public static final String TAG = ReCaptchaActivity.class.toString();
     public static final String YT_URL = "https://www.youtube.com";
 
+    private WebView webView;
     private String foundCookies = "";
 
     @Override
@@ -66,23 +67,23 @@ public class ReCaptchaActivity extends AppCompatActivity {
         setResult(RESULT_CANCELED);
 
 
-        WebView myWebView = findViewById(R.id.reCaptchaWebView);
+        webView = findViewById(R.id.reCaptchaWebView);
 
         // Enable Javascript
-        WebSettings webSettings = myWebView.getSettings();
+        WebSettings webSettings = webView.getSettings();
         webSettings.setJavaScriptEnabled(true);
 
-        myWebView.setWebViewClient(new WebViewClient() {
+        webView.setWebViewClient(new WebViewClient() {
             @Override
             public void onPageFinished(WebView view, String url) {
                 super.onPageFinished(view, url);
-                handleCookies(CookieManager.getInstance().getCookie(url));
+                handleCookies(url);
             }
         });
 
         // Cleaning cache, history and cookies from webView
-        myWebView.clearCache(true);
-        myWebView.clearHistory();
+        webView.clearCache(true);
+        webView.clearHistory();
         android.webkit.CookieManager cookieManager = CookieManager.getInstance();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             cookieManager.removeAllCookies(aBoolean -> {});
@@ -90,7 +91,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
             cookieManager.removeAllCookie();
         }
 
-        myWebView.loadUrl(url);
+        webView.loadUrl(url);
     }
 
     @Override
@@ -125,6 +126,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
     }
 
     private void saveCookiesAndFinish() {
+        handleCookies(webView.getUrl()); // try to get cookies of unclosed page
         if (!foundCookies.isEmpty()) {
             // Give cookies to Downloader class
             DownloaderImpl.getInstance().setCookies(foundCookies);
@@ -138,8 +140,10 @@ public class ReCaptchaActivity extends AppCompatActivity {
 
 
 
-    private void handleCookies(@Nullable String cookies) {
-        if (MainActivity.DEBUG) Log.d(TAG, "handleCookies: cookies=" + (cookies == null ? "null" : cookies));
+    private void handleCookies(String url) {
+        String cookies = CookieManager.getInstance().getCookie(url);
+        if (MainActivity.DEBUG) Log.d(TAG, "handleCookies: url=" + url + "; cookies=" + (cookies == null ? "null" : cookies));
+        Log.e(TAG, "handleCookies: url=" + url + "; cookies=" + (cookies == null ? "null" : cookies));
         if (cookies == null) return;
 
         addYoutubeCookies(cookies);

From 1bf55c21392090855f2c5e0363e221f92f2827ec Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sat, 1 Feb 2020 18:23:57 +0100
Subject: [PATCH 099/199] Remove left-behind Log

---
 app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index 06094cebd..8abcd2435 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -143,7 +143,6 @@ public class ReCaptchaActivity extends AppCompatActivity {
     private void handleCookies(String url) {
         String cookies = CookieManager.getInstance().getCookie(url);
         if (MainActivity.DEBUG) Log.d(TAG, "handleCookies: url=" + url + "; cookies=" + (cookies == null ? "null" : cookies));
-        Log.e(TAG, "handleCookies: url=" + url + "; cookies=" + (cookies == null ? "null" : cookies));
         if (cookies == null) return;
 
         addYoutubeCookies(cookies);

From 38d193899c66a83bc50c4161ea2740048a830073 Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <i.nedoboy@mail.ru>
Date: Sat, 1 Feb 2020 18:58:03 +0000
Subject: [PATCH 100/199] Translated using Weblate (Russian)

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

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 63d0e7699..787c9842e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -543,4 +543,7 @@
     <string name="clear_download_history">Очистить историю загрузок</string>
     <string name="delete_downloaded_files">Удаление загруженных файлов</string>
     <string name="deleted_downloads">Удалено загрузок: %1$s</string>
+    <string name="permission_display_over_apps">Разрешите отображение поверх приложений</string>
+    <string name="app_language_title">Язык интерфейса</string>
+    <string name="systems_language">Как в системе</string>
 </resources>
\ No newline at end of file

From 7568af408a79b526a489696f767078a7dc3a9bf6 Mon Sep 17 00:00:00 2001
From: chr_56 <chr0056@gmail.com>
Date: Sun, 2 Feb 2020 09:42:56 +0800
Subject: [PATCH 101/199] fix wrong strings in Simplified Chinese

---
 app/src/main/res/values-zh-rCN/strings.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 54f58a5bb..d0405b57d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -38,8 +38,8 @@
     <string name="later">稍后</string>
     <string name="network_error">网络错误</string>
     <plurals name="videos">
-        <item quantity="one">视频</item>
-        <item quantity="other">视频</item>
+        <item quantity="one">%s 个视频</item>
+        <item quantity="other">%s 个视频</item>
     </plurals>
     <string name="disabled">禁用</string>
     <string name="controls_background_title">后台播放</string>
@@ -90,8 +90,8 @@
     <string name="retry">重试</string>
     <string name="storage_permission_denied">存储访问权限已被拒绝</string>
     <plurals name="views">
-        <item quantity="one">%1$s 次观看</item>
-        <item quantity="other">%1$s 次观看</item>
+        <item quantity="one">%s 次观看</item>
+        <item quantity="other">%s 次观看</item>
     </plurals>
     <string name="short_thousand">千</string>
     <string name="short_million">百万</string>
@@ -134,6 +134,7 @@
         <item quantity="other">%s 位订阅者</item>
     </plurals>
     <string name="no_videos">没有视频</string>
+    <string name="videos">视频</string>
     <string name="detail_drag_description">拖动以重新排序</string>
     <string name="create">创建</string>
     <string name="delete_one">仅删除一个</string>
@@ -468,8 +469,8 @@
     <string name="show_comments_title">显示评论</string>
     <string name="show_comments_summary">禁用，以停止显示评论</string>
     <plurals name="comments">
-        <item quantity="one">评论</item>
-        <item quantity="other">评论</item>
+        <item quantity="one">%s 条评论</item>
+        <item quantity="other">%s 条评论</item>
     </plurals>
     <string name="error_unable_to_load_comments">无法加载评论</string>
     <string name="close">关闭</string>

From a117e459b04ba5850993384d484a2574610c8170 Mon Sep 17 00:00:00 2001
From: Xiang Rong Lin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sun, 2 Feb 2020 12:54:43 +0100
Subject: [PATCH 102/199] Use AlertDialog.Builder instead of BookmarkDialog
 class for the same look.

Use "rename" string instead of "save" string.
---
 .../local/bookmark/BookmarkFragment.java      | 30 +++++++-----
 .../newpipe/local/dialog/BookmarkDialog.kt    | 47 -------------------
 app/src/main/res/layout/dialog_bookmark.xml   | 34 --------------
 app/src/main/res/values/strings.xml           |  1 -
 4 files changed, 17 insertions(+), 95 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/local/dialog/BookmarkDialog.kt

diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
index ea9655921..761fa4360 100644
--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -1,9 +1,11 @@
 package org.schabi.newpipe.local.bookmark;
 
 import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.Log;
+import android.widget.EditText;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
@@ -22,7 +24,6 @@ import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
 import org.schabi.newpipe.local.BaseLocalListFragment;
-import org.schabi.newpipe.local.dialog.BookmarkDialog;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.report.UserAction;
@@ -254,20 +255,23 @@ public final class BookmarkFragment
     }
 
     private void showLocalDialog(PlaylistMetadataEntry selectedItem) {
-        BookmarkDialog dialog = new BookmarkDialog(getContext(),
-            selectedItem.name, new BookmarkDialog.OnClickListener() {
-            @Override
-            public void onDeleteClicked() {
+        View dialogView = View.inflate(getContext(), R.layout.dialog_bookmark, null);
+        EditText editText = dialogView.findViewById(R.id.playlist_name_edit_text);
+        editText.setText(selectedItem.name);
+
+        Builder builder = new AlertDialog.Builder(activity);
+        builder.setView(dialogView)
+            .setPositiveButton(R.string.rename_playlist, (dialog, which) -> {
+                changeLocalPlaylistName(selectedItem.uid, editText.getText().toString());
+            })
+            .setNegativeButton(R.string.cancel, null)
+            .setNeutralButton(R.string.delete, (dialog, which) -> {
                 showDeleteDialog(selectedItem.name,
                     localPlaylistManager.deletePlaylist(selectedItem.uid));
-            }
-
-            @Override
-            public void onSaveClicked(@NonNull String name) {
-                changeLocalPlaylistName(selectedItem.uid, name);
-            }
-        });
-        dialog.show();
+                dialog.dismiss();
+            })
+            .create()
+            .show();
     }
 
     private void showDeleteDialog(final String name, final Single<Integer> deleteReactor) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/BookmarkDialog.kt b/app/src/main/java/org/schabi/newpipe/local/dialog/BookmarkDialog.kt
deleted file mode 100644
index dd20e88a0..000000000
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/BookmarkDialog.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.schabi.newpipe.local.dialog
-
-import android.app.Dialog
-import android.content.Context
-import android.os.Bundle
-import android.view.Window
-import android.widget.Button
-import android.widget.EditText
-import org.schabi.newpipe.R
-
-class BookmarkDialog(
-        context: Context,
-        private val playlistName: String,
-        val listener: OnClickListener)
-    : Dialog(context) {
-
-    private lateinit var editText: EditText
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        requestWindowFeature(Window.FEATURE_NO_TITLE)
-        setContentView(R.layout.dialog_bookmark)
-        initListeners()
-    }
-
-    private fun initListeners() {
-        editText = findViewById(R.id.playlist_name_edit_text);
-        editText.setText(playlistName)
-
-        findViewById<Button>(R.id.bookmark_delete).setOnClickListener {
-            listener.onDeleteClicked()
-            dismiss()
-        }
-        findViewById<Button>(R.id.bookmark_cancel).setOnClickListener {
-            dismiss()
-        }
-        findViewById<Button>(R.id.bookmark_save).setOnClickListener {
-            listener.onSaveClicked(editText.text.toString())
-            dismiss()
-        }
-    }
-
-    interface OnClickListener {
-        fun onDeleteClicked()
-        fun onSaveClicked(name: String)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_bookmark.xml b/app/src/main/res/layout/dialog_bookmark.xml
index 798a8f4c8..08bf20610 100644
--- a/app/src/main/res/layout/dialog_bookmark.xml
+++ b/app/src/main/res/layout/dialog_bookmark.xml
@@ -14,38 +14,4 @@
     android:layout_margin="10dp"
     android:hint="@string/playlist_name_input"/>
 
-
-  <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:paddingTop="10dp"
-    android:padding="5dp">
-
-    <Button
-      android:id="@+id/bookmark_delete"
-      style="@style/Widget.AppCompat.Button.Borderless"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_centerVertical="true"
-      android:text="@string/delete" />
-
-    <Button
-      android:id="@+id/bookmark_cancel"
-      style="@style/Widget.AppCompat.Button.Borderless"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_toStartOf="@+id/bookmark_save"
-      android:text="@android:string/cancel" />
-
-    <Button
-      android:id="@+id/bookmark_save"
-      style="@style/Widget.AppCompat.Button.Borderless"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
-      android:text="@string/save" />
-  </RelativeLayout>
-
 </LinearLayout>
\ 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 ef012f56d..763eb7426 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -590,7 +590,6 @@
     <string name="downloads_storage_use_saf_title">Use SAF</string>
     <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
-    <string name="save">save</string>
     <string name="app_language_title">App language</string>
     <string name="systems_language">System default</string>
 </resources>

From 07c7398a96269ba6aba1a255d55c6e4932b22548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Sun, 2 Feb 2020 12:18:24 +0000
Subject: [PATCH 103/199] Translated using Weblate (Turkish)

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

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c6603382d..1e703bb55 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -538,4 +538,7 @@
     <string name="clear_download_history">İndirme geçmişini temizle</string>
     <string name="delete_downloaded_files">İndirilen dosyaları sil</string>
     <string name="deleted_downloads">%1$s indirme silindi</string>
+    <string name="permission_display_over_apps">Diğer uygulamaların üzerinde görüntüleme izni ver</string>
+    <string name="app_language_title">Uygulama dili</string>
+    <string name="systems_language">Sistem varsayılanı</string>
 </resources>
\ No newline at end of file

From 9f0efdd5440a419d62d7d6b611ed36ae023d0642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emin=20Tufan=20=C3=87etin?= <etcetin@gmail.com>
Date: Sun, 2 Feb 2020 12:37:45 +0000
Subject: [PATCH 104/199] Translated using Weblate (Turkish)

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

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1e703bb55..51683299d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -23,14 +23,14 @@
     <string name="download_path_audio_title">Ses indirme dizini</string>
     <string name="download_path_audio_summary">İndirilen ses dosyaları burada depolanır</string>
     <string name="download_path_audio_dialog_title">Ses dosyaları için indirme dizinini seçin</string>
-    <string name="autoplay_by_calling_app_title">Otomatik oynat</string>
-    <string name="autoplay_by_calling_app_summary">NewPipe başka bir uygulamadan çağrıldığında bir video oynatır</string>
-    <string name="default_resolution_title">Varsayılan çözünürlük</string>
+    <string name="autoplay_by_calling_app_title">Kendiliğinden oynat</string>
+    <string name="autoplay_by_calling_app_summary">NewPipe başka uygulamadan çağrıldığında video oynatır</string>
+    <string name="default_resolution_title">Öntanımlı çözünürlük</string>
     <string name="play_with_kodi_title">Kodi ile oynat</string>
     <string name="kore_not_found">Kore uygulaması bulunamadı. Yüklensin mi\?</string>
     <string name="show_play_with_kodi_title">\"Kodi ile oynat\" seçeneğini göster</string>
     <string name="show_play_with_kodi_summary">Kodi ortam merkezi üzerinden video oynatmak için bir seçenek göster</string>
-    <string name="default_audio_format_title">Varsayılan ses formatı</string>
+    <string name="default_audio_format_title">Öntanımlı ses biçimi</string>
     <string name="theme_title">Tema</string>
     <string name="dark_theme_title">Koyu</string>
     <string name="light_theme_title">Açık</string>
@@ -38,7 +38,7 @@
     <string name="next_video_title">Sonraki</string>
     <string name="show_next_and_similar_title">\'Sonraki\' ve \'Benzer\' videoları göster</string>
     <string name="url_not_supported_toast">Desteklenmeyen URL</string>
-    <string name="content_language_title">Varsayılan içerik dili</string>
+    <string name="content_language_title">Öntanımlı içerik dili</string>
     <string name="play_audio">Ses</string>
     <string name="settings_category_video_audio_title">Video ve ses</string>
     <string name="settings_category_appearance_title">Görünüm</string>
@@ -103,14 +103,14 @@
     <string name="msg_copied">Panoya kopyalandı</string>
     <string name="no_available_dir">Lütfen daha sonra ayarlardan uygun bir indirme dizini belirleyin</string>
     <string name="could_not_setup_download_menu">İndirme menüsü ayarlanamadı</string>
-    <string name="open_in_popup_mode">Açılır pencere modunda aç</string>
-    <string name="popup_mode_share_menu_title">NewPipe açılır pencere modu</string>
-    <string name="default_popup_resolution_title">Varsayılan açılır pencere çözünürlüğü</string>
+    <string name="open_in_popup_mode">Açılır pencere kipinde aç</string>
+    <string name="popup_mode_share_menu_title">NewPipe açılır pencere kipi</string>
+    <string name="default_popup_resolution_title">Öntanımlı açılır pencere çözünürlüğü</string>
     <string name="show_higher_resolutions_title">Yüksek çözünürlükleri göster</string>
     <string name="show_higher_resolutions_summary">Sadece bazı cihazlar 2K/4K video oynatmayı desteklemektedir</string>
-    <string name="default_video_format_title">Varsayılan video formatı</string>
+    <string name="default_video_format_title">Öntanımlı video biçimi</string>
     <string name="black_theme_title">Siyah</string>
-    <string name="popup_playing_toast">Açılır pencere modunda oynatılıyor</string>
+    <string name="popup_playing_toast">Açılır pencere kipinde oynatılıyor</string>
     <string name="all">Tümü</string>
     <string name="channel">Kanal</string>
     <string name="yes">Evet</string>
@@ -122,7 +122,7 @@
     <string name="short_thousand">b</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-    <string name="msg_popup_permission">Bu izin, açılır pencere modunda 
+    <string name="msg_popup_permission">Bu izin, açılır pencere kipinde
 \naçmak için gereklidir</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
     <string name="reCaptcha_title">reCAPTCHA formu</string>
@@ -245,7 +245,7 @@
     <string name="give_back">Bağışta bulunun</string>
     <string name="website_title">Web sitesi</string>
     <string name="website_encouragement">Daha çok bilgi ve haber için NewPipe web sitesini ziyaret edin.</string>
-    <string name="default_content_country_title">Varsayılan içerik ülkesi</string>
+    <string name="default_content_country_title">Öntanımlı içerik ülkesi</string>
     <string name="service_title">Hizmet</string>
     <string name="toggle_orientation">Yönlendirmeyi Değiştir</string>
     <string name="switch_to_background">Arka Plana Geç</string>
@@ -340,7 +340,7 @@
 \n3. İndirme başlamalı (bu, dışa aktarma dosyasıdır)</string>
     <string name="import_soundcloud_instructions">URL\'yi veya ID\'nizi yazarak SoundCloud profilini içe aktarın: 
 \n 
-\n1. Web tarayıcısında \"masaüstü modu\" etkinleştirin (site, mobil aygıtlar için mevcut değildir) 
+\n1. Web tarayıcısında \"masaüstü kipi\" etkinleştirin (site, mobil aygıtlar için uygun değildir) 
 \n2. Şu adrese gidin: %1$s 
 \n3. Sorulduğunda giriş yapın 
 \n4. Yönlendirildiğiniz profil URL\'sini kopyalayın.</string>
@@ -361,7 +361,7 @@
     <string name="unhook_checkbox">Bağlantısız (bozulmaya neden olabilir)</string>
     <string name="no_streams_available_download">İndirilebilecek akış yok</string>
     <string name="preferred_open_action_settings_title">Tercih edilen \'aç\' eylemi</string>
-    <string name="preferred_open_action_settings_summary">İçerik açılırken varsayılan eylem — %s</string>
+    <string name="preferred_open_action_settings_summary">İçerik açılırken öntanımlı eylem — %s</string>
     <string name="caption_setting_title">Altyazılar</string>
     <string name="caption_setting_description">Oynatıcı altyazı metin ölçeğini ve arka plan biçimini değiştirin. Etkili olması için uygulamayı yeniden başlatma gerektirir.</string>
     <string name="toast_no_player">Bu dosyayı oynatmak için herhangi bir uygulama yüklü değil</string>
@@ -411,15 +411,15 @@
     <string name="app_update_notification_channel_description">Yeni NewPipe sürümü için bildirimler</string>
     <string name="download_to_sdcard_error_title">Harici depolama kullanılamıyor</string>
     <string name="download_to_sdcard_error_message">Harici SD karta indirmek mümkün değil. İndirme dizini konumu sıfırlansın mı\?</string>
-    <string name="saved_tabs_invalid_json">Varsayılan sekmeleri kullanarak, kaydedilen sekmeleri okurken hata</string>
-    <string name="restore_defaults">Varsayılanları geri yükle</string>
-    <string name="restore_defaults_confirmation">Varsayılanları geri yüklemek istiyor musunuz\?</string>
+    <string name="saved_tabs_invalid_json">Öntanımlı sekmeler kullanılıyor, kaydedilen sekmeler okunurken hata</string>
+    <string name="restore_defaults">Öntanımlıları geri yükle</string>
+    <string name="restore_defaults_confirmation">Öntanımlıları geri yüklemek istiyor musunuz\?</string>
     <string name="subscribers_count_not_available">Abone sayısı mevcut değil</string>
     <string name="main_page_content_summary">Ana sayfada hangi sekmeler gösterilir</string>
     <string name="selection">Seçim</string>
     <string name="updates_setting_title">Güncellemeler</string>
     <string name="updates_setting_description">Yeni bir sürüm mevcut olduğunda uygulama güncellemesi için bir bildirim göster</string>
-    <string name="list_view_mode">Liste görünümü modu</string>
+    <string name="list_view_mode">Liste görünümü kipi</string>
     <string name="list">Liste</string>
     <string name="grid">Izgara</string>
     <string name="auto">Otomatik</string>
@@ -505,7 +505,7 @@
         <item quantity="one">Videolar</item>
         <item quantity="other">Videolar</item>
     </plurals>
-    <string name="default_kiosk_page_summary">Varsayılan Kiosk</string>
+    <string name="default_kiosk_page_summary">Öntanımlı Kiosk</string>
     <string name="no_one_watching">Kimse izlemiyor</string>
     <plurals name="watching">
         <item quantity="one">%s izliyor</item>

From 6da90961762b92a2d9cae90e4b5879fdf481ce5a Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sun, 2 Feb 2020 21:33:07 +0100
Subject: [PATCH 105/199] Fix addYoutubeCookies functions (Yt changed things
 lately)

---
 .../org/schabi/newpipe/ReCaptchaActivity.java | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index 8abcd2435..566e1fc76 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -150,28 +150,17 @@ public class ReCaptchaActivity extends AppCompatActivity {
     }
 
     private void addYoutubeCookies(@Nonnull String cookies) {
-        String c_s_gl = "";
-        String c_goojf = "";
-
-        String[] parts = cookies.split(";");
-        for (String part : parts) {
-            String trimmedPart = part.trim();
-            if (trimmedPart.startsWith("s_gl")) {
-                c_s_gl = trimmedPart;
-            }
-            if (trimmedPart.startsWith("goojf")) {
-                c_goojf = trimmedPart;
-            }
-        }
-        if (c_s_gl.length() > 0 && c_goojf.length() > 0) {
-            // addCookie(c_s_gl);
-            // addCookie(c_goojf);
+        if (cookies.contains("s_gl=") || cookies.contains("goojf=") || cookies.contains("VISITOR_INFO1_LIVE=")) {
             // Youtube seems to also need the other cookies:
             addCookie(cookies);
         }
     }
 
     private void addCookie(String cookie) {
+        if (foundCookies.contains(cookie)) {
+            return;
+        }
+
         if (foundCookies.isEmpty() || foundCookies.endsWith("; ")) {
             foundCookies += cookie;
         } else if (foundCookies.endsWith(";")) {

From b6841158df60b066a0b53fe80f4a780d822c227a Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sun, 2 Feb 2020 21:48:45 +0100
Subject: [PATCH 106/199] Remove unused imports and clean up comment style

---
 .../java/org/schabi/newpipe/ReCaptchaActivity.java   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index 566e1fc76..d72f729b5 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -1,7 +1,6 @@
 package org.schabi.newpipe;
 
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.core.app.NavUtils;
@@ -20,7 +19,6 @@ import android.webkit.WebViewClient;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /*
  * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
@@ -63,13 +61,13 @@ public class ReCaptchaActivity extends AppCompatActivity {
             url = YT_URL;
         }
 
-        // Set return to Cancel by default
+        // set return to Cancel by default
         setResult(RESULT_CANCELED);
 
 
         webView = findViewById(R.id.reCaptchaWebView);
 
-        // Enable Javascript
+        // enable Javascript
         WebSettings webSettings = webView.getSettings();
         webSettings.setJavaScriptEnabled(true);
 
@@ -81,7 +79,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
             }
         });
 
-        // Cleaning cache, history and cookies from webView
+        // cleaning cache, history and cookies from webView
         webView.clearCache(true);
         webView.clearHistory();
         android.webkit.CookieManager cookieManager = CookieManager.getInstance();
@@ -128,7 +126,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
     private void saveCookiesAndFinish() {
         handleCookies(webView.getUrl()); // try to get cookies of unclosed page
         if (!foundCookies.isEmpty()) {
-            // Give cookies to Downloader class
+            // give cookies to Downloader class
             DownloaderImpl.getInstance().setCookies(foundCookies);
             setResult(RESULT_OK);
         }
@@ -151,7 +149,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
 
     private void addYoutubeCookies(@Nonnull String cookies) {
         if (cookies.contains("s_gl=") || cookies.contains("goojf=") || cookies.contains("VISITOR_INFO1_LIVE=")) {
-            // Youtube seems to also need the other cookies:
+            // youtube seems to also need the other cookies:
             addCookie(cookies);
         }
     }

From 46c1155c6451e0c4797ca1cafa815765bcc94282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emin=20Tufan=20=C3=87etin?= <etcetin@gmail.com>
Date: Sun, 2 Feb 2020 12:43:18 +0000
Subject: [PATCH 107/199] Translated using Weblate (Turkish)

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

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 51683299d..35168b592 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -107,7 +107,7 @@
     <string name="popup_mode_share_menu_title">NewPipe açılır pencere kipi</string>
     <string name="default_popup_resolution_title">Öntanımlı açılır pencere çözünürlüğü</string>
     <string name="show_higher_resolutions_title">Yüksek çözünürlükleri göster</string>
-    <string name="show_higher_resolutions_summary">Sadece bazı cihazlar 2K/4K video oynatmayı desteklemektedir</string>
+    <string name="show_higher_resolutions_summary">Yalnızca bazı aygıtlar 2K/4K video oynatmayı desteklemektedir</string>
     <string name="default_video_format_title">Öntanımlı video biçimi</string>
     <string name="black_theme_title">Siyah</string>
     <string name="popup_playing_toast">Açılır pencere kipinde oynatılıyor</string>
@@ -360,7 +360,7 @@
     <string name="playback_pitch">Ses yüksekliği</string>
     <string name="unhook_checkbox">Bağlantısız (bozulmaya neden olabilir)</string>
     <string name="no_streams_available_download">İndirilebilecek akış yok</string>
-    <string name="preferred_open_action_settings_title">Tercih edilen \'aç\' eylemi</string>
+    <string name="preferred_open_action_settings_title">Yeğlenen \'aç\' eylemi</string>
     <string name="preferred_open_action_settings_summary">İçerik açılırken öntanımlı eylem — %s</string>
     <string name="caption_setting_title">Altyazılar</string>
     <string name="caption_setting_description">Oynatıcı altyazı metin ölçeğini ve arka plan biçimini değiştirin. Etkili olması için uygulamayı yeniden başlatma gerektirir.</string>
@@ -454,7 +454,7 @@
     <string name="clear_finished_download">Tamamlanan indirmeleri temizle</string>
     <string name="stop">Durdur</string>
     <string name="max_retry_msg">Azami deneme sayısı</string>
-    <string name="max_retry_desc">İndirmeyi iptal etmeden önce maksimum deneme sayısı</string>
+    <string name="max_retry_desc">İndirmeyi iptal etmeden önce azami deneme sayısı</string>
     <string name="pause_downloads_on_mobile">Kotalı bağlantılarda durdur</string>
     <string name="pause_downloads_on_mobile_desc">Bazı indirmelerin bekletilememesine rağmen mobil veriye geçerken kullanışlıdır</string>
     <string name="events">Olaylar</string>
@@ -490,12 +490,12 @@
     <string name="start_downloads">İndirmeleri başlat</string>
     <string name="pause_downloads">İndirmeleri duraklat</string>
     <string name="downloads_storage_ask_title">Nereye indirileceğini sor</string>
-    <string name="downloads_storage_ask_summary">Her indirme için nereye kaydedileceği sorulacak</string>
+    <string name="downloads_storage_ask_summary">Her indirmede nereye kaydedileceği sorulacak</string>
     <string name="downloads_storage_ask_summary_kitkat">Her indirme için nereye kaydedileceği sorulacak. 
-\nEğer bir harici SD karta indirmek istiyorsanız DEÇ\'i seçin</string>
+\nEğer harici SD karta indirmek istiyorsanız DEÇ\'i seçin</string>
     <string name="downloads_storage_use_saf_title">DEÇ\'i kullan</string>
     <string name="downloads_storage_use_saf_summary">Depolama Erişimi Çerçevesi harici SD karta indirmelere izin verir. 
-\nNot: Bazı cihazlar uyumlu değildir</string>
+\nNot: Bazı aygıtlar uyumlu değildir</string>
     <string name="clear_playback_states_title">Oynatım konumlarını sil</string>
     <string name="clear_playback_states_summary">Tüm oynatım konumlarını siler</string>
     <string name="delete_playback_states_alert">Tüm oynatım konumları silinsin mi\?</string>
@@ -532,7 +532,7 @@
     <string name="playlist_no_uploader">Otomatik oluşturulan (yükleyen bulunamadı)</string>
     <string name="recovering">kurtarılıyor</string>
     <string name="error_download_resource_gone">Bu indirme kurtarılamıyor</string>
-    <string name="choose_instance_prompt">Bir örnek seçin</string>
+    <string name="choose_instance_prompt">Oluşum seçin</string>
     <string name="enable_lock_screen_video_thumbnail_title">Kilit ekranı video küçük resmini etkinleştir</string>
     <string name="enable_lock_screen_video_thumbnail_summary">Arka plan oynatıcıyı kullanırken kilit ekranında bir video küçük resmi görüntülenecektir</string>
     <string name="clear_download_history">İndirme geçmişini temizle</string>
@@ -540,5 +540,5 @@
     <string name="deleted_downloads">%1$s indirme silindi</string>
     <string name="permission_display_over_apps">Diğer uygulamaların üzerinde görüntüleme izni ver</string>
     <string name="app_language_title">Uygulama dili</string>
-    <string name="systems_language">Sistem varsayılanı</string>
+    <string name="systems_language">Sistem öntanımlısı</string>
 </resources>
\ No newline at end of file

From 2c27f784f70c51128daa02879c12fde2b5939d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Mon, 3 Feb 2020 16:16:03 +0000
Subject: [PATCH 108/199] Translated using Weblate (Turkish)

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

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 35168b592..7f6a9a8e2 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -502,8 +502,8 @@
     <string name="download_choose_new_path">Etkili olması için indirme dizinlerini değiştirin</string>
     <string name="drawer_header_description">Hizmeti değiştir, şu anda seçili olan:</string>
     <plurals name="videos">
-        <item quantity="one">Videolar</item>
-        <item quantity="other">Videolar</item>
+        <item quantity="one">%s video</item>
+        <item quantity="other">%s video</item>
     </plurals>
     <string name="default_kiosk_page_summary">Öntanımlı Kiosk</string>
     <string name="no_one_watching">Kimse izlemiyor</string>

From b5684ee7df6125829163df7f33e1e1c5c6b14a16 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Sun, 2 Feb 2020 19:14:55 +0000
Subject: [PATCH 109/199] Translated using Weblate (Esperanto)

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

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index fe63caf1b..206f7bdd7 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -537,4 +537,7 @@
     <string name="clear_download_history">Forviŝi la historion de elŝutoj</string>
     <string name="delete_downloaded_files">Forviŝi elŝutitajn dosierojn</string>
     <string name="deleted_downloads">%1$s elŝutoj forviŝitaj</string>
+    <string name="permission_display_over_apps">Doni la permeson por afiŝiĝi supre aliaj apoj</string>
+    <string name="app_language_title">Lingvo de la apo</string>
+    <string name="systems_language">Sistema lingvo</string>
 </resources>
\ No newline at end of file

From bb8bcf3c33ac35da176c0ec29a557af881d0adf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20=C5=A0amla?= <auzkok@seznam.cz>
Date: Sun, 2 Feb 2020 23:39:08 +0000
Subject: [PATCH 110/199] Translated using Weblate (Czech)

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

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 548358473..200d18dc2 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -547,4 +547,7 @@ otevření ve vyskakovacím okně</string>
     <string name="clear_download_history">Smazat historii stahování</string>
     <string name="delete_downloaded_files">Smazat stažené soubory</string>
     <string name="deleted_downloads">Smazat %1$s stahování</string>
+    <string name="permission_display_over_apps">Souhlasit se zobrazením přes jiné aplikace</string>
+    <string name="app_language_title">Jazyk aplikace</string>
+    <string name="systems_language">Jazyk systému</string>
 </resources>
\ No newline at end of file

From ed9c85b25a49802365451541ad61eb454037b5c3 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat, 1 Feb 2020 20:09:10 +0000
Subject: [PATCH 111/199] Translated using Weblate (Hebrew)

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

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 7a1338f60..b27e37fe4 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -167,10 +167,10 @@
     </plurals>
     <string name="no_videos">אין סרטונים</string>
     <plurals name="videos">
-        <item quantity="one">סרטון %s</item>
-        <item quantity="two">%s סרטונים</item>
-        <item quantity="many">%s סרטונים</item>
-        <item quantity="other">%s סרטונים</item>
+        <item quantity="one">סרטון</item>
+        <item quantity="two">סרטונים</item>
+        <item quantity="many">סרטונים</item>
+        <item quantity="other">סרטונים</item>
     </plurals>
     <string name="start">התחלה</string>
     <string name="pause">השהיה</string>
@@ -550,4 +550,7 @@
     <string name="clear_download_history">מחיקת היסטוריית ההורדות</string>
     <string name="delete_downloaded_files">למחוק את הקבצים שהורדתי</string>
     <string name="deleted_downloads">נמחקו %1$s הורדות</string>
+    <string name="permission_display_over_apps">יש להעניק הרשאה להציג על גבי יישומונים אחרים</string>
+    <string name="app_language_title">שפת היישומון</string>
+    <string name="systems_language">בררת המחדל של המערכת</string>
 </resources>
\ No newline at end of file

From 2cceb048e3672189cad616a6eaaa8b5e89162cf3 Mon Sep 17 00:00:00 2001
From: WaldiS <admin@sto.ugu.pl>
Date: Sat, 1 Feb 2020 17:18:57 +0000
Subject: [PATCH 112/199] Translated using Weblate (Polish)

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

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4d2b38b5f..ed6ba75d7 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -544,4 +544,7 @@
     <string name="clear_download_history">Wyczyść historię pobierania</string>
     <string name="delete_downloaded_files">Usuń pobrane pliki</string>
     <string name="deleted_downloads">Usunięte %1$s pobrania</string>
+    <string name="permission_display_over_apps">Zezwól na wyświetlanie w innych aplikacjach</string>
+    <string name="app_language_title">Język aplikacji</string>
+    <string name="systems_language">Domyślny systemu</string>
 </resources>
\ No newline at end of file

From 5d5c2ae2ed4d29048123689d8ae55083d095db26 Mon Sep 17 00:00:00 2001
From: JoC <jo_91_lp@hotmail.com>
Date: Mon, 3 Feb 2020 15:53:51 +0000
Subject: [PATCH 113/199] Translated using Weblate (Spanish)

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

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5b3265cd7..7de8cc5ca 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -537,4 +537,7 @@
     <string name="clear_download_history">Limpiar historial de descargas</string>
     <string name="delete_downloaded_files">Eliminar archivos descargados</string>
     <string name="deleted_downloads">Eliminadas %1$s descargas</string>
+    <string name="permission_display_over_apps">Dar permisos para que se muestre por sobre otras apps</string>
+    <string name="app_language_title">Idioma de la app</string>
+    <string name="systems_language">Predeterminado del sistema</string>
 </resources>
\ No newline at end of file

From 0a2374892ce8f97ad1eea73ce72c66cd8d24fd4a Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Sun, 2 Feb 2020 19:16:50 +0000
Subject: [PATCH 114/199] Translated using Weblate (French)

Currently translated at 100.0% (530 of 530 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 5f9dc0b18..b0c83592f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -538,4 +538,7 @@
     <string name="clear_download_history">Effacer l\'historique de téléchargement</string>
     <string name="delete_downloaded_files">Supprimer les fichiers téléchargés</string>
     <string name="deleted_downloads">%1$s téléchargements supprimés</string>
+    <string name="permission_display_over_apps">Autoriser la superposition d\'applis</string>
+    <string name="app_language_title">Langue de l\'application</string>
+    <string name="systems_language">Langue du système</string>
 </resources>
\ No newline at end of file

From 9560cf59bed360738e4c988b839367dcf6fdc072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isak=20Holmstr=C3=B6m?= <isak@kajko.se>
Date: Mon, 3 Feb 2020 15:24:26 +0000
Subject: [PATCH 115/199] Translated using Weblate (Swedish)

Currently translated at 87.9% (466 of 530 strings)
---
 app/src/main/res/values-sv/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 90e976823..b2e7ac050 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -467,4 +467,5 @@
     <string name="settings_category_clear_data_title">Töm data</string>
     <string name="seek_duration_title">Snabb spola -framåt/-bakåt</string>
     <string name="enable_lock_screen_video_thumbnail_title">Aktivera video på låsskärmen</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">När bakgrundsspelaren används så visas videon på låsskärmen</string>
 </resources>
\ No newline at end of file

From 6941917c7556b7e45bab0ab5c90da20cdce55021 Mon Sep 17 00:00:00 2001
From: Marian Hanzel <marulinko@gmail.com>
Date: Sun, 2 Feb 2020 17:14:37 +0000
Subject: [PATCH 116/199] Translated using Weblate (Slovak)

Currently translated at 98.5% (522 of 530 strings)
---
 app/src/main/res/values-sk/strings.xml | 97 ++++++++++++++++++--------
 1 file changed, 67 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6624f7a3b..5a453370a 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -17,11 +17,11 @@
     <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_summary">Tu sú uložené stiahnuté video súbory</string>
+    <string name="download_path_dialog_title">Vyberte adresár pre ukladanie video súborov</string>
+    <string name="download_path_audio_title">Adresár pre stiahnuté audio</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="download_path_audio_summary">Tu sú uložené stiahnuté audio súbory</string>
     <string name="default_resolution_title">Štandardné rozlíšenie</string>
     <string name="play_with_kodi_title">Prehrať cez Kodi</string>
     <string name="kore_not_found">Aplikácia Kore nie je nainštalovaná. Chcete ju nainštalovať?</string>
@@ -49,7 +49,7 @@
     <string name="parsing_error">Nemožno analyzovať webovú stránku</string>
     <string name="content_not_available">Obsah nie je dostupný</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_thumbnail_view_description">Prehrať video, dĺžka:</string>
     <string name="detail_uploader_thumbnail_view_description">Náhľad avataru uploadera</string>
     <string name="detail_likes_img_view_description">Lajky</string>
     <string name="detail_dislikes_img_view_description">Dislajky</string>
@@ -66,7 +66,7 @@
     <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>
+    <string name="live_streams_not_supported">Živé vysielanie zatiaľ nie je podporované</string>
     <string name="could_not_get_stream">Nemožno získať žiadny stream</string>
     <string name="sorry_string">Pardon, toto sa nemalo stať.</string>
     <string name="error_report_button_text">Nahlásiť chybu mejlom</string>
@@ -99,7 +99,7 @@
     <string name="msg_running_detail">Dotykom zobraziť detaily</string>
     <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="no_available_dir">Priečinok na sťahovanie zadefinujte prosím neskôr v nastaveniach</string>
     <string name="downloads">Prevzaté</string>
     <string name="downloads_title">Prevzaté</string>
     <string name="error_report_title">Hlásenie o chybe</string>
@@ -111,7 +111,7 @@
     <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_thousand">k</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
     <string name="recaptcha_request_toast">Požiadavka reCAPTCHA</string>
@@ -183,7 +183,7 @@
     <string name="title_activity_history">História</string>
     <string name="title_history_search">Vyhľadávané</string>
     <string name="title_history_view">Pozreté</string>
-    <string name="history_disabled">História je zakázaná</string>
+    <string name="history_disabled">História je vypnutá</string>
     <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>
@@ -213,7 +213,7 @@
         <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="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">Uložené zoznamy</string>
@@ -266,7 +266,7 @@
     <string name="feed_page_summary">Novinky</string>
     <string name="channel_page_summary">Kanál</string>
     <string name="select_a_channel">Vyberte si kanál</string>
-    <string name="no_channel_subscribed_yet">Žiadny kanál nie je odoberaný</string>
+    <string name="no_channel_subscribed_yet">Zatiaľ nemáte žiadne odbery kanálov</string>
     <string name="select_a_kiosk">Vyberte si kiosk</string>
     <string name="export_complete_toast">Export je dokončený</string>
     <string name="import_complete_toast">Import je dokončený</string>
@@ -285,9 +285,9 @@
     <string name="hold_to_append">Podržaním pridať do zoznamu</string>
     <string name="enqueue_on_background">Zaradiť na pozadie</string>
     <string name="enqueue_on_popup">Zaradiť do mini okna</string>
-    <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="start_here_on_main">Prehrať odtiaľto</string>
+    <string name="start_here_on_background">Prehrať (zvuk) odtiaľto na pozadí</string>
+    <string name="start_here_on_popup">Prehrať odtiaľto v mini-okne</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>
@@ -296,7 +296,7 @@
     <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="create_playlist">Nový zoznam skladieb</string>
     <string name="delete_playlist">Vymazať</string>
     <string name="rename_playlist">Premenovať</string>
     <string name="playlist_name_input">Názov</string>
@@ -304,11 +304,11 @@
     <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="delete_playlist_prompt">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="playlist_add_stream_success">V playliste</string>
+    <string name="playlist_thumbnail_change_success">Miniatúra zoznamu skladieb bola zmenená.</string>
+    <string name="playlist_delete_failure">Zoznam skladieb nemožno zmazať.</string>
     <string name="caption_none">Bez titulkov</string>
     <string name="resize_fit">Prispôsobiť</string>
     <string name="resize_fill">Vyplniť</string>
@@ -316,7 +316,7 @@
     <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>
+    <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>
     <string name="thumbnail_cache_wipe_complete_notice">Vyrovnávacia pamäť obrázkov vymazaná</string>
     <string name="metadata_cache_wipe_title">Vymazať metadáta uložené vo vyrovnávacej pamäti</string>
     <string name="metadata_cache_wipe_summary">Odstrániť všetky údaje webových stránok vo vyrovnávacej pamäti</string>
@@ -337,12 +337,12 @@
     <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="caption_setting_description">Upravte mierku textu titulkov prehrávača a štýly pozadia. Vyžaduje sa reštart aplikácie.</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</string>
+    <string name="import_export_title">Import/export</string>
     <string name="import_title">Import
 \n</string>
     <string name="import_from">Importovať z
@@ -376,12 +376,12 @@
     <string name="unhook_checkbox">"Spomalenie  (môže spôsobovať skreslenie)"</string>
     <string name="playback_default">Predvolené</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="clear_views_history_summary">Odstráni históriu a pozície prehrávaných streamov</string>
+    <string name="delete_view_history_alert">Vymazať celú históriu pozretí\?</string>
     <string name="watch_history_deleted">História pozretí bola vymazaná.</string>
     <string name="clear_search_history_title">Vymazať históriu vyhľadávania</string>
     <string name="clear_search_history_summary">Vymaže históriu vyhľadávania kľúčových slov</string>
-    <string name="delete_search_history_alert">Vymazať celú históriu vyhľadávania.</string>
+    <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>
@@ -420,7 +420,7 @@
     <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="download_to_sdcard_error_message">Sťahovanie na externú SD kartu nie je možné. Obnoviť umiestnenie priečinka na sťahovanie\?</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>
@@ -454,8 +454,8 @@
     <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_path_creation">Adresár nemožno vytvoriť</string>
+    <string name="error_file_creation">Nemožno vytvoriť súbor</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>
@@ -469,7 +469,7 @@
     <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>
+    <string name="pause_downloads_on_mobile_desc">Je to užitočné pri prechode na mobilné dáta, niektoré sťahovania však nemožno pozastaviť</string>
     <string name="show_comments_title">Zobraziť komentáre</string>
     <string name="show_comments_summary">Vypnutím tejto funkcie sa nebudú zobrazovať komentáre</string>
     <string name="autoplay_title">Automatické prehrávanie</string>
@@ -494,7 +494,7 @@
     <string name="error_insufficient_storage">Máš plnú pamäť</string>
     <string name="error_progress_lost">Nemožno pokračovať, súbor bol vymazaný</string>
     <string name="error_timeout">Spojenie vypršalo</string>
-    <string name="confirm_prompt">Ste si istý\?</string>
+    <string name="confirm_prompt">Chcete vymazať históriu sťahovania alebo odstrániť všetky stiahnuté súbory\?</string>
     <string name="enable_queue_limit">Limitovať počet položiek pri sťahovaní</string>
     <string name="enable_queue_limit_desc">Súbory sa budú sťahovať jeden po druhom</string>
     <string name="start_downloads">Spustite sťahovanie</string>
@@ -512,4 +512,41 @@
     <string name="download_choose_new_path">Zmeniť miesto pre stiahnuté súbory</string>
     <string name="drawer_header_description">Prepnúť službu, práve vybraté:</string>
     <string name="default_kiosk_page_summary">Predvolený kiosk</string>
+    <string name="no_one_watching">Toto nikto nesleduje</string>
+    <plurals name="watching">
+        <item quantity="one">%s sleduje</item>
+        <item quantity="few">%s sledujú</item>
+        <item quantity="other">%s sleduje</item>
+    </plurals>
+    <string name="no_one_listening">Toto nikto nepočúva</string>
+    <plurals name="listening">
+        <item quantity="one">%s poslucháč</item>
+        <item quantity="few">%s poslucháči</item>
+        <item quantity="other">%s poslucháčov</item>
+    </plurals>
+    <string name="localization_changes_requires_app_restart">Zmena jazyka sa prejaví po reštarte aplikácie.</string>
+    <string name="seek_duration_title">Dĺžka rýchleho pretáčania</string>
+    <string name="peertube_instance_url_title">Inštancie PeerTube</string>
+    <string name="peertube_instance_url_summary">Vyberte si svoje obľúbené inštancie PeerTube</string>
+    <string name="peertube_instance_url_help">Nájdite najvyhovujúcejšie inštancie na %s</string>
+    <string name="peertube_instance_add_title">Pridať inštanciu</string>
+    <string name="peertube_instance_add_help">Vložiť URL inštancie</string>
+    <string name="peertube_instance_add_fail">Nepodarilo sa overiť inštanciu</string>
+    <string name="peertube_instance_add_https_only">Podporované sú iba adresy URL s HTTPS</string>
+    <string name="peertube_instance_add_exists">Inštancia už existuje</string>
+    <string name="local">Miestne</string>
+    <string name="recently_added">Nedávno pridané</string>
+    <string name="most_liked">Najobľúbenejšie</string>
+    <string name="playlist_no_uploader">Automaticky generované (používateľ sa nenašiel)</string>
+    <string name="recovering">obnovovanie</string>
+    <string name="error_download_resource_gone">Sťahovanie nemožno obnoviť</string>
+    <string name="choose_instance_prompt">Vyberte inštanciu</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Náhľad videa na uzamknutej obrazovke</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Pri videu na pozadí sa na zamknutej obrazovke zobrazí náhľad</string>
+    <string name="clear_download_history">Vymazať históriu sťahovania</string>
+    <string name="delete_downloaded_files">Vymazať stiahnuté súbory</string>
+    <string name="deleted_downloads">%1$s odstránených</string>
+    <string name="permission_display_over_apps">Súhlas pre zobrazenie cez ďalšie aplikácie</string>
+    <string name="app_language_title">Jazyk aplikácie</string>
+    <string name="systems_language">Predvolený</string>
 </resources>
\ No newline at end of file

From 7009dc574f71010656b65f92640e89ebfd961b86 Mon Sep 17 00:00:00 2001
From: MohammedSR Vevo <mohammednajmidin@gmail.com>
Date: Sat, 1 Feb 2020 20:16:45 +0000
Subject: [PATCH 117/199] Translated using Weblate (Kurdish)

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

diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 9a061bab7..91561066d 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -541,4 +541,7 @@
     <string name="clear_download_history">سڕینەوەی مێژووی داگرتن</string>
     <string name="delete_downloaded_files">سڕینەوەی فایلە داگیراوەکان</string>
     <string name="deleted_downloads">%1$ لە داگرتنەکان سڕانەوە</string>
+    <string name="permission_display_over_apps">دەسەڵاتی پێبدە بۆ پیشاندان لەسەرووی ئەپەکانیترەوە</string>
+    <string name="app_language_title">زمانی ئەپ</string>
+    <string name="systems_language">بنەڕەتی سیستەم</string>
 </resources>
\ No newline at end of file

From 0f0a367174e0efba36ddf28ae9b7c6fdc2e4d413 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sun, 2 Feb 2020 03:39:50 +0000
Subject: [PATCH 118/199] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (530 of 530 strings)
---
 app/src/main/res/values-zh-rTW/strings.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b82736f90..438d4cc45 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -498,8 +498,8 @@
     <string name="download_choose_new_path">變更下載資料夾以使其生效</string>
     <string name="drawer_header_description">切換服務，目前已選取：</string>
     <plurals name="videos">
-        <item quantity="one">影片</item>
-        <item quantity="other"/>
+        <item quantity="one">%s 影片</item>
+        <item quantity="other"></item>
     </plurals>
     <string name="default_kiosk_page_summary">預設 Kiosk</string>
     <string name="no_one_watching">沒有人在看</string>
@@ -534,4 +534,7 @@
     <string name="clear_download_history">清除下載歷史紀錄</string>
     <string name="delete_downloaded_files">刪除已下載的檔案</string>
     <string name="deleted_downloads">已刪除 %1$s 個下載</string>
+    <string name="permission_display_over_apps">給予顯示在其他應用程式上層的權限</string>
+    <string name="app_language_title">應用程式語言</string>
+    <string name="systems_language">系統預設值</string>
 </resources>
\ No newline at end of file

From af411a61ae62b37565117957fdecdfdbc855b07d Mon Sep 17 00:00:00 2001
From: Harshal Lele <harshallele97@gmail.com>
Date: Tue, 4 Feb 2020 16:40:57 +0530
Subject: [PATCH 119/199] added ability to copy comments on long press

---
 .../holder/CommentsMiniInfoItemHolder.java    | 29 ++++++++++++++++++-
 app/src/main/res/values/settings_keys.xml     |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/xml/content_settings.xml     |  6 ++++
 4 files changed, 36 insertions(+), 1 deletion(-)

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 4d94ec392..4b1d1bdae 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,9 +1,16 @@
 package org.schabi.newpipe.info_list.holder;
 
-import androidx.appcompat.app.AppCompatActivity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.preference.PreferenceManager;
 import android.text.util.Linkify;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.jsoup.helper.StringUtil;
 import org.schabi.newpipe.R;
@@ -120,6 +127,26 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
                 itemBuilder.getOnCommentsSelectedListener().selected(item);
             }
         });
+
+        boolean copyCommentOnLongPress = PreferenceManager.getDefaultSharedPreferences(
+                                        itemBuilder.getContext()).getBoolean(itemBuilder.getContext().getString(R.string.copy_comment_long_press),
+                                        false);
+
+        if(copyCommentOnLongPress){
+
+            itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View view) {
+
+                    ClipboardManager clipboardManager = (ClipboardManager) itemBuilder.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                    clipboardManager.setPrimaryClip(ClipData.newPlainText(null,itemContentView.getText()));
+                    Toast.makeText(itemBuilder.getContext(), R.string.msg_copied, Toast.LENGTH_SHORT).show();
+                    return true;
+
+                }
+            });
+
+        }
     }
 
     private void ellipsize() {
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 1a7d61dae..90edd0ef8 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -159,6 +159,7 @@
     <string name="show_play_with_kodi_key" translatable="false">show_play_with_kodi</string>
     <string name="show_next_video_key" translatable="false">show_next_video</string>
     <string name="show_comments_key" translatable="false">show_comments</string>
+    <string name="copy_comment_long_press" translatable="false">copy_comment_long_press</string>
     <string name="stream_info_selected_tab_key" translatable="false">stream_info_selected_tab</string>
     <string name="show_hold_to_append_key" translatable="false">show_hold_to_append</string>
     <string name="default_language_value">en</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dab9bde10..ca5a7527f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,6 +76,7 @@
     <string name="download_thumbnail_title">Load thumbnails</string>
     <string name="show_comments_title">Show comments</string>
     <string name="show_comments_summary">Disable to stop showing comments</string>
+    <string name="copy_comment_long_press_title">Copy comment on long press</string>
     <string name="download_thumbnail_summary">Turn off to prevent loading thumbnails, saving data and memory usage. Changes clear both in-memory and on-disk image cache.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Image cache wiped</string>
     <string name="metadata_cache_wipe_title">Wipe cached metadata</string>
diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml
index 197c14487..d1080bb4d 100644
--- a/app/src/main/res/xml/content_settings.xml
+++ b/app/src/main/res/xml/content_settings.xml
@@ -65,6 +65,12 @@
         android:title="@string/show_comments_title"
         android:summary="@string/show_comments_summary"/>
 
+    <SwitchPreference
+        app:iconSpaceReserved="false"
+        android:defaultValue="false"
+        android:key="@string/copy_comment_long_press"
+        android:title="@string/copy_comment_long_press_title"/>
+
     <Preference
         app:iconSpaceReserved="false"
         android:summary="@string/import_data_summary"

From bc393e6bcd733d29b4724e35e2a1821677738780 Mon Sep 17 00:00:00 2001
From: Harshal Lele <harshallele97@gmail.com>
Date: Tue, 4 Feb 2020 18:01:39 +0530
Subject: [PATCH 120/199] removed settings entry

---
 .../holder/CommentsMiniInfoItemHolder.java    | 26 +++++++------------
 app/src/main/res/values/settings_keys.xml     |  1 -
 app/src/main/res/values/strings.xml           |  1 -
 app/src/main/res/xml/content_settings.xml     |  5 ----
 4 files changed, 10 insertions(+), 23 deletions(-)

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 4b1d1bdae..592378dc0 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
@@ -3,7 +3,6 @@ package org.schabi.newpipe.info_list.holder;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.preference.PreferenceManager;
 import android.text.util.Linkify;
 import android.view.View;
 import android.view.ViewGroup;
@@ -128,25 +127,20 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
             }
         });
 
-        boolean copyCommentOnLongPress = PreferenceManager.getDefaultSharedPreferences(
-                                        itemBuilder.getContext()).getBoolean(itemBuilder.getContext().getString(R.string.copy_comment_long_press),
-                                        false);
 
-        if(copyCommentOnLongPress){
+        itemView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View view) {
 
-            itemView.setOnLongClickListener(new View.OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View view) {
+                ClipboardManager clipboardManager = (ClipboardManager) itemBuilder.getContext()
+                                                    .getSystemService(Context.CLIPBOARD_SERVICE);
+                clipboardManager.setPrimaryClip(ClipData.newPlainText(null,itemContentView.getText()));
+                Toast.makeText(itemBuilder.getContext(), R.string.msg_copied, Toast.LENGTH_SHORT).show();
+                return true;
 
-                    ClipboardManager clipboardManager = (ClipboardManager) itemBuilder.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-                    clipboardManager.setPrimaryClip(ClipData.newPlainText(null,itemContentView.getText()));
-                    Toast.makeText(itemBuilder.getContext(), R.string.msg_copied, Toast.LENGTH_SHORT).show();
-                    return true;
+            }
+        });
 
-                }
-            });
-
-        }
     }
 
     private void ellipsize() {
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 90edd0ef8..1a7d61dae 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -159,7 +159,6 @@
     <string name="show_play_with_kodi_key" translatable="false">show_play_with_kodi</string>
     <string name="show_next_video_key" translatable="false">show_next_video</string>
     <string name="show_comments_key" translatable="false">show_comments</string>
-    <string name="copy_comment_long_press" translatable="false">copy_comment_long_press</string>
     <string name="stream_info_selected_tab_key" translatable="false">stream_info_selected_tab</string>
     <string name="show_hold_to_append_key" translatable="false">show_hold_to_append</string>
     <string name="default_language_value">en</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca5a7527f..dab9bde10 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,7 +76,6 @@
     <string name="download_thumbnail_title">Load thumbnails</string>
     <string name="show_comments_title">Show comments</string>
     <string name="show_comments_summary">Disable to stop showing comments</string>
-    <string name="copy_comment_long_press_title">Copy comment on long press</string>
     <string name="download_thumbnail_summary">Turn off to prevent loading thumbnails, saving data and memory usage. Changes clear both in-memory and on-disk image cache.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Image cache wiped</string>
     <string name="metadata_cache_wipe_title">Wipe cached metadata</string>
diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml
index d1080bb4d..2187b4a3c 100644
--- a/app/src/main/res/xml/content_settings.xml
+++ b/app/src/main/res/xml/content_settings.xml
@@ -65,11 +65,6 @@
         android:title="@string/show_comments_title"
         android:summary="@string/show_comments_summary"/>
 
-    <SwitchPreference
-        app:iconSpaceReserved="false"
-        android:defaultValue="false"
-        android:key="@string/copy_comment_long_press"
-        android:title="@string/copy_comment_long_press_title"/>
 
     <Preference
         app:iconSpaceReserved="false"

From b5f069d08090fff7d8968aa9264fb90c3ef26192 Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <i.nedoboy@mail.ru>
Date: Tue, 4 Feb 2020 18:16:33 +0000
Subject: [PATCH 121/199] Translated using Weblate (Russian)

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

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6455a42c2..f21e0e074 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -546,4 +546,6 @@
     <string name="permission_display_over_apps">Разрешите отображение поверх приложений</string>
     <string name="app_language_title">Язык интерфейса</string>
     <string name="systems_language">Как в системе</string>
+    <string name="subtitle_activity_recaptcha">По завершении нажмите Готово</string>
+    <string name="recaptcha_done_button">Готово</string>
 </resources>
\ No newline at end of file

From 2bac66b5feb69bd4bed18eae9ac5f303ea7974cd Mon Sep 17 00:00:00 2001
From: nautilusx <mail.ka@mailbox.org>
Date: Tue, 4 Feb 2020 07:48:42 +0000
Subject: [PATCH 122/199] Translated using Weblate (German)

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

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 306fcf9de..69e0b273b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -203,8 +203,8 @@
     </plurals>
     <string name="no_videos">Keine Videos</string>
     <plurals name="videos">
-        <item quantity="one">%s Video</item>
-        <item quantity="other">%s Videos</item>
+        <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>
@@ -495,9 +495,9 @@
     <string name="start_downloads">Downloads starten</string>
     <string name="pause_downloads">Downloads anhalten</string>
     <string name="downloads_storage_ask_title">Frage, wohin heruntergeladen werden soll</string>
-    <string name="downloads_storage_ask_summary">Du wirst gefragt, wohin Du jeden Download speichern willst</string>
-    <string name="downloads_storage_ask_summary_kitkat">Du wirst gefragt, wohin Du jeden Download speichern willst. 
-\nAktiviere diese Option, wenn Du auf die externe SD-Karte herunterladen möchtest</string>
+    <string name="downloads_storage_ask_summary">Du wirst gefragt, wohin du jeden Download speichern willst</string>
+    <string name="downloads_storage_ask_summary_kitkat">Du wirst gefragt, wohin du jeden Download speichern willst.
+\nAktiviere diese Option, wenn du auf die externe SD-Karte herunterladen möchtest</string>
     <string name="downloads_storage_use_saf_title">SAF verwenden</string>
     <string name="downloads_storage_use_saf_summary">Das Storage Access Framework erlaubt Downloads auf eine externe SD-Karte.
 \nHinweis: Manche Geräte sind nicht kompatibel</string>
@@ -539,4 +539,9 @@
     <string name="clear_download_history">Downloadverlauf löschen</string>
     <string name="delete_downloaded_files">Heruntergeladene Dateien löschen</string>
     <string name="deleted_downloads">%1$s Downloads gelöscht</string>
+    <string name="permission_display_over_apps">Berechtigung zur Anzeige über andere Apps erteilen</string>
+    <string name="app_language_title">Sprache der App</string>
+    <string name="systems_language">Systemstandard</string>
+    <string name="subtitle_activity_recaptcha">\"Fertig\" drücken, wenn es gelöst wurde</string>
+    <string name="recaptcha_done_button">Fertig</string>
 </resources>
\ No newline at end of file

From 21184f875522a17dc59f89bfcf44cbc103b69514 Mon Sep 17 00:00:00 2001
From: harshlele <45959248+harshlele@users.noreply.github.com>
Date: Wed, 5 Feb 2020 14:48:39 +0530
Subject: [PATCH 123/199] Update CommentsMiniInfoItemHolder.java

Co-Authored-By: yausername <5203007+yausername@users.noreply.github.com>
---
 .../newpipe/info_list/holder/CommentsMiniInfoItemHolder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 592378dc0..58f1ab90d 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
@@ -134,7 +134,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
 
                 ClipboardManager clipboardManager = (ClipboardManager) itemBuilder.getContext()
                                                     .getSystemService(Context.CLIPBOARD_SERVICE);
-                clipboardManager.setPrimaryClip(ClipData.newPlainText(null,itemContentView.getText()));
+                clipboardManager.setPrimaryClip(ClipData.newPlainText(null,commentText));
                 Toast.makeText(itemBuilder.getContext(), R.string.msg_copied, Toast.LENGTH_SHORT).show();
                 return true;
 

From 34e31807fc864ae99511ded080323aa723dcad56 Mon Sep 17 00:00:00 2001
From: harshlele <45959248+harshlele@users.noreply.github.com>
Date: Thu, 6 Feb 2020 18:33:06 +0530
Subject: [PATCH 124/199] removed empty line

---
 app/src/main/res/xml/content_settings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml
index 2187b4a3c..197c14487 100644
--- a/app/src/main/res/xml/content_settings.xml
+++ b/app/src/main/res/xml/content_settings.xml
@@ -65,7 +65,6 @@
         android:title="@string/show_comments_title"
         android:summary="@string/show_comments_summary"/>
 
-
     <Preference
         app:iconSpaceReserved="false"
         android:summary="@string/import_data_summary"

From aaf5d7b89c5f60b32d08c343bf83a1807956d206 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Thu, 6 Feb 2020 17:00:32 -0300
Subject: [PATCH 125/199] Update DataReader.java

make rewind() method fully rewind the stream
---
 app/src/main/java/org/schabi/newpipe/streams/DataReader.java | 1 +
 1 file changed, 1 insertion(+)

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 0e62810c5..75b55cd73 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
@@ -137,6 +137,7 @@ public class DataReader {
 
         position = 0;
         readOffset = readBuffer.length;
+        readCount = 0;
     }
 
     public boolean canRewind() {

From 7045f9711c04a4a0610553f605c8c69a7fd4f21f Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sun, 2 Feb 2020 16:54:09 +0100
Subject: [PATCH 126/199] fix thumbnail for PeerTube, and description changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

description:
- PeerTube: it's now full description (it cut at 250 characters before), and it displays ok (newlines are ok, but markdown isn't)
- MediaCCC: descriptions are now displayed well (newlines added)
- YouTube: timestamps in descriptions are clickable and work

more PeerTube fixes:
thumbnail is now high quality
age limit is now handled
upload date in «recently added» feed is good now (it was one hour delayed)
all fixes come from https://github.com/TeamNewPipe/NewPipeExtractor/pull/239, so it need to be merged before this PR
---
 app/build.gradle                              |  2 +-
 .../fragments/detail/VideoDetailFragment.java | 75 +++++++++++++------
 2 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f8fc1565f..0f7ad5f92 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:ff61e284'
+    implementation 'com.github.B0pol:NewPipeExtractor:5756df8dc7e89b7383d1d1e07a91c30bdab6f868'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 
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 f59cfaef0..a297cddf3 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
@@ -2,7 +2,6 @@ package org.schabi.newpipe.fragments.detail;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -18,7 +17,6 @@ import androidx.fragment.app.Fragment;
 import androidx.core.content.ContextCompat;
 import androidx.viewpager.widget.ViewPager;
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import android.text.Html;
 import android.text.Spanned;
@@ -193,6 +191,14 @@ public class VideoDetailFragment
     private TabLayout tabLayout;
     private FrameLayout relatedStreamsLayout;
 
+    private static final int DESCRIPTION_HTML = 1;
+    private static final int DESCRIPTION_MARKDOWN = 2;
+    private static final int DESCRIPTION_PLAIN_TEXT = 3;
+
+    private static final int YOUTUBE_SERVICE_ID = ServiceList.YouTube.getServiceId();
+    private static final int MEDIACCC_SERVICE_ID = ServiceList.MediaCCC.getServiceId();
+    private static final int PEERTUBE_SERVICE_ID = ServiceList.PeerTube.getServiceId();
+
 
     /*////////////////////////////////////////////////////////////////////////*/
 
@@ -483,7 +489,6 @@ public class VideoDetailFragment
         videoUploadDateView = rootView.findViewById(R.id.detail_upload_date_view);
         videoDescriptionView = rootView.findViewById(R.id.detail_description_view);
         videoDescriptionView.setMovementMethod(LinkMovementMethod.getInstance());
-        videoDescriptionView.setAutoLinkMask(Linkify.WEB_URLS);
 
         thumbsUpTextView = rootView.findViewById(R.id.detail_thumbs_up_count_view);
         thumbsUpImageView = rootView.findViewById(R.id.detail_thumbs_up_img_view);
@@ -919,28 +924,39 @@ public class VideoDetailFragment
         return sortedVideoStreams != null ? sortedVideoStreams.get(selectedVideoStreamIndex) : null;
     }
 
-    private void prepareDescription(final String descriptionHtml) {
-        if (TextUtils.isEmpty(descriptionHtml)) {
+    private void prepareDescription(final String descriptionText, int descriptionTypeId) {
+        if (TextUtils.isEmpty(descriptionText)) {
             return;
         }
 
-        disposables.add(Single.just(descriptionHtml)
-                .map((@io.reactivex.annotations.NonNull String description) -> {
-                    Spanned parsedDescription;
-                    if (Build.VERSION.SDK_INT >= 24) {
-                        parsedDescription = Html.fromHtml(description, 0);
-                    } else {
-                        //noinspection deprecation
-                        parsedDescription = Html.fromHtml(description);
-                    }
-                    return parsedDescription;
-                })
-                .subscribeOn(Schedulers.computation())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe((@io.reactivex.annotations.NonNull Spanned spanned) -> {
-                    videoDescriptionView.setText(spanned);
-                    videoDescriptionView.setVisibility(View.VISIBLE);
-                }));
+        if (descriptionTypeId == DESCRIPTION_PLAIN_TEXT) {
+            videoDescriptionView.setText(descriptionText, TextView.BufferType.SPANNABLE);
+            videoDescriptionView.setVisibility(View.VISIBLE);
+        } else if (descriptionTypeId == DESCRIPTION_MARKDOWN) {
+            //in the future we would use a library or a good method to show markdown.
+            //rn, we just remove **bold**, and let plain_text otherwise
+            videoDescriptionView.setText(descriptionText.replace("**", ""), TextView.BufferType.SPANNABLE);
+            videoDescriptionView.setVisibility(View.VISIBLE);
+        } else {
+            //== DESCRIPTION_HTML
+            disposables.add(Single.just(descriptionText)
+                    .map((@io.reactivex.annotations.NonNull String description) -> {
+                        Spanned parsedDescription;
+                        if (Build.VERSION.SDK_INT >= 24) {
+                            parsedDescription = Html.fromHtml(description, 0);
+                        } else {
+                            //noinspection deprecation
+                            parsedDescription = Html.fromHtml(description);
+                        }
+                        return parsedDescription;
+                    })
+                    .subscribeOn(Schedulers.computation())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe((@io.reactivex.annotations.NonNull Spanned spanned) -> {
+                        videoDescriptionView.setText(spanned);
+                        videoDescriptionView.setVisibility(View.VISIBLE);
+                    }));
+        }
     }
 
     private void setHeightThumbnail() {
@@ -1126,7 +1142,20 @@ public class VideoDetailFragment
             videoUploadDateView.setVisibility(View.GONE);
         }
 
-        prepareDescription(info.getDescription());
+        int serviceId = info.getServiceId();
+
+        if (serviceId != YOUTUBE_SERVICE_ID) {
+            videoDescriptionView.setAutoLinkMask(Linkify.WEB_URLS);
+        }
+
+        if (serviceId == PEERTUBE_SERVICE_ID) {
+            prepareDescription(info.getDescription(), DESCRIPTION_MARKDOWN);
+        } else if (serviceId == MEDIACCC_SERVICE_ID) {
+            prepareDescription(info.getDescription(), DESCRIPTION_PLAIN_TEXT);
+        } else {
+            prepareDescription(info.getDescription(), DESCRIPTION_HTML);
+        }
+
         updateProgressInfo(info);
 
         animateView(spinnerToolbar, true, 500);

From badaff8ebcd6f446a6a4b575adba43d627b4c7c2 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Thu, 6 Feb 2020 23:54:36 +0100
Subject: [PATCH 127/199] refactor Description

---
 app/build.gradle                              |  2 +-
 .../fragments/detail/VideoDetailFragment.java | 60 +++++++------------
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0f7ad5f92..728d380c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.B0pol:NewPipeExtractor:5756df8dc7e89b7383d1d1e07a91c30bdab6f868'
+    implementation 'com.github.B0pol:NewPipeExtractor:11bcc78d9c8eb39e8d61a6f4bc4112025937f087'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 
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 a297cddf3..c6c8ca04c 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
@@ -56,6 +56,7 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor;
 import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamType;
@@ -191,14 +192,6 @@ public class VideoDetailFragment
     private TabLayout tabLayout;
     private FrameLayout relatedStreamsLayout;
 
-    private static final int DESCRIPTION_HTML = 1;
-    private static final int DESCRIPTION_MARKDOWN = 2;
-    private static final int DESCRIPTION_PLAIN_TEXT = 3;
-
-    private static final int YOUTUBE_SERVICE_ID = ServiceList.YouTube.getServiceId();
-    private static final int MEDIACCC_SERVICE_ID = ServiceList.MediaCCC.getServiceId();
-    private static final int PEERTUBE_SERVICE_ID = ServiceList.PeerTube.getServiceId();
-
 
     /*////////////////////////////////////////////////////////////////////////*/
 
@@ -924,29 +917,24 @@ public class VideoDetailFragment
         return sortedVideoStreams != null ? sortedVideoStreams.get(selectedVideoStreamIndex) : null;
     }
 
-    private void prepareDescription(final String descriptionText, int descriptionTypeId) {
-        if (TextUtils.isEmpty(descriptionText)) {
+    private void prepareDescription(Description description) {
+        if (TextUtils.isEmpty(description.getContent()) || description == Description.emptyDescription) {
             return;
         }
 
-        if (descriptionTypeId == DESCRIPTION_PLAIN_TEXT) {
-            videoDescriptionView.setText(descriptionText, TextView.BufferType.SPANNABLE);
-            videoDescriptionView.setVisibility(View.VISIBLE);
-        } else if (descriptionTypeId == DESCRIPTION_MARKDOWN) {
-            //in the future we would use a library or a good method to show markdown.
-            //rn, we just remove **bold**, and let plain_text otherwise
-            videoDescriptionView.setText(descriptionText.replace("**", ""), TextView.BufferType.SPANNABLE);
-            videoDescriptionView.setVisibility(View.VISIBLE);
-        } else {
-            //== DESCRIPTION_HTML
-            disposables.add(Single.just(descriptionText)
-                    .map((@io.reactivex.annotations.NonNull String description) -> {
+        if (description.getType() != Description.HTML) {
+            videoDescriptionView.setAutoLinkMask(Linkify.WEB_URLS);
+        }
+
+        if (description.getType() == Description.HTML) {
+            disposables.add(Single.just(description.getContent())
+                    .map((@io.reactivex.annotations.NonNull String descriptionText) -> {
                         Spanned parsedDescription;
                         if (Build.VERSION.SDK_INT >= 24) {
-                            parsedDescription = Html.fromHtml(description, 0);
+                            parsedDescription = Html.fromHtml(descriptionText, 0);
                         } else {
                             //noinspection deprecation
-                            parsedDescription = Html.fromHtml(description);
+                            parsedDescription = Html.fromHtml(descriptionText);
                         }
                         return parsedDescription;
                     })
@@ -956,6 +944,15 @@ public class VideoDetailFragment
                         videoDescriptionView.setText(spanned);
                         videoDescriptionView.setVisibility(View.VISIBLE);
                     }));
+        } else if (description.getType() == Description.MARKDOWN) {
+            //in the future we would use a library or a good method to show markdown.
+            //rn, we just remove **bold**, and let PLAIN_TEXT otherwise
+            videoDescriptionView.setText(description.getContent().replace("**", ""), TextView.BufferType.SPANNABLE);
+            videoDescriptionView.setVisibility(View.VISIBLE);
+        } else {
+            //== Description.PLAIN_TEXT
+            videoDescriptionView.setText(description.getContent(), TextView.BufferType.SPANNABLE);
+            videoDescriptionView.setVisibility(View.VISIBLE);
         }
     }
 
@@ -1142,20 +1139,7 @@ public class VideoDetailFragment
             videoUploadDateView.setVisibility(View.GONE);
         }
 
-        int serviceId = info.getServiceId();
-
-        if (serviceId != YOUTUBE_SERVICE_ID) {
-            videoDescriptionView.setAutoLinkMask(Linkify.WEB_URLS);
-        }
-
-        if (serviceId == PEERTUBE_SERVICE_ID) {
-            prepareDescription(info.getDescription(), DESCRIPTION_MARKDOWN);
-        } else if (serviceId == MEDIACCC_SERVICE_ID) {
-            prepareDescription(info.getDescription(), DESCRIPTION_PLAIN_TEXT);
-        } else {
-            prepareDescription(info.getDescription(), DESCRIPTION_HTML);
-        }
-
+        prepareDescription(info.getDescription());
         updateProgressInfo(info);
 
         animateView(spinnerToolbar, true, 500);

From 294c35b2fb2f15e4393eb38cb6985ecbb52b6272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 7 Feb 2020 17:51:14 +0100
Subject: [PATCH 128/199] Spelling: the settings

Co-Authored-By: Tobias Groza <TobiGr@users.noreply.github.com>
---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 940008aae..cf44da7c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -138,7 +138,7 @@
     <string name="play_btn_text">Play</string>
     <string name="content">Content</string>
     <string name="show_age_restricted_content_title">Age restricted content</string>
-    <string name="video_is_age_restricted">Show age restricted video. Future changes are possible from \"Settings\".</string>
+    <string name="video_is_age_restricted">Show age restricted video. Future changes are possible from the settings.</string>
     <string name="duration_live">Live</string>
     <string name="duration_live_button" translatable="false">Live</string>
     <string name="downloads">Downloads</string>

From 4c13dda1f953fcf38ddf579e52fd4acdc62aac84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 7 Feb 2020 17:55:37 +0100
Subject: [PATCH 129/199] Spelling: Could not establish secure connection

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cf44da7c0..9d450634c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -557,7 +557,7 @@
     <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">Could not connect securely</string>
+    <string name="error_ssl_exception">Could not establish secure connection</string>
     <string name="error_unknown_host">Could not find the server</string>
     <string name="error_connect_host">Can not connect to the server</string>
     <string name="error_http_no_content">The server does not send data</string>

From 3abc660eb30a103cbd6ec355d96f52348b3d0fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 7 Feb 2020 17:57:38 +0100
Subject: [PATCH 130/199] Spelling: Install the fresh NewPipe version.

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d450634c..bdc3b30e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -529,7 +529,7 @@
     <string name="auto">Auto</string>
     <string name="switch_view">Switch View</string>
     <!-- App update notification -->
-    <string name="app_update_notification_content_title">There is a fresh NewPipe version available!</string>
+    <string name="app_update_notification_content_title">Install the fresh NewPipe version.</string>
     <string name="app_update_notification_content_text">Tap to download</string>
     <string name="missions_header_finished">Finished</string>
     <string name="missions_header_pending">Pending</string>

From f319e3e75a886c3523708f8b7a562be8cabd17b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 7 Feb 2020 18:01:45 +0100
Subject: [PATCH 131/199] Spelling: Treat the NewPipe makers to something you
 like

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bdc3b30e0..4ae59aa33 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -355,7 +355,7 @@
     <string name="github_url" translatable="false">https://github.com/TeamNewPipe/NewPipe</string>
     <string name="view_on_github">View on GitHub</string>
     <string name="donation_title">Donate</string>
-    <string name="donation_encouragement">NewPipe is developed by volunteers spending time bringing you the best experience. Give back to help make NewPipe even better.</string>
+    <string name="donation_encouragement">Treat the newPipe makers to something you like, by way of funding its development.</string>
     <string name="donation_url" translatable="false">https://newpipe.schabi.org/donate</string>
     <string name="give_back">Give back</string>
     <string name="website_title">Website</string>

From 85acc53d408630ae63bd045dfe69604841046d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 7 Feb 2020 18:06:09 +0100
Subject: [PATCH 132/199] Spelling: Video thumbnail shown

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4ae59aa33..c3ffc9c14 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,7 +60,7 @@
     <string name="show_play_with_kodi_title">Show \"Play with Kodi\" option</string>
     <string name="enable_lock_screen_video_thumbnail_title">Lock screen video thumbnail</string>
     <string name="show_play_with_kodi_summary">Displayed option to play a video via Kodi media center</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">Using the background player displays a video thumbnail on the lock screen</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">A video thumbnail is shown on the lock screen when using the background player</string>
     <string name="play_audio">Audio</string>
     <string name="default_audio_format_title">Default audio format</string>
     <string name="default_video_format_title">Default video format</string>

From 6d49148c32e8f3c83a07429eebebae3b392794d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Tue, 4 Feb 2020 09:23:10 +0000
Subject: [PATCH 133/199] Translated using Weblate (Turkish)

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

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 318b30098..bab98a791 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -541,4 +541,6 @@
     <string name="permission_display_over_apps">Diğer uygulamaların üzerinde görüntüleme izni ver</string>
     <string name="app_language_title">Uygulama dili</string>
     <string name="systems_language">Sistem öntanımlısı</string>
+    <string name="subtitle_activity_recaptcha">Çözüldüğünde \"Bitti\" butonuna basın</string>
+    <string name="recaptcha_done_button">Bitti</string>
 </resources>
\ No newline at end of file

From a476f332f71b0e6f1be710e50b21c7b83ba5b901 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Wed, 5 Feb 2020 00:03:15 +0000
Subject: [PATCH 134/199] Translated using Weblate (German)

Currently translated at 100.0% (532 of 532 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 69e0b273b..fbd3f676f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -203,8 +203,8 @@
     </plurals>
     <string name="no_videos">Keine Videos</string>
     <plurals name="videos">
-        <item quantity="one">Video</item>
-        <item quantity="other">Videos</item>
+        <item quantity="one">%s Video</item>
+        <item quantity="other">%s Videos</item>
     </plurals>
     <string name="charset_most_special_characters">Die meisten Sonderzeichen</string>
     <string name="item_deleted">Element gelöscht</string>

From 06eff256f3665075cead89d3ebf0b28265cfe4eb Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Tue, 4 Feb 2020 23:43:42 +0000
Subject: [PATCH 135/199] Translated using Weblate (Esperanto)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-eo/strings.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index d4c5d4c80..ddbda086a 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -123,7 +123,7 @@
     <string name="msg_popup_permission">Tiu permeso estas necesa por 
 \nmalfermi en ŝprucfenestra modo</string>
     <string name="popup_playing_toast">Ludante en ŝprucfenestra modo</string>
-    <string name="disabled">Malaktiva</string>
+    <string name="disabled">Malŝatitaj</string>
     <string name="filter">Filtri</string>
     <string name="refresh">Aktualigi</string>
     <string name="clear">Forviŝi</string>
@@ -138,7 +138,7 @@
     <string name="settings_category_downloads_title">Elŝuti</string>
     <string name="charset_letters_and_digits">Leteroj kaj ciferoj</string>
     <string name="charset_most_special_characters">Plej specialaj karakteroj</string>
-    <string name="resume_on_audio_focus_gain_title">Rekomencu en fokusa gajno</string>
+    <string name="resume_on_audio_focus_gain_title">Rekomenci en fokusa gajno</string>
     <string name="resume_on_audio_focus_gain_summary">Daŭrigi la ludon post la interrompaĵoj (ekzemple telefonadoj)</string>
     <string name="enable_search_history_title">Serĉa historio</string>
     <string name="enable_search_history_summary">Konservi la historio de serĉo lokale</string>
@@ -172,7 +172,7 @@
     <string name="unknown_content">[Nekonata]</string>
     <string name="enqueue_on_background">Viciĝi en la fona ludilo</string>
     <string name="enqueue_on_popup">Viciĝi en nova ŝprucfenestro</string>
-    <string name="start_here_on_popup">Komencu ludi en nova ŝprucfenestro</string>
+    <string name="start_here_on_popup">Komenci ludi en nova ŝprucfenestro</string>
     <string name="default_content_country_title">Defaŭlta enhava lando</string>
     <string name="toggle_orientation">Ŝangi Orientiĝon</string>
     <string name="switch_to_background">Ŝanĝi al Fono</string>
@@ -540,4 +540,6 @@
     <string name="permission_display_over_apps">Doni la permeson por afiŝiĝi supre aliaj apoj</string>
     <string name="app_language_title">Lingvo de la apo</string>
     <string name="systems_language">Sistema lingvo</string>
+    <string name="subtitle_activity_recaptcha">Premu « Finita » kiam solvita</string>
+    <string name="recaptcha_done_button">Finita</string>
 </resources>
\ No newline at end of file

From 75248d7a12f5e7afd2bff65f3143e22526b251ff Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 6 Feb 2020 19:03:14 +0000
Subject: [PATCH 136/199] Translated using Weblate (Basque)

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

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 96745ee23..8e74ed126 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -199,8 +199,8 @@
     </plurals>
     <string name="no_videos">Bideorik ez</string>
     <plurals name="videos">
-        <item quantity="one">Bideoa</item>
-        <item quantity="other">Bideoak</item>
+        <item quantity="one">Bideo %</item>
+        <item quantity="other">% bideo</item>
     </plurals>
     <string name="title_activity_history">Historiala</string>
     <string name="title_history_search">Bilatuta</string>
@@ -538,4 +538,9 @@
     <string name="clear_download_history">Garbitu deskargen historiala</string>
     <string name="delete_downloaded_files">Ezabatu deskargatutako fitxategiak</string>
     <string name="deleted_downloads">%1$s deskarga ezabatuta</string>
+    <string name="permission_display_over_apps">Eman beste aplikazioen gainean erakusteko baimena</string>
+    <string name="app_language_title">Aplikazioaren hizkuntza</string>
+    <string name="systems_language">Sisteman lehenetsia</string>
+    <string name="subtitle_activity_recaptcha">Sakatu \"Egina\" konponduta dagoenean</string>
+    <string name="recaptcha_done_button">Egina</string>
 </resources>
\ No newline at end of file

From ce003d2683ed1afa79548c4601adc67da7e4dba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20=C5=A0amla?= <auzkok@seznam.cz>
Date: Tue, 4 Feb 2020 20:58:55 +0000
Subject: [PATCH 137/199] Translated using Weblate (Czech)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-cs/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 44001ce9f..4c66d4f66 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -319,7 +319,7 @@ otevření ve vyskakovacím okně</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 hlášení nedoručitelných výjimek Rx mimo fragment nebo trvání činnosti po odstranění</string>
+    <string name="enable_disposed_exceptions_summary">Vynutit hlášení nedoručitelných výjimek Rx mimo životnost fragmentu nebo aktivity po odstraně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>
@@ -550,4 +550,6 @@ otevření ve vyskakovacím okně</string>
     <string name="permission_display_over_apps">Souhlasit se zobrazením přes jiné aplikace</string>
     <string name="app_language_title">Jazyk aplikace</string>
     <string name="systems_language">Jazyk systému</string>
+    <string name="subtitle_activity_recaptcha">Po vyřešení stiskni \"Hotovo\"</string>
+    <string name="recaptcha_done_button">Hotovo</string>
 </resources>
\ No newline at end of file

From 5ed5a81708956bd17acb37f08151ad9608fa2ac6 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Tue, 4 Feb 2020 05:48:21 +0000
Subject: [PATCH 138/199] Translated using Weblate (Hebrew)

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

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index dacde43bc..72b6a92ab 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -553,4 +553,6 @@
     <string name="permission_display_over_apps">יש להעניק הרשאה להציג על גבי יישומונים אחרים</string>
     <string name="app_language_title">שפת היישומון</string>
     <string name="systems_language">בררת המחדל של המערכת</string>
+    <string name="subtitle_activity_recaptcha">יש ללחוץ על „סיום” לאחר הפתירה</string>
+    <string name="recaptcha_done_button">סיום</string>
 </resources>
\ No newline at end of file

From 83d43f845fc7fc15e78a492a2e0d7aa8dbdc70f7 Mon Sep 17 00:00:00 2001
From: WaldiS <admin@sto.ugu.pl>
Date: Tue, 4 Feb 2020 14:54:43 +0000
Subject: [PATCH 139/199] Translated using Weblate (Polish)

Currently translated at 99.8% (531 of 532 strings)
---
 app/src/main/res/values-pl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index cfb2c00d2..53de33521 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -547,4 +547,6 @@
     <string name="permission_display_over_apps">Zezwól na wyświetlanie w innych aplikacjach</string>
     <string name="app_language_title">Język aplikacji</string>
     <string name="systems_language">Domyślny systemu</string>
+    <string name="subtitle_activity_recaptcha">Po rozwiązaniu naciśnij „Gotowe”</string>
+    <string name="recaptcha_done_button">Gotowe</string>
 </resources>
\ No newline at end of file

From 72e90b4d576849d247a58bf4e955c1d6b559ca4e Mon Sep 17 00:00:00 2001
From: thami simo <simo.azad@gmail.com>
Date: Thu, 6 Feb 2020 10:55:18 +0000
Subject: [PATCH 140/199] Translated using Weblate (Arabic)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-ar/strings.xml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 4d91b40da..79fe2a6fe 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -246,12 +246,12 @@
         <item quantity="other">%s مشاهدة</item>
     </plurals>
     <plurals name="videos">
-        <item quantity="zero">فيديوهات</item>
-        <item quantity="one">فيديوهات</item>
-        <item quantity="two">فيديوهات</item>
-        <item quantity="few">فيديوهات</item>
-        <item quantity="many">فيديوهات</item>
-        <item quantity="other">فيديوهات</item>
+        <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>
@@ -556,9 +556,14 @@
     <string name="error_download_resource_gone">لا يمكن استرداد هذا التنزيل</string>
     <string name="choose_instance_prompt">اختيار مثيل</string>
     <string name="peertube_instance_url_help">ابحث عن الحالات التي تناسبك على %s</string>
-    <string name="enable_lock_screen_video_thumbnail_title">تمكين صور مصغرة قفل شاشة فيديو</string>
+    <string name="enable_lock_screen_video_thumbnail_title">تمكين قفل شاشة الصور المصغرة الفيديو</string>
     <string name="enable_lock_screen_video_thumbnail_summary">عند استخدام مشغل الخلفية ، سيتم عرض صورة مصغرة للفيديو على شاشة القفل</string>
     <string name="clear_download_history">تنظيف تاريخ التحميل</string>
     <string name="delete_downloaded_files">حذف الملفات التي تم تنزيلها</string>
     <string name="deleted_downloads">التنزيلات %1$s المحذوفة</string>
+    <string name="permission_display_over_apps">إعطاء إذن لعرضه على التطبيقات الأخرى</string>
+    <string name="app_language_title">لغة التطبيق</string>
+    <string name="systems_language">النظام الافتراضي</string>
+    <string name="subtitle_activity_recaptcha">اضغط على \"تم\" عند حلها</string>
+    <string name="recaptcha_done_button">منجز</string>
 </resources>
\ No newline at end of file

From 06e536eb459ec824cdfff0b3fd02170e867525d9 Mon Sep 17 00:00:00 2001
From: zmni <zmni@outlook.com>
Date: Wed, 5 Feb 2020 13:00:11 +0000
Subject: [PATCH 141/199] Translated using Weblate (Indonesian)

Currently translated at 99.6% (530 of 532 strings)
---
 app/src/main/res/values-in/strings.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 36929856e..7c3cce473 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -498,7 +498,7 @@
     <string name="delete_playback_states_alert">Hapus semua posisi pemutaran\?</string>
     <string name="download_choose_new_path">Ubah folder unduhan</string>
     <plurals name="videos">
-        <item quantity="other">Video</item>
+        <item quantity="other">%s video</item>
     </plurals>
     <string name="drawer_header_description">Aktif/Nonaktifkan layanan, saat ini aktif:</string>
     <string name="no_one_watching">Tidak ada yang menonton</string>
@@ -531,4 +531,8 @@
     <string name="clear_download_history">Hapus riwayat unduhan</string>
     <string name="delete_downloaded_files">Hapus berkas yang diunduh</string>
     <string name="deleted_downloads">%1$s unduhan dihapus</string>
+    <string name="permission_display_over_apps">Izinkan untuk ditampilkan di atas aplikasi lain</string>
+    <string name="app_language_title">Bahasa apl</string>
+    <string name="systems_language">Default sistem</string>
+    <string name="recaptcha_done_button">Selesai</string>
 </resources>
\ No newline at end of file

From e9dc96944b4902e5fe776530a045e54d6ad35d4f Mon Sep 17 00:00:00 2001
From: JoC <jo_91_lp@hotmail.com>
Date: Tue, 4 Feb 2020 05:47:51 +0000
Subject: [PATCH 142/199] Translated using Weblate (Spanish)

Currently translated at 99.8% (531 of 532 strings)
---
 app/src/main/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index aadb818f9..1216c02c5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -540,4 +540,6 @@
     <string name="permission_display_over_apps">Dar permisos para que se muestre por sobre otras apps</string>
     <string name="app_language_title">Idioma de la app</string>
     <string name="systems_language">Predeterminado del sistema</string>
+    <string name="subtitle_activity_recaptcha">Presiona \"Hecho\" cuando esté resuelto</string>
+    <string name="recaptcha_done_button">Hecho</string>
 </resources>
\ No newline at end of file

From c93be13dfe5c4acd963076545fdc21de7e5e1245 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Tue, 4 Feb 2020 23:51:01 +0000
Subject: [PATCH 143/199] Translated using Weblate (French)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-fr/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ad416aabc..8a8c00c60 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -116,7 +116,7 @@
     <string name="popup_playing_toast">Lecture en mode flottant</string>
     <string name="yes">Oui</string>
     <string name="later">Plus tard</string>
-    <string name="disabled">Désactivé</string>
+    <string name="disabled">Désactivés</string>
     <string name="info_labels">Quoi :\\nRequête :\\nLangue du contenu :\\nService :\\nHeure UTC :\\nPaquet :\\nVersion :\\nVersion du système d’exploitation :</string>
     <string name="short_thousand">k</string>
     <string name="short_million">M</string>
@@ -541,4 +541,6 @@
     <string name="permission_display_over_apps">Autoriser la superposition d\'applis</string>
     <string name="app_language_title">Langue de l\'application</string>
     <string name="systems_language">Langue du système</string>
+    <string name="subtitle_activity_recaptcha">Appuyez sur « Terminé » une fois résolu</string>
+    <string name="recaptcha_done_button">Terminé</string>
 </resources>
\ No newline at end of file

From 7568616f8ea221bd757337dae6b7bc452b2f4233 Mon Sep 17 00:00:00 2001
From: MohammedSR Vevo <mohammednajmidin@gmail.com>
Date: Tue, 4 Feb 2020 16:53:02 +0000
Subject: [PATCH 144/199] Translated using Weblate (Kurdish)

Currently translated at 99.8% (531 of 532 strings)
---
 app/src/main/res/values-ku/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 6a1ac3b9b..20ce04100 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -544,4 +544,6 @@
     <string name="permission_display_over_apps">دەسەڵاتی پێبدە بۆ پیشاندان لەسەرووی ئەپەکانیترەوە</string>
     <string name="app_language_title">زمانی ئەپ</string>
     <string name="systems_language">بنەڕەتی سیستەم</string>
+    <string name="subtitle_activity_recaptcha">گرتە بکە لەسەر ”تەواو” کاتێ کە چارەسەرکرا</string>
+    <string name="recaptcha_done_button">تەواو</string>
 </resources>
\ No newline at end of file

From 6adbfade2b0736c606f3815a38a7b1e685316cc7 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 4 Feb 2020 02:51:37 +0000
Subject: [PATCH 145/199] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-zh-rTW/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 51d21f167..395a555e7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -537,4 +537,6 @@
     <string name="permission_display_over_apps">給予顯示在其他應用程式上層的權限</string>
     <string name="app_language_title">應用程式語言</string>
     <string name="systems_language">系統預設值</string>
+    <string name="subtitle_activity_recaptcha">解決後請按「完成」</string>
+    <string name="recaptcha_done_button">完成</string>
 </resources>
\ No newline at end of file

From 9eb55e1be5fa98b06a1836a7ce2c09f3b4078e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Mon, 3 Feb 2020 20:50:00 +0000
Subject: [PATCH 146/199] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 98.1% (522 of 532 strings)
---
 app/src/main/res/values-nb-rNO/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index fa39ae466..9757df2ad 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -537,4 +537,9 @@
     <string name="recovering">gjenoppretter</string>
     <string name="error_download_resource_gone">Kan ikke gjenopprette denne nedlastingen</string>
     <string name="seek_duration_title">Hurtigframoverspoling/-tilbakeblafringsvarighet</string>
+    <string name="permission_display_over_apps">Gi tilgang til visning over andre programmer</string>
+    <string name="app_language_title">Programspråk</string>
+    <string name="systems_language">Systemforvalg</string>
+    <string name="subtitle_activity_recaptcha">Trykk \"Ferdig\" når den er løst</string>
+    <string name="recaptcha_done_button">Ferdig</string>
 </resources>
\ No newline at end of file

From 3ff85c2ab71d89ff54cf67507b0a81ad12999ce6 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Fri, 7 Feb 2020 22:22:27 +0100
Subject: [PATCH 147/199] Make report error title in snackbar uppercase again

---
 app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index e7a6319e3..0bb93c63f 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -91,7 +91,7 @@ public class ErrorActivity extends AppCompatActivity {
         if (rootView != null) {
             Snackbar.make(rootView, R.string.error_snackbar_message, 3 * 1000)
                     .setActionTextColor(Color.YELLOW)
-                    .setAction(R.string.error_snackbar_action, v ->
+                    .setAction(context.getString(R.string.error_snackbar_action).toUpperCase(), v ->
                             startErrorActivity(returnActivity, context, errorInfo, el)).show();
         } else {
             startErrorActivity(returnActivity, context, errorInfo, el);

From 2d62fa401d63551785859b0d909f8414e94ba191 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 8 Feb 2020 09:56:37 +0100
Subject: [PATCH 148/199] real markdown support for descriptions

and update third-party licences in about page
---
 app/build.gradle                                 |  4 ++++
 .../org/schabi/newpipe/about/AboutActivity.java  | 16 +++++++++-------
 .../fragments/detail/VideoDetailFragment.java    | 14 +++++++-------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 728d380c4..65ab78ffa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,6 +53,7 @@ ext {
     okHttpLibVersion = '3.12.6'
     icepickLibVersion = '3.2.0'
     stethoLibVersion = '1.5.0'
+    markwonVersion = '4.2.1'
 }
 
 dependencies {
@@ -108,4 +109,7 @@ dependencies {
 
     implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}"
     debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}"
+
+    implementation "io.noties.markwon:core:${markwonVersion}"
+    implementation "io.noties.markwon:linkify:${markwonVersion}"
 }
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 9e23d9d3d..edfc54375 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -32,18 +32,20 @@ public class AboutActivity extends AppCompatActivity {
      * List of all software components
      */
     private static final SoftwareComponent[] SOFTWARE_COMPONENTS = new SoftwareComponent[]{
-            new SoftwareComponent("Giga Get", "2014", "Peter Cai", "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL2),
-            new SoftwareComponent("NewPipe Extractor", "2017", "Christian Schabesberger", "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
+            new SoftwareComponent("Giga Get", "2014 - 2015", "Peter Cai", "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL2),
+            new SoftwareComponent("NewPipe Extractor", "2017 - 2020", "Christian Schabesberger", "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
             new SoftwareComponent("Jsoup", "2017", "Jonathan Hedley", "https://github.com/jhy/jsoup", StandardLicenses.MIT),
             new SoftwareComponent("Rhino", "2015", "Mozilla", "https://www.mozilla.org/rhino/", StandardLicenses.MPL2),
             new SoftwareComponent("ACRA", "2013", "Kevin Gaudin", "http://www.acra.ch", StandardLicenses.APACHE2),
             new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich", "https://github.com/nostra13/Android-Universal-Image-Loader", StandardLicenses.APACHE2),
-            new SoftwareComponent("CircleImageView", "2014 - 2017", "Henning Dodenhof", "https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2),
+            new SoftwareComponent("CircleImageView", "2014 - 2020", "Henning Dodenhof", "https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2),
             new SoftwareComponent("NoNonsense-FilePicker", "2016", "Jonas Kalderstam", "https://github.com/spacecowboy/NoNonsense-FilePicker", StandardLicenses.MPL2),
-            new SoftwareComponent("ExoPlayer", "2014-2017", "Google Inc", "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2),
-            new SoftwareComponent("RxAndroid", "2015", "The RxAndroid authors", "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2),
-            new SoftwareComponent("RxJava", "2016-present", "RxJava Contributors", "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2),
-            new SoftwareComponent("RxBinding", "2015", "Jake Wharton", "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2)
+            new SoftwareComponent("ExoPlayer", "2014 - 2020", "Google Inc", "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxAndroid", "2015 - 2018", "The RxAndroid authors", "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxJava", "2016 - 2020", "RxJava Contributors", "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxBinding", "2015 - 2018", "Jake Wharton", "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2),
+            new SoftwareComponent("PrettyTime", "2012 - 2020", "Lincoln Baxter, III", "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2),
+            new SoftwareComponent("Markwon", "2017 - 2020", "Noties", "https://github.com/noties/Markwon", StandardLicenses.APACHE2)
     };
 
     /**
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 c6c8ca04c..3c594bdfa 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
@@ -95,6 +95,8 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import icepick.State;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.linkify.LinkifyPlugin;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
@@ -922,10 +924,6 @@ public class VideoDetailFragment
             return;
         }
 
-        if (description.getType() != Description.HTML) {
-            videoDescriptionView.setAutoLinkMask(Linkify.WEB_URLS);
-        }
-
         if (description.getType() == Description.HTML) {
             disposables.add(Single.just(description.getContent())
                     .map((@io.reactivex.annotations.NonNull String descriptionText) -> {
@@ -945,12 +943,14 @@ public class VideoDetailFragment
                         videoDescriptionView.setVisibility(View.VISIBLE);
                     }));
         } else if (description.getType() == Description.MARKDOWN) {
-            //in the future we would use a library or a good method to show markdown.
-            //rn, we just remove **bold**, and let PLAIN_TEXT otherwise
-            videoDescriptionView.setText(description.getContent().replace("**", ""), TextView.BufferType.SPANNABLE);
+            final Markwon markwon = Markwon.builder(getContext())
+                    .usePlugin(LinkifyPlugin.create())
+                    .build();
+            markwon.setMarkdown(videoDescriptionView, description.getContent());
             videoDescriptionView.setVisibility(View.VISIBLE);
         } else {
             //== Description.PLAIN_TEXT
+            videoDescriptionView.setAutoLinkMask(Linkify.WEB_URLS);
             videoDescriptionView.setText(description.getContent(), TextView.BufferType.SPANNABLE);
             videoDescriptionView.setVisibility(View.VISIBLE);
         }

From 3f3d1bfccf9be4182bd2872358263d3c904e447a Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sun, 9 Feb 2020 00:00:14 +0100
Subject: [PATCH 149/199] 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 65ab78ffa..5da8c9ff0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.B0pol:NewPipeExtractor:11bcc78d9c8eb39e8d61a6f4bc4112025937f087'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:9112a10'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 

From eb7d9f76e56731407f850f2fd278f5d052b5ab08 Mon Sep 17 00:00:00 2001
From: AioiLight <info@aioilight.space>
Date: Sat, 8 Feb 2020 17:47:01 +0000
Subject: [PATCH 150/199] Translated using Weblate (Japanese)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-ja/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index cf63e33e1..adaaa3828 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -498,7 +498,7 @@
     <string name="download_choose_new_path">ダウンロードフォルダーを変更して有効にします</string>
     <string name="drawer_header_description">サービスの切り替え、現在の選択:</string>
     <plurals name="videos">
-        <item quantity="other">動画</item>
+        <item quantity="other">%s つの動画</item>
     </plurals>
     <string name="default_kiosk_page_summary">デフォルトのキオスク</string>
     <string name="no_one_watching">誰も見ていません</string>
@@ -530,4 +530,10 @@
     <string name="clear_download_history">ダウンロード履歴を消去</string>
     <string name="delete_downloaded_files">ダウンロードしたファイルを消去</string>
     <string name="deleted_downloads">%1$s 個削除しました</string>
+    <string name="playlist_no_uploader">自動生成 (アップローダーが見つかりません)</string>
+    <string name="permission_display_over_apps">他のアプリの上に表示する権限を与えてください</string>
+    <string name="app_language_title">アプリの言語</string>
+    <string name="systems_language">システムの既定</string>
+    <string name="subtitle_activity_recaptcha">解けたら \"完了\" を押してください</string>
+    <string name="recaptcha_done_button">完了</string>
 </resources>
\ No newline at end of file

From c1d9a253b0f72b504414f832ff4972fbe657cee4 Mon Sep 17 00:00:00 2001
From: pjammo <adrianoghr@hotmail.it>
Date: Sat, 8 Feb 2020 19:20:17 +0000
Subject: [PATCH 151/199] Translated using Weblate (Italian)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-it/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5acc513e7..eef99d93f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -538,4 +538,9 @@
     <string name="clear_download_history">Svuota Cronologia Download</string>
     <string name="delete_downloaded_files">Elimina File Scaricati</string>
     <string name="deleted_downloads">%1$s download eliminati</string>
+    <string name="permission_display_over_apps">Consentire la visualizzazione sopra altre applicazioni</string>
+    <string name="app_language_title">Lingua Applicazione</string>
+    <string name="systems_language">Predefinita di Sistema</string>
+    <string name="subtitle_activity_recaptcha">Premere \"Fatto\" quando risolto</string>
+    <string name="recaptcha_done_button">Fatto</string>
 </resources>
\ No newline at end of file

From a75deb6ba2b7a6758caa44cb3d3dff62a730ad11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Sun, 9 Feb 2020 16:29:51 +0100
Subject: [PATCH 152/199] Reverted changes

---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3ffc9c14..ccd58f003 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -355,7 +355,7 @@
     <string name="github_url" translatable="false">https://github.com/TeamNewPipe/NewPipe</string>
     <string name="view_on_github">View on GitHub</string>
     <string name="donation_title">Donate</string>
-    <string name="donation_encouragement">Treat the newPipe makers to something you like, by way of funding its development.</string>
+    <string name="donation_encouragement">NewPipe is developed by volunteers spending their free time bringing you the best user experience. Give back to help developers make NewPipe even better while they enjoy a cup of coffee.</string>
     <string name="donation_url" translatable="false">https://newpipe.schabi.org/donate</string>
     <string name="give_back">Give back</string>
     <string name="website_title">Website</string>
@@ -529,7 +529,7 @@
     <string name="auto">Auto</string>
     <string name="switch_view">Switch View</string>
     <!-- App update notification -->
-    <string name="app_update_notification_content_title">Install the fresh NewPipe version.</string>
+    <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">Pending</string>

From 0882d9d66b94994d5c85e312cf28cbb95da9f2a7 Mon Sep 17 00:00:00 2001
From: Ali Demirtas <alidemirtas94@gmail.com>
Date: Sun, 9 Feb 2020 08:55:08 +0000
Subject: [PATCH 153/199] Translated using Weblate (Turkish)

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

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index bab98a791..1dd9deff6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -430,7 +430,7 @@
     <string name="paused">durduruldu</string>
     <string name="queued">sırada</string>
     <string name="post_processing">son işlemler uygulanıyor</string>
-    <string name="enqueue">Kuyruk</string>
+    <string name="enqueue">Sıra</string>
     <string name="permission_denied">İşlem sistem tarafından reddedildi</string>
     <string name="download_failed">İndirme başarısız</string>
     <string name="download_finished">İndirme bitti</string>

From 17d00837bdc105cfbed1f47010be889e666aba4a Mon Sep 17 00:00:00 2001
From: vkhomenk <animusfidens@gmail.com>
Date: Mon, 10 Feb 2020 10:59:09 +0000
Subject: [PATCH 154/199] Translated using Weblate (Ukrainian)

Currently translated at 99.2% (528 of 532 strings)
---
 app/src/main/res/values-uk/strings.xml | 30 ++++++++++++++++++++------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ef5dbee53..a041a5496 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -233,9 +233,9 @@
         <item quantity="many">%s підписників</item>
     </plurals>
     <plurals name="videos">
-        <item quantity="one">Відео</item>
-        <item quantity="few">Відео</item>
-        <item quantity="many">Відео</item>
+        <item quantity="one">%s відео</item>
+        <item quantity="few">%s відео</item>
+        <item quantity="many">%s відео</item>
     </plurals>
     <string name="create">Створити</string>
     <string name="delete_one">Видалити одне</string>
@@ -491,7 +491,7 @@
     <string name="error_insufficient_storage">На пристрої не залишилося вільного місця</string>
     <string name="error_progress_lost">Прогрес втрачено через видалення файлу</string>
     <string name="error_timeout">Час очікування з\'єднання вичерпано</string>
-    <string name="confirm_prompt">Ви впевнені\?</string>
+    <string name="confirm_prompt">Очистити історію завантажень, чи завантажені файли\?</string>
     <string name="enable_queue_limit">Обмежити чергу завантажень</string>
     <string name="enable_queue_limit_desc">В кожен момент часу виконуватиметься одне завантаження</string>
     <string name="start_downloads">Почати завантаження</string>
@@ -524,8 +524,24 @@
     <string name="localization_changes_requires_app_restart">Мова зміниться після перезапуску програми.</string>
     <string name="seek_duration_title">Швидке перемотування</string>
     <string name="peertube_instance_url_title">Не вдалося перевірити екземпляр</string>
-    <string name="peertube_instance_url_summary">Оберіть ваш улюблений екземпляр peertube.</string>
-    <string name="peertube_instance_url_help">Знайдіть екземпляри, які найбільше підходять вам на https://joinpeertube.org/instance#instance-list</string>
+    <string name="peertube_instance_url_summary">Оберіть сервер PeerTube</string>
+    <string name="peertube_instance_url_help">Знайти найбільш підходящий сервер можна на %s</string>
     <string name="peertube_instance_add_title">Додати екземпляр</string>
-    <string name="peertube_instance_add_help">Введіть посилання на екземпляр</string>
+    <string name="peertube_instance_add_help">Введіть посилання на сервер</string>
+    <string name="peertube_instance_add_https_only">Підтримуються лише HTTP посилання</string>
+    <string name="peertube_instance_add_exists">Сервер уже додано</string>
+    <string name="recently_added">Недавно додані</string>
+    <string name="most_liked">Найбільш вподобані</string>
+    <string name="recovering">відновлюється</string>
+    <string name="error_download_resource_gone">Неможливо відновити це завантаження</string>
+    <string name="choose_instance_prompt">Оберіть сервер</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Прев\'ю на екрані блокування</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">При використанні фонового плеєра, прев\'ю відео буде показано на екрані блокування</string>
+    <string name="clear_download_history">Очистити історію завантажень</string>
+    <string name="delete_downloaded_files">Видалити завантажені файли</string>
+    <string name="permission_display_over_apps">Потрібен дозвіл показувати поверх інших додатків</string>
+    <string name="app_language_title">Мова</string>
+    <string name="systems_language">Мова телефону</string>
+    <string name="subtitle_activity_recaptcha">Натисніть \"Готово\" по закінченню</string>
+    <string name="recaptcha_done_button">Готово</string>
 </resources>
\ No newline at end of file

From 99400fa570721fe76cca082221d76230901c0b45 Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Mon, 10 Feb 2020 20:02:14 +0000
Subject: [PATCH 155/199] Translated using Weblate (Czech)

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

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4c66d4f66..ff89170ac 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -64,7 +64,7 @@
     <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="main_bg_subtitle">Začni klepnutím na hledat</string>
     <string name="msg_copied">Zkopírováno do schránky</string>
     <string name="msg_wait">Počkejte prosím…</string>
     <string name="msg_running">NewPipe stahuje</string>

From 9f9c6eff0042cb114b71794a91c10be266d3cc4a Mon Sep 17 00:00:00 2001
From: Shafiq Jamzuri <1994_shafiq_1414@outlook.my>
Date: Sun, 9 Feb 2020 14:09:27 +0000
Subject: [PATCH 156/199] Translated using Weblate (Malay)

Currently translated at 84.2% (448 of 532 strings)
---
 app/src/main/res/values-ms/strings.xml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index f53450e13..d8d291759 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources><string name="main_bg_subtitle">Tekan carian untuk bermula</string>
+<resources>
+    <string name="main_bg_subtitle">Tekan carian untuk bermula</string>
     <string name="view_count_text">%1$s tontonan</string>
     <string name="upload_date_text">Diterbitkan pada %1$s</string>
     <string name="no_player_found">Tiada pemain strim ditemui. Adakah anda mahu memasang VLC\?</string>
@@ -27,7 +28,6 @@
     <string name="subscription_change_failed">Tidak dapat menukar langganan</string>
     <string name="subscription_update_failed">Tidak dapat mengemaskini langganan</string>
     <string name="show_info">Papar maklumat</string>
-
     <string name="tab_main">Utama</string>
     <string name="tab_subscriptions">Langganan</string>
     <string name="tab_bookmarks">Penanda halaman Senarai main</string>
@@ -38,12 +38,12 @@
     <string name="controls_background_title">Latar Belakang</string>
     <string name="controls_popup_title">Popup</string>
     <string name="controls_add_to_playlist_title">Tambahkan Ke</string>
-    <string name="download_path_title">Lokasi muat turun video</string>
-    <string name="download_path_summary">Lokasi untuk menyimpan video yang dimuat turun</string>
-    <string name="download_path_dialog_title">Memasukkan lokasi muat turun video</string>
+    <string name="download_path_title">Folder muat turun video</string>
+    <string name="download_path_summary">Fail video yang dimuat turun disimpan di sini</string>
+    <string name="download_path_dialog_title">Pilih folder muat turun untuk fail video</string>
     <string name="download_path_audio_title">Lokasi muat turun audio</string>
-    <string name="download_path_audio_summary">Audio yang dimuat turun disimpan sini</string>
-    <string name="download_path_audio_dialog_title">Memasukkan lokasi muat turun fail audio</string>
+    <string name="download_path_audio_summary">Fail audio yang dimuat turun disimpan di sini</string>
+    <string name="download_path_audio_dialog_title">Pilih folder muat turun untuk fail audio</string>
     <string name="autoplay_by_calling_app_title">Main secara automatik</string>
     <string name="autoplay_by_calling_app_summary">Memain video apabila NewPipe dipanggil dari app lain</string>
     <string name="default_resolution_title">Resolusi utama</string>
@@ -224,13 +224,13 @@
     <string name="short_billion">B</string>
     <string name="no_subscribers">Tiada pelanggan</string>
     <plurals name="subscribers">
-    <item quantity="other">%s pelanggan</item>
-</plurals>
+        <item quantity="other">%s pelanggan</item>
+    </plurals>
     <string name="subscribers_count_not_available">Kira pelanggan tidak tersedia</string>
     <string name="no_views">Tiada tontonan</string>
     <plurals name="views">
-    <item quantity="other">%s tontonan</item>
-</plurals>
+        <item quantity="other">%s tontonan</item>
+    </plurals>
     <string name="no_videos">Tiada video</string>
     <string name="start">Mula</string>
     <string name="pause">Jeda</string>
@@ -459,4 +459,6 @@
     <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>
+    <string name="download_choose_new_path">Ubah folder muat turun untuk melihat kesan</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Dayakan lakaran kecil video skrin kunci</string>
 </resources>
\ No newline at end of file

From aecc9081527fb54cdf4176871a451f12f8e3d590 Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Date: Sun, 9 Feb 2020 17:29:43 +0000
Subject: [PATCH 157/199] Translated using Weblate (Spanish)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-es/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1216c02c5..17ef8b5b7 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -221,7 +221,7 @@
     <string name="select_a_channel">Seleccione un canal</string>
     <string name="no_channel_subscribed_yet">No hay suscripciones a canales todavía</string>
     <string name="select_a_kiosk">Seleccione un kiosco</string>
-    <string name="kiosk">Kiosco</string>
+    <string name="kiosk">Quiosco</string>
     <string name="trending">Tendencias</string>
     <string name="top_50">50 mejores</string>
     <string name="show_hold_to_append_summary">Mostrar sugerencia cuando se presiona el botón de 2.º plano o emergente en la página de detalles del vídeo</string>
@@ -517,7 +517,7 @@
         <item quantity="one">%s escucha</item>
         <item quantity="other">%s escuchas</item>
     </plurals>
-    <string name="localization_changes_requires_app_restart">El idioma cambiará luego de que la app sea reiniciada.</string>
+    <string name="localization_changes_requires_app_restart">El idioma cambiará luego de que se reinicie la aplicación.</string>
     <string name="seek_duration_title">Duración de búsqueda al avanzar y/o retroceder</string>
     <string name="peertube_instance_url_title">Instancias de PeerTube</string>
     <string name="peertube_instance_url_summary">Selecciona tus instancias favoritas de PeerTube</string>
@@ -525,7 +525,7 @@
     <string name="peertube_instance_add_title">Agregar instancia</string>
     <string name="peertube_instance_add_help">Ingresar URL de la instancia</string>
     <string name="peertube_instance_add_fail">No se pudo validar la instancia</string>
-    <string name="peertube_instance_add_https_only">Sólo URLs con HTTPS son soportados</string>
+    <string name="peertube_instance_add_https_only">Solo se admiten URL HTTPS</string>
     <string name="peertube_instance_add_exists">La instancia ya existe</string>
     <string name="local">Local</string>
     <string name="recently_added">Agregados recientemente</string>
@@ -538,8 +538,8 @@
     <string name="delete_downloaded_files">Eliminar archivos descargados</string>
     <string name="deleted_downloads">Eliminadas %1$s descargas</string>
     <string name="permission_display_over_apps">Dar permisos para que se muestre por sobre otras apps</string>
-    <string name="app_language_title">Idioma de la app</string>
+    <string name="app_language_title">Idioma de aplicación</string>
     <string name="systems_language">Predeterminado del sistema</string>
-    <string name="subtitle_activity_recaptcha">Presiona \"Hecho\" cuando esté resuelto</string>
+    <string name="subtitle_activity_recaptcha">Pulse en «Hecho» cuando esté resuelto</string>
     <string name="recaptcha_done_button">Hecho</string>
 </resources>
\ No newline at end of file

From 3624f1b9a2c1113a2bd09618590e265f84bdad48 Mon Sep 17 00:00:00 2001
From: burstw0w <burstw0w@protonmail.com>
Date: Tue, 11 Feb 2020 01:05:34 +0000
Subject: [PATCH 158/199] Translated using Weblate (Serbian)

Currently translated at 46.6% (248 of 532 strings)
---
 app/src/main/res/values-sr/strings.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index a8abb98e9..ee999d779 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -14,9 +14,9 @@
     <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">Пусти помоћу Кодија</string>
     <string name="kore_not_found">Апликација Кор (Kore) није нађена. Инсталирати је?</string>
@@ -57,7 +57,6 @@
     <string name="youtube_signature_decryption_error">Не могу да дешифрујем потпис видео урл-а</string>
     <string name="parsing_error">Не могу да рашчланим веб-сајт</string>
     <string name="content_not_available">Садржај није доступан</string>
-
     <string name="content">Садржај</string>
     <string name="show_age_restricted_content_title">Прикажи старосно-ограничени садржај</string>
     <string name="video_is_age_restricted">Старосно-ограничени видео. Премошћавање је доступно у поставкама.</string>
@@ -82,7 +81,7 @@
     <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>
+    <string name="autoplay_by_calling_app_summary">Пушта видео по позиву друге апликације</string>
     <string name="start">Почни</string>
     <string name="pause">Паузирај</string>
     <string name="view">Пусти</string>
@@ -179,7 +178,7 @@
     <string name="error_unable_to_load_license">Не могу да учитам лиценцу</string>
     <string name="channel_unsubscribed">Одјављен са канала</string>
     <string name="subscription_change_failed">Не могу да изменим претплату</string>
-    <string name="subscription_update_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>

From c7a9847e662c01e8aa7b6536008dc254ffb7fcf1 Mon Sep 17 00:00:00 2001
From: Daniele Lira Mereb <danielelmereb@gmail.com>
Date: Thu, 13 Feb 2020 19:36:39 +0000
Subject: [PATCH 159/199] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-pt-rBR/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 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 04c4e3960..04f73b7e4 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -496,7 +496,7 @@ abrir em modo popup</string>
     <string name="error_insufficient_storage">Não há espaço disponível no dispositivo</string>
     <string name="error_progress_lost">Progresso perdido devido ao arquivo ter sido apagado</string>
     <string name="error_timeout">Tempo limite de conexão</string>
-    <string name="confirm_prompt">Tem certeza\?</string>
+    <string name="confirm_prompt">Apagar todo o histórico de downloads ou excluir todos os arquivos baixados\?</string>
     <string name="enable_queue_limit">Limitar tamanho da fila de download</string>
     <string name="enable_queue_limit_desc">Um download será executado ao mesmo tempo</string>
     <string name="start_downloads">Iniciar downloads</string>
@@ -543,4 +543,12 @@ abrir em modo popup</string>
     <string name="choose_instance_prompt">Escolha uma instância</string>
     <string name="enable_lock_screen_video_thumbnail_title">Ativar capa do vídeo na tela de bloqueio</string>
     <string name="enable_lock_screen_video_thumbnail_summary">Mostra capa do vídeo na tela de bloqueio ao usar player em segundo plano</string>
+    <string name="clear_download_history">Limpar histórico de downloads</string>
+    <string name="delete_downloaded_files">Excluir arquivos baixados</string>
+    <string name="deleted_downloads">%1$s arquivos excluídos</string>
+    <string name="permission_display_over_apps">Permita sobreposição a outros aplicativos</string>
+    <string name="app_language_title">Idioma do aplicativo</string>
+    <string name="systems_language">Padrão do sistema</string>
+    <string name="subtitle_activity_recaptcha">Toque em \"Feito\" ao resolver</string>
+    <string name="recaptcha_done_button">Feito</string>
 </resources>
\ No newline at end of file

From 3b5cf0e37c012935d0f4df5a94012d6f8c9c7aaf Mon Sep 17 00:00:00 2001
From: Nogooduser <nice.bakuretsu@gmail.com>
Date: Thu, 13 Feb 2020 16:14:56 +0000
Subject: [PATCH 160/199] Translated using Weblate (Portuguese)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-pt/strings.xml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 3c4977a06..c06a1909d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -23,7 +23,7 @@
     <string name="play_with_kodi_title">Reproduzir no Kodi</string>
     <string name="kore_not_found">Aplicação Kore não encontrada. Instalar?</string>
     <string name="show_play_with_kodi_title">Mostrar opção \"Reproduzir no Kodi\"</string>
-    <string name="show_play_with_kodi_summary">Exibe uma opção para reproduzir o vídeo no Kodi</string>
+    <string name="show_play_with_kodi_summary">Exibir uma opção para reproduzir o vídeo via Kodi media center</string>
     <string name="play_audio">Áudio</string>
     <string name="default_audio_format_title">Formato de áudio predefinido</string>
     <string name="download_dialog_title">Transferir</string>
@@ -109,7 +109,7 @@
     <string name="open_in_popup_mode">Abrir no modo de janela autónoma</string>
     <string name="black_theme_title">Preto</string>
     <string name="all">Tudo</string>
-    <string name="channel">Canais</string>
+    <string name="channel">Canal</string>
     <string name="yes">Sim</string>
     <string name="later">Depois</string>
     <string name="short_thousand">k</string>
@@ -152,7 +152,7 @@
     <string name="tab_about">Sobre</string>
     <string name="tab_contributors">Colaboradores</string>
     <string name="tab_licenses">Licenças</string>
-    <string name="app_description">Aplicação de reprodução de emissões livre para Android.</string>
+    <string name="app_description">Aplicação livre de reprodução de emissões para Android.</string>
     <string name="view_on_github">Ver no GitHub</string>
     <string name="app_license_title">Licença do NewPipe</string>
     <string name="contribution_encouragement">Se tem ideias para: tradução, alterações de desenho, limpeza de código, ou alterações significativas no código fonte - todas as ajudas são bem-vindas. Quanto mais se faz, melhor ficará!</string>
@@ -217,7 +217,7 @@
     <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>
+    <string name="subscription_page_summary">Subscrições</string>
     <string name="channel_page_summary">Página do canal</string>
     <string name="select_a_channel">Selecione um canal</string>
     <string name="no_channel_subscribed_yet">Não existem canais subscritos</string>
@@ -225,7 +225,7 @@
     <string name="kiosk">Kiosk</string>
     <string name="trending">Tendências</string>
     <string name="top_50">Top 50</string>
-    <string name="new_and_hot">Novo e popular</string>
+    <string name="new_and_hot">Tendências</string>
     <string name="title_activity_background_player">Reprodutor em segundo plano</string>
     <string name="title_activity_popup_player">Reprodutor \'popup\'</string>
     <string name="play_queue_remove">Remover</string>
@@ -266,7 +266,7 @@
     <string name="download_thumbnail_title">Carregar miniaturas</string>
     <string name="download_thumbnail_summary">Desative para parar o carregamento das miniaturas, poupar dados e utilização da memória. As alterações limpam a cache de imagem do disco e da memória.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Cache de imagens limpa</string>
-    <string name="default_content_country_title">País do conteúdo predefinido</string>
+    <string name="default_content_country_title">País predefinido dos conteúdos</string>
     <string name="settings_category_debug_title">Depuração</string>
     <string name="video_streams_empty">Não foram encontradas emissões de vídeo</string>
     <string name="audio_streams_empty">Não foram encontradas emissões de áudio</string>
@@ -279,7 +279,7 @@
     <string name="dismiss">Rejeitar</string>
     <string name="website_title">Site</string>
     <string name="website_encouragement">Visite ao site NewPipe para obter mais informação e novidades.</string>
-    <string name="kiosk_page_summary">Página \"kiosk\"</string>
+    <string name="kiosk_page_summary">Página de Quiosque</string>
     <string name="feed_page_summary">Página de \"Feed\"</string>
     <string name="export_complete_toast">Exportados</string>
     <string name="import_complete_toast">Importados</string>
@@ -372,8 +372,8 @@
     <string name="enqueue_on_background">Colocar em fila em segundo plano</string>
     <string name="enqueue_on_popup">Colocar em fila num nova janela</string>
     <string name="preferred_open_action_settings_title">Ação de \'abrir\' preferida</string>
-    <string name="preferred_open_action_settings_summary">Ação predefinida para abrir o conteúdo — %s</string>
-    <string name="set_as_playlist_thumbnail">Definir como miniatura da lista de reprodução</string>
+    <string name="preferred_open_action_settings_summary">Ação predefinida ao 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 eliminar a lista de reprodução.</string>
     <string name="resize_fit">Ajustar</string>
     <string name="resize_fill">Preencher</string>
@@ -537,4 +537,9 @@
     <string name="clear_download_history">Limpar histórico de descarregamentos</string>
     <string name="delete_downloaded_files">Apagar ficheiros descarregados</string>
     <string name="deleted_downloads">%1$s descarregamentos apagados</string>
+    <string name="permission_display_over_apps">Permitir sobreposição da janela sobre outras aplicações</string>
+    <string name="app_language_title">Idioma da aplicação</string>
+    <string name="systems_language">Predefinição do sistema</string>
+    <string name="subtitle_activity_recaptcha">Pressionar \"Aceitar\" quando terminar</string>
+    <string name="recaptcha_done_button">Aceitar</string>
 </resources>
\ No newline at end of file

From c995c6fda5d4c29494c9084c19c2640ab49082b0 Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Wed, 12 Feb 2020 22:32:21 +0000
Subject: [PATCH 161/199] Translated using Weblate (Croatian)

Currently translated at 88.2% (469 of 532 strings)
---
 app/src/main/res/values-hr/strings.xml | 34 +++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index beb2bdd02..d5e751262 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -30,12 +30,12 @@
     <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_title">Mapa za preuzimanje videozapisa</string>
+    <string name="download_path_summary">Preuzete video datoteke se spremaju ovdje</string>
+    <string name="download_path_dialog_title">Odaberi mapu za preuzimanje video datoteka</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="download_path_audio_summary">Preuzete audio datoteke se spremaju ovdje</string>
+    <string name="download_path_audio_dialog_title">Odaberi mapu za preuzimanje audio datoteka</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>
@@ -61,7 +61,7 @@
     <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 &amp; Predmemorija</string>
+    <string name="enable_watch_history_title">Prati povijest</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>
@@ -116,7 +116,7 @@
     <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_thumbnail_view_description">Pokreni video, trajanje:</string>
     <string name="detail_uploader_thumbnail_view_description">Profilna slika prenositelja</string>
     <string name="detail_likes_img_view_description">Goreglasovi</string>
     <string name="detail_dislikes_img_view_description">Doljeglasovi</string>
@@ -130,9 +130,9 @@
     <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="short_thousand">tis</string>
+    <string name="short_thousand">tis.</string>
     <string name="short_million">mil</string>
-    <string name="short_billion">mlrd</string>
+    <string name="short_billion">mlrd.</string>
     <string name="start">Počni</string>
     <string name="pause">Pauziraj</string>
     <string name="view">Reproduciraj</string>
@@ -150,7 +150,7 @@
     <string name="msg_running_detail">Dodirni za detalje</string>
     <string name="msg_wait">Molimo pričekajte…</string>
     <string name="msg_copied">Kopirano u međuspremnik</string>
-    <string name="no_available_dir">Molimo odaberite dostupnu mapu za preuzimanje</string>
+    <string name="no_available_dir">Kasnije odredite mapu za preuzimanje u postavkama</string>
     <string name="msg_popup_permission">Ova dozvola je potrebna za
 \notvaranje skočnog prozora</string>
     <string name="recaptcha">reCAPTCHA</string>
@@ -209,8 +209,8 @@
     <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>
+        <item quantity="few">%s videa</item>
+        <item quantity="other">%s videa</item>
     </plurals>
     <string name="item_deleted">Stavka je izbrisana</string>
     <string name="background_player_append">U redu čekanja za reprod. u pozadini</string>
@@ -397,7 +397,7 @@
     <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="download_to_sdcard_error_message">Preuzimanje na vanjsku SD karticu nije moguće. Ponovo postaviti 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>
@@ -433,7 +433,7 @@
     <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="missions_header_pending">Na čekanju</string>
     <string name="paused">pauzirano</string>
     <string name="queued">Na redu za čekanje</string>
     <string name="post_processing">naknadna obrada</string>
@@ -446,8 +446,8 @@
     <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>
-    <string name="error_file_creation">Odredišnu mapu nije moguće izraditi</string>
+    <string name="error_path_creation">Odredišnu mapu nije moguće stvoriti</string>
+    <string name="error_file_creation">Datoteku nije moguće stvoriti</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>
@@ -460,7 +460,7 @@
     <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">Prekini na mrežama s ograničenim prometom</string>
     <string name="pause_downloads_on_mobile_desc">Preuzimanja koja se ne mogu zaustaviti ponovno će se pokrenuti</string>
     <string name="show_comments_title">Prikaži komentare</string>
     <string name="show_comments_summary">Onemogućite da biste prestali prikazivati komentare</string>

From 67af05e5048dc6124a741ad1dd1544845f815976 Mon Sep 17 00:00:00 2001
From: Tobias Groza <TobiGr@users.noreply.github.com>
Date: Fri, 14 Feb 2020 19:12:59 +0100
Subject: [PATCH 162/199] Use "Report error" instead of "Report Error"

Co-Authored-By: Stypox <stypox@pm.me>
---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ccd58f003..eb17fcd50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -246,7 +246,7 @@
     <string name="detail_dislikes_img_view_description">Dislikes</string>
     <string name="use_tor_title">Use Tor</string>
     <string name="use_tor_summary">(Experimental) Force download traffic through Tor for increased privacy (streaming videos not yet supported).</string>
-    <string name="report_error">Report Error</string>
+    <string name="report_error">Report error</string>
     <string name="user_report">User report</string>
     <string name="search_no_results">No results</string>
     <string name="empty_view_no_videos" translatable="false">@string/no_videos</string>

From dbb6848a9b0282b2d0ff62abe53d56e7f43885b1 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Fri, 14 Feb 2020 20:35:48 +0000
Subject: [PATCH 163/199] Translated using Weblate (Esperanto)

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

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index ddbda086a..33f24695f 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -539,7 +539,7 @@
     <string name="deleted_downloads">%1$s elŝutoj forviŝitaj</string>
     <string name="permission_display_over_apps">Doni la permeson por afiŝiĝi supre aliaj apoj</string>
     <string name="app_language_title">Lingvo de la apo</string>
-    <string name="systems_language">Sistema lingvo</string>
+    <string name="systems_language">Sistemnormo</string>
     <string name="subtitle_activity_recaptcha">Premu « Finita » kiam solvita</string>
     <string name="recaptcha_done_button">Finita</string>
 </resources>
\ No newline at end of file

From 0d896674286d3317d04fa2695507dddb5339dcbe Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Fri, 14 Feb 2020 20:32:32 +0000
Subject: [PATCH 164/199] Translated using Weblate (French)

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

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8a8c00c60..c200b1b8b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -540,7 +540,7 @@
     <string name="deleted_downloads">%1$s téléchargements supprimés</string>
     <string name="permission_display_over_apps">Autoriser la superposition d\'applis</string>
     <string name="app_language_title">Langue de l\'application</string>
-    <string name="systems_language">Langue du système</string>
+    <string name="systems_language">Prédéfini par le système</string>
     <string name="subtitle_activity_recaptcha">Appuyez sur « Terminé » une fois résolu</string>
     <string name="recaptcha_done_button">Terminé</string>
 </resources>
\ No newline at end of file

From 6a91a3a9478fcd5d6520c5549cc87802b92487bd Mon Sep 17 00:00:00 2001
From: chr56 <chr0056@gmail.com>
Date: Sat, 15 Feb 2020 12:52:19 +0800
Subject: [PATCH 165/199] reapply changes after merging

---
 app/src/main/res/values-cmn/strings.xml    | 504 ------------
 app/src/main/res/values-zh-rCN/strings.xml | 867 +++++++++++----------
 2 files changed, 475 insertions(+), 896 deletions(-)
 delete mode 100644 app/src/main/res/values-cmn/strings.xml

diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml
deleted file mode 100644
index 878efa9f2..000000000
--- a/app/src/main/res/values-cmn/strings.xml
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-    <string name="no_player_found_toast">找不到媒体播放器（您可以安装 VLC 来播放）。</string>
-    <string name="install">安装</string>
-    <string name="cancel">取消</string>
-    <string name="open_in_browser">在浏览器中打开</string>
-    <string name="open_in_popup_mode">在悬浮窗模式下打开</string>
-    <string name="share">分享</string>
-    <string name="download">下载</string>
-    <string name="controls_download_desc">下载媒体文件</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="use_external_video_player_title">使用外部视频播放器</string>
-    <string name="use_external_video_player_summary">删除某些分辨率下的音频</string>
-    <string name="use_external_audio_player_title">使用外部音频播放器</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="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>
-    <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="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_video_format_title">默认视频格式</string>
-    <string name="theme_title">主题</string>
-    <string name="light_theme_title">亮色</string>
-    <string name="dark_theme_title">酷黑</string>
-    <string name="black_theme_title">黑色</string>
-    <string name="popup_remember_size_pos_title">记住悬浮窗的尺寸与位置</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>
-    <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>
-    <string name="search_no_results">没有结果</string>
-    <string name="start">开始</string>
-    <string name="pause">暂停</string>
-    <string name="view">播放</string>
-    <string name="create">创建</string>
-    <string name="delete">删除</string>
-    <string name="delete_all">删除所有</string>
-    <string name="add">新任务</string>
-    <string name="finish">好
-\n</string>
-    <string name="msg_error">错误
-\n</string>
-    <string name="msg_server_unsupported">不支持的服务器</string>
-    <string name="msg_exists">文件已存在</string>
-    <string name="msg_running">NewPipe 下载中</string>
-    <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>
-    <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="use_inexact_seek_title">使用快速粗略定位</string>
-    <string name="use_inexact_seek_summary">粗略定位功能允许播放器以略低的精确度为代价换取更快的定位速度</string>
-    <string name="download_thumbnail_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="download_thumbnail_summary">不加载缩略图时，可以节省数据和存储空间。更改后将清除存储空间和扩展空间的缓存。</string>
-    <string name="auto_queue_title">自动排列下一个媒体</string>
-    <string name="auto_queue_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="download_dialog_title">下载</string>
-    <string name="next_video_title">下一部</string>
-    <string name="show_next_and_similar_title">显示「下一部」及「相关」的视频</string>
-    <string name="show_hold_to_append_title">显示「长按以新增」的提示</string>
-    <string name="show_hold_to_append_summary">在视频详细信息页按下后台播放或悬浮窗按钮时提示</string>
-    <string name="url_not_supported_toast">不支持该网址</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_video_audio_title">视频与音频</string>
-    <string name="settings_category_history_title">历史记录和缓存数据</string>
-    <string name="settings_category_popup_title">悬浮窗</string>
-    <string name="settings_category_appearance_title">外观</string>
-    <string name="settings_category_other_title">其他</string>
-    <string name="settings_category_debug_title">调试</string>
-    <string name="background_player_playing_toast">在后台播放</string>
-    <string name="popup_playing_toast">在悬浮窗下播放</string>
-    <string name="background_player_append">已添加到后台播放队列</string>
-    <string name="popup_playing_append">已添加到悬浮窗播放队列</string>
-    <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="duration_live">直播</string>
-    <string name="downloads">下载</string>
-    <string name="downloads_title">下载</string>
-    <string name="error_report_title">错误报告</string>
-    <string name="all">所有</string>
-    <string name="channel">频道</string>
-    <string name="channels">频道</string>
-    <string name="playlist">播放列表</string>
-    <string name="playlists">播放列表</string>
-    <string name="tracks">曲目</string>
-    <string name="users">用户</string>
-    <string name="yes">是的</string>
-    <string name="later">稍等</string>
-    <string name="disabled">不适用</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="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>
-    <string name="export_data_summary">导出历史记录、订阅和播放列表</string>
-    <string name="clear_views_history_summary">删除播放过的媒体的历史记录及回放位置</string>
-    <string name="delete_view_history_alert">确定要清除所有观看历史记录吗？</string>
-    <string name="watch_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="could_not_load_thumbnails">无法加载所有缩略图</string>
-    <string name="youtube_signature_decryption_error">无法解析视频网址签名</string>
-    <string name="parsing_error">无法解析网站</string>
-    <string name="light_parsing_error">无法完全解析网站</string>
-    <string name="content_not_available">内容不可用</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="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="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="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="no_streams_available_download">没有可供下载的串流</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="what_device_headline">信息：</string>
-    <string name="what_happened_headline">发生了什么：</string>
-    <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="list_thumbnail_view_description">视频预览缩略图</string>
-    <string name="detail_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="use_tor_title">使用 Tor</string>
-    <string name="use_tor_summary">（实验性）通过 Tor 强制下载流量以增加隐私（暂不支持视频媒体）。</string>
-    <string name="user_report">用户报告</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="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"/>
-    </plurals>
-    <string name="no_views">无观看次数</string>
-    <plurals name="views">
-        <item quantity="one">%s 次观看</item>
-        <item quantity="other"/>
-    </plurals>
-    <string name="no_videos">没有视频</string>
-    <string name="delete_one">删除</string>
-    <string name="checksum">校验</string>
-    <string name="dismiss">退出</string>
-    <string name="rename">重命名</string>
-    <string name="msg_name">文件名</string>
-    <string name="msg_threads">线程</string>
-    <string name="msg_url_malform">错误的网址或网络不可用</string>
-    <string name="msg_running_detail">点按以查看详细信息</string>
-    <string name="msg_copied">复制到剪贴板</string>
-    <string name="no_available_dir">请稍后在设置中定义一个下载文件夹</string>
-    <string name="msg_popup_permission">在悬浮窗模式打开
-\n需要此权限</string>
-    <string name="one_item_deleted">已删除一个项目。</string>
-    <string name="recaptcha">reCAPTCHA 验证</string>
-    <string name="title_activity_recaptcha">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="copyright" formatted="true">© %1$s 由 %2$s 使用 %3$s 版权所有</string>
-    <string name="error_unable_to_load_license">无法加载许可证</string>
-    <string name="tab_about">关于</string>
-    <string name="tab_contributors">贡献者</string>
-    <string name="tab_licenses">许可证</string>
-    <string name="app_description">安卓上开源且轻便的媒体播放器。</string>
-    <string name="contribution_title">贡献</string>
-    <string name="contribution_encouragement">您是否有想法帮助我们：翻译、界面设计、代码优化以及真正繁重的功能扩展 - 我们随时欢迎您提供帮助。让 NewPipe 越变越好！</string>
-    <string name="view_on_github">在 GitHub 上查看</string>
-    <string name="donation_title">捐赠</string>
-    <string name="donation_encouragement">NewPipe 由社区人员维护和开发额，他们耗费时间务求为您带来最佳体验。现在是时候回过头来，让我们的开发人员能够在使 NewPipe 更加完美的同时，享受一杯咖啡。</string>
-    <string name="give_back">回馈</string>
-    <string name="website_title">网站</string>
-    <string name="website_encouragement">访问 NewPipe 网站了解更多信息和新闻。</string>
-    <string name="privacy_policy_title">NewPipe 的隐私政策</string>
-    <string name="privacy_policy_encouragement">NewPipe 项目是非常重视您的隐私。因此，未经您的同意，该应用程序不会收集任何数据。
-\nNewPipe 的隐私政策详细说明了当您发送崩溃报告时，什么资料会被传送及储存。</string>
-    <string name="read_privacy_policy">阅读隐私政策</string>
-    <string name="app_license_title">NewPipe 的许可证</string>
-    <string name="app_license">NewPipe 是一个 Copyleft 的自由软件：您可以随意使用、研究、分享或改进它。在遵守由自由软件基金会所发布的 GNU 通用公共授权条款的状况下，您可以自由地再发布或修改它；授权条款预设使用第三版，但您也可以选择更新的版本。</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>
-    <string name="history_disabled">历史记录被关闭了</string>
-    <string name="action_history">历史记录</string>
-    <string name="history_empty">没有历史记录</string>
-    <string name="history_cleared">清除历史记录</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="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>
-    <string name="subscription_page_summary">订阅页面</string>
-    <string name="feed_page_summary">Feed 页面</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="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="import_settings">您是否要导入设定？</string>
-    <string name="kiosk">互动</string>
-    <string name="trending">趋势</string>
-    <string name="top_50">前 50</string>
-    <string name="new_and_hot">最新和热门</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>
-    <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="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="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
-\n2.当被询问时登入帐号
-\n3.应该开始下载（这是导出文件）</string>
-    <string name="import_soundcloud_instructions">通过输入 URL 或 ID 来导入 SoundCloud的配置文件：
-\n
-\n1.在浏览器中启用「桌面模式」（该网站不适用于移动设备）
-\n2.移至该网址：%1$s
-\n3.当被询问时登入帐号
-\n4.复制您重定向的配置文件到网址。</string>
-    <string name="import_soundcloud_instructions_hint">您的 ID，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>
-    <string name="unhook_checkbox">取消链接（可能会导致扭曲）</string>
-    <string name="skip_silence_checkbox">静音时快进</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="content_language_title">默认的内容语言</string>
-    <string name="settings_category_updates_title">升级</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">无法下载到外部SD卡。重置下载文件夹位置？</string>
-    <string name="restore_defaults">恢复默认</string>
-    <string name="restore_defaults_confirmation">您真的要恢复至默认吗？</string>
-    <string name="selection">选择</string>
-    <string name="updates_setting_title">升级</string>
-    <string name="list">列表</string>
-    <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="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_finished_warning">同名的已下载文件已经存在</string>
-    <string name="download_already_running">同名下载进行中</string>
-    <string name="show_error">显示错误</string>
-    <string name="label_code">代码</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_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>
-    <string name="events">事件</string>
-    <string name="saved_tabs_invalid_json">使用默认选项卡, 读取保存的选项卡时出错</string>
-    <string name="subscribers_count_not_available">订阅者计数不可用</string>
-    <string name="main_page_content_summary">主页上显示的选项卡</string>
-    <string name="conferences">会议</string>
-    <string name="updates_setting_description">显示通知, 以便在新版本可用时提示应用更新</string>
-    <string name="list_view_mode">列表视图模式</string>
-    <string name="grid">网格</string>
-    <string name="switch_view">切换视图</string>
-    <string name="app_update_notification_content_title">NewPipe 更新可用!</string>
-    <string name="error_path_creation">无法创建目标文件夹</string>
-    <string name="error_http_unsupported_range">服务器不接受多线程下载, 请使用 @string/msg_threads = 1重试</string>
-    <string name="pause_downloads_on_mobile_desc">切换至移动数据时有用，尽管一些下载无法被暂停</string>
-    <string name="show_comments_title">显示评论</string>
-    <string name="show_comments_summary">禁用停止显示评论</string>
-    <string name="autoplay_title">自动播放</string>
-    <plurals name="comments">
-        <item quantity="one">评论</item>
-        <item quantity="other"/>
-    </plurals>
-    <string name="no_comments">没有评论</string>
-    <string name="error_unable_to_load_comments">无法加载评论</string>
-    <string name="close">关闭</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="watch_history_states_deleted">播放位置已删除。</string>
-    <string name="missing_file">文件被移动或删除</string>
-    <string name="overwrite_unrelated_warning">已存在具有此名称的文件</string>
-    <string name="overwrite_failed">无法覆盖该文件</string>
-    <string name="download_already_pending">同名文件正在等待下载</string>
-    <string name="error_postprocessing_stopped">处理此文件时 NewPipe 已关闭</string>
-    <string name="error_insufficient_storage">设备上没有剩余空间</string>
-    <string name="error_progress_lost">进度丢失，因为文件已被删除</string>
-    <string name="error_timeout">连接超时</string>
-    <string name="confirm_prompt">你确定吗？</string>
-    <string name="enable_queue_limit">限制下载队列</string>
-    <string name="enable_queue_limit_desc">同时只有一个下载进行</string>
-    <string name="start_downloads">开始全部下载</string>
-    <string name="pause_downloads">暂停全部下载</string>
-    <string name="downloads_storage_ask_title">询问下载位置</string>
-    <string name="downloads_storage_ask_summary">每次下载将询问保存的位置</string>
-    <string name="downloads_storage_ask_summary_kitkat">每次下载将询问保存的位置.
-\n如果要下载到外部SD卡，请选择外部存储访问框架</string>
-    <string name="downloads_storage_use_saf_title">使用存储访问框架</string>
-    <string name="downloads_storage_use_saf_summary">存储访问框架(SAF)允许下载文件到外部SD卡。
-\n注：一些设备不兼容SAF</string>
-    <string name="clear_playback_states_title">删除回放位置</string>
-    <string name="clear_playback_states_summary">删除所有回放位置</string>
-    <string name="delete_playback_states_alert">删除所有的回放位置吗？</string>
-    <string name="download_choose_new_path">更改要生效的下载文件夹</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0282e6c92..d0405b57d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,457 +1,540 @@
-<?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>
-    <string name="no_player_found">找不到播放器。您是否要安装 VLC？</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="open_in_browser">在浏览器中打开</string>
+    <string name="open_in_popup_mode">在悬浮窗模式下打开</string>
+    <string name="did_you_mean">您是不是要找：%1$s？</string>
+    <string name="no_player_found_toast">找不到串流播放器 （您可以安装 VLC 进行播放）。</string>
+    <string name="controls_download_desc">下载串流文件</string>
     <string name="install">安装</string>
     <string name="cancel">取消</string>
-    <string name="open_in_browser">用浏览器打开</string>
     <string name="share">分享</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="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_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，您要安装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_path_summary">已下载的视频存储在这里</string>
+    <string name="download_path_dialog_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">使用Kodi播放</string>
     <string name="theme_title">主题</string>
-    <string name="dark_theme_title">灰暗</string>
-    <string name="light_theme_title">明亮</string>
-
+    <string name="light_theme_title">浅色</string>
+    <string name="dark_theme_title">暗黑</string>
+    <string name="black_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="url_not_supported_toast">不支援此网址</string>
-    <string name="content_language_title">默认内容语言</string>
-    <string name="settings_category_video_audio_title">视频和音频</string>
+    <string name="next_video_title">下一个</string>
+    <string name="url_not_supported_toast">不支持的 URL</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="all">全部</string>
+    <string name="channel">频道</string>
+    <string name="yes">是</string>
+    <string name="later">稍后</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>
+    <plurals name="videos">
+        <item quantity="one">%s 个视频</item>
+        <item quantity="other">%s 个视频</item>
+    </plurals>
+    <string name="disabled">禁用</string>
+    <string name="controls_background_title">后台播放</string>
+    <string name="filter">过滤器</string>
+    <string name="refresh">刷新</string>
+    <string name="show_search_suggestions_title">搜索建议</string>
+    <string name="subscribe_button_title">订阅</string>
+    <string name="subscribed_button_title">已订阅</string>
+    <string name="enable_watch_history_title">观看历史</string>
+    <string name="settings_category_player_title">播放器</string>
+    <string name="settings_category_history_title">历史记录与缓存</string>
+    <string name="playlist">播放列表</string>
+    <string name="undo">撤销</string>
+    <string name="play_all">全部播放</string>
+    <string name="always">总是</string>
+    <string name="just_once">仅一次</string>
+    <string name="controls_add_to_playlist_title">添加至</string>
+    <string name="file">文件</string>
+    <string name="download_thumbnail_title">加载缩略图</string>
+    <string name="clear_views_history_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="channels">频道</string>
+    <string name="playlists">播放列表</string>
+    <string name="unsubscribe">取消订阅</string>
+    <string name="tab_new">新标签</string>
+    <string name="settings_category_updates_title">更新</string>
+    <string name="file_deleted">文件已删除</string>
+    <string name="subscribers_count_not_available">无法得知订阅人数</string>
+    <string name="updates_setting_description">每推出新版本时，弹出应用升级通知</string>
+    <string name="grid">网格</string>
+    <string name="app_update_notification_content_title">新版 NewPipe 已可升级！</string>
+    <string name="error_http_unsupported_range">服务器不接受 接收 multi-threaded 下载, 以 @string/msg_threads = 1 重试</string>
+    <string name="autoplay_title">自动播放</string>
+    <string name="settings_category_clear_data_title">清除数据</string>
+    <string name="watch_history_deleted">观看记录已删除</string>
     <string name="detail_likes_img_view_description">喜欢</string>
     <string name="detail_dislikes_img_view_description">不喜欢</string>
-    <string name="use_tor_title">使用 Tor</string>
-    <string name="use_tor_summary">（实验性）强制下载流量使用 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="err_dir_create">未能建立下载路径 “%1$s”</string>
-    <string name="info_dir_created">已创建下载目录 “%1$s”</string>
-    <string name="content">内容</string>
-    <string name="show_age_restricted_content_title">显示年龄限制内容</string>
-    <string name="video_is_age_restricted">视频有年龄限制。请先在设置中启用\"显示年龄限制内容\"。</string>
-    <string name="general_error">错误</string>
-    <string name="could_not_load_thumbnails">无法加载所有缩略图</string>
-    <string name="youtube_signature_decryption_error">无法解密视频网址签名</string>
-    <string name="parsing_error">无法解析网站</string>
-    <string name="light_parsing_error">无法完全解析网站</string>
-    <string name="content_not_available">内容不可用</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="sorry_string">抱歉，这本不应该发生。</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="your_comment">您的注释（英文）：</string>
-    <string name="error_details_headline">详细信息：</string>
-
-
+    <string name="use_tor_title">使用Tor</string>
+    <string name="use_tor_summary">（实验性）通过 Tor 强制下载流量以增强隐私（暂不支持串流视频）。</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="autoplay_by_calling_app_title">自动播放</string>
-    <string name="autoplay_by_calling_app_summary">当NewPipe被其他应用调用时，自动播放视频</string>
-    <string name="duration_live">直播</string>
-
-    <string name="main_bg_subtitle">点击搜索开始NewPipe</string>
+    <string name="storage_permission_denied">存储访问权限已被拒绝</string>
+    <plurals name="views">
+        <item quantity="one">%s 次观看</item>
+        <item quantity="other">%s 次观看</item>
+    </plurals>
+    <string name="short_thousand">千</string>
+    <string name="short_million">百万</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>
-    <string name="msg_error">错误</string>
-    <string name="msg_server_unsupported">服务器不支持</string>
-    <string name="msg_exists">文件已经存在</string>
-    <string name="msg_url_malform">网址不正确或网络不可用</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="checksum">校验</string>
     <string name="add">新任务</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服务：\\nGMT时间：\\n包：\\n版本：\\n操作系统版本：</string>
-    <string name="recaptcha">reCAPTCHA</string>
-    <string name="title_activity_recaptcha">reCAPTCHA 验证</string>
-
-    <string name="recaptcha_request_toast">需要 reCAPTCHA 验证</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="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="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>
-    <string name="default_video_format_title">首选视频格式</string>
-    <string name="black_theme_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="settings_category_popup_title">窗口模式</string>
-    <string name="popup_playing_toast">以窗口模式播放</string>
-    <string name="all">所有</string>
-    <string name="channel">频道</string>
-    <string name="yes">是的</string>
-    <string name="later">稍后</string>
-    <string name="disabled">已禁用</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="notification_channel_name">NewPipe 通知</string>
-    <string name="notification_channel_description">NewPipe 后台播放和窗口播放器的通知</string>
-
-    <string name="short_thousand">K</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
-
-    <string name="msg_popup_permission">该项权限用于
-\n以窗口模式打开</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="finish">OK</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_running_detail">点击了解详情</string>
+    <string name="msg_wait">请稍候…</string>
+    <string name="msg_copied">复制至剪贴板</string>
+    <string name="reCaptchaActivity">reCAPTCHA验证码</string>
+    <string name="controls_popup_title">悬浮窗播放</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="copyright" formatted="true">© %1$s by %2$s under %3$s</string>
-    <string name="error_unable_to_load_license">无法加载许可</string>
+    <string name="copyright" formatted="true">© %1$s :作者 %2$s (使用 %3$s )</string>
+    <string name="error_unable_to_load_license">无法加载许可证</string>
     <string name="action_open_website">打开网站</string>
     <string name="tab_about">关于</string>
     <string name="tab_contributors">贡献者</string>
-    <string name="tab_licenses">许可</string>
-    <string name="app_description">开源的轻量级流媒体Android客户端。</string>
-    <string name="view_on_github">在 GitHub 上查看</string>
-    <string name="app_license_title">NewPipe 许可</string>
-    <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>
-    <string name="history_disabled">历史记录已禁用</string>
-    <string name="action_history">历史记录</string>
-    <string name="history_empty">没有历史记录</string>
-    <string name="history_cleared">历史记录已清除</string>
-
-<string name="settings_category_player_title">播放器</string>
-    <string name="settings_category_player_behavior_title">行为</string>
-    <string name="settings_category_history_title">历史记录 &amp; 缓存</string>
-    <string name="background_player_append">在后台播放器上排队</string>
-    <string name="popup_playing_append">在弹出播放器上排队</string>
-    <string name="playlist">播放列表</string>
-    <string name="undo">撤销</string>
-    <string name="play_all">全部播放</string>
-
-    <string name="unknown_content">[未知]</string>
-
-    <string name="player_stream_failure">无法播放此流媒体</string>
-    <string name="player_unrecoverable_failure">发生无法解决的播放器错误</string>
+    <string name="tab_licenses">许可证</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="charset_letters_and_digits">字母和数字</string>
+    <string name="charset_most_special_characters">最特殊字符</string>
     <string name="search_no_results">没有结果</string>
-    <string name="empty_subscription_feed_subtitle">空空如也</string>
-
-    <string name="no_subscribers">无订阅者</string>
+    <string name="no_subscribers">没有订阅者</string>
     <plurals name="subscribers">
-	<item quantity="other">%s 位订阅者</item>
-</plurals>
-
-    <string name="no_views">无观看次数</string>
-    <plurals name="views">
-	<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="other">%s 部视频</item>
-</plurals>
-
-    <string name="item_deleted">项目已删除</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="download_thumbnail_title">加载缩略图</string>
-    <string name="download_thumbnail_summary">停用后，NewPipe將不再加载缩略图，减少数据使用和腾空存储空间，亦会清除内存和内存卡上的缩略图缓存</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="auto_queue_summary">当播放完非循环列表中的最后一个视频时，自动加入一个相关视频到播放列表</string>
-    <string name="show_hold_to_append_title">显示\"长按添加\"提示</string>
-    <string name="show_hold_to_append_summary">当视频详情页中的背景或悬浮按钮被按下的时候显示提示</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="file">文件</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>
-    <string name="export_data_summary">导出历史记录，订阅和播放列表</string>
-    <string name="player_recoverable_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="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="no_streams_available_download">无视频媒体可以下载</string>
-
-    <string name="detail_drag_description">拖拽以重新排列</string>
-
+    <string name="videos">视频</string>
+    <string name="detail_drag_description">拖动以重新排序</string>
     <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="donation_title">捐赠</string>
-    <string name="donation_encouragement">NewPipe 是一群志愿者花费业余时间开发的，目的是为您带来最佳体验。你的一点心意，可以让开发者们在享受一杯 Java 的咖啡的同时让 NewPipe 变得更好用。</string>
-    <string name="give_back">捐赠</string>
-    <string name="website_title">网页</string>
-    <string name="website_encouragement">访问 NewPipe 网站以获取更多的信息和新闻。</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="rename">重 命名</string>
+    <string name="toast_no_player">未安装用于播放此文件的应用程序</string>
+    <string name="one_item_deleted">已删除1个项目。</string>
+    <string name="main_page_content_summary">哪些标签需要在主页上展示</string>
+    <string name="list_view_mode">列表视图模式</string>
+    <string name="missions_header_finished">已完成</string>
+    <string name="missions_header_pending">等待中…</string>
+    <string name="paused">已暂停</string>
+    <string name="queued">排队中</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="no_comments">没有评论</string>
+    <string name="drawer_header_description">切换服务，当前选择：</string>
+    <string name="no_player_found">找不到串流播放器。您想安装 VLC 吗？</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_audio_title">音频下载文件夹</string>
+    <string name="autoplay_by_calling_app_summary">从其他应用调用 NewPipe 时播放视频</string>
+    <string name="default_resolution_title">默认分辨率</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_audio">音频</string>
+    <string name="default_audio_format_title">默认音频格式</string>
+    <string name="show_next_and_similar_title">显示“下一个”和“类似的”视频</string>
+    <string name="settings_category_video_audio_title">视频和音频</string>
+    <string name="background_player_playing_toast">在后台播放</string>
+    <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="duration_live">直播</string>
+    <string name="downloads">下载</string>
+    <string name="downloads_title">下载</string>
+    <string name="error_report_title">错误报告</string>
+    <string name="general_error">错误</string>
+    <string name="could_not_load_thumbnails">无法加载所有缩略图</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="could_not_setup_download_menu">无法设置下载菜单</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">App UI 崩溃</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="what_device_headline">信息：</string>
+    <string name="what_happened_headline">发生了什么：</string>
+    <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="list_thumbnail_view_description">视频预览缩略图</string>
+    <string name="detail_thumbnail_view_description">播放视频，时长：</string>
+    <string name="detail_uploader_thumbnail_view_description">视频上传者的头像缩略图</string>
+    <string name="short_billion">字节</string>
+    <string name="msg_url_malform">错误的 URL 或未联网</string>
+    <string name="msg_running">NewPipe下载中</string>
+    <string name="no_available_dir">请稍后在设置中设定下载目录</string>
+    <string name="msg_popup_permission">用悬浮窗模式
+\n需要此权限</string>
+    <string name="reCaptcha_title">reCAPTCHA验证</string>
+    <string name="recaptcha_request_toast">请求的新的CAPTCHA验证</string>
+    <string name="popup_mode_share_menu_title">NewPipe 悬浮窗模式</string>
+    <string name="popup_playing_toast">在悬浮窗中播放</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="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_summary">显示搜索建议</string>
+    <string name="best_resolution">最佳分辨率</string>
+    <string name="app_description">开源小巧的Android媒体播放器。</string>
+    <string name="view_on_github">在GitHub上查看</string>
+    <string name="app_license_title">NewPipe开源许可证</string>
+    <string name="contribution_encouragement">你是否有想:翻译、设计、清理或重型代码更改 ——我们始终欢迎你来贡献！</string>
+    <string name="read_full_license">阅读许可证</string>
+    <string name="contribution_title">贡献</string>
+    <string name="settings_file_replacement_character_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="resume_on_audio_focus_gain_title">恢复前台焦点</string>
+    <string name="resume_on_audio_focus_gain_summary">中断后继续播放（例如突然来电后）</string>
+    <string name="enable_search_history_title">搜索历史记录</string>
+    <string name="enable_search_history_summary">在本地存储搜索查询记录</string>
+    <string name="enable_watch_history_summary">记录已观看视频</string>
+    <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="action_history">历史</string>
+    <string name="history_empty">历史记录为空</string>
+    <string name="history_cleared">清除历史记录</string>
+    <string name="notification_channel_name">NewPipe 通知</string>
+    <string name="notification_channel_description">NewPipe 后台播放和悬浮窗播放的通知</string>
+    <string name="default_video_format_title">默认视频格式</string>
+    <string name="settings_category_player_behavior_title">行为</string>
+    <string name="empty_subscription_feed_subtitle">空空如也...</string>
+    <string name="no_views">0次观看</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">Kiosk 页</string>
+    <string name="kiosk_page_summary">『时下流行』页-自定义</string>
     <string name="subscription_page_summary">订阅页</string>
-    <string name="feed_page_summary">Feed 页</string>
+    <string name="feed_page_summary">Feed 页面</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="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="kiosk">Kiosk</string>
-    <string name="trending">流行的</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>
-    <string name="new_and_hot">最新 &amp; 最热</string>
-    <string name="title_activity_background_player">后台播放器</string>
+    <string name="new_and_hot">最新与热门</string>
+    <string name="show_hold_to_append_title">显示 \"长按添加\" 说明</string>
+    <string name="show_hold_to_append_summary">在视频详情页中，按下背景播放或悬浮窗播放按钮时显示提示</string>
+    <string name="background_player_append">已加入后台播放播放列表</string>
+    <string name="popup_playing_append">已加入悬浮窗播放列表</string>
+    <string name="player_stream_failure">无法播放此串流</string>
+    <string name="player_unrecoverable_failure">发生无法恢复播放器错误</string>
+    <string name="player_recoverable_failure">恢复播放器错误</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>
     <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="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="hold_to_append">长按队列</string>
+    <string name="unknown_content">[未知]</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="donation_title">捐赠</string>
+    <string name="donation_encouragement">NewPipe 是由志愿者花费时间为您带来最佳体验开发的。回馈帮助开发人员在享用一杯咖啡的同时，让 NewPipe 变得更好。</string>
+    <string name="give_back">回馈</string>
+    <string name="website_title">网站</string>
+    <string name="website_encouragement">请访问 NewPipe 网站了解更多信息和讯息。</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="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="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="preferred_player_fetcher_notification_title">正在获取信息…</string>
+    <string name="preferred_player_fetcher_notification_message">正在加载请求的内容</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="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="show_info">显示信息</string>
+    <string name="tab_bookmarks">书签</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="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="resize_zoom">缩放</string>
+    <string name="drawer_header_action_paceholder_text">敬请等待</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">处理完无法送达的、发生在Fragment或activity生命周期之外的Rx异常后强制报告</string>
-
+    <string name="enable_leak_canary_title">启用LeakCanary</string>
+    <string name="enable_leak_canary_summary">『内存泄漏监视』可能导致应用在『核心转储』时无响应</string>
+    <string name="enable_disposed_exceptions_title">报告『提前结束Android生命周期』错误</string>
+    <string name="enable_disposed_exceptions_summary">强制报告处理后的未送达的Activity或Fragment生命周期之外的Rx异常</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="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_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="previous_export">以前的导出</string>
     <string name="subscriptions_import_unsuccessful">无法导入订阅</string>
     <string name="subscriptions_export_unsuccessful">无法导出订阅</string>
-
-    <string name="import_youtube_instructions">通过下载导出文件导入 YouTube 订阅： 
-\n1. 在浏览器打开URL：%1$s 
-\n2. 登录账户 
-\n3. 下载应该会马上开始（这个就是导出文件）</string>
-    <string name="import_soundcloud_instructions">通过输入URL或您的ID导入SoundCloud配置： 
-\n1. 在浏览器中开启\"桌面模式\"（该网站不适用于移动设备）
-\n2. 打开URL：%1$s 
-\n3. 登录账号
-\n3. 复制重定向后的URL。</string>
-    <string name="import_soundcloud_instructions_hint">你的ID 或 soundcloud.com/你的ID</string>
-
-    <string name="import_network_expensive_warning">请注意该操作可能消耗大量网络流量。 
-\n您希望继续吗？</string>
-
+    <string name="import_youtube_instructions">通过下载导出文件来导入 YouTube 订阅：
+\n
+\n1. 转到此网站： %1$s
+\n2. 登录（如果需要）
+\n3. 应该立即开始下载（即导出文件）</string>
+    <string name="import_soundcloud_instructions">通过键入网址或你的 ID 导入 SoundCloud 配置文件：
+\n
+\n1. 在浏览器中启用\"电脑模式\"（该网站不适用于移动设备）
+\n2. 转到此 URL： %1$s
+\n3. 登录（如果需要）
+\n4. 复制重定向的配置文件下载地址。</string>
+    <string name="import_soundcloud_instructions_hint">你的 ID：soundcloud.com/［你的ID］</string>
+    <string name="import_network_expensive_warning">该操作消耗大量流量，
+\n你想继续吗？</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_tempo">速度</string>
+    <string name="playback_tempo">节奏</string>
     <string name="playback_pitch">音调</string>
-    <string name="unhook_checkbox">Unhook（可能导致失真）</string>
-    <string name="playback_default">默认</string>
-<string name="toast_no_player">未安装能播放此文件的应用</string>
-
+    <string name="unhook_checkbox">解除关联（可能导致失真）</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="clear_views_history_title">清除观看记录</string>
-    <string name="clear_views_history_summary">删除视频观看记录</string>
-    <string name="delete_view_history_alert">删除全部观看记录。</string>
-    <string name="watch_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">已删除1项。</string>
-
-    <string name="privacy_policy_title">NewPipe的隐私策略</string>
-    <string name="privacy_policy_encouragement">NewPipe 项目非常重视您的隐私。因此, 未经您的同意，应用程序不会收集任何您的数据。 NewPipe 的隐私策略详细解释了您在发送崩溃报告时会发送和存储的哪些数据。</string>
-    <string name="read_privacy_policy">阅读隐私策略</string>
-    <string name="app_license">NewPipe 是 copyleft 的自由软件: 你可以按照自己的意愿使用、学习、分享和改进它。具体地说, 您可以根据自由软件基金会发布的 GNU 通用公共许可证的条款（第3版或者任何更高版本）, 重新发布和/或修改本软件。</string>
-    <string name="import_settings">您是否希望同时导入设置？</string>
-
-    <string name="start_accept_privacy_policy">为了遵守欧洲通用数据保护条例（GDPR），我们提醒您注意NewPipe的隐私政策。 请仔细阅读。
-\n您必须接受它才能向我们发送错误报告。</string>
+    <string name="caption_setting_description">修改播放器字幕比例和背景样式。需要重新启动应用程序才能生效。</string>
+    <string name="clear_views_history_summary">删除串流的播放历史和播放位置</string>
+    <string name="delete_view_history_alert">删除全部观看记录？</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="app_license">NewPipe 是版权自由软件：您可以随时使用、研究共享和改进它。您可以根据自由软件基金会发布的 GNU 通用公共许可证GPLv3或（由您选择的）任何更高版本的许可证重新分发或修改该许可证。</string>
+    <string name="import_settings">是否要同时导入设置？</string>
+    <string name="privacy_policy_title">NewPipe的隐私政策</string>
+    <string name="privacy_policy_encouragement">NewPipe 项目非常重视您的隐私。因此，未经您的同意，应用程序不会收集任何数据。
+\nNewPipe 的隐私政策详细解释了在发送崩溃报告时发送和存储的数据。</string>
+    <string name="read_privacy_policy">阅读隐私政策</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_data_usage_none_description">无限制</string>
     <string name="limit_mobile_data_usage_title">使用移动数据时限制分辨率</string>
-    <string name="channels">更多频道</string>
-    <string name="playlists">更多频道</string>
-    <string name="users">用户们</string>
-    </resources>
+    <string name="minimize_on_exit_title">退出应用时最小化</string>
+    <string name="minimize_on_exit_summary">从主播放器切换到其他应用时的操作 - %s</string>
+    <string name="skip_silence_checkbox">静音时快进</string>
+    <string name="playback_step">滑块[比例尺]</string>
+    <string name="playback_reset">重 置</string>
+    <string name="tracks">曲目</string>
+    <string name="users">用户</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="content_language_title">视频默认语言</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">无法下载到外部 SD 卡。重置下载文件夹位置？</string>
+    <string name="saved_tabs_invalid_json">读取已保存标签时发生错误，因此使用者默认标签</string>
+    <string name="restore_defaults">恢复默认</string>
+    <string name="restore_defaults_confirmation">是否恢复默认值？</string>
+    <string name="selection">选择</string>
+    <string name="updates_setting_title">更新</string>
+    <string name="list">列表</string>
+    <string name="auto">自动</string>
+    <string name="switch_view">切换视图</string>
+    <string name="app_update_notification_content_text">点击下载</string>
+    <string name="post_processing">后期处理</string>
+    <string name="generate_unique_name">生成唯一名称</string>
+    <string name="overwrite">覆盖</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_not_found">找不到 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>
+    <string name="pause_downloads_on_mobile_desc">切换至移动数据时可能有用，尽管一些下载无法被暂停</string>
+    <string name="events">事件</string>
+    <string name="conferences">近期大会</string>
+    <string name="show_comments_title">显示评论</string>
+    <string name="show_comments_summary">禁用，以停止显示评论</string>
+    <plurals name="comments">
+        <item quantity="one">%s 条评论</item>
+        <item quantity="other">%s 条评论</item>
+    </plurals>
+    <string name="error_unable_to_load_comments">无法加载评论</string>
+    <string name="close">关闭</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="watch_history_states_deleted">已删除播放位置记录。</string>
+    <string name="missing_file">文件被已移动或删除</string>
+    <string name="overwrite_unrelated_warning">该名称的文件已经存在</string>
+    <string name="overwrite_finished_warning">命名冲突，已存在具有此名称文件</string>
+    <string name="overwrite_failed">无法覆盖文件</string>
+    <string name="download_already_pending">有此名称的已暂停下载</string>
+    <string name="error_postprocessing_stopped">NewPipe 在处理文件时被关闭</string>
+    <string name="error_insufficient_storage">设备上没有剩余储存空间</string>
+    <string name="error_progress_lost">进度丢失，文件已被删除</string>
+    <string name="error_timeout">连接超时</string>
+    <string name="confirm_prompt">是否要清除下载历史记录或删除所有下载的文件？</string>
+    <string name="enable_queue_limit">最大下载队列</string>
+    <string name="enable_queue_limit_desc">同时只允许一个下载进行</string>
+    <string name="start_downloads">开始下载</string>
+    <string name="pause_downloads">暂停下载</string>
+    <string name="downloads_storage_ask_title">询问下载位置</string>
+    <string name="downloads_storage_ask_summary">系统将询问您将每次下载的保存位置</string>
+    <string name="downloads_storage_ask_summary_kitkat">系统将询问您将每次下载的保存位置。
+\n（如果要下载到外部 SD 卡，请选择 SAF）</string>
+    <string name="downloads_storage_use_saf_title">使用 SAF</string>
+    <string name="downloads_storage_use_saf_summary">存储访问框架(SAF)允许下载文件到外部SD卡。
+\n注：一些设备不兼容SAF</string>
+    <string name="clear_playback_states_title">删除播放位置记录</string>
+    <string name="clear_playback_states_summary">删除所有播放位置记录</string>
+    <string name="delete_playback_states_alert">删除所有播放位置记录？</string>
+    <string name="download_choose_new_path">更改下载目录让内容生效</string>
+    <string name="default_kiosk_page_summary">『时下流行』页-默认</string>
+    <string name="no_one_watching">没有人在观看</string>
+    <plurals name="watching">
+        <item quantity="one">%s 人在观看</item>
+        <item quantity="other">%s 人在观看</item>
+    </plurals>
+    <string name="no_one_listening">没有人在听</string>
+    <plurals name="listening">
+        <item quantity="one">％s 人在听</item>
+        <item quantity="other">％s 人在听</item>
+    </plurals>
+    <string name="localization_changes_requires_app_restart">重新启动应用后，语言将更改。</string>
+    <string name="peertube_instance_url_title">PeerTube 服务器</string>
+    <string name="peertube_instance_url_summary">设置自己喜欢的PeerTube服务器</string>
+    <string name="peertube_instance_url_help">查找最适合你的服务器%s</string>
+    <string name="peertube_instance_add_title">添加服务器</string>
+    <string name="peertube_instance_add_help">输入服务器网址(URL)</string>
+    <string name="peertube_instance_add_fail">无法验证服务器</string>
+    <string name="peertube_instance_add_https_only">仅支持 HTTPS和URL</string>
+    <string name="peertube_instance_add_exists">该服务器已存在</string>
+    <string name="local">本地</string>
+    <string name="recently_added">最近添加</string>
+    <string name="most_liked">最喜欢的</string>
+    <string name="playlist_no_uploader">自动生成的（未找到上传者）</string>
+    <string name="recovering">正在恢复</string>
+    <string name="error_download_resource_gone">无法恢复此下载</string>
+    <string name="choose_instance_prompt">选择一个服务器</string>
+    <string name="seek_duration_title">快进 / 快退的单位时间</string>
+    <string name="enable_lock_screen_video_thumbnail_title">在锁屏上显示视频缩略图</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">在后台播放时，锁屏上将会显示视频的缩略图</string>
+    <string name="clear_download_history">清除下载历史记录</string>
+    <string name="delete_downloaded_files">删除下载了的文件</string>
+    <string name="deleted_downloads">已删除 %1$s 下载</string>
+</resources>
\ No newline at end of file

From 9407ac8c247cc57d1701dc68f3dbb7214150c2b4 Mon Sep 17 00:00:00 2001
From: chr56 <chr0056@gmail.com>
Date: Sat, 15 Feb 2020 13:07:34 +0800
Subject: [PATCH 166/199] fix reCaptcha strings in zh-rCN

---
 app/src/main/res/values-zh-rCN/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d0405b57d..8be5dd967 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -110,7 +110,7 @@
     <string name="msg_running_detail">点击了解详情</string>
     <string name="msg_wait">请稍候…</string>
     <string name="msg_copied">复制至剪贴板</string>
-    <string name="reCaptchaActivity">reCAPTCHA验证码</string>
+    <string name="recaptcha">reCAPTCHA验证码</string>
     <string name="controls_popup_title">悬浮窗播放</string>
     <string name="title_activity_about">关于NewPipe</string>
     <string name="action_settings">设置</string>
@@ -208,7 +208,7 @@
     <string name="no_available_dir">请稍后在设置中设定下载目录</string>
     <string name="msg_popup_permission">用悬浮窗模式
 \n需要此权限</string>
-    <string name="reCaptcha_title">reCAPTCHA验证</string>
+    <string name="title_activity_recaptcha">reCAPTCHA验证</string>
     <string name="recaptcha_request_toast">请求的新的CAPTCHA验证</string>
     <string name="popup_mode_share_menu_title">NewPipe 悬浮窗模式</string>
     <string name="popup_playing_toast">在悬浮窗中播放</string>

From 5151c6cb54d853366dd5aaf1cc527bd1877f45b4 Mon Sep 17 00:00:00 2001
From: chr56 <chr0056@gmail.com>
Date: Sat, 15 Feb 2020 18:39:41 +0800
Subject: [PATCH 167/199] fix wrong langcode of Chinesein settings_keys.xml

---
 app/src/main/res/values/settings_keys.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 1a7d61dae..cdb29ca86 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -988,8 +988,8 @@
         <item>uk</item>
         <item>ur</item>
         <item>vi</item>
-        <item>zh</item>
-        <item>zh-hans</item>
+        <item>zh-cn</item>
+        <item>zh-hk</item>
         <item>zh-tw</item>
     </string-array>
     <string-array name="app_language_name" translatable="false">
@@ -1053,9 +1053,9 @@
         <item>українська мова</item>
         <item>اردو</item>
         <item>Tiếng Việt</item>
-        <item>官话</item>
-        <item>简化字</item>
-        <item>臺灣華語</item>
+        <item>简体中文</item>
+        <item>繁體中文（廣東話）</item>
+        <item>正體中文</item>
     </string-array>
 
     <!-- Limit mobile data usage  -->

From f089cd027ebe1dc6088e3d7427e9d1c78352a815 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Fri, 14 Feb 2020 18:19:35 +0100
Subject: [PATCH 168/199] Multiple localization fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With the extractor PR, fixes title & description shown in the wrong language.
Fixed views / spectators counts possibly in the wrong language
Fixed live spectators not showing full count on detail page
Fixed LIVE shown on players, it shows translated instead

Fixed Videos string in search / three dots not available in Weblate
(because it was videos, but there already was a plural string named videos, in Weblate)

Subscriber count is always giving the short count.
We can't get exact number since this YouTube update: https://support.google.com/youtube/thread/6543166
But only short count (B, M, k), so showing full number, eg for 1.9M: 1,900,000, is wrong because the number could be 1,923,490 or 1,897,789…

Added a « sytem default » option to content language and country language selector.
It's the one selected by default (not en-GB anymore then), and correspond to the
language of the system / country of the system
By system I mean phone, tablet, TV…

Fixed russian showing - before time ago (eg 19hrs ago)
This is a workaround fix, I opened an issue on prettytime library repo.

Fixed russian plurals:
other was used instead of many for videos and subscribers

Fixed seek_duration english only
---
 app/build.gradle                              |  2 +-
 .../fragments/detail/VideoDetailFragment.java |  2 +-
 .../list/channel/ChannelFragment.java         |  2 +-
 .../holder/StreamInfoItemHolder.java          |  2 +-
 .../settings/VideoAudioSettingsFragment.java  | 12 +++++++-
 .../org/schabi/newpipe/util/Localization.java | 29 ++++++++++++-------
 .../schabi/newpipe/util/ServiceHelper.java    |  2 +-
 .../activity_player_queue_control.xml         |  3 +-
 .../activity_main_player.xml                  |  3 +-
 .../main/res/layout/activity_main_player.xml  |  3 +-
 .../layout/activity_player_queue_control.xml  |  3 +-
 app/src/main/res/layout/player_popup.xml      |  3 +-
 app/src/main/res/values-eo/strings.xml        |  2 ++
 app/src/main/res/values-ru/strings.xml        |  4 +--
 app/src/main/res/values/settings_keys.xml     | 22 ++++++++------
 app/src/main/res/values/strings.xml           |  7 ++---
 16 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5da8c9ff0..10afbef31 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:9112a10'
+    implementation 'com.github.B0pol:NewPipeExtractor:a9c6beec1434f4edd4197fb655e5327bae94cc92'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 
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 3c594bdfa..7dd98003a 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
@@ -1074,7 +1074,7 @@ public class VideoDetailFragment
             if (info.getStreamType().equals(StreamType.AUDIO_LIVE_STREAM)) {
                 videoCountView.setText(Localization.listeningCount(activity, info.getViewCount()));
             } else if (info.getStreamType().equals(StreamType.LIVE_STREAM)) {
-                videoCountView.setText(Localization.watchingCount(activity, info.getViewCount()));
+                videoCountView.setText(Localization.localizeWatchingCount(activity, info.getViewCount()));
             } else {
                 videoCountView.setText(Localization.localizeViewCount(activity, info.getViewCount()));
             }
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 c20ff0fc2..7b7a08a48 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
@@ -370,7 +370,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
 
         headerSubscribersTextView.setVisibility(View.VISIBLE);
         if (result.getSubscriberCount() >= 0) {
-            headerSubscribersTextView.setText(Localization.localizeSubscribersCount(activity, result.getSubscriberCount()));
+            headerSubscribersTextView.setText(Localization.shortSubscriberCount(activity, result.getSubscriberCount()));
         } else {
             headerSubscribersTextView.setText(R.string.subscribers_count_not_available);
         }
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 c48934d10..1dfbbca3f 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
@@ -60,7 +60,7 @@ public class StreamInfoItemHolder extends StreamMiniInfoItemHolder {
             if (infoItem.getStreamType().equals(StreamType.AUDIO_LIVE_STREAM)) {
                 viewsAndDate = Localization.listeningCount(itemBuilder.getContext(), infoItem.getViewCount());
             } else if (infoItem.getStreamType().equals(StreamType.LIVE_STREAM)) {
-                viewsAndDate = Localization.watchingCount(itemBuilder.getContext(), infoItem.getViewCount());
+                viewsAndDate = Localization.shortWatchingCount(itemBuilder.getContext(), infoItem.getViewCount());
             } else {
                 viewsAndDate = Localization.shortViewCount(itemBuilder.getContext(), infoItem.getViewCount());
             }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
index 7bb931309..21560ee55 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
@@ -4,9 +4,9 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.view.View;
 
 import androidx.annotation.Nullable;
+import androidx.preference.ListPreference;
 
 import com.google.android.material.snackbar.Snackbar;
 
@@ -21,6 +21,16 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        String[] durationsDescriptions = getResources().getStringArray(R.array.seek_duration_description);
+        String[] durationsValues = getResources().getStringArray(R.array.seek_duration_value);
+        int currentDurationValue;
+        for (int i = 0; i < durationsDescriptions.length; i++) {
+            currentDurationValue = Integer.parseInt(durationsValues[i]) / 1000;
+            durationsDescriptions[i] = String.format(durationsDescriptions[i], currentDurationValue);
+        }
+        ListPreference durations = (ListPreference) findPreference(getString(R.string.seek_duration_key));
+        durations.setEntries(durationsDescriptions);
+
         listener = (sharedPreferences, s) -> {
 
             // on M and above, if user chooses to minimise to popup player on exit and the app doesn't have
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index 6149118cc..b24298f4e 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -48,8 +48,8 @@ import java.util.Locale;
 
 public class Localization {
 
-    private static PrettyTime prettyTime;
     private static final String DOT_SEPARATOR = " • ";
+    private static PrettyTime prettyTime;
 
     private Localization() {
     }
@@ -84,6 +84,9 @@ public class Localization {
         final String contentLanguage = PreferenceManager
                 .getDefaultSharedPreferences(context)
                 .getString(context.getString(R.string.content_language_key), context.getString(R.string.default_language_value));
+        if (contentLanguage.equals("system")) {
+            return org.schabi.newpipe.extractor.localization.Localization.fromLocale(Locale.getDefault());
+        }
         return org.schabi.newpipe.extractor.localization.Localization.fromLocalizationCode(contentLanguage);
     }
 
@@ -91,6 +94,9 @@ public class Localization {
         final String contentCountry = PreferenceManager
                 .getDefaultSharedPreferences(context)
                 .getString(context.getString(R.string.content_country_key), context.getString(R.string.default_country_value));
+        if (contentCountry.equals("system")) {
+            return new ContentCountry(Locale.getDefault().getCountry());
+        }
         return new ContentCountry(contentCountry);
     }
 
@@ -114,8 +120,7 @@ public class Localization {
     }
 
     public static String localizeNumber(Context context, long number) {
-        Locale locale = getPreferredLocale(context);
-        NumberFormat nf = NumberFormat.getInstance(locale);
+        NumberFormat nf = NumberFormat.getInstance(getAppLocale(context));
         return nf.format(number);
     }
 
@@ -132,14 +137,14 @@ public class Localization {
         return getQuantity(context, R.plurals.views, R.string.no_views, viewCount, localizeNumber(context, viewCount));
     }
 
-    public static String localizeSubscribersCount(Context context, long subscriberCount) {
-        return getQuantity(context, R.plurals.subscribers, R.string.no_subscribers, subscriberCount, localizeNumber(context, subscriberCount));
-    }
-
     public static String localizeStreamCount(Context context, long streamCount) {
         return getQuantity(context, R.plurals.videos, R.string.no_videos, streamCount, localizeNumber(context, streamCount));
     }
 
+    public static String localizeWatchingCount(Context context, long watchingCount) {
+        return getQuantity(context, R.plurals.watching, R.string.no_one_watching, watchingCount, localizeNumber(context, watchingCount));
+    }
+
     public static String shortCount(Context context, long count) {
         if (count >= 1000000000) {
             return Long.toString(count / 1000000000) + context.getString(R.string.short_billion);
@@ -156,7 +161,7 @@ public class Localization {
         return getQuantity(context, R.plurals.listening, R.string.no_one_listening, listeningCount, shortCount(context, listeningCount));
     }
 
-    public static String watchingCount(Context context, long watchingCount) {
+    public static String shortWatchingCount(Context context, long watchingCount) {
         return getQuantity(context, R.plurals.watching, R.string.no_one_watching, watchingCount, shortCount(context, watchingCount));
     }
 
@@ -215,7 +220,9 @@ public class Localization {
     }
 
     public static String relativeTime(Calendar calendarTime) {
-        return getPrettyTime().formatUnrounded(calendarTime);
+        String time = getPrettyTime().formatUnrounded(calendarTime);
+        return time.startsWith("-") ? time.substring(1) : time;
+        //workaround fix for russian showing -1 day ago, -19hrs ago…
     }
 
     private static void changeAppLanguage(Locale loc, Resources res) {
@@ -226,8 +233,8 @@ public class Localization {
     }
 
     public static Locale getAppLocale(Context context) {
-        SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context);
-        String lang = prefs.getString("app_language_key", "en");
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        String lang = prefs.getString(context.getString(R.string.app_language_key), "en");
         Locale loc;
         if (lang.equals("system")) {
             loc = Locale.getDefault();
diff --git a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
index 8929cc654..6726e4cfc 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
@@ -44,7 +44,7 @@ public class ServiceHelper {
     public static String getTranslatedFilterString(String filter, Context c) {
         switch (filter) {
             case "all": return c.getString(R.string.all);
-            case "videos": return c.getString(R.string.videos);
+            case "videos": return c.getString(R.string.videos_string);
             case "channels": return c.getString(R.string.channels);
             case "playlists": return c.getString(R.string.playlists);
             case "tracks": return c.getString(R.string.tracks);
diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index 7467a79cf..6468c6784 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -304,10 +304,9 @@
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
             android:gravity="center"
-            android:text="@string/duration_live_button"
+            android:text="@string/duration_live"
             android:textAllCaps="true"
             android:textColor="?attr/colorAccent"
-            android:maxLength="4"
             android:background="?attr/selectableItemBackground"
             android:visibility="gone"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout-large-land/activity_main_player.xml b/app/src/main/res/layout-large-land/activity_main_player.xml
index 98017b132..8e11b99f3 100644
--- a/app/src/main/res/layout-large-land/activity_main_player.xml
+++ b/app/src/main/res/layout-large-land/activity_main_player.xml
@@ -442,10 +442,9 @@
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     android:gravity="center"
-                    android:text="@string/duration_live_button"
+                    android:text="@string/duration_live"
                     android:textAllCaps="true"
                     android:textColor="@android:color/white"
-                    android:maxLength="4"
                     android:visibility="gone"
                     android:background="?attr/selectableItemBackground"
                     tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/activity_main_player.xml
index ab9eb8a61..804434456 100644
--- a/app/src/main/res/layout/activity_main_player.xml
+++ b/app/src/main/res/layout/activity_main_player.xml
@@ -440,10 +440,9 @@
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     android:gravity="center"
-                    android:text="@string/duration_live_button"
+                    android:text="@string/duration_live"
                     android:textAllCaps="true"
                     android:textColor="@android:color/white"
-                    android:maxLength="4"
                     android:visibility="gone"
                     android:background="?attr/selectableItemBackground"
                     tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml
index e113075af..d17a7007a 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -154,10 +154,9 @@
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
             android:gravity="center"
-            android:text="@string/duration_live_button"
+            android:text="@string/duration_live"
             android:textAllCaps="true"
             android:textColor="?attr/colorAccent"
-            android:maxLength="4"
             android:background="?attr/selectableItemBackground"
             android:visibility="gone"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/player_popup.xml b/app/src/main/res/layout/player_popup.xml
index 9fbc22145..28c730913 100644
--- a/app/src/main/res/layout/player_popup.xml
+++ b/app/src/main/res/layout/player_popup.xml
@@ -208,10 +208,9 @@
                 android:paddingLeft="4dp"
                 android:paddingRight="4dp"
                 android:gravity="center_vertical"
-                android:text="@string/duration_live_button"
+                android:text="@string/duration_live"
                 android:textAllCaps="true"
                 android:textColor="@android:color/white"
-                android:maxLength="4"
                 android:visibility="gone"
                 android:background="?attr/selectableItemBackground"
                 tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 6370c5e0e..469fb9e21 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -537,4 +537,6 @@
     <string name="clear_download_history">Forviŝi la historion de elŝutoj</string>
     <string name="delete_downloaded_files">Forviŝi elŝutitajn dosierojn</string>
     <string name="deleted_downloads">%1$s elŝutoj forviŝitaj</string>
+    <string name="videos_string">Filmetoj</string>
+    <string name="dynamic_seek_duration_description">%s sekundoj</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 807351a52..940d2ef2f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -201,13 +201,13 @@
     <plurals name="subscribers">
         <item quantity="one">%s подписчик</item>
         <item quantity="few">%s подписчика</item>
-        <item quantity="other">%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="other">%s просмотров</item>
+        <item quantity="many">%s просмотров</item>
     </plurals>
     <string name="no_videos">Нет видео</string>
     <plurals name="videos">
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 1a7d61dae..3a4e7c493 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -31,12 +31,12 @@
     <string name="seek_duration_key" translatable="false">seek_duration</string>
     <string name="seek_duration_default_value" translatable="false">10000</string>
     <string-array name="seek_duration_description" translatable="false">
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-        <item>15 seconds</item>
-        <item>20 seconds</item>
-        <item>25 seconds</item>
-        <item>30 seconds</item>
+        <item>@string/dynamic_seek_duration_description</item>
+        <item>@string/dynamic_seek_duration_description</item>
+        <item>@string/dynamic_seek_duration_description</item>
+        <item>@string/dynamic_seek_duration_description</item>
+        <item>@string/dynamic_seek_duration_description</item>
+        <item>@string/dynamic_seek_duration_description</item>
     </string-array>
     <string-array name="seek_duration_value" translatable="false">
         <item>5000</item>
@@ -161,8 +161,8 @@
     <string name="show_comments_key" translatable="false">show_comments</string>
     <string name="stream_info_selected_tab_key" translatable="false">stream_info_selected_tab</string>
     <string name="show_hold_to_append_key" translatable="false">show_hold_to_append</string>
-    <string name="default_language_value">en</string>
-    <string name="default_country_value">GB</string>
+    <string name="default_language_value" translatable="false">system</string>
+    <string name="default_country_value" translatable="false">system</string>
     <string name="content_language_key" translatable="false">content_language</string>
     <string name="peertube_instance_setup_key" translatable="false">peertube_instance_setup</string>
     <string name="peertube_selected_instance_key" translatable="false">peertube_selected_instance</string>
@@ -267,6 +267,7 @@
 
     <!-- alternatively, load these from some local android data store -->
     <string-array name="language_codes" translatable="false">
+        <item>system</item>
         <item>af</item>
         <item>az</item>
         <item>id</item>
@@ -346,6 +347,7 @@
         <item>ko</item>
     </string-array>
     <string-array name="language_names" translatable="false">
+        <item>@string/system_default</item>
         <item>Afrikaans</item>
         <item>Azərbaycan</item>
         <item>Bahasa Indonesia</item>
@@ -427,6 +429,7 @@
 
 
     <string-array name="country_names" translatable="false">
+        <item>@string/system_default</item>
         <item>Afghanistan</item>
         <item>Aland Islands</item>
         <item>Albania</item>
@@ -677,6 +680,7 @@
     </string-array>
 
     <string-array name="country_codes" translatable="false">
+        <item>system</item>
         <item>AF</item>
         <item>AX</item>
         <item>AL</item>
@@ -993,7 +997,7 @@
         <item>zh-tw</item>
     </string-array>
     <string-array name="app_language_name" translatable="false">
-        <item>@string/systems_language</item>
+        <item>@string/system_default</item>
         <item>العربية</item>
         <item>Azərbaycan dili</item>
         <item>Asturianu</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dab9bde10..622b43bfd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -140,7 +140,6 @@
     <string name="show_age_restricted_content_title">Age restricted content</string>
     <string name="video_is_age_restricted">Show age restricted video. Allowing such material is possible from Settings.</string>
     <string name="duration_live">LIVE</string>
-    <string name="duration_live_button" translatable="false">LIVE</string>
     <string name="downloads">Downloads</string>
     <string name="downloads_title">Downloads</string>
     <string name="error_report_title">Error report</string>
@@ -149,8 +148,7 @@
     <string name="channels">Channels</string>
     <string name="playlist">Playlist</string>
     <string name="playlists">Playlists</string>
-    <string name="videos">Videos</string>
-    <string name="comments">Comments</string>
+    <string name="videos_string">Videos</string>
     <string name="tracks">Tracks</string>
     <string name="users">Users</string>
     <string name="events">Events</string>
@@ -593,5 +591,6 @@
     <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
     <string name="app_language_title">App language</string>
-    <string name="systems_language">System default</string>
+    <string name="system_default">System default</string>
+    <string name="dynamic_seek_duration_description">%s seconds</string>
 </resources>

From 5b541cc9fb4b784ffd7a99e583356d70c8966c9c Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 15 Feb 2020 14:53:05 +0100
Subject: [PATCH 169/199] resolve merge conflicts

---
 app/src/main/res/values/settings_keys.xml | 6 +++---
 app/src/main/res/values/strings.xml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index e652f24ae..05a7416f0 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -347,7 +347,7 @@
         <item>ko</item>
     </string-array>
     <string-array name="language_names" translatable="false">
-        <item>@string/system_default</item>
+        <item>@string/systems_language</item>
         <item>Afrikaans</item>
         <item>Azərbaycan</item>
         <item>Bahasa Indonesia</item>
@@ -429,7 +429,7 @@
 
 
     <string-array name="country_names" translatable="false">
-        <item>@string/system_default</item>
+        <item>@string/systems_language</item>
         <item>Afghanistan</item>
         <item>Aland Islands</item>
         <item>Albania</item>
@@ -997,7 +997,7 @@
         <item>zh-tw</item>
     </string-array>
     <string-array name="app_language_name" translatable="false">
-        <item>@string/system_default</item>
+        <item>@string/systems_language</item>
         <item>العربية</item>
         <item>Azərbaycan dili</item>
         <item>Asturianu</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 622b43bfd..a5f1cb345 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -591,6 +591,6 @@
     <string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
     <string name="app_language_title">App language</string>
-    <string name="system_default">System default</string>
+    <string name="systems_language">System default</string>
     <string name="dynamic_seek_duration_description">%s seconds</string>
 </resources>

From 6f9543b9cfc3fb435e25a4af030016b13c221c5e Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Sat, 15 Feb 2020 13:50:12 +0000
Subject: [PATCH 170/199] Translated using Weblate (Esperanto)

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

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 33f24695f..0bec72e02 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -173,7 +173,7 @@
     <string name="enqueue_on_background">Viciĝi en la fona ludilo</string>
     <string name="enqueue_on_popup">Viciĝi en nova ŝprucfenestro</string>
     <string name="start_here_on_popup">Komenci ludi en nova ŝprucfenestro</string>
-    <string name="default_content_country_title">Defaŭlta enhava lando</string>
+    <string name="default_content_country_title">Preferata enhavlando</string>
     <string name="toggle_orientation">Ŝangi Orientiĝon</string>
     <string name="switch_to_background">Ŝanĝi al Fono</string>
     <string name="switch_to_popup">Ŝanĝi al ŝprucfenestro</string>
@@ -538,7 +538,7 @@
     <string name="delete_downloaded_files">Forviŝi elŝutitajn dosierojn</string>
     <string name="deleted_downloads">%1$s elŝutoj forviŝitaj</string>
     <string name="permission_display_over_apps">Doni la permeson por afiŝiĝi supre aliaj apoj</string>
-    <string name="app_language_title">Lingvo de la apo</string>
+    <string name="app_language_title">Preferata aplingvo</string>
     <string name="systems_language">Sistemnormo</string>
     <string name="subtitle_activity_recaptcha">Premu « Finita » kiam solvita</string>
     <string name="recaptcha_done_button">Finita</string>

From 4de2cfdcc62da47e8388701e689cd6cfa49ced98 Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Sun, 16 Feb 2020 09:12:55 +0000
Subject: [PATCH 171/199] Added translation using Weblate (Chuvash)

---
 app/src/main/res/values-cv/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 app/src/main/res/values-cv/strings.xml

diff --git a/app/src/main/res/values-cv/strings.xml b/app/src/main/res/values-cv/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-cv/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 51f2efd48c6e58c6e835b11f54a81784a8191788 Mon Sep 17 00:00:00 2001
From: Alexey Dubrov <vhsw@ya.ru>
Date: Sun, 16 Feb 2020 16:08:53 +0300
Subject: [PATCH 172/199] Fix initial brightness value

---
 .../java/org/schabi/newpipe/player/MainVideoPlayer.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

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 31f7dd74a..ebb9e2423 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -909,6 +909,14 @@ public final class MainVideoPlayer extends AppCompatActivity
                 final float currentVolumeNormalized = (float) getAudioReactor().getVolume() / getAudioReactor().getMaxVolume();
                 volumeProgressBar.setProgress((int) (volumeProgressBar.getMax() * currentVolumeNormalized));
             }
+
+            final float screenBrightness =  getWindow().getAttributes().screenBrightness;
+            brightnessProgressBar.setProgress((int) (brightnessProgressBar.getMax() * screenBrightness));
+
+            if (DEBUG) Log.d(TAG, "setInitialGestureValues: volumeProgressBar.getProgress() ["
+                    + volumeProgressBar.getProgress() + "] "
+                    + "brightnessProgressBar.getProgress() ["
+                    + brightnessProgressBar.getProgress() + "]");
         }
 
         @Override

From e62e34fd5cef0a265946b99bbb3e020ea6dbf39a Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 15 Feb 2020 16:29:46 +0100
Subject: [PATCH 173/199] created default_localization_key

---
 app/build.gradle                                     |  2 +-
 .../fragments/list/search/SearchFragment.java        |  2 +-
 .../newpipe/settings/VideoAudioSettingsFragment.java |  1 +
 .../java/org/schabi/newpipe/util/Localization.java   | 12 ++++++------
 app/src/main/res/values/settings_keys.xml            | 10 +++++-----
 app/src/main/res/xml/content_settings.xml            |  6 +++---
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9f23bffcf..77b27f50a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.B0pol:NewPipeExtractor:a9c6beec1434f4edd4197fb655e5327bae94cc92'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:fc9f031'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index f2e8aa244..fcb3eafa7 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -190,7 +190,7 @@ public class SearchFragment
 
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
         isSuggestionsEnabled = preferences.getBoolean(getString(R.string.show_search_suggestions_key), true);
-        contentCountry = preferences.getString(getString(R.string.content_country_key), getString(R.string.default_country_value));
+        contentCountry = preferences.getString(getString(R.string.content_country_key), getString(R.string.default_localization_key));
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
index 21560ee55..e5f49e2e8 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
@@ -21,6 +21,7 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        //initializing R.array.seek_duration_description to display the translation of seconds
         String[] durationsDescriptions = getResources().getStringArray(R.array.seek_duration_description);
         String[] durationsValues = getResources().getStringArray(R.array.seek_duration_value);
         int currentDurationValue;
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index b24298f4e..cd66ec3c2 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -83,8 +83,8 @@ public class Localization {
     public static org.schabi.newpipe.extractor.localization.Localization getPreferredLocalization(final Context context) {
         final String contentLanguage = PreferenceManager
                 .getDefaultSharedPreferences(context)
-                .getString(context.getString(R.string.content_language_key), context.getString(R.string.default_language_value));
-        if (contentLanguage.equals("system")) {
+                .getString(context.getString(R.string.content_language_key), context.getString(R.string.default_localization_key));
+        if (contentLanguage.equals(context.getString(R.string.default_localization_key))) {
             return org.schabi.newpipe.extractor.localization.Localization.fromLocale(Locale.getDefault());
         }
         return org.schabi.newpipe.extractor.localization.Localization.fromLocalizationCode(contentLanguage);
@@ -93,8 +93,8 @@ public class Localization {
     public static ContentCountry getPreferredContentCountry(final Context context) {
         final String contentCountry = PreferenceManager
                 .getDefaultSharedPreferences(context)
-                .getString(context.getString(R.string.content_country_key), context.getString(R.string.default_country_value));
-        if (contentCountry.equals("system")) {
+                .getString(context.getString(R.string.content_country_key), context.getString(R.string.default_localization_key));
+        if (contentCountry.equals(context.getString(R.string.default_localization_key))) {
             return new ContentCountry(Locale.getDefault().getCountry());
         }
         return new ContentCountry(contentCountry);
@@ -104,7 +104,7 @@ public class Localization {
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
 
         String languageCode = sp.getString(context.getString(R.string.content_language_key),
-                context.getString(R.string.default_language_value));
+                context.getString(R.string.default_localization_key));
 
         try {
             if (languageCode.length() == 2) {
@@ -236,7 +236,7 @@ public class Localization {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         String lang = prefs.getString(context.getString(R.string.app_language_key), "en");
         Locale loc;
-        if (lang.equals("system")) {
+        if (lang.equals(context.getString(R.string.default_localization_key))) {
             loc = Locale.getDefault();
         } else if (lang.matches(".*-.*")) {
             //to differentiate different versions of the language
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 05a7416f0..fba5546c1 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -161,8 +161,6 @@
     <string name="show_comments_key" translatable="false">show_comments</string>
     <string name="stream_info_selected_tab_key" translatable="false">stream_info_selected_tab</string>
     <string name="show_hold_to_append_key" translatable="false">show_hold_to_append</string>
-    <string name="default_language_value" translatable="false">system</string>
-    <string name="default_country_value" translatable="false">system</string>
     <string name="content_language_key" translatable="false">content_language</string>
     <string name="peertube_instance_setup_key" translatable="false">peertube_instance_setup</string>
     <string name="peertube_selected_instance_key" translatable="false">peertube_selected_instance</string>
@@ -265,9 +263,11 @@
     <string name="update_app_key" translatable="false">update_app_key</string>
     <string name="update_pref_screen_key" translatable="false">update_pref_screen_key</string>
 
+    <!-- Localizations   -->
+    <string name="default_localization_key" translatable="false">system</string>
     <!-- alternatively, load these from some local android data store -->
     <string-array name="language_codes" translatable="false">
-        <item>system</item>
+        <item>@string/default_localization_key</item>
         <item>af</item>
         <item>az</item>
         <item>id</item>
@@ -680,7 +680,7 @@
     </string-array>
 
     <string-array name="country_codes" translatable="false">
-        <item>system</item>
+        <item>@string/default_localization_key</item>
         <item>AF</item>
         <item>AX</item>
         <item>AL</item>
@@ -932,7 +932,7 @@
 
     <!--The next two arrays are set to change the app language-->
     <string-array name="app_language_code" translatable="false">
-        <item>system</item>
+        <item>@string/default_localization_key</item>
         <item>ar</item>
         <item>az</item>
         <item>ast</item>
diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml
index 197c14487..8fe8a66af 100644
--- a/app/src/main/res/xml/content_settings.xml
+++ b/app/src/main/res/xml/content_settings.xml
@@ -6,7 +6,7 @@
 
     <ListPreference
         app:iconSpaceReserved="false"
-        android:defaultValue="system"
+        android:defaultValue="@string/default_localization_key"
         android:entries="@array/app_language_name"
         android:entryValues="@array/app_language_code"
         android:key="@string/app_language_key"
@@ -15,7 +15,7 @@
 
     <ListPreference
         app:iconSpaceReserved="false"
-        android:defaultValue="@string/default_language_value"
+        android:defaultValue="@string/default_localization_key"
         android:entries="@array/language_names"
         android:entryValues="@array/language_codes"
         android:key="@string/content_language_key"
@@ -24,7 +24,7 @@
 
     <ListPreference
         app:iconSpaceReserved="false"
-        android:defaultValue="@string/default_country_value"
+        android:defaultValue="@string/default_localization_key"
         android:entries="@array/country_names"
         android:entryValues="@array/country_codes"
         android:key="@string/content_country_key"

From fbcee61e04e8d425abed47f5c450c8f70d64a628 Mon Sep 17 00:00:00 2001
From: Tobias Groza <TobiGr@users.noreply.github.com>
Date: Sun, 16 Feb 2020 22:41:56 +0100
Subject: [PATCH 174/199] Apply suggestions from code review

Co-Authored-By: Stypox <stypox@pm.me>
---
 app/src/main/res/values/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a2c303c17..1a70d9eaa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,7 +59,7 @@
     <string name="kore_package" translatable="false">org.xbmc.kore</string>
     <string name="show_play_with_kodi_title">Show \"Play with Kodi\" option</string>
     <string name="enable_lock_screen_video_thumbnail_title">Lock screen video thumbnail</string>
-    <string name="show_play_with_kodi_summary">Displayed option to play a video via Kodi media center</string>
+    <string name="show_play_with_kodi_summary">Display an option to play a video via Kodi media center</string>
     <string name="enable_lock_screen_video_thumbnail_summary">A video thumbnail is shown on the lock screen when using the background player</string>
     <string name="play_audio">Audio</string>
     <string name="default_audio_format_title">Default audio format</string>
@@ -100,7 +100,7 @@
     <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">Resumed playing</string>
+    <string name="resume_on_audio_focus_gain_title">Resume playing</string>
     <string name="resume_on_audio_focus_gain_summary">Continue playing after interruptions (e.g. phonecalls)</string>
     <string name="download_dialog_title">Download</string>
     <string name="next_video_title">Next</string>
@@ -231,7 +231,7 @@
     <!-- error activity -->
     <string name="sorry_string">Sorry, that should not have happened.</string>
     <string name="guru_meditation" translatable="false">Guru Meditation.</string>
-    <string name="error_report_button_text">Report this per e-mail</string>
+    <string name="error_report_button_text">Report this error via e-mail</string>
     <string name="error_snackbar_message">Sorry, some errors occurred.</string>
     <string name="error_snackbar_action">Report</string>
     <string name="what_device_headline">Info:</string>
@@ -560,7 +560,7 @@
     <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">Could not establish secure connection</string>
+    <string name="error_ssl_exception">Could not establish a secure connection</string>
     <string name="error_unknown_host">Could not find the server</string>
     <string name="error_connect_host">Can not connect to the server</string>
     <string name="error_http_no_content">The server does not send data</string>
@@ -590,7 +590,7 @@
     <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.\nChoose SAF if you want to download to an external SD card</string>
     <string name="downloads_storage_use_saf_title">Use SAF</string>
-    <string name="downloads_storage_use_saf_summary">The \'Storage Access Framework\' allows downloads to an external SD card.\nNote: Some devices are incompatible</string>
+    <string name="downloads_storage_use_saf_summary">The \'Storage Access Framework\' allows downloads to an external SD card.\nNote: some devices are incompatible</string>
     <string name="choose_instance_prompt">Choose an instance</string>
     <string name="app_language_title">App language</string>
     <string name="systems_language">System default</string>

From e3a891688bb71bda52f26ffe697f469e347aaf3d Mon Sep 17 00:00:00 2001
From: Alexey Dubrov <vhsw@ya.ru>
Date: Mon, 17 Feb 2020 12:11:00 +0300
Subject: [PATCH 175/199] Get brightness from settings if screenBrightness is
 set to auto

---
 .../java/org/schabi/newpipe/player/MainVideoPlayer.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 ebb9e2423..3340f1107 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -910,7 +910,11 @@ public final class MainVideoPlayer extends AppCompatActivity
                 volumeProgressBar.setProgress((int) (volumeProgressBar.getMax() * currentVolumeNormalized));
             }
 
-            final float screenBrightness =  getWindow().getAttributes().screenBrightness;
+            float screenBrightness = getWindow().getAttributes().screenBrightness;
+            if (screenBrightness < 0)
+                screenBrightness = Settings.System.getInt(getContentResolver(),
+                        Settings.System.SCREEN_BRIGHTNESS, 0) / 255.0f;
+
             brightnessProgressBar.setProgress((int) (brightnessProgressBar.getMax() * screenBrightness));
 
             if (DEBUG) Log.d(TAG, "setInitialGestureValues: volumeProgressBar.getProgress() ["

From 54f71c623a03af80dd9c27fd160d7e87fefca0dc Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Mon, 17 Feb 2020 10:10:15 +0100
Subject: [PATCH 176/199] use plural string for
 dynamic_seek_duration_description

---
 .../settings/VideoAudioSettingsFragment.java       | 14 +++++++++++---
 app/src/main/res/values-eo/strings.xml             |  4 +++-
 app/src/main/res/values/settings_keys.xml          | 14 ++++++++------
 app/src/main/res/values/strings.xml                |  5 +++++
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
index e5f49e2e8..d5f46fb22 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.settings;
 
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -22,12 +23,19 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
         super.onCreate(savedInstanceState);
 
         //initializing R.array.seek_duration_description to display the translation of seconds
-        String[] durationsDescriptions = getResources().getStringArray(R.array.seek_duration_description);
-        String[] durationsValues = getResources().getStringArray(R.array.seek_duration_value);
+        Resources res = getResources();
+        String[] durationsValues = res.getStringArray(R.array.seek_duration_value);
+        String[] durationsDescriptions = res.getStringArray(R.array.seek_duration_description);
         int currentDurationValue;
         for (int i = 0; i < durationsDescriptions.length; i++) {
             currentDurationValue = Integer.parseInt(durationsValues[i]) / 1000;
-            durationsDescriptions[i] = String.format(durationsDescriptions[i], currentDurationValue);
+            try {
+                durationsDescriptions[i] = String.format(
+                        res.getQuantityString(R.plurals.dynamic_seek_duration_description, currentDurationValue),
+                        currentDurationValue);
+            } catch (Resources.NotFoundException ignored) {
+                //if this happens, the translation is missing, and the english string will be displayed instead
+            }
         }
         ListPreference durations = (ListPreference) findPreference(getString(R.string.seek_duration_key));
         durations.setEntries(durationsDescriptions);
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 8238b13bc..aa34644d1 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -538,10 +538,12 @@
     <string name="delete_downloaded_files">Forviŝi elŝutitajn dosierojn</string>
     <string name="deleted_downloads">%1$s elŝutoj forviŝitaj</string>
     <string name="videos_string">Filmetoj</string>
-    <string name="dynamic_seek_duration_description">%s sekundoj</string>
     <string name="permission_display_over_apps">Doni la permeson por afiŝiĝi supre aliaj apoj</string>
     <string name="app_language_title">Lingvo de la apo</string>
     <string name="systems_language">Sistemnormo</string>
     <string name="subtitle_activity_recaptcha">Premu « Finita » kiam solvita</string>
     <string name="recaptcha_done_button">Finita</string>
+    <plurals name="dynamic_seek_duration_description">
+        <item quantity="other">%s sekundoj</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index fba5546c1..b5bf738fb 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -31,12 +31,14 @@
     <string name="seek_duration_key" translatable="false">seek_duration</string>
     <string name="seek_duration_default_value" translatable="false">10000</string>
     <string-array name="seek_duration_description" translatable="false">
-        <item>@string/dynamic_seek_duration_description</item>
-        <item>@string/dynamic_seek_duration_description</item>
-        <item>@string/dynamic_seek_duration_description</item>
-        <item>@string/dynamic_seek_duration_description</item>
-        <item>@string/dynamic_seek_duration_description</item>
-        <item>@string/dynamic_seek_duration_description</item>
+    <!--   They are overridden in VideoAudioSettingsFragment.java if the translation
+    (dynamic_seek_duration_description) exist. Otherwise this array is picked-->
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+        <item>15 seconds</item>
+        <item>20 seconds</item>
+        <item>25 seconds</item>
+        <item>30 seconds</item>
     </string-array>
     <string-array name="seek_duration_value" translatable="false">
         <item>5000</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 712916449..39b2907ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -593,4 +593,9 @@
     <string name="app_language_title">App language</string>
     <string name="systems_language">System default</string>
     <string name="dynamic_seek_duration_description">%s seconds</string>
+    <plurals name="dynamic_seek_duration_description">
+        <item quantity="few">%s seconds</item>
+        <item quantity="many">%s seconds</item>
+        <item quantity="other">%s seconds</item>
+    </plurals>
 </resources>

From 55d17b556a4bc88c6c0e5e4a8f8d1c0f7a4a05f1 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Mon, 17 Feb 2020 10:18:20 +0100
Subject: [PATCH 177/199] added all the .iml files in gitignore, not only
 app.iml

if somehow your module name isn't app, it will create a module-name.iml file, and isn't needed
---
 app/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/.gitignore b/app/.gitignore
index d9a86a57c..74862ab9f 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,3 +1,4 @@
 .gitignore
 /build
 app.iml
+*.iml

From 9912ee8199e188bf0660fda1f6f67ea9a67936db Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Tue, 18 Feb 2020 18:35:13 +0100
Subject: [PATCH 178/199] give info if content language is system on crash

---
 .../main/java/org/schabi/newpipe/report/ErrorActivity.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index c90aff1c9..b78751496 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -43,6 +43,7 @@ import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.TimeZone;
 import java.util.Vector;
 
@@ -377,8 +378,12 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     private String getContentLangString() {
-        return PreferenceManager.getDefaultSharedPreferences(this)
+        String contentLanguage = PreferenceManager.getDefaultSharedPreferences(this)
                 .getString(this.getString(R.string.content_country_key), "none");
+        if (contentLanguage.equals(getString(R.string.default_localization_key))) {
+            contentLanguage = Locale.getDefault().toString();
+        }
+        return contentLanguage;
     }
 
     private String getOsString() {

From 831e9985e2484665f8cc1159ea30d208d8c71cc1 Mon Sep 17 00:00:00 2001
From: Laurent Arnoud <laurent@spkdev.net>
Date: Tue, 18 Feb 2020 21:50:28 +0100
Subject: [PATCH 179/199] Migrate annotation to androidx on ReCaptchaActivity

---
 app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index d72f729b5..4219638d6 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -18,7 +18,7 @@ import android.webkit.WebViewClient;
 
 import org.schabi.newpipe.util.ThemeHelper;
 
-import javax.annotation.Nonnull;
+import androidx.annotation.NonNull;
 
 /*
  * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
@@ -147,7 +147,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
         // add other methods to extract cookies here
     }
 
-    private void addYoutubeCookies(@Nonnull String cookies) {
+    private void addYoutubeCookies(@NonNull String cookies) {
         if (cookies.contains("s_gl=") || cookies.contains("goojf=") || cookies.contains("VISITOR_INFO1_LIVE=")) {
             // youtube seems to also need the other cookies:
             addCookie(cookies);

From 316871714ac5ff548465884f68e944ed663b410e Mon Sep 17 00:00:00 2001
From: B0pol <bopol@e.email>
Date: Wed, 19 Feb 2020 17:40:03 +0100
Subject: [PATCH 180/199] Update app/.gitignore

Co-Authored-By: Stypox <stypox@pm.me>
---
 app/.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/.gitignore b/app/.gitignore
index 74862ab9f..53edac5e4 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,4 +1,3 @@
 .gitignore
 /build
-app.iml
 *.iml

From f0e85b31aa7c7c74678a19fd0b6966f6a539fb8f Mon Sep 17 00:00:00 2001
From: mk3z <matias.zwinger@pm.me>
Date: Wed, 19 Feb 2020 20:59:14 +0000
Subject: [PATCH 181/199] Translated using Weblate (Finnish)

Currently translated at 64.8% (345 of 532 strings)
---
 app/src/main/res/values-fi/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index edf10c6f0..d34a6408a 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -400,4 +400,6 @@
     <string name="unsubscribe">Peru tilaus</string>
     <string name="tab_new">Uusi välilehti</string>
     <string name="tab_choose">Valitse välilehti</string>
+    <string name="missions_header_finished">Valmis</string>
+    <string name="enqueue">Jono</string>
 </resources>
\ No newline at end of file

From 61632b3d9dca940230d733c4eac0dd7e17df2d01 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Thu, 20 Feb 2020 13:20:20 -0300
Subject: [PATCH 182/199] fixup for #3081 * dont write the "sbpg" box in video
 tracks

---
 .../java/org/schabi/newpipe/streams/Mp4FromDashWriter.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 57a7aaa9c..64e4534cb 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -291,7 +291,9 @@ public class Mp4FromDashWriter {
                 sampleCount[i] = 1;// the index is not base zero
                 sampleExtra[i] = -1;
             }
-            writeEntryArray(tablesInfo[i].sbgp, 1, sampleCount[i]);
+            if (tablesInfo[i].sbgp > 0) {
+                writeEntryArray(tablesInfo[i].sbgp, 1, sampleCount[i]);
+            }
         }
 
         if (auxBuffer == null) {

From 9f9b53c067f65859d2b9519a37e99420ad04b296 Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Thu, 20 Feb 2020 18:55:22 +0100
Subject: [PATCH 183/199] =?UTF-8?q?remove=20unecessary=20=C2=ABfew=C2=BB?=
 =?UTF-8?q?=20and=20=C2=ABmany=C2=BB=20for=20plural=20string=20in=20englis?=
 =?UTF-8?q?h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 39b2907ce..148a339a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -594,8 +594,6 @@
     <string name="systems_language">System default</string>
     <string name="dynamic_seek_duration_description">%s seconds</string>
     <plurals name="dynamic_seek_duration_description">
-        <item quantity="few">%s seconds</item>
-        <item quantity="many">%s seconds</item>
         <item quantity="other">%s seconds</item>
     </plurals>
 </resources>

From f7d73fc21b2b85776aadb20028eb3acf12a50e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20=C5=A0amla?= <auzkok@seznam.cz>
Date: Thu, 20 Feb 2020 20:29:40 +0000
Subject: [PATCH 184/199] Translated using Weblate (Czech)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-cs/strings.xml | 38 +++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ff89170ac..65cd4026a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -20,7 +20,7 @@
     <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>
-    <string name="kore_not_found">Aplikace Kore nenalezena. Chcete ji nainstalovat?</string>
+    <string name="kore_not_found">Nainstalovat chybějící aplikaci Kore\?</string>
     <string name="view_count_text">%1$s zhlédnutí</string>
     <string name="download_path_title">Adresář pro stažená videa</string>
     <string name="download_path_summary">Stažená videa jsou uložena tady</string>
@@ -61,10 +61,10 @@
     <string name="autoplay_by_calling_app_summary">Přehrává video, když je NewPipe otevřen z jiné aplikace</string>
     <string name="content">Obsah</string>
     <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="video_is_age_restricted">Zobrazit video s věkovým omezením. Změnit tuto volbu v budoucnu 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 klepnutím na hledat</string>
+    <string name="main_bg_subtitle">Začni klepnutím na \"Hledat\"</string>
     <string name="msg_copied">Zkopírováno do schránky</string>
     <string name="msg_wait">Počkejte prosím…</string>
     <string name="msg_running">NewPipe stahuje</string>
@@ -84,9 +84,9 @@
     <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="error_snackbar_action">Nahlásit</string>
     <string name="sorry_string">Omlouváme se, tohle se nemělo stát.</string>
-    <string name="error_report_button_text">Nahlásit chybu přes e-mail</string>
+    <string name="error_report_button_text">Nahlásit tuto chybu přes e-mail</string>
     <string name="error_snackbar_message">Omlouváme se, nastaly určité chyby.</string>
     <string name="could_not_load_image">Nepodařilo se nahrát obrázek</string>
     <string name="app_ui_crash">Aplikace/UI spadlo</string>
@@ -121,11 +121,11 @@
 otevření ve vyskakovacím okně</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="show_higher_resolutions_summary">Pouze některá zařízení dokáží přehrát 2K/4K videa</string>
     <string name="default_video_format_title">Výchozí formát videa</string>
     <string name="popup_remember_size_pos_title">Pamatovat si velikost a pozici vyskakovacího okna</string>
     <string name="popup_remember_size_pos_summary">Pamatovat si poslední velikost a pozici vyskakovacího okna</string>
-    <string name="popup_mode_share_menu_title">NewPipe režim vyskakovacího okna</string>
+    <string name="popup_mode_share_menu_title">Režim vyskakovacího okna</string>
     <string name="subscribe_button_title">Odebírat</string>
     <string name="subscribed_button_title">Odebíráno</string>
     <string name="channel_unsubscribed">Odběr zrušen</string>
@@ -138,14 +138,14 @@ otevření ve vyskakovacím okně</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>
+    <string name="player_gesture_controls_summary">Používat gesta pro ovládání jasu a hlasitosti přehrávače</string>
     <string name="show_search_suggestions_title">Návrhy vyhledávání</string>
     <string name="show_search_suggestions_summary">Zobrazovat návrhy při vyhledávání</string>
     <string name="enable_search_history_title">Historie vyhledávání</string>
     <string name="enable_search_history_summary">Hledané výrazy lokálně uchovávat</string>
     <string name="enable_watch_history_title">Historie sledování</string>
     <string name="enable_watch_history_summary">Evidovat zhlédnutá videa</string>
-    <string name="resume_on_audio_focus_gain_title">Přehrávat po přechodu do popředí</string>
+    <string name="resume_on_audio_focus_gain_title">Obnovit přehrávání</string>
     <string name="resume_on_audio_focus_gain_summary">Pokračovat v přehrávání po přerušení (např. hovor)</string>
     <string name="settings_category_player_title">Přehrávač</string>
     <string name="settings_category_player_behavior_title">Chování</string>
@@ -248,7 +248,7 @@ otevření ve vyskakovacím okně</string>
     <string name="start_here_on_background">Začít přehrávat na pozadí</string>
     <string name="start_here_on_popup">Začít přehrávat v okně</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="donation_encouragement">NewPipe je vyvíjen dobrovolníky, kteří tráví svůj volný č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>
     <string name="website_encouragement">Pro další informace a novinky navštivte webovou stránku NewPipe.</string>
@@ -316,7 +316,7 @@ otevření ve vyskakovacím okně</string>
     <string name="resize_zoom">Zvětšit</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_title">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 hlášení nedoručitelných výjimek Rx mimo životnost fragmentu nebo aktivity po odstranění</string>
@@ -414,13 +414,13 @@ otevření ve vyskakovacím okně</string>
     <string name="volume_gesture_control_title">Ovládání hlasitosti gesty</string>
     <string name="volume_gesture_control_summary">Používat gesta pro ovládání hlasitosti přehrávače</string>
     <string name="brightness_gesture_control_title">Ovládání jasu gesty</string>
-    <string name="brightness_gesture_control_summary">Používat gesta pro kontrolu jasu přehrávače</string>
+    <string name="brightness_gesture_control_summary">Používat gesta pro ovládání jasu přehrávače</string>
     <string name="settings_category_updates_title">Aktualizace</string>
     <string name="file_deleted">Soubor smazán</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="saved_tabs_invalid_json">Nelze načíst uložené karty, takže se použijí 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>
@@ -457,7 +457,7 @@ otevření ve vyskakovacím okně</string>
     <string name="error_path_creation">Cílovou složku nelze vytvořit</string>
     <string name="error_file_creation">Soubor 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_ssl_exception">Nelze navázat zabezpečené připojení</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>
@@ -502,7 +502,7 @@ otevření ve vyskakovacím okně</string>
     <string name="downloads_storage_ask_summary_kitkat">Budete dotázáni, kam jednotlivé soubory stáhnout.
 \nZvolte SAF, pokud si přejete stahovat na externí SD kartu</string>
     <string name="downloads_storage_use_saf_title">Použít SAF</string>
-    <string name="downloads_storage_use_saf_summary">Storage Access Framework umožňuje stahovat na externí SD kartu.
+    <string name="downloads_storage_use_saf_summary">\"Storage Access Framework\" umožňuje stahovat na externí SD kartu. 
 \nUpozornění: některá zařízení jsou nekompatibilní</string>
     <string name="enable_playback_state_lists_summary">Zobrazit pozici přehrávání v seznamech</string>
     <string name="watch_history_states_deleted">Pozice playbacku smazány.</string>
@@ -529,7 +529,7 @@ otevření ve vyskakovacím okně</string>
     <string name="seek_duration_title">Délka přetočení vpřed/zpět</string>
     <string name="peertube_instance_url_title">Instance PeerTube</string>
     <string name="peertube_instance_url_summary">Vybrat oblíbené instance PeerTube</string>
-    <string name="peertube_instance_url_help">Vyhledat nejvhodnější instance na %s</string>
+    <string name="peertube_instance_url_help">Vyhledat instance, které se vám líbí, na %s</string>
     <string name="peertube_instance_add_title">Přidat instanci</string>
     <string name="peertube_instance_add_help">Zadat URL instance</string>
     <string name="peertube_instance_add_fail">Instanci nebylo možno potvrdit</string>
@@ -542,8 +542,8 @@ otevření ve vyskakovacím okně</string>
     <string name="recovering">obnovuji</string>
     <string name="error_download_resource_gone">Toto stahování nelze obnovit</string>
     <string name="choose_instance_prompt">Vyberte instanci</string>
-    <string name="enable_lock_screen_video_thumbnail_title">Zapnout náhled videa na zamknuté obrazovce</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">Hraje-li video na pozadí, náhled videa se ukáže na zamknuté obrazovce</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Náhled videa na zamknuté obrazovce</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Při použití přehrávače na pozadí se náhled videa ukáže na zamknuté obrazovce</string>
     <string name="clear_download_history">Smazat historii stahování</string>
     <string name="delete_downloaded_files">Smazat stažené soubory</string>
     <string name="deleted_downloads">Smazat %1$s stahování</string>

From fd076f5a58f25e39373999b90a63ec4415fb51ca Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Fri, 21 Feb 2020 15:53:31 +0000
Subject: [PATCH 185/199] Translated using Weblate (Czech)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-cs/strings.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 65cd4026a..01bcfede7 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -98,7 +98,7 @@
     <string name="downloads_title">Stažené soubory</string>
     <string name="what_device_headline">Info:</string>
     <string name="your_comment">Vaše poznámky (anglicky):</string>
-    <string name="storage_permission_denied">Oprávnění přístupu do úložiště zamítnuto</string>
+    <string name="storage_permission_denied">Nejdříve udělit oprávnění přístupu k úložišti</string>
     <string name="view">Přehrát</string>
     <string name="add">Nová mise</string>
     <string name="finish">OK</string>
@@ -179,9 +179,9 @@ otevření ve vyskakovacím okně</string>
     </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>
+        <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>
@@ -214,7 +214,7 @@ otevření ve vyskakovacím okně</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_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="show_hold_to_append_summary">Ukázat tip po stisku na pozadí nebo na popup tlačítko v \"Podrobnostech\" o videu</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>
@@ -329,7 +329,7 @@ otevření ve vyskakovacím okně</string>
     <string name="metadata_cache_wipe_summary">Odebrat všechna data uložená v mezipaměti</string>
     <string name="metadata_cache_wipe_complete_notice">Mezipaměť metadat vymazána</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="auto_queue_summary">Pokračovat konečnou (neopakující se) frontu playbacku připojením souvisejícího streamu</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>
@@ -552,4 +552,5 @@ otevření ve vyskakovacím okně</string>
     <string name="systems_language">Jazyk systému</string>
     <string name="subtitle_activity_recaptcha">Po vyřešení stiskni \"Hotovo\"</string>
     <string name="recaptcha_done_button">Hotovo</string>
+    <string name="duration_live_button" translatable="false">Live</string>
 </resources>
\ No newline at end of file

From d460351da2f3c7a0e30382298d40fb1b24ef9262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Thu, 20 Feb 2020 09:59:03 +0000
Subject: [PATCH 186/199] Translated using Weblate (Turkish)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-tr/strings.xml | 51 +++++++++++++-------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1dd9deff6..557e59236 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">Başlamak için aramaya dokunun</string>
+    <string name="main_bg_subtitle">Başlamak için \"Arama\"ya dokunun</string>
     <string name="view_count_text">%1$s görüntüleme</string>
     <string name="upload_date_text">Yayınlanma: %1$s</string>
-    <string name="no_player_found">Akış oynatıcısı bulunamadı. VLC\'yi yüklemek ister misiniz\?</string>
+    <string name="no_player_found">Akış oynatıcısı bulunamadı. VLC yüklensin mi\?</string>
     <string name="install">Yükle</string>
     <string name="cancel">Vazgeç</string>
     <string name="open_in_browser">Tarayıcıda aç</string>
@@ -27,7 +27,7 @@
     <string name="autoplay_by_calling_app_summary">NewPipe başka uygulamadan çağrıldığında video oynatır</string>
     <string name="default_resolution_title">Öntanımlı çözünürlük</string>
     <string name="play_with_kodi_title">Kodi ile oynat</string>
-    <string name="kore_not_found">Kore uygulaması bulunamadı. Yüklensin mi\?</string>
+    <string name="kore_not_found">Eksik Kore uygulaması yüklensin mi\?</string>
     <string name="show_play_with_kodi_title">\"Kodi ile oynat\" seçeneğini göster</string>
     <string name="show_play_with_kodi_summary">Kodi ortam merkezi üzerinden video oynatmak için bir seçenek göster</string>
     <string name="default_audio_format_title">Öntanımlı ses biçimi</string>
@@ -47,8 +47,8 @@
     <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 malzemelere Ayarlardan izin vermek mümkündür.</string>
-    <string name="duration_live">CANLI</string>
+    <string name="video_is_age_restricted">Yaş kısıtlamalı videoyu göster. Daha sonra ayarlardan değiştirilebilir.</string>
+    <string name="duration_live">Canlı</string>
     <string name="downloads">İndirilenler</string>
     <string name="downloads_title">İndirilenler</string>
     <string name="error_report_title">Hata bildirimi</string>
@@ -64,9 +64,9 @@
     <string name="could_not_load_image">Görüntü yüklenemedi</string>
     <string name="app_ui_crash">Uygulama/kullanıcı arayüzü çöktü</string>
     <string name="sorry_string">Üzgünüz, bu olmamalıydı.</string>
-    <string name="error_report_button_text">Hatayı e-posta aracılığıyla bildir</string>
+    <string name="error_report_button_text">Bu hatayı e-posta aracılığıyla bildir</string>
     <string name="error_snackbar_message">Üzgünüz, bazı hatalar oluştu.</string>
-    <string name="error_snackbar_action">BİLDİR</string>
+    <string name="error_snackbar_action">Bildir</string>
     <string name="what_device_headline">Bilgi:</string>
     <string name="what_happened_headline">Ne oldu:</string>
     <string name="info_labels">Ne:\\nİstek:\\nİçerik Dili:\\nHizmet:\\nGMT Zamanı:\\nPaket:\\nSürüm:\\nİşletim sistemi sürümü:</string>
@@ -76,14 +76,14 @@
     <string name="detail_dislikes_img_view_description">Beğenmeme</string>
     <string name="use_tor_title">Tor kullanın</string>
     <string name="use_tor_summary">(Deneysel) Artırılmış gizlilik için indirme trafiğini Tor\'dan geçmesi için zorlayın (video yayımlama henüz desteklenmemektedir).</string>
-    <string name="report_error">Hata Bildirin</string>
+    <string name="report_error">Hata bildir</string>
     <string name="user_report">Kullanıcı raporu</string>
     <string name="err_dir_create">İndirme dizini \'%1$s\' oluşturulamıyor</string>
     <string name="info_dir_created">İndirme dizini \'%1$s\' oluşturuldu</string>
     <string name="video">Video</string>
     <string name="audio">Ses</string>
     <string name="retry">Yeniden dene</string>
-    <string name="storage_permission_denied">Depolama erişim izni reddedildi</string>
+    <string name="storage_permission_denied">Önce depolama alanına erişim izni verin</string>
     <string name="start">Başlat</string>
     <string name="pause">Duraklat</string>
     <string name="view">Oynat</string>
@@ -104,10 +104,10 @@
     <string name="no_available_dir">Lütfen daha sonra ayarlardan uygun bir indirme dizini belirleyin</string>
     <string name="could_not_setup_download_menu">İndirme menüsü ayarlanamadı</string>
     <string name="open_in_popup_mode">Açılır pencere kipinde aç</string>
-    <string name="popup_mode_share_menu_title">NewPipe açılır pencere kipi</string>
+    <string name="popup_mode_share_menu_title">Açılır pencere modu</string>
     <string name="default_popup_resolution_title">Öntanımlı açılır pencere çözünürlüğü</string>
     <string name="show_higher_resolutions_title">Yüksek çözünürlükleri göster</string>
-    <string name="show_higher_resolutions_summary">Yalnızca bazı aygıtlar 2K/4K video oynatmayı desteklemektedir</string>
+    <string name="show_higher_resolutions_summary">Yalnızca bazı aygıtlar 2K/4K videoları oynatabilir</string>
     <string name="default_video_format_title">Öntanımlı video biçimi</string>
     <string name="black_theme_title">Siyah</string>
     <string name="popup_playing_toast">Açılır pencere kipinde oynatılıyor</string>
@@ -136,7 +136,7 @@
     <string name="popup_remember_size_pos_summary">Açılan pencerenin son boyutunu ve konumunu hatırla</string>
     <string name="settings_category_popup_title">Açılır pencere</string>
     <string name="popup_resizing_indicator_title">Yeniden boyutlandırılıyor</string>
-    <string name="use_external_video_player_summary">BAZI çözünürlüklerde ses kaldırılır</string>
+    <string name="use_external_video_player_summary">Bazı çözünürlüklerde sesi kaldırır</string>
     <string name="player_gesture_controls_summary">Oynatıcının parlaklığını ve sesini kontrol etmek için hareketleri kullanın</string>
     <string name="player_gesture_controls_title">Hareketli oynatıcı kontrolü</string>
     <string name="show_search_suggestions_title">Arama önerileri</string>
@@ -176,7 +176,7 @@
     <string name="enable_search_history_summary">Arama sorgularını yerel olarak saklayın</string>
     <string name="enable_watch_history_title">İzleme geçmişi</string>
     <string name="enable_watch_history_summary">İzlenen videoların kaydını tut</string>
-    <string name="resume_on_audio_focus_gain_title">Odaklanıldığında sürdür</string>
+    <string name="resume_on_audio_focus_gain_title">Oynatmaya devam et</string>
     <string name="resume_on_audio_focus_gain_summary">Kesintilerden sonra (örneğin telefon çağrısı) oynatmaya devam et</string>
     <string name="settings_category_player_title">Oynatıcı</string>
     <string name="settings_category_player_behavior_title">Davranış</string>
@@ -208,7 +208,7 @@
     <string name="item_deleted">Öge silindi</string>
     <string name="delete_item_search_history">Bu ögeyi arama geçmişinden silmek istiyor musunuz\?</string>
     <string name="show_hold_to_append_title">\"Eklemek için basılı tutun\" ipucunu göster</string>
-    <string name="show_hold_to_append_summary">Video ayrıntıları sayfasında arka plan veya açılır pencere düğmesine basıldığında ipucu göster</string>
+    <string name="show_hold_to_append_summary">Video \"Ayrıntılar:\" sayfasında arka plan veya açılır pencere butonuna basıldığında ipucu göster</string>
     <string name="background_player_append">Arka plan oynatıcısı kuyruğuna eklendi</string>
     <string name="popup_playing_append">Açılır pencere oynatıcısı kuyruğuna eklendi</string>
     <string name="play_all">Tümünü Oynat</string>
@@ -241,7 +241,7 @@
     <string name="start_here_on_background">Arka planda oynatmayı başlat</string>
     <string name="start_here_on_popup">Yeni açılır pencerede oynatmayı başlat</string>
     <string name="donation_title">Bağışta bulunun</string>
-    <string name="donation_encouragement">NewPipe, size en iyi deneyimi sunmak için zaman harcayan gönüllüler tarafından geliştirilmiştir. Geliştiricilerin bir fincan kahvenin tadını çıkarırken NewPipe\'ı daha iyi hale getirmelerine yardımcı olun.</string>
+    <string name="donation_encouragement">NewPipe, boş zamanlarını size en iyi kullanıcı deneyimi sunmak için harcayan gönüllüler tarafından geliştirilmiştir. Geliştiricilerin bir fincan kahvenin tadını çıkarırken NewPipe\'ı daha iyi hale getirmelerine yardımcı olun.</string>
     <string name="give_back">Bağışta bulunun</string>
     <string name="website_title">Web sitesi</string>
     <string name="website_encouragement">Daha çok bilgi ve haber için NewPipe web sitesini ziyaret edin.</string>
@@ -309,14 +309,14 @@
     <string name="settings_category_debug_title">Hata ayıklama</string>
     <string name="drawer_header_action_paceholder_text">Yakında bir şeyler burada görünecek ;D</string>
     <string name="caption_auto_generated">Kendiliğinden oluşturulan</string>
-    <string name="enable_leak_canary_title">LeakCanary\'i etkinleştir</string>
+    <string name="enable_leak_canary_title">LeakCanary</string>
     <string name="enable_leak_canary_summary">Bellek sızıntısı izleme, yığın boşaltımı sırasında uygulamanın yanıt vermemesine neden olabilir</string>
     <string name="enable_disposed_exceptions_title">Yaşam döngüsü dışı hatalarını bildir</string>
     <string name="enable_disposed_exceptions_summary">Parçanın dışında veya atımdan sonraki etkinlik yaşam döngüsündeki teslim edilemeyen Rx beklentilerinin bildirimini zorla</string>
     <string name="use_inexact_seek_title">Hızlı isabetsiz konumlama kullan</string>
     <string name="use_inexact_seek_summary">İsabetsiz konumlama, oynatıcının daha düşük hassasiyetle daha hızlı pozisyon aramasını sağlar</string>
     <string name="auto_queue_title">Sonraki akışı otomatik kuyruğa ekle</string>
-    <string name="auto_queue_summary">Yinelenmeyen bir kuyruktaki son akışı oynatırken, ilgili bir akışı otomatik olarak ekle</string>
+    <string name="auto_queue_summary">İlgili bir akış ekleyerek sonlu (tekrarlanmayan) oynatma sırasını devam ettir</string>
     <string name="file">Dosya</string>
     <string name="invalid_directory">Böyle bir dizin yok</string>
     <string name="invalid_source">Böyle bir dosya/içerik kaynağı yok</string>
@@ -411,9 +411,9 @@
     <string name="app_update_notification_channel_description">Yeni NewPipe sürümü için bildirimler</string>
     <string name="download_to_sdcard_error_title">Harici depolama kullanılamıyor</string>
     <string name="download_to_sdcard_error_message">Harici SD karta indirmek mümkün değil. İndirme dizini konumu sıfırlansın mı\?</string>
-    <string name="saved_tabs_invalid_json">Öntanımlı sekmeler kullanılıyor, kaydedilen sekmeler okunurken hata</string>
+    <string name="saved_tabs_invalid_json">Kayıtlı sekmeler okunamadı, bu nedenle varsayılanlar kullanılıyor</string>
     <string name="restore_defaults">Öntanımlıları geri yükle</string>
-    <string name="restore_defaults_confirmation">Öntanımlıları geri yüklemek istiyor musunuz\?</string>
+    <string name="restore_defaults_confirmation">Varsayılanları geri yüklemek istiyor musunuz\?</string>
     <string name="subscribers_count_not_available">Abone sayısı mevcut değil</string>
     <string name="main_page_content_summary">Ana sayfada hangi sekmeler gösterilir</string>
     <string name="selection">Seçim</string>
@@ -444,7 +444,7 @@
     <string name="error_file_creation">Dosya oluşturulamıyor</string>
     <string name="error_path_creation">Hedef dizin 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_ssl_exception">Güvenli bağlantı kurulamadı</string>
     <string name="error_unknown_host">Sunucu bulunamadı</string>
     <string name="error_connect_host">Sunucuya bağlanılamıyor</string>
     <string name="error_http_no_content">Sunucu veri göndermiyor</string>
@@ -461,7 +461,7 @@
     <string name="conferences">Konferanslar</string>
     <string name="missions_header_pending">Beklemede</string>
     <string name="show_comments_title">Yorumları göster</string>
-    <string name="show_comments_summary">Yorumları göstermeyi durdurmak için devre dışı bırak</string>
+    <string name="show_comments_summary">Yorumları gizlemek için kapatın</string>
     <string name="autoplay_title">Otomatik oynat</string>
     <plurals name="comments">
         <item quantity="one">Yorum</item>
@@ -494,7 +494,7 @@
     <string name="downloads_storage_ask_summary_kitkat">Her indirme için nereye kaydedileceği sorulacak. 
 \nEğer harici SD karta indirmek istiyorsanız DEÇ\'i seçin</string>
     <string name="downloads_storage_use_saf_title">DEÇ\'i kullan</string>
-    <string name="downloads_storage_use_saf_summary">Depolama Erişimi Çerçevesi harici SD karta indirmelere izin verir. 
+    <string name="downloads_storage_use_saf_summary">\'Depolama Erişimi Çerçevesi\' harici SD karta indirmelere izin verir. 
 \nNot: Bazı aygıtlar uyumlu değildir</string>
     <string name="clear_playback_states_title">Oynatım konumlarını sil</string>
     <string name="clear_playback_states_summary">Tüm oynatım konumlarını siler</string>
@@ -520,7 +520,7 @@
     <string name="seek_duration_title">Hızlı ileri/geri sarma süresi</string>
     <string name="peertube_instance_url_title">PeerTube örnekleri</string>
     <string name="peertube_instance_url_summary">Favori PeerTube örneklerinizi seçin</string>
-    <string name="peertube_instance_url_help">%s adresinde size en uygun örnekleri bulun</string>
+    <string name="peertube_instance_url_help">%s adresinde beğendiğiniz örnekleri bulun</string>
     <string name="peertube_instance_add_title">Örnek ekle</string>
     <string name="peertube_instance_add_help">Örnek URL\'sini girin</string>
     <string name="peertube_instance_add_fail">Örnek doğrulanamadı</string>
@@ -533,8 +533,8 @@
     <string name="recovering">kurtarılıyor</string>
     <string name="error_download_resource_gone">Bu indirme kurtarılamıyor</string>
     <string name="choose_instance_prompt">Oluşum seçin</string>
-    <string name="enable_lock_screen_video_thumbnail_title">Kilit ekranı video küçük resmini etkinleştir</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">Arka plan oynatıcıyı kullanırken kilit ekranında bir video küçük resmi görüntülenecektir</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Kilit ekranı video küçük resmi</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Arka plan oynatıcıyı kullanırken kilit ekranında bir video küçük resmi gösterilir</string>
     <string name="clear_download_history">İndirme geçmişini temizle</string>
     <string name="delete_downloaded_files">İndirilen dosyaları sil</string>
     <string name="deleted_downloads">%1$s indirme silindi</string>
@@ -543,4 +543,5 @@
     <string name="systems_language">Sistem öntanımlısı</string>
     <string name="subtitle_activity_recaptcha">Çözüldüğünde \"Bitti\" butonuna basın</string>
     <string name="recaptcha_done_button">Bitti</string>
+    <string name="duration_live_button" translatable="false">Canlı</string>
 </resources>
\ No newline at end of file

From e1101dd6f13bc546f2fed75524b3240d16fd0eb0 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Thu, 20 Feb 2020 07:30:05 +0000
Subject: [PATCH 187/199] Translated using Weblate (Hebrew)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-he/strings.xml | 41 +++++++++++++-------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 72b6a92ab..59e4ce6be 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -19,7 +19,7 @@
     <string name="use_external_video_player_title">שימוש בנגן סרטונים חיצוני</string>
     <string name="use_external_video_player_summary">בחלק מהרזולוציות השמע יוסר</string>
     <string name="use_external_audio_player_title">שימוש בנגן סרטונים חיצוני</string>
-    <string name="popup_mode_share_menu_title">מצב חלון צף של NewPipe</string>
+    <string name="popup_mode_share_menu_title">מצב חלון צף</string>
     <string name="controls_background_title">רקע</string>
     <string name="controls_popup_title">חלון צף</string>
     <string name="download_path_title">תיקייה להורדת סרטונים</string>
@@ -33,9 +33,9 @@
     <string name="default_resolution_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="show_higher_resolutions_summary">רק חלק מהמכשירים יכולים לנגן סרטונים ב־2K/4K</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>
@@ -65,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>
@@ -110,10 +110,10 @@
     <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_title">להמשיך את הניגון</string>
     <string name="resume_on_audio_focus_gain_summary">להמשיך לנגן לאחר הפרעות (למשל: שיחות טלפון)</string>
     <string name="show_hold_to_append_title">להציג את העצה „להחזיק כדי להוסיף לרשימת נגינה”</string>
-    <string name="show_hold_to_append_summary">להציג עצה בעת לחיצה על כפתור בנגן רקע או צף בעמוד פרטי סרטון</string>
+    <string name="show_hold_to_append_summary">להציג עצה בעת לחיצה על הרקע או על הכפתור של הנגן הצף ב„פרטים:” על הסרטון</string>
     <string name="settings_category_player_title">נגן</string>
     <string name="settings_category_player_behavior_title">התנהגות</string>
     <string name="settings_category_history_title">היסטוריה ומטמון</string>
@@ -147,7 +147,7 @@
     <string name="video">סרטון</string>
     <string name="audio">שמע</string>
     <string name="retry">ניסיון חוזר</string>
-    <string name="storage_permission_denied">הגישה לאחסון נדחתה</string>
+    <string name="storage_permission_denied">יש להעניק גישה לאחסון תחילה</string>
     <string name="short_thousand">ק׳</string>
     <string name="short_million">מ׳</string>
     <string name="short_billion">מיליארד</string>
@@ -216,7 +216,7 @@
     <string name="contribution_encouragement">אם יש לך רעיון כלשהו בנוגע לתרגום, שינויי עיצוב, ניקוי הקוד או שינויים מהותיים בקוד - אנו תמיד שמחים לקבל עזרה. ככל שיותר דברים מתבצעים כך היישומון משתפר!</string>
     <string name="view_on_github">הצגה ב־GitHub</string>
     <string name="donation_title">תרומה</string>
-    <string name="donation_encouragement">הפיתוח של NewPipe נערך ע״י מתנדבים שמשקיעים את זמנם כדי להגיש לך את החוויה הטובה ביותר. באפשרותך להעניק בחזרה כדי לסייע למפתחים לשפר את NewPipe בעודם נהנים מכוס קפה.</string>
+    <string name="donation_encouragement">הפיתוח של NewPipe נערך ע״י מתנדבים שמשקיעים את זמנם הפנוי כדי להגיש לך את חווית השימוש הטובה ביותר. באפשרותך להעניק בחזרה כדי לסייע למפתחים לשפר את NewPipe בעודם נהנים מכוס קפה.</string>
     <string name="give_back">לתרום בחזרה</string>
     <string name="website_title">אתר הבית</string>
     <string name="website_encouragement">מומלץ לבקר באתר של NewPipe לפרטים נוספים ולחדשות.</string>
@@ -338,7 +338,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>
@@ -377,7 +377,7 @@
     <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_title">LeakCanary</string>
     <string name="enable_leak_canary_summary">מעקב אחר זליגת זיכרון עשויה לגרום ליישומון להיות בלתי זמין בזמן העתקת תוכן הזיכרון לקובץ</string>
     <string name="import_soundcloud_instructions_hint">המזהה שלך, soundcloud.com/המזהה שלך</string>
     <string name="import_network_expensive_warning">נא לשים לב כי פעולה זו עשויה להעמיס על תקשורת הנתונים. 
@@ -399,18 +399,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="volume_gesture_control_summary">שימוש במחוות כדי לשלוט בעצמת השמע של הנגן</string>
     <string name="brightness_gesture_control_title">מחוות בקרת בהירות</string>
-    <string name="brightness_gesture_control_summary">ניתן להשתמש במחוות כדי לשלוט בבהירות הנגן</string>
+    <string name="brightness_gesture_control_summary">שימוש במחוות כדי לשלוט בבהירות הנגן</string>
     <string name="settings_category_updates_title">עדכונים</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">אין אפשרות להוריד לכרטיס SD. לאפס את מיקום תיקיית ההורדה\?</string>
-    <string name="saved_tabs_invalid_json">נעשה שימוש בלשוניות בררת המחדל, אירעה שגיאה בעת קריאת הלשוניות שנשמרו</string>
+    <string name="saved_tabs_invalid_json">לא ניתן לקרוא לשוניות שמורות, לכן נעשה שימוש באלו של בררת המחדל</string>
     <string name="restore_defaults">שחזור בררות מחדל</string>
-    <string name="restore_defaults_confirmation">לשחזר את בררות המחדל\?</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>
@@ -456,7 +456,7 @@
     <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_ssl_exception">לא ניתן להקים חיבור מאובטח</string>
     <string name="error_unknown_host">לא ניתן למצוא את השרת</string>
     <string name="error_connect_host">לא ניתן להתחבר לשרת</string>
     <string name="error_http_no_content">השרת לא שולח נתונים</string>
@@ -470,7 +470,7 @@
     <string name="pause_downloads_on_mobile">לייצר הפרעה ברשתות מדודות</string>
     <string name="pause_downloads_on_mobile_desc">שימושי בעת מעבר לחיבור רשת סלולרית, למרות שישנן הורדות שלא ניתן להשהות</string>
     <string name="show_comments_title">הצגת תגובות</string>
-    <string name="show_comments_summary">יש להשבית כדי להפסיק הצגת תגובות</string>
+    <string name="show_comments_summary">יש להשבית כדי להפסיק הסתרת תגובות</string>
     <string name="autoplay_title">ניגון אוטומטי</string>
     <plurals name="comments">
         <item quantity="one">תגובות</item>
@@ -506,7 +506,7 @@
     <string name="downloads_storage_ask_summary_kitkat">תוצג שאלה היכן לשמור כל הורדה. 
 \nיש להפעיל זאת אם ברצונך להוריד לכרטיס SD חיצוני</string>
     <string name="downloads_storage_use_saf_title">שימוש ב־SAF</string>
-    <string name="downloads_storage_use_saf_summary">תשתית גישה לאחסון מאפשרת הורדות לכרטיס SD חיוני.
+    <string name="downloads_storage_use_saf_summary">‚תשתית גישה לאחסון’ מאפשרת הורדות לכרטיס SD חיצוני. 
 \nלתשומת לבך: חלק מהמכשירים אינם נתמכים</string>
     <string name="clear_playback_states_title">מחיקת מיקומי נגינה</string>
     <string name="clear_playback_states_summary">מחיקת כל מיקומי הנגינה</string>
@@ -532,7 +532,7 @@
     <string name="seek_duration_title">משך קפיצה מהירה קדימה/אחורה</string>
     <string name="peertube_instance_url_title">מופעים של PeerTube</string>
     <string name="peertube_instance_url_summary">נא לבחור את מופעי ה־PeerTube המועדפים עליך</string>
-    <string name="peertube_instance_url_help">איתור המופעים שהכי מתאימים לך תחת %s</string>
+    <string name="peertube_instance_url_help">איתור המופעים האהובים עליך תחת %s</string>
     <string name="peertube_instance_add_title">הוספת מופע</string>
     <string name="peertube_instance_add_help">נא להכניס כתובת מופע</string>
     <string name="peertube_instance_add_fail">לא ניתן לאמת את המופע</string>
@@ -545,8 +545,8 @@
     <string name="recovering">בשחזור</string>
     <string name="error_download_resource_gone">לא ניתן לשחזר את ההורדה הזאת</string>
     <string name="choose_instance_prompt">נא לבחור מופע</string>
-    <string name="enable_lock_screen_video_thumbnail_title">הפעלת תמונה מוקטנת של הסרטון במסך הנעילה</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">בעת השימוש בנגן הרקע תופיע תמונה מוקטנת של הסרטון על מסך הנעילה</string>
+    <string name="enable_lock_screen_video_thumbnail_title">תמונה מוקטנת של הסרטון במסך הנעילה</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">תמונה מוקטנת של הסרטון תופיע על מסך הנעילה בעת שימוש בנגן הרקע</string>
     <string name="clear_download_history">מחיקת היסטוריית ההורדות</string>
     <string name="delete_downloaded_files">למחוק את הקבצים שהורדתי</string>
     <string name="deleted_downloads">נמחקו %1$s הורדות</string>
@@ -555,4 +555,5 @@
     <string name="systems_language">בררת המחדל של המערכת</string>
     <string name="subtitle_activity_recaptcha">יש ללחוץ על „סיום” לאחר הפתירה</string>
     <string name="recaptcha_done_button">סיום</string>
+    <string name="duration_live_button" translatable="false">חי</string>
 </resources>
\ No newline at end of file

From 47d2ae5c5edcb803da01c7045dc19e3a828ce963 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 20 Feb 2020 23:16:29 +0000
Subject: [PATCH 188/199] Translated using Weblate (Polish)

Currently translated at 99.6% (530 of 532 strings)
---
 app/src/main/res/values-pl/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 53de33521..46494c1e5 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">Naciśnij Szukaj, aby zacząć</string>
+    <string name="main_bg_subtitle">Naciśnij „Szukaj”, aby zacząć</string>
     <string name="install">Zainstaluj</string>
     <string name="cancel">Anuluj</string>
     <string name="open_in_browser">Otwórz w przeglądarce</string>
@@ -16,7 +16,7 @@
     <string name="use_external_audio_player_title">Użyj zewnętrznego odtwarzacza audio</string>
     <string name="view_count_text">%1$s wyświetleń</string>
     <string name="upload_date_text">Opublikowano %1$s</string>
-    <string name="no_player_found">Nie znaleziono odtwarzacza strumieni. Czy chcesz zainstalować VLC\?</string>
+    <string name="no_player_found">Nie znaleziono odtwarzacza strumieni. Zainstalować VLC\?</string>
     <string name="download_path_title">Folder pobierania wideo</string>
     <string name="download_path_summary">Pobrane pliki wideo są przechowywane tutaj</string>
     <string name="download_path_dialog_title">Wybierz folder pobierania plików wideo</string>
@@ -139,7 +139,7 @@
     <string name="msg_popup_permission">To pozwolenie jest wymagane, aby 
 \notworzyć w trybie okienkowym</string>
     <string name="open_in_popup_mode">Odtwórz w trybie okienkowym</string>
-    <string name="popup_mode_share_menu_title">Tryb okienkowy NewPipe</string>
+    <string name="popup_mode_share_menu_title">Tryb okienkowy</string>
     <string name="controls_popup_title">Tryb okienkowy</string>
     <string name="best_resolution">Najlepsza rozdzielczość</string>
     <string name="settings_category_downloads_title">Pobierz</string>
@@ -409,7 +409,7 @@
     <string name="tab_new">Nowa karta</string>
     <string name="tab_choose">Wybierz kartę</string>
     <string name="volume_gesture_control_title">Kontrola gestów głośności</string>
-    <string name="volume_gesture_control_summary">Użyj gestów do sterowania głośnośnością odtwarzania</string>
+    <string name="volume_gesture_control_summary">Użyj gestów do sterowania głośnośnością odtwarzacza</string>
     <string name="brightness_gesture_control_title">Kontrola gestów jasności</string>
     <string name="brightness_gesture_control_summary">Użyj gestów do sterowania jasnością odtwarzacza</string>
     <string name="settings_category_updates_title">Aktualizacje</string>

From ae5360fb275dea4e4101b1e02578a2c7da0051f3 Mon Sep 17 00:00:00 2001
From: WaldiS <admin@sto.ugu.pl>
Date: Fri, 21 Feb 2020 11:31:47 +0000
Subject: [PATCH 189/199] Translated using Weblate (Polish)

Currently translated at 99.6% (530 of 532 strings)
---
 app/src/main/res/values-pl/strings.xml | 31 +++++++++++++-------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 46494c1e5..fe650d099 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -27,7 +27,7 @@
     <string name="autoplay_by_calling_app_summary">Odtwórz wideo, kiedy NewPipe zostanie wywołany z innej aplikacji</string>
     <string name="default_resolution_title">Domyślna rozdzielczość</string>
     <string name="play_with_kodi_title">Odtwórz w Kodi</string>
-    <string name="kore_not_found">Nie znaleziono aplikacji Kore. Zainstalować ją\?</string>
+    <string name="kore_not_found">Zainstalować brakującą aplikację Kore\?</string>
     <string name="show_play_with_kodi_title">Pokaż opcję „Odtwórz z Kodi”</string>
     <string name="show_play_with_kodi_summary">Wyświetl opcję odtwarzania filmów za pośrednictwem centrum multimedialnego Kodi</string>
     <string name="play_audio">Dźwięk</string>
@@ -65,7 +65,7 @@
     <string name="sorry_string">Przepraszamy, to nie powinno mieć miejsca.</string>
     <string name="error_report_button_text">Zgłoś błąd przez e-mail</string>
     <string name="error_snackbar_message">Przepraszamy, wystąpiły pewne błędy.</string>
-    <string name="error_snackbar_action">ZGŁOŚ</string>
+    <string name="error_snackbar_action">Zgłoś</string>
     <string name="what_device_headline">Informacje:</string>
     <string name="what_happened_headline">Co się stało:</string>
     <string name="info_labels">Co:\\nRequest:\\nJęzyk treści:\\nUsługa:\\nCzas GMT:\\nPakiet:\\nWersja:\\nWersja systemu:</string>
@@ -84,7 +84,7 @@
     <string name="video">Film</string>
     <string name="audio">Dźwięk</string>
     <string name="retry">Ponów</string>
-    <string name="storage_permission_denied">Odmowa dostępu do pamięci</string>
+    <string name="storage_permission_denied">Najpierw udziel dostępu do pamięci</string>
     <string name="pause">Wstrzymaj</string>
     <string name="view">Odtwórz</string>
     <string name="delete">Usuń</string>
@@ -174,7 +174,7 @@
     <string name="enable_search_history_summary">Zapisuj lokalnie historię wyszukiwania</string>
     <string name="enable_watch_history_title">Historia oglądanych</string>
     <string name="enable_watch_history_summary">Zapisuj historię oglądania</string>
-    <string name="resume_on_audio_focus_gain_title">Wznów gdy na pierwszym planie</string>
+    <string name="resume_on_audio_focus_gain_title">Wznów odtwarzanie</string>
     <string name="resume_on_audio_focus_gain_summary">Kontynuuj odtwarzanie po przerwaniu (np. po rozmowie telefonicznej)</string>
     <string name="notification_channel_name">Powiadomienia NewPipe</string>
     <string name="notification_channel_description">Powiadomienia dla NewPipe w tle i trybie wyskakujących okien odtwarzania</string>
@@ -222,7 +222,7 @@
     </plurals>
     <string name="charset_most_special_characters">Większość znaków specjalnych</string>
     <string name="donation_title">Dotacja</string>
-    <string name="donation_encouragement">NewPipe rozwijane jest przez wolontariuszy, którzy poświęcają swój wolny czas, by zapewnić Ci jak najlepsze wrażenia podczas korzystania z aplikacji. To dobry moment, aby wesprzeć programistów i sprawić, by program był jeszcze lepszy, delektując się filiżanką kawy.</string>
+    <string name="donation_encouragement">NewPipe jest rozwijany przez wolontariuszy, którzy poświęcają swój wolny czas, by zapewnić Ci jak najlepsze wrażenia podczas korzystania z aplikacji. To dobry moment, aby wesprzeć programistów i sprawić, by program był jeszcze lepszy, delektując się filiżanką kawy.</string>
     <string name="give_back">Wspomóż</string>
     <string name="website_title">Witryna</string>
     <string name="website_encouragement">By otrzymać więcej informacji oraz najnowsze wiadomości o NewPipe, odwiedź naszą stronę.</string>
@@ -316,7 +316,7 @@
     <string name="resize_fill">Wypełnij</string>
     <string name="resize_zoom">Powiększ</string>
     <string name="caption_auto_generated">Wygenerowane automatycznie</string>
-    <string name="enable_leak_canary_title">Włącz LeakCanary</string>
+    <string name="enable_leak_canary_title">LeakCanary</string>
     <string name="enable_leak_canary_summary">Monitorowanie wycieków pamięci może powodować niestabilność aplikacji podczas zrzutu pamięci</string>
     <string name="enable_disposed_exceptions_title">Zgłaszanie błędów poza cyklem życia</string>
     <string name="enable_disposed_exceptions_summary">Wymusza raportowanie niedostarczonych wyjątków Rx poza cyklem życia fragmentu lub aktywności</string>
@@ -329,7 +329,7 @@
     <string name="metadata_cache_wipe_summary">Wyczyść pamięć podręczną stron</string>
     <string name="metadata_cache_wipe_complete_notice">Wyczyszczono pamięć podręczną metadanych</string>
     <string name="auto_queue_title">Automatyczne kolejkowanie następnego strumienia</string>
-    <string name="auto_queue_summary">Automatycznie dodaj kolejny powiązany strumień podczas odtwarzania ostatniego strumienia w niezapętlonej kolejce</string>
+    <string name="auto_queue_summary">Kontynuuj kończenie (niepowtarzanie) kolejki odtwarzania, dołączając powiązany strumień</string>
     <string name="file">Plik</string>
     <string name="invalid_directory">Nie ma takiego folderu</string>
     <string name="invalid_source">Nie ma takiego źródła plików/treści</string>
@@ -418,10 +418,10 @@
     <string name="app_update_notification_channel_description">Powiadomienia o nowej wersji NewPipe</string>
     <string name="download_to_sdcard_error_title">Pamięć zewnętrzna jest niedostępna</string>
     <string name="download_to_sdcard_error_message">Pobieranie na zewnętrzną kartę SD nie jest możliwe. Zresetować lokalizację folderu pobierania\?</string>
-    <string name="saved_tabs_invalid_json">Korzystanie z domyślnych kart, błąd podczas czytania zapisanych kart</string>
+    <string name="saved_tabs_invalid_json">Nie można odczytać zapisanych kart, więc będzie używana domyślna</string>
     <string name="restore_defaults">Przywróć domyślne</string>
     <string name="restore_defaults_confirmation">Czy chcesz przywrócić ustawienia domyślne\?</string>
-    <string name="subscribers_count_not_available">Subskrybenci nie są dostępni</string>
+    <string name="subscribers_count_not_available">Subskrybent jest niedostępny</string>
     <string name="main_page_content_summary">Karty wyświetlane na stronie głównej</string>
     <string name="selection">Wybierz</string>
     <string name="updates_setting_title">Aktualizacje</string>
@@ -451,7 +451,7 @@
     <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_ssl_exception">Nie można nawiązać bezpiecznego połączenia</string>
     <string name="error_unknown_host">Nie można znaleźć serwera</string>
     <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>
@@ -468,7 +468,7 @@
     <string name="conferences">Konferencje</string>
     <string name="missions_header_pending">Oczekuje</string>
     <string name="show_comments_title">Pokaż komentarze</string>
-    <string name="show_comments_summary">Wyłącz, aby przestać wyświetlać komentarze</string>
+    <string name="show_comments_summary">Wyłącz, aby ukryć komentarze</string>
     <string name="autoplay_title">Automatyczne odtwarzanie</string>
     <plurals name="comments">
         <item quantity="one">Komentarze</item>
@@ -502,7 +502,7 @@
     <string name="downloads_storage_ask_summary_kitkat">Zostaniesz zapytany, gdzie zapisać każde pobranie.
 \nWybierz SAF, jeśli chcesz pobrać na zewnętrzną kartę SD</string>
     <string name="downloads_storage_use_saf_title">Użyj SAF</string>
-    <string name="downloads_storage_use_saf_summary">Biblioteka dostępu do pamięci pozwala na pobieranie danych na zewnętrzną kartę.
+    <string name="downloads_storage_use_saf_summary">Struktura dostępu do pamięci masowej umożliwia pobieranie danych na zewnętrzną kartę SD. 
 \nUwagi: Niektóre urządzenia nie są kompatybilne</string>
     <string name="clear_playback_states_title">Usuń pozycje odtwarzania</string>
     <string name="clear_playback_states_summary">Usuwa wszystkie pozycje odtwarzania</string>
@@ -526,7 +526,7 @@
     <string name="seek_duration_title">Krok czasu przewijania</string>
     <string name="peertube_instance_url_title">Wystąpienia PeerTube</string>
     <string name="peertube_instance_url_summary">Wybierz swoje ulubione instancje PeerTube</string>
-    <string name="peertube_instance_url_help">Znajdź wystąpienia, które najbardziej Ci odpowiadają na %s</string>
+    <string name="peertube_instance_url_help">Znajdź wystąpienia, które lubisz na %s</string>
     <string name="peertube_instance_add_title">Dodaj instancję</string>
     <string name="peertube_instance_add_help">Wprowadź adres URL instancji</string>
     <string name="peertube_instance_add_fail">Nie można sprawdzić poprawności instancji</string>
@@ -539,8 +539,8 @@
     <string name="recovering">odzyskiwanie</string>
     <string name="error_download_resource_gone">Nie można odzyskać tego pobrania</string>
     <string name="choose_instance_prompt">Wybierz instancję</string>
-    <string name="enable_lock_screen_video_thumbnail_title">Włącz miniaturę wideo na ekranie blokady</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">Podczas korzystania z odtwarzacza w tle na ekranie blokady zostanie wyświetlona miniatura filmu</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Zablokuj miniaturę wideo na ekranie</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Podczas korzystania z odtwarzacza w tle na ekranie blokady wyświetlana jest miniatura filmu</string>
     <string name="clear_download_history">Wyczyść historię pobierania</string>
     <string name="delete_downloaded_files">Usuń pobrane pliki</string>
     <string name="deleted_downloads">Usunięte %1$s pobrania</string>
@@ -549,4 +549,5 @@
     <string name="systems_language">Domyślny systemu</string>
     <string name="subtitle_activity_recaptcha">Po rozwiązaniu naciśnij „Gotowe”</string>
     <string name="recaptcha_done_button">Gotowe</string>
+    <string name="duration_live_button" translatable="false">Na żywo</string>
 </resources>
\ No newline at end of file

From da43f47487b1c19b65bca0f5b9202e21269f4c8b Mon Sep 17 00:00:00 2001
From: zmni <zmni@outlook.com>
Date: Fri, 21 Feb 2020 12:08:21 +0000
Subject: [PATCH 190/199] Translated using Weblate (Indonesian)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-in/strings.xml | 57 ++++++++++++++------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 7c3cce473..0f7980dc0 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="main_bg_subtitle">Ketuk pencarian untuk memulai</string>
+    <string name="main_bg_subtitle">Ketuk \"Cari\" untuk memulai</string>
     <string name="view_count_text">%1$s ditonton</string>
     <string name="upload_date_text">Dipublikasikan tanggal %1$s</string>
     <string name="install">Pasang</string>
@@ -24,7 +24,7 @@
     <string name="autoplay_by_calling_app_summary">Putar video ketika NewPipe dijalankan dari aplikasi lain</string>
     <string name="default_resolution_title">Resolusi</string>
     <string name="play_with_kodi_title">Putar dengan Kodi</string>
-    <string name="kore_not_found">Apl Kore tidak ditemukan. Pasang Kore\?</string>
+    <string name="kore_not_found">Pasang apl Kore\?</string>
     <string name="show_play_with_kodi_title">Tampilkan opsi \"Putar dengan Kodi\"</string>
     <string name="show_play_with_kodi_summary">Tampilkan opsi untuk memutar video via Kodi</string>
     <string name="play_audio">Audio</string>
@@ -43,12 +43,12 @@
     <string name="play_btn_text">Putar</string>
     <string name="content">Konten</string>
     <string name="show_age_restricted_content_title">Konten yang dibatasi usia</string>
-    <string name="video_is_age_restricted">Tampilkan video yang dibatasi usia. Membuka akses konten tersebut bisa dilakukan dari Pengaturan.</string>
+    <string name="video_is_age_restricted">Tampilkan video yang dibatasi usia. Bisa diubah nanti dari pengaturan.</string>
     <string name="network_error">Galat jaringan</string>
     <string name="could_not_load_thumbnails">Tidak bisa memuat semua thumbnail</string>
     <string name="did_you_mean">Maksud anda: %1$s\?</string>
     <string name="screen_rotation">rotasi</string>
-    <string name="duration_live">LANGSUNG</string>
+    <string name="duration_live">Langsung</string>
     <string name="downloads">Unduhan</string>
     <string name="downloads_title">Unduhan</string>
     <string name="error_report_title">Laporan galat</string>
@@ -60,9 +60,9 @@
     <string name="live_streams_not_supported">Siaran langsung belum didukung</string>
     <string name="could_not_load_image">Tidak bisa memuat gambar</string>
     <string name="sorry_string">Maaf, hal tersebut seharusnya tidak terjadi.</string>
-    <string name="error_report_button_text">Lapor galat via surel</string>
+    <string name="error_report_button_text">Laporkan kesalahan via surel</string>
     <string name="error_snackbar_message">Maaf, telah terjadi galat.</string>
-    <string name="error_snackbar_action">LAPOR</string>
+    <string name="error_snackbar_action">Lapor</string>
     <string name="what_device_headline">Info:</string>
     <string name="what_happened_headline">Yang terjadi:</string>
     <string name="your_comment">Komentar anda (dalam bahasa Inggris):</string>
@@ -74,13 +74,13 @@
     <string name="detail_dislikes_img_view_description">Tidak suka</string>
     <string name="use_tor_title">Gunakan Tor</string>
     <string name="use_tor_summary">(Eksperimental) Paksa trafik unduhan melalui Tor untuk meningkatkan privasi (video stream belum didukung).</string>
-    <string name="report_error">Laporkan Galat</string>
+    <string name="report_error">Laporkan kesalahan</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="storage_permission_denied">Izinkan akses penyimpanan terlebih dahulu</string>
     <string name="delete">Hapus</string>
     <string name="view">Putar</string>
     <string name="start">Mulai</string>
@@ -98,7 +98,7 @@
     <string name="msg_wait">Mohon tunggu…</string>
     <string name="msg_copied">Disalin ke papan klip</string>
     <string name="no_available_dir">Silakan pilih folder unduhan di pengaturan</string>
-    <string name="no_player_found">Pemutar stream tidak ditemukan. Apakah anda ingin memasang VLC\?</string>
+    <string name="no_player_found">Pemutar stream tidak ditemukan. Pasang 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>
@@ -119,19 +119,19 @@
     <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_mode_share_menu_title">Mode popup</string>
     <string name="popup_playing_toast">Memutar dalam mode popup</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="show_higher_resolutions_summary">Hanya perangkat tertentu yang bisa memutar 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="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>
@@ -166,8 +166,8 @@
     <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="resume_on_audio_focus_gain_title">Lanjutkan pemutaran</string>
+    <string name="resume_on_audio_focus_gain_summary">Melanjutkan 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>
@@ -183,10 +183,10 @@
     <string name="metadata_cache_wipe_title">Hapus tembolok metadata</string>
     <string name="metadata_cache_wipe_summary">Buang semua data tembolok laman web</string>
     <string name="metadata_cache_wipe_complete_notice">Cache metadata dihapus</string>
-    <string name="auto_queue_summary">Otomatis tambahkan stream terkait ketika memutar stream terakhir dalam antrean tanpa perulangan</string>
+    <string name="auto_queue_summary">Melanjutkan akhir dari antrean pemutaran (tak berulang) dengan menambahkan stream terkait</string>
     <string name="enable_watch_history_summary">Simpan daftar video yang telah ditonton</string>
     <string name="show_hold_to_append_title">Tampilkan tip \"Tahan untuk menambahkan\"</string>
-    <string name="show_hold_to_append_summary">Tampilkan tip ketika tombol latar belakang atau popup disentuh pada halaman detail video</string>
+    <string name="show_hold_to_append_summary">Tampilkan tip ketika menekan tombol latar belakang atau popup di dalam \"Detail:\" video</string>
     <string name="default_content_country_title">Negara konten</string>
     <string name="service_title">Layanan</string>
     <string name="settings_category_player_title">Pemutar</string>
@@ -309,7 +309,7 @@
     <string name="resize_fill">Isi</string>
     <string name="resize_zoom">Perbesar</string>
     <string name="caption_auto_generated">Otomatis dibuat</string>
-    <string name="enable_leak_canary_title">Aktifkan LeakCanary</string>
+    <string name="enable_leak_canary_title">LeakCanary</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="controls_download_desc">Unduh berkas stream</string>
@@ -410,10 +410,10 @@
     <string name="app_update_notification_channel_description">Notifikasi untuk versi NewPipe baru</string>
     <string name="download_to_sdcard_error_title">Penyimpanan eksternal tidak tersedia</string>
     <string name="download_to_sdcard_error_message">Tidak bisa mengunduh ke kartu SD eksternal. Atur ulang lokasi folder unduhan\?</string>
-    <string name="saved_tabs_invalid_json">Menggunakan tab baku, ralat saat membaca tab yang disimpan</string>
+    <string name="saved_tabs_invalid_json">Tidak bisa membaca tab yang disimpan, beralih menggunakan tab bawaan</string>
     <string name="restore_defaults">Kembali ke awal</string>
-    <string name="restore_defaults_confirmation">Apakah anda ingin kembali ke awal\?</string>
-    <string name="subscribers_count_not_available">Jumlah pelanggan tidak tersedia</string>
+    <string name="restore_defaults_confirmation">Apakah anda ingin mengembalikan ke bawaan\?</string>
+    <string name="subscribers_count_not_available">Jumlah subscriber tidak tersedia</string>
     <string name="main_page_content_summary">Tab apa yang ditampilkan di halaman utama</string>
     <string name="selection">Pilihan</string>
     <string name="conferences">Konferensi</string>
@@ -445,7 +445,7 @@
     <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_ssl_exception">Tidak bisa membuat koneksi yang aman</string>
     <string name="error_unknown_host">Tidak dapat menemukan server</string>
     <string name="error_connect_host">Tidak dapat terhubung ke server</string>
     <string name="error_http_no_content">Server tidak mengirim data</string>
@@ -459,7 +459,7 @@
     <string name="pause_downloads_on_mobile">Berhenti pada jaringan terbatas</string>
     <string name="pause_downloads_on_mobile_desc">Berguna saat beralih ke data seluler, walaupun beberapa unduhan tidak bisa ditangguhkan</string>
     <string name="show_comments_title">Tampilkan komentar</string>
-    <string name="show_comments_summary">Nonaktifkan untuk berhenti menampilkan komentar</string>
+    <string name="show_comments_summary">Nonaktifkan untuk menyembunyikan komentar</string>
     <string name="autoplay_title">Otomatis putar</string>
     <plurals name="comments">
         <item quantity="other">Komentar</item>
@@ -491,14 +491,14 @@
 \nPilih SAF jika anda ingin mengunduh ke kartu SD eksternal</string>
     <string name="error_timeout">Batas waktu koneksi</string>
     <string name="downloads_storage_use_saf_title">Gunakan SAF</string>
-    <string name="downloads_storage_use_saf_summary">Storage Access Framework memungkinkan mengunduh ke kartu SD eksternal.
+    <string name="downloads_storage_use_saf_summary">\'Storage Access Framework\' memungkinkan untuk mengunduh ke kartu SD eksternal. 
 \nCatatan: beberapa perangkat tidak kompatibel</string>
     <string name="clear_playback_states_title">Hapus posisi pemutaran</string>
     <string name="clear_playback_states_summary">Hapus semua posisi pemutaran</string>
     <string name="delete_playback_states_alert">Hapus semua posisi pemutaran\?</string>
     <string name="download_choose_new_path">Ubah folder unduhan</string>
     <plurals name="videos">
-        <item quantity="other">%s video</item>
+        <item quantity="other">Video</item>
     </plurals>
     <string name="drawer_header_description">Aktif/Nonaktifkan layanan, saat ini aktif:</string>
     <string name="no_one_watching">Tidak ada yang menonton</string>
@@ -512,7 +512,7 @@
     <string name="localization_changes_requires_app_restart">Bahasa akan diterapkan setelah aplikasi dimulai ulang.</string>
     <string name="peertube_instance_url_title">Situs PeerTube</string>
     <string name="peertube_instance_url_summary">Pilih situs PeerTube favorit anda</string>
-    <string name="peertube_instance_url_help">Temukan situs yang sesuai dengan anda di %s</string>
+    <string name="peertube_instance_url_help">Temukan situs yang anda suka di %s</string>
     <string name="peertube_instance_add_title">Tambah situs</string>
     <string name="peertube_instance_add_help">Masukkan URL situs</string>
     <string name="peertube_instance_add_fail">Tidak bisa memvalidasi situs</string>
@@ -525,8 +525,8 @@
     <string name="recovering">memulihkan</string>
     <string name="error_download_resource_gone">Tidak bisa memulihkan unduhan ini</string>
     <string name="choose_instance_prompt">Pilih situs</string>
-    <string name="enable_lock_screen_video_thumbnail_title">Aktifkan kunci layar thumbnail video</string>
-    <string name="enable_lock_screen_video_thumbnail_summary">Ketika menggunakan pemutar latar belakang, thumbnail video akan ditampilkan di tampilan kunci layar</string>
+    <string name="enable_lock_screen_video_thumbnail_title">Thumbnail video layar kunci</string>
+    <string name="enable_lock_screen_video_thumbnail_summary">Ketika menggunakan pemutar latar belakang, thumbnail video akan ditampilkan pada layar kunci</string>
     <string name="default_kiosk_page_summary">Kiosk Default</string>
     <string name="clear_download_history">Hapus riwayat unduhan</string>
     <string name="delete_downloaded_files">Hapus berkas yang diunduh</string>
@@ -535,4 +535,7 @@
     <string name="app_language_title">Bahasa apl</string>
     <string name="systems_language">Default sistem</string>
     <string name="recaptcha_done_button">Selesai</string>
+    <string name="duration_live_button" translatable="false">Langsung</string>
+    <string name="seek_duration_title">Durasi maju/mundur cepat</string>
+    <string name="subtitle_activity_recaptcha">Tekan \"Selesai\" saat selesai</string>
 </resources>
\ No newline at end of file

From 95a6aaac7617bd956ffd3a0ee5e99394200e937c Mon Sep 17 00:00:00 2001
From: MohammedSR Vevo <mohammednajmidin@gmail.com>
Date: Fri, 21 Feb 2020 10:58:22 +0000
Subject: [PATCH 191/199] Translated using Weblate (Kurdish)

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-ku/strings.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 20ce04100..75c8d9d02 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/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>
@@ -38,10 +38,10 @@
     <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_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="download_path_audio_dialog_title">پەڕگەی داگرتنی دەنگەکان هەڵبژێرە</string>
     <string name="autoplay_by_calling_app_title">كاركردنی خۆكارانه‌</string>
     <string name="default_resolution_title">قه‌باره‌ی بنەڕەتی</string>
     <string name="default_popup_resolution_title">قه‌باره‌ی بنەڕەتی په‌نجه‌ره‌ی بچووک</string>
@@ -546,4 +546,5 @@
     <string name="systems_language">بنەڕەتی سیستەم</string>
     <string name="subtitle_activity_recaptcha">گرتە بکە لەسەر ”تەواو” کاتێ کە چارەسەرکرا</string>
     <string name="recaptcha_done_button">تەواو</string>
+    <string name="duration_live_button" translatable="false">ڕاستەوخۆ</string>
 </resources>
\ No newline at end of file

From 40207b515d88126e42af2cccd2f52f6f43a75338 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 20 Feb 2020 08:59:23 +0000
Subject: [PATCH 192/199] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (532 of 532 strings)
---
 app/src/main/res/values-zh-rTW/strings.xml | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 395a555e7..5fa590a52 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/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>
@@ -23,7 +23,7 @@
     <string name="play_with_kodi_title">用 Kodi 播放</string>
     <string name="show_play_with_kodi_summary">顯示用 Kodi 媒體中心播放影片的選項</string>
     <string name="play_audio">聲音</string>
-    <string name="kore_not_found">找不到 Kore，您要安裝 Kore 嗎？</string>
+    <string name="kore_not_found">安裝遺失的 Kore 應用程式嗎？</string>
     <string name="show_play_with_kodi_title">顯示「用 Kodi 播放」的選項</string>
     <string name="default_audio_format_title">預設音訊格式</string>
     <string name="theme_title">主題</string>
@@ -52,16 +52,16 @@
     <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">輕觸「搜尋」按鈕開始使用</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="popup_mode_share_menu_title">懸浮視窗模式</string>
     <string name="controls_background_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>
     <string name="show_higher_resolutions_title">顯示更高的解析度</string>
-    <string name="show_higher_resolutions_summary">只有部分裝置能播 2K 及 4K 影片</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_remember_size_pos_title">記住懸浮視窗大小和位置</string>
@@ -74,7 +74,7 @@
     <string name="popup_playing_toast">以懸浮視窗播放中</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="downloads">下載</string>
     <string name="downloads_title">下載</string>
     <string name="error_report_title">錯誤回報</string>
@@ -100,7 +100,7 @@
     <string name="could_not_load_image">無法載入圖片</string>
     <string name="app_ui_crash">應用程式或界面已停止運作</string>
     <string name="sorry_string">抱歉，這是不該發生的。</string>
-    <string name="error_report_button_text">使用電子郵件回報錯誤</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>
@@ -113,7 +113,7 @@
     <string name="video">影片</string>
     <string name="audio">音訊</string>
     <string name="retry">重試</string>
-    <string name="storage_permission_denied">無法存取儲存空間</string>
+    <string name="storage_permission_denied">先授予儲存空間權限</string>
     <string name="short_thousand">k</string>
     <string name="short_million">百萬</string>
     <string name="short_billion">B</string>
@@ -153,7 +153,7 @@
     <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_title">恢復播放</string>
     <string name="resume_on_audio_focus_gain_summary">在干擾結束後繼續播放（例如有來電）</string>
     <string name="settings_category_player_title">播放器</string>
     <string name="settings_category_player_behavior_title">行為</string>
@@ -221,7 +221,7 @@
     <string name="player_stream_failure">無法播放此串流</string>
     <string name="player_unrecoverable_failure">發生無法復原的播放器錯誤</string>
     <string name="player_recoverable_failure">正在從播放器錯誤中復原</string>
-    <string name="show_hold_to_append_summary">在影片詳細資訊頁按下背景播放或懸浮視窗按鈕時顯示提示</string>
+    <string name="show_hold_to_append_summary">按下影片「詳細資訊：」中的背景或懸浮式視窗按鈕時顯示提示</string>
     <string name="external_player_unsupported_link_type">外部播放器不支援此類型連結</string>
     <string name="invalid_url_toast">無效的 URL</string>
     <string name="video_streams_empty">找不到影片串流</string>
@@ -263,7 +263,7 @@
     <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="donation_encouragement">NewPipe 由志願者所開發，他們花費他們的空閒時間務求為您帶來最佳的使用體驗。現在是時候回過頭來，讓我們的開發人員能夠在使 NewPipe 更臻完美的同時，享受一杯咖啡。</string>
     <string name="drawer_open">打開抽屜</string>
     <string name="drawer_close">關閉抽屜</string>
     <string name="video_player">影片播放器</string>
@@ -306,14 +306,14 @@
     <string name="drawer_header_action_paceholder_text">某些東西即將在此出現 ;D</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_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_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>
@@ -408,7 +408,7 @@
     <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="saved_tabs_invalid_json">使用預設分頁，讀取已儲存的分頁時發生錯誤</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>
@@ -442,7 +442,7 @@
     <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_ssl_exception">無法建立安全連線</string>
     <string name="error_unknown_host">找不到伺服器</string>
     <string name="error_connect_host">無法連線到伺服器</string>
     <string name="error_http_no_content">伺服器沒有傳送資料</string>
@@ -459,7 +459,7 @@
     <string name="conferences">會議</string>
     <string name="error_timeout">連接超時</string>
     <string name="show_comments_title">顯示留言</string>
-    <string name="show_comments_summary">停用以停止顯示留言</string>
+    <string name="show_comments_summary">關閉以隱藏留言</string>
     <string name="autoplay_title">自動播放</string>
     <plurals name="comments">
         <item quantity="other">留言</item>
@@ -499,7 +499,7 @@
     <string name="drawer_header_description">切換服務，目前已選取：</string>
     <plurals name="videos">
         <item quantity="one">%s 影片</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <string name="default_kiosk_page_summary">預設 Kiosk</string>
     <string name="no_one_watching">沒有人在看</string>
@@ -516,7 +516,7 @@
     <string name="seek_duration_title">快轉／快退搜尋持續時間</string>
     <string name="peertube_instance_url_title">PeerTube 站臺</string>
     <string name="peertube_instance_url_summary">選取您最愛的 PeerTube 站臺</string>
-    <string name="peertube_instance_url_help">在 %s 上找到最適合您的站臺</string>
+    <string name="peertube_instance_url_help">在 %s 上找到您喜愛的站臺</string>
     <string name="peertube_instance_add_title">新增站臺</string>
     <string name="peertube_instance_add_help">輸入站臺 URL</string>
     <string name="peertube_instance_add_fail">無法驗證站臺</string>
@@ -529,7 +529,7 @@
     <string name="recovering">正在恢復</string>
     <string name="error_download_resource_gone">無法復原此下載</string>
     <string name="choose_instance_prompt">選擇一個站臺</string>
-    <string name="enable_lock_screen_video_thumbnail_title">啟用鎖定畫面影片縮圖</string>
+    <string name="enable_lock_screen_video_thumbnail_title">鎖定畫面影片縮圖</string>
     <string name="enable_lock_screen_video_thumbnail_summary">使用背景播放器時，鎖定畫面上將會顯示影片縮圖</string>
     <string name="clear_download_history">清除下載歷史紀錄</string>
     <string name="delete_downloaded_files">刪除已下載的檔案</string>
@@ -539,4 +539,5 @@
     <string name="systems_language">系統預設值</string>
     <string name="subtitle_activity_recaptcha">解決後請按「完成」</string>
     <string name="recaptcha_done_button">完成</string>
+    <string name="duration_live_button" translatable="false">直播</string>
 </resources>
\ No newline at end of file

From 30e5e581780430a3fd29db960197d504296a9304 Mon Sep 17 00:00:00 2001
From: chr56 <chr0056@gmail.com>
Date: Thu, 20 Feb 2020 12:12:43 +0000
Subject: [PATCH 193/199] Translated using Weblate (Chinese (Simplified))

Currently translated at 93.0% (495 of 532 strings)
---
 app/src/main/res/values-b+zh+HANS+CN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
index d4119e83c..c5ff40750 100644
--- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml
+++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
@@ -536,4 +536,5 @@
     <string name="clear_download_history">清除下载历史记录</string>
     <string name="delete_downloaded_files">删除下载了的文件</string>
     <string name="deleted_downloads">已删除 %1$s 下载</string>
+    <string name="permission_display_over_apps">授予在其他应用上层显示的权限</string>
 </resources>
\ No newline at end of file

From 6e5851aea89fc29efca8de59d549c7984c6f70bd Mon Sep 17 00:00:00 2001
From: Brikkho <admin@brikkho.net>
Date: Fri, 21 Feb 2020 09:35:26 +0000
Subject: [PATCH 194/199] Translated using Weblate (Bengali (Bangladesh))

Currently translated at 28.5% (152 of 532 strings)
---
 app/src/main/res/values-bn-rBD/strings.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 37938334c..ce7121095 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -1,9 +1,9 @@
 <?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>
+    <string name="no_player_found">কোন স্ট্রিম প্লেয়ার পাওয়া যায়নি। VLC ইনস্টল করতে চাও\?</string>
     <string name="install">ইনস্টল</string>
     <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> -->
@@ -16,13 +16,13 @@
     <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="screen_rotation">ঘূর্ণন</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="popup_mode_share_menu_title">পপআপ মোড</string>
     <string name="controls_background_title">ব্যাকগ্রাউন্ড</string>
     <string name="controls_popup_title">পপআপ</string>
-    <string name="download_path_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>
@@ -171,7 +171,7 @@
     <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="use_external_video_player_summary">কিছু কিছু রেজোলিউশনে অডিও বন্ধ করে দেয়</string>
     <string name="subscribe_button_title">সাবস্ক্রাইব</string>
     <string name="subscribed_button_title">সাবস্ক্রাইব করা আছে</string>
     <string name="channel_unsubscribed">চ্যানেল থেকে আনসাবস্ক্রাইব্ড</string>
@@ -183,4 +183,5 @@
     <string name="use_inexact_seek_title">দ্রুত টানা ব্যাবহার করুন</string>
     <string name="unsubscribe">আনসাবস্ক্রাইব</string>
     <string name="tab_new">নতুন ট্যাব</string>
+    <string name="tab_choose">ট্যাব পছন্দ করুন</string>
 </resources>
\ No newline at end of file

From e539753279fbdb584bf51f62582c64b1cc7a6492 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Fri, 21 Feb 2020 21:59:36 +0100
Subject: [PATCH 195/199] Clean translations

---
 app/src/main/res/values-bn-rBD/strings.xml | 8 --------
 app/src/main/res/values-ku/strings.xml     | 1 -
 2 files changed, 9 deletions(-)

diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index ce7121095..60b87caa9 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -6,7 +6,6 @@
     <string name="no_player_found">কোন স্ট্রিম প্লেয়ার পাওয়া যায়নি। VLC ইনস্টল করতে চাও\?</string>
     <string name="install">ইনস্টল</string>
     <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">পপ-আপ মোডে ওপেন করো</string>
     <string name="share">শেয়ার</string>
@@ -36,7 +35,6 @@
     <string name="show_higher_resolutions_summary">শুধুমাত্র কিছু ডিভাইস 2k / 4k ভিডিও চালানোয় সমর্থন</string>
     <string name="play_with_kodi_title">Kodi এর মাধ্যমে চালাও</string>
     <string name="kore_not_found">Kore অ্যাপ্লিকেশন খুঁজে পাওয়া যায়নি। Kore ইনস্টল করবে?</string>
-    <!--     <string name="fdroid_kore_url" translatable="false">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.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>
@@ -57,10 +55,8 @@
     <string name="settings_category_popup_title">পপআপ</string>
     <string name="settings_category_appearance_title">অ্যাপিয়ারেন্স</string>
     <string name="settings_category_other_title">অন্যান্য</string>
-    <!--     <string name="background_player_time_text" translatable="false">%1$s - NewPipe</string> -->
     <string name="background_player_playing_toast">ব্যাকগ্রাউন্ডে চলছে</string>
     <string name="popup_playing_toast">পপআপ মোডে চলছে</string>
-    <!--     <string name="c3s_url" translatable="false">https://www.c3s.cc/</string> -->
     <string name="play_btn_text">চালাও</string>
     <string name="content">কন্টেন্ট</string>
     <string name="show_age_restricted_content_title">বয়স সীমাবদ্ধ কন্টেন্ট দেখাও</string>
@@ -93,7 +89,6 @@
     <string name="app_ui_crash">অ্যাপ / UI ক্র্যাশ করেছে</string>
     <!-- error activity -->
     <string name="sorry_string">দুঃখিত, এটা ঘটা উচিত ছিল না।</string>
-    <!--     <string name="guru_meditation" translatable="false">Guru Meditation.</string> -->
     <string name="error_report_button_text">মেইলের মাধ্যমে ত্রুটি প্রতিবেদন করো</string>
     <string name="error_snackbar_message">দুঃখিত, কিছু ত্রুটি ঘটেছে।</string>
     <string name="error_snackbar_action">প্রতিবেদন</string>
@@ -142,9 +137,6 @@
     <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="recaptcha">রিক্যাপচা</string>
     <string name="title_activity_recaptcha">reCAPTCHA চ্যালেঞ্জ</string>
     <string name="recaptcha_request_toast">reCAPTCHA চ্যালেঞ্জ অনুরোধ করা হয়েছে</string>
diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 75c8d9d02..b3429d6a2 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -215,7 +215,6 @@
     <string name="no_available_dir">تکایە فۆڵدەرێک بۆ شوێنی داگرتن دیاریبکە لە ڕێکخستنەکان</string>
     <string name="msg_popup_permission">ئەم دەسەڵاتە پێویستە بۆ
 \nکردنەوەی پەنجەرەی بچووک</string>
-    <string name="recaptcha" translatable="false">reCAPTCHA</string>
     <string name="title_activity_recaptcha">reCAPTCHA داواکاری</string>
     <string name="recaptcha_request_toast">reCAPTCHA داواکراوە</string>
     <string name="settings_category_downloads_title">داگرتن</string>

From 9445e8e8a0faabc24a25d85fc85772925d63a376 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sat, 22 Feb 2020 00:37:34 +0100
Subject: [PATCH 196/199] Remove 'duration_live_button' string from
 translations

---
 app/src/main/res/values-cs/strings.xml     | 1 -
 app/src/main/res/values-he/strings.xml     | 1 -
 app/src/main/res/values-in/strings.xml     | 1 -
 app/src/main/res/values-ku/strings.xml     | 1 -
 app/src/main/res/values-pl/strings.xml     | 1 -
 app/src/main/res/values-tr/strings.xml     | 1 -
 app/src/main/res/values-zh-rTW/strings.xml | 1 -
 7 files changed, 7 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 01bcfede7..104ba6695 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -552,5 +552,4 @@ otevření ve vyskakovacím okně</string>
     <string name="systems_language">Jazyk systému</string>
     <string name="subtitle_activity_recaptcha">Po vyřešení stiskni \"Hotovo\"</string>
     <string name="recaptcha_done_button">Hotovo</string>
-    <string name="duration_live_button" translatable="false">Live</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 59e4ce6be..e0567359b 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -555,5 +555,4 @@
     <string name="systems_language">בררת המחדל של המערכת</string>
     <string name="subtitle_activity_recaptcha">יש ללחוץ על „סיום” לאחר הפתירה</string>
     <string name="recaptcha_done_button">סיום</string>
-    <string name="duration_live_button" translatable="false">חי</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 0f7980dc0..59678be19 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -535,7 +535,6 @@
     <string name="app_language_title">Bahasa apl</string>
     <string name="systems_language">Default sistem</string>
     <string name="recaptcha_done_button">Selesai</string>
-    <string name="duration_live_button" translatable="false">Langsung</string>
     <string name="seek_duration_title">Durasi maju/mundur cepat</string>
     <string name="subtitle_activity_recaptcha">Tekan \"Selesai\" saat selesai</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index b3429d6a2..5c4506365 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -545,5 +545,4 @@
     <string name="systems_language">بنەڕەتی سیستەم</string>
     <string name="subtitle_activity_recaptcha">گرتە بکە لەسەر ”تەواو” کاتێ کە چارەسەرکرا</string>
     <string name="recaptcha_done_button">تەواو</string>
-    <string name="duration_live_button" translatable="false">ڕاستەوخۆ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index fe650d099..93bb2cd5c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -549,5 +549,4 @@
     <string name="systems_language">Domyślny systemu</string>
     <string name="subtitle_activity_recaptcha">Po rozwiązaniu naciśnij „Gotowe”</string>
     <string name="recaptcha_done_button">Gotowe</string>
-    <string name="duration_live_button" translatable="false">Na żywo</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 557e59236..6d416c901 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -543,5 +543,4 @@
     <string name="systems_language">Sistem öntanımlısı</string>
     <string name="subtitle_activity_recaptcha">Çözüldüğünde \"Bitti\" butonuna basın</string>
     <string name="recaptcha_done_button">Bitti</string>
-    <string name="duration_live_button" translatable="false">Canlı</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 5fa590a52..a8cb87458 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -539,5 +539,4 @@
     <string name="systems_language">系統預設值</string>
     <string name="subtitle_activity_recaptcha">解決後請按「完成」</string>
     <string name="recaptcha_done_button">完成</string>
-    <string name="duration_live_button" translatable="false">直播</string>
 </resources>
\ No newline at end of file

From 476b3f804b6a0dbb565f01ffc565975b6878965b Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Fri, 21 Feb 2020 22:19:20 +0100
Subject: [PATCH 197/199] Add changelog

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

diff --git a/fastlane/metadata/android/en-US/changelogs/840.txt b/fastlane/metadata/android/en-US/changelogs/840.txt
new file mode 100644
index 000000000..c79321b45
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/840.txt
@@ -0,0 +1,22 @@
+New
+• Added language selector to change the app language
+• Added send to Kodi button to player collapsible menu
+• Added ability to copy comments on long press
+
+Improved
+• Fix ReCaptcha activity and correctly save obtained cookies
+• Removed dot-menu in favour of drawer and hide history button when watch history is not enabled in settings
+• Ask for display over other apps permission in settings correctly on Android 6 and later
+• Rename local playlist by long-clicking in BookmarkFragment
+• Various PeerTube improvements
+• Improved several English source strings
+
+Fixed
+• Fixed player starting again although it is paused when option "minimize on app switch" enabled and NewPipe is minimized
+• Fix initial brightness value for gesture
+• Fixed .srt subtitle downloads containing not all line breaks
+• Fixed download to SD card failing because some Android 5 devices are not CTF compliant
+• Fixed downloading on Android KitKat
+• Fixed corrupt video .mp4 file being recognized as audio file
+• Fixed multiple localization problems, including wrong Chinese language codes
+• [YouTube] Timestamps in description are clickable again
\ No newline at end of file

From e84d5311f9730ecbcb0dcf39b863b6787396b236 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Fri, 21 Feb 2020 22:30:59 +0100
Subject: [PATCH 198/199] Update extractor version to latest release

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

diff --git a/app/build.gradle b/app/build.gradle
index 77b27f50a..dd5dbb865 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:fc9f031'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.18.4'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 

From 533aede80f8f89da84ba0ec99e6dead73626ea92 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Fri, 21 Feb 2020 22:19:23 +0100
Subject: [PATCH 199/199] Update bump version to 0.18.4 (840)

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

diff --git a/app/build.gradle b/app/build.gradle
index dd5dbb865..c2bceab9e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 830
-        versionName "0.18.3"
+        versionCode 840
+        versionName "0.18.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true