Skip to content

Commit

Permalink
Update localizations
Browse files Browse the repository at this point in the history
  • Loading branch information
whattherestimefor committed Nov 29, 2024
1 parent fb9266e commit a055d8a
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 29 deletions.
24 changes: 22 additions & 2 deletions Localization/StringsConvertor/input/Base.lproj/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
},
"login": {
"title": "Welcome Back",
"subtitle": "Log in with the server where you created your account.",
"subtitle": "Log in with the server where you created your account. For example, if your handle is @[email protected], enter 'example.social'.",
"server_search_field": {
"placeholder": "Enter URL or search for your server"
}
Expand Down Expand Up @@ -791,7 +791,7 @@
"general": "General",
"notifications": "Notifications",
"privacy_safety": "Privacy & Safety",
"support_mastodon": "Support Mastodon",
"support_mastodon": "Donate to Mastodon",
"about_mastodon": "About Mastodon",
"server_details": "Server Details",
"logout": "Logout %@"
Expand Down Expand Up @@ -880,6 +880,10 @@
"show_followers_and_following": "Show Followers & Following",
"suggest_my_account_to_others": "Suggest My Account to Others",
"appear_in_search_engines": "Appear in Search Engines"
},
"donation": {
"title": "Donate to Mastodon",
"manage": "Manage donations"
}
},
"report": {
Expand Down Expand Up @@ -965,6 +969,22 @@
"follow": "Follow",
"unfollow": "Unfollow"
}
},
"donation": {
"picker": {
"once_title": "Just once",
"monthly_title": "Monthly",
"yearly_title": "Yearly"
},
"donatebuttontitle": "Donate",
"currency": "Currency",
"success": {
"title": "Thank you for your contribution!",
"subtitle": "You should receive an email confirming your donation soon.",
"server_error_title": "Payment failed",
"server_error_message": "We are sorry, an error occurred and we have not been able to process your donation.\n\nPlease retry in a few minutes.",
"share_button_title": "Spread the word"
}
}
},
"extension": {
Expand Down
4 changes: 2 additions & 2 deletions Mastodon/Scene/Donation/DonationViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class DonationViewController: UIHostingController<DonationView> {
self.navigationItem.leftBarButtonItem = UIBarButtonItem(systemItem: .done, primaryAction: UIAction(handler: { _ in
completion(nil)
}))
self.navigationItem.title = L10n.Scene.Donation.title
self.navigationItem.title = L10n.Scene.Settings.Donation.title
}

@MainActor required dynamic init?(coder aDecoder: NSCoder) {
Expand Down Expand Up @@ -178,7 +178,7 @@ struct DonationView: View {
}) {
HStack {
Spacer()
Text(L10n.Scene.Donation.donateButtonTitle)
Text(L10n.Scene.Donation.donatebuttontitle)
Spacer()
}
.frame(maxWidth: .infinity)
Expand Down
2 changes: 1 addition & 1 deletion Mastodon/Scene/Settings/Settings Overview/Settings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ enum SettingsEntry: Hashable {
case .makeDonation:
return L10n.Scene.Settings.Overview.supportMastodon
case .manageDonations:
return L10n.Scene.Settings.Overview.manageDonations
return L10n.Scene.Settings.Donation.manage
case .aboutMastodon:
return L10n.Scene.Settings.Overview.aboutMastodon
case .logout(let accountName):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -812,9 +812,7 @@ public enum L10n {
/// Currency
public static let currency = L10n.tr("Localizable", "Scene.Donation.Currency", fallback: "Currency")
/// Donate
public static let donateButtonTitle = L10n.tr("Localizable", "Scene.Donation.DonateButtonTitle", fallback: "Donate")
/// Donate to Mastodon
public static let title = L10n.tr("Localizable", "Scene.Donation.Title", fallback: "Donate to Mastodon")
public static let donatebuttontitle = L10n.tr("Localizable", "Scene.Donation.Donatebuttontitle", fallback: "Donate")
public enum Picker {
/// Monthly
public static let monthlyTitle = L10n.tr("Localizable", "Scene.Donation.Picker.MonthlyTitle", fallback: "Monthly")
Expand Down Expand Up @@ -1692,8 +1690,6 @@ public enum L10n {
public static func logout(_ p1: Any) -> String {
return L10n.tr("Localizable", "Scene.Settings.Overview.Logout", String(describing: p1), fallback: "Logout %@")
}
/// Manage donations
public static let manageDonations = L10n.tr("Localizable", "Scene.Settings.Overview.ManageDonations", fallback: "Manage donations")
/// Notifications
public static let notifications = L10n.tr("Localizable", "Scene.Settings.Overview.Notifications", fallback: "Notifications")
/// Privacy & Safety
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,18 @@ uploaded to Mastodon.";
"Scene.Discovery.Tabs.Hashtags" = "Hashtags";
"Scene.Discovery.Tabs.News" = "News";
"Scene.Discovery.Tabs.Posts" = "Posts";
"Scene.Donation.Currency" = "Currency";
"Scene.Donation.Donatebuttontitle" = "Donate";
"Scene.Donation.Picker.MonthlyTitle" = "Monthly";
"Scene.Donation.Picker.OnceTitle" = "Just once";
"Scene.Donation.Picker.YearlyTitle" = "Yearly";
"Scene.Donation.Success.ServerErrorMessage" = "We are sorry, an error occurred and we have not been able to process your donation.

Please retry in a few minutes.";
"Scene.Donation.Success.ServerErrorTitle" = "Payment failed";
"Scene.Donation.Success.ShareButtonTitle" = "Spread the word";
"Scene.Donation.Success.Subtitle" = "You should receive an email confirming your donation soon.";
"Scene.Donation.Success.Title" = "Thank you for your contribution!";
"Scene.Familiarfollowers.FollowedByNames" = "Followed by %@";
"Scene.Familiarfollowers.Title" = "Followers you familiar";
"Scene.Favorite.Title" = "Favorites";
Expand All @@ -299,17 +311,6 @@ uploaded to Mastodon.";
"Scene.FollowedTags.Header.Posts" = "posts";
"Scene.FollowedTags.Header.PostsToday" = "posts today";
"Scene.FollowedTags.Title" = "Followed Tags";
"Scene.Donation.Title" = "Donate to Mastodon";
"Scene.Donation.Picker.OnceTitle" = "Just once";
"Scene.Donation.Picker.MonthlyTitle" = "Monthly";
"Scene.Donation.Picker.YearlyTitle" = "Yearly";
"Scene.Donation.DonateButtonTitle" = "Donate";
"Scene.Donation.Currency" = "Currency";
"Scene.Donation.Success.Title" = "Thank you for your contribution!";
"Scene.Donation.Success.Subtitle" = "You should receive an email confirming your donation soon.";
"Scene.Donation.Success.ServerErrorTitle" = "Payment failed";
"Scene.Donation.Success.ServerErrorMessage" = "We are sorry, an error occurred and we have not been able to process your donation.\n\nPlease retry in a few minutes.";
"Scene.Donation.Success.ShareButtonTitle" = "Spread the word";
"Scene.Follower.Footer" = "Followers from other servers are not displayed.";
"Scene.Follower.Title" = "follower";
"Scene.Following.Footer" = "Follows from other servers are not displayed.";
Expand Down Expand Up @@ -555,6 +556,8 @@ If you disagree with the policy for **%@**, you can go back and pick a different
"Scene.Settings.AboutMastodon.MoreSettings" = "Even More Settings";
"Scene.Settings.AboutMastodon.PrivacyPolicy" = "Privacy Policy";
"Scene.Settings.AboutMastodon.Title" = "About";
"Scene.Settings.Donation.Manage" = "Manage donations";
"Scene.Settings.Donation.Title" = "Donate to Mastodon";
"Scene.Settings.General.Appearance.Dark" = "Dark";
"Scene.Settings.General.Appearance.Light" = "Light";
"Scene.Settings.General.Appearance.SectionTitle" = "Appearance";
Expand Down Expand Up @@ -590,7 +593,6 @@ If you disagree with the policy for **%@**, you can go back and pick a different
"Scene.Settings.Overview.Notifications" = "Notifications";
"Scene.Settings.Overview.PrivacySafety" = "Privacy & Safety";
"Scene.Settings.Overview.ServerDetails" = "Server Details";
"Scene.Settings.Overview.ManageDonations" = "Manage donations";
"Scene.Settings.Overview.SupportMastodon" = "Donate to Mastodon";
"Scene.Settings.Overview.Title" = "Settings";
"Scene.Settings.PrivacySafety.AppearInSearchEngines" = "Appear in Search Engines";
Expand All @@ -611,8 +613,6 @@ If you disagree with the policy for **%@**, you can go back and pick a different
"Scene.Settings.ServerDetails.AboutInstance.MessageAdmin" = "Message Admin";
"Scene.Settings.ServerDetails.AboutInstance.Title" = "Administrator";
"Scene.Settings.ServerDetails.Rules" = "Rules";
"Scene.Settings.Donation.Title" = "Donate to Mastodon";
"Scene.Settings.Donation.Manage" = "Manage donations";
"Scene.SuggestionAccount.FollowAll" = "Follow all";
"Scene.SuggestionAccount.Title" = "Popular on Mastodon";
"Scene.Thread.BackTitle" = "Post";
Expand Down Expand Up @@ -648,4 +648,4 @@ If you disagree with the policy for **%@**, you can go back and pick a different
"Widget.MultipleFollowers.ConfigurationDescription" = "Show number of followers for multiple accounts.";
"Widget.MultipleFollowers.ConfigurationDisplayName" = "Multiple followers";
"Widget.MultipleFollowers.MockUser.AccountName" = "[email protected]";
"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower";
"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower";
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ kann nicht auf Mastodon hochgeladen werden.";
"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.Warning.Silence" = "Dein Konto wurde eingeschränkt.";
"Scene.Notification.Warning.Suspend" = "Dein Konto wurde gesperrt.";
"Scene.Preview.Keyboard.ClosePreview" = "Vorschau schließen";
"Scene.Preview.Keyboard.ShowNext" = "Nächstes anzeigen";
"Scene.Preview.Keyboard.ShowPrevious" = "Vorheriges anzeigen";
Expand Down Expand Up @@ -441,7 +441,7 @@ If you disagree with the policy for **%@**, you can go back and pick a different
"Scene.Report.StepFinal.Unfollowed" = "Entfolgt";
"Scene.Report.StepFinal.WhenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience." = "Wenn du etwas auf Mastodon nicht sehen willst, kannst du den Nutzer aus deiner Erfahrung streichen.";
"Scene.Report.StepFinal.WhileWeReviewThisYouCanTakeActionAgainstUser" = "Während wir dies überprüfen, kannst du gegen %@ vorgehen";
"Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted" = "You won’t see their posts or boosts in your home feed. They won’t know they’ve been muted.";
"Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted" = "Du wirst die Beiträge vom Konto nicht mehr sehen. Das Konto kann dir immer noch folgen, und die Person hinter dem Konto wird deine Beiträge sehen können und nicht wissen, dass du sie stummgeschaltet hast.";
"Scene.Report.StepFour.IsThereAnythingElseWeShouldKnow" = "Gibt es etwas anderes, was wir wissen sollten?";
"Scene.Report.StepFour.Step4Of4" = "Schritt 4 von 4";
"Scene.Report.StepOne.IDontLikeIt" = "Mir gefällt das nicht";
Expand Down Expand Up @@ -570,7 +570,7 @@ If you disagree with the policy for **%@**, you can go back and pick a different
"Scene.Settings.Overview.SupportMastodon" = "Mastodon unterstützen";
"Scene.Settings.Overview.Title" = "Einstellungen";
"Scene.Settings.PrivacySafety.AppearInSearchEngines" = "In Suchmaschinen anzeigen";
"Scene.Settings.PrivacySafety.DefaultPostVisibility.FollowersOnly" = "Followers Only";
"Scene.Settings.PrivacySafety.DefaultPostVisibility.FollowersOnly" = "Nur für Follower";
"Scene.Settings.PrivacySafety.DefaultPostVisibility.OnlyPeopleMentioned" = "Nur erwähnte Profile";
"Scene.Settings.PrivacySafety.DefaultPostVisibility.Public" = "Öffentlich";
"Scene.Settings.PrivacySafety.DefaultPostVisibility.Title" = "Standard-Sichtbarkeit von Beiträgen";
Expand Down

0 comments on commit a055d8a

Please sign in to comment.