commit cbd92539a6755942e34653037c4afe8e7aa5932b parent 7940e6fd32f2ffbb7e0587cca8b88dc0083d7f6a Author: William Casarin <jb55@jb55.com> Date: Sun, 23 Apr 2023 04:27:40 -0700 Merge remote-tracking branch 'github/translations' Diffstat:
19 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/damus/Views/Events/MutedEventView.swift b/damus/Views/Events/MutedEventView.swift @@ -31,9 +31,9 @@ struct MutedEventView: View { .foregroundColor(DamusColors.adaptableGrey) HStack { - Text("Post from a user you've blocked", comment: "Text to indicate that what is being shown is a post from a user who has been blocked.") + Text("Post from a user you've muted", comment: "Text to indicate that what is being shown is a post from a user who has been muted.") Spacer() - Button(shown ? NSLocalizedString("Hide", comment: "Button to hide a post from a user who has been blocked.") : NSLocalizedString("Show", comment: "Button to show a post from a user who has been blocked.")) { + Button(shown ? NSLocalizedString("Hide", comment: "Button to hide a post from a user who has been muted.") : NSLocalizedString("Show", comment: "Button to show a post from a user who has been muted.")) { shown.toggle() } } diff --git a/damus/Views/Muting/MutelistView.swift b/damus/Views/Muting/MutelistView.swift @@ -29,7 +29,7 @@ struct MutelistView: View { damus_state.postbox.send(new_ev) users = get_mutelist_users(new_ev) } label: { - Label(NSLocalizedString("Delete", comment: "Button to remove a user from their blocklist."), systemImage: "trash") + Label(NSLocalizedString("Delete", comment: "Button to remove a user from their mutelist."), systemImage: "trash") } .tint(.red) } diff --git a/damus/Views/Profile/ProfileView.swift b/damus/Views/Profile/ProfileView.swift @@ -210,7 +210,7 @@ struct ProfileView: View { }) { navImage(systemImage: "ellipsis") } - .confirmationDialog(NSLocalizedString("Actions", comment: "Title for confirmation dialog to either share, report, or block a profile."), isPresented: $action_sheet_presented) { + .confirmationDialog(NSLocalizedString("Actions", comment: "Title for confirmation dialog to either share, report, or mute a profile."), isPresented: $action_sheet_presented) { Button(NSLocalizedString("Share", comment: "Button to share the link to a profile.")) { show_share_sheet = true } @@ -257,7 +257,7 @@ struct ProfileView: View { .profile_button_style(scheme: colorScheme) .contextMenu { if profile.reactions == false { - Text("OnlyZaps Enabled") + Text("OnlyZaps Enabled", comment: "Non-tappable text in context menu that shows up when the zap button on profile is long pressed to indicate that the user has enabled OnlyZaps, meaning that they would like to be only zapped and not accept reactions to their notes.") } if let addr = profile.lud16 { diff --git a/damus/ar.lproj/Localizable.strings b/damus/ar.lproj/Localizable.strings Binary files differ. diff --git a/damus/cs.lproj/Localizable.strings b/damus/cs.lproj/Localizable.strings Binary files differ. diff --git a/damus/de.lproj/Localizable.strings b/damus/de.lproj/Localizable.strings Binary files differ. 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 @@ -45,7 +45,7 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>one</key> - <string>Ακόλουθος</string> + <string>Ακολουθεί</string> <key>other</key> <string>Ακολουθεί</string> </dict> diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -141,7 +141,7 @@ Sentence composed of 2 variables to describe how many people are following a use <trans-unit id="Actions" xml:space="preserve"> <source>Actions</source> <target>Actions</target> - <note>Title for confirmation dialog to either share, report, or block a profile.</note> + <note>Title for confirmation dialog to either share, report, or mute a profile.</note> </trans-unit> <trans-unit id="Add" xml:space="preserve"> <source>Add</source> @@ -442,7 +442,7 @@ Sentence composed of 2 variables to describe how many people are following a use <source>Delete</source> <target>Delete</target> <note>Button for deleting the users account. - Button to remove a user from their blocklist.</note> + Button to remove a user from their mutelist.</note> </trans-unit> <trans-unit id="Delete Account" xml:space="preserve"> <source>Delete Account</source> @@ -504,6 +504,11 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Edit</target> <note>Button to edit user's profile.</note> </trans-unit> + <trans-unit id="Enable OnlyZaps mode" xml:space="preserve"> + <source>Enable OnlyZaps mode</source> + <target>Enable OnlyZaps mode</target> + <note>Setting toggle to hide reactions.</note> + </trans-unit> <trans-unit id="Encrypted" xml:space="preserve"> <source>Encrypted</source> <target>Encrypted</target> @@ -582,7 +587,7 @@ Sentence composed of 2 variables to describe how many people are following a use <trans-unit id="Hide" xml:space="preserve"> <source>Hide</source> <target>Hide</target> - <note>Button to hide a post from a user who has been blocked.</note> + <note>Button to hide a post from a user who has been muted.</note> </trans-unit> <trans-unit id="Hide API Key" xml:space="preserve"> <source>Hide API Key</source> @@ -590,6 +595,11 @@ Sentence composed of 2 variables to describe how many people are following a use <note>Button to hide the DeepL translation API key. Button to hide the LibreTranslate server API key.</note> </trans-unit> + <trans-unit id="Hide all 🤙's" xml:space="preserve"> + <source>Hide all 🤙's</source> + <target>Hide all 🤙's</target> + <note>Section footer describing onlyzaps mode</note> + </trans-unit> <trans-unit id="Home" xml:space="preserve"> <source>Home</source> <target>Home</target> @@ -827,6 +837,16 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Only you can see this message and who sent it.</target> <note>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.</note> </trans-unit> + <trans-unit id="OnlyZaps" xml:space="preserve"> + <source>OnlyZaps</source> + <target>OnlyZaps</target> + <note>Section header for enabling OnlyZaps mode (hide reactions)</note> + </trans-unit> + <trans-unit id="OnlyZaps Enabled" xml:space="preserve"> + <source>OnlyZaps Enabled</source> + <target>OnlyZaps Enabled</target> + <note>Non-tappable text in context menu that shows up when the zap button on profile is long pressed to indicate that the user has enabled OnlyZaps, meaning that they would like to be only zapped and not accept reactions to their notes.</note> + </trans-unit> <trans-unit id="Paid Relay" xml:space="preserve"> <source>Paid Relay</source> <target>Paid Relay</target> @@ -863,10 +883,10 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Post</target> <note>Button to post a note.</note> </trans-unit> - <trans-unit id="Post from a user you've blocked" xml:space="preserve"> - <source>Post from a user you've blocked</source> - <target>Post from a user you've blocked</target> - <note>Text to indicate that what is being shown is a post from a user who has been blocked.</note> + <trans-unit id="Post from a user you've muted" xml:space="preserve"> + <source>Post from a user you've muted</source> + <target>Post from a user you've muted</target> + <note>Text to indicate that what is being shown is a post from a user who has been muted.</note> </trans-unit> <trans-unit id="Posts" xml:space="preserve"> <source>Posts</source> @@ -1153,7 +1173,7 @@ Picker option to indicate that a zap should be sent privately and not identify t <trans-unit id="Show" xml:space="preserve"> <source>Show</source> <target>Show</target> - <note>Button to show a post from a user who has been blocked. + <note>Button to show a post from a user who has been muted. Toggle to show or hide user's secret account login key.</note> </trans-unit> <trans-unit id="Show +" xml:space="preserve"> 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/es-ES.lproj/Localizable.strings b/damus/es-ES.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/pt-BR.lproj/Localizable.strings b/damus/pt-BR.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/vi.lproj/Localizable.strings b/damus/vi.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.