Merge branch 'dev' of https://bitbucket.org/johnprestonmail/telegram-desktop into dev

.gitignore

@@ -6,7 +6,14 @@
 /Telegram/SourceFiles/art/grid_200x.png
 /Telegram/SourceFiles/art/sprite_125x.png
 /Telegram/SourceFiles/art/sprite_150x.png
+/Telegram/Resources/art/grid.png
+/Telegram/Resources/art/grid_125x.png
+/Telegram/Resources/art/grid_150x.png
+/Telegram/Resources/art/grid_200x.png
+/Telegram/Resources/art/sprite_125x.png
+/Telegram/Resources/art/sprite_150x.png
 /Telegram/*.user
+*.vcxproj.user
 *.suo
 *.sdf
 *.opensdf

.travis.yml

@@ -0,0 +1,47 @@
+sudo: required
+
+language: cpp
+
+env:
+  - BUILD_VERSION=""
+  - BUILD_VERSION="disable_autoupdate"
+  - BUILD_VERSION="disable_register_custom_scheme"
+  - BUILD_VERSION="disable_crash_reports"
+  - BUILD_VERSION="disable_network_proxy"
+
+arch:
+  packages:
+   - bzr
+   - wget
+   - qt5-base
+
+   - git
+   - patch
+   - libunity
+   - libappindicator-gtk2
+
+   - ffmpeg
+   - icu
+   - jasper
+   - libexif
+   - libmng
+   - libwebp
+   - libxkbcommon-x11
+   - libinput
+   - libproxy
+   - mtdev
+   - openal
+   - libva
+   - desktop-file-utils
+   - gtk-update-icon-cache
+
+  script:
+   - libtool --finish /usr/lib
+   - .travis/build.sh
+
+before_install:
+  - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
+  - .travis/check.sh
+
+script:
+  - .travis/arch.sh

.travis/arch.sh

@@ -0,0 +1,297 @@
+#!/bin/bash
+# Copyright (C) 2016  Mikkel Oscar Lyderik Larsen
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Source: https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh
+
+# Script for setting up and running a travis-ci build in an up to date
+# Arch Linux chroot
+
+ARCH_TRAVIS_MIRROR=${ARCH_TRAVIS_MIRROR:-"https://lug.mtu.edu/archlinux"}
+ARCH_TRAVIS_ARCH_ISO=${ARCH_TRAVIS_ARCH_ISO:-"$(date +%Y.%m).01"}
+mirror_entry='Server = '$ARCH_TRAVIS_MIRROR'/\$repo/os/\$arch'
+archive="archlinux-bootstrap-$ARCH_TRAVIS_ARCH_ISO-x86_64.tar.gz"
+default_root="root.x86_64"
+ARCH_TRAVIS_CHROOT=${ARCH_TRAVIS_CHROOT:-"$default_root"}
+user="travis"
+user_home="/home/$user"
+user_build_dir="/build"
+user_uid=$UID
+
+if [ -n "$CC" ]; then
+  # store travis CC
+  TRAVIS_CC=$CC
+  # reset to gcc for building arch packages
+  CC=gcc
+fi
+
+
+# default packages
+default_packages=("base-devel" "git")
+
+# pacman.conf repository line
+repo_line=70
+
+# setup working Arch Linux chroot
+setup_chroot() {
+  arch_msg "Setting up Arch chroot"
+
+  if [ ! -f $archive ]; then
+    # get root fs
+    curl --fail -O "$ARCH_TRAVIS_MIRROR/iso/$ARCH_TRAVIS_ARCH_ISO/$archive" 2>&1
+    local ret=$?
+
+    # if it fails, try arch iso form the previous month
+    if [ $ret -gt 0 ]; then
+      ARCH_TRAVIS_ARCH_ISO="$(date +%Y.%m -d "-1 month").01"
+      archive="archlinux-bootstrap-$ARCH_TRAVIS_ARCH_ISO-x86_64.tar.gz"
+      as_normal "curl -O $ARCH_TRAVIS_MIRROR/iso/$ARCH_TRAVIS_ARCH_ISO/$archive"
+    fi
+  fi
+
+  # extract root fs
+  as_root "tar xf $archive"
+
+  # remove archive if ARCH_TRAVIS_CLEAN_CHROOT is set
+  if [ -n "$ARCH_TRAVIS_CLEAN_CHROOT" ]; then
+    as_root "rm $archive"
+  fi
+
+  if [ "$ARCH_TRAVIS_CHROOT" != "$default_root" ]; then
+    as_root "mv $default_root $ARCH_TRAVIS_CHROOT"
+  fi
+
+  # don't care for signed packages
+  as_root "sed -i 's|SigLevel    = Required DatabaseOptional|SigLevel = Never|' $ARCH_TRAVIS_CHROOT/etc/pacman.conf"
+
+  # enable multilib
+  as_root "sed -i 's|#\[multilib\]|\[multilib\]\nInclude = /etc/pacman.d/mirrorlist|' $ARCH_TRAVIS_CHROOT/etc/pacman.conf"
+
+  # add mirror
+  as_root "echo $mirror_entry >> $ARCH_TRAVIS_CHROOT/etc/pacman.d/mirrorlist"
+
+  # add nameserver to resolv.conf
+  as_root "echo nameserver 8.8.8.8 >> $ARCH_TRAVIS_CHROOT/etc/resolv.conf"
+
+  sudo mount $ARCH_TRAVIS_CHROOT $ARCH_TRAVIS_CHROOT --bind
+  sudo mount --bind /proc $ARCH_TRAVIS_CHROOT/proc
+  sudo mount --bind /sys $ARCH_TRAVIS_CHROOT/sys
+  sudo mount --bind /dev $ARCH_TRAVIS_CHROOT/dev
+  sudo mount --bind /dev/pts $ARCH_TRAVIS_CHROOT/dev/pts
+  sudo mount --bind /dev/shm $ARCH_TRAVIS_CHROOT/dev/shm
+  sudo mount --bind /run $ARCH_TRAVIS_CHROOT/run
+
+  # update packages
+  chroot_as_root "pacman -Syy"
+  chroot_as_root "pacman -Syu ${default_packages[*]} --noconfirm"
+
+  # use LANG=en_US.UTF-8 as expected in travis environments
+  as_root "sed -i 's|#en_US.UTF-8|en_US.UTF-8|' $ARCH_TRAVIS_CHROOT/etc/locale.gen"
+  chroot_as_root "locale-gen"
+
+  # setup non-root user
+  chroot_as_root "useradd -u $user_uid -m -s /bin/bash $user"
+
+  # disable password for sudo users
+  as_root "echo \"$user ALL=(ALL) NOPASSWD: ALL\" >> $ARCH_TRAVIS_CHROOT/etc/sudoers.d/$user"
+
+  # Add build dir
+  chroot_as_root "mkdir $user_build_dir && chown $user $user_build_dir"
+
+  # bind $TRAVIS_BUILD_DIR to chroot build dir
+  sudo mount --bind $TRAVIS_BUILD_DIR $ARCH_TRAVIS_CHROOT$user_build_dir
+
+  # add custom repos
+  add_repositories
+
+  # setup pacaur for AUR packages
+  setup_pacaur
+}
+
+# add custom repositories to pacman.conf
+add_repositories() {
+  if [ ${#CONFIG_REPOS[@]} -gt 0 ]; then
+    for r in "${CONFIG_REPOS[@]}"; do
+      local splitarr=(${r//=/ })
+      ((repo_line+=1))
+      as_root "sed -i '${repo_line}i[${splitarr[0]}]' $ARCH_TRAVIS_CHROOT/etc/pacman.conf"
+      ((repo_line+=1))
+      as_root "sed -i '${repo_line}iServer = ${splitarr[1]}\n' $ARCH_TRAVIS_CHROOT/etc/pacman.conf"
+      ((repo_line+=1))
+    done
+
+    # update repos
+    chroot_as_root "pacman -Syy"
+  fi
+}
+
+# a wrapper which can be used to eventually add fakeroot support.
+sudo_wrapper() {
+  sudo "$@"
+}
+
+# run command as normal user
+as_normal() {
+  local str="$@"
+  run /bin/bash -c "$str"
+}
+
+# run command as root
+as_root() {
+  local str="$@"
+  run sudo_wrapper /bin/bash -c "$str"
+}
+
+# run command in chroot as root
+chroot_as_root() {
+  local str="$@"
+  run sudo_wrapper chroot $ARCH_TRAVIS_CHROOT /bin/bash -c "$str"
+}
+
+# run command in chroot as normal user
+chroot_as_normal() {
+  local str="$@"
+  run sudo_wrapper chroot --userspec=$user:$user $ARCH_TRAVIS_CHROOT /bin/bash \
+      -c "export HOME=$user_home USER=$user TRAVIS_BUILD_DIR=$user_build_dir && cd $user_build_dir && $str"
+}
+
+# run command
+run() {
+  "$@"
+  local ret=$?
+
+  if [ $ret -gt 0 ]; then
+    takedown_chroot
+    exit $ret
+  fi
+}
+
+# run build script
+run_build_script() {
+  local cmd="$@"
+  echo "$ $cmd"
+  sudo_wrapper chroot --userspec=$user:$user $ARCH_TRAVIS_CHROOT /bin/bash -c "export HOME=$user_home USER=$user TRAVIS_BUILD_DIR=$user_build_dir && cd $user_build_dir && $cmd"
+  local ret=$?
+
+  if [ $ret -gt 0 ]; then
+    takedown_chroot
+    exit $ret
+  fi
+}
+
+# setup pacaur
+setup_pacaur() {
+  local cowerarchive="cower.tar.gz"
+  local aururl="https://aur.archlinux.org/cgit/aur.git/snapshot/"
+  # install cower
+  as_normal "curl -O $aururl/$cowerarchive"
+  as_normal "tar xf $cowerarchive"
+  chroot_as_normal "cd cower && makepkg -is --skippgpcheck --noconfirm"
+  as_root "rm -r cower"
+  as_normal "rm $cowerarchive"
+  # install pacaur
+  chroot_as_normal "cower -dd pacaur"
+  chroot_as_normal "cd pacaur && makepkg -is --noconfirm"
+  chroot_as_normal "rm -rf pacaur"
+}
+
+# install package through pacaur
+_pacaur() {
+  local pacaur="pacaur -S $@ --noconfirm --noedit"
+  chroot_as_normal "$pacaur"
+}
+
+# takedown chroot
+# unmounts anything mounted in the chroot setup
+takedown_chroot() {
+  sudo umount $ARCH_TRAVIS_CHROOT/{run,dev/shm,dev/pts,dev,sys,proc}
+  sudo umount $ARCH_TRAVIS_CHROOT$user_build_dir
+  sudo umount $ARCH_TRAVIS_CHROOT
+
+  if [ -n "$ARCH_TRAVIS_CLEAN_CHROOT" ]; then
+    as_root "rm -rf $ARCH_TRAVIS_CHROOT"
+  fi
+}
+
+# read value from .travis.yml
+travis_yml() {
+  ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' .travis.yml $@
+}
+
+read_config() {
+    old_ifs=$IFS
+    IFS=$'\n'
+    CONFIG_BUILD_SCRIPTS=($(travis_yml arch script))
+    CONFIG_PACKAGES=($(travis_yml arch packages))
+    CONFIG_REPOS=($(travis_yml arch repos))
+    IFS=$old_ifs
+}
+
+# run build scripts defined in .travis.yml
+build_scripts() {
+  if [ ${#CONFIG_BUILD_SCRIPTS[@]} -gt 0 ]; then
+    for script in "${CONFIG_BUILD_SCRIPTS[@]}"; do
+      run_build_script $script
+    done
+  else
+    echo "No build scripts defined"
+    takedown_chroot
+    exit 1
+  fi
+}
+
+# install packages defined in .travis.yml
+install_packages() {
+  for package in "${CONFIG_PACKAGES[@]}"; do
+    _pacaur $package
+  done
+}
+
+# install custom compiler if CC != gcc
+install_c_compiler() {
+  if [ "$TRAVIS_CC" != "gcc" ]; then
+    _pacaur "$TRAVIS_CC"
+  fi
+}
+
+arch_msg() {
+  lightblue='\033[1;34m'
+  reset='\e[0m'
+  echo -e "${lightblue}$@${reset}"
+}
+
+# read .travis.yml
+read_config
+
+echo "travis_fold:start:arch_travis"
+setup_chroot
+
+install_packages
+
+if [ -n "$CC" ]; then
+  install_c_compiler
+
+  # restore CC
+  CC=$TRAVIS_CC
+fi
+echo "travis_fold:end:arch_travis"
+echo ""
+
+arch_msg "Running travis build"
+build_scripts
+
+takedown_chroot
+
+# vim:set ts=2 sw=2 et:

.travis/build.sh

@@ -0,0 +1,160 @@
+#!/bin/bash
+# Installs libs and compiles tdesktop
+
+run() {
+	info_msg "Build version: ${BUILD_VERSION}"
+
+	downloadLibs
+	prepare
+	build
+	check
+}
+
+downloadLibs() {
+	travis_fold_start "download_libs"
+	# Move telegram project to subfolder
+	mkdir tdesktop
+	mv -f Telegram tdesktop
+
+	# Download libraries
+	info_msg "QT-Version: ${_qtver}, SRC-Dir: ${srcdir}"
+
+	echo -e "\nDownload and extract qt"
+	qt_file=qt-everywhere-opensource-src-$_qtver.tar.xz
+	echo -e "QT-File: ${qt_file}"
+
+	wget "http://download.qt.io/official_releases/qt/${_qtver%.*}/$_qtver/single/$qt_file"
+	tar xf $qt_file
+	rm $qt_file
+
+	echo -e "Clone Breakpad"
+	git clone https://chromium.googlesource.com/breakpad/breakpad breakpad
+
+	echo -e "\nClone Linux Syscall Support"
+	git clone https://chromium.googlesource.com/linux-syscall-support breakpad-lss
+
+	echo -e "\nLets view the folder content"
+	ls
+	travis_fold_end "download_libs"
+}
+
+prepare() {
+	travis_fold_start "prepare"
+	start_msg "Preparing the libraries..."
+
+	cd "$srcdir/tdesktop"
+
+	mkdir -p "$srcdir/Libraries"
+
+	local qt_patch_file="$srcdir/tdesktop/Telegram/_qtbase_${_qtver//./_}_patch.diff"
+	if [ "$qt_patch_file" -nt "$srcdir/Libraries/QtStatic" ]; then
+		rm -rf "$srcdir/Libraries/QtStatic"
+		mv "$srcdir/qt-everywhere-opensource-src-$_qtver" "$srcdir/Libraries/QtStatic"
+		cd "$srcdir/Libraries/QtStatic/qtbase"
+		patch -p1 -i "$qt_patch_file"
+	fi
+
+	if [ ! -h "$srcdir/Libraries/breakpad" ]; then
+		ln -s "$srcdir/breakpad" "$srcdir/Libraries/breakpad"
+		ln -s "$srcdir/breakpad-lss" "$srcdir/Libraries/breakpad/src/third_party/lss"
+	fi
+
+	sed -i 's/CUSTOM_API_ID//g' "$srcdir/tdesktop/Telegram/Telegram.pro"
+	sed -i 's,LIBS += /usr/local/lib/libxkbcommon.a,,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
+	sed -i 's,LIBS += /usr/local/lib/libz.a,LIBS += -lz,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
+
+	local options=""
+	
+	if [[ $BUILD_VERSION == *"disable_autoupdate"* ]]; then
+		options+="\nDEFINES += TDESKTOP_DISABLE_AUTOUPDATE"
+	fi
+
+	if [[ $BUILD_VERSION == *"disable_register_custom_scheme"* ]]; then
+		options+="\nDEFINES += TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+	fi
+
+	if [[ $BUILD_VERSION == *"disable_crash_reports"* ]]; then
+		options+="\nDEFINES += TDESKTOP_DISABLE_CRASH_REPORTS"
+	fi
+
+	if [[ $BUILD_VERSION == *"disable_network_proxy"* ]]; then
+		options+="\nDEFINES += TDESKTOP_DISABLE_NETWORK_PROXY"
+	fi
+
+	options+='\nINCLUDEPATH += "/usr/lib/glib-2.0/include"'
+	options+='\nINCLUDEPATH += "/usr/lib/gtk-2.0/include"'
+	options+='\nINCLUDEPATH += "/usr/include/opus"'
+	options+='\nLIBS += -lcrypto -lssl'
+	
+	info_msg "Build options: ${options}"
+	
+	echo -e "${options}" >> "$srcdir/tdesktop/Telegram/Telegram.pro"
+
+	success_msg "Prepare done! :)"
+	travis_fold_end "prepare"
+}
+
+build() {
+	start_msg "Building the projects..."
+
+	info_msg "Build patched Qt"
+	# Build patched Qt
+	cd "$srcdir/Libraries/QtStatic"
+	./configure -prefix "$srcdir/qt" -release -opensource -confirm-license -qt-zlib \
+	            -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb \
+	            -qt-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests
+	make --silent module-qtbase module-qtimageformats
+	make --silent module-qtbase-install_subtargets module-qtimageformats-install_subtargets
+
+	export PATH="$srcdir/qt/bin:$PATH"
+
+	info_msg "Build breakpad"
+	# Build breakpad
+	cd "$srcdir/Libraries/breakpad"
+	./configure
+	make --silent
+
+	info_msg "Build MetaStyle"
+	# Build MetaStyle
+	mkdir -p "$srcdir/tdesktop/Linux/DebugIntermediateStyle"
+	cd "$srcdir/tdesktop/Linux/DebugIntermediateStyle"
+	qmake CONFIG+=debug "../../Telegram/MetaStyle.pro"
+	make --silent
+
+	info_msg "Build MetaLang"
+	# Build MetaLang
+	mkdir -p "$srcdir/tdesktop/Linux/DebugIntermediateLang"
+	cd "$srcdir/tdesktop/Linux/DebugIntermediateLang"
+	qmake CONFIG+=debug "../../Telegram/MetaLang.pro"
+	make --silent
+
+	info_msg "Build Telegram Desktop"
+	# Build Telegram Desktop
+	mkdir -p "$srcdir/tdesktop/Linux/ReleaseIntermediate"
+	cd "$srcdir/tdesktop/Linux/ReleaseIntermediate"
+
+	qmake CONFIG+=release "../../Telegram/Telegram.pro"
+	local pattern="^PRE_TARGETDEPS +="
+	grep "$pattern" "$srcdir/tdesktop/Telegram/Telegram.pro" | sed "s/$pattern//g" | xargs make
+
+	qmake CONFIG+=release "../../Telegram/Telegram.pro"
+	make
+}
+
+check() {
+	local filePath="$srcdir/tdesktop/Linux/Release/Telegram"
+	if test -f "$filePath"; then
+		success_msg "Build successful done! :)"
+
+		local size;
+		size=$(stat -c %s "$filePath")
+		success_msg "File size of ${filePath}: ${size} Bytes"
+	else
+		error_msg "Build error, output file does not exist"
+		exit 1
+	fi
+}
+
+source ./.travis/common.sh
+
+run

.travis/check.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Checks commit message, ...
+
+run() {
+	checkCommitMessage
+}
+
+checkCommitMessage() {
+	info_msg "Commit message: ${TRAVIS_COMMIT_MSG}";
+	info_msg "Is pull request: ${TRAVIS_PULL_REQUEST}";
+
+	if [[ $TRAVIS_PULL_REQUEST != "false" ]];then
+		if [[  $TRAVIS_COMMIT_MSG != *"Signed-off-by: "* ]];then
+			error_msg "The commit message does not contain the signature!"
+			error_msg "More information: https://github.com/telegramdesktop/tdesktop/blob/master/.github/CONTRIBUTING.md#sign-your-work"
+			exit 1
+		else
+			success_msg "Commit message contains signature"
+		fi
+	fi
+}
+
+source ./.travis/common.sh
+
+run

.travis/common.sh

@@ -0,0 +1,40 @@
+# set colors
+RCol='\e[0m'    # Text Reset
+
+# Regular           Bold                Underline           High Intensity      BoldHigh Intens     Background          High Intensity Backgrounds
+Bla='\e[0;30m';     BBla='\e[1;30m';    UBla='\e[4;30m';    IBla='\e[0;90m';    BIBla='\e[1;90m';   On_Bla='\e[40m';    On_IBla='\e[0;100m';
+Red='\e[0;31m';     BRed='\e[1;31m';    URed='\e[4;31m';    IRed='\e[0;91m';    BIRed='\e[1;91m';   On_Red='\e[41m';    On_IRed='\e[0;101m';
+Gre='\e[0;32m';     BGre='\e[1;32m';    UGre='\e[4;32m';    IGre='\e[0;92m';    BIGre='\e[1;92m';   On_Gre='\e[42m';    On_IGre='\e[0;102m';
+Yel='\e[0;33m';     BYel='\e[1;33m';    UYel='\e[4;33m';    IYel='\e[0;93m';    BIYel='\e[1;93m';   On_Yel='\e[43m';    On_IYel='\e[0;103m';
+Blu='\e[0;34m';     BBlu='\e[1;34m';    UBlu='\e[4;34m';    IBlu='\e[0;94m';    BIBlu='\e[1;94m';   On_Blu='\e[44m';    On_IBlu='\e[0;104m';
+Pur='\e[0;35m';     BPur='\e[1;35m';    UPur='\e[4;35m';    IPur='\e[0;95m';    BIPur='\e[1;95m';   On_Pur='\e[45m';    On_IPur='\e[0;105m';
+Cya='\e[0;36m';     BCya='\e[1;36m';    UCya='\e[4;36m';    ICya='\e[0;96m';    BICya='\e[1;96m';   On_Cya='\e[46m';    On_ICya='\e[0;106m';
+Whi='\e[0;37m';     BWhi='\e[1;37m';    UWhi='\e[4;37m';    IWhi='\e[0;97m';    BIWhi='\e[1;97m';   On_Whi='\e[47m';    On_IWhi='\e[0;107m';
+
+# Set variables
+_qtver=5.5.1
+srcdir=${PWD}
+
+start_msg() {
+	echo -e "\n${Gre}$*${RCol}"
+}
+
+info_msg() {
+	echo -e "\n${Cya}$*${RCol}"
+}
+
+error_msg() {
+	echo -e "\n${BRed}$*${RCol}"
+}
+
+success_msg() {
+	echo -e "\n${BGre}$*${RCol}"
+}
+
+travis_fold_start() {
+	echo "travis_fold:start:$*"
+}
+
+travis_fold_end() {
+	echo "travis_fold:end:$*"
+}

README.md

@@ -2,6 +2,8 @@
 
 This is the complete source code and the build instructions for the alpha version of the official desktop client for the [Telegram][telegram] messenger, based on the [Telegram API][telegram_api] and the [MTProto][telegram_proto] secure protocol.
 
+[![Build Status](https://travis-ci.org/telegramdesktop/tdesktop.svg?branch=master)](https://travis-ci.org/telegramdesktop/tdesktop)
+
 The source code is published under GPLv3 with OpenSSL exception, the license is available [here][license].
 
 ## Supported systems

Telegram.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Telegram", "Telegram\Telegram.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -18,10 +18,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Telegram\Updater
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaLang", "Telegram\MetaLang.vcxproj", "{E417CAA4-259B-4C99-88E3-805F1300E8EB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2F863EAD-33C9-4014-A573-93F085BA9CB1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "codegen", "codegen", "{2F863EAD-33C9-4014-A573-93F085BA9CB1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Packer", "Telegram\Packer.vcxproj", "{56A9A4B2-21E5-4360-AFA8-85B43AC43B08}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codegen_style", "Telegram\build\vc\codegen_style\codegen_style.vcxproj", "{E4DF8176-4DEF-4859-962F-B497E3E7A323}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -82,8 +84,21 @@ Global
 		{56A9A4B2-21E5-4360-AFA8-85B43AC43B08}.Deploy|x64.ActiveCfg = Release|Win32
 		{56A9A4B2-21E5-4360-AFA8-85B43AC43B08}.Release|Win32.ActiveCfg = Release|Win32
 		{56A9A4B2-21E5-4360-AFA8-85B43AC43B08}.Release|x64.ActiveCfg = Release|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Debug|Win32.Build.0 = Debug|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Debug|x64.ActiveCfg = Debug|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Deploy|Win32.ActiveCfg = Debug|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Deploy|Win32.Build.0 = Debug|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Deploy|x64.ActiveCfg = Release|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Deploy|x64.Build.0 = Release|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Release|Win32.ActiveCfg = Release|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Release|Win32.Build.0 = Release|Win32
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{E4DF8176-4DEF-4859-962F-B497E3E7A323} = {2F863EAD-33C9-4014-A573-93F085BA9CB1}
+	EndGlobalSection
 EndGlobal

Telegram/Build.bat

@@ -56,7 +56,7 @@ if %BetaVersion% neq 0 (
     exit /b 1
   )
 )
-cd SourceFiles\
+cd Resources\
 if "%1" == "fast" (
   echo Skipping touching of telegram.qrc..
 ) else (

Telegram/Build.sh

@@ -192,7 +192,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
   DropboxSymbolsPath="./../../../Dropbox/Telegram/symbols"
 
   if [ "$FastParam" != "fast" ]; then
-    touch "./SourceFiles/telegram.qrc"
+    touch "./Resources/telegram.qrc"
   fi
   xcodebuild -project Telegram.xcodeproj -alltargets -configuration Release build
 

Telegram/MetaLang.pro

@@ -12,7 +12,7 @@ CONFIG(release, debug|release) {
     DESTDIR = ./../ReleaseLang
 }
 
-CONFIG += plugin static
+CONFIG += plugin static c++11
 
 macx {
     QMAKE_INFO_PLIST = ./SourceFiles/_other/Lang.plist

Telegram/MetaStyle.pro

@@ -12,7 +12,7 @@ CONFIG(release, debug|release) {
     DESTDIR = ./../ReleaseStyle
 }
 
-CONFIG += plugin static
+CONFIG += plugin static c++11
 
 macx {
     QMAKE_INFO_PLIST = ./SourceFiles/_other/Style.plist

Telegram/Resources/LangList

@@ -0,0 +1 @@
+de,es,it,ko,nl,pt_BR

Telegram/Resources/lang.strings

@@ -399,7 +399,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_preview_loading" = "Getting Link Info...";
 
 "lng_profile_chat_unaccessible" = "Group is unaccessible";
-"lng_topbar_info" = "Info";
 "lng_profile_about_section" = "About";
 "lng_profile_description_section" = "Description";
 "lng_profile_settings_section" = "Settings";
@@ -601,6 +600,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forwarded_signed" = "{channel} ({user})";
 "lng_in_reply_to" = "In reply to";
 
+"lng_bot_share_location_unavailable" = "Sorry, the location sharing is currently unavailable in Telegram Desktop.";
+"lng_bot_inline_geo_unavailable" = "Sorry, this bot requires location sharing.\nIt is not available in Telegram Desktop.";
+"lng_bot_share_phone" = "Share Phone Number?";
+"lng_bot_share_phone_confirm" = "Share";
+
 "lng_attach_failed" = "Failed";
 "lng_attach_file" = "File";
 "lng_attach_photo" = "Photo";
@@ -685,8 +689,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_cant_invite_not_contact_channel" = "Sorry, you can only add mutual contacts\nto channels at the moment.\n{more_info}";
 "lng_cant_more_info" = "More info »";
 "lng_cant_invite_banned" = "Sorry, only admin can add this user.";
-"lng_cant_invite_privacy" = "Sorry, you cannot add this user to groups because of the privacy settings.";
-"lng_cant_invite_privacy_channel" = "Sorry, you cannot add this user to channels because of the privacy settings.";
+"lng_cant_invite_privacy" = "Sorry, you cannot add this user to groups because of their privacy settings.";
+"lng_cant_invite_privacy_channel" = "Sorry, you cannot add this user to channels because of their privacy settings.";
 "lng_cant_do_this" = "Sorry, this action is unavailable.";
 
 "lng_send_button" = "Send";
@@ -810,6 +814,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forward_messages" = "{count:_not_used_|Forwarded message|# forwarded messages}";
 "lng_forwarding_from" = "{user} and {count:_not_used_|# other|# others}";
 "lng_forwarding_from_two" = "{user} and {second_user}";
+"lng_inline_switch_choose" = "Choose conversation...";
+"lng_inline_switch_cant" = "Sorry, no way to write here :(";
 
 "lng_share_cant" = "Sorry, no way to share here :(";
 "lng_reply_cant" = "Sorry, no way to reply to an old message in supergroup :(";
@@ -886,12 +892,16 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 "lng_new_version_wrap" = "Telegram Desktop was updated to version {version}\n\n{changes}\n\nFull version history is available here:\n{link}";
 "lng_new_version_minor" = "— Bug fixes and other minor improvements";
-"lng_new_version_text" = "PUBLIC GROUPS, PINNED POSTS, 5,000 MEMBERS\n\n— Groups can now have 5,000 members (up from 1,000)\n— Groups of any size may be converted to supergroups\n\nNew tools for supergroup admins:\n\n— Make your group public by setting up a public link – anyone will be able to view the chat and join it\n— Pin messages to keep important updates visible and notify all members\n— Select messages to delete, report as spam, block users, or remove all messages from a user\n\nMore about this update:\n{link}";
+"lng_new_version_text" = "BOTS 2.0\n\n— Introducing Bot API 2.0, the biggest update to our bot platform since June 2015.\n— Bots can now update existing messages on the fly as you interact with them.\n— New Inline keyboards with callback, 'open URL' or 'switch to inline mode' buttons help create seamless interfaces.\n— Inline bots can now send all attachments supported by Telegram (videos, music, stickers, locations, etc.).\n— Try out these sample bots to see what's coming your way soon: @music, @sticker, @youtube, @foursquare\n\nMore info: {link}";
 
 "lng_menu_insert_unicode" = "Insert Unicode control character";
 
 "lng_full_name" = "{first_name} {last_name}";
 
+// Not used
+
+"lng_topbar_info" = "Info";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";

Telegram/Resources/langs/lang_de.strings

@@ -544,7 +544,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_action_pinned_media" = "{from} hat {media} angeheftet";
 "lng_action_pinned_media_photo" = "ein Bild";
 "lng_action_pinned_media_video" = "ein Video";
-"lng_action_pinned_media_audio" = "ein Audio";
+"lng_action_pinned_media_audio" = "eine Audiodatei";
 "lng_action_pinned_media_voice" = "eine Sprachnachricht";
 "lng_action_pinned_media_file" = "eine Datei";
 "lng_action_pinned_media_gif" = "ein GIF";
@@ -601,6 +601,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forwarded_signed" = "{channel} ({user})";
 "lng_in_reply_to" = "Antwort auf";
 
+"lng_bot_share_location_unavailable" = "Teilen von Standorten ist derzeit bei Telegram Desktop nicht möglich.";
+"lng_bot_inline_geo_unavailable" = "Dieser Bot braucht deinen aktuellen Standort. Die Funktion ist bei Telegram Desktop derzeit nicht verfügbar.";
+"lng_bot_share_phone" = "Telefonnummer teilen?";
+"lng_bot_share_phone_confirm" = "Teilen";
+
 "lng_attach_failed" = "Uploadfehler";
 "lng_attach_file" = "Datei";
 "lng_attach_photo" = "Bild";
@@ -685,8 +690,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_cant_invite_not_contact_channel" = "Du kannst nur Personen hinzufügen,\nwenn ihr eure Nummern ausgetauscht habt.\n{more_info}";
 "lng_cant_more_info" = "Weitere Infos »";
 "lng_cant_invite_banned" = "Nur Admins können diesen Nutzer hinzufügen.";
-"lng_cant_invite_privacy" = "Du kannst mit diesen Nutzern keine Gruppe erstellen, weil sie es nicht erlauben.";
-"lng_cant_invite_privacy_channel" = "Du kannst diese Nutzer keinen Kanälen hinzufügen, weil sie es nicht erlauben.";
+"lng_cant_invite_privacy" = "Du kannst mit diesem Nutzer keine Gruppe erstellen, weil er es nicht erlaubt.";
+"lng_cant_invite_privacy_channel" = "Du kannst diesen Nutzer keinen Kanälen hinzufügen, weil er es nicht erlaubt.";
 "lng_cant_do_this" = "Verzeihung. Das ist leider nicht möglich.";
 
 "lng_send_button" = "Senden";
@@ -698,7 +703,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_will_be_notified" = "Mitglieder werden benachrichtigt";
 "lng_wont_be_notified" = "Mitglieder werden nicht benachrichtigt";
 "lng_empty_history" = "";
-"lng_willbe_history" = "Chat auswählen um zu schreiben";
+"lng_willbe_history" = "Chat auswählen, um zu schreiben";
 "lng_message_with_from" = "[c]{from}:[/c] {message}";
 "lng_from_you" = "Ich";
 "lng_bot_description" = "Was kann dieser Bot?";
@@ -725,10 +730,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_user_action_record_video" = "{user} sendet ein Video";
 "lng_send_action_upload_video" = "schickt ein Video";
 "lng_user_action_upload_video" = "{user} sendet ein Video";
-"lng_send_action_record_audio" = "nimmt ein Audio auf";
-"lng_user_action_record_audio" = "{user} nimmt eine Sprachnachricht auf";
-"lng_send_action_upload_audio" = "sendet eine Sprachnachricht";
-"lng_user_action_upload_audio" = "{user} sendet eine Sprachnachricht";
+"lng_send_action_record_audio" = "nimmt Sprachnachricht auf";
+"lng_user_action_record_audio" = "{user} nimmt Sprachnachricht auf";
+"lng_send_action_upload_audio" = "sendet Sprachnachricht";
+"lng_user_action_upload_audio" = "{user} sendet Sprachnachricht";
 "lng_send_action_upload_photo" = "sendet ein Bild";
 "lng_user_action_upload_photo" = "{user} sendet ein Bild";
 "lng_send_action_upload_file" = "sendet eine Datei";
@@ -810,6 +815,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forward_messages" = "{count:_not_used_|Nachrichtenanhang|# Nachrichtenanhänge}";
 "lng_forwarding_from" = "{user} und {count:_not_used_|# anderer|# andere}";
 "lng_forwarding_from_two" = "{user} und {second_user}";
+"lng_inline_switch_choose" = "Chat wählen...";
+"lng_inline_switch_cant" = "Hier kannst du nicht schreiben :(";
 
 "lng_share_cant" = "Weiterleitung nicht möglich :(";
 "lng_reply_cant" = "Leider kann man alte Nachrichten in Supergruppen nicht beantworten :(";
@@ -886,7 +893,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 "lng_new_version_wrap" = "Telegram Desktop wurde aktualisiert auf Version {version}\n\n{changes}\n\nGesamter Versionsverlauf:\n{link}";
 "lng_new_version_minor" = "— Fehlerbehebungen und Softwareoptimierungen";
-"lng_new_version_text" = "ÖFFENTLICHE GRUPPEN, NACHRICHTEN ANHEFTEN, 5000 MITGLIEDER\n\n— Gruppen dürfen nun 5.000 Mitglieder haben (zuvor waren es 1.000)\n— Jede Gruppe - egal wie groß -  kann ab sofort in eine Supergruppe geändert werden\n\nNeue Werkzeuge für Supergruppen-Admins:\n\n— Mache deine Gruppe öffentlich: Jeder kann den Inhalt einsehen und sie betreten\n— Hefte Nachrichten an: Perfekt um Gruppenmitglieder über Neuigkeiten zu informieren\n— Lösche mehrere Nachrichten, melde sie aufgrund von Spam, blockiere Mitglieder oder entferne alle Nachrichten von bestimmten Nutzern\n\nMehr Infos zum neuen Update:\n{link}";
+"lng_new_version_text" = "BOTS 2.0\n\n— Bot API 2.0: Das größte Update unserer Bot-Plattform seit Juni 2015.\n— Bots können vorhandene Nachrichten aktualisieren, während du mit dem Bot schreibst.\n— Neue Inline-Tastaturen mit 'Callback', 'URL öffnen' oder 'in den Inline-Modus wechseln'-Knöpfen, für eine noch bessere Integration.\n— Inline-Bots dürfen nun alle erlaubten Anhänge senden (Videos, Musik, Sticker, Dateien, etc.).\n— Probiere doch mal einen der folgenden Beispielbots aus: @music, @sticker, @youtube, @foursquare\n\nMehr Infos: {link}";
 
 "lng_menu_insert_unicode" = "Unicode-Steuerzeichen einfügen";
 

Telegram/Resources/langs/lang_es.strings

@@ -601,6 +601,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forwarded_signed" = "{channel} ({user})";
 "lng_in_reply_to" = "Respondiendo a";
 
+"lng_bot_share_location_unavailable" = "Lo sentimos, compartir la ubicación no está disponible actualmente en Telegram Desktop.";
+"lng_bot_inline_geo_unavailable" = "Lo sentimos, este bot requiere compartir la ubicación.\nNo está disponible en Telegram Desktop.";
+"lng_bot_share_phone" = "¿Compartir número de teléfono?";
+"lng_bot_share_phone_confirm" = "Compartir";
+
 "lng_attach_failed" = "Fallido";
 "lng_attach_file" = "Archivo";
 "lng_attach_photo" = "Foto";
@@ -810,6 +815,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forward_messages" = "{count:_not_used_|Mensaje adjunto|# mensajes adjuntos}";
 "lng_forwarding_from" = "{user} y {count:_not_used_|# otro|# otros}";
 "lng_forwarding_from_two" = "{user} y {second_user}";
+"lng_inline_switch_choose" = "Elige una conversación...";
+"lng_inline_switch_cant" = "Lo sentimos, no puedes escribir aquí :(";
 
 "lng_share_cant" = "Lo sentimos. No hay forma de compartir aquí :(";
 "lng_reply_cant" = "Lo sentimos, no puedes responder un mensaje viejo en un supergrupo :(";
@@ -886,7 +893,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 "lng_new_version_wrap" = "Telegram Desktop ha sido actualizada a la versión {version}\n\n{changes}\n\nEl historial completo está disponible aquí:\n{link}";
 "lng_new_version_minor" = "— Corrección de errores y otras mejoras menores";
-"lng_new_version_text" = "GRUPOS PÚBLICOS, PUBLICACIONES ANCLADAS, 5000 MIEMBROS\n\n— Los grupos ahora pueden tener hasta 5000 miembros (antes eran 1000)\n— Los grupos de cualquier tamaño pueden ser convertidos en supergrupos\n\nNuevas herramientas para los administradores de supergrupos:\n\n— Haz público tu grupo, generando un enlace público. Cualquiera podrá ver el chat y unirse.\n— Ancla mensajes, para mantener visible lo importante, y notifica a todos los miembros.\n— Elige varios mensajes para eliminar, reportar como spam, bloquear usuarios o quitar todos los mensajes de un usuario en particular.\n\nMás sobre esta actualización:\n{link}";
+"lng_new_version_text" = "BOTS 2.0\n\n— Presentamos la API para bots 2.0, la actualización más grande en nuestra plataforma para bots desde junio de 2015.\n— Desde ahora, los bots pueden actualizar los mensajes existentes sobre la marcha, al interactuar con ellos.\n— Los nuevos teclados integrados con retrollamada, botones para ‘abrir URL’ o ‘cambiar al modo integrado’, ayudan a crear una interfaz fluida.\n— Ahora los bots integrados pueden enviar todos los adjuntos soportados en Telegram (vídeos, música, stickers, archivos, etc.).\n— Prueba estos ejemplos de bots para que veas lo que viene: @music, @sticker, @youtube, @foursquare\n\nMás en: {link}";
 
 "lng_menu_insert_unicode" = "Insertar caracteres de control Unicode";
 

Telegram/Resources/langs/lang_it.strings

@@ -138,7 +138,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_pinned_notify" = "Notifica tutti i membri";
 
 "lng_intro" = "Benvenuti nell'app desktop ufficiale di [a href=\"https://telegram.org/\"]Telegram[/a].\nÈ [b]veloce[/b] e [b]sicura[/b].";
-"lng_start_msgs" = "INIZIA A MESSAGGIARE";
+"lng_start_msgs" = "INIZIA A CHATTARE";
 
 "lng_intro_next" = "AVANTI";
 "lng_intro_finish" = "ISCRIVITI";
@@ -379,7 +379,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_settings_reset_button" = "Chiudi";
 "lng_settings_reset_done" = "Altre sessioni terminate";
 "lng_settings_ask_question" = "Fai una domanda";
-"lng_settings_ask_sure" = "Per favore nota che il supporto di Telegram è fornito da volontari. Proviamo a rispondere quanto prima, ma potrebbe volerci del tempo.\n\nDai un'occhiata alle domande frequenti su Telegram: potrai trovare importanti suggerimenti riguardo alcune problematiche e risposte alla maggior parte delle domande.";
+"lng_settings_ask_sure" = "Per favore nota che il supporto di Telegram è fornito da volontari. Proviamo a rispondere quanto prima, ma potrebbe volerci del tempo.\n\nDai un'occhiata alle domande frequenti di Telegram: contengono suggerimenti importanti per risolvere i problemi e risposte a quasi tutte le domande.";
 "lng_settings_faq_button" = "Domande frequenti";
 "lng_settings_ask_ok" = "Chiedi";
 "lng_settings_faq" = "Domande frequenti";
@@ -601,6 +601,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forwarded_signed" = "{channel} ({user})";
 "lng_in_reply_to" = "In risposta a";
 
+"lng_bot_share_location_unavailable" = "Spiacenti, la condivisione della posizione non è al momento disponibile su Telegram Desktop.";
+"lng_bot_inline_geo_unavailable" = "Spiacenti, questo bot richiede la condivisione della posizione. Non è disponibile su Telegram Desktop.";
+"lng_bot_share_phone" = "Condividere il numero di telefono?";
+"lng_bot_share_phone_confirm" = "Condividi";
+
 "lng_attach_failed" = "Fallito";
 "lng_attach_file" = "File";
 "lng_attach_photo" = "Foto";
@@ -685,8 +690,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_cant_invite_not_contact_channel" = "Spiacenti, ma al momento puoi aggiungere\nai canali solo contatti reciproci.\n{more_info}";
 "lng_cant_more_info" = "Più info »";
 "lng_cant_invite_banned" = "Spiacenti, solo l'amministratore può aggiungere questo utente.";
-"lng_cant_invite_privacy" = "Spiacenti, non puoi aggiungere questo utente al gruppo a causa delle sue impostazioni di privacy.";
-"lng_cant_invite_privacy_channel" = "Spiacenti, non puoi aggiungere questo utente al canale a causa delle sue impostazioni di privacy.";
+"lng_cant_invite_privacy" = "Spiacenti, non puoi aggiungere questo utente ai gruppi a causa delle sue impostazioni di privacy.";
+"lng_cant_invite_privacy_channel" = "Spiacenti, non puoi aggiungere questo utente ai canali a causa delle sue impostazioni di privacy.";
 "lng_cant_do_this" = "Spiacenti, questa azione non è disponibile.";
 
 "lng_send_button" = "Invia";
@@ -698,7 +703,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_will_be_notified" = "I post saranno notificati ai membri";
 "lng_wont_be_notified" = "I post non saranno notificati ai membri";
 "lng_empty_history" = "";
-"lng_willbe_history" = "Seleziona una chat per iniziare a messaggiare";
+"lng_willbe_history" = "Seleziona una chat per iniziare a chattare";
 "lng_message_with_from" = "[c]{from}:[/c] {message}";
 "lng_from_you" = "Tu";
 "lng_bot_description" = "Cosa può fare questo bot?";
@@ -810,6 +815,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forward_messages" = "{count:_not_used_|messaggio inoltrato|# messaggi inoltrati}";
 "lng_forwarding_from" = "{user} e {count:_not_used_|# altro|altri #}";
 "lng_forwarding_from_two" = "{user} e {second_user}";
+"lng_inline_switch_choose" = "Scegli conversazione...";
+"lng_inline_switch_cant" = "Spiacenti, impossibile scrivere qui :(";
 
 "lng_share_cant" = "Spiacenti, impossibile condividere qui :(";
 "lng_reply_cant" = "Spiacenti, non si può rispondere a un vecchio messaggio nel supergruppo :(";
@@ -886,7 +893,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 "lng_new_version_wrap" = "Telegram Desktop si è aggiornato alla versione {version}\n\n{changes}\n\nLa cronologia degli aggiornamenti è disponibile qui:\n{link}";
 "lng_new_version_minor" = "— Risoluzione di problemi e altri miglioramenti minori";
-"lng_new_version_text" = "GRUPPI PUBBLICI, POST FISSATI, 5000 MEMBRI\n\n— I gruppi possono ora avere fino a 5000 membri (dai precedenti 1000)\n— Puoi convertire qualsiasi gruppo in supergruppo\n\nNuovi strumenti per gli amministratori dei supergruppi:\n\n— Rendi pubblico il tuo gruppo inserendo un link - chiunque sarà in grado di vedere la chat e unirsi\n— Fissa i messaggi per rendere gli aggiornamenti importanti visibili\n— Seleziona diversi messaggi per eliminarli, segnalarli, bloccare utenti ed eliminare i loro messaggi\n\nPiù info su questo aggiornamento:\n{link}";
+"lng_new_version_text" = "BOT 2.0,\n\n— Introdotta l'API dei Bot 2.0, il più grande aggiornamento della nostra piattaforma da Giugno 2015.\n— I bot possono ora aggiornare i messaggi esistenti quando interagisci con loro.\n— Nuove tastiere per i bot inline con pulsanti callback (per non far inviare nuovi messaggi al bot), 'apri URL' o 'passa a modalità inline' per creare un'interfaccia senza interruzioni.\n— I bot inline possono ora inviare qualsiasi tipo di allegato supportato su Telegram (video,musica,sticker,file,etc.).\n— Prova questi bot di esempio per vedere cosa è in arrivo a breve: @music, @sticker, @youtube, @foursquare\n\nPiù informazioni: {link}";
 
 "lng_menu_insert_unicode" = "Inserisci carattere di controllo Unicode";
 

Telegram/Resources/langs/lang_ko.strings

@@ -86,8 +86,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_cancel" = "취소";
 "lng_continue" = "계속";
 "lng_close" = "닫기";
-"lng_connecting" = "Connecting...";
-"lng_reconnecting" = "Reconnect {count:now|in # s|in # s}...";
+"lng_connecting" = "연결중...";
+"lng_reconnecting" = "재연결중..{count:now|in # 초|in # 초}...";
 "lng_reconnecting_try_now" = "다시 시도";
 
 "lng_status_service_notifications" = "서비스 알림";
@@ -108,7 +108,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_status_lastseen_date" = "{date}에 마지막으로 접속";
 "lng_status_lastseen_date_time" = "{date}일 {time}에 마지막으로 접속";
 "lng_status_online" = "온라인";
-"lng_status_connecting" = "connecting...";
+"lng_status_connecting" = "연결중...";
 
 "lng_chat_status_unaccessible" = "그룹 접근 불가";
 "lng_chat_status_members" = "{count:맴버 없음|#명|#명}";
@@ -127,7 +127,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_edit_deleted" = "메시지는 삭제 되었습니다.";
 "lng_edit_too_long" = "메시지 길이가 너무 깁니다.";
 "lng_edit_message" = "메시지 수정";
-"lng_edit_message_text" = "New message text...";
+"lng_edit_message_text" = "새로운 메시지...";
 "lng_deleted" = "알 수 없음";
 "lng_deleted_message" = "삭제된 메시지";
 "lng_pinned_message" = "고정된 메시지";
@@ -162,7 +162,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_code_telegram" = "[b]텔레그램[/b] 앱으로 부터 방금 수신받은,\n코드를 입력해주세요.";
 "lng_code_no_telegram" = "코드를 SMS로 전송";
 "lng_code_call" = "텔레그램이  {minutes}:{seconds}후에는 전화를 겁니다.";
-"lng_code_calling" = "Requesting a call from Telegram...";
+"lng_code_calling" = "텔레그램으로부터 전화 요청을 하고 있습니다...";
 "lng_code_called" = "텔레그램이 회원님의 전화번호로 전화를 걸었습니다.";
 
 "lng_bad_phone" = "잘못된 전화번호입니다. 다시 시도해주세요.";
@@ -201,7 +201,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_dlg_new_channel_name" = "채널명";
 "lng_no_contacts" = "연락처가 없습니다.";
 "lng_no_chats" = "대화시 대화방이 존재 할 곳입니다.";
-"lng_contacts_loading" = "Loading...";
+"lng_contacts_loading" = "로딩중...";
 "lng_contacts_not_found" = "연락처를 찾을 수 없음";
 "lng_dlg_search_chat" = "이 채팅에서 검색";
 "lng_dlg_search_channel" = "이 채널방에서 검색";
@@ -210,7 +210,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_settings_save" = "저장";
 "lng_settings_upload" = "프로필 이미지 선택";
 "lng_settings_crop_profile" = "프로필 사진으로 사용할 사각영역을 선택하세요";
-"lng_settings_uploading_photo" = "Uploading photo...";
+"lng_settings_uploading_photo" = "사진 업로드 중...";
 
 "lng_username_title" = "아이디";
 "lng_username_about" = "텔레그램 아이디를 설정할 수 있습니다. \n아이디를 설정하면 회원님의 전화번호를 몰라도 아이디로 회원님을 찾아 대화를 나눌 수 있습니다.\n아이디는 영문, 밑줄, 숫자로 a-z, _, 0-9, \n다섯 글자 이상으로 설정해 주세요.";
@@ -247,9 +247,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_settings_auto_update" = "자동 업데이트";
 "lng_settings_current_version" = " {version}";
 "lng_settings_check_now" = "업데이트 확인";
-"lng_settings_update_checking" = "Checking for updates...";
+"lng_settings_update_checking" = "업데이트 확인 중...";
 "lng_settings_latest_installed" = "최신 버전이 설치되어 있습니다.";
-"lng_settings_downloading" = "Downloading update {ready} / {total} MB...";
+"lng_settings_downloading" = "데이트를 다운로드 중 {ready} / {total} MB..";
 "lng_settings_update_ready" = "새로운 버전을 설치 할 수 있습니다.";
 "lng_settings_update_now" = "재시작 합니다.";
 "lng_settings_update_fail" = "업데이트 확인 실패 :(";
@@ -291,7 +291,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_download_path_failed" = "파일 다운로드를 시작 할 수 없습니다. 올바르지 않은 다운로드 경로가 원인 일 수도 있습니다.\n\n설정에 가시면 다운로드 경로를 변경하실 수 있습니다.";
 "lng_download_path_settings" = "설정";
 "lng_download_finish_failed" = "파일 다운로드를 끝낼 수 없습니다.\n\n다시 시도하시겠습니까?";
-"lng_download_path_clearing" = "Clearing...";
+"lng_download_path_clearing" = "초기화 중..";
 "lng_download_path_cleared" = "초기화 완료!";
 "lng_download_path_clear_failed" = "초기화 실패 :(";
 
@@ -300,7 +300,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_settings_images_cached" = "{count:_not_used_|이미지 #개|이미지 #개}, {size}";
 "lng_settings_audios_cached" = "{count:_not_used_|음성 메시지 #개|음성 메시지 #개}, {size}";
 "lng_local_storage_clear" = "전체 정리";
-"lng_local_storage_clearing" = "Clearing...";
+"lng_local_storage_clearing" = "초기화 중..";
 "lng_local_storage_cleared" = "초기화 완료!";
 "lng_local_storage_clear_failed" = "초기화 실패 :(";
 
@@ -331,7 +331,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_passcode_logout" = "로그아웃";
 "lng_passcode_need_unblock" = "잠금코드를 먼저 해제해주세요.";
 
-"lng_cloud_password_waiting" = "Confirmation link sent to {email}...";
+"lng_cloud_password_waiting" = "{email}로 확인 이메일을 전송하였습니다..";
 "lng_cloud_password_change" = "클라우드 비밀번호 변경";
 "lng_cloud_password_create" = "클라우드 비밀번호";
 "lng_cloud_password_remove" = "클라우드 비밀번호 삭제";
@@ -358,9 +358,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_cloud_password_is_same" = "비밀번호가 변경되지 않았습니다.";
 
 "lng_connection_type" = "연결 유형:";
-"lng_connection_auto_connecting" = "Default (connecting...)";
+"lng_connection_auto_connecting" = "기본값 (연결중...)";
 "lng_connection_auto" = "기본값 ({transport} 사용)";
-"lng_connection_proxy_connecting" = "Connecting through proxy...";
+"lng_connection_proxy_connecting" = "프록시 연결 중...";
 "lng_connection_proxy" = "{transport} 프록시 연결";
 "lng_connection_header" = "연결 유형";
 "lng_connection_auto_rb" = "자동 (사용 가능하다면 TCP 아니면 HTTP 사용)";
@@ -396,7 +396,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_sessions_other_desc" = "동일한 휴대번호로 다른 휴대기기, 태블릿과 데스크탑에서 텔레그램 로그인이 가능합니다. 모든 데이터는 즉시 동기화 됩니다.";
 "lng_sessions_terminate_all" = "다른 모든 세션 강제 종료";
 
-"lng_preview_loading" = "Getting Link Info...";
+"lng_preview_loading" = "링크 정보를 가져오는 중..";
 
 "lng_profile_chat_unaccessible" = "그룹에 접근할 수 없습니다.";
 "lng_topbar_info" = "정보";
@@ -439,7 +439,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_profile_sure_kick" = "{user}를 추방하시겠습니까?";
 "lng_profile_sure_kick_channel" = "{user}를 추방하시겠습니까?";
 "lng_profile_sure_kick_admin" = "{user}를 관리자에서 제외 하시겠습니까?";
-"lng_profile_loading" = "Loading...";
+"lng_profile_loading" = "로드중..";
 "lng_profile_shared_media" = "공유된 미디어";
 "lng_profile_no_media" = "대화에 미디어가 존재하지 않습니다.";
 "lng_profile_photos" = "{count:_not_used_|#개의 사진|#개의 사진} »";
@@ -455,7 +455,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_profile_shared_links" = "{count:_not_used_|# 공유된 링크|# 공유된 링크} »";
 "lng_profile_shared_links_header" = "공유된 링크 현황";
 "lng_profile_copy_phone" = "전화번호 복사";
-"lng_profile_copy_fullname" = "Copy name";
+"lng_profile_copy_fullname" = "이름 복사";
 
 "lng_channel_add_admins" = "새로운 관리자";
 "lng_channel_add_members" = "구성원 추가";
@@ -601,6 +601,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forwarded_signed" = "{channel} ({user})";
 "lng_in_reply_to" = "다음 유저에게 답장 :";
 
+"lng_bot_share_location_unavailable" = "죄송합니다, 위치 공유는 텔레그램 테스크탑에서는 현재 지원을 하고 있지 않습니다.";
+"lng_bot_inline_geo_unavailable" = "죄송합니다, 위치 공유는 텔레그램 테스크탑에서는 현재 지원을 하고 있지 않습니다.";
+"lng_bot_share_phone" = "전화번호를 공유하겠습니까?";
+"lng_bot_share_phone_confirm" = "공유";
+
 "lng_attach_failed" = "실패";
 "lng_attach_file" = "파일";
 "lng_attach_photo" = "사진";
@@ -660,13 +665,13 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_stickers_remove" = "삭제";
 "lng_stickers_return" = "실행취소";
 "lng_stickers_restore" = "복구";
-"lng_stickers_count" = "{count:Loading...|# sticker|# stickers}";
+"lng_stickers_count" = "{count:Loading...|# 스티커|# 스티커}";
 
 "lng_in_dlg_photo" = "사진";
-"lng_in_dlg_video" = "Video file";
-"lng_in_dlg_audio_file" = "Audio file";
+"lng_in_dlg_video" = "비디오 파일";
+"lng_in_dlg_audio_file" = "음성 파일";
 "lng_in_dlg_contact" = "연락처";
-"lng_in_dlg_audio" = "Voice message";
+"lng_in_dlg_audio" = "음성 메시지";
 "lng_in_dlg_file" = "파일";
 "lng_in_dlg_sticker" = "스티커";
 "lng_in_dlg_sticker_emoji" = "{emoji} (스티커)";
@@ -680,20 +685,20 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_report_spam_sure_group" = "선택한 그룹메시지를 스팸으로 신고하시겠습니까?";
 "lng_report_spam_sure_channel" = "선택한 채널메시지를 스팸으로 신고하시겠습니까?";
 "lng_report_spam_ok" = "신고하기";
-"lng_cant_send_to_not_contact" = "Sorry, you can only send messages to\nmutual contacts at the moment.\n{more_info}";
-"lng_cant_invite_not_contact" = "Sorry, you can only add mutual contacts\nto groups at the moment.\n{more_info}";
-"lng_cant_invite_not_contact_channel" = "Sorry, you can only add mutual contacts\nto channels at the moment.\n{more_info}";
+"lng_cant_send_to_not_contact" = "죄송하지만, 현재 서로 연락처가 추가된 \n회원들끼리만 전송이 가능합니다. \n{more_info}";
+"lng_cant_invite_not_contact" = "죄송하지만, 현재 그룹방에 서로 연락처가 추가된 \n회원들끼리만 추가 가능합니다. {more_info}";
+"lng_cant_invite_not_contact_channel" = "죄송하지만, 현재 채널방에 서로 연락처가 추가된 \n회원들끼리만 추가 가능합니다. \n{more_info}";
 "lng_cant_more_info" = "자세한 정보 »";
-"lng_cant_invite_banned" = "Sorry, only admin can add this user.";
+"lng_cant_invite_banned" = "죄송하지만, 관리자만 회원 추가가 가능합니다.";
 "lng_cant_invite_privacy" = "죄송합니다, 개인설정으로 인하여 이 사용자를 그룹에 초대할 수 없습니다.";
 "lng_cant_invite_privacy_channel" = "죄송합니다, 개인설정으로 인하여 이 사용자를 채널에 초대할 수 없습니다.";
-"lng_cant_do_this" = "Sorry, this action is unavailable.";
+"lng_cant_do_this" = "죄송하지만, 할 수 없는 기능입니다.";
 
 "lng_send_button" = "보내기";
-"lng_message_ph" = "Write a message...";
-"lng_comment_ph" = "Write a comment...";
-"lng_broadcast_ph" = "Broadcast a message...";
-"lng_broadcast_silent_ph" = "Silent broadcast...";
+"lng_message_ph" = "메시지 쓰기..";
+"lng_comment_ph" = "코멘트 쓰기...";
+"lng_broadcast_ph" = "단체메시지 쓰기...";
+"lng_broadcast_silent_ph" = "음소거 메시지...";
 "lng_record_cancel" = "이 영역 밖에서 마우스 클릭을 해제하시면 취소가 됩니다.";
 "lng_will_be_notified" = "메시지 작성시 구성원들에게 알림이 갑니다.";
 "lng_wont_be_notified" = "메시지 작성시 구성원들에게 알림이 가지 않습니다.";
@@ -721,29 +726,29 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_user_typing" = "{user}님이 입력중입니다.";
 "lng_users_typing" = "{user}님과 {second_user}님이 입력중입니다.";
 "lng_many_typing" = "{count:_not_used_|#명이|#명이} 입력중입니다";
-"lng_send_action_record_video" = "recording a video";
-"lng_user_action_record_video" = "{user} is recording a video";
-"lng_send_action_upload_video" = "sending a video";
-"lng_user_action_upload_video" = "{user} is sending a video";
-"lng_send_action_record_audio" = "recording a voice message";
-"lng_user_action_record_audio" = "{user} is recording a voice message";
-"lng_send_action_upload_audio" = "sending a voice message";
-"lng_user_action_upload_audio" = "{user} is sending a voice message";
-"lng_send_action_upload_photo" = "sending a photo";
-"lng_user_action_upload_photo" = "{user} is sending a photo";
-"lng_send_action_upload_file" = "sending a file";
-"lng_user_action_upload_file" = "{user} is sending a file";
-"lng_send_action_geo_location" = "picking a location";
-"lng_user_action_geo_location" = "{user} is picking a location";
-"lng_send_action_choose_contact" = "choosing a contact";
-"lng_user_action_choose_contact" = "{user} is choosing a contact";
+"lng_send_action_record_video" = "비디오 녹화 중";
+"lng_user_action_record_video" = "{user}님이 녹화중입니다";
+"lng_send_action_upload_video" = "비디오 전송 중";
+"lng_user_action_upload_video" = "{user}님이 비디오를 전송 중입니다.";
+"lng_send_action_record_audio" = "음송 메시지 녹음 중";
+"lng_user_action_record_audio" = "{user}님이 오디오를 녹음 중입니다";
+"lng_send_action_upload_audio" = "음성 메시지 전송 중";
+"lng_user_action_upload_audio" = "{user}님이 음성 메시지는 전송 중입니다";
+"lng_send_action_upload_photo" = "사진 전송 중";
+"lng_user_action_upload_photo" = "{user}님이 사진을 전송 중입니다";
+"lng_send_action_upload_file" = "파일 전송 중";
+"lng_user_action_upload_file" = "{user}님이 파일을 전송 중입니다";
+"lng_send_action_geo_location" = "위치 선택 중";
+"lng_user_action_geo_location" = "{user}님이 위치를 선택 중입닏";
+"lng_send_action_choose_contact" = "연락처 선택 중";
+"lng_user_action_choose_contact" = "{user}님이 연락처를 선택 중입니다";
 "lng_unread_bar" = "{count:_not_used_|#개의 읽지 않은 메시지|#개의 읽지 않은 메시지}";
 
 "lng_maps_point" = "위치";
 "lng_save_photo" = "사진 저장";
-"lng_save_video" = "Save video file";
-"lng_save_audio_file" = "Save audio file";
-"lng_save_audio" = "Save voice message";
+"lng_save_video" = "동영상 저장";
+"lng_save_audio_file" = "음성파일 저장";
+"lng_save_audio" = "음성 메시지 저장";
 "lng_save_file" = "파일 저장";
 "lng_save_downloaded" = "{ready} / {total} {mb}";
 "lng_duration_and_size" = "{duration}, {size}";
@@ -760,7 +765,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_context_copy_email" = "이메일 복사";
 "lng_context_copy_hashtag" = "해시태그 복사";
 "lng_context_copy_mention" = "아이디 복사";
-"lng_context_save_image" = "Save Image As...";
+"lng_context_save_image" = "이미지를 다른 이름으로 저장..";
 "lng_context_forward_image" = "이미지 전달";
 "lng_context_delete_image" = "이미지 삭제";
 "lng_context_copy_image" = "이미지 복사";
@@ -768,12 +773,12 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_context_cancel_download" = "다운로드 취소";
 "lng_context_show_in_folder" = "탐색기에서 보기";
 "lng_context_show_in_finder" = "탐색기에서 보기";
-"lng_context_save_video" = "Save Video File As...";
-"lng_context_save_audio_file" = "Save Audio File As...";
-"lng_context_save_audio" = "Save Voice Message As...";
+"lng_context_save_video" = "비디오를 다른 이름으로 저장...";
+"lng_context_save_audio_file" = "음성파일을 다른 이름으로 저장...";
+"lng_context_save_audio" = "음성메시지를 다른 이름으로 저장...";
 "lng_context_pack_info" = "팩 정보";
 "lng_context_pack_add" = "스티커 추가";
-"lng_context_save_file" = "Save File As...";
+"lng_context_save_file" = "파일을 다른 이름으로 저장...";
 "lng_context_forward_file" = "파일 전달";
 "lng_context_delete_file" = "파일 삭제";
 "lng_context_close_file" = "파일 닫기";
@@ -800,7 +805,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_send_image_too_large" = "파일이 1.5GB 보다 큼으로 전송 할 수 없습니다 :(";
 "lng_send_folder" = " «{name}»은 폴더이기 때문에 전송 할 수 없습니다 :(";
 
-"lng_forward_choose" = "Choose recipient...";
+"lng_forward_choose" = "수신자를 선택..";
 "lng_forward_cant" = "이쪽으로 전달 할 수 없습니다 :(";
 "lng_forward_confirm" = "{recipient} 님에게 전달하시겠습니까?";
 "lng_forward_share_contact" = "{recipient} 님에게 연락처를 공유하시겠습니까?";
@@ -810,6 +815,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forward_messages" = "{count:_not_used_|전달받은 메시지|# 개의 전달받은 메시지}";
 "lng_forwarding_from" = "{user} 님과 {count:_not_used_|# 명|# 명}";
 "lng_forwarding_from_two" = "{user} 님과 {second_user}";
+"lng_inline_switch_choose" = "대화 선택...";
+"lng_inline_switch_cant" = "죄송합니다. 이쪽으로 글을 쓸 수 없습니다 :(";
 
 "lng_share_cant" = "이쪽으로 공유 할 수 없습니다 :(";
 "lng_reply_cant" = "죄송합니다. 슈퍼그룹방의 이전 메시지에 답글을 할 수 없습니다 :(";
@@ -863,7 +870,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_search_global_results" = "아이디 검색 결과";
 
 "lng_media_save_progress" = "{ready} / {total} {mb}";
-"lng_mediaview_save_as" = "Save As...";
+"lng_mediaview_save_as" = " 다른 이름으로 저장...";
 "lng_mediaview_copy" = "복사하기";
 "lng_mediaview_forward" = "전달";
 "lng_mediaview_delete" = "삭제";
@@ -886,7 +893,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 "lng_new_version_wrap" = "텔레그램 데스크탑은  {version} 버전으로 업데이트 되었습니다.\n\n{changes}\n\n전체 버전 히스토리는 아래에서 확인 가능합니다:\n{link}";
 "lng_new_version_minor" = "— 버그 수정 및 일부 기능 향상";
-"lng_new_version_text" = "공개 그룹, 메시지 고정, 5,000명\n\n— 그룹은 5,000명까지 가능 (기존 1,000명)\n— 모든 그룹은 구성원 크기에 상관 없이 슈퍼그룹으로 변환 가능\n\n슈퍼그룹 관리기능 추가:\n\n— 공개링크를 생성하여 그룹공개 가능 - 누구나 참여하여 대화가능\n— 메시지를 고정하여 중요한 내용을 표시하고 모두에게 알림\n— 여러 메시지를 선택하여 삭제, 스팸신고, 차단 혹은 특정 유저에게 메시지 삭제 가능\n\n자세한 사항:\n{link}";
+"lng_new_version_text" = "봇 API 2.0\n\n— 봇 API 2.0을 소개합니다, 2015년 6월 이후로 가장 큰 봇 플랫폼 업데이트입니다.\n— 봇을 활용하여  기존 송신한 메시지에 대한 업데이트가 가능합니다.\n— 새로운 Inline 키보드를 소개합니다, 콜백, URL열기 혹은 inline모드 전환 버튼으로 매끄러운 인터페이스를 도와줍니다.\n— Inline 봇은 텔레그램에서 활용 가능한 모든 첨부파일을 전송 할 수 있습니다. (비디오, 음악, 스티커, 파일등)\n— 샘플 봇을 활용하여 미리 업데이트 기능을 활용해보세요 : @music, @sticker, @youtoube, @foursquare\n\n봇에 대한 자세한 설명: {link}";
 
 "lng_menu_insert_unicode" = "유니코드 문자를 입력하세요.";
 

Telegram/Resources/langs/lang_nl.strings

@@ -601,6 +601,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forwarded_signed" = "{channel} ({user})";
 "lng_in_reply_to" = "Antwoord op";
 
+"lng_bot_share_location_unavailable" = "Sorry, locatie delen is nog niet beschikbaar via Telegram Desktop.";
+"lng_bot_inline_geo_unavailable" = "Deze bot heeft je locatie nodig, dit is\nnog niet beschikbaar via Telegram Desktop.";
+"lng_bot_share_phone" = "Telefoonnummer delen?";
+"lng_bot_share_phone_confirm" = "Delen";
+
 "lng_attach_failed" = "Mislukt";
 "lng_attach_file" = "Bestand";
 "lng_attach_photo" = "Foto";
@@ -663,10 +668,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_stickers_count" = "{count:Laden..|# sticker|# stickers}";
 
 "lng_in_dlg_photo" = "Foto";
-"lng_in_dlg_video" = "Video file";
-"lng_in_dlg_audio_file" = "Audio file";
+"lng_in_dlg_video" = "Video";
+"lng_in_dlg_audio_file" = "Audiobestand";
 "lng_in_dlg_contact" = "Contact";
-"lng_in_dlg_audio" = "Voice message";
+"lng_in_dlg_audio" = "Spraakbericht";
 "lng_in_dlg_file" = "Bestand";
 "lng_in_dlg_sticker" = "Sticker";
 "lng_in_dlg_sticker_emoji" = "{emoji} (sticker)";
@@ -741,9 +746,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 "lng_maps_point" = "Locatie";
 "lng_save_photo" = "Afbeelding opslaan";
-"lng_save_video" = "Save video file";
-"lng_save_audio_file" = "Save audio file";
-"lng_save_audio" = "Save voice message";
+"lng_save_video" = "Video opslaan";
+"lng_save_audio_file" = "Audio opslaan";
+"lng_save_audio" = "Spraakbericht opslaan";
 "lng_save_file" = "Bestand opslaan";
 "lng_save_downloaded" = "{ready} / {total} {mb}";
 "lng_duration_and_size" = "{duration}, {size}";
@@ -768,9 +773,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_context_cancel_download" = "Download annuleren";
 "lng_context_show_in_folder" = "Weergeven in map";
 "lng_context_show_in_finder" = "Weergeven in Finder";
-"lng_context_save_video" = "Save Video File As...";
-"lng_context_save_audio_file" = "Save Audio File As...";
-"lng_context_save_audio" = "Save Voice Message As...";
+"lng_context_save_video" = "Video opslaan als...";
+"lng_context_save_audio_file" = "Video opslaan als...";
+"lng_context_save_audio" = "Spraakbericht opslaan als...";
 "lng_context_pack_info" = "Bundelinformatie";
 "lng_context_pack_add" = "Stickers toevoegen";
 "lng_context_save_file" = "Bestand opslaan als...";
@@ -810,6 +815,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forward_messages" = "{count:_not_used_|Doorgestuurd bericht|# doorgestuurde berichten}";
 "lng_forwarding_from" = "{user} en {count:_not_used_|# andere|# anderen}";
 "lng_forwarding_from_two" = "{user} en {second_user}";
+"lng_inline_switch_choose" = "Kies chat...";
+"lng_inline_switch_cant" = "Sorry, je kunt hier niets delen :(";
 
 "lng_share_cant" = "Sorry, delen hierheen kan niet :(";
 "lng_reply_cant" = "Sorry, je kunt geen oude berichten beantwoorden in een supergroep :(";
@@ -886,7 +893,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 "lng_new_version_wrap" = "Telegram is bijgewerkt naar versie {version}\n\n{changes} \n\nVolledige versiegeschiedenis is hier te vinden:\n{link}";
 "lng_new_version_minor" = "— Probleemoplossing en andere kleine verbeteringen";
-"lng_new_version_text" = "PUBLIEKE GROEPEN, BERICHTEN VASTZETTEN, 5000 LEDEN\n\n— Ledenlimiet voor iedere groepsvorm opgehoogd naar 5000 (voorheen 1000).\n— Iedere groep met een willekeurig aantal leden kan nu worden opgewaardeerd naar een supergroep.\n\nNieuwe functies voor  beheerders van supergroepen:\n\n— Maak je groep openbaar door een publieke link in te stellen - iedereen kan de chat zien en er lid van worden.\n— Zet berichten vast om belangrijke informatie weer te geven en alle leden te informeren.\n— Selecteer berichten om te verwijderen, ze als spam te melden, gebruikers te blokkeren of om alle berichten van bepaalde gebruikers ineens te verwijderen.\n\nMeer informatie over deze update:\n{link}";
+"lng_new_version_text" = "BOTS 2.0\n\n— Maak kennis met BOT API 2.0, onze grootste update voor het bot-platform sinds juni 2015.\n— Nieuwe Inline-keyboards met terugroep-functie, 'Open URL' of 'omschakelen naar inline'-knoppen voor een nog betere integratie.\n— Bots kunnen nu berichten bijwerken, direct tijdens je interactie met hen.\n— Inline-bots kunnen nu alle bijlagen sturen die worden ondersteund door Telegram (video's, muziek, stickers, bestanden, etc.).\n— Probeer deze voorbeeldbots uit voor een voorproefje: @music, @sticker, @youtube, @foursquare\n\nMeer over de nieuwe bots: {link}";
 
 "lng_menu_insert_unicode" = "Unicode-besturingsteken invoegen";
 

Telegram/Resources/langs/lang_pt_BR.strings

@@ -601,6 +601,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forwarded_signed" = "{channel} ({user})";
 "lng_in_reply_to" = "Em resposta a";
 
+"lng_bot_share_location_unavailable" = "O compartilhamento de localização está atualmente indisponível no Telegram Desktop.";
+"lng_bot_inline_geo_unavailable" = "Esse bot requer compartilhamento de localização\nIsso não está disponível no Telegram Desktop.";
+"lng_bot_share_phone" = "Compartilhar Número de Telefone?";
+"lng_bot_share_phone_confirm" = "Compartilhar";
+
 "lng_attach_failed" = "Falhou";
 "lng_attach_file" = "Arquivo";
 "lng_attach_photo" = "Foto";
@@ -810,6 +815,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_forward_messages" = "{count:_not_used_|Mensagem encaminhada|# mensagens encaminhadas}";
 "lng_forwarding_from" = "{user} e {count:_not_used_|# outro|# outros}";
 "lng_forwarding_from_two" = "{user} e {second_user}";
+"lng_inline_switch_choose" = "Escolher conversa...";
+"lng_inline_switch_cant" = "Desculpe, não há como escrever aqui :(";
 
 "lng_share_cant" = "Não há como compartilhar aqui :(";
 "lng_reply_cant" = "Desculpe, não há como responder uma mensagem antiga no supergrupo :(";
@@ -886,7 +893,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 "lng_new_version_wrap" = "Telegram Desktop foi atualizado para a versão {version}\n\n{changes}\n\nHistórico completo de mudanças disponível aqui:\n{link}";
 "lng_new_version_minor" = "— Resolução de bugs e outras melhorias menores";
-"lng_new_version_text" = "GRUPOS PÚBLICOS, POSTS FIXADOS, 5.000 MEMBROS\n\n— Grupos agora podem ter até 5.000 membros (mais que 1.000)\n— Grupos de qualquer tamanho podem ser convertidos a supergrupos\n\nNovas ferramentas para administradores dos supergrupos:\n\n— Torne seu grupo público configurando um link público - qualquer um poderá ver a conversa e entrar nela\n— Fixe mensagens para manter as atualizações mais importantes visíveis e notificar todos os membros\n— Selecione várias mensagens para apagar, reporte por spam, bloqueie usuários ou remova todas as mensagens de certos usuários\n\nMais sobre essa atualização:\n{link}";
+"lng_new_version_text" = "BOTS 2.0\n\n— Apresentamos a API para bots 2.0, a maior atualização de nossa plataforma para bots desde junho de 2015.\n— A partir de agora, os bots podem atualizar as mensagens existentes em tempo real, assim como interagir com elas.\n— Os novos teclados integrados com callback, botões para 'Abrir URL' ou 'Alterar para modo integrado', ajudam a criar uma interface fluída.\n— Os bots integrados agora podem enviar qualquer tipo de anexo suportado no Telegram (vídeos, músicas, stickers, arquivos, etc.).\n— Tente usar os bots de exemplos para ver o que está por vir: @music, @sticker, @youtube, @foursquare\n\nMais em: {link}";
 
 "lng_menu_insert_unicode" = "Inserir caractere de controle Unicode";
 

Telegram/Resources/style.txt

@@ -886,6 +886,8 @@ dlgPaddingVer: 8px;
 dlgHeight: 62px;
 dlgPhotoPadding: 12px;
 
+dlgImportantHeight: 37px;
+
 noContactsHeight: 100px;
 noContactsFont: font(fsize);
 noContactsColor: #777;
@@ -950,8 +952,9 @@ dlgUnreadColor: #FFF;
 dlgUnreadBG: #6fc766;
 dlgUnreadMutedBG: #bbb;
 dlgUnreadFont: font(12px bold);
+dlgUnreadHeight: 19px;
+dlgUnreadTop: 1px;
 dlgUnreadPaddingHor: 5px;
-dlgUnreadPaddingVer: 1px;
 dlgUnreadRadius: 2px;
 dlgBG: #FFF;
 dlgHoverBG: #f5f5f5;
@@ -1052,8 +1055,8 @@ msgMinWidth: 190px;
 msgPhotoSize: 33px;
 msgPhotoSkip: 40px;
 msgPadding: margins(13px, 7px, 13px, 8px);
-msgMargin: margins(13px, 6px, 53px, 2px);
-msgMarginTopAttached: 2px;
+msgMargin: margins(13px, 10px, 53px, 2px);
+msgMarginTopAttached: 3px;
 msgLnkPadding: 2px; // for media open / save links
 msgBorder: #f0f0f0;
 msgInBg: #fff;
@@ -1085,11 +1088,27 @@ msgInReplyBarColor: #2fa9e2;
 msgOutReplyBarSelColor: #4da79f;
 msgInReplyBarSelColor: #2fa9e2;
 
+msgBotKbDuration: 200;
+msgBotKbFont: semiboldFont;
+msgBotKbOverOpacity: 0.1;
+msgBotKbIconPadding: 2px;
+msgBotKbUrlIcon: sprite(188px, 338px, 10px, 10px);
+//msgBotKbRequestPhoneIcon: msgBotKbUrlIcon;
+//msgBotKbRequestLocationIcon: msgBotKbUrlIcon;
+msgBotKbSwitchPmIcon: sprite(188px, 348px, 10px, 10px);
+msgBotKbButton: botKeyboardButton {
+	margin: 5px;
+	padding: 10px;
+	height: 36px;
+	textTop: 8px;
+	downTextTop: 9px;
+}
+
 msgServiceBg: #89a0b47f;
 msgServiceSelectBg: #bbc8d4a2;
 msgServiceColor: #FFF;
 msgServicePadding: margins(12px, 3px, 12px, 4px);
-msgServiceMargin: margins(10px, 9px, 80px, 5px);
+msgServiceMargin: margins(10px, 10px, 80px, 2px);
 
 msgColor: #000;
 msgDateColor: #000;
@@ -1473,6 +1492,11 @@ replyCancel: iconedButton(btnDefIconed) {
 	width: 49px;
 	height: 49px;
 }
+inlineBotCancel: iconedButton(replyCancel) {
+	height: 46px;
+	iconPos: point(-1px, 16px); // < 0 means draw in the center of the button
+	downIconPos: point(-1px, 17px);
+}
 forwardIcon: sprite(368px, 197px, 24px, 24px);
 
 historyScroll: flatScroll(scrollDef) {
@@ -1527,6 +1551,7 @@ reportSpamBg: #fffffff0;
 newMsgSound: ':/gui/art/newmsg.wav';
 
 unreadBarHeight: 32px;
+unreadBarMargin: 8px;
 unreadBarFont: semiboldFont;
 unreadBarBG: #fcfbfa;
 unreadBarBorder: shadowColor;
@@ -2097,16 +2122,16 @@ verifiedCheckInv: sprite(299px, 221px, 14px, 14px);
 verifiedCheckPos: point(4px, 2px);
 
 botKbDuration: 200;
-botKbBg: #f7f7f7;
-botKbOverBg: #e8ecef;
-botKbDownBg: #dfe3e6;
-botKbColor: #8a8a8f;
-botKbFont: font(16px);
+botKbBg: #edf1f5;
+botKbOverBg: #d8e2ec;
+botKbDownBg: #d8e2ec;
+botKbColor: #4b565f;
+botKbFont: font(15px semibold);
 botKbButton: botKeyboardButton {
 	margin: 10px;
 	padding: 10px;
-	height: 36px;
-	textTop: 8px;
+	height: 38px;
+	textTop: 9px;
 	downTextTop: 9px;
 }
 botKbTinyButton: botKeyboardButton {
@@ -2114,12 +2139,17 @@ botKbTinyButton: botKeyboardButton {
 	padding: 3px;
 	height: 25px;
 	textTop: 2px;
-	downTextTop: 3px;
+	downTextTop: 2px;
 }
 botKbScroll: flatScroll(solidScroll) {
 	deltax: 3px;
 	width: 10px;
 }
+switchPmButton: BoxButton(defaultBoxButton) {
+	width: 320px;
+	height: 34px;
+	textTop: 7px;
+}
 
 minPhotoSize: 100px;
 maxMediaSize: 420px;
@@ -2460,7 +2490,7 @@ linksDateMargin: margins(0px, 15px, 0px, 2px);
 linksPhotoCheck: sprite(184px, 196px, 16px, 16px);
 linksPhotoChecked: sprite(168px, 196px, 16px, 16px);
 
-inlineResultsLeft: 15px;
+inlineResultsLeft: 11px;
 inlineResultsSkip: 3px;
 inlineMediaHeight: 96px;
 inlineThumbSize: 64px;
@@ -2469,6 +2499,8 @@ inlineDescriptionFg: #8a8a8a;
 inlineRowMargin: 6px;
 inlineRowBorder: linksBorder;
 inlineRowBorderFg: linksBorderFg;
+inlineRowFileNameTop: 2px;
+inlineRowFileDescriptionTop: 23px;
 inlineResultsMinWidth: 64px;
 inlineDurationMargin: 3px;
 
@@ -2476,3 +2508,17 @@ editTextArea: InputArea(defaultInputArea) {
 	textMargins: margins(1px, 6px, 1px, 4px);
 	heightMax: 256px;
 }
+
+toastFont: normalFont;
+toastMaxWidth: 480px;
+toastMinMargin: 13px;
+toastBg: medviewSaveMsg;
+toastFg: #FFF;
+toastPadding: margins(19px, 13px, 19px, 12px);
+toastFadeInDuration: 200;
+toastFadeOutDuration: 1000;
+
+infoButton: PeerAvatarButton {
+	size: topBarHeight;
+	photoSize: 42px;
+}

Telegram/Resources/style_classes.txt

@@ -405,3 +405,8 @@ InputField {
 	iconSprite: sprite;
 	iconPosition: point;
 }
+
+PeerAvatarButton {
+	size: number;
+	photoSize: number;
+}

Telegram/Setup.iss

@@ -25,10 +25,10 @@ DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 OutputDir=.\..\Win32\Deploy
 OutputBaseFilename=tsetup.{#MyAppVersionFull}
-SetupIconFile=.\SourceFiles\art\icon256.ico
+SetupIconFile=.\Resources\art\icon256.ico
 UninstallDisplayIcon={app}\Telegram.exe
 Compression=lzma
-SolidCompression=yes         
+SolidCompression=yes
 DisableStartupPrompt=yes
 PrivilegesRequired=lowest
 VersionInfoVersion={#MyAppVersion}.0

Telegram/SourceFiles/Telegram.plist

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Created by Qt/QMake</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleExecutable</key>
-	<string>Telegram</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>NOTE</key>
-	<string>This file was generated by Qt/QMake.</string>
-</dict>
-</plist>

Telegram/SourceFiles/_other/genemoji.cpp

@@ -1944,7 +1944,7 @@ to link the code of portions of this program with the OpenSSL library.\n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
 Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
 */\n";
