Merge pull request #1291 from nextcloud/lintWarnings

Remove unused ressources

scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 632 warnings</span>
+<span class="mdl-layout-title">Lint Report: 1 error and 632 warnings</span>

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

@@ -1,4 +1,4 @@
-/* ownCloud Android client application
+    /* ownCloud Android client application
  *   Copyright (C) 2012-2014 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -17,8 +17,6 @@
 
 package com.owncloud.android.operations;
 
-import android.accounts.Account;
-
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -47,9 +45,8 @@ public class CopyFileOperation extends SyncOperation {
      *
      * @param srcPath          Remote path of the {@link OCFile} to move.
      * @param targetParentPath Path to the folder where the file will be copied into.
-     * @param account          OwnCloud account containing both the file and the target folder
      */
-    public CopyFileOperation(String srcPath, String targetParentPath, Account account) {
+    public CopyFileOperation(String srcPath, String targetParentPath) {
         mSrcPath = srcPath;
         mTargetParentPath = targetParentPath;
         if (!mTargetParentPath.endsWith(OCFile.PATH_SEPARATOR)) {

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -1,4 +1,4 @@
-/**
+/*
  * ownCloud Android client application
  *
  * @author Bartek Przybylski
@@ -6,16 +6,16 @@
  * @author masensio
  * Copyright (C) 2011  Bartek Przybylski
  * Copyright (C) 2016 ownCloud Inc.
- * <p>
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
  * as published by the Free Software Foundation.
- * <p>
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * <p>
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -1387,47 +1387,5 @@ public class FileContentProvider extends ContentProvider {
         } finally {
             c.close();
         }
-
     }
-
-    /**
-     * Grants that total count of successful uploads stored is not greater than MAX_SUCCESSFUL_UPLOADS.
-     *
-     * Removes older uploads if needed.
-     */
-    private void trimSuccessfulUploads(SQLiteDatabase db) {
-        Cursor c = null;
-        try {
-            String MAX_SUCCESSFUL_UPLOADS = "30";
-            c = db.rawQuery(
-                    "delete from " + ProviderTableMeta.UPLOADS_TABLE_NAME +
-                            " where " + ProviderTableMeta.UPLOADS_STATUS + " == "
-                            + UploadsStorageManager.UploadStatus.UPLOAD_SUCCEEDED.getValue() +
-                            " and " + ProviderTableMeta._ID +
-                            " not in (select " + ProviderTableMeta._ID +
-                            " from " + ProviderTableMeta.UPLOADS_TABLE_NAME +
-                            " where " + ProviderTableMeta.UPLOADS_STATUS + " == "
-                            + UploadsStorageManager.UploadStatus.UPLOAD_SUCCEEDED.getValue() +
-                            " order by " + ProviderTableMeta.UPLOADS_UPLOAD_END_TIMESTAMP +
-                            " desc limit " + MAX_SUCCESSFUL_UPLOADS +
-                            ")",
-                    null
-            );
-            c.moveToFirst(); // do something with the cursor, or deletion doesn't happen; true story
-
-        } catch (Exception e) {
-            Log_OC.e(
-                    TAG,
-                    "Something wrong trimming successful uploads, database could grow more than expected",
-                    e
-            );
-
-        } finally {
-            if (c != null) {
-                c.close();
-            }
-        }
-    }
-
-
 }

src/main/java/com/owncloud/android/services/OperationsService.java

@@ -684,7 +684,7 @@ public class OperationsService extends Service {
                     // Copy file/folder
                     String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH);
                     String newParentPath = operationIntent.getStringExtra(EXTRA_NEW_PARENT_PATH);
-                    operation = new CopyFileOperation(remotePath, newParentPath, account);
+                    operation = new CopyFileOperation(remotePath, newParentPath);
 
                 } else if (action.equals(ACTION_CHECK_CURRENT_CREDENTIALS)) {
                     // Check validity of currently stored credentials for a given account

src/main/java/com/owncloud/android/ui/activity/Preferences.java

@@ -46,10 +46,8 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -63,7 +61,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.ExternalLinksProvider;
-import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datastorage.DataStorageProvider;
 import com.owncloud.android.datastorage.StoragePoint;
 import com.owncloud.android.lib.common.ExternalLink;
@@ -71,9 +68,7 @@ import com.owncloud.android.lib.common.ExternalLinkType;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle;
 import com.owncloud.android.utils.AnalyticsUtils;
-import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
 import java.io.IOException;
@@ -92,8 +87,6 @@ public class Preferences extends PreferenceActivity
 
     private static final String SCREEN_NAME = "Settings";
 
-    private static final int ACTION_SELECT_UPLOAD_PATH = 1;
-    private static final int ACTION_SELECT_UPLOAD_VIDEO_PATH = 2;
     private static final int ACTION_REQUEST_PASSCODE = 5;
     private static final int ACTION_CONFIRM_PASSCODE = 6;
 
@@ -113,20 +106,6 @@ public class Preferences extends PreferenceActivity
     private Preference pAboutApp;
     private AppCompatDelegate mDelegate;
 
-    private String mUploadPath;
-    private PreferenceCategory mPrefInstantUploadCategory;
-    private CheckBoxPreferenceWithLongTitle mPrefInstantUpload;
-    private Preference mPrefInstantUploadBehaviour;
-    private Preference mPrefInstantUploadPath;
-    private Preference mPrefInstantUploadUseSubfolders;
-    private Preference mPrefInstantPictureUploadOnlyOnCharging;
-    private Preference mPrefInstantUploadPathWiFi;
-    private CheckBoxPreferenceWithLongTitle mPrefInstantVideoUpload;
-    private Preference mPrefInstantVideoUploadPath;
-    private Preference mPrefInstantVideoUploadUseSubfolders;
-    private Preference mPrefInstantVideoUploadPathWiFi;
-    private Preference mPrefInstantVideoUploadOnlyOnCharging;
-    private String mUploadVideoPath;
     private ListPreference mPrefStoragePath;
     private String mStoragePath;
 
@@ -149,7 +128,7 @@ public class Preferences extends PreferenceActivity
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
 
-        ActionBar actionBar = getSupportActionBar();
+        ActionBar actionBar = getDelegate().getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         ThemeUtils.setColoredTitle(actionBar, getString(R.string.actionbar_settings));
         actionBar.setBackgroundDrawable(new ColorDrawable(ThemeUtils.primaryColor()));
@@ -319,7 +298,7 @@ public class Preferences extends PreferenceActivity
             }
         }
 
-        boolean fShowHiddenFilesEnabled = getResources().getBoolean(R.bool.passcode_enabled);
+        boolean fShowHiddenFilesEnabled = getResources().getBoolean(R.bool.show_hidden_files_enabled);
         mShowHiddenFiles = (SwitchPreference) findPreference("show_hidden_files");
 
         if (fShowHiddenFilesEnabled) {
@@ -565,9 +544,6 @@ public class Preferences extends PreferenceActivity
             });
         }
 
-        mPrefInstantUploadCategory = (PreferenceCategory) findPreference("instant_uploading_category");
-        getPreferenceScreen().removePreference(mPrefInstantUploadCategory);
-
         // About category
         PreferenceCategory preferenceCategoryAbout = (PreferenceCategory) findPreference("about");
         preferenceCategoryAbout.setTitle(ThemeUtils.getColoredTitle(getString(R.string.prefs_category_about),
@@ -706,32 +682,7 @@ public class Preferences extends PreferenceActivity
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode == ACTION_SELECT_UPLOAD_PATH && resultCode == RESULT_OK) {
-
-            OCFile folderToUpload = data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);
-
-            mUploadPath = folderToUpload.getRemotePath();
-
-            mUploadPath = DisplayUtils.getPathWithoutLastSlash(mUploadPath);
-
-            // Show the path on summary preference
-            mPrefInstantUploadPath.setSummary(mUploadPath);
-
-            saveInstantUploadPathOnPreferences();
-
-        } else if (requestCode == ACTION_SELECT_UPLOAD_VIDEO_PATH && resultCode == RESULT_OK) {
-
-            OCFile folderToUploadVideo = data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);
-
-            mUploadVideoPath = folderToUploadVideo.getRemotePath();
-
-            mUploadVideoPath = DisplayUtils.getPathWithoutLastSlash(mUploadVideoPath);
-
-            // Show the video path on summary preference
-            mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
-
-            saveInstantUploadVideoPathOnPreferences();
-        } else if (requestCode == ACTION_REQUEST_PASSCODE && resultCode == RESULT_OK) {
+        if (requestCode == ACTION_REQUEST_PASSCODE && resultCode == RESULT_OK) {
             String passcode = data.getStringExtra(PassCodeActivity.KEY_PASSCODE);
             if (passcode != null && passcode.length() == 4) {
                 SharedPreferences.Editor appPrefs = PreferenceManager
@@ -759,14 +710,6 @@ public class Preferences extends PreferenceActivity
         }
     }
 
-    public ActionBar getSupportActionBar() {
-        return getDelegate().getSupportActionBar();
-    }
-
-    public void setSupportActionBar(@Nullable Toolbar toolbar) {
-        getDelegate().setSupportActionBar(toolbar);
-    }
-
     @Override
     public MenuInflater getMenuInflater() {
         return getDelegate().getMenuInflater();
@@ -871,16 +814,6 @@ public class Preferences extends PreferenceActivity
         }
     }
 
-    /**
-     * Load upload path set on preferences
-     */
-    private void loadInstantUploadPath() {
-        SharedPreferences appPrefs =
-                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        mUploadPath = appPrefs.getString(PreferenceKeys.INSTANT_UPLOAD_PATH, getString(R.string.instant_upload_path));
-        mPrefInstantUploadPath.setSummary(mUploadPath);
-    }
-
     /**
      * Save storage path
      */
@@ -909,38 +842,6 @@ public class Preferences extends PreferenceActivity
         mPrefStoragePath.setSummary(storageDescription);
     }
 
-    /**
-     * Save the "Instant Upload Path" on preferences
-     */
-    private void saveInstantUploadPathOnPreferences() {
-        SharedPreferences appPrefs =
-                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        SharedPreferences.Editor editor = appPrefs.edit();
-        editor.putString(PreferenceKeys.INSTANT_UPLOAD_PATH, mUploadPath);
-        editor.apply();
-    }
-
-    /**
-     * Load upload video path set on preferences
-     */
-    private void loadInstantUploadVideoPath() {
-        SharedPreferences appPrefs =
-                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        mUploadVideoPath = appPrefs.getString("instant_video_upload_path", getString(R.string.instant_upload_path));
-        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
-    }
-
-    /**
-     * Save the "Instant Video Upload Path" on preferences
-     */
-    private void saveInstantUploadVideoPathOnPreferences() {
-        SharedPreferences appPrefs =
-                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        SharedPreferences.Editor editor = appPrefs.edit();
-        editor.putString(PreferenceKeys.INSTANT_VIDEO_UPLOAD_PATH, mUploadVideoPath);
-        editor.apply();
-    }
-
     @Override
     public void onStorageMigrationFinished(String storagePath, boolean succeed) {
         if (succeed) {

src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -44,7 +44,6 @@ import android.widget.Toast;
 
 import com.evernote.android.job.JobRequest;
 import com.owncloud.android.R;
-import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.files.services.FileUploader;
@@ -195,14 +194,6 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
 
         }        
     }
-    
-    /**
-     * Same as openFileWithDefault() but user cannot save default app.
-     * @param ocFile
-     */
-    private void openFileWithDefaultNoDefault(OCFile ocFile) {
-        getFileOperationsHelper().openFile(ocFile);
-    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {

src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java

@@ -126,7 +126,7 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
 
         if (savedInstanceState != null) {
             if (!mIgnoreFirstSavedState) {
-                setFile((OCFile) savedInstanceState.getParcelable(FileDownloadFragment.EXTRA_FILE));
+                setFile(savedInstanceState.getParcelable(FileDownloadFragment.EXTRA_FILE));
                 mAccount = savedInstanceState.getParcelable(FileDownloadFragment.EXTRA_ACCOUNT);
                 mError = savedInstanceState.getBoolean(FileDownloadFragment.EXTRA_ERROR);
             }
@@ -240,29 +240,9 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
         getView().findViewById(R.id.error_image).setVisibility(View.GONE);
     }
 
-    /**
-     * Enables or disables buttons for a file locally available
-     */
-    private void setButtonsForDown() {
-        getView().findViewById(R.id.cancelBtn).setVisibility(View.GONE);
-
-        // hides the progress bar
-        getView().findViewById(R.id.progressBar).setVisibility(View.GONE);
-
-        // updates the text message
-        TextView progressText = (TextView) getView().findViewById(R.id.progressText);
-        progressText.setText(R.string.common_loading);
-        progressText.setVisibility(View.VISIBLE);
-
-        // hides the error icon
-        getView().findViewById(R.id.errorText).setVisibility(View.GONE);
-        getView().findViewById(R.id.error_image).setVisibility(View.GONE);
-    }
-
-
     /**
      * Enables or disables buttons for a file not locally available
-     * <p/>
+     *
      * Currently, this is only used when a download was failed
      */
     private void setButtonsForRemote() {
@@ -307,7 +287,7 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
         WeakReference<ProgressBar> mProgressBar = null;
 
         ProgressListener(ProgressBar progressBar) {
-            mProgressBar = new WeakReference<ProgressBar>(progressBar);
+            mProgressBar = new WeakReference<>(progressBar);
         }
 
         @Override

src/main/res/anim/pump_bottom.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<scale
-		android:fromXScale="1.1" android:toXScale="1.0"
-		android:fromYScale="1.1" android:toYScale="1.0"
-		android:pivotX="50%" android:pivotY="100%"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-	<alpha
-		android:interpolator="@android:anim/decelerate_interpolator"
-		android:fromAlpha="0.0" android:toAlpha="1.0"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-</set>

src/main/res/anim/pump_top.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<scale
-		android:fromXScale="1.1" android:toXScale="1.0"
-		android:fromYScale="1.1" android:toYScale="1.0"
-		android:pivotX="50%" android:pivotY="0%"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-	<alpha
-		android:interpolator="@android:anim/decelerate_interpolator"
-		android:fromAlpha="0.0" android:toAlpha="1.0"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-</set>

src/main/res/anim/shrink_from_bottom.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<scale
-		android:fromXScale="1.0" android:toXScale="0.3"
-		android:fromYScale="1.0" android:toYScale="0.3"
-		android:pivotX="50%" android:pivotY="0%"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-	<alpha
-		android:interpolator="@android:anim/accelerate_interpolator"
-		android:fromAlpha="1.0" android:toAlpha="0.0"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-</set>

src/main/res/anim/shrink_from_bottomleft_to_topright.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<scale
-		android:fromXScale="1.0" android:toXScale="0.3"
-		android:fromYScale="1.0" android:toYScale="0.3"
-		android:pivotX="100%" android:pivotY="0%"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-	<alpha
-		android:interpolator="@android:anim/accelerate_interpolator"
-		android:fromAlpha="1.0" android:toAlpha="0.0"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-</set>

src/main/res/anim/shrink_from_bottomright_to_topleft.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<scale
-		android:fromXScale="1.0" android:toXScale="0.3"
-		android:fromYScale="1.0" android:toYScale="0.3"
-		android:pivotX="0%" android:pivotY="0%"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-	<alpha
-		android:interpolator="@android:anim/accelerate_interpolator"
-		android:fromAlpha="1.0" android:toAlpha="0.0"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-</set>

src/main/res/anim/shrink_from_top.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<scale
-		android:fromXScale="1.0" android:toXScale="0.3"
-		android:fromYScale="1.0" android:toYScale="0.3"
-		android:pivotX="50%" android:pivotY="100%"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-	<alpha
-		android:interpolator="@android:anim/accelerate_interpolator"
-		android:fromAlpha="1.0" android:toAlpha="0.0"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-</set>

src/main/res/anim/shrink_from_topleft_to_bottomright.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<scale
-		android:fromXScale="1.0" android:toXScale="0.3"
-		android:fromYScale="1.0" android:toYScale="0.3"
-		android:pivotX="100%" android:pivotY="100%"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-	<alpha
-		android:interpolator="@android:anim/accelerate_interpolator"
-		android:fromAlpha="1.0" android:toAlpha="0.0"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-</set>

src/main/res/anim/shrink_from_topright_to_bottomleft.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<scale
-		android:fromXScale="1.0" android:toXScale="0.3"
-		android:fromYScale="1.0" android:toYScale="0.3"
-		android:pivotX="0%" android:pivotY="100%"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-	<alpha
-		android:interpolator="@android:anim/accelerate_interpolator"
-		android:fromAlpha="1.0" android:toAlpha="0.0"
-		android:duration="@android:integer/config_shortAnimTime"
-	/>
-</set>

src/main/res/drawable/round_button.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2016 Andy Scherzinger
-  Copyright (C) 2015 ownCloud Inc.
-  Copyright (C) 2016 Nextcloud.
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/color_accent"/>
-</shape>

src/main/res/layout/migration_layout.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2016 Bartosz Przybylski
-  Copyright (C) 2016 Nextcloud
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:gravity="center_vertical"
-              android:orientation="vertical">
-
-    <ProgressBar
-        android:id="@+id/migrationProgress"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:paddingLeft="30dp"
-        android:paddingRight="30dp"
-        android:progress="50"/>
-
-    <TextView
-        android:id="@+id/migrationText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:text=""
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <Button
-        android:id="@+id/finishButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:text="@string/drawer_close"/>
-</LinearLayout>

src/main/res/values-ar/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">افتح</string>
     <string name="prefs_category_general">عام</string>
     <string name="prefs_category_more">المزيد</string>
-    <string name="prefs_accounts">حسابات</string>
     <string name="prefs_manage_accounts">إدارة الحسابات</string>
     <string name="prefs_passcode">الرقم السري</string>
     <string name="prefs_fingerprint">قفل بصمه الاصبع</string>
     <string name="prefs_fingerprint_notsetup">لم يتم ادخال اى بصمات </string>
     <string name="prefs_show_hidden_files">عرض الملفات المخفية</string>
-    <string name="prefs_instant_upload">التحميل الفوري للصور</string>
-    <string name="prefs_instant_upload_summary">حمل الصور المأخوذه بالكاميرا فورا  </string>
-    <string name="prefs_instant_video_upload">التحميل الفورى للفيديو</string>
-    <string name="prefs_instant_video_upload_summary">حمل الفيديوهات المسجله بالكاميرا فورا</string>
-    <string name="prefs_log_title">اسمح بالتسجيل</string>
-    <string name="prefs_log_summary">يستخدم هذا لتسجيل المشاكل</string>
-    <string name="prefs_log_title_history">تسجيل الدخول …</string>
-    <string name="prefs_log_summary_history">هذا يعرض السجلات المسجلة</string>
     <string name="prefs_log_delete_history_button">حذف البيانات التاريخية</string>
     <string name="prefs_calendar_contacts">مزامنة التقويم &amp; جهات الاتصال</string>
     <string name="prefs_calendar_contacts_summary">اعداد دافرويد (+v1.3.0) للحساب الحالى </string>

src/main/res/values-ast/strings.xml

@@ -39,18 +39,9 @@
     <string name="drawer_open">Abrir</string>
     <string name="prefs_category_general">Xeneral</string>
     <string name="prefs_category_more">Más</string>
-    <string name="prefs_accounts">Cuentes</string>
     <string name="prefs_manage_accounts">Xestionar cuentes</string>
     <string name="prefs_fingerprint_notsetup">Nun se configuraron buelgues.</string>
     <string name="prefs_show_hidden_files">Amosar ficheros anubríos</string>
-    <string name="prefs_instant_upload">Xuba nel intre de semeyes</string>
-    <string name="prefs_instant_upload_summary">Xuba nel intre de semeyes feches cola cámara</string>
-    <string name="prefs_instant_video_upload">Xuba nel intre de vídeos</string>
-    <string name="prefs_instant_video_upload_summary">Xuba nel intre de vídeos fechos cola cámara</string>
-    <string name="prefs_log_title">Habilitar rexistru</string>
-    <string name="prefs_log_summary">Esto úsase pa rexistrar problemes</string>
-    <string name="prefs_log_title_history">Historial del rexistru</string>
-    <string name="prefs_log_summary_history">Esto amuesa los rexistros grabaos</string>
     <string name="prefs_log_delete_history_button">Desaniciar historial</string>
     <string name="prefs_calendar_contacts">Sincronizar calendariu &amp; contautos</string>
     <string name="prefs_calendar_contacts_summary">Configura DAVdroid (v1.3.0+) pa la cuenta actual</string>

src/main/res/values-bg-rBG/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Отвори</string>
     <string name="prefs_category_general">Общи</string>
     <string name="prefs_category_more">Още</string>
-    <string name="prefs_accounts">Профили</string>
     <string name="prefs_manage_accounts">Управление на профилите</string>
     <string name="prefs_passcode">Код за достъп</string>
     <string name="prefs_fingerprint">Заключване с отпечатък</string>
     <string name="prefs_fingerprint_notsetup">Пръстови отпечатъци не са зададени.</string>
     <string name="prefs_show_hidden_files">Показване и на скрити файлове</string>
-    <string name="prefs_instant_upload">Незабавно качване на снимки</string>
-    <string name="prefs_instant_upload_summary">Качвай снимки направени чрез камерата незабавно</string>
-    <string name="prefs_instant_video_upload">Незабавно качване на видео</string>
-    <string name="prefs_instant_video_upload_summary">Качвай видеа, записани с камерата, незабавно.</string>
-    <string name="prefs_log_title">Включи логовете</string>
-    <string name="prefs_log_summary">Използва се за проследяване на проблеми</string>
-    <string name="prefs_log_title_history">История на логове</string>
-    <string name="prefs_log_summary_history">Показва записаните логове</string>
     <string name="prefs_log_delete_history_button">Изтрий истрията</string>
     <string name="prefs_calendar_contacts">Синхронизиране на календар и контакти</string>
     <string name="prefs_calendar_contacts_summary">Настройване на DAVdroid (v1.3.0+) за текущия профил</string>
@@ -62,8 +53,6 @@
     <string name="prefs_recommend">Препоръчай на приятел</string>
     <string name="prefs_feedback">Обратна връзка</string>
     <string name="prefs_imprint">Отпечатък</string>
-    <string name="prefs_remember_last_share_location">Запомни локацията за споделяне</string>
-    <string name="prefs_remember_last_upload_location_summary">Запомни последната локация за споделяне</string>
 
 	<string name="recommend_subject">Пробвайте %1$s на смартфона си!</string>
 	<string name="recommend_text">Искам да ви поканя да използвате %1$s на вашия смартфон.\nСвалете тук: %2$s</string>

src/main/res/values-ca/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Obre</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Més</string>
-    <string name="prefs_accounts">Comptes</string>
     <string name="prefs_manage_accounts">Gestió de comptes</string>
     <string name="prefs_passcode">Contrasenya</string>
     <string name="prefs_fingerprint">Bloqueig d\'empremta</string>
     <string name="prefs_expert_mode">Mode expert</string>
     <string name="prefs_show_hidden_files">Mostra els fitxers ocults</string>
-    <string name="prefs_instant_upload">Pujada instantània de fotografies</string>
-    <string name="prefs_instant_upload_summary">Puja les fotos de la càmera instantàniament</string>
-    <string name="prefs_instant_video_upload">Pujada instantània de vídeos</string>
-    <string name="prefs_instant_video_upload_summary">Puja els vídeos instantàniament</string>
-    <string name="prefs_log_title">Habilita els registres</string>
-    <string name="prefs_log_summary">Això s\'usa per registrar problemes</string>
-    <string name="prefs_log_title_history">Historial dels registres</string>
-    <string name="prefs_log_summary_history">Això mostra els registres desats</string>
     <string name="prefs_log_delete_history_button">Esborra l\'historial</string>
     <string name="prefs_calendar_contacts">Sincronitza el calendari i els contactes</string>
     <string name="prefs_calendar_contacts_summary">Configura DAVdroid (v1.3.0+) al compte actual</string>

src/main/res/values-cs-rCZ/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Otevřít</string>
     <string name="prefs_category_general">Obecné</string>
     <string name="prefs_category_more">Více</string>
-    <string name="prefs_accounts">Účty</string>
     <string name="prefs_manage_accounts">Spravovat účty</string>
     <string name="prefs_passcode">Zámek bezpečnostního kódu</string>
     <string name="prefs_fingerprint">Zámek otiskemprstu</string>
     <string name="prefs_fingerprint_notsetup">Nebyly nastaveny žádné otisky prstů.</string>
     <string name="prefs_show_hidden_files">Zobrazit skryté soubory</string>
-    <string name="prefs_instant_upload">Okamžité nahrávání obrázků</string>
-    <string name="prefs_instant_upload_summary">Okamžitě nahrávat vytvořené fotografie</string>
-    <string name="prefs_instant_video_upload">Okamžité nahrávání videa</string>
-    <string name="prefs_instant_video_upload_summary">Okamžitě odesílat nahrané video</string>
-    <string name="prefs_log_title">Povolit logování</string>
-    <string name="prefs_log_summary">Použito k zaznamenávání problémů</string>
-    <string name="prefs_log_title_history">Historie logu</string>
-    <string name="prefs_log_summary_history">Zobrazuje zaznamenané logy</string>
     <string name="prefs_log_delete_history_button">Smazat historii</string>
     <string name="prefs_calendar_contacts">Synchronizovat kalendář &amp; kontakty</string>
     <string name="prefs_calendar_contacts_summary">Nastavit DAVdroid (v1.3.0+) pro aktuální účet</string>
@@ -64,8 +55,6 @@
     <string name="prefs_recommend">Doporučit přátelům</string>
     <string name="prefs_feedback">Odezva</string>
     <string name="prefs_imprint">Imprint</string>
-    <string name="prefs_remember_last_share_location">Zapamatovat umístění sdílení</string>
-    <string name="prefs_remember_last_upload_location_summary">Zapamatovat poslední umístění pro nahrání sdílených souborů</string>
 
 	<string name="recommend_subject">Zkuste %1$s na svém chytrém telefonu!</string>
 	<string name="recommend_text">Chtěl bych vás pozvat k používání %1$s na vašem chytrém telefonu!\nKe stažení zde: %2$s</string>

src/main/res/values-da/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Åbn</string>
     <string name="prefs_category_general">Generel</string>
     <string name="prefs_category_more">Mere</string>
-    <string name="prefs_accounts">Konti</string>
     <string name="prefs_manage_accounts">Administrer konti</string>
     <string name="prefs_passcode">Passcode-lås</string>
     <string name="prefs_fingerprint">Fingeraftrykslås</string>
     <string name="prefs_fingerprint_notsetup">Ingen fingeraftryk er blevet sat op.</string>
     <string name="prefs_show_hidden_files">Vis skjulte filer</string>
-    <string name="prefs_instant_upload">Upload straks billeder</string>
-    <string name="prefs_instant_upload_summary">Upload straks billeder taget med kameraet</string>
-    <string name="prefs_instant_video_upload">Upload straks video</string>
-    <string name="prefs_instant_video_upload_summary">Upload straks video taget med kameraet</string>
-    <string name="prefs_log_title">Slå logning til</string>
-    <string name="prefs_log_summary">Dette bruges til at logregistrere problemer</string>
-    <string name="prefs_log_title_history">Logningshistorik</string>
-    <string name="prefs_log_summary_history">Dette viser de optagne logger</string>
     <string name="prefs_log_delete_history_button">Slet historik</string>
     <string name="prefs_calendar_contacts">Synkroniser kalender &amp; kontakter</string>
     <string name="prefs_calendar_contacts_summary">Indstil DAVdroid (v1.3.0+) for aktiv konto</string>

src/main/res/values-de-rDE/strings.xml

@@ -39,21 +39,12 @@
     <string name="drawer_open">Öffnen</string>
     <string name="prefs_category_general">Allgemein</string>
     <string name="prefs_category_more">Mehr</string>
-    <string name="prefs_accounts">Konten</string>
     <string name="prefs_manage_accounts">Konten verwalten</string>
     <string name="prefs_passcode">PIN gesperrt</string>
     <string name="prefs_fingerprint">Fingerabdruck-Sperre</string>
     <string name="prefs_fingerprint_notsetup">Keine Fingerabdrücke eingerichtet.</string>
     <string name="prefs_expert_mode">Expertenmodus</string>
     <string name="prefs_show_hidden_files">Versteckte Dateien anzeigen</string>
-    <string name="prefs_instant_upload">Sofortiges Hochladen von Bildern</string>
-    <string name="prefs_instant_upload_summary">Laden Sie mit der Kamera gemachte Fotos sofort hoch</string>
-    <string name="prefs_instant_video_upload">Sofortiges Hochladen von Videos</string>
-    <string name="prefs_instant_video_upload_summary">Laden Sie mit der Kamera gemachte Videos sofort hoch</string>
-    <string name="prefs_log_title">Protokollierung aktivieren</string>
-    <string name="prefs_log_summary">Dies wird zur Protokollierung von Problemen genutzt</string>
-    <string name="prefs_log_title_history">Protokollierungs-Historie</string>
-    <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokollierungen</string>
     <string name="prefs_log_delete_history_button">Verlauf löschen</string>
     <string name="prefs_calendar_contacts">Kalender &amp; Kontakte synchronisieren</string>
     <string name="prefs_calendar_contacts_summary">DAVdroid (v1.3.0+) für aktuelles Konto einrichten</string>
@@ -65,8 +56,6 @@
     <string name="prefs_recommend">Einem Freund empfehlen</string>
     <string name="prefs_feedback">Rückmeldungen</string>
     <string name="prefs_imprint">Impressum</string>
-    <string name="prefs_remember_last_share_location">Geteilten Speicherort merken</string>
-    <string name="prefs_remember_last_upload_location_summary">Zuletzt verwendeten, geteilten Upload-Speicherort merken</string>
 
 	<string name="recommend_subject">Probieren Sie %1$s auf Ihrem Smartphone!</string>
 	<string name="recommend_text">Ich empfehle Ihnen die Nutzung von %1$s auf Ihrem Smartphone!\nLaden Sie es hier herunter: %2$s</string>

src/main/res/values-de/strings.xml

@@ -39,21 +39,12 @@
     <string name="drawer_open">Öffnen</string>
     <string name="prefs_category_general">Allgemein</string>
     <string name="prefs_category_more">Mehr</string>
-    <string name="prefs_accounts">Konten</string>
     <string name="prefs_manage_accounts">Konten verwalten</string>
     <string name="prefs_passcode">PIN gesperrt</string>
     <string name="prefs_fingerprint">Fingerabdruck-Sperre</string>
     <string name="prefs_fingerprint_notsetup">Keine Fingerabdrücke eingerichtet.</string>
     <string name="prefs_expert_mode">Expertenmodus</string>
     <string name="prefs_show_hidden_files">Versteckte Dateien anzeigen</string>
-    <string name="prefs_instant_upload">Sofortiges Hochladen von Bildern</string>
-    <string name="prefs_instant_upload_summary">Lade mit der Kamera gemachte Fotos sofort hoch</string>
-    <string name="prefs_instant_video_upload">Sofortiges Hochladen von Videos</string>
-    <string name="prefs_instant_video_upload_summary">Lade mit der Kamera gemachte Videos sofort hoch</string>
-    <string name="prefs_log_title">Protokollierung aktivieren</string>
-    <string name="prefs_log_summary">Dies wird zur Protokollierung von Problemen genutzt</string>
-    <string name="prefs_log_title_history">Protokollierungs-Historie</string>
-    <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokollierungen</string>
     <string name="prefs_log_delete_history_button">Verlauf löschen</string>
     <string name="prefs_calendar_contacts">Kalender &amp; Kontakte synchronisieren</string>
     <string name="prefs_calendar_contacts_summary">DAVdroid (v1.3.0+) für aktuelles Konto einrichten</string>
@@ -65,8 +56,6 @@
     <string name="prefs_recommend">Einem Freund empfehlen</string>
     <string name="prefs_feedback">Rückmeldungen</string>
     <string name="prefs_imprint">Impressum</string>
-    <string name="prefs_remember_last_share_location">Geteilten Speicherort merken</string>
-    <string name="prefs_remember_last_upload_location_summary">Zuletzt verwendeten, geteilten Upload-Speicherort merken</string>
 
 	<string name="recommend_subject">Probiere %1$s auf Deinem Smartphone!</string>
 	<string name="recommend_text">"Ich empfehle Dir die Nutzung von %1$s auf Deinem Smartphone!\nLade es hier herunter: %2$s"</string>

src/main/res/values-el/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Άνοιγμα</string>
     <string name="prefs_category_general">Γενικά</string>
     <string name="prefs_category_more">Περισσότερα</string>
-    <string name="prefs_accounts">Λογαριασμοί</string>
     <string name="prefs_manage_accounts">Διαχείριση λογαριασμών</string>
     <string name="prefs_passcode">Κλείδωμα με κωδικό πρόσβασης</string>
     <string name="prefs_fingerprint">Κλείδωμα με αποτύπωμα</string>
     <string name="prefs_fingerprint_notsetup">Δεν έχει οριστεί αποτύπωμα</string>
     <string name="prefs_show_hidden_files">Εμφάνιση κρυφών αρχείων</string>
-    <string name="prefs_instant_upload">Άμεσες μεταφορτώσεις φωτογραφιών</string>
-    <string name="prefs_instant_upload_summary">Άμεση μεταφόρτωση φωτογραφιών που λήφθησαν από την φωτογραφική μηχανή</string>
-    <string name="prefs_instant_video_upload">Άμεση μεταφόρτωση βίντεο</string>
-    <string name="prefs_instant_video_upload_summary">Άμεση μεταφόρτωση βίντεο που λήφθησαν από την φωτογραφική μηχανή</string>
-    <string name="prefs_log_title">Ενεργοποίηση καταγραφής ιστορικού</string>
-    <string name="prefs_log_summary">Χρησιμοποιείται για την καταγραφή προβλημάτων</string>
-    <string name="prefs_log_title_history">Καταγραφή ιστορικού</string>
-    <string name="prefs_log_summary_history">Εμφάνιση του καταγεγραμμένου ιστορικού</string>
     <string name="prefs_log_delete_history_button">Διαγραφή ιστορικού</string>
     <string name="prefs_calendar_contacts">Συγχρονισμός ημερολογίου &amp; επαφών</string>
     <string name="prefs_calendar_contacts_summary">Ρυθμίστε το DAVdroid (v1.3.0+) για τον τρέχον λογαριασμό</string>
@@ -64,8 +55,6 @@
     <string name="prefs_recommend">Προτείνετε σε φίλο</string>
     <string name="prefs_feedback">Aνάδραση</string>
     <string name="prefs_imprint">Αποτύπωμα</string>
-    <string name="prefs_remember_last_share_location">Απομνημόνευση θέσης διαμοιρασμού</string>
-    <string name="prefs_remember_last_upload_location_summary">Απομνημόνευση τελευταιας τοποθεσίας διαμοιρασμού μεταφορτώσεων</string>
 
 	<string name="recommend_subject">Δοκιμή %1$s στο κινητό σας!</string>
 	<string name="recommend_text">Θα ήθελα να σε προσκαλέσω να χρησιμοποιήσεις το %1$s στο κινητό σου!\nΛήψη από εδώ: %2$s</string>

src/main/res/values-en-rGB/strings.xml

@@ -39,21 +39,12 @@
     <string name="drawer_open">Open</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
-    <string name="prefs_accounts">Accounts</string>
     <string name="prefs_manage_accounts">Manage accounts</string>
     <string name="prefs_passcode">Passcode lock</string>
     <string name="prefs_fingerprint">Fingerprint lock</string>
     <string name="prefs_fingerprint_notsetup">No fingerprints have been set up.</string>
     <string name="prefs_expert_mode">Expert mode</string>
     <string name="prefs_show_hidden_files">Show hidden files</string>
-    <string name="prefs_instant_upload">Instant uploading of pictures</string>
-    <string name="prefs_instant_upload_summary">Upload pictures taken by camera instantly</string>
-    <string name="prefs_instant_video_upload">Instant uploading of video</string>
-    <string name="prefs_instant_video_upload_summary">Upload videos recorded by camera instantly</string>
-    <string name="prefs_log_title">Enable logging</string>
-    <string name="prefs_log_summary">This is used to log problems</string>
-    <string name="prefs_log_title_history">Logging history</string>
-    <string name="prefs_log_summary_history">This shows the recorded logs</string>
     <string name="prefs_log_delete_history_button">Delete history</string>
     <string name="prefs_calendar_contacts">Sync calendar &amp; contacts</string>
     <string name="prefs_calendar_contacts_summary">Set up DAVdroid (v1.3.0+) for current account</string>
@@ -65,8 +56,6 @@
     <string name="prefs_recommend">Recommend to friend</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprint</string>
-    <string name="prefs_remember_last_share_location">Remember location of share</string>
-    <string name="prefs_remember_last_upload_location_summary">Remember location of share most recently used</string>
 
 	<string name="recommend_subject">Try %1$s on your smartphone!</string>
 	<string name="recommend_text">I want to invite you to use %1$s on your smartphone.\nDownload here: %2$s</string>

src/main/res/values-es-rAR/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Abrir</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
-    <string name="prefs_accounts">Cuentas</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_passcode">Bloqueo con código de seguridad</string>
     <string name="prefs_fingerprint">Bloqueo por huella digital</string>
     <string name="prefs_fingerprint_notsetup">No se ha establecido ninguna huella digital. </string>
     <string name="prefs_show_hidden_files">Mostrar archivos ocultos</string>
-    <string name="prefs_instant_upload">Carga instantánea de imágenes</string>
-    <string name="prefs_instant_upload_summary">Cargar instantaneamente las fotografías tomadas por la cámara</string>
-    <string name="prefs_instant_video_upload">Carga instantánea de video</string>
-    <string name="prefs_instant_video_upload_summary">Cargar instantáneamente los videos grabados por la cámara</string>
-    <string name="prefs_log_title">Habilitar registro</string>
-    <string name="prefs_log_summary">Esto se usa para registrar problemas</string>
-    <string name="prefs_log_title_history">Histórico del registro</string>
-    <string name="prefs_log_summary_history">Esto muestra los registros guardados</string>
     <string name="prefs_log_delete_history_button">Borrar historial</string>
     <string name="prefs_calendar_contacts">Sincronizar calendario  &amp; contactos</string>
     <string name="prefs_calendar_contacts_summary">Configurar DAVdroid (v1.3.0+) para la cuenta actual</string>
@@ -63,8 +54,6 @@
     <string name="prefs_recommend">Recomendar a un amigo</string>
     <string name="prefs_feedback">Retroalimentación</string>
     <string name="prefs_imprint">Exención de responsabilidad </string>
-    <string name="prefs_remember_last_share_location">Recordar la ubicación del elemento compartido</string>
-    <string name="prefs_remember_last_upload_location_summary">Recordar la ubicación del elemento compartido más recientemente usado</string>
 
 	<string name="recommend_subject">Prueba  %1$s en tu teléfono inteligente!</string>
 	<string name="recommend_text">Quisiera invitarlo a usar %1$s en su teléfono inteligente\nDescargue aquí: %2$s</string>

src/main/res/values-es-rMX/strings.xml

@@ -39,21 +39,12 @@
     <string name="drawer_open">Abrir</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
-    <string name="prefs_accounts">Cuentas</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_passcode">Bloqueo con código de seguridad</string>
     <string name="prefs_fingerprint">Bloqueo cor huella digital</string>
     <string name="prefs_fingerprint_notsetup">No se ha establecido alguna huella digital. </string>
     <string name="prefs_expert_mode">Modo experto</string>
     <string name="prefs_show_hidden_files">Mostrar archivos ocultos</string>
-    <string name="prefs_instant_upload">Carga automática de imágenes</string>
-    <string name="prefs_instant_upload_summary">Cargar instantaneamente las fotografías tomadas por la cámara</string>
-    <string name="prefs_instant_video_upload">Carga automática de video</string>
-    <string name="prefs_instant_video_upload_summary">Cargar instantáneamente los videos grabados por la cámara</string>
-    <string name="prefs_log_title">Habilitar registro</string>
-    <string name="prefs_log_summary">Esto se usa para registrar problemas</string>
-    <string name="prefs_log_title_history">Histórico del registro</string>
-    <string name="prefs_log_summary_history">Esto muestra los registros guardados</string>
     <string name="prefs_log_delete_history_button">Borrar historial</string>
     <string name="prefs_calendar_contacts">Sincronizar calendario  &amp; contactos</string>
     <string name="prefs_calendar_contacts_summary">Configurar DAVdroid (v1.3.0+) para la cuenta actual</string>
@@ -65,8 +56,6 @@
     <string name="prefs_recommend">Recomendar a un amigo</string>
     <string name="prefs_feedback">Retroalimentación</string>
     <string name="prefs_imprint">Excención de responsabilidad </string>
-    <string name="prefs_remember_last_share_location">Recordar la ubicación del elemento compartido</string>
-    <string name="prefs_remember_last_upload_location_summary">Recordar la ubicación del elemento compartido usado más recientemente </string>
 
 	<string name="recommend_subject">Prueba  %1$s en tu teléfono inteligente!</string>
 	<string name="recommend_text">Quisiera invitarte a usar %1$s en tu teléfono inteligente\nDescárgalo aquí: %2$s</string>

src/main/res/values-es/strings.xml

@@ -39,21 +39,11 @@
     <string name="drawer_open">Abrir</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
-    <string name="prefs_accounts">Cuentas</string>
     <string name="prefs_manage_accounts">Gestionar cuentas</string>
     <string name="prefs_passcode">Bloqueo con contraseña</string>
     <string name="prefs_fingerprint">Bloqueo con huella dactilar</string>
     <string name="prefs_fingerprint_notsetup">No se han configurado huellas dactilares</string>
     <string name="prefs_show_hidden_files">Mostrar archivos ocultos</string>
-    <string name="prefs_instant_upload">Subida instantánea de imágenes</string>
-    <string name="prefs_instant_upload_summary">Subir instantáneamente imágenes de la cámara</string>
-    <string name="prefs_instant_video_upload">Subida instantánea de vídeo</string>
-    <string name="prefs_instant_video_upload_summary">Subir instantáneamente vídeos grabados con la cámara</string>
-    <string name="prefs_log_title">Habilitar registro</string>
-    <string name="prefs_log_summary">Esto se usa para registrar problemas</string>
-    <string name="prefs_log_title_history">Historial del registro</string>
-    <string name="prefs_log_summary_history">Esto muestra los registros grabados</string>
-    <string name="prefs_log_delete_history_button">Eliminar historial</string>
     <string name="prefs_calendar_contacts">Sincronizar calendario y contactos</string>
     <string name="prefs_calendar_contacts_summary">Configurar DAVdroid (v1.3.0 +) para la cuenta actual</string>
     <string name="prefs_calendar_contacts_address_resolve_error">DAVdroid no ha podido resolver la dirección del servidor para tu cuenta</string>
@@ -64,8 +54,6 @@
     <string name="prefs_recommend">Recomendar a un amigo</string>
     <string name="prefs_feedback">Observaciones</string>
     <string name="prefs_imprint">Pie de imprenta</string>
-    <string name="prefs_remember_last_share_location">Recordar la localización del compartido</string>
-    <string name="prefs_remember_last_upload_location_summary">Recordar la localización del compartido más recientemente usado</string>
 
 	<string name="recommend_subject">¡Prueba  %1$s en tu smarthphone!</string>
 	<string name="recommend_text">Quiero invitarte a usar %1$s en tu móvil.\nDescárgalo aquí: %2$s</string>

src/main/res/values-fi-rFI/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Avaa</string>
     <string name="prefs_category_general">Yleiset</string>
     <string name="prefs_category_more">Enemmän</string>
-    <string name="prefs_accounts">Tilit</string>
     <string name="prefs_manage_accounts">Tilien hallinta</string>
     <string name="prefs_passcode">Suojakoodilukitus</string>
     <string name="prefs_fingerprint">Sormenjälkilukitus</string>
     <string name="prefs_fingerprint_notsetup">Sormenjälkiä ei ole asetettu</string>
     <string name="prefs_show_hidden_files">Näytä piilotetut tiedostot</string>
-    <string name="prefs_instant_upload">Kuvien välitön lähetys</string>
-    <string name="prefs_instant_upload_summary">Lähetä kameralla otetut kuvat välittömästi</string>
-    <string name="prefs_instant_video_upload">Välittömät videolähetykset</string>
-    <string name="prefs_instant_video_upload_summary">Lähetä kameralla kuvatut videot välittömästi</string>
-    <string name="prefs_log_title">Käytä lokitusta</string>
-    <string name="prefs_log_summary">Tätä käytetään ongelmien lokitukseen</string>
-    <string name="prefs_log_title_history">Lokihistoria</string>
-    <string name="prefs_log_summary_history">Tämä näyttää tallennetut lokit</string>
     <string name="prefs_log_delete_history_button">Poista historia</string>
     <string name="prefs_calendar_contacts">Synkronoi kalenteri &amp; kontaktit</string>
     <string name="prefs_calendar_contacts_summary">Aseta DAVdroid (v1.3.0+) nykyiselle käyttäjälle</string>
@@ -63,8 +54,6 @@
     <string name="prefs_recommend">Suosittele kaverille</string>
     <string name="prefs_feedback">Palaute</string>
     <string name="prefs_imprint">Tiedot</string>
-    <string name="prefs_remember_last_share_location">Muista jaon sijainti</string>
-    <string name="prefs_remember_last_upload_location_summary">Muista jaon sijainti eniten käytetyissä</string>
 
 	<string name="recommend_subject">Kokeile %1$sia älypuhelimellasi!</string>
 	<string name="auth_check_server">Tarkista palvelin</string>

src/main/res/values-fr/strings.xml

@@ -39,21 +39,12 @@
     <string name="drawer_open">Ouvrir</string>
     <string name="prefs_category_general">Général</string>
     <string name="prefs_category_more">Plus</string>
-    <string name="prefs_accounts">Comptes</string>
     <string name="prefs_manage_accounts">Gestion des comptes</string>
     <string name="prefs_passcode">Code de sécurité</string>
     <string name="prefs_fingerprint">Verrouillage par empreinte digitale</string>
     <string name="prefs_fingerprint_notsetup">Aucune empreinte digitale n\'a été installée.</string>
     <string name="prefs_expert_mode">Mode Expert</string>
     <string name="prefs_show_hidden_files">Afficher les fichiers masqués</string>
-    <string name="prefs_instant_upload">Téléversements immédiats de photos</string>
-    <string name="prefs_instant_upload_summary">Téléverser immédiatement les photos prises par l\'appareil photo</string>
-    <string name="prefs_instant_video_upload">Téléversements immédiats de vidéos</string>
-    <string name="prefs_instant_video_upload_summary">Téléverser immédiatement les vidéos prises par l\'appareil photo</string>
-    <string name="prefs_log_title">Activer la journalisation</string>
-    <string name="prefs_log_summary">Cela est utilisé pour la journalisation des problèmes</string>
-    <string name="prefs_log_title_history">Historique de la journalisation</string>
-    <string name="prefs_log_summary_history">Cela affiche les logs enregistrés</string>
     <string name="prefs_log_delete_history_button">Effacer le journal</string>
     <string name="prefs_calendar_contacts">Configurer la synchronisation de l\'agenda et des contacts</string>
     <string name="prefs_calendar_contacts_summary">Configurer DAVdroid (v1.3.0+) pour le compte actuel</string>
@@ -65,8 +56,6 @@
     <string name="prefs_recommend">Recommander à un ami</string>
     <string name="prefs_feedback">Nous contacter par mail</string>
     <string name="prefs_imprint">Mentions</string>
-    <string name="prefs_remember_last_share_location">Mémoriser l\'emplacement de partage</string>
-    <string name="prefs_remember_last_upload_location_summary">Mémoriser le dernier emplacement de téléversement</string>
 
 	<string name="recommend_subject">Essayez %1$s sur votre smartphone !</string>
 	<string name="recommend_text">J\'aimerais vous inviter à utiliser %1$s sur votre smartphone.\nTéléchargez-la ici : %2$s.</string>

src/main/res/values-he/strings.xml

@@ -19,14 +19,9 @@
     <string name="drawer_open">פתיחה</string>
     <string name="prefs_category_general">כללי</string>
     <string name="prefs_category_more">יותר</string>
-    <string name="prefs_accounts">חשבונות</string>
     <string name="prefs_manage_accounts">ניהול חשבונות</string>
     <string name="prefs_passcode">נעילת סיסמא</string>
     <string name="prefs_show_hidden_files">הצגת קבצים נסתרים</string>
-    <string name="prefs_log_title">מאפשר התחברות</string>
-    <string name="prefs_log_summary">משמש לתיעוד בעיות</string>
-    <string name="prefs_log_title_history">הסטורית התחברות</string>
-    <string name="prefs_log_summary_history">מראה את יומני התעוד</string>
     <string name="prefs_log_delete_history_button">מחיקת הסטוריה</string>
     <string name="prefs_help">עזרה</string>
     <string name="prefs_feedback">משוב</string>

src/main/res/values-hu-rHU/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Megnyitás</string>
     <string name="prefs_category_general">Általános</string>
     <string name="prefs_category_more">Több</string>
-    <string name="prefs_accounts">Fiókok</string>
     <string name="prefs_manage_accounts">Fiókok kezelése</string>
     <string name="prefs_passcode">Számkódos lezárás</string>
     <string name="prefs_fingerprint">Lezárás Újjlenyomattal</string>
     <string name="prefs_fingerprint_notsetup">Nincs újjlenyomat beállítva.</string>
     <string name="prefs_show_hidden_files">Rejtett fájlok megjelenítése</string>
-    <string name="prefs_instant_upload">Képek azonnali feltöltése</string>
-    <string name="prefs_instant_upload_summary">Kamerával rögzített képek azonnali feltöltése</string>
-    <string name="prefs_instant_video_upload">Videó azonnali feltöltése</string>
-    <string name="prefs_instant_video_upload_summary">Kamerával rögzített videók azonnali feltöltése</string>
-    <string name="prefs_log_title">Naplózás engedélyezése</string>
-    <string name="prefs_log_summary">Ez használható a problémák naplózásához</string>
-    <string name="prefs_log_title_history">Naplózás előzménye</string>
-    <string name="prefs_log_summary_history">Ez megjeleníti a rögzített eseményeket</string>
     <string name="prefs_log_delete_history_button">Előzmények törlése</string>
     <string name="prefs_calendar_contacts">Naptár és Névjegyek szinkronizálása</string>
     <string name="prefs_calendar_contacts_summary">DAVdroid (v1.3.0+) beállítása a fiókhoz</string>
@@ -63,8 +54,6 @@
     <string name="prefs_recommend">Ajánlás egy barátnak</string>
     <string name="prefs_feedback">Visszajelzés</string>
     <string name="prefs_imprint">Impresszum</string>
-    <string name="prefs_remember_last_share_location">Emlékezzen a megosztás helyére</string>
-    <string name="prefs_remember_last_upload_location_summary">Emlékezzen a legutoljára használt megosztás helyére</string>
 
 	<string name="recommend_subject">Próbáld ki a %1$s-ot az okostelefonodon!</string>
 	<string name="recommend_text">Szeretnélek meghívni, hogy használd a %1$s-et az okostelefonodon.\nLetöltés itt:ˇ%2$s</string>

src/main/res/values-id/strings.xml

@@ -21,14 +21,9 @@
     <string name="drawer_open">Buka</string>
     <string name="prefs_category_general">Umum</string>
     <string name="prefs_category_more">Lainnya</string>
-    <string name="prefs_accounts">Akun</string>
     <string name="prefs_manage_accounts">Kelola akun</string>
     <string name="prefs_passcode">Kunci kode sandi</string>
     <string name="prefs_show_hidden_files">Lihat berkas tersembunyi</string>
-    <string name="prefs_log_title">Aktifkan pencatatan</string>
-    <string name="prefs_log_summary">Ini digunakan untuk mencatat masalah</string>
-    <string name="prefs_log_title_history">Sejarah pencatatan</string>
-    <string name="prefs_log_summary_history">Ini menampilkan catatan yang disimpan</string>
     <string name="prefs_log_delete_history_button">Hapus riwayat</string>
     <string name="prefs_calendar_contacts">Sinkronkan kalender &amp; kontak</string>
     <string name="prefs_calendar_contacts_summary">Atur DAVdroid (v1.3.0+) untuk akun saat ini</string>

src/main/res/values-is/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Opna</string>
     <string name="prefs_category_general">Almennt</string>
     <string name="prefs_category_more">Meira</string>
-    <string name="prefs_accounts">Notandaaðgangar</string>
     <string name="prefs_manage_accounts">Sýsla með notandaaðganga</string>
     <string name="prefs_passcode">Læsing með lykilkóða</string>
     <string name="prefs_fingerprint">Fingrafaralás</string>
     <string name="prefs_fingerprint_notsetup">Engin fingraför hafa verið sett inn.</string>
     <string name="prefs_show_hidden_files">Sýna faldar skrár</string>
-    <string name="prefs_instant_upload">Bein innsending á myndum</string>
-    <string name="prefs_instant_upload_summary">Senda beint inn myndir sem teknar eru með myndavél</string>
-    <string name="prefs_instant_video_upload">Bein innsending á myndskeiðum</string>
-    <string name="prefs_instant_video_upload_summary">Senda beint inn myndskeið sem tekin eru með myndavél</string>
-    <string name="prefs_log_title">Virkja skráningu í annál</string>
-    <string name="prefs_log_summary">Þetta er notað til að skrá vandamál</string>
-    <string name="prefs_log_title_history">Ferill annálsskráningar</string>
-    <string name="prefs_log_summary_history">Þetta sýnir skráningar í atvikaskrár</string>
     <string name="prefs_log_delete_history_button">Eyða ferli</string>
     <string name="prefs_calendar_contacts">Samstilla dagatal &amp; tengiliði</string>
     <string name="prefs_calendar_contacts_summary">Setja upp DAVdroid (v1.3.0+) fyrir þennan aðgang</string>
@@ -64,8 +55,6 @@
     <string name="prefs_recommend">Mæla með við vin</string>
     <string name="prefs_feedback">Umsögn</string>
     <string name="prefs_imprint">Prenta</string>
-    <string name="prefs_remember_last_share_location">Muna staðsetningu sameignar</string>
-    <string name="prefs_remember_last_upload_location_summary">Muna staðsetningu síðast notuðu sameignar</string>
 
 	<string name="recommend_subject">Prófaðu %1$s á snjallsímanum þínum!</string>
 	<string name="recommend_text">Mig langar til að bjóða þér að nota %1$s á snjallsímanum þínum.\nHægt að sækja það hér: %2$s</string>

src/main/res/values-it/strings.xml

@@ -38,20 +38,11 @@
     <string name="drawer_open">Apri</string>
     <string name="prefs_category_general">Generale</string>
     <string name="prefs_category_more">Altro</string>
-    <string name="prefs_accounts">Account</string>
     <string name="prefs_manage_accounts">Gestisci account</string>
     <string name="prefs_passcode">Blocco con codice di sicurezza</string>
     <string name="prefs_fingerprint">Blocco con impronta digitale</string>
     <string name="prefs_fingerprint_notsetup">Non è stata impostata alcuna impronta digitale</string>
     <string name="prefs_show_hidden_files">Mostra i file nascosti</string>
-    <string name="prefs_instant_upload">Caricamenti istantanei delle immagini</string>
-    <string name="prefs_instant_upload_summary">Carica immediatamente le immagini scattate dalla fotocamera</string>
-    <string name="prefs_instant_video_upload">Caricamenti istantanei dei video</string>
-    <string name="prefs_instant_video_upload_summary">Carica immediatamente i video registrati dalla fotocamera</string>
-    <string name="prefs_log_title">Abilita la registrazione</string>
-    <string name="prefs_log_summary">Usato per registrare i problemi nei log</string>
-    <string name="prefs_log_title_history">Cronologia di registrazione</string>
-    <string name="prefs_log_summary_history">Mostra i log registrati</string>
     <string name="prefs_log_delete_history_button">Elimina cronologia</string>
     <string name="prefs_calendar_contacts">Sincronizza calendario e contatti</string>
     <string name="prefs_calendar_contacts_summary">Configura DAVdroid (v1.3.0+) per l\'account corrente</string>

src/main/res/values-ja-rJP/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">開く</string>
     <string name="prefs_category_general">一般</string>
     <string name="prefs_category_more">もっと見る</string>
-    <string name="prefs_accounts">アカウント</string>
     <string name="prefs_manage_accounts">アカウント管理</string>
     <string name="prefs_passcode">パスコードロック</string>
     <string name="prefs_fingerprint">指紋ロック</string>
     <string name="prefs_fingerprint_notsetup">指紋は設定されていません。</string>
     <string name="prefs_show_hidden_files">隠しファイルを表示</string>
-    <string name="prefs_instant_upload">写真の自動アップロード</string>
-    <string name="prefs_instant_upload_summary">カメラで撮影した写真を自動アップロードします</string>
-    <string name="prefs_instant_video_upload">ビデオの自動アップロード</string>
-    <string name="prefs_instant_video_upload_summary">カメラで撮影したビデオを自動アップロードします</string>
-    <string name="prefs_log_title">ログの有効化</string>
-    <string name="prefs_log_summary">これは問題をログに記録するのに使用します。</string>
-    <string name="prefs_log_title_history">ログの履歴</string>
-    <string name="prefs_log_summary_history">これは記録されたログを表示します</string>
     <string name="prefs_log_delete_history_button">履歴の削除</string>
     <string name="prefs_calendar_contacts">コンタクト &amp; カレンダーを同期</string>
     <string name="prefs_calendar_contacts_summary">DAVdroid (v1.3.0以上) を現在のアカウントで使う</string>
@@ -63,8 +54,6 @@
     <string name="prefs_recommend">友達に推奨</string>
     <string name="prefs_feedback">フィードバック</string>
     <string name="prefs_imprint">インプリント</string>
-    <string name="prefs_remember_last_share_location">共有場所を記憶する</string>
-    <string name="prefs_remember_last_upload_location_summary">最後に使用した共有場所を記憶する</string>
 
 	<string name="recommend_subject">スマートフォンで %1$s を試してください！</string>
 	<string name="recommend_text">スマートフォンで %1$s を利用してみませんか。\nここからダウンロードしてください: %2$s</string>

src/main/res/values-ko/strings.xml

@@ -39,28 +39,17 @@
     <string name="drawer_open">열기</string>
     <string name="prefs_category_general">일반</string>
     <string name="prefs_category_more">더 보기</string>
-    <string name="prefs_accounts">계정</string>
     <string name="prefs_manage_accounts">계정 관리</string>
     <string name="prefs_passcode">암호 잠금</string>
     <string name="prefs_fingerprint">지문 잠금</string>
     <string name="prefs_fingerprint_notsetup">설정된 지문이 없습니다.</string>
     <string name="prefs_show_hidden_files">숨겨진 파일보기</string>
-    <string name="prefs_instant_upload">사진 즉시 업로드</string>
-    <string name="prefs_instant_upload_summary">카메라로 촬영된 사진 즉시 업로드</string>
-    <string name="prefs_instant_video_upload">비디오 즉시 업로드</string>
-    <string name="prefs_instant_video_upload_summary">카메라로 녹화된 비디오 즉시 업로드</string>
-    <string name="prefs_log_title">로깅 사용</string>
-    <string name="prefs_log_summary">문제점을 기록하는 데 사용됩니다</string>
-    <string name="prefs_log_title_history">로깅 내역</string>
-    <string name="prefs_log_summary_history">여기서 기록된 로그를 보여줍니다</string>
     <string name="prefs_log_delete_history_button">내역 삭제</string>
     <string name="prefs_calendar_contacts_no_store_error">F-droid 나 Google Play 가 설치되어 있지 않습니다.</string>
     <string name="prefs_help">도움말</string>
     <string name="prefs_recommend">친구에게 추천하기</string>
     <string name="prefs_feedback">피드백</string>
     <string name="prefs_imprint">법적 고지</string>
-    <string name="prefs_remember_last_share_location">공유 위치 기억하기</string>
-    <string name="prefs_remember_last_upload_location_summary">가장 최근 사용된 공유 위치 기억하기</string>
 
 	<string name="recommend_subject">%1$s을(를) 스마트폰에서 사용해 보세요!</string>
 	<string name="auth_check_server">서버 확인</string>

src/main/res/values-lv/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Atvērt</string>
     <string name="prefs_category_general">Vispārīgi</string>
     <string name="prefs_category_more">Vairāk</string>
-    <string name="prefs_accounts">Konti</string>
     <string name="prefs_manage_accounts">Pārvaldīt kontus</string>
     <string name="prefs_passcode">Kods bloķēts</string>
     <string name="prefs_fingerprint">Pirkstu nospiedoma aizslēģšana</string>
     <string name="prefs_fingerprint_notsetup">Nav uzstādīti pirkstu nospiedumi</string>
     <string name="prefs_show_hidden_files">Rādīt slēptās datnes</string>
-    <string name="prefs_instant_upload">Tūlītēja attēlu augšupielāde</string>
-    <string name="prefs_instant_upload_summary">Augšupielādēd attēlus no kameras tūlītēji</string>
-    <string name="prefs_instant_video_upload">Tūlītēja video augšupielāde</string>
-    <string name="prefs_instant_video_upload_summary">Augšupielādēd video no kameras tūlītēji</string>
-    <string name="prefs_log_title">Iespējot žurnālu</string>
-    <string name="prefs_log_summary">Šo lieto lai ierakstītu informāciju par problēmām</string>
-    <string name="prefs_log_title_history">Žurnāla vēsture</string>
-    <string name="prefs_log_summary_history">Šis parāda ierakstu žurnālu</string>
     <string name="prefs_log_delete_history_button">Dzēst vēsturi</string>
     <string name="prefs_calendar_contacts">Sinhronizēt kalendāra &amp; kontaktus</string>
     <string name="prefs_calendar_contacts_summary">Kontam iestatīt DAVdroid (v1.3.0+)</string>

src/main/res/values-nb-rNO/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Åpne</string>
     <string name="prefs_category_general">Generelt</string>
     <string name="prefs_category_more">Mer</string>
-    <string name="prefs_accounts">Kontoer</string>
     <string name="prefs_manage_accounts">Håndter kontoer</string>
     <string name="prefs_passcode">Passordlås</string>
     <string name="prefs_fingerprint">Fingeravtrykkslås</string>
     <string name="prefs_fingerprint_notsetup">Det har ikke blitt satt opp noen fingeravtrykk.</string>
     <string name="prefs_show_hidden_files">Vis skjulte filer</string>
-    <string name="prefs_instant_upload">Umiddelbar opplasting av bilder</string>
-    <string name="prefs_instant_upload_summary">Last opp bilder tatt med kameraet med én gang</string>
-    <string name="prefs_instant_video_upload">Umiddelbar opplasting av video</string>
-    <string name="prefs_instant_video_upload_summary">Last opp videoer tatt med kameraet med én gang</string>
-    <string name="prefs_log_title">Aktiver loggføring</string>
-    <string name="prefs_log_summary">Denne er brukt til å loggføre problemer</string>
-    <string name="prefs_log_title_history">Loggføringshistorikk</string>
-    <string name="prefs_log_summary_history">Denne viser de lagrede loggene</string>
     <string name="prefs_log_delete_history_button">Slett historikk</string>
     <string name="prefs_calendar_contacts">Synkroniser kalender &amp; kontakter</string>
     <string name="prefs_calendar_contacts_summary">Sett opp DAVdroid (v1.3.0+) for nåværende konto</string>
@@ -64,8 +55,6 @@
     <string name="prefs_recommend">Anbefal til en venn</string>
     <string name="prefs_feedback">Tilbakemelding</string>
     <string name="prefs_imprint">Avtrykk</string>
-    <string name="prefs_remember_last_share_location">Husk delt plassering</string>
-    <string name="prefs_remember_last_upload_location_summary">Husk sist delt plassering for opplasting</string>
 
 	<string name="recommend_subject">Prøv %1$s på smarttelefonen din!</string>
 	<string name="recommend_text">Jeg ønsker å invitere deg til å bruke %1$s på smarttelefonen din!\nLast ned her: %2$s</string>

src/main/res/values-nl/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Openen</string>
     <string name="prefs_category_general">Algemeen</string>
     <string name="prefs_category_more">Meer</string>
-    <string name="prefs_accounts">Accounts</string>
     <string name="prefs_manage_accounts">Accounts beheren</string>
     <string name="prefs_passcode">Toegangscode</string>
     <string name="prefs_fingerprint">Vingerafdrukbeveiliging</string>
     <string name="prefs_fingerprint_notsetup">Er zijn geen vingerafdrukken ingesteld.</string>
     <string name="prefs_show_hidden_files">Verborgen bestanden weergeven</string>
-    <string name="prefs_instant_upload">Directe upload van afbeeldingen</string>
-    <string name="prefs_instant_upload_summary">Direct afbeeldingen vanaf camera uploaden</string>
-    <string name="prefs_instant_video_upload">Directe upload van video\'s</string>
-    <string name="prefs_instant_video_upload_summary">Direct vanaf de camera uploaden video\'s</string>
-    <string name="prefs_log_title">Logging inschakelen</string>
-    <string name="prefs_log_summary">Dit wordt gebruikt om problemen te loggen.</string>
-    <string name="prefs_log_title_history">Logging-geschiedenis</string>
-    <string name="prefs_log_summary_history">Dit toont de bijgehouden logs</string>
     <string name="prefs_log_delete_history_button">Verwijder geschiedenis</string>
     <string name="prefs_calendar_contacts">Synchroniseren agenda &amp; contactpersonen</string>
     <string name="prefs_calendar_contacts_summary">DAVdroid (v1.3.0+) voor huidige account instellen</string>
@@ -63,8 +54,6 @@
     <string name="prefs_recommend">Aanbevelen bij vriend</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">afdruk</string>
-    <string name="prefs_remember_last_share_location">Onthoud de share locatie</string>
-    <string name="prefs_remember_last_upload_location_summary">Onthoud de laatst gebruikte share locatie</string>
 
 	<string name="recommend_subject">Probeer %1$s op je smartphone!</string>
 	<string name="recommend_text">Ik wil je uitnodigen om %1$s op je smartphone te gebruiken.\nDownload hier: %2$s</string>

src/main/res/values-pl/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Otwórz</string>
     <string name="prefs_category_general">Ogólne</string>
     <string name="prefs_category_more">Więcej</string>
-    <string name="prefs_accounts">Konta</string>
     <string name="prefs_manage_accounts">Zarządzaj kontami</string>
     <string name="prefs_passcode">Blokada kodem PIN</string>
     <string name="prefs_fingerprint">Blokada odciskiem palca</string>
     <string name="prefs_fingerprint_notsetup">Brak skonfigurowanych odcisków palców</string>
     <string name="prefs_show_hidden_files">Pokaż ukryte pliki</string>
-    <string name="prefs_instant_upload">Natychmiastowe wysyłanie zdjęć</string>
-    <string name="prefs_instant_upload_summary">Wyślij zdjęcia z aparatu</string>
-    <string name="prefs_instant_video_upload">Natychmiastowe wysyłanie wideo</string>
-    <string name="prefs_instant_video_upload_summary">Wyślij filmy nagrane aparatem</string>
-    <string name="prefs_log_title">Włącz logowanie</string>
-    <string name="prefs_log_summary">To jest używane do logowania problemów</string>
-    <string name="prefs_log_title_history">Historia logowania</string>
-    <string name="prefs_log_summary_history">To pokazuje zapisane logi</string>
     <string name="prefs_log_delete_history_button">Wyczyść historię</string>
     <string name="prefs_calendar_contacts">Synchronizuj kalendarz i kontakty</string>
     <string name="prefs_calendar_contacts_summary">Skonfiguruj DAVdroid (v1.3.0+) dla obecnego konta</string>
@@ -63,8 +54,6 @@
     <string name="prefs_recommend">Poleć znajomemu</string>
     <string name="prefs_feedback">Opinie</string>
     <string name="prefs_imprint">Stopka</string>
-    <string name="prefs_remember_last_share_location">Zapamiętaj położenie udostępnienia</string>
-    <string name="prefs_remember_last_upload_location_summary">Zapamiętaj ostatnią lokalizację wysyłania</string>
 
 	<string name="recommend_subject">Wypróbuj %1$s na swoim smartfonie!</string>
 	<string name="recommend_text">Zapraszam do użycia %1$s na swoim smartfonie!\nŚciągnij tutaj: %2$s</string>

src/main/res/values-pt-rBR/strings.xml

@@ -39,21 +39,12 @@
     <string name="drawer_open">Abrir</string>
     <string name="prefs_category_general">Geral</string>
     <string name="prefs_category_more">Mais</string>
-    <string name="prefs_accounts">Contas</string>
     <string name="prefs_manage_accounts">Gerenciar contas</string>
     <string name="prefs_passcode">Bloqueio de código de acesso</string>
     <string name="prefs_fingerprint">Bloqueio por impressão digital</string>
     <string name="prefs_fingerprint_notsetup">Nenhuma impressão digital foi configurada.</string>
     <string name="prefs_expert_mode">Modo avançado</string>
     <string name="prefs_show_hidden_files">Mostrar arquivos ocultos</string>
-    <string name="prefs_instant_upload">Envio automático de imagens</string>
-    <string name="prefs_instant_upload_summary">Enviar automaticamente as imagens tiradas pela câmera</string>
-    <string name="prefs_instant_video_upload">Envio automático de vídeos.</string>
-    <string name="prefs_instant_video_upload_summary">Enviar automaticamente os vídeos gravados pela câmera</string>
-    <string name="prefs_log_title">Habilitar login</string>
-    <string name="prefs_log_summary">Usado para registrar problemas</string>
-    <string name="prefs_log_title_history">Histórico de logins</string>
-    <string name="prefs_log_summary_history">Mostra os registros gravados</string>
     <string name="prefs_log_delete_history_button">Eliminar histórico</string>
     <string name="prefs_calendar_contacts">sincronizar calendário &amp; contatos</string>
     <string name="prefs_calendar_contacts_summary">Configurar o DAVdroid (v1.3.0+) para a conta em uso</string>
@@ -65,8 +56,6 @@
     <string name="prefs_recommend">Recomendar a um amigo</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprimir</string>
-    <string name="prefs_remember_last_share_location">Lembrar localização do compartilhamento</string>
-    <string name="prefs_remember_last_upload_location_summary">Lembrar localização do compartilhamento usado mais recentemente</string>
 
 	<string name="recommend_subject">Tentar %1$s em seu smartfone!</string>
 	<string name="recommend_text">Quero convidar você a usar %1$s em seu smartphone.\nBaixe daqui: %2$s</string>

src/main/res/values-pt-rPT/strings.xml

@@ -21,14 +21,9 @@
     <string name="drawer_open">Abrir</string>
     <string name="prefs_category_general">Geral</string>
     <string name="prefs_category_more">Mais</string>
-    <string name="prefs_accounts">Contas</string>
     <string name="prefs_manage_accounts">Gerir contas</string>
     <string name="prefs_passcode">Proteção por código</string>
     <string name="prefs_show_hidden_files">Mostrar ficheiros escondidos</string>
-    <string name="prefs_log_title">Ativar registo de alterações</string>
-    <string name="prefs_log_summary">É utilizado para registar problemas</string>
-    <string name="prefs_log_title_history">Histórico de registos de alterações</string>
-    <string name="prefs_log_summary_history">Isto mostra os registos de alterações guardados</string>
     <string name="prefs_log_delete_history_button">Eliminar histórico</string>
     <string name="prefs_calendar_contacts">Sincronizar calendário e contacots</string>
     <string name="prefs_calendar_contacts_summary">Preparar DAVdroid (v1.3.0+) para a conta actual</string>

src/main/res/values-ro/strings.xml

@@ -38,14 +38,9 @@
     <string name="drawer_open">Deschide</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Mai mult</string>
-    <string name="prefs_accounts">Conturi</string>
     <string name="prefs_manage_accounts">Administrare conturi</string>
     <string name="prefs_passcode">Parolă blocare</string>
     <string name="prefs_show_hidden_files">Arată fișierele ascunse</string>
-    <string name="prefs_log_title">Activează înregistrarea / jurnalizarea activităților</string>
-    <string name="prefs_log_summary">Acesta este folosit pentru a înregistra problemele</string>
-    <string name="prefs_log_title_history">Istoric activități jurnalizate</string>
-    <string name="prefs_log_summary_history">Asta arată înregistrările salvate</string>
     <string name="prefs_log_delete_history_button">Șterge istoricul</string>
     <string name="prefs_calendar_contacts">Sincronizați calendarul și contactele</string>
     <string name="prefs_calendar_contacts_summary">Setează DAVdroid (v1.3.0+) pentru acest cont</string>

src/main/res/values-ru/strings.xml

@@ -40,20 +40,11 @@
     <string name="drawer_open">Открыть</string>
     <string name="prefs_category_general">Основные</string>
     <string name="prefs_category_more">Больше</string>
-    <string name="prefs_accounts">Аккаунты</string>
     <string name="prefs_manage_accounts">Управление аккаунтами</string>
     <string name="prefs_passcode">Блокировка кодом</string>
     <string name="prefs_fingerprint">Блокировка отпечатком пальца</string>
     <string name="prefs_fingerprint_notsetup">Отпечатки не были настроены.</string>
     <string name="prefs_show_hidden_files">Показывать скрытые файлы</string>
-    <string name="prefs_instant_upload">Моментальная загрузка изображений</string>
-    <string name="prefs_instant_upload_summary">Немедленно загружать изображения, сделанные камерой</string>
-    <string name="prefs_instant_video_upload">Моментальная загрузка видео</string>
-    <string name="prefs_instant_video_upload_summary">Немедленно загружать видео, сделанные камерой</string>
-    <string name="prefs_log_title">Включить журналирование</string>
-    <string name="prefs_log_summary">Используется для регистрации ошибок</string>
-    <string name="prefs_log_title_history">История журналирования</string>
-    <string name="prefs_log_summary_history">Здесь показаны записи в журнал</string>
     <string name="prefs_log_delete_history_button">Удалить историю</string>
     <string name="prefs_calendar_contacts">Синхронизировать календарь и контакты</string>
     <string name="prefs_calendar_contacts_summary">Настроить DAVdroid (v1.3.0+) для текущего аккаунта</string>
@@ -65,8 +56,6 @@
     <string name="prefs_recommend">Рекомендовать другу</string>
     <string name="prefs_feedback">Обратная связь</string>
     <string name="prefs_imprint">Отпечаток</string>
-    <string name="prefs_remember_last_share_location">Запомнить расположение общего ресурса</string>
-    <string name="prefs_remember_last_upload_location_summary">Запомнить расположение загрузки последней публикации</string>
 
 	<string name="recommend_subject">Попробуйте %1$s на вашем смартфоне!</string>
 	<string name="recommend_text">Хочу предложить вам использовать %1$s на смартфоне!\nЗагрузить можно здесь: %2$s

src/main/res/values-sk-rSK/strings.xml

@@ -29,14 +29,9 @@
     <string name="drawer_open">Otvoriť</string>
     <string name="prefs_category_general">Všeobecné</string>
     <string name="prefs_category_more">Viac</string>
-    <string name="prefs_accounts">Účty</string>
     <string name="prefs_manage_accounts">Správa účtov</string>
     <string name="prefs_passcode">Heslo</string>
     <string name="prefs_show_hidden_files">Zobraziť skryté súbory</string>
-    <string name="prefs_log_title">Povoliť logovanie</string>
-    <string name="prefs_log_summary">Toto je použité pre logovanie problémov</string>
-    <string name="prefs_log_title_history">História logovania</string>
-    <string name="prefs_log_summary_history">Toto zobrazuje zaznamenané logy</string>
     <string name="prefs_log_delete_history_button">Vymazať históriu</string>
     <string name="prefs_calendar_contacts">Synchronizovať kalendár a kontakty</string>
     <string name="prefs_calendar_contacts_summary">Nastaviť DAVdroid (v1.3.0+) pre tento účet</string>

src/main/res/values-sl/strings.xml

@@ -39,18 +39,11 @@
     <string name="drawer_open">Odpri</string>
     <string name="prefs_category_general">Splošno</string>
     <string name="prefs_category_more">Več</string>
-    <string name="prefs_accounts">Računi</string>
     <string name="prefs_manage_accounts">Upravljanje z računi</string>
     <string name="prefs_passcode">Zakleni dostop s kodo PIN</string>
     <string name="prefs_fingerprint">Ključavnica na prstni odtis</string>
     <string name="prefs_fingerprint_notsetup">Prstni odtis ni nasavljen.</string>
     <string name="prefs_show_hidden_files">Prikaži skrite datoteke</string>
-    <string name="prefs_instant_upload">Takojšnje nalaganje slik</string>
-    <string name="prefs_instant_video_upload">Takojšnje nalaganje posnetkov</string>
-    <string name="prefs_log_title">Omogoči beleženje</string>
-    <string name="prefs_log_summary">Uporablja se za beleženje težav in napak</string>
-    <string name="prefs_log_title_history">Zgodovina beleženja</string>
-    <string name="prefs_log_summary_history">Pokaže shranjene dnevnike</string>
     <string name="prefs_log_delete_history_button">Izbriši zgodovino</string>
     <string name="prefs_calendar_contacts">Nastavi sinhronizacijo koledarja in kontaktov</string>
     <string name="prefs_calendar_contacts_summary">Nastavi DAVdroid (v1.3.0+) za trenutno uporabljen račun</string>

src/main/res/values-sq/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Hape</string>
     <string name="prefs_category_general">Të përgjithshme</string>
     <string name="prefs_category_more">Më tepër</string>
-    <string name="prefs_accounts">Llogaritë</string>
     <string name="prefs_manage_accounts">Administroni llogaritë</string>
     <string name="prefs_passcode">Kyçje kodkalimi</string>
     <string name="prefs_fingerprint">Kyçuni me shenjat e gishtave</string>
     <string name="prefs_fingerprint_notsetup">Shenjat e gishtave nuk janë vendosur</string>
     <string name="prefs_show_hidden_files">Trego skedarët e fshehur</string>
-    <string name="prefs_instant_upload">Ngarkim i menjëhershëm i fotove</string>
-    <string name="prefs_instant_upload_summary">Ngarkoni menjëherë fotot e bëra nga aparati </string>
-    <string name="prefs_instant_video_upload">Ngarkim i menjëhershëm videoje</string>
-    <string name="prefs_instant_video_upload_summary">Ngarkoni video të sapo bëra nga aparati</string>
-    <string name="prefs_log_title">Aktivizoni regjistrimet</string>
-    <string name="prefs_log_summary">Kjo përdoret për të regjistruar probleme</string>
-    <string name="prefs_log_title_history">Historiku i regjistrimeve</string>
-    <string name="prefs_log_summary_history">Kjo shfaq regjistrimet e bëra</string>
     <string name="prefs_log_delete_history_button">Fshini historikun</string>
     <string name="prefs_calendar_contacts">Sinkronizoni kalendarin &amp; kontaktet</string>
     <string name="prefs_calendar_contacts_summary">Vendos DAVdroid (v1.3.0+)  për llogarinë aktuale</string>
@@ -64,8 +55,6 @@
     <string name="prefs_recommend">Rekomandojani një miku </string>
     <string name="prefs_feedback">Përshtypje</string>
     <string name="prefs_imprint">Imprint</string>
-    <string name="prefs_remember_last_share_location">Mbaj mend vendin e shpërndarjes</string>
-    <string name="prefs_remember_last_upload_location_summary">Mbaj mend vendin e shpërndarjes së përdorur së fundmi</string>
 
 	<string name="recommend_subject">Provojeni %1$s te telefoni juaj!</string>
 	<string name="recommend_text">Dua t’ju ftoj të përdorni %1$s në telefonin tuaj!\nShkarko këtu: %2$s</string>

src/main/res/values-sr/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Отвори</string>
     <string name="prefs_category_general">Опште</string>
     <string name="prefs_category_more">Остало</string>
-    <string name="prefs_accounts">Налози</string>
     <string name="prefs_manage_accounts">Управљање налозима</string>
     <string name="prefs_passcode">Закључавање кодом</string>
     <string name="prefs_fingerprint">Закључавање отиском прста</string>
     <string name="prefs_fingerprint_notsetup">Отисак прста није подешен.</string>
     <string name="prefs_show_hidden_files">Покажи скривене датотеке</string>
-    <string name="prefs_instant_upload">Тренутно отпремање фотографија</string>
-    <string name="prefs_instant_upload_summary">Тренутно отпремај фотографије усликане камером</string>
-    <string name="prefs_instant_video_upload">Тренутно отпремање видеа</string>
-    <string name="prefs_instant_video_upload_summary">Тренутно отпремај видео снимљен камером</string>
-    <string name="prefs_log_title">Укључи бележење</string>
-    <string name="prefs_log_summary">користи се за бележење проблема</string>
-    <string name="prefs_log_title_history">Историјат бележења</string>
-    <string name="prefs_log_summary_history">Ово приказује сачуване записнике</string>
     <string name="prefs_log_delete_history_button">Обриши историјат</string>
     <string name="prefs_calendar_contacts">Синхронизуј календар &amp; контакте</string>
     <string name="prefs_calendar_contacts_summary">Подеси DAVdroid (v1.3.0+) за тренутни налог</string>
@@ -63,8 +54,6 @@
     <string name="prefs_recommend">Препоручите пријатељу</string>
     <string name="prefs_feedback">Ваше мишљење</string>
     <string name="prefs_imprint">Жиг</string>
-    <string name="prefs_remember_last_share_location">Запамти локацију дељења</string>
-    <string name="prefs_remember_last_upload_location_summary">Запамти локацију скорашњег дељења</string>
 
 	<string name="recommend_subject">Пробајте %1$s на вашем телефону!</string>
 	<string name="recommend_text">Позивам те да користиш%1$s на твом телефону.\nПреузмите овде:%2$s</string>

src/main/res/values-sv/strings.xml

@@ -29,16 +29,9 @@
     <string name="drawer_open">Öppna</string>
     <string name="prefs_category_general">Allmänt</string>
     <string name="prefs_category_more">Mer</string>
-    <string name="prefs_accounts">Konton</string>
     <string name="prefs_manage_accounts">Hantera konton</string>
     <string name="prefs_passcode">Lösenordslås</string>
     <string name="prefs_show_hidden_files">Visa dolda filer</string>
-    <string name="prefs_instant_upload">Automatisk uppladdning av bilder</string>
-    <string name="prefs_instant_video_upload">Automatisk uppladdning av video</string>
-    <string name="prefs_log_title">Aktivera loggning</string>
-    <string name="prefs_log_summary">Används för att logga problem</string>
-    <string name="prefs_log_title_history">Logghistorik</string>
-    <string name="prefs_log_summary_history">Visar sparade loggar</string>
     <string name="prefs_log_delete_history_button">Radera historik</string>
     <string name="prefs_calendar_contacts">Synkronisera kalender &amp; kontakter</string>
     <string name="prefs_calendar_contacts_summary">Sätt upp DAVdroid (v1.3.0+) för nuvarande konto</string>

src/main/res/values-tr/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">Aç</string>
     <string name="prefs_category_general">Genel</string>
     <string name="prefs_category_more">Daha fazla</string>
-    <string name="prefs_accounts">Hesaplar</string>
     <string name="prefs_manage_accounts">Hesap yönetimi</string>
     <string name="prefs_passcode">Parola kod kilidi</string>
     <string name="prefs_fingerprint">Parmak izi kilidi</string>
     <string name="prefs_fingerprint_notsetup">Henüz bir parmak izi ayarlanmamış.</string>
     <string name="prefs_show_hidden_files">Gizli dosyaları görüntüle</string>
-    <string name="prefs_instant_upload">Anında fotoğraf yükleme</string>
-    <string name="prefs_instant_upload_summary">Kamera ile çekilen fotoğraflar anında yüklenir</string>
-    <string name="prefs_instant_video_upload">Anında görüntü yükleme</string>
-    <string name="prefs_instant_video_upload_summary">Kamera ile çekilen görüntüler anında yüklenir</string>
-    <string name="prefs_log_title">Günlük kullanılsın</string>
-    <string name="prefs_log_summary">Etkinleştirildiğinde sorunlar günlük dosyasına kaydedilir</string>
-    <string name="prefs_log_title_history">Günlük geçmişi</string>
-    <string name="prefs_log_summary_history">Günlük kayıtlarını görüntüler</string>
     <string name="prefs_log_delete_history_button">Geçmişi sil</string>
     <string name="prefs_calendar_contacts">Takvim ve kişiler eşitlensin</string>
     <string name="prefs_calendar_contacts_summary">Geçerli hesap için DAVdroid (v1.3.0+) kurulumu</string>
@@ -64,8 +55,6 @@
     <string name="prefs_recommend">Arkadaşına öner</string>
     <string name="prefs_feedback">Geri bildirim</string>
     <string name="prefs_imprint">İzlenim</string>
-    <string name="prefs_remember_last_share_location">Paylaşılacak konum hatırlansın</string>
-    <string name="prefs_remember_last_upload_location_summary">Son kullanılan konumlar paylaşılmak üzere hatırlanır</string>
 
 	<string name="recommend_subject">%1$s uygulamasını akıllı telefonunuzda deneyin!</string>
 	<string name="recommend_text">Akıllı telefonunda %1$s kullanmanı öneriyorum!\nBuradan indirebilirsin: %2$s</string>

src/main/res/values-uk/strings.xml

@@ -39,16 +39,11 @@
     <string name="drawer_open">Відкрити</string>
     <string name="prefs_category_general">Основне</string>
     <string name="prefs_category_more">Більше</string>
-    <string name="prefs_accounts">Облікові записи</string>
     <string name="prefs_manage_accounts">Управління обліковими записами</string>
     <string name="prefs_passcode">Захистити паролем</string>
     <string name="prefs_fingerprint">Захист даних відбитком пальця</string>
     <string name="prefs_fingerprint_notsetup">Жодного відбитку у базі</string>
     <string name="prefs_show_hidden_files">Відобразити сховані файли</string>
-    <string name="prefs_log_title">Ввімкнути логування</string>
-    <string name="prefs_log_summary">Використовується для реєстрації помилок</string>
-    <string name="prefs_log_title_history">Історія логування</string>
-    <string name="prefs_log_summary_history">Тут показані записи журналу</string>
     <string name="prefs_log_delete_history_button">Видалити історію</string>
     <string name="prefs_calendar_contacts">Синхронізувати календар та контакти</string>
     <string name="prefs_calendar_contacts_summary">Налаштувати DAVdroid (v1.3.0+) для поточного користувача</string>

src/main/res/values-zh-rCN/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">打开</string>
     <string name="prefs_category_general">常规</string>
     <string name="prefs_category_more">更多</string>
-    <string name="prefs_accounts">账号</string>
     <string name="prefs_manage_accounts">管理账号</string>
     <string name="prefs_passcode">密码锁</string>
     <string name="prefs_fingerprint">指纹锁</string>
     <string name="prefs_fingerprint_notsetup">指纹锁没有设置</string>
     <string name="prefs_show_hidden_files">显示隐藏文件</string>
-    <string name="prefs_instant_upload">立刻上传图片</string>
-    <string name="prefs_instant_upload_summary">立刻上传摄像头拍摄的图片</string>
-    <string name="prefs_instant_video_upload">立刻上传视频</string>
-    <string name="prefs_instant_video_upload_summary">立刻上传摄像头拍摄的视频</string>
-    <string name="prefs_log_title">开启日志</string>
-    <string name="prefs_log_summary">用于记录问题</string>
-    <string name="prefs_log_title_history">历史日志</string>
-    <string name="prefs_log_summary_history">这显示已经保存的日志</string>
     <string name="prefs_log_delete_history_button">删除历史</string>
     <string name="prefs_calendar_contacts">同步日历和通讯录</string>
     <string name="prefs_calendar_contacts_summary">为现在的用户设置DAVdroid(v1.3.0+)</string>
@@ -64,8 +55,6 @@
     <string name="prefs_recommend">推荐给朋友</string>
     <string name="prefs_feedback">反馈</string>
     <string name="prefs_imprint">版本说明</string>
-    <string name="prefs_remember_last_share_location">记住本地共享</string>
-    <string name="prefs_remember_last_upload_location_summary">记住最近的本地共享</string>
 
 	<string name="recommend_subject">在您的智能手机上试用 %1$s！</string>
 	<string name="recommend_text">我想邀请你在智能机上使用%1$s。

src/main/res/values-zh-rTW/strings.xml

@@ -39,20 +39,11 @@
     <string name="drawer_open">開啟</string>
     <string name="prefs_category_general">一般</string>
     <string name="prefs_category_more">更多</string>
-    <string name="prefs_accounts">帳戶</string>
     <string name="prefs_manage_accounts">管理帳戶</string>
     <string name="prefs_passcode">密碼鎖</string>
     <string name="prefs_fingerprint">指紋上鎖</string>
     <string name="prefs_fingerprint_notsetup">尚未設置任何指紋。</string>
     <string name="prefs_show_hidden_files">顯示隱藏檔案</string>
-    <string name="prefs_instant_upload">即時上載相片中</string>
-    <string name="prefs_instant_upload_summary">即時上傳相機拍攝的相片</string>
-    <string name="prefs_instant_video_upload">即時上載影片中</string>
-    <string name="prefs_instant_video_upload_summary">即時上傳相機攝錄的影片</string>
-    <string name="prefs_log_title">啟用記錄</string>
-    <string name="prefs_log_summary">此功能用於記錄執行的動作以找出問題</string>
-    <string name="prefs_log_title_history">記錄檔</string>
-    <string name="prefs_log_summary_history">顯示之前的記錄檔</string>
     <string name="prefs_log_delete_history_button">刪除記錄</string>
     <string name="prefs_calendar_contacts">設定日曆與聯絡人同步</string>
     <string name="prefs_calendar_contacts_summary">設定目前帳戶所使用的 DAVdroid (V1.3.0+)</string>
@@ -64,8 +55,6 @@
     <string name="prefs_recommend">向朋友推薦</string>
     <string name="prefs_feedback">回饋</string>
     <string name="prefs_imprint">法律聲明</string>
-    <string name="prefs_remember_last_share_location">記住分享位置</string>
-    <string name="prefs_remember_last_upload_location_summary">記住最近的分享位置</string>
 
 	<string name="recommend_subject">在您的手機中試用 %1$s ！</string>
 	<string name="recommend_text">我想邀請您在您的手機上使用%1$s！可以由這兒下載：%2$s</string>

src/main/res/values/dims.xml

@@ -79,7 +79,6 @@
     <dimen name="search_users_groups_layout_list_view_margin">20dp</dimen>
     <dimen name="share_file_layout_text_size">12sp</dimen>
     <dimen name="unshare_icon_size">36dp</dimen>
-    <dimen name="simple_dialog_list_item_layout_size">48dp</dimen>
     <dimen name="ssl_untrusted_cert_layout_padding">20dp</dimen>
     <dimen name="scroll_view_height">180dp</dimen>
     <dimen name="upload_list_item_frame_layout_width">60dp</dimen>

src/main/res/values/oauth2_configuration.xml

@@ -13,6 +13,4 @@
     
     <!-- values that should be pre-agreed between app and authorization server, but can be loaded without rebuilding the app -->
     <string name="oauth2_client_id">com.owncloud.android</string>	<!-- preferable that client decides this -->
-    <string name="oauth2_client_secret"></string>					<!-- preferable that client decides this -->
-    
 </resources>

src/main/res/values/setup.xml

@@ -26,7 +26,6 @@
     <string name="server_input_type">regular</string>
     <bool name="show_welcome_link">true</bool>
 	<string name="welcome_link_url">"https://nextcloud.com/providers"</string>
-	<string name="share_api_link"></string>
 
     <!-- Flags to setup the authentication methods available in the app -->
     <string name="auth_method_oauth2">off</string>
@@ -54,8 +53,6 @@
     <color name="color_accent">#007CC2</color>
     <color name="login_text_color">@color/white</color>
     <color name="login_text_hint_color">#7fC0E3</color>
-    <color name="login_background_color">#FFFFFF</color>
-    <color name="login_logo_background_color">#FFFFFF</color>
     <color name="background_color">#FFFFFF</color>
     <color name="primary_button_background_color">@color/color_accent</color>
     <color name="primary_button_text_color">@color/white</color>
@@ -66,9 +63,6 @@
     <color name="color_transparent">#201D2D44</color>
     <color name="color_dark_transparent">#40162233</color>
 
-    <!-- Button -->
-    <color name="button_text_color">#000000</color>
-
     <!-- Multiselect backgrounds -->
     <color name="action_mode_background">#757575</color>
     <color name="action_mode_status_bar_background">#616161</color>

src/main/res/values/strings.xml

@@ -39,21 +39,12 @@
     <string name="drawer_open">Open</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
-    <string name="prefs_accounts">Accounts</string>
     <string name="prefs_manage_accounts">Manage accounts</string>
     <string name="prefs_passcode">Passcode lock</string>
     <string name="prefs_fingerprint">Fingerprint lock</string>
     <string name="prefs_fingerprint_notsetup">No fingerprints have been set up.</string>
     <string name="prefs_expert_mode">Expert mode</string>
     <string name="prefs_show_hidden_files">Show hidden files</string>
-    <string name="prefs_instant_upload">Instant uploading of pictures</string>
-    <string name="prefs_instant_upload_summary">Upload pictures taken by camera instantly</string>
-    <string name="prefs_instant_video_upload">Instant uploading of video</string>
-    <string name="prefs_instant_video_upload_summary">Upload videos recorded by camera instantly</string>
-    <string name="prefs_log_title">Enable logging</string>
-    <string name="prefs_log_summary">This is used to log problems</string>
-    <string name="prefs_log_title_history">Logging history</string>
-    <string name="prefs_log_summary_history">This shows the recorded logs</string>
     <string name="prefs_log_delete_history_button">Delete history</string>
     <string name="prefs_calendar_contacts">Sync calendar &amp; contacts</string>
     <string name="prefs_calendar_contacts_summary">Set up DAVdroid (v1.3.0+) for current account</string>
@@ -65,15 +56,13 @@
     <string name="prefs_recommend">Recommend to friend</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprint</string>
-    <string name="prefs_remember_last_share_location">Remember location of share</string>
-    <string name="prefs_remember_last_upload_location_summary">Remember location of share most recently used</string>
 
 	<string name="recommend_subject">"Try %1$s on your smartphone!"</string>
 	<string name="recommend_text">"I want to invite you to use %1$s on your smartphone.\nDownload here: %2$s"</string>
     <string name="recommend_urls">"%1$s or %2$s"</string>
 
     <string name="auth_check_server">Check server</string>
-    <string name="auth_host_url">Server address https://…</string>
+    <string name="auth_host_url">Server address https://&#8230;</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
     <string name="auth_register">Do you not have a server yet?\nClick here to get one from a provider</string>
@@ -277,7 +266,7 @@
 	<string name="auth_expired_oauth_token_toast">Your authorization expired. Please, authorize again</string>
 	<string name="auth_expired_basic_auth_toast">Please enter the current password</string>
 	<string name="auth_expired_saml_sso_token_toast">Your session expired. Please connect again</string>
-	<string name="auth_connecting_auth_server">Connecting to authentication server…</string>
+	<string name="auth_connecting_auth_server">Connecting to authentication server&#8230;</string>
 	<string name="auth_unsupported_auth_method">The server does not support this authentication method</string>
 	<string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
 	<string name="auth_fail_get_user_name">Your server is not returning a correct user ID, please contact an administrator</string>
@@ -305,7 +294,7 @@
     <string name="filename_forbidden_characters">Forbidden characters: / \\ &lt; &gt; : " | ? *</string>
     <string name="filename_forbidden_charaters_from_server">File name contains at least one invalid character</string>
     <string name="filename_empty">File name cannot be empty</string>
-    <string name="wait_a_moment">Wait a moment…</string>
+    <string name="wait_a_moment">Wait a moment&#8230;</string>
     <string name="wait_checking_credentials">Checking stored credentials</string>
     <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem, please select the file from a different app"</string>
     <string name="filedisplay_no_file_selected">No file selected</string>
@@ -313,7 +302,7 @@
     <string name="wait_for_tmp_copy_from_private_storage">Copying file from private storage</string>
     
     <string name="oauth_check_onoff">Log in with OAuth 2.0</string> 
-    <string name="oauth_login_connection">Connecting to OAuth 2.0 server…</string>    
+    <string name="oauth_login_connection">Connecting to OAuth 2.0 server&#8230;</string>
         
     <string name="ssl_validator_header">The identity of the site could not be verified</string>
     <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>

src/main/res/xml/preferences.xml

@@ -38,60 +38,6 @@
 			android:key="synced_folders_configure_folders"/>
 	</PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
-		<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.PreferenceWithLongSummary
-							android:title="@string/prefs_instant_upload_path_title"
-							android:key="instant_upload_path" />
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-							android:title="@string/prefs_instant_upload_path_use_subfolders_title"
-                            android:summary="@string/prefs_instant_upload_path_use_subfolders_summary"
-							android:key="instant_upload_path_use_subfolders" />
-	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:dependency="instant_uploading"
-			android:disableDependentsState="true"
-	        android:title="@string/instant_upload_on_wifi"
-	        android:key="instant_upload_on_wifi"/>
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:title="@string/instant_upload_on_charging"
-			android:key="instant_upload_on_charging"/>
-		<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.PreferenceWithLongSummary
-							android:title="@string/prefs_instant_video_upload_path_title"
-							android:key="instant_video_upload_path" />
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:title="@string/prefs_instant_upload_path_use_subfolders_title"
-			android:summary="@string/prefs_instant_upload_path_use_subfolders_summary"
-			android:key="instant_video_upload_path_use_subfolders" />
-	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-	        				android:title="@string/instant_video_upload_on_wifi"
-	        				android:key="instant_video_upload_on_wifi"/>
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:title="@string/instant_video_upload_on_charging"
-			android:key="instant_video_upload_on_charging"/>
-		<com.owncloud.android.ui.dialog.OwnCloudListPreference android:key="prefs_instant_behaviour"
-			android:dialogTitle="@string/prefs_instant_behaviour_dialogTitle"
-			android:title="@string/prefs_instant_behaviour_title"
-			android:entries="@array/pref_behaviour_entries"
-			android:entryValues="@array/pref_behaviour_entryValues"
-			android:defaultValue="NOTHING"
-			android:summary="%s"
-			/>
-	    <!-- DISABLED FOR RELEASE UNTIL FIXED
-	    CheckBoxPreference android:key="log_to_file"
-	                        android:title="@string/prefs_log_title"
-	                        android:summary="@string/prefs_log_summary"/>
-		<Preference 		android:key="log_history"
-	                        android:title="@string/prefs_log_title_history"
-	                        android:summary="@string/prefs_log_summary_history"/ -->
-
-    </PreferenceCategory>
-
 	<PreferenceCategory android:title="@string/prefs_category_details" android:key="details">
 		<com.owncloud.android.ui.ThemeableSwitchPreference
 			android:title="@string/prefs_passcode"

src/modified/res/values/setup.xml

@@ -54,8 +54,6 @@
     <color name="color_accent">#007CC2</color>
     <color name="login_text_color">@color/white</color>
     <color name="login_text_hint_color">#7fC0E3</color>
-    <color name="login_background_color">#FFFFFF</color>
-    <color name="login_logo_background_color">#FFFFFF</color>
     <color name="background_color">#FFFFFF</color>
     <color name="primary_button_background_color">@color/color_accent</color>
     <color name="primary_button_text_color">@color/white</color>
@@ -66,9 +64,6 @@
     <color name="color_transparent">#201D2D44</color>
     <color name="color_dark_transparent">#40162233</color>
 
-    <!-- Button -->
-    <color name="button_text_color">#000000</color>
-
     <!-- Multiselect backgrounds -->
     <color name="action_mode_background">#757575</color>
     <color name="action_mode_status_bar_background">#616161</color>