Skip to content

Commit a055d8a

Browse files
Update localizations
1 parent fb9266e commit a055d8a

File tree

6 files changed

+45
-29
lines changed

6 files changed

+45
-29
lines changed

Localization/StringsConvertor/input/Base.lproj/app.json

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
},
313313
"login": {
314314
"title": "Welcome Back",
315-
"subtitle": "Log in with the server where you created your account.",
315+
"subtitle": "Log in with the server where you created your account. For example, if your handle is @you@example.social, enter 'example.social'.",
316316
"server_search_field": {
317317
"placeholder": "Enter URL or search for your server"
318318
}
@@ -791,7 +791,7 @@
791791
"general": "General",
792792
"notifications": "Notifications",
793793
"privacy_safety": "Privacy & Safety",
794-
"support_mastodon": "Support Mastodon",
794+
"support_mastodon": "Donate to Mastodon",
795795
"about_mastodon": "About Mastodon",
796796
"server_details": "Server Details",
797797
"logout": "Logout %@"
@@ -880,6 +880,10 @@
880880
"show_followers_and_following": "Show Followers & Following",
881881
"suggest_my_account_to_others": "Suggest My Account to Others",
882882
"appear_in_search_engines": "Appear in Search Engines"
883+
},
884+
"donation": {
885+
"title": "Donate to Mastodon",
886+
"manage": "Manage donations"
883887
}
884888
},
885889
"report": {
@@ -965,6 +969,22 @@
965969
"follow": "Follow",
966970
"unfollow": "Unfollow"
967971
}
972+
},
973+
"donation": {
974+
"picker": {
975+
"once_title": "Just once",
976+
"monthly_title": "Monthly",
977+
"yearly_title": "Yearly"
978+
},
979+
"donatebuttontitle": "Donate",
980+
"currency": "Currency",
981+
"success": {
982+
"title": "Thank you for your contribution!",
983+
"subtitle": "You should receive an email confirming your donation soon.",
984+
"server_error_title": "Payment failed",
985+
"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.",
986+
"share_button_title": "Spread the word"
987+
}
968988
}
969989
},
970990
"extension": {

Mastodon/Scene/Donation/DonationViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DonationViewController: UIHostingController<DonationView> {
1919
self.navigationItem.leftBarButtonItem = UIBarButtonItem(systemItem: .done, primaryAction: UIAction(handler: { _ in
2020
completion(nil)
2121
}))
22-
self.navigationItem.title = L10n.Scene.Donation.title
22+
self.navigationItem.title = L10n.Scene.Settings.Donation.title
2323
}
2424

2525
@MainActor required dynamic init?(coder aDecoder: NSCoder) {
@@ -178,7 +178,7 @@ struct DonationView: View {
178178
}) {
179179
HStack {
180180
Spacer()
181-
Text(L10n.Scene.Donation.donateButtonTitle)
181+
Text(L10n.Scene.Donation.donatebuttontitle)
182182
Spacer()
183183
}
184184
.frame(maxWidth: .infinity)

Mastodon/Scene/Settings/Settings Overview/Settings.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ enum SettingsEntry: Hashable {
3333
case .makeDonation:
3434
return L10n.Scene.Settings.Overview.supportMastodon
3535
case .manageDonations:
36-
return L10n.Scene.Settings.Overview.manageDonations
36+
return L10n.Scene.Settings.Donation.manage
3737
case .aboutMastodon:
3838
return L10n.Scene.Settings.Overview.aboutMastodon
3939
case .logout(let accountName):

MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -812,9 +812,7 @@ public enum L10n {
812812
/// Currency
813813
public static let currency = L10n.tr("Localizable", "Scene.Donation.Currency", fallback: "Currency")
814814
/// Donate
815-
public static let donateButtonTitle = L10n.tr("Localizable", "Scene.Donation.DonateButtonTitle", fallback: "Donate")
816-
/// Donate to Mastodon
817-
public static let title = L10n.tr("Localizable", "Scene.Donation.Title", fallback: "Donate to Mastodon")
815+
public static let donatebuttontitle = L10n.tr("Localizable", "Scene.Donation.Donatebuttontitle", fallback: "Donate")
818816
public enum Picker {
819817
/// Monthly
820818
public static let monthlyTitle = L10n.tr("Localizable", "Scene.Donation.Picker.MonthlyTitle", fallback: "Monthly")
@@ -1692,8 +1690,6 @@ public enum L10n {
16921690
public static func logout(_ p1: Any) -> String {
16931691
return L10n.tr("Localizable", "Scene.Settings.Overview.Logout", String(describing: p1), fallback: "Logout %@")
16941692
}
1695-
/// Manage donations
1696-
public static let manageDonations = L10n.tr("Localizable", "Scene.Settings.Overview.ManageDonations", fallback: "Manage donations")
16971693
/// Notifications
16981694
public static let notifications = L10n.tr("Localizable", "Scene.Settings.Overview.Notifications", fallback: "Notifications")
16991695
/// Privacy & Safety

MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,18 @@ uploaded to Mastodon.";
289289
"Scene.Discovery.Tabs.Hashtags" = "Hashtags";
290290
"Scene.Discovery.Tabs.News" = "News";
291291
"Scene.Discovery.Tabs.Posts" = "Posts";
292+
"Scene.Donation.Currency" = "Currency";
293+
"Scene.Donation.Donatebuttontitle" = "Donate";
294+
"Scene.Donation.Picker.MonthlyTitle" = "Monthly";
295+
"Scene.Donation.Picker.OnceTitle" = "Just once";
296+
"Scene.Donation.Picker.YearlyTitle" = "Yearly";
297+
"Scene.Donation.Success.ServerErrorMessage" = "We are sorry, an error occurred and we have not been able to process your donation.
298+
299+
Please retry in a few minutes.";
300+
"Scene.Donation.Success.ServerErrorTitle" = "Payment failed";
301+
"Scene.Donation.Success.ShareButtonTitle" = "Spread the word";
302+
"Scene.Donation.Success.Subtitle" = "You should receive an email confirming your donation soon.";
303+
"Scene.Donation.Success.Title" = "Thank you for your contribution!";
292304
"Scene.Familiarfollowers.FollowedByNames" = "Followed by %@";
293305
"Scene.Familiarfollowers.Title" = "Followers you familiar";
294306
"Scene.Favorite.Title" = "Favorites";
@@ -299,17 +311,6 @@ uploaded to Mastodon.";
299311
"Scene.FollowedTags.Header.Posts" = "posts";
300312
"Scene.FollowedTags.Header.PostsToday" = "posts today";
301313
"Scene.FollowedTags.Title" = "Followed Tags";
302-
"Scene.Donation.Title" = "Donate to Mastodon";
303-
"Scene.Donation.Picker.OnceTitle" = "Just once";
304-
"Scene.Donation.Picker.MonthlyTitle" = "Monthly";
305-
"Scene.Donation.Picker.YearlyTitle" = "Yearly";
306-
"Scene.Donation.DonateButtonTitle" = "Donate";
307-
"Scene.Donation.Currency" = "Currency";
308-
"Scene.Donation.Success.Title" = "Thank you for your contribution!";
309-
"Scene.Donation.Success.Subtitle" = "You should receive an email confirming your donation soon.";
310-
"Scene.Donation.Success.ServerErrorTitle" = "Payment failed";
311-
"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.";
312-
"Scene.Donation.Success.ShareButtonTitle" = "Spread the word";
313314
"Scene.Follower.Footer" = "Followers from other servers are not displayed.";
314315
"Scene.Follower.Title" = "follower";
315316
"Scene.Following.Footer" = "Follows from other servers are not displayed.";
@@ -555,6 +556,8 @@ If you disagree with the policy for **%@**, you can go back and pick a different
555556
"Scene.Settings.AboutMastodon.MoreSettings" = "Even More Settings";
556557
"Scene.Settings.AboutMastodon.PrivacyPolicy" = "Privacy Policy";
557558
"Scene.Settings.AboutMastodon.Title" = "About";
559+
"Scene.Settings.Donation.Manage" = "Manage donations";
560+
"Scene.Settings.Donation.Title" = "Donate to Mastodon";
558561
"Scene.Settings.General.Appearance.Dark" = "Dark";
559562
"Scene.Settings.General.Appearance.Light" = "Light";
560563
"Scene.Settings.General.Appearance.SectionTitle" = "Appearance";
@@ -590,7 +593,6 @@ If you disagree with the policy for **%@**, you can go back and pick a different
590593
"Scene.Settings.Overview.Notifications" = "Notifications";
591594
"Scene.Settings.Overview.PrivacySafety" = "Privacy & Safety";
592595
"Scene.Settings.Overview.ServerDetails" = "Server Details";
593-
"Scene.Settings.Overview.ManageDonations" = "Manage donations";
594596
"Scene.Settings.Overview.SupportMastodon" = "Donate to Mastodon";
595597
"Scene.Settings.Overview.Title" = "Settings";
596598
"Scene.Settings.PrivacySafety.AppearInSearchEngines" = "Appear in Search Engines";
@@ -611,8 +613,6 @@ If you disagree with the policy for **%@**, you can go back and pick a different
611613
"Scene.Settings.ServerDetails.AboutInstance.MessageAdmin" = "Message Admin";
612614
"Scene.Settings.ServerDetails.AboutInstance.Title" = "Administrator";
613615
"Scene.Settings.ServerDetails.Rules" = "Rules";
614-
"Scene.Settings.Donation.Title" = "Donate to Mastodon";
615-
"Scene.Settings.Donation.Manage" = "Manage donations";
616616
"Scene.SuggestionAccount.FollowAll" = "Follow all";
617617
"Scene.SuggestionAccount.Title" = "Popular on Mastodon";
618618
"Scene.Thread.BackTitle" = "Post";
@@ -648,4 +648,4 @@ If you disagree with the policy for **%@**, you can go back and pick a different
648648
"Widget.MultipleFollowers.ConfigurationDescription" = "Show number of followers for multiple accounts.";
649649
"Widget.MultipleFollowers.ConfigurationDisplayName" = "Multiple followers";
650650
"Widget.MultipleFollowers.MockUser.AccountName" = "another@follower.social";
651-
"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower";
651+
"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower";

MastodonSDK/Sources/MastodonLocalization/Resources/de.lproj/Localizable.strings

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ kann nicht auf Mastodon hochgeladen werden.";
337337
"Scene.Notification.Warning.MarkStatusesAsSensitive" = "Some of your posts have been marked as sensitive.";
338338
"Scene.Notification.Warning.None" = "Your account has received a moderation warning.";
339339
"Scene.Notification.Warning.Sensitive" = "Your posts will be marked as sensitive from now on.";
340-
"Scene.Notification.Warning.Silence" = "Your account has been limited.";
341-
"Scene.Notification.Warning.Suspend" = "Your account has been suspended.";
340+
"Scene.Notification.Warning.Silence" = "Dein Konto wurde eingeschränkt.";
341+
"Scene.Notification.Warning.Suspend" = "Dein Konto wurde gesperrt.";
342342
"Scene.Preview.Keyboard.ClosePreview" = "Vorschau schließen";
343343
"Scene.Preview.Keyboard.ShowNext" = "Nächstes anzeigen";
344344
"Scene.Preview.Keyboard.ShowPrevious" = "Vorheriges anzeigen";
@@ -441,7 +441,7 @@ If you disagree with the policy for **%@**, you can go back and pick a different
441441
"Scene.Report.StepFinal.Unfollowed" = "Entfolgt";
442442
"Scene.Report.StepFinal.WhenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience." = "Wenn du etwas auf Mastodon nicht sehen willst, kannst du den Nutzer aus deiner Erfahrung streichen.";
443443
"Scene.Report.StepFinal.WhileWeReviewThisYouCanTakeActionAgainstUser" = "Während wir dies überprüfen, kannst du gegen %@ vorgehen";
444-
"Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted" = "You won’t see their posts or boosts in your home feed. They won’t know they’ve been muted.";
444+
"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.";
445445
"Scene.Report.StepFour.IsThereAnythingElseWeShouldKnow" = "Gibt es etwas anderes, was wir wissen sollten?";
446446
"Scene.Report.StepFour.Step4Of4" = "Schritt 4 von 4";
447447
"Scene.Report.StepOne.IDontLikeIt" = "Mir gefällt das nicht";
@@ -570,7 +570,7 @@ If you disagree with the policy for **%@**, you can go back and pick a different
570570
"Scene.Settings.Overview.SupportMastodon" = "Mastodon unterstützen";
571571
"Scene.Settings.Overview.Title" = "Einstellungen";
572572
"Scene.Settings.PrivacySafety.AppearInSearchEngines" = "In Suchmaschinen anzeigen";
573-
"Scene.Settings.PrivacySafety.DefaultPostVisibility.FollowersOnly" = "Followers Only";
573+
"Scene.Settings.PrivacySafety.DefaultPostVisibility.FollowersOnly" = "Nur für Follower";
574574
"Scene.Settings.PrivacySafety.DefaultPostVisibility.OnlyPeopleMentioned" = "Nur erwähnte Profile";
575575
"Scene.Settings.PrivacySafety.DefaultPostVisibility.Public" = "Öffentlich";
576576
"Scene.Settings.PrivacySafety.DefaultPostVisibility.Title" = "Standard-Sichtbarkeit von Beiträgen";

0 commit comments

Comments
 (0)