diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 3a48341974..edfbe159f2 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -12672,7 +12672,7 @@ repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 94.0.1; + version = 94.0.2; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6be05ad2bf..ba0d558e52 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "7b0910360d6f700ca9bea5e5374c8e2c9a2da899", - "version" : "94.0.1" + "revision" : "861b8a72930f138cd18b6a7722502a8a40375827", + "version" : "94.0.2" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/duckduckgo-autofill.git", "state" : { - "revision" : "dbecae0df07650a21b5632a92fa2e498c96af7b5", - "version" : "10.0.1" + "revision" : "5597bc17709c8acf454ecaad4f4082007986242a", + "version" : "10.0.2" } }, { diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift index 4f2e03e1ba..b7a82331a4 100644 --- a/DuckDuckGo/Common/Localizables/UserText.swift +++ b/DuckDuckGo/Common/Localizables/UserText.swift @@ -372,8 +372,8 @@ struct UserText { static let autofillAddresses = NSLocalizedString("autofill.addresses", value: "Addresses", comment: "Autofill autosaved data type") static let autofillPaymentMethods = NSLocalizedString("autofill.payment-methods", value: "Payment methods", comment: "Autofill autosaved data type") static let autofillAutoLock = NSLocalizedString("autofill.auto-lock", value: "Auto-lock", comment: "Autofill settings section title") - static let autofillLockWhenIdle = NSLocalizedString("autofill.lock-when-idle", value: "Lock Autofill after computer is idle for", comment: "Autofill auto-lock setting") - static let autofillNeverLock = NSLocalizedString("autofill.never-lock", value: "Never lock Autofill", comment: "Autofill auto-lock setting") + static let autofillLockWhenIdle = NSLocalizedString("autofill.lock-when-idle", value: "Lock autofill after computer is idle for", comment: "Autofill auto-lock setting") + static let autofillNeverLock = NSLocalizedString("autofill.never-lock", value: "Never lock autofill", comment: "Autofill auto-lock setting") static let autofillNeverLockWarning = NSLocalizedString("autofill.never-lock-warning", value: "If not locked, anyone with access to your device will be able to use and modify your autofill data. For security purposes, credit card form fill always requires authentication.", comment: "Autofill disabled auto-lock warning") static let autolockLocksFormFill = NSLocalizedString("autofill.autolock-locks-form-filling", value: "Also lock password form fill", comment: "Lock form filling when auto-lock is active text") @@ -384,7 +384,7 @@ struct UserText { static let passwordManagement = NSLocalizedString("passsword.management", value: "Autofill", comment: "Used as title for password management user interface") static let passwordManagementAllItems = NSLocalizedString("passsword.management.all-items", value: "All Items", comment: "Used as title for the Autofill All Items option") - static let passwordManagementLogins = NSLocalizedString("passsword.management.logins", value: "Logins", comment: "Used as title for the Autofill Logins option") + static let passwordManagementLogins = NSLocalizedString("passsword.management.logins", value: "Passwords", comment: "Used as title for the Autofill Logins option") static let passwordManagementIdentities = NSLocalizedString("passsword.management.identities", value: "Identities", comment: "Used as title for the Autofill Identities option") static let passwordManagementCreditCards = NSLocalizedString("passsword.management.credit-cards", value: "Credit Cards", comment: "Used as title for the Autofill Credit Cards option") static let passwordManagementNotes = NSLocalizedString("passsword.management.notes", value: "Notes", comment: "Used as title for the Autofill Notes option") @@ -552,7 +552,7 @@ struct UserText { static let safariPreferences = NSLocalizedString("import.logins.safari.preferences", value: "Preferences", comment: "Title of the Safari Preferences menu (up to and including macOS 12)") static let safariSettings = NSLocalizedString("import.logins.safari.settings", value: "Settings", comment: "Title of the Safari Settings menu (macOS 13 and above)") - static let importLoginsCSV = NSLocalizedString("import.logins.csv.title", value: "CSV Logins File", comment: "Title text for the CSV importer") + static let importLoginsCSV = NSLocalizedString("import.logins.csv.title", value: "CSV Password File", comment: "Title text for the CSV importer") static let importBookmarksHTML = NSLocalizedString("import.bookmarks.html.title", value: "HTML Bookmarks File", comment: "Title text for the HTML Bookmarks importer") static let importBookmarksSelectHTMLFile = NSLocalizedString("import.bookmarks.select-html-file", value: "Select HTML Bookmarks File…", comment: "Button text for selecting HTML Bookmarks file") static let importBookmarksSelectAnotherFile = NSLocalizedString("import.bookmarks.select-another-file", value: "Select Another HTML File…", comment: "Button text for selecting another file") @@ -576,7 +576,7 @@ struct UserText { static func importingFile(validLogins: Int) -> String { let localized = NSLocalizedString("import.logins.csv.valid-logins", - value: "Contains %@ valid logins", + value: "Contains %@ valid passwords", comment: "Displays the number of the logins being imported") return String(format: localized, String(validLogins)) } @@ -639,7 +639,7 @@ struct UserText { static func loginImportSuccessfulCSVImports(totalSuccessfulImports: Int) -> String { let localized = NSLocalizedString("import.logins.csv.successful-imports", - value: "New Logins: %@", + value: "New passwords: %@", comment: "Status text indicating the number of successful CSV login imports") return String(format: localized, String(totalSuccessfulImports)) } @@ -935,7 +935,7 @@ struct UserText { } static func passwordManagerAutosavePopoverText(domain: String) -> String { - let localized = NSLocalizedString("autofill.popover.autosave.text", value: "Login saved for %@", comment: "Text confirming a password has been saved for the %@ domain") + let localized = NSLocalizedString("autofill.popover.autosave.text", value: "Password saved for %@", comment: "Text confirming a password has been saved for the %@ domain") return String(format: localized, domain) } diff --git a/DuckDuckGo/SecureVault/Extensions/NSAlert+PasswordManager.swift b/DuckDuckGo/SecureVault/Extensions/NSAlert+PasswordManager.swift index 7ed65191b9..a496e01b88 100644 --- a/DuckDuckGo/SecureVault/Extensions/NSAlert+PasswordManager.swift +++ b/DuckDuckGo/SecureVault/Extensions/NSAlert+PasswordManager.swift @@ -22,7 +22,7 @@ extension NSAlert { static func passwordManagerConfirmDeleteLogin() -> NSAlert { let alert = NSAlert() - alert.messageText = "Are you sure you want to delete this Login?" + alert.messageText = "Are you sure you want to delete this saved password?" alert.informativeText = "This action cannot be undone." alert.alertStyle = .warning alert.addButton(withTitle: "Delete") @@ -42,8 +42,8 @@ extension NSAlert { static func passwordManagerDuplicateLogin() -> NSAlert { let alert = NSAlert() - alert.messageText = "Duplicate login" - alert.informativeText = "You already have a login for this username and website." + alert.messageText = "Duplicate Password" + alert.informativeText = "You already have a password saved for this username and website." alert.alertStyle = .warning alert.addButton(withTitle: "OK") return alert @@ -51,7 +51,7 @@ extension NSAlert { static func passwordManagerConfirmDeleteCard() -> NSAlert { let alert = NSAlert() - alert.messageText = "Are you sure you want to delete this Payment Method from Autofill?" + alert.messageText = "Are you sure you want to delete this saved credit card?" alert.informativeText = "This action cannot be undone." alert.alertStyle = .warning alert.addButton(withTitle: "Delete") @@ -61,7 +61,7 @@ extension NSAlert { static func passwordManagerConfirmDeleteIdentity() -> NSAlert { let alert = NSAlert() - alert.messageText = "Are you sure you want to delete this Info from Autofill?" + alert.messageText = "Are you sure you want to delete this saved autofill info?" alert.informativeText = "This action cannot be undone." alert.alertStyle = .warning alert.addButton(withTitle: "Delete") diff --git a/DuckDuckGo/SecureVault/Extensions/UserText+PasswordManager.swift b/DuckDuckGo/SecureVault/Extensions/UserText+PasswordManager.swift index 33707e199c..23de1bdfa9 100644 --- a/DuckDuckGo/SecureVault/Extensions/UserText+PasswordManager.swift +++ b/DuckDuckGo/SecureVault/Extensions/UserText+PasswordManager.swift @@ -20,21 +20,21 @@ import Foundation extension UserText { - static let pmSaveCredentialsEditableTitle = NSLocalizedString("pm.save-credentials.editable.title", value: "Save Login?", comment: "Title for the editable Save Credentials popover") - static let pmSaveCredentialsNonEditableTitle = NSLocalizedString("pm.save-credentials.non-editable.title", value: "New Login Saved", comment: "Title for the non-editable Save Credentials popover") + static let pmSaveCredentialsEditableTitle = NSLocalizedString("pm.save-credentials.editable.title", value: "Save password?", comment: "Title for the editable Save Credentials popover") + static let pmSaveCredentialsNonEditableTitle = NSLocalizedString("pm.save-credentials.non-editable.title", value: "New Password Saved", comment: "Title for the non-editable Save Credentials popover") - static let pmEmptyStateDefaultTitle = NSLocalizedString("pm.empty.default.title", value: "No Logins or Payment Methods saved yet", comment: "Label for default empty state title") + static let pmEmptyStateDefaultTitle = NSLocalizedString("pm.empty.default.title", value: "No passwords or credit cards saved yet", comment: "Label for default empty state title") static let pmEmptyStateDefaultDescription = NSLocalizedString("pm.empty.default.description", - value: "If your logins are saved in another browser, you can import them into DuckDuckGo.", + value: "If your passwords are saved in another browser, you can import them into DuckDuckGo.", comment: "Label for default empty state description") - static let pmEmptyStateLoginsTitle = NSLocalizedString("pm.empty.logins.title", value: "No Logins", comment: "Label for logins empty state title") + static let pmEmptyStateLoginsTitle = NSLocalizedString("pm.empty.logins.title", value: "No passwords", comment: "Label for logins empty state title") static let pmEmptyStateIdentitiesTitle = NSLocalizedString("pm.empty.identities.title", value: "No Identities", comment: "Label for identities empty state title") static let pmEmptyStateCardsTitle = NSLocalizedString("pm.empty.cards.title", value: "No Cards", comment: "Label for cards empty state title") static let pmEmptyStateNotesTitle = NSLocalizedString("pm.empty.notes.title", value: "No Notes", comment: "Label for notes empty state title") static let pmNewCard = NSLocalizedString("pm.new.card", value: "Credit Card", comment: "Label for new card title") - static let pmNewLogin = NSLocalizedString("pm.new.login", value: "Login", comment: "Label for new login title") + static let pmNewLogin = NSLocalizedString("pm.new.login", value: "Password", comment: "Label for new login title") static let pmNewIdentity = NSLocalizedString("pm.new.identity", value: "Identity", comment: "Label for new identity title") static let pmNewNote = NSLocalizedString("pm.new.note", value: "Note", comment: "Label for new note title") @@ -102,7 +102,7 @@ extension UserText { static func pmLockScreenDuration(duration: String) -> String { let localized = NSLocalizedString("pm.lock-screen.duration", - value: "Your Autofill info will remain unlocked until your computer is idle for %@.", + value: "Your autofill info will remain unlocked until your computer is idle for %@.", comment: "") return String(format: localized, duration) } @@ -110,10 +110,10 @@ extension UserText { static let pmLockScreenPreferencesLabel = NSLocalizedString("pm.lock-screen.preferences.label", value: "Change in", comment: "Label used for a button that opens preferences") static let pmLockScreenPreferencesLink = NSLocalizedString("pm.lock-screen.preferences.link", value: "Settings", comment: "Label used for a button that opens preferences") - static let pmAutoLockPromptUnlockLogins = NSLocalizedString("pm.lock-screen.prompt.unlock-logins", value: "unlock access to your Autofill info", comment: "Label presented when unlocking Autofill") + static let pmAutoLockPromptUnlockLogins = NSLocalizedString("pm.lock-screen.prompt.unlock-logins", value: "unlock access to your autofill info", comment: "Label presented when unlocking Autofill") static let pmAutoLockPromptExportLogins = NSLocalizedString("pm.lock-screen.prompt.export-logins", value: "export your usernames and passwords", comment: "Label presented when exporting logins") - static let pmAutoLockPromptChangeLoginsSettings = NSLocalizedString("pm.lock-screen.prompt.change-settings", value: "change your Autofill info access settings", comment: "Label presented when changing Auto-Lock settings") - static let pmAutoLockPromptAutofill = NSLocalizedString("pm.lock-screen.prompt.autofill", value: "unlock access to your Autofill info", comment: "Label presented when autofilling credit card information") + static let pmAutoLockPromptChangeLoginsSettings = NSLocalizedString("pm.lock-screen.prompt.change-settings", value: "change your autofill info access settings", comment: "Label presented when changing Auto-Lock settings") + static let pmAutoLockPromptAutofill = NSLocalizedString("pm.lock-screen.prompt.autofill", value: "unlock access to your autofill info", comment: "Label presented when autofilling credit card information") static let autoLockThreshold1Minute = NSLocalizedString("pm.lock-screen.threshold.1-minute", value: "1 minute", comment: "Label used when selecting the Auto-Lock threshold") static let autoLockThreshold5Minutes = NSLocalizedString("pm.lock-screen.threshold.5-minutes", value: "5 minutes", comment: "Label used when selecting the Auto-Lock threshold") diff --git a/DuckDuckGo/SecureVault/Model/PasswordManagementItemListModel.swift b/DuckDuckGo/SecureVault/Model/PasswordManagementItemListModel.swift index a2354bedb7..492bcec5e6 100644 --- a/DuckDuckGo/SecureVault/Model/PasswordManagementItemListModel.swift +++ b/DuckDuckGo/SecureVault/Model/PasswordManagementItemListModel.swift @@ -437,7 +437,7 @@ final class PasswordManagementItemListModel: ObservableObject { var sections = [PasswordManagementListSection]() - if !accounts.isEmpty { sections.append(PasswordManagementListSection(title: "Logins", items: accounts)) } + if !accounts.isEmpty { sections.append(PasswordManagementListSection(title: "Passwords", items: accounts)) } if !cards.isEmpty { sections.append(PasswordManagementListSection(title: "Credit Cards", items: cards)) } if !identities.isEmpty { sections.append(PasswordManagementListSection(title: "Identities", items: identities)) } if !notes.isEmpty { sections.append(PasswordManagementListSection(title: "Notes", items: notes)) } diff --git a/DuckDuckGo/SecureVault/View/PasswordManager.storyboard b/DuckDuckGo/SecureVault/View/PasswordManager.storyboard index 81af455c65..157d696f24 100644 --- a/DuckDuckGo/SecureVault/View/PasswordManager.storyboard +++ b/DuckDuckGo/SecureVault/View/PasswordManager.storyboard @@ -577,7 +577,7 @@ - + diff --git a/LocalPackages/Account/Package.swift b/LocalPackages/Account/Package.swift index 5dbf4f7514..0e357ade93 100644 --- a/LocalPackages/Account/Package.swift +++ b/LocalPackages/Account/Package.swift @@ -12,7 +12,7 @@ let package = Package( targets: ["Account"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "94.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "94.0.2"), .package(path: "../Purchase") ], targets: [ diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 6b6026c209..d5c101fa40 100644 --- a/LocalPackages/DataBrokerProtection/Package.swift +++ b/LocalPackages/DataBrokerProtection/Package.swift @@ -29,7 +29,7 @@ let package = Package( targets: ["DataBrokerProtection"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "94.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "94.0.2"), .package(path: "../PixelKit"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper") diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index c5d829a0c6..99ead44dd0 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -30,7 +30,7 @@ let package = Package( .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "94.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "94.0.2"), .package(path: "../XPCHelper"), .package(path: "../SwiftUIExtensions") ], diff --git a/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift b/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift index fe4f6c3fef..928aa1123f 100644 --- a/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift +++ b/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift @@ -143,7 +143,7 @@ enum UserText { static let bookmarksLimitExceededDescription = NSLocalizedString("prefrences.sync.bookmarks-limit-exceeded-description", value: "Bookmark limit exceeded. Delete some to resume syncing.", comment: "Description for sync bookmarks limits exceeded warning") static let credentialsLimitExceededDescription = NSLocalizedString("prefrences.sync.credentials-limit-exceeded-description", value: "Logins limit exceeded. Delete some to resume syncing.", comment: "Description for sync credentials limits exceeded warning") static let bookmarksLimitExceededAction = NSLocalizedString("prefrences.sync.bookmarks-limit-exceeded-action", value: "Manage Bookmarks", comment: "Button title for sync bookmarks limits exceeded warning to manage bookmarks") - static let credentialsLimitExceededAction = NSLocalizedString("prefrences.sync.credentials-limit-exceeded-action", value: "Manage Logins", comment: "Button title for sync credentials limits exceeded warning to manage logins") + static let credentialsLimitExceededAction = NSLocalizedString("prefrences.sync.credentials-limit-exceeded-action", value: "Manage passwords...", comment: "Button title for sync credentials limits exceeded warning to manage logins") static let syncErrorAlertTitle = NSLocalizedString("alert.sync-error", value: "Sync Error", comment: "Title for sync error alert") static let unableToSyncDescription = NSLocalizedString("alert.unable-to-sync-description", value: "Unable to sync.", comment: "Description for unable to sync error") static let unableToGetDevicesDescription = NSLocalizedString("alert.unable-to-get-devices-description", value: "Unable to retrieve the list of connected devices.", comment: "Description for unable to get devices error")