Merge branch 'sso' of https://github.com/nextcloud/android into sso

# Conflicts:
#	src/main/java/com/owncloud/android/services/AccountManagerService.java

CHANGELOG.md

@@ -1,4 +1,9 @@
-## 3.1.0 
+## 3.2.0 (May, 13, 2018)
+- Revamped details screen & sharing
+- minor UI/UX improvements
+- many bug fixes
+ 
+## 3.1.0 (Apr, 22, 2018)
 - enhance support for 8.x
 - speed improvements
 - minor UI/UX improvements

build.gradle

@@ -59,9 +59,9 @@ repositories {
 
 // semantic versioning for version code
 def versionMajor = 3
-def versionMinor = 1
+def versionMinor = 3
 def versionPatch = 0
-def versionBuild = 51 // 0-49=Alpha / 50-98=RC / 99=stable
+def versionBuild = 0 // 0-49=Alpha / 50-98=RC / 99=stable
 
 android {
     lintOptions {
@@ -126,8 +126,8 @@ android {
             versionDev {
                 applicationId "com.nextcloud.android.beta"
                 dimension "default"
-                versionCode 20180612
-                versionName "20180612"
+                versionCode 20180613
+                versionName "20180613"
             }
         }
     }

src/main/aidl/de/luhmer/owncloud/accountimporter/helper/IInputStreamService.aidl

@@ -0,0 +1,25 @@
+/***
+	Copyright (c) 2008-2011 CommonsWare, LLC
+	Licensed under the Apache License, Version 2.0 (the "License"); you may not
+	use this file except in compliance with the License. You may obtain	a copy
+	of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless required
+	by applicable law or agreed to in writing, software distributed under the
+	License is distributed on an "AS IS" BASIS,	WITHOUT	WARRANTIES OR CONDITIONS
+	OF ANY KIND, either express or implied. See the License for the specific
+	language governing permissions and limitations under the License.
+
+	From _The Busy Coder's Guide to Advanced Android Development_
+		http://commonsware.com/AdvAndroid
+
+
+	More information here: https://github.com/abeluck/android-streams-ipc
+*/
+
+package de.luhmer.owncloud.accountimporter.helper;
+
+// Declare the interface.
+interface IInputStreamService {
+
+    ParcelFileDescriptor performNextcloudRequest(in ParcelFileDescriptor input);
+
+}

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

@@ -55,7 +55,7 @@ public class CreateShareWithShareeOperation extends SyncOperation {
      */
     public CreateShareWithShareeOperation(String path, String shareeName, ShareType shareType, int permissions) {
         if (!ShareType.USER.equals(shareType) && !ShareType.GROUP.equals(shareType)
-            && !ShareType.FEDERATED.equals(shareType)) {
+                && !ShareType.FEDERATED.equals(shareType) && !ShareType.EMAIL.equals(shareType)) {
             throw new IllegalArgumentException("Illegal share type " + shareType);
         }
         mPath = path;

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

@@ -110,6 +110,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
         sShareTypes.put(DATA_USER, ShareType.USER);
         sShareTypes.put(DATA_GROUP, ShareType.GROUP);
         sShareTypes.put(DATA_REMOTE, ShareType.FEDERATED);
+        sShareTypes.put(DATA_REMOTE, ShareType.EMAIL);
 
         mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH);
@@ -215,6 +216,9 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
                         displayName = userName;
                         icon = R.drawable.ic_user;
                         dataUri = Uri.withAppendedPath(userBaseUri, shareWith);
+                    } else if (ShareType.EMAIL.getValue() == type) {
+                        icon = R.drawable.ic_email;
+                        displayName = getContext().getString(R.string.share_email_clarification, userName);
                     }
 
                     if (displayName != null && dataUri != null) {

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

@@ -23,8 +23,6 @@
 package com.owncloud.android.ui.activity;
 
 import android.accounts.Account;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -76,7 +74,6 @@ import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.ThemeUtils;
 
-import java.io.IOException;
 import java.util.ArrayList;
 
 /**
@@ -789,16 +786,15 @@ public class Preferences extends PreferenceActivity
 
             // For adding content description tag to a title field in the action bar
             int actionBarTitleId = getResources().getIdentifier("action_bar_title", "id", "android");
-            window.getDecorView().findViewById(actionBarTitleId).
-                        setContentDescription(getString(R.string.actionbar_settings));
+            View actionBarTitle = window.getDecorView().findViewById(actionBarTitleId);
+
+            if (actionBarTitle != null) {
+                actionBarTitle.setContentDescription(getString(R.string.actionbar_settings));
+            }
         }
     }
 
-    private void launchDavDroidLogin()
-            throws com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException,
-            OperationCanceledException,
-            AuthenticatorException,
-            IOException {
+    private void launchDavDroidLogin() {
         Account account = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
 
         Intent davDroidLoginIntent = new Intent();

src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java

@@ -22,18 +22,11 @@ package com.owncloud.android.ui.fragment.util;
 
 import android.app.SearchManager;
 import android.content.ComponentName;
-import android.content.res.Resources;
 import android.support.v7.widget.SearchView;
-import android.view.MenuItem;
 import android.view.inputmethod.EditorInfo;
 
-import com.owncloud.android.R;
-import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.status.OCCapability;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 /**
  * Helper calls for visibility logic of the sharing fragment.
  */

src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java

@@ -20,16 +20,11 @@
 
 package com.owncloud.android.ui.fragment.util;
 
-import android.app.SearchManager;
-import android.content.ComponentName;
 import android.content.res.Resources;
-import android.support.v7.widget.SearchView;
 import android.view.MenuItem;
-import android.view.inputmethod.EditorInfo;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.resources.shares.OCShare;
-import com.owncloud.android.lib.resources.status.OCCapability;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

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

@@ -34,7 +34,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.FileProvider;
@@ -93,7 +92,7 @@ public class FileOperationsHelper {
     private static final String TAG = FileOperationsHelper.class.getSimpleName();
     private static final Pattern mPatternUrl = Pattern.compile("^URL=(.+)$");
     private static final Pattern mPatternString = Pattern.compile("<string>(.+)</string>");
-    private FileActivity mFileActivity = null;
+    private FileActivity mFileActivity;
     /// Identifier of operation in progress which result shouldn't be lost
     private long mWaitingForOpId = Long.MAX_VALUE;
 
@@ -432,10 +431,8 @@ public class FileOperationsHelper {
      * @return 'True' if the server supports the Share API
      */
     public boolean isSharedSupported() {
-        if (mFileActivity.getAccount() != null) {
-            return AccountUtils.getServerVersion(mFileActivity.getAccount()).isSharedSupported();
-        }
-        return false;
+        return mFileActivity.getAccount() != null &&
+                AccountUtils.getServerVersion(mFileActivity.getAccount()).isSharedSupported();
     }
 
 
@@ -475,8 +472,7 @@ public class FileOperationsHelper {
     private void queueShareIntent(Intent shareIntent) {
         if (isSharedSupported()) {
             // Unshare the file
-            mWaitingForOpId = mFileActivity.getOperationsServiceBinder().
-                    queueNewOperation(shareIntent);
+            mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(shareIntent);
 
             mFileActivity.showLoadingDialog(mFileActivity.getApplicationContext().
                     getString(R.string.wait_a_moment));
@@ -943,10 +939,8 @@ public class FileOperationsHelper {
      * @return 'True' if the server doesn't need to check forbidden characters
      */
     public boolean isVersionWithForbiddenCharacters() {
-        if (mFileActivity.getAccount() != null) {
-            return AccountUtils.getServerVersion(mFileActivity.getAccount()).isVersionWithForbiddenCharacters();
-        }
-        return false;
+        return mFileActivity.getAccount() != null &&
+                AccountUtils.getServerVersion(mFileActivity.getAccount()).isVersionWithForbiddenCharacters();
     }
 
     /**

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

@@ -236,7 +236,7 @@ public class ThemeUtils {
      * Adjust lightness of given color
      *
      * @param lightnessDelta values -1..+1
-     * @param color
+     * @param color original color
      * @param threshold      0..1 as maximum value, -1 to disable
      * @return color adjusted by lightness
      */
@@ -374,15 +374,16 @@ public class ThemeUtils {
         return tintDrawable(drawable, color);
     }
 
+    @Nullable
     public static Drawable tintDrawable(Drawable drawable, int color) {
         if (drawable != null) {
             Drawable wrap = DrawableCompat.wrap(drawable);
             wrap.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
 
             return wrap;
-        } else {
-            return drawable;
         }
+
+        return null;
     }
 
     public static String colorToHexString(int color) {

src/main/java/de/luhmer/owncloud/accountimporter/helper/IThreadListener.java

@@ -0,0 +1,11 @@
+package de.luhmer.owncloud.accountimporter.helper;
+
+/**
+ * Created by david on 29.06.17.
+ */
+
+public interface IThreadListener {
+
+    void onThreadFinished(final Thread thread);
+
+}

src/main/java/de/luhmer/owncloud/accountimporter/helper/InputStreamBinder.java

@@ -0,0 +1,186 @@
+package de.luhmer.owncloud.accountimporter.helper;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.db.PreferenceManager;
+import com.owncloud.android.lib.common.OwnCloudAccount;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * Created by david on 29.06.17.
+ *
+ * More information here: https://github.com/abeluck/android-streams-ipc
+ */
+
+public class InputStreamBinder extends IInputStreamService.Stub {
+    private final static String TAG = "InputStreamBinder";
+
+    private ArrayList<String> validPackages = new ArrayList<>(Arrays.asList("de.luhmer.owncloudnewsreader"));
+    
+    private Context context;
+    public InputStreamBinder(Context ctxt) {
+        this.context = ctxt;
+    }
+
+
+    private NameValuePair[] convertMapToNVP(Map<String, String> map) {
+        NameValuePair[] nvp = new NameValuePair[map.size()];
+        int i = 0;
+        for (String key : map.keySet()) {
+            nvp[i] = new NameValuePair(key, map.get(key));
+            i++;
+        }
+        return nvp;
+    }
+
+
+    public ParcelFileDescriptor performNextcloudRequest(ParcelFileDescriptor input) {
+        // read the input
+        final InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(input);
+
+        Exception exception = null;
+        InputStream httpStream = new InputStream() {
+            @Override
+            public int read() throws IOException {
+                return 0;
+            }
+        };
+        try {
+            // Start request and catch exceptions
+            NextcloudRequest request = deserializeObjectAndCloseStream(is);
+            httpStream = processRequest(request);
+        } catch (Exception e) {
+            e.printStackTrace();
+            exception = e;
+        }
+
+        try {
+            // Write exception to the stream followed by the actual network stream
+            InputStream exceptionStream = serializeObjectToInputStream(exception);
+            InputStream resultStream = new java.io.SequenceInputStream(exceptionStream, httpStream);
+            return ParcelFileDescriptorUtil.pipeFrom(resultStream, new IThreadListener() {
+                @Override
+                public void onThreadFinished(Thread thread) {
+                    Log.d(TAG, "Done sending result");
+                }
+            });
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private <T extends Serializable> ByteArrayInputStream serializeObjectToInputStream(T obj) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(baos);
+        oos.writeObject(obj);
+        oos.flush();
+        oos.close();
+        return new ByteArrayInputStream(baos.toByteArray());
+    }
+
+    private <T extends Serializable> T deserializeObjectAndCloseStream(InputStream is) throws IOException, ClassNotFoundException {
+        ObjectInputStream ois = new ObjectInputStream(is);
+        T result = (T) ois.readObject();
+        is.close();
+        ois.close();
+        return result;
+    }
+
+    private InputStream processRequest(final NextcloudRequest request) throws Exception {
+        Account account = AccountUtils.getOwnCloudAccountByName(context, request.accountName); // TODO handle case that account is not found!
+        OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);
+        OwnCloudClient client = OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, context);
+
+        // Validate token & package name
+        if (!isValid(request)) {
+            throw new IllegalStateException("Provided authentication token does not match!");
+        }
+
+        // Validate URL
+        if(!request.url.startsWith("/")) {
+            throw new IllegalStateException("URL need to start with a /");
+        }
+
+        request.url = client.getBaseUri() + request.url;
+        HttpMethodBase method;
+
+        switch (request.method) {
+            case "GET":
+                method = new GetMethod(request.url);
+                break;
+
+            case "POST":
+                method = new PostMethod(request.url);
+                if (request.requestBody != null) {
+                    StringRequestEntity requestEntity = new StringRequestEntity(
+                            request.requestBody,
+                            "application/json",
+                            "UTF-8");
+                    ((PostMethod) method).setRequestEntity(requestEntity);
+                }
+                break;
+
+            case "PUT":
+                method = new PutMethod(request.url);
+                if (request.requestBody != null) {
+                    StringRequestEntity requestEntity = new StringRequestEntity(
+                            request.requestBody,
+                            "application/json",
+                            "UTF-8");
+                    ((PutMethod) method).setRequestEntity(requestEntity);
+                }
+                break;
+
+            case "DELETE":
+                method = new DeleteMethod(request.url);
+                break;
+
+            default:
+                throw new Exception("Unexpected type!!");
+
+        }
+
+        method.setQueryString(convertMapToNVP(request.parameter));
+        method.addRequestHeader("OCS-APIREQUEST", "true");
+
+        int status = client.executeMethod(method);
+        if (status == 200) {
+            return method.getResponseBodyAsStream();
+        } else {
+            throw new Exception("Request returned code: " + status);
+        }
+    }
+
+    private boolean isValid(NextcloudRequest request) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        String storedToken = sharedPreferences.getString(request.packageName, "");
+
+        return validPackages.contains(request.packageName) && request.token.equals(storedToken);
+    }
+}

src/main/java/de/luhmer/owncloud/accountimporter/helper/NextcloudRequest.java

@@ -0,0 +1,80 @@
+package de.luhmer.owncloud.accountimporter.helper;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by david on 28.06.17.
+ */
+
+public class NextcloudRequest implements Serializable {
+
+    private static final long serialVersionUID = 215521212534236L; //assign a long value
+
+    public String method;
+    public Map<String, List<String>> header = new HashMap<>();
+    public Map<String, String> parameter = new HashMap<>();
+    public String requestBody;
+    public String url;
+    public String token;
+    public String packageName;
+    public String accountName;
+
+    private NextcloudRequest() {
+
+    }
+
+    public static class Builder {
+        private NextcloudRequest ncr;
+
+        public Builder() {
+            ncr = new NextcloudRequest();
+        }
+
+        public NextcloudRequest build() {
+            return ncr;
+        }
+
+        public Builder setMethod(String method) {
+            ncr.method = method;
+            return this;
+        }
+
+        public Builder setHeader(Map<String, List<String>> header) {
+            ncr.header = header;
+            return this;
+        }
+
+        public Builder setParameter(HashMap<String, String> parameter) {
+            ncr.parameter = parameter;
+            return this;
+        }
+
+        public Builder setRequestBody(String requestBody) {
+            ncr.requestBody = requestBody;
+            return this;
+        }
+
+        public Builder setUrl(String url) {
+            ncr.url = url;
+            return this;
+        }
+
+        public Builder setToken(String token) {
+            ncr.token = token;
+            return this;
+        }
+
+        public Builder setPackageName(String packageName) {
+            ncr.packageName = packageName;
+            return this;
+        }
+
+        public Builder setAccountName(String accountName) {
+            ncr.accountName = accountName;
+            return this;
+        }
+    }
+}

src/main/java/de/luhmer/owncloud/accountimporter/helper/ParcelFileDescriptorUtil.java

@@ -0,0 +1,82 @@
+package de.luhmer.owncloud.accountimporter.helper;
+
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class ParcelFileDescriptorUtil {
+
+    public static ParcelFileDescriptor pipeFrom(InputStream inputStream, IThreadListener listener)
+            throws IOException {
+        ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
+        ParcelFileDescriptor readSide = pipe[0];
+        ParcelFileDescriptor writeSide = pipe[1];
+
+        // start the transfer thread
+        new TransferThread(inputStream, new ParcelFileDescriptor.AutoCloseOutputStream(writeSide),
+                listener)
+                .start();
+
+        return readSide;
+    }
+
+    public static ParcelFileDescriptor pipeTo(OutputStream outputStream, IThreadListener listener)
+            throws IOException {
+        ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
+        ParcelFileDescriptor readSide = pipe[0];
+        ParcelFileDescriptor writeSide = pipe[1];
+
+        // start the transfer thread
+        new TransferThread(new ParcelFileDescriptor.AutoCloseInputStream(readSide), outputStream,
+                listener)
+                .start();
+
+        return writeSide;
+    }
+
+    public static class TransferThread extends Thread {
+        private final InputStream mIn;
+        private final OutputStream mOut;
+        private final IThreadListener mListener;
+
+        TransferThread(InputStream in, OutputStream out, IThreadListener listener) {
+            super("ParcelFileDescriptor Transfer Thread");
+            mIn = in;
+            mOut = out;
+            mListener = listener;
+            setDaemon(true);
+        }
+
+        @Override
+        public void run() {
+            byte[] buf = new byte[1024];
+            int len;
+
+            try {
+                while ((len = mIn.read(buf)) > 0) {
+                    mOut.write(buf, 0, len);
+                }
+                mOut.flush(); // just to be safe
+            } catch (IOException e) {
+                Log.e("TransferThread", "writing failed");
+                e.printStackTrace();
+            } finally {
+                try {
+                    mIn.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                try {
+                    mOut.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (mListener != null)
+                mListener.onThreadFinished(this);
+        }
+    }
+}

src/main/res/values-b+en+001/strings.xml

@@ -268,6 +268,9 @@
 	<string name="auth_fail_get_user_name">Your server is not returning a correct user ID, please contact an admin</string>
 	<string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
     <string name="auth_account_does_not_exist">The account is not added on this device yet</string>
+    <string name="auth_access_failed">Access failed: %1$s</string>
+    <string name="auth_illegal_login_used">Illegal login data URL used</string>
+
     <string name="favorite">Set as available offline</string>
     <string name="unfavorite">Unset as available offline</string>
     <string name="favorite_real">Add to favorites</string>

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

@@ -85,7 +85,7 @@
     <string name="file_list_empty">Качи съдържание или синхронизирай с твоите устройства.</string>
     <string name="file_list_empty_favorites_filter_list">Файловете и папките които отбелязваш като любими ще се показват тук</string>
     <string name="file_list_empty_favorites_filter">Търсенето ви не откри любими файлове</string>
-    <string name="file_list_loading">Зареждане...</string>
+    <string name="file_list_loading">Зареждане…</string>
     <string name="file_list_no_app_for_file_type">Няма апликация, която да се справи с подобен тип файл.</string>
     <string name="local_file_list_empty">В папката няма файлове.</string>
     <string name="local_folder_list_empty">Няма повече папки.</string>
@@ -121,7 +121,7 @@
     <string name="common_back">Назад</string>
     <string name="common_save">Запазване</string>
     <string name="common_error">Грешка</string>
-    <string name="common_loading">Зареждане...</string>
+    <string name="common_loading">Зареждане…</string>
     <string name="common_unknown">неясна</string>
     <string name="common_error_unknown">Неизвестна грешка</string>
     <string name="common_pending">В очакване</string>
@@ -132,7 +132,7 @@
     <string name="avatar">Аватар</string>
     <string name="active_user">Активен потребител</string>
     <string name="uploader_info_dirname">Име на папката</string>
-    <string name="uploader_upload_in_progress_ticker">Качване...</string>
+    <string name="uploader_upload_in_progress_ticker">Качване…</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>
@@ -158,7 +158,7 @@
     <string name="uploads_view_upload_status_waiting_for_wifi">Изчакване на WiFi връзка</string>
     <string name="uploads_view_upload_status_waiting_exit_power_save_mode">Изчакване да излезете от режима за икономия на енергия</string>
     <string name="uploads_view_later_waiting_to_upload">Изчакване за качване</string>
-    <string name="downloader_download_in_progress_ticker">Изтегляне...</string>
+    <string name="downloader_download_in_progress_ticker">Изтегляне…</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>
@@ -221,7 +221,7 @@
     <string name="media_play_pause_description">Бутон възпроизведи / пауза </string>
     <string name="media_forward_description">Бутон за превъртане напред</string>
 
-    <string name="auth_getting_authorization">Получаване на оторизация...</string>
+    <string name="auth_getting_authorization">Получаване на оторизация…</string>
     <string name="auth_no_net_conn_title">Няма връзка с интернет</string>
 	<string name="auth_nossl_plain_ok_title">Няма сигурна връзка.</string>
 	<string name="auth_connection_established">Осъществена е връзка</string>
@@ -366,8 +366,8 @@
     <string name="downloader_download_file_not_found">Файлът вече не се намира на сървъра</string>
 
     <string name="file_migration_dialog_title">Обновяване на пътя до хранилището</string>
-    <string name="file_migration_saving_accounts_configuration">Запазване на настройките на профилите...</string>
-    <string name="file_migration_restoring_accounts_configuration">Възстановяване на настройките на профилите...</string>
+    <string name="file_migration_saving_accounts_configuration">Запазване на настройките на профилите…</string>
+    <string name="file_migration_restoring_accounts_configuration">Възстановяване на настройките на профилите…</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>
@@ -615,5 +615,5 @@
 
     <string name="screenshot_01_gridView">Сигурен дом за всички ваши данни</string>
     <string name="screenshot_04_accounts">Свързване към други профили</string>
-    <string name="end_to_end_encryption_password">Парола...</string>
+    <string name="end_to_end_encryption_password">Парола…</string>
     </resources>

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

@@ -268,6 +268,9 @@
 	<string name="auth_fail_get_user_name">Ihr Server gibt keine korrekte Benutzer-ID zurück, bitte kontaktieren Sie einen Administrator</string>
 	<string name="auth_can_not_auth_against_server">Kann sich nicht auf diesem Server authentifizieren</string>
     <string name="auth_account_does_not_exist">Das Benutzerkonto ist bislang auf dem Gerät nicht vorhanden</string>
+    <string name="auth_access_failed">Zugriffsfehler: %1$s</string>
+    <string name="auth_illegal_login_used">Ungültige Anmeldeadresse verwendet</string>
+
     <string name="favorite">Als Offline verfügbar markieren</string>
     <string name="unfavorite">Offline verfügbar Markierung entfernen</string>
     <string name="favorite_real">Zu den Favoriten hinzufügen</string>

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

@@ -252,7 +252,7 @@
 	<string name="auth_expired_oauth_token_toast">Tu autorización ha expirado. Por favor vuelve a autorizar</string>
 	<string name="auth_expired_basic_auth_toast">Por favor ingresa tu contraseña actual</string>
 	<string name="auth_expired_saml_sso_token_toast">Tu sesión ha expirado. Por favor conectate de nuevo</string>
-    <string name="auth_connecting_auth_server">Conectando al servidor de autenticación...</string>
+    <string name="auth_connecting_auth_server">Conectando al servidor de autenticación…</string>
 	<string name="auth_unsupported_multiaccount">%1$s no soporta cuentas múltiples</string>
 	<string name="auth_fail_get_user_name">Tu servidor no esta regresando un user ID correcto, por favor contacta a tu adminsitrador</string>
 	<string name="auth_can_not_auth_against_server">No es posible autenticarse en este servidor</string>
@@ -283,7 +283,7 @@
     <string name="wait_for_tmp_copy_from_private_storage">Copiando el archivo desde almacenamiento privado</string>
     
     <string name="oauth_check_onoff">Iniciar sesión con OAuth 2.0</string>
-    <string name="oauth_login_connection">Conectando al servidor de OAuth2.0...</string>
+    <string name="oauth_login_connection">Conectando al servidor de OAuth2.0…</string>
         
     <string name="ssl_validator_header">La identidad del servidor no pudo ser verificada</string>
     <string name="ssl_validator_reason_cert_not_trusted">- El certificado del servidor no es de confianza</string>
@@ -376,14 +376,14 @@
     <string name="downloader_download_file_not_found">El archivo ya no se encuentra disponible en el servidor</string>
 
     <string name="file_migration_dialog_title">Actualizando la ruta de almacenamiento</string>
-    <string name="file_migration_preparing">Preparando la migración...</string>
-    <string name="file_migration_checking_destination">Verificando el destino...</string>
-    <string name="file_migration_saving_accounts_configuration">Guardando la configuración de la cuenta...</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Agurardando sincronización completa...</string>
+    <string name="file_migration_preparing">Preparando la migración…</string>
+    <string name="file_migration_checking_destination">Verificando el destino…</string>
+    <string name="file_migration_saving_accounts_configuration">Guardando la configuración de la cuenta…</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Agurardando sincronización completa…</string>
     <string name="file_migration_migrating">Moviendo los datos…</string>
-    <string name="file_migration_updating_index">Actualizando índice ...</string>
+    <string name="file_migration_updating_index">Actualizando índice…</string>
     <string name="file_migration_cleaning">Limpiando…</string>
-    <string name="file_migration_restoring_accounts_configuration">Restaurando la configuración de la cuenta...</string>
+    <string name="file_migration_restoring_accounts_configuration">Restaurando la configuración de la cuenta…</string>
     <string name="file_migration_ok_finished">Terminado</string>
     <string name="file_migration_failed_not_enough_space">Se necesita más espacio</string>
     <string name="file_migration_failed_not_writable">No fue posible escribir al archivo destino</string>
@@ -407,7 +407,7 @@
 	<string name="log_send_history_button">Enviar histórico</string>
 	<string name="log_send_no_mail_app">No se encontró alguna aplicación para el envío de bitácoras. Por favor instala un cliente de correo electrónico. </string>
 	<string name="log_send_mail_subject"> %1$s bitácora de aplicación Android</string>
-    <string name="log_progress_dialog_text">Cargando datos...</string>
+    <string name="log_progress_dialog_text">Cargando datos…</string>
 
 	<string name="saml_authentication_required_text">Se requiere contraseña</string>
 	<string name="saml_authentication_wrong_pass">Contraseña incorrecta</string>
@@ -453,8 +453,8 @@
     <string name="set_picture_as">Usar imagen como</string>
     <string name="set_as">Establecer Como</string>
 
-    <string name="prefs_instant_behaviour_dialogTitle">El archivo original será...</string>
-    <string name="prefs_instant_behaviour_title">El archivo original será...</string>
+    <string name="prefs_instant_behaviour_dialogTitle">El archivo original será…</string>
+    <string name="prefs_instant_behaviour_title">El archivo original será…</string>
     <string name="select_all">Seleccionar todo</string>
     <string name="deselect_all">Deseleccionar todo</string>
 
@@ -471,7 +471,7 @@
     <string name="share_via_link_section_title">Compartir liga</string>
     <string name="share_via_link_hide_file_listing_permission_label">Ocultar listado de archivos</string>
     <string name="share_get_public_link_button">Obtener liga</string>
-    <string name="share_with_title">Compartir con...</string>
+    <string name="share_with_title">Compartir con…</string>
     <string name="share_with_edit_title">Compartir con %1$s</string>
     <string name="search_users_and_groups_hint">Buscar usuarios y grupos</string>
     <string name="share_group_clarification">%1$s (grupo)</string>
@@ -525,11 +525,11 @@
     <string name="participate_rc_fdroid">Obten el candidato a liberación de la tienda de aplicaciones F-Droid </string>
     <string name="participate_dev_fdroid">Obten la liberación de desarrollo de la tienda de aplicaciones F-Droid </string>
     <string name="participate_dev_direct_download">Obten la liberación de desarrollo directamente</string>
-    <string name="move_to">Mover a...</string>
-    <string name="copy_to">Copiar a...</string>
-    <string name="choose_remote_folder">Elige la carpeta remota...</string>
-    <string name="choose_local_folder">Elige la carpeta local...</string>
-    <string name="synced_folders_loading_folders">Cargando carpetas...</string>
+    <string name="move_to">Mover a…</string>
+    <string name="copy_to">Copiar a…</string>
+    <string name="choose_remote_folder">Elige la carpeta remota…</string>
+    <string name="choose_local_folder">Elige la carpeta local…</string>
+    <string name="synced_folders_loading_folders">Cargando carpetas…</string>
     <string name="synced_folders_no_results">No se encontraron carpetas de medios. </string>
     <string name="synced_folders_preferences">Preferencias para cargas automáticas</string>
     <string name="synced_folders_new_info">Las cargas instantaneas se han mejorado por completo. Re-configura tu carga automática desde el menú principal.\n\nDisfruta la nueva y mejorada carga automática. </string>
@@ -539,7 +539,7 @@
         <item quantity="other">%d seleccionados</item>
     </plurals>
 
-    <string name="notifications_loading_activity">Cargando notificaciones...</string>
+    <string name="notifications_loading_activity">Cargando notificaciones…</string>
     <string name="notifications_no_results_headline">No hay notificaciones</string>
     <string name="notifications_no_results_message">Por favor verifica más tarde. </string>
 

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

@@ -39,6 +39,13 @@
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Gestionar cuentas</string>
+    <string name="prefs_lock">Bloquear</string>
+    <string name="prefs_lock_title">Bloquear usando</string>
+    <string name="prefs_lock_none">Ninguno</string>
+    <string name="prefs_lock_using_passcode">Código de acceso</string>
+    <string name="prefs_lock_using_device_credentials">Credenciales del dispositivo</string>
+    <string name="prefs_lock_device_credentials_enabled">Credenciales del dispositivo activadas</string>
+    <string name="prefs_lock_device_credentials_not_setup">No se han configurado las credenciales del dispositivo.</string>
     <string name="prefs_expert_mode">Modo experto</string>
     <string name="prefs_show_hidden_files">Mostrar archivos ocultos</string>
     <string name="prefs_log_delete_history_button">Eliminar historial</string>
@@ -196,6 +203,9 @@
     <string name="foreign_files_remote_text">Remoto: %1$s</string>
     <string name="upload_query_move_foreign_files">No hay suficiente espacio para copiar los archivos seleccionados en la carpeta %1$s. En su lugar, ¿le gustaría moverlos?</string>
     <string name="pass_code_enter_pass_code">Por favor introduzca su código de acceso</string>
+    <string name="default_credentials_wrong">Credenciales incorrectas</string>
+    <string name="credentials_disabled">Credenciales desactivadas</string>
+    
     <string name="pass_code_configure_your_pass_code">Introduce tu código de acceso</string>
     <string name="pass_code_configure_your_pass_code_explanation">Se solicitará el código de acceso cada vez que se inicie la aplicación</string>
     <string name="pass_code_reenter_your_pass_code">Por favor, vuelve a introducir tu código de acceso</string>
@@ -258,6 +268,9 @@
 	<string name="auth_fail_get_user_name">Tu servidor no está devolviendo una ID de usuario correcta; por favor, ponte en contacto con un administrador</string>
 	<string name="auth_can_not_auth_against_server">No puede autenticarse a este servidor</string>
     <string name="auth_account_does_not_exist">La cuenta no se ha añadido aún en este dispositivo</string>
+    <string name="auth_access_failed">Acceso fallido: %1$s</string>
+    <string name="auth_illegal_login_used">Se ha usado una URL ilegal de datos de entrada</string>
+
     <string name="favorite">Marcar como disponible sin conexión</string>
     <string name="unfavorite">Desmarcar como disponible sin conexión</string>
     <string name="favorite_real">Añadir a favoritos</string>
@@ -607,6 +620,7 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Aun no hay actividad</string>
+    <string name="activities_no_results_message">No hay eventos como adiciones, cambios y compartidos</string>
     <string name="prefs_category_about">Acerca de</string>
 
     <string name="actionbar_contacts">Copia de seguridad de contactos</string>
@@ -765,4 +779,6 @@
     <string name="sharee_add_failed">Fallo al añadir compartido</string>
     <string name="unsharing_failed">Fallo al dejar de compartir</string>
     <string name="updating_share_failed">Fallo al actualizar recurso compartido</string>
-    </resources>
+    <string name="whats_new_device_credentials_title">Usar la protección del dispositivo Android</string>
+    <string name="whats_new_device_credentials_content">Usa cualquier cosa, como un patrón, una contraseña, un pin o tu huella dactilar para mantener tus datos a salvo.</string>
+</resources>

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

@@ -260,6 +260,7 @@ Attention la suppression est irréversible.</string>
 	<string name="auth_fail_get_user_name">Votre serveur a retourné un identifiant d\'utilisateur incorrect. Veuillez contacter un administrateur</string>
 	<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\'est pas encore ajouté sur cet appareil</string>
+    <string name="auth_access_failed">L\'accès a échoué: %1$s</string>
     <string name="favorite">Rendre disponible hors-ligne</string>
     <string name="unfavorite">Ne plus rendre disponible hors-ligne</string>
     <string name="favorite_real">Ajouter aux favoris</string>

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

@@ -258,6 +258,7 @@
 	<string name="auth_fail_get_user_name">Vefþjónninn þinn er ekki að svara með 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þá til á tækinu</string>
+    <string name="auth_access_failed">Aðgangur mistókst: %1$s</string>
     <string name="favorite">Stilla sem tiltækt án nettengingar</string>
     <string name="unfavorite">Afstilla sem tiltækt án nettengingar</string>
     <string name="favorite_real">Bæta í eftirlæti</string>

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

@@ -268,6 +268,9 @@
 	<string name="auth_fail_get_user_name">Il server non restituisce un ID utente corretto, contatta un amministratore</string>
 	<string name="auth_can_not_auth_against_server">Impossibile autenticarsi a questo server</string>
     <string name="auth_account_does_not_exist">L\'account non è ancora aggiunto su questo dispositivo</string>
+    <string name="auth_access_failed">Accesso non riuscito: %1$s</string>
+    <string name="auth_illegal_login_used">Utilizzato URL di dati di accesso non consentito</string>
+
     <string name="favorite">Imposta come disponibile non in linea</string>
     <string name="unfavorite">Rimuovi come disponibile non in linea</string>
     <string name="favorite_real">Aggiungi ai preferiti</string>

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

@@ -49,17 +49,25 @@
     <string name="prefs_expert_mode">מצב מומחה</string>
     <string name="prefs_show_hidden_files">הצגת קבצים נסתרים</string>
     <string name="prefs_log_delete_history_button">מחיקת הסטוריה</string>
+    <string name="prefs_calendar_contacts">סנכרון לוח שנה ואנשי קשר</string>
     <string name="prefs_calendar_contacts_summary">הגדרת DAVdroid (v1.3.0+)‎ עבור החשבון הנוכחי</string>
+    <string name="prefs_calendar_contacts_address_resolve_error">לא ניתן לפענח את כתובת השרת של החשבון עבור DAVdroid</string>
+    <string name="prefs_calendar_contacts_no_store_error">לא מותקנים F-Droid או Google Play</string>
+    <string name="prefs_calendar_contacts_sync_setup_successful">הגדרת סנכרון לוח שנה ואנשי קשר</string>
     <string name="prefs_daily_contacts_sync_summary">גיבוי יומי של אנשי הקשר שלך</string>
     <string name="prefs_help">עזרה</string>
     <string name="prefs_recommend">המליצו לחברים</string>
     <string name="prefs_feedback">משוב</string>
     <string name="prefs_imprint">חותמת</string>
 
-	<string name="auth_check_server">בדיקת שרת</string>
+	<string name="recommend_subject">לנסות את %1$s בהתקן שלך!</string>
+	<string name="recommend_urls">%1$s או %2$s</string>
+
+    <string name="auth_check_server">בדיקת שרת</string>
     <string name="auth_host_url">כתובת שרת https://…</string>
     <string name="auth_username">שם משתמש</string>
     <string name="auth_password">ססמה</string>
+    <string name="auth_register">אין לך Nextcloud עדיין?\nניתן ללחוץ כאן כדי לקבל אחד מספק</string>
     <string name="sync_string_files">קבצים</string>
     <string name="setup_btn_connect">התחברות</string>
     <string name="uploader_btn_upload_text">העלאה</string>
@@ -73,7 +81,10 @@
     <string name="uploader_error_message_no_file_to_upload">המידע שהתקבל לא הכיל קובץ חוקי</string>
     <string name="uploader_error_title_file_cannot_be_uploaded">לא ניתן להעלות קובץ זה</string>
     <string name="uploader_error_message_read_permission_not_granted">ל- %1$s אסור לקרוא קובץ מתקבל</string>
+    <string name="uploader_error_message_source_file_not_found">הקובץ שנבחר להעלאה לא נמצא. נא לבדוק האם הקובץ קיים.</string>
+    <string name="uploader_error_message_source_file_not_copied">לא ניתן להעתיק את הקובץ לתיקייה זמנית. נא לנסות לשלוח אותו מחדש.</string>
     <string name="uploader_upload_files_behaviour">אפשרויות העלאה:</string>
+    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">העברת קובץ לתיקייה %1$s</string>
     <string name="uploader_upload_files_behaviour_only_upload">להשאיר בתיקיית המקור</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">מחיקה מתיקיית המקור</string>
     <string name="file_list_seconds_ago">שניות</string>
@@ -108,6 +119,7 @@
     <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_send_share">שליחה/שיתוף</string>
     <string name="common_yes">כן</string>
     <string name="common_no">לא</string>
@@ -125,12 +137,17 @@
     <string name="common_send">שליחה</string>
     <string name="about_title">על אודות</string>
     <string name="delete_account">הסרת חשבון</string>
+    <string name="avatar">תמונה מייצגת</string>
+    <string name="active_user">משתמש פעיל</string>
     <string name="upload_chooser_title">העלאה מהמיקום…</string>
     <string name="uploader_info_dirname">שם התיקייה</string>
     <string name="uploader_upload_in_progress_ticker">מתבצעת העלאה…</string>
     <string name="uploader_upload_in_progress_content">%1$d%% בהעלאה %2$s</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_upload_status_failed_ssl_certificate_not_trusted">אישור השרת אינו מהימן</string>
     <string name="uploads_view_title">העלאות</string>
     <string name="uploads_view_group_current_uploads">נוכחי</string>
     <string name="uploads_view_group_finished_uploads">הועלה</string>
@@ -143,6 +160,7 @@
     <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">בהמתנה לחיבור אלחוטי</string>
     <string name="uploads_view_upload_status_waiting_exit_power_save_mode">בהמתנה ליציאה ממצב חסכון בחשמל</string>
@@ -168,13 +186,22 @@
     <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="pass_code_enter_pass_code">נא להקליד את מילת הצופן שלך</string>
+    <string name="default_credentials_wrong">פרטי הגישה שגויים</string>
+    <string name="credentials_disabled">פרטי גישה מושבתים</string>
+    
     <string name="pass_code_configure_your_pass_code">יש להכניס את הקוד שלך</string>
     <string name="pass_code_configure_your_pass_code_explanation">בכל פעם שיישום זה נפתח יהיה צורך להכניס את הקוד</string>
     <string name="pass_code_reenter_your_pass_code">יש להכניס את הקוד שנית</string>
+    <string name="pass_code_remove_your_pass_code">מחיקת מילת הצופן שלך</string>
     <string name="pass_code_mismatch">הקודים אינם זהים</string>
     <string name="pass_code_wrong">קוד שגוי</string>
+    <string name="pass_code_removed">מילת צופן נמחקה</string>
     <string name="pass_code_stored">הקוד נשמר</string>
     
+    <string name="media_notif_ticker">נגן מוזיקה %1$s</string>
+    <string name="media_state_playing">%1$s (מתגנן)</string>
+    <string name="media_state_loading">%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>
@@ -219,6 +246,7 @@
 	<string name="auth_expired_saml_sso_token_toast">זמן ההתקשרות שלך הסתיים. יש להתחבר מחדש</string>
     <string name="auth_unsupported_multiaccount">%1$s אינו תומך בריבוי חשבונות</string>
 	<string name="auth_can_not_auth_against_server">לא ניתן לאמת עבור שרת זה</string>
+    <string name="auth_access_failed">גישה נכשלה: %1$s</string>
     <string name="favorite">הגדר כזמין באופן לא מקוון</string>
     <string name="unfavorite">ביטול הגדרה כזמין באופן לא מקוון</string>
     <string name="favorite_real">הוספה למועדפים</string>
@@ -229,15 +257,20 @@
     <string name="confirmation_remove_local">מקומי בלבד</string>
     <string name="rename_dialog_title">נא להזין שם חדש</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_no_file_selected">לא נבחר קובץ</string>
     <string name="activity_chooser_title">שליחת קישור אל…</string>
     <string name="wait_for_tmp_copy_from_private_storage">מעתיק קובץ מאחסון פרטי</string>
     
     <string name="oauth_check_onoff">כניסה עם OAuth 2.0</string>
     <string name="oauth_login_connection">התחברות אל שרת oAuth2…</string>
         
+    <string name="ssl_validator_header">לא ניתן לאמת את זהות השרת</string>
     <string name="ssl_validator_reason_cert_not_trusted">- תעודת השרת אינה מהימנה</string>
     <string name="ssl_validator_reason_cert_expired">- תוקף תעודת השרת פג</string>
     <string name="ssl_validator_reason_cert_not_yet_valid">- תוקף תעודת השרת מתייחס לתאריכים בעתיד</string>
@@ -288,10 +321,13 @@
     <string name="prefs_synced_folders_local_path_title">תיקייה מקומית</string>
     <string name="prefs_synced_folders_remote_path_title">תיקייה מרוחקת</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">שימוש בתת־תיקיות</string>
-    <string name="share_link_file_no_exist">לא ניתן לשתף. יש לבדוק אם הקובץ קיים</string>
+    <string name="prefs_instant_upload_path_use_subfolders_summary">אחסון בתת־תיקיות בהפרדה לשנה וחודש</string>
+
+	<string name="share_link_file_no_exist">לא ניתן לשתף. יש לבדוק אם הקובץ קיים</string>
 	<string name="share_link_file_error">שגיאה אירעה בזמן ניסיון לשתף קובץ זה או תיקייה זו</string>
 	<string name="unshare_link_file_no_exist">לא ניתן לבטל שיתוף. יש לבדוק אם הקובץ קיים</string>
 	<string name="unshare_link_file_error">שגיאה אירעה בזמן ניסיון לבטל שיתוף לקובץ זה או לתיקייה זו</string>
+    <string name="update_link_file_no_exist">לא ניתן לעדכן. נא לבדוק האם הקובץ קיים</string>
     <string name="update_link_file_error">שגיאה אירעה בניסיון לעדכן את השיתוף</string>
     <string name="share_link_password_title">הכנסת סיסמא</string>
     <string name="share_link_empty_password">יש להכניס סיסמא</string>
@@ -300,24 +336,48 @@
 
     <string name="copy_link">העתקת קישור</string>
     <string name="clipboard_text_copied">הועתק ללוח הגזירים - clipboard</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_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_waiting_for_unfinished_sync">בהמתנה לסנכרון מלא…</string>
+    <string name="file_migration_migrating">הנתונים מועברים…</string>
+    <string name="file_migration_cleaning">מתבצע ניקיון…</string>
+    <string name="file_migration_restoring_accounts_configuration">תצורת החשבון משוחזרת…</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_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="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 לוגים של יישום אנדרואיד</string>
     <string name="log_progress_dialog_text">טעינת מידע…</string>
 
@@ -325,19 +385,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_details">פרטים</string>
 
-    <string name="subject_user_shared_with_you">%1$s משתף \"%2$s\" אתך</string>
+    <string name="sync_folder_failed_content">לא ניתן להשלים את הסנכרון של התיקייה %1$s</string>
+
+	<string name="subject_user_shared_with_you">%1$s משתף \"%2$s\" אתך</string>
     <string name="subject_shared_with_you">\"%1$s\" שותף אתך</string>
 
     <string name="auth_refresh_button">רענון חיבור</string>
@@ -346,9 +414,14 @@
 
     <string name="username">שם משתמש</string>
 
+    <string name="set_picture_as">שימוש בתמונה בתור</string>
+    <string name="set_as">הגדרה בתור</string>
+
     <string name="prefs_instant_behaviour_dialogTitle">קובץ מקורי יהיה…</string>
     <string name="prefs_instant_behaviour_title">תיקייה מקורית תהיה…</string>
     <string name="select_all">בחר הכל</string>
+    <string name="deselect_all">ביטול בחירה</string>
+
     <string name="pref_behaviour_entries_keep_file">נשמר בתיקייה מקורית</string>
     <string name="pref_behaviour_entries_move">הועבר לתיקיית ישומים</string>
     <string name="pref_behaviour_entries_delete_file">נמחק</string>
@@ -359,33 +432,260 @@
     <string name="share_with_user_section_title">שיתוף עם משתמשים וקבוצות</string>
     <string name="share_no_users">עדיין לא שותף מידע עם משתמשים</string>
     <string name="share_add_user_or_group">הוספת משתמש או קבוצה</string>
+    <string name="share_via_link_edit_permission_label">לאפשר עריכה</string>
+    <string name="share_via_link_password_label">הגנה עם ססמה</string>
+    <string name="share_via_link_password_title">מאובטח</string>
+    <string name="share_via_link_expiration_date_label">הגדרת מועד תפוגה</string>
+    <string name="share_via_link_menu_password_label">הגנה בססמה (%1$s)</string>
+    <string name="share_expiration_date_label">תפוגה ב־%1$s</string>
+    <string name="share_no_expiration_date_label">הגדרת תאריך תפוגה</string>
     <string name="share_via_link_section_title">קישור לשיתוף</string>
+    <string name="share_password_title">מוגן בססמה</string>
+    <string name="share_no_password_title">הגדרת ססמה</string>
+    <string name="edit_permission_label">עריכה</string>
+    <string name="share_via_link_hide_file_listing_permission_label">הסתרת רשימת קבצים</string>
     <string name="share_get_public_link_button">קבלת קישור</string>
     <string name="share_with_title">שיתף עם…</string>
     <string name="share_with_edit_title">שיתף עם %1$s</string>
+    <string name="share_via_link_unset_password">ביטול הגדרה</string>
+
+    <string name="share_search">שם, מזהה ענן מאוגד או כתובת דוא״ל…</string>
+
     <string name="search_users_and_groups_hint">חיפוש משתמשים וקבוצות</string>
     <string name="share_group_clarification">%1$s (קבוצה)</string>
     <string name="share_remote_clarification">%1$s (נשלט מרחוק)</string>
+    <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_unshare">ביטול שיתוף</string>
     <string name="share_privilege_can_share">ניתן לשתף</string>
     <string name="share_privilege_can_edit">ניתן לערוך</string>
+    <string name="share_privilege_can_edit_create">הרשאות ליצור</string>
+    <string name="share_privilege_can_edit_change">הרשאות לערוך</string>
+    <string name="share_privilege_can_edit_delete">האשרות למחוק</string>
+
+    <string name="action_retry_uploads">לנסות העלאות שנכשלו מחדש</string>
+    <string name="action_clear_failed_uploads">פינוי העלאות שנכשלו</string>
+    <string name="action_clear_successful_uploads">פינוי העלאות שהצליחו</string>
+    <string name="action_force_rescan">אילוץ סריקה מחדש</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_clear_data">ניקוי מידע</string>
 
+    <string name="permission_storage_access">נדרשות הרשאות נוספות כדי להעלות ולהוריד קבצים</string>
+    <string name="local_file_not_found_message">הקובץ לא נמצא במערכת הקבצים המקומית</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_synced_folders">העלאה אוטומטית</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_contribute_headline">תרומה פעילה</string>
+    <string name="participate_contribute_irc_text">הצטרפות לשיח ב־IRC:</string>
+    <string name="participate_contribute_forum_text">ניתן לסייע לאחרים</string>
+    <string name="participate_contribute_forum_forum">בפורום</string>
+    <string name="participate_contribute_translate_translate">תרגום</string>
+    <string name="participate_contribute_translate_text">היישומון</string>
     <string name="move_to">העבר אל…</string>
     <string name="copy_to">העתק אל…</string>
     <string name="choose_remote_folder">בחר תיקייה…</string>
+    <string name="choose_local_folder">נא לבחור בתיקייה מקומית…</string>
+    <string name="synced_folders_loading_folders">התיקיות נטענות…</string>
+    <string name="synced_folders_no_results">לא נמצאו תיקיות מדיה</string>
+    <string name="synced_folders_preferences">העדפות להעלאה אוטומטית</string>
+    <string name="notifications_loading_activity">ההתרעות נטענות…</string>
+    <string name="notifications_no_results_headline">אין התרעות</string>
+    <string name="notifications_no_results_message">נא לבדוק שוב מאוחר יותר.</string>
+
     <string name="upload_file_dialog_filename">שם קובץ</string>
     <string name="upload_file_dialog_filetype">סוג קובץ</string>
     <string name="storage_description_default">ברירת מחדל</string>
 
+    <!-- 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>
+
+    <string name="welcome_feature_3_title">העלאה אוטומטית</string>
+    <string name="welcome_feature_3_text">הגנה על התמונות שלך</string>
+
+    <string name="whats_new_end_to_end_encryption_title">הצפנה מקצה לקצה</string>
+    <string name="whats_new_end_to_end_encryption_content">יש לגעת כדי להצפין, מכל לקוח. ניתן להוסיף חדשות על ידי העתקת 12 מילים ממקום למקום.</string>
+    <string name="whats_new_resized_images_title">תמונות מסתגלות</string>
+    <string name="whats_new_resized_images_content">תמונות קטנות הן מהירות ועובדות נהדר בשיתוף. ניתן להתקרב כדי להוריד גרסה מלאה.</string>
+    <string name="whats_new_ipv6_title">תמיכה ב־IPv6</string>
+    <string name="whats_new_ipv6_content">שימוש ב־IPv6 כאשר השרת תומך בזה, אם לא אז IPv4.</string>
+
     <string name="whats_new_skip">דלג</string>
 
-    </resources>
+    <!-- User information -->
+    <string name="user_info_email">דוא״ל</string>
+    <string name="user_info_phone">מספר טלפון</string>
+    <string name="user_info_address">כתובת</string>
+    <string name="user_info_website">אתר</string>
+    <string name="user_info_twitter">טוויטר</string>
+
+    <string name="user_information_retrieval_error">שגיאה בקבלת פרטי המשתמש</string>
+
+    <!-- Activities -->
+    <string name="activities_no_results_headline">אין פעילות עדיין</string>
+    <string name="activities_no_results_message">אין אירועים כגון תוספות, שינויים ושיתופים</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_automatic_backup">גיבוי אוטומטי</string>
+    <string name="contacts_last_backup">גיבוי אחרון</string>
+    <string name="contacts_read_permission">נדרשת הרשאה לקריאת רשימת אנשי הקשר</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="drawer_logout">יציאה</string>
+    <string name="picture_set_as_no_app">לא נמצא יישומון להגדיר אתו תמונה</string>
+    <string name="privacy">פרטיות</string>
+    <string name="file_not_found">לא נמצא קובץ</string>
+    <string name="file_not_synced">לא ניתן לסנכרן את הקובץ. הגרסה הזמינה העדכניות ביותר שלו מוצגת.</string>
+
+    <!-- Auto upload -->
+    <string name="autoupload_custom_folder">הגדרת תיקייה בהתאמה אישית</string>
+    <string name="synced_folders_configure_folders">הגדרת תיקיות</string>
+
+    <string name="test_server_button">בדיקת החיבור לשרת</string>
+    <string name="resharing_is_not_allowed">אסור לשתף מחדש</string>
+    <string name="fallback_weblogin_back">חזרה</string>
+    <string name="fallback_weblogin_text">החזרה לשיטת כניסה ישנה</string>
+
+    <string name="foreground_service_upload">קבצים מועלים…</string>
+    <string name="foreground_service_download">קבצים מתקבלים…</string>
+
+    <string name="prefs_sourcecode">קבלת קוד המקור</string>
+    <string name="prefs_license">רישיון</string>
+    <string name="prefs_gpl_v2">הרישיון הציבורי הכללי של GNU, גרסה 2</string>
+    <string name="push_notifications_temp_error">כרגע התרעות בדחיפה אינן זמינות.</string>
+
+    <string name="sync_in_progress">מתקבלת הגרסה העדכנית ביותר של הקובץ.</string>
+    <string name="date_unknown">לא ידוע</string>
+
+    <string name="resized_image_not_possible">אין תמונות מוקטנות זמינות.</string>
+    <string name="resized_image_not_possible_download">אין תמונה מוקטנת. להוריד את התמונה המלאה?</string>
+    <string name="resized_images_download_full_image">להוריד את התמונה המלאה?</string>
+
+    <string name="drawer_current_account">חשבון נוכחי</string>
+    <string name="drawer_middle_account">חשבון אמצעי</string>
+    <string name="drawer_end_account">חשבון אחרון</string>
+    <string name="contactlist_item_icon">סמן משתמש לרשימת אנשי קשר</string>
+    <string name="activity_icon">סמל פעילות</string>
+    <string name="file_icon">סמל קובץ</string>
+    <string name="user_icon">סמל משתמש</string>
+    <string name="favorite_icon">סמל מועדף</string>
+    <string name="shared_via_link_icon">סמל שיתוף דרך קישור</string>
+    <string name="synced_icon">סמל מסונכרן</string>
+    <string name="available_offline_icon">סמל זמינות בלתי מקוונת</string>
+    <string name="checkbox">תיבת סימון</string>
+    <string name="thumbnail">תמונה ממוזערת</string>
+    <string name="shared_icon">סמל משותף</string>
+    <string name="overflow_menu">תפריט צף</string>
+    <string name="share_file_icon">סמל שיתוף קובץ</string>
+    <string name="sort_by_name_ascending">א - ת</string>
+    <string name="sort_by_modification_date_ascending">החדש ביותר ראשון</string>
+    <string name="sort_by_size_descending">הגדול ביותר ראשון</string>
+    <string name="sort_by_size_ascending">הקטן ביותר ראשון</string>
+    <string name="sort_by_name_descending">ת - א</string>
+    <string name="sort_by_modification_date_descending">הישן ביותר ראשון</string>
+    <string name="synced_folders_type">סוג</string>
+    <string name="sync_status_button">כפתור מצב סנכרון</string>
+    <string name="synced_folder_settings_button">כפתור הגדרות</string>
+    <string name="synced_folder_custom_folder_image">תמונת תיקייה בהתאמה אישית</string>
+    <string name="upload_item_action_button">כפתור פעולת העלאת פריט</string>
+    <string name="forward">העברה</string>
+    <string name="what_s_new_image">תמונת מה חדש</string>
+
+    <string name="dev_version_no_information_available">אין מידע זמין.</string>
+    <string name="dev_version_no_new_version_available">לא קיימת גרסה חדשה.</string>
+    <string name="folder_icon">סמל תיקייה</string>
+    <string name="dev_version_new_version_available">קיימת גרסה חדשה</string>
+    <string name="version_dev_download">הורדה</string>
+
+    <string name="send">שליחה</string>
+    <string name="share">שיתוף</string>
+    <string name="link">קישור</string>
+
+    <string name="notification_channel_upload_name">ערוץ דיווחי הלאה</string>
+    <string name="notification_channel_download_name">ערוץ דיווחי הורדה</string>
+    <string name="notification_channel_download_description">מציג תהליך הורדה</string>
+    <string name="notification_channel_upload_description">מציג תהליך העלאה</string>
+    <string name="notification_channel_media_name">נגן מדיה</string>
+    <string name="notification_channel_media_description">התקדמות נגן מדיה</string>
+    <string name="notification_channel_file_sync_name">סנכרון קבצים</string>
+    <string name="notification_channel_file_sync_description">הצגת תהליך סנכרון קבצים ותוצאות</string>
+    <string name="notification_channel_file_observer_name">משגיח קבצים</string>
+    <string name="notification_channel_file_observer_description">מעקב אחר שינויים בקבצים</string>
+  
+    <string name="account_not_found">החשבון לא נמצא!</string>
+
+    <string name="screenshot_01_gridView">בית בטוח לכל הנתונים שלך</string>
+    <string name="screenshot_02_listView">עיון ושיתוף בקבצים שלך בקלות</string>
+    <string name="screenshot_04_accounts">התחברות לחשבונות אחרים</string>
+    <string name="screenshot_05_autoUpload">העלאת התמונות והסרטונים שלך אוטומטית</string>
+    <string name="screenshot_06_davdroid">סנכרון לוח שנה ואנשי קשר עם DAVdroid</string>
+    
+    <string name="userinfo_no_info_headline">לא הוגדרו פרטים אישיים</string>
+    <string name="userinfo_no_info_text">הוספת שם, תמונה ופרטי קשר לעמוד הפרופיל שלך.</string>
+    <string name="drawer_header_background">תמונת רקע של כותרת מגירה</string>
+    <string name="account_icon">סמל חשבון</string>
+    
+    <string name="end_to_end_encryption_folder_not_empty">התיקייה הזאת אינה ריקה</string>
+    <string name="end_to_end_encryption_wrong_password">ההצפנה נכשלה. ססמה שגויה?</string>
+    <string name="end_to_end_encryption_decrypting">מתבצע פענוח…</string>
+    <string name="end_to_end_encryption_retrieving_keys">המפתחות מתקבלים…</string>
+    <string name="end_to_end_encryption_enter_password">נא להקליד ססמה כדי לפענח את המפתח הפרטי.</string>
+    <string name="end_to_end_encryption_generating_keys">נוצרים מפתחות חדשים…</string>
+    <string name="end_to_end_encryption_title">הגדרת הצפנה</string>
+    <string name="end_to_end_encryption_passphrase_title">נא להכין עותק של ססמת ההצפנה שלך המורכבת מ־12 מילים</string>
+    <string name="end_to_end_encryption_not_supported">הצפנה עובדת על KitKat(4.4) ומעלה בלבד.</string>
+    <string name="end_to_end_encryption_not_enabled">הצפנה מקצה לקצה מושבתת בשרת.</string>
+    <string name="end_to_end_encryption_confirm_button">הגדרת הצפנה</string>
+    <string name="end_to_end_encryption_password">ססמה…</string>
+    <string name="end_to_end_encryption_unsuccessful">לא ניתן לשמור מפתחות, נא לנסות שוב.</string>
+    <string name="end_to_end_encryption_dialog_close">סגירה</string>
+    <string name="notification_channel_push_name">התרעות בדחיפה</string>
+    <string name="notification_channel_push_description">הצגת הודעות בדחיפה שנשלחות על ידי השרת: אזכורים בתגובות, קבלת שיתופים מרוחקים חדשים, הכרזות שפורסמו על ידי מנהל ועוד.</string>
+    <string name="sendbutton_description">סמל כפתור שליחה</string>
+    <string name="hint_name">שם</string>
+    <string name="hint_password">ססמה</string>
+    <string name="add_to_cloud">הוספה אל %1$s</string>
+    <string name="upload_files">העלאת קבצים</string>
+    <string name="upload_content_from_other_apps">העלאת תוכן מיישומונים אחרים</string>
+    <string name="create_new_folder">יצירת תיקייה חדשה</string>
+    <string name="uploads_view_upload_status_virus_detected">התגלה וירוס. לא ניתן להשלים העלאה!</string>
+    <string name="tags">תגיות</string>
+    <string name="sharee_add_failed">הוספת נמען השיתוף נכשלה</string>
+    <string name="unsharing_failed">ביטול השיתוף נכשל</string>
+    <string name="updating_share_failed">עדכון השיתוף נכשל</string>
+    <string name="whats_new_device_credentials_title">שימוש באבטחה של התקן ה־Android</string>
+    <string name="whats_new_device_credentials_content">להשתמש בכל דבר כגון תבנית נעילה, ססמה, קוד או טביעת אצבע כדי לאבטח את המידע שלך.</string>
+</resources>

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

@@ -58,7 +58,7 @@
     <string name="recommend_urls">%1$s または %2$s</string>
 
     <string name="auth_check_server">サーバのチェック</string>
-    <string name="auth_host_url">サーバアドレス https://...</string>
+    <string name="auth_host_url">サーバアドレス https://…</string>
     <string name="auth_username">ユーザー名</string>
     <string name="auth_password">パスワード</string>
     <string name="auth_register">Nextcloud をまだ導入していないのですか？\nここをクリックしてプロバイダから取得してください</string>
@@ -87,7 +87,7 @@
     <string name="file_list_empty">コンテンツをアップロードするか、デバイスと同期してください。</string>
     <string name="file_list_empty_favorites_filter_list">お気に入りに登録されたファイルやフォルダがここに表示されます</string>
     <string name="file_list_empty_favorites_filter">お気に入りのファイルが見つかりませんでした。</string>
-    <string name="file_list_loading">読み込み中...</string>
+    <string name="file_list_loading">読み込み中…</string>
     <string name="file_list_no_app_for_file_type">このファイル形式に設定されたアプリがありません。</string>
     <string name="local_file_list_empty">このフォルダにはファイルがありません。</string>
     <string name="local_folder_list_empty">これ以上フォルダがありません。</string>
@@ -123,7 +123,7 @@
     <string name="common_back">戻る</string>
     <string name="common_save">保存</string>
     <string name="common_error">エラー</string>
-    <string name="common_loading">読み込み中...</string>
+    <string name="common_loading">読み込み中…</string>
     <string name="common_unknown">不明</string>
     <string name="common_error_unknown">不明なエラー</string>
     <string name="common_pending">保留中</string>
@@ -133,9 +133,9 @@
     <string name="delete_account_warning">アカウント %s のファイルとアカウントを削除しますか？\n\n削除すると復元はできません。</string>
     <string name="avatar">アバター</string>
     <string name="active_user">アクティブなユーザー</string>
-    <string name="upload_chooser_title">アップロード...</string>
+    <string name="upload_chooser_title">アップロード…</string>
     <string name="uploader_info_dirname">フォルダ名</string>
-    <string name="uploader_upload_in_progress_ticker">アップロード中...</string>
+    <string name="uploader_upload_in_progress_ticker">アップロード中…</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>
@@ -161,7 +161,7 @@
     <string name="uploads_view_upload_status_waiting_for_wifi">Wi-Fi 待機中</string>
     <string name="uploads_view_upload_status_waiting_exit_power_save_mode">省電力モード解除待機中</string>
     <string name="uploads_view_later_waiting_to_upload">アップロード待ち</string>
-    <string name="downloader_download_in_progress_ticker">ダウンロード中...</string>
+    <string name="downloader_download_in_progress_ticker">ダウンロード中…</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>
@@ -222,8 +222,8 @@
     <string name="media_play_pause_description">再生/一時停止ボタン</string>
     <string name="media_forward_description">早送りボタン</string>
 
-    <string name="auth_getting_authorization">承認を受ける...</string>
-    <string name="auth_trying_to_login">ログインする...</string>
+    <string name="auth_getting_authorization">承認を受ける…</string>
+    <string name="auth_trying_to_login">ログインする…</string>
 	<string name="auth_no_net_conn_title">ネットワークに接続されていません</string>
 	<string name="auth_nossl_plain_ok_title">暗号化通信が利用できません。</string>
 	<string name="auth_connection_established">接続が確立しました</string>
@@ -250,7 +250,7 @@
 	<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_connecting_auth_server">認証サーバに接続しています…</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>
@@ -274,10 +274,10 @@
     <string name="filename_forbidden_characters">使用できない文字: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">ファイル名に使用できない文字が含まれています</string>
     <string name="filename_empty">ファイル名は空にできません</string>
-    <string name="wait_a_moment">少々お待ちください...</string>
+    <string name="wait_a_moment">少々お待ちください…</string>
     <string name="wait_checking_credentials">保存された資格情報をチェック</string>
     <string name="filedisplay_no_file_selected">ファイル未選択</string>
-    <string name="activity_chooser_title">リンク送信...</string>
+    <string name="activity_chooser_title">リンク送信…</string>
     <string name="wait_for_tmp_copy_from_private_storage">プライベートストレージからファイルをコピー中</string>
     
     <string name="oauth_check_onoff">OAuth 2.0 でログインする</string>

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

@@ -39,6 +39,7 @@
     <string name="prefs_category_general">일반</string>
     <string name="prefs_category_more">더 보기</string>
     <string name="prefs_manage_accounts">계정 관리</string>
+    <string name="prefs_lock_using_device_credentials">기기 인증 정보</string>
     <string name="prefs_expert_mode">전문가 모드</string>
     <string name="prefs_show_hidden_files">숨겨진 파일 보기</string>
     <string name="prefs_log_delete_history_button">과거 기록 삭제</string>
@@ -87,7 +88,7 @@
     <string name="file_list_empty">콘텐츠를 업로드하거나 기기와 동기화 하십시오.</string>
     <string name="file_list_empty_favorites_filter_list">즐겨찾기 표시한 파일과 폴더가 여기에 나타납니다</string>
     <string name="file_list_empty_favorites_filter">검색 결과에 즐겨찾기 항목이 없습니다.</string>
-    <string name="file_list_loading">불러오는 중...</string>
+    <string name="file_list_loading">불러오는 중…</string>
     <string name="file_list_no_app_for_file_type">이 파일을 위한 앱이 존재하지 않습니다.</string>
     <string name="local_file_list_empty">이 폴더에 파일이 없습니다.</string>
     <string name="local_folder_list_empty">더 이상의 폴더가 없습니다.</string>
@@ -123,7 +124,7 @@
     <string name="common_back">뒤로</string>
     <string name="common_save">저장</string>
     <string name="common_error">오류</string>
-    <string name="common_loading">불러오는 중...</string>
+    <string name="common_loading">불러오는 중…</string>
     <string name="common_unknown">알 수 없음</string>
     <string name="common_error_unknown">알 수 없는 오류</string>
     <string name="common_pending">대기 중</string>
@@ -134,9 +135,9 @@
     <string name="delete_account_warning">%s 계정 및 모든 로컬 파일을 삭제하시겠습니까\n\n삭제 작업은 취소할 수 없습니다.</string>
     <string name="avatar">아바타</string>
     <string name="active_user">활성 사용자</string>
-    <string name="upload_chooser_title">다음에서 업로드...</string>
+    <string name="upload_chooser_title">다음에서 업로드…</string>
     <string name="uploader_info_dirname">폴더 이름</string>
-    <string name="uploader_upload_in_progress_ticker">업로드 중...</string>
+    <string name="uploader_upload_in_progress_ticker">업로드 중…</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>
@@ -162,7 +163,7 @@
     <string name="uploads_view_upload_status_waiting_for_wifi">Wi-Fi 대기 중</string>
     <string name="uploads_view_upload_status_waiting_exit_power_save_mode">배터리 절약 모드 종료를 기다리는 중</string>
     <string name="uploads_view_later_waiting_to_upload">업로드 대기 중</string>
-    <string name="downloader_download_in_progress_ticker">다운로드 중...</string>
+    <string name="downloader_download_in_progress_ticker">다운로드 중…</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>
@@ -223,8 +224,8 @@
     <string name="media_play_pause_description">재생 혹은 일시 정지 단추</string>
     <string name="media_forward_description">빨리감기 단추</string>
 
-    <string name="auth_getting_authorization">인증 중...</string>
-    <string name="auth_trying_to_login">로그인 시도 중...</string>
+    <string name="auth_getting_authorization">인증 중…</string>
+    <string name="auth_trying_to_login">로그인 시도 중…</string>
 	<string name="auth_no_net_conn_title">네트워크에 연결할 수 없음</string>
 	<string name="auth_nossl_plain_ok_title">암호화된 연결을 사용할 수 없습니다.</string>
 	<string name="auth_connection_established">연결됨</string>
@@ -251,11 +252,12 @@
 	<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_connecting_auth_server">인증 서버에 연결…</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="auth_access_failed">접근 실패: %1$s</string>
     <string name="favorite">오프라인 사용 가능으로 설정</string>
     <string name="unfavorite">오프라인 사용 불가능으로 설정</string>
     <string name="favorite_real">즐겨찾기에 추가</string>
@@ -277,14 +279,14 @@
     <string name="filename_forbidden_characters">사용할 수 없는 문자: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">파일 이름에 잘못된 글자가 한 자 이상 있음</string>
     <string name="filename_empty">파일 이름이 비어 있을 수 없음</string>
-    <string name="wait_a_moment">잠시 기다려 주십시오...</string>
+    <string name="wait_a_moment">잠시 기다려 주십시오…</string>
     <string name="wait_checking_credentials">저장된 인증 정보 확인 중</string>
     <string name="filedisplay_no_file_selected">선택한 파일 없음</string>
-    <string name="activity_chooser_title">다음으로 링크 보내기...</string>
+    <string name="activity_chooser_title">다음으로 링크 보내기…</string>
     <string name="wait_for_tmp_copy_from_private_storage">개인 저장소에서 파일 복사</string>
     
     <string name="oauth_check_onoff">OAuth 2.0으로 로그인</string>
-    <string name="oauth_login_connection">OAuth 2.0 서버에 연결 중...</string>
+    <string name="oauth_login_connection">OAuth 2.0 서버에 연결 중…</string>
         
     <string name="ssl_validator_header">서버를 검증할 수 없습니다</string>
     <string name="ssl_validator_reason_cert_not_trusted">- 서버 인증서를 신뢰할 수 없습니다</string>
@@ -377,7 +379,14 @@
     <string name="downloader_download_file_not_found">이 파일을 서버에서 더 이상 사용할 수 없음</string>
 
     <string name="file_migration_dialog_title">저장소 경로 업데이트 중</string>
-    <string name="file_migration_preparing">이전 준비 중...</string>
+    <string name="file_migration_preparing">이전 준비 중…</string>
+    <string name="file_migration_checking_destination">대상 점검 중…</string>
+    <string name="file_migration_saving_accounts_configuration">계정 설정 저장중…</string>
+    <string name="file_migration_waiting_for_unfinished_sync">모든 동기화가 완료되기를 기다리는 중…</string>
+    <string name="file_migration_migrating">데이터 이동 중…</string>
+    <string name="file_migration_updating_index">색인 업데이트 중…</string>
+    <string name="file_migration_cleaning">정리 중…</string>
+    <string name="file_migration_restoring_accounts_configuration">계정 설정 복원 중…</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>
@@ -401,7 +410,9 @@
 	<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="saml_authentication_required_text">암호가 필요함</string>
+    <string name="log_progress_dialog_text">데이터 불러오는 중…</string>
+
+	<string name="saml_authentication_required_text">암호가 필요함</string>
 	<string name="saml_authentication_wrong_pass">잘못된 암호</string>
 	<string name="actionbar_move">이동</string>
     <string name="actionbar_copy">복사</string>
@@ -443,6 +454,8 @@
     <string name="set_picture_as">다음으로 사진 사용</string>
     <string name="set_as">다음으로 설정</string>
 
+    <string name="prefs_instant_behaviour_dialogTitle">원래 파일은</string>
+    <string name="prefs_instant_behaviour_title">원래 파일은…</string>
     <string name="select_all">모두 선택</string>
     <string name="deselect_all">모두 선택 해제</string>
 
@@ -456,6 +469,10 @@
     <string name="share_with_user_section_title">사용자와 그룹과 공유하기</string>
     <string name="share_no_users">사용자와 공유한 데이터 없음</string>
     <string name="share_add_user_or_group">사용자 또는 그룹 추가</string>
+    <string name="share_via_link_edit_permission_label">편집 허용</string>
+    <string name="share_via_link_password_label">암호로 보호</string>
+    <string name="share_via_link_password_title">보호됨</string>
+    <string name="share_via_link_expiration_date_label">만료 날짜 설정</string>
     <string name="share_via_link_section_title">링크 공유</string>
     <string name="share_via_link_hide_file_listing_permission_label">파일 목록 숨김</string>
     <string name="share_get_public_link_button">링크 얻기</string>
@@ -541,6 +558,7 @@
     <string name="welcome_feature_3_title">자동 업로드</string>
     <string name="welcome_feature_3_text">내 사진을 안전하게 보관</string>
 
+    <string name="whats_new_end_to_end_encryption_title">종단간 암호화</string>
     <string name="whats_new_ipv6_title">IPv6 지원</string>
     <string name="whats_new_skip">건너뛰기</string>
 
@@ -682,6 +700,7 @@
     <string name="end_to_end_encryption_title">암호화 설정</string>
     <string name="end_to_end_encryption_passphrase_title">12단어 암구호를 기록해 두십시오</string>
     <string name="end_to_end_encryption_not_supported">암호화 기능은 KitKat(4.4) 이상에서만 지원합니다.</string>
+    <string name="end_to_end_encryption_not_enabled">종단간 암호화가 서버단에서 사용 해제 되어 있습니다.</string>
     <string name="end_to_end_encryption_confirm_button">암호화 설정</string>
     <string name="end_to_end_encryption_dialog_close">닫기</string>
     <string name="end_to_end_encryption_storing_keys">키 저장 중</string>

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

@@ -258,6 +258,7 @@
 	<string name="auth_fail_get_user_name">Je server geeft geen geldige userID terug, neem contact op met je server beheerder</string>
 	<string name="auth_can_not_auth_against_server">Kan niet authenticeren tegen deze server</string>
     <string name="auth_account_does_not_exist">Account bestaat nog niet op dit apparaat</string>
+    <string name="auth_access_failed">Toegang mislukt: %1$s</string>
     <string name="favorite">Offline beschikbaar maken</string>
     <string name="unfavorite">Niet langer offline beschikbaar maken</string>
     <string name="favorite_real">Aan favorieten toevoegen</string>

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

@@ -491,7 +491,7 @@
     <string name="share_get_public_link_button">Pobierz link</string>
     <string name="share_with_title">Współdziel z…</string>
     <string name="share_with_edit_title">Współdziel z %1$s</string>
-    <string name="share_search">Nazwa, ID chmury stowarzyszonej lub adres e-mail...</string>
+    <string name="share_search">Nazwa, ID chmury stowarzyszonej lub adres e-mail…</string>
 
     <string name="search_users_and_groups_hint">Szukaj użytkowników i grup</string>
     <string name="share_group_clarification">%1$s (grupa)</string>
@@ -635,7 +635,7 @@
     <string name="fallback_weblogin_back">Wróć</string>
     <string name="fallback_weblogin_text">Przywróć starą metodę logowania</string>
 
-    <string name="foreground_service_upload">Wysyłanie plików...</string>
+    <string name="foreground_service_upload">Wysyłanie plików…</string>
     <string name="foreground_service_download">Pobieranie plików…</string>
 
     <string name="prefs_sourcecode">Pobierz kod źródłowy</string>
@@ -692,7 +692,7 @@ Wersja Nextcloud Dev jest wersją rozwojową, można ją zainstalować równoleg
 
     <string name="screenshot_01_gridView">Bezpieczny dom dla wszystkich danych</string>
     <string name="end_to_end_encryption_folder_not_empty">Ten folder nie jest pusty</string>
-    <string name="end_to_end_encryption_decrypting">Odszyfrowywanie...</string>
+    <string name="end_to_end_encryption_decrypting">Odszyfrowywanie…</string>
     <string name="end_to_end_encryption_title">Włącz szyfrowanie</string>
     <string name="end_to_end_encryption_not_supported">Szyfrowanie działa tylko na androidzie KitKat(4.4) lub nowszym</string>
     <string name="end_to_end_encryption_confirm_button">Włącz szyfrowanie</string>

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

@@ -94,7 +94,7 @@
     <string name="file_list_empty">Envie um arquivo ou sincronize com seus dispositivos.</string>
     <string name="file_list_empty_favorites_filter_list">Suas pastas e arquivos favoritos serão exibidos aqui.</string>
     <string name="file_list_empty_favorites_filter">Sua pesquisa não retornou nenhum arquivo favorito.</string>
-    <string name="file_list_loading">Carregando...</string>
+    <string name="file_list_loading">Carregando…</string>
     <string name="file_list_no_app_for_file_type">Nenhuma aplicação definida para manipular este tipo de arquivo.</string>
     <string name="local_file_list_empty">Não existe nenhum arquivo nesta pasta.</string>
     <string name="local_folder_list_empty">Não há outras pastas.</string>
@@ -130,7 +130,7 @@
     <string name="common_back">Voltar</string>
     <string name="common_save">Salvar</string>
     <string name="common_error">Erro</string>
-    <string name="common_loading">Carregando...</string>
+    <string name="common_loading">Carregando…</string>
     <string name="common_unknown">desconhecido</string>
     <string name="common_error_unknown">Erro desconhecido</string>
     <string name="common_pending">Pendente</string>
@@ -141,9 +141,9 @@
     <string name="delete_account_warning">Excluir a conta %s e remover todos os arquivos locais?\n\nEsta exclusão não pode ser desfeita.</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Ativar usuário</string>
-    <string name="upload_chooser_title">Enviar de...</string>
+    <string name="upload_chooser_title">Enviar de…</string>
     <string name="uploader_info_dirname">Nome da pasta</string>
-    <string name="uploader_upload_in_progress_ticker">Enviando...</string>
+    <string name="uploader_upload_in_progress_ticker">Enviando…</string>
     <string name="uploader_upload_in_progress_content">%1$d%% enviando %2$s</string>
     <string name="uploader_upload_succeeded_ticker">Enviado</string>
     <string name="uploader_upload_succeeded_content_single">%1$s enviado</string>
@@ -169,7 +169,7 @@
     <string name="uploads_view_upload_status_waiting_for_wifi">Esperando pelo Wi-Fi</string>
     <string name="uploads_view_upload_status_waiting_exit_power_save_mode">Esperando sair do modo de economia de energia</string>
     <string name="uploads_view_later_waiting_to_upload">Aguardando para enviar</string>
-    <string name="downloader_download_in_progress_ticker">Baixando...</string>
+    <string name="downloader_download_in_progress_ticker">Baixando…</string>
     <string name="downloader_download_in_progress_content">%1$d%% Baixando %2$s</string>
     <string name="downloader_download_succeeded_ticker">Baixado</string>
     <string name="downloader_download_succeeded_content">%1$s baixado</string>
@@ -235,8 +235,8 @@
     <string name="media_play_pause_description">Botão reproduzir ou pausar</string>
     <string name="media_forward_description">Botão de avanço rápido</string>
 
-    <string name="auth_getting_authorization">Obtendo autorização...</string>
-    <string name="auth_trying_to_login">Tentando logar...</string>
+    <string name="auth_getting_authorization">Obtendo autorização…</string>
+    <string name="auth_trying_to_login">Tentando logar…</string>
 	<string name="auth_no_net_conn_title">Sem conexão de rede</string>
 	<string name="auth_nossl_plain_ok_title">Conexão segura indisponível.</string>
 	<string name="auth_connection_established">Conexão estabelecida</string>
@@ -263,11 +263,14 @@
 	<string name="auth_expired_oauth_token_toast">Sua autorização expirou. Por favor, autorize novamente</string>
 	<string name="auth_expired_basic_auth_toast">Por favor, digite a senha atual</string>
 	<string name="auth_expired_saml_sso_token_toast">Sua sessão expirou. Por favor, conecte-se novamente</string>
-    <string name="auth_connecting_auth_server">Conectando ao servidor de autenticação...</string>
+    <string name="auth_connecting_auth_server">Conectando ao servidor de autenticação…</string>
 	<string name="auth_unsupported_multiaccount">%1$s não suporta múltiplas contas</string>
 	<string name="auth_fail_get_user_name">Seu servidor não está retornando uma ID correta de usuário, contacte o administrador</string>
 	<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 não está adicionada neste dispositivo ainda</string>
+    <string name="auth_access_failed">O acesso falhou: %1$s</string>
+    <string name="auth_illegal_login_used">URL ilegal de dados de login utilizada</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">Adicionar aos favoritos</string>
@@ -289,14 +292,14 @@
     <string name="filename_forbidden_characters">Caracteres proibidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">O nome de arquivo contém um caractere inválido pelo menos</string>
     <string name="filename_empty">O nome de arquivo não pode ser vazio</string>
-    <string name="wait_a_moment">Aguarde um momento...</string>
+    <string name="wait_a_moment">Aguarde um momento…</string>
     <string name="wait_checking_credentials">Verificando credenciais salvas</string>
     <string name="filedisplay_no_file_selected">Nenhum arquivo selecionado</string>
-    <string name="activity_chooser_title">Enviar o link para...</string>
+    <string name="activity_chooser_title">Enviar o link para…</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copiando o arquivo da armazenagem privada</string>
     
     <string name="oauth_check_onoff">Entrar com OAuth 2.0</string>
-    <string name="oauth_login_connection">Conectando ao servidor OAuth 2.0...</string>
+    <string name="oauth_login_connection">Conectando ao servidor OAuth 2.0…</string>
         
     <string name="ssl_validator_header">A identidade do servidor não pôde ser verificada</string>
     <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor não é confiável</string>
@@ -389,14 +392,14 @@
     <string name="downloader_download_file_not_found">Este arquivo não está mais disponível neste servidor</string>
 
     <string name="file_migration_dialog_title">Atualizando caminho do armazenamento</string>
-    <string name="file_migration_preparing">Preparando migração...</string>
-    <string name="file_migration_checking_destination">Verificando destino...</string>
-    <string name="file_migration_saving_accounts_configuration">Salvando configuração da conta...</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Aguardando sincronização completa...</string>
-    <string name="file_migration_migrating">Movendo dados...</string>
-    <string name="file_migration_updating_index">Atualizando índice...</string>
-    <string name="file_migration_cleaning">Limpando...</string>
-    <string name="file_migration_restoring_accounts_configuration">Restaurando configuração da conta...</string>
+    <string name="file_migration_preparing">Preparando migração…</string>
+    <string name="file_migration_checking_destination">Verificando destino…</string>
+    <string name="file_migration_saving_accounts_configuration">Salvando configuração da conta…</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Aguardando sincronização completa…</string>
+    <string name="file_migration_migrating">Movendo dados…</string>
+    <string name="file_migration_updating_index">Atualizando índice…</string>
+    <string name="file_migration_cleaning">Limpando…</string>
+    <string name="file_migration_restoring_accounts_configuration">Restaurando configuração da conta…</string>
     <string name="file_migration_ok_finished">Finalizado</string>
     <string name="file_migration_failed_not_enough_space">Mais espaço é necessário</string>
     <string name="file_migration_failed_not_writable">Não foi possível gravar o arquivo de destino</string>
@@ -420,7 +423,7 @@
 	<string name="log_send_history_button">Enviar histórico</string>
 	<string name="log_send_no_mail_app">Nenhum aplicativo para enviar registros foi encontrado. Por favor instale um cliente de email.</string>
 	<string name="log_send_mail_subject">%1$s logs do aplicativo Android</string>
-    <string name="log_progress_dialog_text">Carregando dados...</string>
+    <string name="log_progress_dialog_text">Carregando dados…</string>
 
 	<string name="saml_authentication_required_text">Senha requerida</string>
 	<string name="saml_authentication_wrong_pass">Senha incorreta</string>
@@ -466,8 +469,8 @@
     <string name="set_picture_as">Usar imagem como</string>
     <string name="set_as">Definir como</string>
 
-    <string name="prefs_instant_behaviour_dialogTitle">Arquivo original será...</string>
-    <string name="prefs_instant_behaviour_title">Arquivo original será...</string>
+    <string name="prefs_instant_behaviour_dialogTitle">Arquivo original será…</string>
+    <string name="prefs_instant_behaviour_title">Arquivo original será…</string>
     <string name="select_all">Selecionar tudo</string>
     <string name="deselect_all">Desmarcar todos</string>
 
@@ -494,11 +497,11 @@
     <string name="edit_permission_label">editar</string>
     <string name="share_via_link_hide_file_listing_permission_label">Ocultar a listagem de arquivos</string>
     <string name="share_get_public_link_button">Obter link</string>
-    <string name="share_with_title">Compartilhar com...</string>
+    <string name="share_with_title">Compartilhar com…</string>
     <string name="share_with_edit_title">Compartilhar com %1$s</string>
     <string name="share_via_link_unset_password">Não definido</string>
 
-    <string name="share_search">Nome, ID da nuvem federada ou email...</string>
+    <string name="share_search">Nome, ID da nuvem federada ou email…</string>
 
     <string name="search_users_and_groups_hint">Pesquisar usuários e grupos</string>
     <string name="share_group_clarification">%1$s (grupo)</string>
@@ -557,11 +560,11 @@
     <string name="participate_rc_fdroid">Obtenha a versão de teste do F-Droid</string>
     <string name="participate_dev_fdroid">Obtenha a versão de desenvolvimento do F-Droid</string>
     <string name="participate_dev_direct_download">Baixe a versão de desenvolvimento diretamente</string>
-    <string name="move_to">Mover para...</string>
-    <string name="copy_to">Copiar para...</string>
-    <string name="choose_remote_folder">Escolher pasta remota...</string>
-    <string name="choose_local_folder">Escolher pasta local...</string>
-    <string name="synced_folders_loading_folders">Carregando pastas...</string>
+    <string name="move_to">Mover para…</string>
+    <string name="copy_to">Copiar para…</string>
+    <string name="choose_remote_folder">Escolher pasta remota…</string>
+    <string name="choose_local_folder">Escolher pasta local…</string>
+    <string name="synced_folders_loading_folders">Carregando pastas…</string>
     <string name="synced_folders_no_results">Nenhuma pasta de mídia encontrada.</string>
     <string name="synced_folders_preferences">Preferências do auto envio</string>
     <string name="synced_folders_new_info">O envio instantâneo foi completamente renovado. Reconfigure seu auto envio no menu principal.\n\nDesfrute do novo envio automático e estendido.</string>
@@ -571,7 +574,7 @@
         <item quantity="other">%d selecionados</item>
     </plurals>
 
-    <string name="notifications_loading_activity">Carregando notificações...</string>
+    <string name="notifications_loading_activity">Carregando notificações…</string>
     <string name="notifications_no_results_headline">Não há notificações</string>
     <string name="notifications_no_results_message">Por favor verifique mais tarde.</string>
 
@@ -653,8 +656,8 @@
     <string name="fallback_weblogin_back">Voltar</string>
     <string name="fallback_weblogin_text">Voltar ao antigo método de login</string>
 
-    <string name="foreground_service_upload">Enviando arquivos...</string>
-    <string name="foreground_service_download">Baixando arquivos...</string>
+    <string name="foreground_service_upload">Enviando arquivos…</string>
+    <string name="foreground_service_download">Baixando arquivos…</string>
 
     <string name="prefs_sourcecode">Obter código fonte</string>
     <string name="prefs_license">Licença</string>
@@ -744,17 +747,17 @@
     
     <string name="end_to_end_encryption_folder_not_empty">Esta pasta não está vazia.</string>
     <string name="end_to_end_encryption_wrong_password">Erro descriptografando. Senha errada?</string>
-    <string name="end_to_end_encryption_decrypting">Descriptografando...</string>
-    <string name="end_to_end_encryption_retrieving_keys">Retornando chaves...</string>
+    <string name="end_to_end_encryption_decrypting">Descriptografando…</string>
+    <string name="end_to_end_encryption_retrieving_keys">Retornando chaves…</string>
     <string name="end_to_end_encryption_enter_password">Digite a senha para descriptografar a chave privada.</string>
-    <string name="end_to_end_encryption_generating_keys">Gerando novas chaves...</string>
+    <string name="end_to_end_encryption_generating_keys">Gerando novas chaves…</string>
     <string name="end_to_end_encryption_keywords_description">Todas as 12 palavras juntas fazem uma senha muito forte, permitindo que você use seus arquivos criptografados. Por favor escreva e mantenha-as em um lugar seguro.</string>
     <string name="end_to_end_encryption_title">Definir criptografia</string>
     <string name="end_to_end_encryption_passphrase_title">Anote sua senha de criptografia de 12 palavras</string>
     <string name="end_to_end_encryption_not_supported">A criptografia só funciona no KitKat (4.4) e acima.</string>
     <string name="end_to_end_encryption_not_enabled">Criptografia de ponta-a-ponta desativada no servidor.</string>
     <string name="end_to_end_encryption_confirm_button">Definir criptografia</string>
-    <string name="end_to_end_encryption_password">Senha...</string>
+    <string name="end_to_end_encryption_password">Senha…</string>
     <string name="end_to_end_encryption_unsuccessful">Não foi possível salvar as chaves, tente novamente.</string>
     <string name="end_to_end_encryption_dialog_close">Fechar</string>
     <string name="end_to_end_encryption_storing_keys">Armazenando chaves</string>

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

@@ -258,6 +258,7 @@
 	<string name="auth_fail_get_user_name">Serveri juaj nuk kthen ID e saktë të përdoruesit, ju lutemi kontaktoni nje administrator</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">Kjo llogari nuk është shtuar në këtë paisje akoma</string>
+    <string name="auth_access_failed">Hyrja dështoi: %1$s</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">U shtua te të parapëlqyerat</string>

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

@@ -39,6 +39,13 @@
     <string name="prefs_category_general">Опште</string>
     <string name="prefs_category_more">Остало</string>
     <string name="prefs_manage_accounts">Управљање налозима</string>
+    <string name="prefs_lock">Закључавање</string>
+    <string name="prefs_lock_title">Закључај користећи</string>
+    <string name="prefs_lock_none">Ништа</string>
+    <string name="prefs_lock_using_passcode">Код</string>
+    <string name="prefs_lock_using_device_credentials">Акредитиве уређаја</string>
+    <string name="prefs_lock_device_credentials_enabled">Укључени акредитиви уређаја</string>
+    <string name="prefs_lock_device_credentials_not_setup">Нема подешених акредитива уређаја.</string>
     <string name="prefs_expert_mode">Експертски режим</string>
     <string name="prefs_show_hidden_files">Прикажи скривене фајлове</string>
     <string name="prefs_log_delete_history_button">Обриши историјат</string>
@@ -198,6 +205,9 @@
     <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="default_credentials_wrong">Неисправни акредитиви</string>
+    <string name="credentials_disabled">Акредитиви искључени</string>
+    
     <string name="pass_code_configure_your_pass_code">Унесите код за закључавање</string>
     <string name="pass_code_configure_your_pass_code_explanation">Код ће бити затражен сваки пут кад се апликација покрене</string>
     <string name="pass_code_reenter_your_pass_code">Поново унесите кôд за закључавање</string>
@@ -260,6 +270,9 @@
 	<string name="auth_fail_get_user_name">Сервер не враћа исправну идентификацију корисника, контактирајте администратора</string>
 	<string name="auth_can_not_auth_against_server">Не могу да аутентификујем са овим сервером</string>
     <string name="auth_account_does_not_exist">Налог још није додат на овај уређај</string>
+    <string name="auth_access_failed">Неуспео приступ: %1$s</string>
+    <string name="auth_illegal_login_used">Искоришћена неисправна адреса за податке пријаве</string>
+
     <string name="favorite">Постави као доступно и ван мреже</string>
     <string name="unfavorite">Склони да буде доступно и ван мреже</string>
     <string name="favorite_real">Додај у омиљене</string>
@@ -771,4 +784,6 @@
     <string name="sharee_add_failed">Додавање особе за дељење није успело</string>
     <string name="unsharing_failed">Уклањање дељења није успело</string>
     <string name="updating_share_failed">Ажурирање дељења није успело</string>
-    </resources>
+    <string name="whats_new_device_credentials_title">Користи Андроид заштиту уређаја</string>
+    <string name="whats_new_device_credentials_content">Користите било шта попут шаблона, лозинке, пина или отиска Вашег прста да заштитите Ваше податке.</string>
+</resources>

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

@@ -39,6 +39,13 @@
     <string name="prefs_category_general">Genel</string>
     <string name="prefs_category_more">Daha fazla</string>
     <string name="prefs_manage_accounts">Hesap yönetimi</string>
+    <string name="prefs_lock">Kilitle</string>
+    <string name="prefs_lock_title">Şununla kilitle</string>
+    <string name="prefs_lock_none">Yok</string>
+    <string name="prefs_lock_using_passcode">Parola</string>
+    <string name="prefs_lock_using_device_credentials">Aygıt kimlik doğrulama bilgileri</string>
+    <string name="prefs_lock_device_credentials_enabled">Aygıt kimlik doğrulama bilgileri kullanılıyor</string>
+    <string name="prefs_lock_device_credentials_not_setup">Herhangi bir aygıt kimliği doğrulama bilgisi ayarlanmamış</string>
     <string name="prefs_expert_mode">Uzman kipi</string>
     <string name="prefs_show_hidden_files">Gizli dosyaları görüntüle</string>
     <string name="prefs_log_delete_history_button">Geçmişi sil</string>
@@ -196,6 +203,9 @@
     <string name="foreign_files_remote_text">Uzak: %1$s</string>
     <string name="upload_query_move_foreign_files">Seçilmiş dosyaları %1$s klasörüne kopyalamak için yeterli boş alan yok. Bu dosyaları kopyalamak yerine taşımak ister misiniz?</string>
     <string name="pass_code_enter_pass_code">Lütfen parolanızı yazın</string>
+    <string name="default_credentials_wrong">Kimlik doğrulama bilgileri hatalı</string>
+    <string name="credentials_disabled">Kimlik doğrulama bilgileri kullanılmıyor</string>
+    
     <string name="pass_code_configure_your_pass_code">Parolanızı yazın</string>
     <string name="pass_code_configure_your_pass_code_explanation">Parola uygulama her başlatıldığında sorulacak</string>
     <string name="pass_code_reenter_your_pass_code">Lütfen parolanızı yeniden yazın</string>
@@ -258,6 +268,9 @@
 	<string name="auth_fail_get_user_name">Sunucunuz doğru bir kullanıcı kodu döndürmüyor, lütfen bir yönetici ile görüşün</string>
 	<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="auth_access_failed">Erişilemedi: %1$s</string>
+    <string name="auth_illegal_login_used">Kullanılan veri adresi geçersiz</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>
@@ -766,4 +779,6 @@
     <string name="sharee_add_failed">Paylaşım eklenemedi</string>
     <string name="unsharing_failed">Paylaşımdan kaldırılamadı</string>
     <string name="updating_share_failed">Paylaşım güncellenemedi</string>
-    </resources>
+    <string name="whats_new_device_credentials_title">Android aygıt koruması kullanılsın</string>
+    <string name="whats_new_device_credentials_content">Verilerinizin güvenliğini sağlamak için bir şekil, parola, pin ya da parmak izi kullanabilirsiniz.</string>
+</resources>