Material everywhere

TMessagesProj/build.gradle

@@ -80,7 +80,7 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 21
-        versionCode 382
+        versionCode 383
         versionName "2.0.0"
     }
 }

TMessagesProj/jni/sqlite/sqlite3.c

@@ -1,6 +1,6 @@
 /******************************************************************************
 ** This file is an amalgamation of many separate C source files from SQLite
-** version 3.8.7.  By combining all the individual C code files into this 
+** version 3.8.7.1.  By combining all the individual C code files into this 
 ** single large file, the entire code can be compiled as a single translation
 ** unit.  This allows many compilers to do optimizations that would not be
 ** possible if the files were compiled separately.  Performance improvements
@@ -231,9 +231,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.8.7"
+#define SQLITE_VERSION        "3.8.7.1"
 #define SQLITE_VERSION_NUMBER 3008007
-#define SQLITE_SOURCE_ID      "2014-10-17 11:24:17 e4ab094f8afce0817f4074e823fabe59fc29ebb4"
+#define SQLITE_SOURCE_ID      "2014-10-29 13:59:56 3b7b72c4685aa5cf5e675c2c47ebec10d9704221"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -20756,11 +20756,7 @@ SQLITE_PRIVATE int sqlite3ApiExit(sqlite3* db, int rc){
 ** the glibc version so the glibc version is definitely preferred.
 */
 #if !defined(HAVE_STRCHRNUL)
-# if defined(linux)
-#  define HAVE_STRCHRNUL 1
-# else
-#  define HAVE_STRCHRNUL 0
-# endif
+# define HAVE_STRCHRNUL 0
 #endif
 
 
@@ -42806,6 +42802,14 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){
         rc = SQLITE_OK;
       }else{
         rc = sqlite3OsTruncate(pPager->jfd, 0);
+        if( rc==SQLITE_OK && pPager->fullSync ){
+          /* Make sure the new file size is written into the inode right away.
+          ** Otherwise the journal might resurrect following a power loss and
+          ** cause the last transaction to roll back.  See
+          ** https://bugzilla.mozilla.org/show_bug.cgi?id=1072773
+          */
+          rc = sqlite3OsSync(pPager->jfd, pPager->syncFlags);
+        }
       }
       pPager->journalOff = 0;
     }else if( pPager->journalMode==PAGER_JOURNALMODE_PERSIST
@@ -71443,7 +71447,7 @@ case OP_Column: {
       if( pOp->p4type==P4_MEM ){
         sqlite3VdbeMemShallowCopy(pDest, pOp->p4.pMem, MEM_Static);
       }else{
-        MemSetTypeFlag(pDest, MEM_Null);
+        sqlite3VdbeMemSetNull(pDest);
       }
       goto op_column_out;
     }
@@ -93757,7 +93761,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
       assert( nKey==nPk );  /* OP_Found will use an unpacked key */
       assert( !IsVirtual(pTab) );
       if( aToOpen[iDataCur-iTabCur] ){
-        assert( pPk!=0 );
+        assert( pPk!=0 || pTab->pSelect!=0 );
         sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, addrBypass, iKey, nKey);
         VdbeCoverage(v);
       }
@@ -111281,8 +111285,8 @@ SQLITE_PRIVATE void sqlite3Update(
 
   /* Top of the update loop */
   if( okOnePass ){
-    if( aToOpen[iDataCur-iBaseCur] ){
-      assert( pPk!=0 );
+    if( aToOpen[iDataCur-iBaseCur] && !isView ){
+      assert( pPk );
       sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, labelBreak, regKey, nKey);
       VdbeCoverageNeverTaken(v);
     }

TMessagesProj/jni/sqlite/sqlite3.h

@@ -107,9 +107,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.8.7"
+#define SQLITE_VERSION        "3.8.7.1"
 #define SQLITE_VERSION_NUMBER 3008007
-#define SQLITE_SOURCE_ID      "2014-10-17 11:24:17 e4ab094f8afce0817f4074e823fabe59fc29ebb4"
+#define SQLITE_SOURCE_ID      "2014-10-29 13:59:56 3b7b72c4685aa5cf5e675c2c47ebec10d9704221"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers

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

@@ -1354,7 +1354,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter
                     req.peer.user_id = user.id;
                 }
             }
