Bug fixes

a137f7a2 · DrKLO · 86dd9342 · a137f7a2 · a137f7a2 · a137f7a2
Commit a137f7a2 authored Nov 18, 2014 by DrKLO
24 changed files
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
@@ -232,7 +232,7 @@ public class ActionBar extends FrameLayout {
            createSubtitleTextView();
        }
        if (subTitleTextView != null) {
-            subTitleTextView.setVisibility(value != null ? VISIBLE : GONE);
+            subTitleTextView.setVisibility(value != null && !isSearchFieldVisible ? VISIBLE : GONE);
            subTitleTextView.setText(value);
            positionTitle(getMeasuredWidth(), getMeasuredHeight());
        }
@@ -274,7 +274,7 @@ public class ActionBar extends FrameLayout {
        }
        if (titleTextView != null) {
            lastTitle = value;
-            titleTextView.setVisibility(value != null ? VISIBLE : GONE);
+            titleTextView.setVisibility(value != null && !isSearchFieldVisible ? VISIBLE : GONE);
            titleTextView.setText(value);
            positionTitle(getMeasuredWidth(), getMeasuredHeight());
        }
@@ -433,7 +433,7 @@ public class ActionBar extends FrameLayout {
            createTitleTextView();
        }
        if (titleTextView != null) {
-            titleTextView.setVisibility(textToSet != null ? VISIBLE : GONE);
+            titleTextView.setVisibility(textToSet != null && !isSearchFieldVisible ? VISIBLE : GONE);
            titleTextView.setText(textToSet);
            positionTitle(getMeasuredWidth(), getMeasuredHeight());
        }

--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java
@@ -807,11 +807,13 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
        if (allowedToSetPhoto == value) {
            return;
        }
-        allowedToSetPhoto = value;
+        if (currentMessageObject != null && currentMessageObject.type == 1) {
-        if (value && currentMessageObject != null && currentMessageObject.type == 1) {
+            allowedToSetPhoto = value;
-            MessageObject temp = currentMessageObject;
+            if (value) {
-            currentMessageObject = null;
+                MessageObject temp = currentMessageObject;
-            setMessageObject(temp);
+                currentMessageObject = null;
+                setMessageObject(temp);
+            }
        }
    }

--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -594,19 +594,32 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                        actionBar.hideActionMode();
                        updateVisibleRows();
                    } else if (id == delete) {
-                        ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet());
+                        if (getParentActivity() == null) {
-                        ArrayList<Long> random_ids = null;
+                            return;
-                        if (currentEncryptedChat != null) {
+                        }
-                            random_ids = new ArrayList<Long>();
+                        AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-                            for (HashMap.Entry<Integer, MessageObject> entry : selectedMessagesIds.entrySet()) {
+                        builder.setMessage(LocaleController.formatString("AreYouSureDeleteMessages", R.string.AreYouSureDeleteMessages, LocaleController.formatPluralString("messages", selectedMessagesIds.size())));
-                                MessageObject msg = entry.getValue();
+                        builder.setTitle(LocaleController.getString("AppName", R.string.AppName));
-                                if (msg.messageOwner.random_id != 0 && msg.type != 10) {
+                        builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
-                                    random_ids.add(msg.messageOwner.random_id);
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet());
+                                ArrayList<Long> random_ids = null;
+                                if (currentEncryptedChat != null) {
+                                    random_ids = new ArrayList<Long>();
+                                    for (HashMap.Entry<Integer, MessageObject> entry : selectedMessagesIds.entrySet()) {
+                                        MessageObject msg = entry.getValue();
+                                        if (msg.messageOwner.random_id != 0 && msg.type != 10) {
+                                            random_ids.add(msg.messageOwner.random_id);
+                                        }
+                                    }
                                }
+                                MessagesController.getInstance().deleteMessages(ids, random_ids, currentEncryptedChat);
+                                actionBar.hideActionMode();
                            }
-                        }
+                        });
-                        MessagesController.getInstance().deleteMessages(ids, random_ids, currentEncryptedChat);
+                        builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
-                        actionBar.hideActionMode();
+                        showAlertDialog(builder);
                    } else if (id == forward) {
                        Bundle args = new Bundle();
                        args.putBoolean("onlySelect", true);

--- a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
@@ -120,7 +120,15 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
            actionBar.setBackButtonImage(R.drawable.ic_ab_back);
            actionBar.setAllowOverlayTitle(true);
-            actionBar.setTitle(destroyAfterSelect ? LocaleController.getString("SelectContact", R.string.SelectContact) : LocaleController.getString("Contacts", R.string.Contacts));
+            if (destroyAfterSelect) {
+                if (returnAsResult) {
+                    actionBar.setTitle(LocaleController.getString("SelectContact", R.string.SelectContact));
+                } else {
+                    actionBar.setTitle(LocaleController.getString("NewMessageTitle", R.string.NewMessageTitle));
+                }
+            } else {
+                actionBar.setTitle(LocaleController.getString("Contacts", R.string.Contacts));
+            }
            actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                @Override

--- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
@@ -349,6 +349,12 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
            } catch (Exception e) {
                FileLog.e("tmessages", e);
            }
