diff options
author | ByteHamster <info@bytehamster.com> | 2018-04-08 23:23:03 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2018-04-08 23:23:03 +0200 |
commit | 0a5a31a16918f1f1935f89974015d9fc8206ebab (patch) | |
tree | a92c8ac2a1aedea0b0086cca2de08b7d78da0254 /core/src/main/res/values | |
parent | 02da84b93a553d663202aef633a203346822e6cd (diff) | |
parent | 4e63bfb11c3c1e44fdb15660a264625162fa899c (diff) | |
download | AntennaPod-0a5a31a16918f1f1935f89974015d9fc8206ebab.zip |
Merge branch 'develop' into picture-in-picture
Diffstat (limited to 'core/src/main/res/values')
-rw-r--r-- | core/src/main/res/values/colors.xml | 1 | ||||
-rw-r--r-- | core/src/main/res/values/strings.xml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index 981d16d03..969500928 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -20,6 +20,7 @@ <color name="swipe_refresh_secondary_color_dark">#060708</color> <color name="new_indicator_green">#669900</color> <color name="image_readability_tint">#80000000</color> + <color name="feed_image_bg">#50000000</color> <color name="selection_background_color_dark">#286E8A</color> <color name="selection_background_color_light">#81CFEA</color> diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 162bce136..5558b97b3 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -182,6 +182,8 @@ <string name="download_failed">failed</string> <string name="download_pending">Download pending</string> <string name="download_running">Download running</string> + <string name="download_error_details">Details</string> + <string name="download_error_details_message">%1$s \n\nFile URL:\n%2$s</string> <string name="download_error_device_not_found">Storage Device not found</string> <string name="download_error_insufficient_space">Insufficient Space</string> <string name="download_error_file_error">File Error</string> @@ -476,8 +478,8 @@ <string name="html_export_label">HTML export</string> <string name="exporting_label">Exporting…</string> <string name="export_error_label">Export error</string> - <string name="opml_export_success_title">OPML Export successful.</string> - <string name="opml_export_success_sum">The .opml file was written to:\u0020</string> + <string name="export_success_title">Export successful</string> + <string name="export_success_sum">The exported file was written to:\n\n%1$s</string> <string name="opml_import_ask_read_permission">Access to external storage is required to read the OPML file</string> <!-- Sleep timer --> |