Merge pull request #716 from TomHennen/merge_master_changes
Merge master changes. There were some conflicts from master/develop that needed to be fixed. I believe this resolves them.
This commit is contained in:
Tom Hennen
commit
7888ce9aae
|
|
@ -1,7 +1,3 @@
|
|||
```
|
||||
Please note that AntennaPod is no longer maintained until further notice.
|
||||
```
|
||||
|
||||
How to report a bug
|
||||
-------------------
|
||||
- Use the search function to see if someone else has already reported the bug. If an issue has already been opened, see if you can add any useful information to it.
|
||||
|
|
@ -29,7 +25,7 @@ Submit a pull-request
|
|||
- If you want to work on a feature that has been requested or fix a bug that has been reported on the "issues" page, add a comment to it so that other people know that you are working on it.
|
||||
- Fork the repository
|
||||
- Almost all changes of AntennaPod are done on the `develop` branch. If a new version of AntennaPod is released, the `develop` branch is merged into `master`. As a result, the `master` branch probably doesn't contain the latest changes when you are reading this. Please make sure that you are branching from `develop`! Otherwise, there might be a lot of merge-conflicts when merging your changes into `develop` and therefore it might take longer to review your pull-request. Exceptions are changes in files like README.md, CONTRIBUTING.md and other files that are not directly related to the source code.
|
||||
- If your pull-request fixes a bug that has been reported or implements a feature that has been requested in another issue, try to mention it so that it can be closed once your pull-request has been merged.
|
||||
- If your pull-request fixes a bug that has been reported or implements a feature that has been requested in another issue, try to mention it so that it can be closed once your pull-request has been merged. If you use special keywords in the [commit comment](https://help.github.com/articles/closing-issues-via-commit-messages/) or [pull request text](https://github.com/blog/1506-closing-issues-via-pull-requests) github will close the issues automatically when the changes lands at the master branch.
|
||||
- Although not every part of AntennaPod's source code is fully documented yet, it would be very nice if you could add documentation to your changes if it is a larger pull-request.
|
||||
- If possible, add unit tests for your pull-request and make sure that they pass. Information on how to add unit tests and run them can be found here: [TODO]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
# AntennaPod
|
||||
|
||||
|
||||
### Please note that AntennaPod will not receive any future updates until further notice (see issue [#604](https://github.com/antennapod/antennapod/issues/604) for more information).
|
||||
|
||||
|
||||
|
||||
This is the official repository of AntennaPod, a podcast manager for Android.
|
||||
|
||||
[](https://play.google.com/store/apps/details?id=de.danoeh.antennapod)
|
||||
|
|
@ -15,12 +10,14 @@ You can use the [AntennaPod Google Group](https://groups.google.com/forum/#!foru
|
|||
|
||||
Bug reports and feature requests can be submitted [here](https://github.com/danieloeh/AntennaPod/issues/new) (please read the [instructions](https://github.com/danieloeh/AntennaPod/blob/master/CONTRIBUTING.md) on how to report a bug and how to submit a feature request first!).
|
||||
|
||||
## Alpha Testing
|
||||
You can participate in alpha testing by joining the Google Plus [AntennaPod Alpha](https://plus.google.com/communities/117446128636140585144) community.
|
||||
|
||||
## Nightly Builds
|
||||
|
||||
There are APKs available for every branch that is actively worked on. Please note that these might be very unstable versions of the app, which can break your current installation. Install them at your own risk!
|
||||
|
||||
Click [here](https://www.dropbox.com/sh/45vgg13bmh8jmhp/uZ_3KJIi5K) to get to the nightly builds folder.
|
||||
Click [here](https://www.dropbox.com/sh/4h2kfa2d2jesnu8/AABF7u5QsOn8Lg8MDie4Z4Ama?dl=0) to get to the nightly builds folder.
|
||||
|
||||
## License
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
<!--Activitiy and fragment titles-->
|
||||
<string name="app_name">AntennaPod</string>
|
||||
<string name="feeds_label">订阅</string>
|
||||
<string name="add_feed_label">添加播客</string>
|
||||
<string name="add_feed_label">添加博客</string>
|
||||
<string name="podcasts_label">播客</string>
|
||||
<string name="episodes_label">单集</string>
|
||||
<string name="new_episodes_label">新单集</string>
|
||||
<string name="all_episodes_label">所有单集</string>
|
||||
<string name="episodes_label">曲目</string>
|
||||
<string name="new_episodes_label">新曲目</string>
|
||||
<string name="all_episodes_label">所有曲目</string>
|
||||
<string name="new_label">最新</string>
|
||||
<string name="waiting_list_label">等待列表</string>
|
||||
<string name="settings_label">设置</string>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<string name="gpodnet_auth_label">gpodder.net 登录</string>
|
||||
<!--New episodes fragment-->
|
||||
<string name="recently_published_episodes_label">最近发布</string>
|
||||
<string name="episode_filter_label">仅显示新单集</string>
|
||||
<string name="episode_filter_label">仅显示新曲目</string>
|
||||
<!--Main activity-->
|
||||
<string name="drawer_open">打开菜单</string>
|
||||
<string name="drawer_close">关闭菜单</string>
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
<string name="chapters_label">章节</string>
|
||||
<string name="shownotes_label">笔记</string>
|
||||
<string name="description_label">描述</string>
|
||||
<string name="most_recent_prefix">最近单集:\u0020</string>
|
||||
<string name="most_recent_prefix">最近曲目:\u0020</string>
|
||||
<string name="episodes_suffix">\u0020 曲</string>
|
||||
<string name="length_prefix">长度:\u0020</string>
|
||||
<string name="size_prefix">大小:\u0020</string>
|
||||
|
|
@ -64,12 +64,12 @@
|
|||
<string name="browse_gpoddernet_label">浏览 gpodder.net</string>
|
||||
<!--Actions on feeds-->
|
||||
<string name="mark_all_read_label">全部标识已读</string>
|
||||
<string name="mark_all_read_msg">将所有单集标记为已读</string>
|
||||
<string name="mark_all_read_msg">将所有曲目标记为已读</string>
|
||||
<string name="show_info_label">查看信息</string>
|
||||
<string name="remove_feed_label">删除播客</string>
|
||||
<string name="share_link_label">分享网站链接</string>
|
||||
<string name="share_source_label">分享订阅链接</string>
|
||||
<string name="feed_delete_confirmation_msg">确认要删除这些订阅吗? 该订阅所有已经下载的单集将一并删除. </string>
|
||||
<string name="feed_delete_confirmation_msg">确认要删除这些订阅吗? 该订阅所有已经下载的曲目将一并删除. </string>
|
||||
<string name="feed_remover_msg">删除订阅</string>
|
||||
<!--actions on feeditems-->
|
||||
<string name="download_label">下载</string>
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
<string name="pause_label">暂停</string>
|
||||
<string name="stream_label">流媒体</string>
|
||||
<string name="remove_label">删除</string>
|
||||
<string name="remove_episode_lable">移除单集</string>
|
||||
<string name="remove_episode_lable">移除曲目</string>
|
||||
<string name="mark_read_label">标记已读</string>
|
||||
<string name="mark_unread_label">标记未读</string>
|
||||
<string name="add_to_queue_label">添加到播放列表</string>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<string name="support_label">Flattr 他</string>
|
||||
<string name="enqueue_all_new">全部添加到播放列表</string>
|
||||
<string name="download_all">全部下载</string>
|
||||
<string name="skip_episode_label">跳过单集</string>
|
||||
<string name="skip_episode_label">跳过曲目</string>
|
||||
<!--Download messages and labels-->
|
||||
<string name="download_successful">成功</string>
|
||||
<string name="download_failed">失败</string>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
<string name="cancel_all_downloads_label">取消所有下载</string>
|
||||
<string name="download_cancelled_msg">已取消下载</string>
|
||||
<string name="download_report_title">下载完成</string>
|
||||
<string name="download_error_malformed_url">错误的 URL</string>
|
||||
<string name="download_error_malformed_url">畸形 URL</string>
|
||||
<string name="download_error_io_error">IO 错误</string>
|
||||
<string name="download_error_request_error">请求出错</string>
|
||||
<string name="download_error_db_access">数据库访问错误</string>
|
||||
|
|
@ -190,10 +190,10 @@
|
|||
<string name="pref_set_theme_title">主题选择</string>
|
||||
<string name="pref_set_theme_sum">改变 AntennaPod 外观</string>
|
||||
<string name="pref_automatic_download_title">自动下载</string>
|
||||
<string name="pref_automatic_download_sum">配置自动下载的单集</string>
|
||||
<string name="pref_automatic_download_sum">配置自动下载的曲目</string>
|
||||
<string name="pref_autodl_wifi_filter_title">打开 Wi-Fi 过滤器</string>
|
||||
<string name="pref_autodl_wifi_filter_sum">只允许在 Wi-Fi 网络下自动下载</string>
|
||||
<string name="pref_episode_cache_title">单集缓存</string>
|
||||
<string name="pref_episode_cache_title">曲目缓存</string>
|
||||
<string name="pref_theme_title_light">浅色</string>
|
||||
<string name="pref_theme_title_dark">暗色</string>
|
||||
<string name="pref_episode_cache_unlimited">无限</string>
|
||||
|
|
@ -223,7 +223,7 @@
|
|||
<string name="pref_unpauseOnHeadsetReconnect_sum">当耳机重新连接时恢复播放</string>
|
||||
<!--Auto-Flattr dialog-->
|
||||
<!--Search-->
|
||||
<string name="search_hint">搜索订阅或者单集</string>
|
||||
<string name="search_hint">搜索订阅或者曲目</string>
|
||||
<string name="found_in_shownotes_label">笔记中查找</string>
|
||||
<string name="found_in_chapters_label">章节中查找</string>
|
||||
<string name="search_status_no_results">没有找到任何结果</string>
|
||||
|
|
@ -311,17 +311,17 @@
|
|||
<string name="media_type_video_label">视频</string>
|
||||
<string name="navigate_upwards_label">向上导航</string>
|
||||
<string name="butAction_label">更多动作</string>
|
||||
<string name="status_playing_label">单集正在播放</string>
|
||||
<string name="status_downloading_label">单集正在下载</string>
|
||||
<string name="status_downloaded_label">单集已下载</string>
|
||||
<string name="status_playing_label">曲目正在播放</string>
|
||||
<string name="status_downloading_label">曲目正在下载</string>
|
||||
<string name="status_downloaded_label">曲目已下载</string>
|
||||
<string name="status_unread_label">新项目</string>
|
||||
<string name="in_queue_label">单集已经在播放列表中</string>
|
||||
<string name="new_episodes_count_label">新单集数</string>
|
||||
<string name="in_progress_episodes_count_label">已收听单集数</string>
|
||||
<string name="in_queue_label">曲目已经在播放列表中</string>
|
||||
<string name="new_episodes_count_label">新曲目数</string>
|
||||
<string name="in_progress_episodes_count_label">已收听曲目数</string>
|
||||
<string name="drag_handle_content_description">拖动以变更本项目的位置</string>
|
||||
<!--Feed information screen-->
|
||||
<string name="authentication_label">验证</string>
|
||||
<string name="authentication_descr">给本播客及单集变更用户名及密码</string>
|
||||
<string name="authentication_descr">给本播客及曲目变更用户名及密码</string>
|
||||
<!--AntennaPodSP-->
|
||||
<string name="sp_apps_importing_feeds_msg">正在从选定的应用中导入订阅...</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in New Issue