Bump version code for next release

Fix some lint errors and warnings

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "MessengerProj/jni/messenger-backend"]
+	path = MessengerProj/jni/messenger-backend
+	url = https://github.com/r10s/messenger-backend.git

MessengerProj/build.gradle

@@ -42,6 +42,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     signingConfigs {
         debug {
             storeFile file("config/debug.keystore")
@@ -78,7 +82,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 13
+    defaultConfig.versionCode = 14
 
     sourceSets.main {
         jniLibs.srcDir 'libs'
@@ -129,7 +133,7 @@ android {
     defaultConfig {
         minSdkVersion 14 // 14: Android 4.0 Ice Cream Sandwich 2011 (Telegram default), 21: Android 5.0 Lollipop 2014 (recommended for InstantRun)
         targetSdkVersion 23
-        versionName "0.1.14"
+        versionName "0.1.15"
     }
 }
 

MessengerProj/jni/Android.mk

@@ -1604,26 +1604,26 @@ LOCAL_SRC_FILES     += \
 ./image.c \
 ./video.c \
 ./gifvideo.cpp \
-../../../messenger-backend/src/mrchat.c \
-../../../messenger-backend/src/mrchatlist.c \
-../../../messenger-backend/src/mrcmdline.c \
-../../../messenger-backend/src/mrcontact.c \
-../../../messenger-backend/src/mre2ee.c \
-../../../messenger-backend/src/mrimap.c \
-../../../messenger-backend/src/mrjob.c \
-../../../messenger-backend/src/mrlog.c \
-../../../messenger-backend/src/mrloginparam.c \
-../../../messenger-backend/src/mrmailbox.c \
-../../../messenger-backend/src/mrmimeparser.c \
-../../../messenger-backend/src/mrmsg.c \
-../../../messenger-backend/src/mrosnative.c \
-../../../messenger-backend/src/mrparam.c \
-../../../messenger-backend/src/mrpoortext.c \
-../../../messenger-backend/src/mrsimplify.c \
-../../../messenger-backend/src/mrsmtp.c \
-../../../messenger-backend/src/mrsqlite3.c \
-../../../messenger-backend/src/mrstock.c \
-../../../messenger-backend/src/mrtools.c \
+./messenger-backend/src/mrchat.c \
+./messenger-backend/src/mrchatlist.c \
+./messenger-backend/src/mrcmdline.c \
+./messenger-backend/src/mrcontact.c \
+./messenger-backend/src/mre2ee.c \
+./messenger-backend/src/mrimap.c \
+./messenger-backend/src/mrjob.c \
+./messenger-backend/src/mrlog.c \
+./messenger-backend/src/mrloginparam.c \
+./messenger-backend/src/mrmailbox.c \
+./messenger-backend/src/mrmimeparser.c \
+./messenger-backend/src/mrmsg.c \
+./messenger-backend/src/mrosnative.c \
+./messenger-backend/src/mrparam.c \
+./messenger-backend/src/mrpoortext.c \
+./messenger-backend/src/mrsimplify.c \
+./messenger-backend/src/mrsmtp.c \
+./messenger-backend/src/mrsqlite3.c \
+./messenger-backend/src/mrstock.c \
+./messenger-backend/src/mrtools.c \
 ./mrwrapper.c
 
 include $(BUILD_SHARED_LIBRARY)

MessengerProj/jni/mrwrapper.c

@@ -27,7 +27,7 @@
  
 #include <jni.h>
 #include <android/log.h>
-#include "../../../messenger-backend/src/mrmailbox.h"
+#include "messenger-backend/src/mrmailbox.h"
 
 
 #define CHAR_REF(a) \
@@ -428,9 +428,12 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_MrMailboxGetMsgInfo(JNIEnv *
 }
 
 
-JNIEXPORT void Java_com_b44t_messenger_MrMailbox_deleteMsg(JNIEnv *env, jclass cls, jint id)
+JNIEXPORT void Java_com_b44t_messenger_MrMailbox_deleteMsgs(JNIEnv *env, jclass cls, jintArray msg_ids)
 {
-	mrmailbox_delete_msg(get_mrmailbox_t(env, cls), id);
+	int msg_ids_cnt;
+	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);
 }
 
 

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

@@ -173,7 +173,7 @@ public class MrMailbox {
         return MrMailboxGetMsgInfo(m_hMailbox, id);
     }
 
-    public native static void deleteMsg(int id);
+    public native static void deleteMsgs(int msg_ids[]);
     public native static void forwardMsgs(int msg_ids[], int chat_ids);
 
     private native static long    MrMailboxGetMsg            (long hMailbox, int id); // return hMsg which must be unref'd after usage

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

@@ -45,7 +45,7 @@ public class NotificationCenter {
     public static final int mediaCountDidLoaded = totalEvents++;
     public static final int dialogPhotosLoaded = totalEvents++;
     public static final int notificationsSettingsUpdated = totalEvents++;
-    public static final int pushMessagesUpdated = totalEvents++;
+    //public static final int pushMessagesUpdated = totalEvents++;
     public static final int blockedUsersDidLoaded = totalEvents++;
     public static final int openedChatChanged = totalEvents++;
     public static final int stopEncodingService = totalEvents++;

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

@@ -33,10 +33,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Point;
-import android.graphics.drawable.BitmapDrawable;
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.net.Uri;
@@ -47,7 +44,6 @@ import android.provider.Settings;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.app.RemoteInput;
-import android.util.SparseArray;
 
 import com.b44t.ui.ActionBar.Theme;
 import com.b44t.ui.LaunchActivity;
@@ -77,9 +73,7 @@ public class NotificationsController {
     private int total_unread_count = 0;
     private int personal_count = 0;
     private boolean notifyCheck = false;
-    private int lastOnlineFromOtherDevice = 0;
     private boolean inChatSoundEnabled = true;
-    private int lastBadgeCount;
     private String launcherClassName;
 
     private Runnable notificationDelayRunnable;
@@ -90,10 +84,8 @@ public class NotificationsController {
     private SoundPool soundPool;
     private int soundIn;
     private int soundOut;
-    private int soundRecord;
     private boolean soundInLoaded;
     private boolean soundOutLoaded;
-    private boolean soundRecordLoaded;
     protected AudioManager audioManager;
     private AlarmManager alarmManager;
 
@@ -154,6 +146,7 @@ public class NotificationsController {
         };
     }
 
+    /*
     public void cleanup() {
         popupMessages.clear();
         notificationsQueue.postRunnable(new Runnable() {
@@ -185,6 +178,7 @@ public class NotificationsController {
             }
         });
     }
+    */
 
     public void setInChatSoundEnabled(boolean value) {
         inChatSoundEnabled = value;
@@ -199,18 +193,6 @@ public class NotificationsController {
         });
     }
 
-    /*
-    public void setLastOnlineFromOtherDevice(final int time) {
-        notificationsQueue.postRunnable(new Runnable() {
-            @Override
-            public void run() {
-                FileLog.e("messenger", "set last online from other device = " + time);
-                lastOnlineFromOtherDevice = time;
-            }
-        });
-    }
-    */
-
     /*
     public void removeNotificationsForDialog(long did) {
         NotificationsController.getInstance().processReadMessages(null, did, 0, Integer.MAX_VALUE, false);
@@ -747,6 +729,7 @@ public class NotificationsController {
         setBadge(enabled ? total_unread_count : 0);
     }
 
+    private int lastBadgeCount = -1;
     private void setBadge(final int count) {
 
         notificationsQueue.postRunnable(new Runnable() {
@@ -882,12 +865,14 @@ public class NotificationsController {
                 notificationManager.cancel(entry.getValue());
             }
             wearNotificationsIds.clear();
-            AndroidUtilities.runOnUIThread(new Runnable() {
+            /*AndroidUtilities.runOnUIThread(new Runnable() {
                 @Override
                 public void run() {
                     NotificationCenter.getInstance().postNotificationName(NotificationCenter.pushMessagesUpdated);
                 }
-            });
+            });*/
+            total_unread_count = 0;
+            setBadge(0);
         } catch (Exception e) {
             FileLog.e("messenger", e);
         }

MessengerProj/src/main/java/com/b44t/messenger/support/widget/RecyclerView.java

@@ -7538,6 +7538,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                     resultMode = MeasureSpec.AT_MOST;
                 }
             }
