update

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c2fa0fb..a8cf6c0 100644 (file)
--- 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"
   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
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-sdk

diff --git a/apks/latest b/apks/latest
index fc7c290..d7eb6af 100644 (file)
--- 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 (file)
index 26535e0..0000000
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 (file)
index 0000000..556b8b6
Binary files /dev/null and b/apks/owncloud-beta-20151202.apk differ

diff --git a/build.gradle b/build.gradle
index da6b273..cd582c9 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -36,8 +36,8 @@ android {
 
     defaultConfig {
         applicationId "com.owncloud.android.beta"
 
     defaultConfig {
         applicationId "com.owncloud.android.beta"

-        versionCode 20151130
-        versionName "20151130"
+        versionCode 20151202
+        versionName "20151202"

     }
 
     sourceSets {
     }
 
     sourceSets {

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1df3a15..92085a5 100644 (file)
--- 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="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>
     <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_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>
     <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>