diff --git a/damus/Views/Events/ZapEvent.swift b/damus/Views/Events/ZapEvent.swift index 9829feca..3c2fea68 100644 --- a/damus/Views/Events/ZapEvent.swift +++ b/damus/Views/Events/ZapEvent.swift @@ -21,7 +21,7 @@ struct ZapEvent: View { if zap.private_request != nil { Image(systemName: "lock.fill") .foregroundColor(Color("DamusGreen")) - .help("Only you can see this message and who sent it.") + .help(NSLocalizedString("Only you can see this message and who sent it.", comment: "Help text on green lock icon that explains that only the current user can see the message of a zap event and who sent the zap.")) } } diff --git a/damus/Views/Notifications/EventGroupView.swift b/damus/Views/Notifications/EventGroupView.swift index 35511d72..9aa583bc 100644 --- a/damus/Views/Notifications/EventGroupView.swift +++ b/damus/Views/Notifications/EventGroupView.swift @@ -128,7 +128,7 @@ func reacting_to_text(profiles: Profiles, our_pubkey: String, group: EventGroupT switch group.events.count { case 0: - return NSLocalizedString("??", comment: "") + return "??" case 1: let display_name = event_group_author_name(profiles: profiles, ind: 0, group: group) diff --git a/damus/Views/Zaps/CustomizeZapView.swift b/damus/Views/Zaps/CustomizeZapView.swift index e7748254..70cbbfac 100644 --- a/damus/Views/Zaps/CustomizeZapView.swift +++ b/damus/Views/Zaps/CustomizeZapView.swift @@ -84,17 +84,16 @@ struct CustomizeZapView: View { var zap_type_desc: String { switch zap_type { case .pub: - return "Everyone on can see that you zapped" + return NSLocalizedString("Everyone on can see that you zapped", comment: "Description of public zap type where the zap is sent publicly and identifies the user who sent it.") case .anon: - return "Noone can see that you zapped" + return NSLocalizedString("No one can see that you zapped", comment: "Description of anonymous zap type where the zap is sent anonymously and does not identify the user who sent it.") case .priv: let pk = event.pubkey let prof = state.profiles.lookup(id: pk) let name = Profile.displayName(profile: prof, pubkey: pk) - return String(format: "Only '%@' can see that you zapped them", - name) + return NSLocalizedString("Only '\(name)' can see that you zapped them", comment: "Description of private zap type where the zap is sent privately and does not identify the user to the public.") case .non_zap: - return "No zaps are sent, only a lightning payment." + return NSLocalizedString("No zaps are sent, only a lightning payment.", comment: "Description of non-zap type where sats are sent to the user's wallet as a regular Lightning payment, not as a zap.") } } @@ -102,10 +101,10 @@ struct CustomizeZapView: View { Picker(NSLocalizedString("Zap Type", comment: "Header text to indicate that the picker below it is to choose the type of zap to send."), selection: $zap_type) { Text("Public", comment: "Picker option to indicate that a zap should be sent publicly and identify the user as who sent it.").tag(ZapType.pub) Text("Private", comment: "Picker option to indicate that a zap should be sent privately and not identify the user to the public.").tag(ZapType.priv) - Text("Anon", comment: "Picker option to indicate that a zap should be sent anonymously and not identify the user as who sent it.").tag(ZapType.anon) + Text("Anonymous", comment: "Picker option to indicate that a zap should be sent anonymously and not identify the user as who sent it.").tag(ZapType.anon) 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.").tag(ZapType.non_zap) } - .pickerStyle(.segmented) + .pickerStyle(.menu) } var AmountPicker: some View { @@ -139,9 +138,9 @@ struct CustomizeZapView: View { case .failed(let err): switch err { case .fetching_invoice: - self.error = "Error fetching lightning invoice" + self.error = NSLocalizedString("Error fetching lightning invoice", comment: "Message to display when there was an error fetching a lightning invoice while attempting to zap.") case .bad_lnurl: - self.error = "Invalid lightning address" + self.error = NSLocalizedString("Invalid lightning address", comment: "Message to display when there was an error attempting to zap due to an invalid lightning address.") } break case .got_zap_invoice(let inv): diff --git a/damus/ar.lproj/Localizable.strings b/damus/ar.lproj/Localizable.strings index f4f8d698..a9a296b9 100644 Binary files a/damus/ar.lproj/Localizable.strings and b/damus/ar.lproj/Localizable.strings differ diff --git a/damus/ar.lproj/Localizable.stringsdict b/damus/ar.lproj/Localizable.stringsdict index 0d64a2d2..239190b1 100644 --- a/damus/ar.lproj/Localizable.stringsdict +++ b/damus/ar.lproj/Localizable.stringsdict @@ -211,11 +211,11 @@ two %2$@ و %1$d مستخدمان آخران نشروا منشورا تمت الإشارة لك فيه few - %2$@ و %1$d مستخدم آخر نشر منشورا تمت الإشارة لك فيه + %2$@ و %1$d مستخدمون آخرون نشروا منشورا تمت الإشارة لك فيه many - %2$@ و %1$d مستخدمون آخرون نشروا منشورا تمت الإشارة لك فيه + %2$@ و %1$d مستخدم آخر نشروا منشورا تمت الإشارة لك فيه other - %2$@ و %1$d مستخدمون آخرون نشروا منشورا تمت الإشارة لك فيه + %2$@ و %1$d مستخدم آخر نشروا منشورا تمت الإشارة لك فيه reposted_your_post_3 @@ -235,11 +235,11 @@ two %2$@ و %1$d مستخدمان آخران نشروا منشورك few - %2$@ و %1$d مستخدم آخر نشروا منشورك + %2$@ و %1$d مستخدمون آخرون نشروا منشورك many - %2$@ و %1$d مستخدمون آخرون نشروا منشورك + %2$@ و %1$d مستخدم آخر نشروا منشورك other - %2$@ و %1$d مستخدمون آخرون نشروا منشورك + %2$@ و %1$d مستخدم آخر نشروا منشورك reposted_your_profile_3 @@ -259,11 +259,11 @@ two %2$@ و %1$d مستخدمان آخران نشروا حسابك few - %2$@ و %1$d مستخدم آخر نشر حسابك + %2$@ و %1$d مستخدمون آخرون نشروا حسابك many - %2$@ و %1$d مستخدمون آخرون نشروا حسابك + %2$@ و %1$d مستخدم آخر نشروا حسابك other - %2$@ و %1$d مستخدمون آخرون نشروا حسابك + %2$@ و %1$d مستخدم آخر نشروا حسابك reposts_count @@ -331,11 +331,11 @@ two %2$@ و %1$d مستخدمان آخران ومّضوا منشورا تمت الإشارة لك فيه few - %2$@ و %1$d مستخدم آخر ومّض منشورا تمت الإشارة لك فيه + %2$@ و %1$d مستخدم آخر ومّضوا منشورا تمت الإشارة لك فيه many - %2$@ و %1$d مستخدمون آخرون ومّضوا منشورا تمت الإشارة لك فيه + %2$@ و %1$d مستخدم آخر ومّضوا منشورا تمت الإشارة لك فيه other - %2$@ و %1$d مستخدمون آخرون ومّضوا منشورا تمت الإشارة لك فيه + %2$@ و %1$d مستخدم آخر ومّضوا منشورا تمت الإشارة لك فيه zapped_your_post_3 @@ -355,11 +355,11 @@ two %2$@ و %1$d مستخدمان آخران ومّضوا منشورك few - %2$@ و %1$d مستخدم آخر ومّض منشورك + %2$@ و %1$d مستخدمون آخرون ومّضوا منشورك many - %2$@ و %1$d مستخدمون آخرون ومّضوا منشورك + %2$@ و %1$d مستخدم آخر ومّضوا منشورك other - %2$@ و %1$d مستخدمون آخرون ومّضوا منشورك + %2$@ و %1$d مستخدم آخر ومّضوا منشورك zapped_your_profile_3 @@ -379,11 +379,11 @@ two %2$@ و %1$d مستخدمان آخران ومّضوا حسابك few - %2$@ و %1$d مستخدم آخر ومّض حسابك + %2$@ و %1$d مستخدمون آخرون ومّضوا حسابك many - %2$@ و %1$d مستخدمون آخرون ومّضوا حسابك + %2$@ و %1$d مستخدم آخر ومّضوا حسابك other - %2$@ و %1$d مستخدمون آخرون ومّضوا حسابك + %2$@ و %1$d مستخدم آخر ومّضوا حسابك zaps_count diff --git a/damus/cs.lproj/Localizable.strings b/damus/cs.lproj/Localizable.strings index a96bfce8..2be49d04 100644 Binary files a/damus/cs.lproj/Localizable.strings and b/damus/cs.lproj/Localizable.strings differ diff --git a/damus/de.lproj/Localizable.strings b/damus/de.lproj/Localizable.strings index 2b70e178..1a5a0219 100644 Binary files a/damus/de.lproj/Localizable.strings and b/damus/de.lproj/Localizable.strings differ diff --git a/damus/el-GR.lproj/Localizable.strings b/damus/el-GR.lproj/Localizable.strings index f3cfdad9..8c2fd266 100644 Binary files a/damus/el-GR.lproj/Localizable.strings and b/damus/el-GR.lproj/Localizable.strings differ diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff index ba87f69d..20674ab9 100644 --- a/damus/en-US.xcloc/Localized Contents/en-US.xliff +++ b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -83,11 +83,6 @@ Sentence composed of 2 variables to describe how many people are following a use '%@' is an invalid NIP-05 identifier. It should look like an email. Description of why the nip05 identifier is invalid. - - ?? - ?? - No comment provided by engineer. - API Key (optional) API Key (optional) @@ -483,11 +478,21 @@ Sentence composed of 2 variables to describe how many people are following a use Enter your account key to login: Prompt for user to enter an account key to login. + + Error fetching lightning invoice + Error fetching lightning invoice + Message to display when there was an error fetching a lightning invoice while attempting to zap. + Error: %@ Error: %@ Error message indicating why saving keys failed. + + Everyone on can see that you zapped + Everyone on can see that you zapped + Description of public zap type where the zap is sent publicly and identifies the user who sent it. + Filter Filter @@ -574,6 +579,11 @@ Sentence composed of 2 variables to describe how many people are following a use Invalid key Error message indicating that an invalid account key was entered for login. + + Invalid lightning address + Invalid lightning address + Message to display when there was an error attempting to zap due to an invalid lightning address. + It's spam It's spam @@ -667,10 +677,15 @@ Sentence composed of 2 variables to describe how many people are following a use No block list found, create a new one? This will overwrite any previous block lists. Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists. - - Non-Zap - Non-Zap - Picker option to indicate that sats should be sent to the user's wallet as a regular Lightning payment, not as a zap. + + No one can see that you zapped + No one can see that you zapped + Description of anonymous zap type where the zap is sent anonymously and does not identify the user who sent it. + + + No zaps are sent, only a lightning payment. + No zaps are sent, only a lightning payment. + Description of non-zap type where sats are sent to the user's wallet as a regular Lightning payment, not as a zap. None @@ -697,6 +712,16 @@ Sentence composed of 2 variables to describe how many people are following a use Nudity or explicit content Button for user to report that the account or content has nudity or explicit content. + + Only '(name)' can see that you zapped them + Only '(name)' can see that you zapped them + Description of private zap type where the zap is sent privately and does not identify the user to the public. + + + Only you can see this message and who sent it. + Only you can see this message and who sent it. + Help text on green lock icon that explains that only the current user can see the message of a zap event and who sent the zap. +