Update messenger-backend submodule.

Notification clickable

CHANGELOG.md

@@ -1,12 +1,24 @@
 # Delta Chat Changelog
 
-## v0.11.2
-2017-12-15
+## v0.12.0
+2018-01-07
+
+* Gossip keys of other group members in the encrypted payload (will also be evaluated in one of the next versions)
+* Use SHA-256 instead of SHA-1 in signatures
+* Make the permanent notification clickable
+* Update permanent notification after import
+* Fix rendering of system messages
+* Various bug fixes
+* Update Albanian, French, Italian, Norwegian, Polish, Russian and Turkish translations
+
+## v0.11.4
+2017-12-17
 
 * Add option to initiate Autocrypt Key Transfer
 * Connect after importing a backup
+* Reading memory hole headers
 * Add Albanian translation
-* Update German, Italian, Polish and Russian translations
+* Update German, Italian, Polish, Portuguese, Russian, Turkish and Ukrainian translations
 
 ## v0.10.0
 2017-11-29

MessengerProj/build.gradle

@@ -31,8 +31,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 25       // should be ...
+    buildToolsVersion '25.0.2' // ... in sync unless you know exactly what you're doing
 
     useLibrary 'org.apache.http.legacy'
     defaultConfig.applicationId = "com.b44t.messenger"
@@ -122,7 +122,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.11.2" // do NOT forget to increase defaultConfig.versionCode!
-        versionCode 507
+        versionName "0.12.0" // do NOT forget to increase defaultConfig.versionCode!
+        versionCode 510
     }
 }

MessengerProj/jni/mrwrapper.c

@@ -117,14 +117,16 @@ void mrosnative_unsetup_thread(mrmailbox_t* mailbox)
 
 /* tools */
 
