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

This commit is contained in:
overtake 2018-11-20 23:29:00 +04:00
commit 6b8d29afd6
2 changed files with 3 additions and 3 deletions

View File

@ -3434,7 +3434,7 @@ Unused sets are archived when you add more.";
"Share.AuthDescription" = "Open Telegram and log in to share.";
"Notifications.DisplayNamesOnLockScreen" = "Names on lock-screen";
"Notifications.DisplayNamesOnLockScreenInfo" = "Display names in notifications on the lock screen.";
"Notifications.DisplayNamesOnLockScreenInfoWithLink" = "Display names in notifications when the device is locked. To disable, make sure that \"Show Previews\" is also set to \"When Unlocked\" or \"Never\" in [iOS Settings]";
"Notifications.Badge" = "BADGE COUNTER";
"Notifications.Badge.IncludeMutedChats" = "Include Muted Chats";
@ -3523,6 +3523,6 @@ Unused sets are archived when you add more.";
"Login.CancelPhoneVerificationStop" = "Stop";
"Login.CancelPhoneVerificationContinue" = "Continue";
"Login.CodeExpired" = "Code expired, please login again.";
"Login.CancelSignUpConfirmation" = "Are you sure you want to cancel registration?";
"Login.CancelSignUpConfirmation" = "Do you want to stop the registration process?";
"Passcode.AppLockedAlert" = "Telegram\nLocked";

@ -1 +1 @@
Subproject commit 6a54c41097b9be011999b9cd2a6aff776e2be99b
Subproject commit 2b2982a26edfd8871fe063f5262cb75763da09c2