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

.drone.yml

@@ -1,6 +1,6 @@
 pipeline:
   test:
-    image: nextcloudci/android:android-17
+    image: nextcloudci/android:android-18
     commands:
       # uncomment gplay for Gplay, Modified only
       - sh -c "if [ '$FLAVOUR' != 'Generic' ]; then sed -i '/com.google.*.gms/s/^.*\/\///g' build.gradle; fi"
@@ -28,6 +28,17 @@ pipeline:
       - ANDROID_ABI=armeabi-v7a
       - LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/:/opt/android-sdk-linux/tools/lib64/gles_mesa/
 
+  lint:
+      image: nextcloudci/android:android-18
+      commands:
+        # needs gplay
+        - sed -i '/com.google.*.gms/s/^.*\/\///g' build.gradle
+        - export BRANCH=$(scripts/lint/getBranchName.sh ${GIT_USERNAME} ${GIT_TOKEN} ${DRONE_PULL_REQUEST})
+        - ruby scripts/lint/lint-up.rb ${GIT_USERNAME} ${GIT_TOKEN} $BRANCH
+      when:
+        matrix:
+          FLAVOUR: Modified
+
 matrix:
   FLAVOUR:
     - Generic

.drone.yml.sig

@@ -0,0 +1 @@
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBuZXh0Y2xvdWRjaS9hbmRyb2lkOmFuZHJvaWQtMTgKICAgIGNvbW1hbmRzOgogICAgICAjIHVuY29tbWVudCBncGxheSBmb3IgR3BsYXksIE1vZGlmaWVkIG9ubHkKICAgICAgLSBzaCAtYyAiaWYgWyAnJEZMQVZPVVInICE9ICdHZW5lcmljJyBdOyB0aGVuIHNlZCAtaSAnL2NvbS5nb29nbGUuKi5nbXMvcy9eLipcL1wvLy9nJyBidWlsZC5ncmFkbGU7IGZpIgoKICAgICAgLSBlY2hvIG5vIHwgYW5kcm9pZCBjcmVhdGUgYXZkIC0tZm9yY2UgLW4gdGVzdCAtdCAkQU5EUk9JRF9UQVJHRVQgLS1hYmkgJEFORFJPSURfQUJJIC1jIDIwTQogICAgICAtIGVtdWxhdG9yIC1hdmQgdGVzdCAtbm8td2luZG93ICYKICAgICAgLSAuL3dhaXRfZm9yX2VtdWxhdG9yLnNoCgogICAgICAjIGJ1aWxkIGFwcCBhbmQgYXNzZW1ibGUgQVBLLCBpbiBkZWJ1ZyBtb2RlCiAgICAgIC0gLi9ncmFkbGV3IGFzc2VtYmxlJHtGTEFWT1VSfQoKICAgICAgIyBydW4gYWxsIHRoZSBpbnN0cnVtZW50ZWQgdGVzdHMgb2YgYXBwIG1vZHVsZSAtIERJU0FCTEVEIHVudGlsIHdlIGdldCBhbiBzdGFibGUgc2V0dXAgZm9yIEVzcHJlc3NvIGluIFRyYXZpcwogICAgICAjIC0gLi9ncmFkbGV3IGNvbm5lY3RlZERlYnVnQW5kcm9pZFRlc3QgLS1pbmZvCgogICAgICAjIGluc3RhbGwgYXBwLCB0aGVuIGFzc2VtYmxlIGFuZCBpbnN0YWxsIGluc3RydW1lbnRlZCB0ZXN0cyBvZiBhcHAgbW9kdWxlCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnQW5kcm9pZFRlc3QKCiAgICAgICMgcnVuIHNhbXBsZSBpbnN0cnVtZW50ZWQgdW5pdCB0ZXN0CiAgICAgICMgVE9ETyBmYWlscyBiZWNhdXNlIHRlc3QgcnVubmVyIGlzIG5vdCBhdmFpbGFibGUKICAgICAgIy0gYWRiIHNoZWxsIGFtIGluc3RydW1lbnQgLXcgLWUgZGVidWcgZmFsc2UgLWUgY2xhc3MgY29tLm93bmNsb3VkLmFuZHJvaWQuZGF0YW1vZGVsLk9DRmlsZVVuaXRUZXN0IGNvbS5vd25jbG91ZC5hbmRyb2lkLnRlc3QvYW5kcm9pZC5zdXBwb3J0LnRlc3QucnVubmVyLkFuZHJvaWRKVW5pdFJ1bm5lcgoKICAgIGVudmlyb25tZW50OgogICAgICAtIEFORFJPSURfVEFSR0VUPWFuZHJvaWQtMjQKICAgICAgLSBBTkRST0lEX0FCST1hcm1lYWJpLXY3YQogICAgICAtIExEX0xJQlJBUllfUEFUSD0vdXNyL2xpYi94ODZfNjQtbGludXgtZ251Lzovb3B0L2FuZHJvaWQtc2RrLWxpbnV4L3Rvb2xzL2xpYjY0L2dsZXNfbWVzYS8KCiAgbGludDoKICAgICAgaW1hZ2U6IG5leHRjbG91ZGNpL2FuZHJvaWQ6YW5kcm9pZC0xOAogICAgICBjb21tYW5kczoKICAgICAgICAjIG5lZWRzIGdwbGF5CiAgICAgICAgLSBzZWQgLWkgJy9jb20uZ29vZ2xlLiouZ21zL3MvXi4qXC9cLy8vZycgYnVpbGQuZ3JhZGxlCiAgICAgICAgLSBleHBvcnQgQlJBTkNIPSQoc2NyaXB0cy9saW50L2dldEJyYW5jaE5hbWUuc2ggJHtHSVRfVVNFUk5BTUV9ICR7R0lUX1RPS0VOfSAke0RST05FX1BVTExfUkVRVUVTVH0pCiAgICAgICAgLSBydWJ5IHNjcmlwdHMvbGludC9saW50LXVwLnJiICR7R0lUX1VTRVJOQU1FfSAke0dJVF9UT0tFTn0gJEJSQU5DSAogICAgICB3aGVuOgogICAgICAgIG1hdHJpeDoKICAgICAgICAgIEZMQVZPVVI6IE1vZGlmaWVkCgptYXRyaXg6CiAgRkxBVk9VUjoKICAgIC0gR2VuZXJpYwogICAgLSBHcGxheQogICAgLSBNb2RpZmllZAoKYnJhbmNoZXM6IG1hc3Rlcg.BJDcPdoKinGxnz6zT8dBxvwE_DBi9QyzXXnk0LOOdV4

build.gradle

@@ -51,10 +51,11 @@ repositories {
 
 android {
     lintOptions {
-        abortOnError true
+        abortOnError false
         lintConfig file("${project.rootDir}/lint.xml")
         htmlReport true
         htmlOutput file("$project.buildDir/reports/lint/lint.html")
+        disable 'MissingTranslation'
     }
 
     dexOptions {
@@ -115,10 +116,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/LICENSE'
@@ -182,7 +179,7 @@ dependencies {
     compile name: 'touch-image-view'
     compile 'com.android.support:multidex:1.0.1'
 
-    compile 'com.github.nextcloud:android-library:1.0.15'
+    compile 'com.github.nextcloud:android-library:1.0.18'
     compile "com.android.support:support-v4:${supportLibraryVersion}"
     compile "com.android.support:design:${supportLibraryVersion}"
     compile 'com.jakewharton:disklrucache:2.0.2'

scripts/lint/getBranchName.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# $1: username, $2: password/token, $3: pull request number
+
+curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/android/pulls/$3 | grep \"ref\": | grep -v master | cut -d"\"" -f4

scripts/lint/lint-results.txt

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

scripts/lint/lint-up.rb

@@ -0,0 +1,180 @@
+## Script from https://github.com/tir38/android-lint-entropy-reducer at 07.05.2017
+# adapts to drone, use git username / token as parameter
+
+puts "=================== starting Android Lint Entropy Reducer ===================="
+
+# get args
+git_user, git_token, git_branch = ARGV
+
+# ========================  SETUP ============================
+
+# User name for git commits made by this script.
+TRAVIS_GIT_USERNAME = String.new("Drone CI server")
+
+# File name and relative path of generated Lint report. Must match build.gradle file:
+#   lintOptions {
+#       htmlOutput file("[FILE_NAME].html")
+#   }
+LINT_REPORT_FILE = String.new("build/reports/lint/lint.html")
+
+# File name and relative path of previous results of this script.
+PREVIOUS_LINT_RESULTS_FILE=String.new("scripts/lint/lint-results.txt")
+
+# Flag to evaluate warnings. true = check warnings; false = ignore warnings
+CHECK_WARNINGS = true
+
+# File name and relative path to custom lint rules; Can be null or "".
+CUSTOM_LINT_FILE = String.new("")
+
+# ================ SETUP DONE; DON'T TOUCH ANYTHING BELOW  ================
+
+require 'fileutils'
+require 'pathname'
+require 'open3'
+
+# since we need the xml-simple gem, and we want this script self-contained, let's grab it just when we need it
+begin
+    gem "xml-simple"
+    rescue LoadError
+    system("gem install xml-simple")
+    Gem.clear_paths
+end
+
+require 'xmlsimple'
+
+# add custom Lint jar
+if !CUSTOM_LINT_FILE.nil? &&
+    CUSTOM_LINT_FILE.length > 0
+
+    ENV["ANDROID_LINT_JARS"] = Dir.pwd + "/" + CUSTOM_LINT_FILE
+    puts "adding custom lint rules to default set: "
+    puts ENV["ANDROID_LINT_JARS"]
+end
+
+# run Lint
+puts "running Lint..."
+system './gradlew clean lint'
+
+# confirm that Lint ran w/out error
+result = $?.to_i
+if result != 0
+    puts "FAIL: failed to run ./gradlew clean lint"
+    exit 1
+end
+
+# find Lint report file
+lint_reports = Dir.glob(LINT_REPORT_FILE)
+if lint_reports.length == 0
+    puts "Lint HTML report not found."
+    exit 1
+end
+lint_report = String.new(lint_reports[0])
+
+# find error/warning count string in HTML report
+error_warning_string = ""
+File.open lint_report do |file|
+  error_warning_string = file.find { |line| line =~ /[0-9]* errors and [0-9]* warnings/ }
+end
+
+# find number of errors
+error_string = error_warning_string.match(/[0-9]* errors/)[0]
+current_error_count = error_string.match(/[0-9]*/)[0].to_i
+puts "found errors: " + current_error_count.to_s
+
+# find number of warnings
+if CHECK_WARNINGS == true
+    warning_string = error_warning_string.match(/[0-9]* warnings/)[0]
+    current_warning_count = warning_string.match(/[0-9]*/)[0].to_i
+    puts "found warnings: " + current_warning_count.to_s
+end
+
+# get previous error and warning counts from last successful build
+
+previous_results = false
+
+previous_lint_reports = Dir.glob(PREVIOUS_LINT_RESULTS_FILE)
+if previous_lint_reports.nil? ||
+    previous_lint_reports.length == 0
+
+    previous_lint_report = File.new(PREVIOUS_LINT_RESULTS_FILE, "w") # create for writing to later
+else
+    previous_lint_report = String.new(previous_lint_reports[0])
+
+    previous_error_warning_string = ""
+    File.open previous_lint_report do |file|
+      previous_error_warning_string = file.find { |line| line =~ /[0-9]* errors and [0-9]* warnings/ }
+    end
+
+    unless previous_error_warning_string.nil?
+        previous_results = true
+
+        previous_error_string = previous_error_warning_string.match(/[0-9]* errors/)[0]
+        previous_error_count = previous_error_string.match(/[0-9]*/)[0].to_i
+        puts "previous errors: " + previous_error_count.to_s
+
+        if CHECK_WARNINGS == true
+            previous_warning_string = previous_error_warning_string.match(/[0-9]* warnings/)[0]
+            previous_warning_count = previous_warning_string.match(/[0-9]*/)[0].to_i
+            puts "previous warnings: " + previous_warning_count.to_s
+        end
+    end
+end
+
+# compare previous error count with current error count
+if previous_results == true  &&
+    current_error_count > previous_error_count
+    puts "FAIL: error count increased"
+    exit 1
+end
+
+# compare previous warning count with current warning count
+if CHECK_WARNINGS  == true &&
+    previous_results == true &&
+    current_warning_count > previous_warning_count
+
+    puts "FAIL: warning count increased"
+    exit 1
+end
+
+# check if warning and error count stayed the same
+if  previous_results == true &&
+    current_error_count == previous_error_count &&
+    current_warning_count == previous_warning_count
+
+    puts "SUCCESS: count stayed the same"
+    exit 0
+end
+
+# either error count or warning count DECREASED
+
+# write new results to file (will overwrite existing, or create new)
+File.write(previous_lint_report, "DO NOT TOUCH; GENERATED BY DRONE\n" + error_warning_string)
+
+# push changes to github (if this script is run locally, we don't want to overwrite git username and email, so save temporarily)
+previous_git_username, _ = Open3.capture2('git config user.name')
+previous_git_username = previous_git_username.strip
+
+previous_git_email, _ = Open3.capture3('git config user.email')
+previous_git_email = previous_git_email.strip
+
+# update git user name and email for this script
+system ("git config --local user.name '"  + git_user + "'")
+system ("git config --local user.email '.'") # set email blank
+system ("git remote rm origin")
+system ("git remote add origin https://" + git_user + ":" + git_token + "@github.com/nextcloud/android")
+
+# add previous Lint result file to git
+system ('git add ' + PREVIOUS_LINT_RESULTS_FILE)
+
+# commit changes; Add "skip ci" so that we don't accidentally trigger another Drone build
+system ('git commit -m "Drone: update Lint results to reflect reduced error/warning count [skip ci]" ')
+
+# push to origin
+system ('git push origin HEAD:' + git_branch)
+
+# restore previous git user name and email
+system("git config --local user.name '#{previous_git_username}'")
+system("git config --local user.email '#{previous_git_email}'")
+
+puts "SUCCESS: count was reduced"
+exit 0 # success

src/main/java/com/owncloud/android/MainApp.java

@@ -112,13 +112,8 @@ public class MainApp extends MultiDexApplication {
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();
 
         if (BuildConfig.DEBUG) {
-
-            String dataFolder = getDataFolder();
-
-            // Set folder for store logs
-            Log_OC.setLogDataFolder(dataFolder);
-
-            Log_OC.startLogging(MainApp.storagePath);
+            // use app writable dir, no permissions needed
+            Log_OC.startLogging(getAppContext());
             Log_OC.d("Debug", "start logging");
         }
 

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

@@ -156,7 +156,7 @@ public class AccountUtils {
                             .getDefaultSharedPreferences(context).edit();
                     appPrefs.putString("select_oc_account", accountName);
     
-                    appPrefs.commit();
+                    appPrefs.apply();
                     result = true;
                     break;
                 }

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

@@ -563,6 +563,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                    // not used at the moment
                 }
 
                 @Override
@@ -1252,7 +1253,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }
         } else {
             if (!webViewLoginMethod) {
-                updateStatusIconFailUserName();
+                int statusText = result.getCode() == ResultCode.MAINTENANCE_MODE ? R.string.maintenance_mode : R.string.auth_fail_get_user_name;
+                updateStatusIconFailUserName(statusText);
                 showAuthStatus();
             }
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());
@@ -1452,6 +1454,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mServerStatusIcon = R.drawable.ic_lock_open_white;
                 mServerStatusText = R.string.auth_redirect_non_secure_connection_title;
                 break;
+            case MAINTENANCE_MODE:
+                mServerStatusText = R.string.maintenance_mode;
+                break;
             default:
                 mServerStatusText = 0;
                 mServerStatusIcon = 0;
@@ -1541,10 +1546,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }
     }
 