-static jintArray mrarray2jintArray_n_mrarray_unref(JNIEnv *env, const mrarray_t* ca)
+static jintArray mrarray2jintArray_n_mrarray_unref(JNIEnv *env, mrarray_t* ca)
 {
+	/* takes a C-array of type mrarray_t and converts it it a Java-Array.
+	then the C-array is freed and the Java-Array is returned. */
 	int i, icnt = ca? mrarray_get_cnt(ca) : 0;
 	jintArray ret = (*env)->NewIntArray(env, icnt); if (ret == NULL) { return NULL; }
 	
 	if( ca ) {
 		if( icnt ) {
-			uintptr_t* ca_data = ca->m_array;
+			uintptr_t* ca_data = mrarray_get_raw(ca);
 			if( sizeof(uintptr_t)==sizeof(jint) ) {
 				(*env)->SetIntArrayRegion(env, ret, 0, icnt, (jint*)ca_data);
 			}
@@ -146,7 +148,10 @@ static jintArray mrarray2jintArray_n_mrarray_unref(JNIEnv *env, const mrarray_t*
 
 static uint32_t* jintArray2uint32Pointer(JNIEnv* env, jintArray ja, int* ret_icnt)
 {
+	/* takes a Java-Array and converts it to a C-Array. */
 	uint32_t* ret = NULL;
+	if( ret_icnt ) { *ret_icnt = 0; }
+
 	if( env && ja && ret_icnt )
 	{
 		int i, icnt  = (*env)->GetArrayLength(env, ja);
@@ -167,6 +172,7 @@ static uint32_t* jintArray2uint32Pointer(JNIEnv* env, jintArray ja, int* ret_icn
 			}
 		}
 	}
+
 	return ret;
 }
 
@@ -247,8 +253,10 @@ JNIEXPORT void Java_com_b44t_messenger_MrMailbox_close(JNIEnv *env, jclass cls)
 
 JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_getBlobdir(JNIEnv *env, jclass cls)
 {
-	mrmailbox_t* ths = get_mrmailbox_t(env, cls); if( ths == NULL ) { return JSTRING_NEW(NULL); }
-	return JSTRING_NEW(ths->m_blobdir);
+	char* temp = mrmailbox_get_blobdir(get_mrmailbox_t(env, cls));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }
 
 
@@ -366,7 +374,7 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_getChatIdByContactId(JNIEnv *en
 
 JNIEXPORT void Java_com_b44t_messenger_MrMailbox_markseenMsgs(JNIEnv *env, jclass cls, jintArray msg_ids)
 {
-	int msg_ids_cnt;
+	int msg_ids_cnt = 0;
 	const uint32_t* msg_ids_ptr = jintArray2uint32Pointer(env, msg_ids, &msg_ids_cnt);
 		mrmailbox_markseen_msgs(get_mrmailbox_t(env, cls), msg_ids_ptr, msg_ids_cnt);
 	free(msg_ids_ptr);
@@ -474,7 +482,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_MrMailboxGetMsgInfo(JNIEnv *
 
 JNIEXPORT void Java_com_b44t_messenger_MrMailbox_deleteMsgs(JNIEnv *env, jclass cls, jintArray msg_ids)
 {
-	int msg_ids_cnt;
+	int msg_ids_cnt = 0;
 	const uint32_t* msg_ids_ptr = jintArray2uint32Pointer(env, msg_ids, &msg_ids_cnt);
 		mrmailbox_delete_msgs(get_mrmailbox_t(env, cls), msg_ids_ptr, msg_ids_cnt);
 	free(msg_ids_ptr);
@@ -483,7 +491,7 @@ JNIEXPORT void Java_com_b44t_messenger_MrMailbox_deleteMsgs(JNIEnv *env, jclass
 
 JNIEXPORT void Java_com_b44t_messenger_MrMailbox_forwardMsgs(JNIEnv *env, jclass cls, jintArray msg_ids, jint chat_id)
 {
-	int msg_ids_cnt;
+	int msg_ids_cnt = 0;
 	const uint32_t* msg_ids_ptr = jintArray2uint32Pointer(env, msg_ids, &msg_ids_cnt);
 		mrmailbox_forward_msgs(get_mrmailbox_t(env, cls), msg_ids_ptr, msg_ids_cnt, chat_id); 
 	free(msg_ids_ptr);
@@ -692,14 +700,14 @@ JNIEXPORT jint Java_com_b44t_messenger_MrChatlist_MrChatlistGetCnt(JNIEnv *env,
 JNIEXPORT jlong Java_com_b44t_messenger_MrChatlist_MrChatlistGetChatByIndex(JNIEnv *env, jclass c, jlong hChatlist, jint index)
 {
 	mrchatlist_t* chatlist = (mrchatlist_t*)hChatlist;
-	return (jlong)mrmailbox_get_chat(chatlist->m_mailbox, mrchatlist_get_chat_id(chatlist, index));
+	return (jlong)mrmailbox_get_chat(mrchatlist_get_mailbox(chatlist), mrchatlist_get_chat_id(chatlist, index));
 }
 
 
 JNIEXPORT jlong Java_com_b44t_messenger_MrChatlist_MrChatlistGetMsgByIndex(JNIEnv *env, jclass c, jlong hChatlist, jint index)
 {
 	mrchatlist_t* chatlist = (mrchatlist_t*)hChatlist;
-	return (jlong)mrmailbox_get_msg(chatlist->m_mailbox, mrchatlist_get_msg_id(chatlist, index));
+	return (jlong)mrmailbox_get_msg(mrchatlist_get_mailbox(chatlist), mrchatlist_get_msg_id(chatlist, index));
 }
 
 
@@ -736,29 +744,28 @@ JNIEXPORT void Java_com_b44t_messenger_MrChat_MrChatUnref(JNIEnv *env, jclass c,
 
 JNIEXPORT jint Java_com_b44t_messenger_MrChat_getId(JNIEnv *env, jobject obj)
 {
-	mrchat_t* ths = get_mrchat_t(env, obj); if( ths == NULL ) { return 0; }
-	return ths->m_id;
+	return mrchat_get_id(get_mrchat_t(env, obj));
 }
 
 
 JNIEXPORT jint Java_com_b44t_messenger_MrChat_getType(JNIEnv *env, jobject obj)
 {
-	mrchat_t* ths = get_mrchat_t(env, obj); if( ths == NULL ) { return 0; }
-	return ths->m_type;
+	return mrchat_get_type(get_mrchat_t(env, obj));
 }
 
 
 JNIEXPORT jint Java_com_b44t_messenger_MrChat_getArchived(JNIEnv *env, jobject obj)
 {
-	mrchat_t* ths = get_mrchat_t(env, obj); if( ths == NULL ) { return 0; }
-	return ths->m_archived;
+	return mrchat_get_archived(get_mrchat_t(env, obj));
 }
 
 
 JNIEXPORT jstring Java_com_b44t_messenger_MrChat_getName(JNIEnv *env, jobject obj)
 {
-	mrchat_t* ths = get_mrchat_t(env, obj); if( ths == NULL ) { return JSTRING_NEW(NULL); }
-	return JSTRING_NEW(ths->m_name);
+	const char* temp = mrchat_get_name(get_mrchat_t(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }
 
 
@@ -792,34 +799,25 @@ JNIEXPORT jboolean Java_com_b44t_messenger_MrChat_isSelfTalk(JNIEnv *env, jobjec
 }
 
 
-JNIEXPORT jstring Java_com_b44t_messenger_MrChat_MrChatGetDraft(JNIEnv *env, jclass c, jlong hChat) /* returns NULL for "no draft" */
+JNIEXPORT jstring Java_com_b44t_messenger_MrChat_getDraft(JNIEnv *env, jobject obj) /* returns NULL for "no draft" */
 {
-	mrchat_t* ths = (mrchat_t*)hChat;
-	if( ths && ths->m_draft_text ) {
-		return JSTRING_NEW(ths->m_draft_text);
-	}
-	return NULL; /* no draft */
+	const char* temp = mrchat_get_draft(get_mrchat_t(env, obj));
+		jstring ret = temp? JSTRING_NEW(temp) : NULL;
+	free(temp);
+	return ret;
 }
 
 
-JNIEXPORT jlong Java_com_b44t_messenger_MrChat_MrChatGetDraftTimestamp(JNIEnv *env, jclass c, jlong hChat)
+JNIEXPORT jlong Java_com_b44t_messenger_MrChat_getDraftTimestamp(JNIEnv *env, jobject obj)
 {
-	mrchat_t* ths = (mrchat_t*)hChat; if( ths == NULL ) { return 0; }
-	return ths->m_draft_timestamp;
+	return (jlong)mrchat_get_draft_timestamp(get_mrchat_t(env, obj));
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatGetDraftReplyToMsgId(JNIEnv *env, jclass c, jlong hChat)
-{
-	mrchat_t* ths = (mrchat_t*)hChat; if( ths == NULL ) { return 0; }
-	return 0;
-}
-
-
-JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatSetDraft(JNIEnv *env, jclass c, jlong hChat, jstring draft /* NULL=delete */, jint replyToMsgId)
+JNIEXPORT jint Java_com_b44t_messenger_MrChat_setDraft(JNIEnv *env, jobject obj, jstring draft /* NULL=delete */, jint replyToMsgId)
 {
 	CHAR_REF(draft);
-		jint ret = (jint)mrchat_set_draft((mrchat_t*)hChat, draftPtr /* NULL=delete */);
+		jint ret = (jint)mrchat_set_draft(get_mrchat_t(env, obj), draftPtr /* NULL=delete */);
 	CHAR_UNREF(draft);
 	return ret;
 }
@@ -893,59 +891,48 @@ JNIEXPORT void Java_com_b44t_messenger_MrMsg_MrMsgUnref(JNIEnv *env, jclass c, j
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_MrMsgGetId(JNIEnv *env, jclass c, jlong hMsg)
+JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getId(JNIEnv *env, jobject obj)
 {
-	mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return 0; }
-	return ths->m_id;
+	return mrmsg_get_id(get_mrmsg_t(env, obj));
 }
 
 
-JNIEXPORT jstring Java_com_b44t_messenger_MrMsg_MrMsgGetText(JNIEnv *env, jclass c, jlong hMsg)
+JNIEXPORT jstring Java_com_b44t_messenger_MrMsg_getText(JNIEnv *env, jobject obj)
 {
-	mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return JSTRING_NEW(NULL); }
-	return JSTRING_NEW(ths->m_text);
+	char* temp = mrmsg_get_text(get_mrmsg_t(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }
 
 
-JNIEXPORT jlong Java_com_b44t_messenger_MrMsg_MrMsgGetTimestamp(JNIEnv *env, jclass c, jlong hMsg)
+JNIEXPORT jlong Java_com_b44t_messenger_MrMsg_getTimestamp(JNIEnv *env, jobject obj)
 {
-	mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return 0; }
-	return ths->m_timestamp;
+	return (jlong)mrmsg_get_timestamp(get_mrmsg_t(env, obj));
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_MrMsgGetType(JNIEnv *env, jclass c, jlong hMsg)
+JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getType(JNIEnv *env, jobject obj)
 {
-	mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return 0; }
-	return ths->m_type;
+	return mrmsg_get_type(get_mrmsg_t(env, obj));
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_MrMsgGetState(JNIEnv *env, jclass c, jlong hMsg)
+JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getState(JNIEnv *env, jobject obj)
 {
-	mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return 0; }
-	return ths->m_state;
+	return mrmsg_get_state(get_mrmsg_t(env, obj));
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_MrMsgGetChatId(JNIEnv *env, jclass c, jlong hMsg)
+JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getChatId(JNIEnv *env, jobject obj)
 {
-	mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return 0; }
-	return ths->m_chat_id;
+	return mrmsg_get_chat_id(get_mrmsg_t(env, obj));
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_MrMsgGetFromId(JNIEnv *env, jclass c, jlong hMsg)
+JNIEXPORT jint Java_com_b44t_messenger_MrMsg_getFromId(JNIEnv *env, jobject obj)
 {
-	mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return 0; }
-	return ths->m_from_id;
-}
-
-
-JNIEXPORT jint Java_com_b44t_messenger_MrMsg_MrMsgGetToId(JNIEnv *env, jclass c, jlong hMsg)
-{
-	mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return 0; }
-	return ths->m_to_id;
+	return mrmsg_get_from_id(get_mrmsg_t(env, obj));
 }
 
 
@@ -1132,8 +1119,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrContact_getNameNAddr(JNIEnv *env, jo
 
 JNIEXPORT jboolean Java_com_b44t_messenger_MrContact_isBlocked(JNIEnv *env, jobject obj)
 {
-	mrcontact_t* ths = get_mrcontact_t(env, obj); if( ths == NULL ) { return 0; }
-	return (jboolean)(ths->m_blocked != 0);
+	return (jboolean)( mrcontact_is_blocked(get_mrcontact_t(env, obj)) != 0 );
 }
 
 
@@ -1164,36 +1150,37 @@ JNIEXPORT void Java_com_b44t_messenger_MrLot_unref(JNIEnv *env, jclass cls, jlon
 
 JNIEXPORT jstring Java_com_b44t_messenger_MrLot_getText1(JNIEnv *env, jobject obj)
 {
-	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return JSTRING_NEW(NULL); }
-	return JSTRING_NEW(ths->m_text1);
+	char* temp = mrlot_get_text1(get_mrlot_t(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }
 
 
 JNIEXPORT jint Java_com_b44t_messenger_MrLot_getText1Meaning(JNIEnv *env, jobject obj)
 {
-	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return 0; }
-	return ths->m_text1_meaning;
+	return mrlot_get_text1_meaning(get_mrlot_t(env, obj));
 }
 
 
 JNIEXPORT jstring Java_com_b44t_messenger_MrLot_getText2(JNIEnv *env, jobject obj)
 {
-	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return JSTRING_NEW(NULL); }
-	return JSTRING_NEW(ths->m_text2);
+	char* temp = mrlot_get_text2(get_mrlot_t(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }
 
 
 JNIEXPORT jlong Java_com_b44t_messenger_MrLot_getTimestamp(JNIEnv *env, jobject obj)
 {
-	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return 0; }
-	return ths->m_timestamp;
+	return mrlot_get_timestamp(get_mrlot_t(env, obj));
 }
 
 
 JNIEXPORT jint Java_com_b44t_messenger_MrLot_getState(JNIEnv *env, jobject obj)
 {
-	mrlot_t* ths = get_mrlot_t(env, obj); if( ths == NULL ) { return 0; }
-	return ths->m_state;
+	return mrlot_get_state(get_mrlot_t(env, obj));
 }
 
 

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/Theme.java

@@ -91,6 +91,8 @@ public class Theme {
     public static final int MSG_AUDIO_SEEKBAR_DARK_COLOR = 0xFFf68751; // same color as in audio-icon, also used for the record-button
     public static final int MSG_AUDIO_SEEKBAR_LITE_COLOR = 0xFFfbc8af;
 
+    public static final int MSG_SYSTEM_CMD_COLOR = MSG_AUDIO_NAME_COLOR; // just the same color, there is no other dependency between system commands and audio messages
+
     public static Drawable backgroundDrawableIn;
     public static Drawable backgroundDrawableInSelected;
     public static Drawable backgroundDrawableOut;

MessengerProj/src/main/java/com/b44t/messenger/AudioSelectActivity.java

@@ -214,8 +214,7 @@ public class AudioSelectActivity extends BaseFragment implements NotificationCen
                         TLRPC.TL_message message = new TLRPC.TL_message();
                         message.out = true;
                         message.id = id;
-                        message.to_id = new TLRPC.TL_peerUser();
-                        message.to_id.user_id = message.from_id = MrContact.MR_CONTACT_ID_SELF;
+                        message.from_id = MrContact.MR_CONTACT_ID_SELF;
                         message.date = (int) (System.currentTimeMillis() / 1000);
                         message.message = "-1";
                         message.attachPath = audioEntry.path;

MessengerProj/src/main/java/com/b44t/messenger/Components/ChatActivityEnterView.java

@@ -1568,8 +1568,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                 TLRPC.TL_message message = new TLRPC.TL_message();
                 message.out = true;
                 message.id = 0;
-                message.to_id = new TLRPC.TL_peerUser();
-                message.to_id.user_id = message.from_id = MrContact.MR_CONTACT_ID_SELF;
+                message.from_id = MrContact.MR_CONTACT_ID_SELF;
                 message.date = (int) (System.currentTimeMillis() / 1000);
                 message.message = "-1";
                 message.attachPath = audioToSendPath;

MessengerProj/src/main/java/com/b44t/messenger/KeepAliveService.java

@@ -24,6 +24,7 @@ package com.b44t.messenger;
 
 import android.app.Notification;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -85,6 +86,8 @@ public class KeepAliveService extends Service {
     public static final int FG_NOTIFICATION_ID = 4142;
     private Notification createNotification()
     {
+        Intent intent = new Intent(this, LaunchActivity.class);
+        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         // a notification _must_ contain a small icon, a title and a text, see https://developer.android.com/guide/topics/ui/notifiers/notifications.html#Required
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
 
@@ -101,6 +104,7 @@ public class KeepAliveService extends Service {
             builder.setPriority(NotificationCompat.PRIORITY_MIN);
         }
         builder.setWhen(0);
+        builder.setContentIntent(contentIntent);
         builder.setSmallIcon(R.drawable.notification_permanent);
         return builder.build();
     }

MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java

@@ -93,9 +93,12 @@ public class MessageObject {
             textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
             textPaint.setColor(Theme.MSG_TEXT_COLOR);
             textPaint.linkColor = Theme.MSG_LINK_TEXT_COLOR;
+        }
 
+        if( systemCmdPaint == null ) {
             systemCmdPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
-            systemCmdPaint.setColor(Theme.MSG_AUDIO_NAME_COLOR);
+            systemCmdPaint.setColor(Theme.MSG_SYSTEM_CMD_COLOR);
+            systemCmdPaint.linkColor = Theme.MSG_SYSTEM_CMD_COLOR;
         }
 
         messageOwner = message;
@@ -323,7 +326,7 @@ public class MessageObject {
     }
 
     private void generateLayout() {
-        if (type != MO_TYPE0_TEXT || messageOwner.to_id == null || messageText == null || messageText.length() == 0) {
+        if (type != MO_TYPE0_TEXT || messageText == null || messageText.length() == 0) {
             return;
         }
 

MessengerProj/src/main/java/com/b44t/messenger/MrChat.java

@@ -46,6 +46,7 @@ public class MrChat {
     @Override protected void finalize() throws Throwable {
         super.finalize();
         MrChatUnref(m_hChat);
+        m_hChat = 0;
     }
 
     public native int    getId();
@@ -57,29 +58,15 @@ public class MrChat {
     public native String getProfileImage();
     public native boolean isUnpromoted();
     public native boolean isSelfTalk();
-
-    public String getDraft() {
-        return MrChatGetDraft(m_hChat);
-    }
-
-    public long getDraftTimestamp() {
-        return MrChatGetDraftTimestamp(m_hChat);
-    }
-
+    public native String getDraft();
+    public native long getDraftTimestamp();
     public int getDraftReplyToMsgId() {
-        return MrChatGetDraftReplyToMsgId(m_hChat);
-    }
-
-    public int setDraft(String draft/*NULL=delete*/, long replyToMsgId) {
-        return MrChatSetDraft(m_hChat, draft, replyToMsgId);
+        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);
-    private native static String  MrChatGetDraft             (long hChat); // returns null for "no draft"
-    private native static long    MrChatGetDraftTimestamp    (long hChat); // returns 0 for "no draft"
-    private native static int     MrChatGetDraftReplyToMsgId (long hChat); // returns 0 for "no draft"
-    private native static int     MrChatSetDraft             (long hChat, String draft/*NULL=delete*/, long replyToMsgId);
 
 
     /* additional functions that are not 1:1 available in the backend

MessengerProj/src/main/java/com/b44t/messenger/MrChatlist.java

@@ -36,6 +36,7 @@ public class MrChatlist {
     @Override protected void finalize() throws Throwable {
         super.finalize();
         MrChatlistUnref(m_hChatlist);
+        m_hChatlist = 0;
     }
 
     public int getCnt() {

MessengerProj/src/main/java/com/b44t/messenger/MrContact.java

@@ -40,6 +40,7 @@ public class MrContact {
     @Override protected void finalize() throws Throwable {
         super.finalize();
         MrContactUnref(m_hContact);
+        m_hContact = 0;
     }
 
     public native String getName();

MessengerProj/src/main/java/com/b44t/messenger/MrLot.java

@@ -41,6 +41,7 @@ public class MrLot {
     @Override protected void finalize() throws Throwable {
         super.finalize();
         MrLotUnref(m_hLot);
+        m_hLot = 0;
     }
 
     public native String getText1();

MessengerProj/src/main/java/com/b44t/messenger/MrMsg.java

@@ -64,36 +64,16 @@ public class MrMsg {
     @Override protected void finalize() throws Throwable {
         super.finalize();
         MrMsgUnref(m_hMsg);
+        m_hMsg = 0;
     }
 
-    public int getId() {
-        return MrMsgGetId(m_hMsg);
-    }
-
-    public String getText() {
-        return MrMsgGetText(m_hMsg);
-    }
-
-    public long getTimestamp() {
-        return MrMsgGetTimestamp(m_hMsg);
-    }
-
-    public int getType() {
-        return MrMsgGetType(m_hMsg);
-    }
-
-    public int getState() {
-        return MrMsgGetState(m_hMsg);
-    }
-    public int getChatId() {
-        return MrMsgGetChatId(m_hMsg);
-    }
-    public int getFromId() {
-        return MrMsgGetFromId(m_hMsg);
-    }
-    public int getToId() {
-        return MrMsgGetToId(m_hMsg);
-    }
+    public native int getId();
+    public native String getText();
+    public native long getTimestamp();
+    public native int getType();
+    public native int getState();
+    public native int getChatId();
+    public native int getFromId();
 
     public native int    getWidth(int def);
     public native int    getHeight(int def);
@@ -118,14 +98,6 @@ public class MrMsg {
 
     private long                  m_hMsg; // must not be renamed as referenced by JNI under the name "m_hMsg"
     private native static void    MrMsgUnref                 (long hMsg);
-    private native static int     MrMsgGetId                 (long hMsg);
-    private native static String  MrMsgGetText               (long hMsg);
-    private native static long    MrMsgGetTimestamp          (long hMsg);
-    private native static int     MrMsgGetType               (long hMsg);
-    private native static int     MrMsgGetState              (long hMsg);
-    private native static int     MrMsgGetChatId             (long hMsg);
-    private native static int     MrMsgGetFromId             (long hMsg);
-    private native static int     MrMsgGetToId               (long hMsg);
 
 
     /* additional functions that are not 1:1 available in the backend
@@ -148,8 +120,6 @@ public class MrMsg {
 
         ret.id            = getId();
         ret.from_id       = getFromId();
-        ret.to_id         = new TLRPC.TL_peerUser();
-        ret.to_id.user_id = getToId();
         ret.date          = (int)getTimestamp();
         ret.dialog_id     = getChatId();
         ret.unread        = state!=MR_OUT_MDN_RCVD; // the state of outgoing messages

MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java

@@ -71,14 +71,6 @@ public class TLRPC {
 	public static class TL_documentAttributeFilename extends DocumentAttribute {
 	}
 
-	public static class Peer extends TLObject {
-		public int user_id;
-		public final int chat_id = 0;
-	}
-
-	public static class TL_peerUser extends Peer {
-	}
-
 	public static class TL_messageMediaEmpty extends MessageMedia {
 	}
 
@@ -238,7 +230,6 @@ public class TLRPC {
     public static class Message extends TLObject {
         public int id;
         public int from_id;
-        public Peer to_id;
         public int date;
         public final int reply_to_msg_id = 0;
         public String message;

MessengerProj/src/main/java/com/b44t/messenger/WelcomeActivity.java

@@ -383,6 +383,10 @@ public class WelcomeActivity extends Activity implements NotificationCenter.Noti
 
             if( (int)args[0]==1 ) {
                 MrMailbox.connect(); // import does not automatically connect
+                KeepAliveService kas = KeepAliveService.getInstance();
+                if( kas != null ) {
+                    kas.updateForegroundNotification();
+                }
                 startActivity(new Intent(WelcomeActivity.this, LaunchActivity.class));
                 finish();
             }

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

@@ -208,10 +208,10 @@
     <string name="PermissionOpenSettings">Einstellungen anpassen</string>
     <!--Intro view-->
     <string name="Intro1Headline">Delta Chat</string>
-    <string name="Intro1Message">Der Messenger mit der <![CDATA[<b>größten Reichweite</b>]]> der Welt.<![CDATA[<br/><b>Frei</b>]]> und <![CDATA[<b>sicher</b>]]>.</string>
+    <string name="Intro1Message">Der Messenger mit der <![CDATA[<b>größten Reichweite</b>]]> der Welt. <![CDATA[<b>Frei</b>]]> und <![CDATA[<b>unabhängig</b>]]>.</string>
 
     <string name="Intro2Headline">Unabhängig</string>
-    <string name="Intro2Message"><![CDATA[<b>Keine Abhängigkeiten</b>]]> von fremden Diensten und Servern. Die App verwendet nur Ihren E-Mail-Server.</string>
+    <string name="Intro2Message"><![CDATA[<b>Es gibt keinen Delta-Chat-Server.</b>]]> Die App verwendet nur Ihren E-Mail-Server.</string>
 
     <string name="Intro3Headline">Schnell</string>
     <string name="Intro3Message"><![CDATA[<b>Push-Nachrichten</b>]]> in Sekunden.<![CDATA[<br/>]]>Rasantes Interface.</string>
@@ -222,7 +222,7 @@
     <string name="Intro5Headline">Frei</string>
     <string name="Intro5Message">Open Source. Keine Werbung. Kein Abo.<![CDATA[<br/>]]>Keine Bindung an die Mobilfunknummer.</string>
 
-    <string name="Intro6Headline">Sicher</string>
+    <string name="Intro6Headline">Verschlüsselt</string>
     <string name="Intro6Message"><![CDATA[<b>Verschlüsselung</b>]]> mit allen gängigen Verfahren. Die Nachrichten bleiben auf Ihren Servern.</string>
 
     <string name="Intro7Headline">Vertraulich</string>
@@ -334,7 +334,7 @@
     the string needed for video time+size (0:00, 12,3 Mib) -->
     <string name="OneMoment">Einen Moment …</string>
     <string name="NoChatsHelp">Unten auf das Plussymbol für die erste Chatnachricht tippen; der Menüknopf öffnet die weiteren Optionen.</string>
-    <string name="Intro7Message"><![CDATA[<b>Delta Chat</b>]]> ist für die sichere geschäftliche Kommunikation geeignet.</string>
+    <string name="Intro7Message"><![CDATA[<b>Delta Chat</b>]]> ist für die vertrauliche geschäftliche Kommunikation geeignet.</string>
     <string name="InviteMenuEntry">Einladungen versenden</string>
     <string name="InviteText">Ich verwende nun auch den Delta Chat Messenger - %1$s - und bin dort unter %2$s erreichbar.</string>
     <string name="AdvancedSettings">Fortgeschrittene Einstellungen</string>
@@ -420,4 +420,5 @@
     <string name="AutocryptKeyTransferBadCode">Ungültiger Setup-Code. Bitte versuchen Sie es erneut.\n\nWenn Sie den Setup-Code nicht mehr haben, können Sie auch jederzeit einen neue Autocrypt-Setup-Nachricht mit einem neuen Setup-Code erzeugen.</string>
     <string name="AutocryptKeyTransferSucceeded">Ihr Schlüssel wurde erfolgreich übertragen. Dieses Gerät wird nun Autocrypt mit demselben Schlüssel wie das Andere verwenden.</string>
     <string name="Retry">Wiederholen</string>
+    <string name="SelfTalkSubtitle">Nachrichten von mir an mich</string>
 </resources>

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

@@ -41,9 +41,9 @@
     <string name="From">De</string>
     <string name="NoRecent">Pas de récents</string>
     <string name="TypeMessage">Message</string>
-    <string name="SlideToCancel">GLISSER POUR ANNULER</string>
-    <string name="SaveToDownloads">Enregistrer dans Téléchargements</string>
-    <string name="SaveToMusic">Enregistrer dans Musique</string>
+    <string name="SlideToCancel">Glisser pour annuler</string>
+    <string name="SaveToDownloads">Enregistrer dans \"Téléchargements\"</string>
+    <string name="SaveToMusic">Enregistrer dans \"Musique\"</string>
     <string name="Share">Partager</string>
     <string name="SendItems">Envoyer %1$s</string>
     <string name="ClearRecentEmoji">Vider les émojis récents ?</string>
@@ -83,7 +83,7 @@
     <string name="Default">Défaut</string>
     <string name="OnlyIfSilent">Seulement si silencieux</string>
     <string name="ChatBackground">Arrière-plan des conversations</string>
-    <string name="SendByEnter">Envoyer avec "Entrée"</string>
+    <string name="SendByEnter">Envoyer avec la touche entrée</string>
     <string name="Help">Aide</string>
     <string name="Enabled">Activé</string>
     <string name="Disabled">Désactivé</string>
@@ -101,7 +101,7 @@
     <string name="NotificationsOther">Autres</string>
     <string name="InChatSound">Sons dans la conversation</string>
     <string name="SmartNotifications">Limiter les notifications</string>
-    <string name="SmartNotificationsSoundAtMost">Son au maximum</string>
+    <string name="SmartNotificationsSoundAtMost">max.</string>
     <string name="SmartNotificationsTimes">fois</string>
     <string name="SmartNotificationsWithin">toutes les</string>
     <string name="SmartNotificationsMinutes">minutes</string>
@@ -151,13 +151,13 @@
     <string name="Sharpen">Netteté</string>
     <string name="Fade">Fondu</string>
     <string name="Tint">Teinte</string>
-    <string name="TintShadows">OMBRES</string>
-    <string name="TintHighlights">HAUTES-LUMIERES</string>
+    <string name="TintShadows">Ombres</string>
+    <string name="TintHighlights">Hautes-lumières</string>
     <string name="Curves">Courbes</string>
-    <string name="CurvesAll">TOUT</string>
-    <string name="CurvesRed">ROUGE</string>
-    <string name="CurvesGreen">VERT</string>
-    <string name="CurvesBlue">BLEU</string>
+    <string name="CurvesAll">Tout</string>
+    <string name="CurvesRed">Rouge</string>
+    <string name="CurvesGreen">Vert</string>
+    <string name="CurvesBlue">Bleu</string>
     <string name="Blur">Flou</string>
     <string name="BlurOff">Désactiver</string>
     <string name="BlurLinear">Linéaire</string>
@@ -184,7 +184,7 @@
     <string name="FromGalley">Depuis la galerie</string>
     <string name="Set">Définir</string>
     <string name="OK">OK</string>
-    <string name="Crop">ROGNER</string>
+    <string name="Crop">Rogner</string>
     <!--messages-->
     <string name="AttachPhoto">Photo</string>
     <string name="AttachVideo">Vidéo</string>
@@ -194,11 +194,11 @@
     <string name="AttachVoiceMessage">Message vocal</string>
     <string name="FromSelf">Moi</string>
     <!--Alert messages-->
-    <string name="NoHandleAppInstalled">Vous n\'avez pas d\'application qui peut gérer des fichiers de type \'%1$s\', veuillez en installer une pour continuer</string>
+    <string name="NoHandleAppInstalled">Vous n\'avez pas d\'application qui peut ouvrir des fichiers de type \'%1$s\', veuillez en installer une pour continuer</string>
     <string name="ContactAlreadyInGroup">Ce contact est déjà dans ce groupe</string>
     <string name="ForwardMessagesTo">Renvoyer les messages sélectionnés à <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> ?</string>
     <string name="SendMessagesTo">Envoyer les messages à <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> ?</string>
-    <string name="AreYouSureDeleteThisChat">Êtes-vous sûr de vouloir supprimer cette conversation ? La conversation n\'apparaîtra plus dans la liste des conversations, mais les messages resteront sur le serveur.</string>
+    <string name="AreYouSureDeleteThisChat">Êtes-vous sûr de vouloir supprimer cette conversation? La conversation n\'apparaîtra plus dans la liste des conversations, mais les messages resteront sur le serveur.</string>
     <string name="AreYouSureBlockContact">Êtes-vous sûr de vouloir bloquer ce contact?</string>
     <string name="AreYouSureDeleteContact">Êtes-vous sûr de vouloir supprimer ce contact?</string>
     <!--permissions-->
@@ -222,7 +222,7 @@
     <string name="Intro5Headline">Libre</string>
     <string name="Intro5Message"><![CDATA[<b>Delta Chat</b>]]> sera toujours libre.<![CDATA[<br/>]]>OpenSource. Pas de pub. Pas d\'inscription. Pas lié a un fournisseur.</string>
 
-    <string name="Intro6Headline">Sûr</string>
+    <string name="Intro6Headline">Chiffré</string>
     <string name="Intro6Message"><![CDATA[<b>Chiffré</b>]]> avec des algorithmes reconnus. Les messages restent sur vos serveurs.</string>
 
     <string name="Intro7Headline">Fiable</string>
@@ -239,7 +239,7 @@
     </plurals>
     <plurals name="MeAndMembers">
         <item quantity="one">Moi et %d membre</item>
-        <item quantity="other">Moi et %d membres</item>
+        <item quantity="other">%d membres et moi</item>
     </plurals>
     <plurals name="NewMessages">
         <item quantity="one">%d nouveau message</item>
@@ -312,7 +312,7 @@
     <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, les protocoles IMAP/SMTP doivent être activés depuis l\'interface web.\n\nSi vous rencontrez des problème, demandez à votre fournisseur ou à vos amis.</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="AccountNotConfigured">Compte non configuré</string>
     <string name="AboutThisProgram">À propos Delta Chat</string>
     <string name="NotSet">Non défini</string>
@@ -321,7 +321,7 @@
     <string name="DeaddropInChatlist">Monter les demandes de contact dans la liste des conversations</string>
     <string name="MuteAlways">Toujours muet</string>
     <string name="AskStartChatWith">Lancer une conversation avec <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
-    <string name="DeaddropHint">Pour lancer une conversation, cliquez sur le bouton de réponse en forme de flèche.</string>
+    <string name="DeaddropHint">Pour commencer une conversation, cliquez sur le bouton de réponse en forme de flèche.</string>
     <string name="NotYetImplemented">Cette fonction n\'est pas disponible ou non supportée complètement.</string>
     <string name="DefaultStatusText">Envoyé avec Delta Chat: https://delta.chat</string>
     <string name="Name" >Nom</string>
@@ -333,12 +333,12 @@
     <!-- 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">Veuillez patienter…</string>
-    <string name="NoChatsHelp">Lancez une conversation en appuyant sur le bouton dans le coin inférieur droit ou appuyez sur le bouton menu pour plus d\'options.</string>
+    <string name="NoChatsHelp">Lancez une conversation en appuyant sur le bouton \"Nouvelle conversation\" dans le coin inférieur droit ou appuyez sur le bouton \"Menu\" pour plus d\'options.</string>
     <string name="Intro7Message"><![CDATA[<b>Delta Chat</b>]]> est sûr pour une utilisation professionnelle, compatible et basé sur des standards.</string>
     <string name="InviteMenuEntry">Envoyer des invitations</string>
     <string name="InviteText">J\'utilise la messagerie Delta Chat maintenant - %1$s - vous pouvez me contacter à %2$s</string>
     <string name="AdvancedSettings">Paramètres avancés</string>
-    <string name="AskResetNotifications">Réinitialiser toutes les paramètres de notification et les sons de cette page ainsi que de vos contacts et groupes?</string>
+    <string name="AskResetNotifications">Réinitialiser toutes les paramètres de notification et de son de cette page, contacts et groupes?</string>
     <string name="AttachFiles">Joindre des fichiers</string>
     <string name="ErrGroupNameEmpty">Merci de saisir un nom pour le groupe.</string>
     <string name="MsgNewGroupDraftHint">Écrivez un premier message pour permettre aux autres de répondre dans ce groupe.\n\n• Ça ne devrait pas poser de problème si tous les membres du groupe n\'utilisent pas Delta Chat.\n\n• L\'envoi du premier message peut prendre un moment.</string>
@@ -390,9 +390,9 @@
     <string name="ImportExportExplain">Les fichiers exportés contiendront des clés privées! Gardez-les dans un endroit sûr ou supprimez-les dès que possible.</string>
     <string name="EnterPasswordToContinue">Entrer le mot de passe pour %1$s pour continuer:</string>
     <string name="IncorrectPassword">Mot de passe incorrect.</string>
-    <string name="ImportBackupAsk">Delta Chat a trouvé une sauvegarde dans <![CDATA[<i>]]>%1$s<![CDATA[</i>]]>.\n\n Voulez-vous importer et utiliser toutes les données et paramètres de cette sauvegarde?</string>
+    <string name="ImportBackupAsk">Une sauvegarde a été trouvée dans <![CDATA[<i>]]>%1$s<![CDATA[</i>]]>.\n\n Voulez-vous importer et utiliser toutes les données et paramètres de cette sauvegarde?</string>
     <string name="ImportBackup">Importer une sauvegarde</string>
-    <string name="NoBackupFound">Aucune sauvegarde à importer trouvée.\n\nCopier la sauvegarde dans <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> et réessayez. Sinon, appuyez sur \"Démarrer la messagerie\" pour un processus d\'installation normal.</string>
+    <string name="NoBackupFound">Aucune sauvegarde trouvée.\n\nCopier la sauvegarde dans <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> et réessayez. Sinon, appuyez sur \"Démarrer la messagerie\" pour un processus d\'installation normal.</string>
     <string name="FilesSuccessfullyExported">Fichiers exportés avec succès dans <![CDATA[<i>]]>%1$s<![CDATA[</i>]]>.</string>
     <string name="ExportBackup">Exporter une sauvegarde</string>
     <string name="ExportPrivateKeys">Exporter les clés privées</string>
@@ -410,4 +410,15 @@ La dernière clé importée sera utilisée comme nouvelle clé par défaut</stri
     <string name="LeaveGroup">Quitter le groupe</string>
     <string name="AskLeaveGroup">Êtes-vous sûr de vouloir quitter ce groupe?</string>
     <string name="Never">Jamais</string>
+    <string name="AutocryptKeyTransferInitiate">Lancer le transfert de clé Autocrypt</string>
+    <string name="AutocryptKeyTransfer">Transfert de clé Autocrypt</string>
+    <string name="AutocryptKeyTransferMsgBeforeSend">Le  <![CDATA[<i>]]>transfert de clé Autocrypt<![CDATA[</i>]]> nécessite que le client de messagerie sur l\'autre périphérique soit compatible avec Autocrypt.\n\nVous pouvez alors vous envoyer votre clé secrète. La clé sera cryptée par un code d\'installation qui est affiché ici et doit être tapé sur l\'autre appareil.</string>
+    <string name="AutocryptKeyTransferMsgAfterSend">Votre clé vous a été envoyée. Passez à l\'autre appareil et ouvrez le message d\'installation. Vous devriez être invité à entrer un code d\'installation. Tapez les chiffres suivants dans l\'invite:\n\n%1$s\n\nUne fois que vous avez terminé, votre autre périphérique sera prêt à utiliser Autocrypt.</string>
+    <string name="AutocryptSetupMessageSubject">Message d\'installation d\'Autocrypt</string>
+    <string name="AutocryptSetupMessageGeneralBody">Ceci est le message d\'installation d\'Autocrypt utilisé pour transférer votre clé entre les clients.\n\nPour déchiffrer et utiliser votre clé, ouvrez le message dans un client compatible avec Autocrypt et entrez le code d\'installation présenté sur le périphérique d\'envoi.</string>
+    <string name="AutocryptSetupMessageTapBody">Ceci est le message d\'installation d\'Autocrypt utilisé pour transférer votre clé entre les clients.\n\nPour déchiffrer et utiliser votre clé, appuyez sur ce message.</string>
+    <string name="AutocryptKeyTransferPleaseEnterCode">Veuillez entrer le code d\'installation affiché sur l\'autre appareil.</string>
+    <string name="AutocryptKeyTransferBadCode">Mauvais code d\'installation. Veuillez réessayer.\n\nSi vous ne vous souvenez pas du code d\'installation, lancez à nouveau le transfert de clé depuis l\'autre appareil.</string>
+    <string name="AutocryptKeyTransferSucceeded">Clé transférée avec succès. Cet appareil est maintenant prêt à utiliser Autocrypt avec la même clé que l\'autre appareil.</string>
+    <string name="Retry">Recommencez</string>
     </resources>

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

@@ -420,4 +420,5 @@
     <string name="AutocryptKeyTransferBadCode">Codice di configurazione errato.\n\nSe non si ricorda il codice di configurazione, avviare nuovamente il trafserimento chiavi sull\'altro dispositivo.</string>
     <string name="AutocryptKeyTransferSucceeded">Chiave trasferita con successo. Questo dispositivo è pronto per usare Autocrypt con la stessa chiave dell\'altro dispositivo.</string>
     <string name="Retry">Riprovare</string>
+    <string name="SelfTalkSubtitle">Messaggi inviati a se stessi</string>
 </resources>

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

@@ -302,6 +302,7 @@
     <string name="AttachFiles">Legg ved filer</string>
     <string name="ErrGroupNameEmpty">Skriv inn et navn for gruppen.</string>
     <string name="MsgNewGroupDraft">Hei, jeg har akkurat opprettet gruppen \"%1$s\" for oss.</string>
+    <string name="MsgGroupNameChanged">Gruppenavn endret fra \"%1$s\" til \"%2$s\".</string>
     <string name="MsgGroupImageChanged">Gruppebilde endret.</string>
     <string name="MsgMemberAddedToGroup">Medlem %1$s lagt til.</string>
     <string name="MsgMemberRemovedFromToGroup">Medlem %1$s fjernet.</string>

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

@@ -448,4 +448,5 @@
     <string name="AutocryptKeyTransferBadCode">Zły kod konfiguracyjny. Spróbuj ponownie.\n\nJeśli nie pamiętasz kodu konfiguracji, po prostu uruchom ponownie transfer klucza na drugim urządzeniu.</string>
     <string name="AutocryptKeyTransferSucceeded">Udany transfer klucza. To urządzenie jest teraz gotowe do użycia automatycznego szyfrowania za pomocą tego samego klucza, co na drugim urządzeniu.</string>
     <string name="Retry">Powtórz</string>
+    <string name="SelfTalkSubtitle">Wiadomości wysłane do siebie</string>
 </resources>

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

@@ -151,13 +151,13 @@
     <string name="Sharpen">Nitidez</string>
     <string name="Fade">Desbotar</string>
     <string name="Tint">Matiz</string>
-    <string name="TintShadows">SOMBRAS</string>
-    <string name="TintHighlights">LUZES</string>
+    <string name="TintShadows">Sombras</string>
+    <string name="TintHighlights">Luzes</string>
     <string name="Curves">Curvas</string>
-    <string name="CurvesAll">TUDO</string>
-    <string name="CurvesRed">VERMELHO</string>
-    <string name="CurvesGreen">VERDE</string>
-    <string name="CurvesBlue">AZUL</string>
+    <string name="CurvesAll">Tudo</string>
+    <string name="CurvesRed">Vermelho</string>
+    <string name="CurvesGreen">Verde</string>
+    <string name="CurvesBlue">Azul</string>
     <string name="Blur">Desfoque</string>
     <string name="BlurOff">Desativado</string>
     <string name="BlurLinear">Linear</string>
@@ -184,7 +184,7 @@
     <string name="FromGalley">Da galeria</string>
     <string name="Set">Aplicar</string>
     <string name="OK">OK</string>
-    <string name="Crop">CORTAR</string>
+    <string name="Crop">Cortar</string>
     <!--messages-->
     <string name="AttachPhoto">Foto</string>
     <string name="AttachVideo">Vídeo</string>
@@ -409,4 +409,15 @@
     <string name="LeaveGroup">Sair do grupo</string>
     <string name="AskLeaveGroup">Tem certeza que deseja sair do grupo?</string>
     <string name="Never">Jamais</string>
+    <string name="AutocryptKeyTransferInitiate">Começar transferência de chaves</string>
+    <string name="AutocryptKeyTransfer">Transferência de chaves</string>
+    <string name="AutocryptKeyTransferMsgBeforeSend">Para funcionar, a <![CDATA[<i>]]>transferência de chaves <![CDATA[</i>]]> é necessário que o cliente de e-mail do outro dispositivo seja compatível com o Autocrypt.\n\nEnvie sua chave secreta para você mesmo. A chave será cifrada com o código exibido aqui, o qual precisará ser digitado no outro dispositivo.</string>
+    <string name="AutocryptKeyTransferMsgAfterSend">Sua chave foi enviada para você mesmo. Abra a mensagem de configuração no seu outro dispositivo. Lá será exibido uma solicitação de código. Digite-o lá:\n\n%1$s\n\nDepois disso, seu dispositivo estará pronto para usar o Autocrypt.</string>
+    <string name="AutocryptSetupMessageSubject">Mensagem de configuração do Autocrypt</string>
+    <string name="AutocryptSetupMessageGeneralBody">Esta é uma mensagem de configuração do Autocrypt que serve para transferir suas chaves entre dispositivos diferentes.\n\nPara descriptografar sua chave abra esta mensagem num cliente de e-mail compatível e digite o código exibido no dispositivo de origem.</string>
+    <string name="AutocryptSetupMessageTapBody">Esta é uma mensagem de configuração do Autocrypt que serve para a transferência de chaves.\n\nPara completá-la toque nesta mensagem.</string>
+    <string name="AutocryptKeyTransferPleaseEnterCode">Por favor, digite o código exibido no outro dispositivo.</string>
+    <string name="AutocryptKeyTransferBadCode">Código errado. Tente novamente.\n\nSe você não se lembra do código recomece a transferência de chaves no dispositivo original.</string>
+    <string name="AutocryptKeyTransferSucceeded">Chaves transferidas. Agora você está pronto para usar o Autocrypt neste dispositivo com as mesmas chaves do outro.</string>
+    <string name="Retry">Repetir</string>
     </resources>

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

@@ -43,7 +43,7 @@
     <string name="TypeMessage">Сообщение</string>
     <string name="SlideToCancel">СДВИНЬТЕ ДЛЯ ОТМЕНЫ</string>
     <string name="SaveToDownloads">Сохранить в папку Загрузки</string>
-    <string name="SaveToMusic">Сохранить в музыку</string>
+    <string name="SaveToMusic">Сохранить в музыкальную коллекцию</string>
     <string name="Share">Поделиться</string>
     <string name="SendItems">Отправить %1$s</string>
     <string name="ClearRecentEmoji">Очистить недавние смайлики?</string>
@@ -81,7 +81,7 @@
     <string name="NotificationsAndSounds">Уведомления и звуки</string>
     <string name="BlockedContacts">Заблокированные контакты</string>
     <string name="Default">По умолчанию</string>
-    <string name="OnlyIfSilent">Только если тишина</string>
+    <string name="OnlyIfSilent">Только при выключенном звуке</string>
     <string name="ChatBackground">Фон чата</string>
     <string name="SendByEnter">Отправить нажав "Ввод"</string>
     <string name="Help">Помощь</string>
@@ -101,7 +101,7 @@
     <string name="NotificationsOther">Другие</string>
     <string name="InChatSound">Звуки в чате</string>
     <string name="SmartNotifications">Ограничение уведомлений</string>
-    <string name="SmartNotificationsSoundAtMost">Звук не более</string>
+    <string name="SmartNotificationsSoundAtMost">не более</string>
     <string name="SmartNotificationsTimes">раз</string>
     <string name="SmartNotificationsWithin">в пределах</string>
     <string name="SmartNotificationsMinutes">минут</string>
@@ -192,7 +192,7 @@
     <string name="AttachContact">Контакт</string>
     <string name="AttachDocument">Файл</string>
     <string name="AttachVoiceMessage">Голосовое сообщение</string>
-    <string name="FromSelf">Мне</string>
+    <string name="FromSelf">Я</string>
     <!--Alert messages-->
     <string name="NoHandleAppInstalled">У вас нет приложений, которые могут обрабатывать тип файла \'%1$s\', пожалуйста, установите такое приложение, чтобы продолжить</string>
     <string name="ContactAlreadyInGroup">Контакт уже находится в этой группе.</string>
@@ -211,7 +211,7 @@
     <string name="Intro1Message">Мессенджер с <![CDATA[<b>самым большим диапазоном охвата</b>]]> в мире. <![CDATA[<br/><b>Бесплатный</b>]]> и <![CDATA[<b>безопасный</b>]]>.</string>
 
     <string name="Intro2Headline">Независимый</string>
-    <string name="Intro2Message"><![CDATA[<b>Независимость</b>]]> от иностранных компьютеров или сервисов. Приложение использует только ваш почтовый сервер.</string>
+    <string name="Intro2Message"><![CDATA[<b>Независимость</b>]]> от неконтролируемых вами компьютеров или сервисов. Приложение использует только ваш почтовый сервер.</string>
 
     <string name="Intro3Headline">Быстрый</string>
     <string name="Intro3Message"><![CDATA[<b>Push-сообщения</b>]]> за секунды.<![CDATA[<br/>]]>Быстрый интерфейс.</string>
@@ -340,7 +340,7 @@
     <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="MyAccountExplain2" >Иногда <![CDATA[<b>]]>IMAP должен быть включён<![CDATA[</b>]]> в веб-интерфейсе электронной почты.\n\nВ случае затруднений обратитесь к своему поставщику услуги электронной почты, или компетентным друзьям.</string>
     <string name="AccountNotConfigured">Аккаунт не настроен</string>
     <string name="AboutThisProgram">Delta Chat (Дельта Чат)</string>
     <string name="NotSet">Не задано</string>
@@ -361,7 +361,7 @@
     <!-- 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">Один момент …</string>
-    <string name="NoChatsHelp">Начните обмен сообщениями, нажав кнопку нового чата в нижнем правом углу или коснитесь кнопки меню для получения дополнительных возможностей.</string>
+    <string name="NoChatsHelp">Начните обмен сообщениями, нажав кнопку нового чата в нижнем правом углу, или коснитесь кнопки меню для получения дополнительных возможностей.</string>
     <string name="Intro7Message"><![CDATA[<b>Delta Chat</b>]]> безопасен для использования в бизнесе, основан на совместимых стандартах.</string>
     <string name="InviteMenuEntry">Отправить приглашения</string>
     <string name="InviteText">Я использую систему мгновенных сообщений Delta Chat - %1$s - вы можете написать мне на %2$s</string>
@@ -415,7 +415,7 @@
     <string name="MsgGroupImageDeleted">Изображение группы удалено.</string>
     <string name="AskDeleteGroupImage">Вы действительно хотите удалить изображение группы?\n\nИзменение вступит в силу на всех устройствах участников группы.</string>
     <string name="ExportImportHeader">Экспорт и импорт</string>
-    <string name="ImportExportExplain">Файлы экспорта будут содержать закрытые ключи! Храните их в защищенном месте или удалите их по первой возможности.</string>
+    <string name="ImportExportExplain">Файлы экспорта будут содержать закрытые ключи! Храните их в защищенном месте или удалите их при первой возможности.</string>
     <string name="EnterPasswordToContinue">Введите пароль для %1$s, чтобы продолжить:</string>
     <string name="IncorrectPassword">Неверный пароль.</string>
     <string name="ImportBackupAsk">Delta Chat нашел резервную копию в <![CDATA[<i>]]>%1$s<![CDATA[</i>]]>.\n\nИмпортировать и использовать все данные и настройки из резервной копии?</string>
@@ -430,10 +430,10 @@
     <string name="E2eeOffBecauseOfUser">Для включения сквозного шифрования выберите соответствующий пункт в настройках.</string>
     <string name="E2eeOffBecauseOfRecipient">Шифрование будет переключено в сквозной режим, если со стороны контакта будет выбран соответствующий пункт настроек.</string>
     <string name="NotNow">Не сейчас</string>
-    <string name="ArchiveChat">Архивировать чат</string>
-    <string name="UnarchiveChat">Разархивировать чат</string>
-    <string name="ArchivedChats">Архивированные чаты</string>
-    <string name="Archived">Помещено в архив</string>
+    <string name="ArchiveChat">Переместить чат в архив</string>
+    <string name="UnarchiveChat">Вернуть чат из архива в активный режим</string>
+    <string name="ArchivedChats">Архив чатов</string>
+    <string name="Archived">в архиве</string>
     <string name="LeaveGroup">Выйти из группы</string>
     <string name="AskLeaveGroup">Вы уверены, что хотите выйти из группы?</string>
     <string name="Never">Никогда</string>
@@ -448,4 +448,4 @@
     <string name="AutocryptKeyTransferBadCode">Неверный код настройки. Пожалуйста, повторите.\n\nЕсли Вы не помните код настройки, вернитесь к исходному устройству и передайте ключ ещё раз.</string>
     <string name="AutocryptKeyTransferSucceeded">Ключ передан успешно. Сейчас это устройство может использовать Autocrypt с тем же ключом, что и на другом устройстве.</string>
     <string name="Retry">Повторить</string>
-</resources>
+    </resources>

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

@@ -3,11 +3,11 @@
 
 
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="AppName">Fjalosje Delta</string>
+    <string name="AppName">Delta Chat</string>
     <!--chats view-->
     <string name="Settings">Rregullime</string>
     <string name="NewGroup">Grup i ri</string>
-    <string name="NoResult">S’ka përfundime.</string>
+    <string name="NoResult">S\’ka përfundime.</string>
     <string name="NoChats">Ende pa fjalosje.</string>
     <string name="DeleteChat">Fshije fjalosjen</string>
     <string name="SelectChat">Përzgjidhni fjalosje…</string>
@@ -25,7 +25,7 @@
     <string name="ErrorHint">Gabim i panjohur</string>
     <string name="AccessError">Gabim hyrjeje</string>
     <string name="NoFiles">Ende pa kartela…</string>
-    <string name="NotMounted">S’ka depozitë të montuar</string>
+    <string name="NotMounted">S\’ka depozitë të montuar</string>
     <string name="UsbActive">Shpërngulje USB në ecuri e sipër</string>
     <string name="InternalStorage">Depozitë e Brendshme</string>
     <string name="ExternalStorage">Depozitë e Jashtme</string>
@@ -36,12 +36,13 @@
     <!--chat view-->
     <string name="ChatGallery">Galeri</string>
     <string name="ChatCamera">Kamerë</string>
-    <string name="NoMessages">S’ka mesazhe.</string>
+    <string name="NoMessages">S\’ka mesazhe.</string>
     <string name="ForwardedMessage">Mesazh i përcjellë</string>
     <string name="From">Nga</string>
     <string name="TypeMessage">Mesazh</string>
     <string name="SaveToDownloads">Ruaje te \"Shkarkime\"</string>
     <string name="SaveToMusic">Ruaje te \"Muzikë\"</string>
+    <string name="ClearRecentEmoji">Të hiqen emoji-t e përdorur së fundi?</string>
     <string name="AddShortcut">Shtoje widget-in te kreu</string>
     <string name="ShortcutAdded">Widget-i u shtua tek kreu</string>
     <!--notification-->
@@ -69,6 +70,7 @@
     <string name="DefaultForNormalMessages">Mesazhe normale</string>
     <string name="MessagePreview">Paraparje mesazhesh</string>
     <string name="Sound">Tingull</string>
+    <string name="InAppNotifications">Njoftime nga aplikacioni</string>
     <string name="Vibrate">Dridhu</string>
     <string name="ResetAllNotifications">Ktheji krejt njoftimet te parazgjedhjet</string>
     <string name="NotificationsAndSounds">Njoftime dhe tinguj</string>
@@ -90,6 +92,7 @@
     <string name="NotificationsPriorityMax">Përparësia më  lartë</string>
     <string name="RepeatNotifications">Ripërsëriti njoftimet</string>
     <string name="NotificationsOther">Tjetër</string>
+    <string name="InChatSound">Tinguj nga aplikacioni</string>
     <string name="SmartNotifications">Kufizo njoftimet</string>
     <string name="SmartNotificationsSoundAtMost">Maks.</string>
     <string name="SmartNotificationsTimes">herë</string>
@@ -103,7 +106,7 @@
     <!--passcode view-->
     <string name="Passcode">Kyçje Kodkalimi</string>
     <string name="ChangePasscode">Ndryshoni Kodkalimin</string>
-    <string name="ChangePasscodeInfo">Kur rregulloni një kodkalim shtesë, te faqja e bisedave do të shfaqet një ikonë dryni. Prekeni që të kyçet aplikacioni.\n\nShënim: nëse harroni kodkalimin, do t’ju duhet të fshini dhe ri-instaloni aplikacionin.</string>
+    <string name="ChangePasscodeInfo">Kur rregulloni një kodkalim shtesë, te faqja e bisedave do të shfaqet një ikonë dryni. Prekeni që të kyçet aplikacioni.\n\nShënim: nëse harroni kodkalimin, do t\’ju duhet të fshini dhe ri-instaloni aplikacionin.</string>
     <string name="PasscodePIN">PIN</string>
     <string name="PasscodePassword">Fjalëkalim</string>
     <string name="EnterCurrentPasscode">Jepni kodkalimin tuaj të tanishëm</string>
@@ -119,6 +122,7 @@
     <string name="FingerprintNotRecognized">Shenja gishtash që nuk njihen. Riprovoni</string>
     <!--photo gallery view-->
     <string name="SaveToGallery">Ruaje te \"Galeri\"</string>
+    <string name="Of">%1$d nga %2$d gjithsej</string>
     <string name="Gallery">Galeri</string>
     <string name="AllPhotos">Krejt Fotot</string>
     <string name="AllVideo">Krejt Videot</string>
@@ -185,7 +189,7 @@
     <string name="AreYouSureBlockContact">Jeni i sigurt se doni ta bllokoni këtë kontakt?</string>
     <string name="AreYouSureDeleteContact">Jeni i sigurt se doni ta fshini këtë kontakt?</string>
     <!--permissions-->
-    <string name="PermissionContacts">Lypset hyrje te kontaktet për t’ju lidhur me shokët tuaj nga cilado pajisje juaj.</string>
+    <string name="PermissionContacts">Për t\’ju lidhur me shokët tuaj nga cilado pajisje juaj, lypset hyrje te kontaktet.</string>
     <string name="PermissionStorage">Për dërgim dhe ruajte fotosh, videosh, muzike dhe media të tjera, lypset hyrje te depozita.</string>
     <string name="PermissionNoAudio">Për dërgim mesazhesh zanorë, lypset hyrje te mikrofoni.</string>
     <string name="PermissionOpenSettings">Rregullime</string>
@@ -390,4 +394,15 @@
     <string name="LeaveGroup">Braktiseni grupin</string>
     <string name="AskLeaveGroup">Jeni i sigurt se doni ta braktisni grupin?</string>
     <string name="Never">Kurrë</string>
+    <string name="AutocryptKeyTransferInitiate">Përgatit Transferim Kyçi Autocrypt</string>
+    <string name="AutocryptKeyTransfer">Transferim Kyçi Autocrypt</string>
+    <string name="AutocryptKeyTransferMsgBeforeSend"><![CDATA[<i>]]>Transferimi i Kyçit Autocrypt<![CDATA[</i>]]> lyp që klienti i postës në pajisjen tjetër të mund të përdorë protokolle Autocrypt.\n\nMandej mund t’i dërgoni vetes kyçin tuaj të fshehtë. Kyçi do të fshehtëzohet nga një kod rregullimi që shfaqet këtu dhe duhet të shytpet te pajisja tjetër.</string>
+    <string name="AutocryptKeyTransferMsgAfterSend">Kyçi juaj u dërgua te ju. Kaloni te pajisja tjetër dhe hapni mesazhin e rregullimit. Do t’ju kërkohet një kod rregullimi. Shtypni këto shifra:\n\n%1$s\n\nPasi të keni mbaruar, pajisja tjetër e juaja do të jetë gati të përdorë Autocrypt-in.</string>
+    <string name="AutocryptSetupMessageSubject">Mesazh Rregullimi Autocrypt</string>
+    <string name="AutocryptSetupMessageGeneralBody">Ky është Mesazhi i Rregullimit të Autocrypt-it i përdorur për të transferuar kyçin tuaj nga një klient në tjetrin.\n\nQë të shfshehtëzoni dhe përdorni kyçin tuaj, hapeni mesazhin në një klient qtë aftë për Autocrypt dhe jepni kodin e rregullimit të shfaqur te pajisja që e prodhoi.</string>
+    <string name="AutocryptSetupMessageTapBody">Ky është Mesazhi i Rregullimit të Autocrypt-it i përdorur për të transferuar kyçin tuaj nga një klient në tjetrin.\n\nQë të shfshehtëzoni dhe përdorni kyçin tuaj, prekeni këtë mesazh.</string>
+    <string name="AutocryptKeyTransferPleaseEnterCode">Ju lutemi, jepni kodin e rregullimit që është shfaqur te pajisja tjetër.</string>
+    <string name="AutocryptKeyTransferBadCode">Kod rregullimi i gabuar. Ju lutemi, riprovoni.\n\nNëse s’e mbani mend kodin e rregullimit, thjesht rinisni transferimin e kyçit që nga pajisja tjetër.</string>
+    <string name="AutocryptKeyTransferSucceeded">Kyçi u transferua me sukses. Tani kjo pajisje është gati të përdorë Autocrypt-in me të njëjtin kyç si pajisja tjetër.</string>
+    <string name="Retry">Riprovoni</string>
     </resources>

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

@@ -28,6 +28,7 @@
     <string name="ExternalStorage">Harici Depolama</string>
     <string name="SdCard">SD Kart</string>
     <string name="Folder">Klasör</string>
+    <string name="GalleryInfo">Sıkıştırılmamış resimleri göndermek için</string>
     <!--chat view-->
     <string name="ChatGallery">Galeri</string>
     <string name="ChatCamera">Kamera</string>
@@ -43,7 +44,7 @@
     <string name="AddShortcut">Ana ekrana gereç ekleme</string>
     <string name="ShortcutAdded">Gereç ana ekrana eklendi</string>
     <!--notification-->
-    <string name="Reply">Yanıtlama</string>
+    <string name="Reply">Yanıtla</string>
     <string name="ReplyToGroup">%1$se yanıt ver</string>
     <string name="ReplyToContact">%1$se yanıt ver</string>
     <!--contacts view-->
@@ -74,10 +75,12 @@
     <string name="Default">Öntanımlı</string>
     <string name="OnlyIfSilent">Sadece sessizse</string>
     <string name="ChatBackground">Söyleşi arkaplanı</string>
+    <string name="SendByEnter">Enter tuşu ile gönder</string>
     <string name="Help">Yardım</string>
     <string name="Enabled">Aç</string>
     <string name="Disabled">Kapat</string>
     <string name="LedColor">LED rengi</string>
+    <string name="BadgeNumber">Sayıyı akılda tutmak için mümkünse simge kullanın</string>
     <string name="Short">Kısa</string>
     <string name="Long">Uzun</string>
     <string name="EditName">Adı düzenle</string>
@@ -87,7 +90,11 @@
     <string name="NotificationsPriorityMax">En yüksek öncelik</string>
     <string name="RepeatNotifications">Bildirimleri yinele</string>
     <string name="NotificationsOther">Diğer</string>
+    <string name="InChatSound">söyleşi içi sesler</string>
     <string name="SmartNotifications">Sınır bildirimleri</string>
+    <string name="SmartNotificationsSoundAtMost">En çok</string>
+    <string name="SmartNotificationsTimes">kere</string>
+    <string name="SmartNotificationsWithin">içerisinde</string>
     <string name="DirectShare">Doğrudan paylaşım</string>
     <string name="DirectShareInfo">Son söyleşileri paylaşma menüsünde göster</string>
     <!--cache view-->
@@ -97,6 +104,7 @@
     <!--passcode view-->
     <string name="Passcode">Şifre Kilidi</string>
     <string name="ChangePasscode">Şifre Değiştir</string>
+    <string name="ChangePasscodeInfo">Ek bir şifre koyduğunuzda söyleşi sayfasında bir kilit simgesi görünür. Uygulamayı kilitlemek için dokunun.\n\nNote: Eğer şifreyi unutursanız, uygulamayı silip tekrar yüklemeniz gerekir.</string>
     <string name="PasscodePIN">PİN</string>
     <string name="PasscodePassword">Parola</string>
     <string name="EnterCurrentPasscode">Güncel şifrenizi girin</string>
@@ -106,11 +114,13 @@
     <string name="ReEnterYourPasscode">Yeni şifrenizi tekrar girin</string>
     <string name="PasscodeDoNotMatch">Şifreleriniz eşleşmiyor</string>
     <string name="AutoLock">Otomatik kilit</string>
-    <string name="UnlockFingerprint">Parmak izi il şifreyi aç</string>
+    <string name="AutoLockInfo">Bir süre uzak kalınırsa şifre gerekir.</string>
+    <string name="UnlockFingerprint">Parmak izi ile şifreyi aç</string>
     <string name="FingerprintInfo">Devam etmek için parmak izini onayla</string>
     <string name="FingerprintNotRecognized">Parmak izi tanınmadı. Tekrar deneyin</string>
     <!--photo gallery view-->
     <string name="SaveToGallery">Galeriye kaydet</string>
+    <string name="Of">%1$d/%2$d</string>
     <string name="Gallery">Galeri</string>
     <string name="AllPhotos">Tüm Fotograflar</string>
     <string name="AllVideo">Tüm Vidyolar</string>
@@ -128,6 +138,7 @@
     <string name="Shadows">Gölgeler</string>
     <string name="Sharpen">Keskinleştirme</string>
     <string name="Fade">Soldurma</string>
+    <string name="Tint">Renk tonu</string>
     <string name="TintShadows">Gölgeler</string>
     <string name="TintHighlights">Vurgulamalar</string>
     <string name="Curves">Eğriler</string>
@@ -156,6 +167,7 @@
     <string name="Send">Gönder</string>
     <string name="CopyToClipboard">Panoya kopyala</string>
     <string name="Delete">Sil</string>
+    <string name="Forward">İlet</string>
     <string name="FromCamera">Kameradan</string>
     <string name="FromGalley">Galeriden</string>
     <string name="OK">TAMAM</string>
@@ -164,8 +176,11 @@
     <string name="AttachPhoto">Fotograf</string>
     <string name="AttachVideo">Vidyo</string>
     <string name="AttachGif">GİF</string>
+    <string name="AttachContact">Kişiler</string>
     <string name="AttachDocument">Dosya</string>
     <string name="AttachVoiceMessage">Sesli ileti</string>
+    <string name="ContactAlreadyInGroup">Kişi zaten bu grupta.</string>
+    <string name="AreYouSureDeleteThisChat">Bu söyleşiyi silinsin mi? Söyleşi listesinde artık gösterilmeyecek, iletileri sunucuda kalacak.</string>
     <string name="AreYouSureBlockContact">Bu kişiyi engellemek istediğinizden emin misiniz?</string>
     <string name="AreYouSureDeleteContact">Bu kişiyi silmek istediğizden emin misiniz?</string>
     <string name="PermissionOpenSettings">Ayarlar</string>
@@ -174,7 +189,10 @@
     <string name="Intro2Headline">Bağımsız</string>
     <string name="Intro3Headline">Hızlı</string>
     <string name="Intro4Headline">Muhteşem</string>
-    <string name="Intro6Headline">Güvenli</string>
+    <string name="Intro5Headline">Özgür</string>
+    <string name="Intro6Headline">Şifreli</string>
+    <string name="Intro7Headline">Güvenilir</string>
+
     <!--plural-->
     <plurals name="Members">
         <item quantity="one">%düye</item>
@@ -196,6 +214,10 @@
         <item quantity="one">%dileti</item>
         <item quantity="other">%dileti</item>
     </plurals>
+    <plurals name="AreYouSureDeleteMessages">
+        <item quantity="one">%d ileti silinsin mi? Bu sunucudan da silinecek.</item>
+        <item quantity="other">%d iletiler silinsin mi? Bunlar sunucudan da silinecek.</item>
+    </plurals>
     <plurals name="Chats">
         <item quantity="one">%d söyleşi</item>
         <item quantity="other">%dsöyleşi</item>
@@ -222,9 +244,11 @@
     </plurals>
     <string name="formatterYear">gg.AA.yyyy</string>
     <string name="formatterDay24H">SS:dd</string>
+    <string name="formatDateAtTime">%1$s de %2$s</string>
     <string name="AccountSettings">Hesap ayarları</string>
     <string name="MyAccount">Hesabım</string>
     <string name="MyName">Adım</string>
+    <string name="MyNameExplain">Adınız karşıya böyle gösterilecek. Boş bırakırsanız, yalnızca eposta adresiniz gönderilecek.</string>
     <string name="Password">Parola</string>
     <string name="SmtpPassword">STMP parolası</string>
     <string name="FromAbove">Yukarıdan</string>
@@ -241,32 +265,51 @@
     <string name="AboutThisProgram">Delta Chat Hakkında</string>
     <string name="NewChat">Yeni söyleşi</string>
     <string name="MuteAlways">Sürekli sessiz</string>
+    <string name="DeaddropHint">Söyleşmeye başlamak için yanıt oklarına dokunun.</string>
+    <string name="NotYetImplemented">Bu işlev mevcut değil veya eksik.</string>
+    <string name="DefaultStatusText">Delta Chat Messengerim ile göderildi: https://delta.chat</string>
     <string name="Name" >Ad</string>
     <string name="EmailAddress">E-posta adresi</string>
+    <string name="CannotDeleteContact">Kullanımdaki kişiler silinemez, bunun yerine kişiyi engelleyin.</string>
+    <string name="BadEmailAddress">Hatalı eposta adresi.</string>
+    <string name="ContactCreated">Kişi oluşturuldu.</string>
     <string name="ViewProfile">Profil görüntüsü</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">Bir dakika ...</string>
     <string name="InviteMenuEntry">Davetiye gönderin</string>
     <string name="AdvancedSettings">Gelişmiş ayarlar</string>
+    <string name="AskResetNotifications">Geçerli sayfanın grupların ve kişilerin bütün bildirim ayarları ve sesleri sıfırlansın mı?</string>
     <string name="AttachFiles">Dosyaları iliştir</string>
     <string name="ErrGroupNameEmpty">Grup için bir ad girin</string>
     <string name="MsgGroupImageChanged">Grup resmi değişti.</string>
     <string name="MsgMemberAddedToGroup">%1$s üye eklendi</string>
     <string name="MsgMemberRemovedFromToGroup">%1$s üye silindi.</string>
+    <string name="MsgGroupLeft">Grup ayrıldı.</string>
+    <string name="SendNRcvReadReceipts">İletim raporlarını al ve gönder</string>
+    <string name="PreferE2EEncryption">Uçtan uca şifrelemeyi yeğle</string>
+    <string name="E2EManagePrivateKeys">Özel anahtarları yönet</string>
     <string name="E2ECompareKeys">Anahtarları karşılaştır</string>
     <string name="SelectContact">Bir kişi seçin</string>
     <string name="DoneHint">Tamam.</string>
+    <string name="Error">Hata: %1$s</string>
     <string name="NoNetwork">Ağ kullanılamıyor.</string>
     <string name="Audio">Ses</string>
+    <string name="PermNotificationTitle">%1$s\'e bağlandı</string>
     <string name="PermNotificationText">İletiler bekliyor ...</string>
     <string name="SettingsFor">%1$siçin ayarlar</string>
     <string name="AutoplayGifs">GİFleri otomatik oynat</string>
     <string name="HelpUrl">https://delta.chat/en/help</string>
     <string name="EncryptedMessage">Şifrelenmiş ileti</string>
+    <string name="Encryption">Şifreleme</string>
     <string name="EncrinfoE2E">Uçtan uca şifreleme etkin</string>
     <string name="EncrinfoFingerprints">Parmak izleri</string>
     <string name="Backup">Yedekleme</string>
+    <string name="ReadReceipt">İletim raporu</string>
     <string name="NameAndStatus">Ad ve durum</string>
     <string name="MyStatus">Durumum</string>
     <string name="MsgGroupImageDeleted">Grup resmi silindi</string>
+    <string name="AskDeleteGroupImage">Grup resmini silmek istediğinizden emin misiniz?\n\nBu tüm grup üyelerinin aygıtlarını etkileyecek.</string>
     <string name="ExportImportHeader">Dışa aktarım ve içe aktarım</string>
     <string name="IncorrectPassword">Geçersiz parola</string>
     <string name="ImportBackup">Yedeklemeyi içe aktar</string>
@@ -274,9 +317,14 @@
     <string name="ExportPrivateKeys">Özel anahtarları dışa aktar</string>
     <string name="ImportPrivateKeys">Özel anahtarları içe aktar</string>
     <string name="NoRecentEmoji">Son kullanılan duygu simgeleri burada gösterilecek.</string>
+    <string name="E2eeOffBecauseOfUser">Uçtan uca şifrelemeyi etkinleştirmek için, ayarlarınızdaki ilgili seçeneği işaretleyin.</string>
     <string name="NotNow">Şimdi değil</string>
+    <string name="ArchiveChat">Söyleşiyi arşivle</string>
+    <string name="UnarchiveChat">Söyleşiyi arşivden kaldır</string>
     <string name="ArchivedChats">Arşivlenmiş söyleşiler</string>
     <string name="Archived">Arşivlenmiş</string>
     <string name="LeaveGroup">Gruptan ayrıl</string>
+    <string name="AskLeaveGroup">Bu gruptan ayrılmak istediğinize emin misiniz?</string>
     <string name="Never">Asla</string>
+    <string name="Retry">Yeniden dene</string>
     </resources>

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

@@ -412,4 +412,14 @@
     <string name="ImportPrivateKeys">Імпортувати таємні ключі</string>
     <string name="ImportPrivateKeysAsk2">Імпортувати таємні ключі з <![CDATA[<i>]]>%1$s<![CDATA[</i>]]>?\n\n•
 Чинні таємні ключі не видалені\n\n• Найостанніший імпортований ключ буде використано як новий усталений ключ</string>
+    <string name="NoRecentEmoji">Емоджі, які використовувались недавно, будуть зображені тут.</string>
+    <string name="NotNow">Не зараз</string>
+    <string name="ArchiveChat">Додати розмову до архіву</string>
+    <string name="UnarchiveChat">Витягти розмову з архіву</string>
+    <string name="ArchivedChats">Розмови, що додані до архіву</string>
+    <string name="Archived">Заархівлено</string>
+    <string name="LeaveGroup">Полишити спільноту</string>
+    <string name="AskLeaveGroup">Чи ви певні, що хочете полишити спільноту?</string>
+    <string name="Never">Ніколи</string>
+    <string name="Retry">Спробувати ще раз</string>
     </resources>

MessengerProj/src/main/res/values/strings.xml

@@ -208,13 +208,13 @@
     <string name="PermissionOpenSettings">Settings</string>
     <!--Intro view-->
     <string name="Intro1Headline">Delta Chat</string>
-    <string name="Intro1Message">The messenger with the <![CDATA[<b>broadest audience</b>]]> in the world.<![CDATA[<br/><b>Free</b>]]> and <![CDATA[<b>independent</b>]]>.</string>
+    <string name="Intro1Message">The messenger with the <![CDATA[<b>broadest audience</b>]]> in the world. <![CDATA[<b>Free</b>]]> and <![CDATA[<b>independent</b>]]>.</string>
 
     <string name="Intro2Headline">Independent</string>
-    <string name="Intro2Message"><![CDATA[<b>Independent</b>]]> of foreign computers or services. The app only uses your email-server.</string>
+    <string name="Intro2Message"><![CDATA[<b>There is no Delta Chat server.</b>]]> The app only uses your email server.</string>
 
     <string name="Intro3Headline">Fast</string>
-    <string name="Intro3Message"><![CDATA[<b>Push-messages</b>]]> in seconds.<![CDATA[<br/>]]>Rapid interface.</string>
+    <string name="Intro3Message"><![CDATA[<b>Push messages</b>]]> in seconds.<![CDATA[<br/>]]>Rapid interface.</string>
 
     <string name="Intro4Headline">Powerful</string>
     <string name="Intro4Message"><![CDATA[<b>Unlimited</b>]]> chats, images, videos, audio messages and more. Multi-client capable.</string>

build.gradle

@@ -5,6 +5,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }

tools/CHECKLISTS.md

@@ -8,7 +8,7 @@ The following checklists are there not to forget things ... to be continued.
 2. deltachat-core on Github: "Draft a new release" with the version form `v1.2.3`
 
 
-# Release new Android version
+# Release new F-Droid version
 
 Release core, if needed, then: