changes due to rebase

src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -409,7 +409,7 @@ public class UploadFileOperation extends SyncOperation {
         try {
 
             // check conditions 
-            result = checkConditions (originalFile);
+            result = checkConditions(originalFile);
 
             /***** E2E *****/
 

src/main/res/values/strings.xml

@@ -268,7 +268,6 @@
     <string name="favorite_real">Set as favorite</string>
     <string name="unset_favorite_real">Unset favorite</string>
     <string name="favorite_switch">Available offline</string>
-    <string name="favorite_switch">Available offline</string>
     <string name="encrypted">Set as encrypted</string>
     <string name="unset_encrypted">Unset encryption</string>
     <string name="common_rename">Rename</string>