Merge branch 'master' of git://github.com/dalingrin/Tiny-Tiny-RSS-for-Honeycomb

Conflicts:
	res/values/strings.xml
	res/xml/preferences.xml

1 files changed, 5 insertions, 2 deletions

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 99ac42aa..e05fc5b6 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -92,13 +92,16 @@
             android:key="headlines_show_content"

             android:summary="@string/pref_headlines_show_content_long"

             android:title="@string/pref_headlines_show_content" />

-        

         <CheckBoxPreference

             android:defaultValue="false"

             android:key="oldest_first"

             android:summary="@string/requires_api5"

             android:title="@string/offline_oldest_first" />

-        

+        <CheckBoxPreference android:key="headlines_mark_read_scroll"

+            android:title="@string/pref_headlines_mark_read_scroll"

+            android:summary="@string/pref_headlines_mark_read_scroll_long"

+            android:defaultValue="false"/>

+
     </PreferenceCategory>

     <PreferenceCategory android:title="@string/reading" >

         <ListPreference