-            req.offset = 0;
+            if (load_type == 3) {
+                req.offset = -count / 2;
+            } else {
+                req.offset = 0;
+            }
             req.limit = count;
             req.max_id = max_id;
             long reqId = ConnectionsManager.getInstance().performRpc(req, new RPCRequest.RPCRequestDelegate() {

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

@@ -130,6 +130,9 @@ public class MessagesStorage {
 
                 database.executeFast("CREATE TABLE sent_files_v2(uid TEXT, type INTEGER, data BLOB, PRIMARY KEY (uid, type))").stepThis().dispose();
 
+                database.executeFast("CREATE TABLE messages_holes(uid INTEGER, start INTEGER, end INTEGER, PRIMARY KEY(uid, start));").stepThis().dispose();
+                database.executeFast("CREATE INDEX IF NOT EXISTS type_uid_end_messages_holes ON messages_holes(uid, end);").stepThis().dispose();
+
                 database.executeFast("CREATE INDEX IF NOT EXISTS type_date_idx_download_queue ON download_queue(type, date);").stepThis().dispose();
 
                 database.executeFast("CREATE INDEX IF NOT EXISTS mid_idx_randoms ON randoms(mid);").stepThis().dispose();
@@ -185,7 +188,7 @@ public class MessagesStorage {
                 }
 
                 int version = database.executeInt("PRAGMA user_version");
-                if (version < 7) {
+                if (version < 9) {
                     updateDbToLastVersion(version);
                 }
             }
@@ -320,6 +323,12 @@ public class MessagesStorage {
                         database.executeFast("PRAGMA user_version = 8").stepThis().dispose();
                         version = 8;
                     }*/
+                    if ((version == 7 || version == 8) && version < 9) {
+                        database.executeFast("CREATE TABLE IF NOT EXISTS messages_holes(uid INTEGER, start INTEGER, end INTEGER, PRIMARY KEY(uid, start));").stepThis().dispose();
+                        database.executeFast("CREATE INDEX IF NOT EXISTS type_uid_end_messages_holes ON messages_holes(uid, end);").stepThis().dispose();
+                        database.executeFast("PRAGMA user_version = 9").stepThis().dispose();
+                        version = 9;
+                    }
                 } catch (Exception e) {
                     FileLog.e("tmessages", e);
                 }
@@ -1617,11 +1626,13 @@ public class MessagesStorage {
                 int min_unread_id = 0;
                 int last_message_id = 0;
                 int max_unread_date = 0;
+                int hole_start = Integer.MAX_VALUE;
+                int hole_end = Integer.MAX_VALUE;
                 try {
                     ArrayList<Integer> loadedUsers = new ArrayList<Integer>();
                     ArrayList<Integer> fromUser = new ArrayList<Integer>();
 
-                    SQLiteCursor cursor;
+                    SQLiteCursor cursor = null;
                     int lower_id = (int)dialog_id;
 
                     if (lower_id != 0) {
@@ -1632,8 +1643,19 @@ public class MessagesStorage {
                             }
                             cursor.dispose();
 
-                            cursor = database.queryFinalized(String.format(Locale.US, "SELECT * FROM (SELECT read_state, data, send_state, mid, date FROM messages WHERE uid = %d AND mid <= %d ORDER BY date DESC, mid DESC LIMIT %d) UNION " +
-                                    "SELECT * FROM (SELECT read_state, data, send_state, mid, date FROM messages WHERE uid = %d AND mid > %d ORDER BY date ASC, mid ASC LIMIT %d)", dialog_id, max_id, count_query / 2, dialog_id, max_id, count_query / 2));
+                            boolean containMessage = false;
+                            cursor = database.queryFinalized(String.format(Locale.US, "SELECT mid FROM messages WHERE mid = %d", max_id));
+                            if (cursor.next()) {
+                                containMessage = true;
+                            }
+                            cursor.dispose();
+
+                            if (containMessage) {
+                                cursor = database.queryFinalized(String.format(Locale.US, "SELECT * FROM (SELECT read_state, data, send_state, mid, date FROM messages WHERE uid = %d AND mid <= %d ORDER BY date DESC, mid DESC LIMIT %d) UNION " +
+                                        "SELECT * FROM (SELECT read_state, data, send_state, mid, date FROM messages WHERE uid = %d AND mid > %d ORDER BY date ASC, mid ASC LIMIT %d)", dialog_id, max_id, count_query / 2, dialog_id, max_id, count_query / 2 - 1));
+                            } else {
+                                cursor = null;
+                            }
                         } else if (load_type == 1) {
                             cursor = database.queryFinalized(String.format(Locale.US, "SELECT read_state, data, send_state, mid, date FROM messages WHERE uid = %d AND date >= %d AND mid > %d ORDER BY date ASC, mid ASC LIMIT %d", dialog_id, minDate, max_id, count_query));
                         } else if (minDate != 0) {
@@ -1724,56 +1746,58 @@ public class MessagesStorage {
                             cursor = database.queryFinalized(String.format(Locale.US, "SELECT m.read_state, m.data, m.send_state, m.mid, m.date, r.random_id FROM messages as m LEFT JOIN randoms as r ON r.mid = m.mid WHERE m.uid = %d ORDER BY m.mid ASC LIMIT %d,%d", dialog_id, offset_query, count_query));
                         }
                     }
-                    while (cursor.next()) {
-                        ByteBufferDesc data = buffersStorage.getFreeBuffer(cursor.byteArrayLength(1));
-                        if (data != null && cursor.byteBufferValue(1, data.buffer) != 0) {
-                            if (load_type == 3 && res.messages.isEmpty()) {
-                                int id = cursor.intValue(3);
-                                if (id > max_id) {
-                                    break;
-                                }
-                            }
-                            TLRPC.Message message = (TLRPC.Message)TLClassStore.Instance().TLdeserialize(data, data.readInt32());
-                            MessageObject.setIsUnread(message, cursor.intValue(0) != 1);
-                            message.id = cursor.intValue(3);
-                            message.date = cursor.intValue(4);
-                            message.dialog_id = dialog_id;
-                            res.messages.add(message);
-                            fromUser.add(message.from_id);
-                            if (message.action != null && message.action.user_id != 0) {
-                                fromUser.add(message.action.user_id);
-                            }
-                            if (message.media != null && message.media.user_id != 0) {
-                                fromUser.add(message.media.user_id);
-                            }
-                            if (message.media != null && message.media.audio != null && message.media.audio.user_id != 0) {
-                                fromUser.add(message.media.audio.user_id);
-                            }
-                            if (message.fwd_from_id != 0) {
-                                fromUser.add(message.fwd_from_id);
-                            }
-                            message.send_state = cursor.intValue(2);
-                            if (!MessageObject.isUnread(message) && lower_id != 0 || message.id > 0) {
-                                message.send_state = 0;
-                            }
-                            if (lower_id == 0 && !cursor.isNull(5)) {
-                                message.random_id = cursor.longValue(5);
-                            }
-                            if ((int)dialog_id == 0 && message.media != null && message.media.photo != null) {
-                                try {
-                                    SQLiteCursor cursor2 = database.queryFinalized(String.format(Locale.US, "SELECT date FROM enc_tasks_v2 WHERE mid = %d", message.id));
-                                    if (cursor2.next()) {
-                                        message.destroyTime = cursor2.intValue(0);
+                    if (cursor != null) {
+                        while (cursor.next()) {
+                            ByteBufferDesc data = buffersStorage.getFreeBuffer(cursor.byteArrayLength(1));
+                            if (data != null && cursor.byteBufferValue(1, data.buffer) != 0) {
+                                /*if (load_type == 3 && res.messages.isEmpty()) {
+                                    int id = cursor.intValue(3);
+                                    if (id > max_id) {
+                                        break;
+                                    }
+                                }*/
+                                TLRPC.Message message = (TLRPC.Message) TLClassStore.Instance().TLdeserialize(data, data.readInt32());
+                                MessageObject.setIsUnread(message, cursor.intValue(0) != 1);
+                                message.id = cursor.intValue(3);
+                                message.date = cursor.intValue(4);
+                                message.dialog_id = dialog_id;
+                                res.messages.add(message);
+                                fromUser.add(message.from_id);
+                                if (message.action != null && message.action.user_id != 0) {
+                                    fromUser.add(message.action.user_id);
+                                }
+                                if (message.media != null && message.media.user_id != 0) {
+                                    fromUser.add(message.media.user_id);
+                                }
+                                if (message.media != null && message.media.audio != null && message.media.audio.user_id != 0) {
+                                    fromUser.add(message.media.audio.user_id);
+                                }
+                                if (message.fwd_from_id != 0) {
+                                    fromUser.add(message.fwd_from_id);
+                                }
+                                message.send_state = cursor.intValue(2);
+                                if (!MessageObject.isUnread(message) && lower_id != 0 || message.id > 0) {
+                                    message.send_state = 0;
+                                }
+                                if (lower_id == 0 && !cursor.isNull(5)) {
+                                    message.random_id = cursor.longValue(5);
+                                }
+                                if ((int) dialog_id == 0 && message.media != null && message.media.photo != null) {
+                                    try {
+                                        SQLiteCursor cursor2 = database.queryFinalized(String.format(Locale.US, "SELECT date FROM enc_tasks_v2 WHERE mid = %d", message.id));
+                                        if (cursor2.next()) {
+                                            message.destroyTime = cursor2.intValue(0);
+                                        }
+                                        cursor2.dispose();
+                                    } catch (Exception e) {
+                                        FileLog.e("tmessages", e);
                                     }
-                                    cursor2.dispose();
-                                } catch (Exception e) {
-                                    FileLog.e("tmessages", e);
                                 }
                             }
+                            buffersStorage.reuseFreeBuffer(data);
                         }
-                        buffersStorage.reuseFreeBuffer(data);
+                        cursor.dispose();
                     }
-                    cursor.dispose();
 
                     Collections.sort(res.messages, new Comparator<TLRPC.Message>() {
                         @Override

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

@@ -23,7 +23,6 @@ import android.widget.TextView;
 
 import org.telegram.android.AndroidUtilities;
 import org.telegram.messenger.R;
-import org.telegram.ui.AnimationCompat.ViewProxy;
 
 public class ActionBar extends FrameLayout {
 
@@ -43,15 +42,17 @@ public class ActionBar extends FrameLayout {
     private TextView subTitleTextView;
     private ActionBarMenu menu;
     private ActionBarMenu actionMode;
-    private View actionOverlay;
     private boolean occupyStatusBar = Build.VERSION.SDK_INT >= 21;
 
+    private boolean allowOverlayTitle;
+    private CharSequence lastTitle;
+    private boolean showingOverlayTitle;
+
     protected boolean isSearchFieldVisible;
     protected int itemsBackgroundResourceId;
     private boolean isBackOverlayVisible;
     protected BaseFragment parentFragment;
     public ActionBarMenuOnItemClick actionBarMenuOnItemClick;
-    private float alphaEx = 1;
     private int extraHeight;
 
     public ActionBar(Context context) {
@@ -182,7 +183,6 @@ public class ActionBar extends FrameLayout {
         }
         backButtonImageView = new ImageView(getContext());
         titleFrameLayout.addView(backButtonImageView);
-        backButtonImageView.setVisibility(VISIBLE);
         backButtonImageView.setScaleType(ImageView.ScaleType.CENTER);
         backButtonImageView.setBackgroundResource(itemsBackgroundResourceId);
         backButtonImageView.setOnClickListener(new OnClickListener() {
@@ -273,6 +273,7 @@ public class ActionBar extends FrameLayout {
             createTitleTextView();
         }
         if (titleTextView != null) {
+            lastTitle = value;
             titleTextView.setVisibility(value != null ? VISIBLE : GONE);
             titleTextView.setText(value);
             positionTitle(getMeasuredWidth(), getMeasuredHeight());
@@ -364,7 +365,7 @@ public class ActionBar extends FrameLayout {
         }
         actionMode.setVisibility(GONE);
         if (titleFrameLayout != null) {
-            titleFrameLayout.setVisibility(isSearchFieldVisible || actionOverlay == null || actionOverlay.getVisibility() == GONE ? VISIBLE : INVISIBLE);
+            titleFrameLayout.setVisibility(VISIBLE);
         }
         if (menu != null) {
             menu.setVisibility(VISIBLE);
@@ -387,7 +388,6 @@ public class ActionBar extends FrameLayout {
         if (drawable != null && drawable instanceof MenuDrawable) {
             ((MenuDrawable)drawable).setRotation(visible ? 1 : 0, true);
         }
-        positionBackOverlay(getMeasuredWidth(), getMeasuredHeight());
     }
 
     public void closeSearchField() {
@@ -403,25 +403,10 @@ public class ActionBar extends FrameLayout {
         positionBackImage(actionBarHeight);
         positionMenu(MeasureSpec.getSize(widthMeasureSpec), actionBarHeight);
         positionTitle(MeasureSpec.getSize(widthMeasureSpec), actionBarHeight);
-        positionBackOverlay(MeasureSpec.getSize(widthMeasureSpec), actionBarHeight);
         actionBarHeight += occupyStatusBar ? AndroidUtilities.statusBarHeight : 0;
         super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(actionBarHeight + extraHeight, MeasureSpec.EXACTLY));
     }
 
-    public void setAlphaEx(float alpha) {
-        alphaEx = alpha;
-        if (menu != null) {
-            ViewProxy.setAlpha(menu, alphaEx);
-        }
-        if (titleFrameLayout != null) {
-            ViewProxy.setAlpha(titleFrameLayout, alphaEx);
-        }
-    }
-
-    public float getAlphaEx() {
-        return alphaEx;
-    }
-
     public void onMenuButtonPressed() {
         if (menu != null) {
             menu.onMenuButtonPressed();
@@ -434,30 +419,24 @@ public class ActionBar extends FrameLayout {
         }
     }
 
-    public void setBackOverlay(int resourceId) {
-        LayoutInflater li = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        actionOverlay = li.inflate(resourceId, null);
-        addView(actionOverlay);
-        actionOverlay.setVisibility(GONE);
-        actionOverlay.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (actionBarMenuOnItemClick != null) {
-                    actionBarMenuOnItemClick.onItemClick(-1);
-                }
-            }
-        });
+    public void setAllowOverlayTitle(boolean value) {
+        allowOverlayTitle = value;
     }
 
-    public void setBackOverlayVisible(boolean visible) {
-        if (actionOverlay == null || parentFragment == null || parentFragment.parentLayout == null) {
+    public void setTitleOverlayText(String text) {
+        if (showingOverlayTitle == (text != null) || !allowOverlayTitle || parentFragment.parentLayout == null) {
             return;
         }
-        isBackOverlayVisible = visible;
-        if (visible) {
-            parentFragment.parentLayout.onOverlayShow(actionOverlay, parentFragment);
+        showingOverlayTitle = text != null;
+        CharSequence textToSet = text != null ? text : lastTitle;
+        if (textToSet != null && titleTextView == null) {
+            createTitleTextView();
+        }
+        if (titleTextView != null) {
+            titleTextView.setVisibility(textToSet != null ? VISIBLE : GONE);
+            titleTextView.setText(textToSet);
+            positionTitle(getMeasuredWidth(), getMeasuredHeight());
         }
-        positionBackOverlay(getMeasuredWidth(), getMeasuredHeight());
     }
 
     public void setExtraHeight(int value, boolean layout) {
@@ -471,24 +450,6 @@ public class ActionBar extends FrameLayout {
         return extraHeight;
     }
 
-    private void positionBackOverlay(int widthMeasureSpec, int heightMeasureSpec) {
-        if (actionOverlay == null) {
-            return;
-        }
-        titleFrameLayout.setVisibility(isSearchFieldVisible || actionOverlay == null || actionOverlay.getVisibility() == GONE ? VISIBLE : INVISIBLE);
-        actionOverlay.setVisibility(!isSearchFieldVisible && isBackOverlayVisible ? VISIBLE : GONE);
-        if (actionOverlay.getVisibility() == VISIBLE) {
-            MarginLayoutParams layoutParams = (MarginLayoutParams) actionOverlay.getLayoutParams();
-            layoutParams.width = LayoutParams.WRAP_CONTENT;
-            layoutParams.height = LayoutParams.MATCH_PARENT;
-            actionOverlay.setLayoutParams(layoutParams);
-            actionOverlay.measure(widthMeasureSpec, heightMeasureSpec);
-            layoutParams.topMargin = occupyStatusBar ? AndroidUtilities.statusBarHeight : 0;
-            layoutParams.width = Math.min(actionOverlay.getMeasuredWidth() + AndroidUtilities.dp(4), widthMeasureSpec - (menu != null ? menu.getMeasuredWidth() : 0));
-            actionOverlay.setLayoutParams(layoutParams);
-        }
-    }
-
     public void setOccupyStatusBar(boolean value) {
         occupyStatusBar = value;
     }

TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java

@@ -42,7 +42,6 @@ public class ActionBarLayout extends FrameLayout {
 
     public static interface ActionBarLayoutDelegate {
         public abstract boolean onPreIme();
-        public abstract void onOverlayShow(View view, BaseFragment fragment);
         public abstract boolean needPresentFragment(BaseFragment fragment, boolean removeLast, boolean forceWithoutAnimation, ActionBarLayout layout);
         public abstract boolean needAddFragmentToStack(BaseFragment fragment, ActionBarLayout layout);
         public abstract boolean needCloseLastFragment(ActionBarLayout layout);
@@ -128,6 +127,8 @@ public class ActionBarLayout extends FrameLayout {
     private View backgroundView;
     private boolean removeActionBarExtraHeight;
 
+    private String titleOverlayText;
+
     private ActionBarLayoutDelegate delegate = null;
     protected Activity parentActivity = null;
 
@@ -332,6 +333,7 @@ public class ActionBarLayout extends FrameLayout {
                 lastFragment.actionBar.setOccupyStatusBar(false);
             }
             containerViewBack.addView(lastFragment.actionBar);
+            lastFragment.actionBar.setTitleOverlayText(titleOverlayText);
         }
         containerViewBack.addView(fragmentView);
         ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
@@ -558,6 +560,7 @@ public class ActionBarLayout extends FrameLayout {
                 fragment.actionBar.setOccupyStatusBar(false);
             }
             containerViewBack.addView(fragment.actionBar);
+            fragment.actionBar.setTitleOverlayText(titleOverlayText);
         }
         containerViewBack.addView(fragmentView);
         ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
@@ -695,6 +698,7 @@ public class ActionBarLayout extends FrameLayout {
                     previousFragment.actionBar.setOccupyStatusBar(false);
                 }
                 containerView.addView(previousFragment.actionBar);
+                previousFragment.actionBar.setTitleOverlayText(titleOverlayText);
             }
             containerView.addView(fragmentView);
             ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
@@ -798,6 +802,7 @@ public class ActionBarLayout extends FrameLayout {
                 parent.removeView(previousFragment.actionBar);
             }
             containerView.addView(previousFragment.actionBar);
+            previousFragment.actionBar.setTitleOverlayText(titleOverlayText);
         }
         containerView.addView(fragmentView);
         ViewGroup.LayoutParams layoutParams = fragmentView.getLayoutParams();
@@ -842,12 +847,6 @@ public class ActionBarLayout extends FrameLayout {
         return super.onKeyUp(keyCode, event);
     }
 
-    protected void onOverlayShow(View view, BaseFragment fragment) {
-        if (delegate != null) {
-            delegate.onOverlayShow(view, fragment);
-        }
-    }
-
     public void onActionModeStarted(ActionMode mode) {
         if (currentActionBar != null) {
             currentActionBar.setVisibility(GONE);
@@ -942,4 +941,13 @@ public class ActionBarLayout extends FrameLayout {
     public void setRemoveActionBarExtraHeight(boolean value) {
         removeActionBarExtraHeight = value;
     }
+
+    public void setTitleOverlayText(String text) {
+        titleOverlayText = text;
+        for (BaseFragment fragment : fragmentsStack) {
+            if (fragment.actionBar != null) {
+                fragment.actionBar.setTitleOverlayText(titleOverlayText);
+            }
+        }
+    }
 }

TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java

@@ -57,6 +57,7 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
     public DialogsSearchAdapter(Context context, boolean messagesSearch) {
         mContext = context;
         needMessagesSearch = messagesSearch;
+        needMessagesSearch = false;
     }
 
     public void setDelegate(MessagesActivitySearchAdapterDelegate delegate) {

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

@@ -67,7 +67,7 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("BlockedUsers", R.string.BlockedUsers));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java

@@ -74,6 +74,8 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
     private boolean photoNotSet = false;
     private boolean cancelLoading = false;
 
+    private boolean allowedToSetPhoto = true;
+
     private int TAG;
 
     private int buttonState = 0;
@@ -595,18 +597,19 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
                             }
                         }
                         if (photoExist || MediaController.getInstance().canDownloadMedia(MediaController.AUTODOWNLOAD_MASK_PHOTO)) {
-                            if (messageObject.imagePreview != null) {
-                                photoImage.setImage(currentPhotoObject.photoOwner.location, currentPhotoFilter, new BitmapDrawable(messageObject.imagePreview), noSize ? 0 : currentPhotoObject.photoOwner.size, false);
+                            if (allowedToSetPhoto || ImageLoader.getInstance().getImageFromMemory(currentPhotoObject.photoOwner.location, null, currentPhotoFilter, null) != null) {
+                                allowedToSetPhoto = true;
+                                if (messageObject.imagePreview != null) {
+                                    photoImage.setImage(currentPhotoObject.photoOwner.location, currentPhotoFilter, new BitmapDrawable(messageObject.imagePreview), noSize ? 0 : currentPhotoObject.photoOwner.size, false);
+                                } else {
+                                    photoImage.setImage(currentPhotoObject.photoOwner.location, currentPhotoFilter, null, noSize ? 0 : currentPhotoObject.photoOwner.size, false);
+                                }
                             } else {
-                                photoImage.setImage(currentPhotoObject.photoOwner.location, currentPhotoFilter, null, noSize ? 0 : currentPhotoObject.photoOwner.size, false);
+                                photoImage.setImageBitmap(messageObject.imagePreview);
                             }
                         } else {
                             photoNotSet = true;
-                            if (messageObject.imagePreview != null) {
-                                photoImage.setImageBitmap(messageObject.imagePreview);
-                            } else {
-                                photoImage.setImageBitmap((Bitmap)null);
-                            }
+                            photoImage.setImageBitmap(messageObject.imagePreview);
                         }
                     }
                 } else {
@@ -800,6 +803,18 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
         }
     }
 
+    public void setAllowedToSetPhoto(boolean value) {
+        if (allowedToSetPhoto == value) {
+            return;
+        }
+        allowedToSetPhoto = value;
+        if (value && currentMessageObject != null && currentMessageObject.type == 1) {
+            MessageObject temp = currentMessageObject;
+            currentMessageObject = null;
+            setMessageObject(temp);
+        }
+    }
+
     @Override
     protected void onAfterBackgroundDraw(Canvas canvas) {
         boolean imageDrawn = false;

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

@@ -58,7 +58,7 @@ public class ChangeChatNameActivity extends BaseFragment {
         if (fragmentView == null) {
 
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("EditName", R.string.EditName));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -50,7 +50,7 @@ public class ChangeNameActivity extends BaseFragment {
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("EditName", R.string.EditName));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -63,7 +63,7 @@ public class ChangeUsernameActivity extends BaseFragment {
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("Username", R.string.Username));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -126,6 +126,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     private boolean paused = true;
     private boolean readWhenResume = false;
 
+    private boolean openAnimationEnded = false;
+
     private int readWithDate = 0;
     private int readWithMid = 0;
     private boolean scrollToTopOnResume = false;
@@ -159,6 +161,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     private boolean loadingForward = false;
     private MessageObject unreadMessageObject = null;
     private MessageObject scrollToMessage = null;
+    private int highlightMessageId = Integer.MAX_VALUE;
+    private boolean scrollToMessageMiddleScreen = false;
 
     private String currentPicturePath;
 
@@ -825,12 +829,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             selectedMessagesCountTextView.setLayoutParams(layoutParams);
 
             if (currentEncryptedChat == null) {
-                actionModeViews.add(actionMode.addItem(copy, R.drawable.ic_ab_fwd_copy, R.drawable.bar_selector_mode));
-                actionModeViews.add(actionMode.addItem(forward, R.drawable.ic_ab_fwd_forward, R.drawable.bar_selector_mode));
-                actionModeViews.add(actionMode.addItem(delete, R.drawable.ic_ab_fwd_delete, R.drawable.bar_selector_mode));
+                actionModeViews.add(actionMode.addItem(copy, R.drawable.ic_ab_fwd_copy, R.drawable.bar_selector_mode, null, AndroidUtilities.dp(54)));
+                actionModeViews.add(actionMode.addItem(forward, R.drawable.ic_ab_fwd_forward, R.drawable.bar_selector_mode, null, AndroidUtilities.dp(54)));
+                actionModeViews.add(actionMode.addItem(delete, R.drawable.ic_ab_fwd_delete, R.drawable.bar_selector_mode, null, AndroidUtilities.dp(54)));
             } else {
-                actionModeViews.add(actionMode.addItem(copy, R.drawable.ic_ab_fwd_copy, R.drawable.bar_selector_mode));
-                actionModeViews.add(actionMode.addItem(delete, R.drawable.ic_ab_fwd_delete, R.drawable.bar_selector_mode));
+                actionModeViews.add(actionMode.addItem(copy, R.drawable.ic_ab_fwd_copy, R.drawable.bar_selector_mode, null, AndroidUtilities.dp(54)));
+                actionModeViews.add(actionMode.addItem(delete, R.drawable.ic_ab_fwd_delete, R.drawable.bar_selector_mode, null, AndroidUtilities.dp(54)));
             }
             actionMode.getItem(copy).setVisibility(selectedMessagesCanCopyIds.size() != 0 ? View.VISIBLE : View.GONE);
             checkActionBarMenu();
@@ -1062,7 +1066,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             chatListView.setOnScrollListener(new AbsListView.OnScrollListener() {
                 @Override
                 public void onScrollStateChanged(AbsListView absListView, int i) {
-
+                    if (i == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL || i == AbsListView.OnScrollListener.SCROLL_STATE_FLING && highlightMessageId != Integer.MAX_VALUE) {
+                        highlightMessageId = Integer.MAX_VALUE;
+                        updateVisibleRows();
+                    }
                 }
 
                 @Override
@@ -1847,10 +1854,13 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                         messages.add(messages.size() - (dateAdded ? 0 : 1), dateObj);
                         unreadMessageObject = dateObj;
                         scrollToMessage = unreadMessageObject;
+                        scrollToMessageMiddleScreen = false;
                         newRowsCount++;
                     } else if (load_type == 3 && obj.messageOwner.id == startLoadFromMessageId) {
+                        highlightMessageId = obj.messageOwner.id;
                         scrollToMessage = obj;
                         startLoadFromMessageId = 0;
+                        scrollToMessageMiddleScreen = true;
                     }
 
                     if (obj.messageOwner.id == last_message_id) {
@@ -1890,10 +1900,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                         if (first || scrollToTopOnResume) {
                             chatAdapter.notifyDataSetChanged();
                             if (scrollToMessage != null) {
+                                final int yOffset = scrollToMessageMiddleScreen ? Math.max(0, (AndroidUtilities.displaySize.y - AndroidUtilities.statusBarHeight - scrollToMessage.textHeight - AndroidUtilities.getCurrentActionBarHeight() - AndroidUtilities.dp(48)) / 2) : 0;
                                 if (messages.get(messages.size() - 1) == scrollToMessage) {
-                                    chatListView.setSelectionFromTop(0, AndroidUtilities.dp(-11));
+                                    chatListView.setSelectionFromTop(0, AndroidUtilities.dp(-11) + yOffset);
                                 } else {
-                                    chatListView.setSelectionFromTop(messages.size() - messages.indexOf(scrollToMessage), AndroidUtilities.dp(-11));
+                                    chatListView.setSelectionFromTop(messages.size() - messages.indexOf(scrollToMessage), AndroidUtilities.dp(-11) + yOffset);
                                 }
                                 ViewTreeObserver obs = chatListView.getViewTreeObserver();
                                 obs.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
@@ -1901,9 +1912,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                                     public boolean onPreDraw() {
                                         if (!messages.isEmpty()) {
                                             if (messages.get(messages.size() - 1) == scrollToMessage) {
-                                                chatListView.setSelectionFromTop(0, AndroidUtilities.dp(-11));
+                                                chatListView.setSelectionFromTop(0, AndroidUtilities.dp(-11) + yOffset);
                                             } else {
-                                                chatListView.setSelectionFromTop(messages.size() - messages.indexOf(scrollToMessage), AndroidUtilities.dp(-11));
+                                                chatListView.setSelectionFromTop(messages.size() - messages.indexOf(scrollToMessage), AndroidUtilities.dp(-11) + yOffset);
                                             }
                                         }
                                         chatListView.getViewTreeObserver().removeOnPreDrawListener(this);
@@ -2412,6 +2423,19 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         }
     }
 
+    @Override
+    public void onOpenAnimationEnd() {
+        openAnimationEnded = true;
+        int count = chatListView.getChildCount();
+        for (int a = 0; a < count; a++) {
+            View view = chatListView.getChildAt(a);
+            if (view instanceof ChatMediaCell) {
+                ChatMediaCell cell = (ChatMediaCell)view;
+                cell.setAllowedToSetPhoto(true);
+            }
+        }
+    }
+
     private void updateBottomOverlay() {
         if (currentUser == null) {
             bottomOverlayChatText.setText(LocaleController.getString("DeleteThisGroup", R.string.DeleteThisGroup));
@@ -2477,7 +2501,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         if (scrollToTopOnResume) {
             if (scrollToTopUnReadOnResume && scrollToMessage != null) {
                 if (chatListView != null) {
-                    chatListView.setSelectionFromTop(messages.size() - messages.indexOf(scrollToMessage), -chatListView.getPaddingTop() - AndroidUtilities.dp(7));
+                    final int yOffset = scrollToMessageMiddleScreen ? Math.max(0, (AndroidUtilities.displaySize.y - AndroidUtilities.statusBarHeight - scrollToMessage.textHeight - AndroidUtilities.getCurrentActionBarHeight() - AndroidUtilities.dp(48)) / 2) : 0;
+                    chatListView.setSelectionFromTop(messages.size() - messages.indexOf(scrollToMessage), -chatListView.getPaddingTop() - AndroidUtilities.dp(7) + yOffset);
                 }
             } else {
                 if (chatListView != null) {
@@ -3020,7 +3045,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         int count = chatListView.getChildCount();
         for (int a = 0; a < count; a++) {
             View view = chatListView.getChildAt(a);
-            Object tag = view.getTag();
             if (view instanceof ChatBaseCell) {
                 ChatBaseCell cell = (ChatBaseCell)view;
 
@@ -3041,6 +3065,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 cell.setMessageObject(cell.getMessageObject());
 
                 cell.setCheckPressed(!disableSelection, disableSelection && selected);
+
+                if (highlightMessageId != Integer.MAX_VALUE && cell.getMessageObject() != null && cell.getMessageObject().messageOwner.id == highlightMessageId) {
+                    cell.setCheckPressed(false, true);
+                }
             }
         }
     }
@@ -3249,6 +3277,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                         }
                     });
                     if (view instanceof ChatMediaCell) {
+                        ((ChatMediaCell) view).setAllowedToSetPhoto(openAnimationEnded);
                         ((ChatMediaCell) view).setMediaDelegate(new ChatMediaCell.ChatMediaCellDelegate() {
                             @Override
                             public void didClickedImage(ChatMediaCell cell) {
@@ -3444,6 +3473,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 if (view instanceof ChatAudioCell && MediaController.getInstance().canDownloadMedia(MediaController.AUTODOWNLOAD_MASK_AUDIO)) {
                     ((ChatAudioCell)view).downloadAudioIfNeed();
                 }
+                if (highlightMessageId != Integer.MAX_VALUE && message.messageOwner.id == highlightMessageId) {
+                    baseCell.setCheckPressed(false, true);
+                }
             } else if (view instanceof ChatActionCell) {
                 ChatActionCell actionCell = (ChatActionCell)view;
                 actionCell.setMessageObject(message);

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

@@ -80,7 +80,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             if (addContact) {
                 actionBar.setTitle(LocaleController.getString("AddContactTitle", R.string.AddContactTitle));
             } else {

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

@@ -119,7 +119,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
             searchWas = false;
 
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(destroyAfterSelect ? LocaleController.getString("SelectContact", R.string.SelectContact) : LocaleController.getString("Contacts", R.string.Contacts));
 
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {

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

@@ -64,7 +64,7 @@ public class CountrySelectActivity extends BaseFragment {
     public View createView(LayoutInflater inflater, final ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("ChooseCountry", R.string.ChooseCountry));
 
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {

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

@@ -132,7 +132,7 @@ public class DocumentSelectActivity extends BaseFragment {
 
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("SelectFile", R.string.SelectFile));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -52,6 +52,7 @@ import org.telegram.ui.Adapters.ContactsSearchAdapter;
 import org.telegram.ui.ActionBar.ActionBar;
 import org.telegram.ui.ActionBar.ActionBarMenu;
 import org.telegram.ui.ActionBar.BaseFragment;
+import org.telegram.ui.Cells.UserCell;
 import org.telegram.ui.Views.SectionsListView;
 
 import java.util.ArrayList;
@@ -145,7 +146,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
             searchWas = false;
 
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             if (isAlwaysShare) {
                 actionBar.setTitle(LocaleController.getString("AlwaysShareWithTitle", R.string.AlwaysShareWithTitle));
             } else if (isNeverShare) {
@@ -473,9 +474,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
         } else if (id == NotificationCenter.updateInterfaces) {
             int mask = (Integer)args[0];
             if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0 || (mask & MessagesController.UPDATE_MASK_STATUS) != 0) {
-                if (listView != null) {
-                    listView.invalidateViews();
-                }
+                updateVisibleRows(mask);
             }
         } else if (id == NotificationCenter.chatDidCreated) {
             AndroidUtilities.runOnUIThread(new Runnable() {
@@ -487,6 +486,18 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
         }
     }
 
+    private void updateVisibleRows(int mask) {
+        if (listView != null) {
+            int count = listView.getChildCount();
+            for (int a = 0; a < count; a++) {
+                View child = listView.getChildAt(a);
+                if (child instanceof UserCell) {
+                    ((UserCell) child).update(mask);
+                }
+            }
+        }
+    }
+
     public void setDelegate(GroupCreateActivityDelegate delegate) {
         this.delegate = delegate;
     }

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

@@ -140,7 +140,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             if (isBroadcast) {
                 actionBar.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList));
             } else {

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

@@ -21,7 +21,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.telegram.android.AndroidUtilities;
 import org.telegram.android.LocaleController;
 import org.telegram.messenger.TLRPC;
 import org.telegram.android.MessagesController;
@@ -47,7 +46,7 @@ public class IdenticonActivity extends BaseFragment {
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("EncryptionKey", R.string.EncryptionKey));
 
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {

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

@@ -58,7 +58,7 @@ public class LanguageSelectActivity extends BaseFragment {
             searchWas = false;
 
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("Language", R.string.Language));
 
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {

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

@@ -101,7 +101,7 @@ public class LastSeenActivity extends BaseFragment implements NotificationCenter
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("PrivacyLastSeen", R.string.PrivacyLastSeen));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -78,7 +78,7 @@ public class LastSeenUsersActivity extends BaseFragment implements NotificationC
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             if (isAlwaysShare) {
                 actionBar.setTitle(LocaleController.getString("AlwaysShareWithTitle", R.string.AlwaysShareWithTitle));
             } else {

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

@@ -34,7 +34,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import org.telegram.android.AndroidUtilities;
@@ -917,7 +916,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
         Utilities.checkForUpdates(this);
         ApplicationLoader.mainInterfacePaused = false;
         ConnectionsManager.getInstance().setAppPaused(false, false);
-        //actionBarLayout.getActionBar().setBackOverlayVisible(currentConnectionState != 0);
+        updateCurrentConnectionState();
     }
 
     @Override
@@ -958,13 +957,25 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
             if (currentConnectionState != state) {
                 FileLog.e("tmessages", "switch to state " + state);
                 currentConnectionState = state;
-                //actionBarLayout.getActionBar().setBackOverlayVisible(currentConnectionState != 0);
+                updateCurrentConnectionState();
             }
         } else if (id == NotificationCenter.mainUserInfoChanged) {
             drawerLayoutAdapter.notifyDataSetChanged();
         }
     }
 
+    private void updateCurrentConnectionState() {
+        String text = null;
+        if (currentConnectionState == 1) {
+            text = LocaleController.getString("WaitingForNetwork", R.string.WaitingForNetwork);
+        } else if (currentConnectionState == 2) {
+            text = LocaleController.getString("Connecting", R.string.Connecting);
+        } else if (currentConnectionState == 3) {
+            text = LocaleController.getString("Updating", R.string.Updating);
+        }
+        actionBarLayout.setTitleOverlayText(text);
+    }
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         try {
@@ -1070,24 +1081,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
         return false;
     }
 
-    @Override
-    public void onOverlayShow(View view, BaseFragment fragment) {
-        if (view == null || fragment == null || actionBarLayout.fragmentsStack.isEmpty()) {
-            return;
-        }
-        View backStatusButton = view.findViewById(R.id.back_button);
-        TextView statusText = (TextView)view.findViewById(R.id.status_text);
-        backStatusButton.setVisibility(actionBarLayout.fragmentsStack.get(0) == fragment ? View.GONE : View.VISIBLE);
-        view.setEnabled(actionBarLayout.fragmentsStack.get(0) != fragment);
-        if (currentConnectionState == 1) {
-            statusText.setText(LocaleController.getString("WaitingForNetwork", R.string.WaitingForNetwork));
-        } else if (currentConnectionState == 2) {
-            statusText.setText(LocaleController.getString("Connecting", R.string.Connecting));
-        } else if (currentConnectionState == 3) {
-            statusText.setText(LocaleController.getString("Updating", R.string.Updating));
-        }
-    }
-
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (AndroidUtilities.isTablet()) {

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

@@ -93,7 +93,7 @@ public class LocationActivity extends BaseFragment implements NotificationCenter
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             if (messageObject != null) {
                 actionBar.setTitle(LocaleController.getString("ChatLocation", R.string.ChatLocation));
             } else {

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

@@ -89,7 +89,7 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("SharedMedia", R.string.SharedMedia));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -202,7 +202,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                 actionBar.setBackButtonDrawable(new MenuDrawable());
                 actionBar.setTitle(LocaleController.getString("AppName", R.string.AppName));
             }
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
 
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -136,7 +136,7 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -331,7 +331,7 @@ public class PhotoCropActivity extends BaseFragment {
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("AddContact", R.string.AddContact));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -145,9 +145,12 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen
             });
 
             cancelButton.setText(LocaleController.getString("Cancel", R.string.Cancel).toUpperCase());
+            cancelButton.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
             doneButtonTextView = (TextView)doneButton.findViewById(R.id.done_button_text);
             doneButtonTextView.setText(LocaleController.getString("Send", R.string.Send).toUpperCase());
+            doneButtonTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
             doneButtonBadgeTextView = (TextView)doneButton.findViewById(R.id.done_button_badge);
+            doneButtonBadgeTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
 
             listView.setAdapter(listAdapter = new ListAdapter(getParentActivity()));
             listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {

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

@@ -911,9 +911,12 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
         pickerView.setLayoutParams(layoutParams);
 
         cancelButton.setText(LocaleController.getString("Cancel", R.string.Cancel).toUpperCase());
+        cancelButton.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
         doneButtonTextView = (TextView)doneButton.findViewById(R.id.done_button_text);
         doneButtonTextView.setText(LocaleController.getString("Send", R.string.Send).toUpperCase());
+        doneButtonTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
         doneButtonBadgeTextView = (TextView)doneButton.findViewById(R.id.done_button_badge);
+        doneButtonBadgeTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
 
         gestureDetector = new GestureDetector(containerView.getContext(), this);
         gestureDetector.setOnDoubleTapListener(this);

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

@@ -91,7 +91,7 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("PrivacySettings", R.string.PrivacySettings));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

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

@@ -81,7 +81,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarDrawable.java

@@ -83,6 +83,9 @@ public class AvatarDrawable extends Drawable {
     }
 
     public static int getColorIndex(int id) {
+        if (id >= 0 && id < 8) {
+            return id;
+        }
         try {
             String str;
             if (id >= 0) {

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

@@ -103,7 +103,7 @@ public class WallpapersActivity extends BaseFragment implements NotificationCent
     public View createView(LayoutInflater inflater, ViewGroup container) {
         if (fragmentView == null) {
             actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-            actionBar.setBackOverlay(R.layout.updating_state_layout);
+            actionBar.setAllowOverlayTitle(true);
             actionBar.setTitle(LocaleController.getString("ChatBackground", R.string.ChatBackground));
             actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
                 @Override

TMessagesProj/src/main/res/layout-ar/location_view_layout.xml

@@ -31,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="22dp"
-            android:textColor="#000000"
+            android:textColor="#212121"
             android:layout_marginRight="88dp"
             android:layout_marginTop="20dp"
             android:layout_marginLeft="12dp"

TMessagesProj/src/main/res/layout/location_view_layout.xml

@@ -31,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="22dp"
-            android:textColor="#000000"
+            android:textColor="#212121"
             android:layout_marginLeft="88dp"
             android:layout_marginTop="20dp"
             android:layout_marginRight="12dp"

TMessagesProj/src/main/res/layout/photo_picker_bottom_layout.xml

@@ -14,21 +14,14 @@
         android:paddingLeft="3dp"
         android:layout_width="0.0dip"
         android:layout_height="fill_parent"
-        android:layout_weight="1.0"
-        android:textStyle="bold"/>
-
-    <View
-        android:layout_gravity="center_vertical"
-        android:background="#5c5c5c"
-        android:layout_width="1px"
-        android:layout_height="28dp" />
+        android:layout_weight="1.0"/>
 
     <FrameLayout
         android:id="@+id/done_button"
         android:background="@drawable/bar_selector_picker"
         android:paddingRight="3dp"
         android:clickable="true"
-        android:layout_width="0.0dip"
+        android:layout_width="0dp"
         android:layout_height="fill_parent"
         android:layout_weight="1.0">
 
@@ -45,11 +38,12 @@
                 android:background="@drawable/photobadge"
                 android:layout_gravity="center"
                 android:layout_width="wrap_content"
-                android:layout_height="19dp"
+                android:layout_height="23dp"
+                android:minWidth="23dp"
                 android:id="@+id/done_button_badge"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:textStyle="bold"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:paddingBottom="1dp"
                 android:layout_marginRight="10dp"/>
 
             <TextView
@@ -60,7 +54,7 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/done_button_text"
                 android:drawablePadding="8dp"
-                android:textStyle="bold"/>
+                android:layout_gravity="center_vertical"/>
 
         </LinearLayout>
 

TMessagesProj/src/main/res/layout/updating_state_layout.xml

@@ -1,30 +0,0 @@
-<org.telegram.ui.Views.FrameLayoutFixed
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="400dp"
-    android:layout_height="fill_parent"
-    android:background="@drawable/bar_selector"
-    android:id="@+id/back_button_background"
-    android:layout_gravity="top">
-
-    <ImageView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:src="@drawable/ic_ab_back"
-        android:layout_gravity="center_vertical|left"
-        android:layout_marginLeft="3dp"
-        android:id="@+id/back_button"/>
-
-    <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:textColor="#ffffff"
-        android:textSize="17dp"
-        android:layout_gravity="center_vertical|left"
-        android:gravity="top|left"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:paddingRight="2dp"
-        android:id="@+id/status_text"/>
-
-</org.telegram.ui.Views.FrameLayoutFixed>

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

@@ -9,7 +9,7 @@
     <string name="LanguageCode">ar</string>
     <!--signin view-->
     <string name="YourPhone">رقم هاتفك المحمول</string>
-    <string name="StartText">يرجى التحقق من صحة رمز بلدك وإدخال رقم هاتفك المحمول</string>
+    <string name="StartText">يرجى التحقق من صحة رمز بلدك وإدخال رقم هاتفك المحمول.</string>
     <string name="ChooseCountry">اختر دولة</string>
     <string name="WrongCountry">رمز البلد خاطئ</string>
     <!--code enter view-->
@@ -28,16 +28,13 @@
     <string name="LastName">اسم العائلة</string>
     <string name="CancelRegistration">إلغاء التسجيل</string>
     <!--chats view-->
-    <string name="Chats">الدردشات</string>
-    <string name="Search">بحث</string>
-    <string name="NewMessages">الرسائل الجديدة</string>
     <string name="Settings">الإعدادات</string>
     <string name="Contacts">جهات الاتصال</string>
     <string name="NewGroup">مجموعة جديدة</string>
     <string name="Yesterday">أمس</string>
     <string name="NoResult">لا توجد نتائج</string>
     <string name="NoChats">...لا توجد محادثات بعد</string>
-    <string name="NoChatsHelp">إبدأ المراسلة بالضغط على\nأيقونة النقاط في أعلى يمين الشاشة\nأو اضغط على زر القائمة الرئيسية لخيارات أكثر.</string>
+    <string name="NoChatsHelp">إبدأ المراسلة بالضغط على\nأيقونة النقاط في أعلى يمين الشاشة\nأو اذهب لقسم جهات الاتصال.</string>
     <string name="WaitingForNetwork">في إنتظار الشبكة...</string>
     <string name="Connecting">جاري الاتصال...</string>
     <string name="Updating">جاري التحديث...</string>
@@ -47,16 +44,15 @@
     <string name="EncryptionProcessing">جاري إرسال المفاتيح المشفرة...</string>
     <string name="EncryptedChatStartedOutgoing">%s قام بالدخول للمحادثة السرية.</string>
     <string name="EncryptedChatStartedIncoming">لقد قمت بالدخول للمحادثة السرية.</string>
-    <string name="ClearHistory">مسح سجل التاريخ</string>
+    <string name="ClearHistory">مسح سجل المحادثات</string>
     <string name="DeleteChat">حذف وخروج</string>
-    <string name="HiddenName">الاسم مخفي</string>
+    <string name="DeleteChatUser">حذف المحادثة</string>
+    <string name="HiddenName">حساب محذوف</string>
     <string name="SelectChat">اختر محادثة</string>
-    <string name="PhotoTip">إضغط بإستمرار على المستخدم العرض</string>
+    <string name="PhotoTip">اضغط بإستمرار على المستخدم العرض</string>
     <string name="CompatibilityChat">%1$s يستخدم إصدار قديم من تيليجرام، لذلك، الصور السرية ستظهر في وضع الموافقة.\n\nعندما يقوم %2$s بتحديث تيليجرام، الصور التي بها عداد دقيقة أو أقل ستعمل بطريقة \"الاستمرار بالضغط للإستعراض\"، وسيتم إخبارك عندما يلتقط المستقبل صورة من شاشته.</string>
-    <string name="SearchConversations">Conversations</string>
-    <string name="SearchMessages">Messages</string>
+    <string name="SearchMessages">الرسائل</string>
     <!--broadcasts-->
-    <string name="BroadcastList">قائمة الرسالة الجماعية</string>
     <string name="NewBroadcastList">رسالة جماعية جديدة</string>
     <string name="EnterListName">أدخل اسم القائمة</string>
     <string name="YouCreatedBroadcastList">أنت قمت بإنشاء قائمة رسالة جماعية</string>
@@ -75,10 +71,10 @@
     <string name="ExternalStorage">الذاكرة الخارجية</string>
     <string name="SystemRoot">جذر النظام</string>
     <string name="SdCard">بطاقة الذاكرة</string>
+    <string name="Folder">مجلد</string>
     <!--chat view-->
     <string name="Invisible">مخفي</string>
     <string name="Typing">جاري الكتابة… </string>
-    <string name="Attach">أرفق</string>
     <string name="IsTyping">يكتب… </string>
     <string name="AreTyping">يكتبون… </string>
     <string name="GotAQuestion">هل يوجد لديك سؤال\nحول تيليجرام؟</string>
@@ -88,17 +84,12 @@
     <string name="ChatVideo">مقطع مرئي</string>
     <string name="ChatDocument">مستند</string>
     <string name="NoMessages">...لا توجد رسائل بعد</string>
-    <string name="ViewPhoto">عرض الصورة</string>
-    <string name="ViewLocation">عرض الموقع</string>
-    <string name="ViewVideo">مشاهدة المقطع المرئي</string>
     <string name="ForwardedMessage">الرسالة المعاد توجيهها</string>
     <string name="From">من</string>
     <string name="NoRecent">لا توجد رسائل أحدث</string>
     <string name="Message">الرسالة</string>
-    <string name="TypeMessage">أكتب رسالة</string>
-    <string name="DOWNLOAD">تحميل</string>
-    <string name="Selected">تم تحديد : %d</string>
-    <string name="ShareMyContactInfo">شارك جهة الاتصال الخاصة بي</string>
+    <string name="TypeMessage">الرسالة</string>
+    <string name="ShareMyContactInfo">قم بمشاركة جهة الاتصال الخاصة بي</string>
     <string name="AddToContacts">أضف لجهات الاتصال</string>
     <string name="EncryptedPlaceholderTitleIncoming">%s قام بدعوتك لمحادثة سرية</string>
     <string name="EncryptedPlaceholderTitleOutgoing">لقد قمت بدعوة %s لمحادثة سرية.</string>
@@ -116,8 +107,6 @@
     <string name="ApplyLocalizationFile">تطبيق ملف التعريب</string>
     <string name="UnsupportedAttachment">المرفق غير مدعوم</string>
     <!--notification-->
-    <string name="EncryptedChatRequested">تم طلب محادثة سرية</string>
-    <string name="EncryptedChatAccepted">تم بدء المحادثة السرية</string>
     <string name="MessageLifetimeChanged">%1$s قام بتعيين عداد التدمير الذاتي إلى to %2$s</string>
     <string name="MessageLifetimeChangedOutgoing">لقد قمت بتعيين التدمير الذاتي إلى %1$s</string>
     <string name="MessageLifetimeRemoved">%1$s قام بإيقاف عداد التدمير الذاتي</string>
@@ -160,21 +149,21 @@
     <string name="TodayAt">اليوم الساعة</string>
     <string name="YesterdayAt">أمس الساعة</string>
     <string name="Online">متصل</string>
-    <string name="Offline">غير متصل</string>
     <string name="LastSeen">آخر ظهور</string>
     <string name="LastSeenDate">آخر ظهور</string>
     <string name="InviteFriends">قم بدعوة صديق</string>
     <string name="GlobalSearch">بحث شامل</string>
+    <string name="Lately">آخر ظهور كان قريب</string>
+    <string name="WithinAWeek">آخر ظهور خلال أسبوع</string>
+    <string name="WithinAMonth">آخر ظهور خلال شهر</string>
+    <string name="ALongTimeAgo">آخر ظهور خلال فترة طويلة</string>
     <!--group create view-->
     <string name="SendMessageTo">إرسال الرسالة إلى...</string>
     <string name="EnterGroupNamePlaceholder">أدخل اسم للمجموعة</string>
     <string name="GroupName">اسم المجموعة</string>
-    <string name="AllContacts">جميع جهات الاتصال</string>
     <string name="MembersCount">%1$d/%2$d عضو</string>
     <!--group info view-->
-    <string name="EnterGroupNameTitle">أدخل سم للمجموعة</string>
     <string name="SharedMedia">عدد الوسائط المشتركة</string>
-    <string name="GroupInfo">معلومات المجموعة</string>
     <string name="SETTINGS">الإعدادات</string>
     <string name="AddMember">إضافة مشترك</string>
     <string name="DeleteAndExit">مغادرة المجموعة وحذفها</string>
@@ -183,19 +172,17 @@
     <!--contact info view-->
     <string name="ShareContact">مشاركة</string>
     <string name="AddContact">إضافة</string>
+    <string name="AddContactTitle">قم بإضافة جهة اتصال</string>
     <string name="BlockContact">حظر</string>
     <string name="EditContact">تعديل</string>
     <string name="DeleteContact">حذف</string>
-    <string name="PhoneHome">الهاتف المنزلي</string>
+    <string name="PhoneHome">منزل</string>
     <string name="PhoneMobile">الهاتف المحمول</string>
-    <string name="PhoneWork">هاتف العمل</string>
-    <string name="PhoneOther">هاتف آخر</string>
-    <string name="PhoneMain">الهاتف الأساسي</string>
-    <string name="ContactInfo">معلومات جهة الاتصال</string>
-    <string name="PHONE">الهاتف</string>
+    <string name="PhoneWork">العمل</string>
+    <string name="PhoneOther">آخر</string>
+    <string name="PhoneMain">الرئيسية</string>
     <string name="StartEncryptedChat">إبدأ محادثة سرية</string>
     <string name="CreateEncryptedChatError">حدث خطأ.</string>
-    <string name="SecretTitle">محادثة سرية</string>
     <string name="EncryptionKey">مفتاح التشفير</string>
     <string name="MessageLifetime">عداد التدمير الذاتي</string>
     <string name="ShortMessageLifetimeForever">إيقاف</string>
@@ -222,14 +209,14 @@
     <string name="AskAQuestion">اسأل سؤالًا</string>
     <string name="EnableAnimations">تفعيل التأثيرات المتحركة</string>
     <string name="Unblock">إلغاء الحظر</string>
-    <string name="UnblockText">إضغط بإستمرار على المستخدم لإلغاء الحظر</string>
+    <string name="UnblockText">اضغط بإستمرار على المستخدم لإلغاء الحظر</string>
     <string name="NoBlocked">لا توجد جهات اتصال محظورة</string>
     <string name="MessageNotifications">إشعارات الرسائل</string>
     <string name="Alert">التنبيه</string>
     <string name="MessagePreview">معاينة الرسالة</string>
     <string name="GroupNotifications">إشعارات المجموعات</string>
     <string name="Sound">الصوت</string>
-    <string name="InAppNotifications">إشعارات داخل التطبيق</string>
+    <string name="InAppNotifications">الإشعارات داخل التطبيق</string>
     <string name="InAppSounds">أصوات داخل التطبيق</string>
     <string name="InAppVibrate">اهتزاز داخل التطبيق</string>
     <string name="Vibrate">اهتزاز</string>
@@ -239,9 +226,7 @@
     <string name="UndoAllCustom">إعادة تعيين كافة إعدادات الإشعارات لجميع جهات الاتصال والمجموعات</string>
     <string name="NotificationsAndSounds">الإشعارات والأصوات</string>
     <string name="BlockedUsers">جهات الاتصال المحظورة</string>
-    <string name="SaveIncomingPhotos">حفظ الصور الواردة</string>
     <string name="LogOut">تسجيل خروج</string>
-    <string name="YourFirstNameAndLastName">اسمك واسم عائلتك</string>
     <string name="NoSound">لا يوجد صوت</string>
     <string name="Default">افتراضي</string>
     <string name="Support">الدعم</string>
@@ -265,7 +250,6 @@
     <string name="NotificationsServiceDisableInfo">إذا كانت خدمات Google play كافية بالنسبة لك لتلقي الإشعارات ، يمكنك تعطيل \" خدمة الإشعارات \" . ومع ذلك نحن نوصي بترك هذه الخدمة مفعلة للحفاظ على تشغيل التطبيق في الخلفية ، ولتلقي إشعارات الدردشة .</string>
     <string name="SortBy">فرز حسب</string>
     <string name="ImportContacts">استيراد جهات الاتصال</string>
-    <string name="WiFiOnly">بواسطة WiFi فقط</string>
     <string name="SortFirstName">الاسم الأول</string>
     <string name="SortLastName">اسم العائلة</string>
     <string name="LedColor">لون إضاءة الـ LED</string>
@@ -279,18 +263,16 @@
     <string name="Long">طويل</string>
     <string name="SystemDefault">النظام الإفتراضي</string>
     <string name="SettingsDefault">الإعدادات الإفتراضية</string>
-    <string name="AutomaticMediaDownload">تنزيل الوسائط تلقائيا</string>
+    <string name="AutomaticMediaDownload">تنزيل تلقائي للوسائط</string>
     <string name="WhenUsingMobileData">عند استخدام البيانات الخلوية</string>
     <string name="WhenConnectedOnWiFi">عند الاتصال بالشبكة اللاسلكية</string>
     <string name="WhenRoaming">عند تواجدك خارج البلاد</string>
     <string name="NoMediaAutoDownload">لا يوجد وسائط</string>
     <string name="SaveToGallerySettings">حفظ في الجهاز</string>
-    <string name="EditName">Edit Name</string>
+    <string name="EditName">تعديل الاسم</string>
     <!--media view-->
     <string name="NoMedia">لا توجد وسائط بعد</string>
-    <string name="CancelDownload">إلغاء التنزيل</string>
     <!--map view-->
-    <string name="MyLocation">موقعي</string>
     <string name="Map">الخريطة</string>
     <string name="Satellite">قمر صناعي</string>
     <string name="Hybrid">هجين</string>
@@ -305,6 +287,39 @@
     <string name="Gallery">الألبوم</string>
     <string name="AllPhotos">جميع الصور</string>
     <string name="NoPhotos">لا توجد صور حتى الآن</string>
+    <string name="PleaseDownload">فضلًا، قم بتنزيل الوسائط أولًا</string>
+    <!--privacy settings-->
+    <string name="PrivacySettings">الخصوصية والأمان</string>
+    <string name="PrivacyTitle">الخصوصية</string>
+    <string name="PrivacyLastSeen">آخر ظهور</string>
+    <string name="LastSeenEverybody">الجميع</string>
+    <string name="LastSeenContacts">جهات الاتصال الخاصة بي</string>
+    <string name="LastSeenNobody">لا أحد</string>
+    <string name="LastSeenEverybodyMinus">الجميع (-%1$d)</string>
+    <string name="LastSeenContactsPlus">جهات الاتصال الخاصة بي (+%1$d)</string>
+    <string name="LastSeenContactsMinus">جهات الاتصال الخاصة بي (-%1$d)</string>
+    <string name="LastSeenContactsMinusPlus">جهات الاتصال الخاصة بي (-%1$d, +%2$d)</string>
+    <string name="LastSeenNobodyPlus">لا أحد (+%1$d)</string>
+    <string name="SecurityTitle">الأمان</string>
+    <string name="DeleteAccountTitle">تدمير ذاتي للحساب</string>
+    <string name="DeleteAccountIfAwayFor">إذا كنت غائب لمدة</string>
+    <string name="DeleteAccountHelp">إذا لم تقم بتسجيل الدخول خلال هذه الفترة، سيتم حذف حسابك بالإضافة إلى مجموعاتك، رسائلك، وجهات الاتصال الخاصة بك في تيليجرام.</string>
+    <string name="DeleteAccountNowConfirmation">هل ترغب في حذف حسابك؟</string>
+    <string name="LastSeenHelp">قم بتغيير من يستطيع رؤية آخر ظهور خاص بك.</string>
+    <string name="LastSeenTitle">من يستطيع رؤية آخر ظهور خاص بك؟</string>
+    <string name="AddExceptions">إضافة استثناءات</string>
+    <string name="CustomHelp">هام: لن تستطيع رؤية آخر ظهور للأشخاص اللذين اخترت ألا يروا آخر ظهور لك. سيتم عرض آخر ظهور تقريبي كبديل (قريبًا، خلال أسبوع، خلال شهر).</string>
+    <string name="AlwaysShareWith">دائمًا شارك معه</string>
+    <string name="NeverShareWith">لا تشارك أبدًا مع</string>
+    <string name="CustomShareSettingsHelp">هذه الإعدادات ستستبدل الإعدادات المختارة أعلاه.</string>
+    <string name="AlwaysShareWithTitle">دائمُا شارك</string>
+    <string name="AlwaysShareWithPlaceholder">دائمًا شارك مع جهات الاتصال...</string>
+    <string name="NeverShareWithTitle">لا تشارك أبدًا</string>
+    <string name="NeverShareWithPlaceholder">لا تشارك أبدًا مع جهات الاتصال...</string>
+    <string name="EmpryUsersPlaceholder">إضافة جهات اتصال</string>
+    <string name="PrivacyFloodControlError">المعذرة، يوجد الكثير من الطلبات حاليًا. لا نستطيع تغيير إعدادات الخصوصية الآن، يرجى الإنتظار.</string>
+    <string name="ClearOtherSessionsHelp">قم بتسجيل الخروج من جميع الأجهزة الأخرى باستثناء هذا الجهاز</string>
+    <string name="RemoveFromListText">إضغط بإستمرار على المستخدم لحذفه</string>
     <!--edit video view-->
     <string name="EditVideo">تحرير الفيديو</string>
     <string name="OriginalVideo">الفيديو الأصلي</string>
@@ -328,7 +343,6 @@
     <string name="FromCamera">من الكاميرا</string>
     <string name="FromGalley">من الجهاز</string>
     <string name="DeletePhoto">حذف الصورة</string>
-    <string name="OpenPhoto">فتح الصورة</string>
     <string name="Set">تعيين</string>
     <string name="OK">موافق</string>
     <!--messages-->
@@ -371,12 +385,10 @@
     <string name="NoHandleAppInstalled">لا يوجد لديك تطبيق يمكنه فتح \'%1$s\'، يرجى تنزيل تطبيق مناسب للإستمرار</string>
     <string name="InviteUser">هذا المستخدم ليس لديه تيليجرام بعد ، هل ترغب في دعوته الآن؟</string>
     <string name="AreYouSure">هل أنت متأكد؟</string>
-    <string name="AddContactQ">هل تريد إضافة جهة اتصال؟</string>
     <string name="AddToTheGroup">هل ترغب في إضافة %1$s للمجموعة؟\n\nعدد الرسائل الحديثة المراد إعادة تحويلها:</string>
     <string name="ForwardMessagesTo">؟%1$s هل تريد إعادة توجيه الرسائل إلى</string>
-    <string name="DeleteChatQuestion">هل تريد حذف هذه الدردشة؟</string>
     <string name="SendMessagesTo">هل ترغب في إرسال رسالة إلى %1$s؟</string>
-    <string name="AreYouSureLogout">هل أنت متأكد من أنك تريد تسجيل الخروج؟</string>
+    <string name="AreYouSureLogout">نرجو الأخذ بالعلم أنه يمكنك استخدام تيليجرام على أجهزتك المتعددة بسهولة تامة وفي وقت واحد.\n\nوتذكر، تسجيل الخروج يحذف كافة محادثاتك السرية.</string>
     <string name="AreYouSureSessions">هل أنت متأكد من تسجيل الخروج من جميع الأجهزة الأخرى باستثناء هذا الجهاز؟</string>
     <string name="AreYouSureDeleteAndExit">هل أنت متأكد من أنك تريد حذف المجموعة والخروج منها؟</string>
     <string name="AreYouSureDeleteThisChat">هل أنت متأكد من رغبتك في حذف المجموعة؟</string>
@@ -385,7 +397,8 @@
     <string name="AreYouSureUnblockContact">هل أنت متأكد من رغبتك في إزالة الحظر عن جهة الاتصال هذه؟</string>
     <string name="AreYouSureDeleteContact">هل أنت متأكد من رغبتك في حذف جهة الاتصال هذه؟</string>
     <string name="AreYouSureSecretChat">هل أنت متأكد من أنك تريد بدء محادثة سرية؟</string>
-    <string name="ForwardFromMyName">أعد الإرسال باستخدام اسمي</string>
+    <string name="AreYouSureRegistration">هل أنت متأكد من رغبتك في إلغاء التسجيل؟</string>
+    <string name="AreYouSureClearHistory">هل أنت متأكد من رغبتك في حذف سجل المحادثات؟</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>
@@ -472,6 +485,24 @@
     <string name="Weeks_few">%1$d أسابيع</string>
     <string name="Weeks_many">%1$d أسبوع</string>
     <string name="Weeks_other">%1$d أسبوع</string>
+    <string name="Months_zero">%1$d شهر</string>
+    <string name="Months_one">%1$d شهر</string>
+    <string name="Months_two">%1$d شهران</string>
+    <string name="Months_few">%1$d أشهر</string>
+    <string name="Months_many">%1$d شهر</string>
+    <string name="Months_other">%1$d شهر</string>
+    <string name="Years_zero">%1$d سنة</string>
+    <string name="Years_one">%1$d سنة</string>
+    <string name="Years_two">%1$d سنتان</string>
+    <string name="Years_few">%1$d سنوات</string>
+    <string name="Years_many">%1$d سنة</string>
+    <string name="Years_other">%1$d سنة</string>
+    <string name="Users_zero">%1$d مستخدم</string>
+    <string name="Users_one">%1$d مستخدم</string>
+    <string name="Users_two">%1$d مستخدمان</string>
+    <string name="Users_few">%1$d مستخدمون</string>
+    <string name="Users_many">%1$d مستخدم</string>
+    <string name="Users_other">%1$d مستخدم</string>
     <!--date formatters-->
     <string name="formatterMonth">MMM dd</string>
     <string name="formatterYear">dd.MM.yy</string>

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

@@ -9,7 +9,7 @@
     <string name="LanguageCode">de</string>
     <!--signin view-->
     <string name="YourPhone">Dein Telefon</string>
-    <string name="StartText">Bitte Landeskennzahl und\nTelefonnummer bestätigen.</string>
+    <string name="StartText">Bitte bestätige deine Landesvorwahl und deine Telefonnummer.</string>
     <string name="ChooseCountry">Wähle ein Land</string>
     <string name="WrongCountry">Falsche Landesvorwahl</string>
     <!--code enter view-->
@@ -28,9 +28,6 @@
     <string name="LastName">Nachname (optional)</string>
     <string name="CancelRegistration">Registrierung abbrechen</string>
     <!--chats view-->
-    <string name="Chats">Chats</string>
-    <string name="Search">Suche</string>
-    <string name="NewMessages">Neue Nachrichten</string>
     <string name="Settings">Einstellungen</string>
     <string name="Contacts">Kontakte</string>
     <string name="NewGroup">Neue Gruppe</string>
@@ -41,22 +38,21 @@
     <string name="WaitingForNetwork">Warte auf Netzwerk...</string>
     <string name="Connecting">Verbinde…</string>
     <string name="Updating">Aktualisiere…</string>
-    <string name="NewSecretChat">Neuer geheimer Chat</string>
+    <string name="NewSecretChat">Neuer Geheimer Chat</string>
     <string name="AwaitingEncryption">Warte, bis %s online geht…</string>
-    <string name="EncryptionRejected">Geheimen Chat abgelehnt</string>
+    <string name="EncryptionRejected">Geheimen Chat abgebrochen</string>
     <string name="EncryptionProcessing">Tausche Schlüssel aus…</string>
     <string name="EncryptedChatStartedOutgoing">%s ist deinem geheimen Chat beigetreten.</string>
     <string name="EncryptedChatStartedIncoming">Du bist dem geheimen Chat beigetreten.</string>
     <string name="ClearHistory">Verlauf löschen</string>
     <string name="DeleteChat">Löschen und beenden</string>
-    <string name="HiddenName">Versteckter Name</string>
+    <string name="DeleteChatUser">Lösche Chat</string>
+    <string name="HiddenName">Gelöschtes Konto</string>
     <string name="SelectChat">Chat auswählen</string>
     <string name="PhotoTip">Tippen und Halten</string>
     <string name="CompatibilityChat">%1$s benutzt eine ältere Version von Telegram, sodass Fotos in Geheimen Chats im Kompatibilitätsmodus angezeigt werden.\n\nSobald %2$s Telegram aktualisiert, werden Fotos mit Timern von 1 Minute und kürzer per \"Tippen und Halten\" angezeigt. Du wirst benachrichtigt, sobald dein Chatpartner ein Bildschirmfoto macht.</string>
-    <string name="SearchConversations">Conversations</string>
-    <string name="SearchMessages">Messages</string>
+    <string name="SearchMessages">NACHRICHTEN</string>
     <!--broadcasts-->
-    <string name="BroadcastList">Broadcast Liste</string>
     <string name="NewBroadcastList">Neue Broadcast Liste</string>
     <string name="EnterListName">Listenname</string>
     <string name="YouCreatedBroadcastList">Du hast eine Broadcast Liste erstellt</string>
@@ -75,10 +71,10 @@
     <string name="ExternalStorage">Externer Speicher</string>
     <string name="SystemRoot">Systemverzeichnis</string>
     <string name="SdCard">SD-Karte</string>
+    <string name="Folder">Ordner</string>
     <!--chat view-->
     <string name="Invisible">unsichtbar</string>
     <string name="Typing">schreibt…</string>
-    <string name="Attach">Anhängen</string>
     <string name="IsTyping">schreibt...</string>
     <string name="AreTyping">tippen…</string>
     <string name="GotAQuestion">Hast du eine Frage\nzu Telegram?</string>
@@ -88,18 +84,13 @@
     <string name="ChatVideo">Video</string>
     <string name="ChatDocument">Datei</string>
     <string name="NoMessages">Noch keine Nachrichten…</string>
-    <string name="ViewPhoto">Foto anzeigen</string>
-    <string name="ViewLocation">Standort anzeigen</string>
-    <string name="ViewVideo">Video abspielen</string>
     <string name="ForwardedMessage">Weitergeleitete Nachricht</string>
     <string name="From">Von</string>
     <string name="NoRecent">Keine aktuellen</string>
     <string name="Message">Nachricht</string>
-    <string name="TypeMessage">Nachricht verfassen</string>
-    <string name="DOWNLOAD">Download</string>
-    <string name="Selected">Ausgewählt: %d</string>
-    <string name="ShareMyContactInfo">MEINE TELEFONNUMMER TEILEN</string>
-    <string name="AddToContacts">ZU KONTAKTEN HINZUFÜGEN</string>
+    <string name="TypeMessage">Nachricht</string>
+    <string name="ShareMyContactInfo">Meine Telefonnummer teilen</string>
+    <string name="AddToContacts">Zu Kontakten hinzufügen</string>
     <string name="EncryptedPlaceholderTitleIncoming">%s hat dich zu einem\nEnde-zu-Ende verschlüsselten\nGeheimen Chat eingeladen.</string>
     <string name="EncryptedPlaceholderTitleOutgoing">Du hast %s zu einem\nEnde-zu-Ende verschlüsselten\nGeheimen Chat eingeladen.</string>
     <string name="EncryptedDescriptionTitle">Geheime Chats in Kürze:</string>
@@ -116,8 +107,6 @@
     <string name="ApplyLocalizationFile">Sprachdatei benutzen</string>
     <string name="UnsupportedAttachment">Nicht unterstützte Datei</string>
     <!--notification-->
-    <string name="EncryptedChatRequested">Geheimen Chat angefordert</string>
-    <string name="EncryptedChatAccepted">Geheimen Chat angenommen</string>
     <string name="MessageLifetimeChanged">%1$s hat den Selbstzerstörungs-Timer auf %2$s gesetzt</string>
     <string name="MessageLifetimeChangedOutgoing">Du hast den Selbstzerstörungs-Timer auf %1$s gesetzt</string>
     <string name="MessageLifetimeRemoved">%1$s hat den Selbstzerstörungs-Timer deaktivert</string>
@@ -160,22 +149,22 @@
     <string name="TodayAt">heute um</string>
     <string name="YesterdayAt">gestern um</string>
     <string name="Online">online</string>
-    <string name="Offline">offline</string>
     <string name="LastSeen">zul. online</string>
     <string name="LastSeenDate">zul. online</string>
     <string name="InviteFriends">Freunde einladen</string>
     <string name="GlobalSearch">GLOBALE SUCHE</string>
+    <string name="Lately">zuletzt kürzlich gesehen</string>
+    <string name="WithinAWeek">diese Woche gesehen</string>
+    <string name="WithinAMonth">diesen Monat gesehen</string>
+    <string name="ALongTimeAgo">vor langer Zeit gesehen</string>
     <!--group create view-->
     <string name="SendMessageTo">Sende Nachricht an…</string>
     <string name="EnterGroupNamePlaceholder">Gruppenname</string>
     <string name="GroupName">Gruppenname</string>
-    <string name="AllContacts">ALLE KONTAKTE</string>
     <string name="MembersCount">%1$d/%2$d Mitglieder</string>
     <!--group info view-->
-    <string name="EnterGroupNameTitle">GRUPPENNAMEN EINGEBEN</string>
     <string name="SharedMedia">Geteilte Medien</string>
-    <string name="GroupInfo">Gruppeninfo</string>
-    <string name="SETTINGS">EINSTELLUNGEN</string>
+    <string name="SETTINGS">Einstellungen</string>
     <string name="AddMember">Mitglied hinzufügen</string>
     <string name="DeleteAndExit">Gruppe löschen und verlassen</string>
     <string name="Notifications">Mitteilungen</string>
@@ -183,25 +172,23 @@
     <!--contact info view-->
     <string name="ShareContact">Teilen</string>
     <string name="AddContact">Hinzufügen</string>
+    <string name="AddContactTitle">Kontakt hinzufügen</string>
     <string name="BlockContact">Blockieren</string>
     <string name="EditContact">Bearbeiten</string>
     <string name="DeleteContact">Löschen</string>
-    <string name="PhoneHome">FESTNETZ</string>
-    <string name="PhoneMobile">MOBIL</string>
-    <string name="PhoneWork">ARBEIT</string>
-    <string name="PhoneOther">SONSTIGES</string>
-    <string name="PhoneMain">HAUPTNUMMER</string>
-    <string name="ContactInfo">Kontaktdaten</string>
-    <string name="PHONE">TELEFON</string>
+    <string name="PhoneHome">Festnetz</string>
+    <string name="PhoneMobile">Mobil</string>
+    <string name="PhoneWork">Arbeit</string>
+    <string name="PhoneOther">Sonstiges</string>
+    <string name="PhoneMain">Hauptnummer</string>
     <string name="StartEncryptedChat">Geheimen Chat starten</string>
     <string name="CreateEncryptedChatError">Es ist ein Fehler aufgetreten.</string>
-    <string name="SecretTitle">Geheimer Chat</string>
     <string name="EncryptionKey">Geheimer Schlüssel</string>
     <string name="MessageLifetime">Selbstzerstörungs-Timer</string>
     <string name="ShortMessageLifetimeForever">Aus</string>
     <string name="EncryptionKeyDescription">Das ist eine Darstellung des Schlüssels für den Geheimen Chat mit <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>Wenn dieses Bild auf <![CDATA[<b>]]>%2$s\s<![CDATA[</b>]]>s Telefon genau so aussieht, ist euer Chat zu 200%% sicher.<![CDATA[<br><br>]]>Erfahre mehr auf telegram.org</string>
     <string name="NumberUnknown">Unbekannt</string>
-    <string name="Info">INFO</string>
+    <string name="Info">Info</string>
     <string name="Phone">Telefon</string>
     <!--usernames-->
     <string name="Username">Benutzername</string>
@@ -211,7 +198,7 @@
     <string name="UsernameInvalidShort">Ein Benutzername benötigt mindestens 5 Zeichen.</string>
     <string name="UsernameInvalidLong">Ein Benutzername darf maximal 32 Zeichen haben.</string>
     <string name="UsernameInvalidStartNumber">Benutzernamen dürfen leider nicht mit einer Zahl anfangen.</string>
-    <string name="UsernameHelp">Wähle einen Benutzernamen, wenn du von anderen bei<![CDATA[<b>]]>Telegram<![CDATA[</b>]]>gefunden werden willst — ohne, dass sie deine Nummer kennen müssen.<![CDATA[<br><br>]]>Erlaubt sind <![CDATA[<b>]]>a-z<![CDATA[<b>]]>, <![CDATA[<b>]]>0-9<![CDATA[<b>]]> und Unterstriche. Die Mindestlänge beträgt <![CDATA[<b>]]>5<![CDATA[<b>]]> Zeichen.</string>
+    <string name="UsernameHelp">Wähle einen Benutzernamen, wenn du von anderen bei <![CDATA[<b>]]>Telegram<![CDATA[</b>]]> gefunden werden willst — ohne, dass sie deine Nummer kennen müssen.<![CDATA[<br><br>]]>Erlaubt sind <![CDATA[<b>]]>a-z<![CDATA[<b>]]>, <![CDATA[<b>]]>0-9<![CDATA[<b>]]> und Unterstriche. Die Mindestlänge beträgt <![CDATA[<b>]]>5<![CDATA[<b>]]> Zeichen.</string>
     <string name="UsernameChecking">Prüfe Benutzername...</string>
     <string name="UsernameAvailable">%1$s ist verfügbar.</string>
     <string name="UsernameEmpty">Keiner</string>
@@ -224,32 +211,30 @@
     <string name="Unblock">Freigeben</string>
     <string name="UnblockText">Gedrückt halten um freizugeben.</string>
     <string name="NoBlocked">Keine blockierten Benutzer</string>
-    <string name="MessageNotifications">NACHRICHTEN</string>
+    <string name="MessageNotifications">Nachrichten</string>
     <string name="Alert">Benachrichtigung</string>
     <string name="MessagePreview">Vorschau</string>
-    <string name="GroupNotifications">GRUPPEN</string>
+    <string name="GroupNotifications">Gruppen</string>
     <string name="Sound">Nachrichtenton auswählen</string>
-    <string name="InAppNotifications">IN-APP</string>
+    <string name="InAppNotifications">In-App </string>
     <string name="InAppSounds">In-App-Töne</string>
     <string name="InAppVibrate">In-App-Vibration</string>
     <string name="Vibrate">Vibrieren</string>
     <string name="InAppPreview">In-App-Vorschau</string>
-    <string name="Reset">ZURÜCKSETZEN</string>
+    <string name="Reset">Zurücksetzen</string>
     <string name="ResetAllNotifications">Mitteilungseinstellungen zurücksetzen</string>
     <string name="UndoAllCustom">Setzt alle benutzerdefinierten Einstellungen für Mitteilungen zurück</string>
     <string name="NotificationsAndSounds">Mitteilungen und Töne</string>
     <string name="BlockedUsers">Blockierte Benutzer</string>
-    <string name="SaveIncomingPhotos">Speichere eingehende Bilder</string>
     <string name="LogOut">Abmelden</string>
-    <string name="YourFirstNameAndLastName">DEIN VOR- UND NACHNAME</string>
     <string name="NoSound">Kein Ton</string>
     <string name="Default">Standard</string>
-    <string name="Support">SUPPORT</string>
+    <string name="Support">Support</string>
     <string name="ChatBackground">Chat-Hintergrundbild</string>
-    <string name="MessagesSettings">NACHRICHTEN</string>
+    <string name="MessagesSettings">Nachrichten</string>
     <string name="SendByEnter">Mit Enter senden</string>
     <string name="TerminateAllSessions">Alle anderen Sitzungen beenden</string>
-    <string name="Events">EREIGNISSE</string>
+    <string name="Events">Ereignisse</string>
     <string name="ContactJoined">Kontakt ist Telegram beigetreten</string>
     <string name="Pebble">PEBBLE</string>
     <string name="Language">Sprache</string>
@@ -265,7 +250,6 @@
     <string name="NotificationsServiceDisableInfo">Sofern Google Play Dienste ausreichend für deine Mitteilungen sind, kannst du unseren Mitteilungsdienst abschalten. Wir empfehlen allerdings, unseren Dienst dauerhaft aktiviert zu lassen, um über neue Nachrichten in Echtzeit informiert zu werden.</string>
     <string name="SortBy">sortiert nach</string>
     <string name="ImportContacts">Kontakte importieren</string>
-    <string name="WiFiOnly">Nur über W-LAN</string>
     <string name="SortFirstName">Vorname</string>
     <string name="SortLastName">Nachname</string>
     <string name="LedColor">LED-Farbe</string>
@@ -279,18 +263,16 @@
     <string name="Long">Lang</string>
     <string name="SystemDefault">Systemvorgabe</string>
     <string name="SettingsDefault">Telegramvorgabe</string>
-    <string name="AutomaticMediaDownload">AUTOMATISCHER MEDIENDOWNLOAD</string>
+    <string name="AutomaticMediaDownload">Automatischer Mediendownload</string>
     <string name="WhenUsingMobileData">über Mobilfunk</string>
     <string name="WhenConnectedOnWiFi">über W-LAN</string>
     <string name="WhenRoaming">bei Roaming</string>
     <string name="NoMediaAutoDownload">kein automatischer Download</string>
     <string name="SaveToGallerySettings">In der Galerie speichern</string>
-    <string name="EditName">Edit Name</string>
+    <string name="EditName">Name bearbeiten</string>
     <!--media view-->
     <string name="NoMedia">Noch keine geteilten Medien vorhanden</string>
-    <string name="CancelDownload">Download abbrechen</string>
     <!--map view-->
-    <string name="MyLocation">Mein Standort</string>
     <string name="Map">Karte</string>
     <string name="Satellite">Satellit</string>
     <string name="Hybrid">Hybrid</string>
@@ -305,6 +287,39 @@
     <string name="Gallery">Galerie</string>
     <string name="AllPhotos">Alle Fotos</string>
     <string name="NoPhotos">Noch keine Fotos</string>
+    <string name="PleaseDownload">Medien bitte zuerst herunterladen</string>
+    <!--privacy settings-->
+    <string name="PrivacySettings">Privatsphäre und Sicherheit</string>
+    <string name="PrivacyTitle">Privatsphäre</string>
+    <string name="PrivacyLastSeen">Zuletzt gesehen</string>
+    <string name="LastSeenEverybody">Jeder</string>
+    <string name="LastSeenContacts">Meine Kontakte</string>
+    <string name="LastSeenNobody">Niemand</string>
+    <string name="LastSeenEverybodyMinus">Jeder (-%1$d)</string>
+    <string name="LastSeenContactsPlus">Meine Kontakte (+%1$d)</string>
+    <string name="LastSeenContactsMinus">Meine Kontakte (-%1$d)</string>
+    <string name="LastSeenContactsMinusPlus">Meine Kontakte (-%1$d, +%2$d)</string>
+    <string name="LastSeenNobodyPlus">Niemand (+%1$d)</string>
+    <string name="SecurityTitle">Sicherheit</string>
+    <string name="DeleteAccountTitle">Automatische Kontolöschung</string>
+    <string name="DeleteAccountIfAwayFor">Wenn inaktiv für</string>
+    <string name="DeleteAccountHelp">Wenn du dich innerhalb dieser Zeit nicht anmeldest, wird dein Konto mit allen Nachrichten, Gruppen und Kontakten gelöscht.</string>
+    <string name="DeleteAccountNowConfirmation">Dein Konto löschen?</string>
+    <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="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>
+    <string name="AlwaysShareWithTitle">Immer teilen</string>
+    <string name="AlwaysShareWithPlaceholder">Immer teilen mit...</string>
+    <string name="NeverShareWithTitle">Niemals teilen</string>
+    <string name="NeverShareWithPlaceholder">Niemals teilen mit...</string>
+    <string name="EmpryUsersPlaceholder">Hinzufügen</string>
+    <string name="PrivacyFloodControlError">Du hast zu oft probiert, deine Einstellungen zu ändern; bitte warte kurz.</string>
+    <string name="ClearOtherSessionsHelp">Alle Geräte außer diesem werden abgemeldet.</string>
+    <string name="RemoveFromListText">Auf Nutzer tippen und halten um zu löschen.</string>
     <!--edit video view-->
     <string name="EditVideo">Video bearbeiten</string>
     <string name="OriginalVideo">Originalvideo</string>
@@ -328,7 +343,6 @@
     <string name="FromCamera">Von der Kamera</string>
     <string name="FromGalley">Aus der Galerie</string>
     <string name="DeletePhoto">Foto löschen</string>
-    <string name="OpenPhoto">Foto öffnen</string>
     <string name="Set">Wählen</string>
     <string name="OK">OK</string>
     <!--messages-->
@@ -371,12 +385,10 @@
     <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="InviteUser">Dieser Benutzer hat noch kein Telegram. Möchtest du ihn einladen?</string>
     <string name="AreYouSure">Bist du sicher?</string>
-    <string name="AddContactQ">Kontakt hinzufügen?</string>
     <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="DeleteChatQuestion">Diesen Chat löschen?</string>
     <string name="SendMessagesTo">Nachricht an %1$s senden?</string>
-    <string name="AreYouSureLogout">Möchtest du dich wirklich abmelden?</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="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>
@@ -385,10 +397,11 @@
     <string name="AreYouSureUnblockContact">Blockierung für diesen Kontakt wirklich aufheben?</string>
     <string name="AreYouSureDeleteContact">Diesen Kontakt wirklich löschen?</string>
     <string name="AreYouSureSecretChat">Geheimen Chat starten?</string>
-    <string name="ForwardFromMyName">mit meinem Namen weiterleiten</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="SendMessagesToGroup">Nachricht an %1$s senden?</string>
     <string name="ForwardMessagesToGroup">Weiterleiten an %1$s?</string>
-    <string name="FeatureUnavailable">Sorry, this feature is currently not available in your country.</string>
+    <string name="FeatureUnavailable">Verzeihung, diese Funktion ist derzeit in deinem Land nicht verfügbar.</string>
     <!--Intro view-->
     <string name="Page1Title">Telegram</string>
     <string name="Page2Title">Schnell</string>
@@ -472,6 +485,24 @@
     <string name="Weeks_few">%1$d Wochen</string>
     <string name="Weeks_many">%1$d Wochen</string>
     <string name="Weeks_other">%1$d Wochen</string>
+    <string name="Months_zero">%1$d Monate</string>
+    <string name="Months_one">%1$d Monat</string>
+    <string name="Months_two">%1$d Monate</string>
+    <string name="Months_few">%1$d Monate</string>
+    <string name="Months_many">%1$d Monate</string>
+    <string name="Months_other">%1$d Monate</string>
+    <string name="Years_zero">%1$d Jahre</string>
+    <string name="Years_one">%1$d Jahr</string>
+    <string name="Years_two">%1$d Jahre</string>
+    <string name="Years_few">%1$d Jahre</string>
+    <string name="Years_many">%1$d Jahre</string>
+    <string name="Years_other">%1$d Jahre</string>
+    <string name="Users_zero">%1$d Nutzer</string>
+    <string name="Users_one">%1$d Nutzer</string>
+    <string name="Users_two">%1$d Nutzer</string>
+    <string name="Users_few">%1$d Nutzer</string>
+    <string name="Users_many">%1$d Nutzer</string>
+    <string name="Users_other">%1$d Nutzer</string>
     <!--date formatters-->
     <string name="formatterMonth">dd MMM</string>
     <string name="formatterYear">dd.MM.yy</string>

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

@@ -9,7 +9,7 @@
     <string name="LanguageCode">es</string>
     <!--signin view-->
     <string name="YourPhone">Tu teléfono</string>
-    <string name="StartText">Por favor, confirma tu código de país\ny pon tu número de teléfono.</string>
+    <string name="StartText">Por favor, confirma tu código de país y pon tu número de teléfono.</string>
     <string name="ChooseCountry">Elige un país</string>
     <string name="WrongCountry">Código de país incorrecto</string>
     <!--code enter view-->
@@ -28,9 +28,6 @@
     <string name="LastName">Apellidos (opcional)</string>
     <string name="CancelRegistration">Cancelar registro</string>
     <!--chats view-->
-    <string name="Chats">Chats</string>
-    <string name="Search">Buscar</string>
-    <string name="NewMessages">Nuevos mensajes</string>
     <string name="Settings">Ajustes</string>
     <string name="Contacts">Contactos</string>
     <string name="NewGroup">Nuevo grupo</string>
@@ -49,14 +46,13 @@
     <string name="EncryptedChatStartedIncoming">Te uniste al chat secreto.</string>
     <string name="ClearHistory">Borrar historial</string>
     <string name="DeleteChat">Eliminar y salir</string>
-    <string name="HiddenName">Nombre oculto</string>
+    <string name="DeleteChatUser">Eliminar chat</string>
+    <string name="HiddenName">Cuenta eliminada</string>
     <string name="SelectChat">Elige el chat</string>
     <string name="PhotoTip">Mantén pulsado para ver</string>
     <string name="CompatibilityChat">%1$s usa una versión antigua de Telegram, así que las fotos secretas serán mostradas en un modo de compatibilidad.\n\nCuando %2$s actualice Telegram, las fotos con autodestrucción de 1 minuto o menos funcionarán con el modo \'Mantén pulsado para ver\', y te notificaremos siempre que la otra parte haga una captura de pantalla.</string>
-    <string name="SearchConversations">Conversations</string>
-    <string name="SearchMessages">Messages</string>
+    <string name="SearchMessages">MENSAJES</string>
     <!--broadcasts-->
-    <string name="BroadcastList">Lista de difusión</string>
     <string name="NewBroadcastList">Nueva difusión</string>
     <string name="EnterListName">Nombre de la lista</string>
     <string name="YouCreatedBroadcastList">Creaste una lista de difusión</string>
@@ -75,10 +71,10 @@
     <string name="ExternalStorage">Almacenamiento Externo</string>
     <string name="SystemRoot">Raíz del Sistema</string>
     <string name="SdCard">Tarjeta SD</string>
+    <string name="Folder">Carpeta</string>
     <!--chat view-->
     <string name="Invisible">invisible</string>
     <string name="Typing">escribiendo...</string>
-    <string name="Attach">Adjuntar</string>
     <string name="IsTyping">está escribiendo...</string>
     <string name="AreTyping">están escribiendo...</string>
     <string name="GotAQuestion">¿Tienes preguntas\nsobre Telegram?</string>
@@ -88,25 +84,20 @@
     <string name="ChatVideo">Vídeo</string>
     <string name="ChatDocument">Archivo</string>
     <string name="NoMessages">Aún sin mensajes...</string>
-    <string name="ViewPhoto">Ver foto</string>
-    <string name="ViewLocation">Ver ubicación</string>
-    <string name="ViewVideo">Ver vídeo</string>
     <string name="ForwardedMessage">Mensaje reenviado</string>
     <string name="From">De</string>
     <string name="NoRecent">No hay recientes</string>
     <string name="Message">Mensaje</string>
-    <string name="TypeMessage">Escribe un mensaje</string>
-    <string name="DOWNLOAD">Descargar</string>
-    <string name="Selected">Seleccionado: %d</string>
-    <string name="ShareMyContactInfo">COMPARTIR MI NÚMERO</string>
-    <string name="AddToContacts">AÑADIR A CONTACTOS</string>
+    <string name="TypeMessage">Mensaje</string>
+    <string name="ShareMyContactInfo">Compartir mi número</string>
+    <string name="AddToContacts">Añadir a contactos</string>
     <string name="EncryptedPlaceholderTitleIncoming">%s te invitó a un chat secreto.</string>
     <string name="EncryptedPlaceholderTitleOutgoing">Invitaste a %s a un chat secreto.</string>
     <string name="EncryptedDescriptionTitle">Los chats secretos:</string>
     <string name="EncryptedDescription1">Usan cifrado end-to-end</string>
     <string name="EncryptedDescription2">No dejan rastro en el servidor</string>
     <string name="EncryptedDescription3">Tienen autodestrucción de mensajes</string>
-    <string name="EncryptedDescription4">No permiten reenvíos de mensajes</string>
+    <string name="EncryptedDescription4">Impiden reenviar mensajes</string>
     <string name="YouWereKicked">Te expulsaron de este grupo</string>
     <string name="YouLeft">Dejaste este grupo</string>
     <string name="DeleteThisGroup">Eliminar este grupo</string>
@@ -116,8 +107,6 @@
     <string name="ApplyLocalizationFile">Aplicar traducción</string>
     <string name="UnsupportedAttachment">Adjunto no soportado</string>
     <!--notification-->
-    <string name="EncryptedChatRequested">Chat secreto solicitado</string>
-    <string name="EncryptedChatAccepted">Chat secreto iniciado</string>
     <string name="MessageLifetimeChanged">%1$s activó la autodestrucción en %2$s</string>
     <string name="MessageLifetimeChangedOutgoing">Activaste la autodestrucción en %1$s</string>
     <string name="MessageLifetimeRemoved">%1$s desactivó la autodestrucción</string>
@@ -160,22 +149,22 @@
     <string name="TodayAt">hoy a las</string>
     <string name="YesterdayAt">ayer a las</string>
     <string name="Online">en línea</string>
-    <string name="Offline">fuera de línea</string>
     <string name="LastSeen">últ. vez</string>
     <string name="LastSeenDate">últ. vez el</string>
     <string name="InviteFriends">Invitar a amigos</string>
     <string name="GlobalSearch">BÚSQUEDA GLOBAL</string>
+    <string name="Lately">últ. vez recientemente</string>
+    <string name="WithinAWeek">últ. vez hace unos días</string>
+    <string name="WithinAMonth">últ. vez hace unas semanas</string>
+    <string name="ALongTimeAgo">últ. vez hace mucho tiempo</string>
     <!--group create view-->
     <string name="SendMessageTo">Enviar mensaje a...</string>
     <string name="EnterGroupNamePlaceholder">Nombre del grupo</string>
     <string name="GroupName">Nombre del grupo</string>
-    <string name="AllContacts">TODOS LOS CONTACTOS</string>
     <string name="MembersCount">%1$d/%2$d miembros</string>
     <!--group info view-->
-    <string name="EnterGroupNameTitle">PON EL NOMBRE DEL GRUPO</string>
     <string name="SharedMedia">Fotos y vídeos</string>
-    <string name="GroupInfo">Información </string>
-    <string name="SETTINGS">AJUSTES</string>
+    <string name="SETTINGS">Ajustes</string>
     <string name="AddMember">Añadir miembro</string>
     <string name="DeleteAndExit">Eliminar y dejar el grupo</string>
     <string name="Notifications">Notificaciones</string>
@@ -183,25 +172,23 @@
     <!--contact info view-->
     <string name="ShareContact">Compartir</string>
     <string name="AddContact">Añadir</string>
+    <string name="AddContactTitle">Añadir contacto</string>
     <string name="BlockContact">Bloquear</string>
     <string name="EditContact">Editar</string>
     <string name="DeleteContact">Eliminar</string>
-    <string name="PhoneHome">CASA</string>
-    <string name="PhoneMobile">MÓVIL</string>
-    <string name="PhoneWork">TRABAJO</string>
-    <string name="PhoneOther">OTRO</string>
-    <string name="PhoneMain">PRINCIPAL</string>
-    <string name="ContactInfo">Información</string>
-    <string name="PHONE">TELÉFONO</string>
+    <string name="PhoneHome">Casa</string>
+    <string name="PhoneMobile">Móvil</string>
+    <string name="PhoneWork">Trabajo</string>
+    <string name="PhoneOther">Otro</string>
+    <string name="PhoneMain">Principal</string>
     <string name="StartEncryptedChat">Iniciar chat secreto</string>
     <string name="CreateEncryptedChatError">Ocurrió un error.</string>
-    <string name="SecretTitle">Chat secreto</string>
     <string name="EncryptionKey">Clave de cifrado</string>
     <string name="MessageLifetime">Autodestrucción</string>
     <string name="ShortMessageLifetimeForever">Apagada</string>
     <string name="EncryptionKeyDescription">Esta imagen es una visualización de la clave de cifrado para el chat secreto con <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>Si esta imagen se ve igual en el teléfono de <![CDATA[<b>]]>%2$s<![CDATA[</b>]]>, tu chat es seguro en un 200%%.<![CDATA[<br><br>]]>Aprende más en telegram.org</string>
     <string name="NumberUnknown">Desconocido</string>
-    <string name="Info">INFORMACIÓN</string>
+    <string name="Info">Información</string>
     <string name="Phone">Teléfono</string>
     <!--usernames-->
     <string name="Username">Apodo</string>
@@ -222,34 +209,32 @@
     <string name="AskAQuestion">Hacer una pregunta</string>
     <string name="EnableAnimations">Activar animaciones</string>
     <string name="Unblock">Desbloquear</string>
-    <string name="UnblockText">Para desbloquear, mantén pulsado sobre un usuario.</string>
+    <string name="UnblockText">Mantén pulsado sobre un usuario para desbloquearlo.</string>
     <string name="NoBlocked">Sin usuarios bloqueados</string>
-    <string name="MessageNotifications">NOTIFICACIONES DE MENSAJES</string>
+    <string name="MessageNotifications">Notificación de mensajes</string>
     <string name="Alert">Alerta</string>
     <string name="MessagePreview">Vista previa del mensaje</string>
-    <string name="GroupNotifications">NOTIFICACIONES DE GRUPO</string>
+    <string name="GroupNotifications">Notificaciones de grupo</string>
     <string name="Sound">Sonido</string>
-    <string name="InAppNotifications">NOTIFICACIONES EN LA APP</string>
+    <string name="InAppNotifications">Notificaciones en la app</string>
     <string name="InAppSounds">Sonidos en la app</string>
     <string name="InAppVibrate">Vibración en la app</string>
     <string name="Vibrate">Vibraciones</string>
     <string name="InAppPreview">Vista previa en la app</string>
-    <string name="Reset">RESTABLECER</string>
+    <string name="Reset">Restablecer</string>
     <string name="ResetAllNotifications">Restablecer las notificaciones</string>
     <string name="UndoAllCustom">Deshacer las notificaciones personalizadas para todos tus usuarios y grupos</string>
     <string name="NotificationsAndSounds">Notificaciones y sonidos</string>
     <string name="BlockedUsers">Usuarios bloqueados</string>
-    <string name="SaveIncomingPhotos">Guardar fotos entrantes</string>
     <string name="LogOut">Cerrar sesión</string>
-    <string name="YourFirstNameAndLastName">TU NOMBRE Y APELLIDOS</string>
     <string name="NoSound">Sin sonido</string>
     <string name="Default">Por defecto</string>
-    <string name="Support">SOPORTE</string>
+    <string name="Support">Soporte</string>
     <string name="ChatBackground">Fondo de chat</string>
-    <string name="MessagesSettings">MENSAJES</string>
+    <string name="MessagesSettings">Mensajes</string>
     <string name="SendByEnter">Enviar con \'Intro\'</string>
     <string name="TerminateAllSessions">Cerrar todas las otras sesiones</string>
-    <string name="Events">EVENTOS</string>
+    <string name="Events">Eventos</string>
     <string name="ContactJoined">Un contacto se unió a Telegram</string>
     <string name="Pebble">PEBBLE</string>
     <string name="Language">Idioma</string>
@@ -265,7 +250,6 @@
     <string name="NotificationsServiceDisableInfo">Si tus notificaciones funcionan bien con los Servicios de Google Play, puedes desactivar el Servicio de notificaciones. Sin embargo, recomendamos que lo dejes activo para mantener la app en segundo plano y recibir notificaciones al instante.</string>
     <string name="SortBy">Ordenar por</string>
     <string name="ImportContacts">Importar contactos</string>
-    <string name="WiFiOnly">Sólo vía Wi-Fi</string>
     <string name="SortFirstName">Nombre</string>
     <string name="SortLastName">Apellidos</string>
     <string name="LedColor">Color del LED</string>
@@ -279,18 +263,16 @@
     <string name="Long">Largo</string>
     <string name="SystemDefault">Según el sistema</string>
     <string name="SettingsDefault">Según Telegram</string>
-    <string name="AutomaticMediaDownload">DESCARGA AUTOMÁTICA DE MULTIMEDIA</string>
+    <string name="AutomaticMediaDownload">Descarga automática de multimedia</string>
     <string name="WhenUsingMobileData">Con uso de datos móviles</string>
     <string name="WhenConnectedOnWiFi">Con conexión a Wi-Fi</string>
     <string name="WhenRoaming">Con itinerancia de datos</string>
     <string name="NoMediaAutoDownload">Ningún contenido multimedia</string>
     <string name="SaveToGallerySettings">Guardar en galería</string>
-    <string name="EditName">Edit Name</string>
+    <string name="EditName">Editar nombre</string>
     <!--media view-->
     <string name="NoMedia">Aún no hay fotos ni vídeos</string>
-    <string name="CancelDownload">Cancelar descarga</string>
     <!--map view-->
-    <string name="MyLocation">Mi ubicación</string>
     <string name="Map">Mapa</string>
     <string name="Satellite">Satélite</string>
     <string name="Hybrid">Híbrido</string>
@@ -305,6 +287,39 @@
     <string name="Gallery">Galería</string>
     <string name="AllPhotos">Todas las fotos</string>
     <string name="NoPhotos">Sin fotos aún</string>
+    <string name="PleaseDownload">Por favor, primero descarga la multimedia</string>
+    <!--privacy settings-->
+    <string name="PrivacySettings">Privacidad y seguridad</string>
+    <string name="PrivacyTitle">Privacidad</string>
+    <string name="PrivacyLastSeen">Última conexión</string>
+    <string name="LastSeenEverybody">Todos</string>
+    <string name="LastSeenContacts">Mis contactos</string>
+    <string name="LastSeenNobody">Nadie</string>
+    <string name="LastSeenEverybodyMinus">Todos (-%1$d)</string>
+    <string name="LastSeenContactsPlus">Mis contactos (+%1$d)</string>
+    <string name="LastSeenContactsMinus">Mis contactos (-%1$d)</string>
+    <string name="LastSeenContactsMinusPlus">Mis contactos (-%1$d, +%2$d)</string>
+    <string name="LastSeenNobodyPlus">Nadie (+%1$d)</string>
+    <string name="SecurityTitle">Seguridad</string>
+    <string name="DeleteAccountTitle">Autodestrucción de la cuenta</string>
+    <string name="DeleteAccountIfAwayFor">Si estoy fuera</string>
+    <string name="DeleteAccountHelp">Si no inicias sesión durante este tiempo, al menos una vez, tu cuenta se eliminará con todos tus grupos, mensajes y contactos.</string>
+    <string name="DeleteAccountNowConfirmation">¿Queres eliminar tu cuenta?</string>
+    <string name="LastSeenHelp">Elige quién puede ver tu última conexión.</string>
+    <string name="LastSeenTitle">¿Quién puede ver tu última conexión?</string>
+    <string name="AddExceptions">Añadir excepciones</string>
+    <string name="CustomHelp">Importante: no podrás ver la última conexión de las personas con las que no compartes la tuya. En su lugar, se mostrarán conexiones indeterminadas (recientemente, hace unos días, hace unas semanas).</string>
+    <string name="AlwaysShareWith">Compartir siempre con</string>
+    <string name="NeverShareWith">Nunca compartir con</string>
+    <string name="CustomShareSettingsHelp">Estos ajustes anularán los valores de arriba.</string>
+    <string name="AlwaysShareWithTitle">Siempre compartir</string>
+    <string name="AlwaysShareWithPlaceholder">Siempre compartir con...</string>
+    <string name="NeverShareWithTitle">Nunca compartir</string>
+    <string name="NeverShareWithPlaceholder">Nunca compartir con...</string>
+    <string name="EmpryUsersPlaceholder">Añadir usuarios</string>
+    <string name="PrivacyFloodControlError">Lo siento, hay demasiadas solicitudes. Es imposible cambiar los ajustes de privacidad ahora. Por favor, espera.</string>
+    <string name="ClearOtherSessionsHelp">Salir de todos los dispositivos, excepto este.</string>
+    <string name="RemoveFromListText">Mantén pulsado sobre un usuario para eliminarlo.</string>
     <!--edit video view-->
     <string name="EditVideo">Editar vídeo</string>
     <string name="OriginalVideo">Vídeo original</string>
@@ -328,7 +343,6 @@
     <string name="FromCamera">Desde la cámara</string>
     <string name="FromGalley">Desde la galería</string>
     <string name="DeletePhoto">Eliminar foto</string>
-    <string name="OpenPhoto">Abrir foto</string>
     <string name="Set">Establecer</string>
     <string name="OK">OK</string>
     <!--messages-->
@@ -361,7 +375,7 @@
     <!--Alert messages-->
     <string name="InvalidPhoneNumber">Número de teléfono inválido</string>
     <string name="CodeExpired">Código expirado. Por favor, vuelve a iniciar sesión.</string>
-    <string name="FloodWait">Muchos intentos. Por favor, inténtalo más tarde.</string>
+    <string name="FloodWait">Muchos intentos. Por favor, prueba de nuevo más tarde.</string>
     <string name="InvalidCode">Código inválido</string>
     <string name="InvalidFirstName">Nombre inválido</string>
     <string name="InvalidLastName">Apellidos inválidos</string>
@@ -371,12 +385,10 @@
     <string name="NoHandleAppInstalled">No tienes aplicaciones que puedan manejar el tipo de archivo \'%1$s\'. Por favor, instala una para continuar.</string>
     <string name="InviteUser">Este usuario no tiene Telegram aún. ¿Enviarle una invitación?</string>
     <string name="AreYouSure">¿Quieres hacerlo?</string>
-    <string name="AddContactQ">¿Añadir contacto?</string>
     <string name="AddToTheGroup">¿Añadir a %1$s al grupo?\n\nNúmero de los últimos mensajes para reenviar:</string>
     <string name="ForwardMessagesTo">¿Reenviar mensajes a %1$s?</string>
-    <string name="DeleteChatQuestion">¿Eliminar este chat?</string>
     <string name="SendMessagesTo">¿Enviar mensajes a %1$s?</string>
-    <string name="AreYouSureLogout">¿Quieres cerrar sesión?</string>
+    <string name="AreYouSureLogout">¿Quieres cerrar sesión?\n\nConsidera que puedes usar Telegram en todos tus dispositivos a la vez.\n\nRecuerda que, al cerrar sesión, eliminas todos tus chats secretos.</string>
     <string name="AreYouSureSessions">¿Quieres terminar todas las otras sesiones?</string>
     <string name="AreYouSureDeleteAndExit">¿Quieres eliminar y dejar el grupo?</string>
     <string name="AreYouSureDeleteThisChat">¿Quieres eliminar este chat?</string>
@@ -385,10 +397,11 @@
     <string name="AreYouSureUnblockContact">¿Quieres desbloquear este contacto?</string>
     <string name="AreYouSureDeleteContact">¿Quieres eliminar este contacto?</string>
     <string name="AreYouSureSecretChat">¿Quieres iniciar un chat secreto?</string>
-    <string name="ForwardFromMyName">reenviar desde mi nombre</string>
+    <string name="AreYouSureRegistration">¿Quieres cancelar el registro?</string>
+    <string name="AreYouSureClearHistory">¿Quieres eliminar el historial?</string>
     <string name="SendMessagesToGroup">¿Enviar mensajes a %1$s?</string>
     <string name="ForwardMessagesToGroup">¿Reenviar mensajes a %1$s?</string>
-    <string name="FeatureUnavailable">Sorry, this feature is currently not available in your country.</string>
+    <string name="FeatureUnavailable">Lo siento, esta característica no está disponible en tu país actualmente.</string>
     <!--Intro view-->
     <string name="Page1Title">Telegram</string>
     <string name="Page2Title">Rápida</string>
@@ -472,6 +485,24 @@
     <string name="Weeks_few">%1$d semanas</string>
     <string name="Weeks_many">%1$d semanas</string>
     <string name="Weeks_other">%1$d semanas</string>
+    <string name="Months_zero">%1$d meses</string>
+    <string name="Months_one">%1$d mes</string>
+    <string name="Months_two">%1$d meses</string>
+    <string name="Months_few">%1$d meses</string>
+    <string name="Months_many">%1$d meses</string>
+    <string name="Months_other">%1$d meses</string>
+    <string name="Years_zero">%1$d años</string>
+    <string name="Years_one">%1$d año</string>
+    <string name="Years_two">%1$d años</string>
+    <string name="Years_few">%1$d años</string>
+    <string name="Years_many">%1$d años</string>
+    <string name="Years_other">%1$d años</string>
+    <string name="Users_zero">%1$d usuarios</string>
+    <string name="Users_one">%1$d usuario</string>
+    <string name="Users_two">%1$d usuarios</string>
+    <string name="Users_few">%1$d usuarios</string>
+    <string name="Users_many">%1$d usuarios</string>
+    <string name="Users_other">%1$d usuarios</string>
     <!--date formatters-->
     <string name="formatterMonth">dd \'de\' MMM</string>
     <string name="formatterYear">dd.MM.yy</string>

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

@@ -9,7 +9,7 @@
     <string name="LanguageCode">it</string>
     <!--signin view-->
     <string name="YourPhone">Il tuo telefono</string>
-    <string name="StartText">Conferma il prefisso della tua nazione\ne inserisci il tuo numero di telefono.</string>
+    <string name="StartText">Conferma il prefisso nazionale e inserisci il tuo numero di telefono.</string>
     <string name="ChooseCountry">Scegli una nazione</string>
     <string name="WrongCountry">Prefisso errato</string>
     <!--code enter view-->
@@ -28,16 +28,13 @@
     <string name="LastName">Cognome (facoltativo)</string>
     <string name="CancelRegistration">Annulla registrazione</string>
     <!--chats view-->
-    <string name="Chats">Chat</string>
-    <string name="Search">Cerca</string>
-    <string name="NewMessages">Nuovi messaggi</string>
     <string name="Settings">Impostazioni</string>
     <string name="Contacts">Contatti</string>
     <string name="NewGroup">Nuovo gruppo</string>
     <string name="Yesterday">ieri</string>
     <string name="NoResult">Nessun risultato</string>
     <string name="NoChats">Ancora nessuna chat…</string>
-    <string name="NoChatsHelp">Inizia a messaggiare premendo il tasto\ncomponi nell\'angolo in alto a destra\no premi il tasto menu per più opzioni.</string>
+    <string name="NoChatsHelp">Inizia a scrivere premendo il tasto\nnuovo messaggio nell\'angolo in alto a destra\no apri il menu per avere più opzioni.</string>
     <string name="WaitingForNetwork">In attesa della rete...</string>
     <string name="Connecting">Connessione in corso…</string>
     <string name="Updating">Aggiornamento in corso…</string>
@@ -49,14 +46,13 @@
     <string name="EncryptedChatStartedIncoming">Sei entrato nella chat segreta.</string>
     <string name="ClearHistory">Cancella cronologia</string>
     <string name="DeleteChat">Elimina ed esci</string>
-    <string name="HiddenName">Nome nascosto</string>
+    <string name="DeleteChatUser">Elimina chat</string>
+    <string name="HiddenName">Account eliminato</string>
     <string name="SelectChat">Seleziona chat</string>
     <string name="PhotoTip">Tieni premuto per vedere</string>
     <string name="CompatibilityChat">%1$s sta usando una versione vecchia di Telegram, quindi le foto segrete verranno visualizzate in modalità di compatibilità.\n\nUna volta che %2$s avrà aggiornato Telegram, le foto con il timer minore di 1 minuto funzioneranno in modalità \'Tieni premuto per vedere\' , e verrai notificato ogni volta che l\'altro esegue uno screenshot.</string>
-    <string name="SearchConversations">Conversations</string>
-    <string name="SearchMessages">Messages</string>
+    <string name="SearchMessages">MESSAGGI</string>
     <!--broadcasts-->
-    <string name="BroadcastList">Lista broadcast</string>
     <string name="NewBroadcastList">Nuova lista broadcast</string>
     <string name="EnterListName">Immetti il nome della lista</string>
     <string name="YouCreatedBroadcastList">Hai creato una lista broadcast</string>
@@ -75,10 +71,10 @@
     <string name="ExternalStorage">Archiviazione esterna</string>
     <string name="SystemRoot">Root di sistema</string>
     <string name="SdCard">Scheda SD</string>
+    <string name="Folder">Cartella</string>
     <!--chat view-->
     <string name="Invisible">invisibile</string>
     <string name="Typing">sta scrivendo…</string>
-    <string name="Attach">Allega</string>
     <string name="IsTyping">sta scrivendo…</string>
     <string name="AreTyping">stanno scrivendo…</string>
     <string name="GotAQuestion">Hai una domanda\nsu Telegram?</string>
@@ -86,20 +82,15 @@
     <string name="ChatGallery">Galleria</string>
     <string name="ChatLocation">Posizione</string>
     <string name="ChatVideo">Video</string>
-    <string name="ChatDocument">Documento</string>
+    <string name="ChatDocument">File</string>
     <string name="NoMessages">Non ci sono ancora messaggi…</string>
-    <string name="ViewPhoto">Visualizza foto</string>
-    <string name="ViewLocation">Visualizza posizione</string>
-    <string name="ViewVideo">Riproduci video</string>
     <string name="ForwardedMessage">Messaggio inoltrato</string>
     <string name="From">Da</string>
     <string name="NoRecent">Nessuno recente</string>
     <string name="Message">Messaggio</string>
-    <string name="TypeMessage">Scrivi il messaggio</string>
-    <string name="DOWNLOAD">Scarica</string>
-    <string name="Selected">Selezionati: %d</string>
-    <string name="ShareMyContactInfo">CONDIVIDI INFORMAZIONI CONTATTO</string>
-    <string name="AddToContacts">AGGIUNGI AI CONTATTI</string>
+    <string name="TypeMessage">Messaggi</string>
+    <string name="ShareMyContactInfo">Condividi il mio contatto</string>
+    <string name="AddToContacts">Aggiungi ai contatti</string>
     <string name="EncryptedPlaceholderTitleIncoming">%s ti ha mandato un invito a una chat segreta.</string>
     <string name="EncryptedPlaceholderTitleOutgoing">Hai invitato %s a entrare in una chat segreta.</string>
     <string name="EncryptedDescriptionTitle">Chat segrete:</string>
@@ -116,8 +107,6 @@
     <string name="ApplyLocalizationFile">Applica file di localizzazione</string>
     <string name="UnsupportedAttachment">Allegato non supportato</string>
     <!--notification-->
-    <string name="EncryptedChatRequested">Chat segreta richiesta</string>
-    <string name="EncryptedChatAccepted">Chat segreta iniziata</string>
     <string name="MessageLifetimeChanged">%1$s ha impostato il timer di autodistruzione a %2$s</string>
     <string name="MessageLifetimeChangedOutgoing">Hai impostato il timer di autodistruzione a %1$s</string>
     <string name="MessageLifetimeRemoved">%1$s ha disabilitato il timer di autodistruzione</string>
@@ -129,7 +118,7 @@
     <string name="NotificationMessageVideo">%1$s ti ha inviato un video</string>
     <string name="NotificationMessageContact">%1$s ha condiviso un contatto con te</string>
     <string name="NotificationMessageMap">%1$s ti ha inviato una posizione</string>
-    <string name="NotificationMessageDocument">%1$s ti ha inviato un documento</string>
+    <string name="NotificationMessageDocument">%1$s ti ha inviato un file</string>
     <string name="NotificationMessageAudio">%1$s ti ha inviato un audio</string>
     <string name="NotificationMessageGroupText">%1$s @ %2$s: %3$s</string>
     <string name="NotificationMessageGroupNoText">%1$s ha inviato un messaggio al gruppo %2$s</string>
@@ -137,7 +126,7 @@
     <string name="NotificationMessageGroupVideo">%1$s ha inviato un video al gruppo %2$s</string>
     <string name="NotificationMessageGroupContact">%1$s ha condiviso un contatto con il gruppo %2$s</string>
     <string name="NotificationMessageGroupMap">%1$s ha inviato una posizione al gruppo %2$s</string>
-    <string name="NotificationMessageGroupDocument">%1$s ha inviato un documento al gruppo %2$s</string>
+    <string name="NotificationMessageGroupDocument">%1$s ha inviato un file al gruppo %2$s</string>
     <string name="NotificationMessageGroupAudio">%1$s ha inviato un audio al gruppo %2$s</string>
     <string name="NotificationInvitedToGroup">%1$s ti ha invitato nel gruppo %2$s</string>
     <string name="NotificationEditedGroupName">%1$s ha modificato il nome del gruppo %2$s</string>
@@ -160,22 +149,22 @@
     <string name="TodayAt">oggi alle</string>
     <string name="YesterdayAt">ieri alle</string>
     <string name="Online">in linea</string>
-    <string name="Offline">non in linea</string>
     <string name="LastSeen">ultimo accesso</string>
     <string name="LastSeenDate">ultimo accesso</string>
     <string name="InviteFriends">Invita amici</string>
     <string name="GlobalSearch">RICERCA GLOBALE</string>
+    <string name="Lately">ultimo accesso di recente</string>
+    <string name="WithinAWeek">ultimo accesso entro una settimana</string>
+    <string name="WithinAMonth">ultimo accesso entro un mese</string>
+    <string name="ALongTimeAgo">ultimo accesso molto tempo fa</string>
     <!--group create view-->
     <string name="SendMessageTo">Invia messaggio a...</string>
     <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 membri</string>
     <!--group info view-->
-    <string name="EnterGroupNameTitle">INSERISCI IL NOME DEL GRUPPO</string>
     <string name="SharedMedia">Media condivisi</string>
-    <string name="GroupInfo">Info gruppo</string>
-    <string name="SETTINGS">IMPOSTAZIONI</string>
+    <string name="SETTINGS">Impostazioni</string>
     <string name="AddMember">Aggiungi membro</string>
     <string name="DeleteAndExit">Elimina e lascia il gruppo</string>
     <string name="Notifications">Notifiche</string>
@@ -183,25 +172,23 @@
     <!--contact info view-->
     <string name="ShareContact">Condividi</string>
     <string name="AddContact">Aggiungi</string>
+    <string name="AddContactTitle">Aggiungi contatto</string>
     <string name="BlockContact">Blocca</string>
     <string name="EditContact">Modifica</string>
     <string name="DeleteContact">Elimina</string>
-    <string name="PhoneHome">CASA</string>
-    <string name="PhoneMobile">CELLULARE</string>
-    <string name="PhoneWork">LAVORO</string>
-    <string name="PhoneOther">ALTRO</string>
-    <string name="PhoneMain">PRINCIPALE</string>
-    <string name="ContactInfo">Informazioni contatto</string>
-    <string name="PHONE">TELEFONO</string>
+    <string name="PhoneHome">Home</string>
+    <string name="PhoneMobile">Mobile</string>
+    <string name="PhoneWork">Lavoro</string>
+    <string name="PhoneOther">Altro</string>
+    <string name="PhoneMain">Principale</string>
     <string name="StartEncryptedChat">Inizia chat segreta</string>
     <string name="CreateEncryptedChatError">Si è verificato un errore.</string>
-    <string name="SecretTitle">Chat segreta</string>
     <string name="EncryptionKey">Chiave di cifratura</string>
     <string name="MessageLifetime">Timer di autodistruzione</string>
     <string name="ShortMessageLifetimeForever">Spento</string>
     <string name="EncryptionKeyDescription">Questa immagine è una visualizzazione della chiave di cifratura per questa chat segreta con <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>Se questa immagine è uguale sul telefono di <![CDATA[<b>]]>%2$s<![CDATA[</b>]]>, la chat è sicura al 200%%.<![CDATA[<br><br>]]>Per saperne di più, visita Telegram.org</string>
     <string name="NumberUnknown">Sconosciuto</string>
-    <string name="Info">INFO</string>
+    <string name="Info">Info</string>
     <string name="Phone">Telefono</string>
     <!--usernames-->
     <string name="Username">Nome utente</string>
@@ -224,32 +211,30 @@
     <string name="Unblock">Sblocca</string>
     <string name="UnblockText">Tieni premuto sull’utente per sbloccarlo.</string>
     <string name="NoBlocked">Ancora nessun utente bloccato</string>
-    <string name="MessageNotifications">NOTIFICHE MESSAGGI</string>
+    <string name="MessageNotifications">Notifiche messaggio</string>
     <string name="Alert">Avviso</string>
     <string name="MessagePreview">Anteprima messaggio</string>
-    <string name="GroupNotifications">NOTIFICHE DI GRUPPO</string>
+    <string name="GroupNotifications">Notifiche di gruppo</string>
     <string name="Sound">Suoni</string>
-    <string name="InAppNotifications">NOTIFICHE IN-APP</string>
+    <string name="InAppNotifications">Notifiche in-app</string>
     <string name="InAppSounds">Suoni in-app</string>
     <string name="InAppVibrate">Vibrazione in-app</string>
     <string name="Vibrate">Vibrazione</string>
     <string name="InAppPreview">Anteprima in-app</string>
-    <string name="Reset">RIPRISTINA</string>
+    <string name="Reset">Ripristina</string>
     <string name="ResetAllNotifications">Ripristina tutte le notifiche</string>
     <string name="UndoAllCustom">Annulla tutte le impostazioni di notifica personalizzate per tutti i tuoi contatti e gruppi</string>
     <string name="NotificationsAndSounds">Notifiche e suoni</string>
     <string name="BlockedUsers">Utenti bloccati</string>
-    <string name="SaveIncomingPhotos">Salva foto ricevute</string>
     <string name="LogOut">Disconnetti</string>
-    <string name="YourFirstNameAndLastName">IL TUO NOME E COGNOME</string>
     <string name="NoSound">Nessun suono</string>
     <string name="Default">Predefinito</string>
-    <string name="Support">SUPPORTO</string>
+    <string name="Support">Supporto</string>
     <string name="ChatBackground">Sfondo chat</string>
-    <string name="MessagesSettings">MESSAGGI</string>
+    <string name="MessagesSettings">Messaggi</string>
     <string name="SendByEnter">Spedisci con Invio</string>
     <string name="TerminateAllSessions">Chiudi tutte le altre sessioni</string>
-    <string name="Events">EVENTI</string>
+    <string name="Events">Eventi</string>
     <string name="ContactJoined">Un contatto si è collegato a Telegram</string>
     <string name="Pebble">PEBBLE</string>
     <string name="Language">Lingua</string>
@@ -265,7 +250,6 @@
     <string name="NotificationsServiceDisableInfo">Se i servizi di Google Play sono sufficienti per ricevere le notifiche, è possibile disabilitare il Servizio notifiche. Ti raccomandiamo comunque di lasciarlo abilitato per lasciare l\'app attiva in background e ricevere le notifiche istantanee.</string>
     <string name="SortBy">Ordina per</string>
     <string name="ImportContacts">Importa contatti</string>
-    <string name="WiFiOnly">Solo tramite WiFi</string>
     <string name="SortFirstName">Nome</string>
     <string name="SortLastName">Cognome</string>
     <string name="LedColor">Colore LED</string>
@@ -279,18 +263,16 @@
     <string name="Long">Lungo</string>
     <string name="SystemDefault">Predefinito di sistema</string>
     <string name="SettingsDefault">Impostazioni predefinite</string>
-    <string name="AutomaticMediaDownload">SCARICAMENTO AUTOMATICO MEDIA</string>
+    <string name="AutomaticMediaDownload">Scaricamento automatico media</string>
     <string name="WhenUsingMobileData">Quando si utilizza la rete dati</string>
     <string name="WhenConnectedOnWiFi">Quando si utilizza il Wi-Fi</string>
     <string name="WhenRoaming">In roaming</string>
     <string name="NoMediaAutoDownload">Nessun media</string>
     <string name="SaveToGallerySettings">Salva nella galleria</string>
-    <string name="EditName">Edit Name</string>
+    <string name="EditName">Modifica nome</string>
     <!--media view-->
     <string name="NoMedia">Nessun media condiviso</string>
-    <string name="CancelDownload">Annulla scaricamento</string>
     <!--map view-->
-    <string name="MyLocation">La mia posizione</string>
     <string name="Map">Mappa</string>
     <string name="Satellite">Satellite</string>
     <string name="Hybrid">Ibrido</string>
@@ -305,6 +287,39 @@
     <string name="Gallery">Galleria</string>
     <string name="AllPhotos">Tutte le foto</string>
     <string name="NoPhotos">Ancora nessuna foto</string>
+    <string name="PleaseDownload">Scarica prima il file</string>
+    <!--privacy settings-->
+    <string name="PrivacySettings">Privacy e Sicurezza</string>
+    <string name="PrivacyTitle">Privacy</string>
+    <string name="PrivacyLastSeen">Ultimo Accesso</string>
+    <string name="LastSeenEverybody">Tutti</string>
+    <string name="LastSeenContacts">I miei Contatti</string>
+    <string name="LastSeenNobody">Nessuno</string>
+    <string name="LastSeenEverybodyMinus">Tutti (-%1$d)</string>
+    <string name="LastSeenContactsPlus">I miei Contatti (+%1$d)</string>
+    <string name="LastSeenContactsMinus">I miei Contatti (-%1$d)</string>
+    <string name="LastSeenContactsMinusPlus">I miei Contatti (-%1$d, +%2$d)</string>
+    <string name="LastSeenNobodyPlus">Nessuno (+%1$d)</string>
+    <string name="SecurityTitle">Sicurezza</string>
+    <string name="DeleteAccountTitle">Elimina il mio account</string>
+    <string name="DeleteAccountIfAwayFor">Se lontano per</string>
+    <string name="DeleteAccountHelp">Se non ti connetti almeno una volta in questo periodo, il tuo account verrà eliminato insieme a tutti i gruppi, messaggi e contatti.</string>
+    <string name="DeleteAccountNowConfirmation">Eliminare il tuo account?</string>
+    <string name="LastSeenHelp">Cambia chi può vedere il tuo Ultimo Accesso.</string>
+    <string name="LastSeenTitle">Chi può vedere il tuo Ultimo Accesso?</string>
+    <string name="AddExceptions">Aggiungi eccezioni</string>
+    <string name="CustomHelp">Importante: non sarai in grado di vedere l\'Ultimo Accesso delle persone con le quali non condividi l\'Ultimo Accesso. Verrà mostrato un orario approssimativo (di recente, entro una settimana, entro un mese).</string>
+    <string name="AlwaysShareWith">Condividi con</string>
+    <string name="NeverShareWith">Non condividere con</string>
+    <string name="CustomShareSettingsHelp">Queste impostazioni annulleranno i valori precedenti.</string>
+    <string name="AlwaysShareWithTitle">Condividi</string>
+    <string name="AlwaysShareWithPlaceholder">Condividi con gli utenti...</string>
+    <string name="NeverShareWithTitle">Non condividere</string>
+    <string name="NeverShareWithPlaceholder">Non condividere con gli utenti...</string>
+    <string name="EmpryUsersPlaceholder">Aggiungi Utenti</string>
+    <string name="PrivacyFloodControlError">Ci spiace, troppe richieste. Impossibile cambiare le impostazioni di privacy ora, attendi.</string>
+    <string name="ClearOtherSessionsHelp">Disconnette tutti i dispositivi tranne questo.</string>
+    <string name="RemoveFromListText">Tieni premuto sull\'utente per eliminarlo.</string>
     <!--edit video view-->
     <string name="EditVideo">Modifica video</string>
     <string name="OriginalVideo">Video originale</string>
@@ -328,7 +343,6 @@
     <string name="FromCamera">Dalla fotocamera</string>
     <string name="FromGalley">Dalla galleria</string>
     <string name="DeletePhoto">Elimina foto</string>
-    <string name="OpenPhoto">Apri foto</string>
     <string name="Set">Imposta</string>
     <string name="OK">OK</string>
     <!--messages-->
@@ -353,7 +367,7 @@
     <string name="AttachVideo">Video</string>
     <string name="AttachLocation">Posizione</string>
     <string name="AttachContact">Contatto</string>
-    <string name="AttachDocument">Documento</string>
+    <string name="AttachDocument">File</string>
     <string name="AttachAudio">Audio</string>
     <string name="FromYou">Tu</string>
     <string name="ActionTakeScreenshootYou">Hai catturato la schermata!</string>
@@ -371,12 +385,10 @@
     <string name="NoHandleAppInstalled">Non hai nessuna applicazione che può gestire il tipo di file \'%1$s\': installane una per proseguire</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">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">Inviare i messaggi a %1$s?</string>
-    <string name="AreYouSureLogout">Terminare la sessione?</string>
+    <string name="AreYouSureLogout">Sei sicuro di volerti disconnettere?\n\nRicorda che puoi usare Telegram su tutti i tuoi device contemporaneamente.\n\nRicorda, disconnettersi elimina tutte le Chat Segrete.</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>
@@ -385,7 +397,8 @@
     <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>
+    <string name="AreYouSureRegistration">Sei sicuro di volere eliminare questa registrazione?</string>
+    <string name="AreYouSureClearHistory">Sei sicuro di volere eliminare la cronologia?</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>
@@ -472,6 +485,24 @@
     <string name="Weeks_few">%1$d settimane</string>
     <string name="Weeks_many">%1$d settimane</string>
     <string name="Weeks_other">%1$d settimane</string>
+    <string name="Months_zero">%1$d mesi</string>
+    <string name="Months_one">%1$d mese</string>
+    <string name="Months_two">%1$d mesi</string>
+    <string name="Months_few">%1$d mesi</string>
+    <string name="Months_many">%1$d mesi</string>
+    <string name="Months_other">%1$d mesi</string>
+    <string name="Years_zero">%1$d anni</string>
+    <string name="Years_one">%1$d anno</string>
+    <string name="Years_two">%1$d anni</string>
+    <string name="Years_few">%1$d anni</string>
+    <string name="Years_many">%1$d ann</string>
+    <string name="Years_other">%1$d anni</string>
+    <string name="Users_zero">%1$d utenti</string>
+    <string name="Users_one">%1$d utente</string>
+    <string name="Users_two">%1$d utenti</string>
+    <string name="Users_few">%1$d utenti</string>
+    <string name="Users_many">%1$d utenti</string>
+    <string name="Users_other">%1$d utenti</string>
     <!--date formatters-->
     <string name="formatterMonth">dd MMM</string>
     <string name="formatterYear">dd.MM.yy</string>

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

@@ -9,7 +9,7 @@
     <string name="LanguageCode">ko</string>
     <!--signin view-->
     <string name="YourPhone">전화번호 입력</string>
-    <string name="StartText">국가번호와 전화번호를 입력하세요.<![CDATA[\n]]>대한민국 국가번호: 82</string>
+    <string name="StartText">국가번호와 전화번호를 입력하세요. (대한민국 국가번호: 82)</string>
     <string name="ChooseCountry">국가를 선택하세요</string>
     <string name="WrongCountry">올바른 국가번호를 입력하세요</string>
     <!--code enter view-->
@@ -28,9 +28,6 @@
     <string name="LastName">성(선택)</string>
     <string name="CancelRegistration">가입 취소</string>
     <!--chats view-->
-    <string name="Chats">채팅방</string>
-    <string name="Search">검색</string>
-    <string name="NewMessages">새 메시지</string>
     <string name="Settings">설정</string>
     <string name="Contacts">주소록</string>
     <string name="NewGroup">새 그룹</string>
@@ -38,7 +35,7 @@
     <string name="NoResult">결과 없음</string>
     <string name="NoChats">채팅방이 없습니다...</string>
     <string name="NoChatsHelp">대화를 시작하려면 우측 상단의\n초대하기 버튼을 누르거나\n메뉴 버튼을 눌러 보세요.</string>
-    <string name="WaitingForNetwork">대기 중...</string>
+    <string name="WaitingForNetwork">연결 대기 중...</string>
     <string name="Connecting">연결 중...</string>
     <string name="Updating">업데이트 중...</string>
     <string name="NewSecretChat">비밀대화 시작</string>
@@ -49,14 +46,13 @@
     <string name="EncryptedChatStartedIncoming">비밀대화에 참여했습니다.</string>
     <string name="ClearHistory">대화내용 지우기</string>
     <string name="DeleteChat">채팅방 나가기</string>
-    <string name="HiddenName">숨긴 이름</string>
+    <string name="DeleteChatUser">이 대화 삭제</string>
+    <string name="HiddenName">탈퇴한 계정</string>
     <string name="SelectChat">채팅방 선택</string>
     <string name="PhotoTip">꾹 눌러서 보기</string>
     <string name="CompatibilityChat">%1$s님의 텔레그램 버전이 낮아 비밀 사진을 호환성 모드로 표시합니다.\n\n%2$s님이 텔레그램을 업데이트하고 나면, 자동삭제 시간이 1분 이하인 사진은 \"탭하고 누르고 있어야 보임\" 상태가 되며, 상대방이 화면을 캡처할 때 마다 알림을 받습니다.</string>
-    <string name="SearchConversations">Conversations</string>
-    <string name="SearchMessages">Messages</string>
+    <string name="SearchMessages">메시지</string>
     <!--broadcasts-->
-    <string name="BroadcastList">단체 메시지 리스트</string>
     <string name="NewBroadcastList">새 단체 메시지 리스트</string>
     <string name="EnterListName">리스트 이름을 입력하세요</string>
     <string name="YouCreatedBroadcastList">단체 메시지 리스트를 만들었습니다</string>
@@ -75,10 +71,10 @@
     <string name="ExternalStorage">외부 저장소</string>
     <string name="SystemRoot">시스템 루트</string>
     <string name="SdCard">SD 카드</string>
+    <string name="Folder">폴더</string>
     <!--chat view-->
     <string name="Invisible">숨김</string>
     <string name="Typing">입력 중...</string>
-    <string name="Attach">첨부</string>
     <string name="IsTyping">님이 입력 중...</string>
     <string name="AreTyping">님이 입력 중...</string>
     <string name="GotAQuestion">텔레그램에 관해\n궁금한 사항이 있나요?</string>
@@ -88,16 +84,11 @@
     <string name="ChatVideo">동영상</string>
     <string name="ChatDocument">문서</string>
     <string name="NoMessages">메시지가 없습니다...</string>
-    <string name="ViewPhoto">사진 보기</string>
-    <string name="ViewLocation">위치 보기</string>
-    <string name="ViewVideo">동영상 재생</string>
     <string name="ForwardedMessage">전달된 메시지</string>
     <string name="From">보낸 사람</string>
     <string name="NoRecent">최근에 사용한 이모티콘</string>
     <string name="Message">메시지</string>
-    <string name="TypeMessage">메시지 입력</string>
-    <string name="DOWNLOAD">다운로드</string>
-    <string name="Selected">선택: %d</string>
+    <string name="TypeMessage">메시지</string>
     <string name="ShareMyContactInfo">내 연락처 공유</string>
     <string name="AddToContacts">주소록에 추가</string>
     <string name="EncryptedPlaceholderTitleIncoming">%s님이 비밀대화에 초대했습니다.</string>
@@ -116,8 +107,6 @@
     <string name="ApplyLocalizationFile">언어 파일 적용</string>
     <string name="UnsupportedAttachment">지원하지 않는 형식입니다</string>
     <!--notification-->
-    <string name="EncryptedChatRequested">비밀대화를 요청했습니다</string>
-    <string name="EncryptedChatAccepted">비밀대화를 시작했습니다</string>
     <string name="MessageLifetimeChanged">%1$s님이 자동삭제를 %2$s 후로 설정했습니다</string>
     <string name="MessageLifetimeChangedOutgoing">자동삭제를 %1$s 후로 설정했습니다</string>
     <string name="MessageLifetimeRemoved">%1$s님이 자동삭제를 해제했습니다</string>
@@ -160,21 +149,21 @@
     <string name="TodayAt">오늘</string>
     <string name="YesterdayAt">어제</string>
     <string name="Online">온라인</string>
-    <string name="Offline">오프라인</string>
     <string name="LastSeen">마지막 접속: </string>
     <string name="LastSeenDate">마지막 접속: </string>
     <string name="InviteFriends">친구 초대</string>
     <string name="GlobalSearch">전체 검색</string>
+    <string name="Lately">최근에 접속</string>
+    <string name="WithinAWeek">일주일 이내 마지막으로 접속</string>
+    <string name="WithinAMonth">한 달 이내 마지막으로 접속</string>
+    <string name="ALongTimeAgo">마지막으로 접속한 지 오래됨</string>
     <!--group create view-->
     <string name="SendMessageTo">메시지 보내기...</string>
     <string name="EnterGroupNamePlaceholder">그룹 이름 입력</string>
     <string name="GroupName">그룹 이름</string>
-    <string name="AllContacts">모든 대화상대</string>
     <string name="MembersCount">대화상대 %1$d/%2$d</string>
     <!--group info view-->
-    <string name="EnterGroupNameTitle">그룹 이름을 입력하세요</string>
     <string name="SharedMedia">공유한 미디어</string>
-    <string name="GroupInfo">그룹 정보</string>
     <string name="SETTINGS">설정</string>
     <string name="AddMember">대화상대 추가</string>
     <string name="DeleteAndExit">그룹에서 나가기</string>
@@ -183,6 +172,7 @@
     <!--contact info view-->
     <string name="ShareContact">공유</string>
     <string name="AddContact">추가</string>
+    <string name="AddContactTitle">대화상대 추가</string>
     <string name="BlockContact">차단</string>
     <string name="EditContact">편집</string>
     <string name="DeleteContact">삭제</string>
@@ -190,12 +180,9 @@
     <string name="PhoneMobile">휴대전화</string>
     <string name="PhoneWork">직장</string>
     <string name="PhoneOther">기타</string>
-    <string name="PhoneMain">기본</string>
-    <string name="ContactInfo">연락처 정보</string>
-    <string name="PHONE">전화번호</string>
+    <string name="PhoneMain">주</string>
     <string name="StartEncryptedChat">비밀대화 시작</string>
     <string name="CreateEncryptedChatError">오류가 발생했습니다.</string>
-    <string name="SecretTitle">비밀대화</string>
     <string name="EncryptionKey">암호화 키</string>
     <string name="MessageLifetime">자동삭제 타이머</string>
     <string name="ShortMessageLifetimeForever">해제</string>
@@ -229,7 +216,7 @@
     <string name="MessagePreview">메시지 미리보기</string>
     <string name="GroupNotifications">그룹 알림</string>
     <string name="Sound">알림음</string>
-    <string name="InAppNotifications">앱을 실행 중일 때 알림</string>
+    <string name="InAppNotifications">앱 내 알림</string>
     <string name="InAppSounds">실행 중일 때 알림음</string>
     <string name="InAppVibrate">실행 중일 때 진동</string>
     <string name="Vibrate">진동</string>
@@ -239,9 +226,7 @@
     <string name="UndoAllCustom">연락처와 그룹에 대한 모든 알림 설정을 처음 상태로 되돌립니다.</string>
     <string name="NotificationsAndSounds">알림 및 소리</string>
     <string name="BlockedUsers">차단 목록</string>
-    <string name="SaveIncomingPhotos">받은 사진 저장</string>
     <string name="LogOut">로그아웃</string>
-    <string name="YourFirstNameAndLastName">이름</string>
     <string name="NoSound">알림음 없음</string>
     <string name="Default">기본값</string>
     <string name="Support">지원</string>
@@ -265,7 +250,6 @@
     <string name="NotificationsServiceDisableInfo">알림 서비스를 비활성화 하면 새로운 메시지의 알림이 다소 늦을 수 있습니다.<![CDATA[\n]]>텔레그램이 백그라운드에서 작동하며 알림을 바로 알릴 수 있도록 활성화 하는것을 권장합니다.</string>
     <string name="SortBy">정렬</string>
     <string name="ImportContacts">연락처 가져오기</string>
-    <string name="WiFiOnly">WiFi 전용</string>
     <string name="SortFirstName">이름</string>
     <string name="SortLastName">성</string>
     <string name="LedColor">LED 색상</string>
@@ -279,18 +263,16 @@
     <string name="Long">길게</string>
     <string name="SystemDefault">시스템 기본값</string>
     <string name="SettingsDefault">설정 기본값</string>
-    <string name="AutomaticMediaDownload">미디어 자동 다운로드</string>
+    <string name="AutomaticMediaDownload">사진/동영상 자동 다운로드</string>
     <string name="WhenUsingMobileData">모바일 데이터를 사용 중일 때</string>
     <string name="WhenConnectedOnWiFi">Wi-Fi에 연결 중일 때</string>
     <string name="WhenRoaming">로밍 중일 때</string>
     <string name="NoMediaAutoDownload">다운로드 안함</string>
     <string name="SaveToGallerySettings">앨범에 자동 저장</string>
-    <string name="EditName">Edit Name</string>
+    <string name="EditName">이름 편집</string>
     <!--media view-->
     <string name="NoMedia">공유한 미디어가 없습니다</string>
-    <string name="CancelDownload">다운로드 취소</string>
     <!--map view-->
-    <string name="MyLocation">내 위치</string>
     <string name="Map">지도</string>
     <string name="Satellite">위성</string>
     <string name="Hybrid">혼합</string>
@@ -305,6 +287,39 @@
     <string name="Gallery">앨범</string>
     <string name="AllPhotos">모든 사진</string>
     <string name="NoPhotos">사진이 없습니다.</string>
+    <string name="PleaseDownload">사진/동영상을 먼저 다운로드하세요</string>
+    <!--privacy settings-->
+    <string name="PrivacySettings">개인정보 및 보안</string>
+    <string name="PrivacyTitle">개인정보</string>
+    <string name="PrivacyLastSeen">마지막 접속</string>
+    <string name="LastSeenEverybody">전체 공개</string>
+    <string name="LastSeenContacts">내 주소록</string>
+    <string name="LastSeenNobody">비공개</string>
+    <string name="LastSeenEverybodyMinus">전체 공개 (-%1$d)</string>
+    <string name="LastSeenContactsPlus">내 주소록 (+%1$d)</string>
+    <string name="LastSeenContactsMinus">내 주소록 (-%1$d)</string>
+    <string name="LastSeenContactsMinusPlus">내 주소록 (-%1$d, +%2$d)</string>
+    <string name="LastSeenNobodyPlus">비공개 (+%1$d)</string>
+    <string name="SecurityTitle">보안</string>
+    <string name="DeleteAccountTitle">회원 탈퇴</string>
+    <string name="DeleteAccountIfAwayFor">자동 회원 탈퇴</string>
+    <string name="DeleteAccountHelp">이 기간 동안 최소 한 번 이상 로그인을 하지 않으면 자동으로 모든 메시지와 대화상대를 삭제하고 텔레그램을 탈퇴합니다.</string>
+    <string name="DeleteAccountNowConfirmation">텔레그램을 탈퇴할까요?</string>
+    <string name="LastSeenHelp">누가 마지막 접속 시간을 볼 수 있는지 변경</string>
+    <string name="LastSeenTitle">마지막 접속 시간을 누구에게 공개할까요?</string>
+    <string name="AddExceptions">예외 추가</string>
+    <string name="CustomHelp">주의: 회원님의 마지막 접속 시간을 공유받지 않는 사람의 마지막 접속 시간은 확인할 수 없습니다. 대신 일주일 이내, 한달 이내 등으로 간략하게 표시됩니다.</string>
+    <string name="AlwaysShareWith">항상 공유할 대화상대</string>
+    <string name="NeverShareWith">절대 공유하지 않을 대화 상대</string>
+    <string name="CustomShareSettingsHelp">이 설정은 위의 내용을 무시하고 작동합니다.</string>
+    <string name="AlwaysShareWithTitle">항상 공유</string>
+    <string name="AlwaysShareWithPlaceholder">항상 공유할 대화상대...</string>
+    <string name="NeverShareWithTitle">절대 공유하지 않음</string>
+    <string name="NeverShareWithPlaceholder">절대 공유하지 않을 대화상대...</string>
+    <string name="EmpryUsersPlaceholder">대화상대 추가</string>
+    <string name="PrivacyFloodControlError">죄송합니다. 너무 많이 변경하셨습니다. 개인정보 설정을 변경할 수 없으니 잠시 기다려 주세요.</string>
+    <string name="ClearOtherSessionsHelp">이 기기를 제외한 다른 기기에서 로그아웃합니다.</string>
+    <string name="RemoveFromListText">사용자를 탭하고 눌러서 삭제하세요.</string>
     <!--edit video view-->
     <string name="EditVideo">동영상 편집</string>
     <string name="OriginalVideo">동영상 원본</string>
@@ -328,7 +343,6 @@
     <string name="FromCamera">사진 촬영</string>
     <string name="FromGalley">앨범</string>
     <string name="DeletePhoto">사진 삭제</string>
-    <string name="OpenPhoto">사진 열기</string>
     <string name="Set">설정</string>
     <string name="OK">확인</string>
     <!--messages-->
@@ -371,12 +385,10 @@
     <string name="NoHandleAppInstalled">\'%1$s\' 파일 형식을 처리할 앱이 없습니다. 계속하려면 앱을 설치해 주세요.</string>
     <string name="InviteUser">친구가 아직 텔레그램을 사용하지 않네요. 초대해 보세요!</string>
     <string name="AreYouSure">확실합니까?</string>
-    <string name="AddContactQ">주소록에 추가할까요?</string>
     <string name="AddToTheGroup">%1$s님을 그룹에 초대할까요?\n\n전달할 최근 메시지 개수:</string>
     <string name="ForwardMessagesTo">%1$s님에게 메시지를 전달할까요?</string>
-    <string name="DeleteChatQuestion">이 채팅방을 삭제할까요?</string>
     <string name="SendMessagesTo">%1$s님에게 메시지를 보낼까요?</string>
-    <string name="AreYouSureLogout">로그아웃을 하시겠습니까?</string>
+    <string name="AreYouSureLogout">정말로 로그아웃하시겠습니까?\n\n텔레그램은 여러 기기에서 동시에 사용이 가능합니다.\n\n로그아웃하시면 비밀대화가 삭제되는 점 유의해주세요.</string>
     <string name="AreYouSureSessions">현재 기기를 제외하고 다른 기기에 로그인된 세션을 모두 종료시킬까요?</string>
     <string name="AreYouSureDeleteAndExit">그룹에서 나갈까요?</string>
     <string name="AreYouSureDeleteThisChat">채팅방을 삭제할까요?</string>
@@ -385,7 +397,8 @@
     <string name="AreYouSureUnblockContact">차단을 해제할까요?</string>
     <string name="AreYouSureDeleteContact">대화상대를 삭제할까요?</string>
     <string name="AreYouSureSecretChat">비밀대화를 시작할까요?</string>
-    <string name="ForwardFromMyName">내 이름으로 전달</string>
+    <string name="AreYouSureRegistration">정말로 가입을 취소하시겠습니까?</string>
+    <string name="AreYouSureClearHistory">정말로 대화내용을 지우시겠습니까?</string>
     <string name="SendMessagesToGroup">%1$s 그룹에 메시지를 보낼까요?</string>
     <string name="ForwardMessagesToGroup">%1$s 그룹에 메시지를 전달할까요?</string>
     <string name="FeatureUnavailable">이 기능은 회원님의 국가에서는 사용할 수 없습니다.</string>
@@ -472,6 +485,24 @@
     <string name="Weeks_few">%1$d주</string>
     <string name="Weeks_many">%1$d주</string>
     <string name="Weeks_other">%1$d주</string>
+    <string name="Months_zero">%1$d개월</string>
+    <string name="Months_one">%1$d개월</string>
+    <string name="Months_two">%1$d개월</string>
+    <string name="Months_few">%1$d개월</string>
+    <string name="Months_many">%1$d개월</string>
+    <string name="Months_other">%1$d개월</string>
+    <string name="Years_zero">%1$d년</string>
+    <string name="Years_one">%1$d년</string>
+    <string name="Years_two">%1$d년</string>
+    <string name="Years_few">%1$d년</string>
+    <string name="Years_many">%1$d년</string>
+    <string name="Years_other">%1$d년</string>
+    <string name="Users_zero">%1$d명의 대화상대</string>
+    <string name="Users_one">%1$d명의 대화상대</string>
+    <string name="Users_two">%1$d명의 대화상대</string>
+    <string name="Users_few">%1$d명의 대화상대</string>
+    <string name="Users_many">%1$d명의 대화상대</string>
+    <string name="Users_other">%1$d명의 대화상대</string>
     <!--date formatters-->
     <string name="formatterMonth">M\'월\' d\'일\'</string>
     <string name="formatterYear">yyyy.MM.dd.</string>

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

@@ -9,9 +9,9 @@
     <string name="LanguageCode">nl</string>
     <!--signin view-->
     <string name="YourPhone">Je telefoon</string>
-    <string name="StartText">Bevestig je landcode\nen voer je telefoonnummer in.</string>
+    <string name="StartText">Bevestig je landnummer en voer je telefoonnummer in.</string>
     <string name="ChooseCountry">Kies een land</string>
-    <string name="WrongCountry">Onjuist landcode</string>
+    <string name="WrongCountry">Onjuist landnummer</string>
     <!--code enter view-->
     <string name="YourCode">Je code</string>
     <string name="SentSmsCode">We hebben een sms met een activatiecode verzonden naar je telefoon</string>
@@ -28,16 +28,13 @@
     <string name="LastName">Achternaam (optioneel)</string>
     <string name="CancelRegistration">Registratie annuleren</string>
     <!--chats view-->
-    <string name="Chats">Gesprekken</string>
-    <string name="Search">Zoeken</string>
-    <string name="NewMessages">Nieuwe berichten</string>
     <string name="Settings">Instellingen</string>
     <string name="Contacts">Contacten</string>
     <string name="NewGroup">Nieuwe groep</string>
     <string name="Yesterday">gisteren</string>
     <string name="NoResult">Geen resultaten</string>
     <string name="NoChats">Nog geen gesprekken…</string>
-    <string name="NoChatsHelp">Begin een gesprek door op de\nopstellen-knop rechtsboven te drukken\nof druk op de menuknop voor meer opties.</string>
+    <string name="NoChatsHelp">Begin een gesprek door op de\nopstellen-knop rechtsboven te drukken\nof druk op de menu knop voor meer opties.</string>
     <string name="WaitingForNetwork">Wachten op netwerk…</string>
     <string name="Connecting">Verbinden…</string>
     <string name="Updating">Bijwerken…</string>
@@ -49,14 +46,13 @@
     <string name="EncryptedChatStartedIncoming">Toegevoegd aan de geheime chat.</string>
     <string name="ClearHistory">Geschiedenis wissen</string>
     <string name="DeleteChat">Verwijderen en verlaten</string>
-    <string name="HiddenName">Verborgen naam</string>
+    <string name="DeleteChatUser">Gesprek verwijderen</string>
+    <string name="HiddenName">Verwijderd account</string>
     <string name="SelectChat">Kies een gesprek</string>
     <string name="PhotoTip">Druk en houd ingedrukt</string>
     <string name="CompatibilityChat">%1$s gebruikt een oudere versie van Telegram, dus worden geheime foto\'s weergegeven in de compatibiliteitsmodus.\n\nZodra %2$s Telegram updatet werken foto\'s met timers voor 1 minuut of minder in de \'Druk en houd ingedrukt\'-modus en krijg je een bericht wanneer de andere partij een schermafbeelding maakt.</string>
-    <string name="SearchConversations">Conversations</string>
-    <string name="SearchMessages">Messages</string>
+    <string name="SearchMessages">BERICHTEN</string>
     <!--broadcasts-->
-    <string name="BroadcastList">Verzendlijst</string>
     <string name="NewBroadcastList">Nieuwe verzendlijst</string>
     <string name="EnterListName">Naam van lijst</string>
     <string name="YouCreatedBroadcastList">Je hebt een verzendlijst gemaakt</string>
@@ -73,12 +69,12 @@
     <string name="UsbActive">USB-overdracht actief</string>
     <string name="InternalStorage">Interne opslag</string>
     <string name="ExternalStorage">Externe opslag</string>
-    <string name="SystemRoot">Systeemmap</string>
+    <string name="SystemRoot">Systeem map</string>
     <string name="SdCard">SD-kaart</string>
+    <string name="Folder">Map</string>
     <!--chat view-->
     <string name="Invisible">onzichtbaar</string>
     <string name="Typing">aan het typen…</string>
-    <string name="Attach">Bijvoegen</string>
     <string name="IsTyping">is aan het typen…</string>
     <string name="AreTyping">zijn aan het typen…</string>
     <string name="GotAQuestion">Heb je een vraag\nover Telegram?</string>
@@ -88,18 +84,13 @@
     <string name="ChatVideo">Video</string>
     <string name="ChatDocument">Document</string>
     <string name="NoMessages">Nog geen berichten hier…</string>
-    <string name="ViewPhoto">Foto bekijken</string>
-    <string name="ViewLocation">Locatie bekijken</string>
-    <string name="ViewVideo">Video afspelen</string>
     <string name="ForwardedMessage">Doorgestuurd bericht</string>
     <string name="From">Van</string>
     <string name="NoRecent">Niets recents</string>
     <string name="Message">Bericht</string>
-    <string name="TypeMessage">Typ een bericht...</string>
-    <string name="DOWNLOAD">Downloaden</string>
-    <string name="Selected">Geselecteerd: %d</string>
-    <string name="ShareMyContactInfo">MIJN CONTACTGEGEVENS DELEN</string>
-    <string name="AddToContacts">TOEVOEGEN AAN CONTACTEN</string>
+    <string name="TypeMessage">Bericht</string>
+    <string name="ShareMyContactInfo">Mijn contactgegevens delen</string>
+    <string name="AddToContacts">Toevoegen aan contacten</string>
     <string name="EncryptedPlaceholderTitleIncoming">%s heeft je uitgenodigd voor een geheime chat.</string>
     <string name="EncryptedPlaceholderTitleOutgoing">Je hebt %s uitgenodigd voor een geheime chat.</string>
     <string name="EncryptedDescriptionTitle">Geheime chat functies:</string>
@@ -116,8 +107,6 @@
     <string name="ApplyLocalizationFile">Vertaling toepassen</string>
     <string name="UnsupportedAttachment">Bestandstype niet ondersteund</string>
     <!--notification-->
-    <string name="EncryptedChatRequested">Geheime chat aangevraagd</string>
-    <string name="EncryptedChatAccepted">Geheime chat gestart</string>
     <string name="MessageLifetimeChanged">%1$s heeft de zelfvernietigingstimer ingesteld op %2$s</string>
     <string name="MessageLifetimeChangedOutgoing">Je hebt de zelfvernietigingstimer ingesteld op %1$s</string>
     <string name="MessageLifetimeRemoved">%1$s heeft de zelfvernietigingstimer uitgeschakeld</string>
@@ -160,22 +149,22 @@
     <string name="TodayAt">vandaag om</string>
     <string name="YesterdayAt">gisteren om</string>
     <string name="Online">online</string>
-    <string name="Offline">offline</string>
     <string name="LastSeen">gezien</string>
     <string name="LastSeenDate">gezien</string>
     <string name="InviteFriends">Vrienden uitnodigen</string>
     <string name="GlobalSearch">WERELDWIJD ZOEKEN</string>
+    <string name="Lately">recent gezien</string>
+    <string name="WithinAWeek">afgelopen week gezien</string>
+    <string name="WithinAMonth">afgelopen maand gezien</string>
+    <string name="ALongTimeAgo">lang geleden gezien</string>
     <!--group create view-->
     <string name="SendMessageTo">Bericht verzenden naar…</string>
     <string name="EnterGroupNamePlaceholder">Groepsnaam...</string>
     <string name="GroupName">Groepsnaam</string>
-    <string name="AllContacts">ALLE CONTACTEN</string>
     <string name="MembersCount">%1$d/%2$d deelnemers</string>
     <!--group info view-->
-    <string name="EnterGroupNameTitle">GROEPSNAAM INSTELLEN</string>
     <string name="SharedMedia">Gedeelde media</string>
-    <string name="GroupInfo">Groepsinformatie</string>
-    <string name="SETTINGS">INSTELLINGEN</string>
+    <string name="SETTINGS">Instellingen</string>
     <string name="AddMember">Deelnemer toevoegen</string>
     <string name="DeleteAndExit">Groep verwijderen en verlaten</string>
     <string name="Notifications">Meldingen</string>
@@ -183,25 +172,23 @@
     <!--contact info view-->
     <string name="ShareContact">Delen</string>
     <string name="AddContact">Toevoegen</string>
+    <string name="AddContactTitle">Contact toevoegen</string>
     <string name="BlockContact">Blokkeren</string>
     <string name="EditContact">Bewerken</string>
     <string name="DeleteContact">Verwijderen</string>
-    <string name="PhoneHome">THUIS</string>
-    <string name="PhoneMobile">MOBIEL</string>
-    <string name="PhoneWork">WERK</string>
-    <string name="PhoneOther">OVERIG</string>
-    <string name="PhoneMain">ALGEMEEN</string>
-    <string name="ContactInfo">Contactinformatie</string>
-    <string name="PHONE">TELEFOON</string>
+    <string name="PhoneHome">Thuis</string>
+    <string name="PhoneMobile">Mobiel</string>
+    <string name="PhoneWork">Werk</string>
+    <string name="PhoneOther">Overig</string>
+    <string name="PhoneMain">Hoofd</string>
     <string name="StartEncryptedChat">Geheime chat starten</string>
     <string name="CreateEncryptedChatError">Er is een fout opgetreden.</string>
-    <string name="SecretTitle">Geheime chat</string>
     <string name="EncryptionKey">Encryptiesleutel</string>
     <string name="MessageLifetime">Zelfvernietigingstimer</string>
     <string name="ShortMessageLifetimeForever">Uit</string>
     <string name="EncryptionKeyDescription">Dit is een weergave van de encryptiesleutel voor deze geheime chat met <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>Als deze afbeelding er bij <![CDATA[<b>]]>%2$s<![CDATA[</b>]]> hetzelfde uitziet, is jullie gesprek 200%% beveiligd.<![CDATA[<br><br>]]>Lees meer op telegram.org.</string>
     <string name="NumberUnknown">Onbekend</string>
-    <string name="Info">INFORMATIE</string>
+    <string name="Info">Info</string>
     <string name="Phone">Telefoon</string>
     <!--usernames-->
     <string name="Username">Gebruikersnaam</string>
@@ -224,32 +211,30 @@
     <string name="Unblock">Deblokkeren</string>
     <string name="UnblockText">Houd een gebruiker ingedrukt om hem/haar te deblokkeren.</string>
     <string name="NoBlocked">Geen geblokkeerde gebruikers</string>
-    <string name="MessageNotifications">BERICHTMELDINGEN</string>
+    <string name="MessageNotifications">Berichtmeldingen</string>
     <string name="Alert">Waarschuwing</string>
     <string name="MessagePreview">Voorvertoning</string>
-    <string name="GroupNotifications">GROEPSMELDINGEN</string>
+    <string name="GroupNotifications">Groepsmeldingen</string>
     <string name="Sound">Geluid</string>
-    <string name="InAppNotifications">IN-APP BERICHTGEVING</string>
+    <string name="InAppNotifications">In-app meldingen</string>
     <string name="InAppSounds">Geluiden</string>
     <string name="InAppVibrate">Trillen</string>
     <string name="Vibrate">Trillen</string>
     <string name="InAppPreview">Voorvertoningen</string>
-    <string name="Reset">RESETTEN</string>
+    <string name="Reset">Resetten</string>
     <string name="ResetAllNotifications">Alle meldingen resetten</string>
     <string name="UndoAllCustom">Aangepaste meldingsinstellingen wissen voor contacten en groepen.</string>
     <string name="NotificationsAndSounds">Meldingen en geluiden</string>
     <string name="BlockedUsers">Geblokkeerde gebruikers</string>
-    <string name="SaveIncomingPhotos">Inkomende foto\'s opslaan</string>
     <string name="LogOut">Uitloggen</string>
-    <string name="YourFirstNameAndLastName">JE VOOR- EN ACHTERNAAM</string>
     <string name="NoSound">Geen geluid</string>
     <string name="Default">Standaard</string>
-    <string name="Support">ONDERSTEUNING</string>
-    <string name="ChatBackground">Achtergrond</string>
-    <string name="MessagesSettings">BERICHTEN</string>
+    <string name="Support">Ondersteuning</string>
+    <string name="ChatBackground">Achtergrond kiezen</string>
+    <string name="MessagesSettings">Berichten</string>
     <string name="SendByEnter">Verzenden met Enter</string>
     <string name="TerminateAllSessions">Beëindig alle andere sessies</string>
-    <string name="Events">GEBEURTENISSEN</string>
+    <string name="Events">Gebeurtenissen</string>
     <string name="ContactJoined">Contact lid van Telegram</string>
     <string name="Pebble">PEBBLE</string>
     <string name="Language">Taal</string>
@@ -265,7 +250,6 @@
     <string name="NotificationsServiceDisableInfo">Als Google Play Services genoeg voor je is om meldingen te ontvangen kun je de Meldingenservice uitschakelen. We raden echter aan dit ingeschakeld te laten om de app in de achtergrond te laten draaien en directe meldingen te ontvangen.</string>
     <string name="SortBy">Sorteren op</string>
     <string name="ImportContacts">Importeer contacten</string>
-    <string name="WiFiOnly">Alleen via WiFi</string>
     <string name="SortFirstName">Voornaam</string>
     <string name="SortLastName">Achternaam</string>
     <string name="LedColor">LED kleur</string>
@@ -279,18 +263,16 @@
     <string name="Long">Lang</string>
     <string name="SystemDefault">Systeem standaard</string>
     <string name="SettingsDefault">Standaardinstelling</string>
-    <string name="AutomaticMediaDownload">AUTOMATISCH MEDIA OPHALEN</string>
+    <string name="AutomaticMediaDownload">Automatisch media downloaden</string>
     <string name="WhenUsingMobileData">Bij mobiele verbinding</string>
     <string name="WhenConnectedOnWiFi">Bij Wi-Fi-verbinding</string>
     <string name="WhenRoaming">Bij roaming</string>
     <string name="NoMediaAutoDownload">Geen media</string>
     <string name="SaveToGallerySettings">Opslaan in galerij</string>
-    <string name="EditName">Edit Name</string>
+    <string name="EditName">Naam bewerken</string>
     <!--media view-->
     <string name="NoMedia">Nog geen media gedeeld</string>
-    <string name="CancelDownload">Downloaden annuleren</string>
     <!--map view-->
-    <string name="MyLocation">Mijn locatie</string>
     <string name="Map">Kaart</string>
     <string name="Satellite">Satelliet</string>
     <string name="Hybrid">Hybride</string>
@@ -305,6 +287,39 @@
     <string name="Gallery">Galerij</string>
     <string name="AllPhotos">Alle foto\'s</string>
     <string name="NoPhotos">Nog geen foto\'s</string>
+    <string name="PleaseDownload">Download media eerst</string>
+    <!--privacy settings-->
+    <string name="PrivacySettings">Privacy en veiligheid</string>
+    <string name="PrivacyTitle">Privacy</string>
+    <string name="PrivacyLastSeen">Laatst gezien</string>
+    <string name="LastSeenEverybody">Iedereen</string>
+    <string name="LastSeenContacts">Mijn contacten</string>
+    <string name="LastSeenNobody">Niemand</string>
+    <string name="LastSeenEverybodyMinus">Iedereen (-%1$d)</string>
+    <string name="LastSeenContactsPlus">Mijn contacten (+%1$d)</string>
+    <string name="LastSeenContactsMinus">Mijn contacten (-%1$d)</string>
+    <string name="LastSeenContactsMinusPlus">Mijn contacten (-%1$d, +%2$d)</string>
+    <string name="LastSeenNobodyPlus">Niemand (+%1$d)</string>
+    <string name="SecurityTitle">Veiligheid</string>
+    <string name="DeleteAccountTitle">Account verwijderen</string>
+    <string name="DeleteAccountIfAwayFor">Indien afwezig voor</string>
+    <string name="DeleteAccountHelp">Als je binnen deze periode niet minimaal één keer ingelogd bent geweest zal je account worden verwijderd, inclusief alle data.</string>
+    <string name="DeleteAccountNowConfirmation">Je account verwijderen?</string>
+    <string name="LastSeenHelp">Wijzig wie je laatst gezien tijd kan zien.</string>
+    <string name="LastSeenTitle">Wie kan mijn laatst gezien tijd zien?</string>
+    <string name="AddExceptions">Uitzonderingen toevoegen</string>
+    <string name="CustomHelp">Let op: van mensen waarmee je je laatst gezien tijd niet deelt is deze voor jou ook niet zichtbaar. In plaats daarvan krijg je tijden bij benadering te zien (recent, afgelopen week, afgelopen maand).</string>
+    <string name="AlwaysShareWith">Altijd delen met</string>
+    <string name="NeverShareWith">Nooit delen met</string>
+    <string name="CustomShareSettingsHelp">Deze instelling overschrijft de bovenstaande.</string>
+    <string name="AlwaysShareWithTitle">Altijd delen</string>
+    <string name="AlwaysShareWithPlaceholder">Altijd delen met gebruikers</string>
+    <string name="NeverShareWithTitle">Nooit delen</string>
+    <string name="NeverShareWithPlaceholder">Nooit delen met gebruikers</string>
+    <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>
     <!--edit video view-->
     <string name="EditVideo">Video bewerken</string>
     <string name="OriginalVideo">Originele video</string>
@@ -328,7 +343,6 @@
     <string name="FromCamera">Van camera</string>
     <string name="FromGalley">Uit galerij</string>
     <string name="DeletePhoto">Foto verwijderen</string>
-    <string name="OpenPhoto">Foto openen</string>
     <string name="Set">Instellen</string>
     <string name="OK">OK</string>
     <!--messages-->
@@ -357,7 +371,7 @@
     <string name="AttachAudio">Geluidsbestand</string>
     <string name="FromYou">Jij</string>
     <string name="ActionTakeScreenshootYou">Je hebt een schermafbeelding gemaakt!</string>
-    <string name="ActionTakeScreenshoot">un1 maakte een schermafbeeling!</string>
+    <string name="ActionTakeScreenshoot">un1 maakte een schermafbeelding!</string>
     <!--Alert messages-->
     <string name="InvalidPhoneNumber">Ongeldig telefoonnummer</string>
     <string name="CodeExpired">Code verlopen. Log opnieuw in.</string>
@@ -368,15 +382,13 @@
     <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">Mail ons op sms@telegram.org en vertel ons over je probleem.</string>
-    <string name="NoHandleAppInstalled">Je hebt geen apps die bestandstype \'%1$s\' kunnen verwerken, gelieve een compitabele app te installeren</string>
+    <string name="NoHandleAppInstalled">Je hebt geen apps die bestandstype \'%1$s\' kunnen verwerken, gelieve een compatibele app te installeren</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">%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">Berichten naar %1$s verzenden?</string>
-    <string name="AreYouSureLogout">Weet je zeker dat je wilt uitloggen?</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="AreYouSureDeleteThisChat">Weet je zeker dat je dit gesprek wilt verwijderen?</string>
@@ -385,7 +397,8 @@
     <string name="AreYouSureUnblockContact">Weet je zeker dat je deze persoon wilt deblokkeren?</string>
     <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="ForwardFromMyName">doorsturen via mijn eigen naam</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="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>
@@ -472,6 +485,24 @@
     <string name="Weeks_few">%1$d weken</string>
     <string name="Weeks_many">%1$d weken</string>
     <string name="Weeks_other">%1$d weken</string>
+    <string name="Months_zero">%1$d maanden</string>
+    <string name="Months_one">%1$d maand</string>
+    <string name="Months_two">%1$d maanden</string>
+    <string name="Months_few">%1$d maanden</string>
+    <string name="Months_many">%1$d maanden</string>
+    <string name="Months_other">%1$d maanden</string>
+    <string name="Years_zero">%1$d jaren</string>
+    <string name="Years_one">%1$d jaar</string>
+    <string name="Years_two">%1$d jaren</string>
+    <string name="Years_few">%1$d jaren</string>
+    <string name="Years_many">%1$d jaren</string>
+    <string name="Years_other">%1$d jaren</string>
+    <string name="Users_zero">%1$d gebruikers</string>
+    <string name="Users_one">%1$d gebruiker</string>
+    <string name="Users_two">%1$d gebruikers</string>
+    <string name="Users_few">%1$d gebruikers</string>
+    <string name="Users_many">%1$d gebruikers</string>
+    <string name="Users_other">%1$d gebruikers</string>
     <!--date formatters-->
     <string name="formatterMonth">dd MMM</string>
     <string name="formatterYear">dd-MM-yy</string>

TMessagesProj/src/main/res/values-pt-rBR/strings.xml

@@ -9,7 +9,7 @@
     <string name="LanguageCode">pt_BR</string>
     <!--signin view-->
     <string name="YourPhone">Seu número</string>
-    <string name="StartText">Por favor confirme o código do seu país\ne digite o número do seu telefone.</string>
+    <string name="StartText">Confirme o código de seu país e preencha seu número de telefone.</string>
     <string name="ChooseCountry">Escolha um país</string>
     <string name="WrongCountry">Código do país incorreto</string>
     <!--code enter view-->
@@ -28,35 +28,31 @@
     <string name="LastName">Sobrenome (opcional)</string>
     <string name="CancelRegistration">Cancelar registro</string>
     <!--chats view-->
-    <string name="Chats">Conversas</string>
-    <string name="Search">Busca</string>
-    <string name="NewMessages">Novas mensagens</string>
     <string name="Settings">Configurações</string>
     <string name="Contacts">Contatos</string>
     <string name="NewGroup">Novo Grupo</string>
     <string name="Yesterday">ontem</string>
     <string name="NoResult">Nenhum resultado</string>
-    <string name="NoChats">Ainda não há conversas...</string>
+    <string name="NoChats">Ainda não há chats...</string>
     <string name="NoChatsHelp">Comece a conversar pressionando o\nbotão \'Nova Mensagem\' no canto superior direito\nou vá para a seção \'Contatos\'.</string>
     <string name="WaitingForNetwork">Aguardando rede...</string>
     <string name="Connecting">Conectando...</string>
     <string name="Updating">Atualizando...</string>
-    <string name="NewSecretChat">Nova Conversa Secreta</string>
+    <string name="NewSecretChat">Novo Chat Secreto</string>
     <string name="AwaitingEncryption">Esperando %s se conectar...</string>
-    <string name="EncryptionRejected">Conversa secreta cancelada</string>
+    <string name="EncryptionRejected">Chat secreto cancelado</string>
     <string name="EncryptionProcessing">Trocando chaves de criptografia...</string>
-    <string name="EncryptedChatStartedOutgoing">%s entrou na conversa secreta</string>
-    <string name="EncryptedChatStartedIncoming">Você entrou na conversa secreta</string>
+    <string name="EncryptedChatStartedOutgoing">%s entrou no chat secreto</string>
+    <string name="EncryptedChatStartedIncoming">Você entrou no chat secreto</string>
     <string name="ClearHistory">Limpar histórico</string>
     <string name="DeleteChat">Apagar e sair</string>
-    <string name="HiddenName">Nome oculto</string>
-    <string name="SelectChat">Selecione uma Conversa</string>
+    <string name="DeleteChatUser">Excluir conversa</string>
+    <string name="HiddenName">Excluir Conta</string>
+    <string name="SelectChat">Selecione um Chat</string>
     <string name="PhotoTip">Toque e segure para ver</string>
-    <string name="CompatibilityChat">%1$s está usando uma versão mais antiga do Telegram, por isso fotos secretas serão mostradas em modo de compatibilidade.\n\nAssim que %2$s atualize o Telegram, fotos com timers de 1 minuto ou menos passarão a funcionar no modo ‘Toque e segure para ver’, e você será notificado caso a outra pessoa salve a tela.</string>
-    <string name="SearchConversations">Conversations</string>
-    <string name="SearchMessages">Messages</string>
+    <string name="CompatibilityChat">%1$s está usando uma versão mais antiga do Telegram, por isso fotos secretas serão mostradas em modo de compatibilidade.\n\nAssim que %2$s atualizar o Telegram, fotos com timers de 1 minuto ou menos passarão a funcionar no modo ‘Toque e segure para ver’, e você será notificado caso a outra pessoa salve a tela.</string>
+    <string name="SearchMessages">MENSAGENS</string>
     <!--broadcasts-->
-    <string name="BroadcastList">Lista de Broadcast</string>
     <string name="NewBroadcastList">Nova Lista de Broadcast</string>
     <string name="EnterListName">Digite o nome da lista</string>
     <string name="YouCreatedBroadcastList">Você criou uma lista de broadcast</string>
@@ -75,10 +71,10 @@
     <string name="ExternalStorage">Armazenamento Externo</string>
     <string name="SystemRoot">Administrador do Sistema</string>
     <string name="SdCard">Cartão SD</string>
+    <string name="Folder">Pasta</string>
     <!--chat view-->
     <string name="Invisible">invisível</string>
     <string name="Typing">escrevendo...</string>
-    <string name="Attach">Anexar</string>
     <string name="IsTyping">está escrevendo...</string>
     <string name="AreTyping">estão escrevendo...</string>
     <string name="GotAQuestion">Tem alguma dúvida\nsobre o Telegram?</string>
@@ -88,21 +84,16 @@
     <string name="ChatVideo">Vídeo</string>
     <string name="ChatDocument">Documento</string>
     <string name="NoMessages">Ainda não há mensagens aqui...</string>
-    <string name="ViewPhoto">Ver Foto</string>
-    <string name="ViewLocation">Ver Localização</string>
-    <string name="ViewVideo">Tocar Vídeo</string>
     <string name="ForwardedMessage">Mensagem encaminhada</string>
     <string name="From">De</string>
     <string name="NoRecent">Nada recente</string>
     <string name="Message">Mensagem</string>
-    <string name="TypeMessage">Escrever mensagem</string>
-    <string name="DOWNLOAD">Baixar</string>
-    <string name="Selected">%d selecionado</string>
-    <string name="ShareMyContactInfo">COMPARTILHAR MINHAS INFORMAÇÕES DE CONTATO</string>
-    <string name="AddToContacts">ADICIONAR AOS CONTATOS</string>
-    <string name="EncryptedPlaceholderTitleIncoming">%s convidou você para uma conversa secreta.</string>
-    <string name="EncryptedPlaceholderTitleOutgoing">Você convidou %s para uma conversa secreta.</string>
-    <string name="EncryptedDescriptionTitle">Diferenças dos Chats Secretos:</string>
+    <string name="TypeMessage">Mensagem</string>
+    <string name="ShareMyContactInfo">Compartilhar meu contato</string>
+    <string name="AddToContacts">Adicionar aos contatos</string>
+    <string name="EncryptedPlaceholderTitleIncoming">%s convidou você para um chat secreto</string>
+    <string name="EncryptedPlaceholderTitleOutgoing">Você convidou %s para um chat secreto.</string>
+    <string name="EncryptedDescriptionTitle">Chats Secretos:</string>
     <string name="EncryptedDescription1">Criptografia de ponta-a-ponta</string>
     <string name="EncryptedDescription2">Sem rastros nos servidores</string>
     <string name="EncryptedDescription3">Timer de autodestruição</string>
@@ -110,14 +101,12 @@
     <string name="YouWereKicked">Você foi removido deste grupo</string>
     <string name="YouLeft">Você saiu deste grupo</string>
     <string name="DeleteThisGroup">Apagar este grupo</string>
-    <string name="DeleteThisChat">Apagar esta conversa</string>
+    <string name="DeleteThisChat">Apagar este chat</string>
     <string name="SlideToCancel">DESLIZE PARA CANCELAR</string>
     <string name="SaveToDownloads">Salvar em downloads</string>
     <string name="ApplyLocalizationFile">Aplicar arquivo de localização</string>
     <string name="UnsupportedAttachment">Anexo não suportado</string>
     <!--notification-->
-    <string name="EncryptedChatRequested">Conversa secreta solicitada</string>
-    <string name="EncryptedChatAccepted">Conversa secreta iniciada</string>
     <string name="MessageLifetimeChanged">%1$s estabeleceu o tempo de autodestruição para %2$s </string>
     <string name="MessageLifetimeChangedOutgoing">Você estabeleceu o tempo de autodestruição para %1$s</string>
     <string name="MessageLifetimeRemoved">%1$s desativou o temporizador de autodestruição</string>
@@ -160,22 +149,22 @@
     <string name="TodayAt">hoje às</string>
     <string name="YesterdayAt">ontem às</string>
     <string name="Online">online</string>
-    <string name="Offline">offline</string>
     <string name="LastSeen">visto</string>
     <string name="LastSeenDate">visto</string>
     <string name="InviteFriends">Convidar Amigos</string>
     <string name="GlobalSearch">BUSCA GLOBAL</string>
+    <string name="Lately">visto recentemente</string>
+    <string name="WithinAWeek">visto na última semana</string>
+    <string name="WithinAMonth">visto no último mês</string>
+    <string name="ALongTimeAgo">visto há muito tempo atrás</string>
     <!--group create view-->
     <string name="SendMessageTo">Enviar mensagem para...</string>
     <string name="EnterGroupNamePlaceholder">Digite o nome do grupo</string>
     <string name="GroupName">Nome do grupo</string>
-    <string name="AllContacts">TODOS OS CONTATOS</string>
     <string name="MembersCount">%1$d/%2$d membros</string>
     <!--group info view-->
-    <string name="EnterGroupNameTitle">DIGITE O NOME DO GRUPO</string>
     <string name="SharedMedia">Mídia compartilhada</string>
-    <string name="GroupInfo">Informações do Grupo</string>
-    <string name="SETTINGS">CONFIGURAÇÕES</string>
+    <string name="SETTINGS">Configurações</string>
     <string name="AddMember">Adicionar membro</string>
     <string name="DeleteAndExit">Apagar e sair do grupo</string>
     <string name="Notifications">Notificações</string>
@@ -183,25 +172,23 @@
     <!--contact info view-->
     <string name="ShareContact">Compartilhar</string>
     <string name="AddContact">Adicionar</string>
+    <string name="AddContactTitle">Adicionar contato</string>
     <string name="BlockContact">Bloquear</string>
     <string name="EditContact">Editar</string>
     <string name="DeleteContact">Apagar</string>
-    <string name="PhoneHome">CASA</string>
-    <string name="PhoneMobile">CELULAR</string>
-    <string name="PhoneWork">TRABALHO</string>
-    <string name="PhoneOther">OUTRO</string>
-    <string name="PhoneMain">PRINCIPAL</string>
-    <string name="ContactInfo">Informações do Contato</string>
-    <string name="PHONE">TELEFONE</string>
-    <string name="StartEncryptedChat">Iniciar Conversa Secreta</string>
+    <string name="PhoneHome">Início</string>
+    <string name="PhoneMobile">Celular</string>
+    <string name="PhoneWork">Trabalho</string>
+    <string name="PhoneOther">Outro</string>
+    <string name="PhoneMain">Principal</string>
+    <string name="StartEncryptedChat">Iniciar Chat Secreto</string>
     <string name="CreateEncryptedChatError">Ocorreu um erro.</string>
-    <string name="SecretTitle">Conversa Secreta</string>
     <string name="EncryptionKey">Chave criptográfica</string>
     <string name="MessageLifetime">Tempo de autodestruição</string>
     <string name="ShortMessageLifetimeForever">Desativado</string>
-    <string name="EncryptionKeyDescription">Esta imagem é uma visualização da chave criptográfica para esta conversa secreta com <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>Se esta imagem aparecer da mesma forma no telefone de <![CDATA[<b>]]>%2$s\'s<![CDATA[</b>]]>, sua conversa é 200%% segura.<![CDATA[<br><br>]]>Saiba mais em telegram.org</string>
+    <string name="EncryptionKeyDescription">Esta imagem é uma visualização da chave criptográfica para este chat secreto com <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>Se esta imagem aparecer da mesma forma no telefone de <![CDATA[<b>]]>%2$s\'s<![CDATA[</b>]]>, sua conversa é 200%% segura.<![CDATA[<br><br>]]>Saiba mais em telegram.org</string>
     <string name="NumberUnknown">Desconhecido</string>
-    <string name="Info">INFO</string>
+    <string name="Info">Info</string>
     <string name="Phone">Telefone</string>
     <!--usernames-->
     <string name="Username">Nome de Usuário</string>
@@ -224,32 +211,30 @@
     <string name="Unblock">Desbloquear</string>
     <string name="UnblockText">Toque e segure no usuário para desbloquear</string>
     <string name="NoBlocked">Nenhum usuário bloqueado</string>
-    <string name="MessageNotifications">NOTIFICAÇÕES DE MENSAGENS</string>
+    <string name="MessageNotifications">Notificações de mensagens</string>
     <string name="Alert">Alerta</string>
     <string name="MessagePreview">Visualização de Mensagem</string>
-    <string name="GroupNotifications">NOTIFICAÇÕES DO GRUPO</string>
+    <string name="GroupNotifications">Notificações de grupo</string>
     <string name="Sound">Som</string>
-    <string name="InAppNotifications">NOTIFICAÇÕES NO APLICATIVO</string>
+    <string name="InAppNotifications">Notificações no aplicativo</string>
     <string name="InAppSounds">Sons no Aplicativo</string>
     <string name="InAppVibrate">Vibração no Aplicativo</string>
     <string name="Vibrate">Vibrar</string>
     <string name="InAppPreview">Visualização no Aplicativo</string>
-    <string name="Reset">LIMPAR</string>
+    <string name="Reset">Limpar</string>
     <string name="ResetAllNotifications">Limpar todas as notificações</string>
     <string name="UndoAllCustom">Desfazer todas as configurações de notificação para todos os seus contatos e grupos</string>
     <string name="NotificationsAndSounds">Notificações e Sons</string>
     <string name="BlockedUsers">Usuários bloqueados</string>
-    <string name="SaveIncomingPhotos">Salvar fotos recebidas</string>
     <string name="LogOut">Sair</string>
-    <string name="YourFirstNameAndLastName">SEU NOME E SOBRENOME</string>
     <string name="NoSound">Sem som</string>
     <string name="Default">Padrão</string>
-    <string name="Support">SUPORTE</string>
+    <string name="Support">Suporte</string>
     <string name="ChatBackground">Papel de parede</string>
-    <string name="MessagesSettings">MENSAGENS</string>
+    <string name="MessagesSettings">Mensagens</string>
     <string name="SendByEnter">Enviar usando \'Enter\'</string>
     <string name="TerminateAllSessions">Terminar todas as outras sessões</string>
-    <string name="Events">EVENTOS</string>
+    <string name="Events">Eventos</string>
     <string name="ContactJoined">Contato entrou para o Telegram</string>
     <string name="Pebble">PEBBLE</string>
     <string name="Language">Idioma</string>
@@ -265,7 +250,6 @@
     <string name="NotificationsServiceDisableInfo">Se o serviço de notificação do  Google Play for suficiente para você, você pode desativar o \"Serviço de Notificações\". Porém, recomendamos deixá-lo ativo para manter o aplicativo executando em segundo plano e receber notificações instantaneamente.</string>
     <string name="SortBy">Ordenar Por</string>
     <string name="ImportContacts">Importar Contatos</string>
-    <string name="WiFiOnly">Apenas por WiFi</string>
     <string name="SortFirstName">Primeiro nome</string>
     <string name="SortLastName">Sobrenome</string>
     <string name="LedColor">Cor do LED</string>
@@ -279,18 +263,16 @@
     <string name="Long">Longa</string>
     <string name="SystemDefault">Padrão do sistema</string>
     <string name="SettingsDefault">Configurações padrão</string>
-    <string name="AutomaticMediaDownload">DOWNLOAD AUTOMÁTICO DE MÍDIA</string>
+    <string name="AutomaticMediaDownload">Download automático de mídia</string>
     <string name="WhenUsingMobileData">Ao usar dados móveis</string>
     <string name="WhenConnectedOnWiFi">Quando conectado em Wi-Fi</string>
     <string name="WhenRoaming">Quando em roaming</string>
     <string name="NoMediaAutoDownload">Sem mídia</string>
     <string name="SaveToGallerySettings">Salvar na galeria</string>
-    <string name="EditName">Edit Name</string>
+    <string name="EditName">Editar nome</string>
     <!--media view-->
     <string name="NoMedia">Ainda não há mídia compartilhada</string>
-    <string name="CancelDownload">Cancelar Download</string>
     <!--map view-->
-    <string name="MyLocation">Minha localização</string>
     <string name="Map">Mapa</string>
     <string name="Satellite">Satélite</string>
     <string name="Hybrid">Híbrido</string>
@@ -305,6 +287,39 @@
     <string name="Gallery">Galeria</string>
     <string name="AllPhotos">Todas as Fotos</string>
     <string name="NoPhotos">Ainda não há fotos</string>
+    <string name="PleaseDownload">Baixar o vídeo primeiro</string>
+    <!--privacy settings-->
+    <string name="PrivacySettings">Privacidade e Segurança</string>
+    <string name="PrivacyTitle">Privacidade</string>
+    <string name="PrivacyLastSeen">Último Acesso</string>
+    <string name="LastSeenEverybody">Todos</string>
+    <string name="LastSeenContacts">Meus Contatos</string>
+    <string name="LastSeenNobody">Nenhum</string>
+    <string name="LastSeenEverybodyMinus">Todos (-%1$d)</string>
+    <string name="LastSeenContactsPlus">Meus Contatos (+%1$d)</string>
+    <string name="LastSeenContactsMinus">Meus Contatos (-%1$d)</string>
+    <string name="LastSeenContactsMinusPlus">Meus Contatos (-%1$d, +%2$d)</string>
+    <string name="LastSeenNobodyPlus">Nenhum (+%1$d)</string>
+    <string name="SecurityTitle">Segurança</string>
+    <string name="DeleteAccountTitle">Auto-destruição da conta</string>
+    <string name="DeleteAccountIfAwayFor">Se você estiver inativo por</string>
+    <string name="DeleteAccountHelp">Se você não acessar sua conta ao menos uma vez neste período, sua conta será excluída com seus grupos, mensagens e contatos.</string>
+    <string name="DeleteAccountNowConfirmation">Excluir sua conta?</string>
+    <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="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>
+    <string name="AlwaysShareWithTitle">Sempre Mostrar</string>
+    <string name="AlwaysShareWithPlaceholder">Sempre mostrar para usuários...</string>
+    <string name="NeverShareWithTitle">Nunca Mostrar</string>
+    <string name="NeverShareWithPlaceholder">Nunca mostrar para usuários...</string>
+    <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>
     <!--edit video view-->
     <string name="EditVideo">Editar Vídeo</string>
     <string name="OriginalVideo">Vídeo Original</string>
@@ -328,7 +343,6 @@
     <string name="FromCamera">Câmera</string>
     <string name="FromGalley">Galeria</string>
     <string name="DeletePhoto">Apagar foto</string>
-    <string name="OpenPhoto"> Abrir foto</string>
     <string name="Set">Aplicar</string>
     <string name="OK">OK</string>
     <!--messages-->
@@ -371,12 +385,10 @@
     <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="InviteUser">Este usuário ainda não possui Telegram, deseja enviar um convite?</string>
     <string name="AreYouSure">Você tem certeza?</string>
-    <string name="AddContactQ">Adicionar contato?</string>
     <string name="AddToTheGroup">Adicionar %1$s para o grupo?\n\nNúmero de últimas mensagens para encaminhar:</string>
     <string name="ForwardMessagesTo">Encaminhar mensagem para %1$s?</string>
-    <string name="DeleteChatQuestion">Apagar esta conversa?</string>
     <string name="SendMessagesTo">Enviar mensagens para %1$s?</string>
-    <string name="AreYouSureLogout">Você tem certeza que deseja sair?</string>
+    <string name="AreYouSureLogout">Você tem certeza que desejar sair?\n\nSaiba que você pode usar o Telegram em vários dispositivos de uma vez.\n\nLembre-se, sair apaga todos os seus Chats Secretos.</string>
     <string name="AreYouSureSessions">Você tem certeza que deseja terminar todas as outras sessões?</string>
     <string name="AreYouSureDeleteAndExit">Você tem certeza que deseja deletar e sair do grupo?</string>
     <string name="AreYouSureDeleteThisChat">Você tem certeza que deseja deletar esta conversa?</string>
@@ -384,11 +396,12 @@
     <string name="AreYouSureBlockContact">Você tem certeza que deseja bloquear este contato?</string>
     <string name="AreYouSureUnblockContact">Você tem certeza que deseja desbloquear este contato?</string>
     <string name="AreYouSureDeleteContact">Você tem certeza que deseja deletar este contato?</string>
-    <string name="AreYouSureSecretChat">Você tem certeza que deseja começar uma conversa secreta?</string>
-    <string name="ForwardFromMyName">encaminhar pelo meu nome</string>
+    <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="SendMessagesToGroup">Enviar mensagens para %1$s?</string>
     <string name="ForwardMessagesToGroup">Encaminhar mensagem para %1$s?</string>
-    <string name="FeatureUnavailable">Sorry, this feature is currently not available in your country.</string>
+    <string name="FeatureUnavailable">Desculpe, esta funcionalidade não está disponível para seu país.</string>
     <!--Intro view-->
     <string name="Page1Title">Telegram</string>
     <string name="Page2Title">Rápido</string>
@@ -397,13 +410,13 @@
     <string name="Page5Title">Poderoso</string>
     <string name="Page6Title">Baseado na nuvem</string>
     <string name="Page7Title">Privado</string>
-    <string name="Page1Message">O mais <![CDATA[<b>rápido</b>]]> aplicativo de mensagem do<![CDATA[<br/>]]>mundo. É <![CDATA[<b>gratuito</b>]]> e <![CDATA[<b>seguro</b>]]>.</string>
-    <string name="Page2Message"><![CDATA[<b>Telegram</b>]]> envia mensagens mais rápido que<![CDATA[<br/>]]>qualquer outro aplicativo.</string>
-    <string name="Page3Message"><![CDATA[<b>Telegram</b>]]> é grátis para sempre. <![CDATA[<br/>]]>Sem propagandas. Sem taxas.</string>
-    <string name="Page4Message"><![CDATA[<b>Telegram</b>]]> mantém suas mensagens seguras<![CDATA[<br/>]]>contra ataques de hackers.</string>
-    <string name="Page5Message"><![CDATA[<b>Telegram</b>]]> não possui limites no tamanho<![CDATA[<br/>]]>de seus arquivos e conversas.</string>
-    <string name="Page6Message"><![CDATA[<b>Telegram</b>]]> permite você acessar suas<![CDATA[<br/>]]> mensagens de múltiplos dispositivos.</string>
-    <string name="Page7Message"><![CDATA[<b>Telegram</b>]]> possui mensagens fortemente<![CDATA[<br/>]]>encriptadas e podem se auto-destruir.</string>
+    <string name="Page1Message">O mais <![CDATA[<b>rápido</b>]]> aplicativo de mensagem do mundo. <![CDATA[<br/>]]>É <![CDATA[<b>gratuito</b>]]> e <![CDATA[<b>seguro</b>]]>.</string>
+    <string name="Page2Message">O <![CDATA[<b>Telegram</b>]]> envia mensagens mais rápido<![CDATA[<br/>]]>que qualquer outro aplicativo.</string>
+    <string name="Page3Message">O <![CDATA[<b>Telegram</b>]]> é grátis para sempre. <![CDATA[<br/>]]>Sem propagandas. Sem taxas.</string>
+    <string name="Page4Message">O <![CDATA[<b>Telegram</b>]]> mantém suas mensagens<![CDATA[<br/>]]>seguras de ataques de hackers.</string>
+    <string name="Page5Message">O <![CDATA[<b>Telegram</b>]]> não possui limites no tamanho<![CDATA[<br/>]]>de seus arquivos e conversas.</string>
+    <string name="Page6Message">O <![CDATA[<b>Telegram</b>]]> permite você acessar suas<![CDATA[<br/>]]> mensagens de múltiplos dispositivos.</string>
+    <string name="Page7Message">O <![CDATA[<b>Telegram</b>]]> possui mensagens fortemente<![CDATA[<br/>]]>encriptadas e podem se auto-destruir.</string>
     <string name="StartMessaging">Comece a conversar</string>
     <!--plural-->
     <string name="Online_zero">%1$d online</string>
@@ -472,12 +485,30 @@
     <string name="Weeks_few">%1$d semanas</string>
     <string name="Weeks_many">%1$d semanas</string>
     <string name="Weeks_other">%1$d semanas</string>
+    <string name="Months_zero">%1$d meses</string>
+    <string name="Months_one">%1$d mês</string>
+    <string name="Months_two">%1$d meses</string>
+    <string name="Months_few">%1$d meses</string>
+    <string name="Months_many">%1$d meses</string>
+    <string name="Months_other">%1$d meses</string>
+    <string name="Years_zero">%1$d anos</string>
+    <string name="Years_one">%1$d ano</string>
+    <string name="Years_two">%1$d anos</string>
+    <string name="Years_few">%1$d anos</string>
+    <string name="Years_many">%1$d anos</string>
+    <string name="Years_other">%1$d anos</string>
+    <string name="Users_zero">%1$d usuários</string>
+    <string name="Users_one">%1$d usuário</string>
+    <string name="Users_two">%1$d usuários</string>
+    <string name="Users_few">%1$d usuários</string>
+    <string name="Users_many">%1$d usuários</string>
+    <string name="Users_other">%1$d usuários</string>
     <!--date formatters-->
     <string name="formatterMonth">dd MMM</string>
     <string name="formatterYear">dd.MM.yy</string>
     <string name="formatterYearMax">dd.MM.yyyy</string>
     <string name="chatDate">d MMMM</string>
-    <string name="chatFullDate">MMMM d, yyyy</string>
+    <string name="chatFullDate">d MMMM, yyyy</string>
     <string name="formatterWeek">EEE</string>
     <string name="formatterDay24H">HH:mm</string>
     <string name="formatterDay12H">h:mm a</string>

TMessagesProj/src/main/res/values-pt-rPT/strings.xml

@@ -9,7 +9,7 @@
     <string name="LanguageCode">pt_PT</string>
     <!--signin view-->
     <string name="YourPhone">Seu número</string>
-    <string name="StartText">Por favor confirme o código do seu país\ne digite o número do seu telefone.</string>
+    <string name="StartText">Confirme o código de seu país e preencha seu número de telefone.</string>
     <string name="ChooseCountry">Escolha um país</string>
     <string name="WrongCountry">Código do país incorreto</string>
     <!--code enter view-->
@@ -28,35 +28,31 @@
     <string name="LastName">Sobrenome (opcional)</string>
     <string name="CancelRegistration">Cancelar registro</string>
     <!--chats view-->
-    <string name="Chats">Conversas</string>
-    <string name="Search">Busca</string>
-    <string name="NewMessages">Novas mensagens</string>
     <string name="Settings">Configurações</string>
     <string name="Contacts">Contatos</string>
     <string name="NewGroup">Novo Grupo</string>
     <string name="Yesterday">ontem</string>
     <string name="NoResult">Nenhum resultado</string>
-    <string name="NoChats">Ainda não há conversas...</string>
+    <string name="NoChats">Ainda não há chats...</string>
     <string name="NoChatsHelp">Comece a conversar pressionando o\nbotão \'Nova Mensagem\' no canto superior direito\nou vá para a seção \'Contatos\'.</string>
     <string name="WaitingForNetwork">Aguardando rede...</string>
     <string name="Connecting">Conectando...</string>
     <string name="Updating">Atualizando...</string>
-    <string name="NewSecretChat">Nova Conversa Secreta</string>
+    <string name="NewSecretChat">Novo Chat Secreto</string>
     <string name="AwaitingEncryption">Esperando %s se conectar...</string>
-    <string name="EncryptionRejected">Conversa secreta cancelada</string>
+    <string name="EncryptionRejected">Chat secreto cancelado</string>
     <string name="EncryptionProcessing">Trocando chaves de criptografia...</string>
-    <string name="EncryptedChatStartedOutgoing">%s entrou na conversa secreta</string>
-    <string name="EncryptedChatStartedIncoming">Você entrou na conversa secreta</string>
+    <string name="EncryptedChatStartedOutgoing">%s entrou no chat secreto</string>
+    <string name="EncryptedChatStartedIncoming">Você entrou no chat secreto</string>
     <string name="ClearHistory">Limpar histórico</string>
     <string name="DeleteChat">Apagar e sair</string>
-    <string name="HiddenName">Nome oculto</string>
-    <string name="SelectChat">Selecione uma Conversa</string>
+    <string name="DeleteChatUser">Excluir conversa</string>
+    <string name="HiddenName">Excluir Conta</string>
+    <string name="SelectChat">Selecione um Chat</string>
     <string name="PhotoTip">Toque e segure para ver</string>
-    <string name="CompatibilityChat">%1$s está usando uma versão mais antiga do Telegram, por isso fotos secretas serão mostradas em modo de compatibilidade.\n\nAssim que %2$s atualize o Telegram, fotos com timers de 1 minuto ou menos passarão a funcionar no modo ‘Toque e segure para ver’, e você será notificado caso a outra pessoa salve a tela.</string>
-    <string name="SearchConversations">Conversations</string>
-    <string name="SearchMessages">Messages</string>
+    <string name="CompatibilityChat">%1$s está usando uma versão mais antiga do Telegram, por isso fotos secretas serão mostradas em modo de compatibilidade.\n\nAssim que %2$s atualizar o Telegram, fotos com timers de 1 minuto ou menos passarão a funcionar no modo ‘Toque e segure para ver’, e você será notificado caso a outra pessoa salve a tela.</string>
+    <string name="SearchMessages">MENSAGENS</string>
     <!--broadcasts-->
-    <string name="BroadcastList">Lista de Broadcast</string>
     <string name="NewBroadcastList">Nova Lista de Broadcast</string>
     <string name="EnterListName">Digite o nome da lista</string>
     <string name="YouCreatedBroadcastList">Você criou uma lista de broadcast</string>
@@ -75,10 +71,10 @@
     <string name="ExternalStorage">Armazenamento Externo</string>
     <string name="SystemRoot">Administrador do Sistema</string>
     <string name="SdCard">Cartão SD</string>
+    <string name="Folder">Pasta</string>
     <!--chat view-->
     <string name="Invisible">invisível</string>
     <string name="Typing">escrevendo...</string>
-    <string name="Attach">Anexar</string>
     <string name="IsTyping">está escrevendo...</string>
     <string name="AreTyping">estão escrevendo...</string>
     <string name="GotAQuestion">Tem alguma dúvida\nsobre o Telegram?</string>
@@ -88,21 +84,16 @@
     <string name="ChatVideo">Vídeo</string>
     <string name="ChatDocument">Documento</string>
     <string name="NoMessages">Ainda não há mensagens aqui...</string>
-    <string name="ViewPhoto">Ver Foto</string>
-    <string name="ViewLocation">Ver Localização</string>
-    <string name="ViewVideo">Tocar Vídeo</string>
     <string name="ForwardedMessage">Mensagem encaminhada</string>
     <string name="From">De</string>
     <string name="NoRecent">Nada recente</string>
     <string name="Message">Mensagem</string>
-    <string name="TypeMessage">Escrever mensagem</string>
-    <string name="DOWNLOAD">Baixar</string>
-    <string name="Selected">%d selecionado</string>
-    <string name="ShareMyContactInfo">COMPARTILHAR MINHAS INFORMAÇÕES DE CONTATO</string>
-    <string name="AddToContacts">ADICIONAR AOS CONTATOS</string>
-    <string name="EncryptedPlaceholderTitleIncoming">%s convidou você para uma conversa secreta.</string>
-    <string name="EncryptedPlaceholderTitleOutgoing">Você convidou %s para uma conversa secreta.</string>
-    <string name="EncryptedDescriptionTitle">Diferenças dos Chats Secretos:</string>
+    <string name="TypeMessage">Mensagem</string>
+    <string name="ShareMyContactInfo">Compartilhar meu contato</string>
+    <string name="AddToContacts">Adicionar aos contatos</string>
+    <string name="EncryptedPlaceholderTitleIncoming">%s convidou você para um chat secreto</string>
+    <string name="EncryptedPlaceholderTitleOutgoing">Você convidou %s para um chat secreto.</string>
+    <string name="EncryptedDescriptionTitle">Chats Secretos:</string>
     <string name="EncryptedDescription1">Criptografia de ponta-a-ponta</string>
     <string name="EncryptedDescription2">Sem rastros nos servidores</string>
     <string name="EncryptedDescription3">Timer de autodestruição</string>
@@ -110,14 +101,12 @@
     <string name="YouWereKicked">Você foi removido deste grupo</string>
     <string name="YouLeft">Você saiu deste grupo</string>
     <string name="DeleteThisGroup">Apagar este grupo</string>
-    <string name="DeleteThisChat">Apagar esta conversa</string>
+    <string name="DeleteThisChat">Apagar este chat</string>
     <string name="SlideToCancel">DESLIZE PARA CANCELAR</string>
     <string name="SaveToDownloads">Salvar em downloads</string>
     <string name="ApplyLocalizationFile">Aplicar arquivo de localização</string>
     <string name="UnsupportedAttachment">Anexo não suportado</string>
     <!--notification-->
-    <string name="EncryptedChatRequested">Conversa secreta solicitada</string>
-    <string name="EncryptedChatAccepted">Conversa secreta iniciada</string>
     <string name="MessageLifetimeChanged">%1$s estabeleceu o tempo de autodestruição para %2$s </string>
     <string name="MessageLifetimeChangedOutgoing">Você estabeleceu o tempo de autodestruição para %1$s</string>
     <string name="MessageLifetimeRemoved">%1$s desativou o temporizador de autodestruição</string>
@@ -160,22 +149,22 @@
     <string name="TodayAt">hoje às</string>
     <string name="YesterdayAt">ontem às</string>
     <string name="Online">online</string>
-    <string name="Offline">offline</string>
     <string name="LastSeen">visto</string>
     <string name="LastSeenDate">visto</string>
     <string name="InviteFriends">Convidar Amigos</string>
     <string name="GlobalSearch">BUSCA GLOBAL</string>
+    <string name="Lately">visto recentemente</string>
+    <string name="WithinAWeek">visto na última semana</string>
+    <string name="WithinAMonth">visto no último mês</string>
+    <string name="ALongTimeAgo">visto há muito tempo atrás</string>
     <!--group create view-->
     <string name="SendMessageTo">Enviar mensagem para...</string>
     <string name="EnterGroupNamePlaceholder">Digite o nome do grupo</string>
     <string name="GroupName">Nome do grupo</string>
-    <string name="AllContacts">TODOS OS CONTATOS</string>
     <string name="MembersCount">%1$d/%2$d membros</string>
     <!--group info view-->
-    <string name="EnterGroupNameTitle">DIGITE O NOME DO GRUPO</string>
     <string name="SharedMedia">Mídia compartilhada</string>
-    <string name="GroupInfo">Informações do Grupo</string>
-    <string name="SETTINGS">CONFIGURAÇÕES</string>
+    <string name="SETTINGS">Configurações</string>
     <string name="AddMember">Adicionar membro</string>
     <string name="DeleteAndExit">Apagar e sair do grupo</string>
     <string name="Notifications">Notificações</string>
@@ -183,25 +172,23 @@
     <!--contact info view-->
     <string name="ShareContact">Compartilhar</string>
     <string name="AddContact">Adicionar</string>
+    <string name="AddContactTitle">Adicionar contato</string>
     <string name="BlockContact">Bloquear</string>
     <string name="EditContact">Editar</string>
     <string name="DeleteContact">Apagar</string>
-    <string name="PhoneHome">CASA</string>
-    <string name="PhoneMobile">CELULAR</string>
-    <string name="PhoneWork">TRABALHO</string>
-    <string name="PhoneOther">OUTRO</string>
-    <string name="PhoneMain">PRINCIPAL</string>
-    <string name="ContactInfo">Informações do Contato</string>
-    <string name="PHONE">TELEFONE</string>
-    <string name="StartEncryptedChat">Iniciar Conversa Secreta</string>
+    <string name="PhoneHome">Início</string>
+    <string name="PhoneMobile">Celular</string>
+    <string name="PhoneWork">Trabalho</string>
+    <string name="PhoneOther">Outro</string>
+    <string name="PhoneMain">Principal</string>
+    <string name="StartEncryptedChat">Iniciar Chat Secreto</string>
     <string name="CreateEncryptedChatError">Ocorreu um erro.</string>
-    <string name="SecretTitle">Conversa Secreta</string>
     <string name="EncryptionKey">Chave criptográfica</string>
     <string name="MessageLifetime">Tempo de autodestruição</string>
     <string name="ShortMessageLifetimeForever">Desativado</string>
-    <string name="EncryptionKeyDescription">Esta imagem é uma visualização da chave criptográfica para esta conversa secreta com <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>Se esta imagem aparecer da mesma forma no telefone de <![CDATA[<b>]]>%2$s\'s<![CDATA[</b>]]>, sua conversa é 200%% segura.<![CDATA[<br><br>]]>Saiba mais em telegram.org</string>
+    <string name="EncryptionKeyDescription">Esta imagem é uma visualização da chave criptográfica para este chat secreto com <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>Se esta imagem aparecer da mesma forma no telefone de <![CDATA[<b>]]>%2$s\'s<![CDATA[</b>]]>, sua conversa é 200%% segura.<![CDATA[<br><br>]]>Saiba mais em telegram.org</string>
     <string name="NumberUnknown">Desconhecido</string>
-    <string name="Info">INFO</string>
+    <string name="Info">Info</string>
     <string name="Phone">Telefone</string>
     <!--usernames-->
     <string name="Username">Nome de Usuário</string>
@@ -224,32 +211,30 @@
     <string name="Unblock">Desbloquear</string>
     <string name="UnblockText">Toque e segure no usuário para desbloquear</string>
     <string name="NoBlocked">Nenhum usuário bloqueado</string>
-    <string name="MessageNotifications">NOTIFICAÇÕES DE MENSAGENS</string>
+    <string name="MessageNotifications">Notificações de mensagens</string>
     <string name="Alert">Alerta</string>
     <string name="MessagePreview">Visualização de Mensagem</string>
-    <string name="GroupNotifications">NOTIFICAÇÕES DO GRUPO</string>
+    <string name="GroupNotifications">Notificações de grupo</string>
     <string name="Sound">Som</string>
-    <string name="InAppNotifications">NOTIFICAÇÕES NO APLICATIVO</string>
+    <string name="InAppNotifications">Notificações no aplicativo</string>
     <string name="InAppSounds">Sons no Aplicativo</string>
     <string name="InAppVibrate">Vibração no Aplicativo</string>
     <string name="Vibrate">Vibrar</string>
     <string name="InAppPreview">Visualização no Aplicativo</string>
-    <string name="Reset">LIMPAR</string>
+    <string name="Reset">Limpar</string>
     <string name="ResetAllNotifications">Limpar todas as notificações</string>
     <string name="UndoAllCustom">Desfazer todas as configurações de notificação para todos os seus contatos e grupos</string>
     <string name="NotificationsAndSounds">Notificações e Sons</string>
     <string name="BlockedUsers">Usuários bloqueados</string>
-    <string name="SaveIncomingPhotos">Salvar fotos recebidas</string>
     <string name="LogOut">Sair</string>
-    <string name="YourFirstNameAndLastName">SEU NOME E SOBRENOME</string>
     <string name="NoSound">Sem som</string>
     <string name="Default">Padrão</string>
-    <string name="Support">SUPORTE</string>
+    <string name="Support">Suporte</string>
     <string name="ChatBackground">Papel de parede</string>
-    <string name="MessagesSettings">MENSAGENS</string>
+    <string name="MessagesSettings">Mensagens</string>
     <string name="SendByEnter">Enviar usando \'Enter\'</string>
     <string name="TerminateAllSessions">Terminar todas as outras sessões</string>
-    <string name="Events">EVENTOS</string>
+    <string name="Events">Eventos</string>
     <string name="ContactJoined">Contato entrou para o Telegram</string>
     <string name="Pebble">PEBBLE</string>
     <string name="Language">Idioma</string>
@@ -265,7 +250,6 @@
     <string name="NotificationsServiceDisableInfo">Se o serviço de notificação do  Google Play for suficiente para você, você pode desativar o \"Serviço de Notificações\". Porém, recomendamos deixá-lo ativo para manter o aplicativo executando em segundo plano e receber notificações instantaneamente.</string>
     <string name="SortBy">Ordenar Por</string>
     <string name="ImportContacts">Importar Contatos</string>
-    <string name="WiFiOnly">Apenas por WiFi</string>
     <string name="SortFirstName">Primeiro nome</string>
     <string name="SortLastName">Sobrenome</string>
     <string name="LedColor">Cor do LED</string>
@@ -279,18 +263,16 @@
     <string name="Long">Longa</string>
     <string name="SystemDefault">Padrão do sistema</string>
     <string name="SettingsDefault">Configurações padrão</string>
-    <string name="AutomaticMediaDownload">DOWNLOAD AUTOMÁTICO DE MÍDIA</string>
+    <string name="AutomaticMediaDownload">Download automático de mídia</string>
     <string name="WhenUsingMobileData">Ao usar dados móveis</string>
     <string name="WhenConnectedOnWiFi">Quando conectado em Wi-Fi</string>
     <string name="WhenRoaming">Quando em roaming</string>
     <string name="NoMediaAutoDownload">Sem mídia</string>
     <string name="SaveToGallerySettings">Salvar na galeria</string>
-    <string name="EditName">Edit Name</string>
+    <string name="EditName">Editar nome</string>
     <!--media view-->
     <string name="NoMedia">Ainda não há mídia compartilhada</string>
-    <string name="CancelDownload">Cancelar Download</string>
     <!--map view-->
-    <string name="MyLocation">Minha localização</string>
     <string name="Map">Mapa</string>
     <string name="Satellite">Satélite</string>
     <string name="Hybrid">Híbrido</string>
@@ -305,6 +287,39 @@
     <string name="Gallery">Galeria</string>
     <string name="AllPhotos">Todas as Fotos</string>
     <string name="NoPhotos">Ainda não há fotos</string>
+    <string name="PleaseDownload">Baixar o vídeo primeiro</string>
+    <!--privacy settings-->
+    <string name="PrivacySettings">Privacidade e Segurança</string>
+    <string name="PrivacyTitle">Privacidade</string>
+    <string name="PrivacyLastSeen">Último Acesso</string>
+    <string name="LastSeenEverybody">Todos</string>
+    <string name="LastSeenContacts">Meus Contatos</string>
+    <string name="LastSeenNobody">Nenhum</string>
+    <string name="LastSeenEverybodyMinus">Todos (-%1$d)</string>
+    <string name="LastSeenContactsPlus">Meus Contatos (+%1$d)</string>
+    <string name="LastSeenContactsMinus">Meus Contatos (-%1$d)</string>
+    <string name="LastSeenContactsMinusPlus">Meus Contatos (-%1$d, +%2$d)</string>
+    <string name="LastSeenNobodyPlus">Nenhum (+%1$d)</string>
+    <string name="SecurityTitle">Segurança</string>
+    <string name="DeleteAccountTitle">Auto-destruição da conta</string>
+    <string name="DeleteAccountIfAwayFor">Se você estiver inativo por</string>
+    <string name="DeleteAccountHelp">Se você não acessar sua conta ao menos uma vez neste período, sua conta será excluída com seus grupos, mensagens e contatos.</string>
+    <string name="DeleteAccountNowConfirmation">Excluir sua conta?</string>
+    <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="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>
+    <string name="AlwaysShareWithTitle">Sempre Mostrar</string>
+    <string name="AlwaysShareWithPlaceholder">Sempre mostrar para usuários...</string>
+    <string name="NeverShareWithTitle">Nunca Mostrar</string>
+    <string name="NeverShareWithPlaceholder">Nunca mostrar para usuários...</string>
+    <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>
     <!--edit video view-->
     <string name="EditVideo">Editar Vídeo</string>
     <string name="OriginalVideo">Vídeo Original</string>
@@ -328,7 +343,6 @@
     <string name="FromCamera">Câmera</string>
     <string name="FromGalley">Galeria</string>
     <string name="DeletePhoto">Apagar foto</string>
-    <string name="OpenPhoto"> Abrir foto</string>
     <string name="Set">Aplicar</string>
     <string name="OK">OK</string>
     <!--messages-->
@@ -371,12 +385,10 @@
     <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="InviteUser">Este usuário ainda não possui Telegram, deseja enviar um convite?</string>
     <string name="AreYouSure">Você tem certeza?</string>
-    <string name="AddContactQ">Adicionar contato?</string>
     <string name="AddToTheGroup">Adicionar %1$s para o grupo?\n\nNúmero de últimas mensagens para encaminhar:</string>
     <string name="ForwardMessagesTo">Encaminhar mensagem para %1$s?</string>
-    <string name="DeleteChatQuestion">Apagar esta conversa?</string>
     <string name="SendMessagesTo">Enviar mensagens para %1$s?</string>
-    <string name="AreYouSureLogout">Você tem certeza que deseja sair?</string>
+    <string name="AreYouSureLogout">Você tem certeza que desejar sair?\n\nSaiba que você pode usar o Telegram em vários dispositivos de uma vez.\n\nLembre-se, sair apaga todos os seus Chats Secretos.</string>
     <string name="AreYouSureSessions">Você tem certeza que deseja terminar todas as outras sessões?</string>
     <string name="AreYouSureDeleteAndExit">Você tem certeza que deseja deletar e sair do grupo?</string>
     <string name="AreYouSureDeleteThisChat">Você tem certeza que deseja deletar esta conversa?</string>
@@ -384,11 +396,12 @@
     <string name="AreYouSureBlockContact">Você tem certeza que deseja bloquear este contato?</string>
     <string name="AreYouSureUnblockContact">Você tem certeza que deseja desbloquear este contato?</string>
     <string name="AreYouSureDeleteContact">Você tem certeza que deseja deletar este contato?</string>
-    <string name="AreYouSureSecretChat">Você tem certeza que deseja começar uma conversa secreta?</string>
-    <string name="ForwardFromMyName">encaminhar pelo meu nome</string>
+    <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="SendMessagesToGroup">Enviar mensagens para %1$s?</string>
     <string name="ForwardMessagesToGroup">Encaminhar mensagem para %1$s?</string>
-    <string name="FeatureUnavailable">Sorry, this feature is currently not available in your country.</string>
+    <string name="FeatureUnavailable">Desculpe, esta funcionalidade não está disponível para seu país.</string>
     <!--Intro view-->
     <string name="Page1Title">Telegram</string>
     <string name="Page2Title">Rápido</string>
@@ -397,13 +410,13 @@
     <string name="Page5Title">Poderoso</string>
     <string name="Page6Title">Baseado na nuvem</string>
     <string name="Page7Title">Privado</string>
-    <string name="Page1Message">O mais <![CDATA[<b>rápido</b>]]> aplicativo de mensagem do<![CDATA[<br/>]]>mundo. É <![CDATA[<b>gratuito</b>]]> e <![CDATA[<b>seguro</b>]]>.</string>
-    <string name="Page2Message"><![CDATA[<b>Telegram</b>]]> envia mensagens mais rápido que<![CDATA[<br/>]]>qualquer outro aplicativo.</string>
-    <string name="Page3Message"><![CDATA[<b>Telegram</b>]]> é grátis para sempre. <![CDATA[<br/>]]>Sem propagandas. Sem taxas.</string>
-    <string name="Page4Message"><![CDATA[<b>Telegram</b>]]> mantém suas mensagens seguras<![CDATA[<br/>]]>contra ataques de hackers.</string>
-    <string name="Page5Message"><![CDATA[<b>Telegram</b>]]> não possui limites no tamanho<![CDATA[<br/>]]>de seus arquivos e conversas.</string>
-    <string name="Page6Message"><![CDATA[<b>Telegram</b>]]> permite você acessar suas<![CDATA[<br/>]]> mensagens de múltiplos dispositivos.</string>
-    <string name="Page7Message"><![CDATA[<b>Telegram</b>]]> possui mensagens fortemente<![CDATA[<br/>]]>encriptadas e podem se auto-destruir.</string>
+    <string name="Page1Message">O mais <![CDATA[<b>rápido</b>]]> aplicativo de mensagem do mundo. <![CDATA[<br/>]]>É <![CDATA[<b>gratuito</b>]]> e <![CDATA[<b>seguro</b>]]>.</string>
+    <string name="Page2Message">O <![CDATA[<b>Telegram</b>]]> envia mensagens mais rápido<![CDATA[<br/>]]>que qualquer outro aplicativo.</string>
+    <string name="Page3Message">O <![CDATA[<b>Telegram</b>]]> é grátis para sempre. <![CDATA[<br/>]]>Sem propagandas. Sem taxas.</string>
+    <string name="Page4Message">O <![CDATA[<b>Telegram</b>]]> mantém suas mensagens<![CDATA[<br/>]]>seguras de ataques de hackers.</string>
+    <string name="Page5Message">O <![CDATA[<b>Telegram</b>]]> não possui limites no tamanho<![CDATA[<br/>]]>de seus arquivos e conversas.</string>
+    <string name="Page6Message">O <![CDATA[<b>Telegram</b>]]> permite você acessar suas<![CDATA[<br/>]]> mensagens de múltiplos dispositivos.</string>
+    <string name="Page7Message">O <![CDATA[<b>Telegram</b>]]> possui mensagens fortemente<![CDATA[<br/>]]>encriptadas e podem se auto-destruir.</string>
     <string name="StartMessaging">Comece a conversar</string>
     <!--plural-->
     <string name="Online_zero">%1$d online</string>
@@ -472,12 +485,30 @@
     <string name="Weeks_few">%1$d semanas</string>
     <string name="Weeks_many">%1$d semanas</string>
     <string name="Weeks_other">%1$d semanas</string>
+    <string name="Months_zero">%1$d meses</string>
+    <string name="Months_one">%1$d mês</string>
+    <string name="Months_two">%1$d meses</string>
+    <string name="Months_few">%1$d meses</string>
+    <string name="Months_many">%1$d meses</string>
+    <string name="Months_other">%1$d meses</string>
+    <string name="Years_zero">%1$d anos</string>
+    <string name="Years_one">%1$d ano</string>
+    <string name="Years_two">%1$d anos</string>
+    <string name="Years_few">%1$d anos</string>
+    <string name="Years_many">%1$d anos</string>
+    <string name="Years_other">%1$d anos</string>
+    <string name="Users_zero">%1$d usuários</string>
+    <string name="Users_one">%1$d usuário</string>
+    <string name="Users_two">%1$d usuários</string>
+    <string name="Users_few">%1$d usuários</string>
+    <string name="Users_many">%1$d usuários</string>
+    <string name="Users_other">%1$d usuários</string>
     <!--date formatters-->
     <string name="formatterMonth">dd MMM</string>
     <string name="formatterYear">dd.MM.yy</string>
     <string name="formatterYearMax">dd.MM.yyyy</string>
     <string name="chatDate">d MMMM</string>
-    <string name="chatFullDate">MMMM d, yyyy</string>
+    <string name="chatFullDate">d MMMM, yyyy</string>
     <string name="formatterWeek">EEE</string>
     <string name="formatterDay24H">HH:mm</string>
     <string name="formatterDay12H">h:mm a</string>