+        } else {
+            if (AndroidUtilities.isTablet()) {
+                drawerLayoutContainer.setAllowOpenDrawer(actionBarLayout.fragmentsStack.size() <= 1 && layersActionBarLayout.fragmentsStack.isEmpty());
+            } else {
+                drawerLayoutContainer.setAllowOpenDrawer(actionBarLayout.fragmentsStack.size() <= 1);
+            }
        }
        handleIntent(getIntent(), false, savedInstanceState != null);

--- a/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java
@@ -153,7 +153,8 @@ public class LocationActivity extends BaseFragment implements NotificationCenter
            View bottomView = fragmentView.findViewById(R.id.location_bottom_view);
            TextView sendButton = (TextView) fragmentView.findViewById(R.id.location_send_button);
            if (sendButton != null) {
-                sendButton.setText(LocaleController.getString("SendLocation", R.string.SendLocation));
+                sendButton.setText(LocaleController.getString("SendLocation", R.string.SendLocation).toUpperCase());
+                sendButton.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
            }
            mapView = (MapView)fragmentView.findViewById(R.id.map_view);

--- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
@@ -697,7 +697,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                layoutParams.topMargin = (actionBar.getOccupyStatusBar() ? AndroidUtilities.statusBarHeight : 0) + AndroidUtilities.getCurrentActionBarHeight() + actionBar.getExtraHeight() - AndroidUtilities.dp(29.5f);
                writeButton.setLayoutParams(layoutParams);
                ViewProxy.setAlpha(writeButton, diff);
-                writeButton.setVisibility(diff == 0 ? View.GONE : View.VISIBLE);
+                writeButton.setEnabled(diff > 0.02);
+                writeButton.setVisibility(diff <= 0.02 ? View.GONE : View.VISIBLE);
            }
            avatarImage.imageReceiver.setRoundRadius(AndroidUtilities.dp(avatarSize / 2));
@@ -1063,7 +1064,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                photo = chat.photo.photo_small;
                photoBig = chat.photo.photo_big;
            }
-            avatarImage.setImage(photo, "50_50", new AvatarDrawable(chat));
+            avatarImage.setImage(photo, "50_50", new AvatarDrawable(chat, true));
            avatarImage.imageReceiver.setVisible(!PhotoViewer.getInstance().isShowingImage(photoBig), false);
        }

--- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
@@ -885,7 +885,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
            layoutParams.topMargin = (actionBar.getOccupyStatusBar() ? AndroidUtilities.statusBarHeight : 0) + AndroidUtilities.getCurrentActionBarHeight() + actionBar.getExtraHeight() - AndroidUtilities.dp(29.5f);
            writeButton.setLayoutParams(layoutParams);
            ViewProxy.setAlpha(writeButton, diff);
-            writeButton.setVisibility(diff == 0 ? View.GONE : View.VISIBLE);
+            writeButton.setEnabled(diff > 0.02);
+            writeButton.setVisibility(diff <= 0.02 ? View.GONE : View.VISIBLE);
            avatarImage.imageReceiver.setRoundRadius(AndroidUtilities.dp(avatarSize / 2));
            layoutParams = (FrameLayout.LayoutParams) avatarImage.getLayoutParams();

