diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-03-30 22:16:36 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-03-30 22:16:36 -0400 |
commit | ec3ea8406469c78e133d9703d5877ba43582364b (patch) | |
tree | 00ef59f897762878277f08ad6e06c04e85c4822a /core/src | |
parent | f104bc5b9be9b6838a9fba850d1e501e2b94dc8b (diff) | |
parent | 680c9db075ffb2afafed936dc23a5562db0a7b63 (diff) | |
download | AntennaPod-ec3ea8406469c78e133d9703d5877ba43582364b.zip |
Merge pull request #703 from mfietz/feature/add-feed-and-opml-import
OPML import with better explanations and usage of external apps, "Add feed" facelift
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/main/res/values/strings.xml | 12 | ||||
-rw-r--r-- | core/src/main/res/values/styles.xml | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 72e7a2b31..e15bb10a6 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -71,7 +71,7 @@ <!-- 'Add Feed' Activity labels --> <string name="feedurl_label">Feed URL</string> - <string name="etxtFeedurlHint">URL of feed or website</string> + <string name="etxtFeedurlHint">www.example.com/feed</string> <string name="txtvfeedurl_label">Add Podcast by URL</string> <string name="podcastdirectories_label">Find podcast in directory</string> <string name="podcastdirectories_descr">You can search for new podcasts by name, category or popularity in the gpodder.net directory, or search the iTunes store.</string> @@ -293,8 +293,9 @@ <!-- OPML import and export --> <string name="opml_import_txtv_button_lable">OPML files allow you to move your podcasts from one podcatcher to another.</string> - <string name="opml_import_explanation">To import an OPML file, you have to place it in the following directory and press the button below to start the import process. </string> - <string name="start_import_label">Start import</string> + <string name="opml_import_explanation_1">Choose a specific file path from the local filesystem.</string> + <string name="opml_import_explanation_2">Use an external applications like Dropbox, Google Drive or your favourite file manager to open an OPML file.</string> + <string name="opml_import_explanation_3">Many applications like Google Mail, Dropbox, Google Drive and most file managers can <i>open</i> OPML files <i>with</i> AntennaPod.</string> <string name="start_import_label">Start import</string> <string name="opml_import_label">OPML import</string> <string name="opml_directory_error">ERROR!</string> <string name="reading_opml_label">Reading OPML file</string> @@ -302,11 +303,12 @@ <string name="opml_import_error_dir_empty">The import directory is empty.</string> <string name="select_all_label">Select all</string> <string name="deselect_all_label">Deselect all</string> - <string name="choose_file_to_import_label">Choose file to import</string> + <string name="choose_file_from_filesystem">From local filesystem</string> + <string name="choose_file_from_external_application">Use external application</string> <string name="opml_export_label">OPML 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_title">OPML export successful.</string> <string name="opml_export_success_sum">The .opml file was written to:\u0020</string> <!-- Sleep timer --> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index e8b0e2b2b..4ac4a79fd 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -219,7 +219,6 @@ <style name="AntennaPod.TextView.Heading" parent="@android:style/TextAppearance.Medium"> <item name="android:textSize">@dimen/text_size_large</item> - <item name="android:textStyle">italic</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> |