Merge branch 'master' into dev

Conflicts:
	Telegram/SourceFiles/history/history.style
This commit is contained in:
John Preston
2016-07-08 13:26:28 +03:00
63 changed files with 2063 additions and 660 deletions
+1
View File
@@ -680,6 +680,7 @@ 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_copied" = "Sticker pack link copied to clipboard.";
"lng_stickers_default_set" = "Great Minds";
"lng_stickers_you_have" = "Manage and reorder sticker packs";