diff --git a/DuckDuckGo/DataImport/View/FileImportView.swift b/DuckDuckGo/DataImport/View/FileImportView.swift index 8e704b2293..6536a1cc0a 100644 --- a/DuckDuckGo/DataImport/View/FileImportView.swift +++ b/DuckDuckGo/DataImport/View/FileImportView.swift @@ -275,18 +275,34 @@ func fileImportInstructionsBuilder(source: DataImport.Source, dataType: DataImpo button(UserText.importBookmarksSelectHTMLFile) case (.safari, .passwords), (.safariTechnologyPreview, .passwords): - NSLocalizedString("import.csv.instructions.safari", value: """ - %d Open **Safari** - %d Select **File → Export → Passwords** - %d Save the passwords file someplace you can find it (e.g., Desktop) - %d %@ - """, comment: """ - Instructions to import Passwords as CSV from Safari. - %N$d - step number - %5$@ - “Select Passwords CSV File” button - **bold text**; _italic text_ - """) - button(UserText.importLoginsSelectCSVFile) + if #available(macOS 15.2, *) { + NSLocalizedString("import.csv.instructions.safari.macos15-2", value: """ + %d Open **Safari** + %d Open the **File menu → Export Browsing Data to File...** + %d Select **passwords** and save the file someplace you can find it (e.g., Desktop) + %d Double click the .zip file to unzip it + %d %@ + """, comment: """ + Instructions to import Passwords as CSV from Safari zip file on >= macOS 15.2. + %N$d - step number + %5$@ - “Select Passwords CSV File” button + **bold text**; _italic text_ + """) + button(UserText.importLoginsSelectCSVFile) + } else { + NSLocalizedString("import.csv.instructions.safari", value: """ + %d Open **Safari** + %d Select **File → Export → Passwords** + %d Save the passwords file someplace you can find it (e.g., Desktop) + %d %@ + """, comment: """ + Instructions to import Passwords as CSV from Safari. + %N$d - step number + %5$@ - “Select Passwords CSV File” button + **bold text**; _italic text_ + """) + button(UserText.importLoginsSelectCSVFile) + } case (.safari, .bookmarks), (.safariTechnologyPreview, .bookmarks): NSLocalizedString("import.html.instructions.safari", value: """ diff --git a/DuckDuckGo/Localizable.xcstrings b/DuckDuckGo/Localizable.xcstrings index ba0c0a8fe9..487608d04e 100644 --- a/DuckDuckGo/Localizable.xcstrings +++ b/DuckDuckGo/Localizable.xcstrings @@ -31111,6 +31111,18 @@ } } }, + "import.csv.instructions.safari.macos15-2" : { + "comment" : "Instructions to import Passwords as CSV from Safari zip file on >= macOS 15.2.\n%N$d - step number\n%5$@ - “Select Passwords CSV File” button\n**bold text**; _italic text_", + "extractionState" : "extracted_with_value", + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "%1$d Open **Safari**\n%2$d Open the **File menu → Export Browsing Data to File...**\n%3$d Select **passwords** and save the file someplace you can find it (e.g., Desktop)\n%4$d Double click the .zip file to unzip it\n%5$d %6$@" + } + } + } + }, "import.csv.instructions.vivaldi" : { "comment" : "Instructions to import Passwords exported as CSV from Vivaldi browser.\n%N$d - step number\n%2$s - browser name (Vivaldi)\n%5$@ - menu button icon\n%8$@ - “Select Passwords CSV File” button\n**bold text**; _italic text_", "extractionState" : "extracted_with_value",