Fixed some bugs, upload locales

TMessagesProj/build.gradle

@@ -83,7 +83,7 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 19
-        versionCode 279
+        versionCode 280
         versionName "1.6.0"
     }
 }

TMessagesProj/jni/Android.mk

@@ -234,6 +234,7 @@ LOCAL_SRC_FILES     += \
 ./audio.c \
 ./gif.c \
 ./utils.c \
-./image.c
+./image.c \
+./fake.c
 
 include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file

TMessagesProj/jni/fake.c

+#include <stdio.h>
+
+void fakeFunction() {
+    printf("some androids has buggy native loader, so i should check size of libs in java to know that native library is correct. So each changed native library should has diffrent size in different app versions. This function will increase lib size for few bytes :)");
+    printf("bla blablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablabla");
+}

TMessagesProj/src/main/java/org/telegram/android/MessagesController.java

@@ -1346,9 +1346,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter
                             loadingDialogs = false;
                             if (resetEnd) {
                                 dialogsEndReached = false;
-                                NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
                             }
                             loadDialogs(offset, serverOffset, count, false);
+                            NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
                         }
                     });
                     return;

TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java

@@ -876,7 +876,7 @@ public class MessagesStorage {
                                 if (arg.startsWith(q)) {
                                     ByteBufferDesc data = buffersStorage.getFreeBuffer(cursor.byteArrayLength(0));
                                     ByteBufferDesc data2 = buffersStorage.getFreeBuffer(cursor.byteArrayLength(6));
-                                    if (data != null && cursor.byteBufferValue(0, data.buffer) != 0 && cursor.byteBufferValue(0, data2.buffer) != 0) {
+                                    if (data != null && cursor.byteBufferValue(0, data.buffer) != 0 && cursor.byteBufferValue(6, data2.buffer) != 0) {
                                         TLRPC.EncryptedChat chat = (TLRPC.EncryptedChat) TLClassStore.Instance().TLdeserialize(data, data.readInt32());
                                         chat.user_id = cursor.intValue(2);
                                         chat.a_or_b = cursor.byteArrayValue(3);

TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java

@@ -24,9 +24,9 @@ import java.util.zip.ZipFile;
 public class NativeLoader {
 
     private static final long sizes[] = new long[] {
-            795280,     //armeabi
-            844452,     //armeabi-v7a
-            1242164,    //x86
+            799376,     //armeabi
+            848548,     //armeabi-v7a
+            1246260,    //x86
             0,          //mips
     };
 

TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java

@@ -235,6 +235,10 @@ public class NotificationsController {
             }
 
             TLRPC.User user = MessagesController.getInstance().users.get(user_id);
+            TLRPC.Chat chat = null;
+            if (chat_id != 0) {
+                chat = MessagesController.getInstance().chats.get(chat_id);
+            }
             TLRPC.FileLocation photoPath = null;
 
             boolean notifyDisabled = false;
@@ -306,8 +310,16 @@ public class NotificationsController {
                 } else if (user_id != 0) {
                     intent.putExtra("userId", user_id);
                 }
-                if (pushDialogs.size() == 1 && user.photo != null && user.photo.photo_small != null && user.photo.photo_small.volume_id != 0 && user.photo.photo_small.local_id != 0) {
-                    photoPath = user.photo.photo_small;
+                if (pushDialogs.size() == 1) {
+                    if (chat != null) {
+                        if (chat.photo != null && chat.photo.photo_small != null && chat.photo.photo_small.volume_id != 0 && chat.photo.photo_small.local_id != 0) {
+                            photoPath = chat.photo.photo_small;
+                        }
+                    } else {
+                        if (user.photo != null && user.photo.photo_small != null && user.photo.photo_small.volume_id != 0 && user.photo.photo_small.local_id != 0) {
+                            photoPath = user.photo.photo_small;
+                        }
+                    }
                 }
             } else {
                 intent.putExtra("encId", (int)(dialog_id >> 32));
@@ -320,7 +332,11 @@ public class NotificationsController {
                 name = LocaleController.getString("AppName", R.string.AppName);
                 replace = false;
             } else {
-                name = Utilities.formatName(user.first_name, user.last_name);
+                if (chat != null) {
+                    name = chat.title;
+                } else {
+                    name = Utilities.formatName(user.first_name, user.last_name);
+                }
             }
 
             String detailText = null;
@@ -351,7 +367,11 @@ public class NotificationsController {
                 }
                 if (pushDialogs.size() == 1) {
                     if (replace) {
-                        message = message.replace(name + ": ", "").replace(name + " ", "");
+                        if (chat != null) {
+                            message = message.replace(" @ " + name, "");
+                        } else {
+                            message = message.replace(name + ": ", "").replace(name + " ", "");
+                        }
                     }
                 }
                 inboxStyle.addLine(message);

TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java

@@ -389,11 +389,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                     }
                 }
             });
-
-            if (MessagesController.getInstance().loadingDialogs) {
-                progressView.setVisibility(View.VISIBLE);
-            }
-
         } else {
             ViewGroup parent = (ViewGroup)fragmentView.getParent();
             if (parent != null) {

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

@@ -22,7 +22,7 @@
     <string name="Calling">Ti stiamo chiamando…</string>
     <string name="Code">Codice</string>
     <string name="WrongNumber">Numero errato?</string>
-    <string name="DidNotGetTheCode">Didn\'t get the code?</string>
+    <string name="DidNotGetTheCode">Non hai ricevuto il codice?</string>
 
     <!--signup view-->
     <string name="YourName">Il tuo nome</string>
@@ -110,7 +110,7 @@
     <string name="SlideToCancel">TRASCINA PER ANNULLARE</string>
     <string name="SaveToDownloads">Salva in download</string>
     <string name="ApplyLocalizationFile">Applica file di localizzazione</string>
-    <string name="UnsupportedAttachment">Unsupported attachment</string>
+    <string name="UnsupportedAttachment">Allegato non supportato</string>
 
     <!--notification-->
     <string name="EncryptedChatRequested">Chat segreta richiesta</string>
@@ -171,7 +171,7 @@
     <string name="EnterGroupNamePlaceholder">Immetti il nome del gruppo</string>
     <string name="GroupName">Nome gruppo</string>
     <string name="AllContacts">TUTTI I CONTATTI</string>
-    <string name="MembersCount">%1$d/%2$d members</string>
+    <string name="MembersCount">%1$d/%2$d membri</string>
 
     <!--group info view-->
     <string name="EnterGroupNameTitle">INSERISCI IL NOME DEL GRUPPO</string>
@@ -269,12 +269,12 @@
     <string name="WiFiOnly">Solo tramite WiFi</string>
     <string name="SortFirstName">Nome</string>
     <string name="SortLastName">Cognome</string>
-    <string name="LedColor">LED Color</string>
-    <string name="PopupNotification">Popup Notification</string>
-    <string name="NoPopup">No popup</string>
-    <string name="OnlyWhenScreenOn">Only when screen "on"</string>
-    <string name="OnlyWhenScreenOff">Only when screen "off"</string>
-    <string name="AlwaysShowPopup">Always show popup</string>
+    <string name="LedColor">Colore LED</string>
+    <string name="PopupNotification">Notifica popup</string>
+    <string name="NoPopup">Nessun popup</string>
+    <string name="OnlyWhenScreenOn">Solo con schermo acceso</string>
+    <string name="OnlyWhenScreenOff">Solo con schermo spento</string>
+    <string name="AlwaysShowPopup">Mostra sempre i popup</string>
 
     <!--media view-->
     <string name="NoMedia">Nessun media condiviso</string>
@@ -356,25 +356,25 @@
     <string name="InvalidLastName">Cognome non valido</string>
     <string name="Loading">Caricamento…</string>
     <string name="NoPlayerInstalled">Non hai un lettore video, per favore installane uno per continuare</string>
-    <string name="NoMailInstalled">Please send an email to sms@telegram.org and explain your problem.</string>
+    <string name="NoMailInstalled">Invia un’email a sms@telegram.org spiegandoci il problema.</string>
     <string name="NoHandleAppInstalled">Non hai nessuna applicazione che può gestire il tipo mime \'%1$s\', installane una per continuare</string>
     <string name="InviteUser">Questo utente non ha ancora Telegram, vuoi invitarlo?</string>
     <string name="AreYouSure">Sei sicuro?</string>
     <string name="AddContactQ">Vuoi aggiungere il contatto?</string>
-    <string name="AddToTheGroup">Add %1$s to the group?\n\nNumber of last messages to forward:</string>
+    <string name="AddToTheGroup">Aggiungere %1$s al gruppo?\n\nNumero di messaggi recenti da inoltrare:</string>
     <string name="ForwardMessagesTo">Vuoi inoltrare i messaggi a %1$s?</string>
     <string name="DeleteChatQuestion">Vuoi eliminare questa chat?</string>
-    <string name="SendMessagesTo">Send messages to %1$s?</string>
-    <string name="AreYouSureLogout">Are you sure you want to logout?</string>
-    <string name="AreYouSureSessions">Are you sure you want to terminate all other sessions?</string>
-    <string name="AreYouSureDeleteAndExit">Are you sure you want to delete and leave group?</string>
-    <string name="AreYouSureDeleteThisChat">Are you sure you want to delete this chat?</string>
-    <string name="AreYouSureShareMyContactInfo">Are you sure that you want to share your contact info?</string>
-    <string name="AreYouSureBlockContact">Are you sure you want to block this contact?</string>
-    <string name="AreYouSureUnblockContact">Are you sure you want to unblock this contact?</string>
-    <string name="AreYouSureDeleteContact">Are you sure you want to delete this contact?</string>
-    <string name="AreYouSureSecretChat">Are you sure you want to start secret chat?</string>
-    <string name="ForwardFromMyName">forward from my name</string>
+    <string name="SendMessagesTo">Inviare i messaggi a %1$s?</string>
+    <string name="AreYouSureLogout">Terminare la sessione?</string>
+    <string name="AreYouSureSessions">Chiudere tutte le altre sessioni?</string>
+    <string name="AreYouSureDeleteAndExit">Eliminare il gruppo e uscire da esso?</string>
+    <string name="AreYouSureDeleteThisChat">Eliminare questa chat?</string>
+    <string name="AreYouSureShareMyContactInfo">Condividere le proprie informazioni di contatto?</string>
+    <string name="AreYouSureBlockContact">Bloccare questo contatto?</string>
+    <string name="AreYouSureUnblockContact">Sbloccare questo contatto?</string>
+    <string name="AreYouSureDeleteContact">Eliminare questo contatto?</string>
+    <string name="AreYouSureSecretChat">Iniziare una chat segreta?</string>
+    <string name="ForwardFromMyName">inoltra dal mio nome</string>
 
     <!--Intro view-->
     <string name="Page1Title">Telegram</string>
@@ -394,40 +394,36 @@
     <string name="StartMessaging">Inizia a inviare messaggi</string>
 
     <!--plurals-->
-    <string name="Members_zero">no members</string>
-    <string name="Members_one">%1$d member</string>
-    <string name="Members_two">%1$d members</string>
-    <string name="Members_few">%1$d members</string>
-    <string name="Members_many">%1$d members</string>
-    <string name="Members_other">%1$d members</string>
-
-    <string name="AndMoreTyping_zero">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_one">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_two">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_few">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_many">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_other">and %1$d more people are typing</string>
-
-    <string name="NewMessages_zero">no new messages</string>
-    <string name="NewMessages_one">%1$d new message</string>
-    <string name="NewMessages_two">%1$d new messages</string>
-    <string name="NewMessages_few">%1$d new messages</string>
-    <string name="NewMessages_many">%1$d new messages</string>
-    <string name="NewMessages_other">%1$d new messages</string>
-
-    <string name="messages_zero">no messages</string>
-    <string name="messages_one">%1$d message</string>
-    <string name="messages_two">%1$d messages</string>
-    <string name="messages_few">%1$d messages</string>
-    <string name="messages_many">%1$d messages</string>
-    <string name="messages_other">%1$d messages</string>
-
-    <string name="FromContacts_zero">from no contacts</string>
-    <string name="FromContacts_one">from %1$d contact</string>
-    <string name="FromContacts_two">from %1$d contacts</string>
-    <string name="FromContacts_few">from %1$d contacts</string>
-    <string name="FromContacts_many">from %1$d contacts</string>
-    <string name="FromContacts_other">from %1$d contacts</string>
+    <string name="Members_zero">nessun membro</string>
+    <string name="Members_one">%1$d membro</string>
+    <string name="Members_two">%1$d membri</string>
+    <string name="Members_few">%1$d membri</string>
+    <string name="Members_many">%1$d membri</string>
+    <string name="Members_other">%1$d membri</string>
+    <string name="AndMoreTyping_zero">e %1$d altre persone stanno scrivendo</string>
+    <string name="AndMoreTyping_one">e %1$d altra persona stanno scrivendo</string>
+    <string name="AndMoreTyping_two">e %1$d altre persone stanno scrivendo</string>
+    <string name="AndMoreTyping_few">e %1$d altre persone stanno scrivendo</string>
+    <string name="AndMoreTyping_many">e %1$d altre persone stanno scrivendo</string>
+    <string name="AndMoreTyping_other">e %1$d altre persone stanno scrivendo</string>
+    <string name="NewMessages_zero">nessun nuovo messaggio</string>
+    <string name="NewMessages_one">%1$d nuovo messaggio</string>
+    <string name="NewMessages_two">%1$d nuovi messaggi</string>
+    <string name="NewMessages_few">%1$d nuovi messaggi</string>
+    <string name="NewMessages_many">%1$d nuovi messaggi</string>
+    <string name="NewMessages_other">%1$d nuovi messaggi</string>
+    <string name="messages_zero">nessun messaggio</string>
+    <string name="messages_one">%1$d messaggio</string>
+    <string name="messages_two">%1$d messaggi</string>
+    <string name="messages_few">%1$d messaggi</string>
+    <string name="messages_many">%1$d messaggi</string>
+    <string name="messages_other">%1$d messaggi</string>
+    <string name="FromContacts_zero">da nessun contatto</string>
+    <string name="FromContacts_one">da %1$d contatto</string>
+    <string name="FromContacts_two">da %1$d contatti</string>
+    <string name="FromContacts_few">da %1$d contatti</string>
+    <string name="FromContacts_many">da %1$d contatti</string>
+    <string name="FromContacts_other">da %1$d contatti</string>
 
     <!--Don't change this! Not for localization!-->
     <string name="CacheTag">CACHE_TAG</string>

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

@@ -22,7 +22,7 @@
     <string name="Calling">We bellen je…</string>
     <string name="Code">Code</string>
     <string name="WrongNumber">Verkeerd nummer?</string>
-    <string name="DidNotGetTheCode">Didn\'t get the code?</string>
+    <string name="DidNotGetTheCode">Geen code ontvangen?</string>
 
     <!--signup view-->
     <string name="YourName">Je naam</string>
@@ -110,7 +110,7 @@
     <string name="SlideToCancel">SLEEP OM TE ANNULEREN</string>
     <string name="SaveToDownloads">Opslaan in Downloads</string>
     <string name="ApplyLocalizationFile">Vertaling toepassen</string>
-    <string name="UnsupportedAttachment">Unsupported attachment</string>
+    <string name="UnsupportedAttachment">Bijlageformaat niet ondersteund</string>
 
     <!--notification-->
     <string name="EncryptedChatRequested">Privégesprek aangevraagd</string>
@@ -171,7 +171,7 @@
     <string name="EnterGroupNamePlaceholder">Groepsnaam...</string>
     <string name="GroupName">Groepsnaam</string>
     <string name="AllContacts">ALLE CONTACTEN</string>
-    <string name="MembersCount">%1$d/%2$d members</string>
+    <string name="MembersCount">%1$d/%2$d deelnemers</string>
 
     <!--group info view-->
     <string name="EnterGroupNameTitle">GROEPSNAAM INSTELLEN</string>
@@ -269,12 +269,12 @@
     <string name="WiFiOnly">Alleen via WiFi</string>
     <string name="SortFirstName">Voornaam</string>
     <string name="SortLastName">Achternaam</string>
-    <string name="LedColor">LED Color</string>
-    <string name="PopupNotification">Popup Notification</string>
-    <string name="NoPopup">No popup</string>
-    <string name="OnlyWhenScreenOn">Only when screen "on"</string>
-    <string name="OnlyWhenScreenOff">Only when screen "off"</string>
-    <string name="AlwaysShowPopup">Always show popup</string>
+    <string name="LedColor">LED kleur</string>
+    <string name="PopupNotification">Popup melding</string>
+    <string name="NoPopup">Geen popup</string>
+    <string name="OnlyWhenScreenOn">Alleen wanneer scherm \"aan\" staat</string>
+    <string name="OnlyWhenScreenOff">Alleen wanneer scherm \"uit\" staat</string>
+    <string name="AlwaysShowPopup">Altijd popup tonen</string>
 
     <!--media view-->
     <string name="NoMedia">Nog geen media gedeeld</string>
@@ -356,25 +356,25 @@
     <string name="InvalidLastName">Ongeldige achternaam</string>
     <string name="Loading">Bezig met laden…</string>
     <string name="NoPlayerInstalled">Je hebt geen mediaspeler. Installeer een mediaspeler om door te gaan.</string>
-    <string name="NoMailInstalled">Please send an email to sms@telegram.org and explain your problem.</string>
+    <string name="NoMailInstalled">Stuur aub een emailbericht naar sms@telegram.org en beschrijf uw probleem</string>
     <string name="NoHandleAppInstalled">Je hebt geen applicaties die het MIME-type \'%1$s\' ondersteunen. Installeer een geschikte applicatie om door te gaan.</string>
     <string name="InviteUser">Deze gebruiker heeft nog geen Telegram. Wil je een uitnodiging sturen?</string>
     <string name="AreYouSure">Weet je het zeker?</string>
     <string name="AddContactQ">Contact toevoegen?</string>
-    <string name="AddToTheGroup">Add %1$s to the group?\n\nNumber of last messages to forward:</string>
+    <string name="AddToTheGroup">%1$s toevoegen aan de groep?\n\nAantal recente berichten om door te sturen:</string>
     <string name="ForwardMessagesTo">Berichten doorsturen naar %1$s?</string>
     <string name="DeleteChatQuestion">Dit gesprek verwijderen?</string>
-    <string name="SendMessagesTo">Send messages to %1$s?</string>
-    <string name="AreYouSureLogout">Are you sure you want to logout?</string>
-    <string name="AreYouSureSessions">Are you sure you want to terminate all other sessions?</string>
-    <string name="AreYouSureDeleteAndExit">Are you sure you want to delete and leave group?</string>
-    <string name="AreYouSureDeleteThisChat">Are you sure you want to delete this chat?</string>
-    <string name="AreYouSureShareMyContactInfo">Are you sure that you want to share your contact info?</string>
-    <string name="AreYouSureBlockContact">Are you sure you want to block this contact?</string>
-    <string name="AreYouSureUnblockContact">Are you sure you want to unblock this contact?</string>
-    <string name="AreYouSureDeleteContact">Are you sure you want to delete this contact?</string>
-    <string name="AreYouSureSecretChat">Are you sure you want to start secret chat?</string>
-    <string name="ForwardFromMyName">forward from my name</string>
+    <string name="SendMessagesTo">Berichten naar %1$s verzenden?</string>
+    <string name="AreYouSureLogout">Weet u zeker dat u wil uitloggen?</string>
+    <string name="AreYouSureSessions">Alle andere apparaten afmelden?</string>
+    <string name="AreYouSureDeleteAndExit">Deze groep verlaten en groep verwijderen?</string>
+    <string name="AreYouSureDeleteThisChat">Dit gesprek verwijderen?</string>
+    <string name="AreYouSureShareMyContactInfo">Deze contact-informatie delen?</string>
+    <string name="AreYouSureBlockContact">Deze persoon blokkeren?</string>
+    <string name="AreYouSureUnblockContact">Deze persoon deblokkeren?</string>
+    <string name="AreYouSureDeleteContact">Deze contactpersoon verwijderen?</string>
+    <string name="AreYouSureSecretChat">Een privégesprek starten?</string>
+    <string name="ForwardFromMyName">doorsturen via mijn eigen naam</string>
 
     <!--Intro view-->
     <string name="Page1Title">Telegram</string>
@@ -394,40 +394,36 @@
     <string name="StartMessaging">Begin nu met chatten</string>
 
     <!--plurals-->
-    <string name="Members_zero">no members</string>
-    <string name="Members_one">%1$d member</string>
-    <string name="Members_two">%1$d members</string>
-    <string name="Members_few">%1$d members</string>
-    <string name="Members_many">%1$d members</string>
-    <string name="Members_other">%1$d members</string>
-
-    <string name="AndMoreTyping_zero">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_one">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_two">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_few">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_many">and %1$d more people are typing</string>
-    <string name="AndMoreTyping_other">and %1$d more people are typing</string>
-
-    <string name="NewMessages_zero">no new messages</string>
-    <string name="NewMessages_one">%1$d new message</string>
-    <string name="NewMessages_two">%1$d new messages</string>
-    <string name="NewMessages_few">%1$d new messages</string>
-    <string name="NewMessages_many">%1$d new messages</string>
-    <string name="NewMessages_other">%1$d new messages</string>
-
-    <string name="messages_zero">no messages</string>
-    <string name="messages_one">%1$d message</string>
-    <string name="messages_two">%1$d messages</string>
-    <string name="messages_few">%1$d messages</string>
-    <string name="messages_many">%1$d messages</string>
-    <string name="messages_other">%1$d messages</string>
-
-    <string name="FromContacts_zero">from no contacts</string>
-    <string name="FromContacts_one">from %1$d contact</string>
-    <string name="FromContacts_two">from %1$d contacts</string>
-    <string name="FromContacts_few">from %1$d contacts</string>
-    <string name="FromContacts_many">from %1$d contacts</string>
-    <string name="FromContacts_other">from %1$d contacts</string>
+    <string name="Members_zero">geen deelnemers</string>
+    <string name="Members_one">%1$d deelnemer</string>
+    <string name="Members_two">%1$d deelnemers</string>
+    <string name="Members_few">%1$d deelnemers</string>
+    <string name="Members_many">%1$d deelnemers</string>
+    <string name="Members_other">%1$d deelnemers</string>
+    <string name="AndMoreTyping_zero">en nog %1$d personen zijn aan het typen</string>
+    <string name="AndMoreTyping_one">en nog %1$d personen zijn aan het typen</string>
+    <string name="AndMoreTyping_two">en nog %1$d personen zijn aan het typen</string>
+    <string name="AndMoreTyping_few">en nog %1$d personen zijn aan het typen</string>
+    <string name="AndMoreTyping_many">en nog %1$d personen zijn aan het typen</string>
+    <string name="AndMoreTyping_other">en nog %1$d personen zijn aan het typen</string>
+    <string name="NewMessages_zero">geen nieuwe berichten</string>
+    <string name="NewMessages_one">%1$d nieuw bericht</string>
+    <string name="NewMessages_two">%1$d nieuwe berichten</string>
+    <string name="NewMessages_few">%1$d nieuwe berichten</string>
+    <string name="NewMessages_many">%1$d nieuwe berichten</string>
+    <string name="NewMessages_other">%1$d nieuwe berichten</string>
+    <string name="messages_zero">geen berichten</string>
+    <string name="messages_one">%1$d bericht</string>
+    <string name="messages_two">%1$d berichten</string>
+    <string name="messages_few">%1$d berichten</string>
+    <string name="messages_many">%1$d berichten</string>
+    <string name="messages_other">%1$d berichten</string>
+    <string name="FromContacts_zero">van geen enkel contactpersoon</string>
+    <string name="FromContacts_one">van %1$d contactpersoon</string>
+    <string name="FromContacts_two">van %1$d contactpersonen</string>
+    <string name="FromContacts_few">van %1$d contactpersonen</string>
+    <string name="FromContacts_many">van %1$d contactpersonen</string>
+    <string name="FromContacts_other">van %1$d contactpersonen</string>
 
     <!--Don't change this! Not for localization!-->
     <string name="CacheTag">CACHE_TAG</string>

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

@@ -376,7 +376,6 @@
     <string name="AreYouSureSecretChat">Are you sure you want to start secret chat?</string>
     <string name="ForwardFromMyName">forward from my name</string>
 
-
     <!--Intro view-->
     <string name="Page1Title">Telegram</string>
     <string name="Page2Title">Fast</string>
@@ -401,28 +400,24 @@
     <string name="Members_few">%1$d members</string>
     <string name="Members_many">%1$d members</string>
     <string name="Members_other">%1$d members</string>
-
     <string name="AndMoreTyping_zero">and %1$d more people are typing</string>
     <string name="AndMoreTyping_one">and %1$d more people are typing</string>
     <string name="AndMoreTyping_two">and %1$d more people are typing</string>
     <string name="AndMoreTyping_few">and %1$d more people are typing</string>
     <string name="AndMoreTyping_many">and %1$d more people are typing</string>
     <string name="AndMoreTyping_other">and %1$d more people are typing</string>
-
     <string name="NewMessages_zero">no new messages</string>
     <string name="NewMessages_one">%1$d new message</string>
     <string name="NewMessages_two">%1$d new messages</string>
     <string name="NewMessages_few">%1$d new messages</string>
     <string name="NewMessages_many">%1$d new messages</string>
     <string name="NewMessages_other">%1$d new messages</string>
-
     <string name="messages_zero">no messages</string>
     <string name="messages_one">%1$d message</string>
     <string name="messages_two">%1$d messages</string>
     <string name="messages_few">%1$d messages</string>
     <string name="messages_many">%1$d messages</string>
     <string name="messages_other">%1$d messages</string>
-
     <string name="FromContacts_zero">from no contacts</string>
     <string name="FromContacts_one">from %1$d contact</string>
     <string name="FromContacts_two">from %1$d contacts</string>