diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-10-08 23:43:13 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-10-08 23:43:13 +0200 |
| commit | e58922fad08bedf4bfe86025d836abdeae49a806 (patch) | |
| tree | 1bd8699fdf274fec52700affaeeb4a32382d2ae0 /res/values/strings.xml | |
| parent | a482899eef4a0a7ada979ba0c87b19e91c2f49f1 (diff) | |
| parent | cdd9a0dfdeef8d319063f844fce1e1722f7d9529 (diff) | |
| download | AntennaPod-e58922fad08bedf4bfe86025d836abdeae49a806.zip | |
Merge branch 'feed_preferences' into develop
Conflicts:
res/values/strings.xml
src/de/danoeh/antennapod/storage/DBTasks.java
src/de/danoeh/antennapod/storage/PodDBAdapter.java
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index c0aa27776..350318fcb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -34,6 +34,7 @@ <string name="cancel_label">Cancel</string> <string name="author_label">Author</string> <string name="language_label">Language</string> + <string name="podcast_settings_label">Settings</string> <string name="cover_label">Cover</string> <string name="error_label">Error</string> <string name="error_msg_prefix">An error occurred:</string> @@ -41,6 +42,7 @@ <string name="external_storage_error_msg">No external storage is available. Please make sure that external storage is mounted so that the app can work properly.</string> <string name="chapters_label">Chapters</string> <string name="shownotes_label">Shownotes</string> + <string name="description_label">Description</string> <string name="most_recent_prefix">Most Recent Episode:\u0020</string> <string name="episodes_suffix">\u0020episodes</string> <string name="published_prefix">Published:\u0020</string> @@ -52,7 +54,7 @@ <string name="save_username_password_label">Save username and password</string> <string name="close_label">Close</string> <string name="retry_label">Retry</string> - + <string name="auto_download_label">Include in auto downloads</string> <!-- 'Add Feed' Activity labels --> <string name="feedurl_label">Feed URL</string> |