From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 18 Oct 2015 10:50:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
X-Git-Tag: beta-20151122~103^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e5caabd104b8e3f5bc416821050c1ce706ec04a0

Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
---

e5caabd104b8e3f5bc416821050c1ce706ec04a0
diff --cc AndroidManifest.xml
index 7a971d3c,acb5f1d8..f0d59e4a
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -172,12 -160,8 +160,12 @@@
                  <data android:mimeType="video/*" />
              </intent-filter>
              <intent-filter>
-                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
              </intent-filter>
 +            <intent-filter>
 +				<action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
 +			    <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
 +			</intent-filter>
          </receiver>
          <receiver android:name=".files.BootupBroadcastReceiver">
              <intent-filter>
diff --cc res/values/strings.xml
index 9a5ee4b4,267d713e..25223073
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -275,9 -275,9 +276,9 @@@
      
      <string name="preview_image_description">Image preview</string>
      <string name="preview_image_error_unknown_format">This image cannot be shown</string>
-     
+ 
      <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
 -    <string name="prefs_instant_upload_path_title">Upload Path</string>
 +    <string name="prefs_instant_upload_path_title">Upload path</string>
  
  	<string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your
  		administrator.</string>
@@@ -327,16 -326,23 +327,23 @@@
  	<string name="file_list_empty_moving">Nothing in here. You can add a folder!</string>
  	<string name="folder_picker_choose_button_text">Choose</string>
  
- 	<string name="move_file_not_found">Unable to move. Please check whether the file exists</string>
- 	<string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>
- 	<string name="move_file_invalid_overwrite">The file exists already in the destination folder</string>
- 	<string name="move_file_error">An error occurred while trying to move this file or folder</string>
- 	<string name="forbidden_permissions_move">to move this file</string>
+     <string name="move_file_not_found">Unable to move. Please check whether the file exists</string>
+     <string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>
+     <string name="move_file_invalid_overwrite">The file exists already in the destination folder</string>
+     <string name="move_file_error">An error occurred while trying to move this file or folder</string>
+     <string name="forbidden_permissions_move">to move this file</string>
+ 
+ 
+     <string name="copy_file_not_found">Unable to copy. Please check whether the file exists</string>
+     <string name="copy_file_invalid_into_descendent">It is not possible to copy a folder into a descendant</string>
+     <string name="copy_file_invalid_overwrite">The file exists already in the destination folder</string>
+     <string name="copy_file_error">An error occurred while trying to copy this file or folder</string>
+     <string name="forbidden_permissions_copy">to copy this file</string>
  
- 	<string name="prefs_category_instant_uploading">Instant Uploads</string>
+     <string name="prefs_category_instant_uploading">Instant Uploads</string>
  	<string name="prefs_category_security">Security</string>
  
 -	<string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
 +	<string name="prefs_instant_video_upload_path_title">Upload video path</string>
      <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
  
  	<string name="shared_subject_header">shared</string>