--- a/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarDrawable.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarDrawable.java
@@ -31,9 +31,9 @@ public class AvatarDrawable extends Drawable {
    private static Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
    private static TextPaint namePaint;
    private static int[] arrColors = {0xffe56555, 0xfff28c48, 0xffeec764, 0xff76c84d, 0xff5fbed5, 0xff549cdd, 0xff8e85ee, 0xfff2749a};
-    private static int[] arrColorsProfiles = {0xffd86f65, 0xffdc9663, 0xffdebc68, 0xff67b35d, 0xff56a2bb, 0xff5c98cd, 0xff8c79d2, 0xffda738e};
+    private static int[] arrColorsProfiles = {0xffd86f65, 0xfff69d61, 0xfffabb3c, 0xff67b35d, 0xff56a2bb, 0xff5c98cd, 0xff8c79d2, 0xfff37fa6};
-    private static int[] arrColorsProfilesBack = {0xffca6056, 0xffcf8550, 0xffcfa742, 0xff56a14c, 0xff4492ac, 0xff4c84b6, 0xff7d6ac4, 0xffc9637e};
+    private static int[] arrColorsProfilesBack = {0xffca6056, 0xfff18944, 0xfff2b02c, 0xff56a14c, 0xff4492ac, 0xff4c84b6, 0xff7d6ac4, 0xffe66b94};
-    private static int[] arrColorsProfilesText = {0xfff9cbc5, 0xfffadbc4, 0xfff7e7bf, 0xffc0edba, 0xffb8e2f0, 0xffb3d7f7, 0xffcdc4ed, 0xfff2cfd8};
+    private static int[] arrColorsProfilesText = {0xfff9cbc5, 0xfffdddc8, 0xfffce5bb, 0xffc0edba, 0xffb8e2f0, 0xffb3d7f7, 0xffcdc4ed, 0xfffed1e0};
    private static int[] arrColorsButtons = {R.drawable.bar_selector_red, R.drawable.bar_selector_orange, R.drawable.bar_selector_yellow,
            R.drawable.bar_selector_green, R.drawable.bar_selector_cyan, R.drawable.bar_selector_blue, R.drawable.bar_selector_violet, R.drawable.bar_selector_pink};

--- a/TMessagesProj/src/main/res/drawable-v21/bar_selector_orange.xml
+++ b/TMessagesProj/src/main/res/drawable-v21/bar_selector_orange.xml
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#ffc6763d">
+    android:color="#ffe67429">
 </ripple>
\ No newline at end of file
--- a/TMessagesProj/src/main/res/drawable-v21/bar_selector_pink.xml
+++ b/TMessagesProj/src/main/res/drawable-v21/bar_selector_pink.xml
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#ffbb536e">
+    android:color="#ffd44e7b">
 </ripple>
\ No newline at end of file
--- a/TMessagesProj/src/main/res/drawable-v21/bar_selector_yellow.xml
+++ b/TMessagesProj/src/main/res/drawable-v21/bar_selector_yellow.xml
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#ffc9982e">
+    android:color="#ffef9f09">
 </ripple>
\ No newline at end of file
--- a/TMessagesProj/src/main/res/drawable/bar_selector_orange.xml
+++ b/TMessagesProj/src/main/res/drawable/bar_selector_orange.xml
@@ -2,17 +2,17 @@
    xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true">
        <shape android:shape="rectangle">
-            <solid android:color="#ffc6763d" />
+            <solid android:color="#ffe67429" />
        </shape>
    </item>
    <item android:state_focused="true">
        <shape android:shape="rectangle">
-            <solid android:color="#ffc6763d" />
+            <solid android:color="#ffe67429" />
        </shape>
    </item>
    <item android:state_selected="true">
        <shape android:shape="rectangle">
-            <solid android:color="#ffc6763d" />
+            <solid android:color="#ffe67429" />
        </shape>
    </item>
    <item android:drawable="@drawable/transparent" />

--- a/TMessagesProj/src/main/res/drawable/bar_selector_pink.xml
+++ b/TMessagesProj/src/main/res/drawable/bar_selector_pink.xml
@@ -2,17 +2,17 @@
    xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true">
        <shape android:shape="rectangle">
-            <solid android:color="#ffbb536e" />
+            <solid android:color="#ffd44e7b" />
        </shape>
    </item>
    <item android:state_focused="true">
        <shape android:shape="rectangle">
-            <solid android:color="#ffbb536e" />
+            <solid android:color="#ffd44e7b" />
        </shape>
    </item>
    <item android:state_selected="true">
        <shape android:shape="rectangle">
-            <solid android:color="#ffbb536e" />
+            <solid android:color="#ffd44e7b" />
        </shape>
    </item>
    <item android:drawable="@drawable/transparent" />

--- a/TMessagesProj/src/main/res/drawable/bar_selector_yellow.xml
+++ b/TMessagesProj/src/main/res/drawable/bar_selector_yellow.xml
@@ -2,17 +2,17 @@
    xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true">
        <shape android:shape="rectangle">
-            <solid android:color="#ffc9982e" />
+            <solid android:color="#ffef9f09" />
        </shape>
    </item>
    <item android:state_focused="true">
        <shape android:shape="rectangle">
-            <solid android:color="#ffc9982e" />
+            <solid android:color="#ffef9f09" />
        </shape>
    </item>
    <item android:state_selected="true">
        <shape android:shape="rectangle">
-            <solid android:color="#ffc9982e" />
+            <solid android:color="#ffef9f09" />
        </shape>
    </item>
    <item android:drawable="@drawable/transparent" />

--- a/TMessagesProj/src/main/res/layout/location_attach_layout.xml
+++ b/TMessagesProj/src/main/res/layout/location_attach_layout.xml
@@ -20,7 +20,7 @@
        android:layout_marginRight="15dp"
        android:layout_marginLeft="15dp"
        android:gravity="center"
-        android:textSize="18dp"
+        android:textSize="14dp"
        android:textColor="#316f9f"
        android:background="@drawable/location_send_button_states"
        android:id="@+id/location_send_button"/>

--- a/TMessagesProj/src/main/res/values-ar/strings.xml
+++ b/TMessagesProj/src/main/res/values-ar/strings.xml
@@ -143,6 +143,7 @@
    <string name="ReplyToUser">الرد على %1$s</string>
    <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
    <!--contacts view-->
+    <string name="NewMessageTitle">رسالة جديدة</string>
    <string name="SelectContact">اختر جهة اتصال</string>
    <string name="NoContacts">لا توجد جهات اتصال بعد</string>
    <string name="InviteText">http://telegram.org/dl2 مرحبا! هيا نستخدم تيليجرام: </string>
@@ -399,6 +400,7 @@
    <string name="AreYouSureSecretChat">هل أنت متأكد من أنك تريد بدء محادثة سرية؟</string>
    <string name="AreYouSureRegistration">هل أنت متأكد من رغبتك في إلغاء التسجيل؟</string>
    <string name="AreYouSureClearHistory">هل أنت متأكد من رغبتك في حذف سجل المحادثات؟</string>
+    <string name="AreYouSureDeleteMessages">هل أنت متأكد من رغبتك في حذف %1$s؟</string>
    <string name="SendMessagesToGroup">هل ترغب في إرسال رسالة إلى %1$s؟</string>
    <string name="ForwardMessagesToGroup">؟%1$s هل تريد إعادة توجيه الرسائل إلى</string>
    <string name="FeatureUnavailable">.Sorry, this feature is currently not available in your country</string>

--- a/TMessagesProj/src/main/res/values-de/strings.xml
+++ b/TMessagesProj/src/main/res/values-de/strings.xml
@@ -143,6 +143,7 @@
    <string name="ReplyToUser">%1$s antworten</string>
    <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
    <!--contacts view-->
+    <string name="NewMessageTitle">Neue Nachricht</string>
    <string name="SelectContact">Kontakt auswählen</string>
    <string name="NoContacts">Noch keine Kontakte</string>
    <string name="InviteText">Hey, lass uns zu Telegram wechseln: http://telegram.org/dl2</string>
@@ -308,7 +309,7 @@
    <string name="LastSeenHelp">Bearbeite wer deinen Online Status sieht.</string>
    <string name="LastSeenTitle">Wer kann deinen Online Status sehen?</string>
    <string name="AddExceptions">Ausnahmen hinzufügen</string>
-    <string name="CustomHelp">Wichtig: Du kannst den \"zuletzt online\" Status nur von Personen sehen, mit denen du auch deinen teilst. Ansonsten wird die ungefähre Zeit angezeigt (kürzlich, innerhalb einer Woche, innerhalb eines Monats).</string>
+    <string name="CustomHelp">Wichtig: Du kannst den \"zuletzt gesehen\" Status nur von Personen sehen, mit denen du auch deinen teilst. Ansonsten wird die ungefähre Zeit angezeigt (kürzlich, innerhalb einer Woche, innerhalb eines Monats).</string>
    <string name="AlwaysShareWith">Immer teilen mit</string>
    <string name="NeverShareWith">Niemals teilen mit</string>
    <string name="CustomShareSettingsHelp">Hier kannst du Kontakte hinzufügen, für die eine Ausnahme gemacht werden soll.</string>
@@ -388,7 +389,7 @@
    <string name="AddToTheGroup">%1$s zur Gruppe hinzufügen?\n\nAnzahl der letzten Nachrichten für die Weiterleitung:</string>
    <string name="ForwardMessagesTo">Nachrichten an %1$s weiterleiten?</string>
    <string name="SendMessagesTo">Nachricht an %1$s senden?</string>
-    <string name="AreYouSureLogout">Möchtest du dich wirklich abmelden?\n\n\Du kannst Telegram von all deinen Geräten gleichzeitig nutzen.\n\nWichtig: Abmelden löscht deine Geheimen Chats.</string>
+    <string name="AreYouSureLogout">Wirklich abmelden?\n\nDu kannst Telegram von all deinen Geräten gleichzeitig nutzen.\n\nWichtig: Abmelden löscht deine Geheimen Chats.</string>
    <string name="AreYouSureSessions">Sicher, dass du alle anderen Geräte abmelden möchtest?</string>
    <string name="AreYouSureDeleteAndExit">Diese Gruppe wirklich löschen und verlassen?</string>
    <string name="AreYouSureDeleteThisChat">Möchtest du wirklich diesen Chat löschen?</string>
@@ -399,6 +400,7 @@
    <string name="AreYouSureSecretChat">Geheimen Chat starten?</string>
    <string name="AreYouSureRegistration">Bist du dir sicher, dass du die Registrierung abbrechen willst?</string>
    <string name="AreYouSureClearHistory">Möchtest du wirklich den Verlauf löschen?</string>
+    <string name="AreYouSureDeleteMessages">Sicher, dass du %1$s löschen willst?</string>
    <string name="SendMessagesToGroup">Nachricht an %1$s senden?</string>
    <string name="ForwardMessagesToGroup">Weiterleiten an %1$s?</string>
    <string name="FeatureUnavailable">Verzeihung, diese Funktion ist derzeit in deinem Land nicht verfügbar.</string>

--- a/TMessagesProj/src/main/res/values-it/strings.xml
+++ b/TMessagesProj/src/main/res/values-it/strings.xml
@@ -143,6 +143,7 @@
    <string name="ReplyToUser">Rispondi a %1$s</string>
    <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
    <!--contacts view-->
+    <string name="NewMessageTitle">Nuovo messaggio</string>
    <string name="SelectContact">Seleziona contatto</string>
    <string name="NoContacts">Ancora nessun contatto</string>
    <string name="InviteText">Ehi, è il momento di passare a Telegram: http://telegram.org/dl2</string>
@@ -399,6 +400,7 @@
    <string name="AreYouSureSecretChat">Iniziare una chat segreta?</string>
    <string name="AreYouSureRegistration">Sei sicuro di volere eliminare questa registrazione?</string>
    <string name="AreYouSureClearHistory">Sei sicuro di volere eliminare la cronologia?</string>
+    <string name="AreYouSureDeleteMessages">Sei sicuro di voler eliminare %1$s?</string>
    <string name="SendMessagesToGroup">Inviare messaggi a %1$s?</string>
    <string name="ForwardMessagesToGroup">Inoltra messaggi a %1$s?</string>
    <string name="FeatureUnavailable">Ci spiace, questa funzione non è disponibile nel tuo paese.</string>

--- a/TMessagesProj/src/main/res/values-ko/strings.xml
+++ b/TMessagesProj/src/main/res/values-ko/strings.xml
@@ -143,6 +143,7 @@
    <string name="ReplyToUser">%1$s님에게 답장하기</string>
    <string name="NotificationMessagesPeopleDisplayOrder">%2$s %1$s</string>
    <!--contacts view-->
+    <string name="NewMessageTitle">새 메시지</string>
    <string name="SelectContact">대화상대 선택</string>
    <string name="NoContacts">대화상대가 없습니다</string>
    <string name="InviteText">텔레그램으로 초대합니다! http://telegram.org/dl2</string>
@@ -399,6 +400,7 @@
    <string name="AreYouSureSecretChat">비밀대화를 시작할까요?</string>
    <string name="AreYouSureRegistration">정말로 가입을 취소하시겠습니까?</string>
    <string name="AreYouSureClearHistory">정말로 대화내용을 지우시겠습니까?</string>
+    <string name="AreYouSureDeleteMessages">%1$s: 정말로 삭제하시겠습니까?</string>
    <string name="SendMessagesToGroup">%1$s 그룹에 메시지를 보낼까요?</string>
    <string name="ForwardMessagesToGroup">%1$s 그룹에 메시지를 전달할까요?</string>
    <string name="FeatureUnavailable">이 기능은 회원님의 국가에서는 사용할 수 없습니다.</string>

--- a/TMessagesProj/src/main/res/values-nl/strings.xml
+++ b/TMessagesProj/src/main/res/values-nl/strings.xml
@@ -143,6 +143,7 @@
    <string name="ReplyToUser">Antwoord op %1$s</string>
    <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
    <!--contacts view-->
+    <string name="NewMessageTitle">Nieuw bericht</string>
    <string name="SelectContact">Kies een contact</string>
    <string name="NoContacts">Nog geen contacten</string>
    <string name="InviteText">Hey! Zullen we overstappen op Telegram? http://telegram.org/dl2</string>
@@ -319,7 +320,7 @@
    <string name="EmpryUsersPlaceholder">Toevoegen</string>
    <string name="PrivacyFloodControlError">Sorry, te veel verzoeken. Momenteel is het niet mogelijk om de privacyinstellingen te wijzigen, even geduld alsjeblieft.</string>
    <string name="ClearOtherSessionsHelp">Logt alle apparaten behalve deze uit.</string>
-    <string name="RemoveFromListText">Druk langdurig op een gebruiker om deze te verwijderen.</string>
+    <string name="RemoveFromListText">Gebruiker vasthouden om te verwijderen.</string>
    <!--edit video view-->
    <string name="EditVideo">Video bewerken</string>
    <string name="OriginalVideo">Originele video</string>
@@ -390,7 +391,7 @@
    <string name="SendMessagesTo">Berichten naar %1$s verzenden?</string>
    <string name="AreYouSureLogout">Weet je zeker dat je wilt uitloggen?\n\nTelegram kun je naadloos op al je apparaten tegelijkertijd gebruiken.\n\nLet op! Als je uitlogt worden al je geheime chats verwijderd.</string>
    <string name="AreYouSureSessions">Alle apparaten behalve het huidige apparaat uitloggen?</string>
-    <string name="AreYouSureDeleteAndExit">Weet je zeker dat je alles wilt verwijderen en de groep wilt verlaten?</string>
+    <string name="AreYouSureDeleteAndExit">Echt alles verwijderen en de groep verlaten?</string>
    <string name="AreYouSureDeleteThisChat">Weet je zeker dat je dit gesprek wilt verwijderen?</string>
    <string name="AreYouSureShareMyContactInfo">Weet je zeker dat je je contactinformatie wilt delen?</string>
    <string name="AreYouSureBlockContact">Weet je zeker dat je deze persoon wilt blokkeren?</string>
@@ -398,7 +399,8 @@
    <string name="AreYouSureDeleteContact">Weet je zeker dat je deze contactpersoon wilt verwijderen?</string>
    <string name="AreYouSureSecretChat">Weet je zeker dat je een geheime chat wilt starten?</string>
    <string name="AreYouSureRegistration">Weet je zeker dat je de registratie wilt annuleren?</string>
-    <string name="AreYouSureClearHistory">Weet je zeker dat je de geschiedenis wilt wissen?</string>
+    <string name="AreYouSureClearHistory">Geschiedenis echt wissen? </string>
+    <string name="AreYouSureDeleteMessages">%1$s echt verwijderen?</string>
    <string name="SendMessagesToGroup">Berichten naar %1$s verzenden?</string>
    <string name="ForwardMessagesToGroup">Berichten naar %1$s doorsturen?</string>
    <string name="FeatureUnavailable">Sorry, deze functie is momenteel niet beschikbaar in jouw land.</string>

--- a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml
+++ b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml
@@ -143,6 +143,7 @@
    <string name="ReplyToUser">Responder para %1$s</string>
    <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
    <!--contacts view-->
+    <string name="NewMessageTitle">Nova Mensagem</string>
    <string name="SelectContact">Selecionar Contato</string>
    <string name="NoContacts">Ainda não há contatos</string>
    <string name="InviteText">Ei, vamos mudar para o Telegram: http://telegram.org/dl2</string>
@@ -308,7 +309,7 @@
    <string name="LastSeenHelp">Alterar quem pode ver o seu Último Acesso.</string>
    <string name="LastSeenTitle">Quem pode ver o seu Último Acesso?</string>
    <string name="AddExceptions">Adicionar exceções</string>
-    <string name="CustomHelp">Importante: você não poderá ver o tempo de Último Acesso das pessoas com quem você não compartilha o seu tempo de Último Acesso. Será exibido um tempo aproximado (recentemente, na última semana, no último mês).</string>
+    <string name="CustomHelp">Importante: você não será capaz de ver quando foi o Último Acesso para as pessoas com quem você não compartilha quando foi seu Último Acesso. Você visualizará a última vez visto aproximada. (recentemente, dentro de uma semana, dentro de um mês).</string>
    <string name="AlwaysShareWith">Sempre Mostrar Para</string>
    <string name="NeverShareWith">Nunca Mostrar Para</string>
    <string name="CustomShareSettingsHelp">Estas configurações irão substituir os valores anteriores.</string>
@@ -319,7 +320,7 @@
    <string name="EmpryUsersPlaceholder">Adicionar Usuários</string>
    <string name="PrivacyFloodControlError">Desculpe, muitas solicitações. Impossível alterar os ajustes de privacidade agora, por favor aguarde.</string>
    <string name="ClearOtherSessionsHelp">Sair de todos os dispositivos, exceto este.</string>
-    <string name="RemoveFromListText">Toque e segure no usuário para desbloquear</string>
+    <string name="RemoveFromListText">Toque e segure no usuário para deletar.</string>
    <!--edit video view-->
    <string name="EditVideo">Editar Vídeo</string>
    <string name="OriginalVideo">Vídeo Original</string>
@@ -399,6 +400,7 @@
    <string name="AreYouSureSecretChat">Você tem certeza que deseja começar um chat secreto?</string>
    <string name="AreYouSureRegistration">Você tem certeza que deseja cancelar o registro?</string>
    <string name="AreYouSureClearHistory">Você tem certeza que deseja limpar o histórico?</string>
+    <string name="AreYouSureDeleteMessages">Você tem certeza que deseja deletar %1$s?</string>
    <string name="SendMessagesToGroup">Enviar mensagens para %1$s?</string>
    <string name="ForwardMessagesToGroup">Encaminhar mensagem para %1$s?</string>
    <string name="FeatureUnavailable">Desculpe, esta funcionalidade não está disponível para seu país.</string>

--- a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml
+++ b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml
@@ -143,6 +143,7 @@
    <string name="ReplyToUser">Responder para %1$s</string>
    <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
    <!--contacts view-->
+    <string name="NewMessageTitle">Nova Mensagem</string>
    <string name="SelectContact">Selecionar Contato</string>
    <string name="NoContacts">Ainda não há contatos</string>
    <string name="InviteText">Ei, vamos mudar para o Telegram: http://telegram.org/dl2</string>
@@ -308,7 +309,7 @@
    <string name="LastSeenHelp">Alterar quem pode ver o seu Último Acesso.</string>
    <string name="LastSeenTitle">Quem pode ver o seu Último Acesso?</string>
    <string name="AddExceptions">Adicionar exceções</string>
-    <string name="CustomHelp">Importante: você não poderá ver o tempo de Último Acesso das pessoas com quem você não compartilha o seu tempo de Último Acesso. Será exibido um tempo aproximado (recentemente, na última semana, no último mês).</string>
+    <string name="CustomHelp">Importante: você não será capaz de ver quando foi o Último Acesso para as pessoas com quem você não compartilha quando foi seu Último Acesso. Você visualizará a última vez visto aproximada. (recentemente, dentro de uma semana, dentro de um mês).</string>
    <string name="AlwaysShareWith">Sempre Mostrar Para</string>
    <string name="NeverShareWith">Nunca Mostrar Para</string>
    <string name="CustomShareSettingsHelp">Estas configurações irão substituir os valores anteriores.</string>
@@ -319,7 +320,7 @@
    <string name="EmpryUsersPlaceholder">Adicionar Usuários</string>
    <string name="PrivacyFloodControlError">Desculpe, muitas solicitações. Impossível alterar os ajustes de privacidade agora, por favor aguarde.</string>
    <string name="ClearOtherSessionsHelp">Sair de todos os dispositivos, exceto este.</string>
-    <string name="RemoveFromListText">Toque e segure no usuário para desbloquear</string>
+    <string name="RemoveFromListText">Toque e segure no usuário para deletar.</string>
    <!--edit video view-->
    <string name="EditVideo">Editar Vídeo</string>
    <string name="OriginalVideo">Vídeo Original</string>
@@ -399,6 +400,7 @@
    <string name="AreYouSureSecretChat">Você tem certeza que deseja começar um chat secreto?</string>
    <string name="AreYouSureRegistration">Você tem certeza que deseja cancelar o registro?</string>
    <string name="AreYouSureClearHistory">Você tem certeza que deseja limpar o histórico?</string>
+    <string name="AreYouSureDeleteMessages">Você tem certeza que deseja deletar %1$s?</string>
    <string name="SendMessagesToGroup">Enviar mensagens para %1$s?</string>
    <string name="ForwardMessagesToGroup">Encaminhar mensagem para %1$s?</string>
    <string name="FeatureUnavailable">Desculpe, esta funcionalidade não está disponível para seu país.</string>

--- a/TMessagesProj/src/main/res/values/strings.xml
+++ b/TMessagesProj/src/main/res/values/strings.xml
 <?xml version="1.0" encoding="utf-8"?>
-<!--Translated by Telegram Team, corrected by Florian Keller-->
 <resources>
    <string name="AppName">Telegram</string>
@@ -157,6 +157,7 @@
    <string name="WithinAWeek">last seen within a week</string>
    <string name="WithinAMonth">last seen within a month</string>
    <string name="ALongTimeAgo">last seen a long time ago</string>
+    <string name="NewMessageTitle">New Message</string>
    <!--group create view-->
    <string name="SendMessageTo">Send message to...</string>
    <string name="EnterGroupNamePlaceholder">Enter group name</string>
@@ -308,7 +309,7 @@
    <string name="LastSeenHelp">Change who can see your Last Seen time.</string>
    <string name="LastSeenTitle">Who can see your Last Seen time?</string>
    <string name="AddExceptions">Add exceptions</string>
-    <string name="CustomHelp">Important: you won\'t be able to see Last Seen times for people with whom you don\'t share your Last Seen time. Approximate last seen will be shown instead (recently, within a week, witin a month).</string>
+    <string name="CustomHelp">Important: you won\'t be able to see Last Seen times for people with whom you don\'t share your Last Seen time. Approximate last seen will be shown instead (recently, within a week, within a month).</string>
    <string name="AlwaysShareWith">Always Share With</string>
    <string name="NeverShareWith">Never Share With</string>
    <string name="CustomShareSettingsHelp">These settings will override the values above.</string>
@@ -399,6 +400,7 @@
    <string name="AreYouSureSecretChat">Are you sure you want to start a secret chat?</string>
    <string name="AreYouSureRegistration">Are you sure you want to cancel registration?</string>
    <string name="AreYouSureClearHistory">Are you sure you want to clear history?</string>
+    <string name="AreYouSureDeleteMessages">Are you sure you want to delete %1$s?</string>
    <string name="SendMessagesToGroup">Send messages to %1$s?</string>
    <string name="ForwardMessagesToGroup">Forward messages to %1$s?</string>
    <string name="FeatureUnavailable">Sorry, this feature is currently not available in your country.</string>