Update messenger-backend submodule.

bump version
changelog
2026-07-03 14:05:24 +02:00 · 2018-08-14 14:06:54 +02:00 · 2018-08-14 14:06:43 +02:00 · 2018-08-14 14:02:19 +02:00 · 2018-08-14 14:01:47 +02:00 · 2018-08-04 14:40:35 +02:00
36 changed files with 590 additions and 415 deletions
@@ -1,16 +1,18 @@
-_Please read the guidelines linked above, especially when you are a first time contributor. Remove this text and provide some basic informations below, if applicable. Remove template content that is not applicable._
+<!--
+Please read the guidelines linked above, especially when you are a first time contributor. Remove this text and provide some basic informations below, if applicable. Remove template content which is not applicable.
+-->

 **Delta Chat version**

-See settings dialog …
+<!-- See settings dialog … -->

 **Expected behavior**

-What is the expected output?
+<!-- What is the expected output? -->

 **Actual behavior**

-What do you see instead?
+<!-- What do you see instead? -->

 **Steps to reproduce the problem**

@@ -19,10 +21,14 @@ What do you see instead?

 **Screen snapshots**

-If applicable …
+<!-- If applicable … -->

 **Debug logs**
+<details>
+<summary>Logs</summary>

+```
+<!--
 If applicable, debug logs can be copied from within the Delta Chat app: 

 Open the _Settings_ menu -> _About_ -> _version number|Info_.
@@ -32,3 +38,9 @@ Alternatively from the Android system log:
 ` adb logcat -v time -s DeltaChat `

 This log contains private data (e.g. mail address, provider information) which shall be removed or anonymised prior to posting.
+-->
+
+
+```
+</details>
+
@@ -1,5 +1,42 @@
 # Delta Chat Changelog

+## v0.20.0
+2018-08-14
+
+* Check size before sending videos, files and other attachments
+* On sending problems, try over an appropriate number of times; then give up
+* Detect sending problems related to the message size, show an error and do not try over
+* Show message errors in the message info
+* Add user forum to website
+* Update python bindings
+* Seed node.js bindings and a CLI version based on this
+* Prepare Android bindings update
+* Update Danish, Italian and Russian translations
+
+The changes have been done by Andrei Guliaikin, Angelo Fuchs, Björn Petersen,
+compl4xx, Boehrsi, Enrico B., Floris Bruynooghe, Holger Krekel, Janka, Jikstra,
+Karissa McKelvey, Lars-Magnus Skog, Ole Carlsen
+
+
+## v0.19.0
+2018-07-10
+
+* Give advices for Google users
+* Speed up by making database-locks unneccessary
+* Fix drafts appearing twice
+* Update Albanian, Basque, Catalan, Danish, Dutch, English, Italian, Polish, Russian, and Turkish translations
+* Update website
+
+The changes have been done by Allan Nordhøy, Angelo Fuchs, Besnik, Björn Petersen, Calbasi,
+Claudio Arseni, guland2000, Heimen Stoffels, Holger Krekel, Luis Fernando Stürmer da Rosa,
+Mahmut Özcan, Ole Carlsen, Osoitz, sebek, Thomas Oster
+
+
+## v0.18.2
+2018-06-23
+
+* Fix initial configure process to hang at 95% under some circumstances
+
 ## v0.18.0
 2018-06-21

@@ -17,7 +54,7 @@
 * Update internal sqlite library from 3.22.0 to 3.23.1
 * Update internal libEtPan library from 1.7 to 1.8
 * Add Danish translation from Ole Carlsen
-* Update Albania, Basque, Danish, Italian, Norwegian, Dutch, Polish, Portuguese, Russian and Telugu translations
+* Update Albanian, Basque, Danish, Italian, Norwegian, Dutch, Polish, Portuguese, Russian and Telugu translations

 ## v0.17.3
 2018-05-17
@@ -124,7 +124,7 @@ android {
        targetSdkVersion 25  // 25: Nougat. CAVE: Do NOT target "Andoid O" without checking the background tasks carefully, see https://developer.android.com/preview/behavior-changes.html#back-all . As long as we target "Nougat", everything works as expected even for "Andoid O" or later
                             // in general, we should not change the target without reason; eg. after the switch to Nougat, the camera stops working (see https://inthecheesefactory.com/blog/how-to-share-access-to-file-with-fileprovider-on-android-nougat/en )

-        versionName "0.18.0" // do NOT forget to increase defaultConfig.versionCode!
-        versionCode 530
+        versionName "0.20.0" // do NOT forget to increase defaultConfig.versionCode!
+        versionCode 536
    }
 }
@@ -1628,45 +1628,45 @@ LOCAL_SRC_FILES     += \
 ./messenger-backend/libs/netpgp/src/symmetric.c \
 ./messenger-backend/libs/netpgp/src/validate.c \
 ./messenger-backend/libs/netpgp/src/writer.c \
-./messenger-backend/src/mraheader.c \
-./messenger-backend/src/mrapeerstate.c \
-./messenger-backend/src/mrarray.c \
-./messenger-backend/src/mrchat.c \
-./messenger-backend/src/mrchatlist.c \
-./messenger-backend/src/mrcontact.c \
-./messenger-backend/src/mrdehtml.c \
-./messenger-backend/src/mrhash.c \
-./messenger-backend/src/mrimap.c \
-./messenger-backend/src/mrjob.c \
-./messenger-backend/src/mrkey.c \
-./messenger-backend/src/mrkeyring.c \
-./messenger-backend/src/mrloginparam.c \
-./messenger-backend/src/mrlot.c \
-./messenger-backend/src/mrmailbox.c \
-./messenger-backend/src/mrmailbox_configure.c \
-./messenger-backend/src/mrmailbox_connect.c \
-./messenger-backend/src/mrmailbox_e2ee.c \
-./messenger-backend/src/mrmailbox_imex.c \
-./messenger-backend/src/mrmailbox_keyhistory.c \
-./messenger-backend/src/mrmailbox_log.c \
-./messenger-backend/src/mrmailbox_qr.c \
-./messenger-backend/src/mrmailbox_receive_imf.c \
-./messenger-backend/src/mrmailbox_securejoin.c \
-./messenger-backend/src/mrmimefactory.c \
-./messenger-backend/src/mrmimeparser.c \
-./messenger-backend/src/mrmsg.c \
-./messenger-backend/src/mrparam.c \
-./messenger-backend/src/mrpgp.c \
-./messenger-backend/src/mrsaxparser.c \
-./messenger-backend/src/mrsimplify.c \
-./messenger-backend/src/mrsmtp.c \
-./messenger-backend/src/mrsqlite3.c \
-./messenger-backend/src/mrstock.c \
-./messenger-backend/src/mrstrbuilder.c \
-./messenger-backend/src/mrstrencode.c \
-./messenger-backend/src/mrtoken.c \
-./messenger-backend/src/mrtools.c \
-./messenger-backend/src/mruudecode.c \
+./messenger-backend/src/dc_aheader.c \
+./messenger-backend/src/dc_apeerstate.c \
+./messenger-backend/src/dc_array.c \
+./messenger-backend/src/dc_chat.c \
+./messenger-backend/src/dc_chatlist.c \
+./messenger-backend/src/dc_contact.c \
+./messenger-backend/src/dc_dehtml.c \
+./messenger-backend/src/dc_hash.c \
+./messenger-backend/src/dc_imap.c \
+./messenger-backend/src/dc_job.c \
+./messenger-backend/src/dc_key.c \
+./messenger-backend/src/dc_keyring.c \
+./messenger-backend/src/dc_loginparam.c \
+./messenger-backend/src/dc_lot.c \
+./messenger-backend/src/dc_context.c \
+./messenger-backend/src/dc_configure.c \
+./messenger-backend/src/dc_e2ee.c \
+./messenger-backend/src/dc_imex.c \
+./messenger-backend/src/dc_keyhistory.c \
+./messenger-backend/src/dc_log.c \
+./messenger-backend/src/dc_openssl.c \
+./messenger-backend/src/dc_qr.c \
+./messenger-backend/src/dc_receive_imf.c \
+./messenger-backend/src/dc_securejoin.c \
+./messenger-backend/src/dc_mimefactory.c \
+./messenger-backend/src/dc_mimeparser.c \
+./messenger-backend/src/dc_msg.c \
+./messenger-backend/src/dc_param.c \
+./messenger-backend/src/dc_pgp.c \
+./messenger-backend/src/dc_saxparser.c \
+./messenger-backend/src/dc_simplify.c \
+./messenger-backend/src/dc_smtp.c \
+./messenger-backend/src/dc_sqlite3.c \
+./messenger-backend/src/dc_stock.c \
+./messenger-backend/src/dc_strbuilder.c \
+./messenger-backend/src/dc_strencode.c \
+./messenger-backend/src/dc_token.c \
+./messenger-backend/src/dc_tools.c \
+./messenger-backend/src/dc_uudecode.c \
 ./messenger-backend/cmdline/cmdline.c \
 ./mrwrapper.c

@@ -227,7 +227,12 @@

        <receiver android:name=".NotificationDismissReceiver" android:exported="false"/>

-        <provider android:name=".AttachmentsContentProvider" android:authorities="${applicationId}.attachments" android:exported="true" />
+        <provider
+            android:name=".AttachmentsContentProvider"
+            android:authorities="${applicationId}.attachments"
+            android:grantUriPermissions="true"
+            android:exported="false">
+        </provider>

        <provider
            android:name="android.support.v4.content.FileProvider"
