Merge branch 'master' into sso

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 3.2.4 (Sept, 04, 2018)
+fix push notification on gplay release
+
+## 3.2.3 (Aug, 21, 2018)
+- Fix crash on Android Android 4.x
+
+## 3.2.2 (Aug, 20, 2018)
+- New simple signup screen
+
 ## 3.2.1 (June, 11, 2018)
 - Enhanced file detail/sharing screen for mail-shares
 - Fix local sorting and file selection

build.gradle

@@ -129,8 +129,8 @@ android {
             versionDev {
                 applicationId "com.nextcloud.android.beta"
                 dimension "default"
-                versionCode 20180825
-                versionName "20180825"
+                versionCode 20180903
+                versionName "20180903"
             }
         }
     }

drawable_resources/ic_history.svg

@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16">
-    <path
-        d="m9.025 1.08c-3.95 0-6.535 3.447-6.364 6.72h-2.161l3.904 3.92 4.08-3.874h-2.147c-0.237-1.7 1.163-3.114 2.689-3.092 1.595 0.024 2.8 1.23 2.8 2.734 0.09 1.594-1.63 3.428-3.966 2.53 0 1.23 0.003 2.545 0 3.765 4.19 0.83 7.64-2.51 7.64-6.25 0-3.563-2.92-6.453-6.475-6.453z"/>
+    <path style="fill:#757575"
+          d="m9.025 1.08c-3.95 0-6.535 3.447-6.364 6.72h-2.161l3.904 3.92 4.08-3.874h-2.147c-0.237-1.7 1.163-3.114 2.689-3.092 1.595 0.024 2.8 1.23 2.8 2.734 0.09 1.594-1.63 3.428-3.966 2.53 0 1.23 0.003 2.545 0 3.765 4.19 0.83 7.64-2.51 7.64-6.25 0-3.563-2.92-6.453-6.475-6.453z"/>
 </svg>

lint.xml

@@ -143,5 +143,63 @@
         <ignore path="**/values-cs-rCZ/strings.xml"/>
         <ignore path="**/values-en-rGB/strings.xml"/>
     </issue>
+	
+	<issue id="Typos">
+        <ignore path="**/values-b+en+001/strings.xml"/>
+        <ignore path="**/values-pt-rPT/strings.xml"/>
+        <ignore path="**/values-ro/strings.xml"/>
+        <ignore path="**/values-zh-rCN/strings.xml"/>
+        <ignore path="**/values-bg-rBG/strings.xml"/>
+        <ignore path="**/values-nb-rNO/strings.xml"/>
+        <ignore path="**/values-es/strings.xml"/>
+        <ignore path="**/values-fa/strings.xml"/>
+        <ignore path="**/values-ko/strings.xml"/>
+        <ignore path="**/values-ru/strings.xml"/>
+        <ignore path="**/values-ast/strings.xml"/>
+        <ignore path="**/values-es-rCO/strings.xml"/>
+        <ignore path="**/values-es-rCL/strings.xml"/>
+        <ignore path="**/values-es-rSV/strings.xml"/>
+        <ignore path="**/values-sv/strings.xml"/>
+        <ignore path="**/values-tr/strings.xml"/>
+        <ignore path="**/values-es-rUY/strings.xml"/>
+        <ignore path="**/values-es-rGT/strings.xml"/>
+        <ignore path="**/values-fr/strings.xml"/>
+        <ignore path="**/values-es-rMX/strings.xml"/>
+        <ignore path="**/values-fi-rFI/strings.xml"/>
+        <ignore path="**/values-ar/strings.xml"/>
+        <ignore path="**/values-es-rAR/strings.xml"/>
+        <ignore path="**/values-de-rDE/strings.xml"/>
+        <ignore path="**/values-ca/strings.xml"/>
+        <ignore path="**/values-is/strings.xml"/>
+        <ignore path="**/values-es-rNI/strings.xml"/>
+        <ignore path="**/values-es-rPR/strings.xml"/>
+        <ignore path="**/values-es-rDO/strings.xml"/>
+        <ignore path="**/values-sq/strings.xml"/>
+        <ignore path="**/values-pt-rBR/strings.xml"/>
+        <ignore path="**/values-ja-rJP/strings.xml"/>
+        <ignore path="**/values-sr/strings.xml"/>
+        <ignore path="**/values-it/strings.xml"/>
+        <ignore path="**/values-hu-rHU/strings.xml"/>
+        <ignore path="**/values-pl/strings.xml"/>
+        <ignore path="**/values-es-rHN/strings.xml"/>
+        <ignore path="**/values-lt-rLT/strings.xml"/>
+        <ignore path="**/values-es-rPA/strings.xml"/>
+        <ignore path="**/values-nl/strings.xml"/>
+        <ignore path="**/values-sk-rSK/strings.xml"/>
+        <ignore path="**/values-ka-rGE/strings.xml"/>
+        <ignore path="**/values-eu/strings.xml"/>
+        <ignore path="**/values-es-rCR/strings.xml"/>
+        <ignore path="**/values-da/strings.xml"/>
+        <ignore path="**/values-es-rEC/strings.xml"/>
+        <ignore path="**/values-de/strings.xml"/>
+        <ignore path="**/values-sl/strings.xml"/>
+        <ignore path="**/values-es-rPY/strings.xml"/>
+        <ignore path="**/values-es-rPE/strings.xml"/>
+        <ignore path="**/values-zh-rTW/strings.xml"/>
+        <ignore path="**/values-el/strings.xml"/>
+        <ignore path="**/values-id/strings.xml"/>
+        <ignore path="**/values-cs-rCZ/strings.xml"/>
+        <ignore path="**/values-en-rGB/strings.xml"/>
+    </issue>
 
 </lint>

scripts/analysis/analysis-wrapper.sh

@@ -49,8 +49,9 @@ else
         curl 2>/dev/null -u $1:$2 -X DELETE https://api.github.com/repos/nextcloud/android/issues/comments/$comment
     done
     
-    # check library
-    if [ $(grep "android-library:master" build.gradle -c) -ne 3 ]; then
+    # check library, only if base branch is master
+    baseBranch=$(scripts/analysis/getBranchBase.sh $1 $2 $7 | tr -d "\"")
+    if [ $baseBranch = "master" -a $(grep "android-library:master" build.gradle -c) -ne 3 ]; then
         checkLibraryMessage="<h1>Android-library is not set to master branch in build.gradle</h1>"
         checkLibrary=1
     else 

scripts/analysis/getBranchBase.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# $1: username, $2: password/token, $3: pull request number
+
+if [ -z $3 ] ; then
+    echo "master";
+else
+    curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/android/pulls/$3 | jq .base.ref
+fi

scripts/analysis/lint-results.txt

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

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

@@ -342,7 +342,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         } else {
             setContentView(R.layout.account_setup_webview);
             mLoginWebView = findViewById(R.id.login_webview);
-            initWebViewLogin(webloginUrl, showLegacyLogin);
+            initWebViewLogin(webloginUrl, showLegacyLogin, false);
         }
 
         initServerPreFragment(savedInstanceState);
@@ -369,7 +369,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }
 
     @SuppressLint("SetJavaScriptEnabled")
-    private void initWebViewLogin(String baseURL, boolean showLegacyLogin) {
+    private void initWebViewLogin(String baseURL, boolean showLegacyLogin, boolean useGenericUserAgent) {
         mLoginWebView.setVisibility(View.GONE);
 
         final ProgressBar progressBar = findViewById(R.id.login_webview_progress_bar);
@@ -377,7 +377,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mLoginWebView.getSettings().setAllowFileAccess(false);
         mLoginWebView.getSettings().setJavaScriptEnabled(true);
         mLoginWebView.getSettings().setDomStorageEnabled(true);
-        mLoginWebView.getSettings().setUserAgentString(getWebLoginUserAgent());
+        
+        if (useGenericUserAgent) {
+            mLoginWebView.getSettings().setUserAgentString(MainApp.getNextcloudUserAgent());
+        } else {
+            mLoginWebView.getSettings().setUserAgentString(getWebLoginUserAgent());
+        }
         mLoginWebView.getSettings().setSaveFormData(false);
         mLoginWebView.getSettings().setSavePassword(false);
 
@@ -978,7 +983,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             webViewLoginMethod = true;
             setContentView(R.layout.account_setup_webview);
             mLoginWebView = findViewById(R.id.login_webview);
-            initWebViewLogin(getString(R.string.provider_registration_server), false);
+            initWebViewLogin(getString(R.string.provider_registration_server), false, true);
         }
     }
 
@@ -1470,7 +1475,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
                 setContentView(R.layout.account_setup_webview);
                 mLoginWebView = findViewById(R.id.login_webview);
-                initWebViewLogin(mServerInfo.mBaseUrl + WEB_LOGIN, true);
+                initWebViewLogin(mServerInfo.mBaseUrl + WEB_LOGIN, true, false);
             } else {
                 // show old login
                 setOldLoginVisibility(View.VISIBLE);
@@ -1802,7 +1807,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         } else {    // authorization fail due to client side - probably wrong credentials
             if (webViewLoginMethod) {
                 mLoginWebView = findViewById(R.id.login_webview);
-                initWebViewLogin(mServerInfo.mBaseUrl + WEB_LOGIN, true);
+                initWebViewLogin(mServerInfo.mBaseUrl + WEB_LOGIN, true, false);
 
                 DisplayUtils.showSnackMessage(this, mLoginWebView, R.string.auth_access_failed, result.getLogMessage());
             } else {

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

@@ -455,9 +455,16 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
                 UserInfoActivity.openAccountRemovalConfirmationDialog(getAccount(), getFragmentManager(), true);
                 break;
             case R.id.drawer_menu_account_add:
-                Intent firstRunIntent = new Intent(getApplicationContext(), FirstRunActivity.class);
-                firstRunIntent.putExtra(FirstRunActivity.EXTRA_ALLOW_CLOSE, true);
-                startActivity(firstRunIntent);
+                boolean isProviderOrOwnInstallationVisible = getResources()
+                        .getBoolean(R.bool.show_provider_or_own_installation);
+
+                if (isProviderOrOwnInstallationVisible) {
+                    Intent firstRunIntent = new Intent(getApplicationContext(), FirstRunActivity.class);
+                    firstRunIntent.putExtra(FirstRunActivity.EXTRA_ALLOW_CLOSE, true);
+                    startActivity(firstRunIntent);
+                } else {
+                    createAccount(false);
+                }
                 break;
             case R.id.drawer_menu_account_manage:
                 Intent manageAccountsIntent = new Intent(getApplicationContext(), ManageAccountsActivity.class);

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

@@ -123,6 +123,7 @@ import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 import com.owncloud.android.ui.preview.PreviewTextFragment;
 import com.owncloud.android.ui.preview.PreviewVideoActivity;
+import com.owncloud.android.utils.ClipboardUtil;
 import com.owncloud.android.utils.DataHolderUtil;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
@@ -276,9 +277,7 @@ public class FileDisplayActivity extends HookActivity
                                 PermissionUtil.requestWriteExternalStoreagePermission(FileDisplayActivity.this);
                             }
                         });
-
                 ThemeUtils.colorSnackbar(this, snackbar);
-
                 snackbar.show();
             } else {
                 // No explanation needed, request the permission.
@@ -1907,9 +1906,6 @@ public class FileDisplayActivity extends HookActivity
         if (result.isSuccess()) {
             updateFileFromDB();
 
-            // Create dialog to allow the user choose an app to send the link
-            Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
-
             // if share to user and share via link multiple ocshares are returned,
             // therefore filtering for public_link
             String link = "";
@@ -1921,43 +1917,7 @@ public class FileDisplayActivity extends HookActivity
                 }
             }
 
-            intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
-            intentToShareLink.setType("text/plain");
-
-            String username;
-            try {
-                OwnCloudAccount oca = new OwnCloudAccount(getAccount(), this);
-                if (oca.getDisplayName() != null && !oca.getDisplayName().isEmpty()) {
-                    username = oca.getDisplayName();
-                } else {
-                    username = AccountUtils.getUsernameForAccount(getAccount());
-                }
-            } catch (Exception e) {
-                username = AccountUtils.getUsernameForAccount(getAccount());
-            }
-
-            if (username != null) {
-                intentToShareLink.putExtra(
-                        Intent.EXTRA_SUBJECT,
-                        getString(
-                                R.string.subject_user_shared_with_you,
-                                username,
-                                getFile().getFileName()
-                        )
-                );
-            } else {
-                intentToShareLink.putExtra(
-                        Intent.EXTRA_SUBJECT,
-                        getString(
-                                R.string.subject_shared_with_you,
-                                getFile().getFileName()
-                        )
-                );
-            }
-
-            String[] packagesToExclude = new String[]{getPackageName()};
-            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
-            chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+            copyAndShareFileLink(link);
 
             if (fileDetailFragment != null && fileDetailFragment.getFileDetailSharingFragment() != null) {
                 fileDetailFragment.getFileDetailSharingFragment().refreshPublicShareFromDB();
@@ -1983,15 +1943,71 @@ public class FileDisplayActivity extends HookActivity
                 if (fileDetailFragment != null && fileDetailFragment.getFileDetailSharingFragment() != null) {
                     fileDetailFragment.getFileDetailSharingFragment().refreshPublicShareFromDB();
                 }
-                Snackbar.make(
+                Snackbar snackbar = Snackbar.make(
                         findViewById(android.R.id.content),
                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                         Snackbar.LENGTH_LONG
-                ).show();
+                );
+                ThemeUtils.colorSnackbar(this, snackbar);
+                snackbar.show();
             }
         }
     }
 
