Merge branch 'dev'

.travis/build.sh

@@ -141,6 +141,8 @@ build() {
 
     # Patch tdesktop
     sed -i 's/CUSTOM_API_ID//g' "$UPSTREAM/Telegram/Telegram.pro"
+    sed -i 's,LIBS += /usr/local/lib/libxkbcommon.a,,g" "$UPSTREAM/Telegram/Telegram.pro"
+    sed -i 's,#xkbcommon,xkbcommon,g" "$UPSTREAM/Telegram/Telegram.pro"
     sed -i "s,\..*/Libraries/breakpad/,$BREAKPAD_PATH/,g" "$UPSTREAM/Telegram/Telegram.pro"
 
 	local options=""
@@ -321,4 +323,4 @@ check() {
 
 source ./.travis/common.sh
 
-run
+run

Telegram/Patches/qtbase_5_6_0.diff

@@ -11300,6 +11300,34 @@ index ca92103..225d85f 100644
          QPainter p(&m_qImage);
          p.setCompositionMode(QPainter::CompositionMode_Source);
          const QVector<QRect> rects = region.rects();
+diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
+index 6bec6b1..f14d6ee 100644
+--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
++++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
+@@ -422,14 +422,20 @@ void QCocoaIntegration::updateScreens()
+         }
+         siblings << screen;
+     }
++
++
++// Patch: backport crash fix from Qt 5.6.1
++    // Set virtual siblings list. All screens in mScreens are siblings, because we ignored the
++    // mirrors. Note that some of the screens we update the siblings list for here may be deleted
++    // below, but update anyway to keep the to-be-deleted screens out of the siblings list.
++    foreach (QCocoaScreen* screen, mScreens)
++        screen->setVirtualSiblings(siblings);
++
+     // Now the leftovers in remainingScreens are no longer current, so we can delete them.
+     foreach (QCocoaScreen* screen, remainingScreens) {
+         mScreens.removeOne(screen);
+         destroyScreen(screen);
+     }
+-    // All screens in mScreens are siblings, because we ignored the mirrors.
+-    foreach (QCocoaScreen* screen, mScreens)
+-        screen->setVirtualSiblings(siblings);
+ }
+
+ QCocoaScreen *QCocoaIntegration::screenAtIndex(int index)
 diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
 index c2d206f..0f9b512 100644
 --- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm

Telegram/Resources/all_files.style

@@ -23,7 +23,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 using "basic_types.style";
 using "basic.style";
 
+using "boxes/boxes.style";
 using "dialogs/dialogs.style";
 using "history/history.style";
 using "overview/overview.style";
 using "profile/profile.style";
+using "media/view/mediaview.style";
+using "ui/widgets/widgets.style";

Telegram/Resources/basic.style

@@ -1868,6 +1868,9 @@ stickersSettings: sprite(140px, 124px, 21px, 22px);
 savedGifsOver: sprite(329px, 286px, 21px, 22px);
 savedGifsActive: sprite(350px, 286px, 21px, 22px);
 
