commit fe025532e8e05be2ac41d408f4dcec8f0c4295cf parent 6eb548a0a9916900c67747a36d9f068e15d3261b Author: William Casarin <jb55@jb55.com> Date: Tue, 20 Jun 2023 11:27:29 +0200 Merge remote-tracking branch 'github/translations' Diffstat:
12 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/damus/Views/CarouselView.swift b/damus/Views/CarouselView.swift @@ -21,7 +21,7 @@ let carousel_items = [ CarouselItem(image: Image("undercover"), text: Text("\(Text("Private", comment: "Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading.").bold()). Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.", comment: "Explanation of what is done to keep personally identifiable information private. There is a heading that precedes this explanation which is a variable to this string.")), CarouselItem(image: Image("bitcoin-p2p"), - text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string.")) + text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string.")) ] struct CarouselView: View { diff --git a/damus/Views/EventView.swift b/damus/Views/EventView.swift @@ -40,7 +40,7 @@ struct EventView: View { if let zap = damus.zaps.zaps[event.id] { ZapEvent(damus: damus, zap: zap, is_top_zap: options.contains(.top_zap)) } else { - Text("Invalid Zap") + Text("Invalid Zap", comment: "Text indicating that a zap event is malformed and could not be displayed.") EmptyView() } } else { diff --git a/damus/Views/Events/ZapEvent.swift b/damus/Views/Events/ZapEvent.swift @@ -18,11 +18,11 @@ struct ZapEvent: View { Image("zap.fill") .foregroundColor(.orange) - Text("\(format_msats(zap.amount))", comment: "Text indicating the zap amount. i.e. number of satoshis that were tipped to a user") + Text(verbatim: format_msats(zap.amount)) .font(.headline) if is_top_zap { - Text("Top Zap") + Text("Top Zap", comment: "Text indicating that this zap is the one with the highest amount of sats.") .font(.caption) .foregroundColor(.gray) .padding([.top], 2) diff --git a/damus/cs.lproj/Localizable.strings b/damus/cs.lproj/Localizable.strings Binary files differ. diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -73,9 +73,9 @@ Sentence composed of 2 variables to describe how many people are following a use <target>%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs</target> <note>Explanation of what is done to keep private data encrypted. There is a heading that precedes this explanation which is a variable to this string.</note> </trans-unit> - <trans-unit id="%@. Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet." xml:space="preserve"> - <source>%@. Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet.</source> - <target>%@. Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet.</target> + <trans-unit id="%@. Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet." xml:space="preserve"> + <source>%@. Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet.</source> + <target>%@. Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet.</target> <note>Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string.</note> </trans-unit> <trans-unit id="%lld%%" xml:space="preserve"> @@ -651,6 +651,11 @@ Sentence composed of 2 variables to describe how many people are following a use <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> @@ -1395,6 +1400,11 @@ Button text to indicate that the zap type is a private zap.</note> <target>Thread</target> <note>Navigation bar title for note thread.</note> </trans-unit> + <trans-unit id="Top Zap" xml:space="preserve"> + <source>Top Zap</source> + <target>Top Zap</target> + <note>Text indicating that this zap is the one with the highest amount of sats.</note> + </trans-unit> <trans-unit id="Translate DMs" xml:space="preserve"> <source>Translate DMs</source> <target>Translate DMs</target> @@ -1802,11 +1812,6 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. <target>%@ and %@ zapped your profile</target> <note>Notification that 2 users zapped the current user's profile</note> </trans-unit> - <trans-unit id="⚡️ %@" xml:space="preserve"> - <source>⚡️ %@</source> - <target>⚡️ %@</target> - <note>Text indicating the zap amount. i.e. number of satoshis that were tipped to a user</note> - </trans-unit> </body> </file> <file original="damus/en-US.lproj/Localizable.stringsdict" source-language="en-US" target-language="en-US" datatype="plaintext"> 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/ja.lproj/Localizable.strings b/damus/ja.lproj/Localizable.strings Binary files differ. diff --git a/damus/nl.lproj/Localizable.strings b/damus/nl.lproj/Localizable.strings Binary files differ. diff --git a/damus/sv-SE.lproj/Localizable.strings b/damus/sv-SE.lproj/Localizable.strings Binary files differ. diff --git a/damus/zh-CN.lproj/Localizable.strings b/damus/zh-CN.lproj/Localizable.strings Binary files differ. diff --git a/damus/zh-HK.lproj/Localizable.strings b/damus/zh-HK.lproj/Localizable.strings Binary files differ. diff --git a/damus/zh-TW.lproj/Localizable.strings b/damus/zh-TW.lproj/Localizable.strings Binary files differ.