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

build.gradle

@@ -197,8 +197,8 @@ dependencies {
     compile 'org.greenrobot:eventbus:3.0.0'
     compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2'
 
-// uncomment for gplay, modified
-//    compile 'com.google.android.gms:play-services:10.2.1'
+    // uncomment for gplay, modified
+    //compile 'com.google.android.gms:play-services:10.2.4'
 
     compile 'org.parceler:parceler-api:1.1.6'
     annotationProcessor 'org.parceler:parceler:1.1.6'

src/generic/java/com/owncloud/android/utils/PushUtils.java

@@ -0,0 +1,25 @@
+/**
+ * Nextcloud Android client application
+ *
+ * @author Mario Danic
+ * Copyright (C) 2017 Mario Danic
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.utils;
+
+public class PushUtils {
+    public static final String KEY_PUSH = "push";
+}

src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseInstanceIDService.java

@@ -36,8 +36,6 @@ public class NCFirebaseInstanceIDService extends FirebaseInstanceIdService {
         //You can implement this method to store the token on your server
         if (!TextUtils.isEmpty(getResources().getString(R.string.push_server_url))) {
             PreferenceManager.setPushToken(MainApp.getAppContext(), FirebaseInstanceId.getInstance().getToken());
-            PreferenceManager.setPushTokenUpdateTime(MainApp.getAppContext(), System.currentTimeMillis());
-
             PushUtils.pushRegistrationToServer();
         }
     }

src/gplay/java/com/owncloud/android/ui/activity/ModifiedFileDisplayActivity.java

@@ -20,9 +20,12 @@
 
 package com.owncloud.android.ui.activity;
 
+import android.os.Bundle;
+
 import com.owncloud.android.ui.events.TokenPushEvent;
 import com.owncloud.android.utils.PushUtils;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
@@ -33,4 +36,11 @@ public class ModifiedFileDisplayActivity extends FileDisplayActivity {
         PushUtils.pushRegistrationToServer();
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // see if there's stuff to push every time we start the app
+        EventBus.getDefault().post(new TokenPushEvent());
+    }
+
 }

src/gplay/java/com/owncloud/android/utils/PushUtils.java

@@ -27,9 +27,12 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.util.Base64;
 
+import com.google.gson.Gson;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.PushConfigurationState;
 import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -39,8 +42,12 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.notifications.RegisterAccountDeviceForNotificationsOperation;
 import com.owncloud.android.lib.resources.notifications.RegisterAccountDeviceForProxyOperation;
+import com.owncloud.android.lib.resources.notifications.UnregisterAccountDeviceForNotificationsOperation;
+import com.owncloud.android.lib.resources.notifications.UnregisterAccountDeviceForProxyOperation;
 import com.owncloud.android.lib.resources.notifications.models.PushResponse;
 
+import org.apache.commons.httpclient.HttpStatus;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -65,7 +72,11 @@ public class PushUtils {
     private static final String KEYPAIR_PRIV_EXTENSION = ".priv";
     private static final String KEYPAIR_PUB_EXTENSION = ".pub";
 
-    public static String generateSHA512Hash(String pushToken) {
+    public static final String KEY_PUSH = "push";
+
+    private static ArbitraryDataProvider arbitraryDataProvider;
+
+    private static String generateSHA512Hash(String pushToken) {
         MessageDigest messageDigest = null;
         try {
             messageDigest = MessageDigest.getInstance("SHA-512");
@@ -86,7 +97,7 @@ public class PushUtils {
         return result.toString();
     }
 
-    public static int generateRsa2048KeyPair() {
+    private static int generateRsa2048KeyPair() {
         String keyPath = MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator
                 + KEYPAIR_FOLDER;
 
@@ -124,8 +135,59 @@ public class PushUtils {
         return -2;
     }
 
+    private static void deleteRegistrationForAccount(Account account) {
+        Context context = MainApp.getAppContext();
+        OwnCloudAccount ocAccount = null;
+        arbitraryDataProvider = new ArbitraryDataProvider(MainApp.getAppContext().getContentResolver());
+
+        try {
+            ocAccount = new OwnCloudAccount(account, context);
+            OwnCloudClient mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                    getClientFor(ocAccount, context);
+
+            RemoteOperation unregisterAccountDeviceForNotificationsOperation = new
+                    UnregisterAccountDeviceForNotificationsOperation();
+
+            RemoteOperationResult remoteOperationResult = unregisterAccountDeviceForNotificationsOperation.
+                    execute(mClient);
+
+            if (remoteOperationResult.getHttpCode() == HttpStatus.SC_ACCEPTED) {
+                String arbitraryValue;
+                if (!TextUtils.isEmpty(arbitraryValue = arbitraryDataProvider.getValue(account, KEY_PUSH))) {
+                    Gson gson = new Gson();
+                    PushConfigurationState pushArbitraryData = gson.fromJson(arbitraryValue,
+                            PushArbitraryData.class);
+                    RemoteOperation unregisterAccountDeviceForProxyOperation =
+                            new UnregisterAccountDeviceForProxyOperation(context.getResources().
+                                    getString(R.string.push_server_url),
+                                    pushArbitraryData.getDeviceIdentifier(),
+                                    pushArbitraryData.getDeviceIdentifierSignature(),
+                                    pushArbitraryData.getUserPublicKey());
+
+                    remoteOperationResult = unregisterAccountDeviceForProxyOperation.execute(mClient);
+
+                    if (remoteOperationResult.isSuccess()) {
+                        arbitraryDataProvider.deleteKeyForAccount(account, KEY_PUSH);
+                    }
+                }
+            }
+
+
+        } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
+            Log_OC.d(TAG, "Failed to find an account");
+        } catch (AuthenticatorException e) {
+            Log_OC.d(TAG, "Failed via AuthenticatorException");
+        } catch (IOException e) {
+            Log_OC.d(TAG, "Failed via IOException");
+        } catch (OperationCanceledException e) {
+            Log_OC.d(TAG, "Failed via OperationCanceledException");
+        }
+    }
+
     public static void pushRegistrationToServer() {
         String token = PreferenceManager.getPushToken(MainApp.getAppContext());
+        arbitraryDataProvider = new ArbitraryDataProvider(MainApp.getAppContext().getContentResolver());
+
         if (!TextUtils.isEmpty(MainApp.getAppContext().getResources().getString(R.string.push_server_url)) &&
                 !TextUtils.isEmpty(token)) {
             PushUtils.generateRsa2048KeyPair();
@@ -139,42 +201,57 @@ public class PushUtils {
                 publicKey = "-----BEGIN PUBLIC KEY-----\n" + publicKey + "\n-----END PUBLIC KEY-----\n";
 
                 Context context = MainApp.getAppContext();
+                String providerValue;
+                Gson gson = new Gson();
                 for (Account account : AccountUtils.getAccounts(context)) {
-                    try {
-                        OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);
-                        OwnCloudClient mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
-                                getClientFor(ocAccount, context);
-
-                        RemoteOperation registerAccountDeviceForNotificationsOperation =
-                                new RegisterAccountDeviceForNotificationsOperation(pushTokenHash,
-                                        publicKey,
-                                        context.getResources().getString(R.string.push_server_url));
-
-                        RemoteOperationResult remoteOperationResult = registerAccountDeviceForNotificationsOperation.
-                                execute(mClient);
-
-                        if (remoteOperationResult.isSuccess()) {
-                            PushResponse pushResponse = remoteOperationResult.getPushResponseData();
-
-                            RemoteOperation registerAccountDeviceForProxyOperation = new
-                                    RegisterAccountDeviceForProxyOperation(
-                                    context.getResources().getString(R.string.push_server_url),
-                                    token, pushResponse.getDeviceIdentifier(), pushResponse.getSignature(),
-                                    pushResponse.getPublicKey());
-
-                            remoteOperationResult = registerAccountDeviceForProxyOperation.execute(mClient);
-                            PreferenceManager.setPushTokenLastSentTime(MainApp.getAppContext(),
-                                    System.currentTimeMillis());
-
+                    if (!TextUtils.isEmpty(providerValue = arbitraryDataProvider.getValue(account, KEY_PUSH))) {
+                        PushConfigurationState accountPushData = gson.fromJson(providerValue,
+                                PushConfigurationState.class);
+                        if (!accountPushData.getPushToken().equals(token) && !accountPushData.isShouldBeDeleted()) {
+                            try {
+                                OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);
+                                OwnCloudClient mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                                        getClientFor(ocAccount, context);
+
+                                RemoteOperation registerAccountDeviceForNotificationsOperation =
+                                        new RegisterAccountDeviceForNotificationsOperation(pushTokenHash,
+                                                publicKey,
+                                                context.getResources().getString(R.string.push_server_url));
+
+                                RemoteOperationResult remoteOperationResult = registerAccountDeviceForNotificationsOperation.
+                                        execute(mClient);
+
+                                if (remoteOperationResult.isSuccess()) {
+                                    PushResponse pushResponse = remoteOperationResult.getPushResponseData();
+
+                                    RemoteOperation registerAccountDeviceForProxyOperation = new
+                                            RegisterAccountDeviceForProxyOperation(
+                                            context.getResources().getString(R.string.push_server_url),
+                                            token, pushResponse.getDeviceIdentifier(), pushResponse.getSignature(),
+                                            pushResponse.getPublicKey());
+
+                                    remoteOperationResult = registerAccountDeviceForProxyOperation.execute(mClient);
+
+                                    if (remoteOperationResult.isSuccess()) {
+                                        PushConfigurationState pushArbitraryData = new PushConfigurationState(token,
+                                                pushResponse.getDeviceIdentifier(), pushResponse.getSignature(),
+                                                pushResponse.getPublicKey(), false);
+                                        arbitraryDataProvider.storeOrUpdateKeyValue(account, KEY_PUSH,
+                                                gson.toJson(pushArbitraryData));
+                                    }
+                                }
+                            } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
+                                Log_OC.d(TAG, "Failed to find an account");
+                            } catch (AuthenticatorException e) {
+                                Log_OC.d(TAG, "Failed via AuthenticatorException");
+                            } catch (IOException e) {
+                                Log_OC.d(TAG, "Failed via IOException");
+                            } catch (OperationCanceledException e) {
+                                Log_OC.d(TAG, "Failed via OperationCanceledException");
+                            }
+                        } else if (accountPushData.isShouldBeDeleted()) {
+                            deleteRegistrationForAccount(account);
                         }
-                    } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
-                        Log_OC.d(TAG, "Failed to find an account");
-                    } catch (AuthenticatorException e) {
-                        Log_OC.d(TAG, "Failed via AuthenticatorException");
-                    } catch (IOException e) {
-                        Log_OC.d(TAG, "Failed via IOException");
-                    } catch (OperationCanceledException e) {
-                        Log_OC.d(TAG, "Failed via OperationCanceledException");
                     }
                 }
             }

src/gplay/res/values/setup.xml

@@ -1,135 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Beta indicator -->
-    <bool name="is_beta">false</bool>
-
-    <!-- App name  and other strings-->
-    <string name="app_name">Nextcloud</string>
-    <string name="account_type">nextcloud</string>	<!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
-    <string name="authority">org.nextcloud</string>	<!-- better if was the app package with ".provider" appended ; it identifies the provider -->
-    <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
-    <string name="users_and_groups_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
-    <string name="document_provider_authority">org.nextcloud.documents</string>
-    <string name="file_provider_authority">org.nextcloud.files</string>
-    <string name ="db_file">nextcloud.db</string>
-    <string name ="db_name">nextcloud</string>
-    <string name ="data_folder">nextcloud</string>
-    <string name ="log_name">nextcloud</string>
-    <string name ="default_display_name_for_root_folder">Nextcloud</string>
-    <string name ="user_agent">Mozilla/5.0 (Android) ownCloud-android/%1$s</string>
-
-    <!-- URLs and flags related -->
-    <string name="server_url"></string>
-    <bool name="show_server_url_input">true</bool>
-    <!-- Can be regular (full input), prefix (subdomain input) and suffix (directory input) -->
-    <!-- Requires server url to be set -->
-    <string name="server_input_type">regular</string>
-    <bool name="show_welcome_link">true</bool>
-    <string name="welcome_link_url">"https://nextcloud.com/providers"</string>
-    <string name="share_api_link"></string>
-
-    <!-- Flags to setup the authentication methods available in the app -->
-    <string name="auth_method_oauth2">off</string>
-    <string name="auth_method_saml_web_sso">off</string>
-
-    <!-- Flags to enable/disable some features -->
-    <string name = "send_files_to_other_apps">on</string>
-    <bool name = "share_via_link_feature">true</bool>
-    <bool name = "share_with_users_feature">true</bool>
-    <bool name="show_whats_new">true</bool>
-    <bool name="show_external_links">true</bool>
-
-    <!-- Contacts backup -->
-    <bool name="contacts_backup">true</bool>
-    <string name="contacts_backup_folder">/Contacts-Backup</string>
-    <integer name="contacts_backup_expire">-1</integer>
-
-    <!-- To fill if you want to show webviews instead of regular welcome views -->
-    <array name="whatsnew_urls"></array>
-
-    <!-- Colors -->
-    <color name="primary">@color/nc_blue</color>
-    <color name="primary_dark">#006AA3</color>
-    <color name="color_accent">@color/nc_blue_accent</color>
-    <color name="login_text_color">@color/white</color>
-    <color name="login_text_hint_color">#7fC0E3</color>
-    <color name="login_background_color">#FFFFFF</color>    <!-- Not used at the moment -->
-    <color name="login_logo_background_color">#FFFFFF</color>    <!-- Not used at the moment -->
-    <color name="background_color">#FFFFFF</color>
-    <color name="navigation_bar_start_color">#0082c9</color>
-    <color name="navigation_bar_end_color">#0082c9</color>
-    <color name="primary_button_background_color">@color/nc_blue_accent</color>
-    <color name="primary_button_text_color">@color/white</color>
-    <color name="secondary_button_background_color">#D6D7D7</color>
-    <color name="secondary_button_text_color">@color/black</color>
-
-    <!-- special transparent action bar colors for image preview -->
-    <color name="color_transparent">#201D2D44</color>
-    <color name="color_dark_transparent">#40162233</color>
-
-    <!-- Button -->
-    <color name="button_text_color">#000000</color>
-
-    <!-- Multiselect backgrounds -->
-    <color name="action_mode_background">#757575</color>
-    <color name="action_mode_status_bar_background">#616161</color>
-    <color name="selected_item_background">#ECECEC</color>
-
-    <!-- Multiaccount support -->
-    <bool name="multiaccount_support">true</bool>
-
-    <!-- Drawer options -->
-    <bool name="recently_added_enabled">false</bool>
-    <bool name="recently_modified_enabled">false</bool>
-    <bool name="shared_enabled">true</bool>
-    <bool name="videos_enabled">false</bool>
-
-    <!-- Bottom toolbar -->
-    <bool name="bottom_toolbar_enabled">false</bool>
-
-    <!-- Help, imprint and feedback, and other things -->
-    <bool name="fingerprint_enabled">true</bool>
-    <bool name="davdroid_integration_enabled">true</bool>
-    <bool name="help_enabled">true</bool>
-    <bool name="imprint_enabled">false</bool>
-    <bool name="recommend_enabled">true</bool>
-    <bool name="feedback_enabled">true</bool>
-    <bool name="logger_enabled">false</bool>
-    <string name="url_help">https://help.nextcloud.com/c/feature</string>
-    <string name="url_imprint"></string>
-    <string name="mail_recommend">"mailto:"</string>
-    <string name="mail_feedback">"mailto:android@nextcloud.com"</string>
-    <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string>
-    <string name="url_server_install">https://nextcloud.com/install</string>
-
-    <!--Destination mail for sending log files -->
-    <string name="mail_logger"></string>
-
-    <!-- Determine is participate enabled -->
-    <bool name="participate_enabled">true</bool>
-    <!-- Participate links -->
-    <string name="fdroid_beta_link" translatable="false">https://f-droid.org/repository/browse/?fdid=com.nextcloud.android.beta</string>
-    <string name="beta_apk_link" translatable="false">https://download.nextcloud.com/android/dev/latest.apk</string>
-    <string name="play_store_register_beta" translatable="false">https://play.google.com/apps/testing/com.nextcloud.client</string>
-    <string name="fdroid_link" translatable="false">https://f-droid.org/repository/browse/?fdid=com.nextcloud.client</string>
-    <string name="irc_weblink" translatable="false">http://webchat.freenode.net?channels=nextcloud-mobile</string>
-    <string name="help_link" translatable="false">https://help.nextcloud.com/c/clients/android</string>
-    <string name="translation_link" translatable="false">https://www.transifex.com/nextcloud/nextcloud/android/</string>
-    <string name="contributing_link" translatable="false">https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md</string>
-    <string name="report_issue_link" translatable="false">https://github.com/nextcloud/android/issues</string>
-
-    <!-- login data links -->
-    <string name="login_data_own_scheme" translatable="false">nc</string>
-    <!-- url for webview login, with the protocol prefix
-    If set, will replace all other login methods available -->
-    <string name="webview_login_url" translatable="false"></string>
-
-    <!-- analytics enabled -->
-    <bool name="analytics_enabled">false</bool>
-
-    <!-- Files becomes Home -->
-    <bool name="use_home">false</bool>
-
     <!-- Push server url -->
     <string name="push_server_url" translatable="false">https://push-notifications.nextcloud.com</string>
 </resources>

src/main/AndroidManifest.xml

@@ -88,7 +88,8 @@
         <activity android:name=".ui.activity.UploadFilesActivity" />
         <activity android:name=".ui.activity.ExternalSiteWebView"
                   android:configChanges="orientation|screenSize|keyboardHidden" />
-        <activity android:name=".ui.activity.ContactsPreferenceActivity" />
+        <activity android:name=".ui.activity.ContactsPreferenceActivity"
+            android:launchMode="singleInstance"/>
         <activity android:name=".ui.activity.ReceiveExternalFilesActivity"
                   
                   android:taskAffinity=""

src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -337,6 +337,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 }
                 return false;
             }
+
+            public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
+
+                mLoginWebView.loadData(DisplayUtils.getData(getResources().openRawResource(R.raw.custom_error)),"text/html; charset=UTF-8", null);
+            }
         });
     }
 

src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.java

@@ -0,0 +1,244 @@
+/**
+ * Nextcloud Android client application
+ *
+ * Copyright (C) 2017 Tobias Kaminsky
+ * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Nextcloud.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ * <p>
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.datamodel;
+
+import android.accounts.Account;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+import com.owncloud.android.db.ProviderMeta;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import java.util.ArrayList;
+
+/**
+ * Database provider for handling the persistence aspects of arbitrary data table.
+ */
+
+public class ArbitraryDataProvider {
+    static private final String TAG = ArbitraryDataProvider.class.getSimpleName();
+
+    private ContentResolver contentResolver;
+
+    public ArbitraryDataProvider(ContentResolver contentResolver) {
+        if (contentResolver == null) {
+            throw new IllegalArgumentException("Cannot create an instance with a NULL contentResolver");
+        }
+        this.contentResolver = contentResolver;
+    }
+
+    public int deleteKeyForAccount(Account account, String key) {
+        int result = contentResolver.delete(
+                ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
+                ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID + " = ? AND " +
+                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY + "= ?",
+                new String[]{account.name, key}
+        );
+
+        return result;
+    }
+
+
+    public void storeOrUpdateKeyValue(Account account, String key, String newValue) {
+        ArbitraryDataSet data = getArbitraryDataSet(account, key);
+        if (data == null) {
+            Log_OC.v(TAG, "Adding arbitrary data with cloud id: " + account.name + " key: " + key
+                    + " value: " + newValue);
+            ContentValues cv = new ContentValues();
+            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID, account.name);
+            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY, key);
+            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_VALUE, newValue);
+
+            Uri result = contentResolver.insert(ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA, cv);
+
+            if (result == null) {
+                Log_OC.v(TAG, "Failed to store arbitrary data with cloud id: " + account.name + " key: " + key
+                        + " value: " + newValue);
+            }
+        } else {
+            Log_OC.v(TAG, "Updating arbitrary data with cloud id: " + account.name + " key: " + key
+                    + " value: " + newValue);
+            ContentValues cv = new ContentValues();
+            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID, data.getCloudId());
+            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY, data.getKey());
+            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_VALUE, newValue);
+
+            int result = contentResolver.update(
+                    ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
+                    cv,
+                    ProviderMeta.ProviderTableMeta._ID + "=?",
+                    new String[]{String.valueOf(data.getId())}
+            );
+
+            if (result == 0) {
+                Log_OC.v(TAG, "Failed to update arbitrary data with cloud id: " + account.name + " key: " + key
+                        + " value: " + newValue);
+            }
+        }
+    }
+
+
+    public Long getLongValue(Account account, String key) {
+        String value = getValue(account, key);
+
+        if (value.isEmpty()) {
+            return -1l;
+        } else {
+            return Long.valueOf(value);
+        }
+    }
+
+    public boolean getBooleanValue(Account account, String key) {
+        String value = getValue(account, key);
+
+        return !value.isEmpty() && value.equalsIgnoreCase("true");
+    }
+
+    private ArrayList<String> getValues(Account account, String key) {
+        Cursor cursor = contentResolver.query(
+                ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
+                null,
+                ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID + " = ? and " +
+                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY + " = ?",
+                new String[]{account.name, key},
+                null
+        );
+
+        if (cursor != null) {
+            ArrayList<String> list = new ArrayList<>();
+            if (cursor.moveToFirst()) {
+                do {
+                    String value = cursor.getString(cursor.getColumnIndex(
+                            ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_VALUE));
+                    if (value == null) {
+                        Log_OC.e(TAG, "Arbitrary value could not be created from cursor");
+                    } else {
+                        list.add(value);
+                    }
+                } while (cursor.moveToNext());
+            }
+            cursor.close();
+            return list;
+        } else {
+            Log_OC.e(TAG, "DB error restoring arbitrary values.");
+        }
+
+        return new ArrayList<>();
+    }
+
+    public String getValue(Account account, String key) {
+        Cursor cursor = contentResolver.query(
+                ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
+                null,
+                ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID + " = ? and " +
+                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY + " = ?",
+                new String[]{account.name, key},
+                null
+        );
+
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                String value = cursor.getString(cursor.getColumnIndex(
+                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_VALUE));
+                if (value == null) {
+                    Log_OC.e(TAG, "Arbitrary value could not be created from cursor");
+                } else {
+                    return value;
+                }
+            }
+            cursor.close();
+            return "";
+        } else {
+            Log_OC.e(TAG, "DB error restoring arbitrary values.");
+        }
+
+        return "";
+    }
+
+    private ArbitraryDataSet getArbitraryDataSet(Account account, String key) {
+        Cursor cursor = contentResolver.query(
+                ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
+                null,
+                ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID + " = ? and " +
+                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY + " = ?",
+                new String[]{account.name, key},
+                null
+        );
+
+        ArbitraryDataSet dataSet = null;
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                int id = cursor.getInt(cursor.getColumnIndex(ProviderMeta.ProviderTableMeta._ID));
+                String dbAccount = cursor.getString(cursor.getColumnIndex(
+                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID));
+                String dbKey = cursor.getString(cursor.getColumnIndex(
+                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY));
+                String dbValue = cursor.getString(cursor.getColumnIndex(
+                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_VALUE));
+
+                if (id == -1) {
+                    Log_OC.e(TAG, "Arbitrary value could not be created from cursor");
+                } else {
+                    dataSet = new ArbitraryDataSet(id, dbAccount, dbKey, dbValue);
+                }
+            }
+            cursor.close();
+        } else {
+            Log_OC.e(TAG, "DB error restoring arbitrary values.");
+        }
+
+        return dataSet;
+    }
+
+
+    public class ArbitraryDataSet {
+        private int id;
+        private String cloudId;
+        private String key;
+        private String value;
+
+        public ArbitraryDataSet(int id, String cloudId, String key, String value) {
+            this.id = id;
+            this.cloudId = cloudId;
+            this.key = key;
+            this.value = value;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public String getCloudId() {
+            return cloudId;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+}

src/main/java/com/owncloud/android/datamodel/PushConfigurationState.java

@@ -0,0 +1,81 @@
+/**
+ * Nextcloud Android client application
+ *
+ * @author Mario Danic
+ * Copyright (C) 2017 Mario Danic
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.datamodel;
+
+public class PushConfigurationState {
+    public String pushToken;
+    public String deviceIdentifier;
+    public String deviceIdentifierSignature;
+    public String userPublicKey;
+    public boolean shouldBeDeleted;
+
+    public PushConfigurationState() {
+    }
+
+    public PushConfigurationState(String pushToken, String deviceIdentifier, String deviceIdentifierSignature,
+                             String userPublicKey, boolean shouldBeDeleted) {
+        this.pushToken = pushToken;
+        this.deviceIdentifier = deviceIdentifier;
+        this.deviceIdentifierSignature = deviceIdentifierSignature;
+        this.userPublicKey = userPublicKey;
+        this.shouldBeDeleted = shouldBeDeleted;
+    }
+
+    public String getPushToken() {
+        return pushToken;
+    }
+
+    public void setPushToken(String pushToken) {
+        this.pushToken = pushToken;
+    }
+
+    public String getDeviceIdentifier() {
+        return deviceIdentifier;
+    }
+
+    public void setDeviceIdentifier(String deviceIdentifier) {
+        this.deviceIdentifier = deviceIdentifier;
+    }
+
+    public String getDeviceIdentifierSignature() {
+        return deviceIdentifierSignature;
+    }
+
+    public void setDeviceIdentifierSignature(String deviceIdentifierSignature) {
+        this.deviceIdentifierSignature = deviceIdentifierSignature;
+    }
+
+    public String getUserPublicKey() {
+        return userPublicKey;
+    }
+
+    public void setUserPublicKey(String userPublicKey) {
+        this.userPublicKey = userPublicKey;
+    }
+
+    public boolean isShouldBeDeleted() {
+        return shouldBeDeleted;
+    }
+
+    public void setShouldBeDeleted(boolean shouldBeDeleted) {
+        this.shouldBeDeleted = shouldBeDeleted;
+    }
+}

src/main/java/com/owncloud/android/db/PreferenceManager.java

@@ -47,33 +47,15 @@ public abstract class PreferenceManager {
     private static final String PREF__LEGACY_CLEAN = "legacyClean";
     private static final String PREF__AUTO_UPLOAD_UPDATE_PATH = "autoUploadPathUpdate";
     private static final String PREF__PUSH_TOKEN = "pushToken";
-    private static final String PREF__PUSH_TOKEN_UPDATE_TIME = "pushTokenLastUpdated";
-    private static final String PREF__PUSH_TOKEN_LAST_REGISTRATION_TIME = "pushTokenLastSent";
-
-    public static void setPushTokenLastSentTime(Context context, long time) {
-        saveLongPreference(context, PREF__PUSH_TOKEN_LAST_REGISTRATION_TIME, time);
-    }
-
-    public static long getPushTokenLastSentTime(Context context) {
-        return getDefaultSharedPreferences(context).getLong(PREF__PUSH_TOKEN_LAST_REGISTRATION_TIME, -1);
-    }
 
     public static void setPushToken(Context context, String pushToken) {
-        saveStringPreference(context, PREF__PUSH_TOKEN, pushToken);
+        saveStringPreferenceNow(context, PREF__PUSH_TOKEN, pushToken);
     }
 
     public static String getPushToken(Context context) {
         return getDefaultSharedPreferences(context).getString(PREF__PUSH_TOKEN, "");
     }
 
-    public static void setPushTokenUpdateTime(Context context, long time) {
-        saveLongPreference(context, PREF__PUSH_TOKEN_UPDATE_TIME, time);
-    }
-
-    public static long getPushTokenUpdateTime(Context context) {
-        return getDefaultSharedPreferences(context).getLong(PREF__PUSH_TOKEN_UPDATE_TIME, -1);
-    }
-
     public static boolean instantPictureUploadEnabled(Context context) {
         return getDefaultSharedPreferences(context).getBoolean(PREF__INSTANT_UPLOADING, false);
     }
@@ -289,6 +271,12 @@ public abstract class PreferenceManager {
         appPreferences.apply();
     }
 
+    private static void saveStringPreferenceNow(Context context, String key, String value) {
+        SharedPreferences.Editor appPreferences = getDefaultSharedPreferences(context.getApplicationContext()).edit();
+        appPreferences.putString(key, value);
+        appPreferences.commit();
+    }
+
     private static void saveIntPreference(Context context, String key, int value) {
         SharedPreferences.Editor appPreferences = getDefaultSharedPreferences(context.getApplicationContext()).edit();
         appPreferences.putInt(key, value);

src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -32,7 +32,7 @@ import com.owncloud.android.MainApp;
 public class ProviderMeta {
 
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 20;
+    public static final int DB_VERSION = 21;
 
     private ProviderMeta() {
     }
@@ -44,6 +44,7 @@ public class ProviderMeta {
         public static final String UPLOADS_TABLE_NAME = "list_of_uploads";
         public static final String SYNCED_FOLDERS_TABLE_NAME = "synced_folders";
         public static final String EXTERNAL_LINKS_TABLE_NAME = "external_links";
+        public static final String ARBITRARY_DATA_TABLE_NAME = "arbitrary_data";
         public static final String VIRTUAL_TABLE_NAME = "virtual";
 
         private static final String CONTENT_PREFIX = "content://";
@@ -64,6 +65,8 @@ public class ProviderMeta {
                 + MainApp.getAuthority() + "/synced_folders");
         public static final Uri CONTENT_URI_EXTERNAL_LINKS = Uri.parse(CONTENT_PREFIX
                 + MainApp.getAuthority() + "/external_links");
+        public static final Uri CONTENT_URI_ARBITRARY_DATA = Uri.parse(CONTENT_PREFIX
+                + MainApp.getAuthority() + "/arbitrary_data");
         public static final Uri CONTENT_URI_VIRTUAL = Uri.parse(CONTENT_PREFIX + MainApp.getAuthority() + "/virtual");
 
         public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.owncloud.file";
@@ -180,6 +183,11 @@ public class ProviderMeta {
         public static final String EXTERNAL_LINKS_NAME = "name";
         public static final String EXTERNAL_LINKS_URL = "url";
 
+        // Columns of arbitrary data table
+        public static final String ARBITRARY_DATA_CLOUD_ID = "cloud_id";
+        public static final String ARBITRARY_DATA_KEY = "key";
+        public static final String ARBITRARY_DATA_VALUE = "value";
+
         // Columns of virtual
         public static final String VIRTUAL_TYPE = "type";
         public static final String VIRTUAL_OCFILE_ID = "ocfile_id";

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

@@ -72,7 +72,8 @@ public class FileContentProvider extends ContentProvider {
     private static final int UPLOADS = 6;
     private static final int SYNCED_FOLDERS = 7;
     private static final int EXTERNAL_LINKS = 8;
-    private static final int VIRTUAL = 9;
+    private static final int ARBITRARY_DATA = 9;
+    private static final int VIRTUAL = 10;
 
     private static final String TAG = FileContentProvider.class.getSimpleName();
 
@@ -202,6 +203,9 @@ public class FileContentProvider extends ContentProvider {
             case EXTERNAL_LINKS:
                 count = db.delete(ProviderTableMeta.EXTERNAL_LINKS_TABLE_NAME, where, whereArgs);
                 break;
+            case ARBITRARY_DATA:
+                count = db.delete(ProviderTableMeta.ARBITRARY_DATA_TABLE_NAME, where, whereArgs);
+                break;
             case VIRTUAL:
                 count = db.delete(ProviderTableMeta.VIRTUAL_TABLE_NAME, where, whereArgs);
                 break;
@@ -339,6 +343,18 @@ public class FileContentProvider extends ContentProvider {
                 }
                 return insertedExternalLinkUri;
 
+            case ARBITRARY_DATA:
+                Uri insertedArbitraryDataUri = null;
+                long arbitraryDataId = db.insert(ProviderTableMeta.ARBITRARY_DATA_TABLE_NAME, null, values);
+                if (arbitraryDataId > 0) {
+                    insertedArbitraryDataUri =
+                            ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA, arbitraryDataId);
+                } else {
+                    throw new SQLException("ERROR " + uri);
+
+                }
+                return insertedArbitraryDataUri;
+
             case VIRTUAL:
                 Uri insertedVirtualUri;
                 long virtualId = db.insert(ProviderTableMeta.VIRTUAL_TABLE_NAME, null, values);
@@ -401,6 +417,7 @@ public class FileContentProvider extends ContentProvider {
         mUriMatcher.addURI(authority, "uploads/#", UPLOADS);
         mUriMatcher.addURI(authority, "synced_folders", SYNCED_FOLDERS);
         mUriMatcher.addURI(authority, "external_links", EXTERNAL_LINKS);
+        mUriMatcher.addURI(authority, "arbitrary_data", ARBITRARY_DATA);
         mUriMatcher.addURI(authority, "virtual", VIRTUAL);
 
         return true;
@@ -490,6 +507,13 @@ public class FileContentProvider extends ContentProvider {
                             + uri.getPathSegments().get(1));
                 }
                 break;
+            case ARBITRARY_DATA:
+                sqlQuery.setTables(ProviderTableMeta.ARBITRARY_DATA_TABLE_NAME);
+                if (uri.getPathSegments().size() > 1) {
+                    sqlQuery.appendWhere(ProviderTableMeta._ID + "="
+                            + uri.getPathSegments().get(1));
+                }
+                break;
             case VIRTUAL:
                 sqlQuery.setTables(ProviderTableMeta.VIRTUAL_TABLE_NAME);
                 if (uri.getPathSegments().size() > 1) {
@@ -518,6 +542,9 @@ public class FileContentProvider extends ContentProvider {
                 case EXTERNAL_LINKS:
                     order = ProviderTableMeta.EXTERNAL_LINKS_NAME;
                     break;
+                case ARBITRARY_DATA:
+                    order = ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID;
+                    break;
                 case VIRTUAL:
                     order = ProviderTableMeta.VIRTUAL_TYPE;
                     break;
@@ -564,25 +591,19 @@ public class FileContentProvider extends ContentProvider {
             case DIRECTORY:
                 return 0; //updateFolderSize(db, selectionArgs[0]);
             case SHARES:
-                return db.update(
-                        ProviderTableMeta.OCSHARES_TABLE_NAME, values, selection, selectionArgs
-                );
+                return db.update(ProviderTableMeta.OCSHARES_TABLE_NAME, values, selection, selectionArgs);
             case CAPABILITIES:
-                return db.update(
-                        ProviderTableMeta.CAPABILITIES_TABLE_NAME, values, selection, selectionArgs
-                );
+                return db.update(ProviderTableMeta.CAPABILITIES_TABLE_NAME, values, selection, selectionArgs);
             case UPLOADS:
-                int ret = db.update(
-                        ProviderTableMeta.UPLOADS_TABLE_NAME, values, selection, selectionArgs
-                );
+                int ret = db.update(ProviderTableMeta.UPLOADS_TABLE_NAME, values, selection, selectionArgs);
                 trimSuccessfulUploads(db);
                 return ret;
             case SYNCED_FOLDERS:
                 return db.update(ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME, values, selection, selectionArgs);
+            case ARBITRARY_DATA:
+                return db.update(ProviderTableMeta.ARBITRARY_DATA_TABLE_NAME, values, selection, selectionArgs);
             default:
-                return db.update(
-                        ProviderTableMeta.FILE_TABLE_NAME, values, selection, selectionArgs
-                );
+                return db.update(ProviderTableMeta.FILE_TABLE_NAME, values, selection, selectionArgs);
         }
     }
 
@@ -638,6 +659,9 @@ public class FileContentProvider extends ContentProvider {
             // Create external links table
             createExternalLinksTable(db);
 
+            // Create arbitrary data table
+            createArbitraryData(db);
+
             // Create virtual table
             createVirtualTable(db);
         }
@@ -958,6 +982,22 @@ public class FileContentProvider extends ContentProvider {
             }
 
             if (oldVersion < 20 && newVersion >= 20) {
+                Log_OC.i(SQL, "Adding arbitrary data table");
+                db.beginTransaction();
+                try {
+                    createArbitraryData(db);
+                    upgraded = true;
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+            }
+
+            if (!upgraded) {
+                Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
+            }
+
+            if (oldVersion < 21 && newVersion >= 21) {
                 Log_OC.i(SQL, "Adding virtual table");
                 db.beginTransaction();
                 try {
@@ -1109,6 +1149,15 @@ public class FileContentProvider extends ContentProvider {
         );
     }
 
+    private void createArbitraryData(SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE " + ProviderTableMeta.ARBITRARY_DATA_TABLE_NAME + "("
+                + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "      // id
+                + ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID + " TEXT, " // cloud id (account name + FQDN)
+                + ProviderTableMeta.ARBITRARY_DATA_KEY + " TEXT, "      // key
+                + ProviderTableMeta.ARBITRARY_DATA_VALUE + " TEXT) "    // value
+        );
+    }
+
     private void createVirtualTable(SQLiteDatabase db) {
         db.execSQL("CREATE TABLE " + ProviderTableMeta.VIRTUAL_TABLE_NAME + "("
                 + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "          // id

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

@@ -52,7 +52,7 @@ public class AutoUploadJob extends Job {
         final String filePath = bundle.getString(LOCAL_PATH, "");
         final String remotePath = bundle.getString(REMOTE_PATH, "");
         final Account account = AccountUtils.getOwnCloudAccountByName(context, bundle.getString(ACCOUNT, ""));
-        final Integer uploadBehaviour = bundle.getInt(UPLOAD_BEHAVIOUR, -1);
+        final Integer uploadBehaviour = bundle.getInt(UPLOAD_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_FORGET);
 
 
         File file = new File(filePath);

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

@@ -26,7 +26,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.IBinder;
@@ -39,9 +38,9 @@ import com.evernote.android.job.util.support.PersistableBundleCompat;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.operations.UploadFileOperation;
@@ -76,13 +75,15 @@ public class ContactsBackupJob extends Job {
 
         boolean force = bundle.getBoolean(FORCE, false);
 
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        Long lastExecution = sharedPreferences.getLong(ContactsPreferenceActivity.PREFERENCE_CONTACTS_LAST_BACKUP, -1);
+        final Account account = AccountUtils.getOwnCloudAccountByName(context, bundle.getString(ACCOUNT, ""));
+
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContext().getContentResolver());
+        Long lastExecution = arbitraryDataProvider.getLongValue(account,
+                ContactsPreferenceActivity.PREFERENCE_CONTACTS_LAST_BACKUP);
 
         if (force || (lastExecution + 24 * 60 * 60 * 1000) < Calendar.getInstance().getTimeInMillis()) {
             Log_OC.d(TAG, "start contacts backup job");
 
-            final Account account = AccountUtils.getOwnCloudAccountByName(context, bundle.getString(ACCOUNT, ""));
             String backupFolder = getContext().getResources().getString(R.string.contacts_backup_folder) +
                     OCFile.PATH_SEPARATOR;
             Integer daysToExpire = getContext().getResources().getInteger(R.integer.contacts_backup_expire);
@@ -96,9 +97,9 @@ public class ContactsBackupJob extends Job {
                     OperationsService.BIND_AUTO_CREATE);
 
             // store execution date
-            sharedPreferences.edit().putLong(ContactsPreferenceActivity.PREFERENCE_CONTACTS_LAST_BACKUP,
-                    Calendar.getInstance().getTimeInMillis()).apply();
-
+            arbitraryDataProvider.storeOrUpdateKeyValue(account,
+                    ContactsPreferenceActivity.PREFERENCE_CONTACTS_LAST_BACKUP,
+                    String.valueOf(Calendar.getInstance().getTimeInMillis()));
         } else {
             Log_OC.d(TAG, "last execution less than 24h ago");
         }

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

@@ -64,9 +64,7 @@ public class ContactsImportJob extends Job {
             vCards.addAll(Ezvcard.parse(file).all());
 
             for (int i = 0; i < intArray.length; i++ ){
-                if (intArray[i] == 1){
-                    operations.insertContact(vCards.get(i));
-                }
+                operations.insertContact(vCards.get(intArray[i]));
             }
         } catch (Exception e) {
             Log_OC.e(TAG, e.getMessage());

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

@@ -51,8 +51,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.activities.GetRemoteActivitiesOperation;
 import com.owncloud.android.ui.adapter.ActivityListAdapter;
-import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.AnalyticsUtils;
+import com.owncloud.android.utils.DisplayUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -74,10 +74,8 @@ public class ActivitiesListActivity extends FileActivity {
     @BindView(R.id.empty_list_view)
     public LinearLayout emptyContentContainer;
 
-    @BindView(R.id.swipe_containing_list)
     public SwipeRefreshLayout swipeListRefreshLayout;
 
-    @BindView(R.id.swipe_containing_empty)
     public SwipeRefreshLayout swipeEmptyListRefreshLayout;
 
     @BindView(R.id.empty_list_view_text)
@@ -111,9 +109,13 @@ public class ActivitiesListActivity extends FileActivity {
 
         setContentView(R.layout.activity_list_layout);
         unbinder = ButterKnife.bind(this);
+
         // setup toolbar
         setupToolbar();
 
+        swipeEmptyListRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_containing_empty);
+        swipeListRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_containing_list);
+
         // setup drawer
         setupDrawer(R.id.nav_activity);
         getSupportActionBar().setTitle(getString(R.string.drawer_item_activities));
@@ -197,8 +199,7 @@ public class ActivitiesListActivity extends FileActivity {
 
                     RemoteOperation getRemoteNotificationOperation = new GetRemoteActivitiesOperation();
                     Log_OC.d(TAG, "BEFORE getRemoteActivitiesOperation.execute");
-                    final RemoteOperationResult result =
-                            getRemoteNotificationOperation.execute(mClient);
+                    final RemoteOperationResult result = getRemoteNotificationOperation.execute(mClient);
 
                     if (result.isSuccess() && result.getData() != null) {
                         final ArrayList<Object> activities = result.getData();

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

@@ -21,43 +21,29 @@
 
 package com.owncloud.android.ui.activity;
 
-import android.Manifest;
 import android.accounts.Account;
-import android.app.DatePickerDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.design.widget.BottomNavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.widget.SwitchCompat;
-import android.view.MenuItem;
 import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.DatePicker;
-import android.widget.TextView;
-import android.widget.Toast;
 
 import com.evernote.android.job.JobManager;
 import com.evernote.android.job.JobRequest;
 import com.evernote.android.job.util.support.PersistableBundleCompat;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.services.ContactsBackupJob;
 import com.owncloud.android.ui.fragment.FileFragment;
+import com.owncloud.android.ui.fragment.contactsbackup.ContactListFragment;
+import com.owncloud.android.ui.fragment.contactsbackup.ContactsBackupFragment;
 import com.owncloud.android.utils.DisplayUtils;
-import com.owncloud.android.utils.PermissionUtil;
 
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
+import org.parceler.Parcels;
+
 import java.util.Set;
-import java.util.Vector;
 
 /**
  * This activity shows all settings for contact backup/restore
@@ -69,9 +55,6 @@ public class ContactsPreferenceActivity extends FileActivity implements FileFrag
     public static final String PREFERENCE_CONTACTS_AUTOMATIC_BACKUP = "PREFERENCE_CONTACTS_AUTOMATIC_BACKUP";
     public static final String PREFERENCE_CONTACTS_LAST_BACKUP = "PREFERENCE_CONTACTS_LAST_BACKUP";
 
-    private SwitchCompat backupSwitch;
-    private SharedPreferences sharedPreferences;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -84,41 +67,23 @@ public class ContactsPreferenceActivity extends FileActivity implements FileFrag
         // setup drawer
         setupDrawer(R.id.nav_contacts);
 
-        getSupportActionBar().setTitle(R.string.actionbar_contacts);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
-
-        backupSwitch = (SwitchCompat) findViewById(R.id.contacts_automatic_backup);
-        backupSwitch.setChecked(sharedPreferences.getBoolean(PREFERENCE_CONTACTS_AUTOMATIC_BACKUP, false));
-
-        backupSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked &&
-                        checkAndAskForContactsReadPermission(PermissionUtil.PERMISSIONS_READ_CONTACTS_AUTOMATIC)) {
-                    // store value
-                    setAutomaticBackup(backupSwitch, true);
-
-                    // enable daily job
-                    startContactBackupJob(getAccount());
-                } else {
-                    setAutomaticBackup(backupSwitch, false);
-
-                    // cancel pending jobs
-                    cancelContactBackupJob(getBaseContext());
-                }
+        Intent intent = getIntent();
+        if (savedInstanceState == null) {
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            if (intent == null || intent.getParcelableExtra(ContactListFragment.FILE_NAME) == null ||
+                    intent.getParcelableExtra(ContactListFragment.ACCOUNT) == null) {
+                ContactsBackupFragment fragment = new ContactsBackupFragment();
+                Bundle bundle = new Bundle();
+                bundle.putParcelable(ContactListFragment.ACCOUNT, getAccount());
+                fragment.setArguments(bundle);
+                transaction.add(R.id.frame_container, fragment);
+            } else {
+                OCFile file = Parcels.unwrap(intent.getParcelableExtra(ContactListFragment.FILE_NAME));
+                Account account = Parcels.unwrap(intent.getParcelableExtra(ContactListFragment.ACCOUNT));
+                ContactListFragment contactListFragment = ContactListFragment.newInstance(file, account);
+                transaction.add(R.id.frame_container, contactListFragment);
             }
-        });
-
-        // display last backup
-        TextView lastBackup = (TextView) findViewById(R.id.contacts_last_backup_timestamp);
-        Long lastBackupTimestamp = sharedPreferences.getLong(PREFERENCE_CONTACTS_LAST_BACKUP, -1);
-
-        if (lastBackupTimestamp == -1) {
-            lastBackup.setText(R.string.contacts_preference_backup_never);
-        } else {
-            lastBackup.setText(DisplayUtils.getRelativeTimestamp(getBaseContext(), lastBackupTimestamp));
+            transaction.commit();
         }
 
         BottomNavigationView bottomNavigationView = (BottomNavigationView) findViewById(R.id.bottom_navigation_view);
@@ -129,184 +94,6 @@ public class ContactsPreferenceActivity extends FileActivity implements FileFrag
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-        if (requestCode == PermissionUtil.PERMISSIONS_READ_CONTACTS_AUTOMATIC) {
-            for (int index = 0; index < permissions.length; index++) {
-                if (Manifest.permission.READ_CONTACTS.equalsIgnoreCase(permissions[index])) {
-                    if (grantResults[index] >= 0) {
-                        setAutomaticBackup(backupSwitch, true);
-                    } else {
-                        setAutomaticBackup(backupSwitch, false);
-                    }
-
-                    break;
-                }
-            }
-        }
-
-        if (requestCode == PermissionUtil.PERMISSIONS_READ_CONTACTS_MANUALLY) {
-            for (int index = 0; index < permissions.length; index++) {
-                if (Manifest.permission.READ_CONTACTS.equalsIgnoreCase(permissions[index])) {
-                    if (grantResults[index] >= 0) {
-                        startContactsBackupJob();
-                    }
-
-                    break;
-                }
-            }
-        }
-    }
-
-    public void backupContacts(View v) {
-        if (checkAndAskForContactsReadPermission(PermissionUtil.PERMISSIONS_READ_CONTACTS_MANUALLY)) {
-            startContactsBackupJob();
-        }
-    }
-
-    private void startContactsBackupJob() {
-        PersistableBundleCompat bundle = new PersistableBundleCompat();
-        bundle.putString(ContactsBackupJob.ACCOUNT, getAccount().name);
-        bundle.putBoolean(ContactsBackupJob.FORCE, true);
-
-        new JobRequest.Builder(ContactsBackupJob.TAG)
-                .setExtras(bundle)
-                .setExecutionWindow(3_000L, 10_000L)
-                .setRequiresCharging(false)
-                .setPersisted(false)
-                .setUpdateCurrent(false)
-                .build()
-                .schedule();
-
-        Snackbar.make(findViewById(R.id.contacts_linear_layout), R.string.contacts_preferences_backup_scheduled,
-                Snackbar.LENGTH_LONG).show();
-    }
-
-    private void setAutomaticBackup(SwitchCompat backupSwitch, boolean bool) {
-        backupSwitch.setChecked(bool);
-        SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putBoolean(PREFERENCE_CONTACTS_AUTOMATIC_BACKUP, bool);
-        editor.apply();
-    }
-
-    private boolean checkAndAskForContactsReadPermission(final int permission) {
-        // check permissions
-        if ((PermissionUtil.checkSelfPermission(this, Manifest.permission.READ_CONTACTS))) {
-            return true;
-        } else {
-            // Check if we should show an explanation
-            if (PermissionUtil.shouldShowRequestPermissionRationale(ContactsPreferenceActivity.this,
-                    android.Manifest.permission.READ_CONTACTS)) {
-                // Show explanation to the user and then request permission
-                Snackbar snackbar = Snackbar.make(findViewById(R.id.contacts_linear_layout), R.string.contacts_read_permission,
-                        Snackbar.LENGTH_INDEFINITE)
-                        .setAction(R.string.common_ok, new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                PermissionUtil.requestReadContactPermission(ContactsPreferenceActivity.this, permission);
-                            }
-                        });
-
-                DisplayUtils.colorSnackbar(this, snackbar);
-
-                snackbar.show();
-
-                return false;
-            } else {
-                // No explanation needed, request the permission.
-                PermissionUtil.requestReadContactPermission(ContactsPreferenceActivity.this, permission);
-
-                return false;
-            }
-        }
-    }
-
-    public void openDate(View v) {
-        String backupFolderString = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR;
-        OCFile backupFolder = getStorageManager().getFileByPath(backupFolderString);
-
-        Vector<OCFile> backupFiles = getStorageManager().getFolderContent(backupFolder, false);
-
-        Collections.sort(backupFiles, new Comparator<OCFile>() {
-            @Override
-            public int compare(OCFile o1, OCFile o2) {
-                if (o1.getModificationTimestamp() == o2.getModificationTimestamp()) {
-                    return 0;
-                }
-
-                if (o1.getModificationTimestamp() > o2.getModificationTimestamp()) {
-                    return 1;
-                } else {
-                    return -1;
-                }
-            }
-        });
-
-        Calendar cal = Calendar.getInstance();
-        int year = cal.get(Calendar.YEAR);
-        int month = cal.get(Calendar.MONTH) + 1;
-        int day = cal.get(Calendar.DAY_OF_MONTH);
-
-        DatePickerDialog.OnDateSetListener dateSetListener = new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
-                String backupFolderString = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR;
-                OCFile backupFolder = getStorageManager().getFileByPath(backupFolderString);
-                Vector<OCFile> backupFiles = getStorageManager().getFolderContent(backupFolder, false);
-
-                // find file with modification with date and time between 00:00 and 23:59
-                // if more than one file exists, take oldest
-                Calendar date = Calendar.getInstance();
-                date.set(year, month, dayOfMonth);
-
-                // start
-                date.set(Calendar.HOUR, 0);
-                date.set(Calendar.MINUTE, 0);
-                date.set(Calendar.SECOND, 1);
-                date.set(Calendar.MILLISECOND, 0);
-                date.set(Calendar.AM_PM, Calendar.AM);
-                Long start = date.getTimeInMillis();
-
-                // end
-                date.set(Calendar.HOUR, 23);
-                date.set(Calendar.MINUTE, 59);
-                date.set(Calendar.SECOND, 59);
-                Long end = date.getTimeInMillis();
-
-                OCFile backupToRestore = null;
-
-                for (OCFile file : backupFiles) {
-                    if (start < file.getModificationTimestamp() && end > file.getModificationTimestamp()) {
-                        if (backupToRestore == null) {
-                            backupToRestore = file;
-                        } else if (backupToRestore.getModificationTimestamp() < file.getModificationTimestamp()) {
-                            backupToRestore = file;
-                        }
-                    }
-                }
-
-                if (backupToRestore != null) {
-                    Fragment contactListFragment = ContactListFragment.newInstance(backupToRestore, getAccount());
-
-                    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-                    transaction.replace(R.id.contacts_linear_layout, contactListFragment);
-                    transaction.commit();
-                } else {
-                    Toast.makeText(ContactsPreferenceActivity.this, R.string.contacts_preferences_no_file_found,
-                            Toast.LENGTH_SHORT).show();
-                }
-            }
-        };
-
-        DatePickerDialog datePickerDialog = new DatePickerDialog(this, dateSetListener, year, month, day);
-        datePickerDialog.getDatePicker().setMaxDate(backupFiles.lastElement().getModificationTimestamp());
-        datePickerDialog.getDatePicker().setMinDate(backupFiles.firstElement().getModificationTimestamp());
-
-        datePickerDialog.show();
-    }
-
     public static void startContactBackupJob(Account account) {
         Log_OC.d(TAG, "start daily contacts backup job");
 
@@ -323,8 +110,8 @@ public class ContactsPreferenceActivity extends FileActivity implements FileFrag
                 .schedule();
     }
 
-    public static void cancelContactBackupJob(Context context) {
-        Log_OC.d(TAG, "disabling contacts backup job");
+    public static void cancelAllContactBackupJobs(Context context) {
+        Log_OC.d(TAG, "disabling all contacts backup job");
 
         JobManager jobManager = JobManager.create(context);
         Set<JobRequest> jobs = jobManager.getAllJobRequestsForTag(ContactsBackupJob.TAG);
@@ -334,27 +121,21 @@ public class ContactsPreferenceActivity extends FileActivity implements FileFrag
         }
     }
 
+    public static void cancelContactBackupJobForAccount(Context context, Account account) {
+        Log_OC.d(TAG, "disabling contacts backup job for account: " + account.name);
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        boolean retval;
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                if (isDrawerOpen()) {
-                    closeDrawer();
-                } else {
-                    openDrawer();
-                }
-                retval = true;
-                break;
+        JobManager jobManager = JobManager.create(context);
+        Set<JobRequest> jobs = jobManager.getAllJobRequestsForTag(ContactsBackupJob.TAG);
 
-            default:
-                retval = super.onOptionsItemSelected(item);
-                break;
+        for (JobRequest jobRequest : jobs) {
+            PersistableBundleCompat extras = jobRequest.getExtras();
+            if (extras.getString(ContactsBackupJob.ACCOUNT, "").equalsIgnoreCase(account.name)) {
+                jobManager.cancel(jobRequest.getJobId());
+            }
         }
-        return retval;
     }
 
+
     @Override
     public void showFiles(boolean onDeviceOnly) {
         super.showFiles(onDeviceOnly);

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

@@ -1199,7 +1199,8 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
 
                     Account account = AccountUtils.getCurrentOwnCloudAccount(DrawerActivity.this);
 
-                    if (account != null && getStorageManager().getCapability(account.name) != null &&
+                    if (account != null && getStorageManager() != null &&
+                            getStorageManager().getCapability(account.name) != null &&
                             getStorageManager().getCapability(account.name).getExternalLinks().isTrue()) {
 
                         int count = sharedPreferences.getInt(EXTERNAL_LINKS_COUNT, -1);

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

@@ -32,11 +32,11 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.utils.DisplayUtils;
 
 /**
  * This activity shows an URL as a web view
@@ -52,6 +52,7 @@ public class ExternalSiteWebView extends FileActivity {
 
     private boolean showSidebar = false;
     private int menuItemId;
+    private WebView webview;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -69,8 +70,8 @@ public class ExternalSiteWebView extends FileActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.externalsite_webview);
 
-        WebView webview = (WebView) findViewById(R.id.webView);
-        WebSettings webSettings = webview.getSettings();
+        webview = (WebView) findViewById(R.id.webView);
+        final WebSettings webSettings = webview.getSettings();
 
         webview.setFocusable(true);
         webview.setFocusableInTouchMode(true);
@@ -122,7 +123,7 @@ public class ExternalSiteWebView extends FileActivity {
 
         webview.setWebViewClient(new WebViewClient() {
             public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
-                Toast.makeText(activity, getString(R.string.webview_error) + ": " + description, Toast.LENGTH_SHORT).show();
+                webview.loadData(DisplayUtils.getData(getResources().openRawResource(R.raw.custom_error)),"text/html; charset=UTF-8", null);
             }
         });
 

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

@@ -28,7 +28,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -41,8 +40,8 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AuthenticatorActivity;
+import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader;
@@ -163,8 +162,6 @@ public abstract class FileActivity extends DrawerActivity
 
         setAccount(account, savedInstanceState != null);
 
-        checkContactsBackupJob();
-
         mOperationsServiceConnection = new OperationsServiceConnection();
         bindService(new Intent(this, OperationsService.class), mOperationsServiceConnection,
                 Context.BIND_AUTO_CREATE);
@@ -244,17 +241,6 @@ public abstract class FileActivity extends DrawerActivity
         }
     }
 
-    private void checkContactsBackupJob() {
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
-
-        if (sharedPreferences.getBoolean(ContactsPreferenceActivity.PREFERENCE_CONTACTS_AUTOMATIC_BACKUP, false)) {
-            ContactsPreferenceActivity.startContactBackupJob(getAccount());
-        } else {
-            ContactsPreferenceActivity.cancelContactBackupJob(getBaseContext());
-        }
-    }
-
-
     /**
      * Getter for the main {@link OCFile} handled by the activity.
      *

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

@@ -84,6 +84,7 @@ import com.owncloud.android.services.observer.FileObserverService;
 import com.owncloud.android.syncadapter.FileSyncAdapter;
 import com.owncloud.android.ui.dialog.SortingOrderDialogFragment;
 import com.owncloud.android.ui.events.TokenPushEvent;
+import com.owncloud.android.ui.fragment.contactsbackup.ContactListFragment;
 import com.owncloud.android.ui.fragment.ExtendedListFragment;
 import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
@@ -102,6 +103,7 @@ import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.PermissionUtil;
 
 import org.greenrobot.eventbus.EventBus;
+import org.parceler.Parcels;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -434,7 +436,7 @@ public class FileDisplayActivity extends HookActivity
                 updateActionBarTitleAndHomeButton(file);
             } else {
                 cleanSecondFragment();
-                if (file.isDown() && MimeTypeUtil.isVCard(file.getMimetype())){
+                if (file.isDown() && MimeTypeUtil.isVCard(file.getMimetype())) {
                     startContactListFragment(file);
                 } else if (file.isDown() && PreviewTextFragment.canBePreviewed(file)) {
                     startTextPreview(file);
@@ -603,7 +605,7 @@ public class FileDisplayActivity extends HookActivity
                         if (PreviewMediaFragment.canBePreviewed(mWaitingToPreview)) {
                             startMediaPreview(mWaitingToPreview, 0, true);
                             detailsFragmentChanged = true;
-                        } else if (MimeTypeUtil.isVCard(mWaitingToPreview.getMimetype())){
+                        } else if (MimeTypeUtil.isVCard(mWaitingToPreview.getMimetype())) {
                             startContactListFragment(mWaitingToPreview);
                             detailsFragmentChanged = true;
                         } else if (PreviewTextFragment.canBePreviewed(mWaitingToPreview)) {
@@ -1965,12 +1967,10 @@ public class FileDisplayActivity extends HookActivity
     }
 
     public void startContactListFragment(OCFile file) {
-        Fragment contactListFragment = ContactListFragment.newInstance(file, getAccount());
-
-        setSecondFragment(contactListFragment);
-        updateFragmentsVisibility(true);
-        updateActionBarTitleAndHomeButton(file);
-        setFile(file);
+        Intent intent = new Intent(this, ContactsPreferenceActivity.class);
+        intent.putExtra(ContactListFragment.FILE_NAME, Parcels.wrap(file));
+        intent.putExtra(ContactListFragment.ACCOUNT, Parcels.wrap(getAccount()));
+        startActivity(intent);
     }
 
     /**

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

@@ -36,6 +36,7 @@ import android.os.CancellationSignal;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyPermanentlyInvalidatedException;
 import android.security.keystore.KeyProperties;
+import android.support.annotation.RequiresApi;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.AppCompatActivity;
@@ -256,7 +257,8 @@ public class FingerprintActivity extends AppCompatActivity {
         Toast.makeText(this, errorSeq, Toast.LENGTH_LONG).show();
     }
 
-    final static public boolean isFingerprintCapable(Context context) {
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    static public boolean isFingerprintCapable(Context context) {
         try {
             FingerprintManager fingerprintManager =
                     (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
@@ -274,7 +276,8 @@ public class FingerprintActivity extends AppCompatActivity {
         return false;
     }
 
-    final static public boolean isFingerprintReady(Context context) {
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    static public boolean isFingerprintReady(Context context) {
         try {
             FingerprintManager fingerprintManager =
                     (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);

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

@@ -45,12 +45,13 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.SyncedFolder;
 import com.owncloud.android.datamodel.SyncedFolderDisplayItem;
 import com.owncloud.android.datamodel.SyncedFolderProvider;
+import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.ui.adapter.FolderSyncAdapter;
 import com.owncloud.android.ui.decoration.MediaGridItemDecoration;
 import com.owncloud.android.ui.dialog.SyncedFolderPreferencesDialogFragment;
 import com.owncloud.android.ui.dialog.parcel.SyncedFolderParcelable;
-import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.AnalyticsUtils;
+import com.owncloud.android.utils.DisplayUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -303,7 +304,7 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
                 false,
                 false,
                 AccountUtils.getCurrentOwnCloudAccount(this).name,
-                0,
+                FileUploader.LOCAL_BEHAVIOUR_FORGET,
                 false,
                 mediaFolder.filePaths,
                 mediaFolder.folderName,

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

@@ -52,8 +52,8 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.notifications.GetRemoteNotificationsOperation;
 import com.owncloud.android.lib.resources.notifications.models.Notification;
 import com.owncloud.android.ui.adapter.NotificationListAdapter;
-import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.AnalyticsUtils;
+import com.owncloud.android.utils.DisplayUtils;
 
 import java.io.IOException;
 import java.util.List;
@@ -74,10 +74,8 @@ public class NotificationsActivity extends FileActivity {
     @BindView(R.id.empty_list_view)
     public LinearLayout emptyContentContainer;
 
-    @BindView(R.id.swipe_containing_list)
     public SwipeRefreshLayout swipeListRefreshLayout;
 
-    @BindView(R.id.swipe_containing_empty)
     public SwipeRefreshLayout swipeEmptyListRefreshLayout;
 
     @BindView(R.id.empty_list_view_text)
@@ -116,6 +114,9 @@ public class NotificationsActivity extends FileActivity {
         // setup toolbar
         setupToolbar();
 
+        swipeEmptyListRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_containing_empty);
+        swipeListRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_containing_list);
+
         // setup drawer
         setupDrawer(R.id.nav_notifications);
         getSupportActionBar().setTitle(getString(R.string.drawer_item_notifications));
@@ -296,7 +297,7 @@ public class NotificationsActivity extends FileActivity {
     }
 
     @Override
-    public void onResume(){
+    public void onResume() {
         super.onResume();
         AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
     }

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

@@ -189,41 +189,49 @@ public class Preferences extends PreferenceActivity
         boolean fPrintEnabled = getResources().getBoolean(R.bool.fingerprint_enabled);
         fPrint = (CheckBoxPreference) findPreference(FingerprintActivity.PREFERENCE_USE_FINGERPRINT);
         if (fPrint != null) {
-            if(FingerprintActivity.isFingerprintCapable(MainApp.getAppContext()) && fPrintEnabled) {
-                fPrint.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-                    @Override
-                    public boolean onPreferenceChange(Preference preference, Object newValue) {
-                        Boolean incoming = (Boolean) newValue;
-
-                        if(FingerprintActivity.isFingerprintReady(MainApp.getAppContext())) {
-                            SharedPreferences appPrefs =
-                                    PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-                            SharedPreferences.Editor editor = appPrefs.edit();
-                            editor.putBoolean("use_fingerprint", incoming);
-                            editor.commit();
-                            return true;
-                        } else {
-                            if(incoming) {
-                                Toast.makeText(
-                                        MainApp.getAppContext(),
-                                        R.string.prefs_fingerprint_notsetup,
-                                        Toast.LENGTH_LONG)
-                                        .show();
-                                fPrint.setChecked(false);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (FingerprintActivity.isFingerprintCapable(MainApp.getAppContext()) && fPrintEnabled) {
+                    fPrint.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                        @Override
+                        public boolean onPreferenceChange(Preference preference, Object newValue) {
+                            Boolean incoming = (Boolean) newValue;
+
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                if (FingerprintActivity.isFingerprintReady(MainApp.getAppContext())) {
+                                    SharedPreferences appPrefs =
+                                            PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+                                    SharedPreferences.Editor editor = appPrefs.edit();
+                                    editor.putBoolean("use_fingerprint", incoming);
+                                    editor.apply();
+                                    return true;
+                                } else {
+                                    if (incoming) {
+                                        Toast.makeText(
+                                                MainApp.getAppContext(),
+                                                R.string.prefs_fingerprint_notsetup,
+                                                Toast.LENGTH_LONG)
+                                                .show();
+                                        fPrint.setChecked(false);
+                                    }
+                                    SharedPreferences appPrefs =
+                                            PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+                                    SharedPreferences.Editor editor = appPrefs.edit();
+                                    editor.putBoolean("use_fingerprint", false);
+                                    editor.apply();
+                                    return false;
+                                }
+                            } else {
+                                return false;
                             }
-                            SharedPreferences appPrefs =
-                                    PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-                            SharedPreferences.Editor editor = appPrefs.edit();
-                            editor.putBoolean("use_fingerprint", false);
-                            editor.commit();
-                            return false;
                         }
+                    });
+                    if (!FingerprintActivity.isFingerprintReady(MainApp.getAppContext())) {
+                        fPrint.setChecked(false);
                     }
-                });
-                if(!FingerprintActivity.isFingerprintReady(MainApp.getAppContext())) {
-                    fPrint.setChecked(false);
-                }
 
+                } else {
+                    preferenceCategoryDetails.removePreference(fPrint);
+                }
             } else {
                 preferenceCategoryDetails.removePreference(fPrint);
             }

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

@@ -26,7 +26,6 @@ package com.owncloud.android.ui.activity;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
-import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -609,7 +608,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
         @Nullable
         private File createTempFile(String filename, String text) {
-            File file = new File(((ReceiveExternalFilesActivity)getActivity()).getCacheDir(), filename);
+            File file = new File(getActivity().getCacheDir(), filename);
             FileWriter fw = null;
             try {
                 fw = new FileWriter(file);
@@ -862,7 +861,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
         finish();
     }
 
-    @SuppressLint("NewApi")
     public void uploadFiles() {
 
         UriUploader uploader = new UriUploader(

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

@@ -47,16 +47,22 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.google.gson.Gson;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AuthenticatorActivity;
+import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.PushConfigurationState;
 import com.owncloud.android.lib.common.UserInfo;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation;
+import com.owncloud.android.ui.events.TokenPushEvent;
 import com.owncloud.android.utils.DisplayUtils;
+import com.owncloud.android.utils.PushUtils;
 
+import org.greenrobot.eventbus.EventBus;
 import org.parceler.Parcels;
 
 import butterknife.BindString;
@@ -337,11 +343,38 @@ public class UserInfoActivity extends FileActivity {
                             new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialogInterface, int i) {
-                                    Bundle bundle = new Bundle();
-                                    bundle.putParcelable(KEY_ACCOUNT, Parcels.wrap(account));
-                                    Intent intent = new Intent();
-                                    intent.putExtras(bundle);
+                                    // remove contact backup job
+                                    ContactsPreferenceActivity.cancelContactBackupJobForAccount(getActivity(), account);
+
+                                    // disable daily backup
+                                    ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(
+                                            getActivity().getContentResolver());
+
+                                    arbitraryDataProvider.storeOrUpdateKeyValue(account,
+                                            ContactsPreferenceActivity.PREFERENCE_CONTACTS_AUTOMATIC_BACKUP,
+                                            "false");
+
+
+                                    String arbitraryDataPushString;
+
+                                    if (!TextUtils.isEmpty(arbitraryDataPushString = arbitraryDataProvider.getValue(
+                                            account, PushUtils.KEY_PUSH)) &&
+                                            !TextUtils.isEmpty(getResources().getString(R.string.push_server_url))) {
+                                        Gson gson = new Gson();
+                                        PushConfigurationState pushArbitraryData = gson.fromJson(arbitraryDataPushString,
+                                                PushConfigurationState.class);
+                                        pushArbitraryData.setShouldBeDeleted(true);
+                                        arbitraryDataProvider.storeOrUpdateKeyValue(account, PushUtils.KEY_PUSH,
+                                                gson.toJson(pushArbitraryData));
+                                        EventBus.getDefault().post(new TokenPushEvent());
+                                    }
+
+
                                     if (getActivity() != null && !removeDirectly) {
+                                        Bundle bundle = new Bundle();
+                                        bundle.putParcelable(KEY_ACCOUNT, Parcels.wrap(account));
+                                        Intent intent = new Intent();
+                                        intent.putExtras(bundle);
                                         getActivity().setResult(KEY_DELETE_CODE, intent);
                                         getActivity().finish();
                                     } else {

src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.java

@@ -0,0 +1,28 @@
+/**
+ * Nextcloud Android client application
+ *
+ * @author Mario Danic
+ * Copyright (C) 2017 Mario Danic
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.ui.events;
+
+public class VCardToggleEvent {
+    public boolean showRestoreButton;
+
+    public VCardToggleEvent(boolean showRestore) {
+        this.showRestoreButton = showRestore;
+    }
+}

src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -591,11 +591,18 @@ public class ExtendedListFragment extends Fragment
      *
      * @param enabled Desired visibility for the FAB.
      */
-    public void setFabEnabled(boolean enabled) {
-        if (enabled) {
-            mFabMain.setVisibility(View.VISIBLE);
-        } else {
-            mFabMain.setVisibility(View.GONE);
+    public void setFabEnabled(final boolean enabled) {
+        if (getActivity() != null) {
+            getActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (enabled) {
+                        mFabMain.setVisibility(View.VISIBLE);
+                    } else {
+                        mFabMain.setVisibility(View.GONE);
+                    }
+                }
+            });
         }
     }
 

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -651,13 +651,6 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
         super.onViewStateRestored(savedInstanceState);
 
         if (savedInstanceState != null) {
-            mAdapter = new FileListListAdapter(
-                    mJustFolders,
-                    getActivity(),
-                    mContainerActivity,
-                    this,
-                    mContainerActivity.getStorageManager());
-
             searchEvent = Parcels.unwrap(savedInstanceState.getParcelable(SEARCH_EVENT));
         }
 

src/main/java/com/owncloud/android/ui/activity/ContactListFragment.java → src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.owncloud.android.ui.activity;
+package com.owncloud.android.ui.fragment.contactsbackup;
 
 import android.Manifest;
 import android.accounts.Account;
@@ -30,6 +30,7 @@ import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
+import android.os.Handler;
 import android.provider.ContactsContract;
 import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
@@ -39,12 +40,15 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckedTextView;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 import com.evernote.android.job.JobRequest;
 import com.evernote.android.job.util.support.PersistableBundleCompat;
@@ -54,10 +58,16 @@ import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.services.ContactsImportJob;
 import com.owncloud.android.ui.TextDrawable;
+import com.owncloud.android.ui.activity.ContactsPreferenceActivity;
+import com.owncloud.android.ui.events.VCardToggleEvent;
 import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.PermissionUtil;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -65,6 +75,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
 import ezvcard.Ezvcard;
 import ezvcard.VCard;
 import ezvcard.property.StructuredName;
@@ -72,15 +84,24 @@ import ezvcard.property.StructuredName;
 /**
  * This fragment shows all contacts from a file and allows to import them.
  */
-
 public class ContactListFragment extends FileFragment {
     public static final String TAG = ContactListFragment.class.getSimpleName();
 
     public static final String FILE_NAME = "FILE_NAME";
     public static final String ACCOUNT = "ACCOUNT";
 
-    private RecyclerView recyclerView;
-    private Set<Integer> checkedVCards;
+    public static final String CHECKED_ITEMS_ARRAY_KEY = "CHECKED_ITEMS";
+
+    @BindView(R.id.contactlist_recyclerview)
+    public RecyclerView recyclerView;
+
+    @BindView(R.id.contactlist_restore_selected_container)
+    public LinearLayout restoreContactsContainer;
+
+    @BindView(R.id.contactlist_restore_selected)
+    public Button restoreContacts;
+
+    private ContactListAdapter contactListAdapter;
 
     public static ContactListFragment newInstance(OCFile file, Account account) {
         ContactListFragment frag = new ContactListFragment();
@@ -92,14 +113,29 @@ public class ContactListFragment extends FileFragment {
         return frag;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.contactlist_menu, menu);
+    }
+
     @Override
     public View onCreateView(final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
         View view = inflater.inflate(R.layout.contactlist_fragment, null);
+        ButterKnife.bind(this, view);
+
         setHasOptionsMenu(true);
 
+        ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+        contactsPreferenceActivity.getSupportActionBar().setTitle(R.string.actionbar_contacts_restore);
+        contactsPreferenceActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        contactsPreferenceActivity.setDrawerIndicatorEnabled(false);
+
         ArrayList<VCard> vCards = new ArrayList<>();
-        checkedVCards = new HashSet<>();
 
         try {
             OCFile ocFile = getArguments().getParcelable(FILE_NAME);
@@ -116,10 +152,9 @@ public class ContactListFragment extends FileFragment {
                 vCards.addAll(Ezvcard.parse(file).all());
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            Log_OC.e(TAG, "Error processing contacts file!", e);
         }
 
-        final Button restoreContacts = (Button) view.findViewById(R.id.contactlist_restore_selected);
         restoreContacts.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -132,48 +167,95 @@ public class ContactListFragment extends FileFragment {
 
         recyclerView = (RecyclerView) view.findViewById(R.id.contactlist_recyclerview);
 
-
-        ContactListAdapter.OnVCardClickListener vCardClickListener = new ContactListAdapter.OnVCardClickListener() {
-            private void setRestoreButton() {
-                if (checkedVCards.size() > 0) {
-                    restoreContacts.setEnabled(true);
-                    restoreContacts.setBackgroundColor(getResources().getColor(R.color.primary_button_background_color));
-                } else {
-                    restoreContacts.setEnabled(false);
-                    restoreContacts.setBackgroundColor(getResources().getColor(R.color.standard_grey));
-                }
+        if (savedInstanceState == null) {
+            contactListAdapter = new ContactListAdapter(getContext(), vCards);
+        } else {
+            Set<Integer> checkedItems = new HashSet<>();
+            int[] itemsArray = savedInstanceState.getIntArray(CHECKED_ITEMS_ARRAY_KEY);
+            for (int i = 0; i < itemsArray.length; i++) {
+                checkedItems.add(itemsArray[i]);
             }
+            if (checkedItems.size() > 0) {
+                onMessageEvent(new VCardToggleEvent(true));
+            }
+            contactListAdapter = new ContactListAdapter(getContext(), vCards, checkedItems);
+        }
+        recyclerView.setAdapter(contactListAdapter);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-            @Override
-            public void onVCardCheck(int position) {
-                checkedVCards.add(position);
-                Log_OC.d(TAG, position + " checked");
+        return view;
+    }
 
-                setRestoreButton();
-            }
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putIntArray(CHECKED_ITEMS_ARRAY_KEY, contactListAdapter.getCheckedIntArray());
+    }
 
-            @Override
-            public void onVCardUncheck(int position) {
-                checkedVCards.remove(position);
-                Log_OC.d(TAG, position + " unchecked");
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(VCardToggleEvent event) {
+        if (event.showRestoreButton) {
+            restoreContactsContainer.setVisibility(View.VISIBLE);
+        } else {
+            restoreContactsContainer.setVisibility(View.GONE);
+        }
+    }
 
-                setRestoreButton();
-            }
-        };
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+        contactsPreferenceActivity.setDrawerIndicatorEnabled(true);
+    }
 
-        ContactListAdapter contactListAdapter = new ContactListAdapter(getContext(), vCards, vCardClickListener);
-        recyclerView.setAdapter(contactListAdapter);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+    public void onResume() {
+        super.onResume();
+        ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+        contactsPreferenceActivity.setDrawerIndicatorEnabled(false);
+    }
 
-        return view;
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
     }
 
     @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        menu.findItem(R.id.action_search).setVisible(false);
-        menu.findItem(R.id.action_sync_account).setVisible(false);
-        menu.findItem(R.id.action_sort).setVisible(false);
-        menu.findItem(R.id.action_switch_view).setVisible(false);
+    public void onStop() {
+        EventBus.getDefault().unregister(this);
+        super.onStop();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        boolean retval;
+        ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                contactsPreferenceActivity.onBackPressed();
+                retval = true;
+                break;
+            case R.id.action_select_all:
+                item.setChecked(!item.isChecked());
+                setSelectAllMenuItem(item, item.isChecked());
+                contactListAdapter.selectAllFiles(item.isChecked());
+                retval = true;
+                break;
+            default:
+                retval = super.onOptionsItemSelected(item);
+                break;
+        }
+        return retval;
+    }
+
+    private void setSelectAllMenuItem(MenuItem selectAll, boolean checked) {
+        selectAll.setChecked(checked);
+        if(checked) {
+            selectAll.setIcon(R.drawable.ic_select_none);
+        } else {
+            selectAll.setIcon(R.drawable.ic_select_all);
+        }
     }
 
     static class ContactItemViewHolder extends RecyclerView.ViewHolder {
@@ -211,19 +293,11 @@ public class ContactListFragment extends FileFragment {
     }
 
     private void importContacts(ContactAccount account) {
-        int[] intArray = new int[checkedVCards.size()];
-
-        int i = 0;
-        for (Integer checkedVCard : checkedVCards) {
-            intArray[i] = checkedVCard;
-            i++;
-        }
-
         PersistableBundleCompat bundle = new PersistableBundleCompat();
         bundle.putString(ContactsImportJob.ACCOUNT_NAME, account.name);
         bundle.putString(ContactsImportJob.ACCOUNT_TYPE, account.type);
         bundle.putString(ContactsImportJob.VCARD_FILE_PATH, getFile().getStoragePath());
-        bundle.putIntArray(ContactsImportJob.CHECKED_ITEMS_ARRAY, intArray);
+        bundle.putIntArray(ContactsImportJob.CHECKED_ITEMS_ARRAY, contactListAdapter.getCheckedIntArray());
 
         new JobRequest.Builder(ContactsImportJob.TAG)
                 .setExtras(bundle)
@@ -234,8 +308,19 @@ public class ContactListFragment extends FileFragment {
                 .build()
                 .schedule();
 
-
         Snackbar.make(recyclerView, R.string.contacts_preferences_import_scheduled, Snackbar.LENGTH_LONG).show();
+
+        Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if (getFragmentManager().getBackStackEntryCount() > 0) {
+                    getFragmentManager().popBackStack();
+                } else {
+                    getActivity().finish();
+                }
+            }
+        }, 1750);
     }
 
     private void getAccountForImport() {
@@ -269,13 +354,14 @@ public class ContactListFragment extends FileFragment {
         } catch (Exception e) {
             Log_OC.d(TAG, e.getMessage());
         } finally {
-            cursor.close();
+            if (cursor != null) {
+                cursor.close();
+            }
         }
 
         if (accounts.size() == 1) {
             importContacts(accounts.get(0));
         } else {
-
             ArrayAdapter adapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_list_item_1, accounts);
             AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
             builder.setTitle(R.string.contactlist_account_chooser_title)
@@ -291,7 +377,8 @@ public class ContactListFragment extends FileFragment {
     private boolean checkAndAskForContactsWritePermission() {
         // check permissions
         if (!PermissionUtil.checkSelfPermission(getContext(), Manifest.permission.WRITE_CONTACTS)) {
-            PermissionUtil.requestWriteContactPermission(this);
+            requestPermissions(new String[]{Manifest.permission.WRITE_CONTACTS},
+                    PermissionUtil.PERMISSIONS_WRITE_CONTACTS);
             return false;
         } else {
             return true;
@@ -346,15 +433,46 @@ public class ContactListFragment extends FileFragment {
 
 class ContactListAdapter extends RecyclerView.Adapter<ContactListFragment.ContactItemViewHolder> {
     private List<VCard> vCards;
+    private Set<Integer> checkedVCards;
+
     private Context context;
-    private OnVCardClickListener vCardClickListener;
 
-    ContactListAdapter(Context context, List<VCard> vCards, OnVCardClickListener vCardClickListener) {
+    ContactListAdapter(Context context, List<VCard> vCards) {
         this.vCards = vCards;
         this.context = context;
-        this.vCardClickListener = vCardClickListener;
+        this.checkedVCards = new HashSet<>();
     }
 
+    ContactListAdapter(Context context, List<VCard> vCards,
+                       Set<Integer> checkedVCards) {
+        this.vCards = vCards;
+        this.context = context;
+        this.checkedVCards = checkedVCards;
+    }
+
+    public int getCheckedCount() {
+        if (checkedVCards != null) {
+            return checkedVCards.size();
+        } else {
+            return 0;
+        }
+    }
+
+    public int[] getCheckedIntArray() {
+        int[] intArray;
+        if (checkedVCards != null && checkedVCards.size() > 0) {
+            intArray = new int[checkedVCards.size()];
+            int i = 0;
+            for (int position: checkedVCards) {
+                intArray[i] = position;
+                i++;
+            }
+            return intArray;
+        } else {
+            intArray = new int[0];
+            return intArray;
+        }
+    }
 
     @Override
     public ContactListFragment.ContactItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
@@ -365,9 +483,15 @@ class ContactListAdapter extends RecyclerView.Adapter<ContactListFragment.Contac
 
     @Override
     public void onBindViewHolder(final ContactListFragment.ContactItemViewHolder holder, final int position) {
-        final VCard vcard = vCards.get(holder.getAdapterPosition());
+        final VCard vcard = vCards.get(position);
 
         if (vcard != null) {
+
+            if (checkedVCards.contains(position)) {
+                holder.getName().setChecked(true);
+            } else {
+                holder.getName().setChecked(false);
+            }
             // name
             StructuredName name = vcard.getStructuredName();
             if (name != null) {
@@ -407,9 +531,20 @@ class ContactListAdapter extends RecyclerView.Adapter<ContactListFragment.Contac
                     holder.getName().setChecked(!holder.getName().isChecked());
 
                     if (holder.getName().isChecked()) {
-                        vCardClickListener.onVCardCheck(holder.getAdapterPosition());
+                        if (!checkedVCards.contains(position)) {
+                            checkedVCards.add(position);
+                        }
+                        if (checkedVCards.size() == 1) {
+                            EventBus.getDefault().post(new VCardToggleEvent(true));
+                        }
                     } else {
-                        vCardClickListener.onVCardUncheck(holder.getAdapterPosition());
+                        if (checkedVCards.contains(position)) {
+                            checkedVCards.remove(position);
+                        }
+
+                        if (checkedVCards.size() == 0) {
+                            EventBus.getDefault().post(new VCardToggleEvent(false));
+                        }
                     }
                 }
             });
@@ -421,9 +556,20 @@ class ContactListAdapter extends RecyclerView.Adapter<ContactListFragment.Contac
         return vCards.size();
     }
 
-    interface OnVCardClickListener {
-        void onVCardCheck(int position);
+    public void selectAllFiles(boolean select) {
+        checkedVCards = new HashSet<>();
+        if (select) {
+            for (int i = 0; i < vCards.size(); i++) {
+                checkedVCards.add(i);
+            }
+        }
+
+        if (checkedVCards.size() > 0) {
+            EventBus.getDefault().post(new VCardToggleEvent(true));
+        } else {
+            EventBus.getDefault().post(new VCardToggleEvent(false));
+        }
 
-        void onVCardUncheck(int position);
+        notifyDataSetChanged();
     }
 }

src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -0,0 +1,463 @@
+/**
+ * Nextcloud Android client application
+ *
+ * @author Mario Danic
+ * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 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 <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.ui.fragment.contactsbackup;
+
+import android.Manifest;
+import android.accounts.Account;
+import android.app.DatePickerDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.widget.AppCompatButton;
+import android.support.v7.widget.SwitchCompat;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.DatePicker;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.evernote.android.job.JobRequest;
+import com.evernote.android.job.util.support.PersistableBundleCompat;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.services.ContactsBackupJob;
+import com.owncloud.android.ui.activity.ContactsPreferenceActivity;
+import com.owncloud.android.ui.fragment.FileFragment;
+import com.owncloud.android.utils.DisplayUtils;
+import com.owncloud.android.utils.PermissionUtil;
+
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Vector;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFERENCE_CONTACTS_AUTOMATIC_BACKUP;
+import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFERENCE_CONTACTS_LAST_BACKUP;
+
+public class ContactsBackupFragment extends FileFragment implements DatePickerDialog.OnDateSetListener {
+    public static final String TAG = ContactsBackupFragment.class.getSimpleName();
+
+    @BindView(R.id.contacts_automatic_backup)
+    public SwitchCompat backupSwitch;
+
+    @BindView(R.id.contacts_header_restore)
+    public TextView contactsRestoreHeader;
+
+    @BindView(R.id.contacts_datepicker)
+    public AppCompatButton contactsDatePickerBtn;
+
+    @BindView(R.id.contacts_last_backup_timestamp)
+    public TextView lastBackup;
+
+    private Date selectedDate = null;
+    private boolean calendarPickerOpen;
+
+    private DatePickerDialog datePickerDialog;
+
+    private CompoundButton.OnCheckedChangeListener onCheckedChangeListener;
+
+    private static final String KEY_CALENDAR_PICKER_OPEN = "IS_CALENDAR_PICKER_OPEN";
+    private static final String KEY_CALENDAR_DAY = "CALENDAR_DAY";
+    private static final String KEY_CALENDAR_MONTH = "CALENDAR_MONTH";
+    private static final String KEY_CALENDAR_YEAR = "CALENDAR_YEAR";
+    private ArbitraryDataProvider arbitraryDataProvider;
+    private Account account;
+
+
+    @Override
+    public View onCreateView(final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        View view = inflater.inflate(R.layout.contacts_backup_fragment, null);
+        ButterKnife.bind(this, view);
+
+        setHasOptionsMenu(true);
+
+        final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+
+        account = (Account) getArguments().get(ContactListFragment.ACCOUNT);
+
+        contactsPreferenceActivity.getSupportActionBar().setTitle(R.string.actionbar_contacts);
+        contactsPreferenceActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        arbitraryDataProvider = new ArbitraryDataProvider(getContext().getContentResolver());
+
+        backupSwitch.setChecked(arbitraryDataProvider.getBooleanValue(account, PREFERENCE_CONTACTS_AUTOMATIC_BACKUP));
+
+        onCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (checkAndAskForContactsReadPermission()) {
+                    if (isChecked) {
+                        setAutomaticBackup(true);
+                    } else {
+                        setAutomaticBackup(false);
+                    }
+                }
+            }
+        };
+
+        backupSwitch.setOnCheckedChangeListener(onCheckedChangeListener);
+
+        // display last backup
+        Long lastBackupTimestamp = arbitraryDataProvider.getLongValue(account, PREFERENCE_CONTACTS_LAST_BACKUP);
+
+        if (lastBackupTimestamp == -1) {
+            lastBackup.setText(R.string.contacts_preference_backup_never);
+        } else {
+            lastBackup.setText(DisplayUtils.getRelativeTimestamp(contactsPreferenceActivity, lastBackupTimestamp));
+        }
+
+        if (savedInstanceState != null && savedInstanceState.getBoolean(KEY_CALENDAR_PICKER_OPEN, false)) {
+            if (savedInstanceState.getInt(KEY_CALENDAR_YEAR, -1) != -1 &&
+                    savedInstanceState.getInt(KEY_CALENDAR_MONTH, -1) != -1 &&
+                    savedInstanceState.getInt(KEY_CALENDAR_DAY, -1) != -1) {
+                selectedDate = new Date(savedInstanceState.getInt(KEY_CALENDAR_YEAR),
+                        savedInstanceState.getInt(KEY_CALENDAR_MONTH), savedInstanceState.getInt(KEY_CALENDAR_DAY));
+            }
+            calendarPickerOpen = true;
+        }
+
+        return view;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (calendarPickerOpen) {
+            if (selectedDate != null) {
+                openDate(selectedDate);
+            } else {
+                openDate(null);
+            }
+        }
+
+        final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+
+        String backupFolderString = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR;
+        OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderString);
+
+        Vector<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager().getFolderContent(backupFolder,
+                false);
+
+        if (backupFiles == null || backupFiles.size() == 0) {
+            contactsRestoreHeader.setVisibility(View.GONE);
+            contactsDatePickerBtn.setVisibility(View.GONE);
+        } else {
+            contactsRestoreHeader.setVisibility(View.VISIBLE);
+            contactsDatePickerBtn.setVisibility(View.VISIBLE);
+        }
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+
+        boolean retval;
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                if (contactsPreferenceActivity.isDrawerOpen()) {
+                    contactsPreferenceActivity.closeDrawer();
+                } else {
+                    contactsPreferenceActivity.openDrawer();
+                }
+                retval = true;
+                break;
+
+            default:
+                retval = super.onOptionsItemSelected(item);
+                break;
+        }
+        return retval;
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == PermissionUtil.PERMISSIONS_READ_CONTACTS_AUTOMATIC) {
+            for (int index = 0; index < permissions.length; index++) {
+                if (Manifest.permission.READ_CONTACTS.equalsIgnoreCase(permissions[index])) {
+                    if (grantResults[index] >= 0) {
+                        setAutomaticBackup(true);
+                    } else {
+                        backupSwitch.setOnCheckedChangeListener(null);
+                        backupSwitch.setChecked(false);
+                        backupSwitch.setOnCheckedChangeListener(onCheckedChangeListener);
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        if (requestCode == PermissionUtil.PERMISSIONS_READ_CONTACTS_MANUALLY) {
+            for (int index = 0; index < permissions.length; index++) {
+                if (Manifest.permission.READ_CONTACTS.equalsIgnoreCase(permissions[index])) {
+                    if (grantResults[index] >= 0) {
+                        startContactsBackupJob();
+                    }
+
+                    break;
+                }
+            }
+        }
+    }
+
+    @OnClick(R.id.contacts_backup_now)
+    public void backupContacts() {
+        if (checkAndAskForContactsReadPermission()) {
+            startContactsBackupJob();
+        }
+    }
+
+    private void startContactsBackupJob() {
+        final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+
+        PersistableBundleCompat bundle = new PersistableBundleCompat();
+        bundle.putString(ContactsBackupJob.ACCOUNT, contactsPreferenceActivity.getAccount().name);
+        bundle.putBoolean(ContactsBackupJob.FORCE, true);
+
+        new JobRequest.Builder(ContactsBackupJob.TAG)
+                .setExtras(bundle)
+                .setExecutionWindow(3_000L, 10_000L)
+                .setRequiresCharging(false)
+                .setPersisted(false)
+                .setUpdateCurrent(false)
+                .build()
+                .schedule();
+
+        Snackbar.make(getView().findViewById(R.id.contacts_linear_layout),
+                R.string.contacts_preferences_backup_scheduled,
+                Snackbar.LENGTH_LONG).show();
+    }
+
+    private void setAutomaticBackup(final boolean bool) {
+
+        final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+
+        if (bool) {
+            ContactsPreferenceActivity.startContactBackupJob(contactsPreferenceActivity.getAccount());
+        } else {
+            ContactsPreferenceActivity.cancelContactBackupJobForAccount(contactsPreferenceActivity,
+                    contactsPreferenceActivity.getAccount());
+        }
+
+        arbitraryDataProvider.storeOrUpdateKeyValue(account, PREFERENCE_CONTACTS_AUTOMATIC_BACKUP,
+                String.valueOf(bool));
+    }
+
+    private boolean checkAndAskForContactsReadPermission() {
+        final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+
+        // check permissions
+        if ((PermissionUtil.checkSelfPermission(contactsPreferenceActivity, Manifest.permission.READ_CONTACTS))) {
+            return true;
+        } else {
+            // Check if we should show an explanation
+            if (PermissionUtil.shouldShowRequestPermissionRationale(contactsPreferenceActivity,
+                    android.Manifest.permission.READ_CONTACTS)) {
+                // Show explanation to the user and then request permission
+                Snackbar snackbar = Snackbar.make(getView().findViewById(R.id.contacts_linear_layout),
+                        R.string.contacts_read_permission,
+                        Snackbar.LENGTH_INDEFINITE)
+                        .setAction(R.string.common_ok, new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                requestPermissions(new String[]{Manifest.permission.READ_CONTACTS},
+                                        PermissionUtil.PERMISSIONS_READ_CONTACTS_AUTOMATIC);
+                            }
+                        });
+
+                DisplayUtils.colorSnackbar(contactsPreferenceActivity, snackbar);
+
+                snackbar.show();
+
+                return false;
+            } else {
+                // No explanation needed, request the permission.
+                requestPermissions(new String[]{Manifest.permission.READ_CONTACTS},
+                        PermissionUtil.PERMISSIONS_READ_CONTACTS_AUTOMATIC);
+                return false;
+            }
+        }
+    }
+
+    @OnClick(R.id.contacts_datepicker)
+    public void openCleanDate() {
+        openDate(null);
+    }
+
+    public void openDate(@Nullable Date savedDate) {
+        final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+
+        String backupFolderString = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR;
+        OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderString);
+
+        Vector<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager().getFolderContent(backupFolder,
+                false);
+
+        Collections.sort(backupFiles, new Comparator<OCFile>() {
+            @Override
+            public int compare(OCFile o1, OCFile o2) {
+                if (o1.getModificationTimestamp() == o2.getModificationTimestamp()) {
+                    return 0;
+                }
+
+                if (o1.getModificationTimestamp() > o2.getModificationTimestamp()) {
+                    return 1;
+                } else {
+                    return -1;
+                }
+            }
+        });
+
+        Calendar cal = Calendar.getInstance();
+        int year;
+        int month;
+        int day;
+
+        if (savedDate == null) {
+            year = cal.get(Calendar.YEAR);
+            month = cal.get(Calendar.MONTH) + 1;
+            day = cal.get(Calendar.DAY_OF_MONTH);
+        } else {
+            year = savedDate.getYear();
+            month = savedDate.getMonth();
+            day = savedDate.getDay();
+        }
+
+        if (backupFiles.size() > 0 && backupFiles.lastElement() != null) {
+            datePickerDialog = new DatePickerDialog(contactsPreferenceActivity, this, year, month, day);
+            datePickerDialog.getDatePicker().setMaxDate(backupFiles.lastElement().getModificationTimestamp());
+            datePickerDialog.getDatePicker().setMinDate(backupFiles.firstElement().getModificationTimestamp());
+
+            datePickerDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                @Override
+                public void onDismiss(DialogInterface dialog) {
+                    selectedDate = null;
+                }
+            });
+
+            datePickerDialog.show();
+        } else {
+            Toast.makeText(contactsPreferenceActivity, R.string.contacts_preferences_something_strange_happened,
+                    Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (datePickerDialog != null) {
+            datePickerDialog.dismiss();
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (datePickerDialog != null) {
+            outState.putBoolean(KEY_CALENDAR_PICKER_OPEN, datePickerDialog.isShowing());
+
+            if (datePickerDialog.isShowing()) {
+                outState.putInt(KEY_CALENDAR_DAY, datePickerDialog.getDatePicker().getDayOfMonth());
+                outState.putInt(KEY_CALENDAR_MONTH, datePickerDialog.getDatePicker().getMonth());
+                outState.putInt(KEY_CALENDAR_YEAR, datePickerDialog.getDatePicker().getYear());
+            }
+        }
+    }
+
+    @Override
+    public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
+        final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
+        selectedDate = new Date(year, month, dayOfMonth);
+
+        String backupFolderString = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR;
+        OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderString);
+        Vector<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager().getFolderContent(
+                backupFolder, false);
+
+        // find file with modification with date and time between 00:00 and 23:59
+        // if more than one file exists, take oldest
+        Calendar date = Calendar.getInstance();
+        date.set(year, month, dayOfMonth);
+
+        // start
+        date.set(Calendar.HOUR, 0);
+        date.set(Calendar.MINUTE, 0);
+        date.set(Calendar.SECOND, 1);
+        date.set(Calendar.MILLISECOND, 0);
+        date.set(Calendar.AM_PM, Calendar.AM);
+        Long start = date.getTimeInMillis();
+
+        // end
+        date.set(Calendar.HOUR, 23);
+        date.set(Calendar.MINUTE, 59);
+        date.set(Calendar.SECOND, 59);
+        Long end = date.getTimeInMillis();
+
+        OCFile backupToRestore = null;
+
+        for (OCFile file : backupFiles) {
+            if (start < file.getModificationTimestamp() && end > file.getModificationTimestamp()) {
+                if (backupToRestore == null) {
+                    backupToRestore = file;
+                } else if (backupToRestore.getModificationTimestamp() < file.getModificationTimestamp()) {
+                    backupToRestore = file;
+                }
+            }
+        }
+
+        if (backupToRestore != null) {
+            Fragment contactListFragment = ContactListFragment.newInstance(backupToRestore,
+                    contactsPreferenceActivity.getAccount());
+
+            FragmentTransaction transaction = contactsPreferenceActivity.getSupportFragmentManager().
+                    beginTransaction();
+            transaction.replace(R.id.frame_container, contactListFragment);
+            transaction.addToBackStack(null);
+            transaction.commit();
+        } else {
+            Toast.makeText(contactsPreferenceActivity, R.string.contacts_preferences_no_file_found,
+                    Toast.LENGTH_SHORT).show();
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 package com.owncloud.android.ui.preview;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -45,7 +44,6 @@ public class ImageViewCustom extends ImageView {
         super(context, attrs, defStyle);
     }
 
-    @SuppressLint("NewApi")
 	@Override
     protected void onDraw(Canvas canvas) {
         if(IS_ICS_OR_HIGHER && checkIfMaximumBitmapExceed(canvas) || IS_VERSION_BUGGY_ON_RECYCLES ) {
@@ -109,10 +107,8 @@ public class ImageViewCustom extends ImageView {
      * @param canvas        Canvas where the view will be drawn into.
      * @return boolean      True means that the bitmap is too big for the canvas.
      */
-    @SuppressLint("NewApi")
 	private boolean checkIfMaximumBitmapExceed(Canvas canvas) {
-        return mBitmapWidth > canvas.getMaximumBitmapWidth()
-                || mBitmapHeight > canvas.getMaximumBitmapHeight();
+        return mBitmapWidth > canvas.getMaximumBitmapWidth() || mBitmapHeight > canvas.getMaximumBitmapHeight();
 
     }
     

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

@@ -109,7 +109,6 @@ public class PreviewImageActivity extends FileActivity implements
         // to keep our UI controls visibility in line with system bars visibility
         mFullScreenAnchorView.setOnSystemUiVisibilityChangeListener
                 (new View.OnSystemUiVisibilityChangeListener() {
-                    @SuppressLint("InlinedApi")
                     @Override
                     public void onSystemUiVisibilityChange(int flags) {
                         boolean visible = (flags & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
@@ -441,9 +440,7 @@ public class PreviewImageActivity extends FileActivity implements
         return true;
     }
 
-    @SuppressLint("InlinedApi")
     public void toggleFullScreen() {
-
         boolean visible = (mFullScreenAnchorView.getSystemUiVisibility()
                 & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
 

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

@@ -19,7 +19,6 @@
 package com.owncloud.android.ui.preview;
 
 import android.accounts.Account;
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
@@ -31,6 +30,7 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.PictureDrawable;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.StringRes;
@@ -549,7 +549,6 @@ public class PreviewImageFragment extends FileFragment {
             }
         }
 
-        @SuppressLint("InlinedApi")
         private void showLoadedImage(LoadImage result) {
             final ImageViewCustom imageView = mImageViewRef.get();
             Bitmap bitmap = result.bitmap;
@@ -575,20 +574,23 @@ public class PreviewImageFragment extends FileFragment {
                         }
                         layers[1] = bitmapDrawable;
                         LayerDrawable layerDrawable = new LayerDrawable(layers);
-                        if (result.ocFile.getMimetype().equalsIgnoreCase("image/png") ) {
-                            layerDrawable.setLayerHeight(0, convertDpToPixel(bitmap.getHeight(), getActivity()));
-                            layerDrawable.setLayerHeight(1, convertDpToPixel(bitmap.getHeight(), getActivity()));
-                            layerDrawable.setLayerWidth(0, convertDpToPixel(bitmap.getWidth(), getActivity()));
-                            layerDrawable.setLayerWidth(1, convertDpToPixel(bitmap.getWidth(), getActivity()));
-                        } else {
-                            layerDrawable.setLayerHeight(0, convertDpToPixel(bitmapDrawable.getIntrinsicHeight(),
-                                    getActivity()));
-                            layerDrawable.setLayerHeight(1, convertDpToPixel(bitmapDrawable.getIntrinsicHeight(),
-                                    getActivity()));
-                            layerDrawable.setLayerWidth(0, convertDpToPixel(bitmapDrawable.getIntrinsicWidth(),
-                                    getActivity()));
-                            layerDrawable.setLayerWidth(1, convertDpToPixel(bitmapDrawable.getIntrinsicWidth(),
-                                    getActivity()));
+
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                            if (result.ocFile.getMimetype().equalsIgnoreCase("image/png")) {
+                                layerDrawable.setLayerHeight(0, convertDpToPixel(bitmap.getHeight(), getActivity()));
+                                layerDrawable.setLayerHeight(1, convertDpToPixel(bitmap.getHeight(), getActivity()));
+                                layerDrawable.setLayerWidth(0, convertDpToPixel(bitmap.getWidth(), getActivity()));
+                                layerDrawable.setLayerWidth(1, convertDpToPixel(bitmap.getWidth(), getActivity()));
+                            } else {
+                                layerDrawable.setLayerHeight(0, convertDpToPixel(bitmapDrawable.getIntrinsicHeight(),
+                                        getActivity()));
+                                layerDrawable.setLayerHeight(1, convertDpToPixel(bitmapDrawable.getIntrinsicHeight(),
+                                        getActivity()));
+                                layerDrawable.setLayerWidth(0, convertDpToPixel(bitmapDrawable.getIntrinsicWidth(),
+                                        getActivity()));
+                                layerDrawable.setLayerWidth(1, convertDpToPixel(bitmapDrawable.getIntrinsicWidth(),
+                                        getActivity()));
+                            }
                         }
                         imageView.setImageDrawable(layerDrawable);
                     } else {
@@ -664,7 +666,8 @@ public class PreviewImageFragment extends FileFragment {
     }
 
     private void toggleImageBackground() {
-        if (getFile() != null && (getFile().getMimetype().equalsIgnoreCase("image/png") ||
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && getFile() != null
+                && (getFile().getMimetype().equalsIgnoreCase("image/png") ||
                 getFile().getMimetype().equalsIgnoreCase("image/svg+xml")) && getActivity() != null
                 && getActivity() instanceof PreviewImageActivity && getResources() != null) {
             PreviewImageActivity previewImageActivity = (PreviewImageActivity) getActivity();

src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -81,7 +81,10 @@ import com.owncloud.android.utils.svg.SvgDrawableTranscoder;
 import org.greenrobot.eventbus.EventBus;
 import org.parceler.Parcels;
 
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.math.BigDecimal;
 import java.net.IDN;
 import java.text.DateFormat;
@@ -647,4 +650,27 @@ public class DisplayUtils {
             activity.startActivity(recentlyAddedIntent);
         }
     }
+
+
+    /**
+     * Get String data from a InputStream
+     *
+     * @param inputStream        The File InputStream
+     */
+    public static String getData(InputStream inputStream){
+
+        BufferedReader buffreader = new BufferedReader(new InputStreamReader(inputStream));
+        String line;
+        StringBuilder text = new StringBuilder();
+        try {
+            while (( line = buffreader.readLine()) != null) {
+                text.append(line);
+                text.append('\n');
+            }
+        } catch (IOException e) {
+            Log_OC.e(TAG,e.getMessage());
+        }
+        return text.toString();
+    }
+
 }

src/main/java/com/owncloud/android/utils/PermissionUtil.java

@@ -52,36 +52,4 @@ public class PermissionUtil {
                 new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
                 PERMISSIONS_WRITE_EXTERNAL_STORAGE);
     }
-
-    /**
-     * request the read permission for contacts
-     *
-     * @param activity The target activity.
-     */
-    public static void requestReadContactPermission(Activity activity, int permission) {
-        ActivityCompat.requestPermissions(activity,
-                new String[]{Manifest.permission.READ_CONTACTS},
-                permission);
-    }
-
-    /**
-     * request the write permission for contacts
-     *
-     * @param activity The target activity.
-     */
-    public static void requestWriteContactPermission(Activity activity) {
-        ActivityCompat.requestPermissions(activity,
-                new String[]{Manifest.permission.WRITE_CONTACTS},
-                PERMISSIONS_WRITE_CONTACTS);
-    }
-
-    /**
-     * request the write permission for contacts
-     *
-     * @param fragment The target fragment.
-     */
-    public static void requestWriteContactPermission(android.support.v4.app.Fragment fragment) {
-        fragment.requestPermissions(new String[]{Manifest.permission.WRITE_CONTACTS},
-                PERMISSIONS_WRITE_CONTACTS);
-    }
 }

src/main/res/layout/contactlist_fragment.xml

@@ -21,6 +21,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              android:animateLayoutChanges="true"
               android:orientation="vertical">
 
     <android.support.v7.widget.RecyclerView
@@ -30,14 +31,26 @@
         android:layout_weight="1"
         android:choiceMode="multipleChoice"/>
 
-    <android.support.v7.widget.AppCompatButton
-        android:id="@+id/contactlist_restore_selected"
+    <LinearLayout
+        android:id="@+id/contactlist_restore_selected_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/standard_margin"
-        android:enabled="false"
-        android:text="@string/contaclist_restore_selected"
-        android:background="@color/standard_grey"
-        android:theme="@style/Button.Primary"/>
+        android:background="@color/white"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:src="@drawable/uploader_list_separator"/>
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/contactlist_restore_selected"
+            style="@style/Button.Borderless"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/contaclist_restore_selected"/>
+
+    </LinearLayout>
 
 </LinearLayout>

src/main/res/layout/contactlist_list_item.xml

@@ -18,7 +18,6 @@
   You should have received a copy of the GNU Affero General Public
   License along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="@dimen/standard_list_item_size">

src/main/res/layout/contacts_backup_fragment.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Nextcloud Android client application
+
+  Copyright (C) 2017 Tobias Kaminsky
+  Copyright (C) 2017 Nextcloud.
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+  You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/contacts_linear_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/contacts_header_backup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/standard_margin"
+            android:layout_marginRight="@dimen/standard_margin"
+            android:layout_marginTop="@dimen/standard_margin"
+            android:text="@string/contacts_header_backup"
+            android:textColor="@color/primary"
+            android:textStyle="bold"/>
+
+        <android.support.v7.widget.SwitchCompat
+            android:id="@+id/contacts_automatic_backup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/standard_margin"
+            android:text="@string/contacts_automatic_backup"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/contacts_last_backup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/standard_margin"
+                android:layout_weight="1"
+                android:text="@string/contacts_last_backup"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/black"/>
+
+            <TextView
+                android:id="@+id/contacts_last_backup_timestamp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/standard_margin"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="@string/contacts_preference_backup_never"
+                android:textAppearance="?android:attr/textAppearanceMedium"/>
+        </LinearLayout>
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/contacts_backup_now"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/standard_margin"
+            android:onClick="backupContacts"
+            android:text="@string/contacts_backup_button"
+            android:theme="@style/Button.Primary"/>
+
+        <TextView
+            android:id="@+id/contacts_header_restore"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/standard_margin"
+            android:layout_marginRight="@dimen/standard_margin"
+            android:layout_marginTop="@dimen/standard_margin"
+            android:text="@string/contacts_header_restore"
+            android:textColor="@color/primary"
+            android:textStyle="bold"/>
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/contacts_datepicker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/standard_margin"
+            android:onClick="openDate"
+            android:text="@string/contacts_preference_choose_date"
+            android:theme="@style/Button.Primary"/>
+
+    </LinearLayout>
+
+</ScrollView>

src/main/res/layout/contacts_preference.xml

@@ -28,7 +28,7 @@
 
     <!-- The main content view -->
     <RelativeLayout
-        android:id="@+id/contacts_linear_layout"
+        android:id="@+id/contacts_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -36,88 +36,14 @@
         <include
             layout="@layout/toolbar_standard"/>
 
-        <LinearLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/bottom_navigation_view"
             android:layout_below="@+id/appbar"
-            android:orientation="vertical">
+            android:id="@+id/frame_container">
 
-        <TextView
-            android:id="@+id/contacts_header_backup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/standard_margin"
-            android:layout_marginRight="@dimen/standard_margin"
-            android:layout_marginTop="@dimen/standard_margin"
-            android:text="@string/contacts_header_backup"
-            android:textColor="@color/primary"
-            android:textStyle="bold"/>
-
-        <android.support.v7.widget.SwitchCompat
-            android:id="@+id/contacts_automatic_backup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/standard_margin"
-            android:text="@string/contacts_automatic_backup"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/contacts_last_backup"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/standard_margin"
-                android:layout_weight="1"
-                android:text="@string/contacts_last_backup"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/black"/>
-
-            <TextView
-                android:id="@+id/contacts_last_backup_timestamp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/standard_margin"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:text="@string/contacts_preference_backup_never"
-                android:textAppearance="?android:attr/textAppearanceMedium"/>
-        </LinearLayout>
-
-        <android.support.v7.widget.AppCompatButton
-            android:id="@+id/contacts_backup_now"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/standard_margin"
-            android:onClick="backupContacts"
-            android:text="@string/contacts_backup_button"
-            android:theme="@style/Button.Primary"/>
-
-        <TextView
-            android:id="@+id/contacts_header_restore"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/standard_margin"
-            android:layout_marginRight="@dimen/standard_margin"
-            android:layout_marginTop="@dimen/standard_margin"
-            android:text="@string/contacts_header_restore"
-            android:textColor="@color/primary"
-            android:textStyle="bold"/>
-
-        <android.support.v7.widget.AppCompatButton
-            android:id="@+id/contacts_datepacker"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/standard_margin"
-            android:onClick="openDate"
-            android:text="@string/contacts_preference_choose_date"
-            android:theme="@style/Button.Primary"/>
-
-        </LinearLayout>
+        </FrameLayout>
 
         <android.support.design.widget.BottomNavigationView
             android:id="@+id/bottom_navigation_view"

src/main/res/menu/contactlist_menu.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Nextcloud Android client application
+
+ @author Tobias Kaminsky
+ Copyright (C) 2017 Tobias Kaminsky
+ Copyright (C) 2017 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 <http://www.gnu.org/licenses/>.
+ -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_select_all"
+        android:checkable="true"
+        android:contentDescription="@string/select_all"
+        android:title="@string/select_all"
+        android:icon="@drawable/ic_select_all"
+        app:showAsAction="always"/>
+
+</menu>

src/main/res/raw/custom_error.html

@@ -0,0 +1,4 @@
+<html>
+<h1>Sorry</h1>
+Modified
+</html>

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

@@ -13,10 +13,24 @@
     <string name="actionbar_send_file">Odeslat</string>
     <string name="actionbar_sort">Seřadit</string>
     <string name="actionbar_sort_title">Seřadit podle</string>
+    <string name="sort_by">Řadit podle</string>
+    <string name="menu_item_sort_by_name_a_z">A - Z</string>
+    <string name="menu_item_sort_by_name_z_a">Z - A</string>
+    <string name="menu_item_sort_by_date_newest_first">První nejnovější</string>
+    <string name="menu_item_sort_by_date_oldest_first">První nejstarší</string>
+    <string name="menu_item_sort_by_size_biggest_first">První největší</string>
     <string name="drawer_item_all_files">Všechny soubory</string>
+    <string name="drawer_item_home">Domů</string>
+    <string name="drawer_item_favorites">Oblíbené</string>
+    <string name="drawer_item_photos">Fotky</string>
     <string name="drawer_item_on_device">Na přístroji</string>
+    <string name="drawer_item_recently_added">Nedávno přidané</string>
+    <string name="drawer_item_recently_modified">Nedávno změněné</string>
+    <string name="drawer_item_shared">Sdíleno</string>
     <string name="drawer_item_settings">Nastavení</string>
     <string name="drawer_item_uploads_list">Nahrání</string>
+    <string name="drawer_item_activities">Aktivity</string>
+    <string name="drawer_item_notifications">Upozornění</string>
     <string name="drawer_quota">%1$s z %2$s použito</string>
 	<string name="drawer_close">Zavřít</string>
     <string name="drawer_open">Otevřít</string>
@@ -25,6 +39,8 @@
     <string name="prefs_accounts">Účty</string>
     <string name="prefs_manage_accounts">Spravovat účty</string>
     <string name="prefs_passcode">Zámek bezpečnostního kódu</string>
+    <string name="prefs_fingerprint">Zámek otiskemprstu</string>
+    <string name="prefs_fingerprint_notsetup">Nebyly nastaveny žádné otisky prstů.</string>
     <string name="prefs_show_hidden_files">Zobrazit skryté soubory</string>
     <string name="prefs_instant_upload">Okamžité nahrávání obrázků</string>
     <string name="prefs_instant_upload_summary">Okamžitě nahrávat vytvořené fotografie</string>
@@ -81,6 +97,8 @@
     <string name="file_list_no_app_for_file_type">Pro tento typ souboru nebyla nalezena aplikace!</string>
     <string name="local_file_list_empty">V tomto adresáři nejsou žádné soubory.</string>
     <string name="file_list_empty_headline_search">V této složce nebylo nic nalezeno</string>
+    <string name="file_list_empty_headline_server_search">Žádné výsledky</string>
+    <string name="file_list_empty_favorite_headline">Zatím není nic oblíbeno</string>
     <string name="file_list_empty_search">Zkusit hledat v jiné složce?</string>
     <string name="upload_list_empty_headline">Nic k nahrání</string>
     <string name="upload_list_empty_text">Nahrajte nějaký obsah, nebo aktivujte okamžité nahrání!</string>
@@ -95,7 +113,7 @@
     <string name="filedetails_modified">Upraven:</string>
     <string name="filedetails_download">Stáhnout</string>
     <string name="filedetails_sync_file">Synchronizovat</string>
-    <string name="filedetails_renamed_in_upload_msg">Soubor byl v průběhu odesílání přejmenován na %1$s</string>
+    <string name="filedetails_renamed_in_upload_msg">Soubor byl během nahrávání přejmenován na %1$s</string>
     <string name="list_layout">Náhled seznamu</string>
     <string name="action_share">Sdílet</string>
     <string name="common_yes">Ano</string>
@@ -122,10 +140,10 @@
     <string name="uploader_info_dirname">Název adresáře</string>
     <string name="uploader_upload_in_progress_ticker">Odesílám &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Odesílám %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Odesílání úspěšné</string>
+    <string name="uploader_upload_succeeded_ticker">Nahráno</string>
     <string name="uploader_upload_succeeded_content_single">%1$s nahráno</string>
     <string name="uploader_upload_failed_ticker">Odesílání selhalo</string>
-    <string name="uploader_upload_failed_content_single">Odesílání %1$s nemohlo být dokončeno</string>
+    <string name="uploader_upload_failed_content_single">Nepodařilo se nahrát %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Nahrání selhalo, je třeba se znovu přihlásit</string>
     <string name="uploads_view_title">Nahrání</string>
     <string name="uploads_view_group_current_uploads">Aktuální</string>
@@ -142,21 +160,21 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Místní soubor nenalezen</string>
     <string name="uploads_view_upload_status_failed_permission_error">Chyba oprávnění</string>
     <string name="uploads_view_upload_status_conflict">Konflikt</string>
-    <string name="uploads_view_upload_status_service_interrupted">Aplikace byla ukončena</string>
+    <string name="uploads_view_upload_status_service_interrupted">Aplikace ukončena</string>
     <string name="uploads_view_upload_status_unknown_fail">Neznámá chyba</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Čekání na wifi připojení</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Čeká se na Wi-Fi připojení</string>
     <string name="uploads_view_later_waiting_to_upload">Čekání na nahrávání</string>
     <string name="downloader_download_in_progress_ticker">Stahuji &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Stahuji %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Stažení úspěšné</string>
+    <string name="downloader_download_succeeded_ticker">Staženo</string>
     <string name="downloader_download_succeeded_content">%1$s staženo</string>
     <string name="downloader_download_failed_ticker">Stažení selhalo</string>
-    <string name="downloader_download_failed_content">Stažení %1$s nemohlo být dokončeno</string>
+    <string name="downloader_download_failed_content">Nepodařilo se stáhnout %1$s</string>
     <string name="downloader_not_downloaded_yet">Ještě nestaženo</string>
     <string name="downloader_download_failed_credentials_error">Stažení selhalo, je třeba se znovu přihlásit</string>
     <string name="common_choose_account">Vybrat účet</string>
     <string name="sync_fail_ticker">Synchronizace selhala</string>
-    <string name="sync_fail_ticker_unauthorized">Synchronizace selhala, je třeba se znovu přihlásit</string>
+    <string name="sync_fail_ticker_unauthorized">Synchronizace se nezdařila, musíte se znovu přihlásit.</string>
     <string name="sync_fail_content">Synchronizace %1$s nemohla být dokončena</string>
     <string name="sync_fail_content_unauthorized">Chybné heslo pro %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Nalezeny konflikty</string>
@@ -192,12 +210,12 @@
     <string name="media_err_no_account">Neposkytnut žádný účet</string>
     <string name="media_err_not_in_owncloud">Soubor není v platném účtu</string>
     <string name="media_err_unsupported">Nepodporovaný kodek</string>
-    <string name="media_err_io">Multimediální soubor nelze přečíst</string>
-    <string name="media_err_malformed">Multimediální soubor není správně kódován</string>
+    <string name="media_err_io">Nepodařilo se přečíst soubor médií</string>
+    <string name="media_err_malformed">Soubor médií má neplatné kódování</string>
     <string name="media_err_timeout">Vypršel čas při pokusu o přehrání</string>
     <string name="media_err_invalid_progressive_playback">Multimediální soubor nelze proudově odesílat</string>
     <string name="media_err_unknown">Multimediální soubor nemůže být přehrán s výchozím přehrávačem</string>
-    <string name="media_err_security_ex">Chyba zabezpečení při pokusu o přehrání %1$s</string>
+    <string name="media_err_security_ex">Při pokusu o přehrání %1$s došlo k bezpečnostní chybě</string>
     <string name="media_err_io_ex">Chyba vstupu při pokusu o přehrání %1$s</string>
     <string name="media_err_unexpected">Neočekávaná chyba při pokusu o přehrání %1$s</string>
     <string name="media_rewind_description">Tlačítko Přetočit</string>
@@ -215,7 +233,7 @@
 	<string name="auth_account_not_the_same">Zadaný uživatel neodpovídá uživateli tohoto účtu</string>
 	<string name="auth_unknown_error_title">Nastala neznámá chyba</string>
 	<string name="auth_unknown_host_title">Nelze najít hostitele</string>
-	<string name="auth_incorrect_path_title">Instance serveru nenalezena</string>
+	<string name="auth_incorrect_path_title">Server nenalezen</string>
 	<string name="auth_timeout_title">Serveru trvalo příliš dlouho odpovědět</string>
 	<string name="auth_incorrect_address_title">Chybný formát adresy serveru</string>
 	<string name="auth_ssl_general_error_title">Inicializace SSL selhala</string>
@@ -239,19 +257,21 @@
     
     <string name="favorite">Nastavit jako dostupné offline</string>
     <string name="unfavorite">Zrušit nastavení dostupnosti offline</string>
+    <string name="favorite_real">Nastavit jako oblíbené</string>
+    <string name="unset_favorite_real">Zrušit jako oblíbené</string>
     <string name="common_rename">Přejmenovat</string>
     <string name="common_remove">Odstranit</string>
     <string name="confirmation_remove_file_alert">Opravdu chcete odstranit %1$s?</string>
     <string name="confirmation_remove_folder_alert">Opravdu chcete odstranit %1$s a jeho obsah?</string>
     <string name="confirmation_remove_local">Pouze místní</string>
-    <string name="remove_success_msg">Úspěšně odstraněno</string>
+    <string name="remove_success_msg">Odstraněno</string>
     <string name="remove_fail_msg">Odstranění nelze dokončit</string>
     <string name="rename_dialog_title">Zadejte nový název</string>
     <string name="rename_local_fail_msg">Místní kopii nelze přejmenovat, zkuste jiný nový název</string>
     <string name="rename_server_fail_msg">Přejmenování nelze dokončit</string>
-    <string name="sync_file_fail_msg">Vzdálený soubor nemohl být zkontrolován</string>
+    <string name="sync_file_fail_msg">Nepodařilo se zkontrolovat vzdálený soubor</string>
     <string name="sync_file_nothing_to_do_msg">Obsah souboru je již synchronizován</string>
-    <string name="create_dir_fail_msg">Adresář nemohl být vytvořen</string>
+    <string name="create_dir_fail_msg">Nepodařilo se vytvořit složku</string>
     <string name="filename_forbidden_characters">Zakázané znaky: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Jméno souboru obsahuje aelspoň jeden neplatný znak</string>
     <string name="filename_empty">Název nemůže být prázdný</string>
@@ -301,7 +321,7 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nahrávat pouze přes wifi</string>
-    <string name="instant_upload_on_wifi">Nahrávat obrázky pouze přes wifi</string>
+    <string name="instant_upload_on_wifi">Nahrávat obrázky pouze na Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Nahrávat videa pouze přes wifi</string>
     <string name="instant_video_upload_on_charging">Nahrávat pouze při nabíjení</string>
     <string name="instant_upload_on_charging">Nahrávat pouze při nabíjení</string>
@@ -312,8 +332,9 @@
     <string name="conflict_use_local_version">místní verze</string>
     <string name="conflict_use_server_version">serverová verze</string>
 
-    <string name="preview_sorry">Omlouváme se za to!</string>
     <string name="preview_image_description">Náhled obrázku</string>
+    <string name="preview_image_error_unknown_format">Nelze zobrazit obrázek</string>
+
     <string name="error__upload__local_file_not_copied">%1$s nelze zkopírovat do místního adresáře %2$s</string>
     <string name="prefs_instant_upload_path_title">Adresář pro okamžité nahrání</string>
     <string name="prefs_folder_sync_local_path_title">Místní adresář</string>
@@ -321,7 +342,7 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">Používat podadresáře</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Ukládat v podadresářích podle roku a měsíce</string>
 
-	<string name="share_link_no_support_share_api">Je nám líto, ale sdílení není na vašem serveru povoleno. Kontaktujte svého správce systému.</string>
+	<string name="share_link_no_support_share_api">Sdílení není na vašem serveru povoleno. Prosím, kontaktujte vašeho administrátora.</string>
 	<string name="share_link_file_no_exist">Nelze sdílet. Zkontrolujte prosím že soubor existuje</string>
 	<string name="share_link_file_error">Při pokusu o sdílení tohoto souboru či adresáře nastala chyba</string>
 	<string name="unshare_link_file_no_exist">Nelze ukončit sdílení. Zkontrolujte prosím že soubor existuje</string>
@@ -345,7 +366,8 @@
     <string name="network_error_socket_timeout_exception">Při čekání na odpověď serveru se vyskytla chyba, operace nemohla být dokončena</string>
     <string name="network_error_connect_timeout_exception">Při čekání na odpověď serveru se vyskytla chyba, operace nemohla být dokončena</string>
     <string name="network_host_not_available">Operace nemohla být dokončena, server je nedostupný</string>
-    <string name="forbidden_permissions">Nemáte oprávnění %s</string>
+
+    <string name="forbidden_permissions">Nemáte oprávnění k %s</string>
     <string name="forbidden_permissions_rename">přejmenovat tento soubor</string>
     <string name="forbidden_permissions_delete">smazat tento soubor</string>
     <string name="share_link_forbidden_permissions">sdílet tento soubor</string>
@@ -366,16 +388,16 @@
     <string name="file_migration_cleaning">Čištění&#8230;</string>
     <string name="file_migration_restoring_accounts_configuration">Obnovování konfigurace účtů&#8230;</string>
     <string name="file_migration_ok_finished">Dokončeno</string>
-    <string name="file_migration_failed_not_enough_space">CHYBA: Nedostatek volného prostoru</string>
-    <string name="file_migration_failed_not_writable">CHYBA: Do souboru nelze zapisovat</string>
+    <string name="file_migration_failed_not_enough_space">CHYBA: Nedostatečné místo</string>
+    <string name="file_migration_failed_not_writable">CHYBA: Soubor není zapisovatelný</string>
     <string name="file_migration_failed_not_readable">CHYBA: Soubor nelze číst</string>
     <string name="file_migration_failed_dir_already_exists">CHYBA: Nextcloud adresář již existuje</string>
     <string name="file_migration_failed_while_coping">CHYBA: V průběhu migrace</string>
     <string name="file_migration_failed_while_updating_index">CHYBA: V průběhu aktualizace indexu</string>
 
     <string name="file_migration_directory_already_exists">Datový adresář již existuje, co teď?</string>
-    <string name="file_migration_override_data_folder">Přepsat</string>
-    <string name="file_migration_use_data_folder">Použít existující</string>
+    <string name="file_migration_override_data_folder">Nahradit</string>
+    <string name="file_migration_use_data_folder">Použít</string>
 
     <string name="prefs_category_accounts">Účty</string>
     <string name="prefs_add_account">Přidat účet</string>
@@ -384,7 +406,7 @@
 
 	<string name="actionbar_logger">Logy</string>
 	<string name="log_send_history_button">Historie odesílání</string>
-	<string name="log_send_no_mail_app">Nenalezena aplikace pro odesílání logů. Nainstalujte prosím emailovou aplikaci.</string>
+	<string name="log_send_no_mail_app">Nebyla nalezena aplikace k odesílání protokolů. Prosím, nainstalujte e-mailového klienta.</string>
 	<string name="log_send_mail_subject">%1$s logy aplikace pro Android</string>
 	<string name="log_progress_dialog_text">Nahrávání dat &#8230;</string>
 
@@ -397,14 +419,14 @@
 
     <string name="move_file_not_found">Nelze přesunout. Zkontrolujte prosím že soubor existuje</string>
     <string name="move_file_invalid_into_descendent">Není možné adresář přesunout do vlastního podadresáře</string>
-    <string name="move_file_invalid_overwrite">Soubor již v cílovém adresáři existuje</string>
+    <string name="move_file_invalid_overwrite">Soubor již v cílové složce existuje</string>
     <string name="move_file_error">Při pokusu o přesun tohoto souboru či adresáře nastala chyba</string>
     <string name="forbidden_permissions_move">pro přesun tohoto souboru</string>
 
 
     <string name="copy_file_not_found">Nelze zkopírpovat. Zkontrolujte prosím že soubor existuje</string>
     <string name="copy_file_invalid_into_descendent">Není možné adresář zkopírovat do jeho vlastního podadresáře</string>
-    <string name="copy_file_invalid_overwrite">Soubor již v cílovém adresáři existuje</string>
+    <string name="copy_file_invalid_overwrite">Soubor již v cílové složce existuje</string>
     <string name="copy_file_error">Při pokusu o zkopírování tohoto souboru či adresáře došlo k chybě</string>
     <string name="forbidden_permissions_copy">pro zkopírování tohoto souboru</string>
 
@@ -480,8 +502,8 @@
 
     <string name="action_retry_uploads">Opakování selhalo</string>
     <string name="action_clear_failed_uploads">Vyčištění selhalo</string>
-    <string name="action_clear_successful_uploads">Vyčištění úspěšné</string>
-    <string name="action_clear_finished_uploads">Vyčistit všechny ukončené</string>
+    <string name="action_clear_successful_uploads">Vyčištěno</string>
+    <string name="action_clear_finished_uploads">Vyčistit dokončená nahrávání</string>
 
     <string name="action_switch_grid_view">Zobrazení v mřížce</string>
     <string name="action_switch_list_view">Zobrazení v seznamu</string>
@@ -495,16 +517,17 @@
     <string name="local_file_not_found_toast">Soubor nebyl nalezen v místním souborovém systému</string>
     <string name="confirmation_remove_files_alert">Opravdu chcete odstranit vybrané položky?</string>
     <string name="confirmation_remove_folders_alert">Opravdu chcete odstranit vybrané položky a jejich obsah?</string>
-    <string name="uploads_view_upload_status_waiting_for_charging">Čekání na zahájení nabíjení</string>
+    <string name="uploads_view_upload_status_waiting_for_charging">Čekání na nabití</string>
     <string name="actionbar_search">Hledat</string>
     <string name="files_drop_not_supported">Toto je Nextcloud funkce, prosím nahrát</string>
     <string name="learn_more">Více</string>
     <string name="drawer_folder_sync">Automatické nahrávání</string>
     <string name="drawer_participate">Zúčastnit se</string>
     <string name="participate_testing_headline">Pomoz nám testovat</string>
-    <string name="participate_testing_bug_text">Našel jsi chybu? Něco nefunguje?</string>
+    <string name="participate_testing_bug_text">Našli jste chybu? Něco podivného?</string>
     <string name="participate_testing_report_text">Nahlásit chybu na Github</string>
     <string name="participate_testing_version_text">Chceš nám pomoci testovat další verzi?</string>
+    <string name="participate_beta_headline">Testovat noční verzi</string>
     <string name="participate_beta_text">Zahrnuje všechny nadcházející funkce a pohybuje se na hraně stability. Mohou se vyskytnout chyby, a pokud ano, nahlašte nám je prosím.</string>
     <string name="participate_release_candidate_headline">Předběžná verze</string>
     <string name="participate_release_candidate_text">Předběžná verze nebo také Release Candidate (RC) je stabilní stav připravované, finální verze. Přihlas se jako tester v Play store nebo si najdi a instaluj hodící se verzi z F-Droid pod \"Verze\".</string>
@@ -512,7 +535,6 @@
     <string name="participate_contribute_irc_text">Diskutovat na IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">Pomozte ostatním na &lt;a href="%1$s">fóru&lt;/a></string>
     <string name="participate_contribute_translate_text">&lt;a href="%1$s">Přeložte&lt;/a> aplikaci</string>
-    <string name="participate_contribute_github_text">Přispět jako vývojář, detaily pod &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a></string>
     <string name="move_to">Přesunout do&#8230;</string>
     <string name="copy_to">Kopírovat do&#8230;</string>
     <string name="choose_remote_folder">Vybrat adresář&#8230;</string>
@@ -528,7 +550,10 @@
         <item quantity="other">vybráno %d</item>
     </plurals>
 
-    <string name="upload_file_dialog_title">Zadejte jméno a typ souboru k nahrání</string>
+    <string name="activity_list_loading_activity">Načítání aktivit&#8230;</string>
+    <string name="notifications_no_results_message">Prosíme, vraťte se později.</string>
+
+    <string name="upload_file_dialog_title">Jméno a typ vstupního souboru k nahrání</string>
     <string name="upload_file_dialog_filename">Jméno souboru</string>
     <string name="upload_file_dialog_filetype">Typ souboru</string>
     <string name="upload_file_dialog_filetype_snippet_text">Soubor textového úryvku(.txt)</string>
@@ -544,7 +569,7 @@
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Bezpečné místo pro všechna vaše data</string>
-    <string name="welcome_feature_1_text">Přistupujte, sdílejte a ochraňte své soubory doma, ale i ve své firmě</string>
+    <string name="welcome_feature_1_text">Přistupujte, sdílejte a ochraňte své domácí a pracovní soubory</string>
 
     <string name="welcome_feature_2_title">Multi účet</string>
     <string name="welcome_feature_2_text">Připojte se ke všem svým cloudům</string>
@@ -554,9 +579,12 @@
 
     <string name="whats_new_skip">Přeskočit</string>
 
+    <string name="fingerprint_scan_finger">Prosím, naskenujte svůj otisk prstu</string>
+    <string name="fingerprint_unknown">Otisk prstu nerozpoznán</string>
+
     <!-- User information -->
     <string name="user_info_full_name">Celé jméno</string>
-    <string name="user_info_email">Email</string>
+    <string name="user_info_email">E-mail</string>
     <string name="user_info_phone">Telefonní číslo</string>
     <string name="user_info_address">Adresa</string>
     <string name="user_info_website">Webová stránka</string>
@@ -564,4 +592,18 @@
 
     <string name="user_information_description">Uživatelské informace</string>
 
+    <!-- Activities -->
+    <string name="activities_no_results_headline">Zatím žádná aktivita</string>
+    <string name="webview_error">Došlo k chybě</string>
+    <string name="prefs_category_about">O aplikaci</string>
+
+    <string name="contacts_restore_button">Obnovit poslední zálohu</string>
+    <string name="contacts_header_restore">Obnovit</string>
+    <string name="contacts_header_backup">Záloha</string>
+    <string name="contacts_last_backup">Poslední záloha</string>
+    <string name="contacts_read_permission">Je třeba oprávnění ke čtení seznamu kontaktů</string>
+    <string name="contacts_preference_choose_date">Zvolte datum</string>
+    <string name="contacts_preference_backup_never">Nikdy</string>
+    <!-- Notifications -->
+    <string name="new_notification_received">Přijato nové upozornění</string>
     </resources>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="about_android">%1$s Android-App</string>
+    <string name="about_android">%1$s Android App</string>
     <string name="about_version">Version %1$s</string>
     <string name="actionbar_sync">Konto aktualisieren</string>
     <string name="actionbar_upload">Hochladen</string>
@@ -13,7 +13,7 @@
     <string name="actionbar_send_file">Senden</string>
     <string name="actionbar_sort">Sortieren</string>
     <string name="actionbar_sort_title">Sortiere nach</string>
-    <string name="sort_by">Sortiere nach</string>
+    <string name="sort_by">Sortieren nach</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
     <string name="menu_item_sort_by_date_newest_first">Neueste zuerst</string>
@@ -46,60 +46,61 @@
     <string name="prefs_fingerprint">Fingerabdruck-Sperre</string>
     <string name="prefs_fingerprint_notsetup">Keine Fingerabdrücke eingerichtet.</string>
     <string name="prefs_show_hidden_files">Versteckte Dateien anzeigen</string>
-    <string name="prefs_instant_upload">Sofortiger Bilderupload</string>
-    <string name="prefs_instant_upload_summary">Fotos von der Kamera sofort hochladen</string>
-    <string name="prefs_instant_video_upload">Sofortiger Videoupload</string>
-    <string name="prefs_instant_video_upload_summary">Videos von der Kamera sofort hochladen</string>
+    <string name="prefs_instant_upload">Sofortiges Hochladen von Bildern</string>
+    <string name="prefs_instant_upload_summary">Laden Sie mit der Kamera gemachte Fotos sofort hoch</string>
+    <string name="prefs_instant_video_upload">Sofortiges Hochladen von Videos</string>
+    <string name="prefs_instant_video_upload_summary">Laden Sie mit der Kamera gemachte Videos sofort hoch</string>
     <string name="prefs_log_title">Protokollierung aktivieren</string>
-    <string name="prefs_log_summary">Dies wird zur Protokollierung von Problemen benutzt</string>
-    <string name="prefs_log_title_history">Protokollverlauf</string>
-    <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokolle</string>
+    <string name="prefs_log_summary">Dies wird zur Protokollierung von Problemen genutzt</string>
+    <string name="prefs_log_title_history">Protokollierungs-Historie</string>
+    <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokollierungen</string>
     <string name="prefs_log_delete_history_button">Verlauf löschen</string>
     <string name="prefs_calendar_contacts">Kalender &amp; Kontakte synchronisieren</string>
     <string name="prefs_calendar_contacts_summary">DAVdroid (v1.3.0+) für aktuelles Konto einrichten</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Serveradresse des Kontos für die DAVdroid-Nutzung konnte nicht ermittelt werden</string>
-    <string name="prefs_calendar_contacts_no_store_error">Weder Google Play Store noch F-Droid App installiert</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Kalender- &amp; Kontakte-Synchronisierung erfolgreich konfiguriert</string>
+    <string name="prefs_calendar_contacts_no_store_error">Weder F-Droid noch Google-Play sind installiert</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Kalender- &amp; Adress-Synchronisation konfigurieren</string>
     <string name="prefs_help">Hilfe</string>
-    <string name="prefs_recommend">Dies einem Freund empfehlen</string>
+    <string name="prefs_recommend">Einem Freund empfehlen</string>
     <string name="prefs_feedback">Rückmeldungen</string>
     <string name="prefs_imprint">Impressum</string>
     <string name="prefs_remember_last_share_location">Geteilten Speicherort merken</string>
-    <string name="prefs_remember_last_upload_location_summary">Geteilten Upload-Speicherort merken</string>
+    <string name="prefs_remember_last_upload_location_summary">Zuletzt verwendeten, geteilten Upload-Speicherort merken</string>
 
-	<string name="recommend_subject">%1$s auf Ihrem Smartphone ausprobieren!</string>
-	<string name="recommend_text">Ich empfehle Ihnen die Nutzung von %1$s auf Ihrem Smartphone!\nSie können die App hier herunterladen: %2$s</string>
+	<string name="recommend_subject">Probieren Sie %1$s auf Ihrem Smartphone!</string>
+	<string name="recommend_text">Ich empfehle Ihnen die Nutzung von %1$s auf Ihrem Smartphone!\nLaden Sie es hier herunter: %2$s</string>
 
     <string name="auth_check_server">Server überprüfen</string>
     <string name="auth_host_url">Server-Adresse https://…</string>
     <string name="auth_username">Benutzername</string>
     <string name="auth_password">Passwort</string>
-    <string name="auth_register">Sie haben bislang keinen Server?\nHier klicken um Server-Anbieter zu finden</string>
+    <string name="auth_register">Sie haben noch keinen Server?\nKlicke hier um Server-Anbieter zu finden</string>
     <string name="sync_string_files">Dateien</string>
     <string name="setup_btn_connect">Verbinden</string>
     <string name="uploader_btn_upload_text">Hochladen</string>
     <string name="uploader_top_message">Hochladeordner auswählen</string>
     <string name="uploader_wrn_no_account_title">Kein Konto gefunden</string>
-    <string name="uploader_wrn_no_account_text">Es sind keine %1$s-Konten auf Ihrem Gerät eingerichtet. Bitte richten Sie zuerst ein Konto ein.</string>
+    <string name="uploader_wrn_no_account_text">Es sind keine %1$s Konten auf Ihrem Gerät eingerichtet. Bitte erstellen Sie zuerst ein Konto.</string>
     <string name="uploader_wrn_no_account_setup_btn_text">Einrichten</string>
     <string name="uploader_wrn_no_account_quit_btn_text">Beenden</string>
     <string name="uploader_error_title_no_file_to_upload">Keine Datei zum Hochladen</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s kann einen Textteil als Datei hochladen</string>
     <string name="uploader_error_message_no_file_to_upload">Empfangene Daten enthalten keine gültige Datei.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">Datei kann nicht hochgeladen werden</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Diese Datei kan nicht hochgeladen werden</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s darf eine empfangene Datei nicht lesen</string>
-    <string name="uploader_error_message_source_file_not_found">Hochzuladende Datei wurde an seinem Ort nicht gefunden. Prüfen Sie, dass die Datei existiert.</string>
-    <string name="uploader_error_message_source_file_not_copied">Es ist ein Fehler beim Kopieren dieser Datei in einen temporären Ordner aufgetreten. Bitte versuchen Sie erneut die Datei zu senden.</string>
+    <string name="uploader_error_message_source_file_not_found">Die zum Hochladen ausgewählte Datei kann nicht gefunden werden. Bitte prüfe ob die Datei existiert.
+</string>
+    <string name="uploader_error_message_source_file_not_copied">Es ist ein Fehler beim Kopieren dieser Datei in einen temporären Ordner aufgetreten. Bitte erneut versuchen die Datei zu senden.</string>
     <string name="uploader_upload_files_behaviour">Upload Option:</string>
-    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">In Nextcloud Ordner verschieben</string>
-    <string name="uploader_upload_files_behaviour_only_upload">Hochladen und Datei im ursprünglichen Ordner behalten</string>
-    <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Lösche Datei aus dem ursprünglichen Ordner</string>
+    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Datei in Nextcloud Ordner verschieben</string>
+    <string name="uploader_upload_files_behaviour_only_upload">Hochladen und im Quellordner behalten</string>
+    <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Hochladen und Datei im Quellordner löschen</string>
     <string name="file_list_seconds_ago">Gerade eben</string>
-    <string name="file_list_empty_headline">Keine Dateien vorhanden</string>
-    <string name="file_list_empty">Laden Sie Inhalte hoch oder synchronisieren Sie sie mit Ihren Geräten!</string>
-    <string name="file_list_empty_favorites">Favorisieren Sie einige Dateien oder synchronisieren Sie Ihre Geräte!</string>
-    <string name="file_list_empty_favorites_filter_list">Dateien und Ordner, die Sie als Favoriten kennzeichnen, werden hier erscheinen</string>
-    <string name="file_list_empty_favorites_filter">Keine favorisierten Dateien in Ihrem Verlauf gefunden!</string>
+    <string name="file_list_empty_headline"> Keine Dateien vorhanden </string>
+    <string name="file_list_empty">Laden Sie Inhalt hoch oder synchronisieren Sie mit Ihren Geräten.</string>
+    <string name="file_list_empty_favorites">Favorisieren Sie einige Dateien oder synchronisieren Sie Ihre Geräte.</string>
+    <string name="file_list_empty_favorites_filter_list">Dateien und Ordner, die als Favoriten markiert werden, erscheinen hier</string>
+    <string name="file_list_empty_favorites_filter">Keine favorisierten Dateien in Ihrem Verlauf gefunden.</string>
     <string name="file_list_loading">Lade&#8230;</string>
     <string name="file_list_no_app_for_file_type">Es wurde keine App für diesen Dateityp gefunden!</string>
     <string name="local_file_list_empty">Es befinden sich keine Dateien in diesem Ordner.</string>
@@ -107,22 +108,21 @@
     <string name="file_list_empty_headline_server_search">Keine Ergebnisse</string>
     <string name="file_list_empty_favorite_headline">Noch keine Favoriten vorhanden</string>
     <string name="file_list_empty_shared_headline">Noch nichts geteilt</string>
-    <string name="file_list_empty_shared">Dateien und Ordner, die Sie teilen, werden hier erscheinen</string>
+    <string name="file_list_empty_shared">Von dir geteilte Dateien und Ordner werden hier erscheinen</string>
     <string name="file_list_empty_headline_server_search_videos">Keine Videos</string>
     <string name="file_list_empty_headline_server_search_photos">Keine Fotos</string>
-    <string name="file_list_empty_search">In einem anderen Ordner suchen?</string>
+    <string name="file_list_empty_search">Vielleicht befindet es sich in einem anderen Ordner?</string>
     <string name="file_list_empty_recently_modified">Keine, innerhalb der letzten 7 Tage, geänderten Dateien gefunden</string>
-    <string name="file_list_empty_recently_modified_filter">Keine Dateien  in Ihrem Verlauf gefunden,
-       die in den letzten 7 Tagen geändert wurden!</string>
-    <string name="file_list_empty_recently_added">Keine kürzlich hinzu gefügten Dateien gefunden</string>
-    <string name="file_list_empty_recently_added_filter">Keine kürzlich hinzu gefügten Dateien in Ihrem Verlauf gefunden!</string>
-    <string name="file_list_empty_text_photos">Laden Sie Fotos hoch oder aktivieren Sie den Sofort-Upload!</string>
-    <string name="file_list_empty_text_photos_filter">Keine Fotos in Ihrem Verlauf gefunden!</string>
-    <string name="file_list_empty_text_videos">Laden Sie einige Videos hoch oder aktivieren Sie den Sofort-Upload!</string>
-    <string name="file_list_empty_text_videos_filter">Keine Videos in Ihrem Verlauf gefunden!</string>
+    <string name="file_list_empty_recently_modified_filter">Keine Dateien gefunden, die in den letzten 7 Tagen geändert wurden.</string>
+    <string name="file_list_empty_recently_added">Keine kürzlich hinzugefügten Dateien gefunden</string>
+    <string name="file_list_empty_recently_added_filter">Keine kürzlich hinzu gefügten Dateien gefunden!</string>
+    <string name="file_list_empty_text_photos">Laden Sie Fotos hoch oder aktivieren Sie den Sofortupload!</string>
+    <string name="file_list_empty_text_photos_filter">Keine Fotos gefunden.</string>
+    <string name="file_list_empty_text_videos">Laden Sie einige Videos hoch oder aktivieren Sie den Sofortupload.</string>
+    <string name="file_list_empty_text_videos_filter">Keine Videos gefunden.</string>
     <string name="upload_list_empty_headline">Keine Uploads verfügbar</string>
-    <string name="upload_list_empty_text">Laden Sie Inhalte hoch oder aktivieren Sie den Sofort-Upload!</string>
-    <string name="upload_list_empty_text_auto_upload">Laden Sie Inhalte hoch oder aktivieren Sie den Sofort-Upload!</string>
+    <string name="upload_list_empty_text">Laden Sie Inhalte hoch oder aktivieren Sie den Sofortupload.</string>
+    <string name="upload_list_empty_text_auto_upload">Laden Sie Inhalte hoch oder aktivieren Sie den Auto Upload!</string>
     <string name="file_list_folder">Ordner</string>
     <string name="file_list_folders">Ordner</string>
     <string name="file_list_file">Datei</string>
@@ -134,19 +134,19 @@
     <string name="filedetails_modified">Geändert:</string>
     <string name="filedetails_download">Herunterladen</string>
     <string name="filedetails_sync_file">Synchronisieren</string>
-    <string name="filedetails_renamed_in_upload_msg">Datei wurde während des Uploads zu %1$s umbenannt</string>
-    <string name="list_layout">Listenlayout</string>
+    <string name="filedetails_renamed_in_upload_msg">Datei während des Hochladens in %1$s umbenannt</string>
+    <string name="list_layout">Layout der Liste</string>
     <string name="action_share">Teilen</string>
     <string name="common_yes">Ja</string>
     <string name="common_no">Nein</string>
     <string name="common_ok">OK</string>
     <string name="common_remove_upload">Upload entfernen</string>
-    <string name="common_retry_upload">Hochladen wiederholen</string>
+    <string name="common_retry_upload">Versuchen Sie es erneut hochzuladen</string>
     <string name="common_cancel_sync">Synchronisation abbrechen</string>
     <string name="common_cancel">Abbrechen</string>
     <string name="common_back">Zurück</string>
     <string name="common_save">Speichern</string>
-    <string name="common_save_exit">Speichern &amp; Schließen</string>
+    <string name="common_save_exit">Speichern &amp; verlassen</string>
     <string name="common_error">Fehler</string>
     <string name="common_loading">Lade &#8230;</string>
     <string name="common_unknown">unbekannt</string>
@@ -156,23 +156,23 @@
     <string name="change_password">Passwort ändern</string>
     <string name="delete_account">Benutzerkonto löschen</string>
     <string name="delete_account_warning">Das Konto %s löschen?\n\nDas Löschen kann nicht rückgängig gemacht werden.</string>
-    <string name="create_account">Konto erstellen</string>
-    <string name="upload_chooser_title">Hochladen von &#8230;</string>
+    <string name="create_account">Benutzerkonto erstellen</string>
+    <string name="upload_chooser_title">Dateien hochladen von &#8230;</string>
     <string name="uploader_info_dirname">Ordnername</string>
     <string name="uploader_upload_in_progress_ticker">Hochladen &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Hochladen %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Hochladen erfolgreich</string>
+    <string name="uploader_upload_succeeded_ticker">Hochgeladen</string>
     <string name="uploader_upload_succeeded_content_single">%1$s hochgeladen</string>
     <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
-    <string name="uploader_upload_failed_content_single">Hochladen von  %1$s konnte nicht abgeschlossen werden</string>
-    <string name="uploader_upload_failed_credentials_error">Hochladen fehlgeschlagen, Sie müssen sich erneut anmelden.</string>
+    <string name="uploader_upload_failed_content_single">Konnte %1$s nicht hochladen</string>
+    <string name="uploader_upload_failed_credentials_error">Hochladen fehlgeschlagen, erneute Anmeldung erforderlich</string>
     <string name="uploads_view_title">Uploads</string>
     <string name="uploads_view_group_current_uploads">Aktuell</string>
     <string name="uploads_view_group_failed_uploads">Fehlgeschlagen (Tippen zum Wiederholen)</string>
     <string name="uploads_view_group_finished_uploads">Hochgeladen</string>
     <string name="uploads_view_upload_status_succeeded">Fertiggestellt</string>
     <string name="uploads_view_upload_status_cancelled">Abgebrochen</string>
-    <string name="uploads_view_upload_status_paused">Pausiert</string>
+    <string name="uploads_view_upload_status_paused">pausiert</string>
     <string name="uploads_view_upload_status_failed_connection_error">Verbindungsfehler</string>
     <string name="uploads_view_upload_status_failed_retry">Hochladen wird in Kürze erneut versucht</string>
     <string name="uploads_view_upload_status_failed_credentials_error">Zugangsdaten falsch</string>
@@ -181,137 +181,137 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Lokale Datei nicht gefunden</string>
     <string name="uploads_view_upload_status_failed_permission_error">Berechtigungsfehler</string>
     <string name="uploads_view_upload_status_conflict">Konflikt</string>
-    <string name="uploads_view_upload_status_service_interrupted">Die Anwendung wurde beendet</string>
+    <string name="uploads_view_upload_status_service_interrupted">App beendet</string>
     <string name="uploads_view_upload_status_unknown_fail">Unbekannter Fehler</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Warte auf WLAN-Verbindung</string>
-    <string name="uploads_view_later_waiting_to_upload">Warten auf das Hochladen</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Warte auf W-Lan-Verbindung</string>
+    <string name="uploads_view_later_waiting_to_upload">Warte auf Hochladen</string>
     <string name="downloader_download_in_progress_ticker">Herunterladen &#8230;</string>
-    <string name="downloader_download_in_progress_content">%1$d%% beim Laden von %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Herunterladen erfolgreich</string>
-    <string name="downloader_download_succeeded_content">%1$s wurde erfolgreich heruntergeladen</string>
+    <string name="downloader_download_in_progress_content">%1$d%% Herunterladen %2$s</string>
+    <string name="downloader_download_succeeded_ticker">Heruntergeladen</string>
+    <string name="downloader_download_succeeded_content">%1$s heruntergeladen</string>
     <string name="downloader_download_failed_ticker">Herunterladen fehlgeschlagen</string>
-    <string name="downloader_download_failed_content">Herunterladen von %1$s konnte nicht abgeschlossen werden</string>
-    <string name="downloader_not_downloaded_yet">Noch nicht heruntergeladen</string>
-    <string name="downloader_download_failed_credentials_error">Herunterladen fehlgeschlagen, Sie müssen sich erneut anmelden.</string>
+    <string name="downloader_download_failed_content">Konnte %1$s nicht herunterladen</string>
+    <string name="downloader_not_downloaded_yet">Noch nicht Heruntergeladen</string>
+    <string name="downloader_download_failed_credentials_error">Herunterladen fehlgeschlagen, erneute Anmeldung erforderlich</string>
     <string name="common_choose_account">Konto auswählen</string>
     <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
-    <string name="sync_fail_ticker_unauthorized">Synchronisation fehlgeschlagen, Sie müssen sich erneut anmelden.</string>
+    <string name="sync_fail_ticker_unauthorized">Synchronisation fehlgeschlagen. Sie müssen sich erneut anmelden</string>
     <string name="sync_fail_content">Synchronisation von %1$s konnte nicht abgeschlossen werden</string>
-    <string name="sync_fail_content_unauthorized">Ungültiges Passwort für %1$s</string>
+    <string name="sync_fail_content_unauthorized">Falsches Passwort für %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Konflikte gefunden</string>
-    <string name="sync_conflicts_in_favourites_content">%1$d Synchronisationsdateien konnten nicht synchronisiert werden.</string>
-    <string name="sync_fail_in_favourites_ticker">Synchronisationsdateien konnten nicht synchronisiert werden.</string>
+    <string name="sync_conflicts_in_favourites_content">%1$d synchron zu haltende Dateien konnten nicht synchronisiert werden.</string>
+    <string name="sync_fail_in_favourites_ticker">Synchronhalten schlug fehl.</string>
     <string name="sync_fail_in_favourites_content">Inhalte von %1$d Dateien konnten nicht synchronisiert werden (%2$d Konflikte)</string>
     <string name="sync_foreign_files_forgotten_ticker">Einige lokale Dateien wurden vergessen</string>
-    <string name="sync_foreign_files_forgotten_content">%1$d Dateien aus dem %2$s Ordner konnten nicht kopiert werden nach</string>
-    <string name="sync_foreign_files_forgotten_explanation">Seit Version 1.3.16 werden Dateien die von diesem Gerät aus hochgeladen werden in den lokalen Ordner %1$s kopiert um Datenverlust zu vermeiden, wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden, in den Ordner %2$s verschoben. Jedoch ist während der Account-Synchronisation ein Fehler aufgetreten, der das Abschließen dieses Vorgangs verhindert. Sie können die Datei(en) entweder wie sie sind belassen und den Link zu %3$s entfernen oder die Datei(en) in den %1$s Ordner verschieben und  den Link zu %4$s beibehalten.\n\nUnten befindet sich eine Liste der lokalen Datei(en) und der mit ihnen verbundenen Remote-Datei(en) in %5$s.</string>
-    <string name="sync_current_folder_was_removed">Das Verzeichnis %1$s existiert nicht mehr</string>
-    <string name="foreign_files_move">Verschiebe alle</string>
+    <string name="sync_foreign_files_forgotten_content">%1$d Dateien aus dem %2$s Verzeichnis konnten nicht kopiert werden nach</string>
+    <string name="sync_foreign_files_forgotten_explanation">Seit Version 1.3.16 werden Dateien die von diesem Gerät aus hochgeladen werden in den lokalen Ordner %1$s kopiert um Datenverlust zu vermeiden, wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden, in den Ordner %2$s verschoben. Jedoch ist während der Konto-Synchronisation ein Fehler aufgetreten, der das Abschließen dieses Vorgangs verhindert hat. Die Datei(en) können entweder wie sie sind belassen und den Link zu %3$s entfernt werden oder die Datei(en) in den Ordner %1$s verschoben und den Link zu %4$s beibehalten werden.\n\nUnten befindet sich eine Liste der lokalen Datei(en) und der mit ihnen verbundenen Remote-Datei(en) in %5$s.</string>
+    <string name="sync_current_folder_was_removed">Der Ordner %1$s existiert nicht mehr</string>
+    <string name="foreign_files_move">Alle verschieben</string>
     <string name="foreign_files_success">Alle Dateien wurden verschoben</string>
     <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
     <string name="foreign_files_local_text">Lokal: %1$s</string>
-    <string name="foreign_files_remote_text">Entfernte Freigabe: %1$s</string>
+    <string name="foreign_files_remote_text">Remote: %1$s</string>
     <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung, um die ausgewählten Dateien in das Verzeichnis %1$s zu kopieren. Sollen diese stattdessen verschoben werden?</string>
-    <string name="pass_code_enter_pass_code">Bitte geben Sie ihre PIN ein</string>
+    <string name="pass_code_enter_pass_code">Bitte geben Sie Ihre PIN ein</string>
     
     <string name="pass_code_configure_your_pass_code">Bitte PIN eingeben</string>
-    <string name="pass_code_configure_your_pass_code_explanation">Die PIN wird jedes mal wenn die App gestartet wird abgefragt</string>
-    <string name="pass_code_reenter_your_pass_code">Bitte PIN erneut eingeben</string>
+    <string name="pass_code_configure_your_pass_code_explanation">Die PIN wird jedes mal beim Start der App abgefragt</string>
+    <string name="pass_code_reenter_your_pass_code">Bitte Ihre PIN nochmals eingeben</string>
     <string name="pass_code_remove_your_pass_code">PIN entfernen</string>
     <string name="pass_code_mismatch">Die PINs stimmen nicht überein</string>
     <string name="pass_code_wrong">PIN nicht korrekt</string>
     <string name="pass_code_removed">PIN entfernt</string>
     <string name="pass_code_stored">PIN gespeichert</string>
     
-    <string name="media_notif_ticker">%1$s Musikplayer</string>
-    <string name="media_state_playing">%1$s (läuft)</string>
-    <string name="media_state_loading">%1$s (lädt)</string>
-    <string name="media_event_done">%1$s Wiedergabe beendet</string>
+    <string name="media_notif_ticker">%1$s Musik Player</string>
+    <string name="media_state_playing">%1$s (wird abgespielt)</string>
+    <string name="media_state_loading">%1$s (wird geladen)</string>
+    <string name="media_event_done">%1$s Wiedergabe Beendet</string>
     <string name="media_err_nothing_to_play">Keine Mediendatei gefunden</string>
     <string name="media_err_no_account">Kein Konto angegeben</string>
-    <string name="media_err_not_in_owncloud">Datei ist nicht in einem gültigen Account</string>
-    <string name="media_err_unsupported">Nicht unterstützter Media-codec</string>
-    <string name="media_err_io">Mediendatei konnte nicht gelesen werden</string>
-    <string name="media_err_malformed">Mediendatei nicht korrekt kodiert</string>
-    <string name="media_err_timeout">Wartezeit für Wiedergabe abgelaufen</string>
-    <string name="media_err_invalid_progressive_playback">Mediendatei kann nicht gestreamt werden</string>
-    <string name="media_err_unknown">Die Mediendatei kann nicht mit dem vorinstallierten Media Player abgespielt werden</string>
-    <string name="media_err_security_ex">Sicherheitsfehler bei der Wiedergabe von %1$s</string>
-    <string name="media_err_io_ex">Eingabefehler beim Versuch %1$s abzuspielen</string>
-    <string name="media_err_unexpected">Unerwarteter Fehler beim Versuch %1$s wiederzugeben</string>
-    <string name="media_rewind_description">Zurückspulknopf</string>
-    <string name="media_play_pause_description">Wiedergabe- oder Pause-Knopf</string>
-    <string name="media_forward_description">Vorspul-Knopf</string>
-
-	<string name="auth_getting_authorization">Erhalte Genehmigung &#8230;</string>
-	<string name="auth_trying_to_login">Anmeldeversuch &#8230;</string>
+    <string name="media_err_not_in_owncloud">Die Datei befindet sich nicht in einem gültigen Konto</string>
+    <string name="media_err_unsupported">Medien-Codec wird nicht unterstützt</string>
+    <string name="media_err_io">Konnte die Mediendatei nicht lesen</string>
+    <string name="media_err_malformed">Mediendatei ist nicht korrekt encodiert</string>
+    <string name="media_err_timeout">Wartezeit beim Abspielversuch abgelaufen</string>
+    <string name="media_err_invalid_progressive_playback">Die Mediendatei kann nicht gestreamt werden</string>
+    <string name="media_err_unknown">Diese Mediendatei konnte nicht mit dem Standardplayer geöffnet werden</string>
+    <string name="media_err_security_ex">Sicherheitsfehler beim Versuch %1$s wiederzugeben</string>
+    <string name="media_err_io_ex">Eingabefehler beim Versuch %1$s wiederzugeben</string>
+    <string name="media_err_unexpected">Ein unerwarteter Fehler ist aufgetreten beim Versuch %1$s wiederzugeben</string>
+    <string name="media_rewind_description">Rückspulknopf</string>
+    <string name="media_play_pause_description">Wiedergabe-/Pause Knopf</string>
+    <string name="media_forward_description">Vorspul Knopf</string>
+
+	<string name="auth_getting_authorization">Genehmigung erhalten &#8230;</string>
+	<string name="auth_trying_to_login">Der Versuch, sich anzumelden &#8230;</string>
 	<string name="auth_no_net_conn_title">Keine Netzwerkverbindung</string>
 	<string name="auth_nossl_plain_ok_title">Sichere Verbindung nicht verfügbar.</string>
 	<string name="auth_connection_established">Verbindung hergestellt</string>
-	<string name="auth_testing_connection">Teste Verbindung</string>
+	<string name="auth_testing_connection">Verbindung testen</string>
 	<string name="auth_not_configured_title">Fehlerhafte Server Konfiguration</string>
 	<string name="auth_account_not_new">Ein Benutzerkonto für den gleichen Benutzer und Server existiert auf diesem Gerät bereits</string>
 	<string name="auth_account_not_the_same">Der eingegebene Benutzer passt nicht zu dem Benutzer dieses Benutzerkontos</string>
 	<string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
-	<string name="auth_unknown_host_title">Konnte den Host nicht finden.</string>
-	<string name="auth_incorrect_path_title">Server-Installation nicht gefunden</string>
+	<string name="auth_unknown_host_title">Konnte den Host nicht finden</string>
+	<string name="auth_incorrect_path_title">Server nicht gefunden</string>
 	<string name="auth_timeout_title">Der Server braucht zu lange für eine Antwort.</string>
-	<string name="auth_incorrect_address_title">Fehlerhaftes Format Ihrer Serveradresse</string>
+	<string name="auth_incorrect_address_title">Falsches Adress-Format für den Server</string>
 	<string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen.</string>
 	<string name="auth_ssl_unverified_server_title">SSL-Server-Identität konnte nicht überprüft werden</string>
 	<string name="auth_bad_oc_version_title">Unbekannte Server-Version</string>
-	<string name="auth_wrong_connection_title">Konnte keine Verbindung aufbauen.</string>
+	<string name="auth_wrong_connection_title">Verbindung konnte nicht hergestellt werden</string>
 	<string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
 	<string name="auth_unauthorized">Falscher Benutzername oder Passwort</string>
-	<string name="auth_oauth_error">Legitimierung nicht erfolgreich</string>
-	<string name="auth_oauth_error_access_denied">Zugriff durch den Legitimierungsserver abgelehnt</string>
-	<string name="auth_wtf_reenter_URL">Unerwarteter Zustand; bitte geben Sie die Adresse des Servers nochmals ein</string>
-	<string name="auth_expired_oauth_token_toast">Ihre Legitimierung ist abgelaufen. Bitte Legitimierung nochmals durchführen</string>
-	<string name="auth_expired_basic_auth_toast">Bitte geben Sie Ihr aktuelles Passwort ein</string>
+	<string name="auth_oauth_error">Autorisierung nicht erfolgreich</string>
+	<string name="auth_oauth_error_access_denied">Zugriff durch den Autorisierungsserver abgelehnt</string>
+	<string name="auth_wtf_reenter_URL">Unerwarteter Zustand; Bitte gib die Adresse des Servers erneut ein</string>
+	<string name="auth_expired_oauth_token_toast">Die Autorisierung ist abgelaufen. Bitte Autorisierung nochmals durchführen</string>
+	<string name="auth_expired_basic_auth_toast">Bitte gib das aktuelle Passwort ein</string>
 	<string name="auth_expired_saml_sso_token_toast">Ihre Sitzung ist abgelaufen. Bitte erneut verbinden</string>
-	<string name="auth_connecting_auth_server">Verbinde mit dem Authentifizierungs-Server…</string>
-	<string name="auth_unsupported_auth_method">Der Server unterstützt diese Legitimierungsmethode nicht</string>
+	<string name="auth_connecting_auth_server">Verbinden zum Authentifizierungs-Server ...</string>
+	<string name="auth_unsupported_auth_method">Der Server unterstützt diese Authentifizierung-Methode nicht</string>
 	<string name="auth_unsupported_multiaccount">%1$s unterstützt nicht mehrere Benutzerkonten</string>
-	<string name="auth_fail_get_user_name">Ihr Server gibt keine korrekte Benutzer-ID zurück, bitte kontaktiere einen Administrator</string>
-	<string name="auth_can_not_auth_against_server">Die Authentifizierung gegenüber dem Server konnte nicht durchgeführt werden</string>
-    <string name="auth_account_does_not_exist">Das Benutzerkonto ist bislang auf dem Gerät nicht vorhanden</string>
+	<string name="auth_fail_get_user_name">Ihr Server gibt keine korrekte Benutzer-ID zurück, bitte kontaktieren Sie einen Administrator</string>
+	<string name="auth_can_not_auth_against_server">Kann sich nicht auf diesem Server authentifizieren</string>
+    <string name="auth_account_does_not_exist">Das Benutzerkonto ist bis jetzt noch nicht auf dem Gerät vorhanden</string>
     
     <string name="favorite">Als Offline verfügbar markieren</string>
-    <string name="unfavorite">Markierung Offline verfügbar entfernen</string>
+    <string name="unfavorite">Offline verfügbar Markierung entfernen</string>
     <string name="favorite_real">Als Favorit markieren</string>
     <string name="unset_favorite_real">Markierung als Favorit entfernen</string>
     <string name="common_rename">Umbenennen</string>
     <string name="common_remove">Entfernen</string>
-    <string name="confirmation_remove_file_alert">Möchten Sie %1$s wirklich löschen?</string>
-    <string name="confirmation_remove_folder_alert">Möchten Sie wirklich %1$s und dessen Inhalte entfernen?</string>
+    <string name="confirmation_remove_file_alert">Möchten Sie %1$s wirklich entfernen?</string>
+    <string name="confirmation_remove_folder_alert">Wollen Sie %1$s und deren Inhalte wirklich löschen?</string>
     <string name="confirmation_remove_local">Nur lokal</string>
-    <string name="remove_success_msg">Erfolgreich entfernt</string>
+    <string name="remove_success_msg">Entfernt</string>
     <string name="remove_fail_msg">Entfernen fehlgeschlagen</string>
-    <string name="rename_dialog_title">Geben Sie einen neuen Namen ein</string>
-    <string name="rename_local_fail_msg">Die lokale Kopie konnte nicht umbenannt werden. Versuchen Sie es mit einem anderen Namen.</string>
+    <string name="rename_dialog_title">Gib einen neuen Namen ein</string>
+    <string name="rename_local_fail_msg">Die lokale Kopie konnte nicht umbenannt werden. Versuche es mit einem anderen Namen.</string>
     <string name="rename_server_fail_msg">Die Umbenennung konnte nicht abgeschlossen werden.</string>
     <string name="sync_file_fail_msg">Die entfernte Datei konnte nicht überprüft werden</string>
     <string name="sync_file_nothing_to_do_msg">Dateiinhalte bereits synchronisiert</string>
-    <string name="create_dir_fail_msg">Ordner konnte nicht erstellt werden</string>
+    <string name="create_dir_fail_msg">Verzeichnis konnte nicht erstellt werden</string>
     <string name="filename_forbidden_characters">Verbotene Zeichen: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Der Dateiname enthält mindestens ein ungültiges Zeichen</string>
     <string name="filename_empty">Dateiname darf nicht leer sein</string>
-    <string name="wait_a_moment">Einen Moment warten</string>
-    <string name="wait_checking_credentials">Prüfe gespeicherte Anmeldeinformationen</string>
-    <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuchen Sie, die Datei in einer anderen App zu öffnen.</string>
-    <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
+    <string name="wait_a_moment">Bitte warten...</string>
+    <string name="wait_checking_credentials">Überprüfe gespeicherte Anmeldeinformationen</string>
+    <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu öffnen</string>
+    <string name="filedisplay_no_file_selected">Keine Datei gewählt</string>
     <string name="activity_chooser_title">Link senden an &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Kopiere Datei vom privatem Speicher</string>
     
     <string name="oauth_check_onoff">Anmelden mit oAuth2</string> 
-    <string name="oauth_login_connection">Verbinde mit dem oAuth2-Server…</string>    
+    <string name="oauth_login_connection">Verbinde mit dem oAuth2-Server...</string>    
         
     <string name="ssl_validator_header">Die Identität der Website konnte nicht überprüft werden</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Das Zertifikat des Servers ist nicht vertrauenswürdig</string>
     <string name="ssl_validator_reason_cert_expired">- Das Zertifikat des Servers ist abgelaufen</string>
     <string name="ssl_validator_reason_cert_not_yet_valid">- Das Gültigkeitsdatum des Serverzertifikats liegt in der Zukunft</string>
-    <string name="ssl_validator_reason_hostname_not_verified">- Die Adresse stimmt nicht mit dem im Zertifikat angegebenen Hostnamen überein</string>
-    <string name="ssl_validator_question">Möchten Sie diesem Zertifikat trotzdem vertrauen?</string>
+    <string name="ssl_validator_reason_hostname_not_verified">- Die Adresse stimmt nicht mit dem im Zertifikat angegebenen Hostnamen  überein</string>
+    <string name="ssl_validator_question">Soll diesem Zertifikat trotzdem vertraut werden?</string>
     <string name="ssl_validator_not_saved">Das Zertifikat konnte nicht gespeichert werden</string>
     <string name="ssl_validator_btn_details_see">Details</string>
     <string name="ssl_validator_btn_details_hide">Ausblenden</string>
@@ -325,54 +325,54 @@
     <string name="ssl_validator_label_L">Ort:</string>
     <string name="ssl_validator_label_validity">Gültigkeit:</string>
     <string name="ssl_validator_label_validity_from">Von:</string>
-    <string name="ssl_validator_label_validity_to">An:</string>
+    <string name="ssl_validator_label_validity_to">Bis:</string>
     <string name="ssl_validator_label_signature">Signatur:</string>
     <string name="ssl_validator_label_signature_algorithm">Algorithmus:</string>
-    <string name="digest_algorithm_not_available">Dieser Hash-Algorithmus ist auf Ihrem Handy nicht Verfügbar.</string>
+    <string name="digest_algorithm_not_available">Dieser Algorithmus-Auszug ist auf Ihrem Handy nicht verfügbar.</string>
     <string name="ssl_validator_label_certificate_fingerprint">Fingerabdruck:</string>
-    <string name="certificate_load_problem">Es ist ein Problem beim Laden des Zertifikats aufgetreten.</string>
+    <string name="certificate_load_problem">Beim Laden des Zertifikats ist ein Fehler aufgetreten.</string>
     <string name="ssl_validator_null_cert">Das Zertifikat konnte nicht angezeigt werden.</string>
     <string name="ssl_validator_no_info_about_error">- Keine Informationen über den Fehler</string>
 
     <string name="placeholder_sentence">Dies ist ein Platzhalter</string>
     <string name="placeholder_filename">platzhalter.txt</string>
-    <string name="placeholder_filetype">PNG Bild</string>
+    <string name="placeholder_filetype">PNG-Bild</string>
     <string name="placeholder_filesize">389 KB</string>
-    <string name="placeholder_timestamp">18.05.2012 12:23</string>
+    <string name="placeholder_timestamp">18.5.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Nur über WLAN hochladen</string>
-    <string name="instant_upload_on_wifi">Fotos nur über WLAN hochladen</string>
-    <string name="instant_video_upload_on_wifi">Videos nur über WLAN hochladen</string>
-    <string name="instant_video_upload_on_charging">Hochladen nur während des Ladens</string>
-    <string name="instant_upload_on_charging">Hochladen nur während des Ladens</string>
+    <string name="auto_upload_on_wifi">Nur über W-Lan hochladen</string>
+    <string name="instant_upload_on_wifi">Bilder nur über W-Lan hochladen</string>
+    <string name="instant_video_upload_on_wifi">Videos nur über W-Lan hochladen</string>
+    <string name="instant_video_upload_on_charging">Nur während des Ladens hochladen</string>
+    <string name="instant_upload_on_charging">Nur während des Ladens hochladen</string>
     <string name="instant_upload_path">/SofortUpload</string>
-    <string name="conflict_title">Dateikonflikt</string>
-    <string name="conflict_message">Welche Datei möchten Sie behalten? Wenn Sie beide Versionen auswählen, wird der lokalen Datei eine Zahl ans Ende ihres Dateinamens angehängt.</string>
+    <string name="conflict_title">Dateikonfilikt</string>
+    <string name="conflict_message">Welche Datei soll behalten werden? Wenn Sie beide Versionen wählen, wird der lokalen Datei eine Zahl am Ende des Dateinamens angefügt.</string>
     <string name="conflict_keep_both">Beide behalten</string>
-    <string name="conflict_use_local_version">lokale Version</string>
-    <string name="conflict_use_server_version">Server-Version</string>
+    <string name="conflict_use_local_version">Lokale Version</string>
+    <string name="conflict_use_server_version">Serverversion</string>
 
-    <string name="preview_sorry">Das tut mir leid!</string>
+    <string name="preview_sorry">Entschuldigung.</string>
     <string name="preview_image_description">Bildvorschau</string>
     <string name="preview_image_error_unknown_format">Bild kann nicht angezeigt werden</string>
 
     <string name="error__upload__local_file_not_copied">%1$s konnte nicht in den lokalen %2$s Ordner kopiert werden</string>
-    <string name="prefs_instant_upload_path_title">Pfad zum sofortigen Bilder-Upload</string>
-    <string name="prefs_folder_sync_local_path_title">Lokaler Ordner</string>
-    <string name="prefs_folder_sync_remote_path_title">Server-Ordner</string>
-    <string name="prefs_instant_upload_path_use_subfolders_title">Verwende Unterordner</string>
-    <string name="prefs_instant_upload_path_use_subfolders_summary">Speichere in Unterordnern basierend auf Jahr und Monat</string>
-
-	<string name="share_link_no_support_share_api">Entschuldigung, das Teilen ist auf Ihrem Server nicht aktiviert. Bitte kontaktiere Sie Ihren Administrator.</string>
-	<string name="share_link_file_no_exist">Teilen nicht möglich. Prüfen Sie, ob die Datei existiert</string>
+    <string name="prefs_instant_upload_path_title">Sofort-Upload-Ordner</string>
+    <string name="prefs_folder_sync_local_path_title">Lokales Verzeichnis</string>
+    <string name="prefs_folder_sync_remote_path_title">Entferntes Verzeichnis</string>
+    <string name="prefs_instant_upload_path_use_subfolders_title">Unterordner benutzen</string>
+    <string name="prefs_instant_upload_path_use_subfolders_summary">In Unterordnern speichern, basierend auf Jahr und Monat</string>
+
+	<string name="share_link_no_support_share_api">Teilen ist auf Ihrem Server nicht aktiviert. Bitte kontaktieren Sie den Administrator.</string>
+	<string name="share_link_file_no_exist">Teilen nicht möglich. Prüfe, ob die Datei existiert</string>
 	<string name="share_link_file_error">Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten.</string>
-	<string name="unshare_link_file_no_exist">Entfernen der Freigabe nicht möglich. Prüfen Sie, ob die Datei existiert</string>
+	<string name="unshare_link_file_no_exist">Entfernen der Freigabe nicht möglich. Prüfe, dass die Datei existiert</string>
 	<string name="unshare_link_file_error">Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten.</string>
-    <string name="update_link_file_no_exist">Aktualisierung der Datei nicht möglich. Prüfen Sie, ob die Datei existiert</string>
+    <string name="update_link_file_no_exist">Aktualisierung der Datei nicht möglich. Prüfe, ob die Datei existiert</string>
     <string name="update_link_file_error">Es ist ein Fehler beim Aktualisieren der Freigabe aufgetreten</string>
     <string name="share_link_password_title">Passwort eingeben</string>
-    <string name="share_link_empty_password">Sie müssen ein Passwort eingeben</string>
+    <string name="share_link_empty_password">Si müssen ein Passwort eingeben</string>
 
     <string name="activity_chooser_send_file_title">Senden</string>
 
@@ -384,84 +384,85 @@
 
     <string name="error_cant_bind_to_operations_service">Kritischer Fehler: Operationen können nicht ausgeführt werden</string>
 
-    <string name="network_error_socket_exception">Es ist ein Fehler bei der Verbindung mit dem Server aufgetreten.</string>
-    <string name="network_error_socket_timeout_exception">Es ist ein Fehler während des Wartens auf den Server aufgetreten, die Operation kann nicht ausgeführt werden</string>
-    <string name="network_error_connect_timeout_exception">Es ist ein Fehler während des Wartens auf den Server aufgetreten, die Operation kann nicht ausgeführt werden</string>
+    <string name="network_error_socket_exception">Es ist ein Fehler beim Verbinden mit dem Server aufgetreten.</string>
+    <string name="network_error_socket_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation konnte nicht abgeschlossen werden</string>
+    <string name="network_error_connect_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operationkonnte nicht abgeschlossen werden</string>
     <string name="network_host_not_available">Die Operation kann nicht abgeschlossen werden, der Server ist nicht erreichbar</string>
-    <string name="forbidden_permissions">Sie haben keine Berechtigung %s</string>
+
+    <string name="forbidden_permissions">Dir fehlt die Erlaubnis %s</string>
     <string name="forbidden_permissions_rename">diese Datei umzubenennen</string>
     <string name="forbidden_permissions_delete">diese Datei zu löschen</string>
     <string name="share_link_forbidden_permissions">diese Datei zu teilen</string>
     <string name="unshare_link_forbidden_permissions">diese Datei nicht mehr zu teilen</string>
     <string name="update_link_forbidden_permissions">zum Aktualisieren dieser Freigabe</string>
-    <string name="forbidden_permissions_create">eine Datei zu erstellen</string>
-    <string name="uploader_upload_forbidden_permissions">in diesem Order etwas hochzuladen</string>
+    <string name="forbidden_permissions_create">diese Datei zu erstellen</string>
+    <string name="uploader_upload_forbidden_permissions">diesen Ordner hochzuladen</string>
     <string name="downloader_download_file_not_found">Diese Datei steht auf dem Server nicht mehr zur Verfügung</string>
 
     <string name="file_migration_dialog_title">Aktualisiere Speicherort</string>
     <string name="file_migration_finish_button">Beenden</string>
     <string name="file_migration_preparing">Bereite Migration vor&#8230;</string>
     <string name="file_migration_checking_destination">Prüfe Zielort&#8230;</string>
-    <string name="file_migration_saving_accounts_configuration">Speichere Konteneinstellung&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Warte auf Abschluss der Synchronisierungen&#8230;</string>
+    <string name="file_migration_saving_accounts_configuration">Sichere Konfiguration der Konten&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Warte auf die Fertigstellung der Synchronisationen&#8230;</string>
     <string name="file_migration_migrating">Verschiebe Dateien&#8230;</string>
     <string name="file_migration_updating_index">Aktualisiere Index&#8230;</string>
     <string name="file_migration_cleaning">Aufräumen&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">Konteneinstellung wiederherstellen&#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">Konfiguration der Konten wiederherstellen&#8230;</string>
     <string name="file_migration_ok_finished">Abgeschlossen</string>
-    <string name="file_migration_failed_not_enough_space">FEHLER: Nicht genügend Speicherplatz</string>
+    <string name="file_migration_failed_not_enough_space">FEHLER: zu wenig Platz</string>
     <string name="file_migration_failed_not_writable">FEHLER: Datei kann nicht geschrieben werden</string>
-    <string name="file_migration_failed_not_readable">FEHLER: Datei nicht lesbar</string>
+    <string name="file_migration_failed_not_readable">FEHLER: Datei kann nicht gelesen werden</string>
     <string name="file_migration_failed_dir_already_exists">FEHLER: Nextcloud Ordner existiert bereits</string>
-    <string name="file_migration_failed_while_coping">FEHLER: Während der Migration</string>
-    <string name="file_migration_failed_while_updating_index">FEHLER: Während der Aktualisierung des Indixes</string>
+    <string name="file_migration_failed_while_coping">FEHLER: Migration fehlgeschlagen</string>
+    <string name="file_migration_failed_while_updating_index">FEHLER: Während der Aktualisierung des Indexes</string>
 
-    <string name="file_migration_directory_already_exists">Datenordner existiert bereits, was soll getan werden?</string>
+    <string name="file_migration_directory_already_exists">Datenordner existiert bereits, was soll geschehen?</string>
     <string name="file_migration_override_data_folder">Überschreiben</string>
-    <string name="file_migration_use_data_folder">Verwende Bestehenden</string>
+    <string name="file_migration_use_data_folder">Verwende bestehenden</string>
 
     <string name="prefs_category_accounts">Konten</string>
     <string name="prefs_add_account">Konto hinzufügen</string>
     <string name="drawer_manage_accounts">Konten verwalten</string>
-    <string name="auth_redirect_non_secure_connection_title">Die gesicherte Verbindung wird auf eine unsichere Route weitergeleitet.</string>
+    <string name="auth_redirect_non_secure_connection_title">Die gesicherte Verbindung wird durch eine ungesicherte Route geleitet.</string>
 
 	<string name="actionbar_logger">Protokolle</string>
-	<string name="log_send_history_button">Verlauf senden</string>
-	<string name="log_send_no_mail_app">Keine App zum Versenden der Meldungen gefunden. Bitte installieren Sie eine Mail-App!</string>
+	<string name="log_send_history_button">versende die Chronik</string>
+	<string name="log_send_no_mail_app">Es wurde keine App gefunden die Logs verschicken kann. Bitte installiere eine App die E-Mails verschicken kann.</string>
 	<string name="log_send_mail_subject">%1$s Android-App Meldungen</string>
-	<string name="log_progress_dialog_text">Lade Daten &#8230;</string>
+	<string name="log_progress_dialog_text">Daten werden geladen &#8230;</string>
 
-	<string name="saml_authentication_required_text">Authentifizierung erforderlich</string>
+	<string name="saml_authentication_required_text">Legitimierung benötigt</string>
 	<string name="saml_authentication_wrong_pass">Falsches Passwort</string>
 	<string name="actionbar_move">Verschieben</string>
     <string name="actionbar_copy">Kopieren</string>
-	<string name="file_list_empty_moving">Nichts vorhanden. Sie können einen Ordner hinzufügen!</string>
+	<string name="file_list_empty_moving">Noch nichts vorhanden. Sie können einen Ordner hinzufügen.</string>
 	<string name="folder_picker_choose_button_text">Auswählen</string>
 
-    <string name="move_file_not_found">Verschieben nicht möglich. Bitte überprüfen Sie, ob die Datei existiert</string>
-    <string name="move_file_invalid_into_descendent">Es ist nicht möglich einen Ordner eine Ebene tiefer zu verschieben</string>
+    <string name="move_file_not_found">Verschieben nicht möglich. Prüfe, ob die Datei existiert</string>
+    <string name="move_file_invalid_into_descendent">Es ist nicht möglich, einen Ordner in einen seiner Unterordner zu verschieben</string>
     <string name="move_file_invalid_overwrite">Die Datei ist bereits im Zielordner vorhanden</string>
-    <string name="move_file_error">Es ist ein Fehler beim Verschieben dieser Datei oder dieses Ordners aufgetreten.</string>
+    <string name="move_file_error">Es ist ein Fehler beim Verschieben der Datei oder des Ordners aufgetreten.</string>
     <string name="forbidden_permissions_move">um diese Datei zu verschieben</string>
 
 
-    <string name="copy_file_not_found">Kopieren nicht möglich. Bitte überprüfen Sie, ob die Datei existiert</string>
+    <string name="copy_file_not_found">Kopieren nicht möglich. Prüfe, dass die Datei existiert</string>
     <string name="copy_file_invalid_into_descendent">Es ist nicht möglich, einen Ordner in einen seiner Unterordner zu kopieren</string>
-    <string name="copy_file_invalid_overwrite">Die Datei ist bereits im Zielordner vorhanden</string>
-    <string name="copy_file_error">Es ist ein Fehler beim Kopieren dieser Datei oder dieses Ordners aufgetreten</string>
-    <string name="forbidden_permissions_copy">um diese Datei zu kopieren</string>
+    <string name="copy_file_invalid_overwrite">Die Datei existiert bereits im Zielverzeichnis</string>
+    <string name="copy_file_error">Es ist ein Fehler beim Kopieren der Datei oder des Ordners aufgetreten.</string>
+    <string name="forbidden_permissions_copy">diese Datei zu kopieren</string>
 
-    <string name="prefs_category_instant_uploading">Sofortiges Hochladen</string>
+    <string name="prefs_category_instant_uploading">sofort hochladen</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Pfad zum sofortigen Video-Upload</string>
+	<string name="prefs_instant_video_upload_path_title">Video Speicherpfad wählen</string>
     <string name="sync_folder_failed_content">Bei der Synchronisation konnte %1$s Ordner nicht fertig gestellt werden</string>
 
 	<string name="shared_subject_header">geteilt</string>
-	<string name="with_you_subject_header">Mit Ihnen</string>
+	<string name="with_you_subject_header">Mit Dir</string>
     
-	<string name="subject_user_shared_with_you">%1$s hat \"%2$s\" mit Ihnen geteilt</string>
-    <string name="subject_shared_with_you">\"%1$s\" wurde mit Ihnen geteilt</string>
+	<string name="subject_user_shared_with_you">%1$s hat \"%2$s\" mit Dir geteilt</string>
+    <string name="subject_shared_with_you">\"%1$s\" wurde mit Dir geteilt</string>
 
     <string name="auth_refresh_button">Verbindung aktualisieren</string>
     <string name="auth_host_address">Serveradresse</string>
@@ -479,8 +480,8 @@
     <string name="file_list__footer__files_and_folders">%1$d Dateien, %2$d Ordner</string>
     <string name="prefs_instant_behaviour_dialogTitle">Originaldatei wird&#8230;</string>
     <string name="prefs_instant_behaviour_title">Originaldatei wird&#8230;</string>
-    <string name="upload_copy_files">Datei kopieren</string>
-    <string name="upload_move_files">Datei verschieben</string>
+    <string name="upload_copy_files">kopiere Datei</string>
+    <string name="upload_move_files">verschiebe Datei</string>
     <string name="select_all">Alle auswählen</string>
 
     <string name="pref_behaviour_entries_keep_file">im Originalordner behalten</string>
@@ -490,27 +491,27 @@
     <string name="prefs_common">Allgemein</string>
 
     <string name="share_dialog_title">Teilen</string>
-    <string name="share_file">%1$s teilen</string>
-    <string name="share_with_user_section_title">Mit Benutzern und Gruppen teilen</string>
-    <string name="share_no_users">Bis jetzt hast du noch keine Dateien mit anderen geteilt</string>
-    <string name="share_add_user_or_group">Benutzer oder Gruppe hinzufügen</string>
+    <string name="share_file">Teile %1$s</string>
+    <string name="share_with_user_section_title">Mit Benutzern oder Gruppen teilen</string>
+    <string name="share_no_users">Es wurden noch keine Dateien mit Benutzern geteilt</string>
+    <string name="share_add_user_or_group">Füge Benutzer oder Gruppe hinzu</string>
     <string name="share_via_link_section_title">Link teilen</string>
-    <string name="share_via_link_expiration_date_label">Ein Ablaufdatum setzen</string>
+    <string name="share_via_link_expiration_date_label">Setze ein Ablaufdatum</string>
     <string name="share_via_link_password_label">Passwortschutz</string>
     <string name="share_via_link_password_title">Gesichert</string>
     <string name="share_via_link_edit_permission_label">Bearbeitung erlauben</string>
     <string name="share_via_link_hide_file_listing_permission_label">Dateiliste verbergen</string>
-    <string name="share_get_public_link_button">Link erstellen</string>
-    <string name="share_with_title">Teilen mit &#8230;</string>
-    <string name="share_with_edit_title">Teilen mit %1$s</string>
+    <string name="share_get_public_link_button">Link erhalten</string>
+    <string name="share_with_title">Teile mit &#8230;</string>
+    <string name="share_with_edit_title">Teile mit %1$s</string>
 
     <string name="share_search">Suche</string>
 
-    <string name="search_users_and_groups_hint">Nach Benutzern und Gruppen suchen</string>
+    <string name="search_users_and_groups_hint">Nutzer und Gruppen suchen</string>
     <string name="share_group_clarification">%1$s (Gruppe)</string>
-    <string name="share_remote_clarification">%1$s (entfernte Freigabe)</string>
+    <string name="share_remote_clarification">%1$s (remote)</string>
     <string name="share_email_clarification">%1$s (E-Mail)</string>
-    <string name="share_known_remote_clarification">%1$s ( auf %2$s )</string>
+    <string name="share_known_remote_clarification">%1$s ( at %2$s )</string>
 
     <string name="share_sharee_unavailable">Entschuldigung, Ihre Serverversion erlaubt das Teilen mit Nutzern innerhalb der Clients nicht. \nBitte kontaktieren Sie Ihren Administrator</string>
     <string name="share_privilege_can_share">kann teilen</string>
@@ -521,20 +522,20 @@
     <string name="edit_share_unshare">Freigabe löschen</string>
     <string name="edit_share_done">Erledigt</string>
 
-    <string name="action_retry_uploads">Wiederholung fehlgeschlagen</string>
+    <string name="action_retry_uploads">Fehlgeschlagene erneut versuchen</string>
     <string name="action_clear_failed_uploads">Entferne Fehlversuche</string>
     <string name="action_clear_successful_uploads">Entferne erfolgreiche Uploads</string>
     <string name="action_clear_finished_uploads">Alles aufräumen</string>
 
-    <string name="action_switch_grid_view">Zur Rasteransicht wechseln</string>
-    <string name="action_switch_list_view">Zur Listenansicht wechseln</string>
+    <string name="action_switch_grid_view">Rasteransicht</string>
+    <string name="action_switch_list_view">Listenansicht</string>
 
-    <string name="manage_space_title">Speicher verwalten</string>
+    <string name="manage_space_title">Verwalte Speicherplatz</string>
     <string name="manage_space_description">Einstellungen, Datenbank und Server-Zertifikate von %1$s\'s Daten werden dauerhaft gelöscht.\n\nHerunter geladene Dateien bleiben unangetastet.\n\nDieser Vorgang kann eine Zeit dauern.</string>
-    <string name="manage_space_clear_data">Lösche Daten</string>
+    <string name="manage_space_clear_data">Daten löschen</string>
     <string name="manage_space_error">Einige Dateien konnten nicht gelöscht werden.</string>
 
-    <string name="permission_storage_access">Weitere Berechtigungen erforderlich für das Hoch- und Herunterladen von Dateien</string>
+    <string name="permission_storage_access">Sie haben nicht die erforderlichen Rechte, um Dateien hoch- oder herunterzuladen.</string>
     <string name="local_file_not_found_toast">Die Datei wurde im lokalen Dateisystem nicht gefunden</string>
     <string name="confirmation_remove_files_alert">Wollen Sie die ausgewählten Einträge wirklich löschen?</string>
     <string name="confirmation_remove_folders_alert">Wollen Sie die ausgewählten Einträge und deren Inhalte wirklich löschen?</string>
@@ -542,29 +543,29 @@
     <string name="actionbar_search">Suche</string>
     <string name="files_drop_not_supported">Dies ist eine Nextcloud Funktion, bitte updaten.</string>
     <string name="learn_more">Mehr</string>
-    <string name="drawer_folder_sync">Auto-Upload</string>
+    <string name="drawer_folder_sync">Automatisches Hochladen</string>
     <string name="drawer_participate">Mitmachen</string>
-    <string name="participate_testing_headline">Helfen Sie uns beim Testen</string>
-    <string name="participate_testing_bug_text">Fehler gefunden? Merkwürdiges Verhalten?</string>
+    <string name="participate_testing_headline">Hilf uns Testen</string>
+    <string name="participate_testing_bug_text">Fehler gefunden? Komisches Verhalten?</string>
     <string name="participate_testing_report_text">Fehler melden auf Github</string>
-    <string name="participate_testing_version_text">Möchten Sie uns beim Testen der nächsten Version unterstützen?</string>
-    <string name="participate_beta_headline">Testen Sie die Beta-Version</string>
-    <string name="participate_beta_text">Dies beinhaltet neue Funktionalitäten und ist nicht vollumfänglich qualitätsgesichert. Es können daher Fehler/Bugs auftreten, melden Sie uns diese bitte.</string>
-    <string name="participate_release_candidate_headline">Vorabversionen</string>
+    <string name="participate_testing_version_text">Interessiert uns beim Test der nächsten Version zu unterstützen?</string>
+    <string name="participate_beta_headline">Teste die Entwicklerversion</string>
+    <string name="participate_beta_text">Dies beinhaltet neue Funktionalitäten und ist nicht vollumfänglich qualitätsgesichert. Es können daher Fehler/Bugs auftreten, melde uns diese bitte.</string>
+    <string name="participate_release_candidate_headline">Vorabversion</string>
     <string name="participate_release_candidate_text">Eine Vorabversion, auch Release Candidate (RC) genannt, ist ein stabiler Stand der kommenden, finalen Version. Ein Test in der eigenen Umgebung hilft uns diese Stabilität sicherzustellen. Melden Sie sich als Tester im Play Store an oder suchen und installieren Sie die passende Version bei F-Droid unter „Versionen“.</string>
     <string name="participate_contribute_headline">Aktiv etwas beitragen</string>
-    <string name="participate_contribute_irc_text">An Diskussionen im IRC teilnehmen: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Helfen Sie anderen im &lt;a href="%1$s">Forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">Die App &lt;a href=\"%1$s\">übersetzen&lt;/a></string>
-    <string name="participate_contribute_github_text">Als Entwickler einen Beitrag leisten, Details unter &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a></string>
+    <string name="participate_contribute_irc_text">An Chats teilnehmen auf IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
+    <string name="participate_contribute_forum_text">Hilf anderen im &lt;a href="%1$s">Forum&lt;/a></string>
+    <string name="participate_contribute_translate_text">Die App &lt;a href="%1$s">Übersetzen&lt;/a></string>
+    <string name="participate_contribute_github_text">Zum Überprüfen, Ändern und Schreiben von Quellcode schaue bitte unter &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> für weitere Details.</string>
     <string name="move_to">Verschieben nach&#8230;</string>
     <string name="copy_to">Kopieren nach&#8230;</string>
-    <string name="choose_remote_folder">Ordner auswählen&#8230;</string>
-    <string name="folder_sync_loading_folders">Ordner laden&#8230;</string>
-    <string name="folder_sync_no_results">Keine Medienordner gefunden.</string>
-    <string name="folder_sync_preferences">Auto Upload Einstellungen</string>
+    <string name="choose_remote_folder">Wähle Verzeichnis&#8230;</string>
+    <string name="folder_sync_loading_folders">Lade Verzeichnisse&#8230;</string>
+    <string name="folder_sync_no_results">Keine Medienverzeichnisse gefunden.</string>
+    <string name="folder_sync_preferences">Einstellungen Auto-Hochladen</string>
     <string name="folder_sync_settings">Einstellungen</string>
-    <string name="folder_sync_new_info">Der Auto-Upload wurde vollständig überarbeitet. Bitte über das Hauptmenü zum Auto-Upload gehen und neu konfigurieren. Bitte entschuldigen Sie die Unannehmlichkeiten.\n\nViel Vergnügen mit den neuen und erweiterten Möglichkeiten des Auto-Uploads!</string>
+    <string name="folder_sync_new_info">Sofortiger Upload wurde vollständig überarbeitet. Bitte über das Hauptmenü zum Auto Upload gehen und neu configurieren. Bitte entschuldige die Unannehmlichkeiten.\n\nViel Vergnügen mit den neuen und erweiterten Möglichkeiten des Auto Uploads.</string>
     <string name="folder_sync_preferences_folder_path">Für %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d ausgewählt</item>
@@ -576,14 +577,14 @@
 
     <string name="notifications_loading_activity">Lade Benachrichtigungen&#8230;</string>
     <string name="notifications_no_results_headline">Keine Benachrichtigungen</string>
-    <string name="notifications_no_results_message">Bitte sehen Sie später noch einmal nach.</string>
+    <string name="notifications_no_results_message">Bitte später noch einmal nachsehen.</string>
 
     <string name="upload_file_dialog_title">Dateinamen und -typ zum Hochladen eingeben</string>
     <string name="upload_file_dialog_filename">Dateiname</string>
     <string name="upload_file_dialog_filetype">Dateityp</string>
-    <string name="upload_file_dialog_filetype_snippet_text">Schnipsel-Textdatei (.txt)</string>
-    <string name="upload_file_dialog_filetype_internet_shortcut">Website-Verknüpfungsdatei (%s)</string>
-    <string name="upload_file_dialog_filetype_googlemap_shortcut">Google Maps-Verknüpfungsdatei (%s)</string>
+    <string name="upload_file_dialog_filetype_snippet_text">Schnipsel Textdatei (.txt)</string>
+    <string name="upload_file_dialog_filetype_internet_shortcut">Internet Abkürzungs-Datei (%s)</string>
+    <string name="upload_file_dialog_filetype_googlemap_shortcut">Google Maps Abkürzungs-Datei (%s)</string>
 
     <string name="storage_description_default">Standard</string>
     <string name="storage_description_sd_no">SD Karte %1$d</string>
@@ -619,19 +620,20 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Bislang keine Aktivitäten</string>
-    <string name="activities_no_results_message">Dieser Stream zeigt Ereignisse wie\nHinzugekommenes, Änderungen &amp; und Freigaben an</string>
+    <string name="activities_no_results_message">Dieser Stream zeigt Ereignisse wie\nHinzugekommenes, Änderungen und Freigaben an</string>
     <string name="webview_error">Fehler aufgetreten</string>
     <string name="prefs_category_about">Über</string>
 
-    <string name="actionbar_contacts">Adressen-Sicherung</string>
-    <string name="contacts_backup_button">Sicherung jetzt erstellen</string>
+    <string name="actionbar_contacts">Kontakte-Sicherung</string>
+    <string name="actionbar_contacts_restore">Adressen wiederherstellen</string>
+    <string name="contacts_backup_button">Sicherung jetzt starten</string>
     <string name="contacts_restore_button">Letztes Backup wiederherstellen</string>
     <string name="contacts_header_restore">Wiederherstellen</string>
     <string name="contacts_header_backup">Sicherung</string>
     <string name="contacts_automatic_backup">Adressen-Sicherung</string>
     <string name="contacts_last_backup">Letzte Sicherung</string>
-    <string name="contacts_read_permission">Lese-Zugriffs-Erlaubnis für Adressen ist erforderlich</string>
-    <string name="contacts_write_permission">Schreib-Erlaubnis für Adressen ist erforderlich</string>
+    <string name="contacts_read_permission">Leseberechtigung auf Kontakte erforderlich</string>
+    <string name="contacts_write_permission">Schreibberechtigung auf Kontakte erforderlich</string>
     <string name="contactlist_title">Adressen wiederherstellen</string>
     <string name="contaclist_restore_selected">Ausgewählte Adressen wiederherstellen</string>
     <string name="contactlist_account_chooser_title">Konto für den Import auswählen</string>
@@ -639,11 +641,13 @@
     <string name="contacts_preference_choose_date">Datum auswählen</string>
     <string name="contacts_preference_backup_never">nie</string>
     <string name="contacts_preferences_no_file_found">Keine Datei gefunden</string>
+    <string name="contacts_preferences_something_strange_happened">Wir können Ihr letztes Backup nicht finden!</string>
     <string name="contacts_preferences_backup_scheduled">Sicherung geplant und wird in Kürze starten</string>
     <string name="contacts_preferences_import_scheduled">Import geplant und wird in Kürze starten</string>
 
     <!-- Notifications -->
     <string name="new_notification_received">Neue Benachrichtigung erhalten</string>
+    <string name="drawer_logout">Abmelden</string>
 
 
 </resources>

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

@@ -46,10 +46,10 @@
     <string name="prefs_fingerprint">Fingerabdruck-Sperre</string>
     <string name="prefs_fingerprint_notsetup">Keine Fingerabdrücke eingerichtet.</string>
     <string name="prefs_show_hidden_files">Versteckte Dateien anzeigen</string>
-    <string name="prefs_instant_upload">Sofortiger Bilder-Upload</string>
-    <string name="prefs_instant_upload_summary">Lade Fotos von der Kamera sofort hoch</string>
-    <string name="prefs_instant_video_upload">Sofortiger Video-Upload</string>
-    <string name="prefs_instant_video_upload_summary">Lade Videos von der Kamera sofort hoch</string>
+    <string name="prefs_instant_upload">Sofortiges Hochladen von Bildern</string>
+    <string name="prefs_instant_upload_summary">Lade mit der Kamera gemachte Fotos sofort hoch</string>
+    <string name="prefs_instant_video_upload">Sofortiges Hochladen von Videos</string>
+    <string name="prefs_instant_video_upload_summary">Lade mit der Kamera gemachte Videos sofort hoch</string>
     <string name="prefs_log_title">Protokollierung aktivieren</string>
     <string name="prefs_log_summary">Dies wird zur Protokollierung von Problemen genutzt</string>
     <string name="prefs_log_title_history">Protokollierungs-Historie</string>
@@ -58,17 +58,17 @@
     <string name="prefs_calendar_contacts">Kalender &amp; Kontakte synchronisieren</string>
     <string name="prefs_calendar_contacts_summary">DAVdroid (v1.3.0+) für aktuelles Konto einrichten</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Serveradresse des Kontos für die DAVdroid-Nutzung konnte nicht ermittelt werden</string>
-    <string name="prefs_calendar_contacts_no_store_error">Weder Google Play Store noch F-Droid App installiert</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Kalender- &amp; Kontakte-Synchronisierung erfolgreich konfiguriert</string>
+    <string name="prefs_calendar_contacts_no_store_error">Weder F-Droid noch Google-Play sind installiert</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Kalender- &amp; Adress-Synchronisation konfigurieren</string>
     <string name="prefs_help">Hilfe</string>
-    <string name="prefs_recommend">Empfehle dies einem Freund</string>
+    <string name="prefs_recommend">Einem Freund empfehlen</string>
     <string name="prefs_feedback">Rückmeldungen</string>
     <string name="prefs_imprint">Impressum</string>
     <string name="prefs_remember_last_share_location">Geteilten Speicherort merken</string>
-    <string name="prefs_remember_last_upload_location_summary">Geteilten Upload-Speicherort merken</string>
+    <string name="prefs_remember_last_upload_location_summary">Zuletzt verwendeten, geteilten Upload-Speicherort merken</string>
 
 	<string name="recommend_subject">Probiere %1$s auf Deinem Smartphone!</string>
-	<string name="recommend_text">Ich empfehle Dir die Nutzung von %1$s auf Deinem Smartphone!\nLade es hier herunter: %2$s</string>
+	<string name="recommend_text">"Ich empfehle Dir die Nutzung von %1$s auf Deinem Smartphone!\nLade es hier herunter: %2$s"</string>
 
     <string name="auth_check_server">Server überprüfen</string>
     <string name="auth_host_url">Server-Adresse https://…</string>
@@ -86,20 +86,21 @@
     <string name="uploader_error_title_no_file_to_upload">Keine Datei zum Hochladen</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s kann einen Textteil als Datei hochladen</string>
     <string name="uploader_error_message_no_file_to_upload">Empfangene Daten enthalten keine gültige Datei.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">Datei kann nicht hochgeladen werden</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Diese Datei kan nicht hochgeladen werden</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s darf eine empfangene Datei nicht lesen</string>
-    <string name="uploader_error_message_source_file_not_found">Hochzuladende Datei wurde an ihrem Ort nicht gefunden. Prüfe, ob die Datei existiert.</string>
+    <string name="uploader_error_message_source_file_not_found">Die zum Hochladen ausgewählte Datei kann nicht gefunden werden. Bitte prüfe ob die Datei existiert.
+</string>
     <string name="uploader_error_message_source_file_not_copied">Es ist ein Fehler beim Kopieren dieser Datei in einen temporären Ordner aufgetreten. Bitte erneut versuchen die Datei zu senden.</string>
     <string name="uploader_upload_files_behaviour">Upload Option:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Datei in Nextcloud Ordner verschieben</string>
     <string name="uploader_upload_files_behaviour_only_upload">Hochladen und im Quellordner behalten</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Hochladen und Datei im Quellordner löschen</string>
     <string name="file_list_seconds_ago">Gerade eben</string>
-    <string name="file_list_empty_headline">Keine Dateien vorhanden</string>
-    <string name="file_list_empty">Lade Inhalt hoch oder synchronisiere mit Deinen Geräten!</string>
-    <string name="file_list_empty_favorites">Favorisiere einige Dateien oder synchronisiere deine Geräte!</string>
+    <string name="file_list_empty_headline"> Keine Dateien vorhanden </string>
+    <string name="file_list_empty">Lade Inhalt hoch oder synchronisiere mit Deinen Geräten.</string>
+    <string name="file_list_empty_favorites">Favorisiere einige Dateien oder synchronisiere deine Geräte.</string>
     <string name="file_list_empty_favorites_filter_list">Dateien und Ordner, die als Favoriten markiert werden, erscheinen hier</string>
-    <string name="file_list_empty_favorites_filter">Keine favorisierten Dateien in deinem Verlauf gefunden!</string>
+    <string name="file_list_empty_favorites_filter">Keine favorisierten Dateien in deinem Verlauf gefunden.</string>
     <string name="file_list_loading">Lade&#8230;</string>
     <string name="file_list_no_app_for_file_type">Es wurde keine App für diesen Dateityp gefunden!</string>
     <string name="local_file_list_empty">Es befinden sich keine Dateien in diesem Ordner.</string>
@@ -110,19 +111,18 @@
     <string name="file_list_empty_shared">Von dir geteilte Dateien und Ordner werden hier erscheinen</string>
     <string name="file_list_empty_headline_server_search_videos">Keine Videos</string>
     <string name="file_list_empty_headline_server_search_photos">Keine Fotos</string>
-    <string name="file_list_empty_search">Soll in einem anderen Ordner nachgesehen werden?</string>
+    <string name="file_list_empty_search">Vielleicht befindet es sich in einem anderen Ordner?</string>
     <string name="file_list_empty_recently_modified">Keine, innerhalb der letzten 7 Tage, geänderten Dateien gefunden</string>
-    <string name="file_list_empty_recently_modified_filter">Keine Dateien in deinem Verlauf gefunden,
-        die in den letzten 7 Tagen geändert wurden!</string>
-    <string name="file_list_empty_recently_added">Keine kürzlich hinzu gefügten Dateien gefunden</string>
-    <string name="file_list_empty_recently_added_filter">Keine kürzlich hinzu gefügten Dateien in deinem Verlauf gefunden!</string>
+    <string name="file_list_empty_recently_modified_filter">Keine Dateien gefunden, die in den letzten 7 Tagen geändert wurden.</string>
+    <string name="file_list_empty_recently_added">Keine kürzlich hinzugefügten Dateien gefunden</string>
+    <string name="file_list_empty_recently_added_filter">Keine kürzlich hinzu gefügten Dateien gefunden!</string>
     <string name="file_list_empty_text_photos">Lade Fotos hoch oder aktiviere den Sofortupload!</string>
-    <string name="file_list_empty_text_photos_filter">Keine Fotos in deinem Verlauf gefunden!</string>
-    <string name="file_list_empty_text_videos">Lade einige Videos hoch oder aktiviere den Sofortupload!</string>
-    <string name="file_list_empty_text_videos_filter">Keine Videos in deinem Verlauf gefunden!</string>
+    <string name="file_list_empty_text_photos_filter">Keine Fotos gefunden.</string>
+    <string name="file_list_empty_text_videos">Lade einige Videos hoch oder aktiviere den Sofortupload.</string>
+    <string name="file_list_empty_text_videos_filter">Keine Videos gefunden.</string>
     <string name="upload_list_empty_headline">Keine Uploads verfügbar</string>
-    <string name="upload_list_empty_text">Lade Inhalt hoch oder aktiviere den Sofortupload!</string>
-    <string name="upload_list_empty_text_auto_upload">Lade Inhalt hoch oder aktiviere den Sofortupload!</string>
+    <string name="upload_list_empty_text">Lade Inhalte hoch oder aktiviere den Sofortupload.</string>
+    <string name="upload_list_empty_text_auto_upload">Lade Inhalte hoch oder aktiviere den Auto Upload!</string>
     <string name="file_list_folder">Ordner</string>
     <string name="file_list_folders">Ordner</string>
     <string name="file_list_file">Datei</string>
@@ -134,14 +134,14 @@
     <string name="filedetails_modified">Geändert:</string>
     <string name="filedetails_download">Herunterladen</string>
     <string name="filedetails_sync_file">Synchronisation</string>
-    <string name="filedetails_renamed_in_upload_msg">Datei wurde wärend des Uploads in %1$s umbenannt</string>
+    <string name="filedetails_renamed_in_upload_msg">Datei während des Hochladens in %1$s umbenannt</string>
     <string name="list_layout">Layout der Liste</string>
     <string name="action_share">Teilen</string>
     <string name="common_yes">Ja</string>
     <string name="common_no">Nein</string>
     <string name="common_ok">OK</string>
     <string name="common_remove_upload">Upload entfernen</string>
-    <string name="common_retry_upload">Hochladen erneut versuchen</string>
+    <string name="common_retry_upload">Versuche erneut hochzuladen</string>
     <string name="common_cancel_sync">Synchronisation abbrechen</string>
     <string name="common_cancel">Abbrechen</string>
     <string name="common_back">Zurück</string>
@@ -161,10 +161,10 @@
     <string name="uploader_info_dirname">Ordnername</string>
     <string name="uploader_upload_in_progress_ticker">Hochladen &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Hochladen %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Hochladen erfolgreich</string>
+    <string name="uploader_upload_succeeded_ticker">Hochgeladen</string>
     <string name="uploader_upload_succeeded_content_single">%1$s hochgeladen</string>
     <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
-    <string name="uploader_upload_failed_content_single">Hochladen von  %1$s konnte nicht abgeschlossen werden</string>
+    <string name="uploader_upload_failed_content_single">Konnte %1$s nicht hochladen</string>
     <string name="uploader_upload_failed_credentials_error">Hochladen fehlgeschlagen, erneute Anmeldung erforderlich</string>
     <string name="uploads_view_title">Uploads</string>
     <string name="uploads_view_group_current_uploads">Aktuell</string>
@@ -181,21 +181,21 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Lokale Datei nicht gefunden</string>
     <string name="uploads_view_upload_status_failed_permission_error">Berechtigungsfehler</string>
     <string name="uploads_view_upload_status_conflict">Konflikt</string>
-    <string name="uploads_view_upload_status_service_interrupted">Die Anwendung wurde beendet</string>
+    <string name="uploads_view_upload_status_service_interrupted">App beendet</string>
     <string name="uploads_view_upload_status_unknown_fail">Unbekannter Fehler</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Warten auf Drahtlos-Verbindung</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Warte auf W-Lan-Verbindung</string>
     <string name="uploads_view_later_waiting_to_upload">Warte auf Hochladen</string>
     <string name="downloader_download_in_progress_ticker">Herunterladen &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Herunterladen %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Herunterladen erfolgreich</string>
+    <string name="downloader_download_succeeded_ticker">Heruntergeladen</string>
     <string name="downloader_download_succeeded_content">%1$s heruntergeladen</string>
     <string name="downloader_download_failed_ticker">Herunterladen fehlgeschlagen</string>
-    <string name="downloader_download_failed_content">Herunterladen von %1$s konnte nicht abgeschlossen werden</string>
+    <string name="downloader_download_failed_content">Konnte %1$s nicht herunterladen</string>
     <string name="downloader_not_downloaded_yet">Noch nicht Heruntergeladen</string>
     <string name="downloader_download_failed_credentials_error">Herunterladen fehlgeschlagen, erneute Anmeldung erforderlich</string>
     <string name="common_choose_account">Konto auswählen</string>
     <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
-    <string name="sync_fail_ticker_unauthorized">Synchronisation fehlgeschlagen, erneute Anmeldung erforderlich.</string>
+    <string name="sync_fail_ticker_unauthorized">Synchronisation fehlgeschlagen. Du mußt Dich erneut anmelden</string>
     <string name="sync_fail_content">Synchronisation von %1$s konnte nicht abgeschlossen werden</string>
     <string name="sync_fail_content_unauthorized">Falsches Passwort für %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Konflikte gefunden</string>
@@ -204,8 +204,8 @@
     <string name="sync_fail_in_favourites_content">Inhalte von %1$d Dateien konnten nicht synchronisiert werden (%2$d Konflikte)</string>
     <string name="sync_foreign_files_forgotten_ticker">Einige lokale Dateien wurden vergessen</string>
     <string name="sync_foreign_files_forgotten_content">%1$d Dateien aus dem %2$s Verzeichnis konnten nicht kopiert werden nach</string>
-    <string name="sync_foreign_files_forgotten_explanation">Seit Version 1.3.16 werden Dateien die von diesem Gerät aus hochgeladen werden in den lokalen Ordner %1$s kopiert um Datenverlust zu vermeiden, wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden, in den Ordner %2$s verschoben. Jedoch ist während der Konto-Synchronisation ein Fehler aufgetreten, der das Abschließen dieses Vorgangs verhindert hat. Die Datei(en) können entweder wie sie sind belassen und den Link zu %3$s entfernt werden oder die Datei(en) in den Ordner %1$s verschoben und  den Link zu %4$s beibehalten werden.\n\nUnten befindet sich eine Liste der lokalen Datei(en) und der mit ihnen verbundenen Remote-Datei(en) in %5$s.</string>
-    <string name="sync_current_folder_was_removed">Das Verzeichnis %1$s existiert nicht mehr</string>
+    <string name="sync_foreign_files_forgotten_explanation">Seit Version 1.3.16 werden Dateien die von diesem Gerät aus hochgeladen werden in den lokalen Ordner %1$s kopiert um Datenverlust zu vermeiden, wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden, in den Ordner %2$s verschoben. Jedoch ist während der Konto-Synchronisation ein Fehler aufgetreten, der das Abschließen dieses Vorgangs verhindert hat. Die Datei(en) können entweder wie sie sind belassen und den Link zu %3$s entfernt werden oder die Datei(en) in den Ordner %1$s verschoben und den Link zu %4$s beibehalten werden.\n\nUnten befindet sich eine Liste der lokalen Datei(en) und der mit ihnen verbundenen Remote-Datei(en) in %5$s.</string>
+    <string name="sync_current_folder_was_removed">Der Ordner %1$s existiert nicht mehr</string>
     <string name="foreign_files_move">Verschiebe alle</string>
     <string name="foreign_files_success">Alle Dateien wurden verschoben</string>
     <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
@@ -229,12 +229,12 @@
     <string name="media_event_done">%1$s Wiedergabe Beendet</string>
     <string name="media_err_nothing_to_play">Keine Mediendatei gefunden</string>
     <string name="media_err_no_account">Kein Konto angegeben</string>
-    <string name="media_err_not_in_owncloud">Datei ist nicht in einem gültigen Konto</string>
+    <string name="media_err_not_in_owncloud">Die Datei befindet sich nicht in einem gültigen Konto</string>
     <string name="media_err_unsupported">Medien-Codec wird nicht unterstützt</string>
-    <string name="media_err_io">Mediendatei konnte nicht gelesen werden</string>
-    <string name="media_err_malformed">Mediendatei nicht korrekt encodiert</string>
+    <string name="media_err_io">Konnte die Mediendatei nicht lesen</string>
+    <string name="media_err_malformed">Mediendatei ist nicht korrekt encodiert</string>
     <string name="media_err_timeout">Wartezeit beim Abspielversuch abgelaufen</string>
-    <string name="media_err_invalid_progressive_playback">Mediendatei kann nicht gestreamt werden</string>
+    <string name="media_err_invalid_progressive_playback">Die Mediendatei kann nicht gestreamt werden</string>
     <string name="media_err_unknown">Diese Mediendatei konnte nicht mit dem Standardplayer geöffnet werden</string>
     <string name="media_err_security_ex">Sicherheitsfehler beim Versuch %1$s wiederzugeben</string>
     <string name="media_err_io_ex">Eingabefehler beim Versuch %1$s wiederzugeben</string>
@@ -253,14 +253,14 @@
 	<string name="auth_account_not_new">Ein Benutzerkonto für den gleichen Benutzer und Server existiert auf diesem Gerät bereits</string>
 	<string name="auth_account_not_the_same">Der eingegebene Benutzer passt nicht zu dem Benutzer dieses Benutzerkontos</string>
 	<string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
-	<string name="auth_unknown_host_title">Konnte den Host nicht finden.</string>
-	<string name="auth_incorrect_path_title">Server-Installation nicht gefunden</string>
+	<string name="auth_unknown_host_title">Konnte den Host nicht finden</string>
+	<string name="auth_incorrect_path_title">Server nicht gefunden</string>
 	<string name="auth_timeout_title">Der Server braucht zu lange für eine Antwort.</string>
-	<string name="auth_incorrect_address_title">falsches Server-Adress Format</string>
+	<string name="auth_incorrect_address_title">Falsches Adress-Format für den Server</string>
 	<string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen.</string>
 	<string name="auth_ssl_unverified_server_title">SSL-Server-Identität konnte nicht überprüft werden</string>
 	<string name="auth_bad_oc_version_title">Unbekannte Server-Version</string>
-	<string name="auth_wrong_connection_title">Verbindung konnte nicht aufgebaut werden</string>
+	<string name="auth_wrong_connection_title">Verbindung konnte nicht hergestellt werden</string>
 	<string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
 	<string name="auth_unauthorized">Falscher Benutzername oder Passwort</string>
 	<string name="auth_oauth_error">Autorisierung nicht erfolgreich</string>
@@ -283,9 +283,9 @@
     <string name="common_rename">Umbenennen</string>
     <string name="common_remove">Entfernen</string>
     <string name="confirmation_remove_file_alert">Möchtest Du %1$s wirklich entfernen?</string>
-    <string name="confirmation_remove_folder_alert">Soll %1$s und dessen Inhalt wirklich entfernt werden?</string>
+    <string name="confirmation_remove_folder_alert">Willst Du %1$s deren Inhalte wirklich löschen?</string>
     <string name="confirmation_remove_local">Nur lokal</string>
-    <string name="remove_success_msg">Erfolgreich entfernt</string>
+    <string name="remove_success_msg">Entfernt</string>
     <string name="remove_fail_msg">Entfernen fehlgeschlagen</string>
     <string name="rename_dialog_title">Gib einen neuen Namen ein</string>
     <string name="rename_local_fail_msg">Die lokale Kopie konnte nicht umbenannt werden. Versuche es mit einem anderen Namen.</string>
@@ -296,15 +296,15 @@
     <string name="filename_forbidden_characters">Verbotene Zeichen: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Der Dateiname enthält mindestens ein ungültiges Zeichen</string>
     <string name="filename_empty">Dateiname darf nicht leer sein</string>
-    <string name="wait_a_moment">Bitte warte einen Moment.</string>
+    <string name="wait_a_moment">Bitte warten...</string>
     <string name="wait_checking_credentials">Überprüfe gespeicherte Anmeldeinformationen</string>
     <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu öffnen</string>
-    <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
+    <string name="filedisplay_no_file_selected">Keine Datei gewählt</string>
     <string name="activity_chooser_title">Link senden an &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Kopiere Datei vom privatem Speicher</string>
     
     <string name="oauth_check_onoff">Anmelden mit oAuth2</string> 
-    <string name="oauth_login_connection">Verbinde mit dem oAuth2-Server.</string>    
+    <string name="oauth_login_connection">Verbinde mit dem oAuth2-Server...</string>    
         
     <string name="ssl_validator_header">Die Identität der Website konnte nicht überprüft werden</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Das Zertifikat des Servers ist nicht vertrauenswürdig</string>
@@ -341,11 +341,11 @@
     <string name="placeholder_timestamp">18.5.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Nur über WLAN hochladen</string>
-    <string name="instant_upload_on_wifi">Bilder nur über Wifi hochladen</string>
-    <string name="instant_video_upload_on_wifi">Videos nur über Wifi hochladen</string>
-    <string name="instant_video_upload_on_charging">Hochladen nur während des Ladens</string>
-    <string name="instant_upload_on_charging">Hochladen nur während des Ladens</string>
+    <string name="auto_upload_on_wifi">Nur über W-Lan hochladen</string>
+    <string name="instant_upload_on_wifi">Bilder nur über W-Lan hochladen</string>
+    <string name="instant_video_upload_on_wifi">Videos nur über W-Lan hochladen</string>
+    <string name="instant_video_upload_on_charging">Nur während des Ladens hochladen</string>
+    <string name="instant_upload_on_charging">Nur während des Ladens hochladen</string>
     <string name="instant_upload_path">/SofortUpload</string>
     <string name="conflict_title">Dateikonfilikt</string>
     <string name="conflict_message">Welche Datei soll behalten werden? Wenn du beide Versionen wählst, wird der lokalen Datei eine Zahl am Ende des Dateinamens angefügt.</string>
@@ -353,7 +353,7 @@
     <string name="conflict_use_local_version">Lokale Version</string>
     <string name="conflict_use_server_version">Serverversion</string>
 
-    <string name="preview_sorry">Das tut mir leid!</string>
+    <string name="preview_sorry">Entschuldigung.</string>
     <string name="preview_image_description">Bildvorschau</string>
     <string name="preview_image_error_unknown_format">Bild kann nicht angezeigt werden</string>
 
@@ -364,7 +364,7 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">Unterordner benutzen</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">In Unterordnern speichern, basierend auf Jahr und Monat</string>
 
-	<string name="share_link_no_support_share_api">Entschuldigung, das Teilen ist auf deinem Server nicht aktiviert. Bitte kontaktiere deinen Administrator.</string>
+	<string name="share_link_no_support_share_api">Teilen ist auf Deinem Server nicht aktiviert. Bitte kontaktiere den Administrator.</string>
 	<string name="share_link_file_no_exist">Teilen nicht möglich. Prüfe, ob die Datei existiert</string>
 	<string name="share_link_file_error">Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten.</string>
 	<string name="unshare_link_file_no_exist">Entfernen der Freigabe nicht möglich. Prüfe, dass die Datei existiert</string>
@@ -388,32 +388,33 @@
     <string name="network_error_socket_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operation konnte nicht abgeschlossen werden</string>
     <string name="network_error_connect_timeout_exception">Es ist ein Fehler beim Warten auf den Server aufgetreten, die Operationkonnte nicht abgeschlossen werden</string>
     <string name="network_host_not_available">Die Operation kann nicht abgeschlossen werden, der Server ist nicht erreichbar</string>
-    <string name="forbidden_permissions">Sie haben keine Berechtigung %s</string>
+
+    <string name="forbidden_permissions">Dir fehlt die Erlaubnis %s</string>
     <string name="forbidden_permissions_rename">diese Datei umzubenennen</string>
     <string name="forbidden_permissions_delete">diese Datei zu löschen</string>
     <string name="share_link_forbidden_permissions">diese Datei zu teilen</string>
     <string name="unshare_link_forbidden_permissions">diese Datei nicht mehr zu teilen</string>
     <string name="update_link_forbidden_permissions">zum Aktualisieren dieser Freigabe</string>
-    <string name="forbidden_permissions_create">eine Datei zu erstellen</string>
-    <string name="uploader_upload_forbidden_permissions">in diesen Order etwas hochzuladen</string>
+    <string name="forbidden_permissions_create">diese Datei zu erstellen</string>
+    <string name="uploader_upload_forbidden_permissions">diesen Ordner hochzuladen</string>
     <string name="downloader_download_file_not_found">Diese Datei steht auf dem Server nicht mehr zur Verfügung</string>
 
     <string name="file_migration_dialog_title">Aktualisiere Speicherort</string>
     <string name="file_migration_finish_button">Beenden</string>
     <string name="file_migration_preparing">Bereite Migration vor&#8230;</string>
     <string name="file_migration_checking_destination">Prüfe Zielort&#8230;</string>
-    <string name="file_migration_saving_accounts_configuration">Speichere Konteneinstellung&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Warte auf Abschluss der Synchronisierungen&#8230;</string>
+    <string name="file_migration_saving_accounts_configuration">Sichere Konfiguration der Konten&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Warte auf die Fertigstellung der Synchronisationen&#8230;</string>
     <string name="file_migration_migrating">Verschiebe Dateien&#8230;</string>
     <string name="file_migration_updating_index">Aktualisiere Index&#8230;</string>
     <string name="file_migration_cleaning">Aufräumen&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">Konteneinstellung wiederherstellen&#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">Konfiguration der Konten wiederherstellen&#8230;</string>
     <string name="file_migration_ok_finished">Abgeschlossen</string>
-    <string name="file_migration_failed_not_enough_space">FEHLER: Nicht genügend Speicherplatz</string>
+    <string name="file_migration_failed_not_enough_space">FEHLER: zu wenig Platz</string>
     <string name="file_migration_failed_not_writable">FEHLER: Datei kann nicht geschrieben werden</string>
-    <string name="file_migration_failed_not_readable">FEHLER: Datei nicht lesbar</string>
+    <string name="file_migration_failed_not_readable">FEHLER: Datei kann nicht gelesen werden</string>
     <string name="file_migration_failed_dir_already_exists">FEHLER: Nextcloud Ordner existiert bereits</string>
-    <string name="file_migration_failed_while_coping">FEHLER: Während der Migration</string>
+    <string name="file_migration_failed_while_coping">FEHLER: Migration fehlgeschlagen</string>
     <string name="file_migration_failed_while_updating_index">FEHLER: Während der Aktualisierung des Indexes</string>
 
     <string name="file_migration_directory_already_exists">Datenordner existiert bereits, was soll geschehen?</string>
@@ -435,7 +436,7 @@
 	<string name="saml_authentication_wrong_pass">Falsches Passwort</string>
 	<string name="actionbar_move">Verschieben</string>
     <string name="actionbar_copy">Kopieren</string>
-	<string name="file_list_empty_moving">Noch nichts vorhanden. Sie können einen Ordner hinzufügen!</string>
+	<string name="file_list_empty_moving">Noch nichts vorhanden. Du kannst einen Ordner hinzufügen.</string>
 	<string name="folder_picker_choose_button_text">Auswählen</string>
 
     <string name="move_file_not_found">Verschieben nicht möglich. Prüfe, ob die Datei existiert</string>
@@ -454,7 +455,7 @@
     <string name="prefs_category_instant_uploading">sofort hochladen</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Sofortupload-Video-Ordner</string>
+	<string name="prefs_instant_video_upload_path_title">Video Speicherpfad wählen</string>
     <string name="sync_folder_failed_content">Bei der Synchronisation konnte %1$s Ordner nicht fertig gestellt werden</string>
 
 	<string name="shared_subject_header">geteilt</string>
@@ -556,7 +557,7 @@
     <string name="participate_contribute_irc_text">An Chats teilnehmen auf IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">Hilf anderen im &lt;a href="%1$s">Forum&lt;/a></string>
     <string name="participate_contribute_translate_text">Die App &lt;a href="%1$s">Übersetzen&lt;/a></string>
-    <string name="participate_contribute_github_text">Als Entwickler einen Beitrag leisten, Details unter &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a></string>
+    <string name="participate_contribute_github_text">Zum Überprüfen, Ändern und Schreiben von Quellcode schaue bitte unter &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> für weitere Details.</string>
     <string name="move_to">Verschieben nach&#8230;</string>
     <string name="copy_to">Kopieren nach&#8230;</string>
     <string name="choose_remote_folder">Wähle Verzeichnis&#8230;</string>
@@ -564,7 +565,7 @@
     <string name="folder_sync_no_results">Keine Medienverzeichnisse gefunden.</string>
     <string name="folder_sync_preferences">Einstellungen Auto-Hochladen</string>
     <string name="folder_sync_settings">Einstellungen</string>
-    <string name="folder_sync_new_info">Sofortiger Upload wurde vollständig überarbeitet. Bitte über das Hauptmenü zum Auto Upload gehen und neu configurieren. Bitte entschuldige die Unannehmlichkeiten.\n\nViel Vergnügen mit den neuen und erweiterten Möglichkeiten des Auto Uploads!</string>
+    <string name="folder_sync_new_info">Sofortiger Upload wurde vollständig überarbeitet. Bitte über das Hauptmenü zum Auto Upload gehen und neu configurieren. Bitte entschuldige die Unannehmlichkeiten.\n\nViel Vergnügen mit den neuen und erweiterten Möglichkeiten des Auto Uploads.</string>
     <string name="folder_sync_preferences_folder_path">Für %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d ausgewählt</item>
@@ -619,19 +620,20 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Bislang keine Aktivitäten</string>
-    <string name="activities_no_results_message">Dieser Stream zeigt Ereignisse wie\nHinzugekommenes, Änderungen &amp; und Freigaben an</string>
+    <string name="activities_no_results_message">Dieser Stream zeigt Ereignisse wie\nHinzugekommenes, Änderungen und Freigaben an</string>
     <string name="webview_error">Fehler aufgetreten</string>
     <string name="prefs_category_about">Über</string>
 
-    <string name="actionbar_contacts">Adressen-Sicherung</string>
-    <string name="contacts_backup_button">Sicherung jetzt erstellen</string>
+    <string name="actionbar_contacts">Kontakte-Sicherung</string>
+    <string name="actionbar_contacts_restore">Adressen wiederherstellen</string>
+    <string name="contacts_backup_button">Sicherung jetzt starten</string>
     <string name="contacts_restore_button">Letztes Backup wiederherstellen</string>
     <string name="contacts_header_restore">Wiederherstellen</string>
     <string name="contacts_header_backup">Sicherung</string>
     <string name="contacts_automatic_backup">Adressen-Sicherung</string>
     <string name="contacts_last_backup">Letzte Sicherung</string>
-    <string name="contacts_read_permission">Lese-Zugriffs-Erlaubnis für Adressen ist erforderlich</string>
-    <string name="contacts_write_permission">Schreib-Erlaubnis für Adressen ist erforderlich</string>
+    <string name="contacts_read_permission">Leseberechtigung auf Kontakte erforderlich</string>
+    <string name="contacts_write_permission">Schreibberechtigung auf Kontakte erforderlich</string>
     <string name="contactlist_title">Adressen wiederherstellen</string>
     <string name="contaclist_restore_selected">Ausgewählte Adressen wiederherstellen</string>
     <string name="contactlist_account_chooser_title">Konto für den Import auswählen</string>
@@ -639,11 +641,13 @@
     <string name="contacts_preference_choose_date">Datum auswählen</string>
     <string name="contacts_preference_backup_never">nie</string>
     <string name="contacts_preferences_no_file_found">Keine Datei gefunden</string>
+    <string name="contacts_preferences_something_strange_happened">Wir können dein letztes Backup nicht finden!</string>
     <string name="contacts_preferences_backup_scheduled">Sicherung geplant und wird in Kürze starten</string>
     <string name="contacts_preferences_import_scheduled">Import geplant und wird in Kürze starten</string>
 
     <!-- Notifications -->
     <string name="new_notification_received">Neue Benachrichtigung erhalten</string>
+    <string name="drawer_logout">Abmelden</string>
 
 
 </resources>

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

@@ -46,10 +46,10 @@
     <string name="prefs_fingerprint">Κλείδωμα με αποτύπωμα</string>
     <string name="prefs_fingerprint_notsetup">Δεν έχει οριστεί αποτύπωμα</string>
     <string name="prefs_show_hidden_files">Εμφάνιση κρυφών αρχείων</string>
-    <string name="prefs_instant_upload">Άμεση μεταφόρτωση εικόνων</string>
-    <string name="prefs_instant_upload_summary">Άμεση μεταφόρτωση φωτογραφιών από την κάμερα</string>
+    <string name="prefs_instant_upload">Άμεσες μεταφορτώσεις φωτογραφιών</string>
+    <string name="prefs_instant_upload_summary">Άμεση μεταφόρτωση φωτογραφιών που λήφθησαν από την φωτογραφική μηχανή</string>
     <string name="prefs_instant_video_upload">Άμεση μεταφόρτωση βίντεο</string>
-    <string name="prefs_instant_video_upload_summary">Άμεση μεταφόρτωση των βίντεο από την κάμερα</string>
+    <string name="prefs_instant_video_upload_summary">Άμεση μεταφόρτωση βίντεο που λήφθησαν από την φωτογραφική μηχανή</string>
     <string name="prefs_log_title">Ενεργοποίηση καταγραφής ιστορικού</string>
     <string name="prefs_log_summary">Χρησιμοποιείται για την καταγραφή προβλημάτων</string>
     <string name="prefs_log_title_history">Καταγραφή ιστορικού</string>
@@ -58,23 +58,16 @@
     <string name="prefs_calendar_contacts">Συγχρονισμός ημερολογίου &amp; επαφών</string>
     <string name="prefs_calendar_contacts_summary">Ρυθμίστε το DAVdroid (v1.3.0+) για τον τρέχον λογαριασμό</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Η διεύθυνση του διακομιστή για τον λογαριασμό δεν μπορεί να καθοριστεί για το DAVdroid</string>
-    <string name="prefs_calendar_contacts_no_store_error">Δεν είναι εγκατεστημένα το Google Play ή το F-Droid</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Επιτυχής ρύθμιση συγχρονισμού ημερολογίου &amp; επαφών</string>
+    <string name="prefs_calendar_contacts_no_store_error">Δεν είναι εγκατεστημένο το F-droid αλλά ούτε και το Google Play</string>
     <string name="prefs_help">Βοήθεια</string>
     <string name="prefs_recommend">Προτείνετε σε φίλο</string>
     <string name="prefs_feedback">Aνάδραση</string>
     <string name="prefs_imprint">Αποτύπωμα</string>
-    <string name="prefs_remember_last_share_location">Απομνημόνευση θέσης διαμοιρασμού</string>
-    <string name="prefs_remember_last_upload_location_summary">Απομνημόνευση τελευταιας τοποθεσίας διαμοιρασμού μεταφορτώσεων</string>
-
-	<string name="recommend_subject">Δοκιμή %1$s στο κινητό σας!</string>
-	<string name="recommend_text">Θα ήθελα να σε προσκαλέσω να χρησιμοποιήσεις το %1$s στο κινητό σου!\\nΛήψη από εδώ: %2$s</string>
-
-    <string name="auth_check_server">Έλεγχος διακομιστή</string>
+    <string name="recommend_subject">Δοκιμή %1$s στο κινητό σας!</string>
+	<string name="auth_check_server">Έλεγχος διακομιστή</string>
     <string name="auth_host_url">Διεύθυνση διακομιστή https://…</string>
     <string name="auth_username">Όνομα χρήστη</string>
     <string name="auth_password">Συνθηματικό</string>
-    <string name="auth_register">Δεν έχετε ακόμα διακομιστή;\\nΚάντε κλικ εδώ για να πάρετε έναν από ένα πάροχο</string>
     <string name="sync_string_files">Αρχεία</string>
     <string name="setup_btn_connect">Σύνδεση</string>
     <string name="uploader_btn_upload_text">Μεταφόρτωση</string>
@@ -88,20 +81,12 @@
     <string name="uploader_error_message_no_file_to_upload">Τα ληφθέντα δεδομένα δεν περιλαμβάνουν έγκυρο αρχείο.</string>
     <string name="uploader_error_title_file_cannot_be_uploaded">Το αρχείο δεν μπορεί να μεταφορτωθεί</string>
     <string name="uploader_error_message_read_permission_not_granted">Ο %1$s δεν επιτρέπεται να αναγνώσει ένα ληφθέν αρχείο</string>
-    <string name="uploader_error_message_source_file_not_found">Το αρχείο προς αποστολή δεν βρέθηκε στην τοποθεσία. Παρακαλώ ελέγξτε εάν υπάρχει το αρχείο.</string>
-    <string name="uploader_error_message_source_file_not_copied">Παρουσιάστηκε σφάλμα κατά την αντιγραφή του αρχείου στον προσωρινό φάκελο. Παρακαλούμε δοκιμάστε να στείλετε ξανά.</string>
     <string name="uploader_upload_files_behaviour">Επιλογή μεταφόρτωσης:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Μετακίνηση αρχείου στον φάκελο Nextcloud</string>
     <string name="uploader_upload_files_behaviour_only_upload">Διατήρηση του αρχείου στον πηγαίο φάκελο</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Διαγραφή αρχείου από τον πηγαίο φάκελο</string>
     <string name="file_list_seconds_ago">δευτερόλεπτα πριν</string>
-    <string name="file_list_empty_headline">Δεν υπάρχουν αρχεία</string>
-    <string name="file_list_empty">Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!</string>
-    <string name="file_list_empty_favorites">Σημειώστε ως αγαπημένα ορισμένα αρχεία ή συγχρονίστε τα με τις συσκευές σας!</string>
-    <string name="file_list_empty_favorites_filter_list">Τα αρχεία ή οι φάκελοι που σημειώσατε ως αγαπημένα θα εμφανιστούν εδώ</string>
-    <string name="file_list_empty_favorites_filter">Δεν βρέθηκαν αρχεία σημειωμένα ως αγαπημένα για το ερώτημά σας!</string>
     <string name="file_list_loading">Φόρτωση&#8230;</string>
-    <string name="file_list_no_app_for_file_type">Δεν βρέθηκε εφαρμογή για τον τύπο αρχείου!</string>
     <string name="local_file_list_empty">Δεν υπάρχουν αρχεία σε αυτό τον φάκελο.</string>
     <string name="file_list_empty_headline_search">Κανενα αποτέλεσμα σε αυτον τον φάκελο</string>
     <string name="file_list_empty_headline_server_search">Κανένα αποτέλεσμα</string>
@@ -109,19 +94,7 @@
     <string name="file_list_empty_shared">Τα αρχεία και οι φάκελοι που διαμοιράζεστε θα εμφανίζονται εδώ</string>
     <string name="file_list_empty_headline_server_search_videos">Κανένα βίντεο</string>
     <string name="file_list_empty_headline_server_search_photos">Καμιά φωτογραφία</string>
-    <string name="file_list_empty_search">Θα δοκιμάστε αναζήτηση και σε άλλο φάκελο;</string>
-    <string name="file_list_empty_recently_modified">Δεν βρέθηκαν αρχεία που να έχουν τροποποιηθεί τις τελευταίες 7 ημέρες</string>
-    <string name="file_list_empty_recently_modified_filter">Δεν βρέθηκαν αρχεία για το αίτημά σας που να έχουν τροποποιηθεί
-        τις τελευταίες 7 ημέρες!</string>
-    <string name="file_list_empty_recently_added">Δεν βρέθηκαν πρόσφατα προστεθημένα αρχεία</string>
-    <string name="file_list_empty_recently_added_filter">Δεν βρέθηκαν πρόσφατα προστεθημένα αρχεία για το αίτημά σας!</string>
-    <string name="file_list_empty_text_photos">Μεταφόρτωση μερικών φωτογραφιών ή ενεργοποιήστε την αυτόματη μεταφόρτωση!</string>
-    <string name="file_list_empty_text_photos_filter">Δεν βρέθηκαν φωτογραφίες για το αίτημά σας!</string>
-    <string name="file_list_empty_text_videos">Μεταφορτώστε μερικά βίντεο ή ενεργοποιήστε την αυτόματη μεταφόρτωση!</string>
-    <string name="file_list_empty_text_videos_filter">Δεν βρέθηκε βίντεο για το αίτημά σας!</string>
     <string name="upload_list_empty_headline">Μη διαθέσιμες μεταφορτώσεις</string>
-    <string name="upload_list_empty_text">Μεταφορτώστε περιεχόμενο ή ενεργοποιήστε την άμεση μεταφόρτωση!</string>
-    <string name="upload_list_empty_text_auto_upload">Μεταφορτώστε περιεχόμενο ή ενεργοποιήστε την αυτόματη μεταφόρτωση!</string>
     <string name="file_list_folder">φάκελος</string>
     <string name="file_list_folders">φάκελοι</string>
     <string name="file_list_file">αρχείο</string>
@@ -133,14 +106,11 @@
     <string name="filedetails_modified">Τροποποιήθηκε:</string>
     <string name="filedetails_download">Λήψη</string>
     <string name="filedetails_sync_file">Συγχρονισμός</string>
-    <string name="filedetails_renamed_in_upload_msg">Το αρχείο μετονομάστηκε σε %1$s κατά τη μεταφόρτωση</string>
-    <string name="list_layout">Διάταξη λίστας</string>
     <string name="action_share">Διαμοιρασμός</string>
     <string name="common_yes">Ναι</string>
     <string name="common_no">Όχι</string>
     <string name="common_ok">Εντάξει</string>
     <string name="common_remove_upload">Αφαίρεση μεταφόρτωσης</string>
-    <string name="common_retry_upload">Επανάληψη μεταφόρτωσης</string>
     <string name="common_cancel_sync">Ακύρωση συγχρονισμού</string>
     <string name="common_cancel">Ακύρωση</string>
     <string name="common_back">Επιστροφή</string>
@@ -160,10 +130,9 @@
     <string name="uploader_info_dirname">Όνομα φακέλου</string>
     <string name="uploader_upload_in_progress_ticker">Μεταφόρτωση &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Μεταφορτώνονται %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Επιτυχημένη μεταφόρτωση</string>
+    <string name="uploader_upload_succeeded_ticker">Μεταφορτώθηκε</string>
     <string name="uploader_upload_succeeded_content_single">Το %1$s μεταφορτώθηκε</string>
     <string name="uploader_upload_failed_ticker">Η μεταφόρτωση απέτυχε</string>
-    <string name="uploader_upload_failed_content_single">Η μεταφόρτωση του %1$s δεν ήταν δυνατόν να ολοκληρωθεί</string>
     <string name="uploader_upload_failed_credentials_error">Η μεταφόρτωση απέτυχε, πρέπει να επανασυνδεθείτε</string>
     <string name="uploads_view_title">Μεταφορτώσεις</string>
     <string name="uploads_view_group_current_uploads">Τρέχουσα</string>
@@ -180,37 +149,30 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Δεν βρέθηκε το τοπικό αρχείο</string>
     <string name="uploads_view_upload_status_failed_permission_error">Σφάλμα δικαιωμάτων</string>
     <string name="uploads_view_upload_status_conflict">Διένεξη</string>
-    <string name="uploads_view_upload_status_service_interrupted">Η εφαρμογή τερματίστηκε</string>
     <string name="uploads_view_upload_status_unknown_fail">Άγνωστο σφάλμα</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Αναμονή για σύνδεση wifi</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Αναμονή σύνδεσης Wi-Fi</string>
     <string name="uploads_view_later_waiting_to_upload">Αναμονή για μεταφόρτωση</string>
     <string name="downloader_download_in_progress_ticker">Λαμβάνονται &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Λαμβάνονται %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Επιτυχημένη λήψη</string>
+    <string name="downloader_download_succeeded_ticker">Ληφθέντα</string>
     <string name="downloader_download_succeeded_content">%1$s ελήφθησαν</string>
     <string name="downloader_download_failed_ticker">Αποτυχημένη λήψη</string>
-    <string name="downloader_download_failed_content">Η λήψη του %1$s δεν μπόρεσε να ολοκληρωθεί</string>
     <string name="downloader_not_downloaded_yet">Δεν έχει ληφθεί ακόμα</string>
     <string name="downloader_download_failed_credentials_error">Αποτυχία λήψης, πρέπει να εισέλθετε ξανά</string>
     <string name="common_choose_account">Επιλογή λογαριασμού</string>
     <string name="sync_fail_ticker">Αποτυχία συγχρονισμού</string>
-    <string name="sync_fail_ticker_unauthorized">Αποτυχία συγχρονισμού, χρειάζεται να εισέλθετε ξανά</string>
-    <string name="sync_fail_content">Ο συγχρονισμός του %1$s δεν μπόρεσε να ολοκληρωθεί</string>
-    <string name="sync_fail_content_unauthorized">Μη έγκυρο συνθηματικό για %1$s</string>
+    <string name="sync_fail_content_unauthorized">Εσφαλμένο συνθηματικό για τον %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Βρέθηκαν διενέξεις</string>
     <string name="sync_conflicts_in_favourites_content">%1$d αρχεία σε αναμονή προς συγχρονισμό δεν μπόρεσαν να συγχρονιστούν</string>
     <string name="sync_fail_in_favourites_ticker">Τα αρχεία σε αναμονή προς συγχρονισμού απέτυχαν</string>
     <string name="sync_fail_in_favourites_content">Τα περιεχόμενα των %1$d αρχείων δεν μπόρεσαν να συγχρονιστούν (%2$d διενέξεις)</string>
     <string name="sync_foreign_files_forgotten_ticker">Ορισμένα τοπικά αρχεία ξεχάστηκαν</string>
     <string name="sync_foreign_files_forgotten_content">%1$d αρχεία από τον %2$s φάκελο δεν ήταν δυνατό να αντιγραφούν σε</string>
-    <string name="sync_foreign_files_forgotten_explanation">Από την έκδοση 1.3.16, τα αρχεία που μεταφορτώθηκαν από αυτήν τη συσκευή αντιγράφηκαν στον τοπικό φάκελο %1$s για να αποτραπεί η απώλεια δεδομένων όταν ένα αρχείο είναι συγχρονισμένο με πολλαπλούς λογαριασμούς. \n\nΛόγω αυτής της αλλαγής, όλα τα αρχεία που μεταφορτώθηκαν με προηγούμενες εκδόσεις αυτής της εφαρμογής αντιγράφηκαν στον φάκελο %2$s. Ωστόσο, ένα σφάλμα εμπόδισε την ολοκλήρωση αυτής της λειτουργίας κατά το συγχρονισμό του λογαριασμού. Μπορείτε είτε να αφήσετε το(α) αρχείο(α) όπως είναι και να καταργήσετε τη σύνδεση με το %3$s ή να μετακινήσετε τα αρχεία στο φάκελο %1$s και να διατηρήσετε τη σύνδεση με το %4$s. \n\nΑπαριθμημένα πιο κάτω είναι τα τοπικά αρχεία(ο) και τα απομακρυσμένα αρχεία(ο) στο %5$s με τα οποία συνδέονταν.</string>
-    <string name="sync_current_folder_was_removed">Ο φάκελος %1$s δεν υπάρχει πια</string>
     <string name="foreign_files_move">Μετακίνηση όλων</string>
     <string name="foreign_files_success">Όλα τα αρχεία μετακινήθηκαν</string>
     <string name="foreign_files_fail">Μερικά αρχεία δεν μπόρεσαν να μετακινηθούν</string>
     <string name="foreign_files_local_text">Τοπικά: %1$s</string>
     <string name="foreign_files_remote_text">Απομακρυσμένα: %1$s</string>
-    <string name="upload_query_move_foreign_files">Δεν υπάρχει αρκετός διαθέσιμος αποθηκευτικός χώρος για να αντιγραφούν τα επιλεγμένα αρχεία στον φάκελο %1$s. Θα θέλατε να τα μετακινήσετε αντί αυτού;</string>
     <string name="pass_code_enter_pass_code">Παρακαλούμε εισάγετε τον κωδικό πρόσβασης</string>
     
     <string name="pass_code_configure_your_pass_code">Εισάγετε τον κωδικό πρόσβασης</string>
@@ -228,16 +190,10 @@
     <string name="media_event_done">%1$s αναπαραγωγή τελείωσε</string>
     <string name="media_err_nothing_to_play">Δεν βρέθηκαν αρχεία πολυμέσων</string>
     <string name="media_err_no_account">Δεν δόθηκε λογαριασμός</string>
-    <string name="media_err_not_in_owncloud">Το αρχείο δεν βρίσκεται σε έγκυρο λογαριασμό</string>
+    <string name="media_err_not_in_owncloud">Το αρχείο δεν είναι έγκυρος λογαριασμός</string>
     <string name="media_err_unsupported">Δεν υποστηρίζεται η μορφή κωδικοποιήσης πολυμέσων</string>
     <string name="media_err_io">Αδυναμία ανάγνωσης αρχείου πολυμέσων</string>
-    <string name="media_err_malformed">Εσφαλμένη κωδικοποίηση αρχείου πολυμέσων</string>
     <string name="media_err_timeout">Λήξη χρόνου κατά την προσπάθεια αναπαραγωγής</string>
-    <string name="media_err_invalid_progressive_playback">Το αρχείο πολυμέσων δεν μπορεί να μεταδοθεί</string>
-    <string name="media_err_unknown">Το αρχείο πολυμέσων δεν μπορεί να αναπαραχθεί με την παρεχόμενη εφαρμογή αναπαραγωγής πολυμέσων</string>
-    <string name="media_err_security_ex">Σφάλμα ασφαλείας κατά την προσπάθεια αναπαραγωγής του %1$s</string>
-    <string name="media_err_io_ex">Σφάλμα εισόδου κατά την προσπάθεια αναπαραγωγής του %1$s</string>
-    <string name="media_err_unexpected">Απροσδόκητο σφάλμα κατά την προσπάθεια αναπαραγωγής του %1$s</string>
     <string name="media_rewind_description">Κουμπί ταχείας κίνησης πίσω</string>
     <string name="media_play_pause_description">Κουμπί αναπαραγωγής ή παύσης</string>
     <string name="media_forward_description">Κουμπί γρήγορης προώθησης</string>
@@ -249,32 +205,24 @@
 	<string name="auth_connection_established">Εδραίωση σύνδεσης</string>
 	<string name="auth_testing_connection">Έλεγχος σύνδεσης</string>
 	<string name="auth_not_configured_title">Εσφαλμένες ρυθμίσεις διακομιστή</string>
-	<string name="auth_account_not_new">Ένας λογαριασμός για τον ίδιο χρήστη και διακομιστή υπάρχει ήδη στη συσκευή</string>
 	<string name="auth_account_not_the_same">Ο χρήστης που εισάγατε δεν ταιριάζει με το χρήστη αυτού του λογαριασμού</string>
 	<string name="auth_unknown_error_title">Παρουσιάστηκε άγνωστο σφάλμα!</string>
-	<string name="auth_unknown_host_title">Δεν βρέθηκε κεντρικός υπολογιστής</string>
-	<string name="auth_incorrect_path_title">Δεν βρέθηκε εγκατεστημένος διακομιστής</string>
+	<string name="auth_unknown_host_title">Αδυναμία εύρεσης κεντρικού υπολογιστή</string>
+	<string name="auth_incorrect_path_title">Δεν βρέθηκε διακομιστής</string>
 	<string name="auth_timeout_title">Ο διακομιστής αργεί πολύ να απαντήσει</string>
 	<string name="auth_incorrect_address_title">Εσφαλμένη μορφή διεύθυνσης διακομιστή</string>
 	<string name="auth_ssl_general_error_title">Η αρχικοποίηση του SSL απέτυχε</string>
-	<string name="auth_ssl_unverified_server_title">Αδυναμία επιβεβαίωσης της ταυτότητας του διακομιστή SSL </string>
 	<string name="auth_bad_oc_version_title">Μη αναγνωρίσιμη έκδοση διακομιστή</string>
-	<string name="auth_wrong_connection_title">Αδυναμία δημιουργίας σύνδεσης</string>
 	<string name="auth_secure_connection">Επιτεύχθηκε ασφαλής σύνδεση</string>
 	<string name="auth_unauthorized">Εσφαλμένο όνομα χρήστη ή συνθηματικό</string>
 	<string name="auth_oauth_error">Ανεπιτυχής πιστοποίηση</string>
 	<string name="auth_oauth_error_access_denied">Άρνηση πρόσβασης από τον διακομιστή πιστοποίησης</string>
-	<string name="auth_wtf_reenter_URL">Απροσδόκητη κατάσταση, παρακαλoύμε εισάγετε ξανά τη διεύθυνση του διακομιστή</string>
 	<string name="auth_expired_oauth_token_toast">Η πιστοποιίησή σας έληξε. Παρακαλούμε εξουσιοδοτήστε ξανά</string>
 	<string name="auth_expired_basic_auth_toast">Παρακαλούμε εισάγετε το τρέχον συνθηματικό</string>
 	<string name="auth_expired_saml_sso_token_toast">Η συνεδρία σας έληξε. Παρακαλούμε συνδεθείτε ξανά</string>
-	<string name="auth_connecting_auth_server">Σύνδεση με το διακομιστή πιστοποίησης ...</string>
 	<string name="auth_unsupported_auth_method">Ο διακομιστής δεν υποστηρίζει αυτή τη μέθοδο πιστοποίησης</string>
 	<string name="auth_unsupported_multiaccount">Ο %1$s  δεν υποστηρίζει πολλαπλούς λογαριασμούς</string>
-	<string name="auth_fail_get_user_name">Ο διακομιστής σας δεν επιστρέφει το σωστό αναγνωριστικό χρήστη, παρακαλούμε επικοινωνήστε τον διαχειριστή</string>
 	<string name="auth_can_not_auth_against_server">Αδυαμία πιστοποίησης με αυτόν το διακομιστή</string>
-    <string name="auth_account_does_not_exist">Ο λογαριασμός δεν υπάρχει ακόμα στη συσκευή</string>
-    
     <string name="favorite">Ορισμός ως διαθέσιμο εκτός σύνδεσης</string>
     <string name="unfavorite">Αναίρεση ορισμού ως διαθέσιμο εκτός σύνδεσης</string>
     <string name="favorite_real">Ορισμός ως αγαπημένο</string>
@@ -282,36 +230,29 @@
     <string name="common_rename">Μετονομασία</string>
     <string name="common_remove">Αφαίρεση</string>
     <string name="confirmation_remove_file_alert">Θέλετε να αφαιρέσετε το %1$s;</string>
-    <string name="confirmation_remove_folder_alert">Θέλετε να αφαιρέσετε το %1$s και τα περιεχόμενά του;</string>
     <string name="confirmation_remove_local">Μόνο τοπικά</string>
-    <string name="remove_success_msg">Επιτυχής αφαίρεση</string>
+    <string name="remove_success_msg">Αφαιρέθηκε</string>
     <string name="remove_fail_msg">Αποτυχημένη αφαίρεση</string>
     <string name="rename_dialog_title">Εισάγετε νέο όνομα</string>
-    <string name="rename_local_fail_msg">Το τοπικό αντίγραφο δεν ήταν δυνατόν να μετονομαστεί. Παρακαλούμε επιλέξτε ένα διαφορετικό όνομα.</string>
-    <string name="rename_server_fail_msg">Η μετονομασία δεν μπόρεσε να ολοκληρωθεί</string>
-    <string name="sync_file_fail_msg">Αδυναμία ελέγχου του απομακρυσμένου αρχείου</string>
     <string name="sync_file_nothing_to_do_msg">Τα περιεχόμενα του αρχείου έχουν ήδη συγχρονιστεί</string>
-    <string name="create_dir_fail_msg">Ο φάκελος δεν μπορεί να δημιουργηθεί</string>
+    <string name="create_dir_fail_msg">Αδυναμία δημιουργίας φακέλου</string>
     <string name="filename_forbidden_characters">Απαγορευμένοι χαρακτήρες: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</string>
     <string name="filename_empty">Το όνομα αρχείου δεν μπορεί να είναι κενό</string>
-    <string name="wait_a_moment">Παρακαλούμε περιμένετε</string>
+    <string name="wait_a_moment">Παρακαλούμε περιμένετε...</string>
     <string name="wait_checking_credentials">Γίνεται έλεγχος αποθηκευμένων διαπιστευτηρίων</string>
-    <string name="filedisplay_unexpected_bad_get_content">Μη αναμενόμενο πρόβλημα, παρακαλώ ελέγξτε το αρχείο από διαφορετική εφαρμογή</string>
     <string name="filedisplay_no_file_selected">Δεν επιλέχθηκε αρχείο</string>
     <string name="activity_chooser_title">Αποστολή συνδέσμου σε &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Γίνεται αντιγραφή αρχείου από ιδιωτικό αποθηκευτικό χώρο</string>
     
     <string name="oauth_check_onoff">Σύνδεση με oAuth2</string> 
-    <string name="oauth_login_connection">Γίνεται σύνδεση στο διακομιστή oAuth2...</string>    
-        
     <string name="ssl_validator_header">Η ταυτότητα της σελίδας δεν μπορεί να επληθευτεί</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Το πιστοποιητικό του διακομιστή δεν είναι έμπιστο</string>
     <string name="ssl_validator_reason_cert_expired">- Το πιστοποιητικό του διακομιστή έχει λήξει</string>
     <string name="ssl_validator_reason_cert_not_yet_valid">- Οι έγκυρες ημερομηνίες του πιστοποιητικού του διακομιστή είναι στο μέλλον</string>
     <string name="ssl_validator_reason_hostname_not_verified">- Η URL δεν ταιριάζει με το όνομα του συστήματος στο πιστοποιητικό</string>
     <string name="ssl_validator_question">Θέλετε να θεωρείται έμπιστο το πιστοποιητικό παρ\' όλα αυτά;</string>
-    <string name="ssl_validator_not_saved">Το πιστοποιητικό δεν ήταν δυνατόν να αποθηκευτεί</string>
+    <string name="ssl_validator_not_saved">Αδυναμία αποθήκευσης πιστοποιητικού</string>
     <string name="ssl_validator_btn_details_see">Λεπτομέρειες</string>
     <string name="ssl_validator_btn_details_hide">Απόκρυψη</string>
     <string name="ssl_validator_label_subject">Εκδόθηκε για:</string>
@@ -347,12 +288,11 @@
     <string name="instant_upload_on_charging">Μεταφόρτωση μόνο κατά τη διάρκεια φόρτισης</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="conflict_title">Διένεξη αρχείων</string>
-    <string name="conflict_message">Ποια αρχεία θέλετε να διατηρήσετε; Αν επιλέξετε και τις δύο εκδόσεις, θα προστεθεί ένας αριθμός στο όνομα του τοπικού αρχείου.</string>
     <string name="conflict_keep_both">Διατήρηση και των δύο</string>
     <string name="conflict_use_local_version">τοπική έκδοση</string>
     <string name="conflict_use_server_version">έκδοση διακομιστή</string>
 
-    <string name="preview_sorry">Σας ζητούμε συγγνώμη γι\'αυτό!</string>
+    <string name="preview_sorry">Σας ζητούμε συγγνώμη.</string>
     <string name="preview_image_description">Προεπισκόπηση εικόνας</string>
     <string name="preview_image_error_unknown_format">Αδυναμία προβολής εικόνας</string>
 
@@ -363,7 +303,6 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">Χρήση υποφακέλων</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Αποθήκευση σε υποφακέλους με βάση το χρόνο και μήνα</string>
 
-	<string name="share_link_no_support_share_api">Λυπούμαστε, ο διαμοιρασμός δεν είναι διαθέσιμος στο διακομιστή σας. Παρακαλούμε επικοινωνήστε με τον διαχειριστή.</string>
 	<string name="share_link_file_no_exist">Αδυναμία διαμοιρασμού. Παρακαλούμε ελέγξτε αν υπάρχει ο φάκελος</string>
 	<string name="share_link_file_error">Παρουσιάστηκε σφάλμα κατά την προσπάθεια διαμοιρασμού αυτού του αρχείου ή φακέλου</string>
 	<string name="unshare_link_file_no_exist">Αδυναμία αναίρεσης κοινής χρήσης.  Παρακαλώ ελέγξτε αν το αρχείο υπάρχει</string>
@@ -377,56 +316,39 @@
 
     <string name="copy_link">Αντιγραφή συνδέσμου</string>
     <string name="clipboard_text_copied">Αντιγράφηκε στο πρόχειρο</string>
-    <string name="clipboard_no_text_to_copy">Δεν ελήφθη κείμενο για αντιγραφή στο πρόχειρο</string>
     <string name="clipboard_uxexpected_error">Μη αναμενόμενο σφάλμα κατά την αντιγραφή στο πρόχειρο</string>
     <string name="clipboard_label">Κείμενο που αντιγράφηκε από τον %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Κρίσιμο σφάλμα: αδύνατη η εκτέλεση λειτουργιών</string>
-
-    <string name="network_error_socket_exception">Παρουσιάστηκε σφάλμα κατά τη σύνδεση με το διακομιστή.</string>
-    <string name="network_error_socket_timeout_exception">Παρουσιάστηκε σφάλμα κατά την αναμονή για τον διακομιστή. Η λειτουργία δεν μπορεί να ολοκληρωθεί</string>
-    <string name="network_error_connect_timeout_exception">Παρουσιάστηκε σφάλμα κατά την αναμονή για τον διακομιστή. Η λειτουργία δεν μπορεί να ολοκληρωθεί</string>
-    <string name="network_host_not_available">Η λειτουργία δεν μπορεί να ολοκληρωθεί. Ο διακομιστής δεν είναι διαθέσιμος</string>
-    <string name="forbidden_permissions">Δεν έχετε δικαιώματα %s</string>
     <string name="forbidden_permissions_rename">για να μετονομάσετε αυτό το αρχείο</string>
     <string name="forbidden_permissions_delete">για να διαγράψετε αυτό το αρχείο</string>
     <string name="share_link_forbidden_permissions">για να διαμοιραστείτε αυτό το αρχείο</string>
     <string name="unshare_link_forbidden_permissions">για να αναιρέσετε το διαμοιρασμό αυτού του αρχείου</string>
     <string name="update_link_forbidden_permissions">για να ενημερώσετε αυτό τον διαμοιρασμό</string>
-    <string name="forbidden_permissions_create">για να δημιουργήσετε το αρχείο</string>
-    <string name="uploader_upload_forbidden_permissions">για να μεταφορτώσετε σε αυτό το φάκελο</string>
+    <string name="forbidden_permissions_create">για να δημιουργήσετε αυτό το αρχείο</string>
+    <string name="uploader_upload_forbidden_permissions">για να μεταφορτώσετε αυτό το αρχείο</string>
     <string name="downloader_download_file_not_found">Αυτό το αρχείο δεν είναι πια διαθέσιμο στον διακομιστή</string>
 
     <string name="file_migration_dialog_title">Ενημέρωση διαδρομής αποθηκευτικού χώρου</string>
     <string name="file_migration_finish_button">Ολοκλήρωση</string>
-    <string name="file_migration_preparing">Προετοιμασία για μεταφορά&#8230;</string>
     <string name="file_migration_checking_destination">Γίνεται έλεγχος προορισμού&#8230;</string>
-    <string name="file_migration_saving_accounts_configuration">Γίνεται αποθήκευση ρυθμίσεων λογαριασμών&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Αναμονή για τους μη ολοκληρωμένους συγχρονισμούς&#8230;</string>
     <string name="file_migration_migrating">Γίνεται μετακίνηση δεδομένων&#8230;</string>
     <string name="file_migration_updating_index">Γίνεται ενημέρωση ευρετηρίου&#8230;</string>
     <string name="file_migration_cleaning">Γίνεται εκκαθάριση&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">Γίνεται επαναφορά ρυθμίσεων λογαριασμών&#8230;</string>
     <string name="file_migration_ok_finished">Ολοκληρώθηκε</string>
     <string name="file_migration_failed_not_enough_space">ΣΦΑΛΜΑ: Ανεπαρκής αποθηκευτικός χώρος</string>
     <string name="file_migration_failed_not_writable">ΣΦΑΛΜΑ: Το αρχείο δεν είναι εγγράψιμο</string>
     <string name="file_migration_failed_not_readable">ΣΦΑΛΜΑ: Το αρχείο δεν είναι αναγνώσιμο</string>
     <string name="file_migration_failed_dir_already_exists">ΣΦΑΛΜΑ: Υπάρχει ήδη ο κατάλογος Nextcloud</string>
-    <string name="file_migration_failed_while_coping">ΣΦΑΛΜΑ: Κατά την μεταφορά</string>
     <string name="file_migration_failed_while_updating_index">ΣΦΑΛΜΑ: Κατά την ενημέρωση ευρετηρίου</string>
 
-    <string name="file_migration_directory_already_exists">Ο φάκελος των δεδομένων υπάρχει ήδη, τι να κάνω;</string>
     <string name="file_migration_override_data_folder">Αντικατάσταση</string>
-    <string name="file_migration_use_data_folder">Χρήση υπάρχοντος</string>
+    <string name="file_migration_use_data_folder">Χρήση</string>
 
     <string name="prefs_category_accounts">Λογαριασμοί</string>
     <string name="prefs_add_account">Προσθήκη λογαριασμού</string>
     <string name="drawer_manage_accounts">Διαχείριση λογαριασμών</string>
-    <string name="auth_redirect_non_secure_connection_title">Η ασφαλής σύνδεση ανακατευθύνεται μέσω μιας μη ασφαλούς διαδρομής.</string>
-
-	<string name="actionbar_logger">Αρχεία καταγραφών</string>
+    <string name="actionbar_logger">Αρχεία καταγραφών</string>
 	<string name="log_send_history_button">Αποστολή ιστορικού</string>
-	<string name="log_send_no_mail_app">Δεν εντοπίστηκε εφαρμογή αποστολής ιστορικού συστήματος. Παρακαλούμε εγκαταστήστε μια εφαρμογή ηλεκτρονικού ταχυδρομείου.</string>
 	<string name="log_send_mail_subject">%1$s ιστορικό της εφαρμογής Android</string>
 	<string name="log_progress_dialog_text">Φόρτωση δεδομένων &#8230;</string>
 
@@ -434,27 +356,20 @@
 	<string name="saml_authentication_wrong_pass">Εσφαλμένο συνθηματικό</string>
 	<string name="actionbar_move">Μετακίνηση</string>
     <string name="actionbar_copy">Αντιγραφή</string>
-	<string name="file_list_empty_moving">Δεν υπάρχει τίποτα εδώ. Μπορείτε να προσθέσετε ένα φάκελο!</string>
 	<string name="folder_picker_choose_button_text">Επιλέξτε</string>
 
-    <string name="move_file_not_found">Αδύνατη η μετακίνηση. Παρακαλώ ελέγξτε αν το αρχείο υπάρχει</string>
-    <string name="move_file_invalid_into_descendent">Δεν είναι δυνατό να μετακινηθεί ο φάκελος σε έναν απογονικό</string>
-    <string name="move_file_invalid_overwrite">Το αρχείο υπάρχει ήδη στο φάκελο προορισμού</string>
     <string name="move_file_error">Παρουσιάστηκε σφάλμα κατά την προσπάθεια μετακίνησης αυτού του αρχείου ή φακέλου</string>
     <string name="forbidden_permissions_move">για μετακίνηση αυτού του αρχείου</string>
 
 
     <string name="copy_file_not_found">Αδυναμία αντιγραφής. Παρακαλούμε ελέγξτε αν το αρχείο υπάρχει</string>
-    <string name="copy_file_invalid_into_descendent">Δεν είναι δυνατό να αντιγραφεί ο φάκελος σε απογονικό</string>
-    <string name="copy_file_invalid_overwrite">Το αρχείο υπάρχει ήδη στο φάκελο προορισμού</string>
     <string name="copy_file_error">Παρουσιάστηκε σφάλμα κατά την προσπάθεια αντιγραφής αυτού του αρχείου ή φακέλου</string>
     <string name="forbidden_permissions_copy">για αντιγραφή αυτού του αρχείου</string>
 
     <string name="prefs_category_instant_uploading">Άμεσες μεταφορτώσεις</string>
     <string name="prefs_category_details">Λεπτομέρειες</string>
 
-	<string name="prefs_instant_video_upload_path_title">Φάκελος άμεσης μεταφόρτωσης βίντεο</string>
-    <string name="sync_folder_failed_content">Ο συγχρονισμός του φακέλου %1$s δεν μπόρεσε να ολοκληρωθεί</string>
+	<string name="sync_folder_failed_content">Ο συγχρονισμός του φακέλου %1$s δεν μπόρεσε να ολοκληρωθεί</string>
 
 	<string name="shared_subject_header">διαμοιρασμένα</string>
 	<string name="with_you_subject_header">με εσάς</string>
@@ -495,7 +410,7 @@
     <string name="share_add_user_or_group">Προσθήκη χρήστη ή ομάδας</string>
     <string name="share_via_link_section_title">Διαμοιρασμός συνδέσμου</string>
     <string name="share_via_link_expiration_date_label">Ορισμός ημερομηνίας λήξης</string>
-    <string name="share_via_link_password_label">Προστασία συνθηματικού</string>
+    <string name="share_via_link_password_label">Προστασία με συνθηματικό</string>
     <string name="share_via_link_password_title">Ασφαλίστηκε</string>
     <string name="share_via_link_edit_permission_label">Επιτρέπεται η επεξεργασία</string>
     <string name="share_via_link_hide_file_listing_permission_label">Απόκρυψη λίστας αρχείου</string>
@@ -511,7 +426,6 @@
     <string name="share_email_clarification">%1$s (ηλ. ταχυδρομείο)</string>
     <string name="share_known_remote_clarification">%1$s ( στο %2$s )</string>
 
-    <string name="share_sharee_unavailable">Δεν επιτρέπεται ο διαμοιρασμός μεταξύ χρηστών μέσω πελατών, σε αυτή την έκδοση διακομιστή. \nΕπικοινωνήστε με το διαχειριστή</string>
     <string name="share_privilege_can_share">δυνατότητα διαμοιρασμού</string>
     <string name="share_privilege_can_edit">δυνατότητα επεξεργασίας</string>
     <string name="share_privilege_can_edit_create">δημιουργία</string>
@@ -520,50 +434,34 @@
     <string name="edit_share_unshare">Διακοπή διαμοιρασμού</string>
     <string name="edit_share_done">ολοκληρώθηκε</string>
 
-    <string name="action_retry_uploads">Αποτυχία επανάληψης</string>
     <string name="action_clear_failed_uploads">Αποτυχία εκκαθάρισης</string>
-    <string name="action_clear_successful_uploads">Επιτυχία εκκαθάρισης</string>
-    <string name="action_clear_finished_uploads">Ολοκλήρωση εκκαθάρισης όλων</string>
-
     <string name="action_switch_grid_view">Προβολή πλέγματος</string>
     <string name="action_switch_list_view">Προβολή λίστας</string>
 
     <string name="manage_space_title">Διαχείριση χώρου</string>
-    <string name="manage_space_description">Τα πιστοποιητικά ρυθμίσεων, βάσης δεδομένων και διακομιστή από τα δεδομένα %1$s\'s θα διαγραφούν μόνιμα.\n\nΤα ληφθέντα αρχεία θα παραμείνουν ανέπαφα.\n\nΑυτή η διαδικασία ενδεχομένως να διαρκέσει αρκετά.</string>
     <string name="manage_space_clear_data">Εκκαθάριση δεδομένων</string>
     <string name="manage_space_error">Μερικά αρχεία δεν μπορούν να διαγραφούν.</string>
 
-    <string name="permission_storage_access">Επιπλέον διακαιώματα απαιτούνται για μεταφόρτωση &amp; λήψη αρχείων.</string>
-    <string name="local_file_not_found_toast">Το αρχείο δεν βρέθηκε στο τοπικό σύστημα αρχείων</string>
     <string name="confirmation_remove_files_alert">Θέλετε να αφαιρέσετε τα επιλεγμένα αντικείμενα;</string>
     <string name="confirmation_remove_folders_alert">Θέλετε να αφαιρέσετε τα επιλεγμένα αντικείμενα με τα περιεχόμενά τους;</string>
-    <string name="uploads_view_upload_status_waiting_for_charging">Αναμονή για φόρτιση συσκευής</string>
     <string name="actionbar_search">Αναζήτηση</string>
     <string name="files_drop_not_supported">Αυτό είναι χαρακτηριστικό του Nextcloud, παρακαλούμε ενημερώστε.</string>
     <string name="learn_more">Μάθετε περισσότερα</string>
     <string name="drawer_folder_sync">Αυτόματη μεταφόρτωση</string>
     <string name="drawer_participate">Συμμετοχή</string>
-    <string name="participate_testing_headline">Βοηθήστε μας στις δοκιμές</string>
-    <string name="participate_testing_bug_text">Βρήκατε σφάλμα; Κάτι σας φαίνεται παράξενο;</string>
     <string name="participate_testing_report_text">Αναφέρετε σφάλμα στο Github</string>
-    <string name="participate_testing_version_text">Σας ενδιαφέρει να μας βοηθήσετε να δοκιμάσουμε την επόμενη έκδοση;</string>
     <string name="participate_beta_headline">Δοκιμή της εκδοσης προς ανάπτυξη</string>
-    <string name="participate_beta_text">Αυτή περιέχει όλες τις επερχόμενες λειτουργίες και δαθέτει ότι τελευταίο έχει ενσωματωθεί. Σφάλματα/λάθη μπορεί να προκύψουν. Σας παρακαλούμε να μας τα αναφέρετε.</string>
     <string name="participate_release_candidate_headline">Release candidate</string>
-    <string name="participate_release_candidate_text">Η υποψήφια κυκλοφορία (RC) είναι ένα στιγμιότυπο της επερχόμενης έκδοσης και αναμένεται να είναι σταθερή. Η δοκιμή της μεμονωμένης εγκατάστασής σας θα βοηθήσει στην εξασφάλιση αυτού. Εγγραφείτε για δοκιμές στο Play store ή χειροκίνητα αναζητείστε στο τμήμα \"εκδόσεις\" στο F-Droid.</string>
     <string name="participate_contribute_headline">Ενεργή συνεισφορά</string>
     <string name="participate_contribute_irc_text">Συμμετέχετε στη συνομιλία στο IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">Βοηθήστε χρήστες στο &lt;a href=\"%1$s\">forum&lt;/a></string>
     <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Μεταφράστε&lt;/a> την εφαρμογή</string>
-    <string name="participate_contribute_github_text">Συνεισφέρετε ως προγραμματιστής, για περισσότερες λεπτομέρειες δείτε &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a></string>
     <string name="move_to">Μετακίνηση σε&#8230;</string>
     <string name="copy_to">Αντιγραφή σε&#8230;</string>
     <string name="choose_remote_folder">Επιλογή φακέλου&#8230;</string>
     <string name="folder_sync_loading_folders">Φόρτωση φακέλων&#8230;</string>
     <string name="folder_sync_no_results">Δεν βρέθηκαν φάκελοι πολυμέσων.</string>
-    <string name="folder_sync_preferences">Προτιμήσεις αυτόματης μεταφόρτωσης</string>
     <string name="folder_sync_settings">Ρυθμίσεις</string>
-    <string name="folder_sync_new_info">Η άμεση μεταφόρτωση έχει ανανεωθεί τελείως. Παρακαλούμε δείτε το κυρίως μενού και ρυθμίστε ξανά την αυτόματη μεταφόρτωση. Σας ζητούμε συγγνώμη για την ενόχληση\n\nΑπολαύστε τις νέες και εκτεταμένες δυνατότητες της αυτόματης μεταφόρτωσης!</string>
     <string name="folder_sync_preferences_folder_path">Για %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d επιλέχθηκε</item>
@@ -577,7 +475,6 @@
     <string name="notifications_no_results_headline">Καμία ειδοποίηση</string>
     <string name="notifications_no_results_message">Παρακαλούμε ελέγξτε ξανά αργότερα. </string>
 
-    <string name="upload_file_dialog_title">Εισαγωγή ονόματος και τύπου αρχείου μεταφόρτωσης</string>
     <string name="upload_file_dialog_filename">Όνομα αρχείου</string>
     <string name="upload_file_dialog_filetype">Τύπος αρχείου</string>
     <string name="upload_file_dialog_filetype_snippet_text">Απόσπασμα αρχείου κειμένου(.txt)</string>
@@ -593,8 +490,6 @@
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Μια ασφαλής τοποθεσία για όλα σας τα δεδομένα</string>
-    <string name="welcome_feature_1_text">Πρόσβαση, διαμοιρασμός &amp; προστασία των αρχείων σας στο σπίτι και στην εταιρία σας</string>
-
     <string name="welcome_feature_2_title">Πολλαπλός λογαριασμός</string>
     <string name="welcome_feature_2_text">Σύνδεση με όλα τα clouds σας</string>
 
@@ -608,7 +503,7 @@
 
     <!-- User information -->
     <string name="user_info_full_name">Πλήρες όνομα</string>
-    <string name="user_info_email">Ηλεκτρονικό ταχυδρομείο</string>
+    <string name="user_info_email">E-mail</string>
     <string name="user_info_phone">Αριθμός τηλεφώνου</string>
     <string name="user_info_address">Διεύθυνση</string>
     <string name="user_info_website">Ιστοσελίδα</string>
@@ -618,22 +513,19 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Καμία δραστηριότητα ακόμα</string>
-    <string name="activities_no_results_message">Σε αυτήν τη ροή θα εμφανιστούν γενονότα όπως\nπροσθήκες, αλλαγές &amp; κοινόχρηστα</string>
     <string name="webview_error">Παρουσιάστηκε σφάλμα</string>
     <string name="prefs_category_about">Περί</string>
 
     <string name="actionbar_contacts">Αντίγραφο ασφαλείας επαφών</string>
-    <string name="contacts_backup_button">Δημιουργία αντιγράφου ασφαλείας τώρα</string>
+    <string name="actionbar_contacts_restore">Ανάκτηση επαφών</string>
+    <string name="contacts_backup_button">Αντίγραφο ασφαλείας τώρα</string>
     <string name="contacts_restore_button">Επαναφορά τελευταίου αντιγράφου ασφαλείας</string>
     <string name="contacts_header_restore">Επαναφορά</string>
     <string name="contacts_header_backup">Αντίγραφο ασφαλείας</string>
     <string name="contacts_automatic_backup">Αντίγραφο ασφαλείας επαφών</string>
     <string name="contacts_last_backup">Τελευταίο αντίγραφο ασφαλείας</string>
-    <string name="contacts_read_permission">Απαιτείτούνται δικαιώματα ανάγνωσης για τις επαφές</string>
-    <string name="contacts_write_permission">Απαιτείτούνται δικαιώματα εγγραφής για τις επαφές</string>
     <string name="contactlist_title">Επαναφορά επαφών</string>
     <string name="contaclist_restore_selected">Επαναφορά επιλεγμένων επαφών</string>
-    <string name="contactlist_account_chooser_title">Επιλογή λογαριασμού για εισαγωγή</string>
     <string name="contacts_preference_choose_date">Επιλογή ημερομηνίας</string>
     <string name="contacts_preference_backup_never">ποτέ</string>
     <string name="contacts_preferences_no_file_found">Δεν βρέθηκε αρχείο</string>
@@ -642,6 +534,7 @@
 
     <!-- Notifications -->
     <string name="new_notification_received">Νέα ενημέρωση ελήφθη </string>
+    <string name="drawer_logout">Έξοδος</string>
 
 
 </resources>

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

@@ -47,7 +47,7 @@
     <string name="prefs_fingerprint_notsetup">No se ha establecido ninguna huella digital. </string>
     <string name="prefs_show_hidden_files">Mostrar archivos escondidos</string>
     <string name="prefs_instant_upload">Carga instantánea de imágenes</string>
-    <string name="prefs_instant_upload_summary">Cargar instantáneamente las fotografías tomadas por la cámara</string>
+    <string name="prefs_instant_upload_summary">Cargar instantaneamente las fotografías tomadas por la cámara</string>
     <string name="prefs_instant_video_upload">Carga instantánea de video</string>
     <string name="prefs_instant_video_upload_summary">Cargar instantáneamente los videos grabados por la cámara</string>
     <string name="prefs_log_title">Habilitar registro</string>
@@ -58,23 +58,23 @@
     <string name="prefs_calendar_contacts">Sincronizar calendario  &amp; contactos</string>
     <string name="prefs_calendar_contacts_summary">Configurar DAVdroid (v1.3.0+) para la cuenta actual</string>
     <string name="prefs_calendar_contacts_address_resolve_error">La dirección del servidor para la cuenta no se pudo resolver para DAVdroid</string>
-    <string name="prefs_calendar_contacts_no_store_error">No han instalado las aplicaciones Google Play store o F-Droid</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">El calendario &amp; contactos se configuraron exitosamente</string>
+    <string name="prefs_calendar_contacts_no_store_error">No ha sido instalado F-Droid o Google Play </string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Configuración de la sincronizacion del calendario &amp; contactos </string>
     <string name="prefs_help">Ayuda</string>
     <string name="prefs_recommend">Recomendar a un amigo</string>
     <string name="prefs_feedback">Retroalimentación</string>
     <string name="prefs_imprint">Exención de responsabilidad </string>
     <string name="prefs_remember_last_share_location">Recordar la ubicación del elemento compartido</string>
-    <string name="prefs_remember_last_upload_location_summary">Recordar la última ubicación del elemento compartido cargado.</string>
+    <string name="prefs_remember_last_upload_location_summary">Recordar la ubicación del elemento compartido más recientemente usado</string>
 
 	<string name="recommend_subject">Prueba  %1$s en tu teléfono inteligente!</string>
-	<string name="recommend_text">¡Quisiera invitarlo a usar %1$s en su teléfono inteligente!\\nDescargue aquí: %2$s</string>
+	<string name="recommend_text">Quisiera invitarlo a usar %1$s en su teléfono inteligente\nDescargue aquí: %2$s</string>
 
     <string name="auth_check_server">Verficar el servidor</string>
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Nombre de usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">Aún no tiene un servidor? \nDa click aquí para obtener uno de un proveedor</string>
+    <string name="auth_register">Aún no tiene un servidor? \nHaga click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
@@ -86,43 +86,43 @@
     <string name="uploader_error_title_no_file_to_upload">No hay un archivo para cargar</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s no puede cargar una fragmento de texto como un archivo.</string>
     <string name="uploader_error_message_no_file_to_upload">La información recibida no contiene un archivo válido.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">El archivo no se puede cargar</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Este archivo no puede ser cargado</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s no tiene permitido leer un archivo recibido</string>
-    <string name="uploader_error_message_source_file_not_found">El archivo a cargar no ha sido encontrado en su ubicación. Favor de verificar si el archivo existe. </string>
-    <string name="uploader_error_message_source_file_not_copied">Se presentó un error al copiar el archivo a una carpeta temporal. Favor de intentar enviarlo de nuevo.</string>
+    <string name="uploader_error_message_source_file_not_found">El archivo seleccionado para cargar no fue encontrado. Favor de verificar si el archivo existe.</string>
+    <string name="uploader_error_message_source_file_not_copied">No fue posible copiar el archivo a una carpeta temporal. Favor de intentar enviarlo de nuevo.</string>
     <string name="uploader_upload_files_behaviour">Opción de carga:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Mover el archivo a la carpeta de Nextcloud</string>
     <string name="uploader_upload_files_behaviour_only_upload">Mantener el archivo en la carpeta de origen</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Borrar el archivo de la carpeta de origen</string>
     <string name="file_list_seconds_ago">hace algunos segundos</string>
     <string name="file_list_empty_headline">No hay archivos aquí</string>
-    <string name="file_list_empty">¡Cargue algún contenido o sincronice con sus dispositivos!</string>
-    <string name="file_list_empty_favorites">¡Marque algunos archivos como favoritos o sincronice con sus dispositivos!</string>
+    <string name="file_list_empty">Cargue algún contenido o sincronice con sus dispositivos.</string>
+    <string name="file_list_empty_favorites">Marque algunos archivos como favoritos o sincronice con sus dispositivos.</string>
     <string name="file_list_empty_favorites_filter_list">Los archivos y carpetas que marque como favoritos se mostrarán aquí</string>
-    <string name="file_list_empty_favorites_filter">¡No se encontraron archivos marcados como favoritos en su consulta!</string>
+    <string name="file_list_empty_favorites_filter">Su búsqueda no regresó archivos marcados como favoritos. </string>
     <string name="file_list_loading">Cargando&#8230;</string>
-    <string name="file_list_no_app_for_file_type">¡No se encontró una aplicación para este tipo de archivo!</string>
+    <string name="file_list_no_app_for_file_type">No se cuenta con una aplicación que maneje este tipo de achivo. </string>
     <string name="local_file_list_empty">No hay archivos en esta carpeta</string>
     <string name="file_list_empty_headline_search">No hay resultados en esta carpeta</string>
     <string name="file_list_empty_headline_server_search">No hay resultados</string>
-    <string name="file_list_empty_favorite_headline">Aún no hay favoritos</string>
+    <string name="file_list_empty_favorite_headline">Aún no hay nada marcado como favorito</string>
     <string name="file_list_empty_shared_headline">Aún no hay nada compartido</string>
     <string name="file_list_empty_shared">Los archivos y carpetas que comparta se mostrarán aquí. </string>
     <string name="file_list_empty_headline_server_search_videos">No hay videos</string>
     <string name="file_list_empty_headline_server_search_photos">No hay fotos</string>
-    <string name="file_list_empty_search">¿Intentó buscar en otra carpeta?</string>
+    <string name="file_list_empty_search">¿Tal vez está dentro de una carpeta diferente?</string>
     <string name="file_list_empty_recently_modified">No se encontraron archivos que hayan sido modificado en los últimos 7 días</string>
-    <string name="file_list_empty_recently_modified_filter">¡No se encontraron archivos para su búsqueda que hayan sido modificados 
-en los últimos 7 días!</string>
+    <string name="file_list_empty_recently_modified_filter">Su búsqueda no encontró archivos que hayan sido modificados 
+en los últimos 7 días. </string>
     <string name="file_list_empty_recently_added">No se encontraron archivos agregados recientemente</string>
-    <string name="file_list_empty_recently_added_filter">¡No se encontraron archivos agregados recientemente para su consulta!</string>
-    <string name="file_list_empty_text_photos">¡Cargue algunas fotos o active la carga automática!</string>
-    <string name="file_list_empty_text_photos_filter">¡Ninguna foto fue encontrada para su búsqueda!</string>
-    <string name="file_list_empty_text_videos">¡Cargue algunos videos o active la carga automática!</string>
-    <string name="file_list_empty_text_videos_filter">¡No se encontraron videos para su búsqueda!</string>
+    <string name="file_list_empty_recently_added_filter">Su búsqueda no encontró archivos recientemente agregados. </string>
+    <string name="file_list_empty_text_photos">Cargue algunas fotos o active la carga automática.</string>
+    <string name="file_list_empty_text_photos_filter">Su búsqueda no encontró fotografías. </string>
+    <string name="file_list_empty_text_videos">Cargue algunos videos o active la carga automática.</string>
+    <string name="file_list_empty_text_videos_filter">Su búsqueda no encontró videos. </string>
     <string name="upload_list_empty_headline">No hay cargas disponibles</string>
-    <string name="upload_list_empty_text">¡Cargue nuevo contenido o active la carga instantánea!</string>
-    <string name="upload_list_empty_text_auto_upload">¡Cargue algún contenido o active la carga automática!</string>
+    <string name="upload_list_empty_text">Cargue algún contenido o active la carga instantánea</string>
+    <string name="upload_list_empty_text_auto_upload">Cargue algún contenido o active la carga automática</string>
     <string name="file_list_folder">carpeta</string>
     <string name="file_list_folders">carpetas</string>
     <string name="file_list_file">archivo</string>
@@ -135,7 +135,7 @@ en los últimos 7 días!</string>
     <string name="filedetails_download">Descargar</string>
     <string name="filedetails_sync_file">Sincronizar</string>
     <string name="filedetails_renamed_in_upload_msg">El archivo se renombró como %1$s durante la carga</string>
-    <string name="list_layout">Vista de lista</string>
+    <string name="list_layout">Vista enlistada</string>
     <string name="action_share">Compartir</string>
     <string name="common_yes">Sí</string>
     <string name="common_no">No</string>
@@ -161,10 +161,10 @@ en los últimos 7 días!</string>
     <string name="uploader_info_dirname">Nombre de la carpeta</string>
     <string name="uploader_upload_in_progress_ticker">Cargando &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Cargando %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Carga exitosa</string>
+    <string name="uploader_upload_succeeded_ticker">Cargado</string>
     <string name="uploader_upload_succeeded_content_single">%1$s cargado</string>
     <string name="uploader_upload_failed_ticker">Falla en la carga</string>
-    <string name="uploader_upload_failed_content_single">La carga de %1$s no pudo ser completada</string>
+    <string name="uploader_upload_failed_content_single">No fue posible cargar %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Falla en la carga, necesita autenticarse de nuevo</string>
     <string name="uploads_view_title">Cargas</string>
     <string name="uploads_view_group_current_uploads">Actual</string>
@@ -181,22 +181,22 @@ en los últimos 7 días!</string>
     <string name="uploads_view_upload_status_failed_localfile_error">No se encontró el archivo local</string>
     <string name="uploads_view_upload_status_failed_permission_error">Error de permisos</string>
     <string name="uploads_view_upload_status_conflict">Conflicto</string>
-    <string name="uploads_view_upload_status_service_interrupted">La aplicación ha cerrado inesperadamente</string>
+    <string name="uploads_view_upload_status_service_interrupted">La aplicación ha sido terminada</string>
     <string name="uploads_view_upload_status_unknown_fail">Error desconocido</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Esperando conexión Wi-Fi</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Aguardando conectividad Wi-Fi</string>
     <string name="uploads_view_later_waiting_to_upload">Esperando para cargar</string>
     <string name="downloader_download_in_progress_ticker">Descargando &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Descargando %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Descarga exitosa</string>
+    <string name="downloader_download_succeeded_ticker">Descargado</string>
     <string name="downloader_download_succeeded_content">%1$s descargado</string>
     <string name="downloader_download_failed_ticker">Falla en la descarga</string>
-    <string name="downloader_download_failed_content">La descarga de %1$s no pudo ser completada</string>
+    <string name="downloader_download_failed_content">No fue posible descargar %1$s</string>
     <string name="downloader_not_downloaded_yet">Aún no ha descargado</string>
     <string name="downloader_download_failed_credentials_error">Falla en la descarga, necesita ingresar a su cuenta de nuevo</string>
     <string name="common_choose_account">Elija una cuenta</string>
     <string name="sync_fail_ticker">Falla en la sincronización</string>
-    <string name="sync_fail_ticker_unauthorized">Falla en la sincronización; necesita ingresal a su cuenta de nuevo</string>
-    <string name="sync_fail_content">La sincronización de %1$s no pudo ser completada</string>
+    <string name="sync_fail_ticker_unauthorized">Falla en la sincronización, necesita volver a inicar sesión</string>
+    <string name="sync_fail_content">No fue posible completar la sincronización de %1$s</string>
     <string name="sync_fail_content_unauthorized">Contraseña inválida para %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
     <string name="sync_conflicts_in_favourites_content">%1$d archivos mantenidos-en-sincronización no pudieron ser sinconizados</string>
@@ -204,14 +204,14 @@ en los últimos 7 días!</string>
     <string name="sync_fail_in_favourites_content">El contenido de%1$d archivos no pudo ser sincronizado (%2$d conflictos)</string>
     <string name="sync_foreign_files_forgotten_ticker">Algunos archivos locales se han perdido</string>
     <string name="sync_foreign_files_forgotten_content">%1$d archivos de la carpeta %2$s no pudieron ser copiadas</string>
-    <string name="sync_foreign_files_forgotten_explanation">A partir de la versión 1.3.16, los archivos cargados desde este dispositivo son copiados a la carpeta local %1$s para prevenir pérdidas de datos cuando un archivo es sincronizado entre cuentas múltiples.\n\nDebido a este cambio, todos los archivos subidos en versiones anteriores de esta aplicación fueron copiadas a la carpeta %2$s. Sin embargo, un error evitó completar esta operación durante la sincronización de la cuenta. Usted puede dejar el(los) archivo(s) como están y eliminar la liga a %3$s, o bien mover el(los) archivo(s) a la carpeta %1$s y mantener la liga a %4$s.\n\nSe enlistan a continuación los archivos locales y remotos en %5$s a donde estaban ligados.</string>
-    <string name="sync_current_folder_was_removed">La carpeta %1$s ya no existe.</string>
+    <string name="sync_foreign_files_forgotten_explanation">A partir de la versión 1.3.16, los archivos cargados desde este dispositivo son copiados a la carpeta local %1$s para prevenir perdidas de datos cuando un archivo se sincroniza entre múltiples cuentas. \n\nDervado de este cambio, todos los archivos cargados con versiones anteriores de la aplicación fueron copiados a la carpeta %2$s. Sin embargo, un error evitó que se completara esta operación durante la sincronizacion de la cuenta. Usted puede dejar el(los) archivo(s) como está(n) y eliminar la liga a %3$s, o bine, mover el(los) archivo(s) a la carpeta %1$s y mantener la liga a%4$s.\n\nSe enlistan a continuación los archivos locales asi como los archivos remotos en %5$s a donde estaban ligados.</string>
+    <string name="sync_current_folder_was_removed">La carpeta %1$s ya no existe</string>
     <string name="foreign_files_move">Mover todo</string>
     <string name="foreign_files_success">Todos los archivos fueron movidos</string>
     <string name="foreign_files_fail">Algunos archivos no puderon ser movidos</string>
     <string name="foreign_files_local_text">Local: %1$s</string>
     <string name="foreign_files_remote_text">Remoto: %1$s</string>
-    <string name="upload_query_move_foreign_files">No hay suficiente espacio para copair los archivos seleccionados a la carpeta %1$s. Le gustaría moverlos?</string>
+    <string name="upload_query_move_foreign_files">El espacio insuficiente evita que se copien los archivos seleccionados dentro de la carpeta %1$s. ¿Le gustaría moverlos ahí en su lugar?</string>
     <string name="pass_code_enter_pass_code">Favor de ingresar su código de seguridad</string>
     
     <string name="pass_code_configure_your_pass_code">Ingrese su código de seguridad</string>
@@ -229,15 +229,15 @@ en los últimos 7 días!</string>
     <string name="media_event_done">%1$s reproducción finalizada</string>
     <string name="media_err_nothing_to_play">No se encontró el archivo</string>
     <string name="media_err_no_account">No se ha proporcionado una cuenta</string>
-    <string name="media_err_not_in_owncloud">No se ha encontrado el archivo en una cuenta válida</string>
+    <string name="media_err_not_in_owncloud">El archivo no está en una cuenta válida</string>
     <string name="media_err_unsupported">Codec no soportado</string>
-    <string name="media_err_io">El archivo no ha podido ser leído</string>
-    <string name="media_err_malformed">El archivo no ha sido codificado correctamente</string>
-    <string name="media_err_timeout">Tiempo de espera expirado al intentar reproducir</string>
-    <string name="media_err_invalid_progressive_playback">Archivo de medio no puede ser transmitido como flujo</string>
-    <string name="media_err_unknown">El archivo de medios no se puede reproducir con el reproductor predeterminado</string>
+    <string name="media_err_io">No fue posible leer el archivo de medios</string>
+    <string name="media_err_malformed">El archivo de medios tiene una codificacion incorrecta</string>
+    <string name="media_err_timeout">El intento de reproducir el archivo agotó el tiempo de espera.</string>
+    <string name="media_err_invalid_progressive_playback">Archivo de medio no puede ser transformado a un flujo</string>
+    <string name="media_err_unknown">El reproductor predeterminado no puede reproducir el archivo de medios</string>
     <string name="media_err_security_ex">Se presentó un error de seguridad al intentar reproducir %1$s</string>
-    <string name="media_err_io_ex">Se presentó un error en la entrada de datos al intentar reproducir %1$s</string>
+    <string name="media_err_io_ex">Se presentó un error de entrada al intentar reproducir %1$s </string>
     <string name="media_err_unexpected">Se presentó un error inesperado al intentar reproducir %1$s</string>
     <string name="media_rewind_description">Botón de rebobinar</string>
     <string name="media_play_pause_description">Botón de reproducir o pausar</string>
@@ -250,13 +250,13 @@ en los últimos 7 días!</string>
 	<string name="auth_connection_established">Conexión establecida</string>
 	<string name="auth_testing_connection">Probando conexión</string>
 	<string name="auth_not_configured_title">La configuración del servidor está mal formada. </string>
-	<string name="auth_account_not_new">Una cuenta para el mismo usuario y servidor ya existe en el dispositivo</string>
+	<string name="auth_account_not_new">Ya existe una cuenta en el dispositivo para el mismo usuario y servidor </string>
 	<string name="auth_account_not_the_same">El usuario ingresado no corresponde con el usuario de esta cuenta</string>
 	<string name="auth_unknown_error_title">¡Se presentó un error desconocido!</string>
 	<string name="auth_unknown_host_title">No fue posible encontrar el servidor</string>
-	<string name="auth_incorrect_path_title">No se encontró la instancia del servidor</string>
+	<string name="auth_incorrect_path_title">El servidor no se encontró </string>
 	<string name="auth_timeout_title">El servidor tardó demasiado en responder</string>
-	<string name="auth_incorrect_address_title">Formato de dirección del servidor erróneo</string>
+	<string name="auth_incorrect_address_title">El formato de dirección para el servidor es erróneo</string>
 	<string name="auth_ssl_general_error_title">Falla en la inicialización de SSL</string>
 	<string name="auth_ssl_unverified_server_title">No fue posible verificar la identidad del servidor SSL</string>
 	<string name="auth_bad_oc_version_title">Versión del servidor no reconocida</string>
@@ -265,14 +265,14 @@ en los últimos 7 días!</string>
 	<string name="auth_unauthorized">Nombre de usuario o contraseña incorrecto</string>
 	<string name="auth_oauth_error">Autorización no exitosa</string>
 	<string name="auth_oauth_error_access_denied">Acceso denegado por el servidor de autorización</string>
-	<string name="auth_wtf_reenter_URL">Estado inesperado; Favor de reingresar la dirección del servidor</string>
+	<string name="auth_wtf_reenter_URL">Estado inesperado, favor de reingresar la dirección del servidor</string>
 	<string name="auth_expired_oauth_token_toast">Su autorización ha expirado. Favor de volver a autorizar</string>
 	<string name="auth_expired_basic_auth_toast">Por favor ingrese su contraseña actual</string>
 	<string name="auth_expired_saml_sso_token_toast">Su sesión ha expirado. Favor de conectarse de nuevo</string>
-	<string name="auth_connecting_auth_server">Conectando al servidor de autenticación ...</string>
+	<string name="auth_connecting_auth_server">Conectando al servidor de autenticación...</string>
 	<string name="auth_unsupported_auth_method">El servidor no soporta este método de autenticación</string>
 	<string name="auth_unsupported_multiaccount">%1$s no soporta cuentas múltiples</string>
-	<string name="auth_fail_get_user_name">El servidor no está regresando un Id de usuario correcto, favor de contactar al adminitrador</string>
+	<string name="auth_fail_get_user_name">Su servidor no está regresando un ID de usuario correcto, favor de contactar al adminitrador</string>
 	<string name="auth_can_not_auth_against_server">No es posible autenticarse en este servidor</string>
     <string name="auth_account_does_not_exist">La cuenta aún no existe en el dispositivo</string>
     
@@ -283,28 +283,28 @@ en los últimos 7 días!</string>
     <string name="common_rename">Renombrar</string>
     <string name="common_remove">Eliminar</string>
     <string name="confirmation_remove_file_alert">¿Realmente desea eliminar %1$s?</string>
-    <string name="confirmation_remove_folder_alert">¿Desea realmente eliminar %1$s y sus contenidos?</string>
+    <string name="confirmation_remove_folder_alert">¿Realmente quiere eliminar %1$s y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="remove_success_msg">Eliminado exitosamente</string>
+    <string name="remove_success_msg">Eliminado</string>
     <string name="remove_fail_msg">Falla al eliminar</string>
     <string name="rename_dialog_title">Ingrese un nombre nuevo</string>
-    <string name="rename_local_fail_msg">No ha sido posible cambiar el nombre de la copia local, intente ingresar un nombre differente</string>
-    <string name="rename_server_fail_msg">No se pudo completar el renombrado</string>
-    <string name="sync_file_fail_msg">El archivo remoto no pudo ser verificado</string>
+    <string name="rename_local_fail_msg">No fue posible renombar la copia local, intente con un nombre diferente</string>
+    <string name="rename_server_fail_msg">No fue posible renombrar el servidor</string>
+    <string name="sync_file_fail_msg">No fue posible verificar el archivo remoto</string>
     <string name="sync_file_nothing_to_do_msg">Los contenidos del archivo ya han sido sincronizados</string>
-    <string name="create_dir_fail_msg">La carpeta no pudo ser creada</string>
+    <string name="create_dir_fail_msg">No fue posible crear la carpeta</string>
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un caracter inválido.</string>
     <string name="filename_empty">El nombre del archivo no puede estar vacío</string>
-    <string name="wait_a_moment">Espere un momento</string>
+    <string name="wait_a_moment">Espere un momento...</string>
     <string name="wait_checking_credentials">Verificando credenciales almacenadas</string>
-    <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; favor de seleccionar el archivo de una aplicación diferente </string>
-    <string name="filedisplay_no_file_selected">No se ha seleccionado un archivo</string>
+    <string name="filedisplay_unexpected_bad_get_content">Problema inesperado, favor de seleccionar el archivo desde una aplicación diferente</string>
+    <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="activity_chooser_title">Enviar la liga a &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copiando el archivo desde almacenamiento privado</string>
     
     <string name="oauth_check_onoff">Iniciar sesión con oAuth2</string> 
-    <string name="oauth_login_connection">Conectando al servidor oAuth2...</string>    
+    <string name="oauth_login_connection">Conectando al servidor OAuth 2...</string>    
         
     <string name="ssl_validator_header">La identidad del sitio no pudo ser verificada</string>
     <string name="ssl_validator_reason_cert_not_trusted">- El certificado del servidor no es de confianza</string>
@@ -312,7 +312,7 @@ en los últimos 7 días!</string>
     <string name="ssl_validator_reason_cert_not_yet_valid">- Las fechas del certificado del servidor están en el futuro</string>
     <string name="ssl_validator_reason_hostname_not_verified">- La URL no corresponde con el nombre del servidor en el certificado</string>
     <string name="ssl_validator_question">¿Desea confiar en este certificado de todas formas?</string>
-    <string name="ssl_validator_not_saved">El certificado no pudo ser guardado</string>
+    <string name="ssl_validator_not_saved">No fue posible guardar el certificado</string>
     <string name="ssl_validator_btn_details_see">Detalles</string>
     <string name="ssl_validator_btn_details_hide">Ocultar</string>
     <string name="ssl_validator_label_subject">Emitido para:</string>
@@ -341,9 +341,9 @@ en los últimos 7 días!</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Cargar sólo mediante WiFi</string>
-    <string name="instant_upload_on_wifi">Cargar imágenes a través de WiFi únicamente</string>
-    <string name="instant_video_upload_on_wifi">Cargar videos a través de WiFi únicamente</string>
+    <string name="auto_upload_on_wifi">Cargar sólo mediante Wi-Fi</string>
+    <string name="instant_upload_on_wifi">Cargar imágenes sólo a través de Wi-Fi</string>
+    <string name="instant_video_upload_on_wifi">Cargar videos sólo a través de Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
     <string name="instant_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
     <string name="instant_upload_path">/CargasInstantáneas</string>
@@ -353,9 +353,9 @@ en los últimos 7 días!</string>
     <string name="conflict_use_local_version">versión local</string>
     <string name="conflict_use_server_version">versión de servidor</string>
 
-    <string name="preview_sorry">¡Disculpas por eso!</string>
+    <string name="preview_sorry">Disculpe. </string>
     <string name="preview_image_description">Vista previa de imagen</string>
-    <string name="preview_image_error_unknown_format">La imagen no puede ser mostrada</string>
+    <string name="preview_image_error_unknown_format">No es posible mostrar la imagen</string>
 
     <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s</string>
     <string name="prefs_instant_upload_path_title">Carpeta de carga instantánea</string>
@@ -364,7 +364,7 @@ en los últimos 7 días!</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar sub carpetas</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Almacenar en sub carpetas con base en el año y mes</string>
 
-	<string name="share_link_no_support_share_api">Lo sentimos, no se permite compartir en su servidor. Favor de contactar a su adminstrador. </string>
+	<string name="share_link_no_support_share_api">No se permite compartir en su servidor. Favor de contactar a su adminstrador. </string>
 	<string name="share_link_file_no_exist">No fue posible compartir. Favor de revisar si el archivo existe</string>
 	<string name="share_link_file_error">Se presentó un error al trtatar de compartir este archivo o carpeta</string>
 	<string name="unshare_link_file_no_exist">Falla al dejar de compartir. Favor de revisar si existe el archivo</string>
@@ -382,52 +382,53 @@ en los últimos 7 días!</string>
     <string name="clipboard_uxexpected_error">Se presentó un error inesperado al copiar al portapapeles</string>
     <string name="clipboard_label">Texto copiado desde %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Error crítico: no se pueden realizar operaciones</string>
+    <string name="error_cant_bind_to_operations_service">Error crítico: No se pueden realizar operaciones</string>
 
-    <string name="network_error_socket_exception">Se presentó un error al conectarse con el servidor</string>
-    <string name="network_error_socket_timeout_exception">Se presentó un error al esperar respuesta del servidor; la operación no pudo ser completada</string>
-    <string name="network_error_connect_timeout_exception">Se presentó un error al esperar respuesta del servidor; la operación no pudo ser completada</string>
-    <string name="network_host_not_available">La operación no pudo ser completada; el servidor no está disponible</string>
-    <string name="forbidden_permissions">Usted no cuenta con los permisos %s</string>
+    <string name="network_error_socket_exception">Se presentó un error durante la conexión alel servidor.</string>
+    <string name="network_error_socket_timeout_exception">Se presentó un error al esperar respuesta del servidor. La operación no pudo ser completada.</string>
+    <string name="network_error_connect_timeout_exception">Se presentó un error al esperar respuesta del servidor La operación no pudo ser completada.</string>
+    <string name="network_host_not_available">La operación no pudo ser completada. El servidor no está disponible</string>
+
+    <string name="forbidden_permissions">No se le permite %s</string>
     <string name="forbidden_permissions_rename">para renombrar este archivo</string>
     <string name="forbidden_permissions_delete">para borrar este archivo</string>
     <string name="share_link_forbidden_permissions">para compartir este archivo</string>
     <string name="unshare_link_forbidden_permissions">para dejar de compartir este archivo</string>
     <string name="update_link_forbidden_permissions">para actualizar este recurso compartido</string>
     <string name="forbidden_permissions_create">para crear el archivo</string>
-    <string name="uploader_upload_forbidden_permissions">para cargar esta carpeta</string>
+    <string name="uploader_upload_forbidden_permissions">para cargar a esta carpeta</string>
     <string name="downloader_download_file_not_found">El archivo ya no se encuentra disponible en el servidor</string>
 
     <string name="file_migration_dialog_title">Actualizando la ruta de almacenamiento</string>
     <string name="file_migration_finish_button">Terminar</string>
-    <string name="file_migration_preparing">Preparando para la migración&#8230;</string>
+    <string name="file_migration_preparing">Preparando la migración&#8230;</string>
     <string name="file_migration_checking_destination">Verificando el destino&#8230;</string>
     <string name="file_migration_saving_accounts_configuration">Guardando la configuración de las cuentas&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">En espera de las sincronizaciones incompletas&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Esperando que todas las sincronizaciones terminen&#8230;</string>
     <string name="file_migration_migrating">Moviendo información&#8230;</string>
     <string name="file_migration_updating_index">Actualizando índice&#8230;</string>
     <string name="file_migration_cleaning">Limpiando&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">Restaurando configuración de cuentas&#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">Guardando la configuración de las cuentas&#8230;</string>
     <string name="file_migration_ok_finished">Terminado</string>
-    <string name="file_migration_failed_not_enough_space">ERROR: No cuenta con espacio suficiente</string>
-    <string name="file_migration_failed_not_writable">ERROR: El archivo no se puede escribir</string>
+    <string name="file_migration_failed_not_enough_space">ERROR: Espacio insuficiente</string>
+    <string name="file_migration_failed_not_writable">ERROR: No se puede escribir el archivo</string>
     <string name="file_migration_failed_not_readable">ERROR: El archivo no se puede leer</string>
     <string name="file_migration_failed_dir_already_exists">ERROR: El directorio de Nextcloud ya existe</string>
-    <string name="file_migration_failed_while_coping">ERROR: Durante la migración</string>
-    <string name="file_migration_failed_while_updating_index">ERROR: Durante la actualización del índice</string>
+    <string name="file_migration_failed_while_coping">ERROR: Falla durante la migración</string>
+    <string name="file_migration_failed_while_updating_index">ERROR: Falla durante la actualización del índice</string>
 
-    <string name="file_migration_directory_already_exists">La carpeta de datos ya existe. ¿Qué desa hacer?</string>
-    <string name="file_migration_override_data_folder">Anular</string>
-    <string name="file_migration_use_data_folder">Usar existente</string>
+    <string name="file_migration_directory_already_exists">La carpeta de datos ya existe. Elija una de las siguientes:</string>
+    <string name="file_migration_override_data_folder">Remplazar</string>
+    <string name="file_migration_use_data_folder">Usar</string>
 
     <string name="prefs_category_accounts">Cuentas</string>
     <string name="prefs_add_account">Agregar cuenta</string>
     <string name="drawer_manage_accounts">Administrar cuentas</string>
-    <string name="auth_redirect_non_secure_connection_title">La conexión segura se está redirigiendo a través de una ruta insegura</string>
+    <string name="auth_redirect_non_secure_connection_title">La conexión segura se está redirigiendo a través de una ruta insegura.</string>
 
 	<string name="actionbar_logger">Registros</string>
 	<string name="log_send_history_button">Enviar histórico</string>
-	<string name="log_send_no_mail_app">No se cuenta con una aplicación para el envío de bitácoras. Favor de instalar una aplicación de correo electrónico. </string>
+	<string name="log_send_no_mail_app">No se encontró alguna aplicación para el envío de bitácoras. Favor de instalar un cliente de correo electrónico. </string>
 	<string name="log_send_mail_subject"> %1$s bitácora de aplicación Android</string>
 	<string name="log_progress_dialog_text">Cargando información &#8230;</string>
 
@@ -435,10 +436,10 @@ en los últimos 7 días!</string>
 	<string name="saml_authentication_wrong_pass">Contraseña incorrecta</string>
 	<string name="actionbar_move">Mover</string>
     <string name="actionbar_copy">Copiar</string>
-	<string name="file_list_empty_moving">No hay nada aquí. ¡Puede agregar una carpeta!</string>
+	<string name="file_list_empty_moving">No hay nada aquí. Puede agregar una carpeta.</string>
 	<string name="folder_picker_choose_button_text">Seleccionar</string>
 
-    <string name="move_file_not_found">Falla al mover. Favor de revisar si el archivo existe </string>
+    <string name="move_file_not_found">No fue posible mover el archivo. Favor de verificar si existe. </string>
     <string name="move_file_invalid_into_descendent">No es posible mover una carpeta dentro de una de sus sub carpetas</string>
     <string name="move_file_invalid_overwrite">El archivo ya existe en la carpeta de destino</string>
     <string name="move_file_error">Se presentó un error al intentar mover este archivo o carpeta</string>
@@ -512,7 +513,7 @@ en los últimos 7 días!</string>
     <string name="share_email_clarification">%1$s (correo electrónico)</string>
     <string name="share_known_remote_clarification">%1$s ( a las %2$s )</string>
 
-    <string name="share_sharee_unavailable">Lo sentimos, su versión del servidor no permite compartir con usuarios entre clientes.\nFavor de contactar a su adminsitrador</string>
+    <string name="share_sharee_unavailable"> Actualice la versión del servidor para permitir compartir entre usuarios desde dentro de sus clientes.\nFavor de contactar a su adminsitrador</string>
     <string name="share_privilege_can_share">puede compartir</string>
     <string name="share_privilege_can_edit">puede editar</string>
     <string name="share_privilege_can_edit_create">crear</string>
@@ -521,42 +522,42 @@ en los últimos 7 días!</string>
     <string name="edit_share_unshare">Dejar de compartir</string>
     <string name="edit_share_done">terminado</string>
 
-    <string name="action_retry_uploads">Falla en el reintento</string>
+    <string name="action_retry_uploads">El reintento falló</string>
     <string name="action_clear_failed_uploads">Borrar fallidos</string>
-    <string name="action_clear_successful_uploads">Borrar exitosos</string>
-    <string name="action_clear_finished_uploads">Borrar todos</string>
+    <string name="action_clear_successful_uploads">Borrados</string>
+    <string name="action_clear_finished_uploads">Borrar cargas terminadas</string>
 
     <string name="action_switch_grid_view">Vista de cuadrícula</string>
     <string name="action_switch_list_view">Vista de lista</string>
 
     <string name="manage_space_title">Administrar espacio</string>
-    <string name="manage_space_description">Los ajustes, base de datos y certificados del servior de %1$s serán borrados permanentemente.\n\nLos archivos descargados se mantendrán sin cambios.\n\nEste proceso puede tomar algo de tiempo. </string>
+    <string name="manage_space_description">Los ajustes, base de datos y certificados del servior de los datos de %1$s serán borrados permanentemente.\n\nLos archivos descargados se mantendrán sin cambios.\n\nEste proceso puede tomar algo de tiempo. </string>
     <string name="manage_space_clear_data">Borrar datos</string>
     <string name="manage_space_error">No fue posible borrar algunos archivos</string>
 
-    <string name="permission_storage_access">Se requieren permisos adicionales para cargar &amp; descargar archivos.</string>
-    <string name="local_file_not_found_toast">No se encontró el archivo en el disco local</string>
+    <string name="permission_storage_access">Se requieren permisos adicionales para cargar y descargar archivos. </string>
+    <string name="local_file_not_found_toast">No se encontró el archivo en sistema de archivos local</string>
     <string name="confirmation_remove_files_alert">¿Realmente desea eliminar los elementos seleccionados?</string>
     <string name="confirmation_remove_folders_alert">¿Realmente desea eliminar los elementos seleccionados y su contenido?</string>
-    <string name="uploads_view_upload_status_waiting_for_charging">Esperando la regarga del dispositivo </string>
+    <string name="uploads_view_upload_status_waiting_for_charging">Aguardando la regarga del dispositivo </string>
     <string name="actionbar_search">Buscar</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, favor de actualizar.</string>
     <string name="learn_more">Conozca más</string>
     <string name="drawer_folder_sync">Carga automática</string>
     <string name="drawer_participate">Participe</string>
-    <string name="participate_testing_headline">Ayúdenos a probar</string>
+    <string name="participate_testing_headline">Ayúdenos probando</string>
     <string name="participate_testing_bug_text">¿Encontró una falla? ¿Hay algo raro?</string>
     <string name="participate_testing_report_text">Reportar un tema en Github</string>
-    <string name="participate_testing_version_text">¿Le interesaría ayudarnos a probar la siguiente Versión?</string>
+    <string name="participate_testing_version_text">¿Le interesaría ayudarnos a probar la siguiente versión?</string>
     <string name="participate_beta_headline">Probar la versión de desarrollo</string>
-    <string name="participate_beta_text">Esto incluye todas las próximas características y es lo más nuevo. Fallas/errores pueden ocurrir y si es el caso, favor de reportarnoslos. </string>
+    <string name="participate_beta_text">Esto incluye todas las últimas funcionalidades y es lo más nuevo. Fallas/errores pueden ocurrir y si es el caso, favor de reportarnoslos. </string>
     <string name="participate_release_candidate_headline">Candidato a lanzamiento</string>
-    <string name="participate_release_candidate_text">El candidato a lanzamiento (CL) es una foto del más próximo lanzamiento y se espera que sea estable. Las pruebas a su configuración individual podría ayudarnos a asegurar esto. Regístrese para hacer pruebas en la Play Store o consulte directamente la sección de  \"versiones\" en F-Droid. </string>
+    <string name="participate_release_candidate_text">El candidato a lanzamiento (CL) es una foto del más próximo lanzamiento y se espera que sea estable. Las pruebas a su configuración individual podrían ayudarnos a asegurar esto. Regístrese para hacer pruebas en la Play Store o consulte directamente la sección de \"versiones\" en F-Droid. </string>
     <string name="participate_contribute_headline">Contribuya activamente</string>
     <string name="participate_contribute_irc_text">Únase a las conversaciones en IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">Ayude a los demás en el &lt;a href=\"%1$s\">foro&lt;/a></string>
     <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Traduzca&lt;/a> la aplicación</string>
-    <string name="participate_contribute_github_text">Contribuya como desarrollador, consulte &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUIR.md&lt;/a> para más detalles</string>
+    <string name="participate_contribute_github_text">Revise, corrija y escriba código, consulte &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUIR.md&lt;/a> para más detalles</string>
     <string name="move_to">Mover a&#8230;</string>
     <string name="copy_to">Copiar a&#8230;</string>
     <string name="choose_remote_folder">Seleccione la carpeta&#8230;</string>
@@ -564,7 +565,7 @@ en los últimos 7 días!</string>
     <string name="folder_sync_no_results">No se encontraron carpetas de medios</string>
     <string name="folder_sync_preferences">Preferencias de carga automática</string>
     <string name="folder_sync_settings">Ajustes</string>
-    <string name="folder_sync_new_info">La carga instantánea ha sido completamente moderinzada. Favor de ver el menú principal y reconfigurar sus cargas automáticas. Disculpenos por los inconvenientes. \n\nDisfrute de las nuevas y extendidas capacidades de cargas automáticas. </string>
+    <string name="folder_sync_new_info">La carga instantánea ha sido completamente moderinzada. 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="folder_sync_preferences_folder_path">Para %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d seleccionado</item>
@@ -578,7 +579,7 @@ en los últimos 7 días!</string>
     <string name="notifications_no_results_headline">No hay notificaciones</string>
     <string name="notifications_no_results_message">Favor de verificar más tarde. </string>
 
-    <string name="upload_file_dialog_title">Ingrese el nombre del archivo y el tipo del archivo a cargar</string>
+    <string name="upload_file_dialog_title">Ingrese el nombre y el tipo del archivo a cargar</string>
     <string name="upload_file_dialog_filename">Nombre de archivo</string>
     <string name="upload_file_dialog_filetype">Tipo de archivo</string>
     <string name="upload_file_dialog_filetype_snippet_text">Archivo snippet de texto(.txt)</string>
@@ -594,7 +595,7 @@ en los últimos 7 días!</string>
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Un lugar seguro para todos sus datos</string>
-    <string name="welcome_feature_1_text">Acceda, comparta  &amp; proteja todos sus archivos de casa y de su empresa</string>
+    <string name="welcome_feature_1_text">Acceda, comparta y proteja sus archivos en casa y la oficina</string>
 
     <string name="welcome_feature_2_title">Multi cuenta</string>
     <string name="welcome_feature_2_text">Conéctese a todas sus nubes</string>
@@ -619,31 +620,34 @@ en los últimos 7 días!</string>
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Aún no hay actividades</string>
-    <string name="activities_no_results_message">Este flujo le mostrará eventos tales como \nagregados, cambios &amp; compartidos</string>
+    <string name="activities_no_results_message">Este flujo le mostrará eventos tales como \nagregados, cambios &amp; elementos compartidos</string>
     <string name="webview_error">Se presentó un error</string>
     <string name="prefs_category_about">Acerca de</string>
 
-    <string name="actionbar_contacts">Respaldo de contactos</string>
+    <string name="actionbar_contacts">Respaldar contactos</string>
+    <string name="actionbar_contacts_restore">Restaurar contactos</string>
     <string name="contacts_backup_button">Respaldar ahora</string>
     <string name="contacts_restore_button">Restaurar el último respaldo</string>
     <string name="contacts_header_restore">Restaurar</string>
     <string name="contacts_header_backup">Respaldar</string>
     <string name="contacts_automatic_backup">Respaldo de contactos</string>
     <string name="contacts_last_backup">Último respaldo</string>
-    <string name="contacts_read_permission">Se requieren permisos de lectura para los contactos</string>
-    <string name="contacts_write_permission">Se requieren permisos de escritura para los contactos</string>
+    <string name="contacts_read_permission">Se requiere el permiso para leer la lista de contactos</string>
+    <string name="contacts_write_permission">Se requiere el permiso para cambiar la lista de contactos</string>
     <string name="contactlist_title">Restaurar contactos</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
-    <string name="contactlist_account_chooser_title">Seleccione la cuenta para importar</string>
-    <string name="contactlist_no_permission">¡Sin permisos, nada ha sido importado!</string>
+    <string name="contactlist_account_chooser_title">Seleccione la cuenta a importar</string>
+    <string name="contactlist_no_permission">¡No se otorgaron permisos, nada fue importado!</string>
     <string name="contacts_preference_choose_date">Seleccione una fecha</string>
     <string name="contacts_preference_backup_never">nunca</string>
     <string name="contacts_preferences_no_file_found">No se encontraron archivos</string>
+    <string name="contacts_preferences_something_strange_happened">¡Su último respaldo no fue encontrado!</string>
     <string name="contacts_preferences_backup_scheduled">El respaldo está calendarizado y deberá iniciar en breve</string>
     <string name="contacts_preferences_import_scheduled">La importación está calendarizada y deberá iniciar en breve</string>
 
     <!-- Notifications -->
     <string name="new_notification_received">No se han recibido nuevas notificaciones </string>
+    <string name="drawer_logout">Salir de la sesión</string>
 
 
 </resources>

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

@@ -34,6 +34,7 @@
     <string name="drawer_item_settings">Ajustes</string>
     <string name="drawer_item_uploads_list">Subidas</string>
     <string name="drawer_item_activities">Actividades</string>
+    <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s utilizado</string>
 	<string name="drawer_close">Cerrar</string>
     <string name="drawer_open">Abrir</string>
@@ -42,11 +43,13 @@
     <string name="prefs_accounts">Cuentas</string>
     <string name="prefs_manage_accounts">Gestionar cuentas</string>
     <string name="prefs_passcode">Contraseña</string>
+    <string name="prefs_fingerprint">Bloqueo con huella dactilar</string>
+    <string name="prefs_fingerprint_notsetup">No se han configurado huellas dactilares</string>
     <string name="prefs_show_hidden_files">Mostrar archivos ocultos</string>
     <string name="prefs_instant_upload">Subida instantánea de imágenes</string>
-    <string name="prefs_instant_upload_summary">Sube instantáneamente las fotos tomadas con la cámara</string>
-    <string name="prefs_instant_video_upload">Subidas instantáneas de video</string>
-    <string name="prefs_instant_video_upload_summary">Sube instantáneamente los vídeos grabados con la cámara</string>
+    <string name="prefs_instant_upload_summary">Subir instantáneamente imágenes de la cámara</string>
+    <string name="prefs_instant_video_upload">Subida instantánea de vídeo</string>
+    <string name="prefs_instant_video_upload_summary">Subir instantáneamente vídeos grabajdos con la cámara</string>
     <string name="prefs_log_title">Habilitar registro</string>
     <string name="prefs_log_summary">Esto es usado para registrar problemas</string>
     <string name="prefs_log_title_history">Historial del registro</string>
@@ -55,23 +58,23 @@
     <string name="prefs_calendar_contacts">Sincronizar calendario y contactos</string>
     <string name="prefs_calendar_contacts_summary">Configurar DAVdroid (v1.3.0 +) de la cuenta actual</string>
     <string name="prefs_calendar_contacts_address_resolve_error">La dirección del Servidor para su cuenta no ha podido ser resuelta por DAVdroid</string>
-    <string name="prefs_calendar_contacts_no_store_error">No está instalada la aplicación de Google Play ni la de F-Droid</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Calendario &amp; contactos se ha sincronizado exitosamente</string>
+    <string name="prefs_calendar_contacts_no_store_error">Ni F-Droid ni Google Play están instalados</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Sincronización de calendario y contactos configurada</string>
     <string name="prefs_help">Ayuda</string>
     <string name="prefs_recommend">Recomendar a un amigo</string>
     <string name="prefs_feedback">Observaciones</string>
     <string name="prefs_imprint">Pie de imprenta</string>
-    <string name="prefs_remember_last_share_location">Recordar la ubicación de los archivos compartidos</string>
-    <string name="prefs_remember_last_upload_location_summary">Recordar la ubicación de los últimos archivos compartidos subidos</string>
+    <string name="prefs_remember_last_share_location">Recordar la localización del compartido</string>
+    <string name="prefs_remember_last_upload_location_summary">Recordar la localización del compartido más recientemente usado</string>
 
 	<string name="recommend_subject">¡Prueba  %1$s en su smarthphone!</string>
-	<string name="recommend_text">¡Quiero invitarle a usar %1$s en su smartphone!\nDescárgalo aquí: %2$s</string>
+	<string name="recommend_text">Quiero invitarte a usar %1$s en tu móvil.\nDescárgalo aquí: %2$s</string>
 
     <string name="auth_check_server">Verificar servidor</string>
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Nombre de usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿No tiene un servidor aun?\nHaga click aquí para obtener uno desde un proveedor</string>
+    <string name="auth_register">¿No tienes todavía un servidor?\Pulsa aquí para conseguir uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Subir</string>
@@ -83,42 +86,43 @@
     <string name="uploader_error_title_no_file_to_upload">Ningún archivo para subir</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s  No se puede subir un texto como si fuera un archivo.</string>
     <string name="uploader_error_message_no_file_to_upload">No hay ningún archivo válido en los datos recibidos.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">No se puede subir el archivo</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Este archivo no puede subirse</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s No está autorizado a leer el archivo.</string>
-    <string name="uploader_error_message_source_file_not_found">El archivo a subir no se encuentra. Compruebe que el archivo existe.</string>
-    <string name="uploader_error_message_source_file_not_copied">Ha ocurrido un error al copiar a la carpeta temporal. Por favor intentelo de nuevo.</string>
+    <string name="uploader_error_message_source_file_not_found">No se encuentra el archivo seleccionado para subir. Por favor, comprueba que el archivo existe.</string>
+    <string name="uploader_error_message_source_file_not_copied">No se pudo copiar el archivo a una carpeta temporal. Intenta volver a enviarlo.</string>
     <string name="uploader_upload_files_behaviour">Configuraciones de subida:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Mover el archivo a la carpeta de Nextcloud</string>
     <string name="uploader_upload_files_behaviour_only_upload">Mantener el archivo en la carpeta original</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Borrar archivo de la carpeta original</string>
     <string name="file_list_seconds_ago">hace segundos</string>
     <string name="file_list_empty_headline">No hay archivos aquí</string>
-    <string name="file_list_empty">¡Suba algun contenido o sincronice con sus dispositivos!</string>
-    <string name="file_list_empty_favorites">¡Marque algun archivos como favoritos o sincronice con sus dispositivos!</string>
-    <string name="file_list_empty_favorites_filter_list">Los archivos y carpetas que marque como favoritos aparecerán aquí</string>
-    <string name="file_list_empty_favorites_filter">¡No se encontraron archivos favoritos en su consulta!</string>
+    <string name="file_list_empty">Sube algún contenido o sincroniza con tus dispositivos.</string>
+    <string name="file_list_empty_favorites">Marca como favoritos algunos archivos o sincronízalos con tus dispositivos.</string>
+    <string name="file_list_empty_favorites_filter_list">Los archivos y carpetas que marques como favoritos aparecerán aquí</string>
+    <string name="file_list_empty_favorites_filter">Tu búsqueda no encontró ningún archivo favorito.</string>
     <string name="file_list_loading">Cargando&#8230;</string>
-    <string name="file_list_no_app_for_file_type">¡Aplicación no encontrada para el tipo de archivo!</string>
+    <string name="file_list_no_app_for_file_type">No hay una app configurada para manejar este tipo de archivos.</string>
     <string name="local_file_list_empty">No hay archivos en esta carpeta.</string>
     <string name="file_list_empty_headline_search">No hay resultados en esta carpeta</string>
     <string name="file_list_empty_headline_server_search">Sin resultados</string>
+    <string name="file_list_empty_favorite_headline">Nada marcado como favorito todavía</string>
     <string name="file_list_empty_shared_headline">Aún no hay nada compartido</string>
     <string name="file_list_empty_shared">Aquí aparecerán los archivos y carpetas que usted comparta</string>
     <string name="file_list_empty_headline_server_search_videos">No hay videos</string>
     <string name="file_list_empty_headline_server_search_photos">No hay fotos</string>
-    <string name="file_list_empty_search">¿Ha intentado buscar en otra carpeta?</string>
-    <string name="file_list_empty_recently_modified">No se modificaron archivos en los últimos 7 días</string>
-    <string name="file_list_empty_recently_modified_filter">¡No se encontraron para su consulta, archivos que 
- fueran modificados en los últimos 7 días!</string>
-    <string name="file_list_empty_recently_added">No se encontraron archivos agregados recientemente</string>
-    <string name="file_list_empty_recently_added_filter">¡No se encontraron archivos agregados recientemente para su consulta!</string>
-    <string name="file_list_empty_text_photos">¡Suba algunos archivos o active la subida automática!</string>
-    <string name="file_list_empty_text_photos_filter">¡No hay fotos encontradas para su consulta!</string>
-    <string name="file_list_empty_text_videos">¡Suba unos videos o active la subida automática!</string>
-    <string name="file_list_empty_text_videos_filter">¡No se encontraron videos para su consulta!</string>
+    <string name="file_list_empty_search">¿Quizás está en una carpeta diferente?</string>
+    <string name="file_list_empty_recently_modified">No se encontraron archivos modificados en los últimos 7 días.</string>
+    <string name="file_list_empty_recently_modified_filter">Tu búsqueda no encontró archivos modificados
+      en los últimos 7 días.</string>
+    <string name="file_list_empty_recently_added">No se encontraron archivos recientemente añadidos</string>
+    <string name="file_list_empty_recently_added_filter">Tu búsqueda no encontró archivos recientemente añadidos.</string>
+    <string name="file_list_empty_text_photos">Sube algunas imágenes o activa la subid automática.</string>
+    <string name="file_list_empty_text_photos_filter">Tu búsqueda no encontró fotos.</string>
+    <string name="file_list_empty_text_videos">Sube algunos vídeos o activa la subida automática.</string>
+    <string name="file_list_empty_text_videos_filter">Tu búsqueda no encontró vídeos.</string>
     <string name="upload_list_empty_headline">No hay subidas disponibles</string>
-    <string name="upload_list_empty_text">¡Suba algún contenido o active subidas instantáneas!</string>
-    <string name="upload_list_empty_text_auto_upload">¡Suba con tenido o active la subida automática!</string>
+    <string name="upload_list_empty_text">Sube algún contenido o activa la subida instantánea.</string>
+    <string name="upload_list_empty_text_auto_upload">Sube algún contenido o active la subida automática.</string>
     <string name="file_list_folder">carpeta</string>
     <string name="file_list_folders">carpetas</string>
     <string name="file_list_file">archivo</string>
@@ -130,14 +134,14 @@
     <string name="filedetails_modified">Modificado:</string>
     <string name="filedetails_download">Descargar</string>
     <string name="filedetails_sync_file">Sincronizar</string>
-    <string name="filedetails_renamed_in_upload_msg">El archivo fue renombrado como %1$s durante la subida</string>
-    <string name="list_layout">Listar diseño</string>
+    <string name="filedetails_renamed_in_upload_msg">Archivo renombrado a %1$s durante la subida</string>
+    <string name="list_layout">Formato de lista</string>
     <string name="action_share">Compartir</string>
     <string name="common_yes">Sí</string>
     <string name="common_no">No</string>
     <string name="common_ok">Aceptar</string>
     <string name="common_remove_upload">Quitar los datos para subir</string>
-    <string name="common_retry_upload">Reintentar la subida</string>
+    <string name="common_retry_upload">Volver a intentar la subida</string>
     <string name="common_cancel_sync">Cancelar sincronización</string>
     <string name="common_cancel">Cancelar</string>
     <string name="common_back">Volver</string>
@@ -157,10 +161,10 @@
     <string name="uploader_info_dirname">Nombre de la carpeta</string>
     <string name="uploader_upload_in_progress_ticker">Subiendo &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Subiendo %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Subido con éxito</string>
+    <string name="uploader_upload_succeeded_ticker">Subido</string>
     <string name="uploader_upload_succeeded_content_single">%1$s subido</string>
     <string name="uploader_upload_failed_ticker">Error en la subida</string>
-    <string name="uploader_upload_failed_content_single">La subida de %1$s no se pudo completar</string>
+    <string name="uploader_upload_failed_content_single">No se pudo subir %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Subida fallida, necesita volver a iniciar sesión</string>
     <string name="uploads_view_title">Subidas</string>
     <string name="uploads_view_group_current_uploads">Actual</string>
@@ -179,29 +183,29 @@
     <string name="uploads_view_upload_status_conflict">Conflicto</string>
     <string name="uploads_view_upload_status_service_interrupted">La aplicación se ha interrumpido</string>
     <string name="uploads_view_upload_status_unknown_fail">Error desconocido</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Esperando a la conexión wifi</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Esperando la conexóin Wi-Fi</string>
     <string name="uploads_view_later_waiting_to_upload">Esperando para subir</string>
     <string name="downloader_download_in_progress_ticker">Descargando &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Descargado de %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Descarga completa</string>
+    <string name="downloader_download_succeeded_ticker">Descargado</string>
     <string name="downloader_download_succeeded_content">%1$s descargado</string>
     <string name="downloader_download_failed_ticker">Falló la descarga</string>
-    <string name="downloader_download_failed_content">La descarga de %1$s no se pudo completar</string>
+    <string name="downloader_download_failed_content">No se pudo descargar %1$s</string>
     <string name="downloader_not_downloaded_yet">No descargado</string>
     <string name="downloader_download_failed_credentials_error">La descarga falló, necesita volver a iniciar sesión</string>
     <string name="common_choose_account">Elija una cuenta</string>
     <string name="sync_fail_ticker">Sincronización fallida</string>
-    <string name="sync_fail_ticker_unauthorized">Sincronización fallida, necesita volver a iniciar sesión</string>
-    <string name="sync_fail_content">La sincronización de %1$s no pudo ser completada</string>
-    <string name="sync_fail_content_unauthorized">Contraseña no válida para %1$s</string>
+    <string name="sync_fail_ticker_unauthorized">La sincronización falló, tienes que volver a iniciar sesión</string>
+    <string name="sync_fail_content">No se pudo completar la sincronización de %1$s</string>
+    <string name="sync_fail_content_unauthorized">Contraseña errónea para %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
     <string name="sync_conflicts_in_favourites_content">No se pudo mantener sincronizados los contenidos de %1$d archivos</string>
     <string name="sync_fail_in_favourites_ticker">Fallos en la sincronización de contenidos</string>
     <string name="sync_fail_in_favourites_content">Los contenidos de %1$d archivos no pudieron sincronizarse (%2$d conflictos)</string>
     <string name="sync_foreign_files_forgotten_ticker">Algunos archivos locales se han perdido</string>
     <string name="sync_foreign_files_forgotten_content">%1$d archivos en la carpeta %2$s no pudieron ser copiados a</string>
-    <string name="sync_foreign_files_forgotten_explanation">A partir de la versión 1.3.16, los archivos subidos desde este dispositivo se copian en la carpeta local %1$s para evitar la pérdida de datos cuando se sincroniza un único archivo con varias cuentas.\n\nDebido a este cambio, todos los archivos subidos con versiones anteriores de esta aplicación fueron copiados a la carpeta %2$s. Sin embargo, un error impidió que se completara esta operación durante la sincronización de la cuenta. Puede dejar los archivos tal cual como están y eliminar el enlace hacia %3$s o mover los archivos a la carpeta %1$s y mantener el enlace hacia %4$s.\n\nAbajo se muestran los archivos locales y los archivos remotos en %5$s a los que fueron enlazados.</string>
-    <string name="sync_current_folder_was_removed">La carpeta local %1$s no existe.</string>
+    <string name="sync_foreign_files_forgotten_explanation">A partir de la versión 1.3.16, los archivos subidos desde este dispositivo se copian en la carpeta local %1$s para evitar la pérdida de datos cuando se sincroniza un único archivo con varias cuentas.\n\nDebido a este cambio, todos los archivos subidos con versiones anteriores de esta aplicación fueron copiados a la carpeta %2$s. Sin embargo, un error impidió que se completara esta operación durante la sincronización de la cuenta. Puede dejar los archivos tal cual como están y eliminar el enlace hacia %3$s o mover los archivos a la carpeta %1$s y mantener el enlace hacia %4$s.\n\nDebajo se muestran los archivos locales y los archivos remotos en %5$s a los que fueron enlazados.</string>
+    <string name="sync_current_folder_was_removed">La carpeta %1$s ya no existe</string>
     <string name="foreign_files_move">Mover todo</string>
     <string name="foreign_files_success">Todos los archivos fueron movidos</string>
     <string name="foreign_files_fail">No se han podido mover algunos archivos</string>
@@ -228,11 +232,11 @@
     <string name="media_err_not_in_owncloud">El archivo no está en una cuenta válida </string>
     <string name="media_err_unsupported">Códec no soportado</string>
     <string name="media_err_io">El archivo de medios no pudo ser leído </string>
-    <string name="media_err_malformed">Archivo no codificado correctamente</string>
+    <string name="media_err_malformed">El archivo de medios tiene una codificación incorrecta</string>
     <string name="media_err_timeout">Tiempo de espera agotado en el intento de reproducción</string>
     <string name="media_err_invalid_progressive_playback">El archivo de medios no puede ser transmitido</string>
-    <string name="media_err_unknown">El archivo de medios no se puede reproducir con el reproductor de medios por defecto </string>
-    <string name="media_err_security_ex">Error de seguridad al intentar reproducir %1$s</string>
+    <string name="media_err_unknown">El reproductor por defecto no puede reproducir el archivo de medios</string>
+    <string name="media_err_security_ex">Se encontró un error de seguridad intentando reproducir %1$s</string>
     <string name="media_err_io_ex">Error de entrada al intentar reproducir %1$s</string>
     <string name="media_err_unexpected">Error inesperado al intentar reproducir %1$s</string>
     <string name="media_rewind_description">Botón de rebobinado</string>
@@ -249,28 +253,28 @@
 	<string name="auth_account_not_new">Ya existe una cuenta en este dispositivo con los mismos datos de usuario y servidor</string>
 	<string name="auth_account_not_the_same">El usuario introducido no concuerda con el usuario de esta cuenta</string>
 	<string name="auth_unknown_error_title">Ocurrió un error desconocido</string>
-	<string name="auth_unknown_host_title">Error: no se pudo encontrar el host</string>
-	<string name="auth_incorrect_path_title">Instancia de servidor no encontrada</string>
+	<string name="auth_unknown_host_title">No se pudo encontrar el host</string>
+	<string name="auth_incorrect_path_title">Servidor no encontrado</string>
 	<string name="auth_timeout_title">El servidor ha tardado demasiado en responder</string>
 	<string name="auth_incorrect_address_title">Formato de dirección del servidor incorrecto</string>
 	<string name="auth_ssl_general_error_title">Falló la inicialización SSL</string>
-	<string name="auth_ssl_unverified_server_title">No fue posible verificar la identidad del servidor SSL</string>
+	<string name="auth_ssl_unverified_server_title">No se ha podido verificar la identidad del servidor SSL</string>
 	<string name="auth_bad_oc_version_title">No se reconoce  la versión del servidor </string>
 	<string name="auth_wrong_connection_title">No se ha podido establecer la conexión</string>
 	<string name="auth_secure_connection">Conexión segura establecida</string>
 	<string name="auth_unauthorized">Nombre de usuario o contraseña incorrectos</string>
 	<string name="auth_oauth_error">Autorización fallida</string>
 	<string name="auth_oauth_error_access_denied">Acceso denegado por el servidor de autorización</string>
-	<string name="auth_wtf_reenter_URL">Estado inesperado; por favor introduzca su dirección de correo de nuevo</string>
+	<string name="auth_wtf_reenter_URL">Estado inesperado; por favor, introduce de nuevo la dirección del servidor</string>
 	<string name="auth_expired_oauth_token_toast">Su autorización ha expirado. Por favor, autorice de nuevo</string>
 	<string name="auth_expired_basic_auth_toast">Por favor introduzca su contraseña actual</string>
 	<string name="auth_expired_saml_sso_token_toast">Su sesión ha expirado. Por favor conéctese de nuevo</string>
-	<string name="auth_connecting_auth_server">Conectando al servidor de autentificación</string>
+	<string name="auth_connecting_auth_server">Conectando al servidor de autentificación...</string>
 	<string name="auth_unsupported_auth_method">El servidor no soporta este método de autenticación</string>
 	<string name="auth_unsupported_multiaccount">%1$s no soporta cuentas múltiples</string>
 	<string name="auth_fail_get_user_name">Su servidor no está retornando una identificación de usuario correcta; contacte a un administrador </string>
 	<string name="auth_can_not_auth_against_server">No puede autenticarse a este servidor</string>
-    <string name="auth_account_does_not_exist">Aún no existe la cuenta en el dispositivo</string>
+    <string name="auth_account_does_not_exist">La cuenta no existe todavía en el dispositivo</string>
     
     <string name="favorite">Marcar el modo disponible a desconectado</string>
     <string name="unfavorite">Desmarcar el modo disponible de desconectado</string>
@@ -279,23 +283,23 @@
     <string name="common_rename">Renombrar</string>
     <string name="common_remove">Borrar</string>
     <string name="confirmation_remove_file_alert">¿Está seguro que quiere eliminar %1$s?</string>
-    <string name="confirmation_remove_folder_alert">¿Realmente desea eliminar %1$s y todo su contenido?</string>
+    <string name="confirmation_remove_folder_alert">¿Realmente deseas eliminar %1$s y todo su contenido?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="remove_success_msg">Borrado correctamente</string>
+    <string name="remove_success_msg">Eliminado</string>
     <string name="remove_fail_msg">El borrado no se pudo completar</string>
     <string name="rename_dialog_title">Introduzca un nombre nuevo</string>
-    <string name="rename_local_fail_msg">No se pudo cambiar el nombre de la copia local, trate con un nombre differente</string>
-    <string name="rename_server_fail_msg">No se pudo cambiar el nombre</string>
+    <string name="rename_local_fail_msg">No se ha podido cambiar el nombre de la copia local, prueba un nombre diferente</string>
+    <string name="rename_server_fail_msg">No se ha podido dar un nombre nuevo al servidor</string>
     <string name="sync_file_fail_msg">No se ha podido comprobar el archivo remoto</string>
     <string name="sync_file_nothing_to_do_msg">Ya está sincronizado</string>
-    <string name="create_dir_fail_msg">No se pudo crear la carpeta</string>
+    <string name="create_dir_fail_msg">No se ha podido crear la carpeta</string>
     <string name="filename_forbidden_characters">Caracteres ilegales: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Nombre de archivo contiene al menos un carácter no válido</string>
     <string name="filename_empty">El nombre de archivo no puede estar vacío</string>
-    <string name="wait_a_moment">Espere un momento</string>
+    <string name="wait_a_moment">Espere un momento...</string>
     <string name="wait_checking_credentials">Comprobando las credenciales guardadas</string>
-    <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, pruebe otra app para seleccionar el archivo</string>
-    <string name="filedisplay_no_file_selected">No hay archivos seleccionados.</string>
+    <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, selecciona el archivo en una app diferente</string>
+    <string name="filedisplay_no_file_selected">No hay archivos seleccionados</string>
     <string name="activity_chooser_title">Enviar enlace a &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copiando el archivo desde el almacenamiento privado.</string>
     
@@ -308,7 +312,7 @@
     <string name="ssl_validator_reason_cert_not_yet_valid">- El certificado del servidor es de una fecha que aún no ha llegado</string>
     <string name="ssl_validator_reason_hostname_not_verified">- La URL no coincide con el nombre de dominio del certificado</string>
     <string name="ssl_validator_question">¿Confía de todas formas en este certificado?</string>
-    <string name="ssl_validator_not_saved">No se pudo guardar el certificado</string>
+    <string name="ssl_validator_not_saved">No se ha podido guardar el certificado</string>
     <string name="ssl_validator_btn_details_see">Detalles</string>
     <string name="ssl_validator_btn_details_hide">Ocultar</string>
     <string name="ssl_validator_label_subject">Emitido para:</string>
@@ -337,11 +341,11 @@
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Subir únicamente por WiFi</string>
-    <string name="instant_upload_on_wifi">Subir fotos por wifi únicamente</string>
-    <string name="instant_video_upload_on_wifi">Subir archivos por wifi únicamente</string>
-    <string name="instant_video_upload_on_charging">Subir solo al cargar</string>
-    <string name="instant_upload_on_charging">Subir solo al cargar</string>
+    <string name="auto_upload_on_wifi">Subir solamente por Wi-Fi</string>
+    <string name="instant_upload_on_wifi">Subir fotos solamente por Wi-Fi</string>
+    <string name="instant_video_upload_on_wifi">Subir vídeos solamente por Wi-Fi</string>
+    <string name="instant_video_upload_on_charging">Subir solamente al cargar</string>
+    <string name="instant_upload_on_charging">Subir solamente al cargar</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="conflict_title">Conflicto con archivo</string>
     <string name="conflict_message">¿Qué archivos desea mantener? Si selecciona ambas versiones, el archivo local tendrá un número añadido a su nombre.</string>
@@ -351,7 +355,7 @@
 
     <string name="preview_sorry">¡Lo sentimos!</string>
     <string name="preview_image_description">Previsualización de imagen</string>
-    <string name="preview_image_error_unknown_format">La foto no puede ser mostrada.</string>
+    <string name="preview_image_error_unknown_format">No se puede mostrar la imagen</string>
 
     <string name="error__upload__local_file_not_copied">%1$s se pudo copiar a la carpeta local %2$s</string>
     <string name="prefs_instant_upload_path_title">Carpeta para subida instantánea</string>
@@ -360,7 +364,7 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar subcarpetas</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Archivar en subcarpetas basadas en año y mes.</string>
 
-	<string name="share_link_no_support_share_api">Lo siento, la función compartir no está activada en su servidor. Contacte a su administrador.</string>
+	<string name="share_link_no_support_share_api">La función Compartir no está activada en su servidor. Contacte a su administrador.</string>
 	<string name="share_link_file_no_exist">No se puede compartir. Revise si el archivo existe</string>
 	<string name="share_link_file_error">Ocurrió un error al tratar de compartir este archivo o carpeta</string>
 	<string name="unshare_link_file_no_exist">No se puede dejar de compartir. Revise si el archivo existe</string>
@@ -378,19 +382,20 @@
     <string name="clipboard_uxexpected_error">Error inesperado al copiar al portapapeles</string>
     <string name="clipboard_label">Texto copiado de %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Error crítico: no es posible realizar operaciones</string>
+    <string name="error_cant_bind_to_operations_service">Error crítico: no se puede realizar operaciones</string>
 
     <string name="network_error_socket_exception">Ocurrió un error al conectarse con el servidor.</string>
-    <string name="network_error_socket_timeout_exception">Ocurrió un error al esperar la respuesta del servidor, la operación no se pudo realizar</string>
-    <string name="network_error_connect_timeout_exception">Ocurrió un error al esperar la respuesta del servidor, la operación no se pudo realizar</string>
-    <string name="network_host_not_available">La operación no se pudo completar; el servidor no está disponible</string>
+    <string name="network_error_socket_timeout_exception">Ha ocurrido un error al esperar la respuesta del servidor. La operación no se ha podido completar.</string>
+    <string name="network_error_connect_timeout_exception">Ha ocurrido un error al esperar la respuesta del servidor. La operación no se ha podido completar.</string>
+    <string name="network_host_not_available">La operación no se ha podido completar. El servidor no está disponible</string>
+
     <string name="forbidden_permissions">No tiene permiso %s</string>
     <string name="forbidden_permissions_rename">para renombrar este archivo</string>
     <string name="forbidden_permissions_delete">para eliminar este archivo</string>
     <string name="share_link_forbidden_permissions">para compartir este archivo</string>
     <string name="unshare_link_forbidden_permissions">para descompartir este archivo</string>
     <string name="update_link_forbidden_permissions">para actualizar este comparto</string>
-    <string name="forbidden_permissions_create">para crear el archivo</string>
+    <string name="forbidden_permissions_create">para crear este archivo</string>
     <string name="uploader_upload_forbidden_permissions">para subir archivos a esta carpeta</string>
     <string name="downloader_download_file_not_found">Este archivo ya no se encuentra en el servidor</string>
 
@@ -399,7 +404,7 @@
     <string name="file_migration_preparing">Preparando la migración&#8230;</string>
     <string name="file_migration_checking_destination">Comprobando destino&#8230;</string>
     <string name="file_migration_saving_accounts_configuration">Guardando configuración de cuentas&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Esperando sincronizaciones no finalizadas&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Esperando que todas las sincronizaciones terminen&#8230;</string>
     <string name="file_migration_migrating">Moviendo datos&#8230;</string>
     <string name="file_migration_updating_index">Actualizando índice&#8230;</string>
     <string name="file_migration_cleaning">Limpiando&#8230;</string>
@@ -409,21 +414,21 @@
     <string name="file_migration_failed_not_writable">ERROR: El archivo no se puede escribir</string>
     <string name="file_migration_failed_not_readable">ERROR: El archivo no se puede leer</string>
     <string name="file_migration_failed_dir_already_exists">ERROR: El directorio de Nextcloud ya existe</string>
-    <string name="file_migration_failed_while_coping">ERROR: Al migrar</string>
-    <string name="file_migration_failed_while_updating_index">ERROR: Al actualizar el índice</string>
+    <string name="file_migration_failed_while_coping">ERROR: Fallo durante la migración</string>
+    <string name="file_migration_failed_while_updating_index">ERROR: Fallo al actualizar el índice</string>
 
-    <string name="file_migration_directory_already_exists">La carpeta de datos ya existe. ¿Qué hacer?</string>
-    <string name="file_migration_override_data_folder">Anular</string>
-    <string name="file_migration_use_data_folder">Usar existente</string>
+    <string name="file_migration_directory_already_exists">La carpeta de datos ya existe. Escoge una de las opciones:</string>
+    <string name="file_migration_override_data_folder">Reemplazar</string>
+    <string name="file_migration_use_data_folder">Usar</string>
 
     <string name="prefs_category_accounts">Cuentas</string>
     <string name="prefs_add_account">Agregar cuenta</string>
     <string name="drawer_manage_accounts">Administrar cuentas</string>
-    <string name="auth_redirect_non_secure_connection_title">La conexión segura está siendo redirigida por una ruta insegura.</string>
+    <string name="auth_redirect_non_secure_connection_title">La conexión segura está siendo redirigida a través de una ruta insegura.</string>
 
 	<string name="actionbar_logger">Registros</string>
 	<string name="log_send_history_button">Mandar historial.</string>
-	<string name="log_send_no_mail_app">Aplicación para enviar registros no fue encontrada. Por favor instale una aplicación de correo.</string>
+	<string name="log_send_no_mail_app">No se ha encontrado ningua app para enviar los registros. Por favor, instala un cliente de correo electrónico.</string>
 	<string name="log_send_mail_subject">Se han encontrado %1$s aplicaciones de registros para Android</string>
 	<string name="log_progress_dialog_text">Cargando datos &#8230;</string>
 
@@ -431,26 +436,26 @@
 	<string name="saml_authentication_wrong_pass">Contraseña incorrecta</string>
 	<string name="actionbar_move">Mover</string>
     <string name="actionbar_copy">Copiar</string>
-	<string name="file_list_empty_moving">Nada por aquí. ¡Puede agregar una carpeta!</string>
+	<string name="file_list_empty_moving">Nada por aquí. Puedes agregar una carpeta.</string>
 	<string name="folder_picker_choose_button_text">Elegir</string>
 
-    <string name="move_file_not_found">No se puede mover. Revise si el archivo existe</string>
-    <string name="move_file_invalid_into_descendent">No se puede mover una carpeta dentro de una de sus subcarpetas.</string>
+    <string name="move_file_not_found">No se puede mover el archivo. Comprueba si existe</string>
+    <string name="move_file_invalid_into_descendent">No se puede mover una carpeta dentro de una de sus propias subcarpetas.</string>
     <string name="move_file_invalid_overwrite">El archivo ya existe en la carpeta de destino</string>
     <string name="move_file_error">Hubo un error al tratar de mover este archivo o carpeta</string>
     <string name="forbidden_permissions_move">mover este archivo</string>
 
 
     <string name="copy_file_not_found">No se puede copiar. Revise si existe el archivo</string>
-    <string name="copy_file_invalid_into_descendent">No se puede copiar una carpeta dentro de una de sus subcarpetas.</string>
-    <string name="copy_file_invalid_overwrite">El archivo ya existe en el directorio de destino</string>
+    <string name="copy_file_invalid_into_descendent">No se puede copiar una carpeta dentro de una de sus propias subcarpetas.</string>
+    <string name="copy_file_invalid_overwrite">El fichero ya existe en el directorio de destino</string>
     <string name="copy_file_error">Hubo un error al tratar de copiar este archivo o carpeta</string>
     <string name="forbidden_permissions_copy">copiar este archivo</string>
 
     <string name="prefs_category_instant_uploading">Subidas instantáneas</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta para subida instantánea de vídeos</string>
+	<string name="prefs_instant_video_upload_path_title">Carpeta para subida instantáneo de vídeos</string>
     <string name="sync_folder_failed_content">La sincronización de la carpeta %1$s no se pudo completar</string>
 
 	<string name="shared_subject_header">compartido</string>
@@ -508,7 +513,7 @@
     <string name="share_email_clarification">%1$s (correo electrónico)</string>
     <string name="share_known_remote_clarification">%1$s ( en %2$s )</string>
 
-    <string name="share_sharee_unavailable">Lo siento, su versión de servidor no permite compartir con usuarios desde los clientes.\nPor favor, contacte con su administrador</string>
+    <string name="share_sharee_unavailable">Actualiza la versión del servidor para permitir compartir entre usuarios desde sus clientes.\nPor favor, contacta con tu administrador</string>
     <string name="share_privilege_can_share">puede compartir</string>
     <string name="share_privilege_can_edit">puede editar</string>
     <string name="share_privilege_can_edit_create">crear</string>
@@ -517,10 +522,10 @@
     <string name="edit_share_unshare">Parar de compatir</string>
     <string name="edit_share_done">hecho</string>
 
-    <string name="action_retry_uploads">Reintento fallido</string>
+    <string name="action_retry_uploads">Nuevo intento fallido</string>
     <string name="action_clear_failed_uploads">Limpieza fallida</string>
     <string name="action_clear_successful_uploads">Limpieza exitosa</string>
-    <string name="action_clear_finished_uploads">Limpiar todo al finalizar</string>
+    <string name="action_clear_finished_uploads">Limpiar subidas finalizadas</string>
 
     <string name="action_switch_grid_view">Vista en cuadrícula</string>
     <string name="action_switch_list_view">Ver lista</string>
@@ -530,8 +535,8 @@
     <string name="manage_space_clear_data">Limpiar datos</string>
     <string name="manage_space_error">No se han podido eliminar algunos archivos</string>
 
-    <string name="permission_storage_access">Se requieren permisos adicionales para subir &amp; y descargar archivos.</string>
-    <string name="local_file_not_found_toast">El archivo no se encuentra en el servidor local de archivos.</string>
+    <string name="permission_storage_access">Se necesitan permisos adicionales para subir y descargar archivos.</string>
+    <string name="local_file_not_found_toast">El archivo no se encuentra en el sistema de archivos local.</string>
     <string name="confirmation_remove_files_alert">¿Está seguro de que quiere eliminar los elementos seleccionados?</string>
     <string name="confirmation_remove_folders_alert">¿Está seguro de que quiere eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="uploads_view_upload_status_waiting_for_charging">Esperando la carga del dispositivo</string>
@@ -541,17 +546,18 @@
     <string name="drawer_folder_sync">Subida automática</string>
     <string name="drawer_participate">Participar</string>
     <string name="participate_testing_headline">Ayúdanos a realizar pruebas</string>
-    <string name="participate_testing_bug_text">¿Encontró un error? ¿Algo está mal?</string>
+    <string name="participate_testing_bug_text">¿Encontraste un error? ¿Algo va mal?</string>
     <string name="participate_testing_report_text">Informar de un problema en Github</string>
-    <string name="participate_testing_version_text">¿Está interesado en ayudarnos a probar la próxima versión?</string>
-    <string name="participate_beta_text">Esto incluye todas las características por llegar y está muy avazado en lo último. Pueden ocurrir fallos y errores, que si sucede, por favor infórmanos.</string>
+    <string name="participate_testing_version_text">¿Estás interesado en ayudarnos a probar la próxima versión?</string>
+    <string name="participate_beta_headline">Probar la versión de desarrollo</string>
+    <string name="participate_beta_text">Esto incluye todas las características por llegar y está muy avazado en lo último. Pueden ocurrir fallos y errores y, si suceden infórmanos, por favor.</string>
     <string name="participate_release_candidate_headline">Versión a ser liberada</string>
-    <string name="participate_release_candidate_text">La versión a ser liberada (release candidate - RC) es una instantánea de la próxima versión y se espera que sea estable. Probar su configuración individual podría ayudar a asegurar esto. Regístrese para probarla en Play Store o busque manualmente en la sección \"versiones\" de F-Droid.</string>
+    <string name="participate_release_candidate_text">La versión a ser liberada (release candidate - RC) es una instantánea de la próxima versión y se espera que sea estable. Probar su configuración individual podría ayudar a asegurar esto. Regístrate para probarla en Play Store o busca manualmente en la sección \"versiones\" de F-Droid.</string>
     <string name="participate_contribute_headline">Colabore activamente</string>
     <string name="participate_contribute_irc_text">Únase a la conversación en IRC:  &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">Ayude a otros en el foro &lt;a href=\"%1$s\">&lt;/a>.</string>
     <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Traducen&lt;/a> la app</string>
-    <string name="participate_contribute_github_text">Contribuya como desarrollador, vea &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> para más detalles</string>
+    <string name="participate_contribute_github_text">Revisa, corrige y escribe código, lee  &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> para más detalles</string>
     <string name="move_to">Mover a&#8230;</string>
     <string name="copy_to">Copiar a&#8230;</string>
     <string name="choose_remote_folder">Elija carpeta&#8230;</string>
@@ -559,7 +565,7 @@
     <string name="folder_sync_no_results">No se han encnotrado carpetas de medios.</string>
     <string name="folder_sync_preferences">Preferencias de subida automática</string>
     <string name="folder_sync_settings">Configuración</string>
-    <string name="folder_sync_new_info">La subida instantánea ha sido completamente renovada. Por favor, vaya al menú principal y reconfigure sus subidas instantáneas. Disculpe las molestias.\n\n¡Disfrute las nuevas y extendidas capacidades de la subida automática!</string>
+    <string name="folder_sync_new_info">La subida instantánea ha sido completamente renovada. Reconfigura tus subidas instantáneas en el menú principal.\n\n¡Disfruta las nuevas y extendidas capacidades de la subida automática!</string>
     <string name="folder_sync_preferences_folder_path">Durante %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d seleccionado</item>
@@ -569,7 +575,11 @@
     <string name="activity_list_loading_activity">Cargando actividades&#8230;</string>
     <string name="activity_list_no_results">No se encontró actividad.</string>
 
-    <string name="upload_file_dialog_title">Ingrese nombre y tipo de archivo de subida</string>
+    <string name="notifications_loading_activity">Cargando notificaciones&#8230;</string>
+    <string name="notifications_no_results_headline">No hay notificaciones</string>
+    <string name="notifications_no_results_message">Por favor, comprúebalo más tarde.</string>
+
+    <string name="upload_file_dialog_title">Introduce el nombre y tipo de archivo para subir</string>
     <string name="upload_file_dialog_filename">Nombre de archivo</string>
     <string name="upload_file_dialog_filetype">Tipo de archivo</string>
     <string name="upload_file_dialog_filetype_snippet_text">Archivo de texto recortado (.txt)</string>
@@ -585,7 +595,7 @@
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Un lugar seguro para tus datos</string>
-    <string name="welcome_feature_1_text">Acceda, comparta y proteja sus archivos en casa y en su empresa</string>
+    <string name="welcome_feature_1_text">Accede, comparte y protege tus archivos en casa y en el trabajo</string>
 
     <string name="welcome_feature_2_title">Múltiples cuentas</string>
     <string name="welcome_feature_2_text">Conectar con todas sus nubes</string>
@@ -595,6 +605,9 @@
 
     <string name="whats_new_skip">Omitir</string>
 
+    <string name="fingerprint_scan_finger">Por favor, escanea tu dedo</string>
+    <string name="fingerprint_unknown">Dedo no reconocido</string>
+
     <!-- User information -->
     <string name="user_info_full_name">Nombre completo</string>
     <string name="user_info_email">Correo electrónico</string>
@@ -607,5 +620,34 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Aun no hay actividad</string>
-    <string name="activities_no_results_message">Esta secuencia le mostrará eventos como\nagregados, cambios&amp; recursos compartidos</string>
-    </resources>
+    <string name="activities_no_results_message">Esta secuencia le mostrará eventos como\ninclusiones, cambios y archivos compartidos</string>
+    <string name="webview_error">Ha ocurrido un error</string>
+    <string name="prefs_category_about">Acerca de</string>
+
+    <string name="actionbar_contacts">Copia de seguridad de los contactos</string>
+    <string name="actionbar_contacts_restore">Restaurar los contactos</string>
+    <string name="contacts_backup_button">Realizar la copia de seguridad ahora</string>
+    <string name="contacts_restore_button">Restaurar la última copia de seguridad</string>
+    <string name="contacts_header_restore">Restaurar</string>
+    <string name="contacts_header_backup">Copia de seguridad</string>
+    <string name="contacts_automatic_backup">Copia de seguridad de los contactos</string>
+    <string name="contacts_last_backup">Última copia de seguridad</string>
+    <string name="contacts_read_permission">Se necesita el permiso para leer la lista de contactos</string>
+    <string name="contacts_write_permission">SE necesita el permiso para cambiar la lista de contactos</string>
+    <string name="contactlist_title">Restaurar contactos</string>
+    <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
+    <string name="contactlist_account_chooser_title">Escoge la cuenta para importar</string>
+    <string name="contactlist_no_permission">No se han concedido permisos. ¡No se ha importado nada!</string>
+    <string name="contacts_preference_choose_date">Escoge fecha</string>
+    <string name="contacts_preference_backup_never">nunca</string>
+    <string name="contacts_preferences_no_file_found">No se ha encontrado ningún archivo</string>
+    <string name="contacts_preferences_something_strange_happened">¡No podemos encontrar tu última copia de seguridad!</string>
+    <string name="contacts_preferences_backup_scheduled">Copia de seguridad programada. Comenzará en breve</string>
+    <string name="contacts_preferences_import_scheduled">Importación programada. Comenzará en breve</string>
+
+    <!-- Notifications -->
+    <string name="new_notification_received">Nueva notificación recibida</string>
+    <string name="drawer_logout">Desconectar</string>
+
+
+</resources>

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

@@ -46,10 +46,10 @@
     <string name="prefs_fingerprint">Verrouillage par empreinte digitale</string>
     <string name="prefs_fingerprint_notsetup">Aucune empreinte digitale n\'a été installée.</string>
     <string name="prefs_show_hidden_files">Afficher les fichiers masqués</string>
-    <string name="prefs_instant_upload">Téléversement immédiat des photos</string>
-    <string name="prefs_instant_upload_summary">Téléverser immédiatement les photos prises par la caméra</string>
-    <string name="prefs_instant_video_upload">Téléversement immédiat des vidéos</string>
-    <string name="prefs_instant_video_upload_summary">Téléverser immédiatement les vidéos prises par la caméra</string>
+    <string name="prefs_instant_upload">Téléversements immédiats de photos</string>
+    <string name="prefs_instant_upload_summary">Téléverser immédiatement les photos prises par l\'appareil photo</string>
+    <string name="prefs_instant_video_upload">Téléversements immédiats de vidéos</string>
+    <string name="prefs_instant_video_upload_summary">Téléverser immédiatement les vidéos prises par l\'appareil photo</string>
     <string name="prefs_log_title">Activer la journalisation</string>
     <string name="prefs_log_summary">Cela est utilisé pour la journalisation des problèmes</string>
     <string name="prefs_log_title_history">Historique de la journalisation</string>
@@ -59,7 +59,7 @@
     <string name="prefs_calendar_contacts_summary">Configurer DAVdroid (v1.3.0+) pour le compte actuel</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Une  adresse de serveur pour le compte pourrait ne pas être résolue par DAVdroid</string>
     <string name="prefs_calendar_contacts_no_store_error">Aucune application Google Play store ou F-Droid installée</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">La synchronisation de l\'agenda &amp; des contacts a bien été configurée.</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Synchronisation de l\'agenda &amp; des contacts configurée</string>
     <string name="prefs_help">Aide</string>
     <string name="prefs_recommend">Recommander à un ami</string>
     <string name="prefs_feedback">Nous contacter par mail</string>
@@ -68,7 +68,7 @@
     <string name="prefs_remember_last_upload_location_summary">Mémoriser le dernier emplacement de téléversement</string>
 
 	<string name="recommend_subject">Essayez %1$s sur votre smartphone !</string>
-	<string name="recommend_text">J\'aimerais vous inviter à utiliser %1$s sur votre smartphone !\nTéléchargez-le ici : %2$s.</string>
+	<string name="recommend_text">J\'aimerais vous inviter à utiliser %1$s sur votre smartphone.\nTéléchargez-la ici : %2$s.</string>
 
     <string name="auth_check_server">Vérifier le serveur</string>
     <string name="auth_host_url">Adresse du serveur https://…</string>
@@ -88,41 +88,40 @@
     <string name="uploader_error_message_no_file_to_upload">Les données reçues n\'incluent aucun fichier valide</string>
     <string name="uploader_error_title_file_cannot_be_uploaded">Le fichier ne peut pas être téléversé</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s n\'est pas autorisé à lire un fichier reçu</string>
-    <string name="uploader_error_message_source_file_not_found">Le fichier à téléverser n\'a pas été trouvé dans son emplacement. Merci de vérifier si ce fichier existe.</string>
-    <string name="uploader_error_message_source_file_not_copied">Une erreur est survenue lors de la copie du fichier vers un dossier temporaire. Merci de recommencer votre envoi.</string>
+    <string name="uploader_error_message_source_file_not_found">Le fichier à téléverser n\'a pas été trouvé. Merci de vérifier si ce fichier existe.</string>
+    <string name="uploader_error_message_source_file_not_copied">Impossible de copier le fichier vers un dossier temporaire. Merci de recommencer votre envoi.</string>
     <string name="uploader_upload_files_behaviour">Option de téléversement :</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Déplacer le fichier dans le dossier Nextcloud</string>
     <string name="uploader_upload_files_behaviour_only_upload">Conserver le fichier dans le dossier original</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Supprimer le fichier du dossier original</string>
     <string name="file_list_seconds_ago">à l\'instant</string>
-    <string name="file_list_empty_headline">Aucun fichier</string>
-    <string name="file_list_empty">Déposez du contenu ou synchronisez vos appareils !</string>
-    <string name="file_list_empty_favorites">Mettez certains fichiers en favoris ou synchronisez vos appareils !</string>
+    <string name="file_list_empty_headline">Aucun fichier ici</string>
+    <string name="file_list_empty">Déposez du contenu ou synchronisez vos appareils.</string>
+    <string name="file_list_empty_favorites">Mettez certains fichiers en favoris ou synchronisez vos appareils.</string>
     <string name="file_list_empty_favorites_filter_list">Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici</string>
-    <string name="file_list_empty_favorites_filter">Auncun fichier mis en favori trouvé qui correspond à votre requête !</string>
+    <string name="file_list_empty_favorites_filter">Auncun fichier mis en favori trouvé qui correspond à votre requête.</string>
     <string name="file_list_loading">Chargement&#8230;</string>
-    <string name="file_list_no_app_for_file_type">Aucune application trouvée pour ce type de fichier !</string>
+    <string name="file_list_no_app_for_file_type">Aucune application trouvée pour ce type de fichier.</string>
     <string name="local_file_list_empty">Aucun fichier n\'est présent dans ce dossier.</string>
     <string name="file_list_empty_headline_search">Aucun résultat dans ce dossier</string>
     <string name="file_list_empty_headline_server_search">Aucun résultat</string>
-    <string name="file_list_empty_favorite_headline">Aucun favoris pour l\'instant</string>
+    <string name="file_list_empty_favorite_headline">Rien n\'est mis en favoris pour l\'instant</string>
     <string name="file_list_empty_shared_headline">Rien n\'est partagé pour l\'instant</string>
     <string name="file_list_empty_shared">Les fichiers et dossiers que vous partagez apparaîtront ici</string>
     <string name="file_list_empty_headline_server_search_videos">Aucune vidéo</string>
     <string name="file_list_empty_headline_server_search_photos">Aucune photo</string>
-    <string name="file_list_empty_search">Essayez de chercher dans un autre dossier ?</string>
+    <string name="file_list_empty_search">Il se trouve peut-être dans un autre dossier ?</string>
     <string name="file_list_empty_recently_modified">Aucun fichier modifié au cours des 7 derniers jours trouvé</string>
-    <string name="file_list_empty_recently_modified_filter">Aucun fichier trouvé qui correspond à votre requête qui a été modifié
-        durant les 7 derniers jours !</string>
-    <string name="file_list_empty_recently_added">Auncun fichier ajouté récemment trouvé</string>
-    <string name="file_list_empty_recently_added_filter">Auncun fichier ajouté récemment trouvé qui correspond à votre requête !</string>
-    <string name="file_list_empty_text_photos">Téléversez des photos ou activez le téléversement automatique !</string>
-    <string name="file_list_empty_text_photos_filter">Aucune photo trouvée qui correspond à votre requête !</string>
-    <string name="file_list_empty_text_videos">Téléversez des vidéos ou activez le téléversement automatique !</string>
-    <string name="file_list_empty_text_videos_filter">Aucune vidéo trouvée qui correspond à votre requête !</string>
+    <string name="file_list_empty_recently_modified_filter">Votre recherche n\'a pas retourné de fichiers modifiés dans les 7 derniers jours.</string>
+    <string name="file_list_empty_recently_added">Aucun fichier ajouté récemment trouvé</string>
+    <string name="file_list_empty_recently_added_filter">Votre recherche n\'a pas renvoyée de fichiers récement ajoutés.</string>
+    <string name="file_list_empty_text_photos">Téléversez des photos ou activez le téléversement automatique.</string>
+    <string name="file_list_empty_text_photos_filter">Aucune photo trouvée qui correspond à votre requête.</string>
+    <string name="file_list_empty_text_videos">Téléversez des vidéos ou activez le téléversement automatique.</string>
+    <string name="file_list_empty_text_videos_filter">Aucune vidéo trouvée qui correspond à votre requête.</string>
     <string name="upload_list_empty_headline">Aucun historique de téléversement</string>
-    <string name="upload_list_empty_text">Téléversez du contenu ou activez le téléversement instantané !</string>
-    <string name="upload_list_empty_text_auto_upload">Téléversez du contenu ou activez le téléversement instantané !</string>
+    <string name="upload_list_empty_text">Téléversez du contenu ou activez le téléversement instantané.</string>
+    <string name="upload_list_empty_text_auto_upload">Téléversez du contenu ou activez le téléversement automatique.</string>
     <string name="file_list_folder">dossier</string>
     <string name="file_list_folders">dossiers</string>
     <string name="file_list_file">fichier</string>
@@ -161,10 +160,10 @@
     <string name="uploader_info_dirname">Nom du dossier</string>
     <string name="uploader_upload_in_progress_ticker">Téléversement&#8230;</string>
     <string name="uploader_upload_in_progress_content">Téléversement de %2$s : %1$d%%</string>
-    <string name="uploader_upload_succeeded_ticker">Envoi terminé</string>
+    <string name="uploader_upload_succeeded_ticker">Téléversé</string>
     <string name="uploader_upload_succeeded_content_single">%1$s téléversé</string>
     <string name="uploader_upload_failed_ticker">Échec du téléversement</string>
-    <string name="uploader_upload_failed_content_single">Le téléversement de %1$s a échoué</string>
+    <string name="uploader_upload_failed_content_single">Impossible de téléverser %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Le téléversement a échoué, vous devez vous reconnecter</string>
     <string name="uploads_view_title">Historique des envois</string>
     <string name="uploads_view_group_current_uploads">Actuellement</string>
@@ -183,21 +182,21 @@
     <string name="uploads_view_upload_status_conflict">Conflit</string>
     <string name="uploads_view_upload_status_service_interrupted">L\'application a été arrêtée</string>
     <string name="uploads_view_upload_status_unknown_fail">Erreur inconnue </string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">En attente d\'une connexion wifi</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">En attente d\'une connexion WiFi</string>
     <string name="uploads_view_later_waiting_to_upload">En attente de téléversement</string>
     <string name="downloader_download_in_progress_ticker">Téléchargement en cours&#8230;</string>
     <string name="downloader_download_in_progress_content">Téléchargement de %2$s : %1$d%% effectués</string>
-    <string name="downloader_download_succeeded_ticker">Réception terminée</string>
+    <string name="downloader_download_succeeded_ticker">Téléchargé</string>
     <string name="downloader_download_succeeded_content">%1$s téléchargé</string>
     <string name="downloader_download_failed_ticker">Le téléchargement a échoué</string>
-    <string name="downloader_download_failed_content">Le téléchargement de %1$s a échoué</string>
+    <string name="downloader_download_failed_content">Impossible de télécharger %1$s</string>
     <string name="downloader_not_downloaded_yet">Pas encore téléchargé</string>
     <string name="downloader_download_failed_credentials_error">Le téléchargement a échoué, vous devez vous reconnecter</string>
     <string name="common_choose_account">Choisissez un compte</string>
     <string name="sync_fail_ticker">La synchronisation a échoué</string>
     <string name="sync_fail_ticker_unauthorized">La synchronisation a échoué, vous devez vous reconnecter</string>
-    <string name="sync_fail_content">La synchronisation de %1$s a échoué</string>
-    <string name="sync_fail_content_unauthorized">Mot de passe invalide pour %1$s</string>
+    <string name="sync_fail_content">Impossible de terminer la synchronisation de %1$s</string>
+    <string name="sync_fail_content_unauthorized">Mauvais mot de passe pour %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Des conflits ont été trouvés</string>
     <string name="sync_conflicts_in_favourites_content">%1$d fichiers à garder synchronisés n\'ont pu être synchronisés</string>
     <string name="sync_fail_in_favourites_ticker">La synchronisation des fichiers a échoué</string>
@@ -231,7 +230,7 @@
     <string name="media_err_no_account">Aucun compte fourni</string>
     <string name="media_err_not_in_owncloud">Le fichier n\'est pas dans un compte valide</string>
     <string name="media_err_unsupported">Le codec de ce média n\'est pas pris en charge </string>
-    <string name="media_err_io">Le fichier média ne peut pas être lu</string>
+    <string name="media_err_io">Impossible de lire le fichier média</string>
     <string name="media_err_malformed">Le fichier média n\'est pas correctement encodé</string>
     <string name="media_err_timeout">Délai dépassé pour la lecture du morceau</string>
     <string name="media_err_invalid_progressive_playback">Le fichier média ne peut pas être diffusé</string>
@@ -285,7 +284,7 @@
     <string name="confirmation_remove_file_alert">Voulez-vous vraiment supprimer %1$s ?</string>
     <string name="confirmation_remove_folder_alert">Voulez-vous vraiment supprimer %1$s et ses contenus ?</string>
     <string name="confirmation_remove_local">Local seulement</string>
-    <string name="remove_success_msg">Suppression terminée avec succès</string>
+    <string name="remove_success_msg">Supprimé</string>
     <string name="remove_fail_msg">Échec de la suppression</string>
     <string name="rename_dialog_title">Entrez un nouveau nom</string>
     <string name="rename_local_fail_msg">La version locale ne peut être renommée ; veuillez réessayer avec un nom différent</string>
@@ -296,10 +295,10 @@
     <string name="filename_forbidden_characters">Caractères interdits : / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Le nom de fichier contient au moins un caractère invalide</string>
     <string name="filename_empty">Le nom du fichier ne peut pas être vide</string>
-    <string name="wait_a_moment">Veuillez patienter</string>
+    <string name="wait_a_moment">Veuillez patienter...</string>
     <string name="wait_checking_credentials">Vérification des identifiants enregistrés</string>
     <string name="filedisplay_unexpected_bad_get_content">Problème inattendu ; veuillez sélectionner le fichier depuis une autre application</string>
-    <string name="filedisplay_no_file_selected">Aucun fichier n\'était sélectionné</string>
+    <string name="filedisplay_no_file_selected">Aucun fichier sélectionné</string>
     <string name="activity_chooser_title">Envoyer le lien vers &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copie du fichier depuis le stockage privé</string>
     
@@ -353,7 +352,7 @@
     <string name="conflict_use_local_version">version locale</string>
     <string name="conflict_use_server_version">version serveur</string>
 
-    <string name="preview_sorry">Désolé à propos de cela !</string>
+    <string name="preview_sorry">Désolé.</string>
     <string name="preview_image_description">Prévisualisation de l\'image</string>
     <string name="preview_image_error_unknown_format">L\'image ne peut pas être affichée</string>
 
@@ -382,12 +381,13 @@
     <string name="clipboard_uxexpected_error">Erreur inattendue lors de la copie vers le presse-papiers</string>
     <string name="clipboard_label">Texte copié depuis %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Erreur critique : impossible de réaliser les opérations</string>
+    <string name="error_cant_bind_to_operations_service">Erreur critique : Impossible de réaliser les opérations</string>
 
     <string name="network_error_socket_exception">Une erreur est survenue pendant la connexion au serveur.</string>
     <string name="network_error_socket_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée</string>
     <string name="network_error_connect_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée</string>
-    <string name="network_host_not_available">Impossible de réaliser l\'opération, le serveur n\'est pas accessible.</string>
+    <string name="network_host_not_available">Impossible de réaliser l\'opération. Le serveur n\'est pas accessible</string>
+
     <string name="forbidden_permissions">Vous n\'avez pas la permission %s</string>
     <string name="forbidden_permissions_rename">de renommer ce fichier</string>
     <string name="forbidden_permissions_delete">de supprimer ce fichier</string>
@@ -409,15 +409,15 @@
     <string name="file_migration_cleaning">Nettoyage&#8230;</string>
     <string name="file_migration_restoring_accounts_configuration">Restauration de la configuration des comptes&#8230;</string>
     <string name="file_migration_ok_finished">Terminé</string>
-    <string name="file_migration_failed_not_enough_space">ERREUR : Espace insufisant</string>
+    <string name="file_migration_failed_not_enough_space">ERREUR : Espace insuffisant</string>
     <string name="file_migration_failed_not_writable">ERREUR : Le fichier n\'est pas modifiable</string>
-    <string name="file_migration_failed_not_readable">ERREUR : Le fichier est illisible</string>
+    <string name="file_migration_failed_not_readable">ERREUR : Le fichier n\'est pas lisible</string>
     <string name="file_migration_failed_dir_already_exists">ERREUR : Le dossier Nextcloud existe déjà</string>
-    <string name="file_migration_failed_while_coping">ERREUR : Lors de la migration</string>
-    <string name="file_migration_failed_while_updating_index">ERREUR : Lors de la mise à jour de l\'index</string>
+    <string name="file_migration_failed_while_coping">ERREUR : Echec lors de la migration</string>
+    <string name="file_migration_failed_while_updating_index">ERREUR : Echec lors de la mise à jour de l\'index</string>
 
-    <string name="file_migration_directory_already_exists">Le dossier de données existe déjà, que souhaitez-vous faire ?</string>
-    <string name="file_migration_override_data_folder">Écraser</string>
+    <string name="file_migration_directory_already_exists">Le dossier de données existe déjà. Choisissez une des options suivantes :</string>
+    <string name="file_migration_override_data_folder">Remplacer</string>
     <string name="file_migration_use_data_folder">Conserver le dossier actuel</string>
 
     <string name="prefs_category_accounts">Comptes</string>
@@ -435,10 +435,10 @@
 	<string name="saml_authentication_wrong_pass">Mot de passe incorrect</string>
 	<string name="actionbar_move">Déplacer</string>
     <string name="actionbar_copy">Copier</string>
-	<string name="file_list_empty_moving">Il n\'y a rien ici. Vous pouvez ajouter un dossier !</string>
+	<string name="file_list_empty_moving">Il n\'y a rien ici. Vous pouvez ajouter un dossier.</string>
 	<string name="folder_picker_choose_button_text">Valider</string>
 
-    <string name="move_file_not_found">Impossible de déplacer. Vérifiez que le fichier existe</string>
+    <string name="move_file_not_found">Impossible de déplacer le fichier. Vérifiez que le fichier existe</string>
     <string name="move_file_invalid_into_descendent">Il n\'est pas possible de déplacer un dossier vers un de ses descendants</string>
     <string name="move_file_invalid_overwrite">Le fichier existe déjà dans le dossier de destination</string>
     <string name="move_file_error">Une erreur est survenue lors de la tentative de déplacement de ce fichier ou dossier</string>
@@ -496,7 +496,7 @@
     <string name="share_add_user_or_group">Ajouter un Utilisateur ou un Groupe</string>
     <string name="share_via_link_section_title">Partager par lien public</string>
     <string name="share_via_link_expiration_date_label">Indiquer une date d\'expiration</string>
-    <string name="share_via_link_password_label">Protéger par un mot de passe</string>
+    <string name="share_via_link_password_label">Protéger avec un mot de passe</string>
     <string name="share_via_link_password_title">Sécurisé</string>
     <string name="share_via_link_edit_permission_label">Permettre la modification</string>
     <string name="share_via_link_hide_file_listing_permission_label">Masquer la liste des fichiers</string>
@@ -521,10 +521,10 @@
     <string name="edit_share_unshare">Terminer le partage</string>
     <string name="edit_share_done">Terminé</string>
 
-    <string name="action_retry_uploads">Relancer les échoués</string>
+    <string name="action_retry_uploads">Réessayer les téléversements échoués</string>
     <string name="action_clear_failed_uploads">Effacer les échoués</string>
-    <string name="action_clear_successful_uploads">Effacer les envoyés</string>
-    <string name="action_clear_finished_uploads">Effacer tous les terminés</string>
+    <string name="action_clear_successful_uploads">Effacé</string>
+    <string name="action_clear_finished_uploads">Effacer tous les téléversements terminés</string>
 
     <string name="action_switch_grid_view">Affichage Mosaïque</string>
     <string name="action_switch_list_view">Affichage Liste</string>
@@ -534,7 +534,7 @@
     <string name="manage_space_clear_data">Effacer les données</string>
     <string name="manage_space_error">Certains fichiers n\'ont pu être supprimés.</string>
 
-    <string name="permission_storage_access">Des permissions supplémentaires sont exigées pour téléverser &amp; télécharger des fichiers.</string>
+    <string name="permission_storage_access">Des permissions supplémentaires sont exigées pour téléverser et télécharger des fichiers.</string>
     <string name="local_file_not_found_toast">Le fichier n\'a pas été trouvé sur le système de fichier local</string>
     <string name="confirmation_remove_files_alert">Voulez-vous vraiment supprimer les éléments sélectionnés ?</string>
     <string name="confirmation_remove_folders_alert">Voulez-vous vraiment supprimer les éléments sélectionnés et leurs contenus ?</string>
@@ -544,27 +544,27 @@
     <string name="learn_more">En apprendre plus</string>
     <string name="drawer_folder_sync">Téléversement automatique</string>
     <string name="drawer_participate">Participer</string>
-    <string name="participate_testing_headline">Aidez-nous à améliorer Nextcloud</string>
+    <string name="participate_testing_headline">Aidez nous en le testant</string>
     <string name="participate_testing_bug_text">Vous avez trouvé un bug ? Quelque chose vous semble étrange ?</string>
     <string name="participate_testing_report_text">Signaler un problème sur Github</string>
     <string name="participate_testing_version_text">Vous avez envie de nous aider en testant les futures versions ?</string>
     <string name="participate_beta_headline">Testez la version Bêta</string>
     <string name="participate_beta_text">La version Beta inclut les dernières fonctionnalités qui sont encore toutes fraîches. Des erreurs peuvent se produire et si c\'est le cas, merci de nous les signaler.</string>
     <string name="participate_release_candidate_headline">Testez la version Release Candidate</string>
-    <string name="participate_release_candidate_text">La version « release candidate » (RC) est un instantanné de la dernière version supposée stable. Le test de votre configuration pourrait nous aider à nous assurer que cette version est entièrement stable. Inscrivez vous pour être testeur sur le Play store ou allez jeter un œil dans la section \"versions\" de F-Droid.</string>
+    <string name="participate_release_candidate_text">La version « release candidate » (RC) est un instantanné de la prochaine version et est supposée stable. Le test de votre configuration pourrait nous aider à nous assurer que cette version est entièrement stable. Inscrivez vous pour être testeur sur le Play store ou allez jeter un œil dans la section \"versions\" de F-Droid.</string>
     <string name="participate_contribute_headline">Participez activement</string>
     <string name="participate_contribute_irc_text">Rejoignez la discussion sur IRC &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a>.</string>
     <string name="participate_contribute_forum_text">Aidez les autres sur le &lt;a href=\"%1$s\">forum&lt;/a>.</string>
     <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Traduisez&lt;/a> l\'application.</string>
-    <string name="participate_contribute_github_text">Vous êtes développeur ? Consultez &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a>.</string>
+    <string name="participate_contribute_github_text">Vous êtes développeur ? Consultez &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> pour plus d\'informations</string>
     <string name="move_to">Déplacer vers&#8230;</string>
     <string name="copy_to">Copier vers&#8230;</string>
     <string name="choose_remote_folder">Sélectionner le dossier&#8230;</string>
     <string name="folder_sync_loading_folders">Chargement des dossiers&#8230;</string>
     <string name="folder_sync_no_results">Aucun dossier média trouvé.</string>
-    <string name="folder_sync_preferences">Préférences du téléversement automatique</string>
+    <string name="folder_sync_preferences">Préférences pour le téléversement automatique</string>
     <string name="folder_sync_settings">Paramètres</string>
-    <string name="folder_sync_new_info">Le téléversement immédiat a été complètement réorganisé. Merci de bien vouloir accéder au menu principal et de reconfigurer votre téléversement automatique. Désolé pour le désagrément.\n\nProfitez des nouvelles capacités étendues du téléversement automatique !</string>
+    <string name="folder_sync_new_info">Le téléversement immédiat a été complètement réorganisé. Merci de bien vouloir accéder au menu principal et de reconfigurer votre téléversement automatique.\n\nProfitez des nouvelles capacités étendues du téléversement automatique.</string>
     <string name="folder_sync_preferences_folder_path">Pour %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d sélectionné</item>
@@ -619,16 +619,17 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Aucune activité pour le moment</string>
-    <string name="activities_no_results_message">Ce flux affichera des événements comme\n des ajouts, des changements &amp; des partages</string>
+    <string name="activities_no_results_message">Ce flux liste les événements tels que\nles ajouts, les modifications et les partages</string>
     <string name="webview_error">Une erreur est survenue</string>
     <string name="prefs_category_about">À propos</string>
 
     <string name="actionbar_contacts">Copie de sauvegarde des contacts</string>
+    <string name="actionbar_contacts_restore">Restaurer les contacts</string>
     <string name="contacts_backup_button">Sauvegarder maintenant</string>
     <string name="contacts_restore_button">Restaurer la dernière copie de sauvegarde</string>
     <string name="contacts_header_restore">Restaurer</string>
     <string name="contacts_header_backup">Copie de sauvegarde</string>
-    <string name="contacts_automatic_backup">Copie de sauvegarde des contacts</string>
+    <string name="contacts_automatic_backup">Sauvegarde des contacts</string>
     <string name="contacts_last_backup">Dernière copie de sauvegarde</string>
     <string name="contacts_read_permission">L\'autorisation de lecture des contacts est nécessaire</string>
     <string name="contacts_write_permission">L\'autorisation d\'écriture des contacts est nécessaire</string>
@@ -639,11 +640,13 @@
     <string name="contacts_preference_choose_date">Choisir la date</string>
     <string name="contacts_preference_backup_never">jamais</string>
     <string name="contacts_preferences_no_file_found">Aucun fichier trouvé</string>
+    <string name="contacts_preferences_something_strange_happened">Nous ne trouvons pas votre dernière copie de sauvegarde !</string>
     <string name="contacts_preferences_backup_scheduled">Sauvegarde planifiée et va commencer prochainement</string>
     <string name="contacts_preferences_import_scheduled">Importation planifiée et va commencer prochainement</string>
 
     <!-- Notifications -->
     <string name="new_notification_received">Nouvelle notification reçue</string>
+    <string name="drawer_logout">Se déconnecter</string>
 
 
 </resources>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="about_android">%1$s Android app</string>
+    <string name="about_android">%1$s Android-program</string>
     <string name="about_version">versjon %1$s</string>
     <string name="actionbar_sync">Oppdater konto</string>
     <string name="actionbar_upload">Last opp</string>
@@ -46,10 +46,10 @@
     <string name="prefs_fingerprint">Fingeravtrykkslås</string>
     <string name="prefs_fingerprint_notsetup">Det har ikke blitt satt opp noen fingeravtrykk.</string>
     <string name="prefs_show_hidden_files">Vis skjulte filer</string>
-    <string name="prefs_instant_upload">Umiddelbare bildeopplastninger</string>
-    <string name="prefs_instant_upload_summary">Last opp bilder tatt av kameraet umiddelbart</string>
-    <string name="prefs_instant_video_upload">Umiddelbar opplasting av filmer</string>
-    <string name="prefs_instant_video_upload_summary">Last opp filmer tatt opp av kameraet umiddelbart</string>
+    <string name="prefs_instant_upload">Umiddelbar opplasting av bilder</string>
+    <string name="prefs_instant_upload_summary">Last opp bilder tatt med kameraet med én gang</string>
+    <string name="prefs_instant_video_upload">Umiddelbar opplasting av video</string>
+    <string name="prefs_instant_video_upload_summary">Last opp videoer tatt med kameraet med én gang</string>
     <string name="prefs_log_title">Aktiver loggføring</string>
     <string name="prefs_log_summary">Denne er brukt til å loggføre problemer</string>
     <string name="prefs_log_title_history">Loggføringshistorikk</string>
@@ -58,23 +58,16 @@
     <string name="prefs_calendar_contacts">Synkroniser kalender &amp; kontakter</string>
     <string name="prefs_calendar_contacts_summary">Sett opp DAVdroid (v1.3.0+) for nåværende konto</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Tjeneradressen for kontoen ble ikke funnet for DAVdroid</string>
-    <string name="prefs_calendar_contacts_no_store_error">Ingen Google Play butikk eller F-Droid app er installert</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Kalender &amp; kontaktsynkronisering ble satt opp</string>
+    <string name="prefs_calendar_contacts_no_store_error">Hverken F-droid eller Google play er installert</string>
     <string name="prefs_help">Hjelp</string>
     <string name="prefs_recommend">Anbefal til en venn</string>
     <string name="prefs_feedback">Tilbakemelding</string>
     <string name="prefs_imprint">Avtrykk</string>
-    <string name="prefs_remember_last_share_location">Husk delt plassering</string>
-    <string name="prefs_remember_last_upload_location_summary">Husk sist delt plassering for opplasting</string>
-
-	<string name="recommend_subject">Prøv %1$s på smarttelefonen din!</string>
-	<string name="recommend_text">Jeg ønsker å invitere deg til å bruke %1$s på smarttelefonen din!\nLast ned her: %2$s</string>
-
-    <string name="auth_check_server">Sjekk tjener</string>
+    <string name="recommend_subject">Prøv %1$s på smarttelefonen din!</string>
+	<string name="auth_check_server">Sjekk tjener</string>
     <string name="auth_host_url">Tjeneradresse https://...</string>
     <string name="auth_username">Brukernavn</string>
     <string name="auth_password">Passord</string>
-    <string name="auth_register">Har du ingen tjener enda?\nKlikk her for å opprette en hos en tilbyder</string>
     <string name="sync_string_files">Filer</string>
     <string name="setup_btn_connect">Koble til</string>
     <string name="uploader_btn_upload_text">Last opp</string>
@@ -86,43 +79,29 @@
     <string name="uploader_error_title_no_file_to_upload">Ingen fil å laste opp</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s kan ikke laste opp tekst som en fil.</string>
     <string name="uploader_error_message_no_file_to_upload">Mottatte data inneholder ingen gyldig fil.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">Filen kan ikke lastes opp</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Denne filen kan ikke lastes opp</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s er har ikke tilgang til å se mottatt fil</string>
-    <string name="uploader_error_message_source_file_not_found">Filen som skulle lastes opp ble ikke funnet der den skulle være. Vennligst sjekk at filen finnes.</string>
-    <string name="uploader_error_message_source_file_not_copied">En feil oppstod under kopiering av filen til en midlertidig mappe. Vennligst prøv å sende på nytt.</string>
+    <string name="uploader_error_message_source_file_not_found">Fil valgt for opplasting ble ikke funnet. Sjekk hvorvidt filen eksisterer.</string>
+    <string name="uploader_error_message_source_file_not_copied">Kunne ikke kopiere fil til midlertidig mappe. Prøv å sende igjen.</string>
     <string name="uploader_upload_files_behaviour">Alternativer for opplasting:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Flytt filen til Nextcloud mappen</string>
     <string name="uploader_upload_files_behaviour_only_upload">Behold filen i kildemappe</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Slett filen fra kildemappen</string>
     <string name="file_list_seconds_ago">for få sekunder siden</string>
     <string name="file_list_empty_headline">Ingen filer her</string>
-    <string name="file_list_empty">Last opp innhold eller synkroniser med enhetene dine.</string>
-    <string name="file_list_empty_favorites">Marker noen filer som favoritter eller synkroniser enhetene dine!</string>
-    <string name="file_list_empty_favorites_filter_list">Filer og mapper du markerer som favoritter vil vises her</string>
-    <string name="file_list_empty_favorites_filter">Din spørring returnerte ingen filer markert som favoritter!</string>
     <string name="file_list_loading">Laster&#8230;</string>
-    <string name="file_list_no_app_for_file_type">Ingen applikasjon funnet for filtypen!</string>
     <string name="local_file_list_empty">Det er ingen filer i denne mappen.</string>
     <string name="file_list_empty_headline_search">Ingen resultater i denne mappen</string>
     <string name="file_list_empty_headline_server_search">Ingen resultater</string>
-    <string name="file_list_empty_favorite_headline">Ingen favoritter ennå</string>
     <string name="file_list_empty_shared_headline">Ingenting delt enda</string>
     <string name="file_list_empty_shared">Filer og mapper som du deler vil bli vist her</string>
     <string name="file_list_empty_headline_server_search_videos">Ingen videoer</string>
     <string name="file_list_empty_headline_server_search_photos">Ingen bilder</string>
-    <string name="file_list_empty_search">Vil du prøve i en annen mappe?</string>
-    <string name="file_list_empty_recently_modified">Fant ingen filer endret de siste syv dagene</string>
-    <string name="file_list_empty_recently_modified_filter">Spørringen din returnerte ingen filer endret
-        de siste syv dagene!</string>
     <string name="file_list_empty_recently_added">Fant ingen nylig tillagte filer</string>
-    <string name="file_list_empty_recently_added_filter">Din spørring returnerte ingen filer som nylig er blitt lagt til!</string>
-    <string name="file_list_empty_text_photos">Last opp noen bilder eller aktiver automatisk opplasting!</string>
-    <string name="file_list_empty_text_photos_filter">Din spørring returnerte ingen bilder!</string>
-    <string name="file_list_empty_text_videos">Last opp noen videoer eller skru på automatisk opplasting!</string>
-    <string name="file_list_empty_text_videos_filter">Din spørring returnerte ingen vidoer!</string>
+    <string name="file_list_empty_recently_added_filter">Søket ditt frambragte ingen nylig tillagte filer.</string>
+    <string name="file_list_empty_text_photos">Last opp noen bilder eller aktiver automatisk opplasting.</string>
+    <string name="file_list_empty_text_photos_filter">Ditt søk frambragte ingen bilder.</string>
     <string name="upload_list_empty_headline">Ingen opplastinger tilgjengelig</string>
-    <string name="upload_list_empty_text">Last opp innhold eller aktiver umiddelbar opplasting.</string>
-    <string name="upload_list_empty_text_auto_upload">Last opp noe innhold eller aktiver automatisk opplasting!</string>
     <string name="file_list_folder">mappe</string>
     <string name="file_list_folders">mapper</string>
     <string name="file_list_file">fil</string>
@@ -134,14 +113,11 @@
     <string name="filedetails_modified">Endret:</string>
     <string name="filedetails_download">Last ned</string>
     <string name="filedetails_sync_file">Synkroniser</string>
-    <string name="filedetails_renamed_in_upload_msg">Filnavnet ble endret til  %1$s under opplasting</string>
-    <string name="list_layout">Listevisning</string>
     <string name="action_share">Delt ressurs</string>
     <string name="common_yes">Ja</string>
     <string name="common_no">Nei</string>
     <string name="common_ok">Ok</string>
     <string name="common_remove_upload">Fjern opplasting</string>
-    <string name="common_retry_upload">Prøv å laste opp igjen.</string>
     <string name="common_cancel_sync">Avbryt synkronisering</string>
     <string name="common_cancel">Avbryt</string>
     <string name="common_back">Tilbake</string>
@@ -161,10 +137,10 @@
     <string name="uploader_info_dirname">Mappenavn</string>
     <string name="uploader_upload_in_progress_ticker">Laster opp &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Laster opp %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Opplasting fullført</string>
+    <string name="uploader_upload_succeeded_ticker">Opplastet</string>
     <string name="uploader_upload_succeeded_content_single">%1$s lastet opp</string>
     <string name="uploader_upload_failed_ticker">Opplasting feilet</string>
-    <string name="uploader_upload_failed_content_single">Opplasting av %1$s kunne ikke fullføres</string>
+    <string name="uploader_upload_failed_content_single">Kunne ikke laste opp %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Opplasting feilet, du må logge inn på nytt</string>
     <string name="uploads_view_title">Opplastinger</string>
     <string name="uploads_view_group_current_uploads">Nåværende</string>
@@ -181,37 +157,30 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Finner ikke lokal fil</string>
     <string name="uploads_view_upload_status_failed_permission_error">Tillatelsesfeil</string>
     <string name="uploads_view_upload_status_conflict">Konflikt</string>
-    <string name="uploads_view_upload_status_service_interrupted">Applikasjonen ble avsluttet</string>
     <string name="uploads_view_upload_status_unknown_fail">Ukjent feil</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Venter på trådløstilkobling</string>
     <string name="uploads_view_later_waiting_to_upload">Venter på å laste opp</string>
     <string name="downloader_download_in_progress_ticker">Laster ned &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Laster ned %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Nedlasting fullført</string>
+    <string name="downloader_download_succeeded_ticker">Nedlastet</string>
     <string name="downloader_download_succeeded_content">%1$s lastet ned</string>
     <string name="downloader_download_failed_ticker">Nedlasting feilet</string>
-    <string name="downloader_download_failed_content">Nedlasting av %1$s kunne ikke fullføres</string>
+    <string name="downloader_download_failed_content">Kunne ikke laste ned %1$s</string>
     <string name="downloader_not_downloaded_yet">Ikke lastet ned enda</string>
     <string name="downloader_download_failed_credentials_error">Nedlasting mislyktes, du må logge inn på nytt</string>
     <string name="common_choose_account">Velg konto</string>
     <string name="sync_fail_ticker">Synkronisering feilet</string>
-    <string name="sync_fail_ticker_unauthorized">Synkronisering feilet, du må logge inn på nytt</string>
-    <string name="sync_fail_content">Synkronisering av %1$s kunne ikke fullføres</string>
-    <string name="sync_fail_content_unauthorized">Ugyldig passord for %1$s</string>
+    <string name="sync_fail_content_unauthorized">Feil passord for %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Konflikter funnet</string>
     <string name="sync_conflicts_in_favourites_content">%1$d hold-i-synk filer kunne ikke synkroniseres</string>
     <string name="sync_fail_in_favourites_ticker">Holdt-i-synk -filer mislyktes</string>
     <string name="sync_fail_in_favourites_content">Innholdet av %1$d filer kunne ikke synkroniseres (%2$d konflikter)</string>
     <string name="sync_foreign_files_forgotten_ticker">Noen lokale filer ble glemt</string>
     <string name="sync_foreign_files_forgotten_content">%1$d filer fra %2$s mappen kunne ikke kopieres til</string>
-    <string name="sync_foreign_files_forgotten_explanation">Fra versjon 1.3.16 blir filer som lastes opp fra denne enheten kopiert inn i den lokale mappen %1$s for å forhindre tap av data når samme fil synkroniseres med flere kontoer.\n\nPga. denne endringen ble alle filer som er blitt lastet opp med tidligere versjoner av denne appen, kopiert til mappe %2$s. Imidlertid kunne ikke denne kopieringen fullføres under konto-synkroniseringen pga. en feil. Du kan enten la filen(e) ligge der de ligger og fjerne lenken til %3$s, eller flytte filene til mappe %1$s og beholde lenken til %4$s.\n\nNedenfor finner du en liste over de lokale filene og de eksterne filene i %5$s som de var lenket til.</string>
-    <string name="sync_current_folder_was_removed">Mappen %1$s finnes ikke lengre</string>
     <string name="foreign_files_move">Flytt alle</string>
     <string name="foreign_files_success">Alle filer ble flyttet</string>
     <string name="foreign_files_fail">Noen filer kunne ikke fjernes</string>
     <string name="foreign_files_local_text">Lokal: %1$s</string>
     <string name="foreign_files_remote_text">Ekstern: %1$s</string>
-    <string name="upload_query_move_foreign_files">Det er ikke nok plass til å kopiere de valgte filene inn i mappen %1$s. Vil du flytte dem i stedet? </string>
     <string name="pass_code_enter_pass_code">Sett inn passordet ditt</string>
     
     <string name="pass_code_configure_your_pass_code">Skriv inn passordet ditt</string>
@@ -229,16 +198,7 @@
     <string name="media_event_done">%1$s avspilling avsluttet</string>
     <string name="media_err_nothing_to_play">Ingen mediafil funnet</string>
     <string name="media_err_no_account">Ingen konto angitt</string>
-    <string name="media_err_not_in_owncloud">Filen er ikke i en gyldig konto</string>
     <string name="media_err_unsupported">Ustøttet mediakodek</string>
-    <string name="media_err_io">Mediafilen kunne ikke leses</string>
-    <string name="media_err_malformed">Mediafilen er ikke riktig kodet</string>
-    <string name="media_err_timeout">Tidsavbrudd under avspillingsforsøk</string>
-    <string name="media_err_invalid_progressive_playback">Mediafilen kan ikke strømmes</string>
-    <string name="media_err_unknown">Mediafilen kan ikke spilles med forvalgt mediaspiller</string>
-    <string name="media_err_security_ex">Sikkerhetsfeil under avspilling av %1$s</string>
-    <string name="media_err_io_ex">Inndatafeil under avspilling av %1$s</string>
-    <string name="media_err_unexpected">Uventet feil under avspilling av %1$s</string>
     <string name="media_rewind_description">Spol tilbake</string>
     <string name="media_play_pause_description">Spill eller pause</string>
     <string name="media_forward_description">Spol fremover</string>
@@ -250,32 +210,22 @@
 	<string name="auth_connection_established">Tilkobling opprettet</string>
 	<string name="auth_testing_connection">Tester forbindelsen</string>
 	<string name="auth_not_configured_title">Feil i tjenerkonfigurasjon</string>
-	<string name="auth_account_not_new">En konto for samme bruker og tjener finnes allerede på enheten</string>
 	<string name="auth_account_not_the_same">Den innskrevne brukeren samsvarer ikke med brukeren av denne kontoen</string>
 	<string name="auth_unknown_error_title">Ukjent feil oppstod!</string>
-	<string name="auth_unknown_host_title">Fant ikke tjener</string>
-	<string name="auth_incorrect_path_title">Finner ikke tjenerinstans</string>
+	<string name="auth_unknown_host_title">Fant ikke vert</string>
 	<string name="auth_timeout_title">Tjeneren brukte for lang tid på å svare</string>
-	<string name="auth_incorrect_address_title">Feil format på tjeneradresse</string>
 	<string name="auth_ssl_general_error_title">Oppstart av SSL mislyktes</string>
-	<string name="auth_ssl_unverified_server_title">Kunne ikke verifisere SSL-tjenerens identitet</string>
 	<string name="auth_bad_oc_version_title">Ukjent tjenerversjon</string>
-	<string name="auth_wrong_connection_title">Klarte ikke å opprette tilkobling</string>
 	<string name="auth_secure_connection">Sikker tilkobling opprettet</string>
 	<string name="auth_unauthorized">Feil brukernavn eller passord</string>
 	<string name="auth_oauth_error">Mislykket autorisasjon</string>
 	<string name="auth_oauth_error_access_denied">Tilgang nektet av autorisasjonstjener</string>
-	<string name="auth_wtf_reenter_URL">Uventet tilstand. Legg inn tjeneradressen på nytt</string>
 	<string name="auth_expired_oauth_token_toast">Autorisasjonen din har gått ut. Autoriser igjen</string>
 	<string name="auth_expired_basic_auth_toast">Legg inn nåværende passord</string>
 	<string name="auth_expired_saml_sso_token_toast">Økta di har gått ut. Koble til igjen</string>
-	<string name="auth_connecting_auth_server">Kobler til autentiseringstjener..</string>
 	<string name="auth_unsupported_auth_method">Tjeneren støtter ikke denne autorisasjonsmetoden</string>
 	<string name="auth_unsupported_multiaccount">%1$s støtter ikke flere kontoer</string>
-	<string name="auth_fail_get_user_name">Tjeneren din svarer ikke med korrekt bruker-ID, vennligst ta kontakt med en administrator </string>
 	<string name="auth_can_not_auth_against_server">Kan ikke autentisere mot denne tjeneren</string>
-    <string name="auth_account_does_not_exist">Kontoen eksisterer ikke på enheten enda</string>
-    
     <string name="favorite">Sett som tilgjengelig frakoblet</string>
     <string name="unfavorite">Fjern som tilgjengelig frakoblet</string>
     <string name="favorite_real">Sett som favoritt</string>
@@ -283,36 +233,26 @@
     <string name="common_rename">Endre navn</string>
     <string name="common_remove">Fjern</string>
     <string name="confirmation_remove_file_alert">Vil du virkelig fjerne %1$s?</string>
-    <string name="confirmation_remove_folder_alert">Vil du virkelig fjerne %1$s inkludert innholdet?</string>
     <string name="confirmation_remove_local">Kun lokalt</string>
-    <string name="remove_success_msg">Fjerning var vellykket</string>
+    <string name="remove_success_msg">"Fjernet"</string>
     <string name="remove_fail_msg">Fjerning mislyktes</string>
     <string name="rename_dialog_title">Skriv inn et nytt navn</string>
-    <string name="rename_local_fail_msg">Lokal kopi kunne ikke endre navn; prøv et annet navn</string>
-    <string name="rename_server_fail_msg">Klarte ikke å endre navn</string>
-    <string name="sync_file_fail_msg">Eksterne filer kunne ikke sjekkes</string>
     <string name="sync_file_nothing_to_do_msg">filinnhold er allerede synkronisert</string>
-    <string name="create_dir_fail_msg">Mappe kunne ikke opprettes</string>
     <string name="filename_forbidden_characters">Forbudte tegn: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Filnavnet inneholder minst ett ulovlig tegn</string>
     <string name="filename_empty">Filnavn kan ikke være tomt</string>
-    <string name="wait_a_moment">Vent et øyeblikk</string>
+    <string name="wait_a_moment">Vent et øyeblikk…</string>
     <string name="wait_checking_credentials">Sjekker lagrede påloggingsdetaljer</string>
-    <string name="filedisplay_unexpected_bad_get_content">Uventet problem; vennligst velg filen fra en annen applikasjon</string>
-    <string name="filedisplay_no_file_selected">Ingen fil ble valgt</string>
     <string name="activity_chooser_title">Send lenke til &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Kopierer fil fra privat lager</string>
     
     <string name="oauth_check_onoff">Logg inn med oAuth2</string> 
-    <string name="oauth_login_connection">Kobler til oAuth2 tjener...</string>    
-        
     <string name="ssl_validator_header">Identiteten til siden kunne ikke bekreftes</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Tjenerens sertifikat er ikke til å stole på</string>
     <string name="ssl_validator_reason_cert_expired">- Tjenerens sertifikat er utløpt</string>
     <string name="ssl_validator_reason_cert_not_yet_valid">- Tjenersertifikatets gyldige datoer er i fremtiden</string>
     <string name="ssl_validator_reason_hostname_not_verified">- Nettadressen samsvarer ikke med vertsnavnet i sertifikatet</string>
     <string name="ssl_validator_question">Vil du stole på dette sertifikatet likevel?</string>
-    <string name="ssl_validator_not_saved">Sertifikatet kunne ikke lagres</string>
     <string name="ssl_validator_btn_details_see">Detaljer</string>
     <string name="ssl_validator_btn_details_hide">Skjul</string>
     <string name="ssl_validator_label_subject">Utstedt til:</string>
@@ -341,21 +281,17 @@
     <string name="placeholder_timestamp">18.05.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Last opp kun via Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Last opp bilder kun via Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Last kun opp filmer via Wi-Fi</string>
-    <string name="instant_video_upload_on_charging">Last kun opp under lading</string>
-    <string name="instant_upload_on_charging">Last kun opp under lading</string>
+    <string name="auto_upload_on_wifi">Bare last opp på Wi-Fi</string>
+    <string name="instant_upload_on_wifi">Bare last opp bilder på Wi-Fi</string>
     <string name="instant_upload_path">/Direkteopplasting</string>
     <string name="conflict_title">Filkonflikt</string>
-    <string name="conflict_message">Hvilke filer ønsker du å beholder? Hvis du velger begge versjonene, får den lokale filen lagt til et tall i navnet.</string>
     <string name="conflict_keep_both">Behold begge</string>
     <string name="conflict_use_local_version">lokal versjon</string>
     <string name="conflict_use_server_version">tjenerversjon</string>
 
-    <string name="preview_sorry">Beklager!</string>
+    <string name="preview_sorry">Beklager.</string>
     <string name="preview_image_description">Bildeforhåndsvisning</string>
-    <string name="preview_image_error_unknown_format">Bildet kan ikke vises</string>
+    <string name="preview_image_error_unknown_format">Kunne ikke vise bilde</string>
 
     <string name="error__upload__local_file_not_copied">%1$s kunne ikke kopieres til lokal mappe %2$s</string>
     <string name="prefs_instant_upload_path_title">Mappe for umiddelbar opplasting</string>
@@ -364,7 +300,6 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">Bruk undermapper</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Lagre filer i undermapper basert på år og måned</string>
 
-	<string name="share_link_no_support_share_api">Beklager, deling er ikke skrudd på for din tjener. Ta kontakt med administratoren.</string>
 	<string name="share_link_file_no_exist">Kan ikke dele. Sjekk om filen eksisterer.</string>
 	<string name="share_link_file_error">Det skjedde en feil under deling av denne filen eller mappen</string>
 	<string name="unshare_link_file_no_exist">Kan ikke fjerne deling. Sjekk om filen eksisterer.</string>
@@ -378,56 +313,32 @@
 
     <string name="copy_link">Kopier lenke</string>
     <string name="clipboard_text_copied">Kopiert til utklippstavlen</string>
-    <string name="clipboard_no_text_to_copy">Ingen tekst ble mottatt for kopi til utklippstavlen</string>
     <string name="clipboard_uxexpected_error">Uventet feil ved kopiering til utklippstavle</string>
     <string name="clipboard_label">Teksten ble kopiert fra %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Kritisk feil: Kan ikke utføre operasjonene</string>
-
-    <string name="network_error_socket_exception">En feil oppstod ved oppretting av forbindelse til tjeneren.</string>
-    <string name="network_error_socket_timeout_exception">En feil oppstod ved venting på svar fra tjeneren. Operasjonen kunne ikke utføres</string>
-    <string name="network_error_connect_timeout_exception">En feil oppstod ved venting på svar fra tjeneren. Operasjonen kunne ikke utføres</string>
-    <string name="network_host_not_available">Operasjonen kunne ikke fullføres. Tjeneren er utilgjengelig</string>
-    <string name="forbidden_permissions">Du har ikke tillatelse til %s</string>
     <string name="forbidden_permissions_rename">å gi denne filen nytt navn</string>
     <string name="forbidden_permissions_delete">å slette denne filen</string>
     <string name="share_link_forbidden_permissions">å dele denne filen</string>
     <string name="unshare_link_forbidden_permissions">å avslutte deling av denne filen</string>
     <string name="update_link_forbidden_permissions">å oppdatere denne delingen</string>
-    <string name="forbidden_permissions_create">å opprette filen</string>
-    <string name="uploader_upload_forbidden_permissions">å laste opp i denne mappen</string>
     <string name="downloader_download_file_not_found">Filen finnes ikke på tjeneren lenger</string>
 
     <string name="file_migration_dialog_title">Oppdaterer sti for lagring</string>
     <string name="file_migration_finish_button">Fullfør</string>
-    <string name="file_migration_preparing">Forebereder migrering&#8230;</string>
     <string name="file_migration_checking_destination">Sjekker mål&#8230;</string>
-    <string name="file_migration_saving_accounts_configuration">Lagrer kontokonfigurasjon&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Venter på uferdig synkronisering&#8230;</string>
     <string name="file_migration_migrating">Flytter data&#8230;</string>
     <string name="file_migration_updating_index">Oppdaterer index&#8230;</string>
     <string name="file_migration_cleaning">Rydder&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">Gjenoppretter kontokonfigurasjon&#8230;</string>
     <string name="file_migration_ok_finished">Fullført</string>
-    <string name="file_migration_failed_not_enough_space">FEIL: Ikke nok plass</string>
-    <string name="file_migration_failed_not_writable">FEIL: Filen er skrivebeskyttet</string>
-    <string name="file_migration_failed_not_readable">FEIL: er ikke lesbar</string>
     <string name="file_migration_failed_dir_already_exists">FEIL: Nextcloudmappen finnes allerede</string>
-    <string name="file_migration_failed_while_coping">FEIL: Under migrering</string>
-    <string name="file_migration_failed_while_updating_index">FEIL: Under oppdatering av indeks</string>
-
-    <string name="file_migration_directory_already_exists">Datamappe finnes fra før, hva skal gjøres?</string>
-    <string name="file_migration_override_data_folder">Overstyr</string>
-    <string name="file_migration_use_data_folder">Bruk eksisterende</string>
+    <string name="file_migration_override_data_folder">Erstatt</string>
+    <string name="file_migration_use_data_folder">Bruk</string>
 
     <string name="prefs_category_accounts">Kontoer</string>
     <string name="prefs_add_account">Legg til en konto</string>
     <string name="drawer_manage_accounts">Håndter kontoer</string>
-    <string name="auth_redirect_non_secure_connection_title">Sikker tilkobling videresendes gjennom en usikker rute.</string>
-
-	<string name="actionbar_logger">Logger</string>
+    <string name="actionbar_logger">Logger</string>
 	<string name="log_send_history_button">Send historikk </string>
-	<string name="log_send_no_mail_app">Fant inget program til forsendelse av logger. Installer e-post-program.</string>
 	<string name="log_send_mail_subject">%1$s Android applikasjons-logger</string>
 	<string name="log_progress_dialog_text">Laster data &#8230;</string>
 
@@ -435,27 +346,20 @@
 	<string name="saml_authentication_wrong_pass">Feil passord</string>
 	<string name="actionbar_move">Flytt</string>
     <string name="actionbar_copy">Kopier</string>
-	<string name="file_list_empty_moving">Ingenting her. Du kan legge til en mappe!</string>
 	<string name="folder_picker_choose_button_text">Velg</string>
 
-    <string name="move_file_not_found">Kan ikke flytte. Sjekk om filen eksisterer.</string>
-    <string name="move_file_invalid_into_descendent">Det er ikke mulig å flytte en mappe inn i sin egen undermappe</string>
-    <string name="move_file_invalid_overwrite">Filen finnes allerede i målmappen</string>
     <string name="move_file_error">En feil oppstod ved flytting av denne filen eller mappen</string>
     <string name="forbidden_permissions_move">å flytte denne filen</string>
 
 
     <string name="copy_file_not_found">Kan ikke kopiere. Sjekk om filen eksisterer</string>
-    <string name="copy_file_invalid_into_descendent">Det er ikke mulig å kopiere en mappe inn i sin egen undermappe</string>
-    <string name="copy_file_invalid_overwrite">Filen finnes allerede i målmappen</string>
     <string name="copy_file_error">En feil oppstod ved kopiering av denne filen eller mappen</string>
     <string name="forbidden_permissions_copy">å kopiere denne filen</string>
 
     <string name="prefs_category_instant_uploading">Umiddelbare opplastinger</string>
     <string name="prefs_category_details">Detaljer</string>
 
-	<string name="prefs_instant_video_upload_path_title">Mappe for umiddelbar opplasting av filmer</string>
-    <string name="sync_folder_failed_content">Synkronisering av %1$s mappe kunne ikke fullføres</string>
+	<string name="sync_folder_failed_content">Synkronisering av %1$s mappe kunne ikke fullføres</string>
 
 	<string name="shared_subject_header">delt</string>
 	<string name="with_you_subject_header">med deg</string>
@@ -496,7 +400,6 @@
     <string name="share_add_user_or_group">Legg til bruker eller gruppe</string>
     <string name="share_via_link_section_title">Del lenke</string>
     <string name="share_via_link_expiration_date_label">Sett utløpsdato</string>
-    <string name="share_via_link_password_label">Passordbeskyttet</string>
     <string name="share_via_link_password_title">Sikret</string>
     <string name="share_via_link_edit_permission_label">Tillat redigering</string>
     <string name="share_via_link_hide_file_listing_permission_label">Skjul filliste</string>
@@ -512,7 +415,6 @@
     <string name="share_email_clarification">%1$s (e-post)</string>
     <string name="share_known_remote_clarification">%1$s ( hos %2$s )</string>
 
-    <string name="share_sharee_unavailable">Beklager, tjenerversjonen din tillater ikke klienter å dele med brukere. \nKontakt systemadministratoren</string>
     <string name="share_privilege_can_share">kan dele</string>
     <string name="share_privilege_can_edit">kan endre</string>
     <string name="share_privilege_can_edit_create">opprette</string>
@@ -521,50 +423,35 @@
     <string name="edit_share_unshare">Avslutt deling</string>
     <string name="edit_share_done">ferdig</string>
 
-    <string name="action_retry_uploads">Forsøkte igjen, feilet.</string>
+    <string name="action_retry_uploads">Nytt forsøk mislyktes</string>
     <string name="action_clear_failed_uploads">Sletting feilet</string>
-    <string name="action_clear_successful_uploads">Sletting vellykket</string>
-    <string name="action_clear_finished_uploads">Slett alle ferdige</string>
-
     <string name="action_switch_grid_view">Rutenett-visning</string>
     <string name="action_switch_list_view">Listevisning</string>
 
     <string name="manage_space_title">Håndter plass</string>
-    <string name="manage_space_description">Innstillinger, database og tjenersertifikater fra %1$s\'s filer vil bli slettet. \n\nNedlastede filer blir urørt.\n\nDette kan ta noe tid.</string>
     <string name="manage_space_clear_data">Nullstill data</string>
     <string name="manage_space_error">Noen filer kunne ikke fjernes.</string>
 
-    <string name="permission_storage_access">Flere tillatelser trengs for å laste opp &amp; ned filer.</string>
-    <string name="local_file_not_found_toast">Filen ble ikke funnet i lokalt filsystem</string>
     <string name="confirmation_remove_files_alert">Vil du virkelig fjerne de valgte elementene?</string>
     <string name="confirmation_remove_folders_alert">Vil du virkelig fjerne de valgte elementene og dets innhold?</string>
-    <string name="uploads_view_upload_status_waiting_for_charging">Venter på lading av enhet.</string>
     <string name="actionbar_search">Søk</string>
     <string name="files_drop_not_supported">Dette er en Nextcloud funksjon, vennligst oppdater.</string>
     <string name="learn_more">Lær mer</string>
     <string name="drawer_folder_sync">Auto-opplasting</string>
     <string name="drawer_participate">Delta</string>
-    <string name="participate_testing_headline">Hjelp oss å teste</string>
-    <string name="participate_testing_bug_text">Funnet en feil? Føles noe rart?</string>
     <string name="participate_testing_report_text">Meld en feil på Github</string>
-    <string name="participate_testing_version_text">Er du interessert i å hjelpe oss å teste ned neste versjonen?</string>
     <string name="participate_beta_headline">Test utvikler-versjonen</string>
-    <string name="participate_beta_text">Dette inkluderer alle kommende funksjoner og er helt på kanten. Feil/feilmeldinger kan oppstå og i sådant fall, meld fra om dem til oss.</string>
     <string name="participate_release_candidate_headline">Release candidate</string>
-    <string name="participate_release_candidate_text">Release candidate (RC) er en pakke av den kommende utgaven og er forventet å være stabil. Ved å teste denne med ditt oppsett vil kunne hjelpe oss å sikre dette. Meld deg på for testen i Play butikken eller se i versjonsseksjonen i F-Droid.</string>
     <string name="participate_contribute_headline">Bidra aktivt</string>
     <string name="participate_contribute_irc_text">Delta i chat på IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a> </string>
     <string name="participate_contribute_forum_text">Hjelp andre på &lt;a href="%1$s">forumet&lt;/a></string>
     <string name="participate_contribute_translate_text">&lt;a href="%1$s">Oversette&lt;/a> app\'en</string>
-    <string name="participate_contribute_github_text">Bidra som en utvikler, se &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a> for detaljer</string>
     <string name="move_to">Flytt til&#8230;</string>
     <string name="copy_to">Kopier til&#8230;</string>
     <string name="choose_remote_folder">Velg mappe&#8230;</string>
     <string name="folder_sync_loading_folders">Laster inn mapper&#8230;</string>
     <string name="folder_sync_no_results">Ingen mediamapper funnet.</string>
-    <string name="folder_sync_preferences">Innstillinger for auto-opplasting</string>
     <string name="folder_sync_settings">Innstillinger</string>
-    <string name="folder_sync_new_info">Umiddelbar opplasting er fullstendig omarbeidet. Se hovedmenyen og konfigurer auto-opplasting på nytt. Beklager uleiligheten.\n\nTa i bruk de nye og utvidede mulighetene i auto-opplasting.</string>
     <string name="folder_sync_preferences_folder_path">For %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d valgt</item>
@@ -578,7 +465,6 @@
     <string name="notifications_no_results_headline">Ingen varsler</string>
     <string name="notifications_no_results_message">Kom innom senere og ta en titt.</string>
 
-    <string name="upload_file_dialog_title">Legg inn filnavn og -type for opplasting</string>
     <string name="upload_file_dialog_filename">Filnavn</string>
     <string name="upload_file_dialog_filetype">Filtype</string>
     <string name="upload_file_dialog_filetype_snippet_text">Textfil-snutt(.txt)</string>
@@ -594,8 +480,6 @@
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Et trygt hjem for alle dine data</string>
-    <string name="welcome_feature_1_text">Benytt, del &amp; beskytt filene dine hjemme og i din bedrift</string>
-
     <string name="welcome_feature_2_title">Multi-konto</string>
     <string name="welcome_feature_2_text">Foren alle skyene dine</string>
 
@@ -619,23 +503,17 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Ingen aktivitet enda</string>
-    <string name="activities_no_results_message">Denne strømmen vil vise hendelser som\nf.eks. innlegging, endring og deling</string>
     <string name="webview_error">Feil oppstod</string>
     <string name="prefs_category_about">Om</string>
 
-    <string name="actionbar_contacts">Sikkerhetskopiering av kontakter</string>
-    <string name="contacts_backup_button">Sikkerhetskopier nå</string>
     <string name="contacts_restore_button">Gjenopprett fra siste sikkerhetskopiering</string>
     <string name="contacts_header_restore">Gjenopprett</string>
     <string name="contacts_header_backup">Sikkerhetskopier</string>
     <string name="contacts_automatic_backup">Sikkerhetskopi av kontakter</string>
     <string name="contacts_last_backup">Siste sikkerhetskopi</string>
-    <string name="contacts_read_permission">Lesetilgang til kontaktliste trengs</string>
-    <string name="contacts_write_permission">Skrivetilgang til kontaktliste trengs</string>
     <string name="contactlist_title">Gjenopprett kontakter</string>
     <string name="contaclist_restore_selected">Gjenopprett valgte kontakter</string>
-    <string name="contactlist_account_chooser_title">Velg konto for import</string>
-    <string name="contactlist_no_permission">Ingen tilgang, ingenting importert!</string>
+    <string name="contactlist_account_chooser_title">Velg konto å importere</string>
     <string name="contacts_preference_choose_date">Velg dato</string>
     <string name="contacts_preference_backup_never">aldri</string>
     <string name="contacts_preferences_no_file_found">Ingen fil funnet</string>
@@ -644,6 +522,4 @@
 
     <!-- Notifications -->
     <string name="new_notification_received">Nytt varsel mottatt</string>
-
-
-</resources>
+    </resources>

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

@@ -47,9 +47,9 @@
     <string name="prefs_fingerprint_notsetup">Er zijn geen vingerafdrukken ingesteld.</string>
     <string name="prefs_show_hidden_files">Verborgen bestanden weergeven</string>
     <string name="prefs_instant_upload">Directe upload van afbeeldingen</string>
-    <string name="prefs_instant_upload_summary">Direct uploaden van foto\'s genomen met de camera</string>
+    <string name="prefs_instant_upload_summary">Direct vanaf camera uploaden van afbeeldingen</string>
     <string name="prefs_instant_video_upload">Directe upload van video\'s</string>
-    <string name="prefs_instant_video_upload_summary">Direct uploaden van video\'s opgenomen met de camera</string>
+    <string name="prefs_instant_video_upload_summary">Direct vanaf de camera uploaden video\'s</string>
     <string name="prefs_log_title">Logging inschakelen</string>
     <string name="prefs_log_summary">Dit wordt gebruikt om problemen te loggen.</string>
     <string name="prefs_log_title_history">Logging-geschiedenis</string>
@@ -58,23 +58,24 @@
     <string name="prefs_calendar_contacts">Synchroniseren agenda &amp; contactpersonen</string>
     <string name="prefs_calendar_contacts_summary">DAVdroid (v1.3.0+) voor huidige account instellen</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Serveradres voor dit account kon niet worden gevonden voor DAVdroid</string>
-    <string name="prefs_calendar_contacts_no_store_error">Geen Google Play- of F-Droid-app geïnstalleerd</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Agenda- &amp; contactpersonensynchronisatie met succes ingesteld</string>
+    <string name="prefs_calendar_contacts_no_store_error">Noch F-droid, noch Google Play is geïnstalleerd</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Agenda &amp; contactpersonen sync instellingen</string>
     <string name="prefs_help">Help</string>
-    <string name="prefs_recommend">Aanbevelen bij een vriend</string>
+    <string name="prefs_recommend">Aanbevelen bij vriend</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">afdruk</string>
     <string name="prefs_remember_last_share_location">Onthoud de share locatie</string>
-    <string name="prefs_remember_last_upload_location_summary">Onthoud de laatste upload locatie</string>
+    <string name="prefs_remember_last_upload_location_summary">Onthoud de laatst gebruikte share locatie</string>
 
 	<string name="recommend_subject">Probeer %1$s op je smartphone!</string>
-	<string name="recommend_text">Ik nodig je uit om eens %1$s op je smartphone te proberen!\nDownload hier: %2$s</string>
+	<string name="recommend_text">Ik wil je uitnodigen om %1$s op je smartphone te gebruiken.\nDownload hier: %2$s</string>
 
     <string name="auth_check_server">Controleer server</string>
     <string name="auth_host_url">Serveradres https://…</string>
     <string name="auth_username">Gebruikersnaam</string>
     <string name="auth_password">Wachtwoord</string>
-    <string name="auth_register">Heb je nog geen server?\nKlik hier om er een van een provider te krijgen</string>
+    <string name="auth_register">Heb je nog geen server?\n
+Kies er eentje van een provider.</string>
     <string name="sync_string_files">Bestanden</string>
     <string name="setup_btn_connect">Verbinden</string>
     <string name="uploader_btn_upload_text">Uploaden</string>
@@ -86,42 +87,43 @@
     <string name="uploader_error_title_no_file_to_upload">Niets te uploaden</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s kan niet een stuk tekst als bestand uploaden.</string>
     <string name="uploader_error_message_no_file_to_upload">Ontvangen gegevens bevatten geen geldig bestand.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">Bestand kan niet worden geüpload</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Dit bestand kan niet worden geüpload</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s heeft geen toestemming om een ontvangen bestand te lezen</string>
-    <string name="uploader_error_message_source_file_not_found">Het te uploaden bestand is hier niet. Controleer of het bestand wel bestaat.</string>
+    <string name="uploader_error_message_source_file_not_found">Voor upload geselecteerde bestand niet gevonden. Controleer of het bestaat.</string>
     <string name="uploader_error_message_source_file_not_copied">Er trad een fout op bij het kopiëren van het bestand naar een tijdelijke map. Probeer het opnieuw te versturen.</string>
     <string name="uploader_upload_files_behaviour">Uploadoptie:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Verplaats bestand naar Nextcloud-map</string>
     <string name="uploader_upload_files_behaviour_only_upload">Bewaar het bestand in de bronmap</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Verwijder bestand uit bronmap</string>
     <string name="file_list_seconds_ago">seconden geleden</string>
-    <string name="file_list_empty_headline">Hier zijn geen bestanden</string>
-    <string name="file_list_empty">Upload bestanden of synchroniseer met je apparaten!</string>
+    <string name="file_list_empty_headline">Hier geen bestanden</string>
+    <string name="file_list_empty">Upload je inhoud of synchroniseer met je apparaten.</string>
     <string name="file_list_empty_favorites">Maak enkele bestanden favoriet of synchroniseer met je apparaten!</string>
     <string name="file_list_empty_favorites_filter_list">Bestanden en mappen gemarkeerd als favoriet worden hier getoond</string>
     <string name="file_list_empty_favorites_filter">Geen favoriete bestanden gevonden voor je zoekopdracht!</string>
-    <string name="file_list_loading">Laden&#160;&#8230;</string>
-    <string name="file_list_no_app_for_file_type">Geen app gevonden voor dit bestandsformaat!</string>
+    <string name="file_list_loading">Laden&#8230;</string>
+    <string name="file_list_no_app_for_file_type">Er is geen app ingesteld om dit bestandformaat te behandelen.</string>
     <string name="local_file_list_empty">Er staan geen bestanden in deze map.</string>
     <string name="file_list_empty_headline_search">Geen resultaten in deze map</string>
     <string name="file_list_empty_headline_server_search">Geen resultaten</string>
-    <string name="file_list_empty_favorite_headline">Nog geen favorieten</string>
+    <string name="file_list_empty_favorite_headline">Nog niets als favoriet gemarkeerd</string>
     <string name="file_list_empty_shared_headline">Nog niets gedeeld</string>
     <string name="file_list_empty_shared">Bestanden en mappen die je deelt, worden hier getoond</string>
     <string name="file_list_empty_headline_server_search_videos">Geen video\'s</string>
     <string name="file_list_empty_headline_server_search_photos">Geen foto\'s</string>
-    <string name="file_list_empty_search">In een andere map kijken?</string>
-    <string name="file_list_empty_recently_modified">Geen bestanden gevonden die  de laatste 7 dagen zijn gewijzigd</string>
-    <string name="file_list_empty_recently_modified_filter">Geen gewijzigde bestanden gevonden voor je zoekopdracht die de laatste 7 dagen zijn gewijzigd!</string>
-    <string name="file_list_empty_recently_added">Geen recent toegevoegde bestanden gevoden</string>
+    <string name="file_list_empty_search">Misschien staat het in een andere map?</string>
+    <string name="file_list_empty_recently_modified">Geen bestanden gevonden die de afgelopen 7 dagen werden gewijzigd</string>
+    <string name="file_list_empty_recently_modified_filter">Je zoekopdracht vond geen bestanden die
+ in de laatste 7 dagen werden gewijzigd.</string>
+    <string name="file_list_empty_recently_added">Geen recent toegevoegde bestanden gevonden</string>
     <string name="file_list_empty_recently_added_filter">Geen recent toegevoegde bestanden gevonden voor je zoekopdracht!</string>
-    <string name="file_list_empty_text_photos">Upload enkele foto\'s of activeer auto-upload!</string>
-    <string name="file_list_empty_text_photos_filter">Geen foto\'s voor je zoekopdracht gevonden!</string>
-    <string name="file_list_empty_text_videos">Upload enkele videos of activeer auto-upload!</string>
-    <string name="file_list_empty_text_videos_filter">Geen video\'s voor je zoekopdracht gevonden!</string>
+    <string name="file_list_empty_text_photos">Upload enkele foto\'s of activeer auto-upload.</string>
+    <string name="file_list_empty_text_photos_filter">Geen foto\'s voor je zoekopdracht.</string>
+    <string name="file_list_empty_text_videos">Upload enkele video\'s of activeer auto-upload.</string>
+    <string name="file_list_empty_text_videos_filter">Geen video\'s voor je zoekopdracht.</string>
     <string name="upload_list_empty_headline">Geen uploads beschikbaar</string>
-    <string name="upload_list_empty_text">Upload bestanden of activeer directe uploads!</string>
-    <string name="upload_list_empty_text_auto_upload">Upload enkele gegevens of activeer auto upload!</string>
+    <string name="upload_list_empty_text">Upload enkele gegevens of activeer directe upload.</string>
+    <string name="upload_list_empty_text_auto_upload">Upload enkele gegevens of activeer auto-upload.</string>
     <string name="file_list_folder">map</string>
     <string name="file_list_folders">mappen</string>
     <string name="file_list_file">bestand</string>
@@ -133,14 +135,14 @@
     <string name="filedetails_modified">Aangepast:</string>
     <string name="filedetails_download">Downloaden</string>
     <string name="filedetails_sync_file">Synchroniseren</string>
-    <string name="filedetails_renamed_in_upload_msg">Bestand is tijdens het uploaden hernoemd naar %1$s</string>
+    <string name="filedetails_renamed_in_upload_msg">Bestand hernoemd naar %1$s tijdens de upload</string>
     <string name="list_layout">Lijstoverzicht</string>
     <string name="action_share">Delen</string>
     <string name="common_yes">Ja</string>
     <string name="common_no">Nee</string>
     <string name="common_ok">OK</string>
     <string name="common_remove_upload">Upload verwijderen</string>
-    <string name="common_retry_upload">Upload opnieuw proberen</string>
+    <string name="common_retry_upload">Opnieuw uploaden</string>
     <string name="common_cancel_sync">Synchronisatie annuleren</string>
     <string name="common_cancel">Annuleren</string>
     <string name="common_back">Terug</string>
@@ -160,10 +162,10 @@
     <string name="uploader_info_dirname">Mapnaam</string>
     <string name="uploader_upload_in_progress_ticker">Uploaden&#160;&#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Uploaden van %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Uploaden gelukt </string>
+    <string name="uploader_upload_succeeded_ticker">Geüpload</string>
     <string name="uploader_upload_succeeded_content_single">%1$s geüpload</string>
     <string name="uploader_upload_failed_ticker">Uploaden mislukt</string>
-    <string name="uploader_upload_failed_content_single">Uploaden van %1$s kon niet voltooid worden</string>
+    <string name="uploader_upload_failed_content_single">Kon %1$s niet uploaden</string>
     <string name="uploader_upload_failed_credentials_error">Uploaden mislukt, je moet opnieuw inloggen</string>
     <string name="uploads_view_title">Uploads</string>
     <string name="uploads_view_group_current_uploads">Huidige</string>
@@ -180,31 +182,31 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Lokaal bestand niet gevonden</string>
     <string name="uploads_view_upload_status_failed_permission_error">Permissiefout</string>
     <string name="uploads_view_upload_status_conflict">Conflict</string>
-    <string name="uploads_view_upload_status_service_interrupted">App werd gesloten</string>
+    <string name="uploads_view_upload_status_service_interrupted">App afgesloten</string>
     <string name="uploads_view_upload_status_unknown_fail">Onbekende fout</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Wachten op wifi-verbinding</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Wachten op Wi-Fi verbinding</string>
     <string name="uploads_view_later_waiting_to_upload">Wachten om te uploaden</string>
     <string name="downloader_download_in_progress_ticker">Downloaden&#160;&#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Downloaden van %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Downloaden gelukt</string>
+    <string name="downloader_download_succeeded_ticker">Gedownload</string>
     <string name="downloader_download_succeeded_content">%1$s gedownload.</string>
     <string name="downloader_download_failed_ticker">Downloaden mislukt</string>
-    <string name="downloader_download_failed_content">Downloaden van %1$s kon niet worden voltooid</string>
+    <string name="downloader_download_failed_content">Kon %1$s niet downloaden</string>
     <string name="downloader_not_downloaded_yet">Nog niet gedownload</string>
     <string name="downloader_download_failed_credentials_error">Downloaden mislukt, je moet opnieuw inloggen</string>
     <string name="common_choose_account">Account kiezen</string>
     <string name="sync_fail_ticker">Synchronisatie mislukt</string>
     <string name="sync_fail_ticker_unauthorized">Synchronisatie mislukt, je moet opnieuw inloggen</string>
     <string name="sync_fail_content">Synchronisatie van %1$s kon niet worden voltooid</string>
-    <string name="sync_fail_content_unauthorized">Ongeldig wachtwoord voor %1$s</string>
+    <string name="sync_fail_content_unauthorized">Onjuist wachtwoord voor %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Conflicten gevonden</string>
     <string name="sync_conflicts_in_favourites_content">%1$d gesynchroniseerd te houden bestanden konden niet worden gesynchroniseerd</string>
     <string name="sync_fail_in_favourites_ticker">Gesynchroniseerd te houden bestanden mislukt</string>
     <string name="sync_fail_in_favourites_content">Inhoud van %1$d bestanden kon niet worden gesynchroniseerd (%2$d conflicten)</string>
     <string name="sync_foreign_files_forgotten_ticker">Een paar lokale bestanden werden vergeten</string>
     <string name="sync_foreign_files_forgotten_content">%1$d bestanden uit de %2$s-map konden niet worden gekopieerd naar</string>
-    <string name="sync_foreign_files_forgotten_explanation">Vanaf versie 1.3.16 worden bestanden die vanaf dit apparaat worden geüpload ook gekopieerd naar de lokale map %1$s om gegevensverlies te voorkomen als een enkel bestand wordt gesynchroniseerd met meerdere accounts.\n\nDoor deze aanpassing werden alle bestanden die met een eerdere versie zijn geüpload gekopieerd naar de map %2$s. Maar een fout voorkwam het succesvol afronden van deze actie tijdens het synchroniseren. Je kunt de/het bestand(en) laten staan zoals ze nu zijn en de link naar %3$s verwijderen, of je kunt de bestanden verplaatsen naar de map %1$s en de link naar %4$s laten staan.\n\nHieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar verwezen.</string>
-    <string name="sync_current_folder_was_removed">Map %1$s bestaat niet meer</string>
+    <string name="sync_foreign_files_forgotten_explanation">Vanaf versie 1.3.16 worden bestanden die vanaf dit apparaat worden geüpload ook gekopieerd naar de lokale map %1$s om gegevensverlies te voorkomen als een enkel bestand wordt gesynchroniseerd met meerdere accounts.\n\nDoor deze aanpassing werden alle bestanden die met een eerdere versie zijn geüpload gekopieerd naar de map %2$s. Maar een fout voorkwam het succesvol afronden van deze actie tijdens het synchroniseren. Je kunt de/het bestand(en) laten staan zoals ze nu zijn en de link naar %3$s verwijderen, of je kunt de bestanden verplaatsen naar  map %1$s en de link naar %4$s laten staan.\n\nHieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar verwezen.</string>
+    <string name="sync_current_folder_was_removed">Map %1$s bestaat niet meer</string>
     <string name="foreign_files_move">Alles verplaatsen</string>
     <string name="foreign_files_success">Alle bestanden zijn verplaatst</string>
     <string name="foreign_files_fail">Een paar bestanden konden niet worden verplaatst</string>
@@ -228,15 +230,15 @@
     <string name="media_event_done">%1$s afspelen beëindigd</string>
     <string name="media_err_nothing_to_play">Geen mediabestand gevonden</string>
     <string name="media_err_no_account">Geen account opgegeven</string>
-    <string name="media_err_not_in_owncloud">Bestand niet in een geldig account</string>
+    <string name="media_err_not_in_owncloud">Het bestand hoort niet bij een geldig account</string>
     <string name="media_err_unsupported">Niet-ondersteunde mediacodec</string>
-    <string name="media_err_io">Mediabestand kon niet worden gelezen</string>
+    <string name="media_err_io">Kon het mediabestand niet lezen</string>
     <string name="media_err_malformed">Mediabestand niet goed gecodeerd</string>
-    <string name="media_err_timeout">Time-out tijdens het spelen</string>
+    <string name="media_err_timeout">Time-out tijdens het afspelen</string>
     <string name="media_err_invalid_progressive_playback">Mediabestand kan niet worden gestreamd</string>
     <string name="media_err_unknown">Mediabestand kan niet worden afgespeeld met de standaard mediaplayer</string>
     <string name="media_err_security_ex">Beveiligingsfout bij afspelen %1$s</string>
-    <string name="media_err_io_ex">Invoerfout bij afspelen %1$1s</string>
+    <string name="media_err_io_ex">Invoerfout bij afspelen %1$s</string>
     <string name="media_err_unexpected">Onverwachte fout bij afspelen %1$s</string>
     <string name="media_rewind_description">Terugpoelknop</string>
     <string name="media_play_pause_description">Speel- of pauzeknop</string>
@@ -252,10 +254,10 @@
 	<string name="auth_account_not_new">Er bestaat al een account voor deze gebruiker en server op dit apparaat</string>
 	<string name="auth_account_not_the_same">De opgegeven gebruiker komt niet overeen met de gebruiker van dit account</string>
 	<string name="auth_unknown_error_title">Onbekende fout opgetreden!</string>
-	<string name="auth_unknown_host_title">Kon host niet vinden</string>
-	<string name="auth_incorrect_path_title">Serverinstantie niet gevonden</string>
+	<string name="auth_unknown_host_title">Kon server niet vinden</string>
+	<string name="auth_incorrect_path_title">Server niet gevonden</string>
 	<string name="auth_timeout_title">De server reageerde niet op tijd</string>
-	<string name="auth_incorrect_address_title">Verkeerd serveradresformaat</string>
+	<string name="auth_incorrect_address_title">Verkeerd adresformaat voor server</string>
 	<string name="auth_ssl_general_error_title">SSL-initialisatie mislukt</string>
 	<string name="auth_ssl_unverified_server_title">Kon de identiteit van de SSL-server niet verifiëren</string>
 	<string name="auth_bad_oc_version_title">Niet-herkende serverversie</string>
@@ -264,16 +266,16 @@
 	<string name="auth_unauthorized">Verkeerde gebruikersnaam of wachtwoord</string>
 	<string name="auth_oauth_error">Autorisatie niet succesvol</string>
 	<string name="auth_oauth_error_access_denied">Toegang geweigerd door autorisatieserver</string>
-	<string name="auth_wtf_reenter_URL">Onverwachte toestand; voer nogmaals het serveradres in</string>
+	<string name="auth_wtf_reenter_URL">Onverwachte toestand; voer het serveradres opnieuw in</string>
 	<string name="auth_expired_oauth_token_toast">Je autorisatie is verstreken. Autoriseer opnieuw</string>
 	<string name="auth_expired_basic_auth_toast">Voer het huidige wachtwoord in</string>
 	<string name="auth_expired_saml_sso_token_toast">Je sessie is verstreken. Verbind opnieuw</string>
-	<string name="auth_connecting_auth_server">Verbinden met authenticatieserver&#160;&#8230;</string>
+	<string name="auth_connecting_auth_server">Verbinden met authenticatieserver...</string>
 	<string name="auth_unsupported_auth_method">De server ondersteunt deze authenticatiemethode niet</string>
 	<string name="auth_unsupported_multiaccount">%1$s ondersteunt het gebruik van meerdere accounts niet</string>
 	<string name="auth_fail_get_user_name">Je server geeft geen goede userid terug, neem contact op met je beheerder</string>
 	<string name="auth_can_not_auth_against_server">Kan niet autenticeren tegen deze server</string>
-    <string name="auth_account_does_not_exist">Het account bestaat nog niet in dit apparaat</string>
+    <string name="auth_account_does_not_exist">Account bestaan nog niet op dit apparaat</string>
     
     <string name="favorite">Offline beschikbaar maken</string>
     <string name="unfavorite">Niet langer offline beschikbaar maken</string>
@@ -284,26 +286,26 @@
     <string name="confirmation_remove_file_alert">Wil je %1$s echt verwijderen?</string>
     <string name="confirmation_remove_folder_alert">Wil je %1$s en de inhoud ervan werkelijk verwijderen?</string>
     <string name="confirmation_remove_local">Alleen lokaal</string>
-    <string name="remove_success_msg">Succesvol verwijderd</string>
+    <string name="remove_success_msg">Verwijderd</string>
     <string name="remove_fail_msg">Verwijderen mislukt</string>
     <string name="rename_dialog_title">Voer een nieuwe naam in</string>
     <string name="rename_local_fail_msg">Lokale kopie kon niet worden hernoemd; probeer een andere naam</string>
-    <string name="rename_server_fail_msg">Hernoemen kon niet worden voltooid</string>
-    <string name="sync_file_fail_msg">Extern bestand kon niet worden gecontroleerd</string>
+    <string name="rename_server_fail_msg">Kon de server geen nieuwe naam geven</string>
+    <string name="sync_file_fail_msg">Kon extern bestand niet controleren</string>
     <string name="sync_file_nothing_to_do_msg">Bestandsinhoud is al gesynchroniseerd</string>
-    <string name="create_dir_fail_msg">Map kon niet worden aangemaakt</string>
+    <string name="create_dir_fail_msg">Kan map niet aanmaken</string>
     <string name="filename_forbidden_characters">Verboden tekens: / \\ &lt; &gt; : " | ? *</string>
     <string name="filename_forbidden_charaters_from_server">De bestandsnaam bevat ten minste één ongeldig teken</string>
     <string name="filename_empty">Bestandsnaam mag niet leeg zijn</string>
-    <string name="wait_a_moment">Even geduld</string>
+    <string name="wait_a_moment">Even geduld...</string>
     <string name="wait_checking_credentials">Opgeslagen inloggegevens nakijken</string>
     <string name="filedisplay_unexpected_bad_get_content">Onverwacht probleem; probeer het bestand met een andere app te selecteren</string>
-    <string name="filedisplay_no_file_selected">Er werd geen bestand geselecteerd</string>
+    <string name="filedisplay_no_file_selected">Geen bestand geselecteerd</string>
     <string name="activity_chooser_title">Verstuur link naar &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Bestand vanaf privéopslag kopiëren</string>
     
     <string name="oauth_check_onoff">Inloggen met oAuth2</string> 
-    <string name="oauth_login_connection">Verbinden met oAuth2-server&#160;&#8230;</string>    
+    <string name="oauth_login_connection">Verbinden met OAuth 2 server…</string>    
         
     <string name="ssl_validator_header">De identiteit van de site kan niet worden gecontroleerd</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Het servercertificaat wordt niet vertrouwd</string>
@@ -335,16 +337,16 @@
 
     <string name="placeholder_sentence">Dit is een plaatshouder</string>
     <string name="placeholder_filename">plaatshouder.txt</string>
-    <string name="placeholder_filetype">PNG-afbeelding</string>
+    <string name="placeholder_filetype">PNG afbeelding</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Alleen via wifi uploaden</string>
-    <string name="instant_upload_on_wifi">Afbeeldingen alleen via WiFi uploaden</string>
-    <string name="instant_video_upload_on_wifi">Videos alleen via WiFi uploaden</string>
-    <string name="instant_video_upload_on_charging">Alleen tijdens opladen uploaden</string>
-    <string name="instant_upload_on_charging">Alleen tijdens opladen uploaden</string>
+    <string name="auto_upload_on_wifi">Alleen uploaden via Wi-Fi</string>
+    <string name="instant_upload_on_wifi">Alleen afbeeldingen uploaden via Wi-Fi</string>
+    <string name="instant_video_upload_on_wifi">Alleen video\'s uploaden via Wi-Fi</string>
+    <string name="instant_video_upload_on_charging">Alleen uploaden bij opladen</string>
+    <string name="instant_upload_on_charging">Alleen uploaden bij opladen</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="conflict_title">Bestandsconflict</string>
     <string name="conflict_message">Welke bestanden wil je bewaren? Als je beide versies selecteert zal het lokale bestand een volgnummer aan de naam toegevoegd krijgen.</string>
@@ -352,9 +354,9 @@
     <string name="conflict_use_local_version">lokale versie</string>
     <string name="conflict_use_server_version">serverversie</string>
 
-    <string name="preview_sorry">Sorry hiervoor!</string>
+    <string name="preview_sorry">Sorry.</string>
     <string name="preview_image_description">Voorvertoning van afbeelding</string>
-    <string name="preview_image_error_unknown_format">Afbeelding kan niet worden getoond</string>
+    <string name="preview_image_error_unknown_format">Kan afbeelding niet tonen</string>
 
     <string name="error__upload__local_file_not_copied">%1$s kon niet worden gekopieerd naar de lokale map %2$s</string>
     <string name="prefs_instant_upload_path_title">Directe-uploadmap</string>
@@ -387,6 +389,7 @@
     <string name="network_error_socket_timeout_exception">Er trad een fout op bij het wachten op de server, de verwerking kon niet plaatsvinden</string>
     <string name="network_error_connect_timeout_exception">Er trad een fout op bij het wachten op de server, de verwerking kon niet plaatsvinden</string>
     <string name="network_host_not_available">De verwerking kon niet plaatsvinden, de server is niet beschikbaar</string>
+
     <string name="forbidden_permissions">Je mist autorisatie %s</string>
     <string name="forbidden_permissions_rename">om dit bestand te hernoemen</string>
     <string name="forbidden_permissions_delete">om dit bestand te verwijderen</string>
@@ -399,14 +402,14 @@
 
     <string name="file_migration_dialog_title">Opslagpad bijwerken</string>
     <string name="file_migration_finish_button">Afronden</string>
-    <string name="file_migration_preparing">Voorbereiden van migratie&#160;&#8230;</string>
+    <string name="file_migration_preparing">Voorbereiden van migratie&#8230;</string>
     <string name="file_migration_checking_destination">Doelmap controleren&#160;&#8230;</string>
-    <string name="file_migration_saving_accounts_configuration">Accountconfiguratie opslaan&#160;&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Wachten op onvoltooide synchronisaties&#160;&#8230;</string>
+    <string name="file_migration_saving_accounts_configuration">Accountconfiguratie opslaan&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Wachten op onvoltooide synchronisaties&#8230;</string>
     <string name="file_migration_migrating">Gegevens verplaatsen&#160;&#8230;</string>
     <string name="file_migration_updating_index">Index bijwerken&#160;&#8230;</string>
     <string name="file_migration_cleaning">Opruimen&#160;&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">Accountconfiguratie herstellen&#160;&#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">Accountconfiguratie herstellen&#8230;</string>
     <string name="file_migration_ok_finished">Afgerond</string>
     <string name="file_migration_failed_not_enough_space">FOUT: Niet genoeg ruimte</string>
     <string name="file_migration_failed_not_writable">FOUT: Bestand niet beschrijfbaar</string>
@@ -416,8 +419,8 @@
     <string name="file_migration_failed_while_updating_index">FOUT: Tijdens bijwerken index</string>
 
     <string name="file_migration_directory_already_exists">Gegevensmap bestaat al, wat te doen?</string>
-    <string name="file_migration_override_data_folder">Overschrijven</string>
-    <string name="file_migration_use_data_folder">Bestaande gebruiken</string>
+    <string name="file_migration_override_data_folder">Vervangen</string>
+    <string name="file_migration_use_data_folder">Gebruiken</string>
 
     <string name="prefs_category_accounts">Accounts</string>
     <string name="prefs_add_account">Account toevoegen</string>
@@ -543,8 +546,8 @@
     <string name="learn_more">Meer weten</string>
     <string name="drawer_folder_sync">Automatisch uploaden</string>
     <string name="drawer_participate">Meedoen</string>
-    <string name="participate_testing_headline">Help ons testen</string>
-    <string name="participate_testing_bug_text">Foutje gevonden? Of iets raars?</string>
+    <string name="participate_testing_headline">Help bij testen</string>
+    <string name="participate_testing_bug_text">Bug gevonden? Rare dingen?</string>
     <string name="participate_testing_report_text">Meld het op Github</string>
     <string name="participate_testing_version_text">Geïnteresseerd om ons te helpen de volgende versie te testen?</string>
     <string name="participate_beta_headline">Test de dev versie</string>
@@ -555,7 +558,7 @@
     <string name="participate_contribute_irc_text">Doe mee met de chat op IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">Help andere gebruikers in de &lt;a href="%1$s">forums&lt;/a></string>
     <string name="participate_contribute_translate_text">&lt;a href="%1$s">Vertaal&lt;/a> de app</string>
-    <string name="participate_contribute_github_text">Doe mee als ontwikkelaar, zie &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a> voor details</string>
+    <string name="participate_contribute_github_text">Review, voeg toe en schrijf code, bekijk &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> voor details</string>
     <string name="move_to">Verplaats naar&#160;&#8230;</string>
     <string name="copy_to">Kopieer naar&#160;&#8230;</string>
     <string name="choose_remote_folder">Kies map&#160;&#8230;</string>
@@ -643,6 +646,7 @@
 
     <!-- Notifications -->
     <string name="new_notification_received">Nieuwe meldingen ontvangen</string>
+    <string name="drawer_logout">Uitloggen</string>
 
 
 </resources>

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

@@ -43,11 +43,13 @@
     <string name="prefs_accounts">Konta</string>
     <string name="prefs_manage_accounts">Zarządzaj kontami</string>
     <string name="prefs_passcode">Blokada hasłem</string>
+    <string name="prefs_fingerprint">Blokada odciskiem palca</string>
+    <string name="prefs_fingerprint_notsetup">Brak skonfigurowanych odcisków palców</string>
     <string name="prefs_show_hidden_files">Pokaż ukryte pliki</string>
-    <string name="prefs_instant_upload">Natychmiastowa wysyłka obrazów</string>
-    <string name="prefs_instant_upload_summary">Wysyłaj od razu zdjęcia zrobione aparatem</string>
-    <string name="prefs_instant_video_upload">Natychmiastowa wysyłka wideo</string>
-    <string name="prefs_instant_video_upload_summary">Wysyłaj od razu filmy nagrane aparatem</string>
+    <string name="prefs_instant_upload">Natychmiastowe wysyłanie zdjęć</string>
+    <string name="prefs_instant_upload_summary">Wyślij zdjęcia z aparatu</string>
+    <string name="prefs_instant_video_upload">Natychmiastowe wysyłanie wideo</string>
+    <string name="prefs_instant_video_upload_summary">Wyślij filmy nagrane aparatem</string>
     <string name="prefs_log_title">Włącz logowanie</string>
     <string name="prefs_log_summary">To jest używane do logowania problemów</string>
     <string name="prefs_log_title_history">Historia logowania</string>
@@ -56,19 +58,14 @@
     <string name="prefs_calendar_contacts">Synchronizuj kalendarz i kontakty</string>
     <string name="prefs_calendar_contacts_summary">Skonfiguruj DAVdroid (v1.3.0+) dla obecnego konta</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Adres serwera dla konta nie mógł został przekonwertowany do DAVdroid</string>
-    <string name="prefs_calendar_contacts_no_store_error">Brak aplikacji Google Play lub F-Droida</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Synchronizacja kontaktów i kalendarza została skonfigurowana pomyślnie</string>
+    <string name="prefs_calendar_contacts_no_store_error">F-droid i Google Play nie są zainstalowane</string>
     <string name="prefs_help">Pomoc</string>
     <string name="prefs_recommend">Poleć znajomemu</string>
     <string name="prefs_feedback">Opinie</string>
     <string name="prefs_imprint">Stopka</string>
-    <string name="prefs_remember_last_share_location">Zapamiętaj lokalizację udostępnienia</string>
-    <string name="prefs_remember_last_upload_location_summary">Zapamiętaj ostatnią lokalizację wysyłania</string>
-
-	<string name="recommend_subject">Wypróbuj %1$s na swoim smartfonie!</string>
-	<string name="recommend_text">Zapraszam do użycia %1$s na swoim smartfonie!\nŚciągnij tutaj: %2$s</string>
-
-    <string name="auth_check_server">Sprawdź serwer</string>
+    <string name="prefs_remember_last_share_location">Zapamiętaj położenie udostępnienia</string>
+    <string name="recommend_subject">Wypróbuj %1$s na swoim smartfonie!</string>
+	<string name="auth_check_server">Sprawdź serwer</string>
     <string name="auth_host_url">Adres serwera https://...</string>
     <string name="auth_username">Nazwa użytkownika</string>
     <string name="auth_password">Hasło</string>
@@ -84,42 +81,41 @@
     <string name="uploader_error_title_no_file_to_upload">Brak plików do przesłania</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s nie można przesłać części tekstu jako pliku.</string>
     <string name="uploader_error_message_no_file_to_upload">Odebrane dane nie zawierają prawidłowego pliku.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">Plik nie może być przesłany</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Ten plik nie może być wysłany</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s nie jest autoryzowany do odczytu odebranego pliku</string>
-    <string name="uploader_error_message_source_file_not_found">Plik do wysłania nie został znaleziony w swojej lokalizacji. Proszę sprawdzić czy w ogóle istnieje.</string>
-    <string name="uploader_error_message_source_file_not_copied">Wystąpił błąd podczas kopiowania pliku do folderu tymczasowego. Proszę spróbować przesłać go ponownie.</string>
+    <string name="uploader_error_message_source_file_not_found">Wybrany plik nie został znaleziony. Proszę sprawdzić czy plik istnieje.</string>
+    <string name="uploader_error_message_source_file_not_copied">Nie udało się skopiować pliku do folderu tymczasowego. Spróbuj ponownie.</string>
     <string name="uploader_upload_files_behaviour">Opcja wysłania:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Przenieś plik do folderu Nextcloud</string>
     <string name="uploader_upload_files_behaviour_only_upload">Zachowaj plik w katalogu źródłowym</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Skasuj plik z katalogu źródłowego</string>
     <string name="file_list_seconds_ago">sekund temu</string>
-    <string name="file_list_empty_headline">Nie ma tu plików</string>
-    <string name="file_list_empty">Wyślij pliki lub zsynchronizuj z twoimi urządzeniami!</string>
-    <string name="file_list_empty_favorites">Oznacz pliki jako ulubione lub synchrozniuj ze swoimi urządzeniami!</string>
-    <string name="file_list_empty_favorites_filter_list">Pliki i foldery oznaczone jako ulubione pokażą się tutaj</string>
-    <string name="file_list_empty_favorites_filter">Nie znaleziono ulbionych plików dla twojego zapytania!</string>
+    <string name="file_list_empty_headline">Brak plików</string>
+    <string name="file_list_empty">Wyślij zawartość lub synchronizuj ją ze swoimi urządzeniami</string>
+    <string name="file_list_empty_favorites">Dodaj pliki do ulubionych lub synchronizuj je ze swoimi urządzeniami</string>
+    <string name="file_list_empty_favorites_filter_list">Tutaj znajdziesz pliki i foldery oznaczone jako ulubione</string>
+    <string name="file_list_empty_favorites_filter">Twoje wyszukiwanie nie zwróciło żadnych ulubionych plików</string>
     <string name="file_list_loading">Wczytywanie&#8230;</string>
-    <string name="file_list_no_app_for_file_type">Brak aplikacji dla tego typu plików!</string>
+    <string name="file_list_no_app_for_file_type">Brak aplikacji dla tego typu plików.</string>
     <string name="local_file_list_empty">Nie ma plików w tym folderze.</string>
     <string name="file_list_empty_headline_search">Brak wyników w tym folderze</string>
     <string name="file_list_empty_headline_server_search">Brak wyników</string>
+    <string name="file_list_empty_favorite_headline">Brak ulubionych</string>
     <string name="file_list_empty_shared_headline">Nic nie jest jeszcze współdzielone</string>
     <string name="file_list_empty_shared">Pliki i foldery, które współdzielisz pokażą się tutaj</string>
     <string name="file_list_empty_headline_server_search_videos">Brak plików wideo</string>
     <string name="file_list_empty_headline_server_search_photos">Brak zdjęć</string>
-    <string name="file_list_empty_search">Spróbować szukać w innym folderze?</string>
-    <string name="file_list_empty_recently_modified">Nie znaleziono plików zmodyfikowanych w ostatnich 7 dniach</string>
-    <string name="file_list_empty_recently_modified_filter">Żadne pliki z twojego zapytania, które zostały zmodyfikowane
-        w ostatnich 7 dniach nie zostały znalezione!</string>
-    <string name="file_list_empty_recently_added">Nie znaleziono żadnych ostatnio dodanych plików</string>
-    <string name="file_list_empty_recently_added_filter">Nie znaleziono żadnych ostatnio dodanych plików dla twojego zapytania!</string>
-    <string name="file_list_empty_text_photos">Wyślij zdjęcia lub aktywuj automatyczne wysyłanie!</string>
-    <string name="file_list_empty_text_photos_filter">Żadnych zdjęć nie znaleziono dla twojego zapytania!</string>
-    <string name="file_list_empty_text_videos">Wyślij wideo lub aktywuj automatycznze wysyłanie!</string>
-    <string name="file_list_empty_text_videos_filter">Żadnych plików wideo nie znaleziono dla twojego zapytania!</string>
+    <string name="file_list_empty_recently_modified">Nie znaleziono żadnych plików zmodyfikowanych w ciągu ostatnich 7 dni</string>
+    <string name="file_list_empty_recently_modified_filter">Twoje wyszukiwanie nie zwróciło żądnych plików zmodyfikowanych w ciągu ostatnich 7 dni </string>
+    <string name="file_list_empty_recently_added">NIe znaleziono żadnych ostatnio dodanych plików</string>
+    <string name="file_list_empty_recently_added_filter">Twoje wyszukiwanie nie zwróciło żadnych ostatnio dodanych plików</string>
+    <string name="file_list_empty_text_photos">Wyślij zdjęcia lub włącz automatyczne wysyłanie</string>
+    <string name="file_list_empty_text_photos_filter">Twoje wyszukiwanie nie zwróciło żadnych zdjęć</string>
+    <string name="file_list_empty_text_videos">Wyślij pliki wideo lub włącz automatyczne wysyłanie</string>
+    <string name="file_list_empty_text_videos_filter">Twoje wyszukiwanie nie zwróciło żadnych plików wideo</string>
     <string name="upload_list_empty_headline">Brak dostępnych danych do wysłania</string>
-    <string name="upload_list_empty_text">Wyślij jakieś dane lub włącz wysyłanie natychmiastowe!</string>
-    <string name="upload_list_empty_text_auto_upload">Wyślij jakąś zawartość lub aktywuj automatyczne wysyłanie!</string>
+    <string name="upload_list_empty_text">Wyślij zawartość lub włącz wysyłanie natychmiastowe.</string>
+    <string name="upload_list_empty_text_auto_upload">Wyślij zawartość lub włącz wysyłanie automatyczne.</string>
     <string name="file_list_folder">folder</string>
     <string name="file_list_folders">foldery</string>
     <string name="file_list_file">plik</string>
@@ -131,14 +127,13 @@
     <string name="filedetails_modified">Zmodyfikowano:</string>
     <string name="filedetails_download">Pobierz</string>
     <string name="filedetails_sync_file">Synchronizuj</string>
-    <string name="filedetails_renamed_in_upload_msg">Podczas wysyłania nazwa pliku została zmieniona na %1$s</string>
-    <string name="list_layout">Wygląd listy</string>
+    <string name="filedetails_renamed_in_upload_msg">Podczas wysyłania zmieniono nazwę pliku na %1$s</string>
     <string name="action_share">Udostępnij</string>
     <string name="common_yes">Tak</string>
     <string name="common_no">Nie</string>
     <string name="common_ok">OK</string>
     <string name="common_remove_upload">Usuń</string>
-    <string name="common_retry_upload">Spróbuj przesłać jeszcze raz</string>
+    <string name="common_retry_upload">Ponów wysyłanie</string>
     <string name="common_cancel_sync">Anuluj synchronizację</string>
     <string name="common_cancel">Anuluj</string>
     <string name="common_back">Wróć</string>
@@ -158,10 +153,10 @@
     <string name="uploader_info_dirname">Nazwa folderu</string>
     <string name="uploader_upload_in_progress_ticker">Wysyłam &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Wysyłanie %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Wysyłanie zakończone powodzeniem</string>
+    <string name="uploader_upload_succeeded_ticker">Wysłano</string>
     <string name="uploader_upload_succeeded_content_single">Wysłano %1$s</string>
     <string name="uploader_upload_failed_ticker">Wysyłanie nie powiodło się</string>
-    <string name="uploader_upload_failed_content_single">Wysyłanie %1$s nie powiodło się</string>
+    <string name="uploader_upload_failed_content_single">Nie udało się wysłać %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Błąd przy wysyłaniu zaloguj się ponownie</string>
     <string name="uploads_view_title">Wysłane</string>
     <string name="uploads_view_group_current_uploads">Obecny</string>
@@ -178,37 +173,36 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Nie odnaleziono pliku lokalnego</string>
     <string name="uploads_view_upload_status_failed_permission_error">Błąd uprawnień</string>
     <string name="uploads_view_upload_status_conflict">Konflikt</string>
-    <string name="uploads_view_upload_status_service_interrupted">Program został zatrzymany</string>
+    <string name="uploads_view_upload_status_service_interrupted">Aplikacja została zatrzymana</string>
     <string name="uploads_view_upload_status_unknown_fail">Nieznany błąd</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Oczekiwanie na połączenie bezprzewodowe</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Oczekiwanie na połączenie Wi-Fi</string>
     <string name="uploads_view_later_waiting_to_upload">Oczekuję na przesyłanie</string>
     <string name="downloader_download_in_progress_ticker">Pobieranie &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Pobieranie %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Pobieranie zakończone</string>
+    <string name="downloader_download_succeeded_ticker">Pobrano</string>
     <string name="downloader_download_succeeded_content">%1$s pobrano</string>
     <string name="downloader_download_failed_ticker">Pobieranie nieudane</string>
-    <string name="downloader_download_failed_content">Pobieranie %1$s nie powiodło się</string>
+    <string name="downloader_download_failed_content">Nie udało się pobrać %1$s</string>
     <string name="downloader_not_downloaded_yet">Jeszcze nie pobrane</string>
     <string name="downloader_download_failed_credentials_error">Błąd podczas pobierania, zaloguj się ponownie</string>
     <string name="common_choose_account">Wybierz konto</string>
     <string name="sync_fail_ticker">Nieudana synchronizacja </string>
-    <string name="sync_fail_ticker_unauthorized">Nieudana synchronizacja, zaloguj się ponownie</string>
-    <string name="sync_fail_content">Nie udało się zakończyć synchronizacji %1$s</string>
-    <string name="sync_fail_content_unauthorized">Niepoprawne hasło dla %1$s</string>
+    <string name="sync_fail_ticker_unauthorized">Synchronizacja nieudana, zaloguj się ponownie</string>
+    <string name="sync_fail_content">Nie udało się zsynchronizować %1$s</string>
+    <string name="sync_fail_content_unauthorized">Błędne hasło dla %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Znaleziono konflikty</string>
     <string name="sync_conflicts_in_favourites_content">%1$d synchronizowanych plików nie może zostać zsynchronizowanych</string>
     <string name="sync_fail_in_favourites_ticker">Synchronizacja plików nie powiodła się</string>
     <string name="sync_fail_in_favourites_content">Zawartość %1$d plików nie może zostać synchronizowana (%2$d konfliktów)</string>
     <string name="sync_foreign_files_forgotten_ticker">Niektóre lokalne pliki zostały zgubione.</string>
     <string name="sync_foreign_files_forgotten_content">%1$d plików z folderu %2$s nie udało się się przekopiować</string>
-    <string name="sync_foreign_files_forgotten_explanation">Od wersji 1.3.16, pliki wysyłane z tego urządzenia są kopiowane do lokalnego folderu %1$s aby zapobiec utracie danych gdy pojedynczy plik jest synchronizowany z wieloma kontami.\n\nZ powodu tej zmiany, wszystkie pliki wysłane za pomocą poprzedniej wersji tej aplikacji były kopiowane do folderu %2$s. Jednakże, błąd uniemożliwiał dokończenie tej operacji podczas synchronizacji konta. Możesz albo pozostawić plik(i) tak jak jest i usunąć link do %3$s lub przenieść plik(i) do folderu %1$s i pozostawić link do %4$s.\n\nPoniżej plik(i) lokalny i plik(i) zdalny w %5$s, do którego zostały zlinkowane.</string>
-    <string name="sync_current_folder_was_removed">Folder  %1$s nie istnieje.</string>
+    <string name="sync_current_folder_was_removed">Folder %1$s nie istnieje</string>
     <string name="foreign_files_move">Przenieś wszystko</string>
     <string name="foreign_files_success">Wszystkie pliki zostały przeniesione</string>
     <string name="foreign_files_fail">Niektóre pliki nie mogły być przeniesione</string>
     <string name="foreign_files_local_text">Lokalnie: %1$s</string>
     <string name="foreign_files_remote_text">Zdalnie: %1$s</string>
-    <string name="upload_query_move_foreign_files">Nie ma wystarczającego miejsca, aby skopiować wybrane pliki do folderu %1$s. Czy w zamian chciałbyś je tam przenieść?</string>
+    <string name="upload_query_move_foreign_files">Brak wystarczającego miejsca, aby skopiować wybrane pliki do folderu %1$s. Czy w zamian chcesz je tam przenieść?</string>
     <string name="pass_code_enter_pass_code">Wymyśl kod PIN.</string>
     
     <string name="pass_code_configure_your_pass_code">Wpisz kod PIN.</string>
@@ -226,15 +220,14 @@
     <string name="media_event_done">%1$s odtwarzanie zakończone</string>
     <string name="media_err_nothing_to_play">Nie znaleziono plików multimedialnych</string>
     <string name="media_err_no_account">Nie znaleziono konta</string>
-    <string name="media_err_not_in_owncloud">Plik na nieprawidłowym koncie</string>
     <string name="media_err_unsupported">Nieobsługiwany kodek multimediów</string>
-    <string name="media_err_io">Błąd odczytu pliku multimedialnego</string>
-    <string name="media_err_malformed">Błąd kodowania pliku multimedialnego</string>
-    <string name="media_err_timeout">Upłynął limit czasu podczas próby odtwarzania</string>
-    <string name="media_err_invalid_progressive_playback">Plik mediów nie może być przesyłany strumieniowo</string>
-    <string name="media_err_unknown">Plik multimediów nie może być odtworzony we wbudowanym odtwarzaczu</string>
-    <string name="media_err_security_ex">Błąd zabezpieczeń podczas próby odtworzenia %1$s</string>
-    <string name="media_err_io_ex">Błąd wprowadzania podczas próby odtworzenia %1$s</string>
+    <string name="media_err_io">NIe można odczytać pliku</string>
+    <string name="media_err_malformed">Nieprawidłowe kodowanie pliku multimedialnego</string>
+    <string name="media_err_timeout">Upłynął limit czasu podczas próby odtwarzania pliku</string>
+    <string name="media_err_invalid_progressive_playback">Plik multimedialny nie może być przesyłany strumieniowo</string>
+    <string name="media_err_unknown">Wbudowany odtwarzacz multimediów nie może odtworzyć pliku</string>
+    <string name="media_err_security_ex">Napotkano błąd zabezpieczeń podczas próby odtwarzania %1$s</string>
+    <string name="media_err_io_ex">Błąd danych wejściowych podczas próby odtwarzania %1$s</string>
     <string name="media_err_unexpected">Nieoczekiwany błąd podczas próby odtworzenia %1$s</string>
     <string name="media_rewind_description">Przycisk przewijania do tyłu</string>
     <string name="media_play_pause_description">Przycisk odtwarzania / pauzowania</string>
@@ -247,31 +240,28 @@
 	<string name="auth_connection_established">Połączenie nawiązane</string>
 	<string name="auth_testing_connection">Testowanie połączenia</string>
 	<string name="auth_not_configured_title">Uszkodzona konfiguracja serwera</string>
-	<string name="auth_account_not_new">Konto tego samego użytkownika i serwera już istnieje na tym urządzeniu</string>
 	<string name="auth_account_not_the_same">Podany login nie pasuje do użytkowników </string>
 	<string name="auth_unknown_error_title">Wystąpił nieznany błąd!</string>
-	<string name="auth_unknown_host_title">Nie mogę znaleźć hosta</string>
-	<string name="auth_incorrect_path_title">Nie znaleziono instancji serwer</string>
+	<string name="auth_unknown_host_title">Nie znaleziono hosta</string>
+	<string name="auth_incorrect_path_title">Nie znaleziono serwera</string>
 	<string name="auth_timeout_title">Serwer zbyt długo nie odpowiadał</string>
-	<string name="auth_incorrect_address_title">Nieprawidłowy format adresu serwera</string>
+	<string name="auth_incorrect_address_title">Błędny format adresu serwera</string>
 	<string name="auth_ssl_general_error_title">Inicjowanie SSL nie powiodło się</string>
-	<string name="auth_ssl_unverified_server_title">Nie można zweryfikować tożsamości SSL serwera</string>
+	<string name="auth_ssl_unverified_server_title">Nie udało się zweryfikować tożsamości serwera SSL</string>
 	<string name="auth_bad_oc_version_title">Nie rozpoznano wersji serwera</string>
-	<string name="auth_wrong_connection_title">Nie można ustanowić połączenia</string>
+	<string name="auth_wrong_connection_title">Nie udało się ustanowić połączenia</string>
 	<string name="auth_secure_connection">Nawiązano bezpieczne połączenie</string>
 	<string name="auth_unauthorized">Zła nazwa użytkownika lub hasło</string>
 	<string name="auth_oauth_error">Nieudana autoryzacja</string>
 	<string name="auth_oauth_error_access_denied">Dostęp zabroniony przez serwer autoryzacji</string>
-	<string name="auth_wtf_reenter_URL">Nieoczekiwany stan. Podaj ponownie adres serwera</string>
 	<string name="auth_expired_oauth_token_toast">Twoja sesja wygasła. Proszę zaloguj się ponownie</string>
 	<string name="auth_expired_basic_auth_toast">Podaj aktualne hasło</string>
 	<string name="auth_expired_saml_sso_token_toast">Twoja sesja wygasła. Proszę zaloguj się ponownie</string>
-	<string name="auth_connecting_auth_server">Łączenie z serwerem poświadczeń...</string>
+	<string name="auth_connecting_auth_server">Łączenie z serwerem uwierzytelniania...</string>
 	<string name="auth_unsupported_auth_method">Serwer nie obsługuje tej metody autoryzacji</string>
 	<string name="auth_unsupported_multiaccount">%1$s nie wspiera wielu kont</string>
-	<string name="auth_fail_get_user_name">Twój serwer nie zwraca poprawnego identyfikatora użytkownika. Proszę skontaktuj się z administratorem.</string>
 	<string name="auth_can_not_auth_against_server">Błąd autoryzacji na tym serwerze</string>
-    <string name="auth_account_does_not_exist">Konto jeszcze nie istnieje na tym urządzeniu.</string>
+    <string name="auth_account_does_not_exist">Konto jeszcze nie istnieje na tym urządzeniu</string>
     
     <string name="favorite">Udostępnij w trybie offline</string>
     <string name="unfavorite">Wyłącz udostępnianie w trybie offline</string>
@@ -280,28 +270,28 @@
     <string name="common_rename">Zmień nazwę</string>
     <string name="common_remove">Usuń</string>
     <string name="confirmation_remove_file_alert">Czy naprawdę chcesz usunąć %1$s?</string>
-    <string name="confirmation_remove_folder_alert">Czy naprawdę chcesz usunąć %1$s i jego zawartość?</string>
+    <string name="confirmation_remove_folder_alert">Czy na pewno chcesz usunąć %1$s wraz z zawartością?</string>
     <string name="confirmation_remove_local">Tylko lokalnie</string>
     <string name="remove_success_msg">Usunięto</string>
     <string name="remove_fail_msg">Nie można usunąć</string>
     <string name="rename_dialog_title">Wprowadź nową nazwę</string>
-    <string name="rename_local_fail_msg">Nie można zmienić nazwy kopii lokalnej; spróbuj wybrać inną nazwę </string>
-    <string name="rename_server_fail_msg">Zmiana nazwy nie powiodła się</string>
-    <string name="sync_file_fail_msg">Nie można sprawdzić zdalnego pliku</string>
+    <string name="rename_local_fail_msg">Nie można zmienić nazwy kopii lokalne, użyj innej nazwy</string>
+    <string name="rename_server_fail_msg">Nie udało się nadać serwerowi nowej nazwy</string>
+    <string name="sync_file_fail_msg">Nie udało się sprawdzić zdalnego pliku</string>
     <string name="sync_file_nothing_to_do_msg">Zawartość pliku została już synchronizowana</string>
-    <string name="create_dir_fail_msg">Folder nie może zostać utworzony</string>
+    <string name="create_dir_fail_msg">Nie udało się utworzyć folderu</string>
     <string name="filename_forbidden_characters">Znaki zabronione: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</string>
     <string name="filename_empty">Nazwa pliku nie może być pusta.</string>
-    <string name="wait_a_moment">Poczekaj chwilę</string>
+    <string name="wait_a_moment">Proszę czekać...</string>
     <string name="wait_checking_credentials">Sprawdzanie danych</string>
-    <string name="filedisplay_unexpected_bad_get_content">Nieoczekiwany problem; spróbuj wybrać plik z innej aplikacji</string>
-    <string name="filedisplay_no_file_selected">Nie wybrano żadnych plików</string>
+    <string name="filedisplay_unexpected_bad_get_content">Nieoczekiwany błąd, prosze wybrać plik z innej aplikacji</string>
+    <string name="filedisplay_no_file_selected">Nie wybrano żadnego pliku</string>
     <string name="activity_chooser_title">Wyślij link do &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Kopiowanie pliku z prywatnego zasobu</string>
     
     <string name="oauth_check_onoff">Loguj przez oAuth2</string> 
-    <string name="oauth_login_connection">Łączenie z serwerem oAuth2...</string>    
+    <string name="oauth_login_connection">Łączenie z serwerem OAuth 2...</string>    
         
     <string name="ssl_validator_header">Nie można zweryfikować tożsamości strony</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Certyfikat serwera jest niezaufany</string>
@@ -309,7 +299,7 @@
     <string name="ssl_validator_reason_cert_not_yet_valid">- Certyfikat serwera jest wystawiony w przyszłości</string>
     <string name="ssl_validator_reason_hostname_not_verified">- URL nie pasuje do nazwy hosta w certyfikacie</string>
     <string name="ssl_validator_question">Zaakceptować certyfikat mimo wszystko?</string>
-    <string name="ssl_validator_not_saved">Nie można zapisać certyfikatu</string>
+    <string name="ssl_validator_not_saved">Nie udało się zapisac certyfikatu</string>
     <string name="ssl_validator_btn_details_see">Szczegóły</string>
     <string name="ssl_validator_btn_details_hide">Ukryj</string>
     <string name="ssl_validator_label_subject">Wydany dla:</string>
@@ -333,35 +323,35 @@
 
     <string name="placeholder_sentence">Tekst zastępczy</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Obraz PNG</string>
+    <string name="placeholder_filetype">obraz PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Wysyłaj tylko przez WiFi</string>
-    <string name="instant_upload_on_wifi">Wysyłaj zdjęcia tylko przez WiFi</string>
-    <string name="instant_video_upload_on_wifi">Wysyłaj filmy tylko przez WiFi</string>
+    <string name="auto_upload_on_wifi">Wysyłaj tylko przez Wi-Fi</string>
+    <string name="instant_upload_on_wifi">Wysyłaj zdjęcia tylko przez Wi-Fi</string>
+    <string name="instant_video_upload_on_wifi">Wysyłaj pliki wideo tylko przez Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Wysyłaj tylko podczas ładowania</string>
     <string name="instant_upload_on_charging">Wysyłaj tylko podczas ładowania</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="conflict_title">Konflikt pliku</string>
-    <string name="conflict_message">Które pliki chcesz zachować? Jeśli wybierzesz obie wersje, do nazwy pliku lokalnego zostanie dodana liczba.</string>
+    <string name="conflict_message">Które pliki chcesz zachować? Jeżeli wybierzesz obie wersje, do nazwy pliku lokalnego zostanie dodana liczba.</string>
     <string name="conflict_keep_both">Zatrzymaj oba</string>
     <string name="conflict_use_local_version">wersja lokalna</string>
     <string name="conflict_use_server_version">wersja zdalna</string>
 
-    <string name="preview_sorry">Przykro mi z tego powodu!</string>
+    <string name="preview_sorry">Przykro nam.</string>
     <string name="preview_image_description">Podgląd</string>
-    <string name="preview_image_error_unknown_format">Obraz nie może być pokazany</string>
+    <string name="preview_image_error_unknown_format">Nie można wyświetlić obrazu</string>
 
     <string name="error__upload__local_file_not_copied">%1$s nie może zostać skopiowany do lokalnego folderu %2$s</string>
-    <string name="prefs_instant_upload_path_title">Wysyłka obrazów do folderu</string>
+    <string name="prefs_instant_upload_path_title">Folder natychmiastowego wysyłania</string>
     <string name="prefs_folder_sync_local_path_title">Folder lokalny</string>
     <string name="prefs_folder_sync_remote_path_title">Folder zdalny</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Używaj podfolderów</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Zapisz w podfolderach opartych na roku oraz miesiącu</string>
 
-	<string name="share_link_no_support_share_api">Przepraszam, ale współdzielenie nie jest dostępne na twoim serwerze. Prosze skontaktuj się z administratorem.</string>
+	<string name="share_link_no_support_share_api">Współdzielenie nie jest włączone na serwerze. Skontaktuj się z administratorem.</string>
 	<string name="share_link_file_no_exist">Nie można udostępnić. Proszę sprawdzić, czy plik istnieje</string>
 	<string name="share_link_file_error">Wystąpił błąd podczas udostępniania tego pliku lub folderu.</string>
 	<string name="unshare_link_file_no_exist">Nie można wyłączyć udostępniania. Proszę sprawdzić, czy plik istnieje</string>
@@ -375,56 +365,54 @@
 
     <string name="copy_link">Skopiuj link</string>
     <string name="clipboard_text_copied">Skopiuj do schowka</string>
-    <string name="clipboard_no_text_to_copy">Nie odebrano tekstu, by skopiować go do schowka</string>
     <string name="clipboard_uxexpected_error">Wystąpił błąd podczas kopiowania do schowka</string>
     <string name="clipboard_label">Skopiowano tekst z %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Błąd krytyczny: nie można wykonać operacji</string>
+    <string name="error_cant_bind_to_operations_service">Błąd krytyczny: Nie można wykonać operacji</string>
+
+    <string name="network_error_socket_exception">Wystąpił błąd podczas łączenia z serwerem.</string>
+    <string name="network_error_socket_timeout_exception">Wystąpił błąd podczas oczekiwania na serwer. Operacja nie mogła zostać wykonana.</string>
+    <string name="network_error_connect_timeout_exception">Wystąpił błąd podczas oczekiwania na serwer. Operacja nie mogła zostać wykonana.</string>
+    <string name="network_host_not_available">Nie można ukończyć operacji. Serwer jest niedostępny.</string>
 
-    <string name="network_error_socket_exception">Pojawił się błąd podczas łączenia z serwerem.</string>
-    <string name="network_error_socket_timeout_exception">Pojawił się błąd podczas oczekiwania na serwer, operacja nie mogła zostać wykonana</string>
-    <string name="network_error_connect_timeout_exception">Pojawił się błąd podczas oczekiwania na serwer, operacja nie mogła zostać wykonana</string>
-    <string name="network_host_not_available">Nie można dokończyć operacji, serwer jest niedostępny</string>
-    <string name="forbidden_permissions">Nie masz uprawnień %s</string>
+    <string name="forbidden_permissions">%s nie masz uprawnień</string>
     <string name="forbidden_permissions_rename">do zmiany nazwy tego pliku</string>
     <string name="forbidden_permissions_delete">do usuwania tego pliku</string>
     <string name="share_link_forbidden_permissions">do współdzielenia tego pliku</string>
     <string name="unshare_link_forbidden_permissions">do zniesienia współdzielenia tego pliku</string>
     <string name="update_link_forbidden_permissions">aby uaktualnić ten udział</string>
-    <string name="forbidden_permissions_create">do utworzenia tego pliku</string>
-    <string name="uploader_upload_forbidden_permissions">do wgrania tego folderu</string>
+    <string name="forbidden_permissions_create">do stworzenia tego pliku</string>
+    <string name="uploader_upload_forbidden_permissions">do wysyłania do tego folderu</string>
     <string name="downloader_download_file_not_found">Ten plik nie jest już dostępny na serwerze</string>
 
     <string name="file_migration_dialog_title">Ścieżka przechowywania aktualizacji</string>
     <string name="file_migration_finish_button">Koniec</string>
-    <string name="file_migration_preparing">Przygotowanie do migracji&#8230;</string>
+    <string name="file_migration_preparing">Przygotowywanie migracji&#8230;</string>
     <string name="file_migration_checking_destination">Sprawdzanie docelowe&#8230;</string>
     <string name="file_migration_saving_accounts_configuration">Zapisywanie konfiguracji konta&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Oczekiwanie na niedokończone synchronizacje&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Oczekiwanie na zakończenie synchronizacji&#8230;</string>
     <string name="file_migration_migrating">Przenoszenie danych&#8230;</string>
     <string name="file_migration_updating_index">Aktualizacja indeksa&#8230;</string>
     <string name="file_migration_cleaning">Czyszczenie&#8230;</string>
     <string name="file_migration_restoring_accounts_configuration">Przywracanie konfiguracji konta&#8230;</string>
     <string name="file_migration_ok_finished">Skończone</string>
-    <string name="file_migration_failed_not_enough_space">BŁĄD: Za mało miejsca</string>
-    <string name="file_migration_failed_not_writable">BŁĄD: Plik nie jest zapisywalny</string>
-    <string name="file_migration_failed_not_readable">BŁĄD: Nie można odczytać pliku</string>
+    <string name="file_migration_failed_not_enough_space">BŁĄD: Brak miejsca</string>
+    <string name="file_migration_failed_not_writable">BŁĄD: Plik nie do zapisu</string>
+    <string name="file_migration_failed_not_readable">BŁĄD: Plik nie do odczytu </string>
     <string name="file_migration_failed_dir_already_exists">BŁĄD: Katalog Nextcloud już istnieje</string>
-    <string name="file_migration_failed_while_coping">BŁĄD: Podczas migracji</string>
-    <string name="file_migration_failed_while_updating_index">BŁĄD: Podczas aktualizacji indeksu</string>
+    <string name="file_migration_failed_while_coping">BŁĄD: Nieudana migracja</string>
+    <string name="file_migration_failed_while_updating_index">BŁĄD: Nieudana aktualizacja indeksu</string>
 
-    <string name="file_migration_directory_already_exists">Folder danych już istnieje, co zrobić?</string>
-    <string name="file_migration_override_data_folder">Nadpisanie</string>
-    <string name="file_migration_use_data_folder">Użyj istniejącego</string>
+    <string name="file_migration_directory_already_exists">Folder z danymi już istnieje. Wybierz jedną z następujących czynności:</string>
+    <string name="file_migration_override_data_folder">Zamień</string>
+    <string name="file_migration_use_data_folder">Użyj</string>
 
     <string name="prefs_category_accounts">Konta</string>
     <string name="prefs_add_account">Dodaj konto</string>
     <string name="drawer_manage_accounts">Zarządzaj kontami</string>
-    <string name="auth_redirect_non_secure_connection_title">Bezpieczne połączenie jest przekierowywane przez niezabezpieczone trasy.</string>
-
-	<string name="actionbar_logger">Logi</string>
+    <string name="actionbar_logger">Logi</string>
 	<string name="log_send_history_button">Wyślij historię</string>
-	<string name="log_send_no_mail_app">Brak aplikacji do wysyłania logów. Zainstaluj klienta poczty.</string>
+	<string name="log_send_no_mail_app">Brak aplikacji do wysyłania logów. Zainstaluj klienta poczty e-mail.</string>
 	<string name="log_send_mail_subject">%1$s Logi aplikacji Android</string>
 	<string name="log_progress_dialog_text">Ładowanie danych &#8230;</string>
 
@@ -432,26 +420,26 @@
 	<string name="saml_authentication_wrong_pass">Złe hasło</string>
 	<string name="actionbar_move">Przenieś</string>
     <string name="actionbar_copy">Skopiuj</string>
-	<string name="file_list_empty_moving">Nic tu nie ma. Możesz dodać folder!</string>
+	<string name="file_list_empty_moving">Pusto. Możesz dodać folder.</string>
 	<string name="folder_picker_choose_button_text">Wybierz</string>
 
-    <string name="move_file_not_found">Nie można przenieść. Proszę sprawdzić, czy plik istnieje</string>
-    <string name="move_file_invalid_into_descendent">Nie jest możliwe przeniesienie folderu do potomka</string>
-    <string name="move_file_invalid_overwrite">Plik istnieje już w folderze docelowym</string>
+    <string name="move_file_not_found">Nie można przenieść pliku. Sprawdź, czy plik istnieje.</string>
+    <string name="move_file_invalid_into_descendent">Nie można przenieść folderu do jednego z jego podfolderów</string>
+    <string name="move_file_invalid_overwrite">Plik już istnieje w folderze docelowym</string>
     <string name="move_file_error">Pojawił się błąd podczas próby przeniesienia tego pliku lub folderu</string>
     <string name="forbidden_permissions_move">aby przenieść ten plik</string>
 
 
     <string name="copy_file_not_found">Nie można skopiować. Sprawdź, czy plik istnieje</string>
-    <string name="copy_file_invalid_into_descendent">Nie można skopiować katalogu do jego podkatalogu</string>
-    <string name="copy_file_invalid_overwrite">Plik istnieje już w folderze docelowym</string>
+    <string name="copy_file_invalid_into_descendent">Nie można skopiować folderu do jednego z jego podfolderów</string>
+    <string name="copy_file_invalid_overwrite">Plik już istnieje w folderze docelowym</string>
     <string name="copy_file_error">Wystąpił błąd podczas próby kopiowania tego pliku lub folderu</string>
     <string name="forbidden_permissions_copy">by skopiować ten plik</string>
 
-    <string name="prefs_category_instant_uploading">Automatyczne wysyłanie</string>
+    <string name="prefs_category_instant_uploading">Natychmiastowo wysłane</string>
     <string name="prefs_category_details">Szczegóły</string>
 
-	<string name="prefs_instant_video_upload_path_title">Wysyłka wideo do folderu</string>
+	<string name="prefs_instant_video_upload_path_title">Folder wideo do natychmiastowego wysyłania</string>
     <string name="sync_folder_failed_content">Synchronizacja folderu %1$s nie może zostać zakończona</string>
 
 	<string name="shared_subject_header">udostępniony</string>
@@ -493,7 +481,7 @@
     <string name="share_add_user_or_group">Dodaj użytkownika lub grupę</string>
     <string name="share_via_link_section_title">Udostępnij link</string>
     <string name="share_via_link_expiration_date_label">Ustaw datę wygaśnięcia</string>
-    <string name="share_via_link_password_label">Zabezpieczone hasłem</string>
+    <string name="share_via_link_password_label">Zabezpiecz hasłem</string>
     <string name="share_via_link_password_title">Zabezpieczone</string>
     <string name="share_via_link_edit_permission_label">Pozwól na edycję</string>
     <string name="share_via_link_hide_file_listing_permission_label">Schowaj listę plików</string>
@@ -509,7 +497,6 @@
     <string name="share_email_clarification">%1$s (email)</string>
     <string name="share_known_remote_clarification">%1$s ( w %2$s )</string>
 
-    <string name="share_sharee_unavailable">Przepraszam, ale wersja twojego serwera nie pozwala na współdzielenie z użytkownikami poprzez klienta. \nProszę skontaktuj się z administratorem.</string>
     <string name="share_privilege_can_share">może współdzielić</string>
     <string name="share_privilege_can_edit">może edytować</string>
     <string name="share_privilege_can_edit_create">utwórz</string>
@@ -518,20 +505,19 @@
     <string name="edit_share_unshare">Cofnij udostępnianie</string>
     <string name="edit_share_done">zakończono</string>
 
-    <string name="action_retry_uploads">Wysyłanie ponowne się nie udało</string>
+    <string name="action_retry_uploads">Próba nieudana</string>
     <string name="action_clear_failed_uploads">Wyczyść nieudane</string>
-    <string name="action_clear_successful_uploads">Wyczyść udane</string>
-    <string name="action_clear_finished_uploads">Wyszyczść wszystkie zakończone</string>
+    <string name="action_clear_successful_uploads">Wyczyszczono</string>
+    <string name="action_clear_finished_uploads">Wyczyść zakończone wysyłania</string>
 
     <string name="action_switch_grid_view">Widok siatki</string>
     <string name="action_switch_list_view">Widok listy</string>
 
     <string name="manage_space_title">Zarządzaj przestrzenią</string>
-    <string name="manage_space_description">Ustawienia, baza danych i certyfikaty serwera %1$s zostaną trwale skasowane.\n\nPobrane pliki pozostaną na swoich miejscach.\n\nTen proces zajmie trochę czasu.</string>
     <string name="manage_space_clear_data">Wyczyść dane</string>
     <string name="manage_space_error">Nie udało się usunąć niektórych plików.</string>
 
-    <string name="permission_storage_access">Dodatkowe uprawnienia do wysyłania i ściągania plików.</string>
+    <string name="permission_storage_access">Wymagane są dodatkowe uprawnienia do pobierania i wysyłania plików.</string>
     <string name="local_file_not_found_toast">Plik nie został znaleziony w lokalnym systemie plików</string>
     <string name="confirmation_remove_files_alert">Czy naprawdę chcesz usunąć zaznaczone elementy?</string>
     <string name="confirmation_remove_folders_alert">Czy naprawdę chcesz usunąć zaznaczone elementy oraz ich zawartość?</string>
@@ -541,26 +527,20 @@
     <string name="learn_more">Dowiedz się więcej</string>
     <string name="drawer_folder_sync">Automatyczne przesyłanie</string>
     <string name="drawer_participate">Wspieraj</string>
-    <string name="participate_testing_headline">Pomóż nam testować</string>
-    <string name="participate_testing_bug_text">Znaleziono błąd? Jest coś dziwnego?</string>
     <string name="participate_testing_report_text">Zgłoś błąd na GitHubie</string>
-    <string name="participate_testing_version_text">Chcesz pomóc nam testować następną wersję?</string>
-    <string name="participate_beta_text">Zawiera to w sobie wszystkie nadchodzące funkcjonalności i jest bardzo ryzykowne. Mogą się pojawiać błędy. Jeśli będą proszę je do nas zgłosić.</string>
+    <string name="participate_beta_headline">Sprawdź wersję rozwojową</string>
     <string name="participate_release_candidate_headline">Wydanie kandydujące</string>
-    <string name="participate_release_candidate_text">Release Candidate (RC) jest zarysem nadchodzącego wydania i oczekujemy że będzie stabilne. Testowanie indywidualnej konfiguracji może pomóc, aby to zapewnić. Zapisz się do testowania w sklepie Play lub ręcznie szukaj w sekcji \"wersje\" na F-Droid.</string>
     <string name="participate_contribute_headline">Aktywni członkowie projektu</string>
     <string name="participate_contribute_irc_text">Dołącz do chatu (IRC): &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">Pomóż innym na &lt;a href="%1$s">forum&lt;/a></string>
     <string name="participate_contribute_translate_text">&lt;a href="%1$s">Tłumacz&lt;/a> aplikację</string>
-    <string name="participate_contribute_github_text">Wspomóż nas jako programista, po więcej szczegółów odwiedź &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a> </string>
     <string name="move_to">Przenieś do&#8230;</string>
     <string name="copy_to">Skopiuj do&#8230;</string>
     <string name="choose_remote_folder">Wybierz folder&#8230;</string>
     <string name="folder_sync_loading_folders">Ładowanie folderów&#8230;</string>
     <string name="folder_sync_no_results">Nie znaleziono folderów multimedialnych.</string>
-    <string name="folder_sync_preferences">Preferencje automatycznego przesyłania</string>
+    <string name="folder_sync_preferences">Preferencje automatycznego wysyłania</string>
     <string name="folder_sync_settings">Ustawienia</string>
-    <string name="folder_sync_new_info">Natychmiastowe wysyłanie zostało kompletnie zmienione. Proszę sprawdzić główne menu i zrekonfigurować automatyczne wysyłanie. Przepraszamy za niedogodności.\n\nCiesz się z nowych i rozbudowanych możliwości automatycznego wysyłania!</string>
     <string name="folder_sync_preferences_folder_path">Dla %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d zaznaczony</item>
@@ -576,7 +556,7 @@
     <string name="notifications_no_results_headline">Brak powiadomień</string>
     <string name="notifications_no_results_message">Proszę sprawdź później</string>
 
-    <string name="upload_file_dialog_title">Wprowadź nazwę i typ wysyłanego pliku</string>
+    <string name="upload_file_dialog_title">Wprowadź nazwę i typ pliku do wysłania</string>
     <string name="upload_file_dialog_filename">Nazwa pliku</string>
     <string name="upload_file_dialog_filetype">Typ pliku</string>
     <string name="upload_file_dialog_filetype_snippet_text">Wstawka tekstowa file(.txt)</string>
@@ -592,7 +572,7 @@
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Bezpieczny dom dla wszystkich danych</string>
-    <string name="welcome_feature_1_text">Przechowuj, współdziel i chroń swoje prywatne i służbowe dane</string>
+    <string name="welcome_feature_1_text">Dostęp do, współdzielenie i ochrona twoich plików w domu i w pracy</string>
 
     <string name="welcome_feature_2_title">Wiele kont</string>
     <string name="welcome_feature_2_text">Podłączenie się do wszystkich chmur</string>
@@ -602,6 +582,9 @@
 
     <string name="whats_new_skip">Pominąć</string>
 
+    <string name="fingerprint_scan_finger">Umieść palec na czytniku odcisku palca</string>
+    <string name="fingerprint_unknown">Nie rozpoznano odcisku palca</string>
+
     <!-- User information -->
     <string name="user_info_full_name">Pełna nazwa</string>
     <string name="user_info_email">E-mail</string>
@@ -614,9 +597,33 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Brak aktywności</string>
-    <string name="activities_no_results_message">Ten strumień pokaże zdarzenia jak\ndodatki, zmiany &amp; udziały</string>
+    <string name="webview_error">Wystąpił błąd</string>
+    <string name="prefs_category_about">O aplikacji</string>
+
+    <string name="actionbar_contacts">Utwórz kopię zapasową kontaktów</string>
+    <string name="actionbar_contacts_restore">Przywróć kontakty</string>
+    <string name="contacts_backup_button">Utwórz kopię zapasową</string>
+    <string name="contacts_restore_button">Przywróć ostatnią kopię zapasową</string>
+    <string name="contacts_header_restore">Przywróć</string>
+    <string name="contacts_header_backup">Kopia zapasowa</string>
+    <string name="contacts_automatic_backup">Kopia zapasowa kontaktów</string>
+    <string name="contacts_last_backup">Ostatnia kopia zapasowa</string>
+    <string name="contacts_read_permission">Potrzebne uprawnienia do odczytu kontaktów</string>
+    <string name="contacts_write_permission">Potrzebne uprawnienia do modyfikacji kontaktów</string>
+    <string name="contactlist_title">Przywróć kontakty</string>
+    <string name="contaclist_restore_selected">Przywróć wybrane kontakty</string>
+    <string name="contactlist_account_chooser_title">Wybierz konto do zaimportiwania</string>
+    <string name="contactlist_no_permission">Nie nadano uprawnień, nic nie zostało zaimportowane!</string>
+    <string name="contacts_preference_choose_date">Wybierz datę</string>
+    <string name="contacts_preference_backup_never">nigdy</string>
+    <string name="contacts_preferences_no_file_found">Nie znaleziono żadnych plików</string>
+    <string name="contacts_preferences_something_strange_happened">Nie odnaleziono twojej ostatniej kopii zapasowej!</string>
+    <string name="contacts_preferences_backup_scheduled">Kopia zapasowa została zaplanowana i wkrótce zostanie uruchomiona</string>
+    <string name="contacts_preferences_import_scheduled">Importowanie zostało zaplanowane i wkrótce zostanie uruchomione</string>
+
     <!-- Notifications -->
     <string name="new_notification_received">Otrzymano nowe powiadomienie</string>
+    <string name="drawer_logout">Wyloguj</string>
 
 
 </resources>

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

@@ -47,9 +47,9 @@
     <string name="prefs_fingerprint_notsetup">Nenhuma impressão digital foi configurada.</string>
     <string name="prefs_show_hidden_files">Mostrar arquivos ocultos</string>
     <string name="prefs_instant_upload">Envio automático de imagens</string>
-    <string name="prefs_instant_upload_summary">Envia automaticamente as fotos tiradas com a câmera</string>
-    <string name="prefs_instant_video_upload">Envio automático de vídeos</string>
-    <string name="prefs_instant_video_upload_summary">Envia automaticamente os vídeos feitos com a câmera</string>
+    <string name="prefs_instant_upload_summary">Enviar automaticamente as imagens tiradas pela câmera</string>
+    <string name="prefs_instant_video_upload">Envio automático de vídeos.</string>
+    <string name="prefs_instant_video_upload_summary">Enviar automaticamente os vídeos gravados pela câmera</string>
     <string name="prefs_log_title">Habilitar login</string>
     <string name="prefs_log_summary">Usado para registrar problemas</string>
     <string name="prefs_log_title_history">Histórico de logins</string>
@@ -58,23 +58,23 @@
     <string name="prefs_calendar_contacts">Configurar a sincronização do calendário e dos contatos</string>
     <string name="prefs_calendar_contacts_summary">Configurar o DAVdroid (v1.3.0+) para a conta em uso</string>
     <string name="prefs_calendar_contacts_address_resolve_error">O endereço do servidor da conta não pôde ser reconhecido pelo DAVdroid</string>
-    <string name="prefs_calendar_contacts_no_store_error">Não há um aplicativo F-Droid ou Google Play instalado</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">A sincronização do calendário e dos contatos foi configurada com sucesso</string>
+    <string name="prefs_calendar_contacts_no_store_error">Nem F-droid nem Google Play estão instalados</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Configuração da sincronização de calendário &amp; contatos</string>
     <string name="prefs_help">Ajuda</string>
     <string name="prefs_recommend">Recomendar a um amigo</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprimir</string>
-    <string name="prefs_remember_last_share_location">Lembrar o local de compartilhamento</string>
-    <string name="prefs_remember_last_upload_location_summary">Lembrar o último local de envio de compartilhamento</string>
+    <string name="prefs_remember_last_share_location">Lembrar localização do compartilhamento</string>
+    <string name="prefs_remember_last_upload_location_summary">Lembrar localização do compartilhamento usado mais recentemente</string>
 
 	<string name="recommend_subject">Tentar %1$s em seu smartfone!</string>
-	<string name="recommend_text">Gostaria de convidá-lo a usar %1$s em seu smartphone!\nBaixe aqui: %2$s</string>
+	<string name="recommend_text">Quero convidar você a usar %1$s em seu smartphone.\nBaixe daqui: %2$s</string>
 
     <string name="auth_check_server">Verificar servidor</string>
     <string name="auth_host_url">Endereço do servidor https://...</string>
     <string name="auth_username">Nome de usuário</string>
     <string name="auth_password">Senha</string>
-    <string name="auth_register">Ainda não tem um servidor?\nClique aqui para obter um de um fornecedor</string>
+    <string name="auth_register">Você não tem um servidor ainda?\nClique aqui para obter um de um provedor</string>
     <string name="sync_string_files">Arquivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Enviar</string>
@@ -86,22 +86,22 @@
     <string name="uploader_error_title_no_file_to_upload">Nenhum arquivo para envio</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s não pôde enviar um pedaço de texto como um arquivo.</string>
     <string name="uploader_error_message_no_file_to_upload">Os dados recebidos não incluem um arquivo válido.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">O arquivo não pôde ser enviado</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Este arquivo não pôde ser enviado</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s não tem permissão para ler um arquivo recebido</string>
-    <string name="uploader_error_message_source_file_not_found">Arquivo para envio não foi encontrado em sua localização. Verifique se o arquivo existe.</string>
-    <string name="uploader_error_message_source_file_not_copied">Ocorreu um erro ao copiar o arquivo para uma pasta temporária. Por favor, tente enviar novamente.</string>
+    <string name="uploader_error_message_source_file_not_found">O arquivo selectionado para envio não foi encontrado. Verifique se ele existe.</string>
+    <string name="uploader_error_message_source_file_not_copied">Não foi possível copiar o arquivo para uma pasta temporária. Tente reenviá-lo.</string>
     <string name="uploader_upload_files_behaviour">Opção de envio:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Mover o arquivo para a pasta do Nextcoud</string>
     <string name="uploader_upload_files_behaviour_only_upload">Manter o arquivo na pasta de origem</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Excluir o arquivo da pasta de origem</string>
     <string name="file_list_seconds_ago">segundos atrás</string>
     <string name="file_list_empty_headline">Nenhum arquivo aqui</string>
-    <string name="file_list_empty">Faça o envio de conteúdo ou sincronize com seus dispositivos!</string>
-    <string name="file_list_empty_favorites">Favorite alguns arquivos ou sincronize com seus dispositivos!</string>
-    <string name="file_list_empty_favorites_filter_list">Arquivos e pastas que você favoritar serão mostrados aqui</string>
-    <string name="file_list_empty_favorites_filter">Nenhum arquivos favorito encontrado em sua pesquisa!</string>
+    <string name="file_list_empty">Enviar um conteúdo ou sincronizar com seus dispositivos.</string>
+    <string name="file_list_empty_favorites">Favoritar algum arquivo ou sincronizar com seus dispositivos.</string>
+    <string name="file_list_empty_favorites_filter_list">Arquivos e pastas favoritas serão mostradas aqui</string>
+    <string name="file_list_empty_favorites_filter">Sua pesquisa não retornou nenhum arquivo favorito.</string>
     <string name="file_list_loading">Carregando&#8230;</string>
-    <string name="file_list_no_app_for_file_type">Nenhum aplicativo encontrado para esse tipo de arquivo!</string>
+    <string name="file_list_no_app_for_file_type">Nenhuma aplicação definida para manipular este tipo de arquivo.</string>
     <string name="local_file_list_empty">Não existe nenhum arquivo nesta pasta.</string>
     <string name="file_list_empty_headline_search">Nenhum resultado nesta pasta</string>
     <string name="file_list_empty_headline_server_search">Sem resultados</string>
@@ -110,19 +110,19 @@
     <string name="file_list_empty_shared">Arquivos e pastas que você compartilhar serão mostrados aqui</string>
     <string name="file_list_empty_headline_server_search_videos"> Sem vídeos</string>
     <string name="file_list_empty_headline_server_search_photos">Sem fotos</string>
-    <string name="file_list_empty_search">Tentar encontrar em outra pasta?</string>
-    <string name="file_list_empty_recently_modified">Nenhum arquivo modificado nos últimos 7 dias</string>
-    <string name="file_list_empty_recently_modified_filter">Nenhum arquivo modificado nos últimos 7 dias
-foram encontrados para sua pesquisa! </string>
-    <string name="file_list_empty_recently_added">Nenhum arquivo recentemente adicionado foi encontrado!</string>
-    <string name="file_list_empty_recently_added_filter">Nenhum arquivo recentemente adicionado foi encontrado para sua pesquisa!</string>
-    <string name="file_list_empty_text_photos">Envie algumas fotos ou ative o envio automático!</string>
-    <string name="file_list_empty_text_photos_filter">Nenhuma foto foi encontrada para sua pesquisa!</string>
-    <string name="file_list_empty_text_videos">Envie alguns vídeos ou ative o envio automático!</string>
-    <string name="file_list_empty_text_videos_filter">Nenhum vídeo encontrado para sua pesquisa!</string>
+    <string name="file_list_empty_search">Talvez seja uma pasta diferente?</string>
+    <string name="file_list_empty_recently_modified">Nenhum arquivo alterado nos últimos 7 dias foi encontrado </string>
+    <string name="file_list_empty_recently_modified_filter">Sua pesquisa não encontrou arquivos alterados
+        nos últimos 7 dias.</string>
+    <string name="file_list_empty_recently_added">Nenhum arquivo recente foi adicionado</string>
+    <string name="file_list_empty_recently_added_filter">Sua pesquisa não encontrou arquivos adicionados recentemente.</string>
+    <string name="file_list_empty_text_photos">Enviar algumas fotos ou ativar o envio automático.</string>
+    <string name="file_list_empty_text_photos_filter">Sua pesquisa não encontrou fotos.</string>
+    <string name="file_list_empty_text_videos">Enviar alguns vídeos ou ativar o envio automático.</string>
+    <string name="file_list_empty_text_videos_filter">Sua pesquisa não encontrou vídeos.</string>
     <string name="upload_list_empty_headline">Nenhum envio disponível</string>
-    <string name="upload_list_empty_text">Envie algum conteúdo ou ative o envio automático!</string>
-    <string name="upload_list_empty_text_auto_upload">Envie algum conteúdo ou ative o envio automático!</string>
+    <string name="upload_list_empty_text">Enviar algum conteúdo ou ativar o envio automático.</string>
+    <string name="upload_list_empty_text_auto_upload">Enviar algum conteúdo ou ativar o envio automático.</string>
     <string name="file_list_folder">pasta</string>
     <string name="file_list_folders">pastas</string>
     <string name="file_list_file">arquivo</string>
@@ -135,13 +135,13 @@ foram encontrados para sua pesquisa! </string>
     <string name="filedetails_download">Baixar</string>
     <string name="filedetails_sync_file">Sincronizar</string>
     <string name="filedetails_renamed_in_upload_msg">Arquivo renomeado para %1$s durante o envio</string>
-    <string name="list_layout">Layout da lista</string>
+    <string name="list_layout">Layout listado</string>
     <string name="action_share">Compartilhar</string>
     <string name="common_yes">Sim</string>
     <string name="common_no">Não</string>
     <string name="common_ok">OK</string>
     <string name="common_remove_upload">Excluir arquivo enviado</string>
-    <string name="common_retry_upload">Tentar enviar de novo</string>
+    <string name="common_retry_upload">Retentar o envio</string>
     <string name="common_cancel_sync">Cancelar sincronização</string>
     <string name="common_cancel">Cancelar</string>
     <string name="common_back">Voltar</string>
@@ -161,10 +161,10 @@ foram encontrados para sua pesquisa! </string>
     <string name="uploader_info_dirname">Nome da pasta</string>
     <string name="uploader_upload_in_progress_ticker">Enviando &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% enviando %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Envio bem sucedido</string>
+    <string name="uploader_upload_succeeded_ticker">Enviado</string>
     <string name="uploader_upload_succeeded_content_single">%1$s enviado</string>
     <string name="uploader_upload_failed_ticker">Falha no envio</string>
-    <string name="uploader_upload_failed_content_single">O envio de %1$s não pôde ser finalizado</string>
+    <string name="uploader_upload_failed_content_single">Não foi possível enviar %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Falha no envio, você precisa reautenticar-se</string>
     <string name="uploads_view_title">Envios</string>
     <string name="uploads_view_group_current_uploads">Atual</string>
@@ -181,37 +181,37 @@ foram encontrados para sua pesquisa! </string>
     <string name="uploads_view_upload_status_failed_localfile_error">Arquivo local não encontrado</string>
     <string name="uploads_view_upload_status_failed_permission_error">Erro de permissão</string>
     <string name="uploads_view_upload_status_conflict">Conflito</string>
-    <string name="uploads_view_upload_status_service_interrupted">Aplicativo foi encerrado</string>
+    <string name="uploads_view_upload_status_service_interrupted">Aplicativo finalizado</string>
     <string name="uploads_view_upload_status_unknown_fail">Erro desconhecido</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Aguardando conexão wi-fi</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Esperando por conectividade Wi-Fi</string>
     <string name="uploads_view_later_waiting_to_upload">Aguardando para enviar</string>
     <string name="downloader_download_in_progress_ticker">Baixando &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Baixando %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Download realizado com sucesso</string>
+    <string name="downloader_download_succeeded_ticker">Baixado</string>
     <string name="downloader_download_succeeded_content">%1$s baixado</string>
     <string name="downloader_download_failed_ticker">Download falhou</string>
-    <string name="downloader_download_failed_content">Download de %1$s não pôde ser concluído</string>
+    <string name="downloader_download_failed_content">Não foi possível baixar %1$s</string>
     <string name="downloader_not_downloaded_yet">Ainda não baixado</string>
     <string name="downloader_download_failed_credentials_error">Falha em baixar o arquivo, você precisa reautenticar-se</string>
     <string name="common_choose_account">Escolha a conta</string>
     <string name="sync_fail_ticker">Falha na sincronização</string>
-    <string name="sync_fail_ticker_unauthorized">Falha na sincronização, você precisa se logar novamente</string>
-    <string name="sync_fail_content">A sincronização de %1$s não pôde ser finalizada</string>
-    <string name="sync_fail_content_unauthorized">Senha inválida para %1$s</string>
+    <string name="sync_fail_ticker_unauthorized">A sincronização falhou. Você precisa reautenticar-se</string>
+    <string name="sync_fail_content">Não foi possível sincronizar %1$s</string>
+    <string name="sync_fail_content_unauthorized">Senha errada para %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Conflitos encontrados</string>
     <string name="sync_conflicts_in_favourites_content">%1$d arquivos \"manter sincronizados\" não puderam ser sincronizados</string>
     <string name="sync_fail_in_favourites_ticker">Falha ao manter arquivos sincronizados</string>
     <string name="sync_fail_in_favourites_content">O conteúdo de %1$d arquivos não puderam ser sincronizados (%2$d conflitos)</string>
     <string name="sync_foreign_files_forgotten_ticker">Alguns arquivos locais foram esquecidos</string>
     <string name="sync_foreign_files_forgotten_content">%1$d arquivos de %2$s não puderam ser copiados para a pasta</string>
-    <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os arquivos enviados a partir deste aparelho são copiados para a pasta local %1$s para evitar a perda de dados quando um único arquivo é sincronizado com várias contas. \n\nDevido a essa mudança, todos os arquivos enviados em versões anteriores deste aplicativo foram copiados para a pasta %2$s . No entanto, um erro impediu a conclusão dessa operação durante a sincronização da conta. Você pode tanto deixar os arquivos como estão e remover o link para %3$s, ou mover os arquivo(s) para a pasta %1$s e manter o link para %4$s. \n\nListados abaixo são os arquivo(s) locais, e os arquivo(s) remoto(s) em %5$s que estavam vinculados.</string>
-    <string name="sync_current_folder_was_removed">Pasta %1s não existe mais</string>
+    <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os arquivos enviados deste dispositivo serão copiados para a pasta local %1$s para evitar a perda de dados quando um único arquivo é sincronizado em várias contas.\n\nDevido à esta alteração, todos os arquivos enviados com versões anteriores deste aplicativo foram copiados para a pasta %2$s No entanto, um erro impediu a conclusão desta operação durante a sincronização da conta. Você pode deixar o (s) arquivo (s) como está e remover o link para %3$s ou mover os arquivos para a pasta %1$s e manter o link para %4$s.\n\nListados abaixo estão os arquivos locais e os arquivos remotos em %5$s taos quais eles foram vinculados.</string>
+    <string name="sync_current_folder_was_removed">A pasta %1$s não existe mais</string>
     <string name="foreign_files_move">Mover todos</string>
     <string name="foreign_files_success">Todos os arquivos foram movidos</string>
     <string name="foreign_files_fail">Alguns arquivos não puderam ser movidos</string>
     <string name="foreign_files_local_text">Local: %1$s</string>
     <string name="foreign_files_remote_text">Remoto: %1$s</string>
-    <string name="upload_query_move_foreign_files">Não há espaço suficiente para copiar os arquivos selecionados para a pasta %1$s. Gostaria de movê-los em vez disso?</string>
+    <string name="upload_query_move_foreign_files">O espaço insuficiente está impedindo a cópia dos arquivos selecionados para a pasta %1$s. Ao invés de copiá-los , gostaria de movê-los para lá?</string>
     <string name="pass_code_enter_pass_code">Digite sua senha</string>
     
     <string name="pass_code_configure_your_pass_code">Digite o código de acesso</string>
@@ -229,16 +229,16 @@ foram encontrados para sua pesquisa! </string>
     <string name="media_event_done">%1$s reprodução finalizada</string>
     <string name="media_err_nothing_to_play">Nenhum arquivo de mídia encontrado</string>
     <string name="media_err_no_account">Nenhuma conta fornecida</string>
-    <string name="media_err_not_in_owncloud">O arquivo não está em uma conta válida</string>
+    <string name="media_err_not_in_owncloud">O arquivo não é uma conta válida</string>
     <string name="media_err_unsupported">O codec de mídia não é suportado</string>
-    <string name="media_err_io">O arquivo de mídia não pode ser lido</string>
-    <string name="media_err_malformed">O arquivo de mídia não está corretamente codificado</string>
-    <string name="media_err_timeout">Expirou o tempo durante a tentativa de reproduzir</string>
-    <string name="media_err_invalid_progressive_playback">O arquivo de mídia não pode ser transmitido</string>
-    <string name="media_err_unknown">O arquivo de mídia não pode ser reproduzido com o stock media player</string>
-    <string name="media_err_security_ex">Erro de segurança tentando reproduzir %1$s</string>
+    <string name="media_err_io">Não foi possível ler o arquivo de mídia</string>
+    <string name="media_err_malformed">O arquivo de mídia tem uma codificação incorreta</string>
+    <string name="media_err_timeout">Tempo esgotado tentando reproduzir o arquivo</string>
+    <string name="media_err_invalid_progressive_playback">O arquivo de mídia não pode ser enviado via streaming</string>
+    <string name="media_err_unknown">O reprodutor de mídia não consegue reproduzir o arquivo de mídia</string>
+    <string name="media_err_security_ex">Errro de segurança enquanto se tentava reproduzir %1$s</string>
     <string name="media_err_io_ex">Erro de entrada tentando reproduzir %1$s</string>
-    <string name="media_err_unexpected">Erro inesperado tentando reproduzir %1$s</string>
+    <string name="media_err_unexpected">Erro inesperado euquanto se tentava reproduzir %1$s</string>
     <string name="media_rewind_description">Botão rebobinar</string>
     <string name="media_play_pause_description">Botão reproduzir ou pausar</string>
     <string name="media_forward_description">Botão de avanço rápido</string>
@@ -250,31 +250,31 @@ foram encontrados para sua pesquisa! </string>
 	<string name="auth_connection_established">Conexão estabelecida</string>
 	<string name="auth_testing_connection">Testando conexão...</string>
 	<string name="auth_not_configured_title">Configuração do servidor inválida</string>
-	<string name="auth_account_not_new">Já existe no dispositivo uma conta para o mesmo usuário e servidor</string>
+	<string name="auth_account_not_new">Uma conta para o mesmo usuário e servidor já existe no dispositivo</string>
 	<string name="auth_account_not_the_same">As informações que o usuário digitou não correspondem ao usuário da conta</string>
 	<string name="auth_unknown_error_title">Ocorreu um erro desconhecido!</string>
 	<string name="auth_unknown_host_title">Não foi possível encontrar o host</string>
-	<string name="auth_incorrect_path_title">Instância de servidor não encontrada</string>
+	<string name="auth_incorrect_path_title">Servidor não encontrado</string>
 	<string name="auth_timeout_title">O servidor demorou demais a responder</string>
-	<string name="auth_incorrect_address_title">Formato de endereço de servidor errado</string>
+	<string name="auth_incorrect_address_title">O formato de endereço do servidor está errado</string>
 	<string name="auth_ssl_general_error_title">Inicialização SSL falhou</string>
 	<string name="auth_ssl_unverified_server_title">Não foi possível verificar a identidade do servidor SSL</string>
 	<string name="auth_bad_oc_version_title">Versão do servidor desconhecida</string>
-	<string name="auth_wrong_connection_title">Não foi possível estabelecer conexão</string>
+	<string name="auth_wrong_connection_title">Não foi possível estabelecer a conexão</string>
 	<string name="auth_secure_connection">Conexão segura estabelecida</string>
 	<string name="auth_unauthorized">Nome de usuário ou senha errado</string>
 	<string name="auth_oauth_error">Autorização sem sucesso</string>
 	<string name="auth_oauth_error_access_denied">Acesso negado pelo servidor de autorização</string>
-	<string name="auth_wtf_reenter_URL">Estado inesperado. Insira o endereço do servidor novamente</string>
+	<string name="auth_wtf_reenter_URL">Estado inesperado. Entre o endereço do servidor novamente</string>
 	<string name="auth_expired_oauth_token_toast">Sua autorização expirou. Por favor, autorize novamente</string>
 	<string name="auth_expired_basic_auth_toast">Por favor, digite a senha atual</string>
 	<string name="auth_expired_saml_sso_token_toast">Sua sessão expirou. Por favor, conecte-se novamente</string>
 	<string name="auth_connecting_auth_server">Conectando ao servidor de autenticação...</string>
 	<string name="auth_unsupported_auth_method">O servidor não suporta este método de autenticação</string>
 	<string name="auth_unsupported_multiaccount">%1$s não suporta múltiplas contas</string>
-	<string name="auth_fail_get_user_name">Seu servidor não está retornando um id de usuário correto. Por favor, entre em contato com um administrador</string>
+	<string name="auth_fail_get_user_name">Seu servidor não está retornando um ID correto de usuário. Por favor, contacte o administrador</string>
 	<string name="auth_can_not_auth_against_server">Não é possível obter autenticação neste servidor</string>
-    <string name="auth_account_does_not_exist">Conta ainda não existe no dispositivo</string>
+    <string name="auth_account_does_not_exist">A conta ainda não existe no dispositivo</string>
     
     <string name="favorite">Definir como disponível offline</string>
     <string name="unfavorite">Definir como não disponível offline</string>
@@ -283,28 +283,28 @@ foram encontrados para sua pesquisa! </string>
     <string name="common_rename">Renomear</string>
     <string name="common_remove">Excluir</string>
     <string name="confirmation_remove_file_alert">Deseja realmente excluir %1$s?</string>
-    <string name="confirmation_remove_folder_alert">Você deseja realmente excluir %1$s e seu conteúdo?</string>
+    <string name="confirmation_remove_folder_alert">Você realmente quer remover %1$s e seu conteúdo?</string>
     <string name="confirmation_remove_local">Somente local</string>
-    <string name="remove_success_msg">Excluído com sucesso</string>
+    <string name="remove_success_msg">Excluído</string>
     <string name="remove_fail_msg">Erro ao excluir</string>
     <string name="rename_dialog_title">Digite um novo nome</string>
-    <string name="rename_local_fail_msg">Cópia local não pôde ser renomeada. Tente outro nome</string>
-    <string name="rename_server_fail_msg">Renomeação não pôde ser finalizada</string>
-    <string name="sync_file_fail_msg">Arquivo remoto não pôde ser verificado</string>
+    <string name="rename_local_fail_msg">A cópia local não pôde ser renomeada. Tente um nome diferente</string>
+    <string name="rename_server_fail_msg">Não foi possível dar um nome novo ao servidor</string>
+    <string name="sync_file_fail_msg">Não foi possível verificar o arquivo remoto</string>
     <string name="sync_file_nothing_to_do_msg">Conteúdo do arquivo já foi sincronizado</string>
-    <string name="create_dir_fail_msg">A pasta não pôde ser criada</string>
+    <string name="create_dir_fail_msg">Não foi possível criar a pasta</string>
     <string name="filename_forbidden_characters">Caracteres proibidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">O nome do arquivo contém pelo menos um caractere inválido  </string>
     <string name="filename_empty">O nome do arquivo não pode estar vazio</string>
-    <string name="wait_a_moment">Aguarde um momento</string>
+    <string name="wait_a_moment">Aguarde um momento...</string>
     <string name="wait_checking_credentials">Verificando credenciais salvas</string>
-    <string name="filedisplay_unexpected_bad_get_content">Problema inesperado. Por favor, tente selecionar o arquivo com outro aplicativo</string>
-    <string name="filedisplay_no_file_selected">Nenhum arquivo foi selecionado</string>
+    <string name="filedisplay_unexpected_bad_get_content">Problema inesperado. Por favor selecione o arquivo de um diferente aplicativo</string>
+    <string name="filedisplay_no_file_selected">Nenhum arquivo selecionado</string>
     <string name="activity_chooser_title">Enviar o link para &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copiando o arquivo da armazenagem privada</string>
     
     <string name="oauth_check_onoff">Login com oAuth2</string> 
-    <string name="oauth_login_connection">Conectando-se a oAuth2 servidor...</string>    
+    <string name="oauth_login_connection">Conectando ao servidor OAuth 2...</string>    
         
     <string name="ssl_validator_header">A identidade do site não pôde ser verificada</string>
     <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor não é confiável</string>
@@ -312,7 +312,7 @@ foram encontrados para sua pesquisa! </string>
     <string name="ssl_validator_reason_cert_not_yet_valid">- A data de expiração do certificado do servidor está no futuro</string>
     <string name="ssl_validator_reason_hostname_not_verified">- A URL do host não confere com o host do certificado</string>
     <string name="ssl_validator_question">Você confia nesse certificado mesmo assim?</string>
-    <string name="ssl_validator_not_saved">O certificado não pôde ser salvo</string>
+    <string name="ssl_validator_not_saved">Não foi possível salvar o certificado</string>
     <string name="ssl_validator_btn_details_see">Detalhes</string>
     <string name="ssl_validator_btn_details_hide">Ocultar</string>
     <string name="ssl_validator_label_subject">Emitido para:</string>
@@ -341,21 +341,21 @@ foram encontrados para sua pesquisa! </string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Enviar somente via wifi</string>
-    <string name="instant_upload_on_wifi">Enviar fotos apenas por Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Enviar vídeos apenas por Wi-Fi</string>
-    <string name="instant_video_upload_on_charging">Enviar apenas quando solicitado</string>
-    <string name="instant_upload_on_charging">Enviar apenas quando solicitado</string>
+    <string name="auto_upload_on_wifi">Somente enviar por Wi-Fi</string>
+    <string name="instant_upload_on_wifi">Somente enviar imagens por Wi-Fi</string>
+    <string name="instant_video_upload_on_wifi">Somente enviar vídeos por Wi-Fi</string>
+    <string name="instant_video_upload_on_charging">Somente enviar quando carregando</string>
+    <string name="instant_upload_on_charging">Somente enviar quando carregando</string>
     <string name="instant_upload_path">/Upload automático</string>
     <string name="conflict_title">Conflito de arquivo</string>
-    <string name="conflict_message">Quais arquivos você deseja manter? Se você selecionar ambas as versões, o arquivo local terá um número adicionado ao seu nome.</string>
+    <string name="conflict_message">Quais arquivos você quer manter? Se você selecionar ambos, o arquivo local terá um número adicionado ao seu nome.</string>
     <string name="conflict_keep_both">Manter ambos</string>
     <string name="conflict_use_local_version">versão local</string>
     <string name="conflict_use_server_version">versão do servidor</string>
 
-    <string name="preview_sorry">Desculpe isso!</string>
+    <string name="preview_sorry">Desculpe.</string>
     <string name="preview_image_description">Pré-visualização da imagem</string>
-    <string name="preview_image_error_unknown_format">Imagem não pôde ser mostrada</string>
+    <string name="preview_image_error_unknown_format">Não foi possível mostrar a imagem</string>
 
     <string name="error__upload__local_file_not_copied">%1$s não pôde ser copiado para pasta local %2$s</string>
     <string name="prefs_instant_upload_path_title">Pasta de envio automático</string>
@@ -364,7 +364,7 @@ foram encontrados para sua pesquisa! </string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar subpastas</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Armazena em subpastas baseado no ano e mês</string>
 
-	<string name="share_link_no_support_share_api">Lamentamos, mas o compartilhamento não está ativado no servidor. Entre em contato com o administrador.</string>
+	<string name="share_link_no_support_share_api">O compartilhamento não está habilitado em seu servidor. Por favor, contact o administrador.</string>
 	<string name="share_link_file_no_exist">Não é possível compartilhar. Por favor verifique se o arquivo existe</string>
 	<string name="share_link_file_error">Ocorreu um erro durante a tentativa de compartilhar esse arquivo ou pasta</string>
 	<string name="unshare_link_file_no_exist">Não é possível descompartilhar. Por favor verifique se o arquivo existe</string>
@@ -378,16 +378,17 @@ foram encontrados para sua pesquisa! </string>
 
     <string name="copy_link">Copiar link</string>
     <string name="clipboard_text_copied">Copiado para área de transferência</string>
-    <string name="clipboard_no_text_to_copy">Nenhum texto recebido para copiar para área de transferência</string>
+    <string name="clipboard_no_text_to_copy">Nenhum texto foi recebido para copiar para a área de transferência</string>
     <string name="clipboard_uxexpected_error">Erro inesperado ao copiar para a área de transferência</string>
     <string name="clipboard_label">Texto copiado de %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Erro crítico: não foi possível executar as operações</string>
+    <string name="error_cant_bind_to_operations_service">Erro crítico: Não foi possível executar as operações</string>
+
+    <string name="network_error_socket_exception">Um erro ocorreu durante a conexão ao servidor.</string>
+    <string name="network_error_socket_timeout_exception">Um erro ocorreu quando esperava pelo servidor. Não foi possível completar a operação.</string>
+    <string name="network_error_connect_timeout_exception">Um erro ocorreu quando esperava pelo servidor. Não foi possível completar a operação.</string>
+    <string name="network_host_not_available">Não foi possível completar a operação. O servidor está indisponível</string>
 
-    <string name="network_error_socket_exception">Ocorreu um erro durante a conexão com o servidor.</string>
-    <string name="network_error_socket_timeout_exception">Ocorreu um erro enquanto se espera pelo servidor, a operação pode não ter sido executada</string>
-    <string name="network_error_connect_timeout_exception">Ocorreu um erro enquanto se espera pelo servidor, a operação pode não ter sido executada</string>
-    <string name="network_host_not_available">A operação não pôde ser concluída pois o servidor está indisponível</string>
     <string name="forbidden_permissions">Você não tem permissão %s</string>
     <string name="forbidden_permissions_rename">para renomear este arquivo</string>
     <string name="forbidden_permissions_delete">para excluir este arquivo</string>
@@ -400,34 +401,34 @@ foram encontrados para sua pesquisa! </string>
 
     <string name="file_migration_dialog_title">Atualizando caminho do armazenamento</string>
     <string name="file_migration_finish_button">Finalizado</string>
-    <string name="file_migration_preparing">Preparando para migração&#8230;</string>
+    <string name="file_migration_preparing">Preparando migração&#8230;</string>
     <string name="file_migration_checking_destination">Verificando destino&#8230;</string>
-    <string name="file_migration_saving_accounts_configuration">Salvando configuração de contas&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Aguardando por sincronismo não-finalizado&#8230;</string>
+    <string name="file_migration_saving_accounts_configuration">Salvando configuração das contas&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Esperando por todas as sincronizações terminarem&#8230;</string>
     <string name="file_migration_migrating">Movendo dados&#8230;</string>
     <string name="file_migration_updating_index">Atualizando index&#8230;</string>
     <string name="file_migration_cleaning">Limpando&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">Restaurando configurações de contas&#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">Restaurando a configuração das contas&#8230;</string>
     <string name="file_migration_ok_finished">Finalizado</string>
-    <string name="file_migration_failed_not_enough_space">ERRO: Espaço Insuficiente</string>
-    <string name="file_migration_failed_not_writable">ERRO: Arquivo não permite gravação</string>
-    <string name="file_migration_failed_not_readable">ERRO: Arquivo não permite leitura</string>
+    <string name="file_migration_failed_not_enough_space">ERRO: Espaço insuficiente</string>
+    <string name="file_migration_failed_not_writable">ERRO: Arquivo é somente leitura</string>
+    <string name="file_migration_failed_not_readable">ERRO: Arquivo não é legível</string>
     <string name="file_migration_failed_dir_already_exists">ERRO: Diretório Nexcloud já existe</string>
-    <string name="file_migration_failed_while_coping">ERRO: Durante a Migração</string>
-    <string name="file_migration_failed_while_updating_index">ERRO: Durante atualização de índice</string>
+    <string name="file_migration_failed_while_coping">ERRO: Falha durante a migração</string>
+    <string name="file_migration_failed_while_updating_index">ERRO: Falha ao atualizar índice</string>
 
-    <string name="file_migration_directory_already_exists">Pasta de dados já existe, o que fazer?</string>
-    <string name="file_migration_override_data_folder">Sobrescrever</string>
-    <string name="file_migration_use_data_folder">Usar a existente</string>
+    <string name="file_migration_directory_already_exists">Pasta Data já existe. Escolha uma das seguintes:</string>
+    <string name="file_migration_override_data_folder">Substituir</string>
+    <string name="file_migration_use_data_folder">Usar</string>
 
     <string name="prefs_category_accounts">Contas</string>
     <string name="prefs_add_account">Adicionar uma conta</string>
     <string name="drawer_manage_accounts">Gerenciar contas</string>
-    <string name="auth_redirect_non_secure_connection_title">A conexão segura está redirecionada através de uma rota insegura.</string>
+    <string name="auth_redirect_non_secure_connection_title">A conexão segura foi redirecionada através de uma rota insegura.</string>
 
 	<string name="actionbar_logger">Logs</string>
 	<string name="log_send_history_button">Enviar histórico</string>
-	<string name="log_send_no_mail_app">Nenhum aplicativo para envio de logs foi encontrado. Por favor, instale um aplicativo de email.</string>
+	<string name="log_send_no_mail_app">Nenhum aplicativo para enviar registros foi encontrado. Por favor instale um cliente de email.</string>
 	<string name="log_send_mail_subject">%1$s logs do aplicativo Android</string>
 	<string name="log_progress_dialog_text">Carregando dados &#8230;</string>
 
@@ -435,26 +436,26 @@ foram encontrados para sua pesquisa! </string>
 	<string name="saml_authentication_wrong_pass">Senha incorreta</string>
 	<string name="actionbar_move">Mover</string>
     <string name="actionbar_copy">Copiar</string>
-	<string name="file_list_empty_moving">Nada aqui. Você pode adicionar uma pasta!</string>
+	<string name="file_list_empty_moving">Não há nada aqui. Você pode adicionar uma pasta.</string>
 	<string name="folder_picker_choose_button_text">Escolher</string>
 
-    <string name="move_file_not_found">Não é possível mover. Por favor, verifique se o arquivo existe</string>
-    <string name="move_file_invalid_into_descendent">Não é possível mover a pasta para uma descendente</string>
-    <string name="move_file_invalid_overwrite">O arquivo já existe na pasta de destino</string>
+    <string name="move_file_not_found">Impossível mover o arquivo. Por favor verifique se ele existe.</string>
+    <string name="move_file_invalid_into_descendent">Não é possível mover uma pasta para uma das suas próprias pastas subjacentes</string>
+    <string name="move_file_invalid_overwrite">O arquivo já está presente na pasta destino</string>
     <string name="move_file_error">Ocorreu um erro ao tentar mover este arquivo ou pasta</string>
     <string name="forbidden_permissions_move">mover este arquivo</string>
 
 
     <string name="copy_file_not_found">Não é possível copiar. Por favor, verifique se o arquivo existe</string>
-    <string name="copy_file_invalid_into_descendent">Não é possível copiar uma pasta em uma descendente</string>
-    <string name="copy_file_invalid_overwrite">O arquivo já existe na pasta de destino</string>
+    <string name="copy_file_invalid_into_descendent">Não é possível copiar uma pasta para uma das suas próprias pastas subjacentes</string>
+    <string name="copy_file_invalid_overwrite">O arquivo já está presente na pasta destino</string>
     <string name="copy_file_error">Ocorreu um erro ao tentar copiar este arquivo ou pasta</string>
     <string name="forbidden_permissions_copy">copiar este arquivo</string>
 
     <string name="prefs_category_instant_uploading">Envio automático</string>
     <string name="prefs_category_details">Detalhes</string>
 
-	<string name="prefs_instant_video_upload_path_title">Pasta de envio automático de vídeos</string>
+	<string name="prefs_instant_video_upload_path_title">Pasta de vídeo para envios automáticos</string>
     <string name="sync_folder_failed_content">A sincronização da pasta %1$s não pôde ser finalizada</string>
 
 	<string name="shared_subject_header">compartilhado</string>
@@ -512,7 +513,7 @@ foram encontrados para sua pesquisa! </string>
     <string name="share_email_clarification">%1$s (email)</string>
     <string name="share_known_remote_clarification">%1$s ( em %2$s )</string>
 
-    <string name="share_sharee_unavailable">Lamentamos, mas a versão do seu servidor não permite compartilhar com utilizadores nos clientes.\nPor favor contacte o administrador</string>
+    <string name="share_sharee_unavailable">Atualize a versão do servidor para permitir compartilhamento entre usuários de dentro de seus clientes.\nPor favor, contacte o administrador</string>
     <string name="share_privilege_can_share">pode compartilhar</string>
     <string name="share_privilege_can_edit">pode editar</string>
     <string name="share_privilege_can_edit_create">criar</string>
@@ -521,50 +522,50 @@ foram encontrados para sua pesquisa! </string>
     <string name="edit_share_unshare">Parar compartilhamento</string>
     <string name="edit_share_done">finalizado</string>
 
-    <string name="action_retry_uploads">Retentar falhou</string>
+    <string name="action_retry_uploads">Nova tentativa falhou</string>
     <string name="action_clear_failed_uploads">Limpeza falhou</string>
-    <string name="action_clear_successful_uploads">Limpo com sucesso</string>
-    <string name="action_clear_finished_uploads">Limpar tudo finalizado</string>
+    <string name="action_clear_successful_uploads">Limpo</string>
+    <string name="action_clear_finished_uploads">Limpar envios termiandos</string>
 
     <string name="action_switch_grid_view">Grade de exibição</string>
     <string name="action_switch_list_view">Lista de visualização</string>
 
     <string name="manage_space_title">Gerenciar o espaço</string>
-    <string name="manage_space_description">Definições, certificados de banco de dados e servidor de dados %1$s serão excluídos permanentemente. \n\nArquivos baixados serão mantidos inalterados. \n\nEste processo pode demorar algum tempo.</string>
+    <string name="manage_space_description">Configurações, banco de dados e certificados do servidor de dados de %1$s serão excluídos permanentemente.\n\nArquivos baixados serão mantidos intocados.\n\nEste processo pode levar um tempo.</string>
     <string name="manage_space_clear_data">Limpar dados</string>
     <string name="manage_space_error">Alguns arquivos não puderam ser excluídos.</string>
 
-    <string name="permission_storage_access">Permissões adicionais são necessárias para se enviar e baixar arquivos &amp; .</string>
-    <string name="local_file_not_found_toast">O arquivo não foi encontrado no sistema de arquivos local</string>
+    <string name="permission_storage_access">Permissões adicionais são necessárias para enviar ou baixar arquivos.</string>
+    <string name="local_file_not_found_toast">Arquivo não encontrado no sistema de arquivos local</string>
     <string name="confirmation_remove_files_alert">Deseja realmente excluir os itens selecionados?</string>
     <string name="confirmation_remove_folders_alert">Deseja realmente excluir os itens selecionados e seus conteúdos?</string>
-    <string name="uploads_view_upload_status_waiting_for_charging">Esperando o carregamento do dispositivo</string>
+    <string name="uploads_view_upload_status_waiting_for_charging">Esperando carregar</string>
     <string name="actionbar_search">Pesquisar</string>
     <string name="files_drop_not_supported">Este é um recurso do Nextcloud. Por favor, atualize.</string>
     <string name="learn_more">Saiba mais</string>
     <string name="drawer_folder_sync">Envio automático</string>
     <string name="drawer_participate">Participar</string>
-    <string name="participate_testing_headline">Ajude-nos a testar</string>
-    <string name="participate_testing_bug_text">Encontrou um erro? Algo está estranho?</string>
+    <string name="participate_testing_headline">Ajuda para teste</string>
+    <string name="participate_testing_bug_text">Encontrou um erro? Comentários?</string>
     <string name="participate_testing_report_text">Relate o problema no Github</string>
-    <string name="participate_testing_version_text">Está interessado em ajudar-nos a testar a próxima versão?</string>
+    <string name="participate_testing_version_text">Interessado em ajudar testando a próxima versão?</string>
     <string name="participate_beta_headline">Teste a versão dev</string>
-    <string name="participate_beta_text">Isso inclui todos os próximos recursos. Erros pode ocorrer e irão. Por favor, reporte-os a nós.</string>
+    <string name="participate_beta_text">Isso inclui todos os recursos futuros e está num limite perigoso. Erros podem ocorrer e acontecendo, por favor reporte-os à nós.</string>
     <string name="participate_release_candidate_headline">Candidato a versão</string>
-    <string name="participate_release_candidate_text">O candidato à versão (RC) é um instantâneo do lançamento e espera-se que seja estável. Testar a sua configuração individual pode ajudar a garantir isso. Registre-se para testar na Play Store ou procure manualmente na seção \"versões\" na F-Droid.</string>
+    <string name="participate_release_candidate_text">O release candidate (RC) é um instantâneo da próxima versão e espera-se que seja estável. Testar sua configuração individual pode ajudar a garantir isso. Inscreva-se para testar na Play Store ou confira a seção \"versões\" no F-Droid.</string>
     <string name="participate_contribute_headline">Contribuir ativamente</string>
     <string name="participate_contribute_irc_text">Participe de uma conversa no IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">Ajude outros no &lt;a href="%1$s">forum&lt;/a></string>
     <string name="participate_contribute_translate_text">&lt;a href="%1$s">Traduza&lt;/a> the app</string>
-    <string name="participate_contribute_github_text">Contribuir como desenvolvedor, veja &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a> para detalhes</string>
+    <string name="participate_contribute_github_text">Revisar, alterar e escrever código, veja &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> para detalhes</string>
     <string name="move_to">Mover para&#8230;</string>
     <string name="copy_to">Copiar para&#8230;</string>
     <string name="choose_remote_folder">Escolha a pasta&#8230;</string>
     <string name="folder_sync_loading_folders">Carregando pastas&#8230;</string>
     <string name="folder_sync_no_results">Nenhuma pasta de mídia encontrada.</string>
-    <string name="folder_sync_preferences">Preferências do envio automático</string>
+    <string name="folder_sync_preferences">Preferências do auto envio</string>
     <string name="folder_sync_settings">Configurações</string>
-    <string name="folder_sync_new_info">O envio automático foi completamente renovado.  Por favor veja o menu principal e reconfigure o seu envio automático. Desculpe o inconveniente. \n\nAproveite as novas e extendidas capacidades do envio automático!</string>
+    <string name="folder_sync_new_info">O envio automático foi completamente renovado. Reconfigure-o dentro do menu principal.\n\nCurta o novo e estendido envio automático.</string>
     <string name="folder_sync_preferences_folder_path">Para %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d selecionado</item>
@@ -578,7 +579,7 @@ foram encontrados para sua pesquisa! </string>
     <string name="notifications_no_results_headline">Não há notificações</string>
     <string name="notifications_no_results_message">Por favor verifique mais tarde.</string>
 
-    <string name="upload_file_dialog_title">Forneça o nome e o tipo de arquivo a enviar</string>
+    <string name="upload_file_dialog_title">Entre o nome e tipo de arquivo a enviar</string>
     <string name="upload_file_dialog_filename">Nome do Arquivo</string>
     <string name="upload_file_dialog_filetype">Tipo do Arquivo</string>
     <string name="upload_file_dialog_filetype_snippet_text">Fragmento de arquivo texto (.txt)</string>
@@ -594,7 +595,7 @@ foram encontrados para sua pesquisa! </string>
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Um local seguro para seus dados</string>
-    <string name="welcome_feature_1_text">Acesse, compartilhe &amp; proteja seus dados em casa e na sua empresa</string>
+    <string name="welcome_feature_1_text">Acesse, compartilhe e proteja seus arquivos, em casa e no trabalho</string>
 
     <string name="welcome_feature_2_title">Multi contas</string>
     <string name="welcome_feature_2_text">Conectar em todas as suas Nuvens</string>
@@ -619,31 +620,34 @@ foram encontrados para sua pesquisa! </string>
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Nenhuma atividade ainda</string>
-    <string name="activities_no_results_message">O stream irá mostrar eventos como\nadições, mudanças &amp; compartilhamentos</string>
+    <string name="activities_no_results_message">O fluxo irá mostrar eventos como\nInclusões, alterações e compartilhamentos</string>
     <string name="webview_error">Um erro ocorreu</string>
     <string name="prefs_category_about">Sobre</string>
 
-    <string name="actionbar_contacts">Backup dos contatos</string>
-    <string name="contacts_backup_button">Backup agora</string>
+    <string name="actionbar_contacts">Fazer backup dos contatos</string>
+    <string name="actionbar_contacts_restore">Restaurar contatos</string>
+    <string name="contacts_backup_button">Fazer backup agora</string>
     <string name="contacts_restore_button">Retornar último backup</string>
     <string name="contacts_header_restore">Retornar</string>
     <string name="contacts_header_backup">Backup</string>
     <string name="contacts_automatic_backup">Backup dos contatos</string>
     <string name="contacts_last_backup">Último backup</string>
-    <string name="contacts_read_permission">A permissão de leitura dos contatos é necessária</string>
-    <string name="contacts_write_permission">A permissão de gravação dos contatos é necessária</string>
+    <string name="contacts_read_permission">Permissão para ler contatos é necessária</string>
+    <string name="contacts_write_permission">Permissão para alterar a lista de contatos é necessária</string>
     <string name="contactlist_title">Restaurar contatos</string>
     <string name="contaclist_restore_selected">Restaurar contatos selecionados</string>
-    <string name="contactlist_account_chooser_title">Escolha a conta a importar</string>
-    <string name="contactlist_no_permission">Sem permissão. Nada foi importado!</string>
+    <string name="contactlist_account_chooser_title">Escolha a conta para importar</string>
+    <string name="contactlist_no_permission">Nenhuma permissão foi dada, nada importado!</string>
     <string name="contacts_preference_choose_date">Escolha a data</string>
     <string name="contacts_preference_backup_never">nunca</string>
     <string name="contacts_preferences_no_file_found">Nenhum arquivo encontrado</string>
+    <string name="contacts_preferences_something_strange_happened">Não foi possível encontrar seu último backup!</string>
     <string name="contacts_preferences_backup_scheduled">Backup agendado e irá iniciar em breve</string>
     <string name="contacts_preferences_import_scheduled">Backup importado e irá iniciar em breve</string>
 
     <!-- Notifications -->
     <string name="new_notification_received">Nova notificação recebida</string>
+    <string name="drawer_logout">Sair</string>
 
 
 </resources>

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

@@ -46,10 +46,10 @@
     <string name="prefs_fingerprint">Parmak izi kilidi</string>
     <string name="prefs_fingerprint_notsetup">Henüz bir parmak izi ayarlanmamış.</string>
     <string name="prefs_show_hidden_files">Gizli dosyaları görüntüle</string>
-    <string name="prefs_instant_upload">Fotoğraflar anında yüklensin</string>
-    <string name="prefs_instant_upload_summary">Kamera ile çekilen fotoğraflar anında yüklensin</string>
-    <string name="prefs_instant_video_upload">Görüntüler anında yüklensin</string>
-    <string name="prefs_instant_video_upload_summary">Kamera ile çekilen görüntüler anında yüklensin</string>
+    <string name="prefs_instant_upload">Anında fotoğraf yükleme</string>
+    <string name="prefs_instant_upload_summary">Kamera ile çekilen fotoğraflar anında yüklenir</string>
+    <string name="prefs_instant_video_upload">Anında görüntü yükleme</string>
+    <string name="prefs_instant_video_upload_summary">Kamera ile çekilen görüntüler anında yüklenir</string>
     <string name="prefs_log_title">Günlük kullanılsın</string>
     <string name="prefs_log_summary">Etkinleştirildiğinde sorunlar günlük dosyasına kaydedilir</string>
     <string name="prefs_log_title_history">Günlük geçmişi</string>
@@ -58,14 +58,14 @@
     <string name="prefs_calendar_contacts">Takvim ve kişiler eşitlensin</string>
     <string name="prefs_calendar_contacts_summary">Geçerli hesap için DAVdroid (v1.3.0+) kurulumu</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Hesabın sunucu adresi DAVdroid tarafından çözümlenemedi</string>
-    <string name="prefs_calendar_contacts_no_store_error">Google Play mağazası yok ya da F-Droid uygulaması kurulmamış</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Takvim ve kişi eşitlemesi ayarlandı</string>
+    <string name="prefs_calendar_contacts_no_store_error">F-droid ya da Google Play kurulmamış</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Takvim ve kişi eşitlemesi ayarları</string>
     <string name="prefs_help">Yardım</string>
-    <string name="prefs_recommend">Arkadaşınıza önerin</string>
+    <string name="prefs_recommend">Arkadaşına öner</string>
     <string name="prefs_feedback">Geri bildirim</string>
     <string name="prefs_imprint">İzlenim</string>
-    <string name="prefs_remember_last_share_location">Konum paylaşma hatırlansın</string>
-    <string name="prefs_remember_last_upload_location_summary">Son paylaşma yükleme konumu hatırlansın</string>
+    <string name="prefs_remember_last_share_location">Paylaşılacak konum hatırlansın</string>
+    <string name="prefs_remember_last_upload_location_summary">Son kullanılan konumlar paylaşılmak üzere hatırlanır</string>
 
 	<string name="recommend_subject">%1$s uygulamasını akıllı telefonunuzda deneyin!</string>
 	<string name="recommend_text">Akıllı telefonunda %1$s kullanmanı öneriyorum!\nBuradan indirebilirsin: %2$s</string>
@@ -74,7 +74,7 @@
     <string name="auth_host_url">Sunucu adresi https://…</string>
     <string name="auth_username">Kullanıcı Adı</string>
     <string name="auth_password">Parola</string>
-    <string name="auth_register">Henüz bir sunucunuz yok mu?\nBuraya tıklayarak bir hizmet sağlayıcıdan sunucu edinebilirsiniz</string>
+    <string name="auth_register">Henüz bir sunucunuz yok mu?\Hizmet sağlayıcılardan yararlanabilirsiniz</string>
     <string name="sync_string_files">Dosyalar</string>
     <string name="setup_btn_connect">Bağlan</string>
     <string name="uploader_btn_upload_text">Yükle</string>
@@ -86,9 +86,9 @@
     <string name="uploader_error_title_no_file_to_upload">Yüklenecek bir dosya yok</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s bir metin parçasını dosya olarak yükleyemez.</string>
     <string name="uploader_error_message_no_file_to_upload">Alınan verilerde geçerli bir dosya bulunamadı.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">Dosya yüklenemedi</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Bu dosya yüklenemez</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s alınan bir dosyayı okumaya yetkili değil</string>
-    <string name="uploader_error_message_source_file_not_found">Karşıya yüklenecek dosya konumunda bulunamadı. Lütfen dosyanın var olduğundan emin olun.</string>
+    <string name="uploader_error_message_source_file_not_found">Yüklenmek üzere seçilmiş dosya bulunamadı. Lütfen dosyanın var olup olmadığını denetleyin.</string>
     <string name="uploader_error_message_source_file_not_copied">Dosya geçici bir klasöre kopyalanırken bir sorun çıktı. Lütfen yeniden göndermeyi deneyin.</string>
     <string name="uploader_upload_files_behaviour">Yükleme seçeneği:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Dosya Nextcloud klasörüne taşınsın</string>
@@ -96,31 +96,33 @@
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Dosya kaynak klasörden silinsin</string>
     <string name="file_list_seconds_ago">saniye önce</string>
     <string name="file_list_empty_headline">Burada herhangi bir dosya yok</string>
-    <string name="file_list_empty">Bazı içerikler yükleyin ya da aygıtlarınızla eşitleyin!</string>
-    <string name="file_list_empty_favorites">Bazı dosyaları sık kullanılanlara ekleyin ya da aygıtlarınızla paylaşın!</string>
+    <string name="file_list_empty">Bazı içerikler yükleyin ya da aygıtlarınızla eşitleyin.</string>
+    <string name="file_list_empty_favorites">Bazı dosyaları sık kullanılanlara ekleyin ya da aygıtlarınızla paylaşın.</string>
     <string name="file_list_empty_favorites_filter_list">Sık kullanılanlara eklediğiniz dosya ve klasörler burada görüntülenir</string>
-    <string name="file_list_empty_favorites_filter">Arama sonucunda sık kullanılan bir dosya bulunamadı!</string>
+    <string name="file_list_empty_favorites_filter">Arama sonucunda sık kullanılan bir dosya bulunamadı.</string>
     <string name="file_list_loading">Yükleniyor&#8230;</string>
-    <string name="file_list_no_app_for_file_type">Bu dosya türü için uygulama bulunamadı!</string>
+    <string name="file_list_no_app_for_file_type">Bu dosya türü için uygulama bulunamadı.</string>
     <string name="local_file_list_empty">Bu klasörde herhangi bir dosya yok.</string>
     <string name="file_list_empty_headline_search">Bu klasörde herhangi bir sonuç yok</string>
     <string name="file_list_empty_headline_server_search">Herhangi bir sonuç bulunamadı</string>
+    <string name="file_list_empty_favorite_headline">Henüz sık kullanılan bir öge yok</string>
     <string name="file_list_empty_shared_headline">Henüz hiçbir şey paylaşılmamış</string>
     <string name="file_list_empty_shared">Paylaştığınız dosya ve klasörler burada görüntülenir</string>
     <string name="file_list_empty_headline_server_search_videos">Herhangi bir görüntü bulunamadı</string>
     <string name="file_list_empty_headline_server_search_photos">Herhangi bir fotoğraf bulunamadı</string>
     <string name="file_list_empty_search">Başka bir klasöre bakılmasını ister misiniz?</string>
     <string name="file_list_empty_recently_modified">Son 7 gün içinde değiştirilmiş herhangi bir dosya bulunamadı</string>
-    <string name="file_list_empty_recently_modified_filter">Son 7 gün içinde değiştirilmiş herhangi bir dosya bulunamadı!</string>
+    <string name="file_list_empty_recently_modified_filter">Arama sonucunda son 7 gün içinde düzenlenmiş
+        bir dosya bulunamadı.</string>
     <string name="file_list_empty_recently_added">Geçenlerde eklenmiş herhangi bir dosya bulunamadı</string>
-    <string name="file_list_empty_recently_added_filter">Arama sonucunda geçenlerde eklenmiş bir dosya bulunamadı!</string>
-    <string name="file_list_empty_text_photos">Bazı fotoğraflar yükleyin ya da otomatik yüklemeyi etkinleştirin!</string>
-    <string name="file_list_empty_text_photos_filter">Arama sonucunda herhangi bir fotoğraf bulunamadı!</string>
-    <string name="file_list_empty_text_videos">Bazı görüntüler yükleyin ya da otomatik yüklemeyi etkinleştirin!</string>
-    <string name="file_list_empty_text_videos_filter">Arama sonucunda herhangi bir görüntü bulunamadı!</string>
+    <string name="file_list_empty_recently_added_filter">Arama sonucunda geçenlerde eklenmiş bir dosya bulunamadı.</string>
+    <string name="file_list_empty_text_photos">Bazı fotoğraflar yükleyin ya da otomatik yüklemeyi etkinleştirin.</string>
+    <string name="file_list_empty_text_photos_filter">Arama sonucunda herhangi bir fotoğraf bulunamadı.</string>
+    <string name="file_list_empty_text_videos">Bazı görüntüler yükleyin ya da otomatik yüklemeyi etkinleştirin.</string>
+    <string name="file_list_empty_text_videos_filter">Arama sonucunda herhangi bir görüntü bulunamadı.</string>
     <string name="upload_list_empty_headline">Herhangi bir yükleme yok</string>
-    <string name="upload_list_empty_text">Buraya bazı içerikler yükleyin ya da anında yüklemeyi etkinleştirin!</string>
-    <string name="upload_list_empty_text_auto_upload">Bazı içerikler yükleyin ya da otomatik yüklemeyi etkinleştirin!</string>
+    <string name="upload_list_empty_text">Bazı içerikler yükleyin ya da anında yüklemeyi etkinleştirin.</string>
+    <string name="upload_list_empty_text_auto_upload">Bazı içerikler yükleyin ya da otomatik yüklemeyi etkinleştirin.</string>
     <string name="file_list_folder">klasör</string>
     <string name="file_list_folders">klasör</string>
     <string name="file_list_file">dosya</string>
@@ -202,7 +204,7 @@
     <string name="sync_fail_in_favourites_content">%1$d dosya eşitlenemedi (%2$d çakışma)</string>
     <string name="sync_foreign_files_forgotten_ticker">Bazı yerel dosyalar unutulmuş</string>
     <string name="sync_foreign_files_forgotten_content">%2$s klasöründeki %1$d dosya şuraya kopyalanamadı</string>
-    <string name="sync_foreign_files_forgotten_explanation">1.3.16 sürümünden sonra, veri kaybının önlenebilmesi için bu aygıttan yüklenen dosyalar, bir dosya birden fazla hesapla eşitlendiğinde %1$s yerel klasörüne kopyalanır.\n\nBu değişiklikten dolayı, bu uygulamanın yüklenmiş tüm önceki sürümündeki dosyalar %2$s klasörüne kopyalandı. Ancak hesap eşitlemesi sırasında bu işlemin tamamlanmasını engelleyen bir hata oluştu. Dosyaları olduğu gibi bırakabilir ve %3$s bağlantısını kaldırabilir ya da dosyaları %1$s klasörüne taşıyıp %4$s bağlantısını koruyabilirsiniz.\n\nYerel dosyaları ve bağlı oldukları %5$s içindeki uzak dosyaların listesini aşağıda görebilirsiniz.</string>
+    <string name="sync_foreign_files_forgotten_explanation">1.3.16 sürümünden sonra, veri kaybının önlenebilmesi için bu aygıttan yüklenen dosyalar, bir dosya birden fazla hesapla eşitlendiğinde %1$s yerel klasörüne kopyalanır.\n\nBu değişiklikten dolayı, bu uygulamanın yüklenmiş tüm önceki sürümündeki dosyalar %2$s klasörüne kopyalandı. Ancak hesap eşitlemesi sırasında bu işlemin tamamlanmasını engelleyen bir sorun çıktı. Dosyaları olduğu gibi bırakabilir ve %3$s bağlantısını kaldırabilir ya da dosyaları %1$s klasörüne taşıyıp %4$s bağlantısını koruyabilirsiniz.\n\nYerel dosyaları ve bağlı oldukları %5$s içindeki uzak dosyaların listesini aşağıda görebilirsiniz.</string>
     <string name="sync_current_folder_was_removed">%1$s klasörü artık yok</string>
     <string name="foreign_files_move">Tümünü taşı</string>
     <string name="foreign_files_success">Tüm dosyalar taşındı</string>
@@ -251,8 +253,8 @@
 	<string name="auth_account_not_new">Aygıt üzerinde aynı kullanıcı adı ve sunucu için bir hesap zaten var</string>
 	<string name="auth_account_not_the_same">Yazdığınız kullanıcı adı bu hesabın kullanıcı adı ile eşleşmiyor</string>
 	<string name="auth_unknown_error_title">Bilinmeyen bir sorun çıktı!</string>
-	<string name="auth_unknown_host_title">Sunucu bulunamadı</string>
-	<string name="auth_incorrect_path_title">Sunucu kopyası bulunamadı</string>
+	<string name="auth_unknown_host_title">Sunucu adı bulunamadı</string>
+	<string name="auth_incorrect_path_title">Sunucu bulunamadı</string>
 	<string name="auth_timeout_title">Sunucu çok geç yanıt veriyor</string>
 	<string name="auth_incorrect_address_title">Sunucu adresi biçimi hatalı</string>
 	<string name="auth_ssl_general_error_title">SSL başlatılamadı</string>
@@ -287,22 +289,22 @@
     <string name="remove_fail_msg">Silinemedi</string>
     <string name="rename_dialog_title">Yeni bir ad yazın</string>
     <string name="rename_local_fail_msg">Yerel kopya yeniden adlandırılamadı; farklı bir ad deneyin</string>
-    <string name="rename_server_fail_msg">Yeniden  adlandırma tamamlanamadı</string>
+    <string name="rename_server_fail_msg">Sunucu yeniden adlandırılamadı</string>
     <string name="sync_file_fail_msg">Uzak dosya denetlenemedi</string>
     <string name="sync_file_nothing_to_do_msg">Dosya içerikleri zaten eşitlenmiş</string>
     <string name="create_dir_fail_msg">Klasör oluşturulamadı</string>
     <string name="filename_forbidden_characters">İzin verilmeyen karakterler: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Dosya adında en az bir geçersiz karakter var</string>
     <string name="filename_empty">Dosya adı boş olamaz</string>
-    <string name="wait_a_moment">Biraz bekleyin</string>
+    <string name="wait_a_moment">Biraz bekleyin...</string>
     <string name="wait_checking_credentials">Kayıtlı kimlik bilgileri denetleniyor</string>
-    <string name="filedisplay_unexpected_bad_get_content">Beklenmedik bir sorun çıktı; Lütfen başka bir uygulamadan dosya seçin</string>
-    <string name="filedisplay_no_file_selected">Herhangi bir dosya seçilmedi</string>
+    <string name="filedisplay_unexpected_bad_get_content">Beklenmedik bir sorun çıktı, lütfen başka bir uygulamadan dosya seçin</string>
+    <string name="filedisplay_no_file_selected">Herhangi bir dosya seçilmemiş</string>
     <string name="activity_chooser_title">Bağlantıyı gönder&#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Dosya kişisel depolamadan kopyalanıyor</string>
     
     <string name="oauth_check_onoff">oAuth2 ile oturum açın</string> 
-    <string name="oauth_login_connection">oAuth2 sunucusuna bağlanılıyor…</string>    
+    <string name="oauth_login_connection">OAuth2 sunucusuna bağlanılıyor…</string>    
         
     <string name="ssl_validator_header">Sitenin kimliği doğrulanamadı</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Sunucu sertifikasına güvenilmiyor</string>
@@ -339,7 +341,7 @@
     <string name="placeholder_timestamp">2012/05/18 12:23 ÖS</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Yalnız kablosuz ağ bağlıyken yüklensin</string>
+    <string name="auto_upload_on_wifi">Yalnız kablosuz ağ üzerinden yüklensin</string>
     <string name="instant_upload_on_wifi">Fotoğraflar yalnız kablosuz ağ üzerinden yüklensin</string>
     <string name="instant_video_upload_on_wifi">Görüntüler yalnız kablosuz ağ üzerinden yüklensin</string>
     <string name="instant_video_upload_on_charging">Yalnız şarj edilirken yüklensin</string>
@@ -351,7 +353,7 @@
     <string name="conflict_use_local_version">yerel sürümü</string>
     <string name="conflict_use_server_version">sunucu sürümünü</string>
 
-    <string name="preview_sorry">Bundan dolayı üzgünüz!</string>
+    <string name="preview_sorry">Maalesef.</string>
     <string name="preview_image_description">Görsel önizleme</string>
     <string name="preview_image_error_unknown_format">Görsel görüntülenemedi</string>
 
@@ -362,7 +364,7 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">Alt klasörler kullanılsın</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Yıla ve aya göre alt klasörlere kaydedilsin</string>
 
-	<string name="share_link_no_support_share_api">Maalesef, sunucunuzda paylaşım etkin değil. Lütfen yöneticinizle görüşün.</string>
+	<string name="share_link_no_support_share_api">Sunucunuzda paylaşım etkin değil. Lütfen yöneticinizle görüşün.</string>
 	<string name="share_link_file_no_exist">Paylaşılamadı. Lütfen dosyanın var olup olmadığını denetleyin</string>
 	<string name="share_link_file_error">Bu dosya ya da klasör paylaşılmaya çalışılırken bir sorun çıktı</string>
 	<string name="unshare_link_file_no_exist">Paylaşımı kaldırılamadı. Lütfen dosyanın var olup olmadığını denetleyin</string>
@@ -380,28 +382,29 @@
     <string name="clipboard_uxexpected_error">Panoya kopyalama sırasında beklenmeyen bir sorun çıktı</string>
     <string name="clipboard_label">Metin %1$s kaynağından kopyalandı</string>
 
-    <string name="error_cant_bind_to_operations_service">Ciddi hata: İşlemler gerçekleştirilemiyor</string>
+    <string name="error_cant_bind_to_operations_service">Ciddi sorun: İşlemler gerçekleştirilemiyor</string>
 
     <string name="network_error_socket_exception">Sunucuya bağlanılırken bir sorun çıktı.</string>
-    <string name="network_error_socket_timeout_exception">Sunucu beklenirken bir sorun çıktı, işlem tamamlanamadı</string>
-    <string name="network_error_connect_timeout_exception">Sunucu beklenirken bir sorun çıktı; işlem tamamlanamadı</string>
-    <string name="network_host_not_available">İşlem tamamlanamadı; sunucu kullanılamıyor</string>
+    <string name="network_error_socket_timeout_exception">Sunucu beklenirken bir sorun çıktı, işlem tamamlanamadı.</string>
+    <string name="network_error_connect_timeout_exception">Sunucu beklenirken bir sorun çıktı, işlem tamamlanamadı.</string>
+    <string name="network_host_not_available">İşlem tamamlanamadı, sunucu kullanılamıyor</string>
+
     <string name="forbidden_permissions">%s izniniz yok</string>
     <string name="forbidden_permissions_rename">bu dosyayı yeniden adlandırın</string>
     <string name="forbidden_permissions_delete">bu dosyayı silin</string>
     <string name="share_link_forbidden_permissions">bu dosyayı paylaşın</string>
     <string name="unshare_link_forbidden_permissions">bu dosyanın paylaşımını kaldırın</string>
     <string name="update_link_forbidden_permissions">bu paylaşımı güncelleyin</string>
-    <string name="forbidden_permissions_create">dosya oluşturun</string>
-    <string name="uploader_upload_forbidden_permissions">bu klasöre yükleyin</string>
+    <string name="forbidden_permissions_create">bu dosyayı oluşturamazsınız</string>
+    <string name="uploader_upload_forbidden_permissions">bu klasöre yükleyemezsiniz</string>
     <string name="downloader_download_file_not_found">Bu dosya artık sunucuda yok</string>
 
     <string name="file_migration_dialog_title">Depolama yolu güncelleniyor</string>
     <string name="file_migration_finish_button">Bitti</string>
-    <string name="file_migration_preparing">Aktarıma hazırlanıyor&#8230;</string>
+    <string name="file_migration_preparing">Aktarıma hazırlanılıyor&#8230;</string>
     <string name="file_migration_checking_destination">Hedef denetleniyor&#8230;</string>
     <string name="file_migration_saving_accounts_configuration">Hesap ayarları kaydediliyor&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Eşitlemelerin tamamlanması bekleniyor&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Tüm eşitlemelerin tamamlanması bekleniyor&#8230;</string>
     <string name="file_migration_migrating">Veriler taşınıyor&#8230;</string>
     <string name="file_migration_updating_index">Dizin güncelleniyor&#8230;</string>
     <string name="file_migration_cleaning">Temizleniyor&#8230;</string>
@@ -411,12 +414,12 @@
     <string name="file_migration_failed_not_writable">HATA: Dosya yazılabilir değil</string>
     <string name="file_migration_failed_not_readable">HATA: Dosya okunabilir değil</string>
     <string name="file_migration_failed_dir_already_exists">HATA: Nextcloud klasörü zaten var</string>
-    <string name="file_migration_failed_while_coping">HATA: Aktarımda bir sorun çıktı</string>
-    <string name="file_migration_failed_while_updating_index">HATA: Dizin güncellenirken bir sorun çıktı</string>
+    <string name="file_migration_failed_while_coping">HATA: Aktarımda sorun çıktı</string>
+    <string name="file_migration_failed_while_updating_index">HATA: Dizin güncellenirken sorun çıktı</string>
 
-    <string name="file_migration_directory_already_exists">Veri klasörü zaten var, ne yapmak istersiniz?</string>
-    <string name="file_migration_override_data_folder">Üzerine yazılsın</string>
-    <string name="file_migration_use_data_folder">Varolan kullanılsın</string>
+    <string name="file_migration_directory_already_exists">Veri klasörü zaten var, yapılacak işlemi seçin:</string>
+    <string name="file_migration_override_data_folder">Değiştirilsin</string>
+    <string name="file_migration_use_data_folder">Kullanılsın</string>
 
     <string name="prefs_category_accounts">Hesaplar</string>
     <string name="prefs_add_account">Hesap ekle</string>
@@ -436,15 +439,15 @@
 	<string name="file_list_empty_moving">Burada bir şey yok. Bir klasör ekleyebilirsiniz!</string>
 	<string name="folder_picker_choose_button_text">Seçin</string>
 
-    <string name="move_file_not_found">Taşınamadı. Lütfen dosyanın var olup olmadığını denetleyin</string>
-    <string name="move_file_invalid_into_descendent">Bir klasör kendi alt klasörüne taşınamaz</string>
+    <string name="move_file_not_found">Dosya taşınamadı. Lütfen dosyanın var olup olmadığını denetleyin</string>
+    <string name="move_file_invalid_into_descendent">Bir klasör kendi alt klasörü olarak taşınamaz</string>
     <string name="move_file_invalid_overwrite">Dosya hedef klasörde zaten var</string>
     <string name="move_file_error">Bu dosya ya da klasör taşınmaya çalışılırken bir sorun çıktı</string>
     <string name="forbidden_permissions_move">bu dosyayı taşıyın</string>
 
 
     <string name="copy_file_not_found">Kopyalanamadı. Lütfen dosyanın var olup olmadığını denetleyin</string>
-    <string name="copy_file_invalid_into_descendent">Bir klasör kendi alt klasörüne kopyalanamaz</string>
+    <string name="copy_file_invalid_into_descendent">Bir klasör kendi alt klasörü olarak kopyalanamaz</string>
     <string name="copy_file_invalid_overwrite">Dosya hedef klasörde zaten var</string>
     <string name="copy_file_error">Bu dosya ya da klasör kopyalanmaya çalışılırken bir sorun çıktı</string>
     <string name="forbidden_permissions_copy">bu dosyayı kopyalayın</string>
@@ -452,7 +455,7 @@
     <string name="prefs_category_instant_uploading">Anında yüklemeler</string>
     <string name="prefs_category_details">Ayrıntılar</string>
 
-	<string name="prefs_instant_video_upload_path_title">Anında yükleme görüntü klasörü</string>
+	<string name="prefs_instant_video_upload_path_title">Anında görüntü yükleme klasörü</string>
     <string name="sync_folder_failed_content">%1$s klasörünün eşitlemesi tamamlanamadı</string>
 
 	<string name="shared_subject_header">sizinle</string>
@@ -494,7 +497,7 @@
     <string name="share_add_user_or_group">Kullanıcı ya da grup ekle</string>
     <string name="share_via_link_section_title">Paylaşım bağlantısı</string>
     <string name="share_via_link_expiration_date_label">Son kullanma tarihini ayarla</string>
-    <string name="share_via_link_password_label">Parola koruması</string>
+    <string name="share_via_link_password_label">Parola ile korunsun</string>
     <string name="share_via_link_password_title">Güvenli</string>
     <string name="share_via_link_edit_permission_label">Düzenlenebilsin</string>
     <string name="share_via_link_hide_file_listing_permission_label">Dosya listeleme gizlensin</string>
@@ -510,7 +513,7 @@
     <string name="share_email_clarification">%1$s (E-posta)</string>
     <string name="share_known_remote_clarification">%1$s (%2$s üzerinde)</string>
 
-    <string name="share_sharee_unavailable">Maalesef sunucu sürümünüz istemciler içindeki kullanıcılar ile paylaşıma izin vermiyor.\nLütfen yöneticinizle görüşün</string>
+    <string name="share_sharee_unavailable">Kullanıcıların istemcileri içinden paylaşım yapabilmesini sağlamak için sunucu sürümünüzü yükseltin.\nLütfen yöneticinizle görüşün</string>
     <string name="share_privilege_can_share">paylaşabilir</string>
     <string name="share_privilege_can_edit">düzenleyebilir</string>
     <string name="share_privilege_can_edit_create">oluştur</string>
@@ -519,16 +522,16 @@
     <string name="edit_share_unshare">Paylaşımı durdur</string>
     <string name="edit_share_done">bitti</string>
 
-    <string name="action_retry_uploads">Yeniden denenemedi</string>
+    <string name="action_retry_uploads">Yeni girişim başarısız oldu</string>
     <string name="action_clear_failed_uploads">Temizlenemedi</string>
     <string name="action_clear_successful_uploads">Temizlendi</string>
-    <string name="action_clear_finished_uploads">Tümü temizlendi</string>
+    <string name="action_clear_finished_uploads">Tamamlanmış yüklemeleri temizle</string>
 
     <string name="action_switch_grid_view">Tablo görünümü</string>
     <string name="action_switch_list_view">Liste görünümü</string>
 
     <string name="manage_space_title">Alan yönetimi</string>
-    <string name="manage_space_description">%1$s verilerinden ayarlar, veritabanı ve sunucu sertifikaları kalıcı olarak silinecek. \n\nİndirilen dosyalara dokunulmayacak.\n\nBu işlem biraz vakit alabilir.</string>
+    <string name="manage_space_description">%1$s verilerinden ayarlar, veritabanı ve sunucu sertifikaları kalıcı olarak silinecek. \n\nİndirilen dosyalara dokunulmayacak.\n\nBu işlem biraz zaman alabilir.</string>
     <string name="manage_space_clear_data">Verileri temizle</string>
     <string name="manage_space_error">Bazı dosyalar silinemedi.</string>
 
@@ -545,16 +548,16 @@
     <string name="participate_testing_headline">Denememize yardımcı olun</string>
     <string name="participate_testing_bug_text">Bir hata mı buldunuz? Bir gariplik mi var?</string>
     <string name="participate_testing_report_text">Github üzerinden bir sorun bildirin</string>
-    <string name="participate_testing_version_text">Gelecek sürümler için bize yardımcı olmak ister misiniz?</string>
+    <string name="participate_testing_version_text">Sonraki sürümü deneyerek bize yardımcı olmak ister misiniz?</string>
     <string name="participate_beta_headline">Geliştirici sürümünü deneyin</string>
     <string name="participate_beta_text">Bu sürümde tüm yeni özellikler bulunur ve çok taze olduğundan hata ve sorunlar olabilir. Bir hata ya da soruna rastlarsanız bize iletin.</string>
     <string name="participate_release_candidate_headline">Yayın adayı</string>
-    <string name="participate_release_candidate_text">Yayın adayı (Release Candidate, RC) yayınlanacak sürümün bir kopyasıdır ve kararlı olması beklenir. Kişisel olarak kullanmanız kararlı olduğundan emin olmamızı sağlar. Denemek için Play Store üzerinden kayıt olun ya da el ile F-Droid üzerindeki \"sürümlere\" bakın.</string>
+    <string name="participate_release_candidate_text">Yayın adayı (Release Candidate, RC) yayınlanacak sürümün bir kopyasıdır ve kararlı olması beklenir. Kişisel olarak kullanmanız kararlı olduğundan emin olmamızı sağlar. Denemek için Play Store üzerinden kayıt olun ya da el ile F-Droid üzerindeki \"sürümler\" bölümüne bakın.</string>
     <string name="participate_contribute_headline">Etkin Katkıda Bulunun</string>
     <string name="participate_contribute_irc_text">IRC sohbetine katılın: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">&lt;a href=\"%1$s\">forum&lt;/a> üzerinde diğer kişilere yardımcı olun</string>
     <string name="participate_contribute_translate_text">Uygulamayı &lt;a href="%1$s">çevirin&lt;/a> </string>
-    <string name="participate_contribute_github_text">Yazılımcı olarak katkıda bulunun! Ayrıntılı bilgi almak için &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">KATKIDA BULUNMA&lt;/a> sayfasına bakın</string>
+    <string name="participate_contribute_github_text">Yazılımcı olarak katkıda bulunun! Ayrıntılı bilgi almak için &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">KATKIDA BULUNMA.md&lt;/a> sayfasına bakın</string>
     <string name="move_to">Taşı&#8230;</string>
     <string name="copy_to">Kopyala&#8230;</string>
     <string name="choose_remote_folder">Klasör seçin&#8230;</string>
@@ -562,7 +565,7 @@
     <string name="folder_sync_no_results">Herhangi bir ortam klasörü bulunamadı.</string>
     <string name="folder_sync_preferences">Otomatik yükleme ayarları</string>
     <string name="folder_sync_settings">Ayarlar</string>
-    <string name="folder_sync_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. Verdiğimiz rahatsızlık için özür dileriz.\n\nYeni ve geliştirilmiş otomatik yükleme özellklerinin tadını çıkarın!</string>
+    <string name="folder_sync_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 özellklerinin tadını çıkarın.</string>
     <string name="folder_sync_preferences_folder_path">%1$s için</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d seçili</item>
@@ -592,7 +595,7 @@
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">Verileriniz için güvenli bir yer!</string>
-    <string name="welcome_feature_1_text">Ev ya da iş yerinizdeki dosyalarınıza erişmek, paylaşmak ve korumak için kullanabilirsiniz</string>
+    <string name="welcome_feature_1_text">Ev ya da iş yerinizdeki dosyalarınıza erişin, paylaşın ve koruyun</string>
 
     <string name="welcome_feature_2_title">Birden çok hesap</string>
     <string name="welcome_feature_2_text">Tüm bulut hesaplarınıza bağlanın</string>
@@ -622,26 +625,29 @@
     <string name="prefs_category_about">Hakkında</string>
 
     <string name="actionbar_contacts">Kişileri Yedekle</string>
-    <string name="contacts_backup_button">Şimdi yedekle</string>
+    <string name="actionbar_contacts_restore">Kişileri Geri Yükle</string>
+    <string name="contacts_backup_button">Yedekle</string>
     <string name="contacts_restore_button">Son Yedeği Geri Yükle</string>
     <string name="contacts_header_restore">Geri Yükle</string>
     <string name="contacts_header_backup">Yedekle</string>
     <string name="contacts_automatic_backup">Kişileri Yedekle</string>
     <string name="contacts_last_backup">Son Yedek</string>
-    <string name="contacts_read_permission">Kişileri okuma izni gerekiyor</string>
-    <string name="contacts_write_permission">Kişilere yazma izni gerekiyor</string>
+    <string name="contacts_read_permission">Kişi listesini okuma izni gerekiyor</string>
+    <string name="contacts_write_permission">Kişi listesini düzenleme izni gerekiyor</string>
     <string name="contactlist_title">Kişileri geri yükle</string>
     <string name="contaclist_restore_selected">Seçilmiş kişileri geri yükle</string>
     <string name="contactlist_account_chooser_title">Alınacak hesabı seçin</string>
-    <string name="contactlist_no_permission">İzin verilmemiş olduğundan hiçbir şey alınamadı!</string>
+    <string name="contactlist_no_permission">Herhangi bir izin verilmemiş olduğundan hiçbir şey alınamadı!</string>
     <string name="contacts_preference_choose_date">Tarih seçin</string>
     <string name="contacts_preference_backup_never">asla</string>
     <string name="contacts_preferences_no_file_found">Herhangi bir dosya bulunamadı</string>
+    <string name="contacts_preferences_something_strange_happened">Son yedeğiniz bulunamadı!</string>
     <string name="contacts_preferences_backup_scheduled">Yedekleme zamanlandı ve kısa süre sonra başlatılacak</string>
     <string name="contacts_preferences_import_scheduled">Alma işlemi zamanlandı ve kısa süre sonra başlatılacak</string>
 
     <!-- Notifications -->
     <string name="new_notification_received">Yeni bir bildirim var</string>
+    <string name="drawer_logout">Oturumu Kapat</string>
 
 
 </resources>

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

@@ -46,10 +46,10 @@
     <string name="prefs_fingerprint">指纹锁</string>
     <string name="prefs_fingerprint_notsetup">指纹锁没有设置</string>
     <string name="prefs_show_hidden_files">显示隐藏文件</string>
-    <string name="prefs_instant_upload">即时图片上传</string>
-    <string name="prefs_instant_upload_summary">即时上传相机拍摄的图片</string>
-    <string name="prefs_instant_video_upload">即时上传视频</string>
-    <string name="prefs_instant_video_upload_summary">即时上传由相机拍摄的视频</string>
+    <string name="prefs_instant_upload">立刻上传图片</string>
+    <string name="prefs_instant_upload_summary">立刻上传摄像头拍摄的图片</string>
+    <string name="prefs_instant_video_upload">立刻上传视频</string>
+    <string name="prefs_instant_video_upload_summary">立刻上传摄像头拍摄的视频</string>
     <string name="prefs_log_title">开启日志</string>
     <string name="prefs_log_summary">用于记录问题</string>
     <string name="prefs_log_title_history">历史日志</string>
@@ -58,23 +58,17 @@
     <string name="prefs_calendar_contacts">同步日历和通讯录</string>
     <string name="prefs_calendar_contacts_summary">为现在的用户设置DAVdroid(v1.3.0+)</string>
     <string name="prefs_calendar_contacts_address_resolve_error">用户目前的服务器地址对于DAVdroid不能被解析</string>
-    <string name="prefs_calendar_contacts_no_store_error">没有安装谷歌或F-Droid的应用商店</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">日历和通讯录的同步设置成功</string>
+    <string name="prefs_calendar_contacts_no_store_error">F-droid或谷歌商店都没有装</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">日历&amp;联系人同步设置</string>
     <string name="prefs_help">帮助</string>
     <string name="prefs_recommend">推荐给朋友</string>
     <string name="prefs_feedback">反馈</string>
     <string name="prefs_imprint">版本说明</string>
-    <string name="prefs_remember_last_share_location">记住共享位置</string>
-    <string name="prefs_remember_last_upload_location_summary">记住上次共享上传的位置</string>
-
-	<string name="recommend_subject">在您的智能手机上试用 %1$s！</string>
-	<string name="recommend_text">我邀请你在智能手机上使用 %1$s\n下载路径：%2$s</string>
-
-    <string name="auth_check_server">检查服务器</string>
+    <string name="recommend_subject">在您的智能手机上试用 %1$s！</string>
+	<string name="auth_check_server">检查服务器</string>
     <string name="auth_host_url">服务器地址 https://...</string>
     <string name="auth_username">用户名</string>
     <string name="auth_password">密码</string>
-    <string name="auth_register">还没有服务器吗? \n点击这里从提供商那里获取一个</string>
     <string name="sync_string_files">文件</string>
     <string name="setup_btn_connect">连接</string>
     <string name="uploader_btn_upload_text">上传</string>
@@ -86,23 +80,13 @@
     <string name="uploader_error_title_no_file_to_upload">文件没有上传</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s不能把一段文字做为文件上传</string>
     <string name="uploader_error_message_no_file_to_upload">得到的数据没有包括有效文件</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">文件无法被上传</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s 不让读取已经获得的文件</string>
-    <string name="uploader_error_message_source_file_not_found">要上传的文件没有在本地发现，请检查文件是否存在
-</string>
-    <string name="uploader_error_message_source_file_not_copied">当文件复制到临时文件夹时有错误发生，请重新发送</string>
     <string name="uploader_upload_files_behaviour">上传选项：</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">移动文件到Nextcloud文件夹</string>
     <string name="uploader_upload_files_behaviour_only_upload">在原文件夹中保留文件</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">从原文件夹中删除文件</string>
     <string name="file_list_seconds_ago">几秒前</string>
-    <string name="file_list_empty_headline">这里没有文件</string>
-    <string name="file_list_empty">上传一些内容或者和你的设备同步</string>
-    <string name="file_list_empty_favorites">收藏一些文件或和你的设备同步！</string>
-    <string name="file_list_empty_favorites_filter_list">收藏的文件和文件夹会在这里显示</string>
-    <string name="file_list_empty_favorites_filter">未找到你要搜索的收藏文件</string>
     <string name="file_list_loading">加载中&#8230;</string>
-    <string name="file_list_no_app_for_file_type">没有找到程序打开文件格式！</string>
     <string name="local_file_list_empty">在该文件夹中不存在文件。</string>
     <string name="file_list_empty_headline_search">此文件夹无结果</string>
     <string name="file_list_empty_headline_server_search">没有结果</string>
@@ -110,18 +94,7 @@
     <string name="file_list_empty_shared">您共享的文件和文件夹将显示在这里</string>
     <string name="file_list_empty_headline_server_search_videos">无视频</string>
     <string name="file_list_empty_headline_server_search_photos">无照片</string>
-    <string name="file_list_empty_search">在其他文件夹找找试试？</string>
-    <string name="file_list_empty_recently_modified">未找到 7 日内有更改的文件</string>
-    <string name="file_list_empty_recently_modified_filter">未找到你要搜索的 7 日内有更改的文件！</string>
-    <string name="file_list_empty_recently_added">未找到最近添加的文件</string>
-    <string name="file_list_empty_recently_added_filter">未找到你要搜索的最近添加文件</string>
-    <string name="file_list_empty_text_photos">上传一些照片或启用自动上传！</string>
-    <string name="file_list_empty_text_photos_filter">未找到你要搜索的照片！</string>
-    <string name="file_list_empty_text_videos">上传一些视频或启用自动上传！</string>
-    <string name="file_list_empty_text_videos_filter">未找到你要搜索的视频！</string>
     <string name="upload_list_empty_headline">没有可以上传的</string>
-    <string name="upload_list_empty_text">上传一些内容或者激活实时上传</string>
-    <string name="upload_list_empty_text_auto_upload">上传一些内容或启用自动上传！</string>
     <string name="file_list_folder">文件夹</string>
     <string name="file_list_folders">文件夹</string>
     <string name="file_list_file">文件</string>
@@ -133,14 +106,11 @@
     <string name="filedetails_modified">修改于：</string>
     <string name="filedetails_download">下载</string>
     <string name="filedetails_sync_file">同步</string>
-    <string name="filedetails_renamed_in_upload_msg">上传过程中文件被更名为了 %1$s</string>
-    <string name="list_layout">列表布局</string>
     <string name="action_share">共享</string>
     <string name="common_yes">是</string>
     <string name="common_no">否</string>
     <string name="common_ok">确定</string>
     <string name="common_remove_upload">移除上传任务</string>
-    <string name="common_retry_upload">重试上传任务</string>
     <string name="common_cancel_sync">取消同步</string>
     <string name="common_cancel">取消</string>
     <string name="common_back">返回</string>
@@ -160,10 +130,8 @@
     <string name="uploader_info_dirname">文件夹名称</string>
     <string name="uploader_upload_in_progress_ticker">上传 &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% 上传 %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">上传成功</string>
     <string name="uploader_upload_succeeded_content_single">%1$s 上传成功</string>
     <string name="uploader_upload_failed_ticker">上传失败</string>
-    <string name="uploader_upload_failed_content_single">%1$s 未能成功上传</string>
     <string name="uploader_upload_failed_credentials_error">上传失败，你需要重新登录</string>
     <string name="uploads_view_title">上传</string>
     <string name="uploads_view_group_current_uploads">当前</string>
@@ -180,37 +148,27 @@
     <string name="uploads_view_upload_status_failed_localfile_error">本地文件未找到</string>
     <string name="uploads_view_upload_status_failed_permission_error">权限错误</string>
     <string name="uploads_view_upload_status_conflict">冲突</string>
-    <string name="uploads_view_upload_status_service_interrupted">应该将被终止</string>
     <string name="uploads_view_upload_status_unknown_fail">未知错误</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">等待WiFi连接</string>
     <string name="uploads_view_later_waiting_to_upload">等待上传...</string>
     <string name="downloader_download_in_progress_ticker">下载中 &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% 下载中 %2$s</string>
-    <string name="downloader_download_succeeded_ticker">下载成功</string>
     <string name="downloader_download_succeeded_content">%1$s 下载成功</string>
     <string name="downloader_download_failed_ticker">下载失败</string>
-    <string name="downloader_download_failed_content">%1$s 下载未能完成</string>
     <string name="downloader_not_downloaded_yet">未下载完毕</string>
     <string name="downloader_download_failed_credentials_error">下载失败，你需要重新登录</string>
     <string name="common_choose_account">选择账户</string>
     <string name="sync_fail_ticker">同步失败</string>
-    <string name="sync_fail_ticker_unauthorized">同步错误；你需要重新登陆</string>
-    <string name="sync_fail_content">%1$s 的同步无法完成</string>
-    <string name="sync_fail_content_unauthorized">%1$s 的密码错误</string>
     <string name="sync_conflicts_in_favourites_ticker">发现冲突</string>
     <string name="sync_conflicts_in_favourites_content">%1$d 文件无法同步</string>
     <string name="sync_fail_in_favourites_ticker">文件同步失败</string>
     <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(%2$d 冲突)</string>
     <string name="sync_foreign_files_forgotten_ticker">某些本地文件已被遗忘</string>
     <string name="sync_foreign_files_forgotten_content">%2$s 目录中的 %1$d 个文件不能被复制到</string>
-    <string name="sync_foreign_files_forgotten_explanation">从 1.3.16 版起，从此设备上传的文件将被复制到本地的 %1$s 文件夹，以防止某个单一文件在多个账户间同步而造成的数据损失。\n\n 由于此项变化，此应用之前的版本上传的全部文件都已被复制到了 %2$s 文件夹。然而，账户同步期间有一个错误阻止了此操作的完成。您可能想保持文件不动，并移除指向 %3$s 的链接，或将文件移动到 %1$s 文件夹中并保持其到 %4$s 的链接。下面列出的是本地文件，以及它们被链接到的 %5$s 中的远程文件。</string>
-    <string name="sync_current_folder_was_removed">文件夹%1$s 已经不存在</string>
     <string name="foreign_files_move">移动所有</string>
     <string name="foreign_files_success">所有文件已被移动</string>
     <string name="foreign_files_fail">某些文件无法被移动</string>
     <string name="foreign_files_local_text">本地: %1$s</string>
     <string name="foreign_files_remote_text">远程:%1$s</string>
-    <string name="upload_query_move_foreign_files">没有足够的空间把选上的文件复制到%1$s目录，你愿意改成转移他们吗？</string>
     <string name="pass_code_enter_pass_code">请输入你的密码</string>
     
     <string name="pass_code_configure_your_pass_code">输入您的密码</string>
@@ -228,16 +186,7 @@
     <string name="media_event_done">%1$s 播放完毕</string>
     <string name="media_err_nothing_to_play">没有发现播放文件</string>
     <string name="media_err_no_account">未提供账号</string>
-    <string name="media_err_not_in_owncloud">文件不在合法账户</string>
     <string name="media_err_unsupported">不支持的编码格式</string>
-    <string name="media_err_io">文件不可读</string>
-    <string name="media_err_malformed">文件编码错误</string>
-    <string name="media_err_timeout">播放超时</string>
-    <string name="media_err_invalid_progressive_playback">文件不支持流播</string>
-    <string name="media_err_unknown">当前媒体播放器不支持。</string>
-    <string name="media_err_security_ex">尝试播放%1$s时保护错误</string>
-    <string name="media_err_io_ex">尝试播放%1$s时输入错误</string>
-    <string name="media_err_unexpected">尝试播放%1$s时未知错误</string>
     <string name="media_rewind_description">后退按钮</string>
     <string name="media_play_pause_description">播放暂停按钮</string>
     <string name="media_forward_description">快进按钮</string>
@@ -249,32 +198,21 @@
 	<string name="auth_connection_established">连接已建立。</string>
 	<string name="auth_testing_connection">测试连接</string>
 	<string name="auth_not_configured_title">服务器配置不正确</string>
-	<string name="auth_account_not_new">此设备中已经存在同名同服务器的帐号</string>
 	<string name="auth_account_not_the_same">输入用户与此帐户的用户不符</string>
 	<string name="auth_unknown_error_title">发生未知错误！</string>
-	<string name="auth_unknown_host_title">无法找到主机</string>
-	<string name="auth_incorrect_path_title">未发现服务器实例</string>
 	<string name="auth_timeout_title">看起来服务器不太给力</string>
-	<string name="auth_incorrect_address_title">错误的服务器地址</string>
 	<string name="auth_ssl_general_error_title">SSL初始化失败</string>
-	<string name="auth_ssl_unverified_server_title">无法验证 SSL 服务器的身份</string>
 	<string name="auth_bad_oc_version_title">不可辨识的服务器服务器版本</string>
-	<string name="auth_wrong_connection_title">无法建立连接</string>
 	<string name="auth_secure_connection">安全连接已建立</string>
 	<string name="auth_unauthorized">用户名或密码错误</string>
 	<string name="auth_oauth_error">认证不成功</string>
 	<string name="auth_oauth_error_access_denied">访问被认证服务器拒绝</string>
-	<string name="auth_wtf_reenter_URL">未知状态，请重新输入服务器地址</string>
 	<string name="auth_expired_oauth_token_toast">你的授权已经过期。请重新授权。</string>
 	<string name="auth_expired_basic_auth_toast">请输入当前的密码</string>
 	<string name="auth_expired_saml_sso_token_toast">您的会话超时了，请重新连接</string>
-	<string name="auth_connecting_auth_server">连接认证服务器...</string>
 	<string name="auth_unsupported_auth_method">服务器不支持这种验证方式</string>
 	<string name="auth_unsupported_multiaccount">%1$s不支持多个账户</string>
-	<string name="auth_fail_get_user_name">你的服务器没有返回正确的用户ID，请联系管理员</string>
 	<string name="auth_can_not_auth_against_server">无法连接认证服务器</string>
-    <string name="auth_account_does_not_exist">设备中还未存在该帐号</string>
-    
     <string name="favorite">可以设置离线</string>
     <string name="unfavorite">不可以设置离线</string>
     <string name="favorite_real">加入收藏</string>
@@ -282,36 +220,24 @@
     <string name="common_rename">重命名</string>
     <string name="common_remove">删除</string>
     <string name="confirmation_remove_file_alert">你确定要删除%1$s?</string>
-    <string name="confirmation_remove_folder_alert">您确定要删除 %1$s 及其内容吗？</string>
     <string name="confirmation_remove_local">仅本地</string>
-    <string name="remove_success_msg">成功删除</string>
     <string name="remove_fail_msg">无法完成删除</string>
     <string name="rename_dialog_title">请输出新的名字</string>
-    <string name="rename_local_fail_msg">本地副本无法重命名，请尝试另外的名字</string>
-    <string name="rename_server_fail_msg">重命名未完成</string>
-    <string name="sync_file_fail_msg">无法核实远程文件</string>
     <string name="sync_file_nothing_to_do_msg">文件内容已同步</string>
-    <string name="create_dir_fail_msg">文件夹无法创建</string>
     <string name="filename_forbidden_characters">禁用字符: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">文件名中存在至少一个非法字符</string>
     <string name="filename_empty">文件名不能为空</string>
-    <string name="wait_a_moment">请稍候</string>
     <string name="wait_checking_credentials">检查保存的证书</string>
-    <string name="filedisplay_unexpected_bad_get_content">未预见错误，请从其它程序中选取文件</string>
-    <string name="filedisplay_no_file_selected">未选择文件</string>
     <string name="activity_chooser_title">发送链接给 &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">从私有存储中拷贝文件</string>
     
     <string name="oauth_check_onoff">使用oAuth2登陆</string> 
-    <string name="oauth_login_connection">连接oAuth2 服务器...</string>    
-        
     <string name="ssl_validator_header">站点身份无法验证</string>
     <string name="ssl_validator_reason_cert_not_trusted">- 不受信任的服务器证书</string>
     <string name="ssl_validator_reason_cert_expired">- 服务器证书过期</string>
     <string name="ssl_validator_reason_cert_not_yet_valid">- 服务器证书时间比当前时间还晚</string>
     <string name="ssl_validator_reason_hostname_not_verified">- 主机名与证书中的记录不匹配</string>
     <string name="ssl_validator_question">是否信任此证书？</string>
-    <string name="ssl_validator_not_saved">证书无法保存</string>
     <string name="ssl_validator_btn_details_see">详细信息</string>
     <string name="ssl_validator_btn_details_hide">隐藏</string>
     <string name="ssl_validator_label_subject">授权给：</string>
@@ -335,27 +261,17 @@
 
     <string name="placeholder_sentence">占位符</string>
     <string name="placeholder_filename">点位符.txt</string>
-    <string name="placeholder_filetype">PNG图像格式</string>
     <string name="placeholder_filesize">389字节</string>
     <string name="placeholder_timestamp">2012/05/18 下午12:23 </string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">只通过wifi上传</string>
-    <string name="instant_upload_on_wifi">仅通过 WIFI 上传照片</string>
-    <string name="instant_video_upload_on_wifi">仅通过 WIFI 上传图片。</string>
-    <string name="instant_video_upload_on_charging">只在充电时上传</string>
-    <string name="instant_upload_on_charging">只在充电时上传</string>
     <string name="instant_upload_path">/实时上传</string>
     <string name="conflict_title">文件冲突</string>
-    <string name="conflict_message">您想要保留哪个文件？如果您同时选中了两个版本，本地的文件的文件名将被加上一个数字</string>
     <string name="conflict_keep_both">保留两者</string>
     <string name="conflict_use_local_version">本地版本</string>
     <string name="conflict_use_server_version">服务器版本</string>
 
-    <string name="preview_sorry">对此抱歉！</string>
     <string name="preview_image_description">图片预览</string>
-    <string name="preview_image_error_unknown_format">无法显示图片</string>
-
     <string name="error__upload__local_file_not_copied">无法复制 %1$s 到本地目录 %2$s</string>
     <string name="prefs_instant_upload_path_title">实时上传文件夹</string>
     <string name="prefs_folder_sync_local_path_title">本地文件夹</string>
@@ -363,7 +279,6 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">使用子文件夹</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">基于年和月存于子文件夹</string>
 
-	<string name="share_link_no_support_share_api">抱歉，你的服务器无法分享，请联系你的管理员</string>
 	<string name="share_link_file_no_exist">无法共享。请检查文件是否存在</string>
 	<string name="share_link_file_error">共享文件或目录出错</string>
 	<string name="unshare_link_file_no_exist">无法取消共享。请检查文件是否存在</string>
@@ -377,56 +292,29 @@
 
     <string name="copy_link">复制链接</string>
     <string name="clipboard_text_copied">复制到剪贴板</string>
-    <string name="clipboard_no_text_to_copy">没有取得文本可以复制到剪贴板</string>
     <string name="clipboard_uxexpected_error">发生未预见的错误当复制到剪贴板</string>
     <string name="clipboard_label">从%1$s复制文本</string>
 
-    <string name="error_cant_bind_to_operations_service">严重错误：无法执行操作</string>
-
-    <string name="network_error_socket_exception">连接到服务器时发生了一个错误。</string>
-    <string name="network_error_socket_timeout_exception">当等待服务器时发生错误，操作不能完成</string>
-    <string name="network_error_connect_timeout_exception">当等待服务器时发生错误，操作不能完成</string>
-    <string name="network_host_not_available">操作无法无成，服务器不可用</string>
-    <string name="forbidden_permissions">你没有权限%s</string>
     <string name="forbidden_permissions_rename">重命名该文件</string>
     <string name="forbidden_permissions_delete">删除该文件</string>
     <string name="share_link_forbidden_permissions">共享该文件</string>
     <string name="unshare_link_forbidden_permissions">取消共享该文件</string>
     <string name="update_link_forbidden_permissions">更新共享</string>
-    <string name="forbidden_permissions_create">创建文件</string>
-    <string name="uploader_upload_forbidden_permissions">在此文件夹上传</string>
     <string name="downloader_download_file_not_found">该文件在服务器上不可用</string>
 
     <string name="file_migration_dialog_title">更新存储路径</string>
     <string name="file_migration_finish_button">完成</string>
-    <string name="file_migration_preparing">正在准备迁移&#8230;</string>
     <string name="file_migration_checking_destination">检查目的地&#8230;</string>
-    <string name="file_migration_saving_accounts_configuration">保存用户设置&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">正在同步，请等候&#8230;</string>
     <string name="file_migration_migrating">正在转移数据&#8230;</string>
     <string name="file_migration_updating_index">更新目录&#8230;</string>
     <string name="file_migration_cleaning">清除&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">重新装入用户设置&#8230;</string>
     <string name="file_migration_ok_finished">完成</string>
-    <string name="file_migration_failed_not_enough_space">错误：没有足够空间</string>
-    <string name="file_migration_failed_not_writable">错误：文件不可写</string>
-    <string name="file_migration_failed_not_readable">错误：文件不可读</string>
     <string name="file_migration_failed_dir_already_exists">错误：Nextcloud目录已经存在</string>
-    <string name="file_migration_failed_while_coping">错误：等待迁移</string>
-    <string name="file_migration_failed_while_updating_index">错误：正在更新目录</string>
-
-    <string name="file_migration_directory_already_exists">数据目录已经存在，怎么办？</string>
-    <string name="file_migration_override_data_folder">覆盖</string>
-    <string name="file_migration_use_data_folder">使用存在</string>
-
     <string name="prefs_category_accounts">账号</string>
     <string name="prefs_add_account">添加账号</string>
     <string name="drawer_manage_accounts">管理账号</string>
-    <string name="auth_redirect_non_secure_connection_title">安全连接是通过一个非安全路由定向的。</string>
-
-	<string name="actionbar_logger">日志</string>
+    <string name="actionbar_logger">日志</string>
 	<string name="log_send_history_button">发送历史日志</string>
-	<string name="log_send_no_mail_app">无法发送日志，请安装邮箱应用。</string>
 	<string name="log_send_mail_subject">%1$s Android 程序日志</string>
 	<string name="log_progress_dialog_text">加载数据 &#8230;</string>
 
@@ -434,27 +322,20 @@
 	<string name="saml_authentication_wrong_pass">错误密码</string>
 	<string name="actionbar_move">移动</string>
     <string name="actionbar_copy">复制</string>
-	<string name="file_list_empty_moving">这里还什么都没有。上传些东西吧！</string>
 	<string name="folder_picker_choose_button_text">选择</string>
 
-    <string name="move_file_not_found">无法移动。请检查文件是否存在</string>
-    <string name="move_file_invalid_into_descendent">无法把一个目录移动到它的下级</string>
-    <string name="move_file_invalid_overwrite">该文件已经存在在目标文件夹</string>
     <string name="move_file_error">尝试移动该文件或文件夹时发生错误</string>
     <string name="forbidden_permissions_move">移动该文件</string>
 
 
     <string name="copy_file_not_found">无法复制文件。请检查文件是否存在</string>
-    <string name="copy_file_invalid_into_descendent">将一个目录移动到它的子目录是不可能的</string>
-    <string name="copy_file_invalid_overwrite">该文件已经存在在目标文件夹</string>
     <string name="copy_file_error">尝试复制这个文件或文件夹时发生了错误</string>
     <string name="forbidden_permissions_copy">复制这个文件</string>
 
     <string name="prefs_category_instant_uploading">即时上传</string>
     <string name="prefs_category_details">详细信息</string>
 
-	<string name="prefs_instant_video_upload_path_title">实时上传视频目录</string>
-    <string name="sync_folder_failed_content"> %1$s同步未完成。</string>
+	<string name="sync_folder_failed_content"> %1$s同步未完成。</string>
 
 	<string name="shared_subject_header">已共享</string>
 	<string name="with_you_subject_header">与你</string>
@@ -495,7 +376,6 @@
     <string name="share_add_user_or_group">添加用户或组</string>
     <string name="share_via_link_section_title">分享链接</string>
     <string name="share_via_link_expiration_date_label">设置过期日期</string>
-    <string name="share_via_link_password_label">密码保护</string>
     <string name="share_via_link_password_title">安全</string>
     <string name="share_via_link_edit_permission_label">允许编辑</string>
     <string name="share_via_link_hide_file_listing_permission_label">隐藏文件列表</string>
@@ -511,7 +391,6 @@
     <string name="share_email_clarification">%1$s (邮件)</string>
     <string name="share_known_remote_clarification">%1$s ( 在 %2$s )</string>
 
-    <string name="share_sharee_unavailable">抱歉，你的服务器版本不允许你分享给用户在客户端，请联系管理员</string>
     <string name="share_privilege_can_share">可共享</string>
     <string name="share_privilege_can_edit">可编辑</string>
     <string name="share_privilege_can_edit_create">创建</string>
@@ -520,50 +399,34 @@
     <string name="edit_share_unshare">停止共享</string>
     <string name="edit_share_done">完成</string>
 
-    <string name="action_retry_uploads">重试失败</string>
     <string name="action_clear_failed_uploads">清除失败</string>
-    <string name="action_clear_successful_uploads">清除成功</string>
-    <string name="action_clear_finished_uploads">清除所有完成任务</string>
-
     <string name="action_switch_grid_view">网格视图</string>
     <string name="action_switch_list_view">列表视图</string>
 
     <string name="manage_space_title">管理空间</string>
-    <string name="manage_space_description">在%1$s的数据中，设置、数据库和服务器认证都会永久性删除，\n\n下载目录会保存。\n\n这个过程会持续些时间。</string>
     <string name="manage_space_clear_data">清除数据</string>
     <string name="manage_space_error">某些文件无法删除。</string>
 
-    <string name="permission_storage_access">没有权限上传和下载文件。</string>
-    <string name="local_file_not_found_toast">在当地的文件系统中找不到这个文件</string>
     <string name="confirmation_remove_files_alert">你是否真的要删除所选的项目？</string>
     <string name="confirmation_remove_folders_alert">你是否真的要删除所选的项目和它们的内容？</string>
-    <string name="uploads_view_upload_status_waiting_for_charging">请等待，设备在充电</string>
     <string name="actionbar_search">搜索</string>
     <string name="files_drop_not_supported">这是一个Nextcloud的特征，请更新</string>
     <string name="learn_more">学习更多</string>
     <string name="drawer_folder_sync">自动上传</string>
     <string name="drawer_participate">参加</string>
-    <string name="participate_testing_headline">帮助我们测试</string>
-    <string name="participate_testing_bug_text">发现一个错误？事情很奇怪？</string>
     <string name="participate_testing_report_text">在GIthub在报告问题</string>
-    <string name="participate_testing_version_text">有感兴趣帮我们测试下一个版本吗？</string>
     <string name="participate_beta_headline">检查这个设备的版本</string>
-    <string name="participate_beta_text">这包括所有即将加入的特性，有相当的风险。如果Bug 或错误发生，请向我们报告。</string>
     <string name="participate_release_candidate_headline">发行候选版本</string>
-    <string name="participate_release_candidate_text">候选发行版(RC)是下一个版本的快照，希望它是稳定的，你可以帮助测试以确认这一点。可以注册登陆在应用商店或手工在F-Droid的版本部分查找，并进行测试。</string>
     <string name="participate_contribute_headline">活跃的候选版</string>
     <string name="participate_contribute_irc_text">在IRC上加入这个会话： &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
     <string name="participate_contribute_forum_text">帮助他人在 &lt;a href="%1$s">论坛&lt;/a></string>
     <string name="participate_contribute_translate_text">&lt;a href="%1$s">翻译&lt;/a> 应用程序</string>
-    <string name="participate_contribute_github_text">做为有贡献的开发者，可以看&lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a>的细节</string>
     <string name="move_to">转移到&#8230;</string>
     <string name="copy_to">复制到</string>
     <string name="choose_remote_folder">选择文件夹&#8230;</string>
     <string name="folder_sync_loading_folders">加载文件夹&#8230;</string>
     <string name="folder_sync_no_results">没有发现媒体文件夹</string>
-    <string name="folder_sync_preferences">自动上传喜欢的部分</string>
     <string name="folder_sync_settings">设置</string>
-    <string name="folder_sync_new_info">即时上传已经被完全更新，请查看主菜单，重新设置你的自动上传，很抱歉给你带来的不便。\n\n享受新的并已扩展的上传功能！</string>
     <string name="folder_sync_preferences_folder_path">为%1$s</string>
     <plurals name="items_selected_count">
         <item quantity="other">%d被选择</item>
@@ -576,7 +439,6 @@
     <string name="notifications_no_results_headline">没有提示</string>
     <string name="notifications_no_results_message">请稍后核对</string>
 
-    <string name="upload_file_dialog_title">输入上传的文件名和文件类型</string>
     <string name="upload_file_dialog_filename">文件名</string>
     <string name="upload_file_dialog_filetype">文件类型</string>
     <string name="upload_file_dialog_filetype_snippet_text">片段文本文件(.txt)</string>
@@ -592,8 +454,6 @@
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">给你所有的数据一个安全的家</string>
-    <string name="welcome_feature_1_text">在家里或公司，访问，分享，保护你的文件</string>
-
     <string name="welcome_feature_2_title">多用户</string>
     <string name="welcome_feature_2_text">联接你所有的云</string>
 
@@ -607,7 +467,6 @@
 
     <!-- User information -->
     <string name="user_info_full_name">全名</string>
-    <string name="user_info_email">电子邮件</string>
     <string name="user_info_phone">电话号码</string>
     <string name="user_info_address">地址</string>
     <string name="user_info_website">网站</string>
@@ -617,23 +476,16 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">暂无动态</string>
-    <string name="activities_no_results_message">瀑布流中会显示诸如添加\n更改&amp;分享之类的事件</string>
     <string name="webview_error">发生错误</string>
     <string name="prefs_category_about">关于</string>
 
-    <string name="actionbar_contacts">联系人备份</string>
-    <string name="contacts_backup_button">现在备份</string>
     <string name="contacts_restore_button">恢复上次备份</string>
     <string name="contacts_header_restore">恢复</string>
     <string name="contacts_header_backup">备份</string>
     <string name="contacts_automatic_backup">联系人备份</string>
     <string name="contacts_last_backup">上次备份</string>
-    <string name="contacts_read_permission">需要联系人的读书权限</string>
-    <string name="contacts_write_permission">需要联系人的写权限</string>
     <string name="contactlist_title">恢复联系人</string>
     <string name="contaclist_restore_selected">恢复选中的联系人</string>
-    <string name="contactlist_account_chooser_title">选择客户导入</string>
-    <string name="contactlist_no_permission">没有权限，无法导入！</string>
     <string name="contacts_preference_choose_date">选择时间</string>
     <string name="contacts_preference_backup_never">永远不</string>
     <string name="contacts_preferences_no_file_found">没有文件被发现</string>
@@ -642,6 +494,4 @@
 
     <!-- Notifications -->
     <string name="new_notification_received">收到新提示</string>
-
-
-</resources>
+    </resources>

src/main/res/values/strings.xml

@@ -284,7 +284,7 @@
     <string name="common_rename">Rename</string>
     <string name="common_remove">Remove</string>
     <string name="confirmation_remove_file_alert">"Do you really want to remove %1$s?"</string>
-    <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s the contents thereof?"</string>
+    <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and the contents thereof?"</string>
     <string name="confirmation_remove_local">Local only</string>
     <string name="remove_success_msg">"Removed"</string>
     <string name="remove_fail_msg">"Removal failed"</string>
@@ -633,7 +633,8 @@
     <string name="prefs_category_about">About</string>
 
     <string name="actionbar_contacts">Backup contacts</string>
-    <string name="contacts_backup_button">Now</string>
+    <string name="actionbar_contacts_restore">Restore contacts</string>
+    <string name="contacts_backup_button">Backup now</string>
     <string name="contacts_restore_button">Restore last backup</string>
     <string name="contacts_header_restore">Restore</string>
     <string name="contacts_header_backup">Backup</string>
@@ -648,6 +649,7 @@
     <string name="contacts_preference_choose_date">Choose date</string>
     <string name="contacts_preference_backup_never">never</string>
     <string name="contacts_preferences_no_file_found">No file found</string>
+    <string name="contacts_preferences_something_strange_happened">We can\'t find your last backup!</string>
     <string name="contacts_preferences_backup_scheduled">Backup scheduled and will start shortly</string>
     <string name="contacts_preferences_import_scheduled">Import scheduled and will start shortly</string>
 

src/modified/java/com/owncloud/android/utils/PushUtils.java

@@ -27,9 +27,12 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.util.Base64;
 
+import com.google.gson.Gson;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.PushConfigurationState;
 import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -39,8 +42,12 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.notifications.RegisterAccountDeviceForNotificationsOperation;
 import com.owncloud.android.lib.resources.notifications.RegisterAccountDeviceForProxyOperation;
+import com.owncloud.android.lib.resources.notifications.UnregisterAccountDeviceForNotificationsOperation;
+import com.owncloud.android.lib.resources.notifications.UnregisterAccountDeviceForProxyOperation;
 import com.owncloud.android.lib.resources.notifications.models.PushResponse;
 
+import org.apache.commons.httpclient.HttpStatus;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -65,7 +72,11 @@ public class PushUtils {
     private static final String KEYPAIR_PRIV_EXTENSION = ".priv";
     private static final String KEYPAIR_PUB_EXTENSION = ".pub";
 
-    public static String generateSHA512Hash(String pushToken) {
+    public static final String KEY_PUSH = "push";
+
+    private static ArbitraryDataProvider arbitraryDataProvider;
+
+    private static String generateSHA512Hash(String pushToken) {
         MessageDigest messageDigest = null;
         try {
             messageDigest = MessageDigest.getInstance("SHA-512");
@@ -86,7 +97,7 @@ public class PushUtils {
         return result.toString();
     }
 
-    public static int generateRsa2048KeyPair() {
+    private static int generateRsa2048KeyPair() {
         String keyPath = MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator
                 + KEYPAIR_FOLDER;
 
@@ -124,8 +135,59 @@ public class PushUtils {
         return -2;
     }
 
+    private static void deleteRegistrationForAccount(Account account) {
+        Context context = MainApp.getAppContext();
+        OwnCloudAccount ocAccount = null;
+        arbitraryDataProvider = new ArbitraryDataProvider(MainApp.getAppContext().getContentResolver());
+
+        try {
+            ocAccount = new OwnCloudAccount(account, context);
+            OwnCloudClient mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                    getClientFor(ocAccount, context);
+
+            RemoteOperation unregisterAccountDeviceForNotificationsOperation = new
+                    UnregisterAccountDeviceForNotificationsOperation();
+
+            RemoteOperationResult remoteOperationResult = unregisterAccountDeviceForNotificationsOperation.
+                    execute(mClient);
+
+            if (remoteOperationResult.getHttpCode() == HttpStatus.SC_ACCEPTED) {
+                String arbitraryValue;
+                if (!TextUtils.isEmpty(arbitraryValue = arbitraryDataProvider.getValue(account, KEY_PUSH))) {
+                    Gson gson = new Gson();
+                    PushConfigurationState pushArbitraryData = gson.fromJson(arbitraryValue,
+                            PushConfigurationState.class);
+                    RemoteOperation unregisterAccountDeviceForProxyOperation =
+                            new UnregisterAccountDeviceForProxyOperation(context.getResources().
+                                    getString(R.string.push_server_url),
+                                    pushArbitraryData.getDeviceIdentifier(),
+                                    pushArbitraryData.getDeviceIdentifierSignature(),
+                                    pushArbitraryData.getUserPublicKey());
+
+                    remoteOperationResult = unregisterAccountDeviceForProxyOperation.execute(mClient);
+
+                    if (remoteOperationResult.isSuccess()) {
+                        arbitraryDataProvider.deleteKeyForAccount(account, KEY_PUSH);
+                    }
+                }
+            }
+
+
+        } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
+            Log_OC.d(TAG, "Failed to find an account");
+        } catch (AuthenticatorException e) {
+            Log_OC.d(TAG, "Failed via AuthenticatorException");
+        } catch (IOException e) {
+            Log_OC.d(TAG, "Failed via IOException");
+        } catch (OperationCanceledException e) {
+            Log_OC.d(TAG, "Failed via OperationCanceledException");
+        }
+    }
+
     public static void pushRegistrationToServer() {
         String token = PreferenceManager.getPushToken(MainApp.getAppContext());
+        arbitraryDataProvider = new ArbitraryDataProvider(MainApp.getAppContext().getContentResolver());
+
         if (!TextUtils.isEmpty(MainApp.getAppContext().getResources().getString(R.string.push_server_url)) &&
                 !TextUtils.isEmpty(token)) {
             PushUtils.generateRsa2048KeyPair();
@@ -139,42 +201,57 @@ public class PushUtils {
                 publicKey = "-----BEGIN PUBLIC KEY-----\n" + publicKey + "\n-----END PUBLIC KEY-----\n";
 
                 Context context = MainApp.getAppContext();
+                String providerValue;
+                Gson gson = new Gson();
                 for (Account account : AccountUtils.getAccounts(context)) {
-                    try {
-                        OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);
-                        OwnCloudClient mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
-                                getClientFor(ocAccount, context);
-
-                        RemoteOperation registerAccountDeviceForNotificationsOperation =
-                                new RegisterAccountDeviceForNotificationsOperation(pushTokenHash,
-                                        publicKey,
-                                        context.getResources().getString(R.string.push_server_url));
-
-                        RemoteOperationResult remoteOperationResult = registerAccountDeviceForNotificationsOperation.
-                                execute(mClient);
-
-                        if (remoteOperationResult.isSuccess()) {
-                            PushResponse pushResponse = remoteOperationResult.getPushResponseData();
-
-                            RemoteOperation registerAccountDeviceForProxyOperation = new
-                                    RegisterAccountDeviceForProxyOperation(
-                                    context.getResources().getString(R.string.push_server_url),
-                                    token, pushResponse.getDeviceIdentifier(), pushResponse.getSignature(),
-                                    pushResponse.getPublicKey());
-
-                            remoteOperationResult = registerAccountDeviceForProxyOperation.execute(mClient);
-                            PreferenceManager.setPushTokenLastSentTime(MainApp.getAppContext(),
-                                    System.currentTimeMillis());
-
+                    if (!TextUtils.isEmpty(providerValue = arbitraryDataProvider.getValue(account, KEY_PUSH))) {
+                        PushConfigurationState accountPushData = gson.fromJson(providerValue,
+                                PushConfigurationState.class);
+                        if (!accountPushData.getPushToken().equals(token) && !accountPushData.isShouldBeDeleted()) {
+                            try {
+                                OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);
+                                OwnCloudClient mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                                        getClientFor(ocAccount, context);
+
+                                RemoteOperation registerAccountDeviceForNotificationsOperation =
+                                        new RegisterAccountDeviceForNotificationsOperation(pushTokenHash,
+                                                publicKey,
+                                                context.getResources().getString(R.string.push_server_url));
+
+                                RemoteOperationResult remoteOperationResult = registerAccountDeviceForNotificationsOperation.
+                                        execute(mClient);
+
+                                if (remoteOperationResult.isSuccess()) {
+                                    PushResponse pushResponse = remoteOperationResult.getPushResponseData();
+
+                                    RemoteOperation registerAccountDeviceForProxyOperation = new
+                                            RegisterAccountDeviceForProxyOperation(
+                                            context.getResources().getString(R.string.push_server_url),
+                                            token, pushResponse.getDeviceIdentifier(), pushResponse.getSignature(),
+                                            pushResponse.getPublicKey());
+
+                                    remoteOperationResult = registerAccountDeviceForProxyOperation.execute(mClient);
+
+                                    if (remoteOperationResult.isSuccess()) {
+                                        PushConfigurationState pushArbitraryData = new PushConfigurationState(token,
+                                                pushResponse.getDeviceIdentifier(), pushResponse.getSignature(),
+                                                pushResponse.getPublicKey(), false);
+                                        arbitraryDataProvider.storeOrUpdateKeyValue(account, KEY_PUSH,
+                                                gson.toJson(pushArbitraryData));
+                                    }
+                                }
+                            } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
+                                Log_OC.d(TAG, "Failed to find an account");
+                            } catch (AuthenticatorException e) {
+                                Log_OC.d(TAG, "Failed via AuthenticatorException");
+                            } catch (IOException e) {
+                                Log_OC.d(TAG, "Failed via IOException");
+                            } catch (OperationCanceledException e) {
+                                Log_OC.d(TAG, "Failed via OperationCanceledException");
+                            }
+                        } else if (accountPushData.isShouldBeDeleted()) {
+                            deleteRegistrationForAccount(account);
                         }
-                    } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
-                        Log_OC.d(TAG, "Failed to find an account");
-                    } catch (AuthenticatorException e) {
-                        Log_OC.d(TAG, "Failed via AuthenticatorException");
-                    } catch (IOException e) {
-                        Log_OC.d(TAG, "Failed via IOException");
-                    } catch (OperationCanceledException e) {
-                        Log_OC.d(TAG, "Failed via OperationCanceledException");
                     }
                 }
             }
@@ -184,7 +261,7 @@ public class PushUtils {
     public static Key readKeyFromFile(boolean readPublicKey) {
         String keyPath = MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator
                 + KEYPAIR_FOLDER;
-        ;
+
         String privateKeyPath = keyPath + File.separator + KEYPAIR_FILE_NAME + KEYPAIR_PRIV_EXTENSION;
         String publicKeyPath = keyPath + File.separator + KEYPAIR_FILE_NAME + KEYPAIR_PUB_EXTENSION;
 

src/modified/res/values/setup.xml

@@ -4,18 +4,18 @@
     <bool name="is_beta">false</bool>
 
     <!-- App name  and other strings-->
-    <string name="app_name">Nextcloud</string>
-    <string name="account_type">nextcloud</string>	<!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
+    <string name="app_name">Custom</string>
+    <string name="account_type">custom</string>    <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">com.custom.client.provider</string>	<!-- better if was the app package with ".provider" appended ; it identifies the provider -->
     <string name="users_and_groups_search_authority">com.custom.client.provider.UsersAndGroupsSearch</string>
     <string name="users_and_groups_share_with">com.custom.client.provider.UsersAndGroupsSearch.action.SHARE_WITH</string>
     <string name="document_provider_authority">com.custom.client.provider.Documents</string>
     <string name="file_provider_authority">com.custom.client.provider.Files</string>
-    <string name ="db_file">nextcloud.db</string>
-    <string name ="db_name">nextcloud</string>
-    <string name ="data_folder">nextcloud</string>
-    <string name ="log_name">nextcloud</string>
-    <string name ="default_display_name_for_root_folder">Nextcloud</string>
+    <string name ="db_file">custom.db</string>
+    <string name ="db_name">custom</string>
+    <string name="data_folder">custom</string>
+    <string name ="log_name">custom</string>
+    <string name="default_display_name_for_root_folder">Custom</string>
     <string name ="user_agent">Mozilla/5.0 (Android) ownCloud-android/%1$s</string>
     
     <!-- URLs and flags related -->