diff --git a/Frameworks/Resources/Localizable.xcstrings b/Frameworks/Resources/Localizable.xcstrings index 81b237ab..c2e24e31 100644 --- a/Frameworks/Resources/Localizable.xcstrings +++ b/Frameworks/Resources/Localizable.xcstrings @@ -8522,23 +8522,6 @@ } } }, - "Delete Group" : { - "extractionState" : "manual", - "localizations" : { - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "删除组" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "刪除組" - } - } - } - }, "Delete Group and Hosts" : { "extractionState" : "manual", "localizations" : { @@ -8696,23 +8679,6 @@ } } }, - "Delete Package" : { - "extractionState" : "manual", - "localizations" : { - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "删除包" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "刪除包" - } - } - } - }, "Delete Package and Snippets" : { "extractionState" : "manual", "localizations" : { @@ -32243,13 +32209,13 @@ "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "未打包" + "value" : "未包装" } }, "zh-Hant" : { "stringUnit" : { "state" : "translated", - "value" : "未打包" + "value" : "未包裝" } } } diff --git a/Frameworks/TermindPresentation/Strings/Snippets.swift b/Frameworks/TermindPresentation/Strings/Snippets.swift index c410a0e2..6003e010 100644 --- a/Frameworks/TermindPresentation/Strings/Snippets.swift +++ b/Frameworks/TermindPresentation/Strings/Snippets.swift @@ -12,10 +12,6 @@ extension AppStrings { "Add a host before choosing default targets." } - public static var deletePackage: LocalizedStringResource { - "Delete Package" - } - public static var deletePackageAndSnippets: LocalizedStringResource { "Delete Package and Snippets" } diff --git a/Frameworks/TermindPresentation/Strings/Vault.swift b/Frameworks/TermindPresentation/Strings/Vault.swift index c7665a9b..17ae857e 100644 --- a/Frameworks/TermindPresentation/Strings/Vault.swift +++ b/Frameworks/TermindPresentation/Strings/Vault.swift @@ -80,10 +80,6 @@ extension AppStrings { "Data Bits" } - public static var deleteGroup: LocalizedStringResource { - "Delete Group" - } - public static var deleteGroupAndHosts: LocalizedStringResource { "Delete Group and Hosts" } diff --git a/TFI/Features/Snippets/MobileSnippetsView.swift b/TFI/Features/Snippets/MobileSnippetsView.swift index 193fb75b..2e3c4354 100644 --- a/TFI/Features/Snippets/MobileSnippetsView.swift +++ b/TFI/Features/Snippets/MobileSnippetsView.swift @@ -209,7 +209,7 @@ struct MobileSnippetsView: View { packageID: package.id, parentID: package.parentID) } Divider() - Button(AppStrings.Snippets.deletePackage.swiftUIKey, systemImage: "trash", role: .destructive) { + Button(AppStrings.Common.delete.swiftUIKey, systemImage: "trash", role: .destructive) { deletingPackage = package } } label: { diff --git a/TFI/Features/Vault/MobileVaultView.swift b/TFI/Features/Vault/MobileVaultView.swift index 626e29ee..65430b3c 100644 --- a/TFI/Features/Vault/MobileVaultView.swift +++ b/TFI/Features/Vault/MobileVaultView.swift @@ -684,7 +684,7 @@ struct MobileVaultView: View { groupEditorRequest = GroupEditorRequest(groupID: group.id, parentID: group.parentID) } Divider() - Button(AppStrings.Vault.deleteGroup.swiftUIKey, systemImage: "trash", role: .destructive) { + Button(AppStrings.Common.delete.swiftUIKey, systemImage: "trash", role: .destructive) { requestDelete(group) } } label: { diff --git a/TFM/Features/Hosts/HostsPageView.swift b/TFM/Features/Hosts/HostsPageView.swift index 11c193a5..65838e24 100644 --- a/TFM/Features/Hosts/HostsPageView.swift +++ b/TFM/Features/Hosts/HostsPageView.swift @@ -153,7 +153,7 @@ struct HostsPageView: ManagedCardPage { } Button(AppStrings.Common.edit.swiftUIKey, systemImage: MenuSymbol.edit) { editGroup(group) } Divider() - DestructiveMenuButton(AppStrings.Vault.deleteGroup) { requestDelete(group) } + DestructiveMenuButton(AppStrings.Common.delete) { requestDelete(group) } } } else if case .ungrouped = section.id { let isExpanded = section.isExpanded ?? true diff --git a/TFM/Features/Snippets/SnippetsPageView.swift b/TFM/Features/Snippets/SnippetsPageView.swift index 1c121288..1fc81052 100644 --- a/TFM/Features/Snippets/SnippetsPageView.swift +++ b/TFM/Features/Snippets/SnippetsPageView.swift @@ -128,7 +128,7 @@ struct SnippetsPageView: ManagedCardPage { openPackageEditor(packageID: package.id, parentID: package.parentID) } Divider() - DestructiveMenuButton(AppStrings.Snippets.deletePackage) { + DestructiveMenuButton(AppStrings.Common.delete) { state.confirmation = .deletePackage(package) } }