+    private void copyAndShareFileLink(String link) {
+        ClipboardUtil.copyToClipboard(this, link, false);
+        Snackbar snackbar = Snackbar.make(
+                findViewById(android.R.id.content),
+                R.string.clipboard_text_copied,
+                Snackbar.LENGTH_LONG
+        ).setAction(R.string.share, v -> showShareLinkDialog(link));
+        ThemeUtils.colorSnackbar(this, snackbar);
+        snackbar.show();
+    }
+
+    public void showShareLinkDialog(String link) {
+        // Create dialog to allow the user choose an app to send the link
+        Intent intentToShareLink = new Intent(Intent.ACTION_SEND);
+
+        intentToShareLink.putExtra(Intent.EXTRA_TEXT, link);
+        intentToShareLink.setType("text/plain");
+
+        String username;
+        try {
+            OwnCloudAccount oca = new OwnCloudAccount(getAccount(), this);
+            if (oca.getDisplayName() != null && !oca.getDisplayName().isEmpty()) {
+                username = oca.getDisplayName();
+            } else {
+                username = AccountUtils.getUsernameForAccount(getAccount());
+            }
+        } catch (Exception e) {
+            username = AccountUtils.getUsernameForAccount(getAccount());
+        }
+
+        if (username != null) {
+            intentToShareLink.putExtra(
+                    Intent.EXTRA_SUBJECT,
+                    getString(
+                            R.string.subject_user_shared_with_you,
+                            username,
+                            getFile().getFileName()
+                    )
+            );
+        } else {
+            intentToShareLink.putExtra(
+                    Intent.EXTRA_SUBJECT,
+                    getString(
+                            R.string.subject_shared_with_you,
+                            getFile().getFileName()
+                    )
+            );
+        }
+
+        String[] packagesToExclude = new String[]{getPackageName()};
+        DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
+        chooserDialog.show(getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+    }
+
     private void onUpdateShareInformation(RemoteOperationResult result, @StringRes int errorString) {
         Fragment fileDetailFragment = getSecondFragment();
 
@@ -1999,7 +2015,9 @@ public class FileDisplayActivity extends HookActivity
             updateFileFromDB();
             refreshListOfFilesFragment(false);
         } else if (fileDetailFragment.getView() != null) {
-            Snackbar.make(fileDetailFragment.getView(), errorString, Snackbar.LENGTH_LONG).show();
+            Snackbar snackbar = Snackbar.make(fileDetailFragment.getView(), errorString, Snackbar.LENGTH_LONG);
+            ThemeUtils.colorSnackbar(this, snackbar);
+            snackbar.show();
         }
 
         if (fileDetailFragment != null && fileDetailFragment instanceof FileDetailFragment) {

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

@@ -168,6 +168,13 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
     }
 
     public static boolean runIfNeeded(Context context) {
+        boolean isProviderOrOwnInstallationVisible = context.getResources()
+                .getBoolean(R.bool.show_provider_or_own_installation);
+
+        if (!isProviderOrOwnInstallationVisible) {
+            return false;
+        }
+        
         if (context instanceof FirstRunActivity) {
             return false;
         }

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

@@ -276,7 +276,7 @@ public class ManageAccountsActivity extends FileActivity
         startActivity(firstRunIntent);
     }
 
-    //    @Override
+    @Override
     public void createAccount() {
         AccountManager am = AccountManager.get(getApplicationContext());
         am.addAccount(MainApp.getAccountType(this),

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

@@ -249,10 +249,8 @@ public class NotificationsActivity extends FileActivity {
         recyclerView.setAdapter(adapter);
 
         LinearLayoutManager layoutManager = new LinearLayoutManager(this);
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this, layoutManager.getOrientation());
 
         recyclerView.setLayoutManager(layoutManager);
-        recyclerView.addItemDecoration(dividerItemDecoration);
 
         BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation_view);
 

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

@@ -148,7 +148,6 @@ public class UserInfoActivity extends FileActivity {
         updateActionBarTitleAndHomeButtonByString("");
 
         mUserInfoList.setAdapter(new UserInfoAdapter(null, ThemeUtils.primaryColor(getAccount(), true, this)));
-        mUserInfoList.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
 
         if (userInfo != null) {
             populateUserInfoUi(userInfo);

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

@@ -127,7 +127,15 @@ public class AccountListAdapter extends ArrayAdapter<AccountListItem> implements
         ((ImageView) actionView.findViewById(R.id.user_icon)).setImageResource(R.drawable.ic_account_plus);
 
         // bind action listener
-        actionView.setOnClickListener(v -> mListener.showFirstRunActivity());
+        boolean isProviderOrOwnInstallationVisible = mContext.getResources()
+                .getBoolean(R.bool.show_provider_or_own_installation);
+
+        if (isProviderOrOwnInstallationVisible) {
+            actionView.setOnClickListener(v -> mListener.showFirstRunActivity());
+        } else {
+            actionView.setOnClickListener(v -> mListener.createAccount());
+        }
+        
         return actionView;
     }
 
@@ -185,6 +193,8 @@ public class AccountListAdapter extends ArrayAdapter<AccountListItem> implements
     public interface AccountListAdapterListener {
 
         void showFirstRunActivity();
+
+        void createAccount();
     }
 
     /**

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

@@ -54,7 +54,6 @@ import butterknife.ButterKnife;
 /**
  * Adapter for the trashbin view
  */
-
 public class TrashbinListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private static final int TRASHBIN_ITEM = 100;

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

@@ -1,4 +1,4 @@
-/**
+/*
  *   ownCloud Android client application
  *
  *   @author masensio
@@ -20,6 +20,8 @@
  */
 package com.owncloud.android.ui.adapter;
 
+import android.content.Context;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
@@ -39,13 +41,11 @@ import java.util.Map;
 import javax.security.auth.x500.X500Principal;
 
 /**
- *
+ * Show certificate information.
  */
 public class X509CertificateViewAdapter implements SslUntrustedCertDialog.CertificateViewAdapter {
     
-    //private final static String TAG = X509CertificateViewAdapter.class.getSimpleName();
-    
-    private X509Certificate mCertificate = null;
+    private X509Certificate mCertificate;
 
     private static final String TAG = X509CertificateViewAdapter.class.getSimpleName();
 
@@ -55,7 +55,7 @@ public class X509CertificateViewAdapter implements SslUntrustedCertDialog.Certif
     
     @Override
     public void updateCertificateView(View dialogView) {
-        TextView nullCerView = (TextView) dialogView.findViewById(R.id.null_cert);
+        TextView nullCerView = dialogView.findViewById(R.id.null_cert);
         
         if (mCertificate != null) {
             nullCerView.setVisibility(View.GONE);
@@ -90,32 +90,32 @@ public class X509CertificateViewAdapter implements SslUntrustedCertDialog.Certif
         try {
             cert = mCertificate.getEncoded();
             if (cert == null) {
-
                 certFingerprintView.setText(R.string.certificate_load_problem);
                 algorithmView.setText(R.string.certificate_load_problem);
-
             } else {
-
-                certFingerprintView.setText(
-                        getDigestHexBytesWithColonsAndNewLines(dialogView, "SHA-256", cert)
-                                + getDigestHexBytesWithColonsAndNewLines(dialogView, "SHA-1", cert)
-                                + getDigestHexBytesWithColonsAndNewLines(dialogView, "MD5", cert));
+                certFingerprintView.setText(getDigestString(dialogView.getContext(), cert));
                 algorithmView.setText(mCertificate.getSigAlgName());
-
             }
         } catch (CertificateEncodingException e) {
             Log.e(TAG, "Problem while trying to decode the certificate.");
         }
     }
-    
-    private String getDigestHexBytesWithColonsAndNewLines(View dialogView, final String digestType, final byte [] cert) {
+
+    @NonNull
+    private String getDigestString(Context context, byte[] cert) {
+        return getDigestHexBytesWithColonsAndNewLines(context, "SHA-256", cert)
+                + getDigestHexBytesWithColonsAndNewLines(context, "SHA-1", cert)
+                + getDigestHexBytesWithColonsAndNewLines(context, "MD5", cert);
+    }
+
+    private String getDigestHexBytesWithColonsAndNewLines(Context context, final String digestType, final byte [] cert) {
         final byte[] rawDigest;
         final String newLine = System.getProperty("line.separator");
 
         rawDigest = getDigest(digestType, cert);
 
         if ( rawDigest == null) {
-            return digestType + ":" + newLine + dialogView.getContext().getString(R.string.digest_algorithm_not_available) + newLine + newLine;
+            return digestType + ":" + newLine + context.getString(R.string.digest_algorithm_not_available) + newLine + newLine;
         }
 
         final StringBuilder hex = new StringBuilder(3 * rawDigest.length);

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

@@ -54,6 +54,7 @@ import com.owncloud.android.lib.resources.shares.SharePermissionsBuilder;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.adapter.UserListAdapter;
 import com.owncloud.android.ui.decoration.SimpleListItemDividerDecoration;
 import com.owncloud.android.ui.dialog.ExpirationDatePickerDialogFragment;
@@ -235,24 +236,31 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
     @OnClick(R.id.share_by_link)
     public void toggleShareByLink() {
         if (shareByLink.isChecked()) {
-            if (capabilities != null &&
-                    capabilities.getFilesSharingPublicPasswordEnforced().isTrue()) {
-                // password enforced by server, request to the user before trying to create
-                requestPasswordForShareViaLink(true);
+            createShareLink();
+        } else {
+            ((FileActivity) getActivity()).getFileOperationsHelper().unshareFileViaLink(file);
+        }
+    }
 
-            } else {
-                // create without password if not enforced by server or we don't know if enforced;
-                ((FileActivity) getActivity()).getFileOperationsHelper().shareFileViaLink(file, null);
-            }
+    private void createShareLink() {
+        if (capabilities != null &&
+                capabilities.getFilesSharingPublicPasswordEnforced().isTrue()) {
+            // password enforced by server, request to the user before trying to create
+            requestPasswordForShareViaLink(true);
 
         } else {
-            ((FileActivity) getActivity()).getFileOperationsHelper().unshareFileViaLink(file);
+            // create without password if not enforced by server or we don't know if enforced;
+            ((FileActivity) getActivity()).getFileOperationsHelper().shareFileViaLink(file, null);
         }
     }
 
     private void showSendLinkTo() {
         if (file.isSharedViaLink()) {
-            ((FileActivity) getActivity()).getFileOperationsHelper().getFileWithLink(file);
+            if (TextUtils.isEmpty(file.getPublicLink())) {
+                ((FileActivity) getActivity()).getFileOperationsHelper().getFileWithLink(file);
+            } else {
+                ((FileDisplayActivity) getActivity()).showShareLinkDialog(file.getPublicLink());
+            }
         }
     }
 
@@ -260,7 +268,7 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
     public void copyLinkToClipboard() {
         if (file.isSharedViaLink()) {
             if (TextUtils.isEmpty(file.getPublicLink())) {
-                showSendLinkTo();
+                ((FileActivity) getActivity()).getFileOperationsHelper().getFileWithLink(file);
             } else {
                 ClipboardUtil.copyToClipboard(getActivity(), file.getPublicLink());
             }
@@ -336,7 +344,11 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
                 return true;
             }
             case R.id.action_share_send_link: {
-                showSendLinkTo();
+                if(shareByLink.isChecked() && file.isSharedViaLink() && !TextUtils.isEmpty(file.getPublicLink())) {
+                    ((FileDisplayActivity) getActivity()).showShareLinkDialog(file.getPublicLink());
+                } else {
+                    showSendLinkTo();
+                }
                 return true;
             }
             default:

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

@@ -39,6 +39,10 @@ public class ClipboardUtil {
     }
 
     public static void copyToClipboard(Activity activity, String text) {
+        copyToClipboard(activity, text, true);
+    }
+
+    public static void copyToClipboard(Activity activity, String text, boolean showToast) {
         if (text != null && text.length() > 0) {
             try {
                 ClipData clip = ClipData.newPlainText(
@@ -48,7 +52,9 @@ public class ClipboardUtil {
                 );
                 ((ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(clip);
 
-                Toast.makeText(activity, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show();
+                if (showToast) {
+                    Toast.makeText(activity, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show();
+                }
             } catch (Exception e) {
                 Toast.makeText(activity, R.string.clipboard_unexpected_error, Toast.LENGTH_SHORT).show();
                 Log_OC.e(TAG, "Exception caught while copying to clipboard", e);

src/main/java/third_parties/daveKoeller/AlphanumComparator.java

@@ -28,6 +28,7 @@ import com.owncloud.android.lib.resources.files.ServerFileInterface;
 
 import java.io.File;
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.text.Collator;
 import java.util.Comparator;
 
@@ -150,14 +151,10 @@ public class AlphanumComparator<T> implements Comparator<T>, Serializable {
                     countThat++;
                 }
 
-                try {
-                    long thisChunkValue = Long.parseLong(thisChunk.substring(0, countThis));
-                    long thatChunkValue = Long.parseLong(thatChunk.substring(0, countThat));
+                BigInteger thisChunkValue = new BigInteger(thisChunk.substring(0, countThis));
+                BigInteger thatChunkValue = new BigInteger(thatChunk.substring(0, countThat));
 
-                    result = Long.compare(thisChunkValue, thatChunkValue);
-                } catch (NumberFormatException exception) {
-                    result = thisChunk.substring(0, countThis).compareTo(thatChunk.substring(0, countThat));
-                }
+                result = thisChunkValue.compareTo(thatChunkValue);
                 
                 if (result == 0) {
                     // value is equal, compare leading zeros

src/main/res/drawable/ic_history.xml

@@ -6,6 +6,6 @@
         android:viewportHeight="16">
 
     <path
-        android:fillColor="#000000"
+        android:fillColor="#757575"
         android:pathData="M9.025 1.08c-3.95 0-6.535 3.447-6.364 6.72h-2.161l3.904 3.92 4.08-3.874h-2.147c-0.237-1.7 1.163-3.114 2.689-3.092 1.595 0.024 2.8 1.23 2.8 2.734 0.09 1.594-1.63 3.428-3.966 2.53 0 1.23 0.003 2.545 0 3.765 4.19 0.83 7.64-2.51 7.64-6.25 0-3.563-2.92-6.453-6.475-6.453z"/>
 </vector>

src/main/res/layout/account_action.xml

@@ -41,13 +41,14 @@
         android:id="@+id/user_name"
         android:layout_width="0dp"
         android:layout_height="fill_parent"
-
         android:layout_weight="1"
         android:gravity="center_vertical"
+        android:paddingEnd="@dimen/standard_padding"
+        android:paddingLeft="28dp"
         android:paddingRight="@dimen/standard_padding"
-        android:paddingLeft="@dimen/standard_padding"
+        android:paddingStart="28dp"
         android:text="@string/prefs_add_account"
         android:textColor="@color/primary"
-        android:textSize="@dimen/two_line_primary_text_size"/>
+        android:textSize="@dimen/two_line_primary_text_size" />
 
 </LinearLayout>         

src/main/res/layout/account_item.xml

@@ -64,14 +64,18 @@
         android:layout_centerInParent="true"
         android:layout_toEndOf="@id/avatar_container"
         android:layout_toRightOf="@id/avatar_container"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingEnd="@dimen/zero"
+        android:paddingLeft="3dp"
+        android:paddingRight="@dimen/zero"
+        android:paddingStart="3dp">
 
         <TextView
             android:id="@+id/user_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/standard_half_margin"
-            android:layout_marginLeft="@dimen/standard_half_margin"
+            android:layout_marginLeft="@dimen/standard_margin"
             android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_marginStart="@dimen/standard_margin"
             android:layout_marginTop="@dimen/standard_quarter_margin"
@@ -87,7 +91,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_half_margin"
-            android:layout_marginLeft="@dimen/standard_half_margin"
+            android:layout_marginLeft="@dimen/standard_margin"
             android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_marginStart="@dimen/standard_margin"
             android:ellipsize="end"

src/main/res/layout/accounts_layout.xml

@@ -33,8 +33,6 @@
 		android:id="@+id/account_list"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:divider="@color/list_divider_background"
-		android:dividerHeight="@dimen/divider_height_independent">
-	</ListView>
+		android:divider="@null" />
 
 </LinearLayout>

src/main/res/layout/activity_list_item.xml

@@ -17,9 +17,9 @@
   You should have received a copy of the GNU Affero General Public
   License along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
-
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
@@ -54,7 +54,7 @@
             android:paddingRight="@dimen/zero"
             android:paddingStart="@dimen/activity_icon_layout_right_end_margin"
             android:paddingTop="@dimen/standard_padding"
-            android:text="@string/placeholder_filename"
+            tools:text="@string/placeholder_filename"
             android:textAppearance="?android:attr/textAppearanceListItem" />
 
         <TextView
@@ -66,7 +66,7 @@
             android:paddingRight="@dimen/zero"
             android:paddingStart="@dimen/activity_icon_layout_right_end_margin"
             android:ellipsize="end"
-            android:text="@string/placeholder_sentence"
+            tools:text="@string/placeholder_sentence"
             android:textAppearance="?android:attr/textAppearanceListItem"/>
 
         <GridLayout
@@ -92,7 +92,7 @@
             android:paddingLeft="@dimen/activity_icon_layout_right_end_margin"
             android:paddingRight="@dimen/zero"
             android:paddingStart="@dimen/activity_icon_layout_right_end_margin"
-            android:text="@string/placeholder_sentence"
+            tools:text="@string/placeholder_sentence"
             android:textColor="?android:attr/textColorSecondary"/>
 
     </LinearLayout>

src/main/res/layout/list_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?><!--
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
@@ -24,193 +23,181 @@
     android:background="@drawable/list_selector"
     android:descendantFocusability="blocksDescendants"
     android:foreground="?android:attr/selectableItemBackground"
-    android:orientation="vertical">
+    android:baselineAligned="false"
+    android:orientation="horizontal">
+
+    <RelativeLayout
+        android:layout_width="@dimen/standard_list_item_size"
+        android:layout_height="@dimen/standard_list_item_size"
+        android:paddingBottom="@dimen/standard_padding"
+        android:paddingEnd="@dimen/standard_quarter_padding"
+        android:paddingLeft="@dimen/zero"
+        android:paddingRight="@dimen/standard_quarter_padding"
+        android:paddingStart="@dimen/zero"
+        android:paddingTop="@dimen/standard_padding">
+
+        <ImageView
+            android:id="@+id/thumbnail"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
+            android:layout_centerInParent="true"
+            android:layout_marginLeft="@dimen/standard_half_margin"
+            android:layout_marginStart="@dimen/standard_half_margin"
+            android:contentDescription="@null"
+            android:src="@drawable/folder" />
+
+        <ImageView
+            android:id="@+id/favorite_action"
+            android:layout_width="@dimen/list_item_favorite_action_layout_width"
+            android:layout_height="@dimen/list_item_favorite_action_layout_height"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginEnd="@dimen/standard_quarter_margin"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
+            android:contentDescription="@string/favorite"
+            android:src="@drawable/badge_favorite" />
+
+        <ImageView
+            android:id="@+id/keptOfflineIcon"
+            android:layout_width="@dimen/list_item_kept_offline_icon_layout_width"
+            android:layout_height="@dimen/list_item_kept_offline_icon_layout_height"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginEnd="@dimen/list_item_kept_offline_icon_layout_right_end_margin"
+            android:layout_marginRight="@dimen/list_item_kept_offline_icon_layout_right_end_margin"
+            android:contentDescription="@string/available_offline_icon"
+            android:src="@drawable/ic_available_offline" />
+
+        <ImageView
+            android:id="@+id/localFileIndicator"
+            android:layout_width="@dimen/list_item_local_file_indicator_layout_width"
+            android:layout_height="@dimen/list_item_local_file_indicator_layout_height"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginEnd="@dimen/standard_quarter_margin"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
+            android:contentDescription="@string/downloader_download_succeeded_ticker"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_synced" />
+
+    </RelativeLayout>
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:baselineAligned="false"
-        android:orientation="horizontal">
-
-        <RelativeLayout
-            android:layout_width="@dimen/standard_list_item_size"
-            android:layout_height="@dimen/standard_list_item_size"
-            android:paddingBottom="@dimen/standard_padding"
-            android:paddingEnd="@dimen/standard_quarter_padding"
-            android:paddingLeft="@dimen/zero"
-            android:paddingRight="@dimen/standard_quarter_padding"
-            android:paddingStart="@dimen/zero"
-            android:paddingTop="@dimen/standard_padding">
-
-            <ImageView
-                android:id="@+id/thumbnail"
-                android:layout_width="@dimen/file_icon_size"
-                android:layout_height="@dimen/file_icon_size"
-                android:layout_centerInParent="true"
-                android:layout_marginLeft="@dimen/standard_half_margin"
-                android:layout_marginStart="@dimen/standard_half_margin"
-                android:contentDescription="@null"
-                android:src="@drawable/folder" />
-
-            <ImageView
-                android:id="@+id/favorite_action"
-                android:layout_width="@dimen/list_item_favorite_action_layout_width"
-                android:layout_height="@dimen/list_item_favorite_action_layout_height"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginEnd="@dimen/standard_quarter_margin"
-                android:layout_marginRight="@dimen/standard_quarter_margin"
-                android:contentDescription="@string/favorite"
-                android:src="@drawable/badge_favorite" />
-
-            <ImageView
-                android:id="@+id/keptOfflineIcon"
-                android:layout_width="@dimen/list_item_kept_offline_icon_layout_width"
-                android:layout_height="@dimen/list_item_kept_offline_icon_layout_height"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginEnd="@dimen/list_item_kept_offline_icon_layout_right_end_margin"
-                android:layout_marginRight="@dimen/list_item_kept_offline_icon_layout_right_end_margin"
-                android:contentDescription="@string/available_offline_icon"
-                android:src="@drawable/ic_available_offline" />
-
-            <ImageView
-                android:id="@+id/localFileIndicator"
-                android:layout_width="@dimen/list_item_local_file_indicator_layout_width"
-                android:layout_height="@dimen/list_item_local_file_indicator_layout_height"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginEnd="@dimen/standard_quarter_margin"
-                android:layout_marginRight="@dimen/standard_quarter_margin"
-                android:contentDescription="@string/downloader_download_succeeded_ticker"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_synced" />
-
-        </RelativeLayout>
+        android:layout_weight="1"
+        android:gravity="top"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/standard_padding">
+
+        <TextView
+            android:id="@+id/Filename"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:ellipsize="middle"
+            android:singleLine="true"
+            android:text="@string/placeholder_filename"
+            android:textColor="@color/textColor"
+            android:textSize="@dimen/two_line_primary_text_size" />
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="top"
-            android:orientation="vertical"
-            android:paddingTop="@dimen/standard_padding">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/file_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/placeholder_fileSize"
+                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textSize="@dimen/two_line_secondary_text_size" />
 
             <TextView
-                android:id="@+id/Filename"
+                android:id="@+id/file_separator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:ellipsize="middle"
-                android:singleLine="true"
-                android:text="@string/placeholder_filename"
-                android:textColor="@color/textColor"
-                android:textSize="@dimen/two_line_primary_text_size" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
+                android:gravity="end"
+                android:paddingEnd="@dimen/standard_quarter_padding"
+                android:paddingLeft="@dimen/zero"
+                android:paddingRight="@dimen/standard_quarter_padding"
+                android:paddingStart="@dimen/zero"
+                android:text="@string/info_separator"
+                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textSize="@dimen/two_line_secondary_text_size" />
+
+            <TextView
+                android:id="@+id/last_mod"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/file_size"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/placeholder_fileSize"
-                    android:textColor="@color/list_item_lastmod_and_filesize_text"
-                    android:textSize="@dimen/two_line_secondary_text_size" />
-
-                <TextView
-                    android:id="@+id/file_separator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="end"
-                    android:paddingEnd="@dimen/standard_quarter_padding"
-                    android:paddingLeft="@dimen/zero"
-                    android:paddingRight="@dimen/standard_quarter_padding"
-                    android:paddingStart="@dimen/zero"
-                    android:text="@string/info_separator"
-                    android:textColor="@color/list_item_lastmod_and_filesize_text"
-                    android:textSize="@dimen/two_line_secondary_text_size" />
-
-                <TextView
-                    android:id="@+id/last_mod"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="end"
-                    android:text="@string/placeholder_media_time"
-                    android:textColor="@color/list_item_lastmod_and_filesize_text"
-                    android:textSize="@dimen/two_line_secondary_text_size" />
-
-            </LinearLayout>
+                android:gravity="end"
+                android:text="@string/placeholder_media_time"
+                android:textColor="@color/list_item_lastmod_and_filesize_text"
+                android:textSize="@dimen/two_line_secondary_text_size" />
 
         </LinearLayout>
 
-        <RelativeLayout
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:paddingEnd="@dimen/zero"
+        android:paddingLeft="@dimen/standard_half_padding"
+        android:paddingRight="@dimen/zero"
+        android:paddingStart="@dimen/standard_half_padding">
+
+        <ImageView
+            android:id="@+id/sharedIcon"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:paddingEnd="@dimen/zero"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:clickable="true"
+            android:contentDescription="@string/shared_icon_share"
+            android:focusable="true"
+            android:paddingEnd="@dimen/list_item_share_right_margin"
             android:paddingLeft="@dimen/standard_half_padding"
-            android:paddingRight="@dimen/zero"
-            android:paddingStart="@dimen/standard_half_padding">
+            android:paddingRight="@dimen/list_item_share_right_margin"
+            android:paddingStart="@dimen/standard_half_padding"
+            android:src="@drawable/ic_unshared" />
 
-            <ImageView
-                android:id="@+id/sharedIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:clickable="true"
-                android:contentDescription="@string/shared_icon_share"
-                android:focusable="true"
-                android:paddingEnd="@dimen/list_item_share_right_margin"
-                android:paddingLeft="@dimen/standard_half_padding"
-                android:paddingRight="@dimen/list_item_share_right_margin"
-                android:paddingStart="@dimen/standard_half_padding"
-                android:src="@drawable/ic_unshared" />
-
-            <ImageView
-                android:id="@+id/custom_checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/sharedIcon"
-                android:layout_toRightOf="@id/sharedIcon"
-                android:clickable="false"
-                android:contentDescription="@string/checkbox"
-                android:focusable="false"
-                android:paddingEnd="@dimen/alternate_padding"
-                android:paddingLeft="@dimen/standard_half_padding"
-                android:paddingRight="@dimen/alternate_padding"
-                android:paddingStart="@dimen/standard_half_padding"
-                android:src="@drawable/ic_checkbox_blank_outline" />
-
-            <ImageView
-                android:id="@+id/overflow_menu"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/custom_checkbox"
-                android:layout_toRightOf="@id/custom_checkbox"
-                android:clickable="true"
-                android:contentDescription="@string/overflow_menu"
-                android:focusable="true"
-                android:paddingEnd="@dimen/alternate_padding"
-                android:paddingLeft="@dimen/standard_half_padding"
-                android:paddingRight="@dimen/alternate_padding"
-                android:paddingStart="@dimen/standard_half_padding"
-                android:src="@drawable/ic_dots_vertical" />
-
-        </RelativeLayout>
+        <ImageView
+            android:id="@+id/custom_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/sharedIcon"
+            android:layout_toRightOf="@id/sharedIcon"
+            android:clickable="false"
+            android:contentDescription="@string/checkbox"
+            android:focusable="false"
+            android:paddingEnd="@dimen/alternate_padding"
+            android:paddingLeft="@dimen/standard_half_padding"
+            android:paddingRight="@dimen/alternate_padding"
+            android:paddingStart="@dimen/standard_half_padding"
+            android:src="@drawable/ic_checkbox_blank_outline" />
 
-    </LinearLayout>
+        <ImageView
+            android:id="@+id/overflow_menu"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/custom_checkbox"
+            android:layout_toRightOf="@id/custom_checkbox"
+            android:clickable="true"
+            android:contentDescription="@string/overflow_menu"
+            android:focusable="true"
+            android:paddingEnd="@dimen/alternate_padding"
+            android:paddingLeft="@dimen/standard_half_padding"
+            android:paddingRight="@dimen/alternate_padding"
+            android:paddingStart="@dimen/standard_half_padding"
+            android:src="@drawable/ic_dots_vertical" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/list_divider_background" />
+    </RelativeLayout>
 
 </LinearLayout>

src/main/res/layout/notification_list_item.xml

@@ -19,9 +19,9 @@
   You should have received a copy of the GNU General Public License
   along with this program. If not, see <https://www.gnu.org/licenses/>.
 -->
-
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
@@ -54,7 +54,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:text="@string/placeholder_filename"
+            tools:text="@string/placeholder_filename"
             android:textAppearance="?android:attr/textAppearanceListItem"/>
 
         <TextView
@@ -62,7 +62,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:text="@string/placeholder_sentence"
+            tools:text="@string/placeholder_sentence"
             android:alpha="0.57"
             android:textAppearance="?android:attr/textAppearanceListItem"/>
 
@@ -82,7 +82,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:ellipsize="end"
-            android:text="@string/placeholder_sentence"
+            tools:text="@string/placeholder_sentence"
             android:alpha="0.5"
             android:textColor="?android:attr/textColorSecondary"/>
 

src/main/res/layout/toolbar_user_information.xml

@@ -19,9 +19,10 @@
   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <android.support.design.widget.AppBarLayout
-    android:id="@+id/appbar"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/appbar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_drawer_header_height"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
@@ -96,7 +97,8 @@
                         android:shadowRadius="2"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/drawer_header_text"
-                        android:textStyle="bold"/>
+                        android:textStyle="bold"
+                        tools:text="Max Mustermann"/>
 
                     <TextView
                         android:id="@+id/userinfo_username"
@@ -110,7 +112,8 @@
                         android:shadowDy="0"
                         android:shadowRadius="2"
                         android:textColor="@android:color/white"
-                        android:textSize="@dimen/drawer_header_subtext"/>
+                        android:textSize="@dimen/drawer_header_subtext"
+                        tools:text="max@127.0.0.1/nextcloud"/>
                 </LinearLayout>
 
             </RelativeLayout>

src/main/res/layout/trashbin_item.xml

@@ -18,24 +18,27 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/ListItemLayout"
-              android:layout_width="match_parent"
-              android:layout_height="@dimen/standard_list_item_size"
-              android:background="@drawable/list_selector"
-              android:descendantFocusability="blocksDescendants"
-              android:orientation="horizontal">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ListItemLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/standard_list_item_size"
+    android:background="@drawable/list_selector"
+    android:descendantFocusability="blocksDescendants"
+    android:orientation="horizontal">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:baselineAligned="false"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/standard_padding"
+        android:paddingBottom="@dimen/standard_padding">
 
         <ImageView
             android:id="@+id/thumbnail"
             android:layout_width="@dimen/file_icon_size"
             android:layout_height="@dimen/file_icon_size"
-            android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/standard_margin"
             android:layout_marginRight="@dimen/standard_margin"
             android:contentDescription="@null"
@@ -43,20 +46,18 @@
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="top"
-            android:orientation="vertical"
-            android:paddingTop="@dimen/standard_padding">
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/Filename"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:ellipsize="middle"
                 android:singleLine="true"
-                android:text="@string/placeholder_filename"
+                tools:text="@string/placeholder_filename"
                 android:textColor="@color/textColor"
                 android:textSize="@dimen/two_line_primary_text_size"/>
 
@@ -69,7 +70,7 @@
                     android:id="@+id/fileSize"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/placeholder_fileSize"
+                    tools:text="@string/placeholder_fileSize"
                     android:textColor="@color/list_item_lastmod_and_filesize_text"
                     android:textSize="@dimen/two_line_secondary_text_size"/>
 
@@ -77,7 +78,6 @@
                     android:id="@+id/file_separator"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="end"
                     android:paddingEnd="@dimen/standard_quarter_padding"
                     android:paddingLeft="@dimen/zero"
                     android:paddingRight="@dimen/standard_quarter_padding"
@@ -90,8 +90,7 @@
                     android:id="@+id/deletionTimestamp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="end"
-                    android:text="@string/placeholder_media_time"
+                    tools:text="@string/placeholder_media_time"
                     android:textColor="@color/list_item_lastmod_and_filesize_text"
                     android:textSize="@dimen/two_line_secondary_text_size"/>
 
@@ -101,8 +100,7 @@
                 android:id="@+id/originalLocation"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="@string/placeholder_filename"
+                tools:text="@string/placeholder_filename"
                 android:textColor="@color/list_item_lastmod_and_filesize_text"
                 android:textSize="@dimen/two_line_secondary_text_size"/>
 
@@ -111,7 +109,6 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
             android:paddingEnd="@dimen/zero"
             android:paddingLeft="@dimen/standard_half_padding"
             android:paddingRight="@dimen/zero"
@@ -120,7 +117,7 @@
             <ImageView
                 android:id="@+id/restore"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:clickable="false"
                 android:contentDescription="@string/restore_button_description"
@@ -134,7 +131,7 @@
             <ImageView
                 android:id="@+id/customCheckbox"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/restore"
                 android:layout_toRightOf="@id/restore"
@@ -150,7 +147,7 @@
             <ImageView
                 android:id="@+id/overflowMenu"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/customCheckbox"
                 android:layout_toRightOf="@id/customCheckbox"
@@ -167,9 +164,4 @@
 
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/list_divider_background"/>
-
 </LinearLayout>

src/main/res/layout/user_info_details_table_item.xml

@@ -1,18 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<!--
+  Nextcloud Android client application
+
+  Copyright (C) 2018 Andy Scherzinger
+  Copyright (C) 2018 Nextcloud
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+  You should have received a copy of the GNU Affero General Public
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/icon"
-        android:contentDescription="@string/account_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/standard_margin"
+        android:layout_marginEnd="@dimen/standard_half_margin"
         android:layout_marginLeft="@dimen/standard_icon_list_horizontal_margin"
-        android:layout_marginRight="@dimen/standard_icon_list_horizontal_margin"
-        android:layout_marginTop="@dimen/standard_margin"/>
+        android:layout_marginRight="@dimen/standard_half_margin"
+        android:layout_marginStart="@dimen/standard_icon_list_horizontal_margin"
+        android:layout_marginTop="@dimen/standard_margin"
+        android:contentDescription="@string/account_icon"
+        tools:src="@drawable/ic_phone" />
 
     <TextView
         android:id="@+id/text"
@@ -23,6 +45,7 @@
         android:layout_toEndOf="@id/icon"
         android:layout_toRightOf="@id/icon"
         android:maxLines="3"
-        android:textAppearance="?android:attr/textAppearanceListItem"/>
+        android:textAppearance="?android:attr/textAppearanceListItem"
+        tools:text="+49 123 456 789 12" />
 
 </RelativeLayout>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">النشاطات</string>
     <string name="drawer_item_notifications">الإخطارات</string>
     <string name="drawer_quota">تم استخدام %1$s من %2$s</string>
-	<string name="prefs_category_general">عام</string>
+    <string name="prefs_category_general">عام</string>
     <string name="prefs_category_more">المزيد</string>
     <string name="prefs_manage_accounts">إدارة الحسابات</string>
     <string name="prefs_expert_mode">وضع متقدم</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">عنوان الخادوم https://…</string>
     <string name="auth_username">إسم المستخدم</string>
     <string name="auth_password">كلمة السر</string>
-    <string name="auth_register">ليس لديك ناكست كلاود حتى الآن ؟\nإضغط هنا للحصول على واحد من أحد المزودين</string>
     <string name="sync_string_files">الملفات</string>
     <string name="setup_btn_connect">اتصال</string>
     <string name="uploader_btn_upload_text">رفع</string>
@@ -342,19 +341,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">جديد على %1$s</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_ipv6_title">دعم IPv6</string>
     <string name="whats_new_skip">تخطى</string>
 
     <!-- User information -->

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Activities</string>
     <string name="drawer_item_notifications">Notifications</string>
     <string name="drawer_quota">%1$s of %2$s used</string>
+    <string name="drawer_quota_unlimited">%1$s used</string>
 	<string name="drawer_close">Close sidebar</string>
     <string name="drawer_open">Open sidebar</string>
     <string name="prefs_category_general">General</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Server address https://…</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
-    <string name="auth_register">No Nextcloud yet?\nClick here to get one from a provider</string>
     <string name="sync_string_files">Files</string>
     <string name="setup_btn_connect">Connect</string>
     <string name="uploader_btn_upload_text">Upload</string>
@@ -586,24 +586,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">New in %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">A safe home for all your data</string>
-    <string name="welcome_feature_1_text">Access, share and protect your files at home and at work</string>
-
-    <string name="welcome_feature_2_title">Multi account</string>
-    <string name="welcome_feature_2_text">Connect to all your clouds</string>
-
-    <string name="welcome_feature_3_title">Auto upload</string>
-    <string name="welcome_feature_3_text">Keep your photos safe</string>
-
-    <string name="whats_new_end_to_end_encryption_title">End-to-end encryption</string>
-    <string name="whats_new_end_to_end_encryption_content">Tap to encrypt, from any client. Add new ones by copying 12 words over.</string>
-    <string name="whats_new_resized_images_title">Adaptive images</string>
-    <string name="whats_new_resized_images_content">Small images are fast and work great for sharing. Zoom in to download a full version.</string>
-    <string name="whats_new_ipv6_title">IPv6 support</string>
-    <string name="whats_new_ipv6_content">IPv6 when the server supports it, IPv4 if not.</string>
-
     <string name="whats_new_skip">Skip</string>
 
     <!-- User information -->
@@ -778,6 +760,13 @@
     <string name="prefs_e2e_mnemonic">E2E mnemonic</string>
     <string name="prefs_e2e_no_device_credentials">To show mnemonic please enable device credentials.</string>
     <string name="whats_new_device_credentials_title">Use Android\'s device internal protection</string>
+    <string name="login">Log in</string>
+    <string name="signup_with_provider">Sign up with provider</string>
+    <string name="host_your_own_server">Host your own server</string>
+    <string name="first_run_1_text">Keep your data secure and under your control</string>
+    <string name="first_run_2_text">Secure collaboration &amp; file exchange</string>
+    <string name="first_run_3_text">Easy-to-use web mail, calendering &amp; contacts</string>
+    <string name="first_run_4_text">Screensharing, online meetings &amp; web conferences</string>
     <string name="whats_new_device_credentials_content">Use anything like a pattern, password, pin or your fingerprint to keep your data safe.</string>
     <string name="restore_button_description">Restore deleted file</string>
 	<string name="restore">Restore file</string>
@@ -791,7 +780,6 @@
     <string name="new_media_folder_detected">New %1$s media folder detected.</string>
     <string name="new_media_folder_photos">photo</string>
     <string name="new_media_folder_videos">video</string>
-
     <string name="outdated_server">The server has reached end of life, please upgrade!</string>
     <string name="dismiss">Dismiss</string>
     <string name="feedback_no_mail_app">No app available to send mails!</string>

src/main/res/values-b+es+419/strings.xml

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -451,16 +451,6 @@
 
     <string name="storage_description_default">Predeterminado</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Активност</string>
     <string name="drawer_item_notifications">Известяване</string>
     <string name="drawer_quota">%1$s от %2$s използвани</string>
-	<string name="prefs_category_general">Общи</string>
+    <string name="prefs_category_general">Общи</string>
     <string name="prefs_category_more">Още</string>
     <string name="prefs_manage_accounts">Управление на профилите</string>
     <string name="prefs_lock">Заключи</string>
@@ -62,7 +62,6 @@
     <string name="auth_check_server">Проверяване на сървъра</string>
     <string name="auth_username">Потребител</string>
     <string name="auth_password">Парола</string>
-    <string name="auth_register">Все още нямате Nextcloud? Натиснете тук, за да получите един от доставчик</string>
     <string name="sync_string_files">Файлове</string>
     <string name="setup_btn_connect">Свързване</string>
     <string name="uploader_btn_upload_text">Качване</string>
@@ -520,24 +519,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Ново в %1$s</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>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Activitats</string>
     <string name="drawer_item_notifications">Notificacions</string>
     <string name="drawer_quota">Usats %1$s de %2$s</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Més</string>
     <string name="prefs_manage_accounts">Gestió de comptes</string>
     <string name="prefs_expert_mode">Mode expert</string>
@@ -403,13 +403,6 @@
 
     <string name="storage_description_default">Per defecte</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lloc segur per totes les vostres dades</string>
-    <string name="welcome_feature_2_title">Multi compte</string>
-    <string name="welcome_feature_2_text">Connecteu amb tots els vostres núvols</string>
-
-    <string name="welcome_feature_3_text">Mantingueu les vostres fotos segures</string>
-
     <string name="whats_new_skip">Omet</string>
 
     <string name="screenshot_01_gridView">Un lloc segur per totes les vostres dades</string>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Aktivity</string>
     <string name="drawer_item_notifications">Upozornění</string>
     <string name="drawer_quota">%1$s z %2$s použito</string>
+    <string name="drawer_quota_unlimited">%1$s použito</string>
 	<string name="drawer_close">Zavřít postranní panel</string>
     <string name="drawer_open">Otevřít postranní panel</string>
     <string name="prefs_category_general">Obecné</string>
@@ -589,22 +590,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nově v %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Bezpečné místo pro všechna vaše data</string>
-    <string name="welcome_feature_1_text">Přistupujte, sdílejte a ochraňte své domácí a pracovní soubory</string>
-
-    <string name="welcome_feature_2_title">Multi účet</string>
-    <string name="welcome_feature_2_text">Připojte se ke všem svým cloudům</string>
-
-    <string name="welcome_feature_3_title">Automatické nahrávání</string>
-    <string name="welcome_feature_3_text">Již se neobávjte o své fotografie</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Šifrování end-to-end</string>
-    <string name="whats_new_resized_images_title">Přizpůsobivé obrázky</string>
-    <string name="whats_new_ipv6_title">Podpora IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 pokud to server podporuje, IPv4, když ne.</string>
-
     <string name="whats_new_skip">Přeskočit</string>
 
     <!-- User information -->
@@ -758,14 +743,15 @@
     <string name="uploads_view_upload_status_virus_detected">Zjištěn virus. Nahrávání není možné dokončit!</string>
     <string name="tags">Štítky</string>
     <string name="whats_new_device_credentials_title">Použít vnitřní ochranu Android zařízení</string>
+    <string name="login">Přihlásit</string>
     <string name="restore_button_description">Obnovit smazaný soubor</string>
 	<string name="restore">Obnovit soubor</string>
     <string name="new_version_was_created">Byla vytvořena nová verze</string>
     <string name="new_comment">Nový komentář…</string>
     <string name="error_comment_file">Chyba při komentování souboru</string>
+    <string name="notification_channel_general_name">Obecná oznámení</string>
     <string name="new_media_folder_photos">foto</string>
     <string name="new_media_folder_videos">video</string>
-
     <string name="dismiss">Zavřít</string>
     <string name="drawer_item_trashbin">Smazané soubory</string>
     <string name="trashbin_activity_title">Smazané soubory</string>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Aktiviteter</string>
     <string name="drawer_item_notifications">Notifikationer</string>
     <string name="drawer_quota">%1$s af %2$s brugt</string>
-	<string name="drawer_close">Luk sidebar</string>
+    <string name="drawer_close">Luk sidebar</string>
     <string name="drawer_open">Åben sidebar</string>
     <string name="prefs_category_general">Generel</string>
     <string name="prefs_category_more">Mere</string>
@@ -67,7 +67,6 @@ Enheds legitimationsoplysninger er sat op
     <string name="auth_host_url">Serveradresse https://…</string>
     <string name="auth_username">Brugernavn</string>
     <string name="auth_password">Kodeord</string>
-    <string name="auth_register">Ingen Nextcloud endnu?\nKlik her for at få en fra en udbyder</string>
     <string name="sync_string_files">Filer</string>
     <string name="setup_btn_connect">Tilslut</string>
     <string name="uploader_btn_upload_text">Upload</string>
@@ -381,12 +380,6 @@ Enheds legitimationsoplysninger er sat op
     <string name="upload_file_dialog_filetype">Filtype</string>
     <string name="storage_description_default">Standard</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Et sikket hjem til alt dit data</string>
-    <string name="welcome_feature_2_title">Flere kontoer</string>
-    <string name="welcome_feature_2_text">Forbind til alle dine skyer</string>
-
-    <string name="welcome_feature_3_title">Auto upload</string>
     <string name="whats_new_skip">Spring over</string>
 
     <!-- User information -->

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Aktivitäten</string>
     <string name="drawer_item_notifications">Benachrichtigungen</string>
     <string name="drawer_quota">%1$s von %2$s verwendet</string>
+    <string name="drawer_quota_unlimited">%1$s verwendet</string>
 	<string name="drawer_close">Hauptmenü schließen</string>
     <string name="drawer_open">Hauptmenü öffnen</string>
     <string name="prefs_category_general">Allgemein</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Server-Adresse https://…</string>
     <string name="auth_username">Benutzername</string>
     <string name="auth_password">Passwort</string>
-    <string name="auth_register">Sie haben noch keinen Server?\nKlicken Sie hier um Server-Anbieter zu finden</string>
     <string name="sync_string_files">Dateien</string>
     <string name="setup_btn_connect">Verbinden</string>
     <string name="uploader_btn_upload_text">Hochladen</string>
@@ -332,7 +332,7 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nur über gebührenfreies WLAN hochladen</string>
-    <string name="instant_upload_on_charging">Nur während des Ladens hochladen</string>
+    <string name="instant_upload_on_charging">Nur während des Ladens der Batterie hochladen</string>
     <string name="instant_upload_path">/SofortUpload</string>
     <string name="auto_upload_path">/AutoUpload</string>
     <string name="conflict_title">Dateikonfilikt</string>
@@ -586,24 +586,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Neu in %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Ein sicheres Zuhause für all Ihre Daten</string>
-    <string name="welcome_feature_1_text">Zugriff, Freigabe &amp; Schutz Ihrer Dateien zu Hause und in Ihrem Unternehmen.</string>
-
-    <string name="welcome_feature_2_title">Mehrfachkonto</string>
-    <string name="welcome_feature_2_text">Verbinden Sie sich mit all Ihren Clouds</string>
-
-    <string name="welcome_feature_3_title">Automatisches Hochladen</string>
-    <string name="welcome_feature_3_text">Schützen Sie Ihre Fotos</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Ende-zu-Ende Verschlüsselung</string>
-    <string name="whats_new_end_to_end_encryption_content">Wählen Sie zu verschlüsselnde Ordner aus, egal mit welchem Client. Fügen Sie unter Verwendung der 12 Worte Phrase neue Geräte hinzu.</string>
-    <string name="whats_new_resized_images_title">Auf Gerät optimierte Bildanzeige</string>
-    <string name="whats_new_resized_images_content">Verkleinerte Bilder sind schnell und funktionieren gut für das Teilen. Zoomen zum Herunterladen des Originalbilds.</string>
-    <string name="whats_new_ipv6_title">IPv6 Unterstützung</string>
-    <string name="whats_new_ipv6_content">Es wird IPv6 verwendet, falls der Server dies unterstützt. Ansonsten IPv4.</string>
-
     <string name="whats_new_skip">Überspringen</string>
 
     <!-- User information -->
@@ -778,6 +760,13 @@
     <string name="prefs_e2e_mnemonic">E2E-Mnemonic</string>
     <string name="prefs_e2e_no_device_credentials">Um Mnemonic anzuzeigen aktivieren Sie bitte Geräte-Zugangsdaten</string>
     <string name="whats_new_device_credentials_title">Androids internen Geräteschutz verwenden</string>
+    <string name="login">Anmelden</string>
+    <string name="signup_with_provider">Mit Provider anmelden</string>
+    <string name="host_your_own_server">Eigenen Server betreiben</string>
+    <string name="first_run_1_text">Halten Sie Ihre Daten sicher und unter Ihrer Kontrolle</string>
+    <string name="first_run_2_text">Sichere Zusammenarbeit &amp; Dateiaustausch</string>
+    <string name="first_run_3_text">Leicht verwendbares Web-Mail, Kalender &amp; Kontakte</string>
+    <string name="first_run_4_text">Bildschirm teilen, Online-Meetings&amp; Web-Konferenzen</string>
     <string name="whats_new_device_credentials_content">Verwenden Sie ein Muster, ein Passwort, eine Pin oder Ihren Fingerabdruck um den Zugriff auf Ihre Daten abzusichern.</string>
     <string name="restore_button_description">Gelöschte Datei wiederherstellen</string>
 	<string name="restore">Datei wiederherstellen</string>
@@ -791,7 +780,6 @@
     <string name="new_media_folder_detected">Neuer Medienordner %1$s gefunden.</string>
     <string name="new_media_folder_photos">Foto</string>
     <string name="new_media_folder_videos">Video</string>
-
     <string name="outdated_server">Die Serverversion wird nicht mehr unterstützt, bitte aktualisieren Sie diesen!</string>
     <string name="dismiss">Ausblenden</string>
     <string name="feedback_no_mail_app">Keine App verfügbar für den E-Mailversand!</string>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Δραστηριότητες</string>
     <string name="drawer_item_notifications">Ειδοποιήσεις</string>
     <string name="drawer_quota">χρησιμοποιούνται %1$s από %2$s</string>
+    <string name="drawer_quota_unlimited">%1$sσε χρήση</string>
 	<string name="prefs_category_general">Γενικά</string>
     <string name="prefs_category_more">Περισσότερα</string>
     <string name="prefs_manage_accounts">Διαχείριση λογαριασμών</string>
@@ -57,7 +58,6 @@
     <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>
@@ -103,6 +103,7 @@
     <string name="file_list_empty_text_photos_filter">Δεν υπάρχουν φωτογραφίες.</string>
     <string name="file_list_empty_text_videos">Μεταφορτώστε μερικά βίντεο ή ενεργοποιήστε την αυτόματη μεταφόρτωση.</string>
     <string name="file_list_empty_text_videos_filter">Δεν υπάρχουν βίντεο.</string>
+    <string name="trashbin_empty_headline">Κανένα διαγεγραμμένο αρχείο</string>
     <string name="upload_list_empty_headline">Μη διαθέσιμες μεταφορτώσεις</string>
     <string name="upload_list_empty_text_auto_upload">Μεταφορτώστε περιεχόμενο ή ενεργοποιήστε την αυτόματη μεταφόρτωση.</string>
     <string name="file_list_folder">φάκελος</string>
@@ -231,6 +232,8 @@
 	<string name="auth_can_not_auth_against_server">Αδυαμία πιστοποίησης με αυτόν το διακομιστή</string>
     <string name="favorite">Ορισμός ως διαθέσιμο εκτός σύνδεσης</string>
     <string name="unfavorite">Αναίρεση ορισμού ως διαθέσιμο εκτός σύνδεσης</string>
+    <string name="favorite_real">Προσθήκη στα αγαπημένα</string>
+    <string name="unset_favorite_real">Αφαίρεση από τα αγαπημένα</string>
     <string name="common_rename">Μετονομασία</string>
     <string name="common_remove">Διαγραφή</string>
     <string name="confirmation_remove_local">Μόνο τοπικά</string>
@@ -428,9 +431,11 @@
     <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_via_link_send_link_label">Αποστολή συνδέσμου</string>
     <string name="share_password_title">Προστασία με συνθηματικό</string>
     <string name="share_no_password_title">Ορισμός κωδικού πρόσβασης</string>
     <string name="edit_permission_label">επεξεργασία</string>
@@ -519,18 +524,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Τι νέο υπάρχει στο %1$s</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">Σύνδεση με όλα τα clouds σας</string>
-
-    <string name="welcome_feature_3_title">Αυτόματη μεταφόρτωση</string>
-    <string name="welcome_feature_3_text">Διατήρηση των φωτογραφιών σας με ασφάλεια</string>
-
-    <string name="whats_new_ipv6_title">Υποστήριξη IPv6</string>
     <string name="whats_new_skip">Παράλειψη</string>
 
     <!-- User information -->
@@ -586,6 +579,7 @@
 
     <string name="drawer_current_account">Τρέχον λογαριασμός</string>
     <string name="drawer_end_account">Τελευταίος λογαριασμός</string>
+    <string name="activity_icon">Δραστηριότητα</string>
     <string name="file_icon">Αρχείο</string>
     <string name="user_icon">Χρήστης</string>
     <string name="favorite_icon">Αγαπημένο</string>
@@ -639,12 +633,14 @@
     <string name="upload_files">Μεταφόρτωση αρχείων</string>
     <string name="create_new_folder">Δημιουργία νέου φακέλου</string>
     <string name="tags">Ετικέτες</string>
+    <string name="login">Είσοδος</string>
+    <string name="restore">Επαναφορά αρχείου</string>
     <string name="new_version_was_created">Νέα έκδοση δημιουργήθηκε</string>
+    <string name="new_comment">Νέο σχόλιο…</string>
     <string name="file_version_restored_successfully">Επιτυχημένη επαναφορά έκδοσης αρχείου.</string>
     <string name="file_version_restored_error">Σφάλμα κατά την επαναφορά έκδοσης αρχείου!</string>
     <string name="new_media_folder_photos">φωτογραφία</string>
     <string name="new_media_folder_videos">Βίντεο</string>
-
     <string name="dismiss">Αποδέσμευση</string>
     <string name="drawer_item_trashbin">Διεγραμμένα αρχεία</string>
     <string name="trashbin_activity_title">Διεγραμμένα αρχεία</string>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -407,16 +407,6 @@
 
     <string name="storage_description_default">Predeterminado</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos sus datos</string>
-    <string name="welcome_feature_1_text">Acceda, comparta y proteja sus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctese a todas sus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Mantenga sus fotos seguras</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿Aún no tienes tu Nextcloud?\nHaz click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
@@ -542,24 +541,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nuevo en %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Encripción de punta-a-punta</string>
-    <string name="whats_new_end_to_end_encryption_content">Pulsa para encriptar, desde cualquier cliente. Agrega nuevos copiando las 12 palabras.</string>
-    <string name="whats_new_resized_images_title">Imágenes adaptativas</string>
-    <string name="whats_new_resized_images_content">Las imágenes miniatura son rápidas y geniales para compartir. Haz zoom para descargar la versión completa. </string>
-    <string name="whats_new_ipv6_title">Soporte IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 cuando el servidor lo soporte, IPv4 si no. </string>
-
     <string name="whats_new_skip">Omitir</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿Aún no tienes tu Nextcloud?\nHaz click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
@@ -542,24 +541,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nuevo en %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Encripción de punta-a-punta</string>
-    <string name="whats_new_end_to_end_encryption_content">Pulsa para encriptar, desde cualquier cliente. Agrega nuevos copiando las 12 palabras.</string>
-    <string name="whats_new_resized_images_title">Imágenes adaptativas</string>
-    <string name="whats_new_resized_images_content">Las imágenes miniatura son rápidas y geniales para compartir. Haz zoom para descargar la versión completa. </string>
-    <string name="whats_new_ipv6_title">Soporte IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 cuando el servidor lo soporte, IPv4 si no. </string>
-
     <string name="whats_new_skip">Omitir</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿Aún no tienes tu Nextcloud?\nHaz click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
@@ -542,24 +541,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nuevo en %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Encripción de punta-a-punta</string>
-    <string name="whats_new_end_to_end_encryption_content">Pulsa para encriptar, desde cualquier cliente. Agrega nuevos copiando las 12 palabras.</string>
-    <string name="whats_new_resized_images_title">Imágenes adaptativas</string>
-    <string name="whats_new_resized_images_content">Las imágenes miniatura son rápidas y geniales para compartir. Haz zoom para descargar la versión completa. </string>
-    <string name="whats_new_ipv6_title">Soporte IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 cuando el servidor lo soporte, IPv4 si no. </string>
-
     <string name="whats_new_skip">Omitir</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿Aún no tienes tu Nextcloud?\nHaz click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
@@ -542,24 +541,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nuevo en %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Encripción de punta-a-punta</string>
-    <string name="whats_new_end_to_end_encryption_content">Pulsa para encriptar, desde cualquier cliente. Agrega nuevos copiando las 12 palabras.</string>
-    <string name="whats_new_resized_images_title">Imágenes adaptativas</string>
-    <string name="whats_new_resized_images_content">Las imágenes miniatura son rápidas y geniales para compartir. Haz zoom para descargar la versión completa. </string>
-    <string name="whats_new_ipv6_title">Soporte IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 cuando el servidor lo soporte, IPv4 si no. </string>
-
     <string name="whats_new_skip">Omitir</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿Aún no tienes tu Nextcloud?\nHaz click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
@@ -542,24 +541,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nuevo en %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Encripción de punta-a-punta</string>
-    <string name="whats_new_end_to_end_encryption_content">Pulsa para encriptar, desde cualquier cliente. Agrega nuevos copiando las 12 palabras.</string>
-    <string name="whats_new_resized_images_title">Imágenes adaptativas</string>
-    <string name="whats_new_resized_images_content">Las imágenes miniatura son rápidas y geniales para compartir. Haz zoom para descargar la versión completa. </string>
-    <string name="whats_new_ipv6_title">Soporte IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 cuando el servidor lo soporte, IPv4 si no. </string>
-
     <string name="whats_new_skip">Omitir</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿Aún no tienes tu Nextcloud?\nHaz click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
@@ -542,24 +541,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nuevo en %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Encripción de punta-a-punta</string>
-    <string name="whats_new_end_to_end_encryption_content">Pulsa para encriptar, desde cualquier cliente. Agrega nuevos copiando las 12 palabras.</string>
-    <string name="whats_new_resized_images_title">Imágenes adaptativas</string>
-    <string name="whats_new_resized_images_content">Las imágenes miniatura son rápidas y geniales para compartir. Haz zoom para descargar la versión completa. </string>
-    <string name="whats_new_ipv6_title">Soporte IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 cuando el servidor lo soporte, IPv4 si no. </string>
-
     <string name="whats_new_skip">Omitir</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -451,16 +451,6 @@
 
     <string name="storage_description_default">Predeterminado</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿Aún no tienes tu Nextcloud?\nHaz click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
@@ -564,24 +563,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nuevo en %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Encripción de punta-a-punta</string>
-    <string name="whats_new_end_to_end_encryption_content">Pulsa para encriptar, desde cualquier cliente. Agrega nuevos copiando las 12 palabras.</string>
-    <string name="whats_new_resized_images_title">Imágenes adaptativas</string>
-    <string name="whats_new_resized_images_content">Las imágenes miniatura son rápidas y geniales para compartir. Haz zoom para descargar la versión completa. </string>
-    <string name="whats_new_ipv6_title">Soporte IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 cuando el servidor lo soporte, IPv4 si no. </string>
-
     <string name="whats_new_skip">Omitir</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -451,16 +451,6 @@
 
     <string name="storage_description_default">Predeterminado</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -451,16 +451,6 @@
 
     <string name="storage_description_default">Predeterminado</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -451,16 +451,6 @@
 
     <string name="storage_description_default">Predeterminado</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -451,16 +451,6 @@
 
     <string name="storage_description_default">Predeterminado</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -451,16 +451,6 @@
 
     <string name="storage_description_default">Predeterminado</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿Aún no tienes tu Nextcloud?\nHaz click aquí para obtener uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Cargar</string>
@@ -542,24 +541,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nuevo en %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Encripción de punta-a-punta</string>
-    <string name="whats_new_end_to_end_encryption_content">Pulsa para encriptar, desde cualquier cliente. Agrega nuevos copiando las 12 palabras.</string>
-    <string name="whats_new_resized_images_title">Imágenes adaptativas</string>
-    <string name="whats_new_resized_images_content">Las imágenes miniatura son rápidas y geniales para compartir. Haz zoom para descargar la versión completa. </string>
-    <string name="whats_new_ipv6_title">Soporte IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 cuando el servidor lo soporte, IPv4 si no. </string>
-
     <string name="whats_new_skip">Omitir</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
-	<string name="prefs_category_general">General</string>
+    <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">Más</string>
     <string name="prefs_manage_accounts">Administrar cuentas</string>
     <string name="prefs_expert_mode">Modo experto</string>
@@ -451,16 +451,6 @@
 
     <string name="storage_description_default">Predeterminado</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para todos tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y proteje tus archivos en casa y la oficina</string>
-
-    <string name="welcome_feature_2_title">Multi cuenta</string>
-    <string name="welcome_feature_2_text">Conéctate a todas tsus nubes</string>
-
-    <string name="welcome_feature_3_title">Carga automática</string>
-    <string name="welcome_feature_3_text">Manten tus fotos seguras</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_notifications">Notificaciones</string>
     <string name="drawer_quota">%1$s de %2$s utilizados</string>
+    <string name="drawer_quota_unlimited">usado %1$s</string>
 	<string name="drawer_close">Cerrar barra lateral</string>
     <string name="drawer_open">Abrir barra lateral</string>
     <string name="prefs_category_general">General</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Dirección del servidor https://…</string>
     <string name="auth_username">Usuario</string>
     <string name="auth_password">Contraseña</string>
-    <string name="auth_register">¿Todavía no tienes Nextcloud?\nClic aquí para conseguir uno de un proveedor</string>
     <string name="sync_string_files">Archivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Subir</string>
@@ -586,24 +586,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nuevo en %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un lugar seguro para tus datos</string>
-    <string name="welcome_feature_1_text">Accede, comparte y protege tus archivos en casa y en el trabajo</string>
-
-    <string name="welcome_feature_2_title">Múltiples cuentas</string>
-    <string name="welcome_feature_2_text">Conecta con todas tus nubes</string>
-
-    <string name="welcome_feature_3_title">Subida automática</string>
-    <string name="welcome_feature_3_text">Mantén seguras tus fotos</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Cifrado punto a punto</string>
-    <string name="whats_new_end_to_end_encryption_content">Pulsa para cifrar, desde cualquier cliente. Añade nuevos copiando las 12 palabras.</string>
-    <string name="whats_new_resized_images_title">Imágenes adaptadas a la pantalla</string>
-    <string name="whats_new_resized_images_content">Las imágenes pequeñas son rápidas y funcionan bien para compartir. Haz zoom para descargar una versión completa.</string>
-    <string name="whats_new_ipv6_title">Soporte de IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 cuando el servidor lo soporta, IPv4 si no.</string>
-
     <string name="whats_new_skip">Omitir</string>
 
     <!-- User information -->
@@ -778,6 +760,13 @@
     <string name="prefs_e2e_mnemonic">Nemotécnico del cifrado E2E</string>
     <string name="prefs_e2e_no_device_credentials">Para mostrar el nemotécnico, habilite las credenciales del dispositivo</string>
     <string name="whats_new_device_credentials_title">Usar la protección interna del dispositivo Android</string>
+    <string name="login">Iniciar sesión</string>
+    <string name="signup_with_provider">Registrarse con un proveedor</string>
+    <string name="host_your_own_server">Aloja tu propio servidor</string>
+    <string name="first_run_1_text">Mantén tus datos seguros y bajo tu control</string>
+    <string name="first_run_2_text">Colaboración segura e intercambio de archivos</string>
+    <string name="first_run_3_text">Correo web, calendario y contactos fáciles de usar</string>
+    <string name="first_run_4_text">Compartir pantalla, reuniones online y conferencias web</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>
     <string name="restore_button_description">Restaurar archivo eliminado</string>
 	<string name="restore">Restaurar archivo</string>
@@ -791,7 +780,6 @@
     <string name="new_media_folder_detected">Nueva carpeta de medios %1$s detectada.</string>
     <string name="new_media_folder_photos">foto</string>
     <string name="new_media_folder_videos">vídeo</string>
-
     <string name="outdated_server">El servidor ha alcanzado su final de vida. ¡Por favor, actualiza!</string>
     <string name="dismiss">Descartar</string>
     <string name="feedback_no_mail_app">¡No hay ninguna app disponible para mandar correos!</string>

src/main/res/values-et-rEE/strings.xml

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Tegevused</string>
     <string name="drawer_item_notifications">Märguanded</string>
     <string name="drawer_quota">Kasutatud %1$s/%2$s</string>
-	<string name="drawer_close">Sulge külgriba</string>
+    <string name="drawer_close">Sulge külgriba</string>
     <string name="drawer_open">Ava külgriba</string>
     <string name="prefs_category_general">Üldine</string>
     <string name="prefs_category_more">Rohkem</string>
@@ -58,7 +58,6 @@
     <string name="auth_host_url">Serveri aadress https://…</string>
     <string name="auth_username">Kasutajanimi</string>
     <string name="auth_password">Parool</string>
-    <string name="auth_register">Sul pole veel oma Nextcloudi?\nVajuta siia, et see teenusepakkujalt saada</string>
     <string name="sync_string_files">Failid</string>
     <string name="setup_btn_connect">Ühenda</string>
     <string name="uploader_btn_upload_text">Lae üles</string>
@@ -423,10 +422,6 @@
     <string name="notifications_loading_activity">Teavituste laadimine…</string>
     <string name="notifications_no_results_headline">Märguandeid pole</string>
     <string name="upload_file_dialog_filename">Faili nimi</string>
-    <string name="welcome_feature_3_title">Automaatne üleslaadimine</string>
-    <string name="whats_new_ipv6_title">IPv6 tugi</string>
-    <string name="whats_new_ipv6_content">IPv6 kui server seda toetab, IPv4 kui ei.</string>
-
     <string name="whats_new_skip">Jäta vahele</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Jarduerak</string>
     <string name="drawer_item_notifications">Jakinarazpenak</string>
     <string name="drawer_quota">%1$s %2$s-(e)tik erabilita</string>
-	<string name="prefs_category_general">Orokorra</string>
+    <string name="prefs_category_general">Orokorra</string>
     <string name="prefs_category_more">Gehiago</string>
     <string name="prefs_manage_accounts">Kudeatu kontuak</string>
     <string name="prefs_expert_mode">Modu aurreratua</string>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Viimeisimmät tapahtumat</string>
     <string name="drawer_item_notifications">Ilmoitukset</string>
     <string name="drawer_quota">%1$s / %2$s käytetty</string>
-	<string name="prefs_category_general">Yleiset</string>
+    <string name="prefs_category_general">Yleiset</string>
     <string name="prefs_category_more">Enemmän</string>
     <string name="prefs_manage_accounts">Tilien hallinta</string>
     <string name="prefs_lock">Lukitse</string>
@@ -60,7 +60,6 @@
     <string name="auth_host_url">Palvelimen osoite https://…</string>
     <string name="auth_username">Käyttäjätunnus</string>
     <string name="auth_password">Salasana</string>
-    <string name="auth_register">Eikö sinulla ole vielä Nextcloudia?\nNapauta tästä saadaksesi omasi palveluntarjoajalta</string>
     <string name="sync_string_files">Tiedostot</string>
     <string name="setup_btn_connect">Yhdistä</string>
     <string name="uploader_btn_upload_text">Lähetä</string>
@@ -545,24 +544,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Uutta versiossa %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Turvallinen koti kaikille tiedostoillesi</string>
-    <string name="welcome_feature_1_text">Käytä, jaa ja suojaa tiedostojasi kotona ja töissä</string>
-
-    <string name="welcome_feature_2_title">Useita käyttäjätilejä</string>
-    <string name="welcome_feature_2_text">Yhdistä kaikkiin pilviisi</string>
-
-    <string name="welcome_feature_3_title">Automaattinen lähetys</string>
-    <string name="welcome_feature_3_text">Pidä kuvasi tallessa</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Päästä päähän -salaus</string>
-    <string name="whats_new_end_to_end_encryption_content">Salaa mistä tahansa äpistä. Lisää äppejä tiliisi antamalla 12 sanan salasana.</string>
-    <string name="whats_new_resized_images_title">Mukautuvat kuvat</string>
-    <string name="whats_new_resized_images_content">Pienet kuvat ovat nopeita ja toimivat hyvin jaettaessa. Zoomaamalla voit ladata täyden version. </string>
-    <string name="whats_new_ipv6_title">IPv6-tuki</string>
-    <string name="whats_new_ipv6_content">IPv6 kun palvelin tukee sitä, IPv4 jos ei.</string>
-
     <string name="whats_new_skip">Ohita</string>
 
     <!-- User information -->
@@ -703,7 +684,6 @@ GNU yleinen lisenssi, versio 2</string>
     <string name="notification_channel_general_name">Yleiset ilmoitukset</string>
     <string name="new_media_folder_photos">kuva</string>
     <string name="new_media_folder_videos">video</string>
-
     <string name="outdated_server">Palvelimen elinkaari on päättynyt, päivitä!</string>
     <string name="drawer_item_trashbin">Poistetut tiedostot</string>
     <string name="trashbin_activity_title">Poistetut tiedostot</string>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Activités</string>
     <string name="drawer_item_notifications">Notifications</string>
     <string name="drawer_quota">%1$s utilisés sur %2$s</string>
+    <string name="drawer_quota_unlimited">%1$s utilisé</string>
 	<string name="drawer_close">Fermer la barre latérale</string>
     <string name="drawer_open">Ouvrir la barre latérale</string>
     <string name="prefs_category_general">Général</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Adresse du serveur https://…</string>
     <string name="auth_username">Nom d\'utilisateur</string>
     <string name="auth_password">Mot de passe</string>
-    <string name="auth_register">Pas encore de Nextcloud ?\nCliquez ici pour choisir un fournisseur</string>
     <string name="sync_string_files">Fichiers</string>
     <string name="setup_btn_connect">Se connecter</string>
     <string name="uploader_btn_upload_text">Envoyer</string>
@@ -589,24 +589,6 @@ Veuillez contacter votre administrateur</string>
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nouveautés dans %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un endroit sûr pour toutes vos données</string>
-    <string name="welcome_feature_1_text">Accédez, partagez et protégez vos fichiers personnels et professionnels</string>
-
-    <string name="welcome_feature_2_title">Multi-compte</string>
-    <string name="welcome_feature_2_text">Connectez-vous avec plusieurs comptes clouds</string>
-
-    <string name="welcome_feature_3_title">Envoi automatique</string>
-    <string name="welcome_feature_3_text">Conservez vos photos en toute sécurité</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Chiffrement de bout en bout</string>
-    <string name="whats_new_end_to_end_encryption_content">Appuyer pour encrypter, depuis n\'importe quel client. Ajoutez-en des nouveaux en utilisant votre phrase secrète à 12 mots.</string>
-    <string name="whats_new_resized_images_title">Images adaptatives</string>
-    <string name="whats_new_resized_images_content">Les petites images sont rapides et adaptées pour le partage. Zoomez-les pour télécharger la version complète.</string>
-    <string name="whats_new_ipv6_title">Prise en charge de l\'IPV6</string>
-    <string name="whats_new_ipv6_content">En IPv6 si le serveur le supporte, IPv4 sinon.</string>
-
     <string name="whats_new_skip">Ignorer</string>
 
     <!-- User information -->
@@ -781,6 +763,13 @@ Veuillez contacter votre administrateur</string>
     <string name="prefs_e2e_mnemonic">Mnémonique E2E</string>
     <string name="prefs_e2e_no_device_credentials">Afin d\'afficher le mnémonique, merci d\'activer les informations d\'identification de l\'appareil.</string>
     <string name="whats_new_device_credentials_title">Utiliser la protection interne du terminal Android</string>
+    <string name="login">Se connecter</string>
+    <string name="signup_with_provider">Se connecter avec un fournisseur</string>
+    <string name="host_your_own_server">Hébergez votre propre serveur</string>
+    <string name="first_run_1_text">Sécurisez et contrôlez vos données</string>
+    <string name="first_run_2_text">Collaboration &amp; et échange de fichiers sécurisés</string>
+    <string name="first_run_3_text">Messagerie web, Agenda et Contacts faciles d\'utilisation</string>
+    <string name="first_run_4_text">Partage d\'écran et réunion en ligne</string>
     <string name="whats_new_device_credentials_content">Utiliser un schéma, un mot de passe, un code d\'accès ou vos empreintes digitales pour sécuriser vos données</string>
     <string name="restore_button_description">Restaurer le fichier supprimé</string>
 	<string name="restore">Restaurer le fichier</string>
@@ -794,7 +783,6 @@ Veuillez contacter votre administrateur</string>
     <string name="new_media_folder_detected">Nouveau dossier de média %1$s détecté.</string>
     <string name="new_media_folder_photos">photo</string>
     <string name="new_media_folder_videos">vidéo</string>
-
     <string name="outdated_server">Le serveur est obsolète, veuillez mettre à jour!</string>
     <string name="dismiss">Ignorer</string>
     <string name="feedback_no_mail_app">Aucune application disponible pour envoyer des mails !</string>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Tevékenységek</string>
     <string name="drawer_item_notifications">Értesítések</string>
     <string name="drawer_quota">%1$s felhasználva ennyiből: %2$s</string>
+    <string name="drawer_quota_unlimited">%1$s használt</string>
 	<string name="drawer_close">Oldalsáv bezárása</string>
     <string name="drawer_open">Oldalsáv megnyitása</string>
     <string name="prefs_category_general">Általános</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Kiszolgáló cím https://…</string>
     <string name="auth_username">Felhasználónév</string>
     <string name="auth_password">Jelszó</string>
-    <string name="auth_register">Nincs még szervered?\nKattints ide és szerezz egyet egy szolgáltatótól!</string>
     <string name="sync_string_files">Fájlok</string>
     <string name="setup_btn_connect">Kapcsolódás</string>
     <string name="uploader_btn_upload_text">Feltöltés</string>
@@ -588,24 +588,6 @@ Lépj kapcsolatba a rendszergazdával</string>
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Új itt: %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Egy biztonságos hely az adataidnak</string>
-    <string name="welcome_feature_1_text">Érd el, oszd meg és védd a fájljaidat otthon és a munkában</string>
-
-    <string name="welcome_feature_2_title">Többszörös fiók</string>
-    <string name="welcome_feature_2_text">Csatlakozás az összes felhődhöz</string>
-
-    <string name="welcome_feature_3_title">Autofeltöltés</string>
-    <string name="welcome_feature_3_text">Tartsd biztonságban a fotóidat</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Vég-vég titkosítás</string>
-    <string name="whats_new_end_to_end_encryption_content">Érintsd meg a titkosításhoz, bármely kliensről. Adj hozzá újakat a 12 szavas kód megadásával.</string>
-    <string name="whats_new_resized_images_title">Alkalmazkodó képek.</string>
-    <string name="whats_new_resized_images_content">A kisebb képek jobban működnek és jobbak a megosztáshoz. Nagyíts a teljes kép letöltéséhez.</string>
-    <string name="whats_new_ipv6_title">IPv6 támogatás</string>
-    <string name="whats_new_ipv6_content">IPv6 ha a szerver támogatja,IPv4 ha nem.</string>
-
     <string name="whats_new_skip">Kihagy</string>
 
     <!-- User information -->
@@ -794,6 +776,7 @@ A Nextcloud itt érhető el: https://nextcloud.com</string>
     <string name="sharee_add_failed">Hiba a megosztás hozzáadásakor.</string>
     <string name="unsharing_failed">Megosztás visszavonási hiba</string>
     <string name="updating_share_failed">Megosztás frissítési hiba</string>
+    <string name="login">Bejelentkezés</string>
     <string name="whats_new_device_credentials_content">Használj mintát, jelszót, pin kódot, vagy az ujjlenyomatodat annak érdekében, hogy az adataidat biztonságban tartsd.</string>
     <string name="restore_button_description">Törölt fájl visszaállítása</string>
 	<string name="restore">Fájl visszaállítása</string>
@@ -802,6 +785,8 @@ A Nextcloud itt érhető el: https://nextcloud.com</string>
     <string name="error_comment_file">Fájl hozzászólási hiba</string>
     <string name="file_version_restored_successfully">Sikeresen visszaállított fájl verzió.</string>
     <string name="file_version_restored_error">Hiba a fájl verziójának visszaállítása során.</string>
+    <string name="new_media_folder_photos">Fénykép</string>
+    <string name="new_media_folder_videos">Videó</string>
     <string name="outdated_server">A szerver elérte életciklusa végét, kérem frissítsen!</string>
     <string name="dismiss">Elutasít</string>
     <string name="feedback_no_mail_app">Nincs elérhető alkalmazás email küldéséhez!</string>
@@ -812,4 +797,7 @@ A Nextcloud itt érhető el: https://nextcloud.com</string>
     <string name="trashbin_file_not_deleted">%1$s fájl nem törölhető!</string>
     <string name="trashbin_file_not_restored">%1$s nem állítható vissza!</string>
     <string name="trashbin_not_emptied">A fájlok nem törölhetők véglegesen!</string>
+    <string name="folder_confirm_create">Létrehozás</string>
+    <string name="file_delete">Törlés</string>
+    <string name="file_rename">Átnevez</string>
     </resources>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Aktivitas</string>
     <string name="drawer_item_notifications">Pemberitahuan</string>
     <string name="drawer_quota">%1$s dari %2$s sudah digunakan</string>
-	<string name="prefs_category_general">Umum</string>
+    <string name="prefs_category_general">Umum</string>
     <string name="prefs_category_more">Lainnya</string>
     <string name="prefs_manage_accounts">Kelola akun</string>
     <string name="prefs_expert_mode">Mode Ahli</string>
@@ -405,16 +405,6 @@
 
     <string name="storage_description_default">Bawaan</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Tempat yang aman untuk semua data anda</string>
-    <string name="welcome_feature_1_text">Akses, bagi dan lindungi berkasi anda baik dirumah maupun di kantor.</string>
-
-    <string name="welcome_feature_2_title">Multi akun</string>
-    <string name="welcome_feature_2_text">Sambung ke semua cloud anda</string>
-
-    <string name="welcome_feature_3_title">Unggah otomatis.</string>
-    <string name="welcome_feature_3_text">Jaga foto anda tetap aman</string>
-
     <string name="whats_new_skip">Lewat</string>
 
     <!-- User information -->

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Virkni</string>
     <string name="drawer_item_notifications">Tilkynningar</string>
     <string name="drawer_quota">%1$s af %2$s notað</string>
+    <string name="drawer_quota_unlimited">%1$s notað</string>
 	<string name="prefs_category_general">Almennt</string>
     <string name="prefs_category_more">Meira</string>
     <string name="prefs_manage_accounts">Sýsla með notandaaðganga</string>
@@ -63,7 +64,6 @@
     <string name="auth_host_url">Vistfang þjóns https://…</string>
     <string name="auth_username">Notandanafn</string>
     <string name="auth_password">Lykilorð</string>
-    <string name="auth_register">Ertu ekki enn með Nextcloud skýjaþjón?\nSmelltu hér til að fá þér einn frá þjónustuaðila</string>
     <string name="sync_string_files">Skrár</string>
     <string name="setup_btn_connect">Tengjast</string>
     <string name="uploader_btn_upload_text">Senda inn</string>
@@ -584,24 +584,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nýtt í %1$s?</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Öruggur staður fyrir öll gögnin þín</string>
-    <string name="welcome_feature_1_text">Haltu utan um, deildu og verndaðu skrárnar þínar, hvort sem er heima eða á vinnustað</string>
-
-    <string name="welcome_feature_2_title">Margir aðgangar</string>
-    <string name="welcome_feature_2_text">Tengdu öll gagnaskýin þín</string>
-
-    <string name="welcome_feature_3_title">Sjálfvirk innsending</string>
-    <string name="welcome_feature_3_text">Haltu ljósmyndunum þínum öruggum</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Enda-í-enda dulritun</string>
-    <string name="whats_new_end_to_end_encryption_content">Bankaðu til að dulrita, úr einhverju forritanna. Bættu nýjum við með því að afrita 12 orð yfir.</string>
-    <string name="whats_new_resized_images_title">Aðlaganlegar myndir</string>
-    <string name="whats_new_resized_images_content">Litlar myndir eru hraðvirkar og henta vel til að deila. Auktu aðdráttinn til að sækja fulla útgáfu.</string>
-    <string name="whats_new_ipv6_title">Stuðningur við IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 þegar vefþjónninn styður það, annars IPv4.</string>
-
     <string name="whats_new_skip">Sleppa</string>
 
     <!-- User information -->
@@ -774,6 +756,7 @@
     <string name="prefs_e2e_mnemonic">E2E minnistækni</string>
     <string name="prefs_e2e_no_device_credentials">Til að birta minnishjálp skaltu virkja auðkenningu tækisins.</string>
     <string name="whats_new_device_credentials_title">Nota innri varnir Android tækis</string>
+    <string name="login">Skrá inn</string>
     <string name="whats_new_device_credentials_content">Notaðu tækni á borð við mynstur, lykilorð eða fingraför til að halda gögnunum þínum öruggum.</string>
     <string name="restore_button_description">Endurheimta eydda skrá</string>
 	<string name="restore">Endurheimta skrá</string>
@@ -787,7 +770,6 @@
     <string name="new_media_folder_detected">Fann möppu með %1$s.</string>
     <string name="new_media_folder_photos">ljósmyndum</string>
     <string name="new_media_folder_videos">myndskeiðum</string>
-
     <string name="outdated_server">Netþjónninn er kominn að endimörkum líftíma síns, endilega uppfærðu hann!</string>
     <string name="dismiss">Hafna</string>
     <string name="feedback_no_mail_app">Ekkert forrit tiltækt til að senda póst!</string>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Attività</string>
     <string name="drawer_item_notifications">Notifiche</string>
     <string name="drawer_quota">%1$s di %2$s utilizzati</string>
+    <string name="drawer_quota_unlimited">%1$s utilizzato</string>
 	<string name="drawer_close">Chiudi barra laterale</string>
     <string name="drawer_open">Apri barra laterale</string>
     <string name="prefs_category_general">Generale</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Indirizzo server https://…</string>
     <string name="auth_username">Nome utente</string>
     <string name="auth_password">Password</string>
-    <string name="auth_register">Non hai ancora Nextcloud?\nFai clic qui per ottenerne uno da un fornitore</string>
     <string name="sync_string_files">File</string>
     <string name="setup_btn_connect">Connetti</string>
     <string name="uploader_btn_upload_text">Carica</string>
@@ -586,24 +586,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Prima volta su %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Un posto sicuro per tutti i tuoi dati</string>
-    <string name="welcome_feature_1_text">Accedi, condividi e proteggi i tuoi file a casa e al lavoro</string>
-
-    <string name="welcome_feature_2_title">Account multipli</string>
-    <string name="welcome_feature_2_text">Collega tutti i tuoi cloud</string>
-
-    <string name="welcome_feature_3_title">Caricamento automatico</string>
-    <string name="welcome_feature_3_text">Tieni al sicuro le tue foto</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Cifratura end-to-end</string>
-    <string name="whats_new_end_to_end_encryption_content">Tocca per cifrare, da qualsiasi client. Aggiungi nuovi dispositivi copiando la frase segreta di 12 parole.</string>
-    <string name="whats_new_resized_images_title">Immagini adattative</string>
-    <string name="whats_new_resized_images_content">Le immagini piccole sono veloci e pratiche per la condivisione. Ingrandisci per scaricare la versione completa.</string>
-    <string name="whats_new_ipv6_title">Supporto IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 se il server lo supporta, altrimenti IPv4.</string>
-
     <string name="whats_new_skip">Salta</string>
 
     <!-- User information -->
@@ -778,6 +760,13 @@
     <string name="prefs_e2e_mnemonic">Codice mnemonico E2E</string>
     <string name="prefs_e2e_no_device_credentials">Per mostrare il codice mnemonico, abilita le credenziali del dispositivo.</string>
     <string name="whats_new_device_credentials_title">Usa protezione interna del dispositivo Android</string>
+    <string name="login">Accedi</string>
+    <string name="signup_with_provider">Registrati a un fornitore</string>
+    <string name="host_your_own_server">Ospita il tuo server</string>
+    <string name="first_run_1_text">Mantieni i tuoi dati sicuri e sotto il tuo controllo</string>
+    <string name="first_run_2_text">Rendi sicuri la collaborazione e lo scambio di file</string>
+    <string name="first_run_3_text">Web mail, calendari e contatti di semplice utilizzo</string>
+    <string name="first_run_4_text">Condivisione dello schermo, riunioni in linea e conferenze web</string>
     <string name="whats_new_device_credentials_content">Utilizza qualcosa come un modello, password, PIN o la tua impronta digitale per tenere al sicuro i tuoi dati.</string>
     <string name="restore_button_description">Ripristina file eliminato</string>
 	<string name="restore">Ripristina file</string>
@@ -791,7 +780,6 @@
     <string name="new_media_folder_detected">Nuova cartella multimediale %1$s rilevata</string>
     <string name="new_media_folder_photos">foto</string>
     <string name="new_media_folder_videos">video</string>
-
     <string name="outdated_server">Il server ha raggiunto la fine della sua vita, aggiornalo!</string>
     <string name="dismiss">Annulla</string>
     <string name="feedback_no_mail_app">Nessun applicazione disponibile per inviare email!</string>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">פעילויות</string>
     <string name="drawer_item_notifications">התרעות</string>
     <string name="drawer_quota">נעשה שימוש ב־%1$s מתוך %2$s</string>
+    <string name="drawer_quota_unlimited">%1$s בשימוש</string>
 	<string name="drawer_close">סגירת סרגל הצד</string>
     <string name="drawer_open">פתיחת סרגל הצד</string>
     <string name="prefs_category_general">כללי</string>
@@ -65,7 +66,6 @@
     <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>
@@ -557,24 +557,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">חדש ב־%1$s</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>
 
     <!-- User information -->
@@ -737,6 +719,7 @@
     <string name="unsharing_failed">ביטול השיתוף נכשל</string>
     <string name="updating_share_failed">עדכון השיתוף נכשל</string>
     <string name="whats_new_device_credentials_title">שימוש בהגנה הפנימית של מכשיר ה־Android שלך</string>
+    <string name="login">כניסה</string>
     <string name="whats_new_device_credentials_content">להשתמש בכל דבר כגון תבנית נעילה, ססמה, קוד או טביעת אצבע כדי לאבטח את המידע שלך.</string>
     <string name="restore_button_description">שחזור קובץ שנמחק</string>
 	<string name="restore">שחזור קובץ</string>
@@ -750,7 +733,6 @@
     <string name="new_media_folder_detected">זוהתה תיקיית מדיה עם %1$s</string>
     <string name="new_media_folder_photos">תמונות</string>
     <string name="new_media_folder_videos">סרטונים</string>
-
     <string name="outdated_server">השרת הגיע לתום חייו, נא לשדרג!</string>
     <string name="dismiss">התעלמות</string>
     <string name="feedback_no_mail_app">אין יישומון זמין לשליחת הודעות בדוא״ל!</string>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">アクティビティ</string>
     <string name="drawer_item_notifications">通知</string>
     <string name="drawer_quota">%2$s 中%1$s が使われています。</string>
-	<string name="prefs_category_general">一般</string>
+    <string name="prefs_category_general">一般</string>
     <string name="prefs_category_more">もっと見る</string>
     <string name="prefs_manage_accounts">アカウント管理</string>
     <string name="prefs_lock_using_passcode">パスコード</string>
@@ -57,7 +57,6 @@
     <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>
@@ -361,7 +360,9 @@
     <string name="downloader_download_file_not_found">ファイルはサーバー上で利用できません</string>
 
     <string name="file_migration_dialog_title">ストレージの場所を更新中</string>
-    <string name="file_migration_restoring_accounts_configuration">アカウント設定を復元中...</string>
+    <string name="file_migration_saving_accounts_configuration">アカウントの設定を保存中</string>
+    <string name="file_migration_migrating">データを移動中</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="prefs_add_account">アカウントを追加</string>
@@ -372,6 +373,7 @@
 	<string name="log_send_mail_subject">%1$s アンドロイドアプリログ</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>
@@ -397,6 +399,8 @@
     <string name="username">ユーザー名</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>
@@ -450,13 +454,6 @@
 
     <string name="storage_description_default">デフォルト</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">すべてのデータの安全なホーム</string>
-    <string name="welcome_feature_2_title">マルチアカウント</string>
-    <string name="welcome_feature_2_text">すべてのクラウドへ接続する</string>
-
-    <string name="welcome_feature_3_text">あなたの写真を安全に保つ</string>
-
     <string name="whats_new_skip">スキップ</string>
 
     <!-- User information -->

src/main/res/values-ka-rGE/strings.xml

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">აქტივობები</string>
     <string name="drawer_item_notifications">შეტყობინებები</string>
     <string name="drawer_quota">გამოყენებულია %1$s სულ %2$s-იდან </string>
-	<string name="prefs_category_general">ზოგადი</string>
+    <string name="prefs_category_general">ზოგადი</string>
     <string name="prefs_category_more">მეტი</string>
     <string name="prefs_manage_accounts">ანგარიშების მართვა</string>
     <string name="prefs_expert_mode">ექპერტ-რეჟიმი</string>
@@ -55,7 +55,6 @@
     <string name="auth_check_server">სერვერის შემოწმება</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>
@@ -506,24 +505,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">ახალი %1$s-ში</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">End-to-end შიფრაცია</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>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">활동</string>
     <string name="drawer_item_notifications">알림</string>
     <string name="drawer_quota">%2$s 중 %1$s 사용됨</string>
-	<string name="prefs_category_general">일반</string>
+    <string name="prefs_category_general">일반</string>
     <string name="prefs_category_more">더 보기</string>
     <string name="prefs_manage_accounts">계정 관리</string>
     <string name="prefs_lock">잠금</string>
@@ -58,7 +58,6 @@
     <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>
@@ -555,19 +554,6 @@
 
     <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_resized_images_content">데이터 전송량을 줄이고 다른 사용자와 쉽게 공유할 수 있도록 작은 크기 사진을 기본값으로 표시합니다. 사진을 확대하면 전체 파일을 다운로드합니다.</string>
-    <string name="whats_new_ipv6_title">IPv6 지원</string>
     <string name="whats_new_skip">건너뛰기</string>
 
     <!-- User information -->

src/main/res/values-lt-rLT/strings.xml

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Veiklos</string>
     <string name="drawer_item_notifications">Pranešimai</string>
     <string name="drawer_quota">išnaudota %1$s iš %2$s</string>
-	<string name="prefs_category_general">Bendras</string>
+    <string name="prefs_category_general">Bendras</string>
     <string name="prefs_category_more">Daugiau</string>
     <string name="prefs_manage_accounts">Tvarkyti paskyras</string>
     <string name="prefs_expert_mode">Eksperto režimas</string>
@@ -429,16 +429,6 @@
 
     <string name="storage_description_default">Numatytasis</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Saugūs namai visiems jūsų duomenims</string>
-    <string name="welcome_feature_1_text">Prisijunkite, bendrinkite ir apsaugokite savo failus namuose ir darbe</string>
-
-    <string name="welcome_feature_2_title">Daugialypė paskyra</string>
-    <string name="welcome_feature_2_text">Prijsijunkite prie visų savo debesų</string>
-
-    <string name="welcome_feature_3_title">Automatinis įkėlimas</string>
-    <string name="welcome_feature_3_text">Saugokite nuotraukas</string>
-
     <string name="whats_new_skip">Praleisti</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Izmaiņas</string>
     <string name="drawer_item_notifications">Paziņojumi</string>
     <string name="drawer_quota">%1$s no %2$s lietoti</string>
-	<string name="drawer_close">Aizvērt malu</string>
+    <string name="drawer_close">Aizvērt malu</string>
     <string name="drawer_open">Atvērt malu</string>
     <string name="prefs_category_general">Vispārīgi</string>
     <string name="prefs_category_more">Vairāk</string>
@@ -58,7 +58,6 @@
     <string name="auth_host_url">Servera adrese https://…</string>
     <string name="auth_username">Lietotājvārds</string>
     <string name="auth_password">Parole</string>
-    <string name="auth_register">Nav vēl Nextcloud?\nSpied šeit lai iegūtu vienu no kāda pakalpojumu sniedzēja</string>
     <string name="sync_string_files">Datnes</string>
     <string name="setup_btn_connect">Savienoties</string>
     <string name="uploader_btn_upload_text">Augšupielādēt</string>
@@ -539,19 +538,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Jaunums %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Droša vieta visiem jūsu datiem</string>
-    <string name="welcome_feature_2_title">Multi konts</string>
-    <string name="welcome_feature_2_text">Savienoties ar visiem mākoņiem</string>
-
-    <string name="welcome_feature_3_title">Automātiska augšupielāde</string>
-    <string name="welcome_feature_3_text">Glabājiet savus fotoattēlus drošībā</string>
-
-    <string name="whats_new_end_to_end_encryption_title">No gala līdz galam šifrēšana</string>
-    <string name="whats_new_ipv6_title">IPv6 atbalsts</string>
-    <string name="whats_new_ipv6_content">IPv6 kad serveris to atbalsta, IPv4 ja nē.</string>
-
     <string name="whats_new_skip">Izlaist</string>
 
     <!-- User information -->

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

@@ -31,11 +31,19 @@
     <string name="drawer_item_activities">Aktiviteter</string>
     <string name="drawer_item_notifications">Varsler</string>
     <string name="drawer_quota">%1$s av %2$s brukt</string>
-	<string name="prefs_category_general">Generelt</string>
+    <string name="drawer_quota_unlimited">%1$s brukt</string>
+	<string name="drawer_close">Lukk sidepanel</string>
+    <string name="drawer_open">Åpne sidepanel</string>
+    <string name="prefs_category_general">Generelt</string>
     <string name="prefs_category_more">Mer</string>
     <string name="prefs_manage_accounts">Håndter kontoer</string>
+    <string name="prefs_lock">Lås</string>
+    <string name="prefs_lock_title">Lås med</string>
     <string name="prefs_lock_none">Ingen</string>
     <string name="prefs_lock_using_passcode">Passord</string>
+    <string name="prefs_lock_using_device_credentials">Enhetens legitimasjon</string>
+    <string name="prefs_lock_device_credentials_enabled">Enhetens legitimasjon er aktivert</string>
+    <string name="prefs_lock_device_credentials_not_setup">Ingen legitimasjon for enhet er satt opp.</string>
     <string name="prefs_expert_mode">Ekspertmodus</string>
     <string name="prefs_show_hidden_files">Vis skjulte filer</string>
     <string name="prefs_log_delete_history_button">Slett historikk</string>
@@ -58,7 +66,6 @@
     <string name="auth_host_url">Tjeneradresse https://…</string>
     <string name="auth_username">Brukernavn</string>
     <string name="auth_password">Passord</string>
-    <string name="auth_register">Ingen Nextcloud enda?\nTrykk her for å få fra en tilbyder</string>
     <string name="sync_string_files">Filer</string>
     <string name="setup_btn_connect">Koble til</string>
     <string name="uploader_btn_upload_text">Last opp</string>
@@ -104,6 +111,8 @@
     <string name="file_list_empty_text_photos_filter">Ingen bilder.</string>
     <string name="file_list_empty_text_videos">Last opp noen videoer eller skru på automatisk opplasting.</string>
     <string name="file_list_empty_text_videos_filter">Ingen videoer.</string>
+    <string name="trashbin_empty_headline">Ingen slettede filer</string>
+    <string name="trashbin_empty_message">Du vil kunne gjenopprette slettede filer herfra</string>
     <string name="upload_list_empty_headline">Ingen opplastinger tilgjengelig</string>
     <string name="upload_list_empty_text_auto_upload">Last opp noe innhold eller aktiver automatisk opplasting!</string>
     <string name="file_list_folder">mappe</string>
@@ -193,6 +202,9 @@
     <string name="foreign_files_remote_text">Ekstern: %1$s</string>
     <string name="upload_query_move_foreign_files">Det er ikke nok plass til å kopiere de valgte filene inn i mappen %1$s. Vil du flytte dem i stedet? </string>
     <string name="pass_code_enter_pass_code">Sett inn passordet ditt</string>
+    <string name="default_credentials_wrong">Feil legitimasjon</string>
+    <string name="credentials_disabled">Legitimasjon deaktivert</string>
+    
     <string name="pass_code_configure_your_pass_code">Skriv inn passordet ditt</string>
     <string name="pass_code_configure_your_pass_code_explanation">Passordet vil bli krevd hver gang programmet startes</string>
     <string name="pass_code_reenter_your_pass_code">Skriv inn passordet på nytt</string>
@@ -214,6 +226,7 @@
     <string name="media_err_timeout">Tidsavbrudd under avspillingsforsøk</string>
     <string name="media_err_invalid_progressive_playback">Mediafilen kan ikke strømmes</string>
     <string name="media_err_unknown">Mediafilen kan ikke spilles med innebygd mediaspiller</string>
+    <string name="media_err_playing">Uventet feil ved spilling av %1$s</string>
     <string name="media_rewind_description">Spol tilbake</string>
     <string name="media_play_pause_description">Spill eller pause</string>
     <string name="media_forward_description">Spol fremover</string>
@@ -227,6 +240,7 @@
 	<string name="auth_not_configured_title">Feil i tjenerkonfigurasjon</string>
 	<string name="auth_account_not_new">En konto for samme bruker og tjener finnes allerede på enheten</string>
 	<string name="auth_account_not_the_same">Den innskrevne brukeren samsvarer ikke med brukeren av denne kontoen</string>
+	<string name="auth_unknown_error_http_title">Ukjent HTTP feil oppstod!</string>
 	<string name="auth_unknown_error_title">Ukjent feil oppstod!</string>
 	<string name="auth_unknown_error_exception_title">Ukjent feil: %1$s</string>
 	<string name="auth_unknown_host_title">Fant ikke vert</string>
@@ -250,6 +264,9 @@
 	<string name="auth_fail_get_user_name">Tjeneren svarer ikke med korrekt bruker-ID. Kontakt administrator</string>
 	<string name="auth_can_not_auth_against_server">Kan ikke autentisere mot denne tjeneren</string>
     <string name="auth_account_does_not_exist">Kontoen er ikke lagt til på denne enheten enda</string>
+    <string name="auth_access_failed">Tilgang mislyktes: %1$s</string>
+    <string name="auth_illegal_login_used">Ugyldig påloggingsdata for URL er brukt</string>
+
     <string name="favorite">Sett som tilgjengelig frakoblet</string>
     <string name="unfavorite">Fjern som tilgjengelig frakoblet</string>
     <string name="favorite_real">Legg til i favoritter</string>
@@ -349,6 +366,7 @@
     <string name="copy_link">Kopier lenke</string>
     <string name="clipboard_text_copied">Kopiert til utklippstavlen</string>
     <string name="clipboard_no_text_to_copy">Ingen tekst ble mottatt for kopi til utklippstavlen</string>
+    <string name="clipboard_unexpected_error">Uventet feil ved kopiering til utklippstavle</string>
     <string name="clipboard_label">Teksten ble kopiert fra %1$s</string>
 
     <string name="error_cant_bind_to_operations_service">Kritisk feil: Kan ikke utføre operasjonene</string>
@@ -469,6 +487,7 @@
     <string name="share_expiration_date_label">Utløper den %1$s</string>
     <string name="share_no_expiration_date_label">Sett utløpsdato</string>
     <string name="share_via_link_section_title">Del lenke</string>
+    <string name="share_via_link_send_link_label">Send lenke</string>
     <string name="share_password_title">Passordbeskyttet</string>
     <string name="share_no_password_title">Velg passord</string>
     <string name="edit_permission_label">rediger</string>
@@ -509,6 +528,8 @@
     <string name="confirmation_remove_files_alert">Vil du virkelig fjerne de valgte elementene?</string>
     <string name="confirmation_remove_folders_alert">Vil du virkelig fjerne de valgte elementene og dets innhold?</string>
     <string name="maintenance_mode">Tjener i vedlikeholdsmodus</string>
+    <string name="offline_mode">Ingen internettforbindelse</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Venter på lading av enhet.</string>
     <string name="actionbar_search">Søk</string>
     <string name="files_drop_not_supported">Dette er en Nextcloud funksjon, oppgrader.</string>
@@ -563,24 +584,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nytt i %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Et trygt hjem for alle data</string>
-    <string name="welcome_feature_1_text">Bruk, del og beskytt filene dine hjemme og på jobb</string>
-
-    <string name="welcome_feature_2_title">Multi-konto</string>
-    <string name="welcome_feature_2_text">Koble til andre skytjenester</string>
-
-    <string name="welcome_feature_3_title">Auto-opplasting</string>
-    <string name="welcome_feature_3_text">Hold bilder trygge</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Ende-til-ende -kryptering</string>
-    <string name="whats_new_end_to_end_encryption_content">Trykk for å kryptere, fra vilkårlig klient. Legg til nye ved å kopiere 12 ord over.</string>
-    <string name="whats_new_resized_images_title">Tilpasningsdyktige bilder</string>
-    <string name="whats_new_resized_images_content">Små bilder er raske og fungerer flott til deling. Forstørr for å laste ned fullversjon.</string>
-    <string name="whats_new_ipv6_title">IPv6-støtte</string>
-    <string name="whats_new_ipv6_content">IPv6 når tjeneren støtter det, IPv4 hvis ikke.</string>
-
     <string name="whats_new_skip">Hopp over</string>
 
     <!-- User information -->
@@ -594,6 +597,7 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">Ingen aktivitet enda</string>
+    <string name="activities_no_results_message">Ingen hendelser som tillegg, endringer eller delinger enda</string>
     <string name="prefs_category_about">Om</string>
 
     <string name="actionbar_contacts">Sikkerhetskopier kontakter</string>
@@ -673,11 +677,13 @@ Sjekk ut Nextcloud på https://nextcloud.com</string>
     <string name="file_icon">Fil</string>
     <string name="user_icon">Bruker</string>
     <string name="favorite_icon">Favoritt</string>
+    <string name="synced_icon">Synkronisert</string>
     <string name="available_offline_icon">Tilgjengelig frakoblet</string>
     <string name="checkbox">Avkryssningsboks</string>
     <string name="shared_icon_share">del</string>
     <string name="shared_icon_shared_via_link">del via lenke</string>
     <string name="shared_icon_shared">delt</string>
+    <string name="overflow_menu">Mer meny</string>
     <string name="sort_by_name_ascending">A - Å</string>
     <string name="sort_by_modification_date_ascending">Nyeste først</string>
     <string name="sort_by_size_descending">Største først</string>
@@ -688,6 +694,7 @@ Sjekk ut Nextcloud på https://nextcloud.com</string>
     <string name="sync_status_button">Synkroniseringsstatusknapp</string>
     <string name="synced_folder_settings_button">Innstillingsknapp</string>
     <string name="synced_folder_custom_folder_image">Tilpasset mappe-knapp</string>
+    <string name="upload_item_action_button">Last opp element handlingsknapp</string>
     <string name="forward">Fremover</string>
     <string name="what_s_new_image">Hva er nytt-bilde</string>
 
@@ -705,6 +712,8 @@ Sjekk ut Nextcloud på https://nextcloud.com</string>
     <string name="share">Del</string>
     <string name="link">Lenke</string>
 
+    <string name="notification_channel_upload_name">Kanal for varsel om opplasting</string>
+    <string name="notification_channel_download_name">Kanal for varsel om nedlasting</string>
     <string name="notification_channel_download_description">Viser nedlastingsfremgang</string>
     <string name="notification_channel_upload_description">Viser opplastingsfremgang</string>
     <string name="notification_channel_media_name">Mediaavspiller</string>
@@ -725,6 +734,7 @@ Sjekk ut Nextcloud på https://nextcloud.com</string>
     
     <string name="userinfo_no_info_headline">Ingen personlig info satt</string>
     <string name="userinfo_no_info_text">Legg til navn, bilde og kontaktdetaljer på profilsiden.</string>
+    <string name="drawer_header_background">Bakgrunsbilde for innledning på meny</string>
     <string name="account_icon">Kontoikon</string>
     
     <string name="end_to_end_encryption_folder_not_empty">Denne mappen er ikke tom.</string>
@@ -733,6 +743,7 @@ Sjekk ut Nextcloud på https://nextcloud.com</string>
     <string name="end_to_end_encryption_retrieving_keys">Henter nøkler…</string>
     <string name="end_to_end_encryption_enter_password">Skriv inn passord for å dekryptere privat nøkkel.</string>
     <string name="end_to_end_encryption_generating_keys">Genererer nye nøkler…</string>
+    <string name="end_to_end_encryption_keywords_description">Alle 12 ordene sammen utgjør et veldig sterkt passord, som lar bare deg vise og gjøre bruk av dine krypterte filer. Skriv det ned og oppbevar det på en trygg plass.</string>
     <string name="end_to_end_encryption_title">Sett opp kryptering</string>
     <string name="end_to_end_encryption_passphrase_title">Merk deg dit 12-ords-krypteringspassord</string>
     <string name="end_to_end_encryption_not_supported">Kryptering støttes ikke før Android KitKat (4.4).</string>
@@ -748,17 +759,59 @@ Sjekk ut Nextcloud på https://nextcloud.com</string>
     <string name="notification_channel_push_description">Vis push-merknader sendt av tjeneren: Nevnelser i kommentarer, mottak av ny fjerndeling, kunngjøringer postet av en administrator, osv.</string>
     <string name="sendbutton_description">Ikon for forsendelsesknapp</string>
 
+    <string name="oauth_2_0_auth_end_point_address_hint">Adresse til endepunkt for autentisering</string>
+    <string name="oauth_2_0_access_end_point_address_hint">Gå til endepunkt adresse</string>
     <string name="hint_name">Navn</string>
     <string name="hint_password">Passord</string>
     <string name="add_to_cloud">Legg til %1$s</string>
     <string name="upload_files">Last opp filer</string>
+    <string name="upload_content_from_other_apps">Last opp innhold fra andre programmer</string>
     <string name="create_new_folder">Opprett ny mappe</string>
     <string name="uploads_view_upload_status_virus_detected">Virus oppdaget. Opplasting kan ikke fullføres.</string>
     <string name="tags">Knagger</string>
+    <string name="unsharing_failed">Fjerning av deling feilet</string>
+    <string name="updating_share_failed">Oppdatering av deling feilet</string>
+    <string name="prefs_e2e_mnemonic">E2E mnemonic (hjelper for ende-til-ende kryptering til å huske legitimasjon)</string>
+    <string name="prefs_e2e_no_device_credentials">For å vise mnemonic, ver vennlig å aktiver enhet legitimasjon.</string>
+    <string name="whats_new_device_credentials_title">Bruk Android\'s interne enhets beskyttelse</string>
+    <string name="login">Logg inn</string>
+    <string name="signup_with_provider">Logg på med tilbyder</string>
+    <string name="host_your_own_server">Bruk din egen server</string>
+    <string name="first_run_1_text">Hold dine data sikre og under din egen kontroll</string>
+    <string name="first_run_2_text">Sikkert samarbeid &amp; fil utveksling</string>
+    <string name="first_run_3_text">Brukervennlig e-post på web, kalender &amp; kontakter </string>
+    <string name="first_run_4_text">Deling av skjerm, online møter &amp; samtaler på web</string>
+    <string name="whats_new_device_credentials_content">Bruk et mønster, passord, pin eller fingeravtrykk for å holde dine data sikret.</string>
+    <string name="restore_button_description">Gjenopprett slettet fil</string>
+	<string name="restore">Gjenopprett fil</string>
+    <string name="new_version_was_created">Ny versjon er opprettet</string>
+    <string name="new_comment">Ny kommentar…</string>
+    <string name="error_comment_file">Feil ved kommentering av fil</string>
+    <string name="file_version_restored_successfully">Vellykket gjenoppretting av fil versjon.</string>
+    <string name="file_version_restored_error">Feil ved gjennoppretting av fil versjon!</string>
+    <string name="notification_channel_general_name">Generelle varsel</string>
+    <string name="notification_channel_general_description">Vis varsel for nye media mapper og lignende</string>
+    <string name="new_media_folder_detected">Ny %1$s media mappe oppdaget.</string>
     <string name="new_media_folder_photos">bilde</string>
     <string name="new_media_folder_videos">video</string>
-
+    <string name="outdated_server">Tjener er ikke lengre supportert, ver vennlig å oppgradere!</string>
     <string name="dismiss">Forkast</string>
+    <string name="feedback_no_mail_app">Ingen program tilgjengelig for å sende e-post!</string>
     <string name="drawer_item_trashbin">Slettede filer</string>
     <string name="trashbin_activity_title">Slettede filer</string>
-    </resources>
+    <string name="action_empty_trashbin">Tøm søppelbøtte</string>
+    <string name="trashbin_loading_failed">Innlesing av søppelbøtte feilet!</string>
+    <string name="trashbin_file_not_deleted">Fil %1$s kunne ikke slettes!</string>
+    <string name="trashbin_file_not_restored">Fil %1$s kunne ikke gjenopprettes!</string>
+    <string name="trashbin_not_emptied">Filene kunne ikke slettes permanent!</string>
+    <string name="stream">Strøm med…</string>
+    <string name="stream_not_possible_headline">Intern strøming ikke mulig</string>
+    <string name="stream_not_possible_message">Vennligst last ned media i stedet for å bruke eksternt program.</string>
+    <string name="folder_already_exists">Mappe finnes allerede</string>
+    <string name="notification_icon">Ikon for notifisering</string>
+    <string name="folder_confirm_create">Opprett</string>
+    <string name="file_delete">Slett</string>
+    <string name="file_keep">Behold</string>
+    <string name="file_rename">Gi nytt navn</string>
+    <string name="fab_label">Legg til eller last opp</string>
+</resources>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Activiteiten</string>
     <string name="drawer_item_notifications">Meldingen</string>
     <string name="drawer_quota">%1$s van %2$s gebruikt</string>
+    <string name="drawer_quota_unlimited">%1$s gebruikt</string>
 	<string name="drawer_close">Sluiten zijbalk</string>
     <string name="drawer_open">Openen zijbalk</string>
     <string name="prefs_category_general">Algemeen</string>
@@ -62,7 +63,6 @@
     <string name="auth_host_url">Serveradres https://…</string>
     <string name="auth_username">Gebruikersnaam</string>
     <string name="auth_password">Wachtwoord</string>
-    <string name="auth_register">Heb je nog geen server?\n Klik hier om je bij een provider aan te melden</string>
     <string name="sync_string_files">Bestanden</string>
     <string name="setup_btn_connect">Verbinden</string>
     <string name="uploader_btn_upload_text">Uploaden</string>
@@ -575,24 +575,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Nieuw in %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Een veilige plek voor al je gegevens</string>
-    <string name="welcome_feature_1_text">Benader, deel &amp; beveilig je gegevens thuis en binnen je organisatie</string>
-
-    <string name="welcome_feature_2_title">Meerdere accounts</string>
-    <string name="welcome_feature_2_text">Verbind met al je clouds</string>
-
-    <string name="welcome_feature_3_title">Automatisch uploaden</string>
-    <string name="welcome_feature_3_text">Hou je foto\'s veilig</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Eindpunt-tot-eindpunt versleuteling</string>
-    <string name="whats_new_end_to_end_encryption_content">Versleutel je data met één druk op de knop. Voeg nieuwe locaties toe met een sleutel van 12 woorden.</string>
-    <string name="whats_new_resized_images_title">Slimme afbeeldingsgrootte</string>
-    <string name="whats_new_resized_images_content">In eerste instantie downloaden we kleine afbeeldingen; ideaal om snel te werken en te delen. Zoom in om de volledige resolutie te downloaden.</string>
-    <string name="whats_new_ipv6_title">IPv6 ondersteuning</string>
-    <string name="whats_new_ipv6_content">IPv6 als de server dit ondersteunt, en anders IPv4.</string>
-
     <string name="whats_new_skip">Overslaan</string>
 
     <!-- User information -->
@@ -757,12 +739,13 @@
     <string name="uploads_view_upload_status_virus_detected">Virus gevonden. Upload kan niet vervolledigd worden!</string>
     <string name="tags">Labels</string>
     <string name="prefs_e2e_mnemonic">E2E mnemonic</string>
+    <string name="login">Inloggen</string>
+    <string name="first_run_1_text">Hou je gegevens veilig en in eigen beheer</string>
     <string name="restore_button_description">Herstel verwijderd bestand</string>
 	<string name="restore">Herstellen bestand</string>
     <string name="new_comment">Nieuwe reactie…</string>
     <string name="new_media_folder_photos">foto</string>
     <string name="new_media_folder_videos">video</string>
-
     <string name="dismiss">Weigeren</string>
     <string name="drawer_item_trashbin">Verwijderde bestanden</string>
     <string name="trashbin_activity_title">Verwijderde bestanden</string>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Aktywności</string>
     <string name="drawer_item_notifications">Powiadomienia</string>
     <string name="drawer_quota">Użyto %1$s z %2$s</string>
-	<string name="drawer_close">Zamknij pasek boczny</string>
+    <string name="drawer_close">Zamknij pasek boczny</string>
     <string name="drawer_open">Otwórz pasek boczny</string>
     <string name="prefs_category_general">Ogólne</string>
     <string name="prefs_category_more">Więcej</string>
@@ -62,7 +62,6 @@
     <string name="auth_host_url">Adres serwera https://…</string>
     <string name="auth_username">Nazwa użytkownika</string>
     <string name="auth_password">Hasło</string>
-    <string name="auth_register">Nie masz jeszcze Nextcloud?\nKliknij tutaj, aby znaleźć dostawcę</string>
     <string name="sync_string_files">Pliki</string>
     <string name="setup_btn_connect">Połącz</string>
     <string name="uploader_btn_upload_text">Wyślij</string>
@@ -578,19 +577,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Co nowego w %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Bezpieczny dom dla wszystkich danych</string>
-    <string name="welcome_feature_1_text">Dostęp, współdzielenie i ochrona Twoich plików w domu i w pracy</string>
-
-    <string name="welcome_feature_2_title">Wiele kont</string>
-    <string name="welcome_feature_2_text">Podłącz się do wszystkich swoich chmur</string>
-
-    <string name="welcome_feature_3_title">Automatyczne wysyłanie</string>
-    <string name="welcome_feature_3_text">Twoje zdjęcia będą bezpieczne</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Szyfrowanie end-to-end</string>
-    <string name="whats_new_ipv6_title">Wsparcie IPv6</string>
     <string name="whats_new_skip">Pomiń</string>
 
     <!-- User information -->
@@ -709,6 +695,8 @@ Wersja Nextcloud Dev jest wersją rozwojową, można ją zainstalować równoleg
     <string name="create_new_folder">Utwórz nowy katalog</string>
     <string name="uploads_view_upload_status_virus_detected">Wykryto wirusa. Nie można zakończyć wysyłania pliku!</string>
     <string name="tags">Tagi</string>
+    <string name="login">Zaloguj</string>
+    <string name="host_your_own_server">Hostuj swój własny serwer</string>
     <string name="restore_button_description">Przywróć usunięty plik</string>
 	<string name="restore">Przywróć plik</string>
     <string name="new_version_was_created">Powstała nowa wersja</string>
@@ -717,7 +705,6 @@ Wersja Nextcloud Dev jest wersją rozwojową, można ją zainstalować równoleg
     <string name="file_version_restored_error">Wystąpił błąd podczas przywracania wersji pliku!</string>
     <string name="new_media_folder_photos">zdjęcie</string>
     <string name="new_media_folder_videos">wideo</string>
-
     <string name="dismiss">Anuluj</string>
     <string name="feedback_no_mail_app">Brak dostępnej aplikacji do wysyłki wiadomości email!</string>
     <string name="drawer_item_trashbin">Usunięto pliki</string>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Atividades</string>
     <string name="drawer_item_notifications">Notificações</string>
     <string name="drawer_quota">%1$s de %2$s usados</string>
+    <string name="drawer_quota_unlimited">%1$s usados</string>
 	<string name="drawer_close">Fechar barra lateral</string>
     <string name="drawer_open">Abrir barra lateral</string>
     <string name="prefs_category_general">Geral</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Endereço do servidor https://…</string>
     <string name="auth_username">Nome de usuário</string>
     <string name="auth_password">Senha</string>
-    <string name="auth_register">Sem Nextcloud ainda?\nClique aqui para obter um de um provedor</string>
     <string name="sync_string_files">Arquivos</string>
     <string name="setup_btn_connect">Conectar</string>
     <string name="uploader_btn_upload_text">Enviar</string>
@@ -586,24 +586,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Novo em %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Um local seguro para seus dados</string>
-    <string name="welcome_feature_1_text">Acesse, compartilhe e proteja seus arquivos, em casa e no trabalho</string>
-
-    <string name="welcome_feature_2_title">Multi contas</string>
-    <string name="welcome_feature_2_text">Conectar em todas as suas Nuvens</string>
-
-    <string name="welcome_feature_3_title">Auto envio</string>
-    <string name="welcome_feature_3_text">Mantenha seguras as suas fotos</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Criptografia de ponta-a-ponta</string>
-    <string name="whats_new_end_to_end_encryption_content">Toque para criptografar, de qualquer cliente. Adicione novos copiando as 12 palavras.</string>
-    <string name="whats_new_resized_images_title">Imagens adaptáveis</string>
-    <string name="whats_new_resized_images_content">Imagens pequenas são rápidas e funcionam bem ao compartilhar. Amplie para baixar uma versão completa.</string>
-    <string name="whats_new_ipv6_title"> Support IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 quando o servidor suportar, IPv4 quando não.</string>
-
     <string name="whats_new_skip">Saltar</string>
 
     <!-- User information -->
@@ -778,6 +760,13 @@
     <string name="prefs_e2e_mnemonic">Mnemônico E2E</string>
     <string name="prefs_e2e_no_device_credentials">Para mostrar o mnemônico, ative as credenciais do dispositivo.</string>
     <string name="whats_new_device_credentials_title">Use a proteção interna do dispositivo Android</string>
+    <string name="login">Entrar</string>
+    <string name="signup_with_provider">Registre-se com um provedor</string>
+    <string name="host_your_own_server">Hospede seu próprio servidor</string>
+    <string name="first_run_1_text">Mantenha seus dados seguros e sob seu controle</string>
+    <string name="first_run_2_text">Colaboração segura &amp; troca de arquivo</string>
+    <string name="first_run_3_text">Webmail fácil de usar, calendário &amp; contatos</string>
+    <string name="first_run_4_text">Compartilhamento de tela, reuniões online &amp; conferência via web</string>
     <string name="whats_new_device_credentials_content">Use qualquer coisa como um padrão, senha, pin ou sua impressão digital para manter seus dados seguros.</string>
     <string name="restore_button_description">Restaurar arquivo excluído</string>
 	<string name="restore">Restaurar arquivo</string>
@@ -791,7 +780,6 @@
     <string name="new_media_folder_detected">Nova pasta de mídia %1$s detectada.</string>
     <string name="new_media_folder_photos">foto</string>
     <string name="new_media_folder_videos">vídeo</string>
-
     <string name="outdated_server">O servidor chegou ao fim da vida. Por favor, atualize!</string>
     <string name="dismiss">Dispensar</string>
     <string name="feedback_no_mail_app">Sem aplicativo para enviar e-mails!</string>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Atividades</string>
     <string name="drawer_item_notifications">Notificações</string>
     <string name="drawer_quota">Usado %1$s de %2$s</string>
+    <string name="drawer_quota_unlimited">%1$s utilizado</string>
 	<string name="drawer_close">Fechar barra lateral</string>
     <string name="drawer_open">Abrir barra lateral</string>
     <string name="prefs_category_general">Geral</string>
@@ -64,7 +65,6 @@
     <string name="auth_host_url">Endereço do servidor https://...</string>
     <string name="auth_username">Nome de utilizador</string>
     <string name="auth_password">Palavra-passe</string>
-    <string name="auth_register">Ainda sem Nextcloud?\\nClique aqui para obter um de um fornecedor</string>
     <string name="sync_string_files">Ficheiros</string>
     <string name="setup_btn_connect">Ligar</string>
     <string name="uploader_btn_upload_text">Enviar</string>
@@ -241,13 +241,20 @@
 	<string name="auth_expired_saml_sso_token_toast">A sua sessão expirou. Por favor, inicie a sessão novamente</string>
     <string name="auth_unsupported_multiaccount">%1$s não suporta contas múltiplas</string>
 	<string name="auth_can_not_auth_against_server">Não é possível autenticar para este servidor</string>
+    <string name="auth_access_failed">O acesso falhou: %1$s</string>
     <string name="favorite">Definir como disponível em modo desligado</string>
+    <string name="favorite_real">Adicionar aos favoritos</string>
+    <string name="unset_favorite_real">Remover dos favoritos</string>
     <string name="common_rename">Renomear</string>
+    <string name="common_remove">Eliminar </string>
     <string name="confirmation_remove_local">Apenas localmente</string>
+    <string name="remove_success_msg">Eliminado</string>
     <string name="rename_dialog_title">Introduza um novo nome</string>
     <string name="sync_file_nothing_to_do_msg">O conteúdo do ficheiro já foi sincronizado</string>
     <string name="filename_forbidden_characters">Carateres proibidos: / \\ &lt; &gt; : \" | ? *</string>
+    <string name="wait_a_moment">Aguarde um momento…</string>
     <string name="wait_checking_credentials">A verificar as credenciais guardadas</string>
+    <string name="activity_chooser_title">Enviar ligação para…</string>
     <string name="wait_for_tmp_copy_from_private_storage">A copiar o ficheiro do armazenamento privado</string>
     
     <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor não é de confiança</string>
@@ -278,6 +285,7 @@
 
     <string name="placeholder_sentence">Isto é uma variável</string>
     <string name="placeholder_filename">placeholder.txt</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
@@ -289,6 +297,9 @@
 
     <string name="preview_image_description">Pré-Visualizar imagem</string>
     <string name="error__upload__local_file_not_copied">Não foi possível copiar %1$s para a pasta local %2$s</string>
+    <string name="prefs_synced_folders_local_path_title">Pasta Local</string>
+    <string name="prefs_synced_folders_remote_path_title">Pasta Remota</string>
+    <string name="prefs_instant_upload_path_use_subfolders_title">Usar Subpastas</string>
     <string name="share_link_file_no_exist">Não é possível partilhar. Por favor verifique se o ficheiro existe</string>
 	<string name="share_link_file_error">Ocorreu um erro enquanto tentava partilhar este ficheiro ou pasta</string>
 	<string name="unshare_link_file_no_exist">Não é possível retirar a partilha. Verifique se o ficheiro existe</string>
@@ -308,15 +319,30 @@
     <string name="share_link_forbidden_permissions">para partilhar este ficheiro</string>
     <string name="unshare_link_forbidden_permissions">para cancelar a partilha deste ficheiro</string>
     <string name="update_link_forbidden_permissions">para atualizar esta partilha</string>
+    <string name="forbidden_permissions_create">para criar este ficheiro</string>
     <string name="downloader_download_file_not_found">O ficheiro não está mais disponível no servidor</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">Guardando configurações da conta…</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Aguardando que a sincronização termine…</string>
+    <string name="file_migration_migrating">Movendo dados…</string>
+    <string name="file_migration_updating_index">Actualizando indíce…</string>
+    <string name="file_migration_cleaning">Limpando…</string>
+    <string name="file_migration_restoring_accounts_configuration">Restaurando configurações da conta…</string>
+    <string name="file_migration_ok_finished">Terminado</string>
     <string name="prefs_add_account">Adicionar conta</string>
+    <string name="drawer_manage_accounts">Gerir contas</string>
     <string name="actionbar_logger">Registos de Alterações</string>
 	<string name="log_send_history_button">Histórico de envio</string>
 	<string name="log_send_mail_subject">%1$s registos de aplicação Android</string>
-    <string name="saml_authentication_wrong_pass">Palavra-passe errada</string>
+    <string name="log_progress_dialog_text">A carregar dados…</string>
+
+	<string name="saml_authentication_required_text">Necessário palavra-passe</string>
+	<string name="saml_authentication_wrong_pass">Palavra-passe errada</string>
 	<string name="actionbar_move">Mover</string>
-    <string name="folder_picker_choose_button_text">Escolher</string>
+    <string name="actionbar_copy">Copiar</string>
+	<string name="folder_picker_choose_button_text">Escolher</string>
 
     <string name="move_file_error">Ocorreu um ocorreu quando tentava mover este ficheiro ou pasta</string>
     <string name="forbidden_permissions_move">para mover este ficheiro</string>
@@ -337,23 +363,56 @@
 
     <string name="username">Nome de utilizador</string>
 
+    <plurals name="file_list__footer__folder">
+        <item quantity="one">%1$d pasta</item>
+        <item quantity="other">%1$d pastas</item>
+    </plurals>
+    <plurals name="file_list__footer__file">
+        <item quantity="one">%1$d ficheiro</item>
+        <item quantity="other">%1$d ficheiros</item>
+    </plurals>
+    <string name="prefs_instant_behaviour_dialogTitle">O ficheiro original será…</string>
+    <string name="prefs_instant_behaviour_title">O ficheiro original será…</string>
+    <string name="select_all">Selecionar tudo</string>
+    <string name="deselect_all">Desseleccionado tudo</string>
+
     <string name="pref_behaviour_entries_keep_file">mantido na pasta original</string>
     <string name="pref_behaviour_entries_move">movido para pasta da aplicação</string>
+    <string name="pref_behaviour_entries_delete_file">eliminado</string>
     <string name="share_dialog_title">Partilha</string>
     <string name="share_file">Partilhar %1$s</string>
     <string name="share_with_user_section_title">Partilhar com utilizadores e grupos</string>
     <string name="share_no_users">Ainda não foram partilhados os dados com os utilizadores</string>
     <string name="share_add_user_or_group">Adicionar utilizador ou grupo</string>
+    <string name="share_via_link_edit_permission_label">Permitir edição</string>
+    <string name="share_via_link_password_title">Protegido</string>
+    <string name="share_via_link_expiration_date_label">Definir a data de expiração</string>
+    <string name="share_via_link_menu_password_label">Protegido com Senha (%1$s)</string>
+    <string name="share_no_expiration_date_label">Definir a data de expiração</string>
     <string name="share_via_link_section_title">Compartilhar hiperligação</string>
+    <string name="share_via_link_send_link_label">Enviar hiperligação</string>
+    <string name="share_password_title">Protegido com Senha</string>
+    <string name="share_no_password_title">Defina a senha</string>
+    <string name="edit_permission_label">editar</string>
+    <string name="share_via_link_hide_file_listing_permission_label">Esconder listagem de ficheiros</string>
     <string name="share_get_public_link_button">Obter ligação</string>
+    <string name="share_with_title">Partilhar com…</string>
     <string name="share_with_edit_title">Partilhar com %1$s</string>
+    <string name="share_search">Nome, Id. da nuvem federada ou endereço de e-mail…</string>
+
     <string name="search_users_and_groups_hint">Pesquisar utilizadores e grupos</string>
     <string name="share_group_clarification">%1$s (grupo)</string>
     <string name="share_remote_clarification">%1$s (remoto)</string>
+    <string name="share_email_clarification">%1$s (email)</string>
     <string name="share_known_remote_clarification">%1$s ( em %2$s )</string>
 
+    <string name="share_privilege_unshare">Cancelar partilha</string>
     <string name="share_privilege_can_share">pode partilhar</string>
     <string name="share_privilege_can_edit">pode editar</string>
+    <string name="share_privilege_can_edit_create">pode criar</string>
+    <string name="share_privilege_can_edit_change">pode alterar</string>
+    <string name="share_privilege_can_edit_delete">pode apagar</string>
+
     <string name="action_switch_grid_view">Vista em grelha</string>
     <string name="action_switch_list_view">Vista em lista</string>
 
@@ -363,7 +422,16 @@
     <string name="maintenance_mode">Servidor em manutenção</string>
     <string name="actionbar_search">Procura</string>
     <string name="learn_more">Conheça melhor</string>
+    <string name="drawer_synced_folders">Carregamento automático</string>
     <string name="drawer_participate">Participe</string>
+    <string name="participate_testing_report_text">Reportar um problema no Github</string>
+    <string name="participate_contribute_translate_translate">Traduzir</string>
+    <string name="move_to">Movido para…</string>
+    <plurals name="items_selected_count">
+        <item quantity="one">%d selecionado</item>
+        <item quantity="other">%d selecionados</item>
+    </plurals>
+
     <string name="upload_file_dialog_filename">Nome do ficheiro</string>
     <string name="upload_file_dialog_filetype">Tipo de ficheiro</string>
     <string name="upload_file_dialog_filetype_internet_shortcut">Atalhos(%s) de Internet</string>
@@ -371,29 +439,70 @@
 
     <string name="storage_description_default">Por defeito</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Um lugar seguro para todos os seus dados</string>
-    <string name="welcome_feature_2_title">Conta múltipla</string>
-    <string name="welcome_feature_2_text">Ligar-se a todas as suas contas cloud</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Encriptação ponto-a-ponto</string>
+    <!-- What's new feature and texts to show -->
+    <string name="whats_new_title">Novo em %1$s</string>
     <string name="whats_new_skip">Passar à frente</string>
 
     <!-- User information -->
     <string name="user_info_email">E-mail</string>
+    <string name="user_info_phone">Número de telefone</string>
     <string name="user_info_address">Endereço</string>
+    <string name="user_info_website">Site da Internet</string>
     <string name="user_info_twitter">Twitter</string>
 
+    <!-- Activities -->
+    <string name="activities_no_results_headline">Ainda sem atividade</string>
+    <string name="prefs_category_about">Sobre</string>
+
+    <string name="contacts_preference_backup_never">nunca</string>
+    <string name="drawer_logout">Terminar sessão</string>
+    <string name="privacy">Privacidade</string>
+    <string name="file_not_found">Ficheiro não encontrado</string>
+    <string name="resharing_is_not_allowed">Não é permitido voltar a partilhar</string>
+    <string name="fallback_weblogin_back">Anterior</string>
+    <string name="foreground_service_upload">A enviar ficheiros…</string>
     <string name="foreground_service_download">A transferir os ficheiros...</string>
 
     <string name="prefs_license">Licença</string>
+    <string name="prefs_gpl_v2">GNU - Licença Pública Geral, Versão 2</string>
     <string name="date_unknown">Desconhecido</string>
 
     <string name="resized_images_download_full_image">Transferir imagem completa?</string>
 
+    <string name="activity_icon">Actividade</string>
+    <string name="file_icon">Ficheiro</string>
+    <string name="user_icon">Utilizador</string>
+    <string name="favorite_icon">Favorito</string>
+    <string name="shared_icon_shared_via_link">Partilhado via hiperligação</string>
+    <string name="shared_icon_shared">partilhado</string>
+    <string name="sort_by_modification_date_ascending">Recentes primeiro</string>
+    <string name="sort_by_size_descending">Maiores primeiro</string>
+    <string name="sort_by_size_ascending">Mais pequenos primeiro</string>
+    <string name="sort_by_modification_date_descending">Antigos primeiro</string>
+    <string name="synced_folders_type">Tipo</string>
+    <string name="synced_folder_settings_button">Botão de Configurações</string>
+    <string name="forward">Avançar</string>
     <string name="version_dev_download">Transferir</string>
 
+    <string name="send">Enviar</string>
+    <string name="share">Partilhar</string>
+    <string name="link">Hiperligação</string>
+
     <string name="notification_channel_download_name">Canal de notificação de transferências</string>
     <string name="notification_channel_download_description">Mostra o progresso da transferência</string>
     <string name="end_to_end_encryption_not_enabled">Encriptação ponto-a-ponto desativada no servidor.</string>
+    <string name="end_to_end_encryption_password">Palavra-passe…</string>
+    <string name="end_to_end_encryption_dialog_close">Fechar</string>
+    <string name="hint_name">Nome</string>
+    <string name="hint_password">Palavra-passe</string>
+    <string name="upload_files">Carregar ficheiros</string>
+    <string name="create_new_folder">Criar nova pasta</string>
+    <string name="tags">Etiquetas</string>
+    <string name="login">Iniciar Sessão</string>
+    <string name="new_comment">Novo comentário…</string>
+    <string name="new_media_folder_photos">photo</string>
+    <string name="new_media_folder_videos">vídeo</string>
+    <string name="dismiss">Dispensar</string>
+    <string name="drawer_item_trashbin">Ficheiros eliminados</string>
+    <string name="trashbin_activity_title">Ficheiros eliminados</string>
     </resources>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">События</string>
     <string name="drawer_item_notifications">Уведомления</string>
     <string name="drawer_quota">использовано %1$s из %2$s </string>
+    <string name="drawer_quota_unlimited">%1$s использовано</string>
 	<string name="drawer_close">Закрыть боковую панель</string>
     <string name="drawer_open">Открыть боковую панель</string>
     <string name="prefs_category_general">Основные</string>
@@ -65,7 +66,6 @@
     <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>
@@ -596,24 +596,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Новое в %1$s</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>
 
     <!-- User information -->
@@ -788,6 +770,9 @@
     <string name="prefs_e2e_mnemonic">Мнемофраза E2E</string>
     <string name="prefs_e2e_no_device_credentials">Для просмотра мнемофразы включите системную защитную блокировку.</string>
     <string name="whats_new_device_credentials_title">Использовать системные средства защиты</string>
+    <string name="login">Войти</string>
+    <string name="signup_with_provider">Подключиться через провайдера</string>
+    <string name="first_run_1_text">Храните ваши данные в безопасности и под вашим контролем.</string>
     <string name="whats_new_device_credentials_content">Для защиты данных могут быть использованы пароль, ПИН, защитный узор или отпечаток пальца.</string>
     <string name="restore_button_description">Восстановить удаленный файл</string>
 	<string name="restore">Восстановить файл</string>
@@ -801,7 +786,6 @@
     <string name="new_media_folder_detected">Обнаружена новая папка с фото или видеофайлами: «%1$s».</string>
     <string name="new_media_folder_photos">фото</string>
     <string name="new_media_folder_videos">видео</string>
-
     <string name="outdated_server">Версия сервера Nextcloud  более не поддерживается, требуется её обновление.</string>
     <string name="dismiss">Отклонить</string>
     <string name="feedback_no_mail_app">Нет приложения для отправки писем!</string>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Aktivity</string>
     <string name="drawer_item_notifications">Upozornenia</string>
     <string name="drawer_quota">Využité: %1$s z %2$s</string>
-	<string name="prefs_category_general">Všeobecné</string>
+    <string name="prefs_category_general">Všeobecné</string>
     <string name="prefs_category_more">Viac</string>
     <string name="prefs_manage_accounts">Spravovať účty</string>
     <string name="prefs_expert_mode">Expertný režim</string>
@@ -56,7 +56,6 @@
     <string name="auth_host_url">Adresa servera https://…</string>
     <string name="auth_username">Používateľské meno</string>
     <string name="auth_password">Heslo</string>
-    <string name="auth_register">Ešte nemáte Nextcloud?\nKliknite sem a získajte ho od poskytovateľa</string>
     <string name="sync_string_files">Súbory</string>
     <string name="setup_btn_connect">Pripojiť</string>
     <string name="uploader_btn_upload_text">Nahrať</string>
@@ -413,14 +412,6 @@
 
     <string name="storage_description_default">Predvolené</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Bezpečný domov pre všetky vaše dáta</string>
-    <string name="welcome_feature_2_title">Viac účtov</string>
-    <string name="welcome_feature_2_text">Pripojte sa k všetkým vaším cloudovým službám</string>
-
-    <string name="welcome_feature_3_text">Udržujte svoje fotografie v bezpečí</string>
-
-    <string name="whats_new_ipv6_title">Podpora IPv6</string>
     <string name="whats_new_skip">Preskočiť</string>
 
     <!-- User information -->

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Dejavnosti</string>
     <string name="drawer_item_notifications">Obvestila</string>
     <string name="drawer_quota">%1$s od %2$s uporabljeno</string>
-	<string name="prefs_category_general">Splošno</string>
+    <string name="prefs_category_general">Splošno</string>
     <string name="prefs_category_more">Več</string>
     <string name="prefs_manage_accounts">Upravljanje z računi</string>
     <string name="prefs_lock">Zakleni</string>
@@ -410,14 +410,6 @@
 
     <string name="storage_description_default">Privzeto</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Varno mesto za vse podatke</string>
-    <string name="welcome_feature_2_title">Več računov</string>
-    <string name="welcome_feature_2_text">Poveži se z vsemi tvojimi oblaki</string>
-
-    <string name="welcome_feature_3_title">Samodejno nalaganje</string>
-    <string name="welcome_feature_3_text">Hrani svoje slike na varnem</string>
-
     <string name="whats_new_skip">Preskoči</string>
 
     <!-- User information -->

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Aktivitetet</string>
     <string name="drawer_item_notifications">Njoftime</string>
     <string name="drawer_quota">%1$s e %2$s përdorur</string>
+    <string name="drawer_quota_unlimited">%1$s të përdorura</string>
 	<string name="drawer_close">Mbyllni sidebar-in</string>
     <string name="drawer_open">Hapni sidebar-in</string>
     <string name="prefs_category_general">Të përgjithshme</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Adresa e serverit https://…</string>
     <string name="auth_username">Emër përdoruesi</string>
     <string name="auth_password">Fjalëkalim</string>
-    <string name="auth_register">Nuk keni akoma Nextcloud?\nKlikoni këtu për të marrë një nga ofruesit</string>
     <string name="sync_string_files">Kartela</string>
     <string name="setup_btn_connect">Lidhuni</string>
     <string name="uploader_btn_upload_text">Ngarkoni</string>
@@ -587,24 +587,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">I ri në %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Një shtëpi e sigurt për të gjitha të dhënat tuaja</string>
-    <string name="welcome_feature_1_text">Akseso, ndaj dhe mbro skedarët e tuaja në shtëpinë dhe organizatën tuaj.</string>
-
-    <string name="welcome_feature_2_title">Llogari e shumfishtë</string>
-    <string name="welcome_feature_2_text">Lidhuni me të gjitha shërbimet cloud</string>
-
-    <string name="welcome_feature_3_title">Ngarkim i menjëhershëm</string>
-    <string name="welcome_feature_3_text">Mbajini fotot të sigurta</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Enkriptim end-to-end </string>
-    <string name="whats_new_end_to_end_encryption_content">Shtyp për të enkriptuar, nga cdo klient. Shto të rinj duke kopjuar 12 fjalë ose më shumë.</string>
-    <string name="whats_new_resized_images_title">Imazhe adaptive</string>
-    <string name="whats_new_resized_images_content">Imazhet e vogla janë të shpejta dhe funksionojnë shumë mirë për ti shpërndarë. Zmadhoni për të shkarkuar një version të plotë.</string>
-    <string name="whats_new_ipv6_title">Mbështet IPv6</string>
-    <string name="whats_new_ipv6_content">IPv6 kur serveri e suporton atë, IPv4 kur nuk e suporton.</string>
-
     <string name="whats_new_skip">Kalo</string>
 
     <!-- User information -->
@@ -779,6 +761,13 @@
     <string name="prefs_e2e_mnemonic">E2E i kujtesës</string>
     <string name="prefs_e2e_no_device_credentials">Për të shfaqur kujtesën, ju lutemi aktivizoni kredencialet e pajisje.</string>
     <string name="whats_new_device_credentials_title">Përdorni mbrojtjen e brendshme të pajisjes Android</string>
+    <string name="login">Hyni</string>
+    <string name="signup_with_provider">Regjistrohu me ofruesin</string>
+    <string name="host_your_own_server">Hostoni serverin tuaj</string>
+    <string name="first_run_1_text">Mbani të sigurta dhe nën kontroll të dhënat tuaja</string>
+    <string name="first_run_2_text">Bashkëpunim i sigurtë &amp;skedar i ndryshuar</string>
+    <string name="first_run_3_text">E-mail i thjeshtë për t\'u përdorur në web, kalendari &amp;i kontakteve</string>
+    <string name="first_run_4_text">Ndarja e ekranit, takime në internet &amp; konferenca në web</string>
     <string name="whats_new_device_credentials_content">Përdorni diçka si një model, fjalëkalim, pin ose gjurmë gishtash për të mbajtur të dhënat tuaja të sigurta.</string>
     <string name="restore_button_description">Rikthe skedarin e fshirë</string>
 	<string name="restore">Rikthe skedarin</string>
@@ -792,7 +781,6 @@
     <string name="new_media_folder_detected">Dosja %1$se re e mediave u zbulua.</string>
     <string name="new_media_folder_photos">Foto</string>
     <string name="new_media_folder_videos">Video</string>
-
     <string name="outdated_server">Serveri ka arritur fundin e jetës, ju lutemi përmirësojeni!</string>
     <string name="dismiss">Hiq</string>
     <string name="feedback_no_mail_app">Nuk ka asnjë aplikacion në dispozicion për të dërguar mesazhe!</string>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Активности</string>
     <string name="drawer_item_notifications">Обавештења</string>
     <string name="drawer_quota">%1$s од %2$s заузето</string>
+    <string name="drawer_quota_unlimited">%1$s искоришћено</string>
 	<string name="drawer_close">Затвори бочну траку</string>
     <string name="drawer_open">Отвори бочну траку</string>
     <string name="prefs_category_general">Опште</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Адреса сервера https://…</string>
     <string name="auth_username">Корисничко име</string>
     <string name="auth_password">Лозинка</string>
-    <string name="auth_register">Још немате Некстклауд?\nКликните овде да направите један код провајдера</string>
     <string name="sync_string_files">Фајлови</string>
     <string name="setup_btn_connect">Повежи се</string>
     <string name="uploader_btn_upload_text">Отпреми</string>
@@ -591,24 +591,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">Ново у %1$s</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>
 
     <!-- User information -->
@@ -783,6 +765,13 @@
     <string name="prefs_e2e_mnemonic">Е2Е мнемоник</string>
     <string name="prefs_e2e_no_device_credentials">За приказивање мнемоника, омогућите акредитиве на уређају.</string>
     <string name="whats_new_device_credentials_title">Користи Андроидову интерну заштиту уређаја</string>
+    <string name="login">Пријава</string>
+    <string name="signup_with_provider">Пријавите се преко провајдера</string>
+    <string name="host_your_own_server">Хостујте сопствени  сервер</string>
+    <string name="first_run_1_text">Држите податке безбедним и под Вашом контролом</string>
+    <string name="first_run_2_text">Безбедна сарадња &amp; и размена фајлова</string>
+    <string name="first_run_3_text">Веб пошта лака за коришћење, календар &amp; контакти</string>
+    <string name="first_run_4_text">Дељење екрана, састанци на интернету &amp; веб конференције</string>
     <string name="whats_new_device_credentials_content">Користите било шта попут шаблона, лозинке, пина или отиска Вашег прста да заштитите Ваше податке.</string>
     <string name="restore_button_description">Поврати обрисани фајл</string>
 	<string name="restore">Поврати фајл</string>
@@ -796,7 +785,6 @@
     <string name="new_media_folder_detected">Пронађена је нова мултимедијална фасцикла са %1$s</string>
     <string name="new_media_folder_photos">сликама</string>
     <string name="new_media_folder_videos">видео записима</string>
-
     <string name="outdated_server">Сервер је изашао из гаранције, молимо ажурирајте га!</string>
     <string name="dismiss">Одбаци</string>
     <string name="feedback_no_mail_app">Нема апликација за слање е-поште!</string>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">Aktiviteter</string>
     <string name="drawer_item_notifications">Notifieringar</string>
     <string name="drawer_quota">%1$s av %2$s använt</string>
-	<string name="prefs_category_general">Allmänt</string>
+    <string name="prefs_category_general">Allmänt</string>
     <string name="prefs_category_more">Mer</string>
     <string name="prefs_manage_accounts">Hantera konton</string>
     <string name="prefs_lock">Lås</string>
@@ -60,7 +60,6 @@
     <string name="auth_host_url">Server address https://…</string>
     <string name="auth_username">Användarnamn</string>
     <string name="auth_password">Lösenord</string>
-    <string name="auth_register"> Har du inte Nextcloud än?\nKlicka här för att hämta från leverantör</string>
     <string name="sync_string_files">Filer</string>
     <string name="setup_btn_connect">Anslut</string>
     <string name="uploader_btn_upload_text">Ladda upp</string>
@@ -474,16 +473,6 @@
 
     <string name="storage_description_default">Standard</string>
 
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">En säker lagringsplats för all din data</string>
-    <string name="welcome_feature_1_text">Få tillgång, dela och skydda dina filer hemma och i ditt företag</string>
-
-    <string name="welcome_feature_2_title">Multikonto</string>
-    <string name="welcome_feature_2_text">Anslut alla dina moln</string>
-
-    <string name="welcome_feature_3_title">Automatisk uppladdning</string>
-    <string name="welcome_feature_3_text">Lagra dina foton på ett säkert ställe</string>
-
     <string name="whats_new_skip">Hoppa över</string>
 
     <!-- User information -->

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">Etkinlikler</string>
     <string name="drawer_item_notifications">Bildirimler</string>
     <string name="drawer_quota">%1$s / %2$s kullanıldı</string>
+    <string name="drawer_quota_unlimited">%1$s kullanılıyor</string>
 	<string name="drawer_close">Yan çubuğu kapat</string>
     <string name="drawer_open">Yan çubuğu aç</string>
     <string name="prefs_category_general">Genel</string>
@@ -65,7 +66,6 @@
     <string name="auth_host_url">Sunucu adresi https://…</string>
     <string name="auth_username">Kullanıcı Adı</string>
     <string name="auth_password">Parola</string>
-    <string name="auth_register">Henüz Nextcloud kullanmıyor musunuz?\Listeden bir hizmet sağlayıcısı seçebilirsiniz</string>
     <string name="sync_string_files">Dosyalar</string>
     <string name="setup_btn_connect">Bağlan</string>
     <string name="uploader_btn_upload_text">Yükle</string>
@@ -586,24 +586,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">%1$s yenilikleri</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Verileriniz için güvenli bir yer!</string>
-    <string name="welcome_feature_1_text">Ev ya da iş yerinizdeki dosyalarınıza erişin, paylaşın ve koruyun</string>
-
-    <string name="welcome_feature_2_title">Birden çok hesap</string>
-    <string name="welcome_feature_2_text">Tüm bulut hesaplarınıza bağlanın</string>
-
-    <string name="welcome_feature_3_title">Otomatik yükleme</string>
-    <string name="welcome_feature_3_text">Fotoğraflarınızı koruyun</string>
-
-    <string name="whats_new_end_to_end_encryption_title">Uçtan uca şifreleme</string>
-    <string name="whats_new_end_to_end_encryption_content">Şifrelenmesini istediğiniz istemciye dokunun. 12 sözcüğü kopyalayarak yenilerini ekleyinç</string>
-    <string name="whats_new_resized_images_title">Uyumlu görseller</string>
-    <string name="whats_new_resized_images_content">Küçük görseller çalışmak ve paylaşmak için uygundur. Tam sürümü indirmek için yakınlaştırın.</string>
-    <string name="whats_new_ipv6_title">IPv6 desteği</string>
-    <string name="whats_new_ipv6_content">Sunucu destekliyorsa IPv6, desteklemiyorsa IPv4.</string>
-
     <string name="whats_new_skip">Atla</string>
 
     <!-- User information -->
@@ -778,6 +760,13 @@
     <string name="prefs_e2e_mnemonic">E2E belleği</string>
     <string name="prefs_e2e_no_device_credentials">Belleğin görüntülenmesi için aygıt kimlik doğrulama bilgilerini etkinleştirin.</string>
     <string name="whats_new_device_credentials_title">Android iç aygıt koruması kullanılsın</string>
+    <string name="login">Oturum Aç</string>
+    <string name="signup_with_provider">Hizmet sağlayıcı ile hesap aç</string>
+    <string name="host_your_own_server">Kendi sunucunuzu işletin</string>
+    <string name="first_run_1_text">Verilerinizi güvenli ve denetiminiz altında tutun</string>
+    <string name="first_run_2_text">Güvenli iş birliği ve dosya değiş tokuşu</string>
+    <string name="first_run_3_text">Kolay kullanılan web e-posta, takvim ve kişiler</string>
+    <string name="first_run_4_text">Ekran paylaşımı, çevrimiçi görüşmeler ve web toplantıları</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>
     <string name="restore_button_description">Silinmiş dosyayı geri yükle</string>
 	<string name="restore">Dosyayı geri yükle</string>
@@ -791,7 +780,6 @@
     <string name="new_media_folder_detected">Yeni %1$s ortam klasörü bulundu.</string>
     <string name="new_media_folder_photos">fotoğraf</string>
     <string name="new_media_folder_videos">görüntü</string>
-
     <string name="outdated_server">Sunucu ömrünün sonuna geldi, lütfen sürümünü yükseltin!</string>
     <string name="dismiss">Yoksay</string>
     <string name="feedback_no_mail_app">E-posta göndermek için kullanılabilecek bir uygulama yok!</string>

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

@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="about_android">%1$s Android-додаток</string>
-    <string name="about_version">версія %1$s</string>
-    <string name="actionbar_sync">Оновити обліковий запис</string>
-    <string name="actionbar_open_with">Відкрити за допомогою</string>
-    <string name="actionbar_mkdir">Нова тека</string>
-    <string name="actionbar_settings">Налаштування</string>
-    <string name="actionbar_see_details">Деталі</string>
-    <string name="actionbar_send_file">Надіслати</string>
-    <string name="actionbar_sort">Сортувати</string>
-    <string name="sort_by">Сортувати по</string>
-    <string name="menu_item_sort_by_name_a_z">А - Я</string>
-    <string name="menu_item_sort_by_name_z_a">Я - А</string>
-    <string name="menu_item_sort_by_date_newest_first">Новіші попереду</string>
-    <string name="menu_item_sort_by_date_oldest_first">Старіші попереду</string>
-    <string name="menu_item_sort_by_size_biggest_first">Більші попереду</string>
-    <string name="menu_item_sort_by_size_smallest_first">Менші попереду</string>
-
-    <string name="drawer_item_all_files">Усі файли</string>
-    <string name="drawer_item_home">Старт</string>
-    <string name="drawer_item_favorites">Улюблені</string>
-    <string name="drawer_item_photos">Фото</string>
-    <string name="drawer_item_on_device">На пристрої</string>
-    <string name="drawer_item_recently_added">Нещодавно додані</string>
-    <string name="drawer_item_recently_modified">Нещодавно змінені</string>
-    <string name="drawer_item_shared">Спільні</string>
-    <string name="drawer_item_videos">Відео</string>
-    <string name="drawer_item_settings">Налаштування</string>
-    <string name="drawer_item_uploads_list">Завантаженнь</string>
-    <string name="drawer_item_activities">Події</string>
-    <string name="drawer_item_notifications">Повідомлення</string>
-    <string name="drawer_quota">%1$s з %2$s використано</string>
-	<string name="prefs_category_general">Основне</string>
-    <string name="prefs_category_more">Більше</string>
-    <string name="prefs_manage_accounts">Управління обліковими записами</string>
-    <string name="prefs_lock_none">Жодне</string>
-    <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_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="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="sync_string_files">Файли</string>
-    <string name="setup_btn_connect">З\'єднати</string>
-    <string name="uploader_btn_upload_text">Відвантажити</string>
-    <string name="uploader_btn_alternative_text">Вибрати</string>
-    <string name="uploader_top_message">Оберіть каталог вивантаження</string>
-    <string name="uploader_wrn_no_account_title">Не знайдено облікового запису</string>
-    <string name="uploader_wrn_no_account_text">На вашому пристрої немає %1$s облікових записів. Будь ласка, спочатку створіть обліковий запис.</string>
-    <string name="uploader_wrn_no_account_setup_btn_text">Налаштування</string>
-    <string name="uploader_wrn_no_account_quit_btn_text">Вийти</string>
-    <string name="uploader_error_title_no_file_to_upload">Відсутні файли для вивантаження</string>
-    <string name="uploader_error_message_no_file_to_upload">Отримані дані не містили вірного файлу.</string>
-    <string name="uploader_error_title_file_cannot_be_uploaded">Цей файл неможливо вивантажити</string>
-    <string name="uploader_error_message_read_permission_not_granted">%1$s не дозволено читати отриманий файл</string>
-    <string name="uploader_error_message_source_file_not_found">Файл вибраний для вивантаження не знайдено. Будь-ласка перевірте чи файл існує</string>
-    <string name="uploader_error_message_source_file_not_copied">Неможливо скопіювати файл до тимчасової теки. Спробуйте знову</string>
-    <string name="uploader_upload_files_behaviour">Параметри завантаження:</string>
-    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Перемістити файл до каталогу %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>
-    <string name="file_list_empty_headline">Тут немає файлів</string>
-    <string name="folder_list_empty_headline">Тут немає папок</string>
-    <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_no_app_for_file_type">Відсутній застосунок для відкриття файлу такого типу.</string>
-    <string name="local_file_list_empty">В цій теці немає файлів.</string>
-    <string name="local_folder_list_empty">Тут відсутні інші каталоги.</string>
-    <string name="file_list_empty_headline_search">Жодного співпадіння у цій теці</string>
-    <string name="file_list_empty_headline_server_search">Жодного співпадіння</string>
-    <string name="file_list_empty_favorite_headline">Відсутнє обране</string>
-    <string name="file_list_empty_shared_headline">Жодного спільного файлу</string>
-    <string name="file_list_empty_shared">Файли і теки, яким ви дасте спільний доступ, з\'являться тут</string>
-    <string name="file_list_empty_headline_server_search_videos">Жодного відеофайлу</string>
-    <string name="file_list_empty_headline_server_search_photos">Жодного фото</string>
-    <string name="file_list_empty_search">Можливо, це інший каталог?</string>
-    <string name="file_list_empty_recently_modified">Відсутні зміни серед файлів за останні 7 днів</string>
-    <string name="file_list_empty_recently_added_filter">Нещодавно додані файли відсутні</string>
-    <string name="file_list_empty_text_photos_filter">Немає фотографій.</string>
-    <string name="file_list_empty_text_videos_filter">Немає відеозаписів.</string>
-    <string name="trashbin_empty_headline">Видалені файли відсутні</string>
-    <string name="upload_list_empty_headline">Немає доступних вивантажень.</string>
-    <string name="file_list_folder">тека</string>
-    <string name="filedetails_download">Завантажити</string>
-    <string name="filedetails_sync_file">Синхронізація</string>
-    <string name="filedetails_renamed_in_upload_msg">Під час завантаження назву файлу було змінено %1$s</string>
-    <string name="action_send_share">Надіслати/Поширити</string>
-    <string name="common_yes">Так</string>
-    <string name="common_no">Ні</string>
-    <string name="common_ok">OK</string>
-    <string name="common_cancel_sync">Відмінити синхронізацію</string>
-    <string name="common_cancel">Відмінити</string>
-    <string name="common_back">Назад</string>
-    <string name="common_save">Зберегти</string>
-    <string name="common_error">Помилка</string>
-    <string name="common_loading">Завантаження…</string>
-    <string name="common_unknown">невідомо</string>
-    <string name="common_error_unknown">Невідома помилка</string>
-    <string name="common_pending">Очікування</string>
-    <string name="common_delete">Видалити</string>
-    <string name="common_send">Надіслати</string>
-    <string name="about_title">Про</string>
-    <string name="delete_account">Видалити обліковий запис</string>
-    <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="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_ticker">Завантажені</string>
-    <string name="uploader_upload_succeeded_content_single">%1$s завантажено</string>
-    <string name="uploader_upload_failed_ticker">Помилка завантаження</string>
-    <string name="uploader_upload_failed_content_single">Неможливо завантажити %1$s</string>
-    <string name="uploader_upload_failed_credentials_error">Завантаження невдале, увійдіть ще раз</string>
-    <string name="uploads_view_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>
-    <string name="uploads_view_upload_status_succeeded">Завершені</string>
-    <string name="uploads_view_upload_status_cancelled">Відмінено</string>
-    <string name="uploads_view_upload_status_failed_connection_error">Помилка з\'єднання</string>
-    <string name="uploads_view_upload_status_failed_credentials_error">Помилка в імені користувача та/чи паролі</string>
-    <string name="uploads_view_upload_status_failed_folder_error">Помилка теки</string>
-    <string name="uploads_view_upload_status_failed_file_error">Помилка файлу</string>
-    <string name="uploads_view_upload_status_failed_localfile_error">Локальний файл не знайдено</string>
-    <string name="uploads_view_upload_status_failed_permission_error">Помилка доступу</string>
-    <string name="uploads_view_upload_status_conflict">Конфлікт</string>
-    <string name="uploads_view_upload_status_service_interrupted">Додаток зупинено</string>
-    <string name="uploads_view_upload_status_unknown_fail">Невідома помилка</string>
-    <string name="uploads_view_upload_status_waiting_for_wifi">Очікування з\'єднання з WiFi</string>
-    <string name="uploads_view_upload_status_waiting_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_content">%1$d%% Зкачування %2$s</string>
-    <string name="downloader_download_succeeded_ticker">Вивантажені</string>
-    <string name="downloader_download_succeeded_content">%1$s завантажено</string>
-    <string name="downloader_download_failed_ticker">Завантаження не вдалося</string>
-    <string name="downloader_download_failed_content">Не можливо вивантажити %1$s</string>
-    <string name="downloader_not_downloaded_yet">Ще не завантажене</string>
-    <string name="downloader_download_failed_credentials_error">Вивантаження невдале, увійдіть знову</string>
-    <string name="common_choose_account">Оберіть обліковий запис</string>
-    <string name="common_switch_account">Перемкнути обліковий запис</string>
-    <string name="sync_fail_ticker">Помилка синхронізації</string>
-    <string name="sync_fail_ticker_unauthorized">Синхронізація невдала, увійдіть знову</string>
-    <string name="sync_fail_content">Синхронізація не вдала %1$s</string>
-    <string name="sync_fail_content_unauthorized">Не правильний пароль для %1$s</string>
-    <string name="sync_conflicts_in_favourites_ticker">Конфліктів знайдено</string>
-    <string name="sync_fail_in_favourites_ticker">Синхронізувати файли не вдалося</string>
-    <string name="sync_foreign_files_forgotten_ticker">Деякі локальні файли були забуті</string>
-    <string name="sync_current_folder_was_removed">Теки %1$s більше немає</string>
-    <string name="foreign_files_move">Перемістити все</string>
-    <string name="foreign_files_success">Усі файли переміщено</string>
-    <string name="foreign_files_fail">Окремі файли неможливо перемістити</string>
-    <string name="upload_query_move_foreign_files">Нестача місця не дозволяє скопіювати файли до каталогу%1$s. Чи бажаєте перемістити їх замість копіювання?</string>
-    <string name="pass_code_enter_pass_code">Будь ласка, введіть Ваш код доступу</string>
-    <string name="default_credentials_wrong">Неправильні дані авторизації</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_mismatch">Коди доступу не співпадають</string>
-    <string name="pass_code_wrong">Невірний код доступу</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_unsupported">Кодек не підтримується</string>
-    <string name="media_err_io">Неможливо відкрити мультимедійний файл</string>
-    <string name="media_err_malformed">Мультимедійний файл має неправильно кодування</string>
-    <string name="media_rewind_description">Перемтка назад</string>
-    <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_no_net_conn_title">Відсутнє підключення до мережі</string>
-	<string name="auth_nossl_plain_ok_title">Безпечне з\'єднання не доступне.</string>
-	<string name="auth_connection_established">З\'єднання встановлено</string>
-	<string name="auth_testing_connection">Перевірка з\'єднання</string>
-	<string name="auth_not_configured_title">Не вірні налаштування сервер </string>
-	<string name="auth_account_not_new">Обліковий запис для такого користувача на цьому сервері вже є на пристрої</string>
-	<string name="auth_account_not_the_same">Введений користувач не відповідає обліковому запису</string>
-	<string name="auth_unknown_error_http_title">Сталася невідома помилка HTTP!</string>
-	<string name="auth_unknown_error_title">Виникла невідома помилка!</string>
-	<string name="auth_unknown_error_exception_title">Невідома помилка: %1$s</string>
-	<string name="auth_unknown_host_title">Вузол не знайдено</string>
-	<string name="auth_incorrect_path_title">Сервер не знайдено</string>
-	<string name="auth_timeout_title">Сервер занадто довго не відповідає</string>
-	<string name="auth_incorrect_address_title">Неправильний формат адреси сервера</string>
-	<string name="auth_ssl_general_error_title">Помилка SSL ініціалізації</string>
-	<string name="auth_ssl_unverified_server_title">Неможливо перевірити справжність SSL-сервера</string>
-	<string name="auth_bad_oc_version_title">Не вдалося визначити версію сервер серверу</string>
-	<string name="auth_wrong_connection_title">Не вдалося встановити з\'єднання</string>
-	<string name="auth_secure_connection">Встановлено захищене з\'єднання</string>
-	<string name="auth_unauthorized">Невірне ім\'я користувача або пароль</string>
-	<string name="auth_oauth_error">Невдала авторизація</string>
-	<string name="auth_oauth_error_access_denied">Доступ заборонений сервером авторизації</string>
-	<string name="auth_wtf_reenter_URL">Неочікуваний статус; будь ласка, введіть адресу сервера знову</string>
-	<string name="auth_expired_oauth_token_toast">Час авторизації минув. Будь ласка, увійдіть знову</string>
-	<string name="auth_expired_basic_auth_toast">Будь ласка, введіть поточний пароль</string>
-	<string name="auth_expired_saml_sso_token_toast">Час сесії минув. Будь ласка, підключіться знов</string>
-    <string name="auth_connecting_auth_server">З\'єднання із сервером авторизації</string>
-	<string name="auth_unsupported_multiaccount">%1$s не підтримує одночасно декілька облікових записів</string>
-	<string name="auth_fail_get_user_name">Ваш сервер не повернув правильний ID користувача. Просимо сконтактувати з адміністратором.</string>
-	<string name="favorite_real">Додати до обраного</string>
-    <string name="unset_favorite_real">Вилучити з обраного</string>
-    <string name="encrypted">Позначити як зашифроване</string>
-    <string name="unset_encrypted">Зняти шифрування</string>
-    <string name="common_rename">Перейменувати</string>
-    <string name="common_remove">Вилучити</string>
-    <string name="confirmation_remove_file_alert">Ви справді бажаєте вилучити %1$s?</string>
-    <string name="confirmation_remove_folder_alert">Ви справді бажаєте вилучити %1$s та його вміст?</string>
-    <string name="confirmation_remove_local">Лише локально</string>
-    <string name="remove_success_msg">Вилучено</string>
-    <string name="remove_fail_msg">Помилка під час вилучення</string>
-    <string name="rename_dialog_title">Введіть нове ім\'я</string>
-    <string name="rename_local_fail_msg">Неможливо перейменувати локальну копію, спробуйте інше ім\'я</string>
-    <string name="rename_server_fail_msg">Неможливо перейменувати, таке ім\'я уже існує</string>
-    <string name="sync_file_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">Увійти через oAuth2</string>
-    <string name="oauth_login_connection">З\'єднання з сервером oAuth2…</string>
-        
-    <string name="ssl_validator_reason_cert_not_trusted">- Не довірений сертифікат серверу</string>
-    <string name="ssl_validator_reason_cert_expired">- Сертифікат серверу втратив чинність</string>
-    <string name="ssl_validator_reason_cert_not_yet_valid">- Сертифікат серверу занадто новий</string>
-    <string name="ssl_validator_reason_hostname_not_verified">- URL не відповідає імені хоста у сертифікаті</string>
-    <string name="ssl_validator_question">Ви все одно бажаєте довіряти цьому сертифікату?</string>
-    <string name="ssl_validator_not_saved">Неможливо зберегти сертифікат</string>
-    <string name="ssl_validator_btn_details_see">Деталі</string>
-    <string name="ssl_validator_btn_details_hide">Сховати</string>
-    <string name="ssl_validator_label_subject">Видано для:</string>
-    <string name="ssl_validator_label_issuer">Видавець:</string>
-    <string name="ssl_validator_label_CN">Ім\'я:</string>
-    <string name="ssl_validator_label_O">Організація:</string>
-    <string name="ssl_validator_label_OU">Підрозділ:</string>
-    <string name="ssl_validator_label_C">Країна:</string>
-    <string name="ssl_validator_label_ST">Область:</string>
-    <string name="ssl_validator_label_L">Місцевість:</string>
-    <string name="ssl_validator_label_validity">Чинність:</string>
-    <string name="ssl_validator_label_validity_from">З:</string>
-    <string name="ssl_validator_label_validity_to">До:</string>
-    <string name="ssl_validator_label_signature">Підпис:</string>
-    <string name="ssl_validator_label_signature_algorithm">Алгоритм:</string>
-    <string name="ssl_validator_null_cert">Не вдалося показати сертифікат.</string>
-    <string name="ssl_validator_no_info_about_error">- Інформація про помилку відсутня</string>
-
-    <string name="placeholder_sentence">Це заповнювач</string>
-    <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_fileSize">389 КБ</string>
-    <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
-    <string name="placeholder_media_time">12:23:45</string>
-
-    <string name="auto_upload_on_wifi">Завантаження тільки у нелімітованих мережах WiFi</string>
-    <string name="instant_upload_on_charging">Завантаження тільки під час заряджання</string>
-    <string name="instant_upload_path">/InstantUpload</string>
-    <string name="auto_upload_path">/AutoUpload</string>
-    <string name="conflict_title">Конфлікт файлу</string>
-    <string name="conflict_keep_both">Залишити обидва</string>
-    <string name="conflict_use_local_version">Локальна версія</string>
-    <string name="conflict_use_server_version">Версія сервера</string>
-
-    <string name="preview_sorry">Перепрошуємо</string>
-    <string name="preview_image_description">Попередній перегляд зображення</string>
-    <string name="preview_image_error_unknown_format">Неможливо вивести зображення</string>
-    <string name="preview_image_error_no_local_file">Відсутній локальний файл для попереднього показу</string>
-
-    <string name="error__upload__local_file_not_copied">%1$s неможливо скопіювати до %2$s</string>
-    <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="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="share_link_password_title">Ввести пароль</string>
-    <string name="share_link_empty_password">Ви повинні ввести пароль</string>
-
-    <string name="activity_chooser_send_file_title">Надіслати</string>
-
-    <string name="copy_link">Копіювати посилання</string>
-    <string name="clipboard_text_copied">Скопійовано в буфер обміну</string>
-    <string name="clipboard_no_text_to_copy">Відсутній текст для копіювання до буферу обміну</string>
-    <string name="clipboard_unexpected_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="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="downloader_download_file_not_found">Файл більше не доступний на сервері</string>
-
-    <string name="prefs_add_account">Додати обліковий запис</string>
-    <string name="actionbar_logger">Журнали</string>
-	<string name="log_send_history_button">Надіслати історію</string>
-	<string name="log_send_mail_subject">%1$s Android лог додатку</string>
-    <string name="saml_authentication_wrong_pass">Невірний пароль</string>
-	<string name="actionbar_move">Перемістити</string>
-    <string name="folder_picker_choose_button_text">Обрати</string>
-
-    <string name="move_file_error">Виникла помилка при спробі перемістити файл або теку</string>
-    <string name="forbidden_permissions_move">перемістити цей файл</string>
-
-
-    <string name="copy_file_not_found">Неможливо скопіювати. Будь ласка, перевірте, чи існує файл</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="subject_shared_with_you">З Вами поділилися \"%1$s\"</string>
-
-    <string name="auth_refresh_button">Оновити з\'єднання</string>
-    <string name="auth_host_address">Ареса серверу</string>
-    <string name="common_error_out_memory">Недостатньо пам\'яті</string>
-
-    <string name="username">Ім\'я користувача</string>
-
-    <string name="share_dialog_title">Спільний доступ</string>
-    <string name="share_add_user_or_group">Додати користувача або групу</string>
-    <string name="share_via_link_section_title">Поділитись посиланням</string>
-    <string name="share_privilege_can_share">може ділитися з іншими</string>
-    <string name="share_privilege_can_edit">може редагувати</string>
-    <string name="manage_space_clear_data">Очистити дані</string>
-
-    <string name="participate_release_candidate_headline">Реліз-кандидат</string>
-    <plurals name="items_selected_count">
-        <item quantity="one">%d обрано</item>
-        <item quantity="few">%d обрано</item>
-        <item quantity="many">%d обрано</item>
-        <item quantity="other">%d обрано</item>
-    </plurals>
-
-    <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_2_title">Декілька облікових записів</string>
-    <string name="welcome_feature_2_text">З\'єднайтеся з всіма Вашими хмарами</string>
-
-    <string name="welcome_feature_3_text">Тримайте свої фото у безпеці</string>
-
-    <string name="whats_new_skip">Пропустити</string>
-
-    <string name="user_info_phone">Номер телефону</string>
-    <string name="user_info_address">Адреса</string>
-    <string name="end_to_end_encryption_wrong_password">Помилка розшифрування. Хибний пароль?</string>
-    <string name="end_to_end_encryption_enter_password">Будь ласка введіть пароль для розшифрування приватних ключів.</string>
-    <string name="end_to_end_encryption_title">Налаштування шифрування</string>
-    <string name="end_to_end_encryption_not_supported">Шифрування працює лише на Android 4.4 (KitKat) та вище.</string>
-    <string name="end_to_end_encryption_confirm_button">Налаштування шифрування</string>
-    <string name="end_to_end_encryption_unsuccessful">Не вдалося зберегти ключі, спробуйте ще раз.</string>
-    <string name="end_to_end_encryption_dialog_close">Закрити</string>
-    <string name="end_to_end_encryption_storing_keys">Збереження ключів</string>
-    <string name="copy_move_to_encrypted_folder_not_supported">Копіювання/переміщення в зашифрований каталог - в даний час не підтримується.</string>
-    <string name="untrusted_domain">Доступ через ненадійний домен. Будь ласка, перегляньте документацію для отримання додаткової інформації.</string>
-    </resources>

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

@@ -31,6 +31,7 @@
     <string name="drawer_item_activities">动态</string>
     <string name="drawer_item_notifications">通知</string>
     <string name="drawer_quota">%1$s 中 %2$s 已使用</string>
+    <string name="drawer_quota_unlimited">%1$s 已使用</string>
 	<string name="prefs_category_general">常规</string>
     <string name="prefs_category_more">更多</string>
     <string name="prefs_manage_accounts">管理账号</string>
@@ -63,7 +64,6 @@
     <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>
@@ -478,6 +478,7 @@
     <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_via_link_send_link_label">发送链接</string>
@@ -576,22 +577,6 @@
 
     <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_resized_images_title">Adaptive images</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>
 
     <!-- User information -->
@@ -670,6 +655,7 @@
     <string name="favorite_icon">收藏</string>
     <string name="available_offline_icon">离线可用</string>
     <string name="checkbox">复选框</string>
+    <string name="shared_icon_shared_via_link">通过链接共享</string>
     <string name="shared_icon_shared">已共享</string>
     <string name="sort_by_name_ascending">按名字升序排序</string>
     <string name="sort_by_modification_date_ascending">按时间顺序</string>
@@ -756,6 +742,7 @@
     <string name="unsharing_failed">取消分享失败</string>
     <string name="updating_share_failed">更新分享失败</string>
     <string name="whats_new_device_credentials_title">使用 Android 设备内部保护</string>
+    <string name="login">登录</string>
     <string name="whats_new_device_credentials_content">通过使用图案，密码，PIN 或指纹等方式来确保您的数据安全。</string>
     <string name="restore_button_description">恢复已删除的文件</string>
 	<string name="restore">恢复文件</string>
@@ -768,7 +755,6 @@
     <string name="new_media_folder_detected">检测到新的%1$s媒体目录。</string>
     <string name="new_media_folder_photos">照片</string>
     <string name="new_media_folder_videos">视频</string>
-
     <string name="outdated_server">服务器即将寿命终止，请升级！</string>
     <string name="dismiss">忽略</string>
     <string name="feedback_no_mail_app">没有可用的用于发送邮件的应用！</string>

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

@@ -31,7 +31,7 @@
     <string name="drawer_item_activities">活動</string>
     <string name="drawer_item_notifications">通知</string>
     <string name="drawer_quota">在  %2$s中使用了%1$s </string>
-	<string name="prefs_category_general">一般</string>
+    <string name="prefs_category_general">一般</string>
     <string name="prefs_category_more">更多</string>
     <string name="prefs_manage_accounts">管理帳戶</string>
     <string name="prefs_expert_mode">專家模式</string>
@@ -57,7 +57,6 @@
     <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>
@@ -455,14 +454,6 @@
     <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_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_skip">略過</string>
 
     <!-- User information -->

src/main/res/values/dims.xml

@@ -61,7 +61,6 @@
     <dimen name="alternate_half_padding">5dp</dimen>
     <dimen name="alternate_padding_right">55dp</dimen>
     <dimen name="display_text_min_height">32dp</dimen>
-    <dimen name="divider_height_independent">1dip</dimen>
     <dimen name="alternate_padding_independent">10dip</dimen>
     <dimen name="activity_row_layout_min_width_independent">196dip</dimen>
     <dimen name="user_icon_size_independent">40dip</dimen>

src/test/java/com/owncloud/android/utils/TestSorting.java

@@ -117,6 +117,47 @@ public class TestSorting {
         assertTrue(test(sortedArray, unsortedList));
     }
 
+    @Test
+    public void testSortCloudFiles() {
+        List<OCFile> array = new ArrayList<>();
+        array.add(new OCFile("/Joplin/0ed1778f8f88414286c13b2cbff8664e.md"));
+        array.add(new OCFile("/Joplin/0edf70ab1b722172088257b3d73d6c46.md"));
+        array.add(new OCFile("/Joplin/0fb063d4d18128fdf464878d18439ca3.md"));
+        array.add(new OCFile("/Joplin/10e27391096748b187392f913da048f8.md"));
+        array.add(new OCFile("/Joplin/4093463de91947b990fccff4a1d13d8f.md"));
+        array.add(new OCFile("/Joplin/41742897324842849667274b2d1a0bb6.md"));
+        array.add(new OCFile("/Joplin/41890bd1b11a44f7a6b226120ee1efbc.md"));
+        array.add(new OCFile("/Joplin/41bd23f62ebb4d0b64c5f78b5ad13133.md"));
+        array.add(new OCFile("/Joplin/4292ef3223334677bed0ad0268e5bd4b.md"));
+        array.add(new OCFile("/Joplin/4307355783f4108aad5eba4d1b81ff91.md"));
+        array.add(new OCFile("/Joplin/448d96a6c76b48b68030c8c11339088d.md"));
+        array.add(new OCFile("/Joplin/4969e02c5c504899b17a355e61989bed.md"));
+        array.add(new OCFile("/Joplin/49bfe05d968c3c0612ddceb2250b3a18.md"));
+        array.add(new OCFile("/Joplin/701409a07ee4464fb82d9bc0c451f204.md"));
+        array.add(new OCFile("/Joplin/70ba2272c85353a0216577ec76d0d343.md"));
+        array.add(new OCFile("/Joplin/71563833027a49dcaa86208a3f621402.md"));
+        array.add(new OCFile("/Joplin/7172f37973434fe3aeb6ef96bb48d968.md"));
+        array.add(new OCFile("/Joplin/72068539d77c6e7b3271b653422d6e76.md"));
+        array.add(new OCFile("/Joplin/73098c81e1ae4831b3a90ffda82ddcec.md"));
+        array.add(new OCFile("/Joplin/730c09e169bc4289af163a34d7fe2553.md"));
+        array.add(new OCFile("/Joplin/736be455ce8aff18694649001a74722a.md"));
+        array.add(new OCFile("/Joplin/749c837930174e828620a99a9e7ad7bc.md"));
+        array.add(new OCFile("/Joplin/8a2d6a6461eb4979bb049837a8710a3d.md"));
+        array.add(new OCFile("/Joplin/8b7ff9081f5944399e1fc83c6191a09f.md"));
+        array.add(new OCFile("/Joplin/8c45ac421149a21f32edab06f0955839.md"));
+        array.add(new OCFile("/Joplin/8cd855a41cca4cbd8a0c20e79c4f2f9e.md"));
+        array.add(new OCFile("/Joplin/8f062be696e3488ca12a9d3f3f6aa10a.md"));
+        array.add(new OCFile("/Joplin/8f74a571a11b4709bb1cdf75b4a51a8e.md"));
+        array.add(new OCFile("/Joplin/90f61d36f4dd4ef79525b7b0812213e2.md"));
+        array.add(new OCFile("/Joplin/9846fdafaffa718ebcfa19474e8be251.md"));
+        array.add(new OCFile("/Joplin/a441cb730c22451aa4352129231fe898.md"));
+        array.add(new OCFile("/Joplin/a551ce1ae06e6f05669a0cadc4eb2f7b.md"));
+        array.add(new OCFile("/Joplin/a590cd1671b648c7a3bae0d6fbb7da81.md"));
+
+        FileSortOrderByName fileSortOrderByName = new FileSortOrderByName("test", true);
+        fileSortOrderByName.sortCloudFiles(array);
+    }
+
     private List<Comparable> shuffle(List<? extends Comparable> files) {
         List<Comparable> shuffled = new ArrayList<>();
         shuffled.addAll(files);