Use disable push_on_receive mechanism and comment new feature to prepare next release

res/layout/fragment_mainactivity_gotosettings.xml

@@ -103,7 +103,7 @@
         style="@style/StandardButton"
         android:text="@string/ma_button_sync_accounts_now" />
     
-    <TextView
+   <!-- <TextView
         android:id="@+id/tv_remoteaccount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -125,15 +125,16 @@
         android:background="@drawable/standard_button"
         style="@style/StandardButton"
         android:text="@string/choose_account" />
-
+ --> 
     <ImageView
         android:id="@+id/imageView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/textView1"
         android:layout_alignStart="@+id/textView1"
-        android:layout_below="@+id/main_button_choose_account"
+        android:layout_below="@+id/main_button_sync"
         android:layout_marginTop="33dp"
         android:src="@drawable/next_arrow" />
+    <!--  android:layout_below="@+id/main_button_choose_account" -->
 
 </RelativeLayout>

res/values-en/strings.xml

@@ -27,7 +27,7 @@
 -->
 <resources>
     <!-- Translation version, reference for translators -->
-	<string name="translation_version">6</string>
+	<string name="translation_version">7</string>
 	
     <!-- Translations must begin there -->
     <!-- Preferences -->
@@ -91,6 +91,7 @@
         <item>-1</item>
     </string-array>
     
+    <string name="pref_push_on_receive">Push SMS on reception</string>
     <string name="pref_sync_wifi">Synchronize in Wi-Fi</string>
     <string name="pref_sync_4g">Synchronize in 4G</string>
     <string name="pref_sync_3g">Synchronize in 3G</string>

res/values-fr/strings.xml

@@ -27,7 +27,7 @@
 -->
 <resources>
 	<!-- Translation version, reference for translators -->
-	<string name="translation_version">6</string>
+	<string name="translation_version">7</string>
 	
     <!-- Translations must begin there -->
 
@@ -71,6 +71,7 @@
         <item>-1</item>
     </string-array>
     
+    <string name="pref_push_on_receive">Pousser le SMS à la réception</string>
     <string name="pref_sync_wifi">Synchroniser en Wi-Fi</string>
     <string name="pref_sync_4g">Synchroniser en 4G</string>
     <string name="pref_sync_3g">Synchroniser en 3G</string>

res/values/strings.xml

@@ -28,7 +28,7 @@
 <resources>
 
     <!-- Translation version, reference for translators -->
-    <string name="translation_version">6</string>
+    <string name="translation_version">7</string>
 
     <!-- System strings, do not translate -->
     <string name="app_name">ownCloud-SMS</string>
@@ -96,6 +96,7 @@
         <item>-1</item>
     </string-array>
 
+	<string name="pref_push_on_receive">Push SMS on reception</string>
     <string name="pref_sync_wifi">Synchronize in Wi-Fi</string>
     <string name="pref_sync_4g">Synchronize in 4G</string>
     <string name="pref_sync_3g">Synchronize in 3G</string>