commit 7158f07bb1b79f73f52bdcc211a04693236dd137 parent 07abc5c04b4416fdeb13296fae7d44c03a149df5 Author: William Casarin <jb55@jb55.com> Date: Mon, 10 Jul 2023 08:20:22 -0700 Translate all the things Diffstat:
49 files changed, 693 insertions(+), 583 deletions(-)
diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj @@ -434,6 +434,9 @@ 3AB5B86B2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; }; 3AB5B86C2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = de; path = de.lproj/Localizable.stringsdict; sourceTree = "<group>"; }; 3AB72AB8298ECF30004BB58C /* Translator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Translator.swift; sourceTree = "<group>"; }; + 3ABACEBF2A5B3ED10037A847 /* sw */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sw; path = sw.lproj/InfoPlist.strings; sourceTree = "<group>"; }; + 3ABACEC02A5B3ED10037A847 /* sw */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = sw; path = sw.lproj/Localizable.stringsdict; sourceTree = "<group>"; }; + 3ABACEC12A5B3ED10037A847 /* sw */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sw; path = sw.lproj/Localizable.strings; sourceTree = "<group>"; }; 3AC524EE298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 3AC524EF298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; }; 3AC524F0298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ar; path = ar.lproj/Localizable.stringsdict; sourceTree = "<group>"; }; @@ -1696,6 +1699,7 @@ "pt-PT", ru, "sv-SE", + sw, "tr-TR", uk, vi, @@ -2136,6 +2140,7 @@ 3A325AC929C9E0CF002BE7ED /* es-ES */, 3AC59CA929CDDB78007E04A6 /* pt-BR */, 3A821C4029E819D500B4BCA7 /* fr */, + 3ABACEC02A5B3ED10037A847 /* sw */, ); name = Localizable.stringsdict; sourceTree = "<group>"; @@ -2170,6 +2175,7 @@ 3A325AC829C9E0CF002BE7ED /* es-ES */, 3AC59CA829CDDB78007E04A6 /* pt-BR */, 3A821C3F29E819D500B4BCA7 /* fr */, + 3ABACEBF2A5B3ED10037A847 /* sw */, ); name = InfoPlist.strings; sourceTree = "<group>"; @@ -2205,6 +2211,7 @@ 3A325AC729C9E0CF002BE7ED /* es-ES */, 3AC59CA729CDDB78007E04A6 /* pt-BR */, 3A821C3E29E819D500B4BCA7 /* fr */, + 3ABACEC12A5B3ED10037A847 /* sw */, ); name = Localizable.strings; sourceTree = "<group>"; diff --git a/damus/Components/TranslateView.swift b/damus/Components/TranslateView.swift @@ -44,7 +44,8 @@ struct TranslateView: View { func TranslatedView(lang: String?, artifacts: NoteArtifacts) -> some View { return VStack(alignment: .leading) { - Text(String(format: NSLocalizedString("Translated from %@", comment: "Button to indicate that the note has been translated from a different language."), lang ?? "ja")) + let translatedFromLanguageString = String(format: NSLocalizedString("Translated from %@", comment: "Button to indicate that the note has been translated from a different language."), lang ?? "ja") + Text(translatedFromLanguageString) .foregroundColor(.gray) .font(.footnote) .padding([.top, .bottom], 10) diff --git a/damus/Views/NostrScript/LoadScript.swift b/damus/Views/NostrScript/LoadScript.swift @@ -80,6 +80,11 @@ class ScriptModel: ObservableObject { } } +func imports_string(_ count: Int, locale: Locale = Locale.current) -> String { + let format = localizedStringFormat(key: "imports_count", locale: locale) + return String(format: format, locale: locale, count) +} + struct LoadScript: View { let pool: RelayPool @@ -89,10 +94,9 @@ struct LoadScript: View { ScrollView { VStack { let imports = script.script.imports() - - (Text(verbatim: "\(imports.count)") + - Text(" Imports")) - .font(.title) + + let nounText = Text(verbatim: imports_string(imports.count)).font(.title) + Text("\(Text(verbatim: imports.count.formatted())) \(nounText)", comment: "Sentence composed of 2 variables to describe how many imports were performed from loading a NostrScript. In source English, the first variable is the number of imports, and the second variable is 'Import' or 'Imports'.") ForEach(imports.indices, id: \.self) { ind in Text(imports[ind]) @@ -100,25 +104,25 @@ struct LoadScript: View { switch script.state { case .loaded: - BigButton("Run") { + BigButton(NSLocalizedString("Run", comment: "Button that runs a NostrScript.")) { Task { await model.run() } } case .running: - Text("Running...") + Text("Running...", comment: "Indication that the execution of a NostrScript is running.") case .ran(let result): switch result { case .runtime_err(let errs): - Text("Runtime error") + Text("Runtime error", comment: "Indication that a runtime error occurred when running a NostrScript.") .font(.title2) ForEach(errs.indices, id: \.self) { ind in Text(verbatim: errs[ind]) } case .suspend: - Text("Ran to suspension.") + Text("Ran to suspension.", comment: "Indication that a NostrScript was run until it reached a suspended state.") case .finished(let code): - Text("Executed successfuly, returned with code \(code)") + Text("Executed successfully, returned with code \(code.description)", comment: "Indication that the execution of running a NostrScript finished successfully, while providing a numeric return code.") } } } @@ -138,13 +142,13 @@ struct LoadScript: View { ScriptView(loaded) case .failed(let load_err): VStack(spacing: 20) { - Text("NostrScript Error") + Text("NostrScript Error", comment: "Text indicating that there was an error with loading NostrScript. There is a more descriptive error message shown separately underneath.") .font(.title) switch load_err { case .parse: - Text("Failed to parse") + Text("Failed to parse", comment: "NostrScript error message when it fails to parse a script.") case .module_init: - Text("Failed to initialize") + Text("Failed to initialize", comment: "NostrScript error message when it fails to initialize a module.") } } } @@ -152,7 +156,7 @@ struct LoadScript: View { .task { await model.load(pool: self.pool) } - .navigationTitle("NostrScript") + .navigationTitle(NSLocalizedString("NostrScript", comment: "Navigation title for the view showing NostrScript.")) } } diff --git a/damus/Views/Profile/ProfileView.swift b/damus/Views/Profile/ProfileView.swift @@ -452,7 +452,8 @@ struct ProfileView: View { NavigationLink(value: Route.FollowersYouKnow(friendedFollowers: friended_followers, followers: followers)) { HStack { CondensedProfilePicturesView(state: damus_state, pubkeys: friended_followers, maxPictures: 3) - Text(followedByString(friended_followers, profiles: damus_state.profiles)) + let followedByString = followedByString(friended_followers, profiles: damus_state.profiles) + Text(followedByString) .font(.subheadline).foregroundColor(.gray) .multilineTextAlignment(.leading) } diff --git a/damus/Views/Relays/RelayDetailView.swift b/damus/Views/Relays/RelayDetailView.swift @@ -126,7 +126,7 @@ struct RelayDetailView: View { } if state.settings.developer_mode, let log_contents = log.contents { - Section("Log") { + Section(NSLocalizedString("Log", comment: "Label to display developer mode logs.")) { Text(log_contents) .font(.system(size: 13)) .lineLimit(nil) diff --git a/damus/Views/Zaps/ZapTypePicker.swift b/damus/Views/Zaps/ZapTypePicker.swift @@ -61,15 +61,15 @@ struct ZapTypePicker: View { } } } - ZapTypeSelection(text: "Public", comment: "Picker option to indicate that a zap should be sent publicly and identify the user as who sent it.", img: "globe", action: {zap_type = ZapType.pub}, type: ZapType.pub) - ZapTypeSelection(text: "Private", comment: "Picker option to indicate that a zap should be sent privately and not identify the user to the public.", img: "lock", action: {zap_type = ZapType.priv}, type: ZapType.priv) - ZapTypeSelection(text: "Anonymous", comment: "Picker option to indicate that a zap should be sent anonymously and not identify the user as who sent it.", img: "question", action: {zap_type = ZapType.anon}, type: ZapType.anon) - ZapTypeSelection(text: "None", comment: "Picker option to indicate that sats should be sent to the user's wallet as a regular Lightning payment, not as a zap.", img: "zap", action: {zap_type = ZapType.non_zap}, type: ZapType.non_zap) + ZapTypeSelection(text: NSLocalizedString("Public", comment: "Picker option to indicate that a zap should be sent publicly and identify the user as who sent it."), img: "globe", action: {zap_type = ZapType.pub}, type: ZapType.pub) + ZapTypeSelection(text: NSLocalizedString("Private", comment: "Picker option to indicate that a zap should be sent privately and not identify the user to the public."), img: "lock", action: {zap_type = ZapType.priv}, type: ZapType.priv) + ZapTypeSelection(text: NSLocalizedString("Anonymous", comment: "Picker option to indicate that a zap should be sent anonymously and not identify the user as who sent it."), img: "question", action: {zap_type = ZapType.anon}, type: ZapType.anon) + ZapTypeSelection(text: NSLocalizedString("None", comment: "Picker option to indicate that sats should be sent to the user's wallet as a regular Lightning payment, not as a zap."), img: "zap", action: {zap_type = ZapType.non_zap}, type: ZapType.non_zap) } .padding(.horizontal) } - func ZapTypeSelection(text: LocalizedStringKey, comment: StaticString, img: String, action: @escaping () -> (), type: ZapType) -> some View { + func ZapTypeSelection(text: String, img: String, action: @escaping () -> (), type: ZapType) -> some View { Button(action: action) { VStack(alignment: .leading, spacing: 5) { HStack { @@ -79,14 +79,15 @@ struct ZapTypePicker: View { .frame(width: 20, height: 20) .foregroundColor(.gray) - Text(text, comment: comment) + Text(text) .font(.system(size: 20, weight: .semibold)) Spacer() } .padding(.horizontal) - - Text(zap_type_desc(type: type, profiles: profiles, pubkey: pubkey)) + + let zapTypeDescription = zap_type_desc(type: type, profiles: profiles, pubkey: pubkey) + Text(zapTypeDescription) .padding(.horizontal) .foregroundColor(.gray) .font(.system(size: 16)) diff --git a/damus/ar.lproj/Localizable.stringsdict b/damus/ar.lproj/Localizable.stringsdict @@ -2,30 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>zero</key> - <string>... %d منشورات أخرى ...</string> - <key>one</key> - <string>... %d منشور اضافي ...</string> - <key>two</key> - <string>... %d منشوران ...</string> - <key>few</key> - <string>... %d منشورات اضافية ...</string> - <key>many</key> - <string>... %d منشورات اضافية ...</string> - <key>other</key> - <string>... %d منشورات اضافية ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/az.lproj/InfoPlist.strings b/damus/az.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/bg.lproj/Localizable.stringsdict b/damus/bg.lproj/Localizable.stringsdict @@ -2,22 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d друга бележка ...</string> - <key>other</key> - <string>... %d други бележки ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/cs.lproj/Localizable.stringsdict b/damus/cs.lproj/Localizable.stringsdict @@ -2,26 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d jiná poznámka ...</string> - <key>few</key> - <string>... %d other notes ...</string> - <key>many</key> - <string>... %d other notes ...</string> - <key>other</key> - <string>... %d jiné poznámky ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/de.lproj/Localizable.strings b/damus/de.lproj/Localizable.strings Binary files differ. diff --git a/damus/de.lproj/Localizable.stringsdict b/damus/de.lproj/Localizable.stringsdict @@ -2,20 +2,20 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> + <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> + <string>%#@OTHERS@</string> + <key>OTHERS</key> <dict> <key>NSStringFormatSpecTypeKey</key> <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>... %d andere Notiz ...</string> + <string>Gefolgt von %2$@, %3$@, %4$@ & %1$d weiters Profil</string> <key>other</key> - <string>... %d andere Notizen ...</string> + <string>Gefolgt von %2$@, %3$@, %4$@ & %1$d weitere</string> </dict> </dict> <key>followers_count</key> @@ -61,12 +61,12 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ und %1$d andere*r reagierten auf einen Beitrag in dem du markiert warst</string> + <string>%2$@ und %1$d weiteres Profil reagierten auf eine Notiz, in der du markiert warst</string> <key>other</key> - <string>%2$@ und %1$d andere reagierten auf einen Beitrag in dem du markiert warst</string> + <string>%2$@ und %1$d weitere Profile reagierten auf eine Notiz, in der du markiert warst</string> </dict> </dict> - <key>reacted_your_post_3</key> + <key>reacted_your_note_3</key> <dict> <key>NSStringLocalizedFormatKey</key> <string>%#@REACTED@</string> @@ -77,9 +77,9 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ und %1$d andere*r reagierten auf deinen Beitrag</string> + <string>2$@ und %1$d weiteres Profil reagierten auf dein Profil</string> <key>other</key> - <string>%2$@ und %1$d andere reagierten auf deinen Beitrag</string> + <string>2$@ und %1$d weitere reagierten auf deine Notiz</string> </dict> </dict> <key>reacted_your_profile_3</key> @@ -157,12 +157,12 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ und %1$d andere*r teilten einen Beitrag in dem du markiert warst</string> + <string>%2$@ und %1$d weiteres Profil teilten eine Notiz, in der du markiert warst</string> <key>other</key> - <string>%2$@ und %1$d andere teilten ein Beitrag in dem du markiert warst</string> + <string>%2$@ und %1$d weitere Profile teiten eine Notiz, in der du markiert warst</string> </dict> </dict> - <key>reposted_your_post_3</key> + <key>reposted_your_note_3</key> <dict> <key>NSStringLocalizedFormatKey</key> <string>%#@REPOSTED@</string> @@ -173,9 +173,9 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ und %1$d andere*r teilten deinen Beitrag</string> + <string>2$@ und %1$d weiteres Profil teilten deine Notiz</string> <key>other</key> - <string>%2$@ und %1$d andere teilten deinen Beitrag</string> + <string>2$@ und %1$d weitere teilten deine Notiz</string> </dict> </dict> <key>reposted_your_profile_3</key> @@ -269,9 +269,9 @@ <key>NSStringFormatValueTypeKey</key> <string>@</string> <key>one</key> - <string>Du hast %2$@ Sat von %3$@ erhalten: "%4$@"</string> + <string>Du hast %2$@ Sats von %3$@: "%4$@" erhalten</string> <key>other</key> - <string>Du hast %2$@ Sats von %3$@ erhalten: "%4$@"</string> + <string>Du hast %2$@ Sats von %3$@: "%4$@" erhalten</string> </dict> </dict> <key>zapped_tagged_in_3</key> @@ -285,12 +285,12 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ und %1$d andere:r zappten einen Beitrag in dem du markiert warst</string> + <string>%2$@ und %1$d weiteres Profil zappten eine Notiz, in der du markiert warst</string> <key>other</key> - <string>%2$@ und %1$d andere zappten einen Beitrag in dem du markiert warst</string> + <string>%2$@ und %1$d weitere Profile zappten eine Notiz, in der du markiert warst</string> </dict> </dict> - <key>zapped_your_post_3</key> + <key>zapped_your_note_3</key> <dict> <key>NSStringLocalizedFormatKey</key> <string>%#@ZAPPED@</string> @@ -301,9 +301,9 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ und %1$d andere:r zappten deinen Beitrag</string> + <string>2$@ une %1$d ein weiteres Profil zappten deine Notiz</string> <key>other</key> - <string>%2$@ und %1$d andere zappten deinen Beitrag</string> + <string>2$@ und %1$d weitere zappten deine Notiz</string> </dict> </dict> <key>zapped_your_profile_3</key> @@ -317,9 +317,9 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ und %1$d andere:r zappten dein Profil</string> + <string>2$@ und %1$d ein weiteres Profil zappten dein Profil</string> <key>other</key> - <string>%2$@ und %1$d andere zappten dein Profil</string> + <string>2$@ und %1$d weitere zappten dein Profil</string> </dict> </dict> <key>zaps_count</key> diff --git a/damus/el-GR.lproj/Localizable.strings b/damus/el-GR.lproj/Localizable.strings Binary files differ. diff --git a/damus/el-GR.lproj/Localizable.stringsdict b/damus/el-GR.lproj/Localizable.stringsdict @@ -2,22 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d άλλη σημείωση ...</string> - <key>other</key> - <string>... %d άλλες σημειώσεις ...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -66,6 +50,22 @@ <string>Ακολουθεί</string> </dict> </dict> + <key>imports_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@IMPORTS@</string> + <key>IMPORTS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Εισαγωγή</string> + <key>other</key> + <string>Εισαγωγές</string> + </dict> + </dict> <key>reacted_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/en-US.lproj/Localizable.stringsdict b/damus/en-US.lproj/Localizable.stringsdict @@ -2,22 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d other note ...</string> - <key>other</key> - <string>... %d other notes ...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -66,6 +50,22 @@ <string>Following</string> </dict> </dict> + <key>imports_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@IMPORTS@</string> + <key>IMPORTS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Import</string> + <key>other</key> + <string>Imports</string> + </dict> + </dict> <key>reacted_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -45,7 +45,8 @@ <trans-unit id="%@ %@" xml:space="preserve"> <source>%@ %@</source> <target>%@ %@</target> - <note>Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'. + <note>Sentence composed of 2 variables to describe how many imports were performed from loading a NostrScript. In source English, the first variable is the number of imports, and the second variable is 'Import' or 'Imports'. +Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'. Sentence composed of 2 variables to describe how many people are following a user. In source English, the first variable is the number of followers, and the second variable is 'Follower' or 'Followers'.</note> </trans-unit> <trans-unit id="%@ has been muted" xml:space="preserve"> @@ -158,6 +159,11 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Add bookmark</target> <note>Context menu option for adding a note bookmark.</note> </trans-unit> + <trans-unit id="Additional information" xml:space="preserve"> + <source>Additional information</source> + <target>Additional information</target> + <note>Header text to prompt user to optionally provide additional information when reporting a user or note.</note> + </trans-unit> <trans-unit id="Admin" xml:space="preserve"> <source>Admin</source> <target>Admin</target> @@ -191,7 +197,7 @@ Sentence composed of 2 variables to describe how many people are following a use <trans-unit id="Anonymous" xml:space="preserve"> <source>Anonymous</source> <target>Anonymous</target> - <note>Placeholder author name of the anonymous person who zapped an event. + <note>Picker option to indicate that a zap should be sent anonymously and not identify the user as who sent it. Placeholder display name of anonymous user.</note> </trans-unit> <trans-unit id="Any" xml:space="preserve"> @@ -486,6 +492,22 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Description</target> <note>Label to display relay description.</note> </trans-unit> + <trans-unit id="Developer" xml:space="preserve"> + <source>Developer</source> + <target>Developer</target> + <note>Navigation title for developer settings + Section header for developer settings</note> + </trans-unit> + <trans-unit id="Developer Mode" xml:space="preserve"> + <source>Developer Mode</source> + <target>Developer Mode</target> + <note>Setting to enable developer mode</note> + </trans-unit> + <trans-unit id="Developer Mode enables features and options that may help developers diagnose issues and improve this app. Most users will not need Developer Mode." xml:space="preserve"> + <source>Developer Mode enables features and options that may help developers diagnose issues and improve this app. Most users will not need Developer Mode.</source> + <target>Developer Mode enables features and options that may help developers diagnose issues and improve this app. Most users will not need Developer Mode.</target> + <note>Section header for Developer Settings view</note> + </trans-unit> <trans-unit id="Disconnect" xml:space="preserve"> <source>Disconnect</source> <target>Disconnect</target> @@ -551,6 +573,21 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Everyone will see that you zapped</target> <note>Description of public zap type where the zap is sent publicly and identifies the user who sent it.</note> </trans-unit> + <trans-unit id="Executed successfully, returned with code %@" xml:space="preserve"> + <source>Executed successfully, returned with code %@</source> + <target>Executed successfully, returned with code %@</target> + <note>Indication that the execution of running a NostrScript finished successfully, while providing a numeric return code.</note> + </trans-unit> + <trans-unit id="Failed to initialize" xml:space="preserve"> + <source>Failed to initialize</source> + <target>Failed to initialize</target> + <note>NostrScript error message when it fails to initialize a module.</note> + </trans-unit> + <trans-unit id="Failed to parse" xml:space="preserve"> + <source>Failed to parse</source> + <target>Failed to parse</target> + <note>NostrScript error message when it fails to parse a script.</note> + </trans-unit> <trans-unit id="Filter" xml:space="preserve"> <source>Filter</source> <target>Filter</target> @@ -646,10 +683,10 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Home</target> <note>Navigation bar title for Home view where notes and replies appear from those who the user is following.</note> </trans-unit> - <trans-unit id="Illegal content" xml:space="preserve"> - <source>Illegal content</source> - <target>Illegal content</target> - <note>Button for user to report that the account or content has illegal content.</note> + <trans-unit id="Illegal Content" xml:space="preserve"> + <source>Illegal Content</source> + <target>Illegal Content</target> + <note>Description of report type for illegal content.</note> </trans-unit> <trans-unit id="Image uploader" xml:space="preserve"> <source>Image uploader</source> @@ -661,16 +698,16 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Images</target> <note>Section title for images configuration.</note> </trans-unit> + <trans-unit id="Impersonation" xml:space="preserve"> + <source>Impersonation</source> + <target>Impersonation</target> + <note>Description of report type for impersonation.</note> + </trans-unit> <trans-unit id="Invalid Tip Address" xml:space="preserve"> <source>Invalid Tip Address</source> <target>Invalid Tip Address</target> <note>Title of alerting as invalid tip address.</note> </trans-unit> - <trans-unit id="Invalid Zap" xml:space="preserve"> - <source>Invalid Zap</source> - <target>Invalid Zap</target> - <note>Text indicating that a zap event is malformed and could not be displayed.</note> - </trans-unit> <trans-unit id="Invalid key" xml:space="preserve"> <source>Invalid key</source> <target>Invalid key</target> @@ -681,11 +718,6 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Invalid lightning address</target> <note>Message to display when there was an error attempting to zap due to an invalid lightning address.</note> </trans-unit> - <trans-unit id="It's spam" xml:space="preserve"> - <source>It's spam</source> - <target>It's spam</target> - <note>Button for user to report that the account or content has spam.</note> - </trans-unit> <trans-unit id="Keys" xml:space="preserve"> <source>Keys</source> <target>Keys</target> @@ -757,6 +789,11 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Local default</target> <note>Dropdown option label for system default for Lightning wallet.</note> </trans-unit> + <trans-unit id="Log" xml:space="preserve"> + <source>Log</source> + <target>Log</target> + <note>Label to display developer mode logs.</note> + </trans-unit> <trans-unit id="Login" xml:space="preserve"> <source>Login</source> <target>Login</target> @@ -878,13 +915,23 @@ Sentence composed of 2 variables to describe how many people are following a use <trans-unit id="None" xml:space="preserve"> <source>None</source> <target>None</target> - <note>Button text to indicate that the zap type is a private zap.</note> + <note>Picker option to indicate that sats should be sent to the user's wallet as a regular Lightning payment, not as a zap.</note> </trans-unit> <trans-unit id="Nostr is a protocol, designed for simplicity, that aims to create a censorship-resistant global social network" xml:space="preserve"> <source>Nostr is a protocol, designed for simplicity, that aims to create a censorship-resistant global social network</source> <target>Nostr is a protocol, designed for simplicity, that aims to create a censorship-resistant global social network</target> <note>Description about what is Nostr.</note> </trans-unit> + <trans-unit id="NostrScript" xml:space="preserve"> + <source>NostrScript</source> + <target>NostrScript</target> + <note>Navigation title for the view showing NostrScript.</note> + </trans-unit> + <trans-unit id="NostrScript Error" xml:space="preserve"> + <source>NostrScript Error</source> + <target>NostrScript Error</target> + <note>Text indicating that there was an error with loading NostrScript. There is a more descriptive error message shown separately underneath.</note> + </trans-unit> <trans-unit id="Note contains "nsec1" private key. Are you sure?" xml:space="preserve"> <source>Note contains "nsec1" private key. Are you sure?</source> <target>Note contains "nsec1" private key. Are you sure?</target> @@ -928,10 +975,10 @@ Label for filter for seeing your notes and replies (instead of only your notes). <note>Section header for Damus notifications Toolbar label for Notifications view.</note> </trans-unit> - <trans-unit id="Nudity or explicit content" xml:space="preserve"> - <source>Nudity or explicit content</source> - <target>Nudity or explicit content</target> - <note>Button for user to report that the account or content has nudity or explicit content.</note> + <trans-unit id="Nudity" xml:space="preserve"> + <source>Nudity</source> + <target>Nudity</target> + <note>Description of report type for nudity.</note> </trans-unit> <trans-unit id="Ok" xml:space="preserve"> <source>Ok</source> @@ -958,6 +1005,11 @@ Label for filter for seeing your notes and replies (instead of only your notes). <target>OnlyZaps mode</target> <note>Setting toggle to hide reactions.</note> </trans-unit> + <trans-unit id="Optional" xml:space="preserve"> + <source>Optional</source> + <target>Optional</target> + <note>Prompt to enter optional additional information when reporting an account or content.</note> + </trans-unit> <trans-unit id="Paid Relay" xml:space="preserve"> <source>Paid Relay</source> <target>Paid Relay</target> @@ -1002,8 +1054,7 @@ Label for filter for seeing your notes and replies (instead of only your notes). <trans-unit id="Private" xml:space="preserve"> <source>Private</source> <target>Private</target> - <note>Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading. -Button text to indicate that the zap type is a private zap.</note> + <note>Picker option to indicate that a zap should be sent privately and not identify the user to the public.</note> </trans-unit> <trans-unit id="Private Key" xml:space="preserve"> <source>Private Key</source> @@ -1020,6 +1071,11 @@ Button text to indicate that the zap type is a private zap.</note> <target>Pro</target> <note>Dropdown option for selecting Pro plan for DeepL translation service.</note> </trans-unit> + <trans-unit id="Profanity" xml:space="preserve"> + <source>Profanity</source> + <target>Profanity</target> + <note>Description of report type for profanity.</note> + </trans-unit> <trans-unit id="Profile" xml:space="preserve"> <source>Profile</source> <target>Profile</target> @@ -1033,7 +1089,7 @@ Button text to indicate that the zap type is a private zap.</note> <trans-unit id="Public" xml:space="preserve"> <source>Public</source> <target>Public</target> - <note>Button text to indicate that the zap type is a public zap.</note> + <note>Picker option to indicate that a zap should be sent publicly and identify the user as who sent it.</note> </trans-unit> <trans-unit id="Public Account ID" xml:space="preserve"> <source>Public Account ID</source> @@ -1060,6 +1116,11 @@ Button text to indicate that the zap type is a private zap.</note> <target>Quote</target> <note>Button to compose a quoted note</note> </trans-unit> + <trans-unit id="Ran to suspension." xml:space="preserve"> + <source>Ran to suspension.</source> + <target>Ran to suspension.</target> + <note>Indication that a NostrScript was run until it reached a suspended state.</note> + </trans-unit> <trans-unit id="Reactions" xml:space="preserve"> <source>Reactions</source> <target>Reactions</target> @@ -1143,6 +1204,16 @@ Button text to indicate that the zap type is a private zap.</note> <target>Report ID:</target> <note>Label indicating that the text underneath is the identifier of the report that was sent to relay servers.</note> </trans-unit> + <trans-unit id="Report Note" xml:space="preserve"> + <source>Report Note</source> + <target>Report Note</target> + <note>Button to report a note.</note> + </trans-unit> + <trans-unit id="Report User" xml:space="preserve"> + <source>Report User</source> + <target>Report User</target> + <note>Button to report a user.</note> + </trans-unit> <trans-unit id="Report sent!" xml:space="preserve"> <source>Report sent!</source> <target>Report sent!</target> @@ -1180,6 +1251,21 @@ Button text to indicate that the zap type is a private zap.</note> <target>Retry</target> <note>Button to retry completing account creation after an error occurred.</note> </trans-unit> + <trans-unit id="Run" xml:space="preserve"> + <source>Run</source> + <target>Run</target> + <note>Button that runs a NostrScript.</note> + </trans-unit> + <trans-unit id="Running..." xml:space="preserve"> + <source>Running...</source> + <target>Running...</target> + <note>Indication that the execution of a NostrScript is running.</note> + </trans-unit> + <trans-unit id="Runtime error" xml:space="preserve"> + <source>Runtime error</source> + <target>Runtime error</target> + <note>Indication that a runtime error occurred when running a NostrScript.</note> + </trans-unit> <trans-unit id="Satoshi Nakamoto" xml:space="preserve"> <source>Satoshi Nakamoto</source> <target>Satoshi Nakamoto</target> @@ -1349,7 +1435,8 @@ Button text to indicate that the zap type is a private zap.</note> <trans-unit id="Spam" xml:space="preserve"> <source>Spam</source> <target>Spam</target> - <note>Section header for Universe/Search spam</note> + <note>Description of report type for spam. + Section header for Universe/Search spam</note> </trans-unit> <trans-unit id="Support Damus" xml:space="preserve"> <source>Support Damus</source> @@ -1386,11 +1473,6 @@ Button text to indicate that the zap type is a private zap.</note> <target>The go-to iOS Nostr client</target> <note>Quick description of what Damus is</note> </trans-unit> - <trans-unit id="They are impersonating someone" xml:space="preserve"> - <source>They are impersonating someone</source> - <target>They are impersonating someone</target> - <note>Button for user to report that the account is impersonating someone.</note> - </trans-unit> <trans-unit id="This is a paid relay, you must pay for notes to be accepted." xml:space="preserve"> <source>This is a paid relay, you must pay for notes to be accepted.</source> <target>This is a paid relay, you must pay for notes to be accepted.</target> @@ -1839,21 +1921,6 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/> </header> <body> - <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/one:dict/:string" xml:space="preserve"> - <source>... %d other note ...</source> - <target>... %d other note ...</target> - <note/> - </trans-unit> - <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/other:dict/:string" xml:space="preserve"> - <source>... %d other notes ...</source> - <target>... %d other notes ...</target> - <note/> - </trans-unit> - <trans-unit id="/collapsed_event_view_other_notes:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> - <source>%#@NOTES@</source> - <target>%#@NOTES@</target> - <note/> - </trans-unit> <trans-unit id="/followed_by_three_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@OTHERS@</source> <target>%#@OTHERS@</target> @@ -1899,6 +1966,21 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. <target>%#@FOLLOWING@</target> <note/> </trans-unit> + <trans-unit id="/imports_count:dict/IMPORTS:dict/one:dict/:string" xml:space="preserve"> + <source>Import</source> + <target>Import</target> + <note/> + </trans-unit> + <trans-unit id="/imports_count:dict/IMPORTS:dict/other:dict/:string" xml:space="preserve"> + <source>Imports</source> + <target>Imports</target> + <note/> + </trans-unit> + <trans-unit id="/imports_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> + <source>%#@IMPORTS@</source> + <target>%#@IMPORTS@</target> + <note/> + </trans-unit> <trans-unit id="/reacted_tagged_in_3:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@REACTED@</source> <target>%#@REACTED@</target> diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings Binary files differ. diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict @@ -2,22 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d other note ...</string> - <key>other</key> - <string>... %d other notes ...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -66,6 +50,22 @@ <string>Following</string> </dict> </dict> + <key>imports_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@IMPORTS@</string> + <key>IMPORTS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Import</string> + <key>other</key> + <string>Imports</string> + </dict> + </dict> <key>reacted_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/es-419.lproj/Localizable.stringsdict b/damus/es-419.lproj/Localizable.stringsdict @@ -2,24 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d otra nota ...</string> - <key>many</key> - <string>... %d otras notas ...</string> - <key>other</key> - <string>... %d otras notas...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/es-ES.lproj/Localizable.stringsdict b/damus/es-ES.lproj/Localizable.stringsdict @@ -2,24 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d otra nota ...</string> - <key>many</key> - <string>... %d otras notas ...</string> - <key>other</key> - <string>... %d otras notas ...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/fa.lproj/Localizable.stringsdict b/damus/fa.lproj/Localizable.stringsdict @@ -2,22 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d یادداشت دیگر ...</string> - <key>other</key> - <string>... %d یادداشت های دیگر ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/fr.lproj/Localizable.stringsdict b/damus/fr.lproj/Localizable.stringsdict @@ -2,24 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d autre note ...</string> - <key>many</key> - <string>... %d autres notes ...</string> - <key>other</key> - <string>... %d autres notes ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/hu-HU.lproj/Localizable.stringsdict b/damus/hu-HU.lproj/Localizable.stringsdict @@ -2,22 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d egyéb bejegyzés ...</string> - <key>other</key> - <string>... %d további bejegyzések ...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/id.lproj/Localizable.stringsdict b/damus/id.lproj/Localizable.stringsdict @@ -2,20 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>other</key> - <string>... %d Note Lainnya ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/it-IT.lproj/Localizable.stringsdict b/damus/it-IT.lproj/Localizable.stringsdict @@ -2,24 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d altra nota ...</string> - <key>many</key> - <string>... %d altre note ...</string> - <key>other</key> - <string>... %d altre note ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/ja.lproj/Localizable.strings b/damus/ja.lproj/Localizable.strings Binary files differ. diff --git a/damus/ja.lproj/Localizable.stringsdict b/damus/ja.lproj/Localizable.stringsdict @@ -2,20 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>other</key> - <string>... 他%d件の投稿 ...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -58,6 +44,20 @@ <string>フォロー中</string> </dict> </dict> + <key>imports_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@IMPORTS@</string> + <key>IMPORTS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>other</key> + <string>インポート</string> + </dict> + </dict> <key>reacted_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/ko.lproj/Localizable.strings b/damus/ko.lproj/Localizable.strings Binary files differ. diff --git a/damus/ko.lproj/Localizable.stringsdict b/damus/ko.lproj/Localizable.stringsdict @@ -2,18 +2,18 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> + <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> + <string>%#@OTHERS@</string> + <key>OTHERS</key> <dict> <key>NSStringFormatSpecTypeKey</key> <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>other</key> - <string>... %d 개의 노트 ...</string> + <string>%2$@, %3$@, %4$@ 님 외 %1$d 명이 팔로우했습니다</string> </dict> </dict> <key>followers_count</key> @@ -55,10 +55,10 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>other</key> - <string>%2$@ 님 외 %1$d 명이 내가 태그된 포스트에 리액션을 보냈습니다</string> + <string>%2$@ 님 외 %1$d 명이 내가 태그된 노트에 리액션을 보냈습니다</string> </dict> </dict> - <key>reacted_your_post_3</key> + <key>reacted_your_note_3</key> <dict> <key>NSStringLocalizedFormatKey</key> <string>%#@REACTED@</string> @@ -69,7 +69,7 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>other</key> - <string>%2$@ 님 외 %1$d 명이 내 포스트에 리액션을 보냈습니다</string> + <string>%2$@ 님 외 %1$d 명이 내 노트에 리액션을 보냈습니다</string> </dict> </dict> <key>reacted_your_profile_3</key> @@ -139,10 +139,10 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>other</key> - <string>%2$@ 님 외 %1$d 명이 내가 태그된 포스트를 리포스팅했습니다</string> + <string>%2$@ 님 외 %1$d 명이 내가 태그된 노트를 리포스팅했습니다</string> </dict> </dict> - <key>reposted_your_post_3</key> + <key>reposted_your_note_3</key> <dict> <key>NSStringLocalizedFormatKey</key> <string>%#@REPOSTED@</string> @@ -153,7 +153,7 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>other</key> - <string>%2$@ 님 외 %1$d 명이 내 포스트를 리포스팅했습니다</string> + <string>%2$@ 님 외 %1$d 명이 내 노트를 리포스팅했습니다</string> </dict> </dict> <key>reposted_your_profile_3</key> @@ -237,7 +237,7 @@ <key>NSStringFormatValueTypeKey</key> <string>@</string> <key>other</key> - <string>%3$@ 님이 %2$@ sats를 보냈습니다: "%4$@"</string> + <string>%3$@ 님이 %2$@ sats를 보냈습니다: "%4$@"</string> </dict> </dict> <key>zapped_tagged_in_3</key> @@ -251,10 +251,10 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>other</key> - <string>%2$@ 님 외 %1$d 명이 내가 태그된 포스트에 잽을 날렸습니다</string> + <string>%2$@ 님 외 %1$d 명이 내가 태그된 노트에 잽을 날렸습니다</string> </dict> </dict> - <key>zapped_your_post_3</key> + <key>zapped_your_note_3</key> <dict> <key>NSStringLocalizedFormatKey</key> <string>%#@ZAPPED@</string> @@ -265,7 +265,7 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>other</key> - <string>%2$@ 님 외 %1$d 명이 내 포스트에 잽을 날렸습니다</string> + <string>%2$@ 님 외 %1$d 명이 내 노트에 잽을 날렸습니다</string> </dict> </dict> <key>zapped_your_profile_3</key> @@ -279,7 +279,7 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>other</key> - <string>%2$@ 님 외 %1$d 명이 내 프로필에 잽을 날렸습니다</string> + <string>%2$@ 님 외 %1$d 명이 내게 잽을 날렸습니다</string> </dict> </dict> <key>zaps_count</key> diff --git a/damus/lv-LV.lproj/Localizable.stringsdict b/damus/lv-LV.lproj/Localizable.stringsdict @@ -2,24 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>zero</key> - <string>... %d other notes ...</string> - <key>one</key> - <string>... %d cita ziņa ...</string> - <key>other</key> - <string>... %d citas ziņas ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/nl.lproj/Localizable.strings b/damus/nl.lproj/Localizable.strings Binary files differ. diff --git a/damus/nl.lproj/Localizable.stringsdict b/damus/nl.lproj/Localizable.stringsdict @@ -2,22 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d andere notitie ...</string> - <key>other</key> - <string>... %d andere notities ...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -66,6 +50,22 @@ <string>Volgend</string> </dict> </dict> + <key>imports_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@IMPORTS@</string> + <key>IMPORTS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Importering</string> + <key>other</key> + <string>Importeringen</string> + </dict> + </dict> <key>reacted_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/pl-PL.lproj/Localizable.stringsdict b/damus/pl-PL.lproj/Localizable.stringsdict @@ -2,26 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d inna notatka ...</string> - <key>few</key> - <string>... %d inne notatki ...</string> - <key>many</key> - <string>... %d innych notatek ...</string> - <key>other</key> - <string>... %d innych notatek ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/pt-BR.lproj/Localizable.stringsdict b/damus/pt-BR.lproj/Localizable.stringsdict @@ -2,24 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d Outras observações ... </string> - <key>many</key> - <string>... %d Outras observações ... </string> - <key>other</key> - <string>... %d outras notas ... </string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/pt-PT.lproj/Localizable.stringsdict b/damus/pt-PT.lproj/Localizable.stringsdict @@ -2,24 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d outro note ...</string> - <key>many</key> - <string>... %d outros notes ...</string> - <key>other</key> - <string>... %d outros notes ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/ru.lproj/Localizable.strings b/damus/ru.lproj/Localizable.strings Binary files differ. diff --git a/damus/ru.lproj/Localizable.stringsdict b/damus/ru.lproj/Localizable.stringsdict @@ -2,24 +2,24 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> + <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> + <string>%#@OTHERS@</string> + <key>OTHERS</key> <dict> <key>NSStringFormatSpecTypeKey</key> <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>... %d другая заметка ...</string> + <string>Подписаны %2$@, %3$@ и %1$d другим</string> <key>few</key> - <string>... %d other notes ...</string> + <string>Подписаны %2$@, %3$@ и %1$d others</string> <key>many</key> - <string>... %d other notes ...</string> + <string>Подписаны %2$@, %3$@ и %1$d others</string> <key>other</key> - <string>... %d другие заметки ...</string> + <string>Подписаны %2$@, %3$@ и %1$d другим</string> </dict> </dict> <key>followers_count</key> @@ -73,16 +73,16 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ и %1$d отреагировали на пост, в котором Вы были упомянуты</string> + <string>%2$@ и %1$d отреагировали на заметку, в котором Вы были упомянуты</string> <key>few</key> - <string>%2$@ и еще %1$d пользователя отреагировали на пост, в котором Вы были упомянуты</string> + <string>%2$@ и еще %1$d пользователя отреагировали на заметку, в котором Вы были упомянуты</string> <key>many</key> - <string>%2$@ и еще %1$d пользователей отреагировали на пост, в котором Вы были упомянуты</string> + <string>%2$@ и еще %1$d пользователей отреагировали на заметку, в котором Вы были упомянуты</string> <key>other</key> - <string>%2$@ и еще %1$d пользователь отреагировали на пост, в котором Вы были упомянуты</string> + <string>%2$@ и еще %1$d пользователь отреагировали на заметку, в котором Вы были упомянуты</string> </dict> </dict> - <key>reacted_your_post_3</key> + <key>reacted_your_note_3</key> <dict> <key>NSStringLocalizedFormatKey</key> <string>%#@REACTED@</string> @@ -93,13 +93,13 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ и %1$d отреагировали на Ваш пост</string> + <string>%2$@ и %1$d отреагировали на Вашу заметку</string> <key>few</key> - <string>%2$@ и еще %1$d пользователя отреагировали на Ваш пост</string> + <string>%2$@ и еще %1$d пользователя отреагировали на Вашу заметку</string> <key>many</key> - <string>%2$@ и еще %1$d пользователей отреагировали на Ваш пост</string> + <string>%2$@ и еще %1$d пользователей отреагировали на Вашу заметку</string> <key>other</key> - <string>%2$@ и еще %1$d пользователь отреагировали на Ваш пост</string> + <string>%2$@ и еще %1$d пользователь отреагировали на Вашу заметку</string> </dict> </dict> <key>reacted_your_profile_3</key> @@ -202,7 +202,7 @@ <string>%2$@ и еще %1$d пользователь сделали репост заметки, в которой Вы были упомянуты</string> </dict> </dict> - <key>reposted_your_post_3</key> + <key>reposted_your_note_3</key> <dict> <key>NSStringLocalizedFormatKey</key> <string>%#@REPOSTED@</string> @@ -213,13 +213,13 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ и %1$d сделали репост Вашего поста</string> + <string>%2$@ и %1$d сделали репост Вашей заметки</string> <key>few</key> - <string>%2$@ и еще %1$d пользователя сделали репост Вашего поста</string> + <string>%2$@ и еще %1$d пользователя сделали репост Вашей заметки</string> <key>many</key> <string>%2$@ и еще %1$d пользователей сделали репост Вашей заметки</string> <key>other</key> - <string>%2$@ и еще %1$d пользователь сделали репост Вашего поста</string> + <string>%2$@ и еще %1$d пользователь сделали репост Вашей заметки</string> </dict> </dict> <key>reposted_your_profile_3</key> @@ -262,6 +262,26 @@ <string>Репосты</string> </dict> </dict> + <key>sats</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@SATS@</string> + <key>SATS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>сат</string> + <key>few</key> + <string>сата</string> + <key>many</key> + <string>сат</string> + <key>other</key> + <string>сат</string> + </dict> + </dict> <key>sats_count</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -313,13 +333,13 @@ <key>NSStringFormatValueTypeKey</key> <string>@</string> <key>one</key> - <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> + <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> <key>few</key> - <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> + <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> <key>many</key> - <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> + <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> <key>other</key> - <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> + <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> </dict> </dict> <key>zapped_tagged_in_3</key> @@ -333,16 +353,16 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ и %1$d запнули пост, в котором Вы были упомянуты</string> + <string>%2$@ и %1$d запнули заметку, в котором Вы были упомянуты</string> <key>few</key> - <string>%2$@ и еще %1$d пользователя запнули пост, в котором Вы были упомянуты</string> + <string>%2$@ и еще %1$d пользователя запнули заметку, в котором Вы были упомянуты</string> <key>many</key> - <string>%2$@ и еще %1$d пользователей запнули пост, в котором Вы были упомянуты</string> + <string>%2$@ и еще %1$d пользователей запнули заметку, в котором Вы были упомянуты</string> <key>other</key> - <string>%2$@ и еще %1$d пользователь запнули пост, в котором Вы были упомянуты</string> + <string>%2$@ и еще %1$d пользователь запнули заметку, в котором Вы были упомянуты</string> </dict> </dict> - <key>zapped_your_post_3</key> + <key>zapped_your_note_3</key> <dict> <key>NSStringLocalizedFormatKey</key> <string>%#@ZAPPED@</string> @@ -353,13 +373,13 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ и %1$d запнули Ваш пост</string> + <string>%2$@ и %1$d запнули Вашу заметку</string> <key>few</key> - <string>%2$@ и еще %1$d пользователя запнули Ваш пост</string> + <string>%2$@ и еще %1$d пользователя запнули Вашу заметку</string> <key>many</key> - <string>%2$@ и еще %1$d пользователей запнули Ваш пост</string> + <string>%2$@ и еще %1$d пользователей запнули Вашу заметку</string> <key>other</key> - <string>%2$@ и еще %1$d пользователь запнули Ваш пост</string> + <string>%2$@ и еще %1$d пользователь запнули Вашу заметку</string> </dict> </dict> <key>zapped_your_profile_3</key> @@ -373,13 +393,13 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>%2$@ и %1$d запнули Ваш профиль</string> + <string>%2$@ и %1$d запнули Вашу заметку</string> <key>few</key> - <string>%2$@ и еще %1$d пользователя запнули Ваш профиль</string> + <string>%2$@ и еще %1$d пользователя запнули Вашу заметку</string> <key>many</key> - <string>%2$@ и еще %1$d пользователей запнули Ваш профиль</string> + <string>%2$@ и еще %1$d пользователей запнули Вашу заметку</string> <key>other</key> - <string>%2$@ и еще %1$d пользователь запнули Ваш профиль</string> + <string>%2$@ и еще %1$d пользователь запнули Вашу заметку</string> </dict> </dict> <key>zaps_count</key> diff --git a/damus/sv-SE.lproj/Localizable.strings b/damus/sv-SE.lproj/Localizable.strings Binary files differ. diff --git a/damus/sv-SE.lproj/Localizable.stringsdict b/damus/sv-SE.lproj/Localizable.stringsdict @@ -2,22 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>...%d andra inlägg...</string> - <key>other</key> - <string>...%d andra anteckningar...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/sw.lproj/InfoPlist.strings b/damus/sw.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/sw.lproj/Localizable.strings b/damus/sw.lproj/Localizable.strings Binary files differ. diff --git a/damus/sw.lproj/Localizable.stringsdict b/damus/sw.lproj/Localizable.stringsdict @@ -0,0 +1,342 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>followed_by_three_and_others</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@OTHERS@</string> + <key>OTHERS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Fuatwa na %2$@, %3$@, %4$@ & %1$d wengine</string> + <key>other</key> + <string>Fuatwa na %2$@, %3$@, %4$@ & %1$d wengine</string> + </dict> + </dict> + <key>followers_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@FOLLOWERS@</string> + <key>FOLLOWERS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Wafuasi</string> + <key>other</key> + <string>Wafuasi</string> + </dict> + </dict> + <key>following_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@FOLLOWING@</string> + <key>FOLLOWING</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Unafuata</string> + <key>other</key> + <string>Unafuata</string> + </dict> + </dict> + <key>reacted_tagged_in_3</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@REACTED@</string> + <key>REACTED</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%2$@ and %1$d wengine walijibu kwa taarifa uliyewekewa alama.</string> + <key>other</key> + <string>%2$@ and %1$d wengine walijibu kwa taarifa uliyewekewa alama.</string> + </dict> + </dict> + <key>reacted_your_note_3</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@REACTED@</string> + <key>REACTED</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%2$@ and %1$d wengine walijibu kwa kidokezo chako</string> + <key>other</key> + <string>%2$@ and %1$d wengine walijibu kwa kidokezo chako</string> + </dict> + </dict> + <key>reacted_your_profile_3</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@REACTED@</string> + <key>REACTED</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%2$@ na %1$d wengine walitoa hisia kwenye wasifu wako.</string> + <key>other</key> + <string>%2$@ na %1$d wengine walitoa hisia kwenye wasifu wako.</string> + </dict> + </dict> + <key>reactions_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@REACTIONS@</string> + <key>REACTIONS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Hisia</string> + <key>other</key> + <string>Hisia</string> + </dict> + </dict> + <key>relays_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@RELAYS@</string> + <key>RELAYS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Relays</string> + <key>other</key> + <string>Relays</string> + </dict> + </dict> + <key>replying_to_two_and_others</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@OTHERS@</string> + <key>OTHERS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Jibu %2$@, %3$@, & %1$@ wengine</string> + <key>other</key> + <string>Jibu %2$@, %3$@, & %1$@ wengine</string> + </dict> + </dict> + <key>reposted_tagged_in_3</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@REPOSTED@</string> + <key>REPOSTED</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%2$@ na %1$d wengine walirudisha chapisho ambalo uliwekewa alama.</string> + <key>other</key> + <string>%2$@ na %1$d wengine walirudisha chapisho ambalo uliwekewa alama.</string> + </dict> + </dict> + <key>reposted_your_note_3</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@REPOSTED@</string> + <key>REPOSTED</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%2$@ na %1$d wengine wamerudisha tena kidokezo chako.</string> + <key>other</key> + <string>%2$@ na %1$d wengine wamerudisha tena kidokezo chako.</string> + </dict> + </dict> + <key>reposted_your_profile_3</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@REPOSTED@</string> + <key>REPOSTED</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%2$@ na %1$d wengine wameirudisha tena wasifu wako.</string> + <key>other</key> + <string>"%2$@ na %1$d wengine wameirudisha tena wasifu wako."</string> + </dict> + </dict> + <key>reposts_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@REPOSTS@</string> + <key>REPOSTS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Chapisho tena</string> + <key>other</key> + <string>Chapisho tena</string> + </dict> + </dict> + <key>sats</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@SATS@</string> + <key>SATS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>sats</string> + <key>other</key> + <string>sats</string> + </dict> + </dict> + <key>sats_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@SATS@</string> + <key>SATS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>%2$@ sats</string> + <key>other</key> + <string>%2$@ sats</string> + </dict> + </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Ulipokea %2$@ sats kutoka kwa %3$@</string> + <key>other</key> + <string>Ulipokea %2$@ sats kutoka kwa %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Ume pokea %2$@ sats kutoka kwa %3$@: "%4$@"</string> + <key>other</key> + <string>Ume pokea %2$@ sats kutoka kwa %3$@: "%4$@"</string> + </dict> + </dict> + <key>zapped_tagged_in_3</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@ZAPPED@</string> + <key>ZAPPED</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%2$@ na %1$d wengine wame zap kidokezo ambapo umetajwa</string> + <key>other</key> + <string>%2$@ na %1$d wengine wame zap kidokezo ambapo umetajwa</string> + </dict> + </dict> + <key>zapped_your_note_3</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@ZAPPED@</string> + <key>ZAPPED</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%2$@ na %1$d wengine wame zap kidokezo chako</string> + <key>other</key> + <string>%2$@ na %1$d wengine wame zap kidokezo chako</string> + </dict> + </dict> + <key>zapped_your_profile_3</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@ZAPPED@</string> + <key>ZAPPED</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%2$@ na %1$d wengine wameku zap</string> + <key>other</key> + <string>%2$@ na %1$d wengine wameku zap</string> + </dict> + </dict> + <key>zaps_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@ZAPS@</string> + <key>ZAPS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Zaps</string> + <key>other</key> + <string>Zaps</string> + </dict> + </dict> +</dict> +</plist> diff --git a/damus/tr-TR.lproj/Localizable.stringsdict b/damus/tr-TR.lproj/Localizable.stringsdict @@ -2,22 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d diğer not ...</string> - <key>other</key> - <string>... %d diğer notlar ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/uk.lproj/Localizable.stringsdict b/damus/uk.lproj/Localizable.stringsdict @@ -2,26 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>one</key> - <string>... %d інша нотатка ...</string> - <key>few</key> - <string>... %d інші нотатки ...</string> - <key>many</key> - <string>... %d інших нотаток ...</string> - <key>other</key> - <string>... %d інші нотатки ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/vi.lproj/Localizable.stringsdict b/damus/vi.lproj/Localizable.stringsdict @@ -2,20 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>other</key> - <string>... %d bài đăng khác ...</string> - </dict> - </dict> <key>followers_count</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/zh-CN.lproj/Localizable.stringsdict b/damus/zh-CN.lproj/Localizable.stringsdict @@ -2,20 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>other</key> - <string>... %d 条更多笔记...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/zh-HK.lproj/Localizable.stringsdict b/damus/zh-HK.lproj/Localizable.stringsdict @@ -2,20 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>other</key> - <string>...還有%d 条筆記...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/zh-TW.lproj/Localizable.stringsdict b/damus/zh-TW.lproj/Localizable.stringsdict @@ -2,20 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>collapsed_event_view_other_notes</key> - <dict> - <key>NSStringLocalizedFormatKey</key> - <string>%#@NOTES@</string> - <key>NOTES</key> - <dict> - <key>NSStringFormatSpecTypeKey</key> - <string>NSStringPluralRuleType</string> - <key>NSStringFormatValueTypeKey</key> - <string>d</string> - <key>other</key> - <string>...還有%d 条筆記...</string> - </dict> - </dict> <key>followed_by_three_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damusTests/NostrScriptTests.swift b/damusTests/NostrScriptTests.swift @@ -105,6 +105,18 @@ final class NostrScriptTests: XCTestCase { self.wait(for: [resume_expected], timeout: 10.0) } + func test_imports_string() throws { + let enUsLocale = Locale(identifier: "en-US") + XCTAssertEqual(imports_string(0, locale: enUsLocale), "Imports") + XCTAssertEqual(imports_string(1, locale: enUsLocale), "Import") + XCTAssertEqual(imports_string(2, locale: enUsLocale), "Imports") + Bundle.main.localizations.map { Locale(identifier: $0) }.forEach { + for count in 1...10 { + XCTAssertNoThrow(imports_string(count, locale: $0)) + } + } + } + func testPerformanceExample() throws { // This is an example of a performance test case. self.measure {