diff options
Diffstat (limited to 'org.fox.ttrss/src')
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/strings.xml | 12 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/xml/preferences.xml | 53 |
2 files changed, 33 insertions, 32 deletions
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index d460101e..56bc64c0 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -95,7 +95,7 @@ <string name="article_set_labels">Set labels</string> <string name="search">Search</string> <string name="cancel">Cancel</string> - <string name="pref_font_size">Article text size</string> + <string name="pref_font_size">Text size</string> <string name="dialog_close">Close</string> <string name="article_link_copy">Copy link to clipboard</string> <string name="text_copied_to_clipboard">Text copied to clipboard</string> @@ -139,7 +139,7 @@ <string name="offline_articles_to_download">Amount of articles to download</string> <string name="offline_articles_to_download_long">How many articles to download for offline mode (newest first)</string> <string name="pref_headlines_show_content_long">Show content previews in headlines list</string> - <string name="pref_headlines_show_content">Preview article content</string> + <string name="pref_headlines_show_content">Show content preview</string> <string name="api_too_low">This action requires newer version of Tiny Tiny RSS</string> <string name="share_url_hint">Article URL</string> <string name="share_content_hint">Article Content</string> @@ -183,7 +183,7 @@ <item quantity="other">%1$d unread articles</item> </plurals> - <string name="pref_headline_font_size">Headline text size</string> + <string name="pref_headline_font_size">Text size</string> <string name="context_confirm_catchup">Mark all articles in %1$s as read?</string> <string name="accel_webview_summary">Disable if you see flicker or visual glitches</string> <string name="accel_webview_title">Accelerate web views (3.0+)</string> @@ -214,7 +214,7 @@ <string name="prefs_enable_fab">Enable FAB</string> <string name="prefs_enable_fab_long">Show floating action button when reading</string> <string name="prefs_open_fresh_on_startup">Open Fresh articles on startup</string> - <string name="prefs_headline_display_mode">Headline display mode</string> + <string name="prefs_headline_display_mode">Display mode</string> <string name="prefs_headline_display_mode_long">Default, no images, or compact mode</string> <string name="headline_display_mode_default">Default</string> <string name="headline_display_mode_no_images">No images</string> @@ -274,5 +274,7 @@ <string name="prefs_headline_request_size">How many headlines to request</string> <string name="prefs_headline_request_size_long">Use lower values on slow connections</string> <string name="headlines">Headlines</string> - <string name="prefs_headline_images_wifi_only">Show headline images on Wi-Fi only</string> + <string name="prefs_headline_images_wifi_only">Show images on Wi-Fi only</string> + <string name="prefs_headline_images_wifi_only_long">Overrides previous setting</string> + <string name="prefs_inline_video_player">Experimental. Long tap to open separate player</string> </resources> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index 15340386..40e327cf 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -68,32 +68,6 @@ android:key="category_headlines" android:title="@string/headlines" > - <org.fox.ttrss.util.LessBrokenSwitchPreference - android:defaultValue="true" - android:key="headlines_show_content" - android:summary="@string/pref_headlines_show_content_long" - android:title="@string/pref_headlines_show_content" /> - - <org.fox.ttrss.util.LessBrokenSwitchPreference - android:defaultValue="true" - android:dependency="headlines_mark_read_scroll" - android:key="headlines_swipe_to_dismiss" - android:summary="@string/pref_headlines_swipe_to_dismiss_long" - android:title="@string/pref_headlines_swipe_to_dismiss" /> - - <org.fox.ttrss.util.LessBrokenSwitchPreference - android:defaultValue="false" - android:disableDependentsState="true" - android:key="headlines_mark_read_scroll" - android:summary="@string/pref_headlines_mark_read_scroll_long" - android:title="@string/pref_headlines_mark_read_scroll" /> - - <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference - android:defaultValue="false" - android:key="enable_condensed_fonts" - android:summary="@string/pref_headlines_use_condensed_fonts_long" - android:title="@string/pref_headlines_use_condensed_fonts" /> --> - <org.fox.ttrss.util.FontSizeDialogPreference android:defaultValue="13" android:key="headlines_font_size_sp" @@ -111,8 +85,33 @@ <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="false" android:key="headline_images_wifi_only" + android:summary="@string/prefs_headline_images_wifi_only_long" android:title="@string/prefs_headline_images_wifi_only" /> + <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="true" + android:key="headlines_show_content" + android:title="@string/pref_headlines_show_content" /> + + <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="false" + android:disableDependentsState="true" + android:key="headlines_mark_read_scroll" + android:title="@string/pref_headlines_mark_read_scroll" /> + + <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="true" + android:dependency="headlines_mark_read_scroll" + android:key="headlines_swipe_to_dismiss" + android:summary="@string/pref_headlines_swipe_to_dismiss_long" + android:title="@string/pref_headlines_swipe_to_dismiss" /> + + <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="false" + android:key="enable_condensed_fonts" + android:summary="@string/pref_headlines_use_condensed_fonts_long" + android:title="@string/pref_headlines_use_condensed_fonts" /> --> + <ListPreference android:defaultValue="15" android:entries="@array/pref_headlines_request_values" @@ -124,7 +123,7 @@ <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="false" android:key="inline_video_player" - android:summary="Experimental: play videos inside headlines list. Long tap to open separate player" + android:summary="@string/prefs_inline_video_player" android:title="Inline video player" /> </PreferenceCategory> |