Skip to content

Commit 5dd0a03

Browse files
laktyushinlaktyushin
committed
Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
2 parents 711f8f7 + e23a02e commit 5dd0a03

File tree

16 files changed

+296
-160
lines changed

16 files changed

+296
-160
lines changed

‎Telegram/Telegram-iOS/en.lproj/Localizable.strings

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14789,3 +14789,82 @@ Sorry for the inconvenience.";
1478914789
"Stars.SellGift.OnlyTonInfo" = "If the buyer pays you in TON, there's no risk of refunds, unlike with Stars payments.";
1479014790

1479114791
"Chat.ViewCollection" = "VIEW COLLECTION";
14792+
14793+
"CallList.DeleteConfirmation" = "Do you want to delete the information about this call?";
14794+
14795+
"ChatList.Search.FilterGlobalPosts" = "Posts";
14796+
"ChatList.HeaderPublicPosts" = "PUBLIC POSTS";
14797+
"ChatList.PaidSearchToast.Text_1" = "%@ Star spent on extra search.";
14798+
"ChatList.PaidSearchToast.Text_any" = "%@ Stars spent on extra search.";
14799+
14800+
"ChatList.GlobalSearch.StartPlaceholder.Title" = "Global Search";
14801+
"ChatList.GlobalSearch.StartPlaceholder.Text" = "Type a keyword to search all posts\nfrom public channels.";
14802+
"ChatList.GlobalSearch.StartPlaceholder.Subtitle" = "Global search is a Premium feature.";
14803+
"ChatList.GlobalSearch.StartPlaceholder.RemainingSubtitle_1" = "%@ free search remaining today.";
14804+
"ChatList.GlobalSearch.StartPlaceholder.RemainingSubtitle_any" = "%@ free searches remaining today.";
14805+
"ChatList.GlobalSearch.LimitPlaceholder.Title" = "Limit Reached";
14806+
"ChatList.GlobalSearch.LimitPlaceholder.Text_1" = "You can make up to\n%@ search query per day.";
14807+
"ChatList.GlobalSearch.LimitPlaceholder.Text_any" = "You can make up to\n%@ search queries per day.";
14808+
"ChatList.GlobalSearch.SearchButton" = "Search";
14809+
"ChatList.GlobalSearch.SearchButtonPremium" = "Subscribe to Premium";
14810+
"ChatList.GlobalSearch.SearchButtonQuery" = "Search {}";
14811+
"ChatList.GlobalSearch.SearchButtonPaidTitle" = "Search for * %@";
14812+
"ChatList.GlobalSearch.SearchButtonPaidSubtitle" = "free search unlocks in %@";
14813+
14814+
"Chat.ViewCollection" = "VIEW COLLECTION";
14815+
"Chat.ViewAlbum" = "VIEW ALBUM";
14816+
14817+
"PeerInfo.MenuAddStories" = "Add Stories";
14818+
"Stories.MenuDeleteAlbum" = "Delete Album";
14819+
"Stories.AddStoriesTitle" = "Add Stories";
14820+
"Stories.AddStoriesEmpty" = "Add Stories";
14821+
"Stories.AddStories_1" = "Add %@ Story";
14822+
"Stories.AddStories_any" = "Add %@ Stories";
14823+
"Stories.MenuAddToAlbum" = "Add to Album";
14824+
"Stories.MenuRemoveFromAlbum" = "Remove from Album";
14825+
"Stories.MenuNewAlbum" = "New Album";
14826+
"Stories.MenuRenameAlbum" = "Rename Album";
14827+
"Stories.StatusEmpty" = "no stories";
14828+
"Stories.AlbumAll" = "All Stories";
14829+
"Stories.AlbumAdd" = "+ Add Album";
14830+
"Stories.AlbumEmptyTitle" = "Organize Your Stories";
14831+
"Stories.AlbumEmptyText" = "Add some stories to this album.";
14832+
"Stories.AlbumEmptyButton" = "Add to Album";
14833+
"Stories.CreateAlbum.Title" = "Create a New Album";
14834+
"Stories.CreateAlbum.Text" = "Choose a name for your album and start adding your stories there.";
14835+
"Stories.CreateAlbum.Placeholder" = "Title";
14836+
"Stories.EditAlbum.Title" = "Edit Album Name";
14837+
"Stories.EditAlbum.Text" = "Choose a new name for your album.";
14838+
"Stories.DeleteAlbum.Confirmation" = "Delete %@?";
14839+
14840+
"ProfileLevelInfo.Title" = "Rating";
14841+
"ProfileLevelInfo.MyText" = "The rating reflects your activity on Telegram. What affects it:";
14842+
"ProfileLevelInfo.MyDescriptionToday_1" = "The rating updates today.\n\%@ point is pending.";
14843+
"ProfileLevelInfo.MyDescriptionToday_any" = "The rating updates today.\n\%@ points are pending.";
14844+
"ProfileLevelInfo.MyDescriptionDays_1" = "%@ day";
14845+
"ProfileLevelInfo.MyDescriptionDays_any" = "%@ days";
14846+
"ProfileLevelInfo.MyDescriptionPoints_1" = "%@ point is";
14847+
"ProfileLevelInfo.MyDescriptionPoints_any" = "%@ points are";
14848+
"ProfileLevelInfo.MyDescription" = "The rating updates in %@ after purchases.\n\%@ pending.";
14849+
"ProfileLevelInfo.OtherDescription" = "The rating reflects **%@'s** activity on Telegram. What affects it:";
14850+
"ProfileLevelInfo.LevelIndex_1" = "Level %@";
14851+
"ProfileLevelInfo.LevelIndex_any" = "Level %@";
14852+
"ProfileLevelInfo.CloseButton" = "Understood";
14853+
14854+
"ProfileLevelInfo.Item0.Title" = "Gifts from Telegram";
14855+
"ProfileLevelInfo.Item0.Text" = "100% of the Stars spent on gifts purchased from Telegram.";
14856+
"ProfileLevelInfo.Item0.Badge" = "ADDED";
14857+
"ProfileLevelInfo.Item1.Title" = "Gifts and Posts from Users";
14858+
"ProfileLevelInfo.Item1.Text" = "20% of the Stars spent on gifts or posts from users and channels.";
14859+
"ProfileLevelInfo.Item1.Badge" = "ADDED";
14860+
"ProfileLevelInfo.Item2.Title" = "Refunds and Conversions";
14861+
"ProfileLevelInfo.Item2.Text" = "10x of refunded Stars and 85% of bought gifts converted to Stars.";
14862+
"ProfileLevelInfo.Item2.Badge" = "DEDUCTED";
14863+
14864+
"Call.AlertMoveToConference" = "End current call and start a conference?";
14865+
14866+
"Stories.Post.Album" = "Album";
14867+
"Stories.Post.AlbumFooter" = "Choose the albums where you want to share your story.";
14868+
"Stories.Post.AlbumAll" = "All Stories";
14869+
"Stories.Post.AlbumCount_1" = "%@ Album";
14870+
"Stories.Post.AlbumCount_any" = "%@ Albums";

