ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-16 03:09:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Peter 2019-04-29 18:10:01 +04:00
parent 6b5aea7253
commit 27c18424f4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4231,11 +4231,7 @@ Unused sets are archived when you add more.";
"ChatList.ArchiveAction" = "Archive";
"ChatList.UnarchiveAction" = "Unarchive";
<<<<<<< HEAD
"ChatList.HideAction" = "Unpin";
=======
"ChatList.HideAction" = "Hide";
>>>>>>> e8f89f29928527555050923b6bdeaa73b78d02d0
"ChatList.UnhideAction" = "Pin";
"ChatList.UndoArchiveTitle" = "Chat archived";