From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 2 Dec 2015 20:06:39 +0000 (+0100)
Subject: update
X-Git-Tag: beta-20151202
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c8cb58f05e58976d7c84605ed9b273342bf7ced2?ds=sidebyside

update
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c2fa0fba..a8cf6c0b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="20151130"
-    android:versionName="20151130"
+    android:versionCode="20151202"
+    android:versionName="20151202"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-sdk
diff --git a/apks/latest b/apks/latest
index fc7c290e..d7eb6af2 100644
--- a/apks/latest
+++ b/apks/latest
@@ -1 +1 @@
-20151130
+20151202
diff --git a/apks/owncloud-beta-20151124.apk b/apks/owncloud-beta-20151124.apk
deleted file mode 100644
index 26535e0e..00000000
Binary files a/apks/owncloud-beta-20151124.apk and /dev/null differ
diff --git a/apks/owncloud-beta-20151202.apk b/apks/owncloud-beta-20151202.apk
new file mode 100644
index 00000000..556b8b65
Binary files /dev/null and b/apks/owncloud-beta-20151202.apk differ
diff --git a/build.gradle b/build.gradle
index da6b273a..cd582c92 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,8 +36,8 @@ android {
 
     defaultConfig {
         applicationId "com.owncloud.android.beta"
-        versionCode 20151130
-        versionName "20151130"
+        versionCode 20151202
+        versionName "20151202"
     }
 
     sourceSets {
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1df3a152..92085a58 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -392,8 +392,6 @@
     <string name="action_switch_list_view">Switch to list view</string>
     <string name="common_category">Common</string>
     <string name="pref_cache_size">Cache size</string>
-    <string name="prefs_instant_behaviour_dialogTitle">Upload file to server and ...</string>
-    <string name="prefs_instant_behaviour_title">Behaviour</string>
     <string name="prefs_instant_behaviour_dialogTitle">Original file will be...</string>
     <string name="prefs_instant_behaviour_title">Original file will be...</string>
     <string name="upload_copy_files">Copy file</string>
@@ -403,7 +401,6 @@
 
     <string name="pref_behaviour_entries_do_nothing">do nothing</string>
     <string name="pref_behaviour_entries_copy">copy file to OC folder</string>
-    <string name="pref_behaviour_entries_move">move file to OC folder</string>
     <string name="pref_behaviour_entries_delete">delete origin file</string>
     <string name="confirmation_remove_files_alert">Do you really want to remove selected items?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to remove a folder and its content?</string>