From: masensio <masensio@solidgear.es>
Date: Tue, 1 Sep 2015 14:51:40 +0000 (+0200)
Subject: Merge branch 'develop' into uploadWhenCharging
X-Git-Tag: beta-20151122~103^2~3^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/efb3989ee67b2d7d7bb16725d7b5bfd172b5d134?hp=--cc

Merge branch 'develop' into uploadWhenCharging

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

efb3989ee67b2d7d7bb16725d7b5bfd172b5d134
diff --cc res/values-fr/strings.xml
index 90c7ba74,a502db5f..ad46d061
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@@ -263,11 -279,11 +279,12 @@@ Ci-dessous la liste des fichiers locaux
    <string name="activity_chooser_send_file_title">Envoyer</string>
    <string name="copy_link">Copier le lien</string>
    <string name="clipboard_text_copied">Copié dans le presse-papiers</string>
-   <string name="error_cant_bind_to_operations_service">Erreur critique&amp;nbsp;: impossible de réaliser des opérations</string>
-   <string name="network_error_socket_exception">Une erreur s\'est produite pendant la connection au serveur</string>
-   <string name="network_error_socket_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée.</string>
-   <string name="network_error_connect_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée.</string>
-   <string name="network_host_not_available">L\'opération n\'a pas pu être terminée, le serveur n\'est pas disponible.</string>
+   <string name="error_cant_bind_to_operations_service">Erreur critique : impossible de réaliser des opérations</string>
+   <string name="network_error_socket_exception">Une erreur est survenue pendant la connexion au serveur.</string>
+   <string name="network_error_socket_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée</string>
+   <string name="network_error_connect_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée</string>
+   <string name="network_host_not_available">L\'opération n\'a pas pu être terminée, le serveur n\'est pas disponible</string>
++>>>>>>> develop
    <string name="empty"></string>
    <string name="forbidden_permissions">Vous ne possédez pas les droits suffisants %s</string>
    <string name="forbidden_permissions_rename">afin de renommer ce fichier</string>
diff --cc res/values/strings.xml
index 5a7e76f4,cc3587d1..8b782652
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -250,14 -264,13 +264,14 @@@
      <string name="placeholder_media_time">12:23:45</string>
      
      <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
 +    <string name="instant_upload_on_charging">Upload when charging only</string>
      <string name="instant_video_upload_on_wifi">Upload videos via WiFi only</string>
      <string name="instant_upload_path">/InstantUpload</string>
-     <string name="conflict_title">Update conflict</string>
-     <string name="conflict_message">Remote file %s is not synchronized with local file. Continuing will replace content of file on server.</string>
+     <string name="conflict_title">File conflict</string>
+     <string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number added to its name.</string>
      <string name="conflict_keep_both">Keep both</string>
-     <string name="conflict_overwrite">Overwrite</string>
-     <string name="conflict_dont_upload">Don\'t upload</string>
+     <string name="conflict_use_local_version">local version</string>
+     <string name="conflict_use_server_version">server version</string>
      
      <string name="preview_image_description">Image preview</string>
      <string name="preview_image_error_unknown_format">This image cannot be shown</string>
diff --cc res/xml/preferences.xml
index b922764b,4823a83f..9b4b9b7b
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@@ -18,39 -18,30 +18,45 @@@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
  <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
--    <PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">
++    <PreferenceCategory
++		android:title="@string/prefs_category_accounts"
++		android:key="accounts_category">
      </PreferenceCategory>
      
  	<PreferenceCategory android:title="@string/prefs_category_security">
- 	    <!-- ListPreference
- 	        android:key="select_oc_account"
- 	        android:title="@string/prefs_select_oc_account"
- 	        android:summary="@string/prefs_summary_select_oc_account"
- 	        / -->
- 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 
-                         android:summary="@string/prefs_pincode_summary"/>
 -	    <android.preference.CheckBoxPreference android:title="@string/prefs_passcode" android:key="set_pincode" />
++	    <android.preference.CheckBoxPreference
++			android:title="@string/prefs_passcode"
++			android:key="set_pincode" />
  	</PreferenceCategory>
  
-     <PreferenceCategory android:title="@string/prefs_category_instant_uploading">
 -    <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
 -         <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
++    <PreferenceCategory android:title="@string/prefs_category_instant_uploading"
++		android:key="instant_uploading_category">
 +	    <EditTextPreference android:title="@string/prefs_instant_upload_path_title"
 +	        				android:defaultValue="@string/instant_upload_path"
 +	        				android:key="instant_upload_path"/>
-    	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading"
++   	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
++			android:dependency="instant_uploading"
 +       				android:disableDependentsState="true"
 +       				android:title="@string/instant_upload_on_charging"
 +       				android:key="instant_upload_on_charging"/>
- 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
++	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
++			android:key="instant_uploading"
  	                        android:title="@string/prefs_instant_upload"
  	                        android:summary="@string/prefs_instant_upload_summary"/>
- 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading"
- 	        				android:disableDependentsState="true"
+          <com.owncloud.android.ui.PreferenceWithLongSummary
+ 							android:title="@string/prefs_instant_upload_path_title"
+ 							android:key="instant_upload_path" />
+ 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
  	        				android:title="@string/instant_upload_on_wifi"
  	        				android:key="instant_upload_on_wifi"/>
--	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_video_uploading"
++	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
++			android:key="instant_video_uploading"
  	                        android:title="@string/prefs_instant_video_upload"
- 	                        android:summary="@string/prefs_instant_video_upload_summary"/>
- 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_video_uploading"
- 	        				android:disableDependentsState="true"
+ 	                        android:summary="@string/prefs_instant_video_upload_summary" />
+ 	    <com.owncloud.android.ui.PreferenceWithLongSummary
+ 							android:title="@string/prefs_instant_video_upload_path_title"
+ 							android:key="instant_video_upload_path" />
+ 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
  	        				android:title="@string/instant_video_upload_on_wifi"
  	        				android:key="instant_video_upload_on_wifi"/>
  	    <!-- DISABLED FOR RELEASE UNTIL FIXED