Merge remote-tracking branch 'remotes/origin/master' into thumbnailDuringUpload

res/values/setup.xml

@@ -11,7 +11,7 @@
     <string name ="data_folder">nextcloud</string>
     <string name ="log_name">nextcloud</string>
     <string name ="default_display_name_for_root_folder">Nextcloud</string>
-    <string name ="user_agent">Mozilla/5.0 (Android) nextcloud-android/%1$s</string>
+    <string name ="user_agent">Mozilla/5.0 (Android) ownCloud-android/%1$s</string>
     
     <!-- URLs and flags related -->
     <string name="server_url"></string>