Merge commit '6fa4d68fc46d59395d41b33fc768d49158589bf4'

This commit is contained in:
Peter 2018-11-20 18:21:14 +03:00
commit 72111b78cc
4 changed files with 19 additions and 3 deletions

View File

@ -372,6 +372,17 @@
"Notification.MessageLifetime1d" = "1 day";
"Notification.MessageLifetime1w" = "1 week";
"Notification.Exceptions.AlwaysOn" = "Always On";
"Notification.Exceptions.AlwaysOff" = "Always Off";
"Notification.Exceptions.MutedUntil" = "Muted until %@";
"Notification.Exceptions.AddException" = "Add an Exception";
"Notification.Exceptions.NewException" = "New Exception";
"Notification.Exceptions.NewException.NotificationHeader" = "NOTIFICATIONS";
"Notification.Exceptions.Sound" = "Sound: %@";
// Message
"Message.Photo" = "Photo";
"Message.Video" = "Video";
@ -527,18 +538,23 @@
"Notifications.MessageNotificationsPreview" = "Message Preview";
"Notifications.MessageNotificationsSound" = "Sound";
"Notifications.MessageNotificationsHelp" = "You can set custom notifications for specific users on their Info page.";
"Notifications.MessageNotificationsExceptionsHelp" = "Set custom notifications for specific users.";
"Notifications.GroupNotifications" = "GROUP NOTIFICATIONS";
"Notifications.GroupNotificationsAlert" = "Alert";
"Notifications.GroupNotificationsPreview" = "Message Preview";
"Notifications.GroupNotificationsSound" = "Sound";
"Notifications.GroupNotificationsHelp" = "You can set custom notifications for specific groups on the Group Info page.";
"Notifications.GroupNotificationsExceptionsHelp" = "Set custom notifications for specific groups.";
"Notifications.ChannelNotifications" = "CHANNEL NOTIFICATIONS";
"Notifications.ChannelNotificationsAlert" = "Alert";
"Notifications.ChannelNotificationsPreview" = "Message Preview";
"Notifications.ChannelNotificationsSound" = "Sound";
"Notifications.ChannelNotificationsHelp" = "You can set custom notifications for specific channels on the Channel Info page.";
"Notifications.ChannelNotificationsExceptionsHelp" = "Set custom notifications for specific channels.";
"Notifications.TextTone" = "Text Tone";
"Notifications.AlertTones" = "ALERT TONES";

@ -1 +1 @@
Subproject commit f1b535b111c5a11adf81a9672b9e45f6f3f33503
Subproject commit 32a425b111d3869d3c1de7ccf42ab27d12544fcf

@ -1 +1 @@
Subproject commit c365203961de051a271e6fee80d690bf6a9b4fcf
Subproject commit 9b2c101689212ef52194d96beace82bd90ca4a23

@ -1 +1 @@
Subproject commit ad9943d5b947f60a1d59d9a415903f1690aff921
Subproject commit d4b7ea31faa2674f000ed9ceeaece4de4965b4e9