From 3b36bed228204cbfa0b6b7afccb1838dd9ca3dd8 Mon Sep 17 00:00:00 2001 From: Pete Date: Thu, 4 Apr 2024 13:56:47 +0100 Subject: [PATCH 1/2] Fix usertext comment --- DuckDuckGo/Common/Localizables/UserText.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift index e78ee81e96..49a5fb4d84 100644 --- a/DuckDuckGo/Common/Localizables/UserText.swift +++ b/DuckDuckGo/Common/Localizables/UserText.swift @@ -637,10 +637,10 @@ struct UserText { } static func importNoDataBookmarksSubtitle(from source: DataImport.Source) -> String { - String(format: NSLocalizedString("import.nodata.bookmarks.subtitle", value: "If you have %@ bookmarks, try importing them manually instead.", comment: "Data import error subtitle: suggestion to import Bookmarks manually by selecting a CSV or HTML file."), source.importSourceName) + String(format: NSLocalizedString("import.nodata.bookmarks.subtitle", value: "If you have %@ bookmarks, try importing them manually instead.", comment: "Data import error subtitle: suggestion to import Bookmarks manually by selecting a CSV or HTML file. The placeholder here represents the source browser, e.g Firefox."), source.importSourceName) } static func importNoDataPasswordsSubtitle(from source: DataImport.Source) -> String { - String(format: NSLocalizedString("import.nodata.passwords.subtitle", value: "If you have %@ passwords, try importing them manually instead.", comment: "Data import error subtitle: suggestion to import passwords manually by selecting a CSV or HTML file. The placeholder here represents the source browser, e.g Firefox"), source.importSourceName) + String(format: NSLocalizedString("import.nodata.passwords.subtitle", value: "If you have %@ passwords, try importing them manually instead.", comment: "Data import error subtitle: suggestion to import passwords manually by selecting a CSV or HTML file. The placeholder here represents the source browser, e.g Firefox."), source.importSourceName) } static let importLoginsPasswords = NSLocalizedString("import.logins.passwords", value: "Passwords", comment: "Title text for the Passwords import option") From ea07d4017dab43b0e4a1c636146f48c6445beea3 Mon Sep 17 00:00:00 2001 From: Pete Date: Thu, 4 Apr 2024 14:17:41 +0100 Subject: [PATCH 2/2] Disable flakey test --- .../xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme index d683d41f9e..497c10ee86 100644 --- a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme +++ b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme @@ -126,6 +126,9 @@ + +