@@ -80,6 +80,7 @@ import java.nio.channels.FileChannel;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Locale;

 public class AndroidUtilities {
@@ -817,6 +818,8 @@ public class AndroidUtilities {
        return mimeType;
    }

+    public static HashMap<String, Integer> sharedFiles = new HashMap<>();
+
    public static void openForViewOrShare(Activity activity, int msg_id, String cmd)
    {
        MrMsg msg = MrMailbox.getMsg(msg_id);
@@ -832,6 +835,7 @@ public class AndroidUtilities {
            Uri uri;
            if (path.startsWith(MrMailbox.getBlobdir())) {
                uri = Uri.parse("content://" + BuildConfig.APPLICATION_ID + ".attachments/" + file.getName());
+                sharedFiles.put("/"+file.getName(), 1); // as different Android version handle uris in putExtra differently, we also check them on our own
            } else {
                if (Build.VERSION.SDK_INT >= 24) {
                    uri = FileProvider.getUriForFile(activity, BuildConfig.APPLICATION_ID + ".provider", file);
@@ -48,7 +48,12 @@ public class AttachmentsContentProvider extends ContentProvider {

    @Override
    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
-        File privateFile = new File(MrMailbox.getBlobdir(), uri.getPath());
+        String path = uri.getPath();
+        if (!AndroidUtilities.sharedFiles.containsKey(path)) {
+            throw new FileNotFoundException("File was not shared before.");
+        }
+
+        File privateFile = new File(MrMailbox.getBlobdir(), path);
        return ParcelFileDescriptor.open(privateFile, ParcelFileDescriptor.MODE_READ_ONLY);
    }

@@ -23,6 +23,7 @@
 package com.b44t.messenger.Cells;

 import android.content.Context;
+import android.text.method.LinkMovementMethod;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.FrameLayout;
@@ -67,13 +68,26 @@ public class TextInfoCell extends FrameLayout {

    public void setText(CharSequence text)
    {
-        setText(text, null, true);
+        setText(text, null, true, false);
    }

    public void setText(CharSequence text, CharSequence icon, boolean borderBotton)
+    {
+        setText(text, icon, borderBotton, false);
+    }
+
+    public void setText(CharSequence text, CharSequence icon, boolean borderBotton, boolean clickableHtml)
    {
        textView.setText(text);

+        if( clickableHtml ) {
+            //allow for clickable Links in TextViews
+            //https://stackoverflow.com/questions/2734270/how-do-i-make-links-in-a-textview-clickable
+            //as this avoids the onClickListener to be called (used at least for the "expand" icon in the AccountSettings)
+            //we do this only explicitly
+            textView.setMovementMethod(LinkMovementMethod.getInstance());
+        }
+
        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) textView.getLayoutParams();
        lp.width        = LayoutHelper.WRAP_CONTENT;
        lp.height       = LayoutHelper.WRAP_CONTENT;
@@ -1927,6 +1927,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                        }
                    }
                }
+                else if(evt_chat_id == dialog_id) {
+                    // needed to update eg. the draft
+                    m_mrChat = MrMailbox.getChat(evt_chat_id);
+                }
            }
        }
        else if (id == NotificationCenter.updateInterfaces)
@@ -1040,9 +1040,9 @@ public class ChatlistActivity extends BaseFragment implements NotificationCenter
        }
        else if( id == NotificationCenter.secureJoinJoinerProgress ) {
            int contact_id = (Integer)args[0];
-            int step = (Integer)args[1];
+            int progress = (Integer)args[1];
            String msg = null;
-            if( step == 4) {
+            if( progress == 400) {
                msg = String.format(ApplicationLoader.applicationContext.getString(R.string.OobAddrVerifiedIntroduceMyself), MrMailbox.getContact(contact_id).getNameNAddr());
            }

@@ -573,7 +573,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
                public void onClick(DialogInterface dialogInterface, int i) {
                    int chatId = MrMailbox.createChatByContactId(MrMailbox.createContact("", createChatWithFinal));
                    if( chatId != 0 ) {
-                        if( sendingText!=null ) { MrMailbox.getChat(chatId).setDraft(sendingText, 0); }
+                        if( sendingText!=null ) { MrMailbox.setDraft(chatId, sendingText); }
                        Bundle args = new Bundle();
                        args.putInt("chat_id", chatId);
                        boolean removeLast = actionBarLayout.fragmentsStack.size() > 1 && actionBarLayout.fragmentsStack.get(actionBarLayout.fragmentsStack.size() - 1) instanceof ChatActivity;
@@ -57,10 +57,6 @@ public class MrChat {
    public native boolean isVerified();
    public native String getDraft();
    public native long getDraftTimestamp();
-    public int getDraftReplyToMsgId() {
-        return 0;
-    }
-    public native int setDraft(String draft/*NULL=delete*/, long replyToMsgId);

    private long                  m_hChat;  // must not be renamed as referenced by JNI under the name "m_hChat"
    private native static void    MrChatUnref                (long hChat);
@@ -90,22 +86,22 @@ public class MrChat {
            return null;
        }
        ret.date = (int)getDraftTimestamp();
-        ret.reply_to_msg_id = getDraftReplyToMsgId();
+        ret.reply_to_msg_id = 0;
        return ret;
    }

    public void saveDraft(CharSequence message, TLRPC.Message replyToMessage) {
        if( message == null || TextUtils.isEmpty(message) ) {
-            setDraft(null, 0);
+            MrMailbox.setDraft(getId(), null);
        }
        else {
-            setDraft(message.toString(), 0);
+            MrMailbox.setDraft(getId(), message.toString());
        }
    }

    public void cleanDraft()
    {
-        setDraft(null, 0);
+        MrMailbox.setDraft(getId(), null);
    }

    public String getNameNAddr()
@@ -79,12 +79,10 @@ public class MrMailbox {
    public final static int MR_IMEX_IMPORT_SELF_KEYS = 2;
    public final static int MR_IMEX_EXPORT_BACKUP = 11;
    public final static int MR_IMEX_IMPORT_BACKUP = 12;
-    public native static int imex(int what, String dir);
+    public native static void imex(int what, String dir);
    public native static String imexHasBackup(String dir);
    public native static int  checkPassword(String pw);

-    public native static void heartbeat();
-
    private static long           m_hMailbox = 0; // do not rename this, is used in C-part
    private native static long    MrMailboxNew(); // returns hMailbox which must be unref'd after usage (Names as mrmailbox_new don't work due to the additional underscore)

@@ -148,6 +146,7 @@ public class MrMailbox {
    public native static int isContactInChat       (int chat_id, int contact_id);
    public native static int addContactToChat      (int chat_id, int contact_id);
    public native static int removeContactFromChat (int chat_id, int contact_id);
+    public native static void setDraft              (int chat_id, String draft/*NULL=delete*/);
    public native static int setChatName           (int chat_id, String name);
    public native static int setChatProfileImage   (int chat_id, String name);

@@ -219,6 +218,7 @@ public class MrMailbox {
    public final static int MR_EVENT_MSGS_CHANGED             = 2000;
    public final static int MR_EVENT_INCOMING_MSG             = 2005;
    public final static int MR_EVENT_MSG_DELIVERED            = 2010;
+    public final static int DC_EVENT_MSG_FAILED               = 2012;
    public final static int MR_EVENT_MSG_READ                 = 2015;

    public final static int MR_EVENT_CHAT_MODIFIED            = 2020;
@@ -264,7 +264,12 @@ public class MrMailbox {
                AndroidUtilities.runOnUIThread(new Runnable() {
                    @Override
                    public void run() {
-                        NotificationCenter.getInstance().postNotificationName(NotificationCenter.imexProgress, (int)data1);
+                        if (data1==0 || data1==1000) {
+                            NotificationCenter.getInstance().postNotificationName(NotificationCenter.imexEnded, (int) data1);
+                        }
+                        else {
+                            NotificationCenter.getInstance().postNotificationName(NotificationCenter.imexProgress, (int) data1);
+                        }
                    }
                });
                return 0;
@@ -313,6 +318,7 @@ public class MrMailbox {

            case MR_EVENT_MSG_DELIVERED:
            case MR_EVENT_MSG_READ:
+            case DC_EVENT_MSG_FAILED:
                AndroidUtilities.runOnUIThread(new Runnable() {
                    @Override
                    public void run() {
@@ -412,6 +418,8 @@ public class MrMailbox {
                    case 42: s = ApplicationLoader.applicationContext.getString(R.string.AutocryptSetupMessageSubject); break;
                    case 43: s = ApplicationLoader.applicationContext.getString(R.string.AutocryptSetupMessageGeneralBody); break;
                    case 50: s = ApplicationLoader.applicationContext.getString(R.string.SelfTalkSubtitle); break;
+                    case 60: s = ApplicationLoader.applicationContext.getString(R.string.ErrCannotLogin); break;
+                    case 61: s = "<c#808080>" + ApplicationLoader.applicationContext.getString(R.string.ErrSeverResponse) + "</c>"; break;
                    default: s = null; break;
                }
                return String2CPtr(s);
@@ -149,23 +149,28 @@ public class QRshowActivity extends AppCompatActivity implements NotificationCen
    public void didReceivedNotification(int id, Object... args) {
        if( id==NotificationCenter.secureJoinInviterProgress) {
            int contact_id = (Integer)args[0];
-            int step = (Integer)args[1];
+            int progress = (Integer)args[1];
            String msg = null;
-            if( step == 3) {
+            if (progress == 300) {
                msg = String.format(ApplicationLoader.applicationContext.getString(R.string.OobSecureJoinRequested), MrMailbox.getContact(contact_id).getNameNAddr());
                num_joiners++;
            }
-            else if( step == 6 ){
+            else if (progress == 600){
                msg = String.format(ApplicationLoader.applicationContext.getString(R.string.OobAddrVerified), MrMailbox.getContact(contact_id).getNameNAddr());
-                num_joiners--;
+            }
+            else if (progress == 800) {
+                msg = String.format(ApplicationLoader.applicationContext.getString(R.string.OobGroupJoined), MrMailbox.getContact(contact_id).getNameNAddr());
            }

-            if( msg != null ) {
+            if (msg != null) {
                AndroidUtilities.showHint(ApplicationLoader.applicationContext, msg);
            }

-            if( step == 6 && num_joiners <= 0 ) {
-                finish();
+            if (progress == 1000) {
+                num_joiners--;
+                if (num_joiners <= 0) {
+                    finish();
+                }
            }
        }
    }
@@ -31,6 +31,7 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.InputType;
 import android.view.View;
 import android.view.ViewGroup;
@@ -60,6 +61,7 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
    private int         rowAddr;
    private int         rowMailPwHeadline;
    private int         rowMailPw;
+    private int         rowInfoExplain;
    private int         rowOpenAdvOpions;

    private int         rowMailHeadline;
@@ -75,8 +77,8 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
    private int         rowSendUser;
    private int         rowSendPw;
    private int         rowSendSecurity;
+    private int         rowBreak2;

-    private int         rowInfoBelowSendPw;
    private int         rowCount;

    private final int ROWTYPE_INFO         = 0; // no gaps here!
@@ -84,6 +86,7 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
    private final int ROWTYPE_SHADOW_BREAK = 2;
    private final int ROWTYPE_HEADLINE     = 3;
    private final int ROWTYPE_TEXT_FLAGS   = 4;
+    private final int ROWTYPE_TEXT_SETTINGS= 5;

    private EditTextCell addrCell;  // warning all these objects may be null!
    private EditTextCell mailPwCell;
@@ -150,6 +153,7 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
        rowAddr          = rowCount++;
        rowMailPwHeadline= rowCount++;
        rowMailPw        = rowCount++;
+        rowInfoExplain = rowCount++;
        rowOpenAdvOpions = rowCount++;

        if( m_expanded ) {
@@ -183,7 +187,7 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
            rowSendSecurity  = -1;
        }

-        rowInfoBelowSendPw = rowCount++;
+        rowBreak2        = rowCount++;
    }

    @Override
@@ -233,13 +237,7 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
            @Override
            public void onItemClick(final AdapterView<?> adapterView, View view, final int i, long l) {
-                if( i==rowOpenAdvOpions )
-                {
-                    m_expanded = !m_expanded;
-                    calculateRows();
-                    listAdapter.notifyDataSetChanged();
-                }
-                else if( i==rowMailSecurity || i==rowSendSecurity )
+                if( i==rowMailSecurity || i==rowSendSecurity )
                {
                    AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
                    builder.setTitle(R.string.SecurityTitle);
@@ -274,12 +272,26 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
                    showDialog(builder.create());

                }
+                else if( i == rowOpenAdvOpions ) {
+                    m_expanded = !m_expanded;
+                    calculateRows();
+                    listAdapter.notifyDataSetChanged();
+                }
            }
        });

        return fragmentView;
    }

+    /**
+     * Returns true if the selected E-Mail Address belongs to GMAIL
+     * @return true if E-Mail is Gmail address
+     */
+    private boolean isGmail() {
+        String addr = addrCell != null ? addrCell.getValue() : MrMailbox.getConfig("addr", "");
+        return addr != null && (addr.contains("@gmail.") || addr.contains("@googlemail."));
+    }
+
    private void saveData() {
        // Warning: the widgets are created as needed and may not be present!
        String v;
@@ -394,7 +406,7 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
            }
            else if( ! MrMailbox.m_lastErrorString.isEmpty() ){
                AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-                builder.setMessage(errorString);
+                builder.setMessage(AndroidUtilities.replaceTags(errorString));
                builder.setPositiveButton(R.string.OK, null);
                showDialog(builder.create());
            }
@@ -426,7 +438,7 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio

        @Override
        public boolean isEnabled(int i) {
-            return !(i==rowAddrHeadline || i==rowMailPwHeadline || i== rowMailHeadline || i== rowBreak1 || i== rowSendHeadline || i==rowInfoBelowSendPw);
+            return !(i==rowAddrHeadline || i==rowMailPwHeadline || i== rowMailHeadline || i== rowBreak1 || i== rowBreak2 || i== rowSendHeadline || i== rowInfoExplain);
        }

        @Override
@@ -459,6 +471,20 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
                        addrCell.setValueHintAndLabel(MrMailbox.getConfig("addr", ""),
                                "", "", false);
                        addrCell.getEditTextView().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
+                        //show or hide Gmail specific messages depending on mail address
+                        addrCell.getEditTextView().setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                            boolean wasGmail = false;
+                            @Override
+                            public void onFocusChange(View view, boolean b) {
+                                if (b) {
+                                    wasGmail = isGmail();
+                                }
+                                else if (wasGmail != isGmail()) {
+                                    calculateRows();
+                                    listAdapter.notifyDataSetChanged();
+                                }
+                            }
+                        });
                    }
                    view = addrCell;
                }
@@ -571,21 +597,33 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
                if (view == null) {
                    view = new ShadowSectionCell(mContext);
                }
+                if( i == rowBreak2 ) {
+                    view.setBackgroundResource(R.drawable.greydivider_bottom);
+                }
+            }
+            else if( type == ROWTYPE_TEXT_SETTINGS ) {
+                if (view == null) {
+                    view = new TextSettingsCell(mContext);
+                    view.setBackgroundColor(0xffffffff);
+                }
+                TextSettingsCell textCell = (TextSettingsCell) view;
+                if( i == rowOpenAdvOpions ) {
+                    textCell.setText((m_expanded?"▼ ":"▶ ")+mContext.getString(R.string.AdvancedSettings), false);
+                }
            }
            else if (type == ROWTYPE_INFO) {
-                if (view == null) {
-                    view = new TextInfoCell(mContext);
-                }
-                if( i== rowOpenAdvOpions) {
-                    ((TextInfoCell) view).setText(ApplicationLoader.applicationContext.getString(R.string.MyAccountExplain),
-                            m_expanded? " \u2212" /*minus-sign*/ : "+", m_expanded /*draw bottom border?*/);
-                    view.setBackgroundResource(m_expanded? R.drawable.greydivider : R.drawable.greydivider_bottom); // has shadow top+bottom
-                }
-                else if( i==rowInfoBelowSendPw) {
-                    ((TextInfoCell) view).setText(AndroidUtilities.replaceTags(ApplicationLoader.applicationContext.getString(R.string.MyAccountExplain2)));
-                    if( m_expanded ) {
-                        view.setBackgroundResource(R.drawable.greydivider_bottom);
+                if( i== rowInfoExplain) {
+                    if (view == null) {
+                        view = new TextInfoCell(mContext);
                    }
+                    ((TextInfoCell) view).setText(
+                        Html.fromHtml(
+                            ApplicationLoader.applicationContext.getString(
+                                    isGmail() ? R.string.MyAccountExplainGmail : R.string.MyAccountExplain
+                            )
+                        ), null, true, true
+                    );
+                    view.setBackgroundResource(R.drawable.greydivider);
                }
            }
            return view;
@@ -604,12 +642,15 @@ public class SettingsAccountFragment extends BaseFragment implements Notificatio
            else if( i==rowAddrHeadline || i==rowMailPwHeadline || i== rowMailHeadline || i== rowSendHeadline ) {
                return ROWTYPE_HEADLINE;
            }
-            else if( i== rowBreak1 ) {
+            else if( i== rowBreak1 || i== rowBreak2 ) {
                return ROWTYPE_SHADOW_BREAK;
            }
            else if( i==rowMailSecurity || i==rowSendSecurity) {
                return ROWTYPE_TEXT_FLAGS;
            }
+            else if( i == rowOpenAdvOpions ) {
+                return ROWTYPE_TEXT_SETTINGS;
+            }
            return ROWTYPE_INFO;
        }

@@ -234,7 +234,7 @@ public class SettingsAdvFragment extends BaseFragment implements NotificationCen
                    else {
                        AlertDialog.Builder builder1 = new AlertDialog.Builder(getParentActivity());
                        builder1.setTitle("Labs: QR code options");
-                        builder1.setMessage("With the QR code options you can easily connect to other Delta Chat users by scanning a QR code. Moreover, this securely transfers the encryption keys in both directions and allows the creation of verified groups.\n\nStay tuned for more information about this on the mailing ist :)\n\nDo you want to enable this experimental feature that may still contain issues?");
+                        builder1.setMessage("With the QR code options you can easily connect to other Delta Chat users by scanning a QR code. Moreover, this securely transfers the encryption keys in both directions and allows the creation of verified groups.\n\nStay tuned for more information about this on the mailing list :)\n\nDo you want to enable this experimental feature that may still contain issues?");
                        builder1.setNegativeButton(R.string.Cancel, null);
                        builder1.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
                            @Override
@@ -569,18 +569,7 @@ public class SettingsAdvFragment extends BaseFragment implements NotificationCen
            MrMailbox.m_lastErrorString = "";
        }

-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                final int res = MrMailbox.imex(progressWhat, imexDir.getAbsolutePath());
-                AndroidUtilities.runOnUIThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        NotificationCenter.getInstance().postNotificationName(NotificationCenter.imexEnded, (int)res);
-                    }
-                });
-            }
-        }).start();
+        MrMailbox.imex(progressWhat, imexDir.getAbsolutePath());
    }

    @Override
@@ -614,7 +603,7 @@ public class SettingsAdvFragment extends BaseFragment implements NotificationCen
                progressDialog = null;
            }

-            if( (int)args[0]==1 ) {
+            if( (int)args[0]!=0 ) {
                // success
                if( progressWhat==MrMailbox.MR_IMEX_EXPORT_SELF_KEYS || progressWhat==MrMailbox.MR_IMEX_EXPORT_BACKUP ) {
                    AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
@@ -101,7 +101,7 @@ public class VideoEditorActivity extends BaseFragment implements TextureView.Sur
    private long resultDurationMs = 0;
    private int estimatedBytes = 0;

-    final long MAX_BYTES = (24*1024*1024)/4*3; // 25 MB minus 1 MB header-overhead minus base64-overhead
+    private long MAX_BYTES;

    public interface VideoEditorActivityDelegate {
        void didFinishEditVideo(VideoEditedInfo vei, long estimatedSize, long estimatedDuration);
@@ -166,6 +166,7 @@ public class VideoEditorActivity extends BaseFragment implements TextureView.Sur
    public VideoEditorActivity(Bundle args) {
        super(args);
        videoPath = args.getString("videoPath");
+        MAX_BYTES = MrMailbox.getConfigInt("sys.msgsize_max_recommended", 10*1024*1024);
    }

    @Override
@@ -347,18 +347,7 @@ public class WelcomeActivity extends Activity implements NotificationCenter.Noti
            MrMailbox.m_lastErrorString = "";
        }

-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                final int res = MrMailbox.imex(MrMailbox.MR_IMEX_IMPORT_BACKUP, backupFile);
-                AndroidUtilities.runOnUIThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        NotificationCenter.getInstance().postNotificationName(NotificationCenter.imexEnded, (int)res);
-                    }
-                });
-            }
-        }).start();
+        MrMailbox.imex(MrMailbox.MR_IMEX_IMPORT_BACKUP, backupFile);
    }

    @Override