-
-    private void updateStatusIconFailUserName() {
+    private void updateStatusIconFailUserName(int failedStatusText){
         mAuthStatusIcon = R.drawable.ic_alert;
-        mAuthStatusText = R.string.auth_fail_get_user_name;
+        mAuthStatusText = failedStatusText;
     }
 
     private void updateServerStatusIconNoRegularAuth() {
@@ -1787,7 +1791,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 SharedPreferences.Editor editor = PreferenceManager
                         .getDefaultSharedPreferences(this).edit();
                 editor.putString("select_oc_account", accountName);
-                editor.commit();
+                editor.apply();
             }
 
             /// prepare result to return to the Authenticator

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

@@ -60,7 +60,7 @@ public class PassCodeManager {
         return mPassCodeManagerInstance;
     }
 
-    protected PassCodeManager() {};
+    protected PassCodeManager() {}
 
     public void onActivityCreated(Activity activity) {
         if (passCodeIsEnabled() || fingerprintIsEnabled()) {

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

@@ -393,7 +393,4 @@ public class OCUpload implements Parcelable {
     }
 
     enum CanUploadFileNowStatus {NOW, LATER, FILE_GONE, ERROR}
-
-    ;
-
 }

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

@@ -274,7 +274,7 @@ public abstract class PreferenceManager {
     private static void saveStringPreferenceNow(Context context, String key, String value) {
         SharedPreferences.Editor appPreferences = getDefaultSharedPreferences(context.getApplicationContext()).edit();
         appPreferences.putString(key, value);
-        appPreferences.commit();
+        appPreferences.apply();
     }
 
     private static void saveIntPreference(Context context, String key, int value) {

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

@@ -34,7 +34,8 @@ public enum UploadResult {
     FILE_NOT_FOUND(8),
     DELAYED_FOR_WIFI(9),
     SERVICE_INTERRUPTED(10),
-    DELAYED_FOR_CHARGING(11);
+    DELAYED_FOR_CHARGING(11),
+    MAINTENANCE_MODE(12);
 
     private final int value;
 
@@ -74,6 +75,8 @@ public enum UploadResult {
                 return SERVICE_INTERRUPTED;
             case 11:
                 return DELAYED_FOR_CHARGING;
+            case 12:
+                return MAINTENANCE_MODE;
         }
         return null;
     }
@@ -115,6 +118,8 @@ public enum UploadResult {
                     return FILE_ERROR;
                 }
                 return UNKNOWN;
+            case MAINTENANCE_MODE:
+                return MAINTENANCE_MODE;
             default:
                 return UNKNOWN;
         }

src/main/java/com/owncloud/android/files/FileMenuFilter.java

@@ -1,4 +1,4 @@
-/**
+/*
  * ownCloud Android client application
  *
  * @author David A. Velasco
@@ -31,10 +31,11 @@ import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
+import com.owncloud.android.utils.MimeTypeUtil;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -59,8 +60,7 @@ public class FileMenuFilter {
      * @param cg                Accessor to app components, needed to access synchronization services
      * @param context           Android {@link Context}, needed to access build setup resources.
      */
-    public FileMenuFilter(Collection<OCFile> targetFiles, Account account, ComponentsGetter cg,
-                          Context context) {
+    public FileMenuFilter(Collection<OCFile> targetFiles, Account account, ComponentsGetter cg, Context context) {
         mFiles = targetFiles;
         mAccount = account;
         mComponentsGetter = cg;
@@ -75,9 +75,8 @@ public class FileMenuFilter {
      * @param cg                Accessor to app components, needed to access synchronization services
      * @param context           Android {@link Context}, needed to access build setup resources.
      */
-    public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg,
-                          Context context) {
-        this(Arrays.asList(new OCFile[]{targetFile}), account, cg, context);
+    public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg, Context context) {
+        this(Collections.singletonList(targetFile), account, cg, context);
     }
 
     /**
@@ -91,8 +90,8 @@ public class FileMenuFilter {
             hideAll(menu);
 
         } else {
-            List<Integer> toShow = new ArrayList<Integer>();
-            List<Integer> toHide = new ArrayList<Integer>();
+            List<Integer> toShow = new ArrayList<>();
+            List<Integer> toHide = new ArrayList<>();
 
             filter(toShow, toHide);
 
@@ -124,7 +123,6 @@ public class FileMenuFilter {
         }
     }
 
-
     /**
      * Performs the real filtering, to be applied in the {@link Menu} by the caller methods.
      *
@@ -257,6 +255,12 @@ public class FileMenuFilter {
         }
 
 
+        // SET PICTURE AS
+        if (isSingleImage() && !MimeTypeUtil.isSVG(mFiles.iterator().next())) {
+            toShow.add(R.id.action_set_as_wallpaper);
+        } else {
+            toHide.add(R.id.action_set_as_wallpaper);
+        }
     }
 
     private boolean anyFileSynchronizing() {
@@ -312,6 +316,10 @@ public class FileMenuFilter {
         return isSingleSelection() && !mFiles.iterator().next().isFolder();
     }
 
+    private boolean isSingleImage() {
+        return isSingleSelection() && MimeTypeUtil.isImage(mFiles.iterator().next());
+    }
+
     private boolean allFiles() {
         return mFiles != null && !containsFolder();
     }

src/main/java/com/owncloud/android/files/services/FileDownloader.java

@@ -54,6 +54,7 @@ import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.operations.DownloadFileOperation;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.ui.notifications.NotificationUtils;
 import com.owncloud.android.ui.preview.PreviewImageActivity;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
@@ -174,9 +175,10 @@ public class FileDownloader extends Service
         } else {
             final Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);
             final OCFile file = intent.getParcelableExtra(EXTRA_FILE);
+            final String behaviour = intent.getStringExtra(OCFileListFragment.DOWNLOAD_BEHAVIOUR);
             AbstractList<String> requestedDownloads = new Vector<String>();
             try {
-                DownloadFileOperation newDownload = new DownloadFileOperation(account, file);
+                DownloadFileOperation newDownload = new DownloadFileOperation(account, file, behaviour);
                 newDownload.addDatatransferProgressListener(this);
                 newDownload.addDatatransferProgressListener((FileDownloaderBinder) mBinder);
                 Pair<String, String> putResult = mPendingDownloads.putIfAbsent(
@@ -490,7 +492,7 @@ public class FileDownloader extends Service
         file.setFileLength((new File(mCurrentDownload.getSavePath()).length()));
         file.setRemoteId(mCurrentDownload.getFile().getRemoteId());
         mStorageManager.saveFile(file);
-        mStorageManager.triggerMediaScan(file.getStoragePath());
+        FileDataStorageManager.triggerMediaScan(file.getStoragePath());
         mStorageManager.saveConflict(file, null);
     }
 
@@ -639,6 +641,7 @@ public class FileDownloader extends Service
         end.putExtra(ACCOUNT_NAME, download.getAccount().name);
         end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());
         end.putExtra(EXTRA_FILE_PATH, download.getSavePath());
+        end.putExtra(OCFileListFragment.DOWNLOAD_BEHAVIOUR, download.getBehaviour());
         if (unlinkedFromRemotePath != null) {
             end.putExtra(EXTRA_LINKED_TO_PATH, unlinkedFromRemotePath);
         }

src/main/java/com/owncloud/android/files/services/IndexedForest.java

@@ -61,7 +61,7 @@ public class IndexedForest<V> {
 
         public Node<V> getParent() {
             return mParent;
-        };
+        }
 
         public Set<Node<V>> getChildren() {
             return mChildren;
@@ -143,7 +143,7 @@ public class IndexedForest<V> {
 
             return new Pair<String, String>(targetKey, linkedTo);
         }
-    };
+    }
 
 
     public Pair<V, String> removePayload(String accountName, String remotePath) {

src/main/java/com/owncloud/android/media/MediaControlView.java

@@ -89,6 +89,7 @@ public class MediaControlView extends FrameLayout /* implements OnLayoutChangeLi
 
     @Override
     public void onFinishInflate() {
+        super.onFinishInflate();
         /*
         if (mRoot != null)
             initControllerView(mRoot);

src/main/java/com/owncloud/android/media/MediaService.java

@@ -98,9 +98,6 @@ public class MediaService extends Service implements OnCompletionListener, OnPre
         PAUSED
     }
 
-    ;
-
-
     /** Current state */
     private State mState = State.STOPPED;
 

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

@@ -49,6 +49,7 @@ public class DownloadFileOperation extends RemoteOperation {
 
     private Account mAccount;
     private OCFile mFile;
+    private String mBehaviour;
     private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
     private long mModificationTimestamp = 0;
     private String mEtag = "";
@@ -57,7 +58,7 @@ public class DownloadFileOperation extends RemoteOperation {
     private DownloadRemoteFileOperation mDownloadOperation;
 
 
-    public DownloadFileOperation(Account account, OCFile file) {
+    public DownloadFileOperation(Account account, OCFile file, String behaviour) {
         if (account == null) {
             throw new IllegalArgumentException("Illegal null account in DownloadFileOperation " +
                     "creation");
@@ -69,6 +70,7 @@ public class DownloadFileOperation extends RemoteOperation {
         
         mAccount = account;
         mFile = file;
+        mBehaviour = behaviour;
     }
 
 
@@ -80,6 +82,10 @@ public class DownloadFileOperation extends RemoteOperation {
         return mFile;
     }
 
+    public String getBehaviour() {
+        return mBehaviour;
+    }
+
     public String getSavePath() {
         if (mFile.getStoragePath() != null) {
             File path = new File(mFile.getStoragePath());  // re-downloads should be done over the original file

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

@@ -90,7 +90,7 @@ public class UnshareOperation extends SyncOperation {
                 getStorageManager().saveFile(file);
                 getStorageManager().removeShare(share);
 
-            } else if (!existsFile(client, file.getRemotePath())) {
+            } else if (result.getCode() != ResultCode.MAINTENANCE_MODE && !existsFile(client, file.getRemotePath())) {
                 // unshare failed because file was deleted before
                 getStorageManager().removeFile(file, true, true);
             }

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

@@ -2,7 +2,7 @@
  *   ownCloud Android client application
  *
  *   @author David A. Velasco
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -323,6 +323,7 @@ public class UploadFileOperation extends SyncOperation {
             remoteParentPath = remoteParentPath.endsWith(OCFile.PATH_SEPARATOR) ?
                     remoteParentPath : remoteParentPath + OCFile.PATH_SEPARATOR;
             result = grantFolderExistence(remoteParentPath, client);
+
             if (!result.isSuccess()) {
 
                 return result;
@@ -370,15 +371,19 @@ public class UploadFileOperation extends SyncOperation {
                 throw new OperationCancelledException();
             }
 
+            // Get the last modification date of the file from the file system
+            Long timeStampLong = originalFile.lastModified()/1000;
+            String timeStamp = timeStampLong.toString();
+
             /// perform the upload
             if ( mChunked &&
                     (new File(mFile.getStoragePath())).length() >
                             ChunkedUploadRemoteFileOperation.CHUNK_SIZE ) {
                 mUploadOperation = new ChunkedUploadRemoteFileOperation(mContext, mFile.getStoragePath(),
-                        mFile.getRemotePath(), mFile.getMimetype(), mFile.getEtagInConflict());
+                        mFile.getRemotePath(), mFile.getMimetype(), mFile.getEtagInConflict(), timeStamp);
             } else {
                 mUploadOperation = new UploadRemoteFileOperation(mFile.getStoragePath(),
-                        mFile.getRemotePath(), mFile.getMimetype(), mFile.getEtagInConflict());
+                        mFile.getRemotePath(), mFile.getMimetype(), mFile.getEtagInConflict(), timeStamp);
             }
             Iterator <OnDatatransferProgressListener> listener = mDataTransferListeners.iterator();
             while (listener.hasNext()) {

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

@@ -265,6 +265,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
                 // The Toast must be shown in the main thread to grant that will be hidden correctly; otherwise
                 // the thread may die before, an exception will occur, and the message will be left on the screen
                 // until the app dies
+
                 Toast.makeText(
                         getContext().getApplicationContext(),
                         ErrorMessageAdapter.getErrorCauseMessage(

src/main/java/com/owncloud/android/ui/CustomPopup.java

@@ -63,9 +63,11 @@ public class CustomPopup {
     }
 
     public void onCreate() {
+        // not used at the moment
     }
 
     public void onShow() {
+        // not used at the moment
     }
 
     public void preShow() {

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

@@ -1373,28 +1373,35 @@ public class FileDisplayActivity extends HookActivity
         public void onReceive(Context context, Intent intent) {
             try {
                 boolean sameAccount = isSameAccount(intent);
-                String downloadedRemotePath =
-                        intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
+                String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
+                String downloadBehaviour = intent.getStringExtra(OCFileListFragment.DOWNLOAD_BEHAVIOUR);
                 boolean isDescendant = isDescendant(downloadedRemotePath);
 
                 if (sameAccount && isDescendant) {
-                    String linkedToRemotePath =
-                            intent.getStringExtra(FileDownloader.EXTRA_LINKED_TO_PATH);
+                    String linkedToRemotePath = intent.getStringExtra(FileDownloader.EXTRA_LINKED_TO_PATH);
                     if (linkedToRemotePath == null || isAscendant(linkedToRemotePath)) {
                         refreshListOfFilesFragment(false);
                     }
                     refreshSecondFragment(
                             intent.getAction(),
                             downloadedRemotePath,
-                            intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)
-                    );
+                            intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
                 }
 
                 if (mWaitingToSend != null) {
-                    mWaitingToSend =
-                            getStorageManager().getFileByPath(mWaitingToSend.getRemotePath());
-                    if (mWaitingToSend.isDown()) {
-                        sendDownloadedFile();
+                    mWaitingToSend = getStorageManager().getFileByPath(mWaitingToSend.getRemotePath());
+                    if (mWaitingToSend.isDown() && downloadBehaviour != null) {
+                        switch (downloadBehaviour) {
+                            case OCFileListFragment.DOWNLOAD_SEND:
+                                sendDownloadedFile();
+                                break;
+                            case OCFileListFragment.DOWNLOAD_SET_AS:
+                                setPictureAs();
+                                break;
+                            default:
+                                // do nothing
+                                break;
+                        }
                     }
                 }
 
@@ -1872,12 +1879,13 @@ public class FileDisplayActivity extends HookActivity
         }
     }
 
-    private void requestForDownload(OCFile file) {
+    private void requestForDownload(OCFile file, String downloadBehaviour) {
         Account account = getAccount();
         if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
             Intent i = new Intent(this, FileDownloader.class);
             i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
             i.putExtra(FileDownloader.EXTRA_FILE, file);
+            i.putExtra(OCFileListFragment.DOWNLOAD_BEHAVIOUR, downloadBehaviour);
             startService(i);
         }
     }
@@ -1887,6 +1895,11 @@ public class FileDisplayActivity extends HookActivity
         mWaitingToSend = null;
     }
 
+    private void setPictureAs() {
+        getFileOperationsHelper().setPictureAs(mWaitingToSend);
+        mWaitingToSend = null;
+    }
+
 
     /**
      * Requests the download of the received {@link OCFile} , updates the UI
@@ -1895,9 +1908,9 @@ public class FileDisplayActivity extends HookActivity
      *
      * @param file {@link OCFile} to download and preview.
      */
-    public void startDownloadForSending(OCFile file) {
+    public void startDownloadForSending(OCFile file, String downloadBehaviour) {
         mWaitingToSend = file;
-        requestForDownload(mWaitingToSend);
+        requestForDownload(mWaitingToSend, downloadBehaviour);
         boolean hasSecondFragment = (getSecondFragment() != null);
         updateFragmentsVisibility(hasSecondFragment);
     }

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

@@ -104,7 +104,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
             caption = getIntent().getStringExtra(EXTRA_ACTION);
         } else {
             caption = getString(R.string.default_display_name_for_root_folder);
-        };
+        }
         getSupportActionBar().setTitle(caption);
 
         setIndeterminate(mSyncInProgress);
@@ -518,8 +518,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
         }
     }
 
-    
-
     /**
      * Shows the information of the {@link OCFile} received as a
      * parameter in the second fragment.
@@ -528,7 +526,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
      */
     @Override
     public void showDetails(OCFile file) {
-
+        // not used at the moment
     }
 
     /**
@@ -536,7 +534,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
      */
     @Override
     public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading) {
-            
+        // not used at the moment
     }
 
     @Override

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

@@ -40,7 +40,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.utils.AnalyticsUtils;
-import com.owncloud.android.utils.FileStorageUtils;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -64,7 +63,7 @@ public class LogHistoryActivity extends ToolbarActivity {
 
     private static final String SCREEN_NAME = "Logs";
 
-    private String mLogPath = FileStorageUtils.getLogPath();
+    private String mLogPath = Log_OC.getLogPath();
     private File logDIR = null;
     private String mLogText;
 
@@ -166,11 +165,7 @@ public class LogHistoryActivity extends ToolbarActivity {
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
                     uris.add(Uri.fromFile(logFile));
                 } else {
-                    uris.add(FileProvider.getUriForFile(
-                            this,
-                            getString(R.string.file_provider_authority),
-                            logFile
-                    ));
+                    uris.add(FileProvider.getUriForFile(this, getString(R.string.file_provider_authority), logFile));
                 }
             }
         }

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

@@ -84,13 +84,12 @@ public class ParticipateActivity extends FileActivity {
         TextView contributeTranslationView = (TextView) findViewById(R.id.participate_contribute_translate_text);
         contributeTranslationView.setMovementMethod(LinkMovementMethod.getInstance());
         contributeTranslationView.setText(Html.fromHtml(
-                getString(R.string.participate_contribute_translate_text,
-                        getString(R.string.translation_link)
-                )));
+                getString(R.string.participate_contribute_translate_text, getString(R.string.translation_link))));
 
         TextView contributeGithubView = (TextView) findViewById(R.id.participate_contribute_github_text);
         contributeGithubView.setMovementMethod(LinkMovementMethod.getInstance());
-        contributeGithubView.setText(Html.fromHtml(getString(R.string.participate_contribute_github_text)));
+        contributeGithubView.setText(Html.fromHtml(getString(R.string.participate_contribute_github_text,
+                getString(R.string.contributing_link))));
 
         findViewById(R.id.participate_testing_report).setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -514,6 +514,9 @@ public class Preferences extends PreferenceActivity
             getPreferenceScreen().removePreference(mPrefInstantUploadCategory);
         }
 
+        // About category
+        PreferenceCategory preferenceCategoryAbout = (PreferenceCategory) findPreference("about");
+
         /* About App */
         pAboutApp = findPreference("about_app");
         if (pAboutApp != null) {
@@ -521,6 +524,32 @@ public class Preferences extends PreferenceActivity
             pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));
         }
 
+        // privacy
+        boolean privacyEnabled = getResources().getBoolean(R.bool.privacy_enabled);
+        Preference privacyPreference = findPreference("privacy");
+        if (privacyPreference != null) {
+            if (privacyEnabled) {
+                privacyPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        String privacyUrl = getString(R.string.privacy_url);
+                        if (privacyUrl.length() > 0) {
+                            Intent externalWebViewIntent = new Intent(getApplicationContext(), ExternalSiteWebView.class);
+                            externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE,
+                                    getResources().getString(R.string.privacy));
+                            externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_URL, privacyUrl);
+                            externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);
+                            externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_MENU_ITEM_ID, -1);
+                            startActivity(externalWebViewIntent);
+                        }
+                        return true;
+                    }
+                });
+            } else {
+                preferenceCategoryAbout.removePreference(privacyPreference);
+            }
+        }
+
         loadExternalSettingLinks(preferenceCategoryMore);
 
         loadStoragePath();
@@ -840,7 +869,7 @@ public class Preferences extends PreferenceActivity
         MainApp.setStoragePath(mStoragePath);
         SharedPreferences.Editor editor = appPrefs.edit();
         editor.putString(PreferenceKeys.STORAGE_PATH, mStoragePath);
-        editor.commit();
+        editor.apply();
         String storageDescription = DataStorageProvider.getInstance().getStorageDescriptionByPath(mStoragePath);
         mPrefStoragePath.setSummary(storageDescription);
         mPrefStoragePath.setValue(newStoragePath);
@@ -866,7 +895,7 @@ public class Preferences extends PreferenceActivity
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         SharedPreferences.Editor editor = appPrefs.edit();
         editor.putString(PreferenceKeys.INSTANT_UPLOAD_PATH, mUploadPath);
