diff --git a/Zotero/Assets/en.lproj/Localizable.strings b/Zotero/Assets/en.lproj/Localizable.strings index c48c79d27..978d5dc4b 100644 --- a/Zotero/Assets/en.lproj/Localizable.strings +++ b/Zotero/Assets/en.lproj/Localizable.strings @@ -401,7 +401,6 @@ "errors.collections.bibliography_failed" = "Could not load items for bibliography."; "errors.sync.group_removed" = "Group '%@' is no longer accessible. What would you like to do?"; "errors.sync.metadata_write_denied" = "You can't write to group '%@' anymore. What would you like to do?"; -"errors.sync.keep_changes" = "Keep changes"; "errors.sync.revert_to_original" = "Revert to original"; "errors.sync.file_write_denied" = "You no longer have file-editing access for the group ‘%@’, and files you’ve changed locally cannot be uploaded. If you continue, all group files will be reset to their state on %@.\n\nIf you would like a chance to copy modified files elsewhere or to request file-editing access from a group administrator, you can skip syncing of the group now."; "errors.sync.reset_group_files" = "Reset Group Files and Sync"; diff --git a/Zotero/Controllers/Sync/SyncController.swift b/Zotero/Controllers/Sync/SyncController.swift index fe33792e1..235b9499a 100644 --- a/Zotero/Controllers/Sync/SyncController.swift +++ b/Zotero/Controllers/Sync/SyncController.swift @@ -657,9 +657,6 @@ final class SyncController: SynchronizationController { case .deleteGroup(let id): return [.deleteGroup(id)] - case .keepGroupChanges(let id): - return [.markChangesAsResolved(id)] - case .markGroupAsLocalOnly(let id): return [.markGroupAsLocalOnly(id)] diff --git a/Zotero/Extensions/Localizable.swift b/Zotero/Extensions/Localizable.swift index 3d5830873..dd67a1822 100644 --- a/Zotero/Extensions/Localizable.swift +++ b/Zotero/Extensions/Localizable.swift @@ -684,8 +684,6 @@ internal enum L10n { internal static func groupRemoved(_ p1: Any) -> String { return L10n.tr("Localizable", "errors.sync.group_removed", String(describing: p1), fallback: "Group '%@' is no longer accessible. What would you like to do?") } - /// Keep changes - internal static let keepChanges = L10n.tr("Localizable", "errors.sync.keep_changes", fallback: "Keep changes") /// You can't write to group '%@' anymore. What would you like to do? internal static func metadataWriteDenied(_ p1: Any) -> String { return L10n.tr("Localizable", "errors.sync.metadata_write_denied", String(describing: p1), fallback: "You can't write to group '%@' anymore. What would you like to do?") diff --git a/Zotero/Models/ConflictResolution.swift b/Zotero/Models/ConflictResolution.swift index e06adfe03..008e74460 100644 --- a/Zotero/Models/ConflictResolution.swift +++ b/Zotero/Models/ConflictResolution.swift @@ -12,7 +12,6 @@ enum ConflictResolution { case deleteGroup(Int) case markGroupAsLocalOnly(Int) case revertGroupChanges(LibraryIdentifier) - case keepGroupChanges(LibraryIdentifier) case revertGroupFiles(LibraryIdentifier) case skipGroup(LibraryIdentifier) case remoteDeletionOfActiveObject(libraryId: LibraryIdentifier, toDeleteCollections: [String], toRestoreCollections: [String], diff --git a/Zotero/Scenes/AppCoordinator.swift b/Zotero/Scenes/AppCoordinator.swift index afde53857..b2e4dc323 100644 --- a/Zotero/Scenes/AppCoordinator.swift +++ b/Zotero/Scenes/AppCoordinator.swift @@ -832,8 +832,8 @@ extension AppCoordinator: ConflictReceiver { let actions = [UIAlertAction(title: L10n.Errors.Sync.revertToOriginal, style: .cancel, handler: { _ in completed(.revertGroupChanges(.group(groupId))) }), - UIAlertAction(title: L10n.Errors.Sync.keepChanges, style: .default, handler: { _ in - completed(.keepGroupChanges(.group(groupId))) + UIAlertAction(title: L10n.Errors.Sync.skipGroup, style: .default, handler: { _ in + completed(.skipGroup(.group(groupId))) })] return (L10n.warning, L10n.Errors.Sync.metadataWriteDenied(groupName), actions)