-			tcpp << "#include \"stdafx.h\"\n#include \"gui/emoji_config.h\"\n\n";
+			tcpp << "#include \"stdafx.h\"\n#include \"ui/emoji_config.h\"\n\n";
 
 			tcpp << "namespace {\n"; // namespace with data
 			tcpp << "\tEmojiData *emojis = 0;\n";

Telegram/SourceFiles/_other/genlang.cpp

@@ -432,7 +432,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
 					QMap<QByteArray, QVector<QString> > &countedTags(keysCounted[keysOrder[i]]);
 					if (!countedTags.isEmpty()) {
 						for (QMap<QByteArray, QVector<QString> >::const_iterator j = countedTags.cbegin(), e = countedTags.cend(); j != e; ++j) {
-							const QVector<QString> &counted(*j);
+							const auto &counted(*j);
 							for (int k = 0, s = counted.size(); k < s; ++k) {
 								th << "\t" << keysOrder[i] << "__" + j.key() + QString::number(k).toUtf8() << ",\n";
 							}
@@ -510,7 +510,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
 					QMap<QByteArray, QVector<QString> > &countedTags(keysCounted[keysOrder[i]]);
 					if (!countedTags.isEmpty()) {
 						for (QMap<QByteArray, QVector<QString> >::const_iterator j = countedTags.cbegin(), e = countedTags.cend(); j != e; ++j) {
-							const QVector<QString> &counted(*j);
+							const auto &counted(*j);
 							for (int k = 0, s = counted.size(); k < s; ++k) {
 								tcpp << "\t\t\"" << keysOrder[i] << "__" + j.key() + QString::number(k).toUtf8() << "\",\n";
 							}
@@ -534,7 +534,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
 				QMap<QByteArray, QVector<QString> > &countedTags(keysCounted[keysOrder[i]]);
 				if (!countedTags.isEmpty()) {
 					for (QMap<QByteArray, QVector<QString> >::const_iterator j = countedTags.cbegin(), e = countedTags.cend(); j != e; ++j) {
-						const QVector<QString> &counted(*j);
+						const auto &counted(*j);
 						for (int k = 0, s = counted.size(); k < s; ++k) {
 							writeCppKey(tcpp, keysOrder[i] + "__" + j.key() + QString::number(k).toUtf8(), counted[k]);
 						}

Telegram/SourceFiles/_other/genstyles.cpp

@@ -383,7 +383,7 @@ to link the code of portions of this program with the OpenSSL library.\n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
 Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
 */\n";
-			tout << "#pragma once\n\n#include \"style.h\"\n\nnamespace style {\n";
+			tout << "#pragma once\n\n#include \"ui/style.h\"\n\nnamespace style {\n";
 			for (int i = 0, l = byIndex.size(); i < l; ++i) {
 				ClassData &cls(byIndex[i]);
 				classes.insert(cls.name, cls);
@@ -1064,7 +1064,7 @@ ScalarValue prepareFont(int variant, const string &name, const char *&text, cons
 
 	string size, family;
 	int flags = 0;
-	bool sizepx;
+	bool sizepx = false;
 
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 (%2) while reading font() cons!").arg(type).arg(token.c_str()));
@@ -1544,7 +1544,7 @@ to link the code of portions of this program with the OpenSSL library.\n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
 Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
 */\n";
-			tout << "#pragma once\n\n#include \"style.h\"\n\nnamespace st {\n";
+			tout << "#pragma once\n\n#include \"ui/style.h\"\n\nnamespace st {\n";
 			tcpp << "\
 /*\n\
 Created from \'/Resources/style.txt\' by \'/MetaStyle\' project\n\

Telegram/SourceFiles/_other/memain.cpp

@@ -21,7 +21,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include "memain.h"
 
 int main(int argc, char *argv[]) {
-	QString emoji_in("./SourceFiles/art/emojisprite_"), emoji_out("./SourceFiles/gui/emoji_config.cpp"), emoji_png("./SourceFiles/art/emoji");
+	QString emoji_in("./Resources/art/emojisprite_"), emoji_out("./SourceFiles/gui/emoji_config.cpp"), emoji_png("./Resources/art/emoji");
 	for (int i = 0; i < argc; ++i) {
 		if (string("-emoji_in") == argv[i]) {
 			if (++i < argc) emoji_in = argv[i];

Telegram/SourceFiles/_other/msmain.cpp

@@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include <QtCore/QDir>
 
 int main(int argc, char *argv[]) {
-	QString classes_in("style_classes.txt"), classes_out("style_classes.h"), styles_in("style.txt"), styles_out("style_auto.h"), path_to_sprites("./SourceFiles/art/");
+	QString classes_in("style_classes.txt"), classes_out("style_classes.h"), styles_in("style.txt"), styles_out("style_auto.h"), path_to_sprites("./Resources/art/");
 	for (int i = 0; i < argc; ++i) {
 		if (string("-classes_in") == argv[i]) {
 			if (++i < argc) classes_in = argv[i];

Telegram/SourceFiles/apiwrap.cpp

@@ -19,11 +19,11 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 */
 #include "stdafx.h"
-#include "style.h"
+#include "ui/style.h"
 #include "lang.h"
 
 #include "application.h"
-#include "window.h"
+#include "mainwindow.h"
 #include "mainwidget.h"
 #include "apiwrap.h"
 
@@ -99,21 +99,21 @@ void ApiWrap::resolveMessageDatas() {
 void ApiWrap::gotMessageDatas(ChannelData *channel, const MTPmessages_Messages &msgs, mtpRequestId req) {
 	switch (msgs.type()) {
 	case mtpc_messages_messages: {
-		const MTPDmessages_messages &d(msgs.c_messages_messages());
+		const auto &d(msgs.c_messages_messages());
 		App::feedUsers(d.vusers);
 		App::feedChats(d.vchats);
 		App::feedMsgs(d.vmessages, NewMessageExisting);
 	} break;
 
 	case mtpc_messages_messagesSlice: {
-		const MTPDmessages_messagesSlice &d(msgs.c_messages_messagesSlice());
+		const auto &d(msgs.c_messages_messagesSlice());
 		App::feedUsers(d.vusers);
 		App::feedChats(d.vchats);
 		App::feedMsgs(d.vmessages, NewMessageExisting);
 	} break;
 
 	case mtpc_messages_channelMessages: {
-		const MTPDmessages_channelMessages &d(msgs.c_messages_channelMessages());
+		const auto &d(msgs.c_messages_channelMessages());
 		if (channel) {
 			channel->ptsReceived(d.vpts.v);
 		} else {
@@ -169,8 +169,8 @@ void ApiWrap::processFullPeer(PeerData *peer, const MTPUserFull &result) {
 }
 
 void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mtpRequestId req) {
-	const MTPDmessages_chatFull &d(result.c_messages_chatFull());
-	const QVector<MTPChat> &vc(d.vchats.c_vector().v);
+	const auto &d(result.c_messages_chatFull());
+	const auto &vc(d.vchats.c_vector().v);
 	bool badVersion = false;
 	if (peer->isChat()) {
 		badVersion = (!vc.isEmpty() && vc.at(0).type() == mtpc_chat && vc.at(0).c_chat().vversion.v < peer->asChat()->version);
@@ -186,13 +186,13 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 			LOG(("MTP Error: bad type in gotChatFull for chat: %1").arg(d.vfull_chat.type()));
 			return;
 		}
-		const MTPDchatFull &f(d.vfull_chat.c_chatFull());
+		const auto &f(d.vfull_chat.c_chatFull());
 		App::feedParticipants(f.vparticipants, false, false);
-		const QVector<MTPBotInfo> &v(f.vbot_info.c_vector().v);
+		const auto &v(f.vbot_info.c_vector().v);
 		for (QVector<MTPBotInfo>::const_iterator i = v.cbegin(), e = v.cend(); i < e; ++i) {
 			switch (i->type()) {
 			case mtpc_botInfo: {
-				const MTPDbotInfo &b(i->c_botInfo());
+				const auto &b(i->c_botInfo());
 				UserData *user = App::userLoaded(b.vuser_id.v);
 				if (user) {
 					user->setBotInfo(*i);
@@ -218,7 +218,7 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 			LOG(("MTP Error: bad type in gotChatFull for channel: %1").arg(d.vfull_chat.type()));
 			return;
 		}
-		const MTPDchannelFull &f(d.vfull_chat.c_channelFull());
+		const auto &f(d.vfull_chat.c_channelFull());
 		PhotoData *photo = App::feedPhoto(f.vchat_photo);
 		ChannelData *channel = peer->asChannel();
 		channel->flagsFull = f.vflags.v;
@@ -245,7 +245,7 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 						if (!h->isEmpty()) {
 							h->clear(true);
 						}
-						if (hto->inChatList() && h->inChatList()) {
+						if (hto->inChatList(Dialogs::Mode::All) && h->inChatList(Dialogs::Mode::All)) {
 							App::removeDialog(h);
 						}
 					}
@@ -257,11 +257,11 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 				App::main()->peerUpdated(cfrom);
 			}
 		}
-		const QVector<MTPBotInfo> &v(f.vbot_info.c_vector().v);
+		const auto &v(f.vbot_info.c_vector().v);
 		for (QVector<MTPBotInfo>::const_iterator i = v.cbegin(), e = v.cend(); i < e; ++i) {
 			switch (i->type()) {
 			case mtpc_botInfo: {
-				const MTPDbotInfo &b(i->c_botInfo());
+				const auto &b(i->c_botInfo());
 				UserData *user = App::userLoaded(b.vuser_id.v);
 				if (user) {
 					user->setBotInfo(*i);
@@ -321,7 +321,7 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 }
 
 void ApiWrap::gotUserFull(PeerData *peer, const MTPUserFull &result, mtpRequestId req) {
-	const MTPDuserFull &d(result.c_userFull());
+	const auto &d(result.c_userFull());
 	App::feedUsers(MTP_vector<MTPUser>(1, d.vuser), false);
 	if (d.has_profile_photo()) {
 		App::feedPhoto(d.vprofile_photo);
@@ -351,7 +351,7 @@ void ApiWrap::gotUserFull(PeerData *peer, const MTPUserFull &result, mtpRequestI
 }
 
 bool ApiWrap::gotPeerFullFailed(PeerData *peer, const RPCError &error) {
-	if (mtpIsFlood(error)) return false;
+	if (MTP::isDefaultHandledError(error)) return false;
 
 	_fullPeerRequests.remove(peer);
 	return true;
@@ -399,7 +399,7 @@ void ApiWrap::requestLastParticipants(ChannelData *peer, bool fromStart) {
 	if ((needAdmins && adminsOutdated) || peer->lastParticipantsCountOutdated()) {
 		fromStart = true;
 	}
-	QMap<PeerData*, mtpRequestId>::iterator i = _participantsRequests.find(peer);
+	auto i = _participantsRequests.find(peer);
 	if (i != _participantsRequests.cend()) {
 		if (fromStart && i.value() < 0) { // was not loading from start
 			_participantsRequests.erase(i);
@@ -420,7 +420,7 @@ void ApiWrap::gotChat(PeerData *peer, const MTPmessages_Chats &result) {
 	_peerRequests.remove(peer);
 
 	if (result.type() == mtpc_messages_chats) {
-		const QVector<MTPChat> &v(result.c_messages_chats().vchats.c_vector().v);
+		const auto &v(result.c_messages_chats().vchats.c_vector().v);
 		bool badVersion = false;
 		if (peer->isChat()) {
 			badVersion = (!v.isEmpty() && v.at(0).type() == mtpc_chat && v.at(0).c_chat().vversion.v < peer->asChat()->version);
@@ -458,7 +458,7 @@ void ApiWrap::gotUsers(const MTPVector<MTPUser> &result) {
 }
 
 bool ApiWrap::gotPeerFailed(PeerData *peer, const RPCError &error) {
-	if (mtpIsFlood(error)) return false;
+	if (MTP::isDefaultHandledError(error)) return false;
 
 	_peerRequests.remove(peer);
 	return true;
@@ -491,8 +491,8 @@ void ApiWrap::lastParticipantsDone(ChannelData *peer, const MTPchannels_ChannelP
 		peer->mgInfo->lastParticipantsStatus = MegagroupInfo::LastParticipantsUpToDate;
 	}
 
-	const MTPDchannels_channelParticipants &d(result.c_channels_channelParticipants());
-	const QVector<MTPChannelParticipant> &v(d.vparticipants.c_vector().v);
+	const auto &d(result.c_channels_channelParticipants());
+	const auto &v(d.vparticipants.c_vector().v);
 	App::feedUsers(d.vusers);
 	bool added = false, needBotsInfos = false;
 	int32 botStatus = peer->mgInfo->botStatus;
@@ -555,7 +555,7 @@ void ApiWrap::lastParticipantsDone(ChannelData *peer, const MTPchannels_ChannelP
 }
 
 bool ApiWrap::lastParticipantsFail(ChannelData *peer, const RPCError &error, mtpRequestId req) {
-	if (mtpIsFlood(error)) return false;
+	if (MTP::isDefaultHandledError(error)) return false;
 	if (_participantsRequests.value(peer) == req || _participantsRequests.value(peer) == -req) {
 		_participantsRequests.remove(peer);
 	} else if (_botsRequests.value(peer) == req) {
@@ -578,27 +578,27 @@ void ApiWrap::gotSelfParticipant(ChannelData *channel, const MTPchannels_Channel
 		return;
 	}
 
-	const MTPDchannels_channelParticipant &p(result.c_channels_channelParticipant());
+	const auto &p(result.c_channels_channelParticipant());
 	App::feedUsers(p.vusers);
 
 	switch (p.vparticipant.type()) {
 	case mtpc_channelParticipantSelf: {
-		const MTPDchannelParticipantSelf &d(p.vparticipant.c_channelParticipantSelf());
+		const auto &d(p.vparticipant.c_channelParticipantSelf());
 		channel->inviter = d.vinviter_id.v;
 		channel->inviteDate = date(d.vdate);
 	} break;
 	case mtpc_channelParticipantCreator: {
-		const MTPDchannelParticipantCreator &d(p.vparticipant.c_channelParticipantCreator());
+		const auto &d(p.vparticipant.c_channelParticipantCreator());
 		channel->inviter = MTP::authedId();
 		channel->inviteDate = date(MTP_int(channel->date));
 	} break;
 	case mtpc_channelParticipantModerator: {
-		const MTPDchannelParticipantModerator &d(p.vparticipant.c_channelParticipantModerator());
+		const auto &d(p.vparticipant.c_channelParticipantModerator());
 		channel->inviter = d.vinviter_id.v;
 		channel->inviteDate = date(d.vdate);
 	} break;
 	case mtpc_channelParticipantEditor: {
-		const MTPDchannelParticipantEditor &d(p.vparticipant.c_channelParticipantEditor());
+		const auto &d(p.vparticipant.c_channelParticipantEditor());
 		channel->inviter = d.vinviter_id.v;
 		channel->inviteDate = date(d.vdate);
 	} break;
@@ -609,7 +609,7 @@ void ApiWrap::gotSelfParticipant(ChannelData *channel, const MTPchannels_Channel
 }
 
 bool ApiWrap::gotSelfParticipantFail(ChannelData *channel, const RPCError &error) {
-	if (mtpIsFlood(error)) return false;
+	if (MTP::isDefaultHandledError(error)) return false;
 
 	if (error.type() == qstr("USER_NOT_PARTICIPANT")) {
 		channel->inviter = -1;
@@ -655,7 +655,7 @@ void ApiWrap::kickParticipantDone(KickRequest kick, const MTPUpdates &result, mt
 }
 
 bool ApiWrap::kickParticipantFail(KickRequest kick, const RPCError &error, mtpRequestId req) {
-	if (mtpIsFlood(error)) return false;
+	if (MTP::isDefaultHandledError(error)) return false;
 	_kickRequests.remove(kick);
 	return true;
 }
@@ -680,10 +680,10 @@ void ApiWrap::gotStickerSet(uint64 setId, const MTPmessages_StickerSet &result)
 	_stickerSetRequests.remove(setId);
 
 	if (result.type() != mtpc_messages_stickerSet) return;
-	const MTPDmessages_stickerSet &d(result.c_messages_stickerSet());
+	const auto &d(result.c_messages_stickerSet());
 
 	if (d.vset.type() != mtpc_stickerSet) return;
-	const MTPDstickerSet &s(d.vset.c_stickerSet());
+	const auto &s(d.vset.c_stickerSet());
 
 	Stickers::Sets &sets(Global::RefStickerSets());
 	auto it = sets.find(setId);
@@ -695,7 +695,7 @@ void ApiWrap::gotStickerSet(uint64 setId, const MTPmessages_StickerSet &result)
 	it->title = stickerSetTitle(s);
 	it->flags = s.vflags.v;
 
-	const QVector<MTPDocument> &d_docs(d.vdocuments.c_vector().v);
+	const auto &d_docs(d.vdocuments.c_vector().v);
 	auto custom = sets.find(Stickers::CustomSetId);
 
 	StickerPack pack;
@@ -735,13 +735,13 @@ void ApiWrap::gotStickerSet(uint64 setId, const MTPmessages_StickerSet &result)
 	} else {
 		it->stickers = pack;
 		it->emoji.clear();
-		const QVector<MTPStickerPack> &v(d.vpacks.c_vector().v);
+		const auto &v(d.vpacks.c_vector().v);
 		for (int32 i = 0, l = v.size(); i < l; ++i) {
 			if (v.at(i).type() != mtpc_stickerPack) continue;
 
-			const MTPDstickerPack &pack(v.at(i).c_stickerPack());
+			const auto &pack(v.at(i).c_stickerPack());
 			if (EmojiPtr e = emojiGetNoColor(emojiFromText(qs(pack.vemoticon)))) {
-				const QVector<MTPlong> &stickers(pack.vdocuments.c_vector().v);
+				const auto &stickers(pack.vdocuments.c_vector().v);
 				StickerPack p;
 				p.reserve(stickers.size());
 				for (int32 j = 0, c = stickers.size(); j < c; ++j) {
@@ -765,7 +765,7 @@ void ApiWrap::gotStickerSet(uint64 setId, const MTPmessages_StickerSet &result)
 }
 
 bool ApiWrap::gotStickerSetFail(uint64 setId, const RPCError &error) {
-	if (mtpIsFlood(error)) return false;
+	if (MTP::isDefaultHandledError(error)) return false;
 
 	_stickerSetRequests.remove(setId);
 	return true;
@@ -861,21 +861,21 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs
 	const QVector<MTPMessage> *v = 0;
 	switch (msgs.type()) {
 	case mtpc_messages_messages: {
-		const MTPDmessages_messages &d(msgs.c_messages_messages());
+		const auto &d(msgs.c_messages_messages());
 		App::feedUsers(d.vusers);
 		App::feedChats(d.vchats);
 		v = &d.vmessages.c_vector().v;
 	} break;
 
 	case mtpc_messages_messagesSlice: {
-		const MTPDmessages_messagesSlice &d(msgs.c_messages_messagesSlice());
+		const auto &d(msgs.c_messages_messagesSlice());
 		App::feedUsers(d.vusers);
 		App::feedChats(d.vchats);
 		v = &d.vmessages.c_vector().v;
 	} break;
 
 	case mtpc_messages_channelMessages: {
-		const MTPDmessages_channelMessages &d(msgs.c_messages_channelMessages());
+		const auto &d(msgs.c_messages_channelMessages());
 		if (channel) {
 			channel->ptsReceived(d.vpts.v);
 		} else {
@@ -894,7 +894,7 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs
 	if (!v) return;
 	QMap<uint64, int32> msgsIds; // copied from feedMsgs
 	for (int32 i = 0, l = v->size(); i < l; ++i) {
-		const MTPMessage &msg(v->at(i));
+		const auto &msg(v->at(i));
 		switch (msg.type()) {
 		case mtpc_message: msgsIds.insert((uint64(uint32(msg.c_message().vid.v)) << 32) | uint64(i), i); break;
 		case mtpc_messageEmpty: msgsIds.insert((uint64(uint32(msg.c_messageEmpty().vid.v)) << 32) | uint64(i), i); break;

Telegram/SourceFiles/apiwrap.h

@@ -28,7 +28,7 @@ public:
 	ApiWrap(QObject *parent);
 	void init();
 
-	typedef SharedCallback2<void, ChannelData*, MsgId> RequestMessageDataCallback;
+	typedef SharedCallback<void, ChannelData*, MsgId> RequestMessageDataCallback;
 	void requestMessageData(ChannelData *channel, MsgId msgId, RequestMessageDataCallback *callback);
 
 	void requestFullPeer(PeerData *peer);
@@ -69,7 +69,7 @@ private:
 	struct MessageDataRequest {
 		MessageDataRequest() : req(0) {
 		}
-		typedef SharedCallback2<void, ChannelData*, MsgId>::Ptr CallbackPtr;
+		typedef SharedCallback<void, ChannelData*, MsgId>::Ptr CallbackPtr;
 		typedef QList<CallbackPtr> Callbacks;
 		mtpRequestId req;
 		Callbacks callbacks;

Telegram/SourceFiles/app.cpp

@@ -19,8 +19,10 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 */
 #include "stdafx.h"
-#include "lang.h"
+#include "app.h"
 
+#include "lang.h"
+#include "dialogs/dialogs_layout.h"
 #include "audio.h"
 #include "application.h"
 #include "fileuploader.h"
@@ -29,7 +31,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include <libexif/exif-data.h>
 #endif
 #include "localstorage.h"
-
+#include "apiwrap.h"
 #include "numbers.h"
 
 namespace {
@@ -55,12 +57,6 @@ namespace {
 	typedef QHash<WebPageId, WebPageData*> WebPagesData;
 	WebPagesData webPagesData;
 
-	typedef QMap<MsgId, ReplyMarkup> ReplyMarkups;
-	ReplyMarkups replyMarkups;
-	ReplyMarkup zeroMarkup(qFlags(MTPDreplyKeyboardMarkup_ClientFlag::f_zero));
-	typedef QMap<ChannelId, ReplyMarkups> ChannelReplyMarkups;
-	ChannelReplyMarkups channelReplyMarkups;
-
 	PhotoItems photoItems;
 	DocumentItems documentItems;
 	WebPageItems webPageItems;
@@ -111,9 +107,6 @@ namespace {
 	typedef QHash<PhotoData*, LastPhotosList::iterator> LastPhotosMap;
 	LastPhotosMap lastPhotosMap;
 
-	typedef QMap<FileLoader*, InlineResult*> InlineResultLoaders;
-	InlineResultLoaders inlineResultLoaders;
-
 	style::color _msgServiceBg;
 	style::color _msgServiceSelectBg;
 	style::color _historyScrollBarColor;
@@ -153,23 +146,29 @@ namespace App {
 		return AppClass::app();
 	}
 
-	Window *wnd() {
+	MainWindow *wnd() {
 		return AppClass::wnd();
 	}
 
 	MainWidget *main() {
-		Window *w(wnd());
-		return w ? w->mainWidget() : 0;
+		if (auto w = wnd()) {
+			return w->mainWidget();
+		}
+		return nullptr;
 	}
 
 	SettingsWidget *settings() {
-		Window *w(wnd());
-		return w ? w->settingsWidget() : 0;
+		if (auto w = wnd()) {
+			return w->settingsWidget();
+		}
+		return nullptr;
 	}
 
 	bool passcoded() {
-		Window *w(wnd());
-		return w ? w->passcodeWidget() : 0;
+		if (auto w = wnd()) {
+			return w->passcodeWidget();
+		}
+		return false;
 	}
 
 	FileUploader *uploader() {
@@ -180,21 +179,19 @@ namespace App {
 		return main() ? main()->api() : 0;
 	}
 
+namespace {
 	bool loggedOut() {
-		Window *w(wnd());
 		if (cHasPasscode()) {
 			cSetHasPasscode(false);
 		}
 		if (audioPlayer()) {
 			audioPlayer()->stopAndClear();
 		}
-		if (w) {
+		if (auto w = wnd()) {
 			w->tempDirDelete(Local::ClearManagerAll);
 			w->notifyClearFast();
 			w->setupIntro(true);
 		}
-		MainWidget *m(main());
-		if (m) m->destroyData();
 		MTP::authed(0);
 		Local::reset();
 
@@ -205,13 +202,14 @@ namespace App {
 		globalNotifyChatsPtr = UnknownNotifySettings;
 		if (App::uploader()) App::uploader()->clear();
 		clearStorageImages();
-		if (w) {
+		if (auto w = wnd()) {
 			w->getTitle()->updateBackButton();
 			w->updateTitleStatus();
 			w->getTitle()->resizeEvent(0);
 		}
 		return true;
 	}
+} // namespace
 
 	void logOut() {
 		if (MTP::started()) {
@@ -366,16 +364,16 @@ namespace App {
 
 	UserData *feedUsers(const MTPVector<MTPUser> &users, bool emitPeerUpdated) {
         UserData *data = 0;
-		const QVector<MTPUser> &v(users.c_vector().v);
+		const auto &v(users.c_vector().v);
 		for (QVector<MTPUser>::const_iterator i = v.cbegin(), e = v.cend(); i != e; ++i) {
-			const MTPuser &user(*i);
+			const auto &user(*i);
             data = 0;
 			bool wasContact = false, minimal = false;
 			const MTPUserStatus *status = 0, emptyStatus = MTP_userStatusEmpty();
 
 			switch (user.type()) {
 			case mtpc_userEmpty: {
-				const MTPDuserEmpty &d(user.c_userEmpty());
+				const auto &d(user.c_userEmpty());
 
 				PeerId peer(peerFromUser(d.vid.v));
 				data = App::user(peer);
@@ -391,7 +389,7 @@ namespace App {
 				data->contact = -1;
 			} break;
 			case mtpc_user: {
-				const MTPDuser &d(user.c_user());
+				const auto &d(user.c_user());
 				minimal = d.is_min();
 
 				PeerId peer(peerFromUser(d.vid.v));
@@ -437,13 +435,17 @@ namespace App {
 
 					bool showPhone = !isServiceUser(data->id) && !d.is_self() && !d.is_contact() && !d.is_mutual_contact();
 					bool showPhoneChanged = !isServiceUser(data->id) && !d.is_self() && ((showPhone && data->contact) || (!showPhone && !data->contact));
+					if (minimal) {
+						showPhoneChanged = false;
+						showPhone = !isServiceUser(data->id) && (data->id != peerFromUser(MTP::authedId())) && !data->contact;
+					}
 
 					// see also Local::readPeer
 
 					QString pname = (showPhoneChanged || phoneChanged || nameChanged) ? ((showPhone && !phone.isEmpty()) ? formatPhone(phone) : QString()) : data->nameOrPhone;
 
 					if (!minimal && d.is_self() && uname != data->username) {
-						SignalHandlers::setSelfUsername(uname);
+						SignalHandlers::setCrashAnnotation("Username", uname);
 					}
 					data->setName(fname, lname, pname, uname);
 					if (d.has_photo()) {
@@ -520,14 +522,14 @@ namespace App {
 
 	PeerData *feedChats(const MTPVector<MTPChat> &chats, bool emitPeerUpdated) {
 		PeerData *data = 0;
-		const QVector<MTPChat> &v(chats.c_vector().v);
+		const auto &v(chats.c_vector().v);
 		for (QVector<MTPChat>::const_iterator i = v.cbegin(), e = v.cend(); i != e; ++i) {
-			const MTPchat &chat(*i);
+			const auto &chat(*i);
 			data = 0;
 			bool minimal = false;
 			switch (chat.type()) {
 			case mtpc_chat: {
-				const MTPDchat &d(chat.c_chat());
+				const auto &d(chat.c_chat());
 
 				data = App::chat(peerFromChat(d.vid.v));
 				data->input = MTP_inputPeerChat(d.vid);
@@ -539,7 +541,7 @@ namespace App {
 				cdata->date = d.vdate.v;
 
 				if (d.has_migrated_to() && d.vmigrated_to.type() == mtpc_inputChannel) {
-					const MTPDinputChannel &c(d.vmigrated_to.c_inputChannel());
+					const auto &c(d.vmigrated_to.c_inputChannel());
 					ChannelData *channel = App::channel(peerFromChannel(c.vchannel_id));
 					if (!channel->mgInfo) {
 						channel->flags |= MTPDchannel::Flag::f_megagroup;
@@ -561,7 +563,7 @@ namespace App {
 								if (!h->isEmpty()) {
 									h->clear(true);
 								}
-								if (hto->inChatList() && h->inChatList()) {
+								if (hto->inChatList(Dialogs::Mode::All) && h->inChatList(Dialogs::Mode::All)) {
 									App::removeDialog(h);
 								}
 							}
@@ -586,7 +588,7 @@ namespace App {
 				}
 			} break;
 			case mtpc_chatForbidden: {
-				const MTPDchatForbidden &d(chat.c_chatForbidden());
+				const auto &d(chat.c_chatForbidden());
 
 				data = App::chat(peerFromChat(d.vid.v));
 				data->input = MTP_inputPeerChat(d.vid);
@@ -602,7 +604,7 @@ namespace App {
 				cdata->isForbidden = true;
 			} break;
 			case mtpc_channel: {
-				const MTPDchannel &d(chat.c_channel());
+				const auto &d(chat.c_channel());
 
 				PeerId peer(peerFromChannel(d.vid.v));
 				minimal = d.is_min();
@@ -642,7 +644,7 @@ namespace App {
 				cdata->setPhoto(d.vphoto);
 			} break;
 			case mtpc_channelForbidden: {
-				const MTPDchannelForbidden &d(chat.c_channelForbidden());
+				const auto &d(chat.c_channelForbidden());
 
 				PeerId peer(peerFromChannel(d.vid.v));
 				data = App::channel(peer);
@@ -684,18 +686,18 @@ namespace App {
 		ChatData *chat = 0;
 		switch (p.type()) {
 		case mtpc_chatParticipantsForbidden: {
-			const MTPDchatParticipantsForbidden &d(p.c_chatParticipantsForbidden());
+			const auto &d(p.c_chatParticipantsForbidden());
 			chat = App::chat(d.vchat_id.v);
 			chat->count = -1;
 			chat->invalidateParticipants();
 		} break;
 
 		case mtpc_chatParticipants: {
-			const MTPDchatParticipants &d(p.c_chatParticipants());
+			const auto &d(p.c_chatParticipants());
 			chat = App::chat(d.vchat_id.v);
 			if (!requestBotInfos || chat->version <= d.vversion.v) { // !requestBotInfos is true on getFullChat result
 				chat->version = d.vversion.v;
-				const QVector<MTPChatParticipant> &v(d.vparticipants.c_vector().v);
+				const auto &v(d.vparticipants.c_vector().v);
 				chat->count = v.size();
 				int32 pversion = chat->participants.isEmpty() ? 1 : (chat->participants.begin().value() + 1);
 				chat->invitedByMe = ChatData::InvitedByMe();
@@ -705,17 +707,17 @@ namespace App {
 					int32 uid = 0, inviter = 0;
 					switch (i->type()) {
 					case mtpc_chatParticipantCreator: {
-						const MTPDchatParticipantCreator &p(i->c_chatParticipantCreator());
+						const auto &p(i->c_chatParticipantCreator());
 						uid = p.vuser_id.v;
 						chat->creator = uid;
 					} break;
 					case mtpc_chatParticipantAdmin: {
-						const MTPDchatParticipantAdmin &p(i->c_chatParticipantAdmin());
+						const auto &p(i->c_chatParticipantAdmin());
 						uid = p.vuser_id.v;
 						inviter = p.vinviter_id.v;
 					} break;
 					case mtpc_chatParticipant: {
-						const MTPDchatParticipant &p(i->c_chatParticipant());
+						const auto &p(i->c_chatParticipant());
 						uid = p.vuser_id.v;
 						inviter = p.vinviter_id.v;
 					} break;
@@ -965,7 +967,7 @@ namespace App {
 		}
 		if (HistoryItem *existing = App::histItemById(peerToChannel(peerId), m.vid.v)) {
 			existing->setText(qs(m.vmessage), m.has_entities() ? entitiesFromMTP(m.ventities.c_vector().v) : EntitiesInText());
-			existing->updateMedia(m.has_media() ? (&m.vmedia) : 0);
+			existing->updateMedia(m.has_media() ? (&m.vmedia) : nullptr);
 			existing->setViewsCount(m.has_views() ? m.vviews.v : -1);
 			existing->addToOverview(AddToOverviewNew);
 
@@ -985,15 +987,7 @@ namespace App {
 			peerId = peerFromUser(m.vfrom_id);
 		}
 		if (HistoryItem *existing = App::histItemById(peerToChannel(peerId), m.vid.v)) {
-			existing->setText(qs(m.vmessage), m.has_entities() ? entitiesFromMTP(m.ventities.c_vector().v) : EntitiesInText());
-			existing->updateMedia(m.has_media() ? (&m.vmedia) : 0, true);
-			existing->setViewsCount(m.has_views() ? m.vviews.v : -1);
-			if (existing->history()->textCachedFor == existing) {
-				existing->history()->textCachedFor = 0;
-			}
-			if (App::main()) {
-				App::main()->dlgUpdated(existing->history(), existing->id);
-			}
+			existing->applyEdition(m);
 		}
 	}
 
@@ -1027,10 +1021,10 @@ namespace App {
 	void feedMsgs(const QVector<MTPMessage> &msgs, NewMessageType type) {
 		QMap<uint64, int32> msgsIds;
 		for (int32 i = 0, l = msgs.size(); i < l; ++i) {
-			const MTPMessage &msg(msgs.at(i));
+			const auto &msg(msgs.at(i));
 			switch (msg.type()) {
 			case mtpc_message: {
-				const MTPDmessage &d(msg.c_message());
+				const auto &d(msg.c_message());
 				bool needToAdd = true;
 				if (type == NewMessageUnread) { // new message, index my forwarded messages to links overview
 					if (checkEntitiesAndViewsUpdate(d)) { // already in blocks
@@ -1058,17 +1052,17 @@ namespace App {
 	ImagePtr image(const MTPPhotoSize &size) {
 		switch (size.type()) {
 		case mtpc_photoSize: {
-			const MTPDphotoSize &d(size.c_photoSize());
+			const auto &d(size.c_photoSize());
 			if (d.vlocation.type() == mtpc_fileLocation) {
-				const MTPDfileLocation &l(d.vlocation.c_fileLocation());
+				const auto &l(d.vlocation.c_fileLocation());
 				return ImagePtr(StorageImageLocation(d.vw.v, d.vh.v, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v), d.vsize.v);
 			}
 		} break;
 		case mtpc_photoCachedSize: {
-			const MTPDphotoCachedSize &d(size.c_photoCachedSize());
+			const auto &d(size.c_photoCachedSize());
 			if (d.vlocation.type() == mtpc_fileLocation) {
-				const MTPDfileLocation &l(d.vlocation.c_fileLocation());
-				const string &s(d.vbytes.c_string().v);
+				const auto &l(d.vlocation.c_fileLocation());
+				const auto &s(d.vbytes.c_string().v);
 				QByteArray bytes(s.data(), s.size());
 				return ImagePtr(StorageImageLocation(d.vw.v, d.vh.v, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v), bytes);
 			} else if (d.vlocation.type() == mtpc_fileLocationUnavailable) {
@@ -1083,7 +1077,7 @@ namespace App {
 
 	StorageImageLocation imageLocation(int32 w, int32 h, const MTPFileLocation &loc) {
 		if (loc.type() == mtpc_fileLocation) {
-			const MTPDfileLocation &l(loc.c_fileLocation());
+			const auto &l(loc.c_fileLocation());
 			return StorageImageLocation(w, h, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v);
 		}
 		return StorageImageLocation(w, h, 0, 0, 0, 0);
@@ -1092,11 +1086,11 @@ namespace App {
 	StorageImageLocation imageLocation(const MTPPhotoSize &size) {
 		switch (size.type()) {
 		case mtpc_photoSize: {
-			const MTPDphotoSize &d(size.c_photoSize());
+			const auto &d(size.c_photoSize());
 			return imageLocation(d.vw.v, d.vh.v, d.vlocation);
 		} break;
 		case mtpc_photoCachedSize: {
-			const MTPDphotoCachedSize &d(size.c_photoCachedSize());
+			const auto &d(size.c_photoCachedSize());
 			return imageLocation(d.vw.v, d.vh.v, d.vlocation);
 		} break;
 		}
@@ -1149,8 +1143,8 @@ namespace App {
 			} else {
 				if (channelHistory) {
 					channelHistory->messageWithIdDeleted(i->v);
-					if (channelHistory->unreadCount > 0 && i->v >= channelHistory->inboxReadBefore) {
-						channelHistory->setUnreadCount(channelHistory->unreadCount - 1);
+					if (channelHistory->unreadCount() > 0 && i->v >= channelHistory->inboxReadBefore) {
+						channelHistory->setUnreadCount(channelHistory->unreadCount() - 1);
 					}
 				}
 			}
@@ -1163,9 +1157,9 @@ namespace App {
 	}
 
 	void feedUserLinks(const MTPVector<MTPcontacts_Link> &links, bool emitPeerUpdated) {
-		const QVector<MTPcontacts_Link> &v(links.c_vector().v);
+		const auto &v(links.c_vector().v);
 		for (QVector<MTPcontacts_Link>::const_iterator i = v.cbegin(), e = v.cend(); i != e; ++i) {
-			const MTPDcontacts_link &dv(i->c_contacts_link());
+			const auto &dv(i->c_contacts_link());
 			UserData *user = feedUsers(MTP_vector<MTPUser>(1, dv.vuser), false);
 			MTPint userId(MTP_int(0));
 			switch (dv.vuser.type()) {
@@ -1298,7 +1292,7 @@ namespace App {
 		}
 		switch (photo.type()) {
 		case mtpc_photo: {
-			const MTPDphoto &ph(photo.c_photo());
+			const auto &ph(photo.c_photo());
 			return App::photoSet(ph.vid.v, 0, ph.vaccess_hash.v, ph.vdate.v, ImagePtr(*thumb, "JPG"), ImagePtr(*medium, "JPG"), ImagePtr(*full, "JPG"));
 		} break;
 		case mtpc_photoEmpty: return App::photo(photo.c_photoEmpty().vid.v);
@@ -1307,7 +1301,7 @@ namespace App {
 	}
 
 	PhotoData *feedPhoto(const MTPDphoto &photo, PhotoData *convert) {
-		const QVector<MTPPhotoSize> &sizes(photo.vsizes.c_vector().v);
+		const auto &sizes(photo.vsizes.c_vector().v);
 		const MTPPhotoSize *thumb = 0, *medium = 0, *full = 0;
 		int32 thumbLevel = -1, mediumLevel = -1, fullLevel = -1;
 		for (QVector<MTPPhotoSize>::const_iterator i = sizes.cbegin(), e = sizes.cend(); i != e; ++i) {
@@ -1362,7 +1356,7 @@ namespace App {
 	DocumentData *feedDocument(const MTPdocument &document, const QPixmap &thumb) {
 		switch (document.type()) {
 		case mtpc_document: {
-			const MTPDdocument &d(document.c_document());
+			const auto &d(document.c_document());
 			return App::documentSet(d.vid.v, 0, d.vaccess_hash.v, d.vdate.v, d.vattributes.c_vector().v, qs(d.vmime_type), ImagePtr(thumb, "JPG"), d.vdc_id.v, d.vsize.v, StorageImageLocation());
 		} break;
 		case mtpc_documentEmpty: return App::document(document.c_documentEmpty().vid.v);
@@ -1450,12 +1444,12 @@ namespace App {
 
 	PeerData *peerByName(const QString &username) {
 		QString uname(username.trimmed());
-		for (PeersData::const_iterator i = peersData.cbegin(), e = peersData.cend(); i != e; ++i) {
-			if (!i.value()->userName().compare(uname, Qt::CaseInsensitive)) {
-				return i.value();
+		for_const (PeerData *peer, peersData) {
+			if (!peer->userName().compare(uname, Qt::CaseInsensitive)) {
+				return peer;
 			}
 		}
-		return 0;
+		return nullptr;
 	}
 
 	void updateImage(ImagePtr &old, ImagePtr now) {
@@ -1535,7 +1529,7 @@ namespace App {
 	DocumentData *document(const DocumentId &document) {
 		DocumentsData::const_iterator i = ::documentsData.constFind(document);
 		if (i == ::documentsData.cend()) {
-			i = ::documentsData.insert(document, new DocumentData(document));
+			i = ::documentsData.insert(document, DocumentData::create(document));
 		}
 		return i.value();
 	}
@@ -1543,45 +1537,44 @@ namespace App {
 	DocumentData *documentSet(const DocumentId &document, DocumentData *convert, const uint64 &access, int32 date, const QVector<MTPDocumentAttribute> &attributes, const QString &mime, const ImagePtr &thumb, int32 dc, int32 size, const StorageImageLocation &thumbLocation) {
 		bool sentSticker = false;
 		if (convert) {
+			MediaKey oldKey = convert->mediaKey();
 			if (convert->id != document) {
 				DocumentsData::iterator i = ::documentsData.find(convert->id);
 				if (i != ::documentsData.cend() && i.value() == convert) {
 					::documentsData.erase(i);
 				}
 
-				// inline bot sent gifs caching
-				if (!convert->voice() && !convert->isVideo()) {
-					Local::copyStickerImage(mediaKey(DocumentFileLocation, convert->dc, convert->id), mediaKey(DocumentFileLocation, dc, document));
-				}
-
 				convert->id = document;
 				convert->status = FileReady;
 				sentSticker = (convert->sticker() != 0);
 			}
 			if (date) {
-				convert->access = access;
-				convert->date = date;
 				convert->setattributes(attributes);
+				convert->setRemoteLocation(dc, access);
+				convert->date = date;
 				convert->mime = mime;
 				if (!thumb->isNull() && (convert->thumb->isNull() || convert->thumb->width() < thumb->width() || convert->thumb->height() < thumb->height())) {
 					updateImage(convert->thumb, thumb);
 				}
-				convert->dc = dc;
 				convert->size = size;
 				convert->recountIsImage();
 				if (convert->sticker() && convert->sticker()->loc.isNull() && !thumbLocation.isNull()) {
 					convert->sticker()->loc = thumbLocation;
 				}
+
+				MediaKey newKey = convert->mediaKey();
+				if (newKey != oldKey) {
+					if (convert->voice()) {
+						Local::copyAudio(oldKey, newKey);
+					} else if (convert->sticker() || convert->isAnimation()) {
+						Local::copyStickerImage(oldKey, newKey);
+					}
+				}
 			}
 
 			if (cSavedGifs().indexOf(convert) >= 0) { // id changed
 				Local::writeSavedGifs();
 			}
-
-			const FileLocation &loc(convert->location(true));
-			if (!loc.isEmpty()) {
-				Local::writeFileLocation(convert->mediaKey(), loc);
-			}
 		}
 		DocumentsData::const_iterator i = ::documentsData.constFind(document);
 		DocumentData *result;
@@ -1589,7 +1582,11 @@ namespace App {
 			if (convert) {
 				result = convert;
 			} else {
-				result = new DocumentData(document, access, date, attributes, mime, thumb, dc, size);
+				result = DocumentData::create(document, dc, access, attributes);
+				result->date = date;
+				result->mime = mime;
+				result->thumb = thumb;
+				result->size = size;
 				result->recountIsImage();
 				if (result->sticker()) {
 					result->sticker()->loc = thumbLocation;
@@ -1599,14 +1596,15 @@ namespace App {
 		} else {
 			result = i.value();
 			if (result != convert && date) {
-				result->access = access;
-				result->date = date;
 				result->setattributes(attributes);
+				if (!result->isValid()) {
+					result->setRemoteLocation(dc, access);
+				}
+				result->date = date;
 				result->mime = mime;
 				if (!thumb->isNull() && (result->thumb->isNull() || result->thumb->width() < thumb->width() || result->thumb->height() < thumb->height())) {
 					result->thumb = thumb;
 				}
-				result->dc = dc;
 				result->size = size;
 				result->recountIsImage();
 				if (result->sticker() && result->sticker()->loc.isNull() && !thumbLocation.isNull()) {
@@ -1628,7 +1626,7 @@ namespace App {
 		return i.value();
 	}
 
-	WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const QString &description, PhotoData *photo, DocumentData *doc, int32 duration, const QString &author, int32 pendingTill) {
+	WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const QString &description, PhotoData *photo, DocumentData *document, int32 duration, const QString &author, int32 pendingTill) {
 		if (convert) {
 			if (convert->id != webPage) {
 				WebPagesData::iterator i = webPagesData.find(convert->id);
@@ -1645,7 +1643,7 @@ namespace App {
 				convert->title = title;
 				convert->description = description;
 				convert->photo = photo;
-				convert->doc = doc;
+				convert->document = document;
 				convert->duration = duration;
 				convert->author = author;
 				if (convert->pendingTill > 0 && pendingTill <= 0 && api()) api()->clearWebPageRequest(convert);
@@ -1659,7 +1657,7 @@ namespace App {
 			if (convert) {
 				result = convert;
 			} else {
-				result = new WebPageData(webPage, toWebPageType(type), url, displayUrl, siteName, title, description, photo, doc, duration, author, (pendingTill >= -1) ? pendingTill : -1);
+				result = new WebPageData(webPage, toWebPageType(type), url, displayUrl, siteName, title, description, document, photo, duration, author, (pendingTill >= -1) ? pendingTill : -1);
 				if (pendingTill > 0 && api()) {
 					api()->requestWebPageDelayed(result);
 				}
@@ -1676,7 +1674,7 @@ namespace App {
 					result->title = title;
 					result->description = description;
 					result->photo = photo;
-					result->doc = doc;
+					result->document = document;
 					result->duration = duration;
 					result->author = author;
 					if (result->pendingTill > 0 && pendingTill <= 0 && api()) api()->clearWebPageRequest(result);
@@ -1712,7 +1710,7 @@ namespace App {
 
 	MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo) {
 		if (photo.type() == mtpc_userProfilePhoto) {
-			const MTPDuserProfilePhoto &uphoto(photo.c_userProfilePhoto());
+			const auto &uphoto(photo.c_userProfilePhoto());
 
 			QVector<MTPPhotoSize> photoSizes;
 			photoSizes.push_back(MTP_photoSize(MTP_string("a"), uphoto.vphoto_small, MTP_int(160), MTP_int(160), MTP_int(0)));
@@ -1744,14 +1742,16 @@ namespace App {
 	}
 
 	HistoryItem *histItemById(ChannelId channelId, MsgId itemId) {
-		MsgsData *data = fetchMsgsData(channelId, false);
-		if (!data) return 0;
+		if (!itemId) return nullptr;
 
-		MsgsData::const_iterator i = data->constFind(itemId);
+		MsgsData *data = fetchMsgsData(channelId, false);
+		if (!data) return nullptr;
+
+		auto i = data->constFind(itemId);
 		if (i != data->cend()) {
 			return i.value();
 		}
-		return 0;
+		return nullptr;
 	}
 
 	void historyRegItem(HistoryItem *item) {
@@ -1851,8 +1851,6 @@ namespace App {
 		}
 
 		::hoveredItem = ::pressedItem = ::hoveredLinkItem = ::pressedLinkItem = ::contextItem = 0;
-		replyMarkups.clear();
-		channelReplyMarkups.clear();
 	}
 
 	void historyClearItems() {
@@ -1863,20 +1861,20 @@ namespace App {
 		cSetSavedPeers(SavedPeers());
 		cSetSavedPeersByTime(SavedPeersByTime());
 		cSetRecentInlineBots(RecentInlineBots());
-		for (PeersData::const_iterator i = peersData.cbegin(), e = peersData.cend(); i != e; ++i) {
-			delete *i;
+		for_const (PeerData *peer, peersData) {
+			delete peer;
 		}
 		peersData.clear();
-		for (PhotosData::const_iterator i = ::photosData.cbegin(), e = ::photosData.cend(); i != e; ++i) {
-			delete *i;
+		for_const (PhotoData *photo, ::photosData) {
+			delete photo;
 		}
 		::photosData.clear();
-		for (DocumentsData::const_iterator i = ::documentsData.cbegin(), e = ::documentsData.cend(); i != e; ++i) {
-			delete *i;
+		for_const (DocumentData *document, ::documentsData) {
+			delete document;
 		}
 		::documentsData.clear();
-		for (WebPagesData::const_iterator i = webPagesData.cbegin(), e = webPagesData.cend(); i != e; ++i) {
-			delete *i;
+		for_const (WebPageData *webpage, webPagesData) {
+			delete webpage;
 		}
 		webPagesData.clear();
 		if (api()) api()->clearWebPageRequests();
@@ -2020,6 +2018,7 @@ namespace App {
 			::cornersMask[i]->setDevicePixelRatio(cRetinaFactor());
 		}
 		prepareCorners(BlackCorners, st::msgRadius, st::black);
+		prepareCorners(WhiteCorners, st::msgRadius, st::white);
 		prepareCorners(ServiceCorners, st::msgRadius, st::msgServiceBg);
 		prepareCorners(ServiceSelectedCorners, st::msgRadius, st::msgServiceSelectBg);
 		prepareCorners(SelectedOverlayCorners, st::msgRadius, st::msgSelectOverlay);
@@ -2048,8 +2047,8 @@ namespace App {
 	}
 
 	void clearHistories() {
-		textlnkOver(TextLinkPtr());
-		textlnkDown(TextLinkPtr());
+		ClickHandler::clearActive();
+		ClickHandler::unpressed();
 
 		histories().clear();
 
@@ -2083,6 +2082,8 @@ namespace App {
 		mainEmojiMap.clear();
 		otherEmojiMap.clear();
 
+		Dialogs::Layout::clearStyleSheets();
+
 		clearAllImages();
 	}
 
@@ -2343,7 +2344,7 @@ namespace App {
 			GifItems gifs = ::gifItems;
 			for (GifItems::const_iterator i = gifs.cbegin(), e = gifs.cend(); i != e; ++i) {
 				if (HistoryMedia *media = i.value()->getMedia()) {
-					media->stopInline(i.value());
+					media->stopInline();
 				}
 			}
 		}
@@ -2388,106 +2389,6 @@ namespace App {
 		if (changeInMin) App::main()->updateMutedIn(changeInMin);
 	}
 
-	void regInlineResultLoader(FileLoader *loader, InlineResult *result) {
-		::inlineResultLoaders.insert(loader, result);
-	}
-
-	void unregInlineResultLoader(FileLoader *loader) {
-		::inlineResultLoaders.remove(loader);
-	}
-
-	InlineResult *inlineResultFromLoader(FileLoader *loader) {
-		InlineResultLoaders::const_iterator i = ::inlineResultLoaders.find(loader);
-		return (i == ::inlineResultLoaders.cend()) ? 0 : i.value();
-	}
-
-	inline void insertReplyMarkup(ChannelId channelId, MsgId msgId, const ReplyMarkup &markup) {
-		if (channelId == NoChannel) {
-			replyMarkups.insert(msgId, markup);
-		} else {
-			channelReplyMarkups[channelId].insert(msgId, markup);
-		}
-	}
-
-	void feedReplyMarkup(ChannelId channelId, MsgId msgId, const MTPReplyMarkup &markup) {
-		ReplyMarkup data;
-		ReplyMarkup::Commands &commands(data.commands);
-		switch (markup.type()) {
-		case mtpc_replyKeyboardMarkup: {
-			const MTPDreplyKeyboardMarkup &d(markup.c_replyKeyboardMarkup());
-			data.flags = d.vflags.v;
-
-			const QVector<MTPKeyboardButtonRow> &v(d.vrows.c_vector().v);
-			if (!v.isEmpty()) {
-				commands.reserve(v.size());
-				for (int32 i = 0, l = v.size(); i < l; ++i) {
-					switch (v.at(i).type()) {
-					case mtpc_keyboardButtonRow: {
-						const MTPDkeyboardButtonRow &r(v.at(i).c_keyboardButtonRow());
-						const QVector<MTPKeyboardButton> &b(r.vbuttons.c_vector().v);
-						if (!b.isEmpty()) {
-							QList<QString> btns;
-							btns.reserve(b.size());
-							for (int32 j = 0, s = b.size(); j < s; ++j) {
-								switch (b.at(j).type()) {
-								case mtpc_keyboardButton: {
-									btns.push_back(qs(b.at(j).c_keyboardButton().vtext));
-								} break;
-								}
-							}
-							if (!btns.isEmpty()) commands.push_back(btns);
-						}
-					} break;
-					}
-				}
-				if (!commands.isEmpty()) {
-					insertReplyMarkup(channelId, msgId, data);
-				}
-			}
-		} break;
-
-		case mtpc_replyKeyboardHide: {
-			const MTPDreplyKeyboardHide &d(markup.c_replyKeyboardHide());
-			if (d.vflags.v) {
-				insertReplyMarkup(channelId, msgId, ReplyMarkup(mtpCastFlags(d.vflags.v) | MTPDreplyKeyboardMarkup_ClientFlag::f_zero));
-			}
-		} break;
-
-		case mtpc_replyKeyboardForceReply: {
-			const MTPDreplyKeyboardForceReply &d(markup.c_replyKeyboardForceReply());
-			insertReplyMarkup(channelId, msgId, ReplyMarkup(mtpCastFlags(d.vflags.v) | MTPDreplyKeyboardMarkup_ClientFlag::f_force_reply));
-		} break;
-		}
-	}
-
-	void clearReplyMarkup(ChannelId channelId, MsgId msgId) {
-		if (channelId == NoChannel) {
-			replyMarkups.remove(msgId);
-		} else {
-			ChannelReplyMarkups::iterator i = channelReplyMarkups.find(channelId);
-			if (i != channelReplyMarkups.cend()) {
-				i->remove(msgId);
-				if (i->isEmpty()) {
-					channelReplyMarkups.erase(i);
-				}
-			}
-		}
-	}
-
-	inline const ReplyMarkup &replyMarkup(const ReplyMarkups &markups, MsgId msgId) {
-		ReplyMarkups::const_iterator i = markups.constFind(msgId);
-		if (i == markups.cend()) return zeroMarkup;
-		return i.value();
-	}
-	const ReplyMarkup &replyMarkup(ChannelId channelId, MsgId msgId) {
-		if (channelId == NoChannel) {
-			return replyMarkup(replyMarkups, msgId);
-		}
-		ChannelReplyMarkups::const_iterator j = channelReplyMarkups.constFind(channelId);
-		if (j == channelReplyMarkups.cend()) return zeroMarkup;
-		return replyMarkup(*j, msgId);
-	}
-
 	void setProxySettings(QNetworkAccessManager &manager) {
 #ifndef TDESKTOP_DISABLE_NETWORK_PROXY
 		manager.setProxy(getHttpProxySettings());

Telegram/SourceFiles/app.h

@@ -20,10 +20,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "types.h"
+#include "core/basic_types.h"
 
 class AppClass;
-class Window;
+class MainWindow;
 class MainWidget;
 class SettingsWidget;
 class ApiWrap;
@@ -44,19 +44,11 @@ typedef QHash<ClipReader*, HistoryItem*> GifItems;
 typedef QHash<PhotoId, PhotoData*> PhotosData;
 typedef QHash<DocumentId, DocumentData*> DocumentsData;
 
-struct ReplyMarkup {
-	ReplyMarkup(MTPDreplyKeyboardMarkup::Flags flags = 0) : flags(flags) {
-	}
-	typedef QList<QList<QString> > Commands;
-	Commands commands;
-	MTPDreplyKeyboardMarkup::Flags flags;
-};
-
 class LayeredWidget;
 
 namespace App {
 	AppClass *app();
-	Window *wnd();
+	MainWindow *wnd();
 	MainWidget *main();
 	SettingsWidget *settings();
 	bool passcoded();
@@ -64,7 +56,6 @@ namespace App {
 	ApiWrap *api();
 
 	void logOut();
-	bool loggedOut();
 
 	QString formatPhone(QString phone);
 
@@ -268,14 +259,6 @@ namespace App {
 	void unregMuted(PeerData *peer);
 	void updateMuted();
 
-	void regInlineResultLoader(FileLoader *loader, InlineResult *result);
-	void unregInlineResultLoader(FileLoader *loader);
-	InlineResult *inlineResultFromLoader(FileLoader *loader);
-
-	void feedReplyMarkup(ChannelId channelId, MsgId msgId, const MTPReplyMarkup &markup);
-	void clearReplyMarkup(ChannelId channelId, MsgId msgId);
-	const ReplyMarkup &replyMarkup(ChannelId channelId, MsgId msgId);
-
 	void setProxySettings(QNetworkAccessManager &manager);
 #ifndef TDESKTOP_DISABLE_NETWORK_PROXY
 	QNetworkProxy getHttpProxySettings();

Telegram/SourceFiles/application.cpp

@@ -20,7 +20,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 */
 #include "stdafx.h"
 #include "application.h"
-#include "style.h"
+#include "ui/style.h"
 
 #include "shortcuts.h"
 
@@ -690,7 +690,7 @@ AppClass::AppClass() : QObject()
 			cSetLang(languageDefault);
 		}
 	} else if (cLang() > languageDefault && cLang() < languageCount) {
-		LangLoaderPlain loader(qsl(":/langs/lang_") + LanguageCodes[cLang()] + qsl(".strings"));
+		LangLoaderPlain loader(qsl(":/langs/lang_") + LanguageCodes[cLang()].c_str() + qsl(".strings"));
 		if (!loader.errors().isEmpty()) {
 			LOG(("Lang load errors: %1").arg(loader.errors()));
 		} else if (!loader.warnings().isEmpty()) {
@@ -718,7 +718,7 @@ AppClass::AppClass() : QObject()
 
 	QMimeDatabase().mimeTypeForName(qsl("text/plain")); // create mime database
 
-	_window = new Window();
+	_window = new MainWindow();
 	_window->createWinId();
 	_window->init();
 
@@ -835,7 +835,7 @@ void AppClass::chatPhotoCleared(PeerId peer, const MTPUpdates &updates) {
 
 void AppClass::selfPhotoDone(const MTPphotos_Photo &result) {
 	if (!App::self()) return;
-	const MTPDphotos_photo &photo(result.c_photos_photo());
+	const auto &photo(result.c_photos_photo());
 	App::feedPhoto(photo.vphoto);
 	App::feedUsers(photo.vusers);
 	cancelPhotoUpdate(App::self()->id);
@@ -851,7 +851,7 @@ void AppClass::chatPhotoDone(PeerId peer, const MTPUpdates &updates) {
 }
 
 bool AppClass::peerPhotoFail(PeerId peer, const RPCError &error) {
-	if (mtpIsFlood(error)) return false;
+	if (MTP::isDefaultHandledError(error)) return false;
 
 	LOG(("Application Error: update photo failed %1: %2").arg(error.type()).arg(error.description()));
 	cancelPhotoUpdate(peer);
@@ -962,6 +962,15 @@ void AppClass::onSwitchDebugMode() {
 	}
 }
 
+void AppClass::onSwitchWorkMode() {
+	Global::SetDialogsModeEnabled(!Global::DialogsModeEnabled());
+	Global::SetDialogsMode(Dialogs::Mode::All);
+	Local::writeUserSettings();
+	cSetRestarting(true);
+	cSetRestartingToSettings(true);
+	App::quit();
+}
+
 void AppClass::onSwitchTestMode() {
 	if (cTestMode()) {
 		QFile(cWorkingDir() + qsl("tdata/withtestmode")).remove();
@@ -1025,12 +1034,11 @@ void AppClass::checkMapVersion() {
     if (Local::oldMapVersion() < AppVersion) {
 		if (Local::oldMapVersion()) {
 			QString versionFeatures;
-			if ((cDevVersion() || cBetaVersion()) && Local::oldMapVersion() < 9035) {
-//				QString ctrl = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? qsl("Cmd") : qsl("Ctrl");
-				versionFeatures = QString::fromUtf8("\xe2\x80\x94 Design improvements\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D));
-//				versionFeatures = lng_new_version_text(lt_link, qsl("https://telegram.org/blog/supergroups5k")).trimmed();
-			} else if (Local::oldMapVersion() < 9031) {
-				versionFeatures = lng_new_version_text(lt_link, qsl("https://telegram.org/blog/supergroups5k")).trimmed();
+			if ((cDevVersion() || cBetaVersion()) && Local::oldMapVersion() < 9041) {
+//				versionFeatures = QString::fromUtf8("\xe2\x80\x94 Design improvements\n\xe2\x80\x94 Bug fixes and other minor improvements");
+				versionFeatures = langNewVersionText();
+			} else if (Local::oldMapVersion() < 9041) {
+				versionFeatures = langNewVersionText();
 			} else {
 				versionFeatures = lang(lng_new_version_minor).trimmed();
 			}
@@ -1040,15 +1048,12 @@ void AppClass::checkMapVersion() {
 			}
 		}
 	}
-	if (cNeedConfigResave()) {
-		Local::writeUserSettings();
-	}
 }
 
 AppClass::~AppClass() {
 	Shortcuts::finish();
 
-	if (Window *w = _window) {
+	if (auto w = _window) {
 		_window = 0;
 		delete w;
 	}
@@ -1081,7 +1086,7 @@ AppClass *AppClass::app() {
 	return AppObject;
 }
 
-Window *AppClass::wnd() {
+MainWindow *AppClass::wnd() {
 	return AppObject ? AppObject->_window : 0;
 }
 

Telegram/SourceFiles/application.h

@@ -20,7 +20,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "window.h"
+#include "mainwindow.h"
 #include "pspecific.h"
 
 class UpdateChecker;
@@ -153,7 +153,7 @@ public:
 	~AppClass();
 
 	static AppClass *app();
-	static Window *wnd();
+	static MainWindow *wnd();
 	static MainWidget *main();
 
 	FileUploader *uploader();
@@ -195,6 +195,7 @@ public slots:
 	void photoUpdated(const FullMsgId &msgId, bool silent, const MTPInputFile &file);
 
 	void onSwitchDebugMode();
+	void onSwitchWorkMode();
 	void onSwitchTestMode();
 
 	void killDownloadSessions();
@@ -211,7 +212,7 @@ private:
 
 	uint64 _lastActionTime;
 
-	Window *_window;
+	MainWindow *_window;
 	FileUploader *_uploader;
 	Translator *_translator;
 

Telegram/SourceFiles/audio.cpp

@@ -506,7 +506,7 @@ void AudioPlayer::play(const SongMsgId &song, int64 position) {
 		if (current->file.isEmpty() && current->data.isEmpty()) {
 			setStoppedState(current);
 			if (!song.song->loading()) {
-				DocumentOpenLink::doOpen(song.song);
+				DocumentOpenClickHandler::doOpen(song.song);
 			}
 		} else {
 			current->state = fadedStart ? AudioPlayerStarting : AudioPlayerPlaying;

Telegram/SourceFiles/audio.h

@@ -20,7 +20,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "types.h"
+#include "core/basic_types.h"
 
 void audioInit();
 bool audioWorks();

Telegram/SourceFiles/boxes/aboutbox.cpp

@@ -23,7 +23,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 #include "aboutbox.h"
 #include "mainwidget.h"
-#include "window.h"
+#include "mainwindow.h"
 
 #include "autoupdater.h"
 #include "boxes/confirmbox.h"
@@ -139,7 +139,7 @@ void AboutBox::dropEvent(QDropEvent *e) {
 QString telegramFaqLink() {
 	QString result = qsl("https://telegram.org/faq");
 	if (cLang() > languageDefault && cLang() < languageCount) {
-		const char *code = LanguageCodes[cLang()];
+		const char *code = LanguageCodes[cLang()].c_str();
 		if (qstr("de") == code || qstr("es") == code || qstr("it") == code || qstr("ko") == code) {
 			result += qsl("/") + code;
 		} else if (qstr("pt_BR") == code) {

Telegram/SourceFiles/boxes/abstractbox.cpp

@@ -25,7 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 #include "abstractbox.h"
 #include "mainwidget.h"
-#include "window.h"
+#include "mainwindow.h"
 
 void BlueTitleShadow::paintEvent(QPaintEvent *e) {
 	Painter p(this);