@@ -381,7 +370,7 @@ public class WelcomeActivity extends Activity implements NotificationCenter.Noti
                progressDialog = null;
            }

-            if( (int)args[0]==1 ) {
+            if( (int)args[0]!=0 ) {
                //ApplicationLoader.imapForeground = true;
                ApplicationLoader.startThreads(); // import does not automatically connect
                KeepAliveService kas = KeepAliveService.getInstance();
@@ -12,8 +12,8 @@
    <string name="DeleteChat">Slette samtale</string>
    <string name="SelectChat">Vælge samtale…</string>
    <string name="Search">Søge</string>
-    <string name="MuteNotifications">Ingen lyd påmindelser</string>
-    <string name="MuteFor">Ingen lyd til %1$s</string>
+    <string name="MuteNotifications">Lydløse påmindelser</string>
+    <string name="MuteFor">Lydløs i %1$s</string>
    <string name="UnmuteNotifications">Lyd</string>
    <string name="Draft">Kladde</string>
    <!--audio view-->
@@ -32,7 +32,7 @@
    <string name="SystemRoot">System root</string>
    <string name="SdCard">SD kort</string>
    <string name="Folder">Mappe</string>
-    <string name="GalleryInfo">Sende dekomprimerede billeder</string>
+    <string name="GalleryInfo">Sende de-komprimerede billeder</string>
    <!--chat view-->
    <string name="ChatGallery">Galleri</string>
    <string name="ChatCamera">Kamera</string>
@@ -43,7 +43,7 @@
    <string name="TypeMessage">Besked</string>
    <string name="SlideToCancel">Glide for at annullere</string>
    <string name="SaveToDownloads">Gemme i \"Downloads\"</string>
-    <string name="SaveToMusic">Gemme i \"Music\"</string>
+    <string name="SaveToMusic">Gemme i \"Musik\"</string>
    <string name="Share">Dele</string>
    <string name="SendItems">Sende %1$s</string>
    <string name="ClearRecentEmoji">Rydde nylige emoji?</string>
@@ -57,7 +57,7 @@
    <string name="NoContacts">Ingen kontakter endnu.</string>
    <!--group create view-->
    <string name="SendMessageTo">Sende besked til...</string>
-    <string name="EnterGroupNamePlaceholder">Indtaste gruppenavn</string>
+    <string name="EnterGroupNamePlaceholder">Indtaste gruppe navn</string>
    <!--group info view-->
    <string name="AddMember">Tilføje medlem</string>
    <string name="Notifications">Påmindelser</string>
@@ -88,7 +88,7 @@
    <string name="Enabled">Til</string>
    <string name="Disabled">Fra</string>
    <string name="LedColor">LED farve</string>
-    <string name="BadgeNumber">Bruge ikon for at holde antal hvis muligt</string>
+    <string name="BadgeNumber">Brug ikon for at holde optælling hvis muligt</string>
    <string name="Short">Kort</string>
    <string name="Long">Lang</string>
    <string name="RaiseToSpeak">Hæve for at tale</string>
@@ -98,7 +98,7 @@
    <string name="NotificationsPriorityHigh">Høj prioritet</string>
    <string name="NotificationsPriorityMax">Højeste prioritet</string>
    <string name="RepeatNotifications">Gentage påmindelser</string>
-    <string name="NotificationsOther">Andre</string>
+    <string name="NotificationsOther">Andet</string>
    <string name="InChatSound">I samtale lyde</string>
    <string name="SmartNotifications">Begrænse påmindelser</string>
    <string name="SmartNotificationsSoundAtMost">Maks.</string>
@@ -110,7 +110,7 @@
    <!--cache view-->
    <string name="CacheSettings">Lager</string>
    <string name="KeepMedia">Beholde medie</string>
-    <string name="KeepMediaInfo">Billeder, videor og andre filer fra sky samtaler som <![CDATA[<b>ikke er tilgået</b>]]> i enne periode vil blive fjernet fra denne enhed for at spare lager plads.</string>
+    <string name="KeepMediaInfo">Billeder, videor og andre filer fra sky samtaler som <![CDATA[<b>ikke er tilgået</b>]]> i denne periode fjernes fra denne enhed for at spare lager plads.</string>
    <string name="KeepMediaForever">For altid</string>
    <!--passcode view-->
    <string name="Passcode">Kodeordslås</string>
@@ -124,13 +124,13 @@
    <string name="EnterYourPasscode">Indtaste kodeord</string>
    <string name="ReEnterYourPasscode">Genindtaste nyt kodeord</string>
    <string name="PasscodeDoNotMatch">Kodeord passer ikke</string>
-    <string name="AutoLock">Automatisk låse</string>
-    <string name="AutoLockInfo">Påkræve kodeord hvis væk i en tid.</string>
+    <string name="AutoLock">Autolåse</string>
+    <string name="AutoLockInfo">Kræve kodeord hvis væk i en tid.</string>
    <string name="UnlockFingerprint">Låse op med fingeraftryk</string>
    <string name="FingerprintInfo">Bekræfte fingeraftryk for at fortsætte</string>
    <string name="FingerprintNotRecognized">Kan ikke genkende fingeraftryk. Prøv igen.</string>
    <!--photo gallery view-->
-    <string name="SaveToGallery">Gemme til \"Gallery\"</string>
+    <string name="SaveToGallery">Gemme i \"Galleri\"</string>
    <string name="Of">%1$d af %2$d</string>
    <string name="Gallery">Galleri</string>
    <string name="AllPhotos">Alle billeder</string>
@@ -158,7 +158,7 @@
    <string name="CurvesRed">Rød</string>
    <string name="CurvesGreen">Grøn</string>
    <string name="CurvesBlue">Blå</string>
-    <string name="Blur">Sløring</string>
+    <string name="Blur">Sløre</string>
    <string name="BlurOff">Fra</string>
    <string name="BlurLinear">Lineær</string>
    <string name="BlurRadial">Radial</string>
@@ -174,14 +174,14 @@
    <!--button titles-->
    <string name="Done">Færdig</string>
    <string name="Open">Åbne</string>
-    <string name="Cancel">Afbryde</string>
+    <string name="Cancel">Annullere</string>
    <string name="Edit">Redigere</string>
    <string name="Send">Sende</string>
    <string name="CopyToClipboard">Kopiere til klippebord</string>
    <string name="Delete">Slette</string>
    <string name="Forward">Videresende</string>
    <string name="FromCamera">Fra kamera</string>
-    <string name="FromGalley">Fra \"Gallery\"</string>
+    <string name="FromGalley">Fra \"Galleri\"</string>
    <string name="Set">Sætte</string>
    <string name="OK">O.k.</string>
    <string name="Crop">Beskære</string>
@@ -195,15 +195,15 @@
    <string name="FromSelf">Undertegnet</string>
    <!--Alert messages-->
    <string name="NoHandleAppInstalled">For at fortsætte installere et program som kan håndtere  \'%1$s\' filer.</string>
-    <string name="ContactAlreadyInGroup">Kontakt er allerede i gruppen.</string>
+    <string name="ContactAlreadyInGroup">Kontakt allerede i gruppen.</string>
    <string name="ForwardMessagesTo">Videresende valgte beskeder til <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <string name="SendMessagesTo">Sende beskeder til <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
-    <string name="AreYouSureDeleteThisChat">Slette samtale? Den vil ikke længere blive vist i samtale listen, dets bekseder vil forblive på serveren.</string>
+    <string name="AreYouSureDeleteThisChat">Slette samtale? Den vil ikke længere blive vist i samtale listen, dens beskeder vil forblive på serveren.</string>
    <string name="AreYouSureBlockContact">Blokere kontakt?</string>
    <string name="AreYouSureDeleteContact">Slette kontakt?</string>
    <!--permissions-->
    <string name="PermissionContacts">Adgang til kontakter nødvendig for at forbinde med venner på alle enheder.</string>
-    <string name="PermissionStorage">Lager adgang nødvendig for at sende og gemme billeder, video, musik og andre medier.</string>
+    <string name="PermissionStorage">Lager adgang nødvendigt for at sende og gemme billeder, video, musik og andre medier.</string>
    <string name="PermissionNoAudio">Tildele mikrofon adgang for at optage tale beskeder.</string>
    <string name="PermissionOpenSettings">Opsætning</string>
    <!--Intro view-->
@@ -211,16 +211,16 @@
    <string name="Intro1Message">Budbringeren med det <![CDATA[<b>største publikum</b>]]> i verden. <![CDATA[<b>Fri</b>]]> og <![CDATA[<b>uafhængig</b>]]>.</string>

    <string name="Intro2Headline">Uafhængig</string>
-    <string name="Intro2Message"><![CDATA[<b>Der er ingen Delta Chat server.</b>]]> Programmet bruger e-post server.</string>
+    <string name="Intro2Message"><![CDATA[<b>Der er ingen Delta Chat server.</b>]]> Programmet bruger kun e-post server.</string>

    <string name="Intro3Headline">Hurtig</string>
    <string name="Intro3Message"><![CDATA[<b>Skubbe beskeder</b>]]> på sekunder.<![CDATA[<br/>]]>Hurtig grænseflade.</string>

-    <string name="Intro4Headline">Kraftfuld</string>
+    <string name="Intro4Headline">Stærk</string>
    <string name="Intro4Message"><![CDATA[<b>Ubegrænsede</b>]]> samtaler, billeder, videoer, lyd beskeder og mere. Kan håndteres af flere klienter.</string>

    <string name="Intro5Headline">Fri</string>
-    <string name="Intro5Message"><![CDATA[<b>Delta Chat</b>]]> er gratis for altid.<![CDATA[<br/>]]>Open-source. Ingen reklamer. Ingen Intet abonnement.. Ingen låsning til leverandør.</string>
+    <string name="Intro5Message"><![CDATA[<b>Delta Chat</b>]]> er fri for altid.<![CDATA[<br/>]]>Åben kildetekst. Ingen reklamer. Intet abonnement.. Ingen leverandør låsning.</string>

    <string name="Intro6Headline">Krypteret</string>
    <string name="Intro6Message"><![CDATA[<b>Krypteret</b>]]> med kun almindelige algoritmer. Meddelelser bliver på servere.</string>
@@ -288,8 +288,8 @@
    text "%d minutes", so the complete sentence would be e.g.
    "At most 8 notifications within 3 minutes". -->
    <plurals name="MaxNotifications">
-        <item quantity="one">Højst %1$d påmindelse inden for %2$s</item>
-        <item quantity="other">Højst %1$d påmindelser inde for %2$s</item>
+        <item quantity="one">Højest %1$d påmindelse inden for %2$s</item>
+        <item quantity="other">Højest %1$d påmindelser inden for %2$s</item>
    </plurals>
    <!--date formatters-->
    <string name="formatterMonthYear">MMMM åååå</string>
@@ -307,47 +307,51 @@
    <string name="MyNameExplain">Navn, vist for modtagere. Hvis tom vil kun e-post adresse blive sendt.</string>
    <string name="Password">Adgangskode</string>
    <string name="SmtpPassword">SMTP adgangskode</string>
-    <string name="FromAbove">Fra ovenfor</string>
-    <string name="SmtpLoginname">SMTP log ind navn</string>
+    <string name="FromAbove">Ovenfra</string>
+    <string name="SmtpLoginname">SMTP logind navn</string>
    <string name="SmtpPort">SMTP port</string>
    <string name="Automatic">Automatisk</string>
    <string name="ImapServer">IMAP server</string>
-    <string name="ImapLoginname">IMAP log ind navn</string>
+    <string name="ImapLoginname">IMAP logind navn</string>
    <string name="SmtpServer">SMTP server</string>
    <string name="ImapPort">IMAP port</string>
    <string name="InboxHeadline">Indbakke</string>
    <string name="OutboxHeadline">Udbakke</string>
-    <string name="MyAccountExplain">For kendte e-post udbyder bliver ekstra opsætninger bestemt automatisk.</string>
-    <string name="MyAccountExplain2" >Nogle gange, <![CDATA[<b>]]>skal IMAP aktiveres<![CDATA[</b>]]> i e-post web grænseflade.\n\nKontakt e-post udbyder eller venner ved problemer.</string>
-    <string name="AccountNotConfigured">Konto ikke opsat</string>
+    <string name="AdvancedOptions">Avancerede indstillinger...</string>
+    <string name="MyAccountExplain">For kendte e-post udbyder bliver ekstra opsætninger bestemt automatisk.<![CDATA[<br/>]]><![CDATA[<br/>]]>Nogle gange, <![CDATA[<b>]]>skal IMAP aktiveres<![CDATA[</b>]]> i e-post web grænseflade.\n\nKontakt e-post udbyder eller venner ved problemer.</string>
+    <string name="MyAccountExplainGmail">For <![CDATA[<b>]]>GMail<![CDATA[</b>]]> konti skal der enten oprettes en
+        <![CDATA[<a href=\"https://security.google.com/settings/security/apppasswords\">]]>program-adgangskode<![CDATA[</a>]]> hvis 2FA er aktiveret.
+        <![CDATA[<br/>]]>Hvis opsætningen ikke er tilgængelig, skal <![CDATA[<a href=\"https://myaccount.google.com/lesssecureapps\">]]>mindre sikre programmer<![CDATA[</a>]]> aktiveres.
+    </string>
+    <string name="AccountNotConfigured">Konto ikke indstillet</string>
    <string name="AboutThisProgram">Om Delta Chat</string>
    <string name="NotSet">Ikke angivet</string>
    <string name="NewChat">Ny samtale</string>
    <string name="Deaddrop">Kontakt forespørgsel</string>
-    <string name="DeaddropInChatlist">Vise kontakt forespørgsleri samtale liste</string>
-    <string name="MuteAlways">Altid afbrudt</string>
-    <string name="AskStartChatWith">Samtale med <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
-    <string name="DeaddropHint">Tryk svar-pilen for at starte samtale.</string>
+    <string name="DeaddropInChatlist">Vise kontakt forespørgsler i samtale liste</string>
+    <string name="MuteAlways">Altid lydløs</string>
+    <string name="AskStartChatWith">Snakke med <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
+    <string name="DeaddropHint">Tryk på svar-pile for at starte samtale.</string>
    <string name="NotYetImplemented">Funktion ikke tilgængelig eller ufuldstændig.</string>
    <!-- Translators: The URL should not be localized, it is not clear which languuage the receiver prefers and the language will be detected on the server -->
    <string name="DefaultStatusText">Sendt med Delta Chat Messenger: https://delta.chat</string>
    <string name="Name" >Navn</string>
    <string name="EmailAddress">E-post adresse</string>
    <string name="CannotDeleteContact">Kan ikke slette aktiv bruger, blokere kontakt i stedet. </string>
-    <string name="BadEmailAddress">Fejlagtig e-post adresse.</string>
+    <string name="BadEmailAddress">Forkert e-post adresse.</string>
    <string name="ContactCreated">Kontakt oprettet</string>
    <string name="ViewProfile">Vise profil</string>
    <!-- Translators: please use a very short string here, it should not much longer than
    the string needed for video time+size (0:00, 12,3 Mib) -->
    <string name="OneMoment">Øjeblik…</string>
-    <string name="NoChatsHelp">Start bekseder ved at trykke på \"Ny samtale\" knappen i bunden til højre eller tryk på \"Menu\" knappen for flere valgmuligheder.</string>
-    <string name="Intro7Message"><![CDATA[<b>Delta Chat</b>]]> er sikker for firma brug, kompatibel og og baseret på standarder.</string>
+    <string name="NoChatsHelp">Start beskeder ved at trykke på \"Ny samtale\" knappen i bunden til højre eller på \"Menu\" knappen for flere valgmuligheder.</string>
+    <string name="Intro7Message"><![CDATA[<b>Delta Chat</b>]]> er sikker til erhvervslivet, kompatibel og standardbaseret.</string>
    <string name="InviteMenuEntry">Sende invitationer</string>
    <string name="InviteText"> Jeg bruger Delta Chat - %1$s - du kan skrive til mig hos %2$s</string>
-    <string name="AdvancedSettings">Advanceret</string>
-    <string name="AskResetNotifications">Nulstille alle påmindelse opsætning og lyde på nuværende side, kontakter og grupper?</string>
+    <string name="AdvancedSettings">Avanceret</string>
+    <string name="AskResetNotifications">Nulstille alle påmindelse opsætninger og lyde på nuværende side, kontakter og grupper?</string>
    <string name="AttachFiles">Vedhæfte filer</string>
-    <string name="ErrGroupNameEmpty">Indtaste gruppenavn.</string>
+    <string name="ErrGroupNameEmpty">Indtaste gruppe navn.</string>
    <string name="MsgNewGroupDraftHint">Skriv den første besked som tillader andre at svare inden for denne gruppe.\n\n• Det er o.k. hvis ikke alle medlemmer bruger Delta Chat.\n\n• Aflevering af første besked kan tage nogen tid.</string>
    <string name="MsgNewGroupDraft">Hej, jeg har lige oprettet gruppen \"%1$s\" til os.</string>
    <string name="MsgGroupNameChanged">Gruppe navn ændret fra \"%1$s\" til \"%2$s\".</string>
@@ -357,10 +361,10 @@
    <string name="AskAddMemberToGroup">Tilføje <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> til gruppe?</string>
    <string name="AskRemoveMemberFromGroup">Fjerne <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> fra gruppe?</string>
    <string name="ErrSelfNotInGroup">Mans skal være medlem af gruppen for at kunne udføre denne handling.</string>
-    <string name="MsgGroupLeft">Forladt gruppe</string>
+    <string name="MsgGroupLeft">Forladt gruppe.</string>
    <string name="NoMessagesHint">Sende besked til <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>:\n\n• Det er o.k.hvis <![CDATA[<b>]]>%2$s<![CDATA[</b>]]> ikke bruger Delta Chat.\n\n• Levering af første besked kan tage nogen tid.</string>
    <string name="SendNRcvReadReceipts">Modtage og sende læse kvitteringer</string>
-    <string name="PreferE2EEncryption">Foretærkke ende til ende-kryptering</string>
+    <string name="PreferE2EEncryption">Foretrække ende-til-ende kryptering</string>
    <string name="E2EManagePrivateKeys">Håndtere nøgler</string>
    <string name="E2ECompareKeys">Sammenligne nøgler</string>
    <string name="ForwardToTitle">Videresende til...</string>
@@ -378,8 +382,8 @@
    <string name="HelpUrl">https://delta.chat/en/help</string>
    <string name="EncryptedMessage">Krypteret besked</string>
    <string name="Encryption">Kryptering</string>
-    <string name="EncrinfoE2EAvailable">Ende til ende-kryptering tilgængelig.</string>
-    <string name="EncrinfoTransport">Mindst overførsel kryptering til server.</string>
+    <string name="EncrinfoE2EAvailable">Ende-til-ende kryptering tilgængelig.</string>
+    <string name="EncrinfoTransport">Overførsel kryptering mindst til server.</string>
    <string name="EncrinfoNone">Ingen kryptering til server.</string>
    <string name="EncrinfoFingerprints">Fingeraftryk</string>
    <string name="Backup">Sikkerhedskopi</string>
@@ -403,14 +407,14 @@
    <string name="ExportPrivateKeys">Eksportere hemmelige nøgler</string>
    <string name="ImportPrivateKeys">Importere hemmelige nøgler</string>
    <string name="ImportPrivateKeysAsk2">Importere hemmelige nøgler fra <![CDATA[<i>]]>%1$s<![CDATA[</i>]]>?\n\n• Eksisterende nøgler bliver ikke slettet\n\n• Seneste importeret nøgle bruges som standard nøgle</string>
-    <string name="NoRecentEmoji">Nylig brugte emoji vises her.</string>
+    <string name="NoRecentEmoji">Nylige brugte emoji vises her.</string>
    <string name="NotNow">Ikke nu</string>
    <string name="ArchiveChat">Arkivere samtale</string>
-    <string name="UnarchiveChat">Dearkivere samtale</string>
+    <string name="UnarchiveChat">De-arkivere samtale</string>
    <string name="ArchivedChats">Arkivere samtaler</string>
    <string name="Archived">Arkiveret</string>
    <string name="LeaveGroup">Forlade gruppe</string>
-    <string name="AskLeaveGroup">Forlade denne gruppe?</string>
+    <string name="AskLeaveGroup">Forlade gruppe?</string>
    <string name="Never">Aldrig</string>
    <string name="AutocryptKeyTransferInitiate">Sende Autocrypt opsætningsbesked</string>
    <string name="AutocryptKeyTransfer">Autocrypt opsætningsbesked</string>
@@ -419,15 +423,15 @@
    <string name="AutocryptSetupMessageSubject">Autocrypt opsætningsbesked</string>
    <string name="AutocryptSetupMessageGeneralBody">Dette er Autocrypt opsætningsbesked brugt til at overføre ende-til-ende opsætning mellem klienter.\n\nFor at dekryptere og bruge opsætning åben beskeden i en Autocrypt kompatibel klient og indtast opsætningskoden vist på kilde enheden.</string>
    <string name="AutocryptSetupMessageTapBody">Dette er en Autocrypt besked brugt til at overføre ende-til-ende opsætning mellem klienter.\n\nFor at dekryptere og bruge opsætning, tryk på denne besked.</string>
-    <string name="AutocryptKeyTransferPleaseEnterCode">Indtast opsætningskode vist på den anden enhed.</string>
+    <string name="AutocryptKeyTransferPleaseEnterCode">Indtaste opsætningskode vist på anden enhed.</string>
    <string name="AutocryptKeyTransferBadCode">Opsætningskode er ikke god. Prøv igen.\n\nHvis opsætningskode er glemt send blot en ny Autocrypt besked fra en anden enhed..</string>
    <string name="AutocryptKeyTransferSucceeded">Ende-til-ende opsætning overført. Denne enhed er nu klar til at bruge Autocrypt med samme opsætning som anden enhed.</string>
    <string name="Retry">Prøv igen</string>
    <string name="SelfTalkSubtitle">Beskeder sendt af undertegnet til undertegnet</string>
-    <string name="QrScan">Skanne QR-kode</string>
-    <string name="QrShow">Vise QR-kode</string>
-    <string name="QrScanContainsText">Skannet QR kode indeholder følgende tekst:\n\n%1$s</string>
-    <string name="QrScanContainsUrl">Skannet QR kode indeholder følgende URL:\n\n%1$s</string>
+    <string name="QrScan">Skanne QR kode</string>
+    <string name="QrShow">Vise QR kode</string>
+    <string name="QrScanContainsText">Skannet QR kode tekst:\n\n%1$s</string>
+    <string name="QrScanContainsUrl">Skannet QR kode URL:\n\n%1$s</string>
    <string name="OobFingerprint">Fingeraftryk</string>
    <string name="OobFingerprintAskOob">Efterprøv kontakt og start samtale med <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <string name="OobFingerprintOk">Kontact <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> efterprøvet. Start samtale?</string>
@@ -435,7 +439,7 @@
    <string name="OobFingerprintWithoutAddr">QR kode indeholder fingeraftryk men ingen e-post adresse.\n \nFor en uden for bånd efterprøvning, skal en krypteret forbindelse til modtageren først oprettes.</string>
    <string name="OobSecureJoinRequested">%1$s tilslutter.</string>
    <string name="CannotDecryptBody">Denne besked kan ikke dekrypteres.\n\n• Det kan måske hjælpe at svare på beskeden og bede afsender gensende beskeden.\n\n• I tilfælde Delta Chat er blevet geninstalleret eller et andet e-post program på denne eller en anden enhed bør der sendes en Autocrypt opsætningsbeked fra dem.</string>
-    <string name="Autocrypt">Automatisk kryptering</string>
+    <string name="Autocrypt">Autocrypt</string>
    <string name="AutocryptExplain"><![CDATA[<i>]]>Autocrypt<![CDATA[</i>]]> er en ny og åben specifikation til ende-til-ende e-post kryptering.\n\nEnde-til-ende opsætning oprettes automatisk efter behov og kan overføres mellem enheder med <![CDATA[<i>]]>Autocrypt opsætningsbeskeder.<![CDATA[</i>]]></string>
    <string name="NewVerifiedGroup">Ny efterprøvet gruppe</string>
    <string name="SharedChats">Delte samtaler</string>
@@ -444,8 +448,9 @@
    <string name="VerifiedGroup">Bekræftet gruppe</string>
    <string name="Group">Gruppe</string>
    <string name="EditedNameWillBeShared">Redigeret navn vil blive delt med alle gruppe medlemmer.</string>
-    <string name="E2EEncryptionPreferred">Ende til ende-kryptering foretrukken.</string>
+    <string name="E2EEncryptionPreferred">Ende-til-ende kryptering foretrukken.</string>
    <string name="OobAddrVerified">%1$s efterprøvet.</string>
+    <string name="OobGroupJoined">%1$s sikkert tilsluttet gruppe.</string>
    <string name="OobAddrVerifiedIntroduceMyself">%1$s efterprøvet, præsentere…</string>
    <string name="OobAskJoinVerifiedGroup">Tilslutte efterprøvet gruppe <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <!-- Translators: %1$s is replaced by an action, eg. MsgMemberAddedToGroup, MsgMemberRemovedFromToGroup, MsgGroupNameChanged or MsgGroupImageChanged. If the action ends with a full stop, this is removed.
@@ -457,8 +462,8 @@
    Resulting strings might be "Member Alice added by me." or 'Group name changed from "Foo" to "Bar" by me.
    If you do not find a correct grammar for your language you can just use "%1$s (by me)" or "Me: %1$s" -->
    <string name="ActionBySelf">%1$s af undertegnet.</string>
-    <string name="ExampleEmailAddr">user@example.org</string>
-    <string name="QrScanHint">Placere kamera over QR koden</string>
+    <string name="ExampleEmailAddr">bruger@eksempel.dk</string>
+    <string name="QrScanHint">Placere kamera over QR kode</string>

    <string name="QrShowVerifyCode">Vise QR efterprøve kode</string>
    <string name="QrVerifyContactTitle">QR efterprøve kode</string>
@@ -471,5 +476,9 @@
    <string name="FetchModeSaveBattery">Spare batteri</string>
    <string name="FetchModePersistentConnection">Vedvarende forbindelse</string>
    <string name="FetchModeExplain">Når hente tilstand bruges <![CDATA[<i>]]>Spar batteri<![CDATA[</i>]]>, nye beskeder vises hvis ikke programmet kører i forgunden og med en gennemsnitsforsinkelse på 30 sekunder hvis programmet ikke bruges. Når enheden er i hvile tilstand kan forsinkelse være længere. Dette er standard tilstand.\n\n<![CDATA[<i>]]>Vedvarende forbindelse<![CDATA[</i>]]> er typisk hurtiger men kan kræve at programmet er hvidlisteti system opsætning for at kunne forbruge mere batteri.\n\nHvilken hente tilstand ønskes at bruge?</string>
-    <string name="PermissionCamera">Adgang til kamera er nødvendig for at tage billeder eller skanne QR koder.</string>
+    <string name="PermissionCamera">Kamera adgang nødvendig for at tage billeder eller skanne QR koder.</string>
+    <!-- Translators: %1$s will be replaced by the email address -->
+    <string name="ErrCannotLogin">Kan ikke logge ind som <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>. Kontrollere at e-post adresse og adgangskode er korrekt.</string>
+    <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
+    <string name="ErrSeverResponse">Svar fra %1$s: %2$s\n\nNogle udbydere placerer yderligere oplysninger i indbakken; tjek dem f.eks. via frontenden. Kontakt udbyder eller venner ved problemer.</string>
 </resources>
@@ -317,8 +317,14 @@
    <string name="ImapPort">IMAP-Port</string>
    <string name="InboxHeadline">Posteingang</string>
    <string name="OutboxHeadline">Postausgang</string>
-    <string name="MyAccountExplain">Für bekannte E-Mail-Anbieter werden die weiteren Einstellungen automatisch ermittelt.</string>
-    <string name="MyAccountExplain2" >Manchmal muss die <![CDATA[<b>]]>IMAP-Funktion<![CDATA[</b>]]> noch in der E-Mail-Weboberfläche <![CDATA[<b>]]>eingeschaltet<![CDATA[</b>]]> werden.\n\nBei Problemen kann der E-Mail-Anbieter oder ein Bekannter weiterhelfen.</string>
+    <string name="AdvancedOptions">Erweiterte Einstellungen...</string>
+    <string name="MyAccountExplain">Für bekannte E-Mail-Anbieter werden die weiteren Einstellungen automatisch ermittelt.
+        <![CDATA[<br/>]]><![CDATA[<br/>]]>
+        Manchmal muss die <![CDATA[<b>]]>IMAP-Funktion<![CDATA[</b>]]> noch in der E-Mail-Weboberfläche <![CDATA[<b>]]>eingeschaltet<![CDATA[</b>]]> werden.\n\nBei Problemen kann der E-Mail-Anbieter oder ein Bekannter weiterhelfen.</string>
+    <string name="MyAccountExplainGmail">Für <![CDATA[<b>]]>GMail<![CDATA[</b>]]> Accounts muss ein
+        <![CDATA[<a href="https://security.google.com/settings/security/apppasswords">]]>App-Passwort<![CDATA[</a>]]> erstellt werden, wenn 2FA aktiv ist.
+        <![CDATA[<br/>]]>Falls diese Einstellung nicht vorhanden ist, müssen Sie Zugriff für <![CDATA[<a href="https://myaccount.google.com/lesssecureapps">]]>weniger sichere Apps<![CDATA[</a>]]> zulassen.
+    </string>
    <string name="AccountNotConfigured">Konto nicht konfiguriert</string>
    <string name="AboutThisProgram">Über Delta Chat</string>
    <string name="NotSet">Nicht gesetzt</string>
@@ -471,4 +477,5 @@
    <string name="FetchModeSaveBattery">Batterie sparen</string>
    <string name="FetchModePersistentConnection">Dauerhafte Verbindung</string>
    <string name="FetchModeExplain">Wenn Sie den Modus <![CDATA[<i>]]>Batterie sparen<![CDATA[</i>]]> verwenden, kommen neue Nachrichten sofort an, während die App geöffnet ist und mit einer Verzögerung von ca 30 Sekunden, wenn die App nicht benutzt wird. Wenn das Gerät in den Schlafmodus umschaltet, kann die Verzögerung größer sein. Das ist die Standard-Einstellung.\n\n<![CDATA[<i>]]>Dauerhafte Verbindung<![CDATA[</i>]]> ist üblicherweise schneller, aber kann es erforden, dass die App in den Systemeinstellungen freigeschaltet werden muss um mehr Batterieverbrauch zu erlauben..\n\nWelchen Empfangsmodus möchten Sie verwenden?</string>
+    <string name="PermissionCamera">Für die Aufnahme von Fotos oder das Scannen von QR Codes wird Zugriff auf die Kamera benötigt.</string>
    </resources>
@@ -317,8 +317,7 @@
    <string name="ImapPort">Puerto IMAP</string>
    <string name="InboxHeadline">Bandeja de entrada</string>
    <string name="OutboxHeadline">Bandeja de salida</string>
-    <string name="MyAccountExplain">Para proveedores conocidos de correo, los ajustes adicionales se determinan automáticamente.</string>
-    <string name="MyAccountExplain2" >Algunas veces, <b>hay que habilitar IMAP</b> en la interfaz web del correo.\n\nEn caso de problemas, consulte a su proveedor de correo o el de sus amigos.</string>
+    <string name="MyAccountExplain">Para proveedores conocidos de correo, los ajustes adicionales se determinan automáticamente.<![CDATA[<br/>]]><![CDATA[<br/>]]>Algunas veces, <b>hay que habilitar IMAP</b> en la interfaz web del correo.\n\nEn caso de problemas, consulte a su proveedor de correo o el de sus amigos.</string>
    <string name="AccountNotConfigured">Cuenta no configurada</string>
    <string name="AboutThisProgram">Sobre Delta Chat</string>
    <string name="NotSet">No establecido</string>
@@ -317,8 +317,12 @@
    <string name="ImapPort">IMAP ataka</string>
    <string name="InboxHeadline">Sarrera ontzia</string>
    <string name="OutboxHeadline">Irteera ontzia</string>
-    <string name="MyAccountExplain">E-mail hornitzaile ezagunentzat, ezarpen gehigarriak automatikoki zehaztuko dira.</string>
-    <string name="MyAccountExplain2" >Batzuetan, <![CDATA[<b>]]>IMAP gaitu behar da<![CDATA[</b>]]> e-mail zerbitzuaren web interfazean.\n\nGaldetu zure e-mail hornitzaileari edo lagunei arazoak badituzu.</string>
+    <string name="AdvancedOptions">Aukera aurreratuak...</string>
+    <string name="MyAccountExplain">E-mail hornitzaile ezagunentzat, ezarpen gehigarriak automatikoki zehaztuko dira.<![CDATA[<br/>]]><![CDATA[<br/>]]>Batzuetan, <![CDATA[<b>]]>IMAP gaitu behar da<![CDATA[</b>]]> e-mail zerbitzuaren web interfazean.\n\nGaldetu zure e-mail hornitzaileari edo lagunei arazoak badituzu.</string>
+    <string name="MyAccountExplainGmail"><![CDATA[<b>]]>GMail<![CDATA[</b>]]> kontuetarako bietako bat
+        <![CDATA[<a href=\"https://security.google.com/settings/security/apppasswords\">]]>Aplikazio-pasahitz<![CDATA[</a>]]> bat sortu dezakezu 2FA gaituta izanez gero.
+        <![CDATA[<br/>]]>eEzarpen hau erabilgarri ez badago, <![CDATA[<a href=\"https://myaccount.google.com/lesssecureapps\">]]>Aplikazio ez seguruak<![CDATA[</a>]]> gaitu behar duzu
+    </string>
    <string name="AccountNotConfigured">Kontua konfiguratu gabe</string>
    <string name="AboutThisProgram">Delta Chat-i buruz</string>
    <string name="NotSet">Ezarri gabe</string>
@@ -446,6 +450,7 @@
    <string name="EditedNameWillBeShared">Taldeko kide guztiek izango dute izen aldaketaren berri.</string>
    <string name="E2EEncryptionPreferred">Muturretik muturrerako zifratzea hobetsia.</string>
    <string name="OobAddrVerified">%1$s egiaztatuta.</string>
+    <string name="OobGroupJoined">%1$s taldera modu seguruan elkartu da</string>
    <string name="OobAddrVerifiedIntroduceMyself">%1$s egiaztatuta, egin aurkezpena …</string>
    <string name="OobAskJoinVerifiedGroup"><![CDATA[<b>]]>%1$s<![CDATA[</b>]]> egiaztatutako taldera elkartu nahi duzu?</string>
    <!-- Translators: %1$s is replaced by an action, eg. MsgMemberAddedToGroup, MsgMemberRemovedFromToGroup, MsgGroupNameChanged or MsgGroupImageChanged. If the action ends with a full stop, this is removed.
@@ -472,4 +477,8 @@
    <string name="FetchModePersistentConnection">Konexio iraunkorra</string>
    <string name="FetchModeExplain"><![CDATA[<i>]]>Aurreztu bateria<![CDATA[</i>]]> eskuratze modua erabiltzean, mezu berriak berehala agertuko dira aplikazioa irekita dagoenean eta batez beste 30 segunduko atzerapenarekin aplikazioa bigarren planoan badago. Gailua lo dagoenean atzerapena luzeagoa izan daiteke. Hau da lehenetsitako modua.\n\n<![CDATA[<i>]]>Konexio iraunkorra<![CDATA[</i>]]> azkarragoa izan ohi da baina agian aplikazioari bateria gehiago kontsumitzea baimendu behar zaio sistemaren ezarpenetan.\n\nZein eskuratze modu erabili nahi duzu?</string>
    <string name="PermissionCamera">Kamera atzitzeko baimena behar da argazkiak atera nahi badituzu edo QR kodeak eskaneatu nahi badituzu.</string>
+    <!-- Translators: %1$s will be replaced by the email address -->
+    <string name="ErrCannotLogin">Ezin izan da <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> saioa hasi. Egiaztatu e-mail helbidea eta pasahitza zuzenak diren.</string>
+    <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
+    <string name="ErrSeverResponse">%1$s(r)en erantzuna: %2$s\n\n Hornitzaile batzuk informazio gehigarria kokatzen dute zure sarrera ontzian; Hau adibidez web interfazea erabiliz egiaztatu dezakezu. Arazorik baduzu galdetu hornitzaileari edo zure lagunei.</string>
 </resources>
@@ -317,8 +317,7 @@
    <string name="ImapPort">Port IMAP</string>
    <string name="InboxHeadline">Boîte de réception</string>
    <string name="OutboxHeadline">Boîte d\'envoi</string>
-    <string name="MyAccountExplain">Pour les fournisseurs e-mails connus, les paramètres suivants seront déterminés automatiquement.</string>
-    <string name="MyAccountExplain2" >Parfois, <![CDATA[<b>]]>IMAP doit être activé<![CDATA[</b>]]> depuis l\'interface web.\n\nSi vous rencontrez des problème, demandez à votre fournisseur ou à vos amis.</string>
+    <string name="MyAccountExplain">Pour les fournisseurs e-mails connus, les paramètres suivants seront déterminés automatiquement.<![CDATA[<br/>]]><![CDATA[<br/>]]>Parfois, <![CDATA[<b>]]>IMAP doit être activé<![CDATA[</b>]]> depuis l\'interface web.\n\nSi vous rencontrez des problème, demandez à votre fournisseur ou à vos amis.</string>
    <string name="AccountNotConfigured">Compte non configuré</string>
    <string name="AboutThisProgram">À propos Delta Chat</string>
    <string name="NotSet">Non défini</string>
@@ -316,8 +316,7 @@
    <string name="ImapPort">IMAP port</string>
    <string name="InboxHeadline">Bejövő</string>
    <string name="OutboxHeadline">Kimenő</string>
-    <string name="MyAccountExplain">Ismert e-mail szolgáltató esetén az alábbi beállításokat automatikusan meghatározzuk.</string>
-    <string name="MyAccountExplain2" >Előfordulhat, hogy az IMAP/SMTP szolgáltatást az email fiókod webes felületén engedélyezni kell.\n\nHa nem megy, kérj segítséget a szolgáltatótól vagy a barátaidtól.</string>
+    <string name="MyAccountExplain">Ismert e-mail szolgáltató esetén az alábbi beállításokat automatikusan meghatározzuk.<![CDATA[<br/>]]><![CDATA[<br/>]]>Előfordulhat, hogy az IMAP/SMTP szolgáltatást az email fiókod webes felületén engedélyezni kell.\n\nHa nem megy, kérj segítséget a szolgáltatótól vagy a barátaidtól.</string>
    <string name="AccountNotConfigured">A fiók nincs beállítva</string>
    <string name="AboutThisProgram">Delta Chat névjegye</string>
    <string name="NotSet">Nincs beállítva</string>
@@ -317,8 +317,12 @@
    <string name="ImapPort">Porta IMAP</string>
    <string name="InboxHeadline">In arrivo</string>
    <string name="OutboxHeadline">In uscita</string>
-    <string name="MyAccountExplain">Per i provider email conosciuti, le impostazioni aggiuntive vengono configurate automaticamente.</string>
-    <string name="MyAccountExplain2" >A volte, <![CDATA[<b>]]>IMAP deve essere abilitato<![CDATA[</b>]]> dall\'interfaccia web dell\'email.\n\nSe si riscontrano problemi contattare il proprio provider email o i propri amici.</string>
+    <string name="AdvancedOptions">Opzioni avanzate...</string>
+    <string name="MyAccountExplain">Per i provider email conosciuti, le impostazioni aggiuntive vengono configurate automaticamente.<![CDATA[<br/>]]><![CDATA[<br/>]]>A volte, <![CDATA[<b>]]>IMAP deve essere abilitato<![CDATA[</b>]]> dall\'interfaccia web dell\'email.\n\nSe si riscontrano problemi contattare il proprio provider email o i propri amici.</string>
+    <string name="MyAccountExplainGmail">Per gli account <![CDATA[<b>]]>GMail<![CDATA[</b>]]> è necessario creare una
+        <![CDATA[<a href=\"https://security.google.com/settings/security/apppasswords\">]]>Password per le app<![CDATA[</a>]]> se è attiva la verifica in 2 passaggi.
+        <![CDATA[<br/>]]>Se queste impostazioni non sono disponibili, è necessario abilitare le <![CDATA[<a href=\"https://myaccount.google.com/lesssecureapps\">]]>App meno sicure<![CDATA[</a>]]>
+    </string>
    <string name="AccountNotConfigured">Account non configurato</string>
    <string name="AboutThisProgram">Informazioni su Delta Chat</string>
    <string name="NotSet">Non impostato</string>
@@ -446,6 +450,7 @@
    <string name="EditedNameWillBeShared">Il nome modificato verrà condiviso con tutti i membri del gruppo.</string>
    <string name="E2EEncryptionPreferred">Cifratura end-to-end preferita.</string>
    <string name="OobAddrVerified">%1$s verificato.</string>
+    <string name="OobGroupJoined">%1$s è entrato nel gruppo sicuro.</string>
    <string name="OobAddrVerifiedIntroduceMyself">%1$s verificato, mi presento…</string>
    <string name="OobAskJoinVerifiedGroup">Entrare nel gruppo verificato <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <!-- Translators: %1$s is replaced by an action, eg. MsgMemberAddedToGroup, MsgMemberRemovedFromToGroup, MsgGroupNameChanged or MsgGroupImageChanged. If the action ends with a full stop, this is removed.
@@ -467,7 +472,13 @@
    <string name="QrShowInviteCode">Mostra codice QR di invito</string>
    <string name="QrJoinVerifiedGroupTitle">Codice QR di invito</string>
    <string name="QrJoinVerifiedGroupHint">Scansiona questo per entrare nel gruppo verificato <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.</string>
+    <string name="FetchMode">Modalità di recupero</string>
    <string name="FetchModeSaveBattery">Risparmia batteria</string>
    <string name="FetchModePersistentConnection">Connessione persistente</string>
+    <string name="FetchModeExplain">Quando viene usata la modalità di recupero <![CDATA[<i>]]>Risparmia batteria<![CDATA[</i>]]>, i nuovi messaggi appaiono una volta che l\'app è in primo  piano e con un ritardo di 30 secondi se l\'app non viene usata. Quando il dispositivo è in stanby il ritardo potrebbe essere maggiore. Questa è la modalità predefinita.\n\n<![CDATA[<i>]]>Connessione persistente<![CDATA[</i>]]> di solito è più veloce, ma potrebbe richiedere che l\'app venga inserita nella lista bianca del sistema tramite le impostazioni per permetterle di consumare più batteria.\n\nQuale modalità di recupero vuoi usare?</string>
    <string name="PermissionCamera">L\'accesso alla fotocamera è necessario se si vogliono acquisire immagini o per eseguire la scansione dei codici QR.</string>
+    <!-- Translators: %1$s will be replaced by the email address -->
+    <string name="ErrCannotLogin">Impossibile accedere come <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>. Per favore, controlla la correttezza di indirizzo email e password.</string>
+    <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
+    <string name="ErrSeverResponse">Risposta da %1$s: %2$s\n\nAlcuni provider potrebbero inserire altre informazioni nella casella di posta, controlla ad es. nell\'interfaccia web. Chiedi al provider o ai tuoi amici se riscontri problemi.</string>
 </resources>
@@ -317,8 +317,7 @@
    <string name="ImapPort">IMAP-port</string>
    <string name="InboxHeadline">Innboks</string>
    <string name="OutboxHeadline">Utboks</string>
-    <string name="MyAccountExplain">For kjente e-posttilbydere blir ytterligere innstillinger bestemt automatisk.</string>
-    <string name="MyAccountExplain2" >Noen ganger må  <![CDATA[<b>]]>IMAP<![CDATA[</b>]]> skrus på i vev-e-postgrenseflaten.\n\nVed problemer, spør din e-posttilbyder eller vennene dine.</string>
+    <string name="MyAccountExplain">For kjente e-posttilbydere blir ytterligere innstillinger bestemt automatisk.<![CDATA[<br/>]]><![CDATA[<br/>]]>Noen ganger må  <![CDATA[<b>]]>IMAP<![CDATA[</b>]]> skrus på i vev-e-postgrenseflaten.\n\nVed problemer, spør din e-posttilbyder eller vennene dine.</string>
    <string name="AccountNotConfigured">Konto ikke satt opp</string>
    <string name="AboutThisProgram">Om</string>
    <string name="NotSet">Ikke satt</string>
@@ -317,8 +317,12 @@
    <string name="ImapPort">IMAP-poort</string>
    <string name="InboxHeadline">Postvak IN</string>
    <string name="OutboxHeadline">Postvak UIT</string>
-    <string name="MyAccountExplain">Bij bekende e-maildiensten worden de instellingen automatisch bepaald.</string>
-    <string name="MyAccountExplain2" >Soms moet <![CDATA[<b>]]>IMAP ingeschakeld worden<![CDATA[</b>]]> op de e-mailwebsite.\n\nAls je problemen hebt, vraag dan je e-maildienst of vrienden om hulp.</string>
+    <string name="AdvancedOptions">Geavanceerde opties...</string>
+    <string name="MyAccountExplain">Bij bekende e-maildiensten worden de instellingen automatisch bepaald.<![CDATA[<br/>]]><![CDATA[<br/>]]>Soms moet <![CDATA[<b>]]>IMAP ingeschakeld worden<![CDATA[</b>]]> op de e-mailwebsite.\n\nAls je problemen hebt, vraag dan je e-maildienst of vrienden om hulp.</string>
+    <string name="MyAccountExplainGmail">Voor <![CDATA[<b>]]>GMail<![CDATA[</b>]]>-accounts moet je een
+        <![CDATA[<a href=\"https://security.google.com/settings/security/apppasswords\">]]>app-wachtwoord<![CDATA[</a>]]>creëren als je authenticatie in twee stappen hebt ingeschakeld.
+        <![CDATA[<br/>]]>Als dit niet beschikbaar is, dan moet je<![CDATA[<a href=\"https://myaccount.google.com/lesssecureapps\">]]>Minder veilige apps<![CDATA[</a>]]> inschakelen.
+    </string>
    <string name="AccountNotConfigured">Account niet ingesteld</string>
    <string name="AboutThisProgram">Over Delta Chat</string>
    <string name="NotSet">Niet ingesteld</string>
@@ -472,4 +476,4 @@
    <string name="FetchModePersistentConnection">Aanhoudende verbinding</string>
    <string name="FetchModeExplain">Bij gebruik van de ophaalmodus <![CDATA[<i>]>Batterij sparen<![CDATA[</i>]]>, verschijnen nieuwe berichten meteen wanneer de app op de voorgrond staat en met een gemiddelde vertraging van 30 seconden als de app niet wordt gebruikt. Wanneer het apparaat in sluimerstand (doze mode) is, kan de vertraging langer zijn. Dit is de standaardmodus.\n\n<![CDATA[<i>]]>Continue connectie<![CDATA[</i>]]> is meestal sneller maar vereist mogelijk dat de app in de systeeminstellingen op de witte lijst wordt geplaatst om meer batterij te mogen verbruiken.\n\nWelke ophaalmodus wilt u gebruiken?</string>
    <string name="PermissionCamera">Cameratoegang is nodig als je foto\'s wilt maken of QR-codes wilt scannen.</string>
-</resources>
+    </resources>
@@ -345,8 +345,11 @@
    <string name="ImapPort">IMAP port</string>
    <string name="InboxHeadline">Skrzynka odbiorcza</string>
    <string name="OutboxHeadline">Skrzynka nadawcza</string>
-    <string name="MyAccountExplain">Dla znanych dostawców usług poczty elektronicznej poniższe ustawienia są określane automatycznie.</string>
-    <string name="MyAccountExplain2" >Czasami <![CDATA[<b>]]>IMAP musi być włączony<![CDATA[</b>]]> w interfejsie www poczty internetowej.\n\nZ problemami należy zwrócić się do usługodawcy e-mail lub znajomych.</string>
+    <string name="AdvancedOptions">Opcje zaawansowane…</string>
+    <string name="MyAccountExplain">Dla znanych dostawców usług poczty elektronicznej poniższe ustawienia są określane automatycznie.<![CDATA[<br/>]]><![CDATA[<br/>]]>Czasami <![CDATA[<b>]]>IMAP musi być włączony<![CDATA[</b>]]> w interfejsie www poczty internetowej.\n\nZ problemami należy zwrócić się do usługodawcy e-mail lub znajomych.</string>
+    <string name="MyAccountExplainGmail">W przypadku kont <![CDATA[<b>]]>GMail<![CDATA[</b>]]>musisz utworzyć
+        <![CDATA[<a href=\"https://security.google.com/settings/security/apppasswords\">]]>hasło aplikacji<![CDATA[</a>]]> , jeśli masz włączone 2FA (weryfikację dwustopniową).
+        <![CDATA[<br/>]]>Jeśli te ustawienia nie są dostępne, musisz włączyć <![CDATA[<a href=\"https://myaccount.google.com/lesssecureapps\">]]>mniej bezpieczne aplikacje<![CDATA[</a>]]>.</string>
    <string name="AccountNotConfigured">Konto nie jest skonfigurowane</string>
    <string name="AboutThisProgram">O Delta Chat</string>
    <string name="NotSet">Nie ustawiona</string>
@@ -474,6 +477,7 @@
    <string name="EditedNameWillBeShared">Edytowana nazwa zostanie udostępniona wszystkim członkom grupy.</string>
    <string name="E2EEncryptionPreferred">Preferowane pełne szyfrowanie.</string>
    <string name="OobAddrVerified">Zweryfikowano %1$s</string>
+    <string name="OobGroupJoined">Użytkownik %1$s bezpiecznie dołączył do grupy. </string>
    <string name="OobAddrVerifiedIntroduceMyself">Zweryfikowano %1$s, przedstaw się…</string>
    <string name="OobAskJoinVerifiedGroup">Czy chcesz dołączyć do zweryfikowanej grupy <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <!-- Translators: %1$s is replaced by an action, eg. MsgMemberAddedToGroup, MsgMemberRemovedFromToGroup, MsgGroupNameChanged or MsgGroupImageChanged. If the action ends with a full stop, this is removed.
@@ -500,4 +504,8 @@
    <string name="FetchModePersistentConnection">Stałe połączenie</string>
    <string name="FetchModeExplain">Podczas korzystania z trybu pobierania <![CDATA[<i>]]>Oszczędzaj baterię<![CDATA[</i>]]> nowe wiadomości pojawiają się od razu, jeśli aplikacja jest na pierwszym planie oraz ze średnim opóźnieniem 30 sekund, jeśli aplikacja nie jest używana. Gdy urządzenie znajduje się w trybie drzemki, opóźnienie może być dłuższe. Jest to tryb domyślny.\n\n<![CDATA[<i>]]>Stałe połączenie<![CDATA[</i>]]> jest zazwyczaj szybsze, ale może wymagać umieszczenia aplikacji na białej liście w ustawieniach systemu w celu zwiększenia zużycia baterii.\n\nKtórego trybu pobierania chcesz używać?</string>
    <string name="PermissionCamera">Dostęp do aparatu jest niezbędny, jeśli chcesz robić zdjęcia lub skanować kody QR.</string>
+    <!-- Translators: %1$s will be replaced by the email address -->
+    <string name="ErrCannotLogin">Nie można się zalogować jako <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>. Sprawdź, czy adres e-mail i hasło są poprawne.</string>
+    <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
+    <string name="ErrSeverResponse">Odpowiedź od %1$s: %2$s\n\nNiektórzy dostawcy umieszczają w skrzynce odbiorczej dodatkowe informacje, które można sprawdzić np. na stronie internetowej. W przypadku wystąpienia problemów należy skonsultować się z dostawcą lub znajomymi.</string>
 </resources>
@@ -317,8 +317,7 @@
    <string name="ImapPort">Porta IMAP</string>
    <string name="InboxHeadline">Caixa de entrada</string>
    <string name="OutboxHeadline">Caixa de saída</string>
-    <string name="MyAccountExplain">Para provedores de e-mail mais populares as configurações a seguir são detectadas automaticamente.</string>
-    <string name="MyAccountExplain2" >Por vezes <![CDATA[<b>]]> é necessário habilitar o IMAP/SMTP<![CDATA[</b>]]> nas configurações do servidor de e-mail.\n\nSe tiver dificuldades peça ajuda aos administradores do servidor ou a algum amigo.</string>
+    <string name="MyAccountExplain">Para provedores de e-mail mais populares as configurações a seguir são detectadas automaticamente.<![CDATA[<br/>]]><![CDATA[<br/>]]>Por vezes <![CDATA[<b>]]> é necessário habilitar o IMAP/SMTP<![CDATA[</b>]]> nas configurações do servidor de e-mail.\n\nSe tiver dificuldades peça ajuda aos administradores do servidor ou a algum amigo.</string>
    <string name="AccountNotConfigured">Conta não configurada</string>
    <string name="AboutThisProgram">Sobre Delta Chat</string>
    <string name="NotSet">Não configurado</string>
@@ -83,7 +83,7 @@
    <string name="Default">По умолчанию</string>
    <string name="OnlyIfSilent">Только при выключенном звуке</string>
    <string name="ChatBackground">Фон чата</string>
-    <string name="SendByEnter">Оправлять нажав ↵</string>
+    <string name="SendByEnter">Оправлять нажав Ввод</string>
    <string name="Help">Помощь</string>
    <string name="Enabled">Вкл</string>
    <string name="Disabled">Выкл.</string>
@@ -115,7 +115,7 @@
    <!--passcode view-->
    <string name="Passcode">Код доступа</string>
    <string name="ChangePasscode">Изменить код доступа</string>
-    <string name="ChangePasscodeInfo">Когда вы установите дополнительный код доступа, на странице чатов появится значок блокировки. Нажмите на него, чтобы заблокировать приложение.\n\nПримечание: если вы забудете код доступа, вам нужно будет удалить и переустановить приложение.</string>
+    <string name="ChangePasscodeInfo">Если вы установите дополнительный код доступа, значок блокировки будет отображён в верхней части списка чата. Нажмите на него, чтобы заблокировать приложение.\n\nПримечание: Если вы забудете код доступа, вам будет необходимо удалить и переустановить приложение.</string>
    <string name="PasscodePIN">ПИН</string>
    <string name="PasscodePassword">Пароль</string>
    <string name="EnterCurrentPasscode">Введите текущий код доступа</string>
@@ -202,8 +202,8 @@
    <string name="AreYouSureBlockContact">Вы действительно хотите заблокировать этот контакт?</string>
    <string name="AreYouSureDeleteContact">Вы уверены, что хотите удалить этот контакт?</string>
    <!--permissions-->
-    <string name="PermissionContacts">Доступ к вашим контактам необходим для того, чтобы вы могли общаться со своими друзьями на всех ваших устройствах.</string>
-    <string name="PermissionStorage">Необходим доступ к памяти вашего устройства для отправки и хранения фотографий, видео, музыки и других файлов.</string>
+    <string name="PermissionContacts">Предоставьте доступ к вашим контактам если вы хотите синхронизировать друзей на всех ваших устройствах.</string>
+    <string name="PermissionStorage">Предоставьте доступ к памяти вашего устройства если вы хотите отправлять и хранить фотографии, видео, музыку и другие файлы.</string>
    <string name="PermissionNoAudio">Предоставьте доступ к микрофону для записи голосовых сообщений.</string>
    <string name="PermissionOpenSettings">Настройки</string>
    <!--Intro view-->
@@ -345,8 +345,11 @@
    <string name="ImapPort">IMAP порт</string>
    <string name="InboxHeadline">Входящие</string>
    <string name="OutboxHeadline">Исходящие</string>
-    <string name="MyAccountExplain">Для известных поставщиков электронной почты дополнительные настройки определяются автоматически.</string>
-    <string name="MyAccountExplain2" >Иногда <![CDATA[<b>]]>IMAP должен быть включён<![CDATA[</b>]]> в веб-интерфейсе электронной почты.\n\nВ случае затруднений обратитесь к своему поставщику услуги электронной почты или компетентным друзьям.</string>
+    <string name="AdvancedOptions">Расширенные настройки...</string>
+    <string name="MyAccountExplain">Для известных поставщиков электронной почты дополнительные настройки определяются автоматически.<![CDATA[<br/>]]><![CDATA[<br/>]]>Иногда, <![CDATA[<b>]]>IMAP должен быть включён<![CDATA[</b>]]> в веб-интерфейсе электронной почты.\n\nВ случае затруднений, обратитесь к своему поставщику услуги электронной почты или компетентным друзьям.</string>
+    <string name="MyAccountExplainGmail">Для <![CDATA[<b>]]>GMail<![CDATA[</b>]]> Аккаунтов, вам возможно, понадобиться или создать
+        <![CDATA[<a href=\"https://security.google.com/settings/security/apppasswords\">]]>Пароль на приложение<![CDATA[</a>]]> если у вас включена аутентификация 2FA.
+        <![CDATA[<br/>]]>Если эти настройки не доступны, вам будет необходимо разрешить <![CDATA[<a href=\"https://myaccount.google.com/lesssecureapps\">]]>Доступ Небезопасных Приложений<![CDATA[</a>]]></string>
    <string name="AccountNotConfigured">Аккаунт не настроен</string>
    <string name="AboutThisProgram">Delta Chat (Дельта Чат)</string>
    <string name="NotSet">Не задано</string>
@@ -411,7 +414,7 @@
    <string name="EncrinfoNone">Соединение к моему серверу незащищено.</string>
    <string name="EncrinfoFingerprints">Ключи шифрования</string>
    <string name="Backup">Резервное копирование</string>
-    <string name="ImportBackupExplain2">Для восстановления из резервной копии скопируйте резервную копию в <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> и переустановите приложение.</string>
+    <string name="ImportBackupExplain2">Для восстановления из резервной копии, скопируйте её в <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> и переустановите приложение.</string>
    <string name="ReadReceiptMailBody">Это уведомление о доставке сообщения \"%1$s\".\n\nОно подтверждает, что сообщение было отображено на устройстве адресата. Однако это не означает, что получатель прочитал его содержимое.</string>
    <string name="ReadReceipt">Уведомление о доставке</string>
    <string name="NameAndStatus">Имя и подпись</string>
@@ -454,17 +457,17 @@
    <string name="SelfTalkSubtitle">Сообщения отправленные самому себе</string>
    <string name="QrScan">Сканирование QR кода</string>
    <string name="QrShow">Показать QR код</string>
-    <string name="QrScanContainsText">Отсканированный QR код содержит текст:\n\n%1$s</string>
-    <string name="QrScanContainsUrl">QR код для перехода по ссылке URL:\n\n%1$s</string>
+    <string name="QrScanContainsText">Текст сканированного QR кода:\n\n%1$s</string>
+    <string name="QrScanContainsUrl">QR код для перехода по URL:\n\n%1$s</string>
    <string name="OobFingerprint">Ключ</string>
    <string name="OobFingerprintAskOob">Верифицировать контакт и начать общение с <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <string name="OobFingerprintOk">Контакт <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> верифицирован. Начать общение?</string>
    <string name="OobFingerprintMismatch">Отсканированный ключ шифрования <![CDATA[<b>]]>не соответствует<![CDATA[</b>]]> ключу, который ранее был у <![CDATA[<i>]]>%1$s<![CDATA[</i>]]>.</string>
-    <string name="OobFingerprintWithoutAddr">Этот QR код содержит ключ шифрования, не  адрес эл.почты.\n\nЧтобы выполнить  верификацию по внешнему каналу, прежде всего установите с получателем защищённое соединение.</string>
+    <string name="OobFingerprintWithoutAddr">Этот QR код содержит отпечаток ключа, не  адрес эл.почты.\n\nЧтобы выполнить  верификацию по внешнему каналу, прежде всего установите с получателем защищённое соединение.</string>
    <string name="OobSecureJoinRequested">%1$s соединений.</string>
    <string name="CannotDecryptBody">Это сообщение не может быть расшифровано.\n\n• Возможно вам надо, просто попросить отправителя направить вам сообщение ещё раз.\n\n• В случае переустановки программы Дельта Чат или любой другой почтовой программы на этом или другом устройствах вам будет необходимо отправить от них Сообщение Настроек Autocrypt.</string>
    <string name="Autocrypt">Autocrypt</string>
-    <string name="AutocryptExplain"><![CDATA[<i>]]>Autocrypt<![CDATA[</i>]]> это новая и открытая спецификация сквозного шифрования для эл. почты.\n\nНастройки вашего сквозного шифрования создаются при необходимости автоматически и вы можете передавать их между устройствами посредством <![CDATA[<i>]]>Сообщения Настроек Autocrypt.<![CDATA[</i>]]></string>
+    <string name="AutocryptExplain"><![CDATA[<i>]]>Autocrypt<![CDATA[</i>]]> это новая и открытая спецификация для автоматического сквозного шифрования эл.почты.\n\nНастройки вашего сквозного шифрования создаются при необходимости автоматически и вы можете передавать их между устройствами через <![CDATA[<i>]]>Сообщения Настройки Autocrypt.<![CDATA[</i>]]></string>
    <string name="NewVerifiedGroup">Новая проверенная группа</string>
    <string name="SharedChats">Коллективный чат</string>
    <string name="VerifiedContact">Проверенный контакт</string>
@@ -474,6 +477,7 @@
    <string name="EditedNameWillBeShared">Отредактированное имя будет разослано всем участникам группы.</string>
    <string name="E2EEncryptionPreferred">Предпочтено сквозное шифрование.</string>
    <string name="OobAddrVerified">%1$s верифицирован.</string>
+    <string name="OobGroupJoined">%1$s безопасно присоединился к группе.</string>
    <string name="OobAddrVerifiedIntroduceMyself">%1$s верифицирован, представьтесь …</string>
    <string name="OobAskJoinVerifiedGroup">Вы хотите присоединиться к верифицированной группе <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <!-- Translators: %1$s is replaced by an action, eg. MsgMemberAddedToGroup, MsgMemberRemovedFromToGroup, MsgGroupNameChanged or MsgGroupImageChanged. If the action ends with a full stop, this is removed.
@@ -490,7 +494,7 @@

    <string name="QrShowVerifyCode">Показать проверочный QR код</string>
    <string name="QrVerifyContactTitle">Проверочный QR код</string>
-    <string name="QrVerifyContactHint"><![CDATA[<b>]]>%1$s<![CDATA[</b>]]>\nСканируйте эту настройку доверенного контакта.</string>
+    <string name="QrVerifyContactHint"><![CDATA[<b>]]>%1$s<![CDATA[</b>]]>\nСканируйте это для настройки доверенного контакта.</string>

    <string name="QrShowInviteCode">Показать QR код приглашения</string>
    <string name="QrJoinVerifiedGroupTitle">Пригласительный QR код</string>
@@ -500,4 +504,8 @@
    <string name="FetchModePersistentConnection">Постоянное соединение</string>
    <string name="FetchModeExplain">Когда используется режим выборки <![CDATA[<i>]]>Сохранять батарею<![CDATA[</i>]]>, новые сообщения появляются сразу, если приложение находится в фоне, если приложение не используется, с задержкой в 30 секунд. Когда устройство находится в «Спящем режиме» задержка может быть дольше. Это режим по умолчанию.\n\n<![CDATA[<i>]]>Постоянное соединение<![CDATA[</i>]]> обычно сообщения приходят быстрее, но в таком случае расход батареи может быть значительным.\n\nКакой режим выборки вы желаете использовать?</string>
    <string name="PermissionCamera">Необходим допуск к камере если вы хотите сделать фотоснимок или сканировать QR коды.</string>
+    <!-- Translators: %1$s will be replaced by the email address -->
+    <string name="ErrCannotLogin">Невозможно войти как <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>. Пожалуйста, убедитесь в том, что вы правильно вводите адрес адрес эл.почты и пароль.</string>
+    <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
+    <string name="ErrSeverResponse">Ответ от %1$s: %2$s\n\nНекоторые поставщики эл.почты помещают дополнительную информацию в папку входящие; проверьте её, например через веб интерфейс. Проконсультируйтесь у поставщика услуги или друзей, в случае если проблема по-прежнему не разрешилась.</string>
 </resources>
@@ -316,8 +316,11 @@
    <string name="ImapPort">Portë IMAP</string>
    <string name="InboxHeadline">Të marrë</string>
    <string name="OutboxHeadline">Të dërguar</string>
-    <string name="MyAccountExplain">Për furnizues të njohur shërbimesh email, rregullimet shtesë përcaktohen vetvetiu.</string>
-    <string name="MyAccountExplain2" >Ndonjëherë, <![CDATA[<b>]]>IMAP lypset të aktivizohet<![CDATA[</b>]]> te pjesa e dukshme e sistemit email web.\n\nNëse hasni probleme, këshillohuni me furnizuesin e email-it ose me shokë tuajt.</string>
+    <string name="AdvancedOptions">Mundësi të Thelluara…</string>
+    <string name="MyAccountExplain">Për furnizues të njohur shërbimesh email, rregullimet shtesë përcaktohen vetvetiu.<![CDATA[<br/>]]><![CDATA[<br/>]]>Ndonjëherë, <![CDATA[<b>]]>IMAP lypset të aktivizohet<![CDATA[</b>]]> te pjesa e dukshme e sistemit email web.\n\nNëse hasni probleme, këshillohuni me furnizuesin e email-it ose me shokë tuajt.</string>
+    <string name="MyAccountExplainGmail">Për Llogari <![CDATA[<b>]]>GMail<![CDATA[</b>]]> lypset të krijoni një
+ <![CDATA[<a href="https://security.google.com/settings/security/apppasswords">]]>App-Password<![CDATA[</a>]]>, nëse keni të aktivizuar 2FA.
+ <![CDATA[<br/>]]>Nëse ky rregullim s\’është i mundshëm, lypset të aktivizoni <![CDATA[<a href="https://myaccount.google.com/lesssecureapps">]]>Less Secure Apps<![CDATA[</a>]]></string>
    <string name="AccountNotConfigured">Llogari e paformësuar</string>
    <string name="AboutThisProgram">Mbi Delta Chat-in</string>
    <string name="NotSet">E papërcaktuar</string>
@@ -445,6 +448,7 @@
    <string name="EditedNameWillBeShared">Emri i përpunuar do të ndahet me krejt anëtarët e grupit.</string>
    <string name="E2EEncryptionPreferred">Parapëlqehet fshehtëzim skaj-më-skaj.</string>
    <string name="OobAddrVerified">%1$s u verifikua.</string>
+    <string name="OobGroupJoined">%1$s u bë pjesë e grupit në mënyrë të sigurt.</string>
    <string name="OobAddrVerifiedIntroduceMyself">%1$s u verifikua, prezantomë …</string>
    <string name="OobAskJoinVerifiedGroup">Doni të bëheni pjesë e grupit të verifikuar <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <!-- Translators: %1$s is replaced by an action, eg. MsgMemberAddedToGroup, MsgMemberRemovedFromToGroup, MsgGroupNameChanged or MsgGroupImageChanged. If the action ends with a full stop, this is removed.
@@ -471,4 +475,8 @@
    <string name="FetchModePersistentConnection">Lidhje e qëndrueshme</string>
    <string name="FetchModeExplain">Kur përdoret mënyra sjellje <![CDATA[<i>]]>Kurseni bateri<![CDATA[</i>]]>, mesazhet e rinj shfaqen menjëherë, nëse aplikacioni gjendet në prapaskenë dhe me një vonesë mesatarisht 30 sekondash, nëse aplikacioni nuk është në përdorim. Kur pajisja gjendet nën mënyrën <em>doze</em>, vonesa mund të jetë më e madhe. Kjo është mënyra parazgjedhje.\n\n<![CDATA[<i>]]>Lidhja e qëndrueshme<![CDATA[</i>]]> është përgjithësisht më e shpejtë, por mund të kërkojë që aplikacioni të lejohet nga sistemi të harxhojë më tepër bateri.\n\nCilën mënyrë prurjesh doni të përdoret?</string>
    <string name="PermissionCamera">Nëse doni të bëni foto apo doni të skanoni kode QR, lypset hyrje te kamera.</string>
+    <!-- Translators: %1$s will be replaced by the email address -->
+    <string name="ErrCannotLogin">S’bëhet dot hyrje si <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>. Ju lutemi, kontrolloni nëse adresa email dhe fjalëkalimi janë të saktë.</string>
+    <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
+    <string name="ErrSeverResponse">Përgjigje nga %1$s: %2$s\n\nDisa shërbime vendosin të dhëna shtesë te kutia juaj postare; ato mund t’i shihni, për shembull, që nga ndërfaqja web. Nëse hasni probleme, konsultohuni me shërbimin tuaj ose me ndonjë shok.</string>
 </resources>
@@ -284,6 +284,7 @@
    <string name="ImapPort">İMAP bağlanma noktası</string>
    <string name="InboxHeadline">Gelen kutusu</string>
    <string name="OutboxHeadline">Gönderilenler</string>
+    <string name="AdvancedOptions">Gelişmiş Seçenekler...</string>
    <string name="MyAccountExplain">Bilinen e-posta sağlayıcıları için ek ayarlar otomatik olarak algılanır.</string>
    <string name="AccountNotConfigured">Hesap düzenlenmedi</string>
    <string name="AboutThisProgram">Delta Chat Hakkında</string>
@@ -387,6 +388,8 @@
    <string name="SelfTalkSubtitle">Kendime gönderdiğim iletiler</string>
    <string name="QrScan">QR kod tara</string>
    <string name="QrShow">QR kodu göster</string>
+    <string name="QrScanContainsText">Taranan QR kodu aşağıdaki metni içeriyor:\n\n%1$s</string>
+    <string name="QrScanContainsUrl">Taranan QR kodu aşağıdaki internet adresini içeriyor:\n\n%1$s</string>
    <string name="OobFingerprint">Parmak izi</string>
    <string name="OobSecureJoinRequested">%1$s katılıyor.</string>
    <string name="Autocrypt">Autocrypt</string>
@@ -345,8 +345,7 @@
    <string name="ImapPort">IMAP порт</string>
    <string name="InboxHeadline">Скринька для вхідних</string>
    <string name="OutboxHeadline">Скринька для вихідних</string>
-    <string name="MyAccountExplain">Для відомих email-поставників, додаткові налаштування обираються автоматично.</string>
-    <string name="MyAccountExplain2" >Інколи, <![CDATA[<b>]]>IMAP має бути ввімкненим<![CDATA[</b>]]> у верстці email.\n\nУ разі виникнення проблем, спитайте поради у вашого email-поставника або друзів.</string>
+    <string name="MyAccountExplain">Для відомих email-поставників, додаткові налаштування обираються автоматично.<![CDATA[<br/>]]><![CDATA[<br/>]]>Інколи, <![CDATA[<b>]]>IMAP має бути ввімкненим<![CDATA[</b>]]> у верстці email.\n\nУ разі виникнення проблем, спитайте поради у вашого email-поставника або друзів.</string>
    <string name="AccountNotConfigured">Обліківка не налаштована</string>
    <string name="AboutThisProgram">Про оповісник</string>
    <string name="NotSet">Не встановлено</string>
@@ -83,7 +83,7 @@
    <string name="Default">Default</string>
    <string name="OnlyIfSilent">Only when silent</string>
    <string name="ChatBackground">Chat background</string>
-    <string name="SendByEnter">Send with ↵</string>
+    <string name="SendByEnter">Send with Enter key</string>
    <string name="Help">Help</string>
    <string name="Enabled">On</string>
    <string name="Disabled">Off</string>
@@ -115,7 +115,7 @@
    <!--passcode view-->
    <string name="Passcode">Passcode Lock</string>
    <string name="ChangePasscode">Change Passcode</string>
-    <string name="ChangePasscodeInfo">When you set up an additional passcode, a lock icon will appear atop the chat list. Tap it to lock the app.\n\nNote: If you forget the passcode, you\'ll need to delete and reinstall the app.</string>
+    <string name="ChangePasscodeInfo">If you set up an additional passcode, a lock icon will appear atop the chat list. Tap it to lock the app.\n\nNote: If you forget the passcode, you\'ll need to delete and reinstall the app.</string>
    <string name="PasscodePIN">PIN</string>
    <string name="PasscodePassword">Password</string>
    <string name="EnterCurrentPasscode">Enter your current passcode</string>
@@ -202,8 +202,8 @@
    <string name="AreYouSureBlockContact">Are you sure you want to block this contact?</string>
    <string name="AreYouSureDeleteContact">Are you sure you want to delete this contact?</string>
    <!--permissions-->
-    <string name="PermissionContacts">Access to contacts needed to connect with your friends across all your devices.</string>
-    <string name="PermissionStorage">Storage access needed to send and save photos, videos, music, and other media.</string>
+    <string name="PermissionContacts">Grant access to contacts if you want to sync friends across all your devices.</string>
+    <string name="PermissionStorage">Grant storage access if you want to send and save photos, videos, music, and other media.</string>
    <string name="PermissionNoAudio">Grant microphone access to record voice messages.</string>
    <string name="PermissionOpenSettings">Settings</string>
    <!--Intro view-->
@@ -250,7 +250,7 @@
        <item quantity="other">%d messages</item>
    </plurals>
    <plurals name="AreYouSureDeleteMessages">
-        <item quantity="one">Delete %d messagehere and from the server.</item>
+        <item quantity="one">Delete %d message here and from the server.</item>
        <item quantity="other">Delete %d messages here and from the server.</item>
    </plurals>
    <!-- Translators: The first string placeholder gets replaced with the
@@ -317,8 +317,15 @@
    <string name="ImapPort">IMAP port</string>
    <string name="InboxHeadline">Inbox</string>
    <string name="OutboxHeadline">Outbox</string>
-    <string name="MyAccountExplain">For known email providers, additional settings are determinated automatically.</string>
-    <string name="MyAccountExplain2" >Sometimes, <![CDATA[<b>]]>IMAP needs to be enabled<![CDATA[</b>]]> in the email web frontend.\n\nConsult your email provider or friends if you run into problems.</string>
+    <string name="AdvancedOptions">Advanced Options...</string>
+    <string name="MyAccountExplain">For known email providers, additional settings are determinated automatically.
+        <![CDATA[<br/>]]>
+        <![CDATA[<br/>]]>
+        Sometimes, <![CDATA[<b>]]>IMAP needs to be enabled<![CDATA[</b>]]> in the email web frontend.\n\nConsult your email provider or friends if you run into problems.</string>
+    <string name="MyAccountExplainGmail">For <![CDATA[<b>]]>GMail<![CDATA[</b>]]> Accounts you either need to create an
+        <![CDATA[<a href="https://security.google.com/settings/security/apppasswords">]]>App-Password<![CDATA[</a>]]> if you have 2FA enabled.
+        <![CDATA[<br/>]]>If this settings is not available, you need to enable <![CDATA[<a href="https://myaccount.google.com/lesssecureapps">]]>Less Secure Apps<![CDATA[</a>]]>
+    </string>
    <string name="AccountNotConfigured">Account not configured</string>
    <string name="AboutThisProgram">About Delta Chat</string>
    <string name="NotSet">Not set</string>
@@ -383,7 +390,7 @@
    <string name="EncrinfoNone">No encryption to my server.</string>
    <string name="EncrinfoFingerprints">Fingerprints</string>
    <string name="Backup">Backup</string>
-    <string name="ImportBackupExplain2">To import a backup, copy a backup to <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> and reinstall the app.</string>
+    <string name="ImportBackupExplain2">To import a backup, copy it to <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> and reinstall the app.</string>
    <string name="ReadReceiptMailBody">This is a read receipt for the message \"%1$s\".\n\nIt means that message was displayed on the recipient\'s device, not necessarily that the content was read.</string>
    <string name="ReadReceipt">Read receipt</string>
    <string name="NameAndStatus">Name and status</string>
@@ -426,8 +433,8 @@
    <string name="SelfTalkSubtitle">Messages I sent to myself</string>
    <string name="QrScan">Scan QR code</string>
    <string name="QrShow">Show QR code</string>
-    <string name="QrScanContainsText">The scanned QR code contains the following text:\n\n%1$s</string>
-    <string name="QrScanContainsUrl">The scanned QR code contains the following URL:\n\n%1$s</string>
+    <string name="QrScanContainsText">Scanned QR code text:\n\n%1$s</string>
+    <string name="QrScanContainsUrl">Scanned QR code URL:\n\n%1$s</string>
    <string name="OobFingerprint">Fingerprint</string>
    <string name="OobFingerprintAskOob">Verify contact and start chatting with <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <string name="OobFingerprintOk">Contact <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> verified. Start chatting?</string>
@@ -436,7 +443,7 @@
    <string name="OobSecureJoinRequested">%1$s joins.</string>
    <string name="CannotDecryptBody">This message cannot be decrypted.\n\n• It might already help to simply reply to this message and ask the sender to send the message again.\n\n• In case you re-installed Delta Chat or another email program on this or another device you may want to send an Autocrypt Setup Message from there.</string>
    <string name="Autocrypt">Autocrypt</string>
-    <string name="AutocryptExplain"><![CDATA[<i>]]>Autocrypt<![CDATA[</i>]]> is a new and open specification for end-to-end email encryption.\n\nYour end-to-end setup is created automatically as needed and you can transfer it between devices with <![CDATA[<i>]]>Autocrypt Setup Messages.<![CDATA[</i>]]></string>
+    <string name="AutocryptExplain"><![CDATA[<i>]]>Autocrypt<![CDATA[</i>]]> is a new and open specification for automatic end-to-end email encryption.\n\nYour end-to-end setup is created automatically as needed and you can transfer it between devices with <![CDATA[<i>]]>Autocrypt Setup Messages.<![CDATA[</i>]]></string>
    <string name="NewVerifiedGroup">New verified group</string>
    <string name="SharedChats">Shared chats</string>
    <string name="VerifiedContact">Verified contact</string>
@@ -446,6 +453,7 @@
    <string name="EditedNameWillBeShared">The edited name will be shared with all group members.</string>
    <string name="E2EEncryptionPreferred">End-to-end encryption preferred.</string>
    <string name="OobAddrVerified">%1$s verified.</string>
+    <string name="OobGroupJoined">%1$s securely joined the group.</string>
    <string name="OobAddrVerifiedIntroduceMyself">%1$s verified, introduce myself …</string>
    <string name="OobAskJoinVerifiedGroup">Do you want to join the verified group <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
    <!-- Translators: %1$s is replaced by an action, eg. MsgMemberAddedToGroup, MsgMemberRemovedFromToGroup, MsgGroupNameChanged or MsgGroupImageChanged. If the action ends with a full stop, this is removed.
@@ -462,7 +470,7 @@

    <string name="QrShowVerifyCode">Show QR verify code</string>
    <string name="QrVerifyContactTitle">QR verify code</string>
-    <string name="QrVerifyContactHint"><![CDATA[<b>]]>%1$s<![CDATA[</b>]]>\nScan this to setup a verified contact.</string>
+    <string name="QrVerifyContactHint"><![CDATA[<b>]]>%1$s<![CDATA[</b>]]>\nScan this to set up a verified contact.</string>

    <string name="QrShowInviteCode">Show QR invite code</string>
    <string name="QrJoinVerifiedGroupTitle">QR invite code</string>
@@ -472,4 +480,8 @@
    <string name="FetchModePersistentConnection">Persistent connection</string>
    <string name="FetchModeExplain">When using the fetch mode <![CDATA[<i>]]>Save battery<![CDATA[</i>]]>, new messages appear at once if the app is in foreground and with an average delay of 30 seconds if the app is not used. When the device is in doze mode, the delay may be longer. This is the default mode.\n\n<![CDATA[<i>]]>Persistent connection<![CDATA[</i>]]> is typically faster but may require the app to be whitelisted in the system settings to consume more battery.\n\nWhich fetch mode do you want to use?</string>
    <string name="PermissionCamera">Access to the camera is needed if you want to take photos or if you want to scan QR codes.</string>
+    <!-- Translators: %1$s will be replaced by the email address -->
+    <string name="ErrCannotLogin">Cannot login as <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>. Please check if the email-address and the password are correct.</string>
+    <!-- Translators: %1$s will be replaced by the server name (eg. imap.somewhere.org) and %2$s will be replaced by the human-readable response from the server. this response may be a single word or some sentences and may or may not be localized. -->
+    <string name="ErrSeverResponse">Response from %1$s: %2$s\n\nSome providers place additional information in your inbox; you can check them it eg. in the web frontend. Consult your provider or friends if you run into problems.</string>
 </resources>
Author	SHA1	Message	Date
B. Petersen	f49b193001	Update messenger-backend submodule.	2018-08-14 14:06:54 +02:00
B. Petersen	3e794ccc6c	bump version	2018-08-14 14:06:43 +02:00
B. Petersen	58eb862550	changelog	2018-08-14 14:02:19 +02:00
B. Petersen	259b209f20	update translations	2018-08-14 14:01:47 +02:00
Lars-Magnus Skog	374844ffe0	Merge pull request #375 from devSJR/patch-1 Update CHANGELOG.md	2018-08-04 14:40:35 +02:00
devSJR	cd1868417c	Update CHANGELOG.md Typo	2018-07-27 14:24:12 +02:00
B. Petersen	e6086e679c	changelog	2018-07-27 13:37:04 +02:00
B. Petersen	37397c9c32	update translations	2018-07-27 13:36:56 +02:00
B. Petersen	78d5fe7a9a	Update messenger-backend submodule.	2018-07-27 13:24:44 +02:00
björn petersen	66724cf501	Merge pull request #369 from deltachat/track-shared-files track a list of shared files	2018-07-27 13:24:12 +02:00
B. Petersen	11b342f3a9	track a list of shared files add message do not export provider, we grant access explicitly	2018-07-26 17:06:30 +02:00
Björn Petersen	27b32362c1	Merge pull request #367 from ralphtheninja/master Fix mailing list typo	2018-07-23 00:52:48 +02:00
Lars-Magnus Skog	230f4f7de5	Fix mailing list typo	2018-07-23 00:52:09 +02:00
B. Petersen	da947466a2	Update messenger-backend submodule.	2018-07-15 11:07:28 +02:00
B. Petersen	d386804b14	changelog	2018-07-13 16:53:19 +02:00
B. Petersen	53ebcc18e0	get the max. recommended attachment size from the core.	2018-07-13 16:47:29 +02:00
B. Petersen	c9187e9d53	add explicit event for failed messages	2018-07-11 23:57:49 +02:00
B. Petersen	0a1d26ffc4	bump version	2018-07-10 16:39:40 +02:00
B. Petersen	bf39d9ef8f	Update messenger-backend submodule.	2018-07-10 16:37:14 +02:00
B. Petersen	931477e7f5	update translations	2018-07-10 16:36:44 +02:00
B. Petersen	55b2a41674	changelog	2018-07-07 23:39:27 +02:00
B. Petersen	564c518984	Update messenger-backend submodule.	2018-07-06 19:08:19 +02:00
B. Petersen	e751208fed	reflect changed drafts, fixes #355	2018-07-06 19:08:02 +02:00
B. Petersen	b1d77b89b2	Update messenger-backend submodule.	2018-07-06 17:22:56 +02:00
B. Petersen	d24a3db337	Update messenger-backend submodule.	2018-07-05 13:54:37 +02:00
B. Petersen	9eaa6632c6	adapt secure-join-progress to the new permille progress (instead of the old steps)	2018-07-05 13:54:18 +02:00
B. Petersen	e9a34e4cdd	changelog	2018-07-04 23:58:30 +02:00
B. Petersen	9cef9ab2b0	Update messenger-backend submodule.	2018-07-04 00:13:21 +02:00
B. Petersen	51d5d31204	add translators hints	2018-07-03 13:25:16 +02:00
B. Petersen	e8367b9c60	typo	2018-07-03 13:17:35 +02:00
B. Petersen	5fa9441635	Update messenger-backend submodule.	2018-07-03 13:15:52 +02:00
B. Petersen	c3b53e56ba	More detailed login-error message.	2018-07-03 13:15:24 +02:00
B. Petersen	70fc419d35	update translations	2018-07-02 12:29:20 +02:00
B. Petersen	952eb60aff	Update messenger-backend submodule.	2018-07-02 11:31:17 +02:00
Björn Petersen	04d3bdd714	Merge pull request #350 from deltachat/remove-db-locks adapt to new import/export API	2018-07-02 10:53:12 +02:00
B. Petersen	a9dda41ab1	adapt to new import/export API	2018-06-30 15:02:34 +02:00
B. Petersen	8db7c9f45b	try an alternative button for the new advanced-account-settings-button	2018-06-26 01:55:49 +02:00
B. Petersen	33bfd74c13	update translations	2018-06-26 00:56:42 +02:00
Björn Petersen	0aed681953	Merge pull request #336 from t-oster/feature-gmail-info Add Gmail specific info in setup.	2018-06-26 00:52:28 +02:00
B. Petersen	fe1a14ac9b	Update messenger-backend submodule.	2018-06-26 00:48:18 +02:00
B. Petersen	261c68af10	adapt to new api	2018-06-26 00:47:59 +02:00
B. Petersen	df00a28920	Update messenger-backend submodule.	2018-06-25 11:16:58 +02:00
B. Petersen	b46de6a803	do no longer used deprecated setDraft()	2018-06-25 11:16:35 +02:00
Thomas Oster	602feeb6a4	Add Gmail specific info, refactor helptext, advanced options as button	2018-06-25 07:47:33 +02:00
B. Petersen	80e1282767	Update messenger-backend submodule.	2018-06-24 23:44:46 +02:00
B. Petersen	40285124f5	Update messenger-backend submodule.	2018-06-23 23:52:01 +02:00
B. Petersen	fb3e20fe39	bump version	2018-06-23 23:51:35 +02:00
B. Petersen	ba70da63ba	typo	2018-06-23 18:42:12 +02:00
B. Petersen	fbf1d5e252	Update messenger-backend submodule.	2018-06-23 18:40:00 +02:00
B. Petersen	e70d32c3b1	bump version, changelog	2018-06-23 18:39:32 +02:00
B. Petersen	a9dfb88dda	Update messenger-backend submodule.	2018-06-22 19:44:42 +02:00
B. Petersen	0d86683182	bump version	2018-06-22 19:44:30 +02:00
Björn Petersen	b1da1efb4a	Merge pull request #335 from violoncelloch/patch-1 updated ISSUE_TEMPLATE.md	2018-06-22 18:36:13 +02:00
violoncelloch	ba539cd1f9	updated ISSUE_TEMPLATE.md * commented out our statements so we don't have them visible in issues if ppl. don't remove them * created a `details` section so long logs are expandable	2018-06-17 22:08:34 +02:00