-        editor.commit();
+        editor.apply();
     }
 
     /**
@@ -887,7 +916,7 @@ public class Preferences extends PreferenceActivity
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         SharedPreferences.Editor editor = appPrefs.edit();
         editor.putString(PreferenceKeys.INSTANT_VIDEO_UPLOAD_PATH, mUploadVideoPath);
-        editor.commit();
+        editor.apply();
     }
 
     @Override

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

@@ -1137,10 +1137,14 @@ public class ReceiveExternalFilesActivity extends FileActivity
                 }
 
                 @Override
-                public void onNeutral(String callerTag) {}
+                public void onNeutral(String callerTag) {
+                    // not used at the moment
+                }
 
                 @Override
-                public void onCancel(String callerTag) {}
+                public void onCancel(String callerTag) {
+                    // not used at the moment
+                }
             }
         );
         errorDialog.show(getSupportFragmentManager(), FTAG_ERROR_FRAGMENT);

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

@@ -38,6 +38,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.operations.CreateShareViaLinkOperation;
 import com.owncloud.android.operations.GetSharesForFileOperation;
 import com.owncloud.android.operations.UnshareOperation;
@@ -51,6 +52,7 @@ import com.owncloud.android.ui.fragment.ShareFragmentListener;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
 
+import java.util.ArrayList;
 
 /**
  * Activity for sharing files
@@ -111,10 +113,19 @@ public class ShareActivity extends FileActivity
             Uri data = intent.getData();
             String dataString = intent.getDataString();
             String shareWith = dataString.substring(dataString.lastIndexOf('/') + 1);
-            doShareWith(
-                    shareWith,
-                    data.getAuthority()
-            );
+
+            ArrayList<String> shareeNames = new ArrayList<>();
+            for (OCShare share : getStorageManager().getSharesWithForAFile(getFile().getRemotePath(), getAccount().name)) {
+                shareeNames.add(share.getShareWith());
+            }
+
+            if (!shareeNames.contains(shareWith)) {
+
+                doShareWith(
+                        shareWith,
+                        data.getAuthority()
+                );
+            }
 
         } else {
             Log_OC.e(TAG, "Unexpected intent " + intent.toString());
@@ -142,11 +153,19 @@ public class ShareActivity extends FileActivity
         if (getFile().isSharedWithMe()) {
             return OCShare.READ_PERMISSION_FLAG;    // minimum permissions
 
-        } else if (getFile().isFolder()) {
-            return (isFederated) ? OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER : OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
-
-        } else {    // isFile
-            return (isFederated) ? OCShare.FEDERATED_PERMISSIONS_FOR_FILE : OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
+        } else if (isFederated) {
+            OwnCloudVersion serverVersion = com.owncloud.android.authentication.AccountUtils.
+                    getServerVersion(getAccount());
+            if (serverVersion != null && serverVersion.isNotReshareableFederatedSupported()) {
+                return (getFile().isFolder() ? OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9 :
+                        OCShare.FEDERATED_PERMISSIONS_FOR_FILE_AFTER_OC9);
+            } else {
+                return (getFile().isFolder() ? OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9 :
+                        OCShare.FEDERATED_PERMISSIONS_FOR_FILE_UP_TO_OC9);
+            }
+        } else {
+            return (getFile().isFolder() ? OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER :
+                    OCShare.MAXIMUM_PERMISSIONS_FOR_FILE);
         }
     }
 

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

@@ -296,7 +296,6 @@ public class StorageMigration {
         protected Integer doInBackground(Void... voids) {
             publishProgress(R.string.file_migration_preparing);
 
-            Log_OC.stopLogging();
             boolean[] syncStates = null;
             try {
                 publishProgress(R.string.file_migration_saving_accounts_configuration);
@@ -309,7 +308,6 @@ public class StorageMigration {
                 publishProgress(R.string.file_migration_restoring_accounts_configuration);
                 restoreAccountsSyncStatus(syncStates);
             }
-            Log_OC.startLogging(mStorageTarget);
 
             return 0;
         }
@@ -338,7 +336,6 @@ public class StorageMigration {
         @Override
         protected Integer doInBackground(Void... args) {
             publishProgress(R.string.file_migration_preparing);
-            Log_OC.stopLogging();
 
             boolean[] syncState = null;
 
@@ -372,14 +369,12 @@ public class StorageMigration {
 
             } catch (MigrationException e) {
                 rollback();
-                Log_OC.startLogging(mStorageSource);
                 return e.getResId();
             } finally {
                 publishProgress(R.string.file_migration_restoring_accounts_configuration);
                 restoreAccountsSyncStatus(syncState);
             }
 
-            Log_OC.startLogging(mStorageTarget);
             publishProgress(R.string.file_migration_ok_finished);
 
             return 0;

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

@@ -334,7 +334,7 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
                 mUploaderBinder = null;
             }
         }
-    };
+    }
 
     /**
      * Once the file upload has changed its status -> update uploads list view

src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -514,6 +514,7 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
      * @return              Text describing the status of the given upload.
      */
     private String getStatusText(OCUpload upload) {
+
         String status;
         switch (upload.getUploadStatus()) {
 
@@ -596,6 +597,9 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
                         // should not get here ; status should be UPLOAD_SUCCESS
                         status =  mParentActivity.getString(R.string.uploads_view_upload_status_succeeded);
                         break;
+                    case MAINTENANCE_MODE:
+                        status = mParentActivity.getString(R.string.maintenance_mode);
+                        break;
                     default:
                         status = "Naughty devs added a new fail result but no description for the user";
                         break;

src/main/java/com/owncloud/android/ui/dialog/SslValidatorDialog.java

@@ -82,7 +82,6 @@ public class SslValidatorDialog extends Dialog {
      * Instances have to be created through static {@link SslValidatorDialog#newInstance}.
      * 
      * @param context       Android context where the dialog will live
-     * @param e             Exception causing the need of prompt the user about the server certificate.
      * @param listener      Object to notice when the server certificate was added to the local certificates store.
      */
     private SslValidatorDialog(Context context, OnSslValidatorListener listener) {

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

@@ -33,6 +33,7 @@ import android.widget.CompoundButton;
 import android.widget.TextView;
 
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -40,6 +41,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.SharePermissionsBuilder;
 import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.utils.AnalyticsUtils;
 
@@ -67,6 +69,9 @@ public class EditShareFragment extends Fragment {
     /** File bound to mShare, received as a parameter in construction time */
     private OCFile mFile;
 
+    /** Account of the shared file, received as a parameter in construction time */
+    private Account mAccount;
+
     /** Listener for changes on privilege checkboxes */
     private CompoundButton.OnCheckedChangeListener mOnPrivilegeChangeListener;
     
@@ -99,7 +104,7 @@ public class EditShareFragment extends Fragment {
             mShare = getArguments().getParcelable(ARG_SHARE);
             mFile = getArguments().getParcelable(ARG_FILE);
             /* OC account holding the shared file, received as a parameter in construction time */
-            //Account mAccount = getArguments().getParcelable(ARG_ACCOUNT);
+            mAccount = getArguments().getParcelable(ARG_ACCOUNT);
         }
     }
 
@@ -145,34 +150,39 @@ public class EditShareFragment extends Fragment {
 
             int sharePermissions = mShare.getPermissions();
             boolean isFederated = ShareType.FEDERATED.equals(mShare.getShareType());
-            CompoundButton compound;
+            OwnCloudVersion serverVersion = AccountUtils.getServerVersion(mAccount);
+            boolean isNotReshareableFederatedSupported = (serverVersion != null &&
+                    serverVersion.isNotReshareableFederatedSupported());
 
-            compound = (CompoundButton) editShareView.findViewById(R.id.canShareSwitch);
-            if(isFederated) {
+            CompoundButton compound = (CompoundButton) editShareView.findViewById(R.id.canShareSwitch);
+
+            if (isFederated) {
                 compound.setVisibility(View.INVISIBLE);
             }
             compound.setChecked((sharePermissions & OCShare.SHARE_PERMISSION_FLAG) > 0);
 
             compound = (CompoundButton) editShareView.findViewById(R.id.canEditSwitch);
-            int anyUpdatePermission =
-                    OCShare.CREATE_PERMISSION_FLAG |
-                            OCShare.UPDATE_PERMISSION_FLAG |
-                            OCShare.DELETE_PERMISSION_FLAG;
+            int anyUpdatePermission = OCShare.CREATE_PERMISSION_FLAG | OCShare.UPDATE_PERMISSION_FLAG |
+                    OCShare.DELETE_PERMISSION_FLAG;
             boolean canEdit = (sharePermissions & anyUpdatePermission) > 0;
             compound.setChecked(canEdit);
 
-            if (mFile.isFolder() && !isFederated) {
+            boolean areEditOptionsAvailable = !isFederated || isNotReshareableFederatedSupported;
+
+            if (mFile.isFolder() && areEditOptionsAvailable) {
+                /// TODO change areEditOptionsAvailable in order to delete !isFederated
+                // from checking when iOS is ready
                 compound = (CompoundButton) editShareView.findViewById(R.id.canEditCreateCheckBox);
                 compound.setChecked((sharePermissions & OCShare.CREATE_PERMISSION_FLAG) > 0);
-                compound.setVisibility(canEdit ? View.VISIBLE : View.GONE);
+                compound.setVisibility((canEdit) ? View.VISIBLE : View.GONE);
 
                 compound = (CompoundButton) editShareView.findViewById(R.id.canEditChangeCheckBox);
                 compound.setChecked((sharePermissions & OCShare.UPDATE_PERMISSION_FLAG) > 0);
-                compound.setVisibility(canEdit ? View.VISIBLE : View.GONE);
+                compound.setVisibility((canEdit) ? View.VISIBLE : View.GONE);
 
                 compound = (CompoundButton) editShareView.findViewById(R.id.canEditDeleteCheckBox);
                 compound.setChecked((sharePermissions & OCShare.DELETE_PERMISSION_FLAG) > 0);
-                compound.setVisibility(canEdit ? View.VISIBLE : View.GONE);
+                compound.setVisibility((canEdit) ? View.VISIBLE : View.GONE);
             }
 
             setPermissionsListening(editShareView, true);

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

@@ -118,11 +118,10 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+        super.onActivityCreated(savedInstanceState);
         setHasOptionsMenu(true);
     }
 
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
@@ -308,7 +307,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
                 // Obtain the file
                 if (!getFile().isDown()) {  // Download the file                    
                     Log_OC.d(TAG, getFile().getRemotePath() + " : File must be downloaded");
-                    ((FileDisplayActivity) mContainerActivity).startDownloadForSending(getFile());
+                    ((FileDisplayActivity) mContainerActivity).startDownloadForSending(getFile(),
+                            OCFileListFragment.DOWNLOAD_SEND);
                 }
                 else {
                     mContainerActivity.getFileOperationsHelper().sendDownloadedFile(getFile());

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

@@ -141,7 +141,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
             } else {    /// Click on a file
                 ImageView checkBoxV = (ImageView) v.findViewById(R.id.custom_checkbox);
                 if (checkBoxV != null) {
-                    if (((AbsListView)getListView()).isItemChecked(position)) {
+                    if (getListView().isItemChecked(position)) {
                         checkBoxV.setImageResource(R.drawable.ic_checkbox_marked);
                     } else {
                         checkBoxV.setImageResource(R.drawable.ic_checkbox_blank_outline);
@@ -222,7 +222,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
         }
 
         // by now, only files in the same directory will be kept as selected
-        ((AbsListView)mCurrentListView).clearChoices();
+        mCurrentListView.clearChoices();
         mAdapter.swapDirectory(directory);
         if (mDirectory == null || !mDirectory.equals(directory)) {
             mCurrentListView.setSelection(0);
@@ -238,7 +238,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
      */
     public String[] getCheckedFilePaths() {
         ArrayList<String> result = new ArrayList<String>();
-        SparseBooleanArray positions = ((AbsListView)mCurrentListView).getCheckedItemPositions();
+        SparseBooleanArray positions = mCurrentListView.getCheckedItemPositions();
         if (positions.size() > 0) {
             for (int i = 0; i < positions.size(); i++) {
                 if (positions.get(positions.keyAt(i)) == true) {
@@ -270,7 +270,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
      * @param select <code>true</code> to select all, <code>false</code> to deselect all
      */
     public void selectAllFiles(boolean select) {
-        AbsListView listView = (AbsListView) getListView();
+        AbsListView listView = getListView();
         for (int position = 0; position < listView.getCount(); position++) {
             File file = (File) mAdapter.getItem(position);
             if (file.isFile()) {

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

@@ -120,6 +120,10 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
     public final static String ARG_ALLOW_CONTEXTUAL_ACTIONS = MY_PACKAGE + ".ALLOW_CONTEXTUAL";
     public final static String ARG_HIDE_FAB = MY_PACKAGE + ".HIDE_FAB";
 
+    public static final String DOWNLOAD_BEHAVIOUR = "DOWNLOAD_BEHAVIOUR";
+    public static final String DOWNLOAD_SEND = "DOWNLOAD_SEND";
+    public static final String DOWNLOAD_SET_AS = "DOWNLOAD_SET_AS";
+
     public static final String SEARCH_EVENT = "SEARCH_EVENT";
 
     private static final String KEY_FILE = MY_PACKAGE + ".extra.FILE";
@@ -867,13 +871,21 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
                     // Obtain the file
                     if (!singleFile.isDown()) {  // Download the file
                         Log_OC.d(TAG, singleFile.getRemotePath() + " : File must be downloaded");
-                        ((FileDisplayActivity) mContainerActivity).startDownloadForSending(singleFile);
-
+                        ((FileDisplayActivity) mContainerActivity).startDownloadForSending(singleFile, DOWNLOAD_SEND);
                     } else {
                         mContainerActivity.getFileOperationsHelper().sendDownloadedFile(singleFile);
                     }
                     return true;
                 }
+                case R.id.action_set_as_wallpaper: {
+                    if (singleFile.isDown()) {
+                        mContainerActivity.getFileOperationsHelper().setPictureAs(singleFile);
+                    } else {
+                        Log_OC.d(TAG, singleFile.getRemotePath() + " : File must be downloaded");
+                        ((FileDisplayActivity) mContainerActivity).startDownloadForSending(singleFile, DOWNLOAD_SET_AS);
+                    }
+                    return true;
+                }
             }
         }
 

src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -1,23 +1,22 @@
 /**
- *   ownCloud Android client application
- *
- *   @author masensio
- *   @author David A. Velasco
- *   @author Juan Carlos González Cabrero
- *   Copyright (C) 2015 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * ownCloud Android client application
  *
+ * @author masensio
+ * @author David A. Velasco
+ * @author Juan Carlos González Cabrero
+ * Copyright (C) 2015 ownCloud Inc.
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.ui.helpers;
@@ -29,12 +28,14 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
-import android.os.Parcelable;
+import android.os.Build;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
+import android.support.v4.content.FileProvider;
 import android.webkit.MimeTypeMap;
 import android.widget.Toast;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
@@ -54,6 +55,7 @@ import com.owncloud.android.ui.events.FavoriteEvent;
 import org.greenrobot.eventbus.EventBus;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -77,21 +79,21 @@ public class FileOperationsHelper {
     /// Identifier of operation in progress which result shouldn't be lost 
     private long mWaitingForOpId = Long.MAX_VALUE;
 
-	private static final Pattern mPatternUrl = Pattern.compile("^URL=(.+)$");
-	private static final Pattern mPatternString = Pattern.compile("<string>(.+)</string>");
+    private static final Pattern mPatternUrl = Pattern.compile("^URL=(.+)$");
+    private static final Pattern mPatternString = Pattern.compile("<string>(.+)</string>");
 
     public FileOperationsHelper(FileActivity fileActivity) {
         mFileActivity = fileActivity;
     }
 
-	@Nullable
+    @Nullable
     private String getUrlFromFile(String storagePath, Pattern pattern) {
         String url = null;
 
         InputStreamReader fr = null;
         BufferedReader br = null;
         try {
-            fr =  new InputStreamReader(new FileInputStream(storagePath), "UTF8");
+            fr = new InputStreamReader(new FileInputStream(storagePath), "UTF8");
             br = new BufferedReader(fr);
 
             String line;
@@ -103,7 +105,7 @@ public class FileOperationsHelper {
                 }
             }
         } catch (IOException e) {
-			Log_OC.d(TAG, e.getMessage());
+            Log_OC.d(TAG, e.getMessage());
         } finally {
             if (br != null) {
                 try {
@@ -122,7 +124,7 @@ public class FileOperationsHelper {
             }
         }
         return url;
-	}
+    }
 
     @Nullable
     private Intent createIntentFromFile(String storagePath) {
@@ -130,12 +132,12 @@ public class FileOperationsHelper {
         int lastIndexOfDot = storagePath.lastIndexOf('.');
         if (lastIndexOfDot >= 0) {
             String fileExt = storagePath.substring(lastIndexOfDot + 1);
-            if (fileExt.equalsIgnoreCase("url") ||fileExt.equalsIgnoreCase("desktop")) {
-				// Windows internet shortcut file .url
-				// Ubuntu internet shortcut file .desktop
+            if (fileExt.equalsIgnoreCase("url") || fileExt.equalsIgnoreCase("desktop")) {
+                // Windows internet shortcut file .url
+                // Ubuntu internet shortcut file .desktop
                 url = getUrlFromFile(storagePath, mPatternUrl);
             } else if (fileExt.equalsIgnoreCase("webloc")) {
-				// mac internet shortcut file .webloc
+                // mac internet shortcut file .webloc
                 url = getUrlFromFile(storagePath, mPatternString);
             }
         }
@@ -163,7 +165,7 @@ public class FileOperationsHelper {
                 }
             }
 
-            if(openFileWithIntent == null) {
+            if (openFileWithIntent == null) {
                 openFileWithIntent = createIntentFromFile(storagePath);
             }
 
@@ -180,7 +182,7 @@ public class FileOperationsHelper {
             List<ResolveInfo> launchables = mFileActivity.getPackageManager().
                     queryIntentActivities(openFileWithIntent, PackageManager.GET_INTENT_FILTERS);
 
-            if(launchables != null && launchables.size() > 0) {
+            if (launchables != null && launchables.size() > 0) {
                 try {
                     mFileActivity.startActivity(
                             Intent.createChooser(
@@ -248,7 +250,7 @@ public class FileOperationsHelper {
         }
     }
 
-    public void getFileWithLink(OCFile file){
+    public void getFileWithLink(OCFile file) {
         if (isSharedSupported()) {
             if (file != null) {
                 mFileActivity.showLoadingDialog(mFileActivity.getApplicationContext().
@@ -285,7 +287,7 @@ public class FileOperationsHelper {
         if (file != null) {
             // TODO check capability?
             mFileActivity.showLoadingDialog(mFileActivity.getApplicationContext().
-                getString(R.string.wait_a_moment));
+                    getString(R.string.wait_a_moment));
 
             Intent service = new Intent(mFileActivity, OperationsService.class);
             service.setAction(OperationsService.ACTION_CREATE_SHARE_WITH_SHAREE);
@@ -333,7 +335,7 @@ public class FileOperationsHelper {
         queueShareIntent(unshareService);
     }
 
-    public void unshareFileWithUserOrGroup(OCFile file, ShareType shareType, String userOrGroup){
+    public void unshareFileWithUserOrGroup(OCFile file, ShareType shareType, String userOrGroup) {
 
         // Unshare the file: Create the intent
         Intent unshareService = new Intent(mFileActivity, OperationsService.class);
@@ -347,7 +349,7 @@ public class FileOperationsHelper {
     }
 
 
-    private void queueShareIntent(Intent shareIntent){
+    private void queueShareIntent(Intent shareIntent) {
         if (isSharedSupported()) {
             // Unshare the file
             mWaitingForOpId = mFileActivity.getOperationsServiceBinder().
@@ -371,10 +373,10 @@ public class FileOperationsHelper {
      *
      * @param file  File to share or unshare.
      */
-    public void showShareFile(OCFile file){
+    public void showShareFile(OCFile file) {
         Intent intent = new Intent(mFileActivity, ShareActivity.class);
-        intent.putExtra(mFileActivity.EXTRA_FILE, (Parcelable) file);
-        intent.putExtra(mFileActivity.EXTRA_ACCOUNT, mFileActivity.getAccount());
+        intent.putExtra(FileActivity.EXTRA_FILE, file);
+        intent.putExtra(FileActivity.EXTRA_ACCOUNT, mFileActivity.getAccount());
         mFileActivity.startActivity(intent);
 
     }
@@ -478,8 +480,15 @@ public class FileOperationsHelper {
         if (hideFileListing) {
             updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, OCShare.CREATE_PERMISSION_FLAG);
         } else {
-            updateShareIntent.
-                    putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER);
+            OwnCloudVersion serverVersion = AccountUtils.getServerVersion(mFileActivity.getAccount());
+
+            if (serverVersion != null && serverVersion.isNotReshareableFederatedSupported()) {
+                updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS,
+                        OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9);
+            } else {
+                updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS,
+                        OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9);
+            }
         }
 
         queueShareIntent(updateShareIntent);
@@ -502,8 +511,8 @@ public class FileOperationsHelper {
             // set MimeType
             sendIntent.setType(file.getMimetype());
             sendIntent.putExtra(
-                Intent.EXTRA_STREAM,
-                file.getExposedFileUri(mFileActivity)
+                    Intent.EXTRA_STREAM,
+                    file.getExposedFileUri(mFileActivity)
             );
             sendIntent.putExtra(Intent.ACTION_SEND, true);      // Send Action
 
@@ -518,18 +527,50 @@ public class FileOperationsHelper {
     }
 
     public void syncFiles(Collection<OCFile> files) {
-        for (OCFile file: files) {
+        for (OCFile file : files) {
             syncFile(file);
         }
     }
 
+    public void setPictureAs(OCFile file) {
+        if (file != null) {
+            if (file.isDown()) {
+                Context context = MainApp.getAppContext();
+
+                try {
+                    File externalFile = new File(file.getStoragePath());
+                    Intent intent = new Intent(Intent.ACTION_ATTACH_DATA);
+                    Uri sendUri;
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                        sendUri = FileProvider.getUriForFile(context,
+                                context.getResources().getString(R.string.file_provider_authority), externalFile);
+                    } else {
+                        sendUri = Uri.fromFile(externalFile);
+                    }
+
+                    intent.setDataAndType(sendUri, file.getMimetype());
+                    intent.putExtra("mimeType", file.getMimetype());
+                    mFileActivity.startActivityForResult(Intent.createChooser(intent,
+                            mFileActivity.getString(R.string.set_as)), 200);
+
+                } catch (ActivityNotFoundException exception) {
+                    Toast.makeText(context, R.string.picture_set_as_no_app, Toast.LENGTH_LONG).show();
+                }
+            }
+        } else {
+            Log_OC.wtf(TAG, "Trying to send a NULL OCFile");
+        }
+    }
+
     /**
      * Request the synchronization of a file or folder with the OC server, including its contents.
      *
      * @param file          The file or folder to synchronize
      */
     public void syncFile(OCFile file) {
-        if (!file.isFolder()){
+        if (!file.isFolder()) {
             Intent intent = new Intent(mFileActivity, OperationsService.class);
             intent.setAction(OperationsService.ACTION_SYNC_FILE);
             intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
@@ -537,7 +578,7 @@ public class FileOperationsHelper {
             intent.putExtra(OperationsService.EXTRA_SYNC_FILE_CONTENTS, true);
             mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(intent);
             mFileActivity.showLoadingDialog(mFileActivity.getApplicationContext().
-                getString(R.string.wait_a_moment));
+                    getString(R.string.wait_a_moment));
 
         } else {
             Intent intent = new Intent(mFileActivity, OperationsService.class);
@@ -551,37 +592,37 @@ public class FileOperationsHelper {
 
     public void toggleFavoriteFiles(Collection<OCFile> files, boolean shouldBeFavorite) {
         List<OCFile> alreadyRightStateList = new ArrayList<>();
-        for(OCFile file : files) {
-            if(file.getIsFavorite() == shouldBeFavorite) {
+        for (OCFile file : files) {
+            if (file.getIsFavorite() == shouldBeFavorite) {
                 alreadyRightStateList.add(file);
             }
         }
 
         files.removeAll(alreadyRightStateList);
 
-        for (OCFile file: files) {
+        for (OCFile file : files) {
             toggleFavoriteFile(file, shouldBeFavorite);
         }
     }
 
     public void toggleFavoriteFile(OCFile file, boolean shouldBeFavorite) {
-        if(file.getIsFavorite() != shouldBeFavorite) {
+        if (file.getIsFavorite() != shouldBeFavorite) {
             EventBus.getDefault().post(new FavoriteEvent(file.getRemotePath(), shouldBeFavorite, file.getRemoteId()));
         }
     }
 
 
-    public void toogleOfflineFiles(Collection<OCFile> files, boolean isAvailableOffline){
+    public void toogleOfflineFiles(Collection<OCFile> files, boolean isAvailableOffline) {
         List<OCFile> alreadyRightStateList = new ArrayList<>();
-        for(OCFile file : files) {
-            if(file.isAvailableOffline() == isAvailableOffline) {
+        for (OCFile file : files) {
+            if (file.isAvailableOffline() == isAvailableOffline) {
                 alreadyRightStateList.add(file);
             }
         }
 
         files.removeAll(alreadyRightStateList);
 
-        for (OCFile file: files) {
+        for (OCFile file : files) {
             toggleOfflineFile(file, isAvailableOffline);
         }
     }
@@ -649,7 +690,7 @@ public class FileOperationsHelper {
         service.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
         service.putExtra(OperationsService.EXTRA_REMOTE_PATH, remotePath);
         service.putExtra(OperationsService.EXTRA_CREATE_FULL_PATH, createFullPath);
-        mWaitingForOpId =  mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
+        mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
 
         mFileActivity.showLoadingDialog(mFileActivity.getString(R.string.wait_a_moment));
     }
@@ -748,7 +789,7 @@ public class FileOperationsHelper {
         mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
 
         mFileActivity.showLoadingDialog(
-            mFileActivity.getString(R.string.wait_checking_credentials)
+                mFileActivity.getString(R.string.wait_checking_credentials)
         );
     }
 }

src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java

@@ -74,6 +74,4 @@ public class NotificationUtils {
         }, delayInMillis); 
     
     }
-    
-
 }

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

@@ -323,15 +323,9 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
             }
             mLastPercent = percent;
         }
-
     }
 
-
     public void setError(boolean error) {
         mError = error;
     }
-
-    ;
-
-
 }

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

@@ -358,6 +358,7 @@ public class PreviewImageActivity extends FileActivity implements
      */
     @Override
     public void onPageScrollStateChanged(int state) {
+        // not used at the moment
     }
 
     /**
@@ -367,16 +368,15 @@ public class PreviewImageActivity extends FileActivity implements
      * @param   position                Position index of the first page currently being displayed. 
      *                                  Page position+1 will be visible if positionOffset is
      *                                  nonzero.
-     *                                  
      * @param   positionOffset          Value from [0, 1) indicating the offset from the page
      *                                  at position.
      * @param   positionOffsetPixels    Value in pixels indicating the offset from position. 
      */
     @Override
     public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        // not used at the moment
     }
 
-
     /**
      * Class waiting for broadcast events from the {@link FileDownloader} service.
      * 

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

@@ -365,6 +365,10 @@ public class PreviewImageFragment extends FileFragment {
                 mContainerActivity.getFileOperationsHelper().syncFile(getFile());
                 return true;
 
+            case R.id.action_set_as_wallpaper:
+                mContainerActivity.getFileOperationsHelper().setPictureAs(getFile());
+                return true;
+
             default:
                 return super.onOptionsItemSelected(item);
         }

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

@@ -611,6 +611,7 @@ public class PreviewMediaFragment extends FileFragment implements
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
         Log_OC.v(TAG, "onConfigurationChanged " + this);
     }
 

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

@@ -202,6 +202,7 @@ public class PreviewTextFragment extends FileFragment {
 
         @Override
         protected void onPreExecute() {
+            // not used at the moment
         }
 
         @Override

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

@@ -191,7 +191,7 @@ public class DialogMenuItem implements MenuItem {
 
     @Override
     public void setShowAsAction(int actionEnum) {
-
+        // not used at the moment
     }
 
     @Override

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

@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 package com.owncloud.android.utils;
 
 import android.content.res.Resources;
@@ -57,8 +56,8 @@ public class ErrorMessageAdapter {
 
         String message = null;
 
-        if (!result.isSuccess() && isNetworkError(result.getCode())) {
-            message = getErrorMessage(result, res);
+        if (!result.isSuccess() && isCommonError(result.getCode())) {
+            message = getCommonErrorMessage(result, res);
 
         } else if (operation instanceof UploadFileOperation) {
 
@@ -119,6 +118,7 @@ public class ErrorMessageAdapter {
                     // Error --> No permissions
                     message = String.format(res.getString(R.string.forbidden_permissions),
                             res.getString(R.string.forbidden_permissions_delete));
+
                 } else {
                     message = res.getString(R.string.remove_fail_msg);
                 }
@@ -158,9 +158,11 @@ public class ErrorMessageAdapter {
 
             } else if (result.getCode() == ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER) {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
+
             } else {
                 message = res.getString(R.string.create_dir_fail_msg);
             }
+
         } else if (operation instanceof CreateShareViaLinkOperation ||
                 operation instanceof CreateShareWithShareeOperation) {
 
@@ -238,6 +240,7 @@ public class ErrorMessageAdapter {
                 // Show a Message, operation finished without success
                 message = res.getString(R.string.move_file_error);
             }
+
         } else if (operation instanceof SynchronizeFolderOperation) {
 
             if (!result.isSuccess()) {
@@ -253,9 +256,11 @@ public class ErrorMessageAdapter {
                             folderPathName);
                 }
             }
+
         } else if (operation instanceof CopyFileOperation) {
             if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
                 message = res.getString(R.string.copy_file_not_found);
+
             } else if (result.getCode() == ResultCode.INVALID_COPY_INTO_DESCENDANT) {
                 message = res.getString(R.string.copy_file_invalid_into_descendent);
 
@@ -275,7 +280,7 @@ public class ErrorMessageAdapter {
         return message;
     }
 
-    private static String getErrorMessage(RemoteOperationResult result, Resources res) {
+    private static String getCommonErrorMessage(RemoteOperationResult result, Resources res) {
 
         String message = null;
 
@@ -295,15 +300,18 @@ public class ErrorMessageAdapter {
 
             } else if (result.getCode() == ResultCode.HOST_NOT_AVAILABLE) {
                 message = res.getString(R.string.network_host_not_available);
+            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
+                message = res.getString(R.string.maintenance_mode);
             }
         }
 
         return message;
     }
 
-    private static boolean isNetworkError(RemoteOperationResult.ResultCode code) {
+    private static boolean isCommonError(RemoteOperationResult.ResultCode code) {
         return code == ResultCode.WRONG_CONNECTION ||
                 code == ResultCode.TIMEOUT ||
-                code == ResultCode.HOST_NOT_AVAILABLE;
+                code == ResultCode.HOST_NOT_AVAILABLE ||
+                code == ResultCode.MAINTENANCE_MODE;
     }
 }

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

@@ -115,10 +115,6 @@ public class FileStorageUtils {
         return savePath.getUsableSpace();
     }
 
-    public static String getLogPath() {
-        return MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator + "log";
-    }
-
     /**
      * Returns the a string like 2016/08/ for the passed date. If date is 0 an empty
      * string is returned

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

@@ -175,6 +175,10 @@ public class MimeTypeUtil {
         return isImage(extractMimeType(file));
     }
 
+    public static boolean isSVG(OCFile file) {
+        return "image/svg+xml".equalsIgnoreCase(file.getMimetype());
+    }
+
     /**
      * @param file the file to be analyzed
      * @return 'True' if the file contains audio

src/main/java/third_parties/michaelOrtiz/TouchImageViewCustom.java

@@ -64,7 +64,7 @@ public class TouchImageViewCustom extends ImageViewCustom {
     //
 	private Matrix matrix, prevMatrix;
 
-    private static enum State { NONE, DRAG, ZOOM, FLING, ANIMATE_ZOOM };
+    private static enum State { NONE, DRAG, ZOOM, FLING, ANIMATE_ZOOM }
     private State state;
 
     private float minScale;

src/main/res/layout/contacts_backup_fragment.xml

@@ -68,7 +68,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/standard_margin"
                 android:layout_weight="1"
-                android:gravity="right"
+                android:gravity="end"
                 android:text="@string/contacts_preference_backup_never"
                 android:textAppearance="?android:attr/textAppearanceMedium"/>
         </LinearLayout>
@@ -78,7 +78,6 @@
             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"/>
 
@@ -98,7 +97,6 @@
             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"/>
 

src/main/res/menu/file_actions_menu.xml

@@ -118,6 +118,12 @@
         app:showAsAction="never"
         android:showAsAction="never"
         android:orderInCategory="1" />
+    <item
+        android:id="@+id/action_set_as_wallpaper"
+        android:title="@string/set_picture_as"
+        app:showAsAction="never"
+        android:showAsAction="never"
+        android:orderInCategory="1" />
     <item
         android:id="@+id/action_see_details"
         android:title="@string/actionbar_see_details"

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

@@ -1,51 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="about_android">%1$s aplicación d\'Android</string>
+    <string name="about_android">Aplicación %1$s p\'Android</string>
     <string name="about_version">versión %1$s</string>
-    <string name="actionbar_sync">Anovar cuenta</string>
+    <string name="actionbar_sync">Refrescar cuenta</string>
     <string name="actionbar_upload">Xubir</string>
     <string name="actionbar_upload_from_apps">Conteníu dende otres aplicaciones</string>
     <string name="actionbar_upload_files">Ficheros</string>
     <string name="actionbar_open_with">Abrir con</string>
-    <string name="actionbar_mkdir">Nueva carpeta</string>
+    <string name="actionbar_mkdir">Carpeta nueva</string>
     <string name="actionbar_settings">Axustes</string>
     <string name="actionbar_see_details">Detalles</string>
     <string name="actionbar_send_file">Unviar</string>
     <string name="actionbar_sort">Ordenar</string>
-    <string name="actionbar_sort_title">Ordenar por</string>
+    <string name="actionbar_sort_title">Ordenar per</string>
+    <string name="sort_by">Ordenar per</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">Lo más nuevo</string>
+    <string name="menu_item_sort_by_date_oldest_first">Lo más vieyo</string>
+    <string name="menu_item_sort_by_size_biggest_first">Lo más grande</string>
+    <string name="menu_item_sort_by_size_smallest_first">Lo más pequeño</string>
+
     <string name="drawer_item_all_files">Tolos ficheros</string>
+    <string name="drawer_item_files">Ficheros</string>
+    <string name="drawer_item_home">Aniciu</string>
+    <string name="drawer_item_favorites">Favoritos</string>
+    <string name="drawer_item_photos">Semeyes</string>
+    <string name="drawer_item_on_device">Nel preséu</string>
+    <string name="drawer_item_recently_added">Amestao apocayá</string>
+    <string name="drawer_item_recently_modified">Modificao apocayá</string>
+    <string name="drawer_item_shared">Compartío</string>
+    <string name="drawer_item_videos">Vídeos</string>
     <string name="drawer_item_settings">Axustes</string>
     <string name="drawer_item_uploads_list">Xubes </string>
-    <string name="drawer_close">Zarrar</string>
+    <string name="drawer_item_activities">Actividaes</string>
+    <string name="drawer_item_notifications">Avisos</string>
+    <string name="drawer_quota">%1$s de %2$s usao</string>
+	<string name="drawer_close">Zarrar</string>
     <string name="drawer_open">Abrir</string>
     <string name="prefs_category_general">Xeneral</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_accounts">Cuentes</string>
-    <string name="prefs_manage_accounts">Alministrar cuentes</string>
-    <string name="prefs_passcode">Contraseña</string>
-    <string name="prefs_instant_upload">Xubida de semeya instantánea</string>
+    <string name="prefs_manage_accounts">Xestionar cuentes</string>
+    <string name="prefs_fingerprint_notsetup">Nun se configuraron buelgues.</string>
+    <string name="prefs_show_hidden_files">Amosar ficheros anubríos</string>
+    <string name="prefs_instant_upload">Xuba nel intre de semeyes</string>
     <string name="prefs_instant_upload_summary">Xuba nel intre de semeyes feches cola cámara</string>
-    <string name="prefs_instant_video_upload">Xubida de videu nel intre</string>
-    <string name="prefs_instant_video_upload_summary">Xubida nel intre de vídeos grabaos pela cámara</string>
+    <string name="prefs_instant_video_upload">Xuba nel intre de vídeos</string>
+    <string name="prefs_instant_video_upload_summary">Xuba nel intre de vídeos fechos cola cámara</string>
     <string name="prefs_log_title">Habilitar rexistru</string>
     <string name="prefs_log_summary">Esto úsase pa rexistrar problemes</string>
     <string name="prefs_log_title_history">Historial del rexistru</string>
-    <string name="prefs_log_summary_history">Esto amuesa los rexistros atroxaos</string>
+    <string name="prefs_log_summary_history">Esto amuesa los rexistros grabaos</string>
     <string name="prefs_log_delete_history_button">Desaniciar historial</string>
+    <string name="prefs_calendar_contacts">Sincronizar calendariu &amp; contautos</string>
+    <string name="prefs_calendar_contacts_summary">Configura DAVdroid (v1.3.0+) pa la cuenta actual</string>
     <string name="prefs_help">Ayuda</string>
-    <string name="prefs_recommend">Recomendar a un collaciu</string>
     <string name="prefs_feedback">Mensaxes de retroalimentación</string>
-    <string name="prefs_imprint">Imprint</string>
-    <string name="prefs_remember_last_share_location">Recuerdala llocalización compartida</string>
-    <string name="prefs_remember_last_upload_location_summary">Recuerda la cabera llocalización compartida</string>
-
-	<string name="recommend_subject">¡Prueba %1$s nel to teléfonu intelixente!</string>
-	<string name="recommend_text">Prestaríame invitate a usar %1$s nel to smartphone Descárgalo equi: %2$s</string>
+    <string name="recommend_subject">¡Prueba %1$s nel to teléfonu intelixente!</string>
+	<string name="recommend_text">Quiero convidate a usar %1$s nel to teléfonu intelixente.\nBáxalu d\'equí: %2$s</string>
 
     <string name="auth_check_server">Comprobar servidor</string>
     <string name="auth_host_url">Direición del sirvidor https://...</string>
     <string name="auth_username">Nome d\'usuariu</string>
     <string name="auth_password">Contraseña</string>
+    <string name="auth_register">¿Entá nun tienes un sirvidor?\nPrimi equí pa consiguir ún d\'un fornidor</string>
     <string name="sync_string_files">Ficheros</string>
     <string name="setup_btn_connect">Coneutar</string>
     <string name="uploader_btn_upload_text">Xubir</string>
@@ -56,14 +75,25 @@
     <string name="uploader_wrn_no_account_quit_btn_text">Colar</string>
     <string name="uploader_error_title_no_file_to_upload">Ensin ficheru pa xubir</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s nun puede xubir un cachu de testu como un ficheru.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">Ficheru nun puede xubise</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s nun ta permitíu lleer un ficheru recibíu</string>
-    <string name="uploader_error_message_source_file_not_found">Ficheru pa xubir nun s\'atopó nel so allugamientu . Por favor, compruebe si esiste\'l ficheru.</string>
-    <string name="uploader_error_message_source_file_not_copied">Hebo un fallu mientres s\'intentaba copiar un ficheru a una carpeta temporal. Por favor, intente unviala de nuevu.</string>
+    <string name="uploader_error_message_source_file_not_copied">Nun pudo copiase\'l ficheru a una carpeta temporal. Prueba a reunvialu.</string>
+    <string name="uploader_upload_files_behaviour_only_upload">Caltener ficheru na carpeta fonte</string>
     <string name="file_list_seconds_ago">hai segundos</string>
-    <string name="file_list_loading">Cargando...</string>
-    <string name="file_list_no_app_for_file_type">¡Nun s\'alcontró aplicación pa la triba de ficheru!</string>
+    <string name="file_list_empty_headline">Equí nun hai ficheros</string>
+    <string name="file_list_loading">Cargando&#8230;</string>
     <string name="local_file_list_empty">Nun hai ficheros nesta carpeta.</string>
+    <string name="file_list_empty_headline_search">Ensin resultaos nesta carpeta</string>
+    <string name="file_list_empty_headline_server_search">Ensin resultaos</string>
+    <string name="file_list_empty_shared_headline">Entá nun se compartió nada</string>
+    <string name="file_list_empty_shared">Equí amosaránse los ficheros y carpetes que compartas</string>
+    <string name="file_list_empty_headline_server_search_videos">Ensín vídeos</string>
+    <string name="file_list_empty_headline_server_search_photos">Ensin semeyes</string>
+    <string name="file_list_empty_search">¿Quiciabes tea nuna carpeta diferente?</string>
+    <string name="file_list_empty_recently_modified_filter">La to gueta nun devolvió ficheros
+        modificaos nos caberos 7 díes.</string>
+    <string name="file_list_empty_recently_added_filter">La to gueta nun devolvió ficheros amestaos apocayá</string>
+    <string name="file_list_empty_text_videos_filter">La to gueta nun devolvió vídeos.</string>
+    <string name="upload_list_empty_headline">Nun hai xubes disponibles</string>
     <string name="file_list_folder">Carpeta</string>
     <string name="file_list_folders">Carpetes</string>
     <string name="file_list_file">Ficheru</string>
@@ -75,34 +105,32 @@
     <string name="filedetails_modified">Modificáu:</string>
     <string name="filedetails_download">Descargar</string>
     <string name="filedetails_sync_file">Sincroniza</string>
-    <string name="filedetails_renamed_in_upload_msg">El ficheru renomóse a %1$s demientres la xuba</string>
-    <string name="list_layout">Llista de diseños</string>
+    <string name="filedetails_renamed_in_upload_msg">Renomóse\'l ficheru %1$s na xuba</string>
     <string name="action_share">Compartir</string>
     <string name="common_yes">Sí</string>
     <string name="common_no">Non</string>
     <string name="common_ok">Aceutar</string>
     <string name="common_remove_upload">Desaniciar xuba</string>
-    <string name="common_retry_upload">Reintentar xuba</string>
+    <string name="common_retry_upload">Retentar xuba</string>
     <string name="common_cancel_sync">Encaboxar sincronización</string>
     <string name="common_cancel">Encaboxar</string>
     <string name="common_back">Atrás</string>
     <string name="common_save_exit">Guardar y colar</string>
     <string name="common_error">Fallu</string>
-    <string name="common_loading">Cargando ...</string>
+    <string name="common_loading">Cargando&#8230;</string>
     <string name="common_unknown">desconocí­u</string>
     <string name="common_error_unknown">Fallu desconocíu</string>
     <string name="about_title">Tocante</string>
     <string name="change_password">Camudar contraseña</string>
     <string name="delete_account">Desaniciar cuenta</string>
     <string name="create_account">Crear cuenta</string>
-    <string name="upload_chooser_title">Xubir dende ...</string>
+    <string name="upload_chooser_title">Xubir dende&#8230;</string>
     <string name="uploader_info_dirname">Nome de la carpeta</string>
-    <string name="uploader_upload_in_progress_ticker">Xubiendo ...</string>
+    <string name="uploader_upload_in_progress_ticker">Xubiendo&#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Xubiendo %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Xuba correuta</string>
     <string name="uploader_upload_succeeded_content_single">%1$s xubíu</string>
     <string name="uploader_upload_failed_ticker">Xuba fallida</string>
-    <string name="uploader_upload_failed_content_single">Nun pudo completase la xuba de %1$s</string>
+    <string name="uploader_upload_failed_content_single">Nun pudo xubise %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Falló la xubida, necesites aniciar sesión de nueves</string>
     <string name="uploads_view_title">Xubes</string>
     <string name="uploads_view_group_current_uploads">Actual</string>
@@ -119,36 +147,36 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Ficheru llocal nun s\'atopó</string>
     <string name="uploads_view_upload_status_failed_permission_error">Fallu de permisu</string>
     <string name="uploads_view_upload_status_conflict">Conflictu</string>
-    <string name="uploads_view_upload_status_service_interrupted">Aplicación terminóse</string>
+    <string name="uploads_view_upload_status_service_interrupted">Aplicación finada</string>
     <string name="uploads_view_upload_status_unknown_fail">Fallu desconocíu</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Esperando conectividá wifi</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Esperando pola coneutividá Wi-Fi</string>
     <string name="uploads_view_later_waiting_to_upload">Esperando pa xubir</string>
-    <string name="downloader_download_in_progress_ticker">Baxando ...</string>
+    <string name="downloader_download_in_progress_ticker">Baxando&#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Descargando %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Descarga correuta</string>
     <string name="downloader_download_succeeded_content">%1$s descargáu</string>
     <string name="downloader_download_failed_ticker">Descarga fallida</string>
-    <string name="downloader_download_failed_content">La descarga de %1$s nun pudo completase</string>
+    <string name="downloader_download_failed_content">Nun pudo baxase %1$s</string>
     <string name="downloader_not_downloaded_yet">Entá non baxáu</string>
     <string name="downloader_download_failed_credentials_error">Descarga fallida, necesites aniciar sesión de nueves</string>
     <string name="common_choose_account">Esbillar cuenta</string>
     <string name="sync_fail_ticker">Sincronización fallida</string>
-    <string name="sync_fail_content">La sincronización de %1$s nun pudo completase</string>
-    <string name="sync_fail_content_unauthorized">Contraseña inválida pa %1$s</string>
+    <string name="sync_fail_content">Nun pudo completase la sincronización de %1$s</string>
+    <string name="sync_fail_content_unauthorized">Contraseña incorreuta pa %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Conflictos alcontraos</string>
     <string name="sync_conflicts_in_favourites_content">Los ficheros %1$d kept-in-sync pueden nun tar sincronizaos</string>
     <string name="sync_fail_in_favourites_ticker">Fallu al caltener ficheros sincronizaos.</string>
     <string name="sync_fail_in_favourites_content">Los conteníos de los ficheros %1$d pueden nun tar sincronizaos (%2$d conflictos)</string>
     <string name="sync_foreign_files_forgotten_ticker">Dexáronse dalgunos ficheros llocales.</string>
     <string name="sync_foreign_files_forgotten_content">Los ficheros %1$d fuera de la carpeta %2$s nun puen copiase dientro</string>
-    <string name="sync_foreign_files_forgotten_explanation">Lo mesmo que na versión 1.3.16, los archivos xubíos dende esti preséu copiáronse dientro la carpeta llocal %1$s pa prevenir la perda de datos cuando un ficheru se sincroniza con múltiples cuentes Por mor d\'esti cambéu, tolos ficheros xubíos en versiones previes d\'esta aplicación tán copiaos na carpeta %2$s . Por embargu, un error torgó\'l pieslle de la operación demientres la sincronización de la cuenta. Pues dexar el/los ficheru/os como tán, desaniciar l\'enllaz a %3$s , o mover el/los ficheru/os a la carpeta %1$s y guardar l\'enllaz a %4$s . El llistáu d\'abaxo contién los ficheros llocales y remotos enllazaos en %5$s</string>
     <string name="sync_current_folder_was_removed">La carpeta %1$s yá nun esiste</string>
     <string name="foreign_files_move">Mover too</string>
     <string name="foreign_files_success">Moviéronse tolos ficheros</string>
     <string name="foreign_files_fail">Nun pudieron movese dalgunos ficheros</string>
     <string name="foreign_files_local_text">Llocal: %1$s</string>
     <string name="foreign_files_remote_text">Remotu: %1$s</string>
-    <string name="pass_code_configure_your_pass_code">Introduz la contraseña</string>
+    <string name="pass_code_enter_pass_code">Introduz el to códigu de pasu, por favor</string>
+    
+    <string name="pass_code_configure_your_pass_code">Introduz el to códigu de pasu</string>
     <string name="pass_code_configure_your_pass_code_explanation">La contraseña va ser solicitada cada vegada que s\'anicie l\'aplicación</string>
     <string name="pass_code_reenter_your_pass_code">Por favor, vuelvi inxertar la contraseña</string>
     <string name="pass_code_remove_your_pass_code">Desanicia la to contraseña</string>
@@ -163,77 +191,76 @@
     <string name="media_event_done">%1$s reproducción finada</string>
     <string name="media_err_nothing_to_play">Nun s\'atopó nengún ficheru multimedia</string>
     <string name="media_err_no_account">Nun s\'especificó nenguna cuenta.</string>
-    <string name="media_err_not_in_owncloud">El ficheru nun ta nuna cuenta válida</string>
+    <string name="media_err_not_in_owncloud">El ficheru nun ye una cuenta válida</string>
     <string name="media_err_unsupported">Códec multimedia non soportáu</string>
-    <string name="media_err_io">El códec multimedia nun ye llexible.</string>
-    <string name="media_err_malformed">Ficheru multimedia codificáu incorreutamente</string>
-    <string name="media_err_timeout">Acabóse\'l tiempu intentando reproducir</string>
-    <string name="media_err_invalid_progressive_playback">El ficheru multimedia nun pue tresferise</string>
-    <string name="media_err_unknown">Ficheru multimedia nun pue reproducise</string>
-    <string name="media_err_security_ex">Fallu de seguridá intentando reproducir %1$s</string>
-    <string name="media_err_io_ex">Fallu d\'entrada intentando reproducir %1$s</string>
-    <string name="media_err_unexpected">Error inesperáu intentando reproducir %1$s</string>
+    <string name="media_err_io">Nun pudo lleese\'l ficheru de medios</string>
+    <string name="media_err_malformed">El ficheru de medios tien una codificación incorreuta</string>
+    <string name="media_err_timeout">Escoso\'l tiempu pa reproducir el ficheru</string>
+    <string name="media_err_invalid_progressive_playback">El ficheru de medios nun pue tresmitise</string>
+    <string name="media_err_security_ex">Alcontróse un fallu de seguranza tentando de reproducir %1$s</string>
+    <string name="media_err_io_ex">Fallu d\'entrada entrín se tentaba de reproducir %1$s</string>
+    <string name="media_err_unexpected">Fallu inesperáu entrín se tentaba de reproducir %1$s</string>
     <string name="media_rewind_description">Botón de rebobináu</string>
     <string name="media_play_pause_description">Botón de reproducción o posa</string>
     <string name="media_forward_description">Botón d\'avance rápidu</string>
 
-	<string name="auth_getting_authorization">Garrando autorización...</string>
-	<string name="auth_trying_to_login">Intentando aniciar sesión...</string>
+	<string name="auth_getting_authorization">Consiguiendo autorización&#8230;</string>
+	<string name="auth_trying_to_login">Tentado d\'aniciar sesión&#8230;</string>
 	<string name="auth_no_net_conn_title">Ensin conexón de rede</string>
 	<string name="auth_nossl_plain_ok_title">Conexón segura non disponible</string>
 	<string name="auth_connection_established">Conexón afitada</string>
 	<string name="auth_testing_connection">Probando conexón</string>
 	<string name="auth_not_configured_title">Configuración del sirvidor mal fecha</string>
-	<string name="auth_account_not_new">Yá esiste una cuenta col mesmu usuariu y sirvidor nel preséu</string>
+	<string name="auth_account_not_new">Yá esiste nel preséu una cuenta pal mesmu usuariu y sirvidor</string>
 	<string name="auth_account_not_the_same">L\'usuariu inxertáu nun concasa col usuariu d\'esta cuenta</string>
 	<string name="auth_unknown_error_title">¡Asocedió un fallu desconocíu!</string>
-	<string name="auth_unknown_host_title">Nun pue atopase\'l sirvidor</string>
-	<string name="auth_incorrect_path_title">Nun s\'atopa la instancia del sirvidor.</string>
+	<string name="auth_unknown_host_title">Nun pudo alcontrase l\'agospiu</string>
+	<string name="auth_incorrect_path_title">Nun s\'alcontró\'l sirvidor</string>
 	<string name="auth_timeout_title">El sirvidor tardó muncho en responder</string>
-	<string name="auth_incorrect_address_title">Formatu de direición de sirvidor incorrectu</string>
 	<string name="auth_ssl_general_error_title">Falló la inicialización SSL</string>
-	<string name="auth_ssl_unverified_server_title">Nun se pue certificar la identidá del sirvidor SSL</string>
+	<string name="auth_ssl_unverified_server_title">Nun pudo verificase la identidá del sirvidor SSL</string>
 	<string name="auth_bad_oc_version_title">Versión del sirvidor non reconocida</string>
-	<string name="auth_wrong_connection_title">Nun se pue afitar conexón</string>
+	<string name="auth_wrong_connection_title">Nun pudo afitase la conexón</string>
 	<string name="auth_secure_connection">Afitada conexón segura</string>
 	<string name="auth_unauthorized">Nome d\'usuariu o contraseña erroneos</string>
 	<string name="auth_oauth_error">Autorización ensin ésitu</string>
 	<string name="auth_oauth_error_access_denied">Accesu refugáu pol sirvidor d\'autenticación</string>
-	<string name="auth_wtf_reenter_URL">Estáu non esperáu; por favor, inxerta la direición del sirvidor otra vegada</string>
 	<string name="auth_expired_oauth_token_toast">La to autorización finó. Por favor, autorízala otra vegada</string>
 	<string name="auth_expired_basic_auth_toast">Por favor, introduzca la contraseña actual</string>
 	<string name="auth_expired_saml_sso_token_toast">La so sesión finó. Por favor conéutate otra vegada</string>
-	<string name="auth_connecting_auth_server">Coneutando al sirvidor d\'autentificación…</string>
+	<string name="auth_connecting_auth_server">Coneutando col sirvidor d\'autenticación...</string>
 	<string name="auth_unsupported_auth_method">El sirvidor nun sofita esti métodu/triba d\'autentificación</string>
 	<string name="auth_unsupported_multiaccount">%1$s nun permite cuentes múltiples</string>
+	<string name="auth_fail_get_user_name">El to sirvidor nun ta devolviendo una ID correuta d\'usuariu, por favor contauta con un alministrador</string>
 	<string name="auth_can_not_auth_against_server">Nun pues autentificate nesti sirvidor</string>
-    <string name="auth_account_does_not_exist">La cuenta nun esiste nel preséu aínda</string>
+    <string name="auth_account_does_not_exist">La cuenta entá nun esiste nel preséu</string>
+
 
     <string name="favorite">Afitar como disponible ensin conexón</string>
     <string name="unfavorite">Desaniciar como disponible ensin conexón</string>
+    <string name="favorite_real">Afitar como favoritu</string>
     <string name="common_rename">Renomar</string>
     <string name="common_remove">Desaniciáu</string>
-    <string name="confirmation_remove_folder_alert">¿De xuru quies desaniciar %1$s y los sos conteníos?</string>
+    <string name="confirmation_remove_file_alert">¿De xuru que quies desaniciar %1$s?</string>
     <string name="confirmation_remove_local">Namái llocal</string>
-    <string name="remove_success_msg">Desaniciu correutu</string>
     <string name="remove_fail_msg">Fallu nel desaniciu </string>
     <string name="rename_dialog_title">Introduz un nome nuevu</string>
-    <string name="rename_local_fail_msg">Nun se puede renomar la copia llocal; intenta un nome diferente</string>
-    <string name="rename_server_fail_msg">Nun se pudo completar el renomáu</string>
-    <string name="sync_file_fail_msg">El ficheru remotu nun pudo comprobase</string>
+    <string name="rename_server_fail_msg">Nun pudo dase\'l nome nuevu al sirvidor</string>
+    <string name="sync_file_fail_msg">Nun pudo comprobase\'l ficheru remotu</string>
     <string name="sync_file_nothing_to_do_msg">El conteníu del ficheru yá ta sincronizáu</string>
-    <string name="create_dir_fail_msg">Nun se puede crear la carpeta</string>
+    <string name="create_dir_fail_msg">Nun pudo crease la carpeta</string>
     <string name="filename_forbidden_characters">Caráuteres prohibíos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">El nome del ficheru contién polo menos un carácter non válidu</string>
     <string name="filename_empty">El nome de ficheru nun pue tar baleru</string>
-    <string name="wait_a_moment">Espera un momentu</string>
+    <string name="wait_a_moment">Espera un momentu...</string>
     <string name="wait_checking_credentials">Comprobación de credenciales almacenaes</string>
-    <string name="filedisplay_no_file_selected">Nun s\'esbilló dengún ficheru</string>
-    <string name="activity_chooser_title">Unviar enllaz a ...</string>
+    <string name="filedisplay_unexpected_bad_get_content">Problema inesperáu, por favor esbilla\'l ficheru dende una aplicación diferente</string>
+    <string name="filedisplay_no_file_selected">Nun s\'esbillaron ficheros</string>
+    <string name="activity_chooser_title">Unviar enllaz a&#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copiando ficheru dende l\'almacenamientu priváu</string>
     
     <string name="oauth_check_onoff">Aniciar sesión con oAuth2</string> 
-    <string name="oauth_login_connection">Coneutando al sirvidor oAuth2…</string>    
+    <string name="oauth_login_connection">Coneutando col sirvidor d\'OAuth2</string>    
         
     <string name="ssl_validator_header">La identidá del sitiu nun pue certificase</string>
     <string name="ssl_validator_reason_cert_not_trusted">- El certificáu del sirvidor nun ye de confianza</string>
@@ -270,19 +297,27 @@
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="instant_upload_on_wifi">Xubir semeyes namái per WiFi</string>
-    <string name="instant_video_upload_on_wifi">Xubir vídeos namái per WIFI</string>
+    <string name="auto_upload_on_wifi">Xubir namái na Wi-Fi</string>
+    <string name="instant_upload_on_wifi">Xubir namái semeyes na Wi-Fi</string>
+    <string name="instant_video_upload_on_wifi">Xubir namái vídeos na Wi-Fi</string>
+    <string name="instant_video_upload_on_charging">Namái xubir al cargar</string>
+    <string name="instant_upload_on_charging">Namái xubir al cargar</string>
     <string name="instant_upload_path">/XubidaNelIntre</string>
     <string name="conflict_title">Conflictu nel ficheru</string>
-    <string name="conflict_message">¿Qué ficheros quies caltener? Si seleiciones dambes versiones, el ficheru llocal va tener un númberu amestáu al so nome</string>
+    <string name="conflict_message">¿Qué ficheros quies caltener? Si esbilles dambes versiones, el ficheru llocal tendrá un númberu axuntáu al so nome.</string>
     <string name="conflict_keep_both">Caltener dambos</string>
     <string name="conflict_use_local_version">Versión llocal</string>
     <string name="conflict_use_server_version">Versión de sirvidor</string>
 
+    <string name="preview_sorry">Perdón.</string>
     <string name="preview_image_description">Previsualización d\'imaxe</string>
-    <string name="preview_image_error_unknown_format">Nun pue amosase esta imaxe</string>
+    <string name="preview_image_error_unknown_format">Nun pue amosase la imaxe</string>
 
     <string name="error__upload__local_file_not_copied">Nun se pudo copiar %1$s al ficheru llocal %2$s</string>
+    <string name="prefs_instant_upload_path_title">Carpeta de xuba nel intre</string>
+    <string name="prefs_folder_sync_local_path_title">Carpeta llocal</string>
+    <string name="prefs_folder_sync_remote_path_title">Carpeta remota</string>
+    <string name="prefs_instant_upload_path_use_subfolders_title">Usar socarpetes</string>
     <string name="share_link_file_no_exist">Nun pue compartise. Por favor, comprueba si\'l ficheru esiste</string>
 	<string name="share_link_file_error">Hebo un fallu mientres s\'intentaba compartir esti ficheru o carpeta</string>
 	<string name="unshare_link_file_no_exist">Incapaz de dexar de compartir. Por favor, comprueba si\'l ficheru esiste</string>
@@ -295,56 +330,81 @@
 
     <string name="copy_link">Copiar enllaz</string>
     <string name="clipboard_text_copied">Copiáu al cartafueyu</string>
-    <string name="clipboard_no_text_to_copy">Nun se recibió dengún testu pa copiar al cartafueyu</string>
     <string name="clipboard_uxexpected_error">Error inesperáu intentando copiar al cartafueyu</string>
     <string name="clipboard_label">Testu copiáu dende %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Fallu críticu: nun puen facese les operaciones</string>
+    <string name="error_cant_bind_to_operations_service">Fallu críticu: Nun puen facese les operaciones</string>
+
+    <string name="network_error_socket_exception">Asocedió un fallu na conexón col sirvidor.</string>
+    <string name="network_error_socket_timeout_exception">Asocedió un fallu entrín s\'esperaba pol sirvidor. Nun pudo completase la operación.</string>
+    <string name="network_error_connect_timeout_exception">Asocedió un fallu entrín s\'esperaba pol sirvidor. Nun pudo completase la operación.</string>
+    <string name="network_host_not_available">Nun pudo completase la operación. Sirvidor non disponible</string>
 
-    <string name="network_error_socket_exception">Asocedió un fallu cuando se coneutaba col sirvidor.</string>
     <string name="forbidden_permissions">Nun tienes permisu %s</string>
     <string name="forbidden_permissions_rename">pa renomar esti ficheru</string>
     <string name="forbidden_permissions_delete">pa desaniciar esti ficheru</string>
     <string name="share_link_forbidden_permissions">pa compartir esti ficheru</string>
-    <string name="unshare_link_forbidden_permissions">pa nun compartir esti ficheru</string>
-    <string name="update_link_forbidden_permissions">p\'actualizar esta cuota</string>
+    <string name="unshare_link_forbidden_permissions">pa dexar de compartir esti ficheru</string>
+    <string name="update_link_forbidden_permissions">p\'anovar esta compartición</string>
     <string name="forbidden_permissions_create">pa crear esti ficheru</string>
-    <string name="uploader_upload_forbidden_permissions">pa xubir ficheros a esta carpeta</string>
+    <string name="uploader_upload_forbidden_permissions">pa xubir esta carpeta</string>
     <string name="downloader_download_file_not_found">Esti ficheru yá nun ta nel sirvidor</string>
 
+    <string name="file_migration_finish_button">Finar</string>
+    <string name="file_migration_preparing">Tresnando la migración&#8230;</string>
+    <string name="file_migration_checking_destination">Comprobando destín&#8230;</string>
+    <string name="file_migration_saving_accounts_configuration">Guardando configuración de les cuentes&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Esperando que finen toles sincronizaciones&#8230;</string>
+    <string name="file_migration_migrating">Moviendo datos&#8230;</string>
+    <string name="file_migration_updating_index">Anovando índiz&#8230;</string>
+    <string name="file_migration_cleaning">Llimpiando&#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">Restaurando configuración de les cuentes&#8230;</string>
+    <string name="file_migration_ok_finished">Finó</string>
+    <string name="file_migration_failed_not_enough_space">FALLU: Espaciu insuficiente</string>
+    <string name="file_migration_failed_not_writable">FALLU: El ficheru de destín nun ye escribible</string>
+    <string name="file_migration_failed_not_readable">FALLU: Nun pue lleese\'l códigu fonte</string>
+    <string name="file_migration_failed_dir_already_exists">FALLU: Yá esiste\'l to direutoriu de Nextcloud</string>
+    <string name="file_migration_failed_while_coping">FALLU: Fallu na migración</string>
+    <string name="file_migration_failed_while_updating_index">FALLU: Falló l\'anovamientu del índiz</string>
+
+    <string name="file_migration_override_data_folder">Trocar</string>
+    <string name="file_migration_use_data_folder">Usar</string>
+
+    <string name="file_migration_source_not_readable_title">¡El direutoriu fonte nun ye lleible!</string>
+    <string name="file_migration_source_not_readable">¿Entá quies camudar el camín d\'almacenamientu a %1$s?\n\nNota: tendrán de baxase de nueves tolos datos.</string>
+
     <string name="prefs_category_accounts">Cuentes</string>
     <string name="prefs_add_account">Amestar cuenta</string>
-    <string name="auth_redirect_non_secure_connection_title">La conexón segura rediríxese pente una ruta insegura.</string>
+    <string name="drawer_manage_accounts">Xestionar cuentes</string>
+    <string name="auth_redirect_non_secure_connection_title">Conexón segura redirixida pente una ruta insegura.</string>
 
 	<string name="actionbar_logger">Rexistros</string>
 	<string name="log_send_history_button">Unviar historial</string>
-	<string name="log_send_no_mail_app">Nun s\'atopó nenguna aplicación pa unviar rexistros.  Por favor instala una aplicación de corréu electrónicu</string>
 	<string name="log_send_mail_subject">Aplicación de rexistros d\'Android %1$s</string>
-	<string name="log_progress_dialog_text">Cargando datos ...</string>
+	<string name="log_progress_dialog_text">Cargando datos&#8230;</string>
 
 	<string name="saml_authentication_required_text">Necesítase autenticación</string>
 	<string name="saml_authentication_wrong_pass">Contraseña incorreuta</string>
 	<string name="actionbar_move">Mover</string>
-    <string name="file_list_empty_moving">Ensín nada dientro. ¡Pues amestar una carpeta!</string>
+    <string name="actionbar_copy">Copiar</string>
+	<string name="file_list_empty_moving">Equí nun hai nada. Pes amestar una carpeta</string>
 	<string name="folder_picker_choose_button_text">Esbillar</string>
 
-    <string name="move_file_not_found">Nun pue movese. Por favor, comprueba si\'l ficheru esiste</string>
-    <string name="move_file_invalid_into_descendent">Nun ye posible mover una carpeta dientro de so subcarpeta</string>
-    <string name="move_file_invalid_overwrite">El ficheru yá esiste na carpeta destín</string>
+    <string name="move_file_not_found">Nun pue movese\'l ficheru. Comprueba si esiste, por favor</string>
     <string name="move_file_error">Asocedió un fallu entrín s\'intentaba mover esta carpeta</string>
     <string name="forbidden_permissions_move">pa mover esti ficheru</string>
 
 
     <string name="copy_file_not_found">Nun pue copiáse. Por favor, comprueba si\'l ficheru esiste</string>
-    <string name="copy_file_invalid_into_descendent">Nun ye posible copiar una carpeta diento de so subcarpeta</string>
-    <string name="copy_file_invalid_overwrite">El ficheru yá esiste na carpeta destín</string>
+    <string name="copy_file_invalid_overwrite">El ficheru yá ta presente na carpeta destín</string>
     <string name="copy_file_error">Asocedió un fallú entrín s\'intentaba copiar esta carpeta o ficheru</string>
     <string name="forbidden_permissions_copy">pa copiar esti ficheru</string>
 
     <string name="prefs_category_instant_uploading">Xubes nel intre</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="sync_folder_failed_content">La sincronización de la carpeta %1$s nun pudo completase</string>
+	<string name="prefs_instant_video_upload_path_title">Carpeta Vídeo pa xubes nel intre</string>
+    <string name="sync_folder_failed_content">La sincronización de la carpeta %1$s nun pudo completase</string>
 
 	<string name="shared_subject_header">compartíu</string>
 	<string name="with_you_subject_header">contigo</string>
@@ -366,12 +426,17 @@
     <string name="file_list__footer__files">%1$d ficheros</string>
     <string name="file_list__footer__files_and_folder">%1$d ficheros, 1 carpeta</string>
     <string name="file_list__footer__files_and_folders">%1$d ficheros, %2$d carpetes</string>
-    <string name="prefs_instant_behaviour_dialogTitle">Ficheru orixinal será&#8230;</string>
-    <string name="prefs_instant_behaviour_title">Ficheru orixinal será&#8230;</string>
+    <string name="prefs_instant_behaviour_dialogTitle">El ficheru orixinal sedrá&#8230;</string>
+    <string name="prefs_instant_behaviour_title">El ficheru orixinal sedrá&#8230;</string>
     <string name="upload_copy_files">Copiar ficheru</string>
     <string name="upload_move_files">Mover ficheru</string>
+    <string name="select_all">Esbillar too</string>
+
     <string name="pref_behaviour_entries_keep_file">guardáu en carpeta orixinal</string>
     <string name="pref_behaviour_entries_move">movíu a la carpeta d\'aplicaciones</string>
+    <string name="prefs_storage_path">Camín d\'almacenamientu</string>
+    <string name="prefs_common">Común</string>
+
     <string name="share_dialog_title">Compartiendo</string>
     <string name="share_file">Compartir %1$s</string>
     <string name="share_with_user_section_title">Compartir con usuarios y grupos</string>
@@ -379,11 +444,10 @@
     <string name="share_add_user_or_group">Amestar usuariu o grupu</string>
     <string name="share_via_link_section_title">Compartir enllaz</string>
     <string name="share_via_link_expiration_date_label">Afitar la data de caducidá</string>
-    <string name="share_via_link_password_label">Protexer con contraseña</string>
     <string name="share_via_link_password_title">Aseguráu</string>
     <string name="share_via_link_edit_permission_label">Permitir edición</string>
     <string name="share_get_public_link_button">Consiguir enllaz</string>
-    <string name="share_with_title">Compartir con ...</string>
+    <string name="share_with_title">Compartir con&#8230;</string>
     <string name="share_with_edit_title">Compartir con %1$s</string>
 
     <string name="share_search">Guetar</string>
@@ -391,6 +455,7 @@
     <string name="search_users_and_groups_hint">Guetar usuarios y grupos</string>
     <string name="share_group_clarification">%1$s (gropu)</string>
     <string name="share_remote_clarification">%1$s (remotu)</string>
+    <string name="share_email_clarification">%1$s (corréu)</string>
     <string name="share_known_remote_clarification">%1$s ( en %2$s )</string>
 
     <string name="share_privilege_can_share">pue compartir</string>
@@ -401,19 +466,72 @@
     <string name="edit_share_unshare">Dexar de compartir</string>
     <string name="edit_share_done">fechu</string>
 
-    <string name="action_retry_uploads">Reintentar falló</string>
     <string name="action_clear_failed_uploads">Llimpiar falló</string>
-    <string name="action_clear_successful_uploads">Llimpieza con ésitu</string>
-    <string name="action_clear_finished_uploads">Esborrar tolos finalizaos</string>
-
+    <string name="action_clear_successful_uploads">Llimpióse</string>
     <string name="action_switch_grid_view">Vista de rexella</string>
     <string name="action_switch_list_view">Vista de llista</string>
 
     <string name="manage_space_title">Alministrar espaciu</string>
-    <string name="manage_space_description">Axustes, bases de datos y sirvidor de certificaos de los datos %1$s esborraránse dafechu. \n\nLos archivos descargados caltendrase intactos.\n\nEsti procesu puede tardar dalgún tiempu.</string>
     <string name="manage_space_clear_data">Llimpiar datos</string>
     <string name="manage_space_error">Dalgunos ficheros nun pudieron esborrase.</string>
 
-    <string name="permission_storage_access">Ríquense permisos adicionales para xubir &amp; los ficheros descargaos.</string>
-    <string name="local_file_not_found_toast">El ficheru nun s\'atopó nel sistema de ficheros llocal</string>
+    <string name="local_file_not_found_toast">Nun s\'alcontró\'l ficheru nel sistema llocal de ficheros</string>
+    <string name="confirmation_remove_files_alert">¿De xuru que quies desaniciar los elementos esbillaos?</string>
+    <string name="confirmation_remove_folders_alert">¿De xuru que quies desaniciar los elementos esbillaos y los sos conteníos?</string>
+    <string name="actionbar_search">Guetar</string>
+    <string name="learn_more">Deprendi más</string>
+    <string name="participate_release_candidate_headline">Llanzamientu candidatu</string>
+    <string name="move_to">Mover a&#8230;</string>
+    <string name="copy_to">Copiar a&#8230;</string>
+    <string name="choose_remote_folder">Escoyer carpeta&#8230;</string>
+    <string name="folder_sync_loading_folders">Cargando carpetes&#8230;</string>
+    <string name="folder_sync_no_results">Nun s\'alcontraron carpetes de medios.</string>
+    <string name="folder_sync_preferences">Preferencies pa la xuba automática</string>
+    <string name="folder_sync_settings">Axustes</string>
+    <string name="activity_list_loading_activity">Cargando actividaes&#8230;</string>
+    <string name="activity_list_no_results">Nun s\'alcontraron actividaes.</string>
+
+    <string name="notifications_loading_activity">Cargando avisos&#8230;</string>
+    <string name="notifications_no_results_headline">Ensin avisos</string>
+    <string name="upload_file_dialog_filename">Nome de ficheru</string>
+    <string name="upload_file_dialog_filetype">Triba de ficheru</string>
+    <string name="storage_description_sd_no">Tarxeta SD %1$d</string>
+    <string name="storage_description_unknown">Desconozse</string>
+
+    <!-- What's new feature and texts to show -->
+    <string name="whats_new_title">Qué hai nuevo en Nextcloud</string>
+
+    <!-- Welcome to Nc intro features -->
+    <string name="welcome_feature_1_title">Un llar seguru pa tolos tos datos</string>
+    <string name="welcome_feature_1_text">Accedu, comparti y protexi los tos ficheros en casa y nel trabayu</string>
+
+    <string name="welcome_feature_3_title">Xuba nel intre</string>
+    <string name="whats_new_skip">Saltar</string>
+
+    <string name="fingerprint_scan_finger">Escania\'l to deu, por favor</string>
+    <string name="fingerprint_unknown">Nun se reconoz el deu</string>
+
+    <!-- User information -->
+    <string name="user_info_full_name">Nome completu</string>
+    <string name="user_info_email">Corréu</string>
+    <string name="user_info_phone">Númberu telefónicu</string>
+    <string name="user_info_address">Direición</string>
+    <string name="user_info_website">Sitiu web</string>
+    <string name="user_info_twitter">Twitter</string>
+
+    <string name="user_information_description">Información d\'usuariu</string>
+
+    <!-- Activities -->
+    <string name="activities_no_results_headline"> Entá nun hai actividá</string>
+    <string name="webview_error">Asocedió un fallu</string>
+    <string name="prefs_category_about">Tocante a</string>
+
+    <string name="actionbar_contacts">Respaldar contautos</string>
+    <string name="actionbar_contacts_restore">Restaurar contautos</string>
+    <string name="contacts_backup_button">Respaldar agora</string>
+    <string name="contacts_header_restore">Respaldar</string>
+    <string name="contacts_preference_backup_never">enxamás</string>
+    <!-- Notifications -->
+    <string name="new_notification_received">Recibióse un avisu nuevu</string>
+    <string name="drawer_logout">Zarrar sesión</string>
     </resources>

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

@@ -263,6 +263,7 @@
 	<string name="auth_can_not_auth_against_server">Na tomto serveru nelze ověřit</string>
     <string name="auth_account_does_not_exist">V zařízení není zatím nastaven účet</string>
 
+
     <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>
@@ -539,9 +540,6 @@
     <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>
     <string name="participate_contribute_headline">Aktivně něčím přispět</string>
-    <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="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>
@@ -632,6 +630,4 @@
     <!-- Notifications -->
     <string name="new_notification_received">Přijato nové upozornění</string>
     <string name="drawer_logout">Odhlásit se</string>
-
-
-</resources>
+    </resources>

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

@@ -4,7 +4,7 @@
     <string name="about_version">Version %1$s</string>
     <string name="actionbar_sync">Konto aktualisieren</string>
     <string name="actionbar_upload">Hochladen</string>
-    <string name="actionbar_upload_from_apps">Inhalt anderer Apps</string>
+    <string name="actionbar_upload_from_apps">Content from other apps</string>
     <string name="actionbar_upload_files">Dateien</string>
     <string name="actionbar_open_with">Öffnen mit</string>
     <string name="actionbar_mkdir">Neuer Ordner</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">Sortieren nach</string>
+    <string name="sort_by">Sortiere 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>
@@ -108,7 +108,7 @@
     <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">Von dir geteilte Dateien und Ordner werden hier erscheinen</string>
+    <string name="file_list_empty_shared">Von Ihnen 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">Vielleicht befindet es sich in einem anderen Ordner?</string>
@@ -172,7 +172,7 @@
     <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>
@@ -214,7 +214,7 @@
     <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_configure_your_pass_code">Bitte PIN eingeben</string>
+    <string name="pass_code_configure_your_pass_code">PIN 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>
@@ -241,7 +241,7 @@
     <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="media_forward_description">Vorspulknopf</string>
 
 	<string name="auth_getting_authorization">Genehmigung erhalten &#8230;</string>
 	<string name="auth_trying_to_login">Der Versuch, sich anzumelden &#8230;</string>
@@ -249,17 +249,17 @@
 	<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">Verbindung testen</string>
-	<string name="auth_not_configured_title">Fehlerhafte Server Konfiguration</string>
+	<string name="auth_not_configured_title">Fehlerhafte Serverkonfiguration</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 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 Adress-Format für den Server</string>
-	<string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen.</string>
+	<string name="auth_incorrect_address_title">Falsches Adressformat 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_bad_oc_version_title">Unbekannte Serverversion</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>
@@ -276,6 +276,7 @@
 	<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">Offline verfügbar Markierung entfernen</string>
     <string name="favorite_real">Als Favorit markieren</string>
@@ -542,6 +543,8 @@
     <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>
+    <string name="maintenance_mode">Server befindet sich im Wartungsmodus</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Warte auf das Aufladen des Gerätes</string>
     <string name="actionbar_search">Suche</string>
     <string name="files_drop_not_supported">Dies ist eine Nextcloud Funktion, bitte updaten.</string>
@@ -557,10 +560,10 @@
     <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 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="participate_contribute_irc_text">An Chats auf IRC teil: &lt;a href=\"%1$s\">#nexcloud-mobile&lt;/a></string>
+    <string name="participate_contribute_forum_text">Helfe anderen im &lt;a href=\\"%1$s\\">Forum&lt;/a></string>
+    <string name="participate_contribute_translate_text">&lt;a href=\\"%1$s\\">Übersetze&lt;/a>die App</string>
+    <string name="participate_contribute_github_text">Prüfen, ändern und schreiben Sie Code. Siehe auch  &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> für Einzelheiten</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>
@@ -651,6 +654,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">Neue Benachrichtigung erhalten</string>
     <string name="drawer_logout">Abmelden</string>
+    <string name="privacy">Datenschutz</string>
 
 
 </resources>

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

@@ -276,6 +276,7 @@
 	<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">Offline verfügbar Markierung entfernen</string>
     <string name="favorite_real">Als Favorit markieren</string>
@@ -542,6 +543,9 @@
     <string name="local_file_not_found_toast">Die Datei wurde im lokalen Dateisystem nicht gefunden</string>
     <string name="confirmation_remove_files_alert">Willst Du die ausgewählten Einträge wirklich löschen?</string>
     <string name="confirmation_remove_folders_alert">Willst Du die ausgewählten Einträge und deren Inhalte wirklich löschen?</string>
+    <string name="maintenance_mode">Der Server ist im Wartungsmodus
+</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Warte auf das Aufladen des Gerätes</string>
     <string name="actionbar_search">Suche</string>
     <string name="files_drop_not_supported">Dies ist eine Nextcloud Funktion, bitte updaten.</string>
@@ -557,10 +561,10 @@
     <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 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="participate_contribute_irc_text">Trete dem Chat auf IRC bei: &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">&lt;a href=\"%1$s\">Übersetze&lt;/a> die App</string>
+    <string name="participate_contribute_github_text">Prüfe, ändere und schreibe Code. Siehe auch &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> für Einzelheiten</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>
@@ -651,6 +655,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">Neue Benachrichtigung erhalten</string>
     <string name="drawer_logout">Abmelden</string>
+    <string name="privacy">Datenschutz</string>
 
 
 </resources>

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

@@ -275,6 +275,7 @@
 	<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>
@@ -556,10 +557,6 @@
     <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>
@@ -650,6 +647,4 @@
     <!-- Notifications -->
     <string name="new_notification_received">Νέα ενημέρωση ελήφθη </string>
     <string name="drawer_logout">Έξοδος</string>
-
-
-</resources>
+    </resources>

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

@@ -275,6 +275,7 @@
 	<string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
     <string name="auth_account_does_not_exist">Account does not exist on the device yet</string>
 
+
     <string name="favorite">Set as available offline</string>
     <string name="unfavorite">Unset as available offline</string>
     <string name="favorite_real">Set as favourite</string>
@@ -541,6 +542,8 @@
     <string name="local_file_not_found_toast">File not found in local file system</string>
     <string name="confirmation_remove_files_alert">Do you really want to remove the selected items?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to remove the selected items and their contents?</string>
+    <string name="maintenance_mode">Server in maintenance mode</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
     <string name="actionbar_search">Search</string>
     <string name="files_drop_not_supported">This is a Nextcloud feature, please update.</string>
@@ -556,9 +559,6 @@
     <string name="participate_release_candidate_headline">Release candidate</string>
     <string name="participate_release_candidate_text">The release candidate (RC) is a snapshot of the upcoming release and is expected to be stable. Testing your individual setup could help ensure this. Sign up for testing on the Play store or manually look in the \"versions\" section on F-Droid.</string>
     <string name="participate_contribute_headline">Actively Contribute</string>
-    <string name="participate_contribute_irc_text">Join the chat on IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Help others on the &lt;a href="%1$s">forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">Translate&lt;/a> the app</string>
     <string name="move_to">Move to&#8230;</string>
     <string name="copy_to">Copy to&#8230;</string>
     <string name="choose_remote_folder">Choose folder&#8230;</string>
@@ -649,6 +649,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">New notification received</string>
     <string name="drawer_logout">Logout</string>
+    <string name="privacy">Privacy</string>
 
 
 </resources>

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

@@ -276,6 +276,7 @@ en los últimos 7 días. </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>
 
+
     <string name="favorite">Establer como disponible fuera de línea</string>
     <string name="unfavorite">Establecer como disponible en línea</string>
     <string name="favorite_real">Establecer como favorito</string>
@@ -542,6 +543,8 @@ en los últimos 7 días. </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="maintenance_mode">El servidor se encuentra en modo mantenimiento</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>
@@ -557,10 +560,6 @@ en los últimos 7 días. </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í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">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>
@@ -651,6 +650,7 @@ en los últimos 7 días. </string>
     <!-- Notifications -->
     <string name="new_notification_received">No se han recibido nuevas notificaciones </string>
     <string name="drawer_logout">Salir de la sesión</string>
+    <string name="privacy">Privacidad</string>
 
 
 </resources>

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

@@ -276,6 +276,7 @@
 	<string name="auth_can_not_auth_against_server">No puede autenticarse a este servidor</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>
     <string name="favorite_real">Marque como favorito</string>
@@ -557,10 +558,6 @@
     <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í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">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>
@@ -651,6 +648,4 @@
     <!-- Notifications -->
     <string name="new_notification_received">Nueva notificación recibida</string>
     <string name="drawer_logout">Desconectar</string>
-
-
-</resources>
+    </resources>

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

@@ -275,6 +275,7 @@
 	<string name="auth_can_not_auth_against_server">Impossible de s\'authentifier sur ce serveur</string>
     <string name="auth_account_does_not_exist">Le compte n\'existe pas encore sur ce périphérique</string>
 
+
     <string name="favorite">Rendre disponible hors-ligne</string>
     <string name="unfavorite">Ne plus rendre disponible hors-ligne</string>
     <string name="favorite_real">Mettre en favori</string>
@@ -541,6 +542,8 @@
     <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>
+    <string name="maintenance_mode">Serveur en mode de maintenance</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">En attente de recharge de l\'appareil</string>
     <string name="actionbar_search">Rechercher</string>
     <string name="files_drop_not_supported">Il s\'agit d\'une fonctionnalité de Nextcloud ; veuillez mettre à jour..</string>
@@ -556,10 +559,10 @@
     <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 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_irc_text">Rejoingnez la discussion sur le canal IRC : &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a>.</string>
+    <string name="participate_contribute_forum_text">Aidez les autres utilisateurs sur &lt;a href=\"%1$s\">le 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> pour plus d\'informations</string>
+    <string name="participate_contribute_github_text">Pour contrôler, réviser ou écrire du code, consultez &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a>.</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>
@@ -650,6 +653,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">Nouvelle notification reçue</string>
     <string name="drawer_logout">Se déconnecter</string>
+    <string name="privacy">Vie privée</string>
 
 
 </resources>

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

@@ -46,10 +46,10 @@
     <string name="prefs_fingerprint">Fingrafaralás</string>
     <string name="prefs_fingerprint_notsetup">Engin fingraför hafa verið sett inn.</string>
     <string name="prefs_show_hidden_files">Sýna faldar skrár</string>
-    <string name="prefs_instant_upload">Hlaða strax inn myndum</string>
-    <string name="prefs_instant_upload_summary">Hlaða strax inn myndum teknum á myndavél</string>
-    <string name="prefs_instant_video_upload">Hlaða strax inn myndskeiðum</string>
-    <string name="prefs_instant_video_upload_summary">Hlaða strax inn myndskeiðum teknum á myndavél</string>
+    <string name="prefs_instant_upload">Bein innsending á myndum</string>
+    <string name="prefs_instant_upload_summary">Senda beint inn myndir sem teknar eru með myndavél</string>
+    <string name="prefs_instant_video_upload">Bein innsending á myndskeiðum</string>
+    <string name="prefs_instant_video_upload_summary">Senda beint inn myndskeið sem tekin eru með myndavél</string>
     <string name="prefs_log_title">Virkja skráningu í annál</string>
     <string name="prefs_log_summary">Þetta er notað til að skrá vandamál</string>
     <string name="prefs_log_title_history">Ferill annálsskráningar</string>
@@ -58,23 +58,24 @@
     <string name="prefs_calendar_contacts">Samstilla dagatal &amp; tengiliði</string>
     <string name="prefs_calendar_contacts_summary">Setja upp DAVdroid (v1.3.0+) fyrir þennan aðgang</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Ekki var hægt að leysa vistfang þjóns fyrir aðganginn í DAVdroid</string>
-    <string name="prefs_calendar_contacts_no_store_error">Hvorki Google Play né F-Droid appið eru uppsett</string>
-    <string name="prefs_calendar_contacts_sync_setup_successful">Tókst að setja upp samstillingu dagatals og tengiliða</string>
+    <string name="prefs_calendar_contacts_no_store_error">Hvorki F-droid né Google Play eru uppsett</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">Samstillingar dagatals 1&amp; tengiliða eru uppsettar</string>
     <string name="prefs_help">Hjálp</string>
     <string name="prefs_recommend">Mæla með við vin</string>
     <string name="prefs_feedback">Umsögn</string>
     <string name="prefs_imprint">Prenta</string>
     <string name="prefs_remember_last_share_location">Muna staðsetningu sameignar</string>
-    <string name="prefs_remember_last_upload_location_summary">Muna staðsetningu á síðustu innhleðslu sameignar</string>
+    <string name="prefs_remember_last_upload_location_summary">Muna staðsetningu síðast notuðu sameignar</string>
 
 	<string name="recommend_subject">Prófaðu %1$s á snjallsímanum þínum!</string>
-	<string name="recommend_text">Þér langar til að bjóða þér að nota %1$s á snjallsímanum þínum!\nSæktu það hér: %2$s</string>
+	<string name="recommend_text">Mig langar til að bjóða þér að nota %1$s á snjallsímanum þínum.\nHægt að sækja það hér: %2$s</string>
 
     <string name="auth_check_server">Athuga með þjón</string>
     <string name="auth_host_url">Vistfang þjóns https://…</string>
     <string name="auth_username">Notandanafn</string>
     <string name="auth_password">Lykilorð</string>
-    <string name="auth_register">Ertu ekki enn með skýjaþjón?\nSmelltu hér til að fá þér einn frá þjónustuaðila</string>
+    <string name="auth_register">Ertu ekki enn með skýjaþjón?
+Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="sync_string_files">Skrár</string>
     <string name="setup_btn_connect">Tengjast</string>
     <string name="uploader_btn_upload_text">Senda inn</string>
@@ -86,43 +87,42 @@
     <string name="uploader_error_title_no_file_to_upload">Engin skrá til að senda inn</string>
     <string name="uploader_error_message_received_piece_of_text">%1$s getur ekki sent inn textabút sem skrá.</string>
     <string name="uploader_error_message_no_file_to_upload">Móttekin gögn innihéldu ekki gilda skrá.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">Ekki tókst að senda inn skrá</string>
+    <string name="uploader_error_title_file_cannot_be_uploaded">Ekki er hægt að senda þessa skrá inn</string>
     <string name="uploader_error_message_read_permission_not_granted">%1$s hefur ekki heimild til að lesa móttekna skrá</string>
-    <string name="uploader_error_message_source_file_not_found">Skráin sem á að senda inn fannst ekki á staðnum sínum. Athugaðu hvort skráin sé til.</string>
-    <string name="uploader_error_message_source_file_not_copied">Villa kom upp við að afrita þessa skrá í bráðabirgðamöppu. Prófaðu aftur að senda.</string>
+    <string name="uploader_error_message_source_file_not_found">Skrá sem valin var til sendingar fannst ekki. Athugaðu hvort skráin sé til</string>
     <string name="uploader_upload_files_behaviour">Valkostir innsendingar:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Flytja skrá í Nextcloud-möppu</string>
     <string name="uploader_upload_files_behaviour_only_upload">Halda skrá í upprunamöppu</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Eyða skrá úr upprunamöppu</string>
     <string name="file_list_seconds_ago">sek. síðan</string>
     <string name="file_list_empty_headline">Engar skrár hér</string>
-    <string name="file_list_empty">Sendu inn eitthvað efni eða samstilltu við tækin þín!</string>
-    <string name="file_list_empty_favorites">Settu einhverjar skrár í eftirlæti eða samstilltu við tækin þín!</string>
+    <string name="file_list_empty">Sendu inn eitthvað efni eða samstilltu við tækin þín.</string>
+    <string name="file_list_empty_favorites">Gerðu eitthvað efni að uppáhaldi eða samstilltu við tækin þín.</string>
     <string name="file_list_empty_favorites_filter_list">Skrár og möppur sem þú merkir sem eftirlæti birtast hér</string>
-    <string name="file_list_empty_favorites_filter">Engar eftirlætisskrár fundust sem samsvara leitarstrengnum þínum!</string>
+    <string name="file_list_empty_favorites_filter">Leitin skilaði engum eftirlætisskrám</string>
     <string name="file_list_loading">Hleð inn&#8230;</string>
-    <string name="file_list_no_app_for_file_type">Engin forrit fundust fyrir skráategund!</string>
+    <string name="file_list_no_app_for_file_type">Ekkert forrit er uppsett til að meðhöndla þessa tegund skráa.</string>
     <string name="local_file_list_empty">Það eru engar skrár í þessari möppu.</string>
     <string name="file_list_empty_headline_search">Engar niðurstöður í þessari möppu</string>
     <string name="file_list_empty_headline_server_search">Engar niðurstöður</string>
-    <string name="file_list_empty_favorite_headline">Engin eftirlæti ennþá</string>
+    <string name="file_list_empty_favorite_headline">Ekkert er eftirlæti ennþá</string>
     <string name="file_list_empty_shared_headline">Engu deilt ennþá</string>
     <string name="file_list_empty_shared">Skrár og möppur sem þú deilir birtast hér</string>
     <string name="file_list_empty_headline_server_search_videos">Engin myndskeið</string>
     <string name="file_list_empty_headline_server_search_photos">Engar ljósmyndir</string>
-    <string name="file_list_empty_search">Reyna að leita í annarri möppu?</string>
-    <string name="file_list_empty_recently_modified">Engar skrár fundust sem breytt hefur verið síðustu 7 daga</string>
-    <string name="file_list_empty_recently_modified_filter">Engar skrár fundust sem breytt hefur verið
-        síðustu 7 daga!</string>
-    <string name="file_list_empty_recently_added">Engar nýlega viðbættar skrár fundust</string>
-    <string name="file_list_empty_recently_added_filter">Engar nýlega viðbættar skrár fundust sem samsvara leitarstrengnum þínum!</string>
-    <string name="file_list_empty_text_photos">Sendu inn einhverjar myndir eða virkjaðu sjálfvirka innsendingu!</string>
-    <string name="file_list_empty_text_photos_filter">Engar myndir fundust sem samsvara leitarstrengnum þínum!</string>
-    <string name="file_list_empty_text_videos">Sendu inn einhver myndskeið eða virkjaðu sjálfvirka innsendingu!</string>
-    <string name="file_list_empty_text_videos_filter">Engin myndskeið fundust sem samsvara leitarstrengnum þínum!</string>
+    <string name="file_list_empty_search">Er þetta kannski í einhverri annarri möppu?</string>
+    <string name="file_list_empty_recently_modified">Fann engar skrár sem breytt hefur verið síðustu 7 daga</string>
+    <string name="file_list_empty_recently_modified_filter">Leitin skilaði engum skrám sem breytt
+        hefur verið síðustu 7 daga</string>
+    <string name="file_list_empty_recently_added">Fann engar nýlega viðbættar skrár</string>
+    <string name="file_list_empty_recently_added_filter">Leitin skilaði engum nýlega viðbættum skrám</string>
+    <string name="file_list_empty_text_photos">Sendu inn einhverjar myndir eða virkjaðu sjálfvirka innsendingu.</string>
+    <string name="file_list_empty_text_photos_filter">Leitin skilaði engum myndum.</string>
+    <string name="file_list_empty_text_videos">Sendu inn einhver myndskeið eða virkjaðu sjálfvirka innsendingu.</string>
+    <string name="file_list_empty_text_videos_filter">Leitin skilaði engum myndskeiðum.</string>
     <string name="upload_list_empty_headline">Engar innsendingar tiltækar</string>
-    <string name="upload_list_empty_text">Sendu inn eitthvað efni eða virkjaðu beina innsendingu!</string>
-    <string name="upload_list_empty_text_auto_upload">Sendu inn eitthvað efni eða virkjaðu sjálfvirka innsendingu!</string>
+    <string name="upload_list_empty_text">Sendu inn eitthvað efni eða virkjaðu beina innsendingu.</string>
+    <string name="upload_list_empty_text_auto_upload">Sendu inn einhverjar myndir eða virkjaðu sjálfvirka innsendingu.</string>
     <string name="file_list_folder">mappa</string>
     <string name="file_list_folders">möppur</string>
     <string name="file_list_file">skrá</string>
@@ -134,14 +134,13 @@
     <string name="filedetails_modified">Breytt:</string>
     <string name="filedetails_download">Niðurhal</string>
     <string name="filedetails_sync_file">Samstilla</string>
-    <string name="filedetails_renamed_in_upload_msg">Skrá var endurnefnd sem %1$s við innsendingu</string>
-    <string name="list_layout">Framsetning lista</string>
+    <string name="filedetails_renamed_in_upload_msg">Skrá endurnefnd sem %1$s við innsendingu</string>
     <string name="action_share">Deila</string>
     <string name="common_yes">Já</string>
     <string name="common_no">Nei</string>
     <string name="common_ok">Í lagi</string>
     <string name="common_remove_upload">Fjarlægja innsendingu</string>
-    <string name="common_retry_upload">Reyna aftur að senda inn</string>
+    <string name="common_retry_upload">Prófa innsendingu aftur</string>
     <string name="common_cancel_sync">Hætta við samstillingu</string>
     <string name="common_cancel">Hætta við</string>
     <string name="common_back">Til baka</string>
@@ -161,10 +160,10 @@
     <string name="uploader_info_dirname">Nafn möppu</string>
     <string name="uploader_upload_in_progress_ticker">Sendi inn &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Sendi inn %2$s</string>
-    <string name="uploader_upload_succeeded_ticker">Innsending tókst</string>
+    <string name="uploader_upload_succeeded_ticker">Sent inn</string>
     <string name="uploader_upload_succeeded_content_single">%1$s sent inn</string>
     <string name="uploader_upload_failed_ticker">Innsending mistókst</string>
-    <string name="uploader_upload_failed_content_single">Ekki var hægt að ljúka innsendingu á %1$s</string>
+    <string name="uploader_upload_failed_content_single">Gat ekki sent inn %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Innsending mistókst, þú verður að skrá þig inn aftur</string>
     <string name="uploads_view_title">Innsendingar</string>
     <string name="uploads_view_group_current_uploads">Núverandi</string>
@@ -181,37 +180,35 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Skrá finnst ekki á tækinu</string>
     <string name="uploads_view_upload_status_failed_permission_error">Villa í heimildum</string>
     <string name="uploads_view_upload_status_conflict">Árekstur</string>
-    <string name="uploads_view_upload_status_service_interrupted">Forritinu var lokað</string>
+    <string name="uploads_view_upload_status_service_interrupted">Forrit hætti</string>
     <string name="uploads_view_upload_status_unknown_fail">Óþekkt villa</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Bíð eftir þráðlausri tengingu</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">Bíð eftir Wi-Fi tengingu</string>
     <string name="uploads_view_later_waiting_to_upload">Bíð eftir að senda inn</string>
     <string name="downloader_download_in_progress_ticker">Sæki &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Sæki %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Niðurhal tókst</string>
+    <string name="downloader_download_succeeded_ticker">Þegar sótt</string>
     <string name="downloader_download_succeeded_content">%1$s niðurhalað</string>
     <string name="downloader_download_failed_ticker">Niðurhal mistókst</string>
-    <string name="downloader_download_failed_content">Ekki var hægt að ljúka niðurhali á %1$s</string>
+    <string name="downloader_download_failed_content">Gat ekki sótt %1$s</string>
     <string name="downloader_not_downloaded_yet">Ekki ennþá búið að sækja</string>
     <string name="downloader_download_failed_credentials_error">Niðurhal mistókst, þú verður að skrá þig inn aftur</string>
     <string name="common_choose_account">Veldu aðgang</string>
     <string name="sync_fail_ticker">Samstilling mistókst</string>
     <string name="sync_fail_ticker_unauthorized">Samstilling mistókst, þú verður að skrá þig inn aftur</string>
-    <string name="sync_fail_content">Ekki var hægt að ljúka samstillingu á %1$s</string>
-    <string name="sync_fail_content_unauthorized">Ógilt lykilorð fyrir %1$s</string>
+    <string name="sync_fail_content">Gat ekki lokið samstillingu á %1$s</string>
+    <string name="sync_fail_content_unauthorized">Rangt lykilorð fyrir %1$s</string>
     <string name="sync_conflicts_in_favourites_ticker">Árekstrar fundust</string>
     <string name="sync_conflicts_in_favourites_content">%1$d skrár merktar fyrir samstillingu var ekki hægt að samstilla</string>
     <string name="sync_fail_in_favourites_ticker">Skrár merktar fyrir samstillingu mistókust</string>
     <string name="sync_fail_in_favourites_content">Efni %1$d skráa var ekki hægt að samstilla (%2$d árekstrar)</string>
     <string name="sync_foreign_files_forgotten_ticker">Sumar staðværar skrár gleymdust</string>
     <string name="sync_foreign_files_forgotten_content">%1$d skrár úr %2$s möppunni var ekki hægt að afrita í</string>
-    <string name="sync_foreign_files_forgotten_explanation">Frá og með útgáfu 1.3.16, munu skrár sem sendar eru frá þessu tæki verða afritaðar inn í staðværu %1$s möppuna, í þeim tilgangi að koma í veg fyrir gagnatap þegar stök skrá er samstillt við marga notandaaðganga.\n\nVegna þessarar breytingar hafa allar skrár sem sendar hafa verið inn í eldri útgáfum kerfisins verið afritaðar í %2$s möppuna. Hins vegar, núna kom villa í veg fyrir að þessari aðgerð lyki um leið og aðgangar voru samstilltir. Þú getur annað hvort látið skrárnar vera eins og þær eru og fjarlægt tengilinn í %3$s, eða fært skrárnar inn í %1$s möppuna og halda tenglinum í %4$s.\n\nStaðværar skrár eru taldar upp hér fyrir neðan, ásamt þeim fjartengdu skrám í %5$s sem þær voru tengdar við.</string>
-    <string name="sync_current_folder_was_removed">Mappan %1$s er ekki lengur til staðar</string>
+    <string name="sync_current_folder_was_removed">Mappan %1$ser ekki lengur til</string>
     <string name="foreign_files_move">Færa allt</string>
     <string name="foreign_files_success">Allar skrár voru færðar</string>
     <string name="foreign_files_fail">Ekki tókst að færa allar skrár</string>
     <string name="foreign_files_local_text">Staðvært: %1$s</string>
     <string name="foreign_files_remote_text">Fjartengt: %1$s</string>
-    <string name="upload_query_move_foreign_files">Það er ekki nægilegt pláss til að afrita völdu skrárnar í %1$s möppuna. Vilt þú kannski færa þær í staðinn? </string>
     <string name="pass_code_enter_pass_code">Settu inn lykilkóðann þinn</string>
     
     <string name="pass_code_configure_your_pass_code">Settu inn lykilkóða</string>
@@ -229,15 +226,13 @@
     <string name="media_event_done">%1$s afspilun lokið</string>
     <string name="media_err_nothing_to_play">Engin margmiðlunarskrá fannst</string>
     <string name="media_err_no_account">Enginn notandaaðgangur uppgefinn</string>
-    <string name="media_err_not_in_owncloud">Skrá er ekki á gildum aðgangi</string>
     <string name="media_err_unsupported">Óstudd margmiðlunarlyklun (codec)</string>
-    <string name="media_err_io">Ekki tókst að lesa margmiðlunarskrá</string>
-    <string name="media_err_malformed">Margmiðlunarskrá er ekki rétt kóðuð</string>
-    <string name="media_err_timeout">Féll á tíma við að reyna að spila</string>
+    <string name="media_err_io">Gat ekki lesið margmiðlunarskrána</string>
+    <string name="media_err_malformed">Margmiðlunarskráin er með ranga kóðun</string>
+    <string name="media_err_timeout">Tilraun til að spila skrá rann út á tíma</string>
     <string name="media_err_invalid_progressive_playback">Ekki tókst að streyma margmiðlunarskrá</string>
-    <string name="media_err_unknown">Ekki tókst að spila skrána í meðfylgjandi margmiðlunarspilara</string>
-    <string name="media_err_security_ex">Öryggisvilla kom upp við að reyna að spila  %1$s</string>
-    <string name="media_err_io_ex">Inntaksvilla kom upp við að reyna að spila  %1$s</string>
+    <string name="media_err_security_ex">Öryggissvilla kom upp við að reyna að spila  %1$s</string>
+    <string name="media_err_io_ex">Óvænt villa kom upp við að reyna að spila  %1$s</string>
     <string name="media_err_unexpected">Óvænt villa kom upp við að reyna að spila  %1$s</string>
     <string name="media_rewind_description">Spóla-til-baka hnappur</string>
     <string name="media_play_pause_description">Afspilun-eða-hlé hnappur</string>
@@ -250,31 +245,30 @@
 	<string name="auth_connection_established">Tengingu komið á</string>
 	<string name="auth_testing_connection">Prófa tengingu</string>
 	<string name="auth_not_configured_title">Gölluð uppsetning þjóns</string>
-	<string name="auth_account_not_new">Aðgangur fyrir sama notanda og sama þjón er þegar fyrir hendi á tækinu</string>
 	<string name="auth_account_not_the_same">Notandanafnið sem sett var inn samsvarar ekki notanda þessa aðgangs</string>
 	<string name="auth_unknown_error_title">Óþekkt villa kom upp!</string>
-	<string name="auth_unknown_host_title">Fann ekki hýsilvél</string>
-	<string name="auth_incorrect_path_title">Tilvik þjóns fannst ekki</string>
+	<string name="auth_unknown_host_title">Gat ekki fundið hýsilvél</string>
+	<string name="auth_incorrect_path_title">Þjónn finnst ekki</string>
 	<string name="auth_timeout_title">Þjónninn var of lengi að svara</string>
 	<string name="auth_incorrect_address_title">Rangt snið á vistfangi þjóns</string>
 	<string name="auth_ssl_general_error_title">Mistókst að frumstilla SSL</string>
-	<string name="auth_ssl_unverified_server_title">Gat ekki sannreynt auðkenni SSL-þjóns</string>
+	<string name="auth_ssl_unverified_server_title">Gate ekki sannreynt auðkenni SSL-þjónsins</string>
 	<string name="auth_bad_oc_version_title">Óþekkjanleg útgáfa af þjóni</string>
 	<string name="auth_wrong_connection_title">Gat ekki komið á tengingu</string>
 	<string name="auth_secure_connection">Öruggri tengingu komið á</string>
 	<string name="auth_unauthorized">Rangt notandanafn eða lykilorð</string>
 	<string name="auth_oauth_error">Auðkenning mistókst</string>
 	<string name="auth_oauth_error_access_denied">Aðgangi hafnað af auðkenningarþjóni</string>
-	<string name="auth_wtf_reenter_URL">Óvænt staða, settu aftur inn vistfang þjónsins</string>
+	<string name="auth_wtf_reenter_URL">Óvænt ástand, settu aftur inn vistfang þjónsins</string>
 	<string name="auth_expired_oauth_token_toast">Heimild þín er útrunnin. Skráðu þig aftur inn.</string>
 	<string name="auth_expired_basic_auth_toast">Settu inn núgildandi lykilorð</string>
 	<string name="auth_expired_saml_sso_token_toast">Setan þín er útrunnin. Skráðu þig aftur inn.</string>
 	<string name="auth_connecting_auth_server">Tengist við auðkenningarþjón …</string>
 	<string name="auth_unsupported_auth_method">Þjónninn styður ekki þessa auðkenningaraðferð</string>
 	<string name="auth_unsupported_multiaccount">%1$s styður ekki fjölaðganga</string>
-	<string name="auth_fail_get_user_name">Þjónninn skilar ekki réttu notandaauðkenni, hafðu samband við kerfisstjóra </string>
 	<string name="auth_can_not_auth_against_server">Get ekki auðkennt á þessum þjóni</string>
-    <string name="auth_account_does_not_exist">Aðgangur er ekki ennþá fyrir hendi á tækinu</string>
+    <string name="auth_account_does_not_exist">Aðgangur er ekki ennþá til á tækinu</string>
+
 
     <string name="favorite">Stilla sem tiltækt án nettengingar</string>
     <string name="unfavorite">Afstilla sem tiltækt án nettengingar</string>
@@ -283,28 +277,27 @@
     <string name="common_rename">Endurnefna</string>
     <string name="common_remove">Fjarlægja</string>
     <string name="confirmation_remove_file_alert">Ertu viss um að þú viljir fjarlægja %1$s?</string>
-    <string name="confirmation_remove_folder_alert">Ertu viss um að þú viljir fjarlægja %1$s og innihald þess?</string>
+    <string name="confirmation_remove_folder_alert">Ertu viss um að þú viljir fjarlægja %1$s og innihald þessa?</string>
     <string name="confirmation_remove_local">Einungis staðvært</string>
-    <string name="remove_success_msg">Fjarlæging tókst</string>
+    <string name="remove_success_msg">Fjarlægt</string>
     <string name="remove_fail_msg">Fjarlæging mistókst</string>
     <string name="rename_dialog_title">Settu inn nýtt nafn</string>
-    <string name="rename_local_fail_msg">Ekki var hægt að endurnefna staðvært afrit; prófaðu annað nafn</string>
-    <string name="rename_server_fail_msg">Ekki var hægt að ljúka endurnefningu</string>
-    <string name="sync_file_fail_msg">Ekki var hægt að athuga fjartengda skrá</string>
+    <string name="rename_server_fail_msg">Gat ekki gefið þjóni nýtt nafn</string>
+    <string name="sync_file_fail_msg">Gat ekki athugað fjartengda skrá</string>
     <string name="sync_file_nothing_to_do_msg">Efni skrár er þegar samstillt</string>
-    <string name="create_dir_fail_msg">Tókst ekki að búa til möppu</string>
+    <string name="create_dir_fail_msg">Gat ekki búið til möppu</string>
     <string name="filename_forbidden_characters">Óleyfilegir stafir: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Skráarheitið inniheldur að minnsta kosti einn ógildan staf</string>
     <string name="filename_empty">Skráarheiti má ekki vera tómt</string>
-    <string name="wait_a_moment">Bíddu aðeins</string>
+    <string name="wait_a_moment">Bíddu augnablik…</string>
     <string name="wait_checking_credentials">Athuga geymd auðkenni</string>
     <string name="filedisplay_unexpected_bad_get_content">Óvænt vandamál, veldu skrána úr öðru forriti</string>
-    <string name="filedisplay_no_file_selected">Engin skrá var valin</string>
+    <string name="filedisplay_no_file_selected">Engin skrá valin</string>
     <string name="activity_chooser_title">Senda tengil til &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Afrita skrá úr einkageymslu</string>
     
     <string name="oauth_check_onoff">Skrá inn með oAuth2</string> 
-    <string name="oauth_login_connection">Tengist við oAuth2-þjón…</string>    
+    <string name="oauth_login_connection">Tengist við OAuth-auðkenningarþjón …</string>    
         
     <string name="ssl_validator_header">Ekki var hægt að sannreyna auðkenni vefsvæðisins</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Skilríki þjónsins er ekki treyst</string>
@@ -312,7 +305,7 @@
     <string name="ssl_validator_reason_cert_not_yet_valid">- Skilríki þjónsins er með gildistíma í framtíðinni</string>
     <string name="ssl_validator_reason_hostname_not_verified">- Slóðin samsvarar ekki vélarheitinu í skilríkinu</string>
     <string name="ssl_validator_question">Viltu samt treysta þessu skilríki?</string>
-    <string name="ssl_validator_not_saved">Ekki var hægt að vista þetta skilríki</string>
+    <string name="ssl_validator_not_saved">Gat ekki vistað skilríki</string>
     <string name="ssl_validator_btn_details_see">Nánar</string>
     <string name="ssl_validator_btn_details_hide">Fela</string>
     <string name="ssl_validator_label_subject">Gefið út fyrir:</string>
@@ -336,26 +329,26 @@
 
     <string name="placeholder_sentence">Þetta er frátökutákn</string>
     <string name="placeholder_filename">frátökutákn.txt</string>
-    <string name="placeholder_filetype">PNG mynd</string>
+    <string name="placeholder_filetype">PNG-mynd</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 EH</string>
     <string name="placeholder_media_time">12:23:45</string>
 
-    <string name="auto_upload_on_wifi">Einungis senda inn um þráðlaus net</string>
-    <string name="instant_upload_on_wifi">Senda inn myndir einungis um þráðlaus net</string>
-    <string name="instant_video_upload_on_wifi">Senda inn myndskeið einungis um þráðlaus net</string>
+    <string name="auto_upload_on_wifi">Aðeins senda inn á þráðlausu WiFi-neti</string>
+    <string name="instant_upload_on_wifi">Aðeins senda inn myndir á þráðlausu WiFi-neti</string>
+    <string name="instant_video_upload_on_wifi">Aðeins senda inn myndskeið á þráðlausu WiFi-neti</string>
     <string name="instant_video_upload_on_charging">Einungis senda inn þegar verið er að hlaða</string>
     <string name="instant_upload_on_charging">Einungis senda inn þegar verið er að hlaða</string>
     <string name="instant_upload_path">/BeinInnsending</string>
     <string name="conflict_title">Árekstur skráa</string>
-    <string name="conflict_message">Ef þú velur báðar útgáfur, þá mun verða bætt tölustaf aftan við heiti skrárinnar á tölvunni.</string>
+    <string name="conflict_message">Hvaða skrám viltu halda? Ef þú velur báðar útgáfur, þá mun verða bætt tölustaf aftan við heiti afrituðu skrárinnar.</string>
     <string name="conflict_keep_both">Halda báðum</string>
     <string name="conflict_use_local_version">útgáfu á tölvu</string>
     <string name="conflict_use_server_version">útgáfu á þjóni</string>
 
-    <string name="preview_sorry">Leiðinlegt þetta!</string>
+    <string name="preview_sorry">Því miður.</string>
     <string name="preview_image_description">Forskoðun myndar</string>
-    <string name="preview_image_error_unknown_format">Ekki er hægt að birta myndina</string>
+    <string name="preview_image_error_unknown_format">Get ekki birt mynd</string>
 
     <string name="error__upload__local_file_not_copied">%1$s var ekki hægt að afrita í staðværu %2$s möppuna</string>
     <string name="prefs_instant_upload_path_title">Mappa fyrir beinar innsendingar</string>
@@ -364,7 +357,7 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">Nota undirmöppur</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Geyma í undirmöppum byggðum á ári og mánuðum</string>
 
-	<string name="share_link_no_support_share_api">Því miður, deiling gagna er ekki virk á þjóninum. Hafðu samband við kerfisstjóra.</string>
+	<string name="share_link_no_support_share_api">Deiling er ekki virk á þjóninum þínum. Hafðu samband við kerfisstjóra.</string>
 	<string name="share_link_file_no_exist">Get ekki deilt. Athugaðu hvort skráin sé til</string>
 	<string name="share_link_file_error">Villa kom upp við að reyna að deila þessari skrá eða möppu</string>
 	<string name="unshare_link_file_no_exist">Get ekki hætt deilingu. Athugaðu hvort skráin sé til</string>
@@ -382,52 +375,37 @@
     <string name="clipboard_uxexpected_error">Óvænt villa kom upp við afritun á klippispjald</string>
     <string name="clipboard_label">Texti afritaður úr %1$s</string>
 
-    <string name="error_cant_bind_to_operations_service">Alvarleg villa: get ekki framkvæmt aðgerðir</string>
+    <string name="error_cant_bind_to_operations_service">Alvarleg villa: Ekki hægt að framkvæma aðgerðir</string>
 
-    <string name="network_error_socket_exception">Villa kom upp við að tengjast við þjóninn.</string>
-    <string name="network_error_socket_timeout_exception">Villa kom upp á meðan beðið var eftir þjóninum; ekki var hægt að ljúka aðgerðinni</string>
-    <string name="network_error_connect_timeout_exception">Villa kom upp á meðan beðið var eftir þjóninum; ekki var hægt að ljúka aðgerðinni</string>
-    <string name="network_host_not_available">Ekki var hægt að ljúka aðgerðinni; þjónninn er ekki tiltækur</string>
+    <string name="network_error_socket_exception">Villa kom upp við að tengjast þjóninum.</string>
+    <string name="network_error_socket_timeout_exception">Villa kom upp á meðan beðið var eftir þjóninum. Ekki var hægt að ljúka aðgerðinni</string>
+    <string name="network_error_connect_timeout_exception">Villa kom upp á meðan beðið var eftir þjóninum. Ekki var hægt að ljúka aðgerðinni</string>
     <string name="forbidden_permissions">Þú hefur ekki heimild %s</string>
     <string name="forbidden_permissions_rename">til að endurnefna þessa skrá</string>
     <string name="forbidden_permissions_delete">til að eyða þessari skrá</string>
     <string name="share_link_forbidden_permissions">til að deila þessari skrá</string>
     <string name="unshare_link_forbidden_permissions">til að hætta deilingu á þessari skrá</string>
     <string name="update_link_forbidden_permissions">til að uppfæra þessa sameign</string>
-    <string name="forbidden_permissions_create">til að búa til skrána</string>
+    <string name="forbidden_permissions_create">til að búa til þessa skrá</string>
     <string name="uploader_upload_forbidden_permissions">til að senda inn í þessa möppu</string>
     <string name="downloader_download_file_not_found">Skráin er ekki lengur tiltæk á þjóninum</string>
 
     <string name="file_migration_dialog_title">Uppfæri slóð á gagnageymslu</string>
     <string name="file_migration_finish_button">Ljúka</string>
-    <string name="file_migration_preparing">Undirbý yfirfærslu&#8230;</string>
     <string name="file_migration_checking_destination">Athuga áfangastað&#8230;</string>
-    <string name="file_migration_saving_accounts_configuration">Vista aðgangsuppsetningar&#8230;</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Bíð eftir óloknum samstillingum&#8230;</string>
     <string name="file_migration_migrating">Færi gögn&#8230;</string>
     <string name="file_migration_updating_index">Uppfæri atriðaskrá&#8230;</string>
     <string name="file_migration_cleaning">Hreinsa&#8230;</string>
-    <string name="file_migration_restoring_accounts_configuration">Endurheimti aðgangsuppsetningar&#8230;</string>
     <string name="file_migration_ok_finished">Lokið</string>
-    <string name="file_migration_failed_not_enough_space">VILLA: Ekki nægilegt pláss</string>
-    <string name="file_migration_failed_not_writable">VILLA: Skráin er ekki skrifanleg</string>
-    <string name="file_migration_failed_not_readable">VILLA: Skráin er ekki lesanleg</string>
     <string name="file_migration_failed_dir_already_exists">VILLA: Nextcloud-mappa er þegar til staðar</string>
-    <string name="file_migration_failed_while_coping">VILLA: við yfirfærslu</string>
-    <string name="file_migration_failed_while_updating_index">VILLA: við að uppfæra atriðaskrá</string>
-
-    <string name="file_migration_directory_already_exists">Gagnamappan er þegar til, hvað skal gera?</string>
-    <string name="file_migration_override_data_folder">Taka yfir</string>
-    <string name="file_migration_use_data_folder">Nota fyrirliggjandi</string>
+    <string name="file_migration_override_data_folder">Skipta út</string>
+    <string name="file_migration_use_data_folder">Nota</string>
 
     <string name="prefs_category_accounts">Notandaaðgangar</string>
     <string name="prefs_add_account">Bæta við notandaaðgangi</string>
     <string name="drawer_manage_accounts">Sýsla með notandaaðganga</string>
-    <string name="auth_redirect_non_secure_connection_title">Öruggri tengingu er endurbeint í gegnum óörugga leið.</string>
-
-	<string name="actionbar_logger">Annálar</string>
+    <string name="actionbar_logger">Annálar</string>
 	<string name="log_send_history_button">Ferill sendinga</string>
-	<string name="log_send_no_mail_app">Ekkert forrit fannst til að senda annála. Settu upp eitthvað tölvupóstforrit.</string>
 	<string name="log_send_mail_subject">%1$s annálar Android-forrita</string>
 	<string name="log_progress_dialog_text">Hleð inn gögnum &#8230;</string>
 
@@ -435,19 +413,18 @@
 	<string name="saml_authentication_wrong_pass">Rangt lykilorð</string>
 	<string name="actionbar_move">Færa</string>
     <string name="actionbar_copy">Afrita</string>
-	<string name="file_list_empty_moving">Ekkert hér. Þú getur bætt við möppu!</string>
+	<string name="file_list_empty_moving">Ekkert hér. Þú getur bætt við möppu.</string>
 	<string name="folder_picker_choose_button_text">Veldu</string>
 
-    <string name="move_file_not_found">Get ekki fært. Athugaðu hvort skráin sé til</string>
-    <string name="move_file_invalid_into_descendent">Ekki er hægt að færa möppu inn í undirmöppu sína</string>
-    <string name="move_file_invalid_overwrite">Skráin er þegar til í úttaksmöppunni</string>
+    <string name="move_file_invalid_into_descendent">Ekki er hægt að færa möppu inn í eina af undirmöppum sínum</string>
+    <string name="move_file_invalid_overwrite">Skráin er þegar til í móttökumöppunni</string>
     <string name="move_file_error">Villa kom upp við að reyna að færa þessa skrá eða möppu</string>
     <string name="forbidden_permissions_move">til að færa þessa skrá</string>
 
 
     <string name="copy_file_not_found">Get ekki afritað. Athugaðu hvort skráin sé til</string>
-    <string name="copy_file_invalid_into_descendent">Ekki er hægt að afrita möppu inn í undirmöppu sína</string>
-    <string name="copy_file_invalid_overwrite">Skráin er þegar til í úttaksmöppunni</string>
+    <string name="copy_file_invalid_into_descendent">Ekki er hægt að afrita möppu inn í eina af undirmöppum sínum</string>
+    <string name="copy_file_invalid_overwrite">Skráin er þegar til í móttökumöppunni</string>
     <string name="copy_file_error">Villa kom upp við að reyna að afrita þessa skrá eða möppu</string>
     <string name="forbidden_permissions_copy">til að afrita þessa skrá</string>
 
@@ -512,7 +489,6 @@
     <string name="share_email_clarification">%1$s (tölvupóstur)</string>
     <string name="share_known_remote_clarification">%1$s ( á %2$s )</string>
 
-    <string name="share_sharee_unavailable">Því miður, deiling gagna með notendum innan forrita er ekki leyfð í þessari útgáfu þjónsins. \nHafðu samband við kerfisstjóra</string>
     <string name="share_privilege_can_share">getur deilt</string>
     <string name="share_privilege_can_edit">getur breytt</string>
     <string name="share_privilege_can_edit_create">búið til</string>
@@ -521,50 +497,46 @@
     <string name="edit_share_unshare">Hætta deilingu</string>
     <string name="edit_share_done">lokið</string>
 
-    <string name="action_retry_uploads">Mistókst að reyna aftur</string>
+    <string name="action_retry_uploads">Ný tilraun mistókst</string>
     <string name="action_clear_failed_uploads">Hreinsun mistókst</string>
-    <string name="action_clear_successful_uploads">Hreinsun tókst</string>
-    <string name="action_clear_finished_uploads">Hreinsa allt klárað</string>
+    <string name="action_clear_successful_uploads">Hreinsað</string>
+    <string name="action_clear_finished_uploads">Hreinsa innsendingar sem er lokið</string>
 
     <string name="action_switch_grid_view">Reitir</string>
     <string name="action_switch_list_view">Listi</string>
 
     <string name="manage_space_title">Sýsla með geymslurými</string>
-    <string name="manage_space_description">Stillingar, gagnagrunnur og skilríki þjóna úr gögnum %1$s verður eytt endanlega. \n\nSóttar skrár verða skildar eftir ósnertar.\n\nÞetta ferli getur tekið drjúgan tíma.</string>
     <string name="manage_space_clear_data">Hreinsa gögn</string>
     <string name="manage_space_error">Ekki tókst að eyða öllum skrám.</string>
 
-    <string name="permission_storage_access">Aukinna heimilda er krafist til að geta sent inn og sótt skrár.</string>
-    <string name="local_file_not_found_toast">Skráin fannst ekki á staðværu skráakerfi</string>
+    <string name="permission_storage_access">Krafist er viðbótarheimilda til að senda inn og sækja skrár.</string>
+    <string name="local_file_not_found_toast">Skrá fannst ekki á staðværu skráakerfi</string>
     <string name="confirmation_remove_files_alert">Ertu viss um að þú viljir fjarlægja valin atriði?</string>
     <string name="confirmation_remove_folders_alert">Ertu viss um að þú viljir fjarlægja valin atriði og innihald þeirra?</string>
-    <string name="uploads_view_upload_status_waiting_for_charging">Bíð eftir að tækið hlaðist</string>
+    <string name="maintenance_mode">Þjónn í viðhaldsham</string>
+
+    <string name="uploads_view_upload_status_waiting_for_charging">Bíð eftir hleðslu</string>
     <string name="actionbar_search">Leita</string>
     <string name="files_drop_not_supported">Þetta er Nextcloud-eiginleiki, endilega uppfærðu.</string>
     <string name="learn_more">Læra meira</string>
     <string name="drawer_folder_sync">Sjálfvirk innsending</string>
     <string name="drawer_participate">Taka þátt</string>
-    <string name="participate_testing_headline">Hjálpaðu okkur við prófanir</string>
-    <string name="participate_testing_bug_text">Fannstu villu? Eitthvað er skrýtið?</string>
+    <string name="participate_testing_headline">Hjálpaðu til við prófanir</string>
+    <string name="participate_testing_bug_text">Fannstu villu? Skringilegheit?</string>
     <string name="participate_testing_report_text">Tilkynna um vandamál á Github</string>
-    <string name="participate_testing_version_text">Hefurðu áhuga á að hjálpa okkur með næstu útgáfu?</string>
+    <string name="participate_testing_version_text">Hefurðu áhuga á að hjálpa til við að prófa næstu útgáfu?</string>
     <string name="participate_beta_headline">Prófaðu þróunarútgáfuna</string>
-    <string name="participate_beta_text">Þetta innifelur alla nýjust eiginleika og er alveg á jaðri framþróunarinnar. Villur og hnökrar geta komið upp, og ef slíkt gerist skaltu endilega tilkynna um þær til okkar.</string>
+    <string name="participate_beta_text">Þetta innigeldur alla væntanlega eiginleika og er alveg á jaðrinum hvað varðar stöðugleika, Villur geta komið upp, og ef slíkt gerist, endilega tilkynntu um þær.</string>
     <string name="participate_release_candidate_headline">Forútgáfa</string>
-    <string name="participate_release_candidate_text">Útgáfukandídatinn (release candidate = RC) er skyndiútgáfa af væntanlegri útgáfu og er ætlað að vera nokkuð stöðug. Þú getur hjálpað til við að tryggja stöðugleikann með því að prófa þína eigin uppsetningu. Skráðu þig í prófanir í Play Store eða handvirkt með því að fara í \"útgáfur\"-hlutann í F-Droid.</string>
+    <string name="participate_release_candidate_text">Útgáfukandídat (RC) er stöðutaka á væntanlegri útgáfu og er vænst til að hún sé nokkuð stöðug. Með prófun á uppsetningunni þinni værirðu að hjálpa til við að tryggja þann stöðugleika. Skráðu þig til prófana í Play-safninu eða skoðaðu handvirkt í \"útgáfur\" hlutanum á F-Droid.</string>
     <string name="participate_contribute_headline">Vertu virkur þáttakandi</string>
-    <string name="participate_contribute_irc_text">Taktu þátt í spjalli á IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Hjálpaðu öðrum á &lt;a href=\"%1$s\">spjallvefnum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Þýða&lt;/a> forritið</string>
-    <string name="participate_contribute_github_text">Leggðu þitt af mörkum sem forritari, skoðaðu &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> fyrir nánari upplýsingar</string>
     <string name="move_to">Færa í&#8230;</string>
     <string name="copy_to">Afrita í&#8230;</string>
     <string name="choose_remote_folder">Veldu möppu&#8230;</string>
     <string name="folder_sync_loading_folders">Hleð inn möppum&#8230;</string>
     <string name="folder_sync_no_results">Engar margmiðlunarmöppur fundust</string>
-    <string name="folder_sync_preferences">Kjörstillingar fyrir sjálfvirka innsendingu</string>
+    <string name="folder_sync_preferences">Kjörstillingar fyrir sjálfvirkar innsendingar</string>
     <string name="folder_sync_settings">Stillingar</string>
-    <string name="folder_sync_new_info">Beinar innsendingar hafa verið algerlega endurhannaðar. Skoðaðu aðalvalmyndina og endurstilltu sjálfvirku innsendingarnar þínar. Við biðjumst samt velvirðingar á þessum óþægindum.\n\nNjóttu hinna nýju og öflugu innsendingareiginleika!</string>
     <string name="folder_sync_preferences_folder_path">Fyrir %1$s</string>
     <plurals name="items_selected_count">
         <item quantity="one">%d valið</item>
@@ -578,7 +550,6 @@
     <string name="notifications_no_results_headline">Engar tilkynningar</string>
     <string name="notifications_no_results_message">Athugaðu aftur síðar.</string>
 
-    <string name="upload_file_dialog_title">Settu inn skráaheiti og skráagerð fyrir innsendingu</string>
     <string name="upload_file_dialog_filename">Skráarheiti</string>
     <string name="upload_file_dialog_filetype">Skráartegund</string>
     <string name="upload_file_dialog_filetype_snippet_text">Textabútsskrá(.txt)</string>
@@ -609,7 +580,7 @@
 
     <!-- User information -->
     <string name="user_info_full_name">Fullt nafn</string>
-    <string name="user_info_email">Tölvupóstfang</string>
+    <string name="user_info_email">Tölvupóstur</string>
     <string name="user_info_phone">Símanúmer</string>
     <string name="user_info_address">Heimilisfang</string>
     <string name="user_info_website">Vefsvæði</string>
@@ -619,23 +590,23 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Engin virkni ennþá</string>
-    <string name="activities_no_results_message">Streymið mun birta atburði á borð við\nviðbætingar, breytingar og deilingar</string>
+    <string name="activities_no_results_message">Þetta streymi mun birta atburði á borð við viðbætingar, breytingar og deilingar</string>
     <string name="webview_error">Villa átti sér stað</string>
     <string name="prefs_category_about">Um hugbúnaðinn</string>
 
-    <string name="actionbar_contacts">Öryggisafrit af tengiliðum</string>
+    <string name="actionbar_contacts">Taka öryggisafrit af tengiliðum</string>
+    <string name="actionbar_contacts_restore">Endurheimta tengiliði</string>
     <string name="contacts_backup_button">Taka öryggisafrit núna</string>
     <string name="contacts_restore_button">Endurheimta síðasta öryggisafrit</string>
     <string name="contacts_header_restore">Endurheimta</string>
     <string name="contacts_header_backup">Taka öryggisafrit</string>
     <string name="contacts_automatic_backup">Öryggisafrit af tengiliðum</string>
     <string name="contacts_last_backup">Síðasta öryggisafrit</string>
-    <string name="contacts_read_permission">Nauðsynlegt er að hafa lesheimildir fyrir tengiliði</string>
-    <string name="contacts_write_permission">Nauðsynlegt er að hafa skrifheimildir fyrir tengiliði</string>
+    <string name="contacts_read_permission">Nauðsynlegt er að hafa heimild til að lesa tengiliðalista</string>
+    <string name="contacts_write_permission">Nauðsynlegt er að hafa heimild til að breyta tengiliðalista</string>
     <string name="contactlist_title">Endurheimta tengiliði</string>
     <string name="contaclist_restore_selected">Endurheimta valda tengiliði</string>
-    <string name="contactlist_account_chooser_title">Veldu notandaaðgang fyrir innflutning</string>
-    <string name="contactlist_no_permission">Engar aðgangsheimildir, ekkert flutt inn!</string>
+    <string name="contactlist_account_chooser_title">Veldu aðgang til að flytja inn</string>
     <string name="contacts_preference_choose_date">Veldu dagsetningu</string>
     <string name="contacts_preference_backup_never">aldrei</string>
     <string name="contacts_preferences_no_file_found">Engin skrá fannst</string>
@@ -644,6 +615,8 @@
 
     <!-- Notifications -->
     <string name="new_notification_received">Tók á móti nýrri tilkynningu</string>
+    <string name="drawer_logout">Útskráning</string>
+    <string name="privacy">Gagnaleynd</string>
 
 
 </resources>

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

@@ -436,9 +436,6 @@
     <string name="participate_beta_headline">開発バージョンをテスト</string>
     <string name="participate_release_candidate_headline">リリース候補</string>
     <string name="participate_contribute_headline">積極的な貢献</string>
-    <string name="participate_contribute_irc_text">IRCでチャットに参加してください: &lt;a href=\"%1$s\">#nextcloud-モバイル&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="move_to">&#8230;に移動</string>
     <string name="copy_to">&#8230;にコピー</string>
     <string name="choose_remote_folder">&#8230; フォルダーを選択</string>

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

@@ -276,6 +276,7 @@
 	<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>
@@ -542,6 +543,8 @@
     <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="maintenance_mode">Tjener i vedlikeholdsmodus</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>
@@ -557,9 +560,6 @@
     <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="move_to">Flytt til&#8230;</string>
     <string name="copy_to">Kopier til&#8230;</string>
     <string name="choose_remote_folder">Velg mappe&#8230;</string>
@@ -650,6 +650,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">Nytt varsel mottatt</string>
     <string name="drawer_logout">Utlogging</string>
+    <string name="privacy">Personvern</string>
 
 
 </resources>

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

@@ -277,6 +277,7 @@ Kies er eentje van een provider.</string>
 	<string name="auth_can_not_auth_against_server">Kan niet autenticeren tegen deze server</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>
     <string name="favorite_real">Instellen als favoriet</string>
@@ -543,6 +544,8 @@ Kies er eentje van een provider.</string>
     <string name="local_file_not_found_toast">Het bestand is niet te vinden binnen het lokale bestandssysteem.</string>
     <string name="confirmation_remove_files_alert">Wil je de geselecteerde objecten echt verwijderen?</string>
     <string name="confirmation_remove_folders_alert">Wil je de geselecteerde objecten en hun inhoud echt verwijderen?</string>
+    <string name="maintenance_mode">Server in onderhoudsmodus</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Wachten to apparaat wordt opgeladen</string>
     <string name="actionbar_search">Zoeken</string>
     <string name="files_drop_not_supported">Dit is een Nextcloud-optie, gelieve te updaten.</string>
@@ -558,10 +561,12 @@ Kies er eentje van een provider.</string>
     <string name="participate_release_candidate_headline">Release candidate</string>
     <string name="participate_release_candidate_text">De Release Candidate (RC) is een kopie van de komende release en zou stabiel moeten zijn. Testen van jouw installatie kan ons helpen om dit te bevestigen. Meld je aan om te testen op de Play Store of bekijk handmatig de \"versies\"-sectie op F-Droid.</string>
     <string name="participate_contribute_headline">Actief meedoen</string>
-    <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">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="participate_contribute_irc_text">Bezoek de IRC chat op IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a>
+</string>
+    <string name="participate_contribute_forum_text">Help anderen op het &lt;a href=\"%1$s\">forum&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">Bekijk, schrijf of pas code aan. Kijk in &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> voor meer 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>
@@ -652,6 +657,7 @@ Kies er eentje van een provider.</string>
     <!-- Notifications -->
     <string name="new_notification_received">Nieuwe meldingen ontvangen</string>
     <string name="drawer_logout">Uitloggen</string>
+    <string name="privacy">Privacy</string>
 
 
 </resources>

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

@@ -275,6 +275,7 @@
 	<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="favorite">Udostępnij w trybie offline</string>
     <string name="unfavorite">Wyłącz udostępnianie w trybie offline</string>
     <string name="favorite_real">Ustaw jako ulubione</string>
@@ -541,6 +542,8 @@
     <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>
+    <string name="maintenance_mode">Serwer w trybie konserwacji</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Oczekiwanie na ładowanie urządzenia</string>
     <string name="actionbar_search">Wyszukaj</string>
     <string name="files_drop_not_supported">Ta funkcja jest dostępna w Nextcloud, prosimy wykonać aktualizację</string>
@@ -556,10 +559,6 @@
     <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>
@@ -652,6 +651,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">Otrzymano nowe powiadomienie</string>
     <string name="drawer_logout">Wyloguj</string>
+    <string name="privacy">Prywatność</string>
 
 
 </resources>

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

@@ -276,6 +276,7 @@
 	<string name="auth_can_not_auth_against_server">Não foi possível obter autenticação neste servidor</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>
     <string name="favorite_real">Marque como favorito</string>
@@ -542,6 +543,8 @@
     <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="maintenance_mode">O servidor está em modo de manutenção</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>
@@ -557,10 +560,6 @@
     <string name="participate_release_candidate_headline">Candidato a versão</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">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>
@@ -651,6 +650,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">Nova notificação recebida</string>
     <string name="drawer_logout">Sair</string>
+    <string name="privacy">Privacidade</string>
 
 
 </resources>

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

@@ -278,6 +278,7 @@
 	<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>
@@ -458,7 +459,7 @@
     <string name="forbidden_permissions_copy">для копирования этого файла</string>
 
     <string name="prefs_category_instant_uploading">Немедленная загрузка</string>
-    <string name="prefs_category_details">Подробно</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>
@@ -529,7 +530,7 @@
 
     <string name="action_retry_uploads">Повторить неудавшиеся</string>
     <string name="action_clear_failed_uploads">Очистить неудавшиеся</string>
-    <string name="action_clear_successful_uploads">Очищено</string>
+    <string name="action_clear_successful_uploads">Очистить успешные</string>
     <string name="action_clear_finished_uploads">Очистить завершенные</string>
 
     <string name="action_switch_grid_view">Вид сеткой</string>
@@ -544,6 +545,8 @@
     <string name="local_file_not_found_toast">Файл не был найден в локальной файловой системе</string>
     <string name="confirmation_remove_files_alert">Вы действительно хотите удалить выбранные элементы?</string>
     <string name="confirmation_remove_folders_alert">Вы действительно хотите удалить выбранные элементы и их содержимое?</string>
+    <string name="maintenance_mode">Сервер находится в режиме обслуживания</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Ожидание зарядки устройства</string>
     <string name="actionbar_search">Поиск</string>
     <string name="files_drop_not_supported">Это есть в новой версии Nextcloud, пожалуйста обновитесь</string>
@@ -559,10 +562,6 @@
     <string name="participate_release_candidate_headline">Кандидат в релизы</string>
     <string name="participate_release_candidate_text">Релиз-кандидат (RC) — это текущее состояние готовящегося выпуска, и, ожидается, что он будет стабильным. Проверка с вашими индивидуальными настройками может помочь убедится в этом. Зарегистрируйтесь для тестирования в Google Play или используйте раздел «версии» в каталоге приложений 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">Копировать в&#8230;</string>
     <string name="choose_remote_folder">Выберите каталог &#8230;</string>
@@ -655,6 +654,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">Получено новое уведомление</string>
     <string name="drawer_logout">Выйти</string>
+    <string name="privacy">Конфиденциальность</string>
 
 
 </resources>

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

@@ -276,6 +276,7 @@ në 7 ditët e fundit.</string>
 	<string name="auth_can_not_auth_against_server">S’kryhet dot identifikimi me këtë server</string>
     <string name="auth_account_does_not_exist">Llogaria s\’ekziston ende te pajisja</string>
 
+
     <string name="favorite">Caktojeni si të gatshëm jo në linjë</string>
     <string name="unfavorite">Hiqeni si të gatshëm jo në linjë</string>
     <string name="favorite_real">Vendose si të preferuar</string>
@@ -557,10 +558,6 @@ në 7 ditët e fundit.</string>
     <string name="participate_release_candidate_headline">Lëshimi i kandidatit</string>
     <string name="participate_release_candidate_text">Lëshimi i kandidatit  (RC) është një fragment i lëshimit të ardhshme dhe pritet të jetë i qëndrueshëm. Testimi i setup-it tuaj individuale mund të ndihmojë për ta siguruar këtë. Regjistrohuni për testimin në Play Store ose manualisht  shikoni në seksionin \"versionet\" në F-Droid.</string>
     <string name="participate_contribute_headline">Kontribim aktiv</string>
-    <string name="participate_contribute_irc_text">Bashkohu në bisedat në IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Ndihmo të tjerët në &lt;a href="%1$s">forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Përktheni&lt;/a> aplikacionin</string>
-    <string name="participate_contribute_github_text">Kontriboni si një zhvillues, shih&lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> për detaje</string>
     <string name="move_to">Levizni tek&#8230;</string>
     <string name="copy_to">Kopjojeni tek&#8230;</string>
     <string name="choose_remote_folder">Zgjidh dosjen&#8230;</string>
@@ -651,6 +648,7 @@ në 7 ditët e fundit.</string>
     <!-- Notifications -->
     <string name="new_notification_received">Morët njoftime të reja</string>
     <string name="drawer_logout">Dilni</string>
+    <string name="privacy">Privatësi</string>
 
 
 </resources>

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

@@ -150,7 +150,7 @@
     <string name="common_error">Hata</string>
     <string name="common_loading">Yükleniyor&#8230;</string>
     <string name="common_unknown">bilinmiyor</string>
-    <string name="common_error_unknown">Bilinmeyen hata</string>
+    <string name="common_error_unknown">Bilinmeyen sorun</string>
     <string name="common_pending">Bekliyor</string>
     <string name="about_title">Hakkında</string>
     <string name="change_password">Parola değiştir</string>
@@ -173,16 +173,16 @@
     <string name="uploads_view_upload_status_succeeded">Tamamlandı</string>
     <string name="uploads_view_upload_status_cancelled">İptal Edildi</string>
     <string name="uploads_view_upload_status_paused">Duraklatıldı</string>
-    <string name="uploads_view_upload_status_failed_connection_error">Bağlantı hatası</string>
+    <string name="uploads_view_upload_status_failed_connection_error">Bağlantı sorunu</string>
     <string name="uploads_view_upload_status_failed_retry">Yükleme kısa bir süre sonra yeniden denenecek</string>
-    <string name="uploads_view_upload_status_failed_credentials_error">Kimlik bilgileri hatası</string>
-    <string name="uploads_view_upload_status_failed_folder_error">Klasör hatası</string>
-    <string name="uploads_view_upload_status_failed_file_error">Dosya hatası</string>
+    <string name="uploads_view_upload_status_failed_credentials_error">Kimlik bilgileri sorunu</string>
+    <string name="uploads_view_upload_status_failed_folder_error">Klasör sorunu</string>
+    <string name="uploads_view_upload_status_failed_file_error">Dosya sorunu</string>
     <string name="uploads_view_upload_status_failed_localfile_error">Yerel dosya bulunamadı</string>
-    <string name="uploads_view_upload_status_failed_permission_error">İzin hatası</string>
+    <string name="uploads_view_upload_status_failed_permission_error">İzin sorunu</string>
     <string name="uploads_view_upload_status_conflict">Çakışma</string>
     <string name="uploads_view_upload_status_service_interrupted">Uygulama sonlandırıldı</string>
-    <string name="uploads_view_upload_status_unknown_fail">Bilinmeyen hata</string>
+    <string name="uploads_view_upload_status_unknown_fail">Bilinmeyen sorun</string>
     <string name="uploads_view_upload_status_waiting_for_wifi">WiFi bağlantısı bekleniyor</string>
     <string name="uploads_view_later_waiting_to_upload">Yüklenmeyi bekliyor</string>
     <string name="downloader_download_in_progress_ticker">İndiriliyor&#8230;</string>
@@ -219,7 +219,7 @@
     <string name="pass_code_reenter_your_pass_code">Lütfen parolanızı yeniden yazın</string>
     <string name="pass_code_remove_your_pass_code">Parolanızı kaldırın</string>
     <string name="pass_code_mismatch">Parola ile onayı aynı değil</string>
-    <string name="pass_code_wrong">Parola hatalı</string>
+    <string name="pass_code_wrong">Parola yanlış</string>
     <string name="pass_code_removed">Parola kaldırıldı</string>
     <string name="pass_code_stored">Parola depolandı</string>
     
@@ -249,20 +249,20 @@
 	<string name="auth_nossl_plain_ok_title">Güvenli bağlantı kullanılamıyor.</string>
 	<string name="auth_connection_established">Bağlantı kuruldu</string>
 	<string name="auth_testing_connection">Bağlantı sınanıyor</string>
-	<string name="auth_not_configured_title">Sunucu ayarları hatalı</string>
+	<string name="auth_not_configured_title">Sunucu ayarları doğru değil</string>
 	<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 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_incorrect_address_title">Sunucu adresi biçimi yanlış</string>
 	<string name="auth_ssl_general_error_title">SSL başlatılamadı</string>
 	<string name="auth_ssl_unverified_server_title">SSL sunucusunun kimliği doğrulanamadı</string>
 	<string name="auth_bad_oc_version_title">Sunucu sürümü anlaşılamadı</string>
 	<string name="auth_wrong_connection_title">Bağlantı kurulamadı</string>
 	<string name="auth_secure_connection">Güvenli bağlantı kuruldu</string>
-	<string name="auth_unauthorized">Kullanıcı adı ya da parola hatalı</string>
+	<string name="auth_unauthorized">Kullanıcı adı ya da parola yanlış</string>
 	<string name="auth_oauth_error">Kimlik doğrulanamadı</string>
 	<string name="auth_oauth_error_access_denied">Kimlik doğrulama sunucusu erişime izin vermedi</string>
 	<string name="auth_wtf_reenter_URL">Beklenilmeyen durum; Lütfen sunucu adresini yeniden yazın</string>
@@ -276,6 +276,7 @@
 	<string name="auth_can_not_auth_against_server">Bu sunucuda kimlik doğrulanamadı</string>
     <string name="auth_account_does_not_exist">Aygıt üzerinde henüz bu hesap açılmamış</string>
 
+
     <string name="favorite">Çevrimdışı kullanılabilir olarak işaretle</string>
     <string name="unfavorite">Çevrimdışı kullanılabilir işaretini kaldır</string>
     <string name="favorite_real">Sık Kullanılanlara Ekle</string>
@@ -436,7 +437,7 @@
 	<string name="log_progress_dialog_text">Veri yükleniyor&#8230;</string>
 
 	<string name="saml_authentication_required_text">Kimlik doğrulaması gerekli</string>
-	<string name="saml_authentication_wrong_pass">Parola hatalı</string>
+	<string name="saml_authentication_wrong_pass">Parola yanlış</string>
 	<string name="actionbar_move">Taşı</string>
     <string name="actionbar_copy">Kopyala</string>
 	<string name="file_list_empty_moving">Burada bir şey yok. Bir klasör ekleyebilirsiniz!</string>
@@ -542,6 +543,8 @@
     <string name="local_file_not_found_toast">Dosya yerel dosya sisteminde bulunamadı</string>
     <string name="confirmation_remove_files_alert">Seçilen ögeleri gerçekten silmek istiyor musunuz?</string>
     <string name="confirmation_remove_folders_alert">Seçilen ögeleri ve içeriklerini gerçekten silmek istiyor musunuz?</string>
+    <string name="maintenance_mode">Sunucu bakım kipinde</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Aygıtın şarj olması bekleniyor</string>
     <string name="actionbar_search">Arama</string>
     <string name="files_drop_not_supported">Bu bir Nextcloud özelliğidir, lütfen güncelleyin.</string>
@@ -553,14 +556,14 @@
     <string name="participate_testing_report_text">Github üzerinden bir sorun bildirin</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_beta_text">Bu sürümde tüm yeni özellikler bulunur ve çok taze olduğundan eksikleri 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ü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.md&lt;/a> sayfasına bakın</string>
+    <string name="participate_contribute_forum_text">&lt;a href=\"%1$s\">Forumda&lt;/a> diğer kullanıcılara 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">Kodu gözden geçirin ve katkıda bulunun. Ayrıntılar için &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> dosyası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>
@@ -651,6 +654,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">Yeni bir bildirim var</string>
     <string name="drawer_logout">Oturumu Kapat</string>
+    <string name="privacy">Gizlilik</string>
 
 
 </resources>

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

@@ -64,7 +64,10 @@
     <string name="prefs_recommend">推荐给朋友</string>
     <string name="prefs_feedback">反馈</string>
     <string name="prefs_imprint">版本说明</string>
-    <string name="recommend_subject">在您的智能手机上试用 %1$s！</string>
+    <string name="prefs_remember_last_share_location">记住本地共享</string>
+    <string name="prefs_remember_last_upload_location_summary">记住最近的本地共享</string>
+
+	<string name="recommend_subject">在您的智能手机上试用 %1$s！</string>
 	<string name="recommend_text">我想邀请你在智能机上使用%1$s。
 从这里下载：%2$s</string>
 
@@ -96,6 +99,7 @@
     <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>
@@ -114,7 +118,14 @@
     <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>
@@ -126,11 +137,14 @@
     <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>
@@ -150,8 +164,10 @@
     <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>
@@ -168,27 +184,36 @@
     <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">等待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_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_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>
@@ -206,7 +231,16 @@
     <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>
@@ -218,21 +252,33 @@
 	<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>
@@ -240,24 +286,36 @@
     <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">连接到OAuth 2服务器...</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>
@@ -281,17 +339,27 @@
 
     <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">仅在Wi-Fi下上传</string>
+    <string name="instant_upload_on_wifi">仅在Wi-Fi下上传图片</string>
+    <string name="instant_video_upload_on_wifi">仅在Wi-Fi下上传视频</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>
@@ -299,6 +367,7 @@
     <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>
@@ -312,29 +381,60 @@
 
     <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">准备迁移1&#8230;</string>
     <string name="file_migration_checking_destination">检查目的地&#8230;</string>
+    <string name="file_migration_saving_accounts_configuration">保存帐户配置1&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">等待所有同步完成1&#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">恢复帐户配置1&#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_source_not_readable_title">源目录不可读！</string>
+    <string name="file_migration_source_not_readable">您还想将存储路径更改为%1$s？\ n \ note：所有数据都必须重新下载。</string>
+
     <string name="prefs_category_accounts">账号</string>
     <string name="prefs_add_account">添加账号</string>
     <string name="drawer_manage_accounts">管理账号</string>
-    <string name="actionbar_logger">日志</string>
+    <string name="auth_redirect_non_secure_connection_title">安全连接通过不安全的路由重定向。</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>
 
@@ -342,20 +442,27 @@
 	<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="sync_folder_failed_content"> %1$s同步未完成。</string>
+	<string name="prefs_instant_video_upload_path_title">用于即时上传的视频文件夹</string>
+    <string name="sync_folder_failed_content"> %1$s同步未完成。</string>
 
 	<string name="shared_subject_header">已共享</string>
 	<string name="with_you_subject_header">与你</string>
@@ -396,6 +503,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_title">安全</string>
     <string name="share_via_link_edit_permission_label">允许编辑</string>
     <string name="share_via_link_hide_file_listing_permission_label">隐藏文件列表</string>
@@ -411,6 +519,7 @@
     <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>
@@ -419,34 +528,48 @@
     <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="maintenance_mode">服务器处于维护模式</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">发行候选版本</string>
+    <string name="participate_release_candidate_text">发布候选人（RC）是即将发布的快照，预计将稳定。 测试您的个人设置可以帮助确保这一点。 注册在Play商店进行测试，或手动查看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="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>
@@ -459,6 +582,7 @@
     <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>
@@ -474,6 +598,8 @@
 
     <!-- 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>
 
@@ -487,6 +613,7 @@
 
     <!-- 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>
@@ -496,22 +623,35 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">暂无动态</string>
+    <string name="activities_no_results_message">此流将显示\ n添加，更改和共享等事件</string>
     <string name="webview_error">发生错误</string>
     <string name="prefs_category_about">关于</string>
 
+    <string name="actionbar_contacts">备份联系人</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="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>
+    <string name="contacts_preferences_something_strange_happened">找不到最后的备份</string>
     <string name="contacts_preferences_backup_scheduled">备份已经排期，稍后将开始</string>
     <string name="contacts_preferences_import_scheduled">导入已经排期，稍后将开始</string>
 
     <!-- Notifications -->
     <string name="new_notification_received">收到新提示</string>
-    </resources>
+    <string name="drawer_logout">退出</string>
+    <string name="privacy">隐私</string>
+
+
+</resources>

src/main/res/values/setup.xml

@@ -36,15 +36,15 @@
     <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>
-    <bool name="show_drawer_logout">false</bool>
 
     <!-- Contacts backup -->
     <bool name="contacts_backup">true</bool>
     <string name="contacts_backup_folder">/.Contacts-Backup</string>
     <integer name="contacts_backup_expire">-1</integer>
 
+    <!-- What's new -->
+    <bool name="show_whats_new">true</bool>
     <!-- To fill if you want to show webviews instead of regular welcome views -->
     <array name="whatsnew_urls"></array>
 
@@ -84,6 +84,7 @@
     <bool name="recently_modified_enabled">false</bool>
     <bool name="shared_enabled">true</bool>
     <bool name="videos_enabled">false</bool>
+    <bool name="show_drawer_logout">false</bool>
 
     <!-- Bottom toolbar -->
     <bool name="bottom_toolbar_enabled">false</bool>
@@ -92,11 +93,13 @@
     <bool name="fingerprint_enabled">true</bool>
     <bool name="davdroid_integration_enabled">true</bool>
     <bool name="help_enabled">true</bool>
+    <string name="url_help">https://help.nextcloud.com/c/feature</string>
+    <bool name="privacy_enabled">true</bool>
+    <string name="privacy_url">https://nextcloud.com/privacy</string>
     <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>

src/main/res/values/strings.xml

@@ -277,6 +277,7 @@
 	<string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
     <string name="auth_account_does_not_exist">Account does not exist on the device yet</string>
 
+
     <string name="favorite">Set as available offline</string>
     <string name="unfavorite">Unset as available offline</string>
     <string name="favorite_real">Set as favorite</string>
@@ -482,6 +483,9 @@
     <string name="file_list__footer__files">%1$d files</string>
     <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
     <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
+    <string name="set_picture_as">Set picture as</string>
+    <string name="set_as">Set As</string>
+
     <string name="prefs_instant_behaviour_dialogTitle">Original file will be&#8230;</string>
     <string name="prefs_instant_behaviour_title">Original file will be&#8230;</string>
     <string name="upload_copy_files">Copy file</string>
@@ -543,6 +547,8 @@
     <string name="local_file_not_found_toast">File not found in local file system</string>
     <string name="confirmation_remove_files_alert">Do you really want to remove the selected items?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to remove the selected items and their contents?</string>
+    <string name="maintenance_mode">Server in maintenance mode</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
     <string name="actionbar_search">Search</string>
     <string name="files_drop_not_supported">This is a Nextcloud feature, please update.</string>
@@ -558,10 +564,10 @@
     <string name="participate_release_candidate_headline">Release candidate</string>
     <string name="participate_release_candidate_text">The release candidate (RC) is a snapshot of the upcoming release and is expected to be stable. Testing your individual setup could help ensure this. Sign up for testing on the Play store or manually look in the \"versions\" section on F-Droid.</string>
     <string name="participate_contribute_headline">Actively Contribute</string>
-    <string name="participate_contribute_irc_text">Join the chat on IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Help others on the &lt;a href="%1$s">forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">Translate&lt;/a> the app</string>
-    <string name="participate_contribute_github_text">Review, amend and write code, see &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a> for details</string>
+    <string name="participate_contribute_irc_text">Join the chat on IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
+    <string name="participate_contribute_forum_text">Help others on the &lt;a href=\"%1$s\">forum&lt;/a></string>
+    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Translate&lt;/a> the app</string>
+    <string name="participate_contribute_github_text">Review, amend and write code, see &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> for details</string>
     <string name="move_to">Move to&#8230;</string>
     <string name="copy_to">Copy to&#8230;</string>
     <string name="choose_remote_folder">Choose folder&#8230;</string>
@@ -659,6 +665,6 @@
     <!-- Notifications -->
     <string name="new_notification_received">New notification received</string>
     <string name="drawer_logout">Logout</string>
-
-
+    <string name="picture_set_as_no_app">No app found to set a picture with!</string>
+    <string name="privacy">Privacy</string>
 </resources>

src/main/res/xml/exposed_filepaths.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
+    <files-path
+        path="log/"
+        name="log"/>
     <external-path name="external_files" path="."/>
     <root-path name="external_files" path="/storage/" />
     <!-- yes, valid for ALL external storage and not only our app folder, since we can't use @string/data_folder

src/main/res/xml/preferences.xml

@@ -95,6 +95,10 @@
 		<Preference android:title="@string/prefs_imprint" android:key="imprint" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/prefs_category_about" android:key="about">
+		<Preference
+			android:title="@string/privacy"
+			android:id="@+id/privacy"
+			android:key="privacy"/>
 		<Preference android:title="@string/about_title" android:id="@+id/about_app" android:key="about_app" />
 	</PreferenceCategory>
 

src/modified/res/values/setup.xml

@@ -21,7 +21,10 @@
     <!-- URLs and flags related -->
     <string name="server_url"></string>
     <bool name="show_server_url_input">true</bool>
-    <bool name="show_welcome_link">false</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>
 
@@ -34,17 +37,17 @@
     <bool name="share_via_link_feature">true</bool>
     <bool name="share_with_users_feature">true</bool>
     <bool name="show_external_links">true</bool>
-    <bool name="show_drawer_logout">true</bool>
-  
-    <bool name="show_whats_new">true</bool>
-    <!-- To fill if you want to show webviews instead of regular welcome views -->
-    <array name="whatsnew_urls"></array>
 
     <!-- Contacts backup -->
     <bool name="contacts_backup">true</bool>
     <string name="contacts_backup_folder">/.Contacts-Backup</string>
     <integer name="contacts_backup_expire">30</integer>
 
+    <!-- What's new -->
+    <bool name="show_whats_new">true</bool>
+    <!-- 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>
@@ -81,19 +84,22 @@
     <bool name="recently_modified_enabled">true</bool>
     <bool name="shared_enabled">true</bool>
     <bool name="videos_enabled">true</bool>
+    <bool name="show_drawer_logout">true</bool>
 
     <!-- Bottom toolbar -->
     <bool name="bottom_toolbar_enabled">true</bool>
 
-    <!-- Help, imprint and feedback -->
+    <!-- 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>
+    <string name="url_help">https://help.nextcloud.com/c/feature</string>
+    <bool name="privacy_enabled">true</bool>
+    <string name="privacy_url">https://nextcloud.com/privacy</string>
     <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>