‎submodules/CallListUI/Sources/CallListControllerNode.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,7 @@ final class CallListControllerNode: ASDisplayNode {
350350
let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData)
351351
var items: [ActionSheetItem] = []
352352

353-
//TODO:localize
354-
items.append(ActionSheetTextItem(title: "Do you want to delete the information about this call?", parseMarkdown: true))
353+
items.append(ActionSheetTextItem(title: strongSelf.presentationData.strings.CallList_DeleteConfirmation, parseMarkdown: true))
355354

356355
items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_DeleteMessagesFor(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).string, color: .destructive, action: { [weak actionSheet] in
357356
actionSheet?.dismissAnimated()

‎submodules/ChatListUI/Sources/ChatListSearchFiltersContainerNode.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ private final class ItemNode: ASDisplayNode {
9393
title = presentationData.strings.ChatList_Search_FilterApps
9494
icon = nil
9595
case .globalPosts:
96-
//TODO:localize
97-
title = "Posts"
98-
titleBadge = "NEW"
96+
title = presentationData.strings.ChatList_Search_FilterGlobalPosts
97+
titleBadge = presentationData.strings.ChatList_ContextMenuBadgeNew
9998
icon = nil
10099
case .media:
101100
title = presentationData.strings.ChatList_Search_FilterMedia

0 commit comments

Comments
 (0)