+stickersSettingsUnreadSize: 17px;
+stickersSettingsUnreadPosition: point(4px, 5px);
+
 emojiPanCategories: #f7f7f7;
 
 rbEmoji: flatCheckbox {
@@ -2141,7 +2144,9 @@ mvCaptionRadius: 2px;
 mvCaptionBg: #11111180;
 mvCaptionFont: font(fsize);
 
-medviewSaveMsgCheck: sprite(311px, 309px, 22px, 18px);
+medviewSaveMsgCheck: icon {
+	{ "mediaview_save_check", #ffffff }
+};
 medviewSaveMsgFont: font(16px);
 medviewSaveMsgPadding: margins(55px, 19px, 29px, 20px);
 medviewSaveMsgCheckPos: point(23px, 21px);

Telegram/Resources/basic_types.style

@@ -450,3 +450,17 @@ OutlineButton {
 	font: font;
 	padding: margins;
 }
+
+IconButton {
+	width: pixels;
+	height: pixels;
+
+	opacity: double;
+	overOpacity: double;
+
+	icon: icon;
+	iconPosition: point;
+	downIconPosition: point;
+
+	duration: int;
+}

Telegram/Resources/langs/lang.strings

@@ -190,6 +190,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_signin_reset_account" = "Reset your account";
 "lng_signin_sure_reset" = "Warning!\n\nYou will lose all your chats and messages, along with any media and files you shared!\n\nDo you want to reset your account?";
 "lng_signin_reset" = "Reset";
+"lng_signin_reset_wait" = "Since the account {phone_number} is active and protected by a password, we will delete it in 1 week for security purposes. You can cancel this process at any time.\n\nYou’ll be able to reset your account in:\n{when}";
+"lng_signin_reset_in_days" = "{count_days:0 days|# day|# days} {count_hours:0 hours|# hour|# hours} {count_minutes:0 minutes|# minute|# minutes}";
+"lng_signin_reset_in_hours" = "{count_hours:0 hours|# hour|# hours} {count_minutes:0 minutes|# minute|# minutes}";
+"lng_signin_reset_in_minutes" = "{count_minutes:0 minutes|# minute|# minutes}";
+"lng_signin_reset_cancelled" = "Your recent attempts to reset this account have been cancelled by its active user. Please try again in 7 days.";
 
 "lng_signup_title" = "Information and photo";
 "lng_signup_desc" = "Please enter your name and\nupload a photo.";
@@ -602,6 +607,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_group_invite_want_join_channel" = "Do you want to join the channel «{title}»?";
 "lng_group_invite_join" = "Join";
 
+"lng_group_invite_members" = "{count:_not_used_|# member|# members}, among them:";
+
 "lng_group_invite_link" = "Invite link:";
 "lng_group_invite_create" = "Create an invite link";
 "lng_group_invite_about" = "Telegram users will be able to join\nyour group by following this link.";
@@ -664,6 +671,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_emoji_category6" = "Objects";
 "lng_emoji_category7" = "Symbols & Flags";
 
+"lng_recent_stickers" = "Frequently used";
 "lng_switch_stickers" = "Stickers";
 "lng_switch_stickers_gifs" = "GIFs & Stickers";
 "lng_switch_emoji" = "Emoji";
@@ -680,12 +688,16 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_stickers_add_pack" = "Add stickers";
 "lng_stickers_share_pack" = "Share Stickers";
 "lng_stickers_not_found" = "Sticker pack not found.";
-"lng_stickers_too_many_packs" = "You have too many sticker packs. Please remove some first.";
+"lng_stickers_packs_archived" = "Some of your unused stickers have been archived to make room for the sets you've activated.";
+"lng_stickers_archived" = "Archived Stickers";
 "lng_stickers_copied" = "Sticker pack link copied to clipboard.";
 "lng_stickers_default_set" = "Great Minds";
 "lng_stickers_you_have" = "Manage and reorder sticker packs";
 "lng_stickers_packs" = "Sticker Packs";
 "lng_stickers_reorder" = "Click and drag to reorder sticker packs";
+"lng_stickers_featured" = "Trending Stickers";
+"lng_stickers_clear_recent" = "Clear";
+"lng_stickers_clear_recent_sure" = "Are you sure you want to clear your frequently used stickers list?";
 "lng_stickers_remove" = "Delete";
 "lng_stickers_return" = "Undo";
 "lng_stickers_restore" = "Restore";
@@ -922,12 +934,19 @@ 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" = "— Fixed photo viewer to handle screen resolution change correctly\n— Fixed forwarding photos via drag-n-drop\n— Various design improvements and other bug fixes";
+"lng_new_version_text" = "— Trending stickers. Check out and install noteworthy sticker packs from the new tab in Settings.\n— Archived stickers. Unused stickers are now archived automatically when you go over the 200 limit.\n— Group previews. Preview groups before joining them via invite link – see who else is in the group before joining.\n— New internal video player.\n— Improved design for chats.";
 
 "lng_menu_insert_unicode" = "Insert Unicode control character";
 
 "lng_full_name" = "{first_name} {last_name}";
 
+"lng_confirm_phone_link_invalid" = "This link is broken or has expired.";
+"lng_confirm_phone_title" = "Cancel account reset";
+"lng_confirm_phone_about" = "Somebody with access to your phone number {phone} has requested to delete your Telegram account and reset your 2-Step Verification password.\n\nIf this wasn't you, please enter the code we've just sent you via SMS to your number.";
+"lng_confirm_phone_success" = "Success!\n\nThe deletion process was cancelled for your account {phone}. You may close this window now.";
+"lng_confirm_phone_send" = "Send";
+"lng_confirm_phone_enter_code" = "Please enter the code.";
+
 // Not used
 
 "lng_topbar_info" = "Info";

Telegram/Resources/langs/lang_de.strings

@@ -190,6 +190,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_signin_reset_account" = "Konto zurücksetzen";
 "lng_signin_sure_reset" = "Hinweis!\n\nDu verlierst du alle Chats und Nachrichten, ebenso deine geteilten Bilder und Videos.\n\nKonto wirklich zurücksetzen?";
 "lng_signin_reset" = "Zurücksetzen";
+"lng_signin_reset_wait" = "Da dein Konto {phone_number} aktiv und durch ein Kennwort geschützt ist, löschen wir es aus Sicherheitsgründen in einer Woche. Du kannst den Vorgang jederzeit abbrechen.\n\nDu kannst dein Konto zurücksetzen in:\n{when}";
+"lng_signin_reset_in_days" = "{count_days:0 Tage|# Tag|# Tage} {count_hours:0 Stunden|# Stunde|# Stunden} {count_minutes:0 Minuten|# Minute|# Minuten}";
+"lng_signin_reset_in_hours" = "{count_hours:0 Stunden|# Stunde|# Stunden} {count_minutes:0 Minuten|# Minute|# Minuten}";
+"lng_signin_reset_in_minutes" = "{count_minutes:0 Minuten|# Minute|# Minuten}";
+"lng_signin_reset_cancelled" = "Deine vorherigen Versuche das Konto zurückzusetzen wurden durch den aktiven Nutzer abgebrochen. Bitte in 7 Tagen erneut probieren.";
 
 "lng_signup_title" = "Information und Bild";
 "lng_signup_desc" = "Bitte trage deinen Namen ein \nund lade ein Bild hoch.";
@@ -602,6 +607,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_group_invite_want_join_channel" = "Möchtest du dem Kanal «{title}» beitreten?";
 "lng_group_invite_join" = "Beitreten";
 
+"lng_group_invite_members" = "{count:_not_used_|# Mitglied|# Mitglieder}, darunter:";
+
 "lng_group_invite_link" = "Einladungslink:";
 "lng_group_invite_create" = "Neuer Link";
 "lng_group_invite_about" = "Jeder, der Telegram installiert hat,\nkann anhand dieses Links in deine Gruppe.";
@@ -664,6 +671,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_emoji_category6" = "Objekte";
 "lng_emoji_category7" = "Symbole & Flaggen";
 
+"lng_recent_stickers" = "Häufig genutzt";
 "lng_switch_stickers" = "Sticker";
 "lng_switch_stickers_gifs" = "GIFs & Sticker";
 "lng_switch_emoji" = "Emoji";
@@ -680,11 +688,16 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_stickers_add_pack" = "Sticker hinzufügen";
 "lng_stickers_share_pack" = "Sticker teilen";
 "lng_stickers_not_found" = "Sticker-Paket nicht gefunden.";
+"lng_stickers_packs_archived" = "Einige deiner unbenutzen Sticker wurden archiviert, damit du Platz für neue Sticker hast.";
+"lng_stickers_archived" = "Archivierte Sticker";
 "lng_stickers_copied" = "Sticker-Paket Link in die Zwischenablage kopiert.";
 "lng_stickers_default_set" = "Große Denker";
 "lng_stickers_you_have" = "Sticker-Pakete verwalten";
 "lng_stickers_packs" = "Sticker-Pakete";
 "lng_stickers_reorder" = "Paket gedrückt halten und verschieben um die Anordnung zu ändern";
+"lng_stickers_featured" = "Angesagte Sticker";
+"lng_stickers_clear_recent" = "Leeren";
+"lng_stickers_clear_recent_sure" = "Zuletzt benutzte Sticker leeren?";
 "lng_stickers_remove" = "Löschen";
 "lng_stickers_return" = "Rückgängig";
 "lng_stickers_restore" = "Zeigen";
@@ -881,7 +894,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_selected_forward" = "Weiterleiten";
 "lng_selected_count" = "{count:_not_used_|# Nachricht|# Nachrichten}";
 "lng_selected_cancel_sure_this" = "Upload abbrechen?";
-"lng_selected_upload_stop" = "Abbrechen";
+"lng_selected_upload_stop" = "Stoppen";
 "lng_selected_delete_sure_this" = "Diese Nachricht wirklich löschen?";
 "lng_selected_delete_sure" = "Willst du {count:_not_used_|# Nachricht|# Nachrichten} löschen?";
 "lng_delete_photo_sure" = "Dieses Bild wirklich löschen?";
@@ -921,12 +934,19 @@ 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" = "— Fehlerbehebung: Bildbetrachter sollte Änderungen der Bildschirmauflösung korrekt handhaben\n— Fehlerbehebung: Bilder per Drag’n’Drop weiterleiten\n— Verschiedene optische Verbesserungen und sonstige Fehlerbehebungen";
+"lng_new_version_text" = "— Angesagte Sticker: In den Einstellungen, im Bereich Sticker, stehen interessante Stickerpakete bereit.\n— Archivierte Sticker: Unbenutze Sticker werden automatisch archiviert, sobald das Limit (200) erreicht wird.\n— Gruppenvorschau: Vor dem Betreten der Gruppe wird dir angezeigt, wer bereits Mitglied ist.\n— Neuer interner Videoplayer.\n— Verbessertes Chatdesign.";
 
 "lng_menu_insert_unicode" = "Unicode-Steuerzeichen einfügen";
 
 "lng_full_name" = "{first_name} {last_name}";
 
+"lng_confirm_phone_link_invalid" = "Dieser Link ist abgelaufen oder ungültig.";
+"lng_confirm_phone_title" = "Zurücksetzung abbrechen";
+"lng_confirm_phone_about" = "Jemand mit Zugang zu deiner Telefonnummer {phone} hat die Kontolöschung und Zurücksetzung der zweistufige Bestätigung beantragt.\n\nWenn du das nicht selbst gewesen bist, tippe den Code der SMS ein, den wir dir gerade gesendet haben.";
+"lng_confirm_phone_success" = "Geschafft!\n\nDer Löschvorgang für dein Konto {phone} wurde abgebrochen. Du kannst dieses Fenster jetzt schließen.";
+"lng_confirm_phone_send" = "Senden";
+"lng_confirm_phone_enter_code" = "Bitte den Code eingeben.";
+
 // Not used
 
 "lng_topbar_info" = "Info";

Telegram/Resources/langs/lang_es.strings

@@ -190,6 +190,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_signin_reset_account" = "Restablecer tu cuenta";
 "lng_signin_sure_reset" = "¡Advertencia!\n\n¡Perderás todos tus chats y mensajes, junto con la multimedia y archivos compartidos!\n\n¿Quieres restablecer tu cuenta?";
 "lng_signin_reset" = "Restablecer";
+"lng_signin_reset_wait" = "Como la cuenta {phone_number} está activa y protegida con una contraseña, la eliminaremos en 1 semana, por motivos de seguridad. Puedes cancelar el proceso en cualquier momento.\n\nPodrás restablecer tu cuenta en:\n{when}";
+"lng_signin_reset_in_days" = "{count_days:0 días|# día|# días} {count_hours:0 horas|# hora|# horas} {count_minutes:0 minutos|# minuto|# minutos}";
+"lng_signin_reset_in_hours" = "{count_hours:0 horas|# hora|# horas} {count_minutes:0 minutos|# minuto|# minutos}";
+"lng_signin_reset_in_minutes" = "{count_minutes:0 minutos|# minuto|# minutos}";
+"lng_signin_reset_cancelled" = "Tus intentos recientes para restablecer la cuenta fueron cancelados por su usuario activo. Por favor, reinténtalo en 7 días.";
 
 "lng_signup_title" = "Información y foto";
 "lng_signup_desc" = "Por favor, pon tu nombre \ny una foto.";
@@ -602,6 +607,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_group_invite_want_join_channel" = "¿Quieres unirte al canal «{title}»?";
 "lng_group_invite_join" = "Unirme";
 
+"lng_group_invite_members" = "{count:_not_used_|# miembro|# miembros}, entre ellos:";
+
 "lng_group_invite_link" = "Enlace de invitación:";
 "lng_group_invite_create" = "Crear un enlace de invitación";
 "lng_group_invite_about" = "Los usuarios de Telegram podrán unirse\na tu grupo a través de este enlace.";
@@ -664,6 +671,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_emoji_category6" = "Objetos";
 "lng_emoji_category7" = "Símbolos y banderas";
 
+"lng_recent_stickers" = "Uso frecuente";
 "lng_switch_stickers" = "Stickers";
 "lng_switch_stickers_gifs" = "GIF y stickers";
 "lng_switch_emoji" = "Emoji";
@@ -680,11 +688,16 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_stickers_add_pack" = "Añadir stickers";
 "lng_stickers_share_pack" = "Compartir stickers";
 "lng_stickers_not_found" = "Pack de stickers no encontrado.";
+"lng_stickers_packs_archived" = "Algunos de los stickers que no usas fueron archivados. Así tendrás más espacio para los packs que activaste.";
+"lng_stickers_archived" = "Stickers archivados";
 "lng_stickers_copied" = "Enlace del pack de stickers copiado al portapapeles.";
 "lng_stickers_default_set" = "Grandes personajes";
 "lng_stickers_you_have" = "Administrar y ordenar los packs de stickers";
 "lng_stickers_packs" = "Packs de stickers";
 "lng_stickers_reorder" = "Haz clic y arrastra para ordenar los packs";
+"lng_stickers_featured" = "Stickers destacados";
+"lng_stickers_clear_recent" = "Borrar";
+"lng_stickers_clear_recent_sure" = "¿Quieres borrar la lista de stickers usados frecuentemente?";
 "lng_stickers_remove" = "Eliminar";
 "lng_stickers_return" = "Deshacer";
 "lng_stickers_restore" = "Restaurar";
@@ -880,7 +893,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_selected_delete" = "Eliminar";
 "lng_selected_forward" = "Reenviar";
 "lng_selected_count" = "{count:_not_used_|# mensaje|# mensajes}";
-"lng_selected_cancel_sure_this" = "¿Cancelar envío?";
+"lng_selected_cancel_sure_this" = "¿Detener el envío?";
 "lng_selected_upload_stop" = "Detener";
 "lng_selected_delete_sure_this" = "¿Quieres eliminar este mensaje?";
 "lng_selected_delete_sure" = "¿Quieres eliminar {count:_not_used_|# mensaje|# mensajes}?";
@@ -921,12 +934,19 @@ 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" = "— Corrección en el visor de fotos, para manejar correctamente el cambio de la resolución de la pantalla\n— Corrección en el reenvío de fotos a través de arrastrar y soltar \n— Varias mejoras de diseño y corrección de otros errores";
+"lng_new_version_text" = "— Stickers destacados. Mira e instala packs de stickers desde la nueva pestaña en Ajustes.\n— Stickers archivados. Ahora, los packs de stickers que no usas, se archivan automáticamente cuando superas el límite de 200.\n— Vista previa de grupos. Mira un grupo antes de unirte a él a través del enlace de invitación. Mira quién está en el grupo antes de unirte.\n— Nuevo reproductor interno de vídeo.\n— Diseño mejorado de chats.";
 
 "lng_menu_insert_unicode" = "Insertar caracteres de control Unicode";
 
 "lng_full_name" = "{first_name} {last_name}";
 
+"lng_confirm_phone_link_invalid" = "El enlace está roto o ha expirado.";
+"lng_confirm_phone_title" = "No restablecer la cuenta";
+"lng_confirm_phone_about" = "Alguien, con acceso a tu número de teléfono {phone}, solicitó eliminar tu cuenta de Telegram y restablecer tu contraseña de la verificación en dos pasos.\n\nSi no eras tú, por favor, inserta el código que enviamos por SMS a tu número.";
+"lng_confirm_phone_success" = "¡Listo!\n\nEl proceso de eliminación de la cuenta {phone} fue cancelado. Puedes cerrar esta ventana ahora.";
+"lng_confirm_phone_send" = "Enviar";
+"lng_confirm_phone_enter_code" = "Por favor, pon el código.";
+
 // Not used
 
 "lng_topbar_info" = "Información";