1
0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-01-12 10:20:30 +00:00

Merge branch 'dev' into redesign

This commit is contained in:
Somethingweirdhere 2018-06-16 11:21:43 +02:00 committed by GitHub
commit 2528d0f0b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 142 additions and 44 deletions

View File

@ -157,7 +157,19 @@ public class MainActivity extends AppCompatActivity {
.add(R.id.menu_options_about_group, 1, 0, R.string.tab_about)
.setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.info));
toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.drawer_open, R.string.drawer_close);
toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
R.string.drawer_open, R.string.drawer_close) {
@Override
public void onDrawerClosed(View view) { super.onDrawerClosed(view); }
@Override
public void onDrawerOpened(View drawerView) { super.onDrawerOpened(drawerView); }
@Override
public void onDrawerSlide(View drawerView, float slideOffset) {
super.onDrawerSlide(drawerView, 0);
}
};
toggle.syncState();
drawer.addDrawerListener(toggle);
drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() {

View File

@ -1,2 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources><string name="main_bg_subtitle"></string>
<string name="view_count_text"></string>
<string name="upload_date_text"></string>
<string name="no_player_found"></string>
<string name="no_player_found_toast"></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"></string>
<string name="share_dialog_title"></string>
<string name="choose_browser"></string>
<string name="screen_rotation"></string>
</resources>

View File

@ -112,7 +112,7 @@
<string name="finish">OK</string>
<string name="msg_name">Nombre del archivo</string>
<string name="msg_threads">Trapos</string>
<string name="msg_threads">Hilo</string>
<string name="msg_error">Error</string>
<string name="msg_server_unsupported">Servidor no soportado</string>
<string name="msg_exists">El archivo ya existe</string>

View File

@ -479,4 +479,10 @@
<string name="accept">Accepter</string>
<string name="decline">Refuser</string>
</resources>
<string name="privacy_policy_encouragement">Le projet NewPipe prend votre vie privée très à cœur. Ainsi, l\'appli n\'envoie aucune donnée sans votre consentement.
\nLa politique de vie privée de NewPipe explique en détail quelle donnée est envoyée et stockée quand vous envoyez un rapport de plantage.</string>
<string name="start_accept_privacy_policy">Afin de se conformer au Règlement Général sur la Protection des Données (RGPD ou GDPR), nous attirons votre attention sur la politique de vie privée de NewPipe. Merci de la lire attentivement.
\nVous devez l\'accepter pour nous envoyer le rapport de bug.</string>
<string name="limit_data_usage_none_description">Pas de limite</string>
<string name="limit_mobile_data_usage_title">Limiter la résolution en données mobile</string>
</resources>

View File

@ -444,4 +444,15 @@
<string name="caption_setting_title">Преводи</string>
<string name="caption_setting_description">Смени ја големината и стилот на преводот. Потребен е рестарт за промена.</string>
<string name="privacy_policy_title">NewPipe - политика за приватност</string>
<string name="privacy_policy_encouragement">Проектот NewPipe сериозно ја сфаќа вашата приватност. Затоа апликацијата не собира ваши податоци без ваша дозвола.
\nПолитиката за приватност на NewPipe детално објаснува кои податоци се зачувани и пратени кога праќате извештај за грешка во апликацијата.</string>
<string name="read_privacy_policy">Прочитај ја политиката за приватност</string>
<string name="start_accept_privacy_policy">За да постапуваме соодветно со регулацијата за заштита на податоци (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>
</resources>

View File

@ -474,4 +474,15 @@
<string name="preferred_open_action_settings_title">Предпочтительное действие \'открытие\'</string>
<string name="import_settings">Желаете ли вы также импортировать настройки?</string>
<string name="privacy_policy_title">Политика конфиденциальности NewPipe</string>
<string name="privacy_policy_encouragement">Проект NewPipe очень серьезно относится к вашей конфиденциальности. Поэтому приложение не собирает никаких данных без вашего согласия.
\nПолитика конфиденциальности NewPipe подробно объясняет, какие данные отправляются и хранятся при отправке отчета о сбоях.</string>
<string name="read_privacy_policy">Прочитать политику конфиденциальности</string>
<string name="start_accept_privacy_policy">Чтобы соответствовать Европейскому стандарту защиты данных (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>
</resources>

View File

@ -29,7 +29,7 @@
<string name="download_path_audio_summary">Plats för att lagra nerladdat ljud i</string>
<string name="download_path_audio_dialog_title">Ange nerladdningsplats för ljudfiler</string>
<string name="autoplay_by_calling_app_summary">Spelar automatiskt upp en video när NewPipe öppnas av en annan app</string>
<string name="autoplay_by_calling_app_summary">Automatiskt spelar en video upp när NewPipe öppnas av en annan app</string>
<string name="default_resolution_title">Standardupplösning</string>
<string name="default_popup_resolution_title">Standardupplösning för popup</string>
<string name="show_higher_resolutions_title">Visa högre upplösningar</string>
@ -41,7 +41,7 @@
<string name="play_audio">Ljud</string>
<string name="default_audio_format_title">Standardformat för ljud</string>
<string name="default_video_format_title">Videoformat som föredras</string>
<string name="webm_description">WebM — fritt format</string>
<string name="webm_description">WebM — öppet format</string>
<string name="m4a_description">M4A — bättre kvalité</string>
<string name="theme_title">Tema</string>
<string name="light_theme_title">Ljus</string>
@ -57,7 +57,7 @@
<string name="download_dialog_title">Ladda ner</string>
<string name="next_video_title">Nästa video</string>
<string name="show_next_and_similar_title">Visa nästkommande och liknande videor</string>
<string name="show_next_and_similar_title">Visa \'nästkommande\' och \'liknande\' videor</string>
<string name="url_not_supported_toast">Webbadressen stöds inte</string>
<string name="search_language_title">Standard innehållsspråk</string>
<string name="settings_category_video_audio_title">Video &amp; Ljud</string>
@ -123,15 +123,15 @@
<string name="autoplay_by_calling_app_title">Autospela</string>
<string name="enable_search_history_title">Sök historik</string>
<string name="enable_search_history_summary">Spara sökfrågor lokalt</string>
<string name="enable_watch_history_title">Historik</string>
<string name="enable_watch_history_title">Historik &amp; Cacheminne</string>
<string name="enable_watch_history_summary">Håll koll på videor som du tittat på</string>
<string name="resume_on_audio_focus_gain_title">Fortsätt då fokus fås</string>
<string name="resume_on_audio_focus_gain_summary">Fortsätta spela efter avbrott (t.ex. telefonsamtal)</string>
<string name="show_hold_to_append_title">Visa \"Håll för att lägga till\" tips</string>
<string name="show_hold_to_append_title">Visa \"håll för att lägga till\" tips</string>
<string name="show_hold_to_append_summary">Visa tips när bakgrunds- eller popup-knappen trycks på sidan för videodetaljer</string>
<string name="settings_category_player_title">Spelare</string>
<string name="settings_category_player_behavior_title">Beteende</string>
<string name="settings_category_history_title">Historik</string>
<string name="settings_category_history_title">Historik &amp; Cacheminne</string>
<string name="background_player_append">Tillagd till bakgrunds-spelar kön</string>
<string name="popup_playing_append">Tillagd till popup-spelar kön</string>
<string name="playlist">Spellista</string>
@ -237,7 +237,7 @@
<string name="tab_about">Om</string>
<string name="tab_contributors">Medverkande</string>
<string name="tab_licenses">Licenser</string>
<string name="app_description">Gratis och enkel YouTube-app för Android.</string>
<string name="app_description">Öppet och enkel Android app för mediastreaming.</string>
<string name="view_on_github">Visa på GitHub</string>
<string name="app_license_title">NewPipes licens</string>
<string name="contribution_encouragement">Vad du än har för idéer gällande översättning, designändringar, kod rengöring eller riktigt tunga så är hjälp alltid välkommet. Ju mer som görs desto bättre blir det!</string>
@ -280,8 +280,25 @@
<string name="start_here_on_background">Börja här i bakgrunden</string>
<string name="start_here_on_popup">Börja här i popup</string>
<string name="donation_title">Donera</string>
<string name="donation_encouragement">NewPipe utvecklas av frivilliga som spenderar sin fritid på att ge dig den bästa användarupplevelsen. Nu är det tid att ge tillbaka för att säkerställa att utvecklarna kan göra NewPipe ännu bättre medan de njuter av en kopp kaffe!</string>
<string name="donation_encouragement">NewPipe utvecklas av frivilliga som spenderar sin fritid på att ge dig den bästa användarupplevelsen. Nu är det tid att ge tillbaka för att säkerställa att utvecklarna kan göra NewPipe ännu bättre medan de njuter av en kopp kaffe.</string>
<string name="give_back">Ge tillbaka</string>
<string name="website_title">Webbplats</string>
<string name="website_encouragement">För att få mer information och de senaste nyheterna om NewPipe, besök vår webbplats.</string>
<string name="show_info">Visa info</string>
<string name="tab_bookmarks">Bokmärken</string>
<string name="controls_add_to_playlist_title">Lägga till</string>
<string name="use_inexact_seek_title">Använda snabb inexact sökning</string>
<string name="download_thumbnail_title">Ladda miniatyrer</string>
<string name="download_thumbnail_summary">Inaktivera för att stoppa alla miniatyrer från lastning och spara på nät och minnesanvändning. Ändring av detta kommer att rensa cache-minnet.</string>
<string name="thumbnail_cache_wipe_complete_notice">Bild cacheminnet var rensad</string>
<string name="service_title">Tjänst</string>
<string name="settings_category_debug_title">Debug</string>
<string name="always">Alltid</string>
<string name="just_once">Bara en gång</string>
<string name="file">Fil</string>
<string name="toggle_orientation">Byta orientationen</string>
</resources>

View File

@ -34,7 +34,7 @@
<string name="download_dialog_title">下载</string>
<string name="next_video_title">即将播放</string>
<string name="show_next_and_similar_title">显示下一部和相的视频</string>
<string name="show_next_and_similar_title">显示下一部和相的视频</string>
<string name="url_not_supported_toast">不支援此网址</string>
<string name="search_language_title">默认内容语言</string>
<string name="settings_category_video_audio_title">视频和音频</string>
@ -88,7 +88,7 @@
<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="autoplay_by_calling_app_summary">NewPipe被其他应用调用时自动播放视频</string>
<string name="duration_live">直播</string>
<string name="main_bg_subtitle">点击搜索开始NewPipe</string>
@ -155,7 +155,7 @@
<string name="show_search_suggestions_summary">在搜索时显示搜索建议</string>
<string name="enable_search_history_title">搜索记录</string>
<string name="enable_search_history_summary">在本地存储搜索请求</string>
<string name="enable_watch_history_title">历史</string>
<string name="enable_watch_history_title">历史和缓存</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>
@ -204,7 +204,7 @@
<string name="tab_about">关于</string>
<string name="tab_contributors">贡献者</string>
<string name="tab_licenses">许可</string>
<string name="app_description">一款开源、轻量级的安卓 YouTube 客户端。</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>
@ -230,7 +230,7 @@
<string name="unknown_content">[未知]</string>
<string name="player_stream_failure">播放此流媒体失败</string>
<string name="player_stream_failure">无法播放此流媒体</string>
<string name="player_unrecoverable_failure">发生无法解决的播放器错误</string>
<string name="search_no_results">没有结果</string>
<string name="empty_subscription_feed_subtitle">空空如也</string>
@ -268,8 +268,8 @@
<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="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>
@ -308,10 +308,10 @@
<string name="rename">重命名</string>
<string name="donation_title">捐赠</string>
<string name="donation_encouragement">NewPipe 是一群志愿者花费业余时间开发的,目的是给你们带来最佳体验。你的一点心意,可以让开发者们可以享受一杯 Java 的咖啡的同时让 NewPipe 变得更好用!</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="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>
@ -335,7 +335,7 @@
<string name="kiosk">Kiosk</string>
<string name="trending">流行的</string>
<string name="top_50">Top 50</string>
<string name="top_50">50</string>
<string name="new_and_hot">最新 &amp; 最热</string>
<string name="title_activity_background_player">后台播放器</string>
<string name="title_activity_popup_player">悬浮窗播放器</string>
@ -351,10 +351,10 @@
<string name="drawer_open">打开侧栏菜单</string>
<string name="drawer_close">关闭侧栏菜单</string>
<string name="drawer_header_action_paceholder_text">马上就好 ;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_title">偏好\"打开\"动作</string>
<string name="preferred_open_action_settings_summary">打开内容的默认动作 — %s</string>
<string name="video_player">视频播放器</string>
@ -363,7 +363,7 @@
<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="preferred_player_fetcher_notification_message">正在加载请求内容</string>
<string name="create_playlist">创建新播放列表</string>
<string name="delete_playlist">删除播放列表</string>
@ -379,7 +379,7 @@
<string name="playlist_creation_success">播放列表已创建</string>
<string name="playlist_add_stream_success">加入播放列表</string>
<string name="playlist_thumbnail_change_success">播放列表缩略图已更改</string>
<string name="playlist_delete_failure">删除播放列表失败</string>
<string name="playlist_delete_failure">无法删除播放列表</string>
<string name="caption_none">无字幕</string>
@ -394,10 +394,10 @@
<string name="larger_caption_font_size">大字体</string>
<string name="enable_leak_canary_title">启用 LeakCanary</string>
<string name="enable_leak_canary_summary">heap dumping 的时候,内存泄露监测可能会导致应用未响应</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_disposed_exceptions_summary">处理无法送达的、发生在Fragment或activity生命周期之外的Rx异常后强制报告</string>
<string name="import_export_title">导入/导出</string>
<string name="import_title">导入</string>
@ -410,22 +410,22 @@
<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="import_youtube_instructions">为了导入你的 YouTube 订阅,你需要一个导出文件,按照下面的步骤来下载此文件:
\n1. 浏览器打开链接:%1$s
\n2. 登录你的账户
\n3. 下载应该马上开始(这个就是你的导出文件)</string>
<string name="import_soundcloud_instructions">为了导入你的 SoundCloud你需要知道你的个人页链接或者id如果你知道只要在下面的输入框中输入任意一种就OK了。
\n如果你不知道,你需要这么做:
\n1. 浏览器打开链接:%1$s
\n2. 在某些手机浏览器中你得开启桌面模式desktop mode
\n3. 复制你跳转到的链接(这个就是你的个人页链接)</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_network_expensive_warning">请注意该操作可能消耗大量网络流量。
\n您希望继续吗?</string>
<string name="playback_speed_control">播放速度控制</string>
<string name="playback_tempo">速度</string>
@ -433,9 +433,32 @@
<string name="unhook_checkbox">Unhook可能导致失真</string>
<string name="playback_nightcore">Nightcore</string>
<string name="playback_default">默认</string>
<string name="toast_no_player">找不到能播放此文件的播放器</string>
<string name="toast_no_player">未安装能播放此文件的应用</string>
<string name="caption_setting_title">字幕</string>
<string name="caption_setting_description">修改播放器的字幕文本大小和背景样式。需要重启播放器以生效。</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="view_history_deleted">观看记录已删除。</string>
<string name="clear_search_history_title">清除搜索记录</string>
<string name="clear_search_history_summary">删除搜索关键词记录。</string>
<string name="delete_search_history_alert">删除全部搜索记录。</string>
<string name="search_history_deleted">搜索记录已删除。</string>
<string name="one_item_deleted">已删除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="accept">接受</string>
<string name="decline">拒绝</string>
<string name="limit_data_usage_none_description">不限制</string>
<string name="limit_mobile_data_usage_title">使用移动数据时限制分辨率</string>
</resources>