From 6d4e57046dd5ae89dfe3ce299f0ea97ec4c3d9b9 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 6 Jun 2019 17:38:28 +0200 Subject: [PATCH] Update submodules --- .gitmodules | 2 +- Telegram-iOS/en.lproj/Localizable.strings | 33 +++++++++++++++++++++++ submodules/Display | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- submodules/libtgvoip | 2 +- 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index eef423b020..1d8ca120d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url=../Display.git url=../HockeySDK-iOS.git [submodule "submodules/libtgvoip"] path = submodules/libtgvoip -url=../libtgvoip.git +url=git@gitlab.com:peter-iakovlev/libtgvoip.git [submodule "submodules/lottie-ios"] path = submodules/lottie-ios url=../lottie-ios.git diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index fab3b085af..56a4825898 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4363,3 +4363,36 @@ Any member of this group will be able to see messages in the channel."; "AddContact.ContactWillBeSharedAfterMutual" = "Phone number vill be visible once %1$@ adds you as a contact. Your phone number will become visible to %1$@."; "AddContact.StatusSuccess" = "%@ is now in your contacts list."; "Conversation.ShareMyPhoneNumber.StatusSuccess" = "%@ can now see your phone number."; + +"Group.EditAdmin.TransferOwnership" = "Transfer Group Ownership"; +"Channel.EditAdmin.TransferOwnership" = "Transfer Channel Ownership"; + +"OwnershipTransfer.SecurityCheck" = "Security Check"; +"OwnershipTransfer.SecurityRequirements" = "Ownership transfers are available if:\n\n• 2-Step verification was enabled for your account more than **7 days** ago.\n\n• You have logged in on this device more than **24 hours** ago."; +"OwnershipTransfer.ComeBackLater" = "\n\nPlease come back later."; +"OwnershipTransfer.SetupTwoStepAuth" = "Enable 2-Step Verification"; + +"Channel.OwnershipTransfer.Title" = "Transfer Channel Ownership"; +"Channel.OwnershipTransfer.DescriptionInfo" = "This will transfer the full **owner rights** for **%1$@** to **%2$@**.\n\nYou will no longer be considered the creator of the channel. The new owner will be free to remove any of your admin privileges or even ban you."; +"Group.OwnershipTransfer.Title" = "Transfer Group Ownership"; +"Group.OwnershipTransfer.DescriptionInfo" = "This will transfer the full **owner rights** for **%1$@** to **%2$@**.\n\nYou will no longer be considered the creator of the group. The new owner will be free to remove any of your admin privileges or even ban you."; +"Channel.OwnershipTransfer.ChangeOwner" = "Change Owner"; + +"Channel.OwnershipTransfer.EnterPassword" = "Enter Password"; +"Channel.OwnershipTransfer.EnterPasswordText" = "Please enter your 2-Step Verification password to complete the transfer."; +"Channel.OwnershipTransfer.PasswordPlaceholder" = "Password"; + +"Channel.OwnershipTransfer.TransferCompleted" = "**%1$@** is now the owner of **%2$@**"; + +"Contacts.AddPeopleNearby" = "Add People Nearby"; + +"PeopleNearby.Title" = "People Nearby"; +"PeopleNearby.Description" = "Use this section to quickly find people and groups near you."; +"PeopleNearby.Users" = "People Around You"; +"PeopleNearby.UsersEmpty" = "No one else is viewing \"People Nearby\" around you now"; +"PeopleNearby.Groups" = "Groups Around You"; +"PeopleNearby.CreateGroup" = "Start a Group Chat Here"; +"PeopleNearby.Channels" = "Channels Around You"; + +"Channel.Management.LabelOwner" = "Owner"; +"Channel.Management.LabelAdministrator" = "Administrator"; diff --git a/submodules/Display b/submodules/Display index 03718ebeb2..7657cdb00a 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 03718ebeb2cd6ffac5f4a746059ef8cc108dd981 +Subproject commit 7657cdb00a9b5955f9c25e2aa6c0c12f9395562e diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 19dfab255e..9c3641dae9 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 19dfab255e0ce8d1ff6784b958135258e4e3fdca +Subproject commit 9c3641dae90d18262584153d6f53d122c56eb0d2 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 4150d20eb0..339bc3c472 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 4150d20eb09d79ea91878278273037d1c0a9207f +Subproject commit 339bc3c47210e118a21046742a3b4b69cdfb1427 diff --git a/submodules/libtgvoip b/submodules/libtgvoip index 351c9968ff..16711e2023 160000 --- a/submodules/libtgvoip +++ b/submodules/libtgvoip @@ -1 +1 @@ -Subproject commit 351c9968ff2f0781ccda2011aa2e935865c3dc27 +Subproject commit 16711e202393ae7e1b160436f4291c5f06a3d375