+            //noinspection WrongConstant
             return MeasureSpec.makeMeasureSpec(resultSize, resultMode);
         }
 

MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java

@@ -2508,13 +2508,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
 
-                ArrayList<Integer> ids = new ArrayList<>(selectedMessagesIds.keySet());
-                if( ids.size()>0) {
+                ArrayList<Integer> ids_list = new ArrayList<>(selectedMessagesIds.keySet());
+                if( ids_list.size()>0) {
+                    int ids_arr[] = new int[selectedMessagesIds.size()], j = 0;
                     for (HashMap.Entry<Integer, Integer> entry : selectedMessagesIds.entrySet()) {
-                        Integer id_to_del = entry.getKey();
-                        MrMailbox.deleteMsg(id_to_del);
+                        ids_arr[j++] = entry.getKey();
                     }
-                    NotificationCenter.getInstance().postNotificationName(NotificationCenter.messagesDeleted, ids, 0);
+                    MrMailbox.deleteMsgs(ids_arr);
+                    NotificationCenter.getInstance().postNotificationName(NotificationCenter.messagesDeleted, ids_list, 0);
                 }
 
                 actionBar.hideActionMode();

MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java

@@ -137,8 +137,11 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
                     }
                     int i, icnt = selectedContacts.size();
                     for( i = 0; i < icnt; i++ ) {
-                        if( 0==MrMailbox.addContactToChat(chat_id, selectedContacts.get(i)) ) {
-                            Toast.makeText(getParentActivity(), "ErrAddContact", Toast.LENGTH_LONG).show();
+                        int contact_id = selectedContacts.get(i);
+                        if( contact_id != MrContact.MR_CONTACT_ID_SELF ) {
+                            if (0 == MrMailbox.addContactToChat(chat_id, contact_id)) {
+                                Toast.makeText(getParentActivity(), "ErrAddContactToGroup", Toast.LENGTH_LONG).show();
+                            }
                         }
                     }
 

MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java

@@ -1288,9 +1288,12 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
         menuItem.addSubItem(gallery_menu_openin, str, 0);
         menuItem.addSubItem(gallery_menu_save, LocaleController.getString("SaveToGallery", R.string.SaveToGallery), 0);
         //menuItem.addSubItem(gallery_menu_showall, LocaleController.getString("ShowAllMedia", R.string.ShowAllMedia), 0);
-        menuItem.addSubItem(gallery_menu_share, LocaleController.getString("ShareFile", R.string.ShareFile), 0);
-        menuItem.addSubItem(gallery_menu_forward, LocaleController.getString("Forward", R.string.Forward), 0);
-        menuItem.addSubItem(gallery_menu_delete, LocaleController.getString("Delete", R.string.Delete), 0);
+
+        // the following 3 options are disabled for the moment, we'll add them if we have the time (bp)
+        // (as a replacement, you can use "save to gallery" for sharing or the options from the chat for forwarding/delete)
+        //menuItem.addSubItem(gallery_menu_share, LocaleController.getString("ShareFile", R.string.ShareFile), 0);
+        //menuItem.addSubItem(gallery_menu_forward, LocaleController.getString("Forward", R.string.Forward), 0);
+        //menuItem.addSubItem(gallery_menu_delete, LocaleController.getString("Delete", R.string.Delete), 0);
 
         //captionDoneItem = menu.addItemWithWidth(gallery_menu_caption_done, R.drawable.ic_done, AndroidUtilities.dp(56));
         //captionItem = menu.addItemWithWidth(gallery_menu_caption, R.drawable.photo_text, AndroidUtilities.dp(56));

MessengerProj/src/main/res/layout/popup_count_layout.xml

@@ -4,7 +4,6 @@
     android:layout_alignParentRight="true">
 
     <TextView
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="match_parent"
         android:layout_width="56dp"
         android:id="@+id/count_text"

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

@@ -13,11 +13,11 @@
     <string name="Yesterday">gestern</string>
     <string name="NoResult">Keine Ergebnisse</string>
     <string name="NoChats">Noch keine Chats.</string>
-    <string name="WaitingForNetwork">Warte auf Netzwerk...</string>
-    <string name="Connecting">Verbinde…</string>
-    <string name="Updating">Aktualisiere…</string>
+    <string name="WaitingForNetwork">Warte auf Netzwerk …</string>
+    <string name="Connecting">Verbinde …</string>
+    <string name="Updating">Aktualisiere …</string>
     <string name="DeleteChat">Chat löschen</string>
-    <string name="SelectChat">Chat auswählen ...</string>
+    <string name="SelectChat">Chat auswählen …</string>
     <string name="Search">Suche</string>
     <string name="MuteNotifications">Stummschalten</string>
     <string name="MuteFor">Stumm für %1$s</string>
@@ -34,7 +34,7 @@
     <string name="FreeOfTotal">Freier Speicher: %1$s von %2$s</string>
     <string name="UnknownError">Unbekannter Fehler</string>
     <string name="AccessError">Zugriffsfehler</string>
-    <string name="NoFiles">Noch keine Dateien…</string>
+    <string name="NoFiles">Noch keine Dateien …</string>
     <string name="FileUploadLimit">Die Datei darf nicht größer als %1$s sein</string>
     <string name="NotMounted">Speicher nicht eingebunden</string>
     <string name="UsbActive">USB-Transfer aktiv</string>
@@ -61,11 +61,11 @@
     <string name="SaveToMusic">Musik speichern</string>
     <string name="ShareFile">Teilen</string>
     <string name="UnsupportedAttachment">Nicht unterstützte Datei</string>
-    <string name="OpenInBrowser">ÖFFNEN MIT...</string>
+    <string name="OpenInBrowser">ÖFFNEN MIT …</string>
     <string name="SendItems">%1$s senden</string>
     <string name="OpenUrlAlert">URL %1$s öffnen?</string>
     <string name="MoreInfo">Mehr Infos</string>
-    <string name="ShareSendTo">Sende an...</string>
+    <string name="ShareSendTo">Sende an …</string>
     <string name="ClearRecentEmoji">Zuletzt benutzte Emoji leeren?</string>
     <string name="AddShortcut">Auf Startbildschirm platzieren</string>
     <string name="ShortcutAdded">Widget zum Startbildschirm hinzugefügt</string>
@@ -81,7 +81,7 @@
     <string name="LastSeen">zul. online</string>
     <string name="LastSeenDate">zul. online</string>
     <!--group create view-->
-    <string name="SendMessageTo">Sende Nachricht an…</string>
+    <string name="SendMessageTo">Sende Nachricht an …</string>
     <string name="EnterGroupNamePlaceholder">Gruppenname</string>
     <string name="ShareLink">Link teilen</string>
     <!--group info view-->
@@ -141,7 +141,7 @@
     <string name="NotificationsServiceConnection">Hintergrundverbindung</string>
     <string name="NotificationsServiceConnectionInfo">Nutzt eine batterieschonende Hintergrundverbindung, um Benachrichtigungen zu gewährleisten.</string>
     <string name="LedColor">LED-Farbe</string>
-    <string name="BadgeNumber">Anzahl in Popup anzeigen</string>
+    <string name="BadgeNumber">Anzahl auf Icon anzeigen, wenn möglich</string>
     <string name="Short">Kurz</string>
     <string name="Long">Lang</string>
     <string name="SystemDefault">Systemvorgabe</string>
@@ -247,7 +247,7 @@
     <string name="ClearButton">Löschen</string>
     <string name="PickerPhotos">Bilder</string>
     <string name="PickerVideo">Video</string>
-    <string name="AddCaption">Beschriftung...</string>
+    <string name="AddCaption">Beschriftung …</string>
     <string name="PhotoCaption">Bildbeschriftung</string>
     <string name="VideoCaption">Videobeschriftung</string>
     <string name="Caption">Beschriftung</string>
@@ -259,7 +259,7 @@
     <string name="EditVideo">Video bearbeiten</string>
     <string name="OriginalVideo">Originalvideo</string>
     <string name="EditedVideo">Bearbeitetes Video</string>
-    <string name="SendingVideo">Sende Video...</string>
+    <string name="SendingVideo">Sende Video …</string>
     <string name="CompressVideo">Video komprimieren</string>
     <!--button titles-->
     <string name="Next">Weiter</string>
@@ -293,7 +293,7 @@
     <string name="AttachAudio">Sprachnachricht</string>
     <string name="FromSelf">Ich</string>
     <!--Alert messages-->
-    <string name="Loading">Lädt…</string>
+    <string name="Loading">Lädt …</string>
     <string name="NoPlayerInstalled">Du hast keinen Videoplayer. Bitte installiere einen um fortzufahren.</string>
     <string name="NoHandleAppInstalled">Du hast keine Applikationen, die den Dateityp \'%1$s\' öffnen könnten. Bitte installiere eine entsprechende Anwendung um fortzufahren.</string>
     <string name="AddToTheGroupTitle">%1$s dem Chat %2$s hinzufügen?</string>
@@ -521,10 +521,10 @@
     <string name="ContactDeleted">Benutzer gelöscht.</string>
     <string name="ContactCreated">Benutzer angelegt.</string>
     <string name="ViewProfile">Profil anzeigen</string>
-    <string name="OneMomentPlease">Einen Moment, bitte...</string>
+    <string name="OneMomentPlease">Einen Moment, bitte …</string>
     <string name="NoChatsHelp">Unten auf das Plussymbol für die erste Chatnachricht tippen; der Menüknopf öffnet die weiteren Optionen.</string>
     <string name="CannotDeleteChat">Kann Chat nicht löschen</string>
-    <string name="ConfiguringAccount">Konto konfigurieren...</string>
+    <string name="ConfiguringAccount">Konto konfigurieren …</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>
@@ -548,5 +548,5 @@
     <string name="E2EManagePrivateKeys">Private Schlüssel verwalten</string>
     <string name="E2ECompareKeys">Schlüssel vergleichen</string>
     <string name="ResetUserKey">Benutzerschlüssel zurücksetzen</string>
-    <string name="ForwardToTitle">Weiterleiten an ...</string>
+    <string name="ForwardToTitle">Weiterleiten an …</string>
 </resources>

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

@@ -13,11 +13,11 @@
     <string name="Yesterday">ayer</string>
     <string name="NoResult">Sin resultados</string>
     <string name="NoChats">Aún sin chats.</string>
-    <string name="WaitingForNetwork">Esperando red...</string>
-    <string name="Connecting">Conectando...</string>
-    <string name="Updating">Actualizando...</string>
+    <string name="WaitingForNetwork">Esperando red…</string>
+    <string name="Connecting">Conectando…</string>
+    <string name="Updating">Actualizando…</string>
     <string name="DeleteChat">Eliminar chat</string>
-    <string name="SelectChat">Elige el chat ...</string>
+    <string name="SelectChat">Elige el chat …</string>
     <string name="Search">Buscar</string>
     <string name="MuteNotifications">Silenciar notificaciones</string>
     <string name="MuteFor">Silenciar %1$s</string>
@@ -34,7 +34,7 @@
     <string name="FreeOfTotal">%1$s de %2$s libres</string>
     <string name="UnknownError">Error desconocido</string>
     <string name="AccessError">Error de acceso</string>
-    <string name="NoFiles">Aún sin archivos...</string>
+    <string name="NoFiles">Aún sin archivos…</string>
     <string name="FileUploadLimit">El archivo no debe superar los %1$s</string>
     <string name="NotMounted">Almacenamiento no montado</string>
     <string name="UsbActive">Transferencia USB activa</string>
@@ -61,11 +61,11 @@
     <string name="SaveToMusic">Guardar en música</string>
     <string name="ShareFile">Compartir</string>
     <string name="UnsupportedAttachment">Adjunto no soportado</string>
-    <string name="OpenInBrowser">ABRIR EN...</string>
+    <string name="OpenInBrowser">ABRIR EN…</string>
     <string name="SendItems">Enviar %1$s</string>
     <string name="OpenUrlAlert">¿Abrir %1$s?</string>
     <string name="MoreInfo">Más información</string>
-    <string name="ShareSendTo">Enviar a...</string>
+    <string name="ShareSendTo">Enviar a…</string>
     <string name="ClearRecentEmoji">¿Borrar los emojis recientes?</string>
     <string name="AddShortcut">Añadir acceso directo</string>
     <string name="ShortcutAdded">Acceso directo añadido al escritorio</string>
@@ -81,7 +81,7 @@
     <string name="LastSeen">últ. vez</string>
     <string name="LastSeenDate">últ. vez el</string>
     <!--group create view-->
-    <string name="SendMessageTo">Invitar a...</string>
+    <string name="SendMessageTo">Invitar a…</string>
     <string name="EnterGroupNamePlaceholder">Nombre del grupo</string>
     <string name="ShareLink">Compartir enlace</string>
     <!--group info view-->
@@ -247,7 +247,7 @@
     <string name="ClearButton">Borrar</string>
     <string name="PickerPhotos">Fotos</string>
     <string name="PickerVideo">Vídeo</string>
-    <string name="AddCaption">Añadir un comentario...</string>
+    <string name="AddCaption">Añadir un comentario…</string>
     <string name="PhotoCaption">Comentario de foto</string>
     <string name="VideoCaption">Comentario de vídeo</string>
     <string name="Caption">Comentario</string>
@@ -259,7 +259,7 @@
     <string name="EditVideo">Editar vídeo</string>
     <string name="OriginalVideo">Vídeo original</string>
     <string name="EditedVideo">Vídeo editado</string>
-    <string name="SendingVideo">Enviando vídeo...</string>
+    <string name="SendingVideo">Enviando vídeo…</string>
     <string name="CompressVideo">Comprimir Vídeo</string>
     <!--button titles-->
     <string name="Next">Siguiente</string>
@@ -293,7 +293,7 @@
     <string name="AttachAudio">Mensaje de voz</string>
     <string name="FromSelf">Tú</string>
     <!--Alert messages-->
-    <string name="Loading">Cargando...</string>
+    <string name="Loading">Cargando…</string>
     <string name="NoPlayerInstalled">No tienes reproductor de vídeo. Por favor, instala uno para continuar.</string>
     <string name="NoHandleAppInstalled">No tienes aplicaciones que puedan manejar el tipo de archivo “%1$s”. Por favor, instala una para continuar.</string>
     <string name="AddToTheGroupTitle">¿Añadir a %1$s al chat %2$s?</string>
@@ -448,5 +448,5 @@
     <string name="Media">Multimedia</string>
     <string name="SeachUser">Buscar</string>
     <string name="InviteMenuEntry">Invitar a amigos</string>
-    <string name="ForwardToTitle">Elige el chat ...</string>
+    <string name="ForwardToTitle">Elige el chat …</string>
 </resources>

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

@@ -13,11 +13,11 @@
     <string name="Yesterday">ieri</string>
     <string name="NoResult">Nessun risultato</string>
     <string name="NoChats">Ancora nessuna chat.</string>
-    <string name="WaitingForNetwork">Attendo la rete...</string>
+    <string name="WaitingForNetwork">Attendo la rete…</string>
     <string name="Connecting">Connetto…</string>
     <string name="Updating">Aggiorno…</string>
     <string name="DeleteChat">Elimina chat</string>
-    <string name="SelectChat">Seleziona chat ...</string>
+    <string name="SelectChat">Seleziona chat …</string>
     <string name="Search">Cerca</string>
     <string name="MuteNotifications">Silenzia notifiche</string>
     <string name="MuteFor">Silenzia per %1$s</string>
@@ -34,7 +34,7 @@
     <string name="FreeOfTotal">Liberi %1$s di %2$s</string>
     <string name="UnknownError">Errore sconosciuto</string>
     <string name="AccessError">Errore durante l\'accesso</string>
-    <string name="NoFiles">Ancora nessun file...</string>
+    <string name="NoFiles">Ancora nessun file…</string>
     <string name="FileUploadLimit">La dimensione del file non dovrebbe superare i %1$s</string>
     <string name="NotMounted">Archiviazione non montata</string>
     <string name="UsbActive">Trasferimento USB attivo</string>
@@ -61,11 +61,11 @@
     <string name="SaveToMusic">Salva nella musica</string>
     <string name="ShareFile">Condividi</string>
     <string name="UnsupportedAttachment">Allegato non supportato</string>
-    <string name="OpenInBrowser">APRI IN...</string>
+    <string name="OpenInBrowser">APRI IN…</string>
     <string name="SendItems">Invia %1$s</string>
     <string name="OpenUrlAlert">Aprire url %1$s?</string>
     <string name="MoreInfo">Maggiori info</string>
-    <string name="ShareSendTo">Invia a...</string>
+    <string name="ShareSendTo">Invia a…</string>
     <string name="ClearRecentEmoji">Cancellare le emoji recenti?</string>
     <string name="AddShortcut">Aggiungi scorciatoia</string>
     <string name="ShortcutAdded">Scorciatoia aggiunta alla schermata home</string>
@@ -81,7 +81,7 @@
     <string name="LastSeen">ultimo accesso</string>
     <string name="LastSeenDate">ultimo accesso</string>
     <!--group create view-->
-    <string name="SendMessageTo">Invia messaggio a...</string>
+    <string name="SendMessageTo">Invia messaggio a…</string>
     <string name="EnterGroupNamePlaceholder">Immetti il nome del gruppo</string>
     <string name="ShareLink">Condividi link</string>
     <!--group info view-->
@@ -247,7 +247,7 @@
     <string name="ClearButton">Cancella</string>
     <string name="PickerPhotos">Foto</string>
     <string name="PickerVideo">Video</string>
-    <string name="AddCaption">Aggiungi una didascalia...</string>
+    <string name="AddCaption">Aggiungi una didascalia…</string>
     <string name="PhotoCaption">Didascalia foto</string>
     <string name="VideoCaption">Didascalia video</string>
     <string name="Caption">Didascalia</string>
@@ -259,7 +259,7 @@
     <string name="EditVideo">Modifica video</string>
     <string name="OriginalVideo">Video originale</string>
     <string name="EditedVideo">Video modificato</string>
-    <string name="SendingVideo">Invio video...</string>
+    <string name="SendingVideo">Invio video…</string>
     <string name="CompressVideo">Comprimi video</string>
     <!--button titles-->
     <string name="Next">Avanti</string>
@@ -456,5 +456,5 @@
     <string name="Media">Media</string>
     <string name="SeachUser">Cerca</string>
     <string name="InviteMenuEntry">Invita amici</string>
-    <string name="ForwardToTitle">Seleziona chat ...</string>
+    <string name="ForwardToTitle">Seleziona chat …</string>
 </resources>

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

@@ -17,7 +17,7 @@
     <string name="Connecting">Verbinden</string>
     <string name="Updating">Bijwerken</string>
     <string name="DeleteChat">Chat verwijderen</string>
-    <string name="SelectChat">Kies een chat ...</string>
+    <string name="SelectChat">Kies een chat …</string>
     <string name="Search">Zoeken</string>
     <string name="MuteNotifications">Meldingen stil</string>
     <string name="MuteFor">%1$s stil</string>
@@ -61,11 +61,11 @@
     <string name="SaveToMusic">Opslaan in muziek</string>
     <string name="ShareFile">Delen</string>
     <string name="UnsupportedAttachment">Bestandstype niet ondersteund</string>
-    <string name="OpenInBrowser">OPENEN IN...</string>
+    <string name="OpenInBrowser">OPENEN IN…</string>
     <string name="SendItems">%1$s versturen</string>
     <string name="OpenUrlAlert">URL %1$s openen?</string>
     <string name="MoreInfo">Meer informatie</string>
-    <string name="ShareSendTo">Versturen naar...</string>
+    <string name="ShareSendTo">Versturen naar…</string>
     <string name="ClearRecentEmoji">Recente emoji\'s wissen?</string>
     <string name="AddShortcut">Snelkoppeling toevoegen</string>
     <string name="ShortcutAdded">Snelkoppeling aan startscherm toegevoegd</string>
@@ -448,5 +448,5 @@
     <string name="Media">Media</string>
     <string name="SeachUser">Zoeken</string>
     <string name="InviteMenuEntry">Vrienden uitnodigen</string>
-    <string name="ForwardToTitle">Kies een chat ...</string>
+    <string name="ForwardToTitle">Kies een chat …</string>
 </resources>

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

@@ -13,11 +13,11 @@
     <string name="Yesterday">ontem</string>
     <string name="NoResult">Nenhum resultado</string>
     <string name="NoChats">Ainda não há chats.</string>
-    <string name="WaitingForNetwork">Aguardando rede...</string>
-    <string name="Connecting">Conectando...</string>
-    <string name="Updating">Atualizando...</string>
+    <string name="WaitingForNetwork">Aguardando rede…</string>
+    <string name="Connecting">Conectando…</string>
+    <string name="Updating">Atualizando…</string>
     <string name="DeleteChat">Apagar conversa</string>
-    <string name="SelectChat">Selecione um Chat ...</string>
+    <string name="SelectChat">Selecione um Chat …</string>
     <string name="Search">Busca</string>
     <string name="MuteNotifications">Silenciar notificações</string>
     <string name="MuteFor">Silenciar por %1$s</string>
@@ -61,11 +61,11 @@
     <string name="SaveToMusic">Salvar em músicas</string>
     <string name="ShareFile">Compartilhar</string>
     <string name="UnsupportedAttachment">Anexo não suportado</string>
-    <string name="OpenInBrowser">ABRIR EM...</string>
+    <string name="OpenInBrowser">ABRIR EM…</string>
     <string name="SendItems">Enviar %1$s</string>
     <string name="OpenUrlAlert">Abrir URL em %1$s?</string>
     <string name="MoreInfo">Mais informações</string>
-    <string name="ShareSendTo">Enviar para...</string>
+    <string name="ShareSendTo">Enviar para…</string>
     <string name="ClearRecentEmoji">Limpar emojis recentes?</string>
     <string name="AddShortcut">Adicionar atalho</string>
     <string name="ShortcutAdded">Atalho adicionado à tela de início</string>
@@ -81,7 +81,7 @@
     <string name="LastSeen">visto</string>
     <string name="LastSeenDate">visto</string>
     <!--group create view-->
-    <string name="SendMessageTo">Enviar mensagem para...</string>
+    <string name="SendMessageTo">Enviar mensagem para…</string>
     <string name="EnterGroupNamePlaceholder">Digite o nome do grupo</string>
     <string name="ShareLink">Compartilhar Link</string>
     <!--group info view-->
@@ -247,7 +247,7 @@
     <string name="ClearButton">Limpar</string>
     <string name="PickerPhotos">Fotos</string>
     <string name="PickerVideo">Vídeo</string>
-    <string name="AddCaption">Adicionar legenda...</string>
+    <string name="AddCaption">Adicionar legenda…</string>
     <string name="PhotoCaption">Legenda da Foto</string>
     <string name="VideoCaption">Legenda do Vídeo</string>
     <string name="Caption">Legenda</string>
@@ -259,7 +259,7 @@
     <string name="EditVideo">Editar Vídeo</string>
     <string name="OriginalVideo">Vídeo Original</string>
     <string name="EditedVideo">Vídeo Editado</string>
-    <string name="SendingVideo">Enviando vídeo...</string>
+    <string name="SendingVideo">Enviando vídeo…</string>
     <string name="CompressVideo">Compactar Vídeo</string>
     <!--button titles-->
     <string name="Next">Próximo</string>
@@ -293,7 +293,7 @@
     <string name="AttachAudio">Mensagem de voz</string>
     <string name="FromSelf">Você</string>
     <!--Alert messages-->
-    <string name="Loading">Carregando...</string>
+    <string name="Loading">Carregando…</string>
     <string name="NoPlayerInstalled">Você não possui um reprodutor de vídeo, instale um para continuar</string>
     <string name="NoHandleAppInstalled">Você não possui um aplicativo que suporte o tipo de arquivo \'%1$s\', por favor instale um para continuar</string>
     <string name="AddToTheGroupTitle">Adcione %1$s ao chat %2$s?</string>
@@ -448,5 +448,5 @@
     <string name="Media">Mídias</string>
     <string name="SeachUser">Busca</string>
     <string name="InviteMenuEntry">Convidar Amigos</string>
-    <string name="ForwardToTitle">Selecione um Chat ...</string>
+    <string name="ForwardToTitle">Selecione um Chat …</string>
 </resources>

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

@@ -13,11 +13,11 @@
     <string name="Yesterday">yesterday</string>
     <string name="NoResult">No results.</string>
     <string name="NoChats">No chats yet.</string>
-    <string name="WaitingForNetwork">Waiting for network...</string>
-    <string name="Connecting">Connecting...</string>
-    <string name="Updating">Updating...</string>
+    <string name="WaitingForNetwork">Waiting for network …</string>
+    <string name="Connecting">Connecting …</string>
+    <string name="Updating">Updating …</string>
     <string name="DeleteChat">Delete chat</string>
-    <string name="SelectChat">Select chat ...</string>
+    <string name="SelectChat">Select chat …</string>
     <string name="Search">Search</string>
     <string name="MuteNotifications">Mute notifications</string>
     <string name="MuteFor">Mute for %1$s</string>
@@ -34,7 +34,7 @@
     <string name="FreeOfTotal">Free %1$s of %2$s</string>
     <string name="UnknownError">Unknown error</string>
     <string name="AccessError">Access error</string>
-    <string name="NoFiles">No files yet...</string>
+    <string name="NoFiles">No files yet …</string>
     <string name="FileUploadLimit">File size shouldn\'t be greater than %1$s</string>
     <string name="NotMounted">Storage not mounted</string>
     <string name="UsbActive">USB transfer active</string>
@@ -61,11 +61,11 @@
     <string name="SaveToMusic">Save to music</string>
     <string name="ShareFile">Share</string>
     <string name="UnsupportedAttachment">Unsupported attachment</string>
-    <string name="OpenInBrowser">OPEN IN...</string>
+    <string name="OpenInBrowser">OPEN IN …</string>
     <string name="SendItems">Send %1$s</string>
     <string name="OpenUrlAlert">Open url %1$s?</string>
     <string name="MoreInfo">More info</string>
-    <string name="ShareSendTo">Send to...</string>
+    <string name="ShareSendTo">Send to …</string>
     <string name="ClearRecentEmoji">Clear recent emoji?</string>
     <string name="AddShortcut">Add widget to home screen</string>
     <string name="ShortcutAdded">Widget added to home screen</string>
@@ -81,7 +81,7 @@
     <string name="LastSeen">last seen</string>
     <string name="LastSeenDate">last seen</string>
     <!--group create view-->
-    <string name="SendMessageTo">Send message to...</string>
+    <string name="SendMessageTo">Send message to …</string>
     <string name="EnterGroupNamePlaceholder">Enter group name</string>
     <string name="ShareLink">Share Link</string>
     <!--group info view-->
@@ -141,7 +141,7 @@
     <string name="NotificationsServiceConnection">Background connection</string>
     <string name="NotificationsServiceConnectionInfo">Keep a low impact background connection to receive notifications. Enable for reliable notifications.</string>
     <string name="LedColor">LED color</string>
-    <string name="BadgeNumber">Show count in popup</string>
+    <string name="BadgeNumber">Show count on icon if possible</string>
     <string name="Short">Short</string>
     <string name="Long">Long</string>
     <string name="SystemDefault">System default</string>
@@ -193,6 +193,7 @@
     <string name="EnterYourPasscode">Enter your passcode</string>
     <string name="ReEnterYourPasscode">Re-enter your new passcode</string>
     <string name="PasscodeDoNotMatch">Passcodes do not match</string>
+    <string name="AutoLock">Autolock</string>
     <string name="AutoLockInfo">Require passcode if away for a time.</string>
     <string name="AutoLockInTime">in %1$s</string>
     <string name="UnlockFingerprint">Unlock with Fingerprint</string>
@@ -246,7 +247,7 @@
     <string name="ClearButton">Clear</string>
     <string name="PickerPhotos">Photos</string>
     <string name="PickerVideo">Video</string>
-    <string name="AddCaption">Add a caption...</string>
+    <string name="AddCaption">Add a caption …</string>
     <string name="PhotoCaption">Photo Caption</string>
     <string name="VideoCaption">Video Caption</string>
     <string name="Caption">Caption</string>
@@ -258,7 +259,7 @@
     <string name="EditVideo">Edit Video</string>
     <string name="OriginalVideo">Original Video</string>
     <string name="EditedVideo">Edited Video</string>
-    <string name="SendingVideo">Sending video...</string>
+    <string name="SendingVideo">Sending video …</string>
     <string name="CompressVideo">Compress Video</string>
     <!--button titles-->
     <string name="Next">Next</string>
@@ -292,7 +293,7 @@
     <string name="AttachAudio">Voice message</string>
     <string name="FromSelf">Me</string>
     <!--Alert messages-->
-    <string name="Loading">Loading...</string>
+    <string name="Loading">Loading …</string>
     <string name="NoPlayerInstalled">You don\'t have a video player, please install one to continue</string>
     <string name="NoHandleAppInstalled">You don\'t have applications that can handle the file type \'%1$s\', please install one to continue</string>
     <string name="AddToTheGroupTitle">Add %1$s to the chat %2$s?</string>
@@ -519,10 +520,10 @@
     <string name="ContactDeleted">User deleted.</string>
     <string name="ContactCreated">User created.</string>
     <string name="ViewProfile">View profile</string>
-    <string name="OneMomentPlease">One moment, please...</string>
+    <string name="OneMomentPlease">One moment, please …</string>
     <string name="CannotDeleteChat">Cannot delete chat.</string>
     <string name="NoChatsHelp">Start messaging by pressing the new chat button in the bottom right corner or tap the menu button for more options.</string>
-    <string name="ConfiguringAccount">Configuring account...</string>
+    <string name="ConfiguringAccount">Configuring account …</string>
     <string name="CannotConnect">Cannot connect, please check the configuration.</string>
     <string name="Intro7Message"><![CDATA[<b>Delta Chat</b>]]> is safe for business use, compatible and standards-based.</string>
     <string name="InviteMenuEntry">Send invitations</string>
@@ -548,5 +549,5 @@
     <string name="E2EManagePrivateKeys">Manage private keys</string>
     <string name="E2ECompareKeys">Compare keys</string>
     <string name="ResetUserKey">Reset user\'s key</string>
-    <string name="ForwardToTitle">Forward to ...</string>
+    <string name="ForwardToTitle">Forward to …</string>
 </resources>