Merge remote-tracking branch 'upstream/master'

Keep in line with upstream
2024-11-27 09:39:25 +03:00 · 2019-12-06 20:36:26 +05:30 · 2019-12-06 20:36:26 +05:30 · c608f0081c
commit c608f0081c
parent 041a6787b8 f9bd91b4b3
104 changed files with 499 additions and 231 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,16 @@
+3.9.2 (December, 05, 2019)
+
+- HOTFIX: fix login loop
+- Fix crash on opening png images
+- Translation updates
+
+3.9.1 (December, 04, 2019)
+
+- Fix crash on opening png images
+- Translation updates
+
+For a full list, please see https://github.com/nextcloud/android/milestone/43
+
 3.9.0 (November, 12, 2019)

 - preview Markdown with syntax highlighting @AndyScherzinger
--- a/build.gradle
+++ b/build.gradle
@ -26,7 +26,7 @@ buildscript {
        }
        classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.6'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.2.0"
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.2.2"
    }
 }

@ -110,7 +110,8 @@ android {
            'VectorPath',
            'IconMissingDensityFolder',
            'IconDensities',
-            'GoogleAppIndexingWarning'
+            'GoogleAppIndexingWarning',
+            'MissingDefaultResource'
    }

    dexOptions {
@ -167,8 +168,8 @@ android {
            versionDev {
                applicationId "com.nextcloud.android.beta"
                dimension "default"
-                versionCode 20191127
-                versionName "20191127"
+                versionCode 20191206
+                versionName "20191206"
            }

            qa {
@ -283,7 +284,7 @@ dependencies {
    implementation "androidx.work:work-runtime:2.2.0"
    implementation "androidx.work:work-runtime-ktx:2.2.0"
    implementation 'com.github.albfernandez:juniversalchardet:2.0.3' // need this version for Android <7
-    implementation 'com.google.code.findbugs:annotations:2.0.1'
+    compileOnly 'com.google.code.findbugs:annotations:2.0.1'
    implementation 'commons-io:commons-io:2.6'
    implementation 'com.github.tobiaskaminsky:android-job:v1.2.6.1' // 'com.github.evernote:android-job:v1.2.5'
    implementation 'com.jakewharton:butterknife:10.2.0'
@ -306,7 +307,6 @@ dependencies {
    implementation 'com.caverock:androidsvg:1.4'
    implementation 'androidx.annotation:annotation:1.1.0'
    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'org.jetbrains:annotations:18.0.0'

    implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido:2.5.1'

@ -322,7 +322,7 @@ dependencies {
    compileOnly "org.projectlombok:lombok:1.18.10"
    annotationProcessor "org.projectlombok:lombok:1.18.10"

-    ktlint "com.pinterest:ktlint:0.35.0"
+    ktlint "com.pinterest:ktlint:0.36.0"
    implementation 'org.conscrypt:conscrypt-android:2.2.1'

    // dependencies for markdown rendering
@ -338,7 +338,7 @@ dependencies {

    // dependencies for local unit tests
    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:3.1.0'
+    testImplementation 'org.mockito:mockito-core:3.2.0'
    testImplementation 'androidx.test:core:1.2.0'
    testImplementation 'org.powermock:powermock-core:2.0.4'
    testImplementation 'org.powermock:powermock-module-junit4:2.0.4'
--- a/src/generic/fastlane/metadata/android/eu-ES/short_description.txt
+++ b/src/generic/fastlane/metadata/android/eu-ES/short_description.txt
@ -0,0 +1 @@
+Kontrolpean mantentzen zaituen norberak ostatutako produktibitate plataforma
--- a/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java
+++ b/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java
@ -42,8 +42,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation;

-import org.jetbrains.annotations.NotNull;
-
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
@ -216,7 +214,7 @@ public class UserAccountManagerImpl implements UserAccountManager {
     *
     * @return User instance
     */
-    @NotNull
+    @NonNull
    @Override
    public User getUser() {
        Account account = getCurrentAccount();
--- a/src/main/java/com/nextcloud/client/onboarding/WhatsNewActivity.java
+++ b/src/main/java/com/nextcloud/client/onboarding/WhatsNewActivity.java
@ -23,7 +23,6 @@
 */
 package com.nextcloud.client.onboarding;

-import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@ -99,11 +98,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
            updateNextButtonIfNeeded();
        });

-        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            mForwardFinishButton.setBackground(null);
-        } else {
-            mForwardFinishButton.setBackgroundDrawable(null);
-        }
+        mForwardFinishButton.setBackground(null);

        mSkipButton = findViewById(R.id.skip);
        mSkipButton.setTextColor(fontColor);
--- a/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
+++ b/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
@ -39,7 +39,7 @@ public interface AppPreferences {
     * events.
     */
    interface Listener {
-        default void onDarkThemeEnabledChanged(boolean enabled) {
+        default void onDarkThemeModeChanged(DarkMode mode) {
            /* default empty implementation */
        };
    }
@ -274,18 +274,18 @@ public interface AppPreferences {
    int getUploaderBehaviour();

    /**
-     * Enable dark theme.
+     * Changes dark theme mode
     *
     * This is reactive property. Listeners will be invoked if registered.
     *
-     * @param enabled true to turn dark theme on, false to turn it off
+     * @param mode dark mode setting: on, off, system
     */
-    void setDarkThemeEnabled(boolean enabled);
+    void setDarkThemeMode(DarkMode mode);

    /**
-     * @return true if application uses dark UI theme, false otherwise
+     * @return dark mode setting: on, off, system
     */
-    boolean isDarkThemeEnabled();
+    DarkMode getDarkThemeMode();

    /**
     * Saves the uploader behavior which the user has set last.
--- a/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
+++ b/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
@ -21,7 +21,6 @@

 package com.nextcloud.client.preferences;

-import android.accounts.Account;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
@ -57,6 +56,7 @@ public final class AppPreferencesImpl implements AppPreferences {
     */
    public static final String AUTO_PREF__LAST_SEEN_VERSION_CODE = "lastSeenVersionCode";
    public static final String STORAGE_PATH = "storage_path";
+    public static final String PREF__DARK_THEME = "dark_theme_mode";
    public static final float DEFAULT_GRID_COLUMN = 4.0f;

    private static final String AUTO_PREF__LAST_UPLOAD_PATH = "last_upload_path";
@ -79,7 +79,6 @@ public final class AppPreferencesImpl implements AppPreferences {
    private static final String PREF__AUTO_UPLOAD_INIT = "autoUploadInit";
    private static final String PREF__FOLDER_SORT_ORDER = "folder_sort_order";
    private static final String PREF__FOLDER_LAYOUT = "folder_layout";
-    static final String PREF__DARK_THEME_ENABLED = "dark_theme_enabled";

    private static final String PREF__LOCK_TIMESTAMP = "lock_timestamp";
    private static final String PREF__SHOW_MEDIA_SCAN_NOTIFICATIONS = "show_media_scan_notifications";
@ -121,10 +120,10 @@ public final class AppPreferencesImpl implements AppPreferences {

        @Override
        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            if(PREF__DARK_THEME_ENABLED.equals(key)) {
-                boolean enabled = preferences.isDarkThemeEnabled();
+            if (PREF__DARK_THEME.equals(key)) {
+                DarkMode mode = preferences.getDarkThemeMode();
                for(Listener l : listeners) {
-                    l.onDarkThemeEnabledChanged(enabled);
+                    l.onDarkThemeModeChanged(mode);
                }
            }
        }
@ -408,13 +407,18 @@ public final class AppPreferencesImpl implements AppPreferences {
    }

    @Override
-    public void setDarkThemeEnabled(boolean enabled) {
-        preferences.edit().putBoolean(PREF__DARK_THEME_ENABLED, enabled).apply();
+    public void setDarkThemeMode(DarkMode mode) {
+        preferences.edit().putString(PREF__DARK_THEME, mode.name()).apply();
    }

    @Override
-    public boolean isDarkThemeEnabled() {
-        return preferences.getBoolean(PREF__DARK_THEME_ENABLED, false);
+    public DarkMode getDarkThemeMode() {
+        try {
+            return DarkMode.valueOf(preferences.getString(PREF__DARK_THEME, DarkMode.LIGHT.name()));
+        } catch (ClassCastException e) {
+            preferences.edit().putString(PREF__DARK_THEME, DarkMode.LIGHT.name()).apply();
+            return DarkMode.DARK;
+        }
    }

    @Override
--- a/src/main/java/com/nextcloud/client/preferences/DarkMode.java
+++ b/src/main/java/com/nextcloud/client/preferences/DarkMode.java
@ -0,0 +1,27 @@
+/*
+ *
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2019 Tobias Kaminsky
+ * Copyright (C) 2019 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) 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 <https://www.gnu.org/licenses/>.
+ */
+
+package com.nextcloud.client.preferences;
+
+public enum DarkMode {
+    DARK, LIGHT, SYSTEM
+}
--- a/src/main/java/com/owncloud/android/MainApp.java
+++ b/src/main/java/com/owncloud/android/MainApp.java
@ -57,6 +57,7 @@ import com.nextcloud.client.network.ConnectivityService;
 import com.nextcloud.client.onboarding.OnboardingService;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.client.preferences.AppPreferencesImpl;
+import com.nextcloud.client.preferences.DarkMode;
 import com.owncloud.android.authentication.PassCodeManager;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.MediaFolder;
@ -247,7 +248,7 @@ public class MainApp extends MultiDexApplication implements HasAndroidInjector {
    @SuppressFBWarnings("ST")
    @Override
    public void onCreate() {
-        setAppTheme(preferences.isDarkThemeEnabled());
+        setAppTheme(preferences.getDarkThemeMode());
        super.onCreate();

        insertConscrypt();
@ -821,11 +822,17 @@ public class MainApp extends MultiDexApplication implements HasAndroidInjector {
    }


-    public static void setAppTheme(Boolean darkTheme) {
-        if (darkTheme) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-        } else {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+    public static void setAppTheme(DarkMode mode) {
+        switch (mode) {
+            case LIGHT:
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                break;
+            case DARK:
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                break;
+            case SYSTEM:
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                break;
        }
    }
 }
--- a/src/main/java/com/owncloud/android/authentication/PassCodeManager.java
+++ b/src/main/java/com/owncloud/android/authentication/PassCodeManager.java
@ -24,6 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.PowerManager;
+import android.os.SystemClock;
 import android.view.Window;
 import android.view.WindowManager;

@ -102,7 +103,7 @@ public final class PassCodeManager {
            activity.startActivityForResult(i, PASSCODE_ACTIVITY);
        } else {
            if (!askedForPin && preferences.getLockTimestamp() != 0) {
-                preferences.setLockTimestamp(System.currentTimeMillis());
+                preferences.setLockTimestamp(SystemClock.elapsedRealtime());
            }
        }

@ -124,7 +125,7 @@ public final class PassCodeManager {
    }

    private boolean passCodeShouldBeRequested(Long timestamp) {
-        return (System.currentTimeMillis() - timestamp) > PASS_CODE_TIMEOUT &&
+        return (SystemClock.elapsedRealtime() - timestamp) > PASS_CODE_TIMEOUT &&
            visibleActivitiesCounter <= 0 && isPassCodeEnabled();
    }

@ -133,7 +134,7 @@ public final class PassCodeManager {
    }

    private boolean deviceCredentialsShouldBeRequested(Long timestamp, Activity activity) {
-        return (System.currentTimeMillis() - timestamp) > PASS_CODE_TIMEOUT && visibleActivitiesCounter <= 0 &&
+        return (SystemClock.elapsedRealtime() - timestamp) > PASS_CODE_TIMEOUT && visibleActivitiesCounter <= 0 &&
            deviceCredentialsAreEnabled(activity);
    }

--- a/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@ -54,8 +54,6 @@ import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimeType;
 import com.owncloud.android.utils.MimeTypeUtil;

-import org.jetbrains.annotations.NotNull;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@ -1970,7 +1968,7 @@ public class FileDataStorageManager {
        return capability;
    }

-    @NotNull
+    @NonNull
    private ContentValues createContentValues(String accountName, OCCapability capability) {
        ContentValues cv = new ContentValues();
        cv.put(ProviderTableMeta.CAPABILITIES_ACCOUNT_NAME, accountName);
--- a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@ -66,7 +66,6 @@ import com.owncloud.android.utils.MimeTypeUtil;

 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.jetbrains.annotations.NotNull;

 import java.io.File;
 import java.io.FileNotFoundException;
@ -76,6 +75,7 @@ import java.net.URLEncoder;
 import java.util.List;
 import java.util.Locale;

+import androidx.annotation.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 /**
@ -868,7 +868,7 @@ public final class ThumbnailsCacheManager {
            return Math.round(r.getDimension(R.dimen.file_avatar_size));
        }

-        private @NotNull
+        private @NonNull
        Drawable doAvatarInBackground() {
            Bitmap avatar;

--- a/src/main/java/com/owncloud/android/files/services/FileUploader.java
+++ b/src/main/java/com/owncloud/android/files/services/FileUploader.java
@ -76,8 +76,6 @@ import com.owncloud.android.ui.notifications.NotificationUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.ThemeUtils;

-import org.jetbrains.annotations.NotNull;
-
 import java.io.File;
 import java.util.AbstractList;
 import java.util.HashMap;
@ -396,10 +394,10 @@ public class FileUploader extends Service
        public void retryFailedUploads(
            @NonNull final Context context,
            @Nullable final Account account,
-            @NotNull final UploadsStorageManager uploadsStorageManager,
-            @NotNull final ConnectivityService connectivityService,
-            @NotNull final UserAccountManager accountManager,
-            @NotNull final PowerManagementService powerManagementService,
+            @NonNull final UploadsStorageManager uploadsStorageManager,
+            @NonNull final ConnectivityService connectivityService,
+            @NonNull final UserAccountManager accountManager,
+            @NonNull final PowerManagementService powerManagementService,
            @Nullable final UploadResult uploadResult
        ) {
            OCUpload[] failedUploads = uploadsStorageManager.getFailedUploads();
--- a/src/main/java/com/owncloud/android/jobs/AccountRemovalJob.java
+++ b/src/main/java/com/owncloud/android/jobs/AccountRemovalJob.java
@ -61,14 +61,13 @@ import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.PushUtils;

 import org.greenrobot.eventbus.EventBus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;

 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import static android.content.Context.ACCOUNT_SERVICE;
 import static com.owncloud.android.ui.activity.ManageAccountsActivity.PENDING_FOR_REMOVAL;
@ -93,7 +92,7 @@ public class AccountRemovalJob extends Job implements AccountManagerCallback<Boo

    @NonNull
    @Override
-    protected Result onRunJob(@NotNull Params params) {
+    protected Result onRunJob(@NonNull Params params) {
        Context context = MainApp.getAppContext();
        PersistableBundleCompat bundle = params.getExtras();
        Account account = userAccountManager.getAccountByName(bundle.getString(ACCOUNT, ""));
--- a/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java
+++ b/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java
@ -23,7 +23,6 @@ package com.owncloud.android.ui;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
-import android.os.Build;
 import android.preference.SwitchPreference;
 import android.util.AttributeSet;
 import android.view.View;
@ -33,7 +32,6 @@ import android.widget.Switch;
 import com.owncloud.android.R;
 import com.owncloud.android.utils.ThemeUtils;

-import androidx.annotation.RequiresApi;
 import androidx.core.graphics.drawable.DrawableCompat;


@ -58,12 +56,11 @@ public class ThemeableSwitchPreference extends SwitchPreference {
    protected void onBindView(View view) {
        super.onBindView(view);

-        if (view instanceof ViewGroup && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+        if (view instanceof ViewGroup) {
            findSwitch((ViewGroup) view);
        }
    }

-    @RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
    private void findSwitch(ViewGroup viewGroup) {
        ColorStateList thumbColorStateList = null;
        ColorStateList trackColorStateList = null;
--- a/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
@ -15,6 +15,7 @@ import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.java.util.Optional;
+import com.nextcloud.client.preferences.DarkMode;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@ -59,8 +60,8 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab

    private AppPreferences.Listener onPreferencesChanged = new AppPreferences.Listener() {
        @Override
-        public void onDarkThemeEnabledChanged(boolean enabled) {
-            BaseActivity.this.onThemeSettingsChanged();
+        public void onDarkThemeModeChanged(DarkMode mode) {
+            onThemeSettingsModeChanged();
        }
    };

@ -91,7 +92,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
        super.onResume();
        paused = false;

-        if(themeChangePending) {
+        if (themeChangePending) {
            recreate();
        }
    }
@ -129,8 +130,8 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
        Log_OC.v(TAG, "onRestart() end");
    }

-    private void onThemeSettingsChanged() {
-        if(paused) {
+    private void onThemeSettingsModeChanged() {
+        if (paused) {
            themeChangePending = true;
        } else {
            recreate();
@ -226,7 +227,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
            return Optional.empty();
        }
    }
-    
+
    public FileDataStorageManager getStorageManager() {
        return storageManager;
    }
--- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@ -41,6 +41,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.SystemClock;
 import android.text.Html;
 import android.view.Menu;
 import android.view.MenuItem;
@ -57,11 +58,11 @@ import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.google.android.material.navigation.NavigationView;
 import com.nextcloud.client.account.User;
-import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.network.ClientFactory;
 import com.nextcloud.client.onboarding.FirstRunActivity;
 import com.nextcloud.client.preferences.AppPreferences;
+import com.nextcloud.client.preferences.DarkMode;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.PassCodeManager;
@ -71,7 +72,6 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.ExternalLink;
 import com.owncloud.android.lib.common.ExternalLinkType;
-import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.Quota;
 import com.owncloud.android.lib.common.UserInfo;
 import com.owncloud.android.lib.common.accounts.ExternalLinksOperation;
@ -1275,9 +1275,12 @@ public abstract class DrawerActivity extends ToolbarActivity
    @Override
    protected void onResume() {
        super.onResume();
-        getDelegate().setLocalNightMode(preferences.isDarkThemeEnabled() ?
-                                        AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
-        getDelegate().applyDayNight();
+        if (AppCompatDelegate.getDefaultNightMode() != AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
+
+            getDelegate().setLocalNightMode(DarkMode.DARK == preferences.getDarkThemeMode() ?
+                                                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
+            getDelegate().applyDayNight();
+        }
        setDrawerMenuItemChecked(mCheckedMenuItem);
    }

@ -1435,7 +1438,7 @@ public abstract class DrawerActivity extends ToolbarActivity
    @Override
    protected void onStop() {
        if (preferences.getLockTimestamp() != 0) {
-            preferences.setLockTimestamp(System.currentTimeMillis());
+            preferences.setLockTimestamp(SystemClock.elapsedRealtime());
        }
        EventBus.getDefault().unregister(this);
        super.onStop();
--- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@ -28,7 +28,6 @@ package com.owncloud.android.ui.activity;
 import android.Manifest;
 import android.accounts.Account;
 import android.accounts.AuthenticatorException;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@ -42,7 +41,6 @@ import android.content.SyncRequest;
 import android.content.pm.PackageManager;
 import android.content.res.Resources.NotFoundException;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Parcelable;
@ -939,7 +937,6 @@ public class FileDisplayActivity extends FileActivity
    /**
     * Called, when the user selected something for uploading
     */
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
    @Override
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

@ -1077,10 +1074,7 @@ public class FileDisplayActivity extends FileActivity

        ArrayList<Parcelable> streamsToUpload = new ArrayList<>();

-        //getClipData is only supported on api level 16+, Jelly Bean
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN &&
-                contentIntent.getClipData() != null &&
-                contentIntent.getClipData().getItemCount() > 0) {
+        if (contentIntent.getClipData() != null && contentIntent.getClipData().getItemCount() > 0) {

            for (int i = 0; i < contentIntent.getClipData().getItemCount(); i++) {
                streamsToUpload.add(contentIntent.getClipData().getItemAt(i).getUri());
--- a/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java
@ -24,6 +24,7 @@ package com.owncloud.android.ui.activity;

 import android.content.Intent;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@ -239,7 +240,7 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
        if (ACTION_CHECK.equals(getIntent().getAction())) {
            if (checkPassCode()) {
                /// pass code accepted in request, user is allowed to access the app
-                AppPreferencesImpl.fromContext(this).setLockTimestamp(System.currentTimeMillis());
+                AppPreferencesImpl.fromContext(this).setLockTimestamp(SystemClock.elapsedRealtime());
                hideSoftKeyboard();
                finish();

@ -249,7 +250,7 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {

        } else if (ACTION_CHECK_WITH_RESULT.equals(getIntent().getAction())) {
            if (checkPassCode()) {
-                AppPreferencesImpl.fromContext(this).setLockTimestamp(System.currentTimeMillis());
+                AppPreferencesImpl.fromContext(this).setLockTimestamp(SystemClock.elapsedRealtime());
                Intent resultIntent = new Intent();
                resultIntent.putExtra(KEY_CHECK_RESULT, true);
                setResult(RESULT_OK, resultIntent);
--- a/src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java
@ -25,6 +25,7 @@ import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
+import android.os.SystemClock;
 import android.widget.Toast;

 import com.nextcloud.client.preferences.AppPreferencesImpl;
@ -53,7 +54,7 @@ public class RequestCredentialsActivity extends Activity {
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
        if (requestCode == REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS) {
            if (resultCode == Activity.RESULT_OK) {
-                AppPreferencesImpl.fromContext(this).setLockTimestamp(System.currentTimeMillis());
+                AppPreferencesImpl.fromContext(this).setLockTimestamp(SystemClock.elapsedRealtime());
                finishWithResult(KEY_CHECK_RESULT_TRUE);
            } else if (resultCode == Activity.RESULT_CANCELED) {
                finishWithResult(KEY_CHECK_RESULT_CANCEL);
--- a/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
@ -59,6 +59,7 @@ import com.nextcloud.client.logger.ui.LogsActivity;
 import com.nextcloud.client.network.ClientFactory;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.client.preferences.AppPreferencesImpl;
+import com.nextcloud.client.preferences.DarkMode;
 import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
@ -79,6 +80,7 @@ import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.ThemeUtils;

 import java.util.ArrayList;
+import java.util.List;

 import javax.inject.Inject;

@ -106,6 +108,7 @@ public class SettingsActivity extends ThemedPreferenceActivity
    public static final String LOCK_PASSCODE = "passcode";
    public static final String LOCK_DEVICE_CREDENTIALS = "device_credentials";

+
    public final static String PREFERENCE_USE_FINGERPRINT = "use_fingerprint";
    public static final String PREFERENCE_SHOW_MEDIA_SCAN_NOTIFICATIONS = "show_media_scan_notifications";

@ -692,13 +695,31 @@ public class SettingsActivity extends ThemedPreferenceActivity

        loadStoragePath();

-        SwitchPreference themePref = (SwitchPreference) findPreference("dark_theme_enabled");
-        boolean darkThemeEnabled = preferences.isDarkThemeEnabled();
-        int summaryResId = darkThemeEnabled ? R.string.prefs_value_theme_dark : R.string.prefs_value_theme_light;
-        themePref.setSummary(summaryResId);
+        ListPreference themePref = (ListPreference) findPreference("darkTheme");
+
+        List<String> themeEntries = new ArrayList<>(3);
+        themeEntries.add(getString(R.string.prefs_value_theme_light));
+        themeEntries.add(getString(R.string.prefs_value_theme_dark));
+        themeEntries.add(getString(R.string.prefs_value_theme_system));
+
+        List<String> themeValues = new ArrayList<>(3);
+        themeValues.add(DarkMode.LIGHT.name());
+        themeValues.add(DarkMode.DARK.name());
+        themeValues.add(DarkMode.SYSTEM.name());
+
+        themePref.setEntries(themeEntries.toArray(new String[0]));
+        themePref.setEntryValues(themeValues.toArray(new String[0]));
+
+        if (TextUtils.isEmpty(themePref.getEntry())) {
+            themePref.setValue(DarkMode.LIGHT.name());
+            themePref.setSummary(TextUtils.isEmpty(themePref.getEntry()) ? DarkMode.LIGHT.name() : themePref.getEntry());
+        }
+
        themePref.setOnPreferenceChangeListener((preference, newValue) -> {
-            boolean enabled = (Boolean)newValue;
-            MainApp.setAppTheme(enabled);
+            DarkMode mode = DarkMode.valueOf((String) newValue);
+            preferences.setDarkThemeMode(mode);
+            MainApp.setAppTheme(mode);
+
            return true;
        });
    }
--- a/src/main/java/com/owncloud/android/ui/activity/ThemedPreferenceActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/ThemedPreferenceActivity.java
@ -24,6 +24,7 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;

 import com.nextcloud.client.preferences.AppPreferences;
+import com.nextcloud.client.preferences.DarkMode;

 import javax.inject.Inject;

@ -41,8 +42,10 @@ public class ThemedPreferenceActivity extends PreferenceActivity {

    private AppPreferences.Listener onThemeChangedListener = new AppPreferences.Listener() {
        @Override
-        public void onDarkThemeEnabledChanged(boolean enabled) {
-            if(paused) {
+        public void onDarkThemeModeChanged(DarkMode mode) {
+            preferences.setDarkThemeMode(mode);
+
+            if (paused) {
                themeChangePending = true;
                return;
            }
@ -73,7 +76,7 @@ public class ThemedPreferenceActivity extends PreferenceActivity {
        super.onResume();
        paused = false;

-        if(themeChangePending) {
+        if (themeChangePending) {
            recreate();
        }
    }
--- a/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
@ -461,7 +461,7 @@ public class SyncedFolderAdapter extends SectionedRecyclerViewAdapter<SectionedV
    private void setSyncButtonActiveIcon(ImageButton syncStatusButton, boolean enabled) {
        if (enabled) {
            syncStatusButton.setImageDrawable(ThemeUtils.tintDrawable(R.drawable.ic_cloud_sync_on,
-                    ThemeUtils.primaryColor(context)));
+                                                                      ThemeUtils.primaryColor(context, true)));
        } else {
            syncStatusButton.setImageResource(R.drawable.ic_cloud_sync_off);
        }
--- a/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java
@ -27,8 +27,6 @@ import com.owncloud.android.ui.helpers.FileOperationsHelper;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.ThemeUtils;

-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.List;

@ -106,7 +104,7 @@ public class SendShareDialog extends BottomSheetDialogFragment {

    @Nullable
    @Override
-    public View onCreateView(@NotNull LayoutInflater inflater,
+    public View onCreateView(@NonNull LayoutInflater inflater,
                             @Nullable ViewGroup container,
                             @Nullable Bundle savedInstanceState) {

--- a/src/main/java/com/owncloud/android/ui/fragment/PhotoFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/PhotoFragment.java
@ -34,8 +34,6 @@ import com.owncloud.android.ui.asynctasks.PhotoSearchTask;
 import com.owncloud.android.ui.events.ChangeMenuEvent;
 import com.owncloud.android.ui.events.SearchEvent;

-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;

 import androidx.annotation.NonNull;
@ -94,7 +92,7 @@ public class PhotoFragment extends OCFileListFragment {

        getRecyclerView().addOnScrollListener(new RecyclerView.OnScrollListener() {
            @Override
-            public void onScrolled(@NotNull RecyclerView recyclerView, int dx, int dy) {
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                loadMoreWhenEndReached(recyclerView, dy);
            }
        });
--- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java
@ -34,7 +34,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.ContactsContract;
@ -80,7 +79,6 @@ import com.owncloud.android.utils.ThemeUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.jetbrains.annotations.NotNull;

 import java.io.File;
 import java.io.IOException;
@ -498,7 +496,7 @@ public class ContactListFragment extends FileFragment implements Injectable {
            }
        }

-        @NotNull
+        @NonNull
        @Override
        public String toString() {
            return displayName;
@ -717,13 +715,11 @@ class ContactListAdapter extends RecyclerView.Adapter<ContactListFragment.Contac
    private void setChecked(boolean checked, CheckedTextView checkedTextView) {
        checkedTextView.setChecked(checked);

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            if (checked) {
-                checkedTextView.getCheckMarkDrawable()
-                        .setColorFilter(ThemeUtils.primaryColor(context), PorterDuff.Mode.SRC_ATOP);
-            } else {
-                checkedTextView.getCheckMarkDrawable().clearColorFilter();
-            }
+        if (checked) {
+            checkedTextView.getCheckMarkDrawable()
+                .setColorFilter(ThemeUtils.primaryColor(context), PorterDuff.Mode.SRC_ATOP);
+        } else {
+            checkedTextView.getCheckMarkDrawable().clearColorFilter();
        }
    }

@ -731,19 +727,15 @@ class ContactListAdapter extends RecyclerView.Adapter<ContactListFragment.Contac
        holder.getName().setChecked(!holder.getName().isChecked());

        if (holder.getName().isChecked()) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                holder.getName().getCheckMarkDrawable()
-                        .setColorFilter(ThemeUtils.primaryColor(context), PorterDuff.Mode.SRC_ATOP);
-            }
+            holder.getName().getCheckMarkDrawable().setColorFilter(ThemeUtils.primaryColor(context),
+                                                                   PorterDuff.Mode.SRC_ATOP);

            checkedVCards.add(verifiedPosition);
            if (checkedVCards.size() == SINGLE_SELECTION) {
                EventBus.getDefault().post(new VCardToggleEvent(true));
            }
        } else {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                holder.getName().getCheckMarkDrawable().clearColorFilter();
-            }
+            holder.getName().getCheckMarkDrawable().clearColorFilter();

            checkedVCards.remove(verifiedPosition);

--- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
@ -25,7 +25,6 @@ import android.accounts.Account;
 import android.app.DatePickerDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
@ -55,8 +54,6 @@ import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.PermissionUtil;
 import com.owncloud.android.utils.ThemeUtils;

-import org.jetbrains.annotations.NotNull;
-
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
@ -108,7 +105,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi


    @Override
-    public View onCreateView(@NotNull final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

        // use grey as fallback for elements where custom theming is not available
        if (ThemeUtils.themingEnabled(getContext())) {
@ -465,7 +462,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
    }

    @Override
-    public void onSaveInstanceState(@NotNull Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
        super.onSaveInstanceState(outState);
        if (datePickerDialog != null) {
            outState.putBoolean(KEY_CALENDAR_PICKER_OPEN, datePickerDialog.isShowing());
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
@ -557,8 +557,7 @@ public class PreviewTextFragment extends FileFragment implements SearchView.OnQu
    }

    private void setText(TextView textView, String text, OCFile file) {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN
-            && MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN.equals(file.getMimeType())) {
+        if (MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN.equals(file.getMimeType())) {
            textView.setText(getRenderedMarkdownText(getContext(), text));
        } else {
            textView.setText(text);
--- a/src/main/java/com/owncloud/android/utils/ThemeUtils.java
+++ b/src/main/java/com/owncloud/android/utils/ThemeUtils.java
@ -61,6 +61,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.AppCompatCheckBox;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.SwitchCompat;
@ -180,6 +181,10 @@ public final class ThemeUtils {
     * adapted from https://github.com/nextcloud/server/blob/master/apps/theming/lib/Util.php#L90-L102
     */
    public static int fontColor(Context context) {
+        if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
+            return Color.WHITE;
+        }
+
        try {
            return Color.parseColor(getCapability(context).getServerTextColor());
        } catch (Exception e) {
@ -404,11 +409,9 @@ public final class ThemeUtils {
     */
    public static void colorHorizontalSeekBar(SeekBar seekBar, Context context) {
        int color = ThemeUtils.primaryAccentColor(context);
-        colorHorizontalProgressBar(seekBar, color);

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            seekBar.getThumb().setColorFilter(color, PorterDuff.Mode.SRC_IN);
-        }
+        colorHorizontalProgressBar(seekBar, color);
+        seekBar.getThumb().setColorFilter(color, PorterDuff.Mode.SRC_IN);
    }

    /**
@ -501,14 +504,16 @@ public final class ThemeUtils {
        int color = ContextCompat.getColor(context, R.color.fg_default);

        // Theme the view when it is already on a theme'd background according to dark / light theme
-        if (themedBackground) {
+        if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
+            color = Color.WHITE;
+        } else if (themedBackground) {
            if (darkTheme(context)) {
                color = ContextCompat.getColor(context, R.color.themed_fg);
            } else {
                color = ContextCompat.getColor(context, R.color.themed_fg_inverse);
            }
        }
-        
+
        editText.setTextColor(color);
        editText.setHighlightColor(context.getResources().getColor(R.color.fg_contrast));
        setEditTextCursorColor(editText, color);
--- a/src/main/res/drawable/ic_history.xml
+++ b/src/main/res/drawable/ic_history.xml
@ -1,11 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16"
-        android:viewportHeight="16">
+<!--
+    @author Google LLC
+    Copyright (C) 2018 Google LLC

-    <path
-        android:fillColor="#757575"
-        android:pathData="M9.025 1.08c-3.95 0-6.535 3.447-6.364 6.72h-2.161l3.904 3.92 4.08-3.874h-2.147c-0.237-1.7 1.163-3.114 2.689-3.092 1.595 0.024 2.8 1.23 2.8 2.734 0.09 1.594-1.63 3.428-3.966 2.53 0 1.23 0.003 2.545 0 3.765 4.19 0.83 7.64-2.51 7.64-6.25 0-3.563-2.92-6.453-6.475-6.453z"/>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#757575"
+      android:pathData="M12,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
 </vector>
--- a/src/main/res/layout-land/account_setup.xml
+++ b/src/main/res/layout-land/account_setup.xml
@ -109,8 +109,7 @@
                        android:paddingEnd="@dimen/alternate_padding_right"
                        android:paddingRight="@dimen/alternate_padding_right"
                        android:textColor="@color/login_text_color"
-                        android:textColorHint="@color/login_text_hint_color"
-                        android:theme="@style/Nextcloud.EditText.Login">
+                        android:textColorHint="@color/login_text_hint_color">

                        <requestFocus />

--- a/src/main/res/layout/account_setup.xml
+++ b/src/main/res/layout/account_setup.xml
@ -109,8 +109,7 @@
                        android:paddingEnd="@dimen/alternate_padding_right"
                        android:paddingRight="@dimen/alternate_padding_right"
                        android:textColor="@color/login_text_color"
-                        android:textColorHint="@color/login_text_color"
-                        android:theme="@style/Nextcloud.EditText.Login">
+                        android:textColorHint="@color/login_text_color">

                        <requestFocus />

--- a/src/main/res/values-b+en+001/strings.xml
+++ b/src/main/res/values-b+en+001/strings.xml
@ -662,7 +662,6 @@
    <string name="synced_folders_configure_folders">Configure folders</string>
    <string name="synced_folders_loading_folders">Loading folders…</string>
    <string name="synced_folders_new_info">Instant uploading has been revamped completely. Re-configure your auto upload from within the main menu.\n\nEnjoy the new and extended auto uploading.</string>
-    <string name="synced_folders_no_results">No media folders found.</string>
    <string name="synced_folders_preferences">Preferences for auto uploading</string>
    <string name="synced_folders_preferences_folder_path">For %1$s</string>
    <string name="synced_folders_type">Type</string>
--- a/src/main/res/values-b+es+419/strings.xml
+++ b/src/main/res/values-b+es+419/strings.xml
@ -342,7 +342,6 @@
    <string name="synced_folder_settings_button">Botón de configuración</string>
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@ -566,7 +566,6 @@
    <string name="synced_folders_configure_folders">Конфигуриране на папки</string>
    <string name="synced_folders_loading_folders">Зареждане на папките…</string>
    <string name="synced_folders_new_info">Моментално качване е преправено изцяло. Конфигурирайте автоматичното качване от главното меню.\n\n Насладете се на новото и продължено автоматично качване.</string>
-    <string name="synced_folders_no_results">Не са открити медийни папки.</string>
    <string name="synced_folders_preferences">Предпочитания за автоматично качване</string>
    <string name="synced_folders_preferences_folder_path">За %1$s</string>
    <string name="synced_folders_type">Тип</string>
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@ -675,7 +675,6 @@
    <string name="synced_folders_configure_folders">Configureu les carpetes</string>
    <string name="synced_folders_loading_folders">S\'està carregant les carpetes…</string>
    <string name="synced_folders_new_info">La càrrega instantània s\'ha renovat completament. Torneu a configurar la vostra càrrega automàtica des de dins del menú principal.\n\nGaudiu de la nova càrrega automàtica amb més funcionalitats.</string>
-    <string name="synced_folders_no_results">No s\'han trobat carpetes amb contingut multimèdia</string>
    <string name="synced_folders_preferences">Preferències de la càrrega automàtica</string>
    <string name="synced_folders_preferences_folder_path">Per %1$s</string>
    <string name="synced_folders_type">Tipus</string>
--- a/src/main/res/values-cs-rCZ/strings.xml
+++ b/src/main/res/values-cs-rCZ/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">ponechán v původní složce, protože je pouze pro čtení</string>
    <string name="auto_upload_on_wifi">Nahrávat pouze přes neplacené Wi-Fi připojení</string>
    <string name="auto_upload_path">/AutoUpload</string>
+    <string name="autoupload_configure">Nastavit</string>
    <string name="autoupload_create_new_custom_folder">Vytvořte nové nastavení vlastní složky</string>
    <string name="autoupload_custom_folder">Nastavit uživatelsky určenou složku</string>
    <string name="autoupload_disable_power_save_check">Zakázat kontrolu úspory energie</string>
+    <string name="autoupload_hide_folder">Skrýt složku</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Zavřít</string>
    <string name="battery_optimization_disable">Vypnout</string>
@ -505,6 +507,7 @@
    <string name="prefs_theme_title">Motiv</string>
    <string name="prefs_value_theme_dark">Tmavý</string>
    <string name="prefs_value_theme_light">Světlý</string>
+    <string name="prefs_value_theme_system">Následovat systém</string>
    <string name="preview_image_description">Náhled obrázku</string>
    <string name="preview_image_error_no_local_file">Není zde žádný místní soubor pro který zobrazit náhled</string>
    <string name="preview_image_error_unknown_format">Obrázek se nedaří zobrazit</string>
@ -694,7 +697,7 @@ Jak vývojová tak produkční verze je k dispozici na F-droidu a mohou být nai
    <string name="synced_folders_configure_folders">Nastavit složky</string>
    <string name="synced_folders_loading_folders">Načítání složek…</string>
    <string name="synced_folders_new_info">Okamžité nahrávání bylo zcela předěláno. Proto je třeba ho znovu nastavit z hlavní nabídky.\n\nUžijte si nové a rozšířené automatické nahrávání.</string>
-    <string name="synced_folders_no_results">Nebyly nalezeny žádné složky médií.</string>
+    <string name="synced_folders_no_results">Nebyly nalezeny žádné složky médií</string>
    <string name="synced_folders_preferences">Předvolby automatického nahrávání</string>
    <string name="synced_folders_preferences_folder_path">Pro %1$s</string>
    <string name="synced_folders_type">Typ</string>
@ -831,6 +834,12 @@ Jak vývojová tak produkční verze je k dispozici na F-droidu a mohou být nai
        <item quantity="many">%1$d souborů</item>
        <item quantity="other">%1$d soubory</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Zobrazit %1$d skrytou složku</item>
+        <item quantity="few">Zobrazit %1$d skryté složky</item>
+        <item quantity="many">Zobrazit %1$d skrytých složek</item>
+        <item quantity="other">Zobrazit %1$d skryté složky</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d vybrán</item>
        <item quantity="few">%d vybrány</item>
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@ -263,6 +263,7 @@
    <string name="fallback_weblogin_text">Tilbage til foregående login metode</string>
    <string name="favorite">Tilføj til favoritter</string>
    <string name="favorite_icon">Favorit</string>
+    <string name="file">fil</string>
    <string name="file_delete">Slet</string>
    <string name="file_detail_activity_error">Fejl ved indlæsning af aktiviteter for fil</string>
    <string name="file_details_no_content">Fejl ved indlæsning af detaljer</string>
@ -332,6 +333,7 @@
    <string name="first_run_2_text">Sikker kollaboration&amp; fil udveksling</string>
    <string name="first_run_3_text">Nemt at bruge web mail, kalender &amp; kontakter</string>
    <string name="first_run_4_text">Skærmdeling, onlinemøder &amp; web konferencer</string>
+    <string name="folder">mappe</string>
    <string name="folder_already_exists">Mappe findes allerede</string>
    <string name="folder_confirm_create">Opret</string>
    <string name="folder_icon">Mappe ikon</string>
@ -502,6 +504,9 @@ Enheds legitimationsoplysninger er sat op
    <string name="prefs_storage_path">Lagringssti</string>
    <string name="prefs_synced_folders_local_path_title">Lokal mappe</string>
    <string name="prefs_synced_folders_remote_path_title">Ekstern mappe</string>
+    <string name="prefs_theme_title">Tema</string>
+    <string name="prefs_value_theme_dark">Mørk</string>
+    <string name="prefs_value_theme_light">Lys</string>
    <string name="preview_image_description">Forhåndsvisning af billede</string>
    <string name="preview_image_error_no_local_file">Der er ingen lokalfil at forhåndsvise</string>
    <string name="preview_image_error_unknown_format">Kunne ikke vise billede</string>
@ -539,6 +544,7 @@ Enheds legitimationsoplysninger er sat op
    <string name="screenshot_04_accounts_subline">på et sted</string>
    <string name="screenshot_05_autoUpload_heading">Automatisk upload</string>
    <string name="screenshot_05_autoUpload_subline">Til dine billeder &amp; videoer</string>
+    <string name="screenshot_06_davdroid_subline">Synkronisér med DAVx5</string>
    <string name="search_users_and_groups_hint">Søg brugere og grupper</string>
    <string name="select_all">Vælg alle</string>
    <string name="select_template">Vælg model</string>
@ -556,6 +562,8 @@ Enheds legitimationsoplysninger er sat op
    <string name="share_file">Del %1$s</string>
    <string name="share_get_public_link_button">Få link</string>
    <string name="share_group_clarification">%1$s (gruppe)</string>
+    <string name="share_internal_link">Del internt link</string>
+    <string name="share_internal_link_text">Virker kun for brugere med adgang til %1$s</string>
    <string name="share_known_remote_clarification">%1$s ( ved %2$s)</string>
    <string name="share_link_empty_password">Du skal angive et kodeord</string>
    <string name="share_link_file_error">Der opstod en fejl ved deling af denne fil eller mappe</string>
@ -666,7 +674,6 @@ Enheds legitimationsoplysninger er sat op
    <string name="synced_folders_configure_folders">Konfigurer mapper</string>
    <string name="synced_folders_loading_folders">Henter mapper...</string>
    <string name="synced_folders_new_info">Øjeblikkelig send er blevet fundamentalt nylanceret. Omkonfigurer din autoupload fra hovedmenuen.\n\nNyd den nye og udvidede auto upload.</string>
-    <string name="synced_folders_no_results">Ingen medie mappe fundet</string>
    <string name="synced_folders_preferences">indstillinger til auto send</string>
    <string name="synced_folders_preferences_folder_path">For %1$s</string>
    <string name="synced_folders_type">Type</string>
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">im Original-Verzeichnis belassen, da nur lesbar</string>
    <string name="auto_upload_on_wifi">Nur über gebührenfreies WLAN hochladen</string>
    <string name="auto_upload_path">/AutoUpload</string>
+    <string name="autoupload_configure">Einrichten</string>
    <string name="autoupload_create_new_custom_folder">Erstellen Sie ein Setup für den eigenen Ordner</string>
    <string name="autoupload_custom_folder">Erstellen Sie einen eigenen Ordner</string>
    <string name="autoupload_disable_power_save_check">Energiesparmodus deaktivieren</string>
+    <string name="autoupload_hide_folder">Ordner verstecken</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Schliessen</string>
    <string name="battery_optimization_disable">Deaktivieren</string>
@ -505,6 +507,7 @@
    <string name="prefs_theme_title">Design</string>
    <string name="prefs_value_theme_dark">Dunkel</string>
    <string name="prefs_value_theme_light">Hell</string>
+    <string name="prefs_value_theme_system">Systemvorgaben verwenden</string>
    <string name="preview_image_description">Bildvorschau</string>
    <string name="preview_image_error_no_local_file">Keine lokale Datei für die Vorschau vorhanden</string>
    <string name="preview_image_error_unknown_format">Bild kann nicht angezeigt werden</string>
@ -677,7 +680,7 @@
    <string name="synced_folders_configure_folders">Ordner konfigurieren</string>
    <string name="synced_folders_loading_folders">Lade Ordner…</string>
    <string name="synced_folders_new_info">Die Sofort-Uploads wurden vollständig überarbeitet. Konfiguriere Sie Ihren automatischen Uploader im Hauptmenü.\n\nGenießen Sie den verbesserten Auto-Upload.</string>
-    <string name="synced_folders_no_results">Keine Medien-Ordner gefunden.</string>
+    <string name="synced_folders_no_results">Keine Medien-Ordner gefunden</string>
    <string name="synced_folders_preferences">Einstellungen für automatisches Hochladen</string>
    <string name="synced_folders_preferences_folder_path">Für %1$s</string>
    <string name="synced_folders_type">Typ</string>
@ -806,6 +809,10 @@
        <item quantity="one">%1$d Datei</item>
        <item quantity="other">%1$d Dateien</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Zeige %1$dversteckten Ordner</item>
+        <item quantity="other">Zeige %1$d versteckte Ordner</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d ausgewählt</item>
        <item quantity="other">%d ausgewählt</item>
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@ -639,7 +639,6 @@
    <string name="synced_folders_configure_folders">Ρυθμίστε τους φακέλους</string>
    <string name="synced_folders_loading_folders">Φόρτωση φακέλων…</string>
    <string name="synced_folders_new_info">Η άμεση μεταφόρτωση έχει ανανεωθεί πλήρως. Ξανά ρυθμίστε την αυτόματη μεταφόρτωσή σας από το κύριο μενού. \ N \ nΑπολαύστε τη νέα και εκτεταμένη αυτόματη μεταφόρτωση.</string>
-    <string name="synced_folders_no_results">Δεν βρέθηκαν φάκελοι media .</string>
    <string name="synced_folders_preferences">Προτιμήσεις για αυτόματη μεταφόρτωση</string>
    <string name="synced_folders_preferences_folder_path">Για%1$s</string>
    <string name="synced_folders_type">Τύπος</string>
--- a/src/main/res/values-eo/strings.xml
+++ b/src/main/res/values-eo/strings.xml
@ -599,7 +599,6 @@
    <string name="synced_folders_configure_folders">Agordi dosierujojn</string>
    <string name="synced_folders_loading_folders">Ŝargado de dosierujoj...</string>
    <string name="synced_folders_new_info">Ni tute elrenovigis tuj-alŝutadon. Reagordu vian aŭtomatan alŝuton pere de la ĉefa menuo.\n\nUzu la novan, kaj pli kapablan, aŭtomatan alŝuton.</string>
-    <string name="synced_folders_no_results">Neniu aŭdovida dosierujo troveblas</string>
    <string name="synced_folders_preferences">Agordoj pri aŭtomata alŝuto</string>
    <string name="synced_folders_preferences_folder_path">Pri %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rAR/strings.xml
+++ b/src/main/res/values-es-rAR/strings.xml
@ -599,7 +599,6 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">La carga instantánea ha sido completamente modernizada. Reconfigure su carga automática desde el menu principal. \n\nDisfrute de las nuevas y extendidas capacidades de la carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios</string>
    <string name="synced_folders_preferences">Preferencias de carga automática</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Escribir</string>
--- a/src/main/res/values-es-rCL/strings.xml
+++ b/src/main/res/values-es-rCL/strings.xml
@ -459,7 +459,6 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rCO/strings.xml
+++ b/src/main/res/values-es-rCO/strings.xml
@ -459,7 +459,6 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rCR/strings.xml
+++ b/src/main/res/values-es-rCR/strings.xml
@ -459,7 +459,6 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rDO/strings.xml
+++ b/src/main/res/values-es-rDO/strings.xml
@ -459,7 +459,6 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rEC/strings.xml
+++ b/src/main/res/values-es-rEC/strings.xml
@ -459,7 +459,6 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rGT/strings.xml
+++ b/src/main/res/values-es-rGT/strings.xml
@ -459,7 +459,6 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rHN/strings.xml
+++ b/src/main/res/values-es-rHN/strings.xml
@ -342,7 +342,6 @@
    <string name="synced_folder_settings_button">Botón de configuración</string>
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@ -506,7 +506,6 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rNI/strings.xml
+++ b/src/main/res/values-es-rNI/strings.xml
@ -342,7 +342,6 @@
    <string name="synced_folder_settings_button">Botón de configuración</string>
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rPA/strings.xml
+++ b/src/main/res/values-es-rPA/strings.xml
@ -342,7 +342,6 @@
    <string name="synced_folder_settings_button">Botón de configuración</string>
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rPE/strings.xml
+++ b/src/main/res/values-es-rPE/strings.xml
@ -342,7 +342,6 @@
    <string name="synced_folder_settings_button">Botón de configuración</string>
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rPR/strings.xml
+++ b/src/main/res/values-es-rPR/strings.xml
@ -342,7 +342,6 @@
    <string name="synced_folder_settings_button">Botón de configuración</string>
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rPY/strings.xml
+++ b/src/main/res/values-es-rPY/strings.xml
@ -342,7 +342,6 @@
    <string name="synced_folder_settings_button">Botón de configuración</string>
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rSV/strings.xml
+++ b/src/main/res/values-es-rSV/strings.xml
@ -459,7 +459,6 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es-rUY/strings.xml
+++ b/src/main/res/values-es-rUY/strings.xml
@ -342,7 +342,6 @@
    <string name="synced_folder_settings_button">Botón de configuración</string>
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
-    <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
    <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">se mantiene en la carpeta original, pues es de solo lectura</string>
    <string name="auto_upload_on_wifi">Subir sólo con conexión Wi-Fi sin límite de datos</string>
    <string name="auto_upload_path">/CargaAutomática</string>
+    <string name="autoupload_configure">Configurar</string>
    <string name="autoupload_create_new_custom_folder">Crear nueva configuración de una carpeta especifica </string>
    <string name="autoupload_custom_folder">Configure una carpeta especifica </string>
    <string name="autoupload_disable_power_save_check">Desactivar comprobación de ahorro de energía</string>
+    <string name="autoupload_hide_folder">Ocultar carpeta</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Cerrar</string>
    <string name="battery_optimization_disable">Desactivar</string>
@ -505,6 +507,7 @@
    <string name="prefs_theme_title">Tema</string>
    <string name="prefs_value_theme_dark">Oscuro</string>
    <string name="prefs_value_theme_light">Claro</string>
+    <string name="prefs_value_theme_system">Sistema de seguimiento</string>
    <string name="preview_image_description">Previsualización de imagen</string>
    <string name="preview_image_error_no_local_file">No hay archivo local para previsualizar</string>
    <string name="preview_image_error_unknown_format">No se puede mostrar la imagen</string>
@ -676,7 +679,7 @@
    <string name="synced_folders_configure_folders">Configurar carpetas</string>
    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
    <string name="synced_folders_new_info">Carga instantánea ha sido modificado por completo. Re-configura tu carga automática desde el menú principal. \n\nDisfruta la nueva y extendida carga automática.</string>
-    <string name="synced_folders_no_results">Ningún archivo multimedia encontrado.</string>
+    <string name="synced_folders_no_results">No se han encontrado carpetas de medios</string>
    <string name="synced_folders_preferences">Preferencias de subida automática</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
@ -805,6 +808,10 @@
        <item quantity="one">%1$d archivo</item>
        <item quantity="other">%1$d archivos</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Mostrar %1$d carpeta oculta</item>
+        <item quantity="other">Mostrar %1$d carpetas ocultas</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d seleccionado</item>
        <item quantity="other">%d seleccionados</item>
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">Jatorrizko karpetan mantendu da, soilik irakurtzeko delako</string>
    <string name="auto_upload_on_wifi">Igoerak neurketarik gabeko Wi-Fi bidez soilik</string>
    <string name="auto_upload_path">/Auto-karga</string>
+    <string name="autoupload_configure">Konfiguratu</string>
    <string name="autoupload_create_new_custom_folder">Sortu karpeta pertsonalizatu berriaren konfigurazioa</string>
    <string name="autoupload_custom_folder">Konfiguratu karpeta berria</string>
    <string name="autoupload_disable_power_save_check">Desgaitu energia aurrezteko kontrola</string>
+    <string name="autoupload_hide_folder">Karpeta ezkutatu</string>
    <string name="avatar">avatar</string>
    <string name="battery_optimization_close">Itxi</string>
    <string name="battery_optimization_disable">Desaktibatu</string>
@ -86,6 +88,7 @@
    <string name="battery_optimization_no_setting">Ezin dira bateriaren ezarpenak zuzenean aldatu. Aldatu eskuz gailuaren ezarpenetan.</string>
    <string name="battery_optimization_title">Bateria optimizazioa</string>
    <string name="certificate_load_problem">Arazo bat dago egiaztagiria kargatzean</string>
+    <string name="changelog_dev_version">Garapen bertsioaren aldaketa-egunkaria</string>
    <string name="checkbox">Kontrol laukia</string>
    <string name="choose_local_folder">Hautatu tokiko karpeta...</string>
    <string name="choose_remote_folder">Hautatu urruneko karpeta...</string>
@ -168,6 +171,7 @@
    <string name="copy_link">Lotura kopiatu</string>
    <string name="copy_move_to_encrypted_folder_not_supported">Une honetan ez da onartzen kopiatzea/mugitzea enkriptatutako karpetara</string>
    <string name="copy_to">Kopiatu hona…</string>
+    <string name="could_not_download_image">Ezin izan da irudi osoa jaitsi</string>
    <string name="could_not_retrieve_url">Ezin izan da URLa berreskuratu</string>
    <string name="create_dir_fail_msg">Ezin da karpeta sortu</string>
    <string name="create_file_from_template">Fitxategia txantiloitik sortzen...</string>
@ -263,6 +267,7 @@
    <string name="favorite_icon">Gogokoa</string>
    <string name="file">fitxategia</string>
    <string name="file_delete">Ezabatu</string>
+    <string name="file_detail_activity_error">Errorea fitxategiaren jarduerak berreskuratzen</string>
    <string name="file_details_no_content">Huts egin du zehaztapenak kargatzen</string>
    <string name="file_icon">Fitxategia</string>
    <string name="file_keep">Mantendu</string>
@ -502,6 +507,7 @@
    <string name="prefs_theme_title">Gaia</string>
    <string name="prefs_value_theme_dark">Iluna</string>
    <string name="prefs_value_theme_light">Argia</string>
+    <string name="prefs_value_theme_system">Jarraipen sistema</string>
    <string name="preview_image_description">Irudi aurreikuspena</string>
    <string name="preview_image_error_no_local_file">Ez dago aurreikusteko fitxategi lokalik</string>
    <string name="preview_image_error_unknown_format">Ezin izan da irudia erakutsi</string>
@ -513,6 +519,7 @@
    <string name="recommend_subject">Probatu %1$s zure gailuan!</string>
    <string name="recommend_text">%1$s zure gailuan erabiltzera gonbidatu nahi zaitut.\n Hemendik deskargatu: %2$s</string>
    <string name="recommend_urls">%1$s edo %2$s</string>
+    <string name="remote_file_fetch_failed">Fitxategia bilatzeak huts egin du!</string>
    <string name="remove_fail_msg">Ezabatzeak huts egin du</string>
    <string name="remove_notification_failed">Huts egin du jakinarazpena kentzen</string>
    <string name="remove_push_notification">Ezabatu</string>
@ -532,13 +539,17 @@
    <string name="saml_authentication_wrong_pass">Pasahitz okerra</string>
    <string name="scanQR_description">Saioa hasi QR kode bidez</string>
    <string name="screenshot_01_gridView_heading">Zure datuak babesten</string>
+    <string name="screenshot_01_gridView_subline">norberak ostatatutako produktibitatea</string>
    <string name="screenshot_02_listView_heading">Arakatu eta partekatu</string>
    <string name="screenshot_02_listView_subline">ekintza guztiak zure atzamarretan</string>
+    <string name="screenshot_03_drawer_heading">Jarduera, partekatzeak, ...</string>
    <string name="screenshot_03_drawer_subline">guztia azkar eskuragarri</string>
    <string name="screenshot_04_accounts_heading">Zure kontu guztiak</string>
    <string name="screenshot_04_accounts_subline">leku bakar batean</string>
    <string name="screenshot_05_autoUpload_heading">Igoera automatikoa</string>
    <string name="screenshot_05_autoUpload_subline">zure argazki eta bideoentzat</string>
+    <string name="screenshot_06_davdroid_heading">Egutegia eta kontaktuak</string>
+    <string name="screenshot_06_davdroid_subline">Sinkronizatu DAVx5ekin</string>
    <string name="search_users_and_groups_hint">Bilatu erabiltzaile eta taldeak</string>
    <string name="select_all">Hautatu dena</string>
    <string name="select_template">Aukeratu txantiloia</string>
@ -556,6 +567,8 @@
    <string name="share_file">Partekatu %1$s</string>
    <string name="share_get_public_link_button">Esteka lortu</string>
    <string name="share_group_clarification">%1$s (taldea)</string>
+    <string name="share_internal_link">Partekatu barne-esteka</string>
+    <string name="share_internal_link_text">%1$s honetara sartzeko baimena duten erabiltzaileentzat bakarrik funtzionatzen du</string>
    <string name="share_known_remote_clarification">%1$s (%2$s-n)</string>
    <string name="share_link_empty_password">Pasahitz bat sartu behar duzu</string>
    <string name="share_link_file_error">Errore bat egon da fitxategaia edo karpeta partekatzerakoan</string>
@ -595,6 +608,7 @@
    <string name="shared_icon_shared">partekatua</string>
    <string name="shared_icon_shared_via_link">partekatu esteka bidez</string>
    <string name="shared_with_you_by"> %1$s-(e)k zurekin partekatua</string>
+    <string name="sharee_add_failed">Hartzailea gehitzeak huts egin du</string>
    <string name="signup_with_provider">Erregistratu hornitzaile batekin</string>
    <string name="single_sign_on_request_token" formatted="true">Baimendu %1$s sartzeko zure Nextcloud kontuan%2$s?</string>
    <string name="sort_by">Ordenatu honen arabera</string>
@ -639,7 +653,11 @@
    <string name="storage_music">Musika</string>
    <string name="storage_pictures">Irudiak</string>
    <string name="store_full_desc">Zure datuak kontrolpean mantentzen dituen auto-ostatutako produktibitate platafoma.\n\n Ezaugarriak:\n* Interfazea erraza eta modernoa, zure zerbitzariaren gaira egokitzen dena\n* Kargatu fitxategiak Nextcloud zerbitzarira\n* Partekatu itzazu besteekin\n* Mantendu zure gogoko fitxategiak eta karpetak sinkronizatuta\n* Bilatu zure zerbitzariako karpeta guztietan\n* Kargatu automatikoki zure gailuan ateratako argazkiak eta bideoak\n* Egunean egon jakinarazpenen bidez\n* Kontu anitzeko laguntza\n* Sarbide segurua zure datuetarako hatzmarka edo PINaren bidez\n* DAVx5-rekin integratua (lehenago DAVdroid izenarekin ezagutzen dena) egutegiaren konfigurazio erraza konfiguratzeko&amp; Kontaktuen sinkronizazioa\n\n Eman arazoen berri https://github.com/nextcloud/android/issues orrian eta eztabaidatu aplikazio hau https://help.nextcloud.com/c/clients/android orrian\n\n Berria Nextcloud-en? Nextcloud fitxategi pribatuen sinkronizazio&amp; partekatua eta komunikazio zerbitzaria da. Software librea da, eta zuk zeuk ostatatu dezakezu edo enpresa bat ordaindu zure ordez ostatatzeko. Horrela, zure argazkiak, zure egutegia eta harremanetarako datuak, zure dokumentuak eta gainerako guztia kontrolatzen dituzu.\n\n Ezagutu Nextcloud https://nextcloud.com helbidean</string>
+    <string name="store_full_dev_desc">Agintean mantentzen zaituen produktibitate-plataforma autobabestua.\Garapenaren bertsio ofiziala da, probatu gabeko edozein funtzionalitateren eguneroko lagina hartzen duena, eta horrek ezegonkortasuna eta datu-galera eragin ditzake. Aplikazio hau probatu eta gertatzen diren akatsen berri eman nahi duten erabiltzaileentzat da. Ez erabili zure produkzio-lanerako!\n\nBerdin garapeneko bertsio normala eta ofiziala F-Droiden daude eskuragarri eta aldi berean instalatuta egon daitezke.</string>
+    <string name="store_short_desc">Kontrolpean mantentzen zaituen norberak ostatutako produktibitate plataforma</string>
+    <string name="store_short_dev_desc">Kontrolpean mantentzen zaituen norberak ostatutako produktibitate plataforma (garapen aurreikuspen bertsioa)</string>
    <string name="stream">Transmititu honekin...</string>
+    <string name="stream_not_possible_headline">Barneko streaminga ez da posible</string>
    <string name="stream_not_possible_message">Mesedez multimedia deskargatu edo erabili ezazu kanpoko aplikazio bat.</string>
    <string name="subject_shared_with_you">%1$s zurekin partekatu dute</string>
    <string name="subject_user_shared_with_you">%1$sk %2$s zurekin partekatu du</string>
@ -652,6 +670,7 @@
    <string name="sync_fail_ticker_unauthorized">Sinkronizazioak huts egin du, hasi saioa berriz</string>
    <string name="sync_file_nothing_to_do_msg">Fitxategi edukiak dagoeneko sinkronizaturik</string>
    <string name="sync_folder_failed_content"> %1$s karpetaren sinkronizazioa ezin da burutu</string>
+    <string name="sync_foreign_files_forgotten_explanation">1.3.16 bertsiotik abiatuta, gailu horretatik igotzen diren fitxategiak tokiko %1$s  tokiko karpetan kopiatzen dira, hainbat konturekin fitxategi bakarra sinkronizatzen denean datuak gal ez daitezen.\n\nAldaketa horren ondorioz, aplikazio honen aurreko bertsioekin igotako fitxategi guztiak  %2$s karpetara kopiatu dira.  Hala ere, akats batek eragotzi zuen eragiketa hori osatzea kontua sinkronizatu bitartean. Fitxategiak dauden bezala utz ditzakezu, eta fitxategiak karpetara eramateko edo mugitzeko esteka %3$sezabatu, edo fitxategiak %1$s karpetara mugitu eta %4$sesteka mantendu.\n\nAzpian, artxibo lokalak eta %5$s lotura izan zuten urruneko artxiboak erakusten dira.</string>
    <string name="sync_foreign_files_forgotten_ticker">Bertako fitxategi batzuk ahaztu dira</string>
    <string name="sync_in_progress">Fitxategiaren bertsio berriena ekartzen.</string>
    <string name="sync_status_button">Sinkronizazio egoeraren botoia</string>
@ -659,7 +678,8 @@
    <string name="synced_folder_settings_button">Ezarpenak botoia</string>
    <string name="synced_folders_configure_folders">Karpetak konfiguratu</string>
    <string name="synced_folders_loading_folders">Karpetak kargatzen...</string>
-    <string name="synced_folders_no_results">Ez da media karpetarik aurkitu.</string>
+    <string name="synced_folders_new_info">Berehalako karga erabat aldatu da. Birkonfiguratu zure karga automatikoa menu nagusitik.\n\nGozatu karga automatiko berri eta hedatuaz. </string>
+    <string name="synced_folders_no_results">Ez da media karpetarik aurkitu</string>
    <string name="synced_folders_preferences">Ezarpenak igoera automatikorako</string>
    <string name="synced_folders_preferences_folder_path"> %1$s-(r)entzat</string>
    <string name="synced_folders_type">Mota</string>
@ -695,12 +715,16 @@
    <string name="upload_file_dialog_filetype">Fitxategi mota</string>
    <string name="upload_file_dialog_filetype_googlemap_shortcut">Google Maps lasterbidearen fitxategia(%s)</string>
    <string name="upload_file_dialog_filetype_internet_shortcut">Internet lasterbidearen fitxategia(%s)</string>
+    <string name="upload_file_dialog_filetype_snippet_text">Kode-zati testu-fitxategia(.txt)</string>
+    <string name="upload_file_dialog_title">Sartu igoko den fitxategi-izena eta fitxategi mota</string>
    <string name="upload_files">Igo fitxategiak</string>
+    <string name="upload_item_action_button">Kargatu elementuaren ekintza botoia</string>
    <string name="upload_list_empty_headline">Ezin dira fitxategiak igo</string>
    <string name="upload_list_empty_text_auto_upload">Edukiak igo edo auto-igotzea aktiba ezazu.</string>
    <string name="upload_local_storage_full">Biltegiratze lokala beteta</string>
    <string name="upload_local_storage_not_copied">Ezin izan da fitxategia kopiatu biltegiratze lokalera</string>
    <string name="upload_lock_failed">Karpeta blokeatzeak huts egin du</string>
+    <string name="upload_old_android"><![CDATA[Zifratzea >= Android 5.0 bertsioarekin soilik da posible]]></string>
    <string name="upload_query_move_foreign_files">Hautatutako fitxategiak ezin dira %1$sra kopiatu ez dagoelako toki nahikorik. Kopiatu ordez bertara mugitu nahi dituzu?</string>
    <string name="upload_sync_conflict">Sinkronizazio gatazka, ebatzi eskuz</string>
    <string name="upload_unknown_error">Akats ezezaguna</string>
@ -731,6 +755,7 @@
    <string name="uploader_wrn_no_account_text">Ez dago %1$s konturik zure gailuan. Mesedez, konfiguratu kontu bat lehenbizi.</string>
    <string name="uploader_wrn_no_account_title">Ez da konturik aurkitu</string>
    <string name="uploads_view_group_current_uploads">Unekoa</string>
+    <string name="uploads_view_group_failed_uploads">Huts egin du/berrabiarazteko zain</string>
    <string name="uploads_view_group_finished_uploads">Igoa</string>
    <string name="uploads_view_later_waiting_to_upload">Igotzeko itxoiten</string>
    <string name="uploads_view_title">Igoerak</string>
@ -783,6 +808,10 @@
        <item quantity="one">fitxategi %1$d</item>
        <item quantity="other">%1$d fitxategi</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Erakutsi ezkutatutako karpeta %1$d</item>
+        <item quantity="other">Erakutsi ezkutatutako %1$d karpetak </item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">aukeratuta %d</item>
        <item quantity="other">%d aukeratuta</item>
--- a/src/main/res/values-fi-rFI/strings.xml
+++ b/src/main/res/values-fi-rFI/strings.xml
@ -663,7 +663,6 @@ GNU yleinen lisenssi, versio 2</string>
    <string name="synced_folders_configure_folders">Määritä kansiot</string>
    <string name="synced_folders_loading_folders">Ladataan kansioita…</string>
    <string name="synced_folders_new_info">Heti lähetettävien tiedostojen lähetys on uudistettu täysin. Muuta automaattisen lähetyksen asetuksia päävalikossa vastaamaan nykyistä toimintaa.\n\nNauti uudesta ja monipuolisemmasta toiminnosta.</string>
-    <string name="synced_folders_no_results">Mediakansioita ei löytynyt.</string>
    <string name="synced_folders_preferences">Automaattisen lähetyksen asetukset</string>
    <string name="synced_folders_preferences_folder_path">%1$s varten</string>
    <string name="synced_folders_type">Tyyppi</string>
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">conservé dans le dossier original (puisqu\'il est en lecture seule)</string>
    <string name="auto_upload_on_wifi">Téléverser par Wi-Fi uniquement</string>
    <string name="auto_upload_path">/EnvoiAuto</string>
+    <string name="autoupload_configure">Configurer</string>
    <string name="autoupload_create_new_custom_folder">Créer une nouvelle configuration de dossier personnalisé</string>
    <string name="autoupload_custom_folder">Configurer un dossier personnalisé</string>
    <string name="autoupload_disable_power_save_check">Désactiver l\'économie de batterie</string>
+    <string name="autoupload_hide_folder">Masquer le dossier</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Fermer</string>
    <string name="battery_optimization_disable">Désactiver</string>
@ -507,6 +509,7 @@ Attention la suppression est irréversible.</string>
    <string name="prefs_theme_title">Thème</string>
    <string name="prefs_value_theme_dark">Sombre</string>
    <string name="prefs_value_theme_light">Clair</string>
+    <string name="prefs_value_theme_system">Selon le système</string>
    <string name="preview_image_description">Prévisualisation de l\'image</string>
    <string name="preview_image_error_no_local_file">Il n\'y a aucun fichier local à prévisualiser</string>
    <string name="preview_image_error_unknown_format">L\'image ne peut pas être affichée</string>
@ -538,6 +541,7 @@ Attention la suppression est irréversible.</string>
    <string name="saml_authentication_wrong_pass">Mot de passe incorrect</string>
    <string name="scanQR_description">Connexion par code QR</string>
    <string name="screenshot_01_gridView_heading">Protection de vos données</string>
+    <string name="screenshot_01_gridView_subline">productivité auto-hébergée</string>
    <string name="screenshot_02_listView_heading">Parcourir et partager</string>
    <string name="screenshot_02_listView_subline">toutes les actions à portée de main</string>
    <string name="screenshot_03_drawer_heading">Activité, partages, …</string>
@ -677,7 +681,7 @@ Attention la suppression est irréversible.</string>
    <string name="synced_folders_configure_folders">Configurer les dossiers</string>
    <string name="synced_folders_loading_folders">Chargement des dossiers…</string>
    <string name="synced_folders_new_info">L\'envoi immédiat a été complètement refondu. Merci de reconfigurer vos envois automatiques depuis le Menu principal.\n\nProfitez des capacités nouvelles et étendues des envois automatiques.</string>
-    <string name="synced_folders_no_results">Aucun dossier média trouvé.</string>
+    <string name="synced_folders_no_results">Aucun dossier média trouvé</string>
    <string name="synced_folders_preferences">Préférences d\'envois automatiques</string>
    <string name="synced_folders_preferences_folder_path">Pour %1$s</string>
    <string name="synced_folders_type">Type</string>
@ -806,6 +810,10 @@ Attention la suppression est irréversible.</string>
        <item quantity="one">%1$d fichier</item>
        <item quantity="other">%1$d fichiers</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">%1$d dossier masqué affiché</item>
+        <item quantity="other">%1$d dossiers masqués affichés</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d sélectionné</item>
        <item quantity="other">%d sélectionnés</item>
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">mantense no cartafol orixinal, xa que é de só lectura</string>
    <string name="auto_upload_on_wifi">Enviar só con WiFi sen límite de datos</string>
    <string name="auto_upload_path">/EnvíoAutomático</string>
+    <string name="autoupload_configure">Configurar</string>
    <string name="autoupload_create_new_custom_folder">Crear un cartafol personalizado novo</string>
    <string name="autoupload_custom_folder">Estabelecer un cartafol personalizado</string>
    <string name="autoupload_disable_power_save_check">Desactivar a verificación de aforro de enerxía</string>
+    <string name="autoupload_hide_folder">Agochar o cartafol</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Pechar</string>
    <string name="battery_optimization_disable">Desactivar</string>
@ -506,6 +508,7 @@
    <string name="prefs_theme_title">Tema</string>
    <string name="prefs_value_theme_dark">Escuro</string>
    <string name="prefs_value_theme_light">Claro</string>
+    <string name="prefs_value_theme_system">Seguir o sistema</string>
    <string name="preview_image_description">Vista previa da imaxe</string>
    <string name="preview_image_error_no_local_file">Non hai ficheiro local que ver</string>
    <string name="preview_image_error_unknown_format">Non é posíbel amosar a imaxe</string>
@ -670,14 +673,14 @@
    <string name="sync_folder_failed_content">A sincronización do cartafol %1$s non se completou</string>
    <string name="sync_foreign_files_forgotten_explanation">A partires da versión 1.3.16, os ficheiros enviados dende este dispositivo cópianse no cartafol local %1$s para evitar a perda de datos cando se sincroniza un único ficheiro con varias contas.\n\nPor mor deste cambio, todos os ficheiros enviados con versións anteriores desta aplicación foron copiados no cartafol %2$s. Porén, un erro impediu que se completara esta operación durante a sincronización da conta. Pode deixar o(s) ficheiro(s) tal e como está(n) e eliminar a ligazón cara a %3$s ou mover o(s) ficheiro(s) para o cartafol %1$s e manter a ligazón cara a %4$s.\n\nEmbaixo amósanse os ficheiros locais e os ficheiros remotos en %5$s aos que foron enlazados.</string>
    <string name="sync_foreign_files_forgotten_ticker">Esquecéronse algúns ficheiros locais</string>
-    <string name="sync_in_progress">Obtendo a versión mais recente do ficheiro.</string>
+    <string name="sync_in_progress">Recuperando a versión mais recente do ficheiro.</string>
    <string name="sync_status_button">Botón do estado da sincronización</string>
    <string name="sync_string_files">Ficheiros</string>
    <string name="synced_folder_settings_button">Botón de axustes</string>
    <string name="synced_folders_configure_folders">Configurar os cartafoles</string>
    <string name="synced_folders_loading_folders">Cargando cartafoles…</string>
    <string name="synced_folders_new_info">O envío automático foi renovado completamente. Reconfigure os seus envíos instantáneos no menú principal.\n\nGoce das novas e ampliadas capacidades do envío automático!</string>
-    <string name="synced_folders_no_results">Non se atopan cartafoles multimedia.</string>
+    <string name="synced_folders_no_results">Non se atopan cartafoles multimedia</string>
    <string name="synced_folders_preferences">Preferencias de envío automático</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
@ -806,6 +809,10 @@
        <item quantity="one">%1$d ficheiro</item>
        <item quantity="other">%1$d ficheiros</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Amosar %1$d ficheiro agochado</item>
+        <item quantity="other">Amosar %1$d ficheiros agochados</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d seleccionado</item>
        <item quantity="other">%d seleccionados</item>
--- a/src/main/res/values-hr/strings.xml
+++ b/src/main/res/values-hr/strings.xml
@ -263,7 +263,9 @@
    <string name="fallback_weblogin_text">Vrati na stari način prijave</string>
    <string name="favorite">Dodaj u favorite</string>
    <string name="favorite_icon">Favorit</string>
+    <string name="file">datoteka</string>
    <string name="file_delete">Izbriši</string>
+    <string name="file_detail_activity_error">Pogreška pri dohvaćanju aktivnosti za datoteku</string>
    <string name="file_details_no_content">Učitavanje pojedinosti nije uspjelo</string>
    <string name="file_icon">Datoteka</string>
    <string name="file_keep">Zadrži</string>
@ -331,6 +333,7 @@
    <string name="first_run_2_text">Sigurna suradnja i razmjena datoteka</string>
    <string name="first_run_3_text">Jednostavna e-pošta putem interneta, kalendar i kontakti</string>
    <string name="first_run_4_text">Dijeljenje zaslona, sastanci na mreži i web konferencije</string>
+    <string name="folder">mapa</string>
    <string name="folder_already_exists">Mapa već postoji</string>
    <string name="folder_confirm_create">Stvori</string>
    <string name="folder_icon">Ikona mape</string>
@ -412,6 +415,7 @@
    <string name="new_notification">Nova obavijest</string>
    <string name="new_version_was_created">Stvorena je nova inačica</string>
    <string name="no_browser_available">Nema dostupnih aplikacija za upravljanje poveznicama</string>
+    <string name="no_mutliple_accounts_allowed">Dopušten je samo jedan račun</string>
    <string name="no_pdf_app_available">Nema dostupnih aplikacija za upravljanje PDF datotekama</string>
    <string name="note_confirm">Pošalji</string>
    <string name="note_could_not_sent">Nije moguće poslati bilješku</string>
@ -498,6 +502,9 @@
    <string name="prefs_storage_path">Put pohrane</string>
    <string name="prefs_synced_folders_local_path_title">Lokalna mapa</string>
    <string name="prefs_synced_folders_remote_path_title">Udaljena mapa</string>
+    <string name="prefs_theme_title">Tema</string>
+    <string name="prefs_value_theme_dark">Tamno</string>
+    <string name="prefs_value_theme_light">Svijetlo</string>
    <string name="preview_image_description">Pretpregled slike</string>
    <string name="preview_image_error_no_local_file">Nema lokalne datoteke za pretpregled</string>
    <string name="preview_image_error_unknown_format">Nije moguće prikazati sliku</string>
@ -509,6 +516,7 @@
    <string name="recommend_subject">Isprobajte %1$s na uređaju!</string>
    <string name="recommend_text">Želim vas pozvati da koristite %1$s na svom uređaju.\nPreuzmite ovdje: %2$s</string>
    <string name="recommend_urls">%1$s ili %2$s</string>
+    <string name="remote_file_fetch_failed">Datoteka nije pronađena!</string>
    <string name="remove_fail_msg">Brisanje nije uspjelo</string>
    <string name="remove_notification_failed">Nije uspjelo uklanjanje obavijesti.</string>
    <string name="remove_push_notification">Ukloni</string>
@ -552,6 +560,8 @@
    <string name="share_file">Dijeli %1$s</string>
    <string name="share_get_public_link_button">Preuzmi poveznicu</string>
    <string name="share_group_clarification">%1$s (grupa)</string>
+    <string name="share_internal_link">Dijeli internu poveznicu</string>
+    <string name="share_internal_link_text">Samo za korisnike koji smiju pristupiti %1$s</string>
    <string name="share_known_remote_clarification">%1$s (na %2$s)</string>
    <string name="share_link_empty_password">Morate unijeti zaporku</string>
    <string name="share_link_file_error">Došlo je do pogreške prilikom dijeljenja ove datoteke ili mape</string>
@ -662,7 +672,6 @@
    <string name="synced_folders_configure_folders">Konfiguriraj mape</string>
    <string name="synced_folders_loading_folders">Učitavanje mapa...</string>
    <string name="synced_folders_new_info">Trenutačno otpremanje datoteka potpuno je obnovljeno. Ponovno konfigurirajte automatsko otpremanje iz glavnog izbornika.\n\nUživajte u novoj i proširenoj značajci automatskog otpremanja datoteka.</string>
-    <string name="synced_folders_no_results">Nije pronađena nijedna medijska mapa.</string>
    <string name="synced_folders_preferences">Preferencije za automatsko otpremanje</string>
    <string name="synced_folders_preferences_folder_path">Za %1$s</string>
    <string name="synced_folders_type">Vrsta</string>
--- a/src/main/res/values-hu-rHU/strings.xml
+++ b/src/main/res/values-hu-rHU/strings.xml
@ -690,7 +690,6 @@ A Nextcloud itt érhető el: https://nextcloud.com</string>
    <string name="synced_folders_configure_folders">Mappák beállítása</string>
    <string name="synced_folders_loading_folders">Mappák betöltése…</string>
    <string name="synced_folders_new_info">Az azonnali feltöltés teljesen át lett dolgozva. Állítsa be újra az automatikus feltöltést a főmenüben.\n\nÉlvezze az új és kibővített automatikus feltöltést.</string>
-    <string name="synced_folders_no_results">Nincsenek médiamappák.</string>
    <string name="synced_folders_preferences">Automatikus feltöltés beállításai</string>
    <string name="synced_folders_preferences_folder_path">Neki: %1$s</string>
    <string name="synced_folders_type">Típus</string>
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@ -463,7 +463,6 @@
    <string name="synced_folders_configure_folders">Konfigurasi folder</string>
    <string name="synced_folders_loading_folders">Memuat folder…</string>
    <string name="synced_folders_new_info">Unggah instan telah dirubah sepenuhnya. Harap lihat menu utama dan konfigurasi ulang unggah otomatis anda. Maaf untuk gangguannya.\n\nNikmati kemampuan unggah otomatis yang baru!</string>
-    <string name="synced_folders_no_results">Folder media tidak ditemukan.</string>
    <string name="synced_folders_preferences">Preferensi untuk mengunggah otomatis.</string>
    <string name="synced_folders_preferences_folder_path">Untuk %1$s</string>
    <string name="test_server_button">Tes koneksi server.</string>
--- a/src/main/res/values-is/strings.xml
+++ b/src/main/res/values-is/strings.xml
@ -638,7 +638,6 @@
    <string name="synced_folders_configure_folders">Stilla möppur</string>
    <string name="synced_folders_loading_folders">Hleð inn möppum…</string>
    <string name="synced_folders_new_info">Beinar innsendingar hafa verið algerlega endurhannaðar. Endurstilltu sjálfvirkar innsendingar beint í aðalvalmyndinni\n\nNjóttu góðs af nýju og ítarlegu viðmóti sjálfvirkra innsendinga.</string>
-    <string name="synced_folders_no_results">Engar margmiðlunarmöppur fundust.</string>
    <string name="synced_folders_preferences">Kjörstillingar fyrir sjálfvirkar innsendingar</string>
    <string name="synced_folders_preferences_folder_path">Fyrir %1$s</string>
    <string name="synced_folders_type">Tegund</string>
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">lasciato nella cartella originale, poiché è in sola lettura</string>
    <string name="auto_upload_on_wifi">Carica solo su Wi-Fi senza limitazioni</string>
    <string name="auto_upload_path">/AutoUpload</string>
+    <string name="autoupload_configure">Configura</string>
    <string name="autoupload_create_new_custom_folder">Crea nuova configurazione di cartella personalizzata</string>
    <string name="autoupload_custom_folder">Configura una cartella personalizzata</string>
    <string name="autoupload_disable_power_save_check">Disabilita controllo di risparmio energetico</string>
+    <string name="autoupload_hide_folder">Nascondi cartella</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Chiudi</string>
    <string name="battery_optimization_disable">Disabilita</string>
@ -505,6 +507,7 @@
    <string name="prefs_theme_title">Tema</string>
    <string name="prefs_value_theme_dark">Scuro</string>
    <string name="prefs_value_theme_light">Chiaro</string>
+    <string name="prefs_value_theme_system">Segui il sistema</string>
    <string name="preview_image_description">Anteprima dell\'immagine</string>
    <string name="preview_image_error_no_local_file">Non esiste un file locale per l\'anteprima</string>
    <string name="preview_image_error_unknown_format">Impossibile mostrare l\'immagine</string>
@ -676,7 +679,7 @@
    <string name="synced_folders_configure_folders">Configura cartelle</string>
    <string name="synced_folders_loading_folders">Caricamento cartelle…</string>
    <string name="synced_folders_new_info">Il caricamento istantaneo è stato riscritto completamente. Riconfigura il caricamento automatico dal menu principale.\n\nGoditi il nuovo ed esteso caricamento automatico.</string>
-    <string name="synced_folders_no_results">Nessuna cartella di file multimediali trovata.</string>
+    <string name="synced_folders_no_results">Nessuna cartella multimediale trovata</string>
    <string name="synced_folders_preferences">Preferenze per il caricamento automatico</string>
    <string name="synced_folders_preferences_folder_path">Per %1$s</string>
    <string name="synced_folders_type">Tipo</string>
@ -805,6 +808,10 @@
        <item quantity="one">%1$d file</item>
        <item quantity="other">%1$d file</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Mostra %1$d cartella nascosta</item>
+        <item quantity="other">Mostra %1$d cartelle nascoste</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d selezionato</item>
        <item quantity="other">%d selezionati</item>
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">נשאר בתיקייה המקומית כיוון שהיא לקריאה בלבד</string>
    <string name="auto_upload_on_wifi">להעלות רק ברשת אלחוטית ללא מדידת כמות</string>
    <string name="auto_upload_path">/העלאה אוטומטית</string>
+    <string name="autoupload_configure">הגדרה</string>
    <string name="autoupload_create_new_custom_folder">יצירת התקנה בתיקייה בהתאמה אישית</string>
    <string name="autoupload_custom_folder">הגדרת תיקייה בהתאמה אישית</string>
    <string name="autoupload_disable_power_save_check">השבתת בדיקת חיסכון בחשמל</string>
+    <string name="autoupload_hide_folder">הסתרת תיקייה</string>
    <string name="avatar">תמונה מייצגת</string>
    <string name="battery_optimization_close">סגירה</string>
    <string name="battery_optimization_disable">השבתה</string>
@ -169,6 +171,7 @@
    <string name="copy_link">העתקת קישור</string>
    <string name="copy_move_to_encrypted_folder_not_supported">נכון לעכשיו, אין תמיכה בהעתקה/העברה לתיקייה מוצפנת.</string>
    <string name="copy_to">העתק אל…</string>
+    <string name="could_not_download_image">לא ניתן להוריד את התמונה המלאה</string>
    <string name="could_not_retrieve_url">לא ניתן לקבל כתובת</string>
    <string name="create_dir_fail_msg">לא ניתן ליצור תיקייה</string>
    <string name="create_file_from_template">נוצר קובץ מתבנית…</string>
@ -201,6 +204,7 @@
    <string name="downloader_download_succeeded_ticker">הורדה</string>
    <string name="downloader_not_downloaded_yet">לא הורד עדיין</string>
    <string name="drawer_close">סגירת סרגל הצד</string>
+    <string name="drawer_community">קהילה</string>
    <string name="drawer_current_account">חשבון נוכחי</string>
    <string name="drawer_end_account">חשבון אחרון</string>
    <string name="drawer_header_background">תמונת רקע של כותרת מגירה</string>
@ -256,11 +260,14 @@
    <string name="etm_title">מצב בדיקת מהנדסים</string>
    <string name="fab_label">הוספה או העלאה</string>
    <string name="failed_to_download">העברת הקובץ למנהל ההורדות נכשלה</string>
+    <string name="failed_to_print">הדפסת הקובץ נכשלה</string>
    <string name="fallback_weblogin_back">חזרה</string>
    <string name="fallback_weblogin_text">החזרה לשיטת כניסה ישנה</string>
    <string name="favorite">הוספה למועדפים</string>
    <string name="favorite_icon">סימון כמועדף</string>
+    <string name="file">קובץ</string>
    <string name="file_delete">מחיקה</string>
+    <string name="file_detail_activity_error">שגיאה בקבלת הפעילויות לקובץ</string>
    <string name="file_details_no_content">טעינת הפרטים נכשלה</string>
    <string name="file_icon">קובץ</string>
    <string name="file_keep">שימור</string>
@ -328,6 +335,7 @@
    <string name="first_run_2_text">שיתוף פעולה והעברת קבצים באופן מאובטח</string>
    <string name="first_run_3_text">אתר מייל, לוח שנה ואנשי קשר נוחים לשימוש</string>
    <string name="first_run_4_text">שיתוף מסך, פגישות מקוונות וכנסים מקוונים</string>
+    <string name="folder">תיקייה</string>
    <string name="folder_already_exists">התיקייה כבר קיימת</string>
    <string name="folder_confirm_create">יצירה</string>
    <string name="folder_icon">סמל תיקייה</string>
@ -409,6 +417,7 @@
    <string name="new_notification">התראה חדשה</string>
    <string name="new_version_was_created">נוצרה גרסה חדשה</string>
    <string name="no_browser_available">אין יישומון שיכול לטפל בקישורים</string>
+    <string name="no_mutliple_accounts_allowed">מותר חשבון אחד בלבד</string>
    <string name="no_pdf_app_available">אין יישומים זמינים לטיפול ב־PDF</string>
    <string name="note_confirm">שליחה</string>
    <string name="note_could_not_sent">לא ניתן לשלוח מסר</string>
@ -495,6 +504,10 @@
    <string name="prefs_storage_path">נתיב אחסון</string>
    <string name="prefs_synced_folders_local_path_title">תיקייה מקומית</string>
    <string name="prefs_synced_folders_remote_path_title">תיקייה מרוחקת</string>
+    <string name="prefs_theme_title">ערכת עיצוב</string>
+    <string name="prefs_value_theme_dark">כהה</string>
+    <string name="prefs_value_theme_light">בהירה</string>
+    <string name="prefs_value_theme_system">כמו המערכת</string>
    <string name="preview_image_description">תצוגה מקדימה לתמונה</string>
    <string name="preview_image_error_no_local_file">אין קובץ מקומי לתצוגה מקדימה</string>
    <string name="preview_image_error_unknown_format">לא ניתן להציג תמונה</string>
@ -506,6 +519,7 @@
    <string name="recommend_subject">לנסות את %1$s בהתקן שלך!</string>
    <string name="recommend_text">אשמח להזמין אותך להשתמש ב־%1$s במכשיר שלך.\nניתן להוריד מכאן: %2$s</string>
    <string name="recommend_urls">%1$s או %2$s</string>
+    <string name="remote_file_fetch_failed">איתור הקובץ נכשל!</string>
    <string name="remove_fail_msg">המחיקה נכשלה</string>
    <string name="remove_notification_failed">הסרת ההתראה נכשלה.</string>
    <string name="remove_push_notification">הסרה</string>
@ -525,13 +539,17 @@
    <string name="saml_authentication_wrong_pass">סיסמא שגוייה</string>
    <string name="scanQR_description">כניסה עם קוד QR</string>
    <string name="screenshot_01_gridView_heading">הגנה על הנתונים שלך</string>
+    <string name="screenshot_01_gridView_subline">כלי משרד באירוח עצמי</string>
    <string name="screenshot_02_listView_heading">עיון ושיתוף</string>
    <string name="screenshot_02_listView_subline">כל הפעולות בהינף יד</string>
+    <string name="screenshot_03_drawer_heading">פעילות, שיתופים, …</string>
    <string name="screenshot_03_drawer_subline">הכול נגיש במהירות</string>
    <string name="screenshot_04_accounts_heading">כל החשבונות שלך</string>
    <string name="screenshot_04_accounts_subline">במקום אחד</string>
    <string name="screenshot_05_autoUpload_heading">העלאה אוטומטית</string>
    <string name="screenshot_05_autoUpload_subline">לתמונות ולסרטונים שלך</string>
+    <string name="screenshot_06_davdroid_heading">לוח שנה ואנשי קשר</string>
+    <string name="screenshot_06_davdroid_subline">סנכרון עם DAVx5</string>
    <string name="search_users_and_groups_hint">חיפוש משתמשים וקבוצות</string>
    <string name="select_all">בחר הכל</string>
    <string name="select_template">בחירת תבנית</string>
@ -549,6 +567,8 @@
    <string name="share_file">שיתוף %1$s</string>
    <string name="share_get_public_link_button">קבלת קישור</string>
    <string name="share_group_clarification">%1$s (קבוצה)</string>
+    <string name="share_internal_link">שיתוף קישור פנימי</string>
+    <string name="share_internal_link_text">עובד עבור משתמשים עם גישה ל%1$s הזו</string>
    <string name="share_known_remote_clarification">%1$s ( ב- %2$s )</string>
    <string name="share_link_empty_password">יש להכניס סיסמא</string>
    <string name="share_link_file_error">שגיאה אירעה בזמן ניסיון לשתף קובץ זה או תיקייה זו</string>
--- a/src/main/res/values-ja-rJP/strings.xml
+++ b/src/main/res/values-ja-rJP/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">読み取り専用のため元のフォルダに残しました</string>
    <string name="auto_upload_on_wifi">定額制 Wi-Fi でのみアップロード</string>
    <string name="auto_upload_path">/AutoUpload</string>
+    <string name="autoupload_configure">設定</string>
    <string name="autoupload_create_new_custom_folder">新しいカスタムフォルダセットアップを作成する</string>
    <string name="autoupload_custom_folder">カスタムフォルダを設定する</string>
    <string name="autoupload_disable_power_save_check">省電力チェックを無効化</string>
+    <string name="autoupload_hide_folder">フォルダを隠す</string>
    <string name="avatar">アバター</string>
    <string name="battery_optimization_close">閉じる</string>
    <string name="battery_optimization_disable">無効</string>
@ -255,6 +257,7 @@
    <string name="error_retrieving_templates">テンプレートの取得中にエラーが発生しました</string>
    <string name="error_starting_direct_camera_upload">カメラ起動エラー</string>
    <string name="etm_preferences">環境設定</string>
+    <string name="etm_title">開発者用テストモード</string>
    <string name="fab_label">追加またはアップロード</string>
    <string name="failed_to_download">ダウンロードマネージャーにファイルを渡せませんでした</string>
    <string name="failed_to_print">ファイルの印刷に失敗</string>
@ -262,7 +265,9 @@
    <string name="fallback_weblogin_text">古いログイン方法へ戻す</string>
    <string name="favorite">お気に入りに追加</string>
    <string name="favorite_icon">お気に入り</string>
+    <string name="file">ファイル</string>
    <string name="file_delete">削除</string>
+    <string name="file_detail_activity_error">ファイルのアクティビティ取得エラー</string>
    <string name="file_details_no_content">詳細のロードに失敗しました</string>
    <string name="file_icon">ファイル</string>
    <string name="file_keep">保持</string>
@ -330,6 +335,7 @@
    <string name="first_run_2_text">セキュアなコラボレーションとファイル交換</string>
    <string name="first_run_3_text">使いやすいWebメールやカレンダーや連絡先</string>
    <string name="first_run_4_text">画面共有やオンラインミーティングやウェブ会議</string>
+    <string name="folder">フォルダー</string>
    <string name="folder_already_exists">フォルダーはすでに存在します</string>
    <string name="folder_confirm_create">作成</string>
    <string name="folder_icon">フォルダアイコン</string>
@ -370,7 +376,9 @@
    <string name="logs_menu_refresh">更新</string>
    <string name="logs_menu_search">ログを検索</string>
    <string name="logs_menu_send">ログをメールで送信</string>
+    <string name="logs_status_filtered">ログ: %1$d kB, 一致 %2$d 件 / %3$d 件、%4$d ms </string>
    <string name="logs_status_loading">読み込み中…</string>
+    <string name="logs_status_not_filtered">ログ: %1$d kB, フィルタ無し</string>
    <string name="logs_title">ログ</string>
    <string name="maintenance_mode">サーバーはメンテナンスモードです。</string>
    <string name="manage_space_clear_data">データのクリア</string>
@ -409,6 +417,7 @@
    <string name="new_notification">新しい通知</string>
    <string name="new_version_was_created">新しいバージョンが作成されました</string>
    <string name="no_browser_available">リンクを処理するアプリがありません</string>
+    <string name="no_mutliple_accounts_allowed">利用できるアカウントは１つだけです</string>
    <string name="no_pdf_app_available">PDFを処理するアプリケーションがありません</string>
    <string name="note_confirm">送信</string>
    <string name="note_could_not_sent">メモを送信できませんでした</string>
@ -495,6 +504,10 @@
    <string name="prefs_storage_path">ストレージの場所</string>
    <string name="prefs_synced_folders_local_path_title">ローカルフォルダー</string>
    <string name="prefs_synced_folders_remote_path_title">リモートフォルダー</string>
+    <string name="prefs_theme_title">テーマ</string>
+    <string name="prefs_value_theme_dark">暗い</string>
+    <string name="prefs_value_theme_light">明るい</string>
+    <string name="prefs_value_theme_system">システムの設定に従う</string>
    <string name="preview_image_description">イメージプレビュー</string>
    <string name="preview_image_error_no_local_file">プレビューするローカルファイルはありません</string>
    <string name="preview_image_error_unknown_format">画像を表示できません</string>
@ -506,6 +519,7 @@
    <string name="recommend_subject">デバイスで %1$s をお試しください</string>
    <string name="recommend_text">あなたのデバイスで %1$s を使用してください。\nダウンロードはこちらです: %2$s</string>
    <string name="recommend_urls">%1$s または %2$s</string>
+    <string name="remote_file_fetch_failed">ファイルが見つかりません！</string>
    <string name="remove_fail_msg">削除失敗</string>
    <string name="remove_notification_failed">通知の削除に失敗</string>
    <string name="remove_push_notification">削除</string>
@ -525,10 +539,17 @@
    <string name="saml_authentication_wrong_pass">パスワードが間違っています</string>
    <string name="scanQR_description">QRコードを用いてログイン</string>
    <string name="screenshot_01_gridView_heading">あなたのデータを保護</string>
+    <string name="screenshot_01_gridView_subline">自己ホスト型の生産性</string>
    <string name="screenshot_02_listView_heading">閲覧と共有</string>
+    <string name="screenshot_02_listView_subline">すべての操作をあなたの指で</string>
+    <string name="screenshot_03_drawer_heading">アクティビティ、共有、 …</string>
+    <string name="screenshot_03_drawer_subline">あらゆるものにすぐにアクセスできます</string>
    <string name="screenshot_04_accounts_heading">あなたのすべてのアカウント</string>
    <string name="screenshot_04_accounts_subline">ひとつの場所に</string>
    <string name="screenshot_05_autoUpload_heading">自動アップロード</string>
+    <string name="screenshot_05_autoUpload_subline">あなたの写真&amp;ビデオ</string>
+    <string name="screenshot_06_davdroid_heading">カレンダー &amp; 連絡先</string>
+    <string name="screenshot_06_davdroid_subline">DAVx5で同期</string>
    <string name="search_users_and_groups_hint">ユーザーとグループを検索</string>
    <string name="select_all">すべて選択</string>
    <string name="select_template">テンプレートを選択する</string>
@ -546,6 +567,8 @@
    <string name="share_file">%1$s を共有</string>
    <string name="share_get_public_link_button">リンクを取得</string>
    <string name="share_group_clarification">%1$s (グループ)</string>
+    <string name="share_internal_link">内部リンクを共有</string>
+    <string name="share_internal_link_text">この %1$sにアクセスできるユーザーにのみ機能します</string>
    <string name="share_known_remote_clarification">%1$s ( %2$s で)</string>
    <string name="share_link_empty_password">パスワードを入力しなければなりません</string>
    <string name="share_link_file_error">このファイルまたはフォルダーを共有する際にエラーが発生しました</string>
@ -629,6 +652,10 @@
    <string name="storage_movies">動画</string>
    <string name="storage_music">音楽</string>
    <string name="storage_pictures">写真</string>
+    <string name="store_full_desc">あなたの管理下にあり続ける、自己ホスト型の生産性プラットフォーム\n\nフィーチャー：\n* 簡単でモダンなインターフェースであなたのサーバに適合\n* あなたのNextcloudサーバにファイルをアップロード\n* ファイルの共有\n* お気に入りのファイルやフォルダをいつでも同期\n* サーバのすべてのフォルダをまたいで検索\n* あなたのデバイスで撮影した写真やビデオの自動アップロード\n* 更新の通知\n* 複数アカウントのサポート\n* 指紋やPIN認証であなたのデータに安全にアクセス\n* DAVx5 (旧称 DAVdroid) との統合によりカレンダー&amp;連絡先の同期を簡単にセットアップ\n\n問題の報告は https://github.com/nextcloud/android/issues 、アプリについての議論は https://help.nextcloud.com/c/clients/android まで\n\nNextcloudは初めてですか? Nextcloud は個人ファイルの同期&amp;共有とコミュニケーションのためのサーバです。無償のソフトウェアにより自分のためのホストをたてたり、そのための有償サービスを企業から受けることが出来るので、あなたの写真やカレンダー、連絡先、ドキュメントその他あらゆるファイルを自身でコントロールできます。\n\nNextcloud 詳細は https://nextcloud.com まで。</string>
+    <string name="store_full_dev_desc">あなたの管理下にあり続ける、自己ホスト型の生産性プラットフォーム。\nこれは公式の開発バージョンです。テストされていない新しい機能のサンプルを毎日提供しており、不安定やデータの消失を招く可能性があります。 このアプリはテストユーザーのためのもので、バグが発生した場合にレポートを必要とします。 実業務では使用しないでください！\n\n公式開発の正規バージョンはF-droidからもインストールできます。</string>
+    <string name="store_short_desc">あなたの管理下にあり続ける、自己ホスト型の生産性プラットフォーム</string>
+    <string name="store_short_dev_desc">あなたの管理下にあり続ける、自己ホスト型の生産性プラットフォーム（開発プレビューバージョン）</string>
    <string name="stream">ストリームと...</string>
    <string name="stream_not_possible_headline">内部ストリーミングは不可能</string>
    <string name="stream_not_possible_message">代わりにメディアをダウンロードするか、外部アプリを使用してください。</string>
@ -652,7 +679,7 @@
    <string name="synced_folders_configure_folders">フォルダの設定</string>
    <string name="synced_folders_loading_folders">フォルダーの読み込み中…</string>
    <string name="synced_folders_new_info">インスタントアップロードは完全に改訂されました。 メインメニューから自動アップロードを再設定してください。\n\n新しく拡張された自動アップロードをお楽しみください。</string>
-    <string name="synced_folders_no_results">メディアフォルダーが見つかりません。</string>
+    <string name="synced_folders_no_results">メディアフォルダーが見つかりません</string>
    <string name="synced_folders_preferences">自動アップロード設定</string>
    <string name="synced_folders_preferences_folder_path">%1$sの</string>
    <string name="synced_folders_type">タイプ</string>
@ -777,6 +804,9 @@
    <plurals name="file_list__footer__file">
        <item quantity="other">%1$d ファイル</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="other">%1$d 件の隠しフォルダを表示する</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="other">%d 選択</item>
    </plurals>
--- a/src/main/res/values-ka-rGE/strings.xml
+++ b/src/main/res/values-ka-rGE/strings.xml
@ -418,7 +418,6 @@
    <string name="synced_folder_settings_button">პარამეტრების ღილაკი</string>
    <string name="synced_folders_configure_folders">დირექტორიების კონფიგურაცია</string>
    <string name="synced_folders_new_info">მყისიერი ატვირთვა სრულიად გამოსწორდა. ავტო-ატვირთვას რეკონფიგურაცია გაუწიეთ მთავარი მენიუდან.\n\nისიამოვნეთ ახალი და გაუმჯობესებული ავტო-ატვირთვით.</string>
-    <string name="synced_folders_no_results">მედია დირექტორიები ვერ იქნა ნაპოვნი.</string>
    <string name="synced_folders_preferences">პრეფერენციები ავტო-ატვირთვაზე</string>
    <string name="synced_folders_preferences_folder_path">%1$s-ისთვის</string>
    <string name="synced_folders_type">სახეობა</string>
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@ -668,7 +668,6 @@
    <string name="synced_folders_configure_folders">폴더 설정</string>
    <string name="synced_folders_loading_folders">폴더 불러오는 중…</string>
    <string name="synced_folders_new_info">즉석 업로드가 완전히 변경되었습니다. 주 메뉴에서 자동 업로드를 다시 설정해 주십시오.\n\n새롭게 강화된 자동 업로드 기능을 활용하십시오.</string>
-    <string name="synced_folders_no_results">미디어 폴더를 찾을 수 없습니다.</string>
    <string name="synced_folders_preferences">자동 업로드 설정</string>
    <string name="synced_folders_preferences_folder_path">%1$s</string>
    <string name="synced_folders_type">종류</string>
--- a/src/main/res/values-lt-rLT/strings.xml
+++ b/src/main/res/values-lt-rLT/strings.xml
@ -74,6 +74,7 @@
    <string name="auto_upload_path">automatinis paleidimas</string>
    <string name="autoupload_create_new_custom_folder">Naujas aplanko nustatymas</string>
    <string name="autoupload_custom_folder">Pritaikyti aplanką</string>
+    <string name="autoupload_hide_folder">Slėpti aplanką</string>
    <string name="avatar">Avataras</string>
    <string name="battery_optimization_close">Užverti</string>
    <string name="battery_optimization_disable">Išjungti</string>
@ -300,6 +301,7 @@
    <string name="local_folder_list_empty">Nėra kitų aplankų</string>
    <string name="log_send_mail_subject">%1$s Android žurnalai</string>
    <string name="log_send_no_mail_app">Nėra programėlės įrašams siųsti. Prašome instaliuoti el. pašto klientą.</string>
+    <string name="logs_menu_delete">Ištrinti žurnalus</string>
    <string name="logs_menu_refresh">Įkelti iš naujo</string>
    <string name="logs_status_loading">Įkeliama…</string>
    <string name="maintenance_mode">Serveris yra techninės priežiūros veiksenoje</string>
@ -394,6 +396,9 @@
    <string name="prefs_storage_path">Saugojimo kelias</string>
    <string name="prefs_synced_folders_local_path_title">Aplankas vietinis</string>
    <string name="prefs_synced_folders_remote_path_title">Nuotolinis aplankas</string>
+    <string name="prefs_theme_title">Apipavidalinimas</string>
+    <string name="prefs_value_theme_dark">Tamsus</string>
+    <string name="prefs_value_theme_light">Šviesus</string>
    <string name="preview_image_description">Paveikslėlio peržiūra</string>
    <string name="preview_image_error_no_local_file">Nėra vietinio failo peržiūrai</string>
    <string name="preview_image_error_unknown_format">Nepavyko parodyti paveikslo</string>
@ -421,6 +426,7 @@
    <string name="richdocuments_failed_to_load_document">Nepavyko įkelti dokumento!</string>
    <string name="saml_authentication_required_text">Reikalingas slaptažodis</string>
    <string name="saml_authentication_wrong_pass">Neteisingas slaptažodis</string>
+    <string name="scanQR_description">Prisijungti per QR kodą</string>
    <string name="search_users_and_groups_hint">Ieškoti naudotojų ar grupių</string>
    <string name="select_all">Pažymėti viską</string>
    <string name="send">Siųsti</string>
@ -445,7 +451,8 @@
    <string name="share_no_users">Su vartotojais niekuo nesidalinama</string>
    <string name="share_password_title">Apsaugota slaptažodžiu</string>
    <string name="share_privilege_can_edit">gali redaguoti</string>
-    <string name="share_privilege_can_share">gali dalintis</string>
+    <string name="share_privilege_can_edit_delete">gali ištrinti</string>
+    <string name="share_privilege_can_share">gali bendrinti</string>
    <string name="share_remote_clarification">%1$s (nuotolinis)</string>
    <string name="share_search">Vardas, federacinės debesijos ID arba el. pašto adresas…</string>
    <string name="share_send_note">Pastaba gavėjui</string>
@ -509,7 +516,6 @@
    <string name="synced_folders_configure_folders">Konfigūruokite aplankus</string>
    <string name="synced_folders_loading_folders">Įkeliami aplankai…</string>
    <string name="synced_folders_new_info">Momentinis įkėlimas buvo visiškai sutaisytas. Perkonfigūruokite automatinius įkėlimus per pagrindinį meniu.\n\nMėgaukitės naujuoju automatiniu įkėlimu.</string>
-    <string name="synced_folders_no_results">Medijos aplankų nerasta</string>
    <string name="synced_folders_preferences">Pageidaujami nustatymai automatiniam įkėlimui</string>
    <string name="synced_folders_preferences_folder_path">Dėl %1$s</string>
    <string name="synced_folders_type">Tipas</string>
@ -517,6 +523,7 @@
    <string name="tags">Žymės</string>
    <string name="test_server_button">Prisijunkite prie serverio</string>
    <string name="thumbnail">Miniatiūra</string>
+    <string name="timeout_richDocuments">Įkėlimas užima labai ilgai…</string>
    <string name="trashbin_activity_title">Ištrinti failai</string>
    <string name="trashbin_empty_headline">Ištrintų failų nėra</string>
    <string name="trashbin_empty_message">Čia galėsite atkurti ištrintus failus</string>
@ -524,6 +531,7 @@
    <string name="trashbin_file_not_restored">Nepavyko atkurti failo %1$s!</string>
    <string name="trashbin_loading_failed">Nepavyko įkelti šiukšlinės!</string>
    <string name="trashbin_not_emptied">Nepavyko ištrinti failų visam laikui!</string>
+    <string name="unread_comments">Yra neskaitytų komentarų</string>
    <string name="unset_favorite">Šalinti iš mėgstamų</string>
    <string name="unshare_link_file_error">Įvyko klaida bandant nebedalinti šio failu ar aplanku</string>
    <string name="unshare_link_file_no_exist">Nepavyksta nebedalinti. Patikrinkite ar failas egzistuoja</string>
@ -619,4 +627,10 @@
        <item quantity="many">%1$d failų</item>
        <item quantity="other">%1$d failas</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Rodyti %1$d paslėptą aplanką</item>
+        <item quantity="few">Rodyti %1$d paslėptus aplankus</item>
+        <item quantity="many">Rodyti %1$d paslėptų aplankų</item>
+        <item quantity="other">Rodyti %1$d paslėptą aplanką</item>
+    </plurals>
    </resources>
--- a/src/main/res/values-lv/strings.xml
+++ b/src/main/res/values-lv/strings.xml
@ -450,7 +450,6 @@
    <string name="sync_foreign_files_forgotten_ticker">Dažas lokālās datnes tika aizmirstas</string>
    <string name="sync_string_files">Datnes</string>
    <string name="synced_folders_loading_folders">Ielādē mapes…</string>
-    <string name="synced_folders_no_results">Nav atrastas multivides mapes.</string>
    <string name="synced_folders_preferences">Iestatījumi automātiskai augšupielādei</string>
    <string name="synced_folders_preferences_folder_path">Priekš %1$s</string>
    <string name="synced_folders_type">Tips</string>
--- a/src/main/res/values-mk/strings.xml
+++ b/src/main/res/values-mk/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">се чува во оргиналната папка, како да се само за читање</string>
    <string name="auto_upload_on_wifi">Прикачувај само на неограничена Wi-Fi мрежа</string>
    <string name="auto_upload_path">/Автоматско прикачување</string>
+    <string name="autoupload_configure">Конфигурирај</string>
    <string name="autoupload_create_new_custom_folder">Креирај нова папка за инсталација</string>
    <string name="autoupload_custom_folder">Креирај нова папка</string>
    <string name="autoupload_disable_power_save_check">Оневозможи проверка за заштеда на енергија</string>
+    <string name="autoupload_hide_folder">Сокриј папка</string>
    <string name="avatar">Аватар</string>
    <string name="battery_optimization_close">Затвори</string>
    <string name="battery_optimization_disable">Оневозможи</string>
@ -246,6 +248,7 @@
    <string name="fallback_weblogin_text">Врти се на стариот начин на за најавување</string>
    <string name="favorite">Додади во фаворити</string>
    <string name="favorite_icon">Омилен</string>
+    <string name="file">датотека</string>
    <string name="file_delete">Избриши</string>
    <string name="file_detail_activity_error">Грешка при превземањето на активностите за датотеката</string>
    <string name="file_details_no_content">Неуспешно вчитување на деталите</string>
@ -315,6 +318,7 @@
    <string name="first_run_2_text">Безбедна соработка &amp; пренос на датотеки</string>
    <string name="first_run_3_text">Лесно за користење веб базирана е-пошта &amp; контакти</string>
    <string name="first_run_4_text">Споделување на екранот, онлајн состаноци &amp; веб конференции</string>
+    <string name="folder">папка</string>
    <string name="folder_already_exists">Папката веќе постои</string>
    <string name="folder_confirm_create">Креирај</string>
    <string name="folder_icon">Икона на папка</string>
@ -519,11 +523,13 @@
    <string name="screenshot_01_gridView_heading">Заштитете ги вашите податоци</string>
    <string name="screenshot_02_listView_heading">Прелистај и сподели</string>
    <string name="screenshot_02_listView_subline">сите активности се во вашите раце</string>
+    <string name="screenshot_03_drawer_heading">Активности, споделувања, ...</string>
    <string name="screenshot_03_drawer_subline">сè брзо достапно</string>
    <string name="screenshot_04_accounts_heading">Сите ваши сметки</string>
    <string name="screenshot_04_accounts_subline">на едно место</string>
    <string name="screenshot_05_autoUpload_heading">Автоматско прикачување</string>
    <string name="screenshot_05_autoUpload_subline">за вашите слики &amp; видеа</string>
+    <string name="screenshot_06_davdroid_heading">Календар &amp; контакти</string>
    <string name="search_users_and_groups_hint">Пребарувај корисници и групи</string>
    <string name="select_all">Избери се</string>
    <string name="select_template">Избери шаблон</string>
@ -541,6 +547,8 @@
    <string name="share_file">Сподели %1$s</string>
    <string name="share_get_public_link_button">Земете линк</string>
    <string name="share_group_clarification">%1$s (група)</string>
+    <string name="share_internal_link">Сподели внатрешен линк</string>
+    <string name="share_internal_link_text">Функционира само за корисници со пристап до оваа %1$s</string>
    <string name="share_known_remote_clarification">%1$s ( на %2$s )</string>
    <string name="share_link_empty_password">Морате да внесете лозинка</string>
    <string name="share_link_file_error">Се случи грешка кога пробав да ја споделам оваа папка</string>
@ -780,6 +788,10 @@
        <item quantity="one">%1$d датотека</item>
        <item quantity="other">%1$d датотеки</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Прикажи %1$d сокриена папка</item>
+        <item quantity="other">Прикажи %1$d сокриени папки</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d означена</item>
        <item quantity="other">%d означени</item>
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@ -79,6 +79,7 @@
    <string name="autoupload_create_new_custom_folder">Lag nytt tilpasset mappe-oppsett</string>
    <string name="autoupload_custom_folder">Sett opp en tilpasset mappe</string>
    <string name="autoupload_disable_power_save_check">Deaktivere strømsparing sjekk</string>
+    <string name="autoupload_hide_folder">Skjul mappe</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Lukk</string>
    <string name="battery_optimization_disable">Deaktiver</string>
@ -260,6 +261,7 @@
    <string name="fallback_weblogin_text">Gå tilbake til gammel innloggingsmetode</string>
    <string name="favorite">Legg til i favoritter</string>
    <string name="favorite_icon">Favoritt</string>
+    <string name="file">fil</string>
    <string name="file_delete">Slett</string>
    <string name="file_details_no_content">Klarte ikke å laste inn detaljer</string>
    <string name="file_icon">Fil</string>
@ -328,6 +330,7 @@
    <string name="first_run_2_text">Sikkert samarbeid &amp; fil utveksling</string>
    <string name="first_run_3_text">Brukervennlig e-post på web, kalender &amp; kontakter </string>
    <string name="first_run_4_text">Deling av skjerm, online møter &amp; samtaler på web</string>
+    <string name="folder">mappe</string>
    <string name="folder_already_exists">Mappe finnes allerede</string>
    <string name="folder_confirm_create">Opprett</string>
    <string name="folder_icon">Mappeikon</string>
@ -648,7 +651,6 @@
    <string name="synced_folders_configure_folders">Sett opp mapper</string>
    <string name="synced_folders_loading_folders">Laster inn mapper…</string>
    <string name="synced_folders_new_info">Umiddelbar opplasting er fullstendig omarbeidet. Du må sette opp auto-opplasting på nytt fra hovedmenyen.\n\nKos deg med den nye og utvidede auto-opplastingen.</string>
-    <string name="synced_folders_no_results">Ingen mediamapper funnet.</string>
    <string name="synced_folders_preferences">Alternativer for auto-opplasting</string>
    <string name="synced_folders_preferences_folder_path">For %1$s</string>
    <string name="synced_folders_type">Type</string>
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@ -672,7 +672,6 @@
    <string name="synced_folders_configure_folders">Mappen instellen</string>
    <string name="synced_folders_loading_folders">Mappen laden…</string>
    <string name="synced_folders_new_info">Automatisch uploaden is helemaal herzien. Herconfigureer je auto-uploadfunctie in het hoofdmenu.\n\nVeel plezier met de nieuwe en meer uitgebreide auto-upload.</string>
-    <string name="synced_folders_no_results">Geen mediamappen gevonden.</string>
    <string name="synced_folders_preferences">Voorkeuren voor automatisch uploaden</string>
    <string name="synced_folders_preferences_folder_path">Voor %1$s</string>
    <string name="synced_folders_type">Type</string>
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">zachowany w oryginalnym katalogu, jak jest tylko do odczytu</string>
    <string name="auto_upload_on_wifi">Wysyłaj tylko przez Wi-Fi</string>
    <string name="auto_upload_path">/AutoUpload</string>
+    <string name="autoupload_configure">Konfiguruj</string>
    <string name="autoupload_create_new_custom_folder">Stwórz nowy własny katalog</string>
    <string name="autoupload_custom_folder">Ustaw własny katalog</string>
    <string name="autoupload_disable_power_save_check">Wyłącz kontrolę oszczędzania energii</string>
+    <string name="autoupload_hide_folder">Ukryj katalog</string>
    <string name="avatar">Awatar</string>
    <string name="battery_optimization_close">Zamknij</string>
    <string name="battery_optimization_disable">Wyłącz</string>
@ -505,6 +507,7 @@
    <string name="prefs_theme_title">Motyw</string>
    <string name="prefs_value_theme_dark">Ciemny</string>
    <string name="prefs_value_theme_light">Jasny</string>
+    <string name="prefs_value_theme_system">Śledź system</string>
    <string name="preview_image_description">Podgląd</string>
    <string name="preview_image_error_no_local_file">Brak lokalnego pliku do podglądu</string>
    <string name="preview_image_error_unknown_format">Nie można wyświetlić obrazu</string>
@ -676,7 +679,7 @@
    <string name="synced_folders_configure_folders">Skonfiguruj katalogi</string>
    <string name="synced_folders_loading_folders">Pobieram katalogi…</string>
    <string name="synced_folders_new_info">Automatyczne wysyłanie zostało całkowicie zmienione. Ponownie skonfiguruj automatyczne wysyłanie z menu głównego.\n\nCiesz się nowym i rozszerzonym automatycznym wysyłaniem.</string>
-    <string name="synced_folders_no_results">Nie znaleziono katalogów multimedialnych.</string>
+    <string name="synced_folders_no_results">Nie znaleziono katalogów multimedialnych</string>
    <string name="synced_folders_preferences">Preferencje automatycznego wysyłania</string>
    <string name="synced_folders_preferences_folder_path">Dla %1$s</string>
    <string name="synced_folders_type">Typ</string>
@ -813,6 +816,12 @@
        <item quantity="many">%1$d plików</item>
        <item quantity="other">%1$d plików</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Pokaż %1$d katalog ukryty</item>
+        <item quantity="few">Pokaż %1$d katalogi ukryte</item>
+        <item quantity="many">Pokaż %1$d katalogów ukrytych</item>
+        <item quantity="other">Pokaż %1$d katalogów ukrytych</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d wybrany</item>
        <item quantity="few">%d wybrane</item>
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">mantido na pasta original, já que é somente leitura</string>
    <string name="auto_upload_on_wifi">Enviar só por WiFi não medida</string>
    <string name="auto_upload_path">/AutoEnvio</string>
+    <string name="autoupload_configure">Configurar</string>
    <string name="autoupload_create_new_custom_folder">Criar nova configuração de pasta personalizada</string>
    <string name="autoupload_custom_folder">Configurar uma pasta personalizada</string>
    <string name="autoupload_disable_power_save_check">Desativar a verificação de economia de energia</string>
+    <string name="autoupload_hide_folder">Ocultar pasta</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Fechar</string>
    <string name="battery_optimization_disable">Desativar</string>
@ -505,6 +507,7 @@
    <string name="prefs_theme_title">Tema</string>
    <string name="prefs_value_theme_dark">Escuro</string>
    <string name="prefs_value_theme_light">Claro</string>
+    <string name="prefs_value_theme_system">Siga o sistema</string>
    <string name="preview_image_description">Pré-visualização da imagem</string>
    <string name="preview_image_error_no_local_file">Não há arquivos locais para exibir</string>
    <string name="preview_image_error_unknown_format">Não foi possível exibir a imagem</string>
@ -676,7 +679,7 @@
    <string name="synced_folders_configure_folders">Configurar pastas</string>
    <string name="synced_folders_loading_folders">Carregando pastas…</string>
    <string name="synced_folders_new_info">O envio instantâneo foi completamente renovado. Reconfigure seu auto envio no menu principal.\n\nDesfrute do novo envio automático e estendido.</string>
-    <string name="synced_folders_no_results">Nenhuma pasta de mídia encontrada.</string>
+    <string name="synced_folders_no_results">Pastas com mídias não encontradas</string>
    <string name="synced_folders_preferences">Preferências do auto envio</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
@ -805,6 +808,10 @@
        <item quantity="one">%1$d arquivo</item>
        <item quantity="other">%1$d arquivos</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Mostrar %1$d pasta oculta</item>
+        <item quantity="other">Mostrar %1$d pastas ocultas</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d selecionado</item>
        <item quantity="other">%d selecionados</item>
--- a/src/main/res/values-pt-rPT/strings.xml
+++ b/src/main/res/values-pt-rPT/strings.xml
@ -616,7 +616,6 @@
    <string name="synced_folders_loading_folders">A carregar pastas…</string>
    <string name="synced_folders_new_info">O envio instantâneo foi completamente renovado. Reconfigure o seu envio automático a partir do menu principal.
 Aproveite o novo e melhorado envio automático.</string>
-    <string name="synced_folders_no_results">Não foram encontrados pastas multimédia.</string>
    <string name="synced_folders_preferences">Preferências de envio automático</string>
    <string name="synced_folders_preferences_folder_path">Para %1$s</string>
    <string name="synced_folders_type">Tipo</string>
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@ -536,7 +536,6 @@
    <string name="sync_foreign_files_forgotten_ticker">Unele fisiere locale au fost uitate</string>
    <string name="sync_string_files">Fișiere</string>
    <string name="synced_folders_loading_folders">Încărcare dosare…</string>
-    <string name="synced_folders_no_results">Nu au fost găsite dosare media.</string>
    <string name="synced_folders_type">Tip</string>
    <string name="tags">Etichete</string>
    <string name="thumbnail">Miniatură</string>
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@ -657,7 +657,6 @@
    <string name="synced_folders_configure_folders">Настроить каталоги</string>
    <string name="synced_folders_loading_folders">Получение списка папок…</string>
    <string name="synced_folders_new_info">Моментальная загрузка была полностью переделана. Используйте главное меню для перенастройки автоматической загрузки. Извините за неудобства.\n\nВам понравятся новые расширенные возможности!</string>
-    <string name="synced_folders_no_results">Не найдены каталоги с медиа(файлами).</string>
    <string name="synced_folders_preferences">Настройки автозагрузки</string>
    <string name="synced_folders_preferences_folder_path">Для %1$s</string>
    <string name="synced_folders_type">Тип</string>
--- a/src/main/res/values-sk-rSK/strings.xml
+++ b/src/main/res/values-sk-rSK/strings.xml
@ -665,7 +665,6 @@
    <string name="synced_folders_configure_folders">Nastavenie priečinkov</string>
    <string name="synced_folders_loading_folders">Načítavanie priečinkov…</string>
    <string name="synced_folders_new_info">Okamžité nahrávanie bolo kompletne prepracované.  Zmente si nastavenie automatického nahrávania cez hlavné menu.\n\nUžite si nové a rozšírene možnosti automatického nahrávania.</string>
-    <string name="synced_folders_no_results">Neboli nájdené žiadne multimediálne priečinky.</string>
    <string name="synced_folders_preferences">Nastavenie automatického nahrávania</string>
    <string name="synced_folders_preferences_folder_path">Pre %1$s</string>
    <string name="synced_folders_type">Typ</string>
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@ -634,7 +634,6 @@
    <string name="synced_folders_configure_folders">Nastavi mape</string>
    <string name="synced_folders_loading_folders">Poteka nalaganje map …</string>
    <string name="synced_folders_new_info">Možnost Hipnega pošiljanja je bila v celoti predelana. Nastavitve je treba ponovno prilagoditi v glavnem meniju.\n\nUživajte v razširjenih možnostih samodejnega pošiljanja.</string>
-    <string name="synced_folders_no_results">Map s predstavno vsebino ni mogoče najti.</string>
    <string name="synced_folders_preferences">Nastavitve za samodejno pošiljanje</string>
    <string name="synced_folders_preferences_folder_path">Za %1$s</string>
    <string name="synced_folders_type">Vrsta</string>
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@ -672,7 +672,6 @@
    <string name="synced_folders_configure_folders">Konfiguroni dosjet</string>
    <string name="synced_folders_loading_folders">Duke ngarkuar dosjet…</string>
    <string name="synced_folders_new_info">Ngarkimi i menjëhershëm është ngritur plotësisht. Rii-konfiguroni ngarkimet tuaja automatike  brenda menusë kryesore.\n\nShijoni aftësitë e reja dhe të zgjeruara të ngarkimit automatik.</string>
-    <string name="synced_folders_no_results">Nuk u gjet asnjë dosje.</string>
    <string name="synced_folders_preferences">Parapëlqimet për ngarkimin automatik</string>
    <string name="synced_folders_preferences_folder_path">Për %1$s</string>
    <string name="synced_folders_type">Tipi</string>
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@ -677,7 +677,6 @@
    <string name="synced_folders_configure_folders">Подесите фасцикле</string>
    <string name="synced_folders_loading_folders">Учитавам фасцикле…</string>
    <string name="synced_folders_new_info">Брзо отпремање је скроз редизајнирано. Поново подесите Ваша аутоматска отпремања из главног менија.\n\nУживајте у новом аутоматском отпремању.</string>
-    <string name="synced_folders_no_results">Нису пронађене мултимедијалне фасцикле.</string>
    <string name="synced_folders_preferences">Подешавања аутоматског отпремања</string>
    <string name="synced_folders_preferences_folder_path">За %1$s</string>
    <string name="synced_folders_type">Тип</string>
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">behålls i originalmappen, eftersom den är skrivskyddad</string>
    <string name="auto_upload_on_wifi">Ladda bara upp via obelastad Wi-Fi</string>
    <string name="auto_upload_path">/AutomatiskUppladdning</string>
+    <string name="autoupload_configure">Konfigurera</string>
    <string name="autoupload_create_new_custom_folder">Skapa en ny anpassad mappkonfiguration </string>
    <string name="autoupload_custom_folder">Skapa en anpassad mapp</string>
    <string name="autoupload_disable_power_save_check">Inaktivera strömsparingskontrollen</string>
+    <string name="autoupload_hide_folder">Göm mapp</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Stäng</string>
    <string name="battery_optimization_disable">Inaktivera</string>
@ -505,6 +507,7 @@
    <string name="prefs_theme_title">Tema</string>
    <string name="prefs_value_theme_dark">Mörkt</string>
    <string name="prefs_value_theme_light">Ljust</string>
+    <string name="prefs_value_theme_system">Följ systemet</string>
    <string name="preview_image_description">Förhandsvisa bild</string>
    <string name="preview_image_error_no_local_file">Där finns ingen lokal fil att förhandsvisa</string>
    <string name="preview_image_error_unknown_format">Kan inte visa bild</string>
@ -675,7 +678,7 @@
    <string name="synced_folders_configure_folders">Konfigurera mappar</string>
    <string name="synced_folders_loading_folders">Laddar mappar…</string>
    <string name="synced_folders_new_info">Direktuppladdning heter numera Automatisk uppladdning och har blivit totalt omgjort. Vänligen se huvudmenyn för att konfigurera Automatisk uppladdning igen. Ledsen för besväret.\n\nNjut av de nya och förbättrade uppladdningsmöjligheterna!</string>
-    <string name="synced_folders_no_results">Inga mediamappar funna.</string>
+    <string name="synced_folders_no_results">Inga mediamappar hittades</string>
    <string name="synced_folders_preferences">Inställningar för automatisk uppladdning</string>
    <string name="synced_folders_preferences_folder_path">För %1$s</string>
    <string name="synced_folders_type">Typ</string>
@ -804,6 +807,10 @@
        <item quantity="one">%1$d fil</item>
        <item quantity="other">%1$d filer</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">Visa %1$d gömd mapp</item>
+        <item quantity="other">Visa %1$d gömda mappar</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d vald</item>
        <item quantity="other">%d vald</item>
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@ -76,9 +76,11 @@
    <string name="auto_upload_file_behaviour_kept_in_folder">salt okunur olduğundan özgün klasörde kaldı</string>
    <string name="auto_upload_on_wifi">Yalnız kullanıma göre ücretlendirilmeyen kablosuz ağ üzerinden yüklensin</string>
    <string name="auto_upload_path">/OtomatikYükleme</string>
+    <string name="autoupload_configure">Ayarla</string>
    <string name="autoupload_create_new_custom_folder">Özel klasör kurulumu ekle</string>
    <string name="autoupload_custom_folder">Bir özel klasör kurun</string>
    <string name="autoupload_disable_power_save_check">Güç koruma denetimini devre dışı bırak</string>
+    <string name="autoupload_hide_folder">Klasörü gizle</string>
    <string name="avatar">Avatar</string>
    <string name="battery_optimization_close">Kapat</string>
    <string name="battery_optimization_disable">Devre dışı bırak</string>
@ -505,6 +507,7 @@
    <string name="prefs_theme_title">Tema</string>
    <string name="prefs_value_theme_dark">Koyu</string>
    <string name="prefs_value_theme_light">Açık</string>
+    <string name="prefs_value_theme_system">Sistemi takip et</string>
    <string name="preview_image_description">Görsel ön izleme</string>
    <string name="preview_image_error_no_local_file">Ön izlenebilecek bir yerel dosya yok</string>
    <string name="preview_image_error_unknown_format">Görsel görüntülenemedi</string>
@ -676,7 +679,7 @@
    <string name="synced_folders_configure_folders">Klasör ayarları</string>
    <string name="synced_folders_loading_folders">Klasörler yükleniyor…</string>
    <string name="synced_folders_new_info">Anında yükleme tamamen elden geçirildi. Lütfen ama menüye giderek otomatik yükleme ayarlarınızı yeniden yapın.\n\nYeni ve geliştirilmiş otomatik yükleme özelliklerinin tadını çıkarın.</string>
-    <string name="synced_folders_no_results">Herhangi bir ortam klasörü bulunamadı.</string>
+    <string name="synced_folders_no_results">Medya klasörü bulunamadı</string>
    <string name="synced_folders_preferences">Otomatik yükleme ayarları</string>
    <string name="synced_folders_preferences_folder_path">%1$s için</string>
    <string name="synced_folders_type">Tür</string>
@ -805,6 +808,10 @@
        <item quantity="one">%1$d dosya</item>
        <item quantity="other">%1$d dosya</item>
    </plurals>
+    <plurals name="synced_folders_show_hidden_folders">
+        <item quantity="one">%1$dgizli klasörleri göster</item>
+        <item quantity="other">%1$d gizli klasörleri göster</item>
+    </plurals>
    <plurals name="items_selected_count">
        <item quantity="one">%d seçilmiş</item>
        <item quantity="other">%d seçilmiş</item>
--- a/src/main/res/values-v21/styles.xml
+++ b/src/main/res/values-v21/styles.xml
@ -73,9 +73,4 @@
        <item name="android:statusBarColor">@android:color/transparent</item>
        <item name="android:colorBackground">@color/bg_default</item>
    </style>
-
-    <style name="Nextcloud.EditText.Login" parent="ThemeOverlay.MaterialComponents.TextInputEditText">
-        <item name="colorControlNormal">@color/login_text_color</item>
-        <item name="colorControlActivated">@color/login_text_color</item>
-    </style>
 </resources>
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@ -363,7 +363,6 @@
    <string name="synced_folder_settings_button">Nút thiết đặt</string>
    <string name="synced_folders_configure_folders">Cấu hình thư mục</string>
    <string name="synced_folders_loading_folders">Đang tải thư mục</string>
-    <string name="synced_folders_no_results">Không có thư mục media nào được tìm thấy</string>
    <string name="synced_icon">Đã đồng bộ</string>
    <string name="test_server_button">Kiểm tra kết nối máy chủ</string>
    <string name="trashbin_activity_title">File đã bị xóa</string>
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@ -679,7 +679,7 @@
    <string name="synced_folders_configure_folders">配置文件夹</string>
    <string name="synced_folders_loading_folders">正在加载文件夹…</string>
    <string name="synced_folders_new_info">即时上传已经完全改版。 从主菜单中重新配置自动上传。\ n \ n享受新的扩展自动上传。</string>
-    <string name="synced_folders_no_results">没有发现媒体文件夹</string>
+    <string name="synced_folders_no_results">未找到媒体文件夹</string>
    <string name="synced_folders_preferences">自动上传的首选项</string>
    <string name="synced_folders_preferences_folder_path">从 %1$s</string>
    <string name="synced_folders_type">类型</string>
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@ -660,7 +660,6 @@
    <string name="synced_folders_configure_folders">設定資料夾</string>
    <string name="synced_folders_loading_folders">載入資料夾…</string>
    <string name="synced_folders_new_info">即時上傳已經完全改版，請在選單中重新設定自動上傳。\n\n享受全新且強大的自動上傳。</string>
-    <string name="synced_folders_no_results">沒有發現媒體檔案</string>
    <string name="synced_folders_preferences">自動上傳偏好</string>
    <string name="synced_folders_type">類型</string>
    <string name="synced_icon">已同步</string>
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@ -58,6 +58,7 @@
    <string name="prefs_imprint">Imprint</string>
    <string name="prefs_value_theme_light">Light</string>
    <string name="prefs_value_theme_dark">Dark</string>
+    <string name="prefs_value_theme_system">Follow system</string>
    <string name="prefs_theme_title">Theme</string>


--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@ -277,10 +277,6 @@

 	<style name="TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
    </style>
-	<style name="Nextcloud.EditText.Login" parent="ThemeOverlay.MaterialComponents.TextInputEditText">
-        <item name="colorControlNormal">@color/login_text_color</item>
-		<item name="colorControlActivated">@color/login_text_color</item>
-	</style>

 	<style name="AppTabTextAppearance" parent="@style/TextAppearance.Design.Tab">
 		<item name="android:textSize">16sp</item>
@ -322,7 +318,4 @@
        <item name="android:scaleType">fitCenter</item>
        <item name="android:layout_gravity">center_vertical</item>
    </style>
-    <style name="SwitchPreference" parent="Widget.AppCompat.CompoundButton.Switch">
-        <item name="android:colorForeground">@color/fg_default</item>
-    </style>
 </resources>
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@ -26,13 +26,10 @@
        <ListPreference
            android:title="@string/prefs_storage_path"
            android:key="storage_path"/>
-        <com.owncloud.android.ui.ThemeableSwitchPreference
-            android:id="@+id/dark_theme_preference"
-            android:defaultValue="@string/prefs_value_theme_light"
-            android:key="dark_theme_enabled"
-            android:summary="%s"
+        <ListPreference
            android:title="@string/prefs_theme_title"
-            android:theme="@style/SwitchPreference"/>
+            android:key="darkTheme"
+            android:summary="%s" />
 	</PreferenceCategory>
 	<PreferenceCategory
 		android:title="@string/drawer_synced_folders"
--- a/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt
+++ b/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt
@ -176,9 +176,9 @@ class TestPowerManagementService {
        }

        @Test
-        fun `battery charging status on API 14-16`() {
+        fun `battery charging status on API 16`() {
            // GIVEN
-            //      device has API level 16 or below
+            //      device has API level 16
            //      battery status sticky intent is available
            whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.JELLY_BEAN)
            val powerSources = setOf(
@ -199,9 +199,9 @@ class TestPowerManagementService {
        }

        @Test
-        fun `wireless charging is not supported in API 14-16`() {
+        fun `wireless charging is not supported in API 16`() {
            // GIVEN
-            //      device has API level 16 or below
+            //      device has API level 16
            //      battery status sticky intent is available
            whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.JELLY_BEAN)

--- a/src/test/java/com/nextcloud/client/preferences/TestAppPreferences.java
+++ b/src/test/java/com/nextcloud/client/preferences/TestAppPreferences.java
@ -11,10 +11,15 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.mockito.InOrder;
 import org.mockito.Mock;
-import static org.mockito.Mockito.*;
-
 import org.mockito.MockitoAnnotations;

+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(Suite.class)
@Suite.SuiteClasses({
    TestAppPreferences.Preferences.class,
@ -45,7 +50,7 @@ public class TestAppPreferences {
        @Before
        public void setUp() {
            MockitoAnnotations.initMocks(this);
-            when(appPreferences.isDarkThemeEnabled()).thenReturn(true);
+            when(appPreferences.getDarkThemeMode()).thenReturn(DarkMode.DARK);
            registry = new AppPreferencesImpl.ListenerRegistry(appPreferences);
        }

@ -64,21 +69,21 @@ public class TestAppPreferences {
                registry.remove(listener2);
                registry.remove(listener3);
                return null;
-            }).when(listener2).onDarkThemeEnabledChanged(anyBoolean());
+            }).when(listener2).onDarkThemeModeChanged(DarkMode.DARK);

            // WHEN
            //      callback is called twice
-            registry.onSharedPreferenceChanged(NOT_USED_NULL, AppPreferencesImpl.PREF__DARK_THEME_ENABLED);
-            registry.onSharedPreferenceChanged(NOT_USED_NULL, AppPreferencesImpl.PREF__DARK_THEME_ENABLED);
+            registry.onSharedPreferenceChanged(NOT_USED_NULL, AppPreferencesImpl.PREF__DARK_THEME);
+            registry.onSharedPreferenceChanged(NOT_USED_NULL, AppPreferencesImpl.PREF__DARK_THEME);

            // THEN
            //      no ConcurrentModificationException
            //      1st time, all listeners (including removed) are called
            //      2nd time removed callbacks are not called
-            verify(listener1, times(2)).onDarkThemeEnabledChanged(anyBoolean());
-            verify(listener2).onDarkThemeEnabledChanged(anyBoolean());
-            verify(listener3).onDarkThemeEnabledChanged(anyBoolean());
-            verify(listener4, times(2)).onDarkThemeEnabledChanged(anyBoolean());
+            verify(listener1, times(2)).onDarkThemeModeChanged(DarkMode.DARK);
+            verify(listener2).onDarkThemeModeChanged(DarkMode.DARK);
+            verify(listener3).onDarkThemeModeChanged(DarkMode.DARK);
+            verify(listener4, times(2)).onDarkThemeModeChanged(DarkMode.DARK);
        }

        @Test
@ -90,7 +95,7 @@ public class TestAppPreferences {

            // WHEN
            //      callback is called
-            registry.onSharedPreferenceChanged(NOT_USED_NULL, AppPreferencesImpl.PREF__DARK_THEME_ENABLED);
+            registry.onSharedPreferenceChanged(NOT_USED_NULL, AppPreferencesImpl.PREF__DARK_THEME);

            // THEN
            //      nothing happens
--- a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191129.txt
+++ b/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191129.txt
@ -0,0 +1,17 @@
+2c57e3709 Merge pull request #4784 from nextcloud/hideAutoUploadEntries
+5257fb236 [tx-robot] updated from transifex
+aa431815a Merge pull request #4882 from nextcloud/dependabot/gradle/com.google.android-flexbox-2.0.0
+1f4e85768 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
+d17c85349 re-add button/action and improve upon code review
+74bfe473c remove action button, use checkable menu item for shown/hidden state display
+3e872df68 add more spotbug exclusions (for 3rd party libs)
+4e0b40517 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
+7c62ad6b0 unify use of boolean, make use of lombok getter/setters, remove unneeded boolean boxing
+bedc2b48e housekeeping, removing unused resources
+ca6918f9f show/hide improvements when list is completed hidden + nicer empty UI + action button
+23e44243d show/hide auto upload list items
+540c649ef Merge pull request #4894 from nextcloud/dependabot/gradle/kotlin_version-1.3.61
+f34ba2cdc Bump kotlin_version from 1.3.60 to 1.3.61
+48038d564 Merge pull request #4883 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.2.0
+83e0ebc46 [tx-robot] updated from transifex
+21c0de3cd daily dev 20191127
--- a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191203.txt
+++ b/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191203.txt
@ -0,0 +1,7 @@
+d27075239 Merge pull request #4865 from Infomaniak/feature/fix-restore-btn-size
+34db13482 Merge pull request #4910 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.2.1
+eac9c9df6 Merge pull request #4911 from nextcloud/dependabot/gradle/org.mockito-mockito-core-3.2.0
+dc0181bac [tx-robot] updated from transifex
+82e226f86 Bump mockito-core from 3.1.0 to 3.2.0
+85e13f291 Bump detekt-gradle-plugin from 1.2.0 to 1.2.1
+30f96aa98 daily dev 20191129
--- a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191204.txt
+++ b/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191204.txt
@ -0,0 +1,6 @@
+7cf3ba93c Merge pull request #4925 from nextcloud/NotNull
+cd86ff16c Merge pull request #4924 from nextcloud/theming_auto_upload
+2f9c5e976 replace org.jetbrains.annotations with androidx.annotations
+83903ea1d fix wrong sync status in auto upload on white theming
+2dbf724b3 [tx-robot] updated from transifex
+2d68e2e1c daily dev 20191203
--- a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191205.txt
+++ b/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191205.txt
@ -0,0 +1,12 @@
+adbc1f27a Merge pull request #4940 from nextcloud/changelog-master-stable-3.9.1
+e0ec1c163 Add changelog for 3.9.1
+9dcb91526 [tx-robot] updated from transifex
+92510cb16 Merge pull request #4938 from nextcloud/disableMissingDefaultResource
+a89481461 disable MissingDefaultResource
+dda56defb Merge pull request #4933 from nextcloud/appLocking
+cb0067717 Merge pull request #4926 from nextcloud/deleteChecksFor16
+fd48163e2 Merge pull request #4922 from nextcloud/themeFollowOS
+5e687f2c1 Dark mode: light, dark, follow system
+fb69c1bd5 remove all checks for <= JELLY_BEAN as we have this as our new minimum.
+683faab11 [tx-robot] updated from transifex
+c3eec4777 daily dev 20191204
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`Kontrolpean mantentzen zaituen norberak ostatutako produktibitate plataforma`