ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-25 17:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin 2018-12-18 20:07:25 +04:00
commit 245b2e29f2
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -401,6 +401,7 @@
"Message.Audio" = "Voice Message";
"Message.ForwardedMessage" = "Forwarded Message\nFrom: %@";
"Message.Animation" = "GIF";
"Message.Poll" = "Poll";
// Conversation Profile
"ConversationProfile.ErrorCreatingConversation" = "An error occurred";
@ -3604,7 +3605,7 @@ Unused sets are archived when you add more.";
"MessagePoll.LabelAnonymous" = "Anonymous Poll";
"MessagePoll.LabelClosed" = "Final Results";
"MessagePoll.VotedCount_0" = "%@ voted";
"MessagePoll.VotedCount_0" = "No votes";
"MessagePoll.VotedCount_1" = "1 voted";
"MessagePoll.VotedCount_2" = "2 voted";
"MessagePoll.VotedCount_3_10" = "%@ voted";

2
submodules/LegacyComponents

@ -1 +1 @@
Subproject commit 01b7622735a78c3892b7455084802cc4ea26ebdb
Subproject commit 94aadbb5b721763afb1f15b60f38e7624c625588

2
submodules/TelegramUI

@ -1 +1 @@
Subproject commit 248daccea4fde3687e0020d3f7bc43e26dd76d55
Subproject commit 128e4ccf3d08b106e7ea542d036d28a893987ecf