diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-18 16:37:38 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-18 16:40:57 +0400 |
| commit | aadfbbc18b7126011d879754b1b3d11056519b01 (patch) | |
| tree | ef531963c7881aacf6403aa5cab2bdeb14eb3ee3 /res/values/strings.xml | |
| parent | 490f53e6d088cc8c09a1a9ea933d24db4afae5d1 (diff) | |
| parent | f012d88a7e2a4a30b91f6617480dbb5d658454ee (diff) | |
Merge branch 'master' of git://github.com/dalingrin/Tiny-Tiny-RSS-for-Honeycomb
Conflicts:
res/values/strings.xml
res/xml/preferences.xml
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index bdcfa61d..6dd47839 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -193,4 +193,6 @@ <string name="labels">Labels</string> <string name="article_img_view_caption">View Caption</string> <string name="light_theme_is_not_supported_on_honeycomb">Light theme is not supported on Honeycomb</string> + <string name="pref_headlines_mark_read_scroll">Mark read on scroll</string> + <string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string> </resources> |