diff --git a/Localization/app.json b/Localization/app.json index b63f51433..7d5a1cd92 100644 --- a/Localization/app.json +++ b/Localization/app.json @@ -736,7 +736,8 @@ "reblogged_your_post": "boosted your post", "mentioned_you": "mentioned you", "request_to_follow_you": "request to follow you", - "poll_has_ended": "poll has ended" + "poll_has_ended": "poll has ended", + "relationship_severance": "An admin from %@ has blocked %@, including %@." }, "keyobard": { "show_everything": "Show Everything", @@ -758,6 +759,7 @@ "suspend": "Your account has been suspended.", "learn_more": "Learn More" }, + "learn_more_about_server_blocks" : "Learn more about server blocks", "filtered_notification": { "title": "Filtered Notifications", "accept": "Accept", diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift index 2613487ea..b2b6431b2 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift +++ b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift @@ -929,6 +929,8 @@ public enum L10n { } } public enum Notification { + /// Learn more about server blocks + public static let learnMoreAboutServerBlocks = L10n.tr("Localizable", "Scene.Notification.LearnMoreAboutServerBlocks", fallback: "Learn more about server blocks") public enum FilteredNotification { /// Accept public static let accept = L10n.tr("Localizable", "Scene.Notification.FilteredNotification.Accept", fallback: "Accept") @@ -964,6 +966,10 @@ public enum L10n { public static let pollHasEnded = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.PollHasEnded", fallback: "poll has ended") /// boosted your post public static let rebloggedYourPost = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.RebloggedYourPost", fallback: "boosted your post") + /// An admin from %@ has blocked %@, including %@. + public static func relationshipSeveranceEvent(_ p1: Any, _ p2: Any, _ p3: Any) -> String { + return L10n.tr("Localizable", "Scene.Notification.NotificationDescription.RelationshipSeveranceEvent", String(describing: p1), String(describing: p2), String(describing: p3), fallback: "An admin from %@ has blocked %@, including %@.") + } /// request to follow you public static let requestToFollowYou = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.RequestToFollowYou", fallback: "request to follow you") } @@ -1006,8 +1012,8 @@ public enum L10n { public static let deleteStatuses = L10n.tr("Localizable", "Scene.Notification.Warning.DeleteStatuses", fallback: "Some of your posts have been removed.") /// Your account has been disabled. public static let disable = L10n.tr("Localizable", "Scene.Notification.Warning.Disable", fallback: "Your account has been disabled.") - /// Learn More - public static let learnMore = L10n.tr("Localizable", "Scene.Notification.Warning.LearnMore", fallback: "Learn More") + /// Learn more + public static let learnMore = L10n.tr("Localizable", "Scene.Notification.Warning.LearnMore", fallback: "Learn more") /// Some of your posts have been marked as sensitive. public static let markStatusesAsSensitive = L10n.tr("Localizable", "Scene.Notification.Warning.MarkStatusesAsSensitive", fallback: "Some of your posts have been marked as sensitive.") /// Your account has received a moderation warning. @@ -1971,6 +1977,10 @@ public enum L10n { return L10n.tr("Localizable", "plural.people_talking", p1, fallback: "Plural format key: \"%#@count_people_talking@\"") } public enum Count { + /// Plural format key: "%#@count_accounts_that_you_follow@" + public static func accountsThatYouFollow(_ p1: Int) -> String { + return L10n.tr("Localizable", "plural.count.accounts_that_you_follow", p1, fallback: "Plural format key: \"%#@count_accounts_that_you_follow@\"") + } /// Plural format key: "%#@attachment_count@" public static func attachment(_ p1: Int) -> String { return L10n.tr("Localizable", "plural.count.attachment", p1, fallback: "Plural format key: \"%#@attachment_count@\"") @@ -2007,6 +2017,10 @@ public enum L10n { public static func media(_ p1: Int) -> String { return L10n.tr("Localizable", "plural.count.media", p1, fallback: "Plural format key: \"%#@media_count@\"") } + /// Plural format key: "%#@count_of_your_followers@" + public static func ofYourFollowers(_ p1: Int) -> String { + return L10n.tr("Localizable", "plural.count.of_your_followers", p1, fallback: "Plural format key: \"%#@count_of_your_followers@\"") + } /// Plural format key: "%#@poll_count@" public static func poll(_ p1: Int) -> String { return L10n.tr("Localizable", "plural.count.poll", p1, fallback: "Plural format key: \"%#@poll_count@\"") diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings index 07651d419..f41eb554a 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings @@ -345,6 +345,7 @@ Please retry in a few minutes."; "Scene.Notification.NotificationDescription.PollHasEnded" = "poll has ended"; "Scene.Notification.NotificationDescription.RebloggedYourPost" = "boosted your post"; "Scene.Notification.NotificationDescription.RequestToFollowYou" = "request to follow you"; +"Scene.Notification.NotificationDescription.RelationshipSeveranceEvent" = "An admin from %@ has blocked %@, including %@."; "Scene.Notification.Policy.NewAccount.Subtitle" = "Created within the past 30 days"; "Scene.Notification.Policy.NewAccount.Title" = "New accounts"; "Scene.Notification.Policy.NoFollower.Subtitle" = "Including people who have been following you fewer than 3 days"; @@ -358,12 +359,13 @@ Please retry in a few minutes."; "Scene.Notification.Title.Mentions" = "Mentions"; "Scene.Notification.Warning.DeleteStatuses" = "Some of your posts have been removed."; "Scene.Notification.Warning.Disable" = "Your account has been disabled."; -"Scene.Notification.Warning.LearnMore" = "Learn More"; +"Scene.Notification.Warning.LearnMore" = "Learn more"; "Scene.Notification.Warning.MarkStatusesAsSensitive" = "Some of your posts have been marked as sensitive."; "Scene.Notification.Warning.None" = "Your account has received a moderation warning."; "Scene.Notification.Warning.Sensitive" = "Your posts will be marked as sensitive from now on."; "Scene.Notification.Warning.Silence" = "Your account has been limited."; "Scene.Notification.Warning.Suspend" = "Your account has been suspended."; +"Scene.Notification.LearnMoreAboutServerBlocks" = "Learn more about server blocks"; "Scene.Preview.Keyboard.ClosePreview" = "Close Preview"; "Scene.Preview.Keyboard.ShowNext" = "Show Next"; "Scene.Preview.Keyboard.ShowPrevious" = "Show Previous"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict index 8fda97b86..f9013e378 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict @@ -517,6 +517,50 @@ %ld followers + plural.count.of_your_followers + + NSStringLocalizedFormatKey + %#@count_of_your_followers@ + count_of_your_followers + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 of your followers + one + 1 of your followers + few + %ld of your followers + many + %ld of your followers + other + %ld of your followers + + + plural.count.accounts_that_you_follow + + NSStringLocalizedFormatKey + %#@count_accounts_that_you_follow@ + count_accounts_that_you_follow + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 accounts that you follow + one + 1 account that you follow + few + %ld accounts that you follow + many + %ld accounts that you follow + other + %ld accounts that you follow + + date.year.left NSStringLocalizedFormatKey