Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta

[pub/Android/ownCloud.git] / res / values / attrs.xml

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7d80983..d51b3c0 100644 (file)
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -12,16 +12,12 @@
        </declare-styleable>
 
        <string-array name="pref_behaviour_entries">
        </declare-styleable>
 
        <string-array name="pref_behaviour_entries">

-               <item>@string/pref_behaviour_entries_do_nothing</item>
-               <item>@string/pref_behaviour_entries_copy</item>
+               <item>@string/pref_behaviour_entries_keep_file</item>

                <item>@string/pref_behaviour_entries_move</item>
                <item>@string/pref_behaviour_entries_move</item>

-               <item>@string/pref_behaviour_entries_delete</item>

        </string-array>
 
        <string-array name="pref_behaviour_entryValues">
                <item>NOTHING</item>
        </string-array>
 
        <string-array name="pref_behaviour_entryValues">
                <item>NOTHING</item>

-               <item>COPY</item>

                <item>MOVE</item>
                <item>MOVE</item>

-               <item>DELETE</item>

        </string-array>
 </resources>
\ No newline at end of file
        </string-array>
 </resources>
\ No newline at end of file