diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift index 246bf725ed..0c7edfeb3e 100644 --- a/DuckDuckGo/Common/Localizables/UserText.swift +++ b/DuckDuckGo/Common/Localizables/UserText.swift @@ -691,7 +691,7 @@ struct UserText { static let autofill = NSLocalizedString("preferences.autofill", value: "Passwords", comment: "Show Autofill preferences") static let aboutDuckDuckGo = NSLocalizedString("preferences.about.about-duckduckgo", value: "About DuckDuckGo", comment: "About screen") - static let privacySimplified = NSLocalizedString("preferences.about.privacy-simplified", value: "Privacy, simplified.", comment: "About screen") + static let duckduckgoTagline = NSLocalizedString("preferences.about.duckduckgo-tagline", value: "Your protection, our priority.", comment: "About screen") static let aboutUnsupportedDeviceInfo1 = NSLocalizedString("preferences.about.unsupported-device-info1", value: "DuckDuckGo is no longer providing browser updates for your version of macOS.", comment: "This string represents a message informing the user that DuckDuckGo is no longer providing browser updates for their version of macOS") static func aboutUnsupportedDeviceInfo2(version: String) -> String { let localized = NSLocalizedString("preferences.about.unsupported-device-info2", value: "Please update to macOS %@ or later to use the most recent version of DuckDuckGo. You can also keep using your current version of the browser, but it will not receive further updates.", comment: "Copy in section that tells the user to update their macOS version since their current version is unsupported") diff --git a/DuckDuckGo/Localizable.xcstrings b/DuckDuckGo/Localizable.xcstrings index e490fa88b9..3ca1f23270 100644 --- a/DuckDuckGo/Localizable.xcstrings +++ b/DuckDuckGo/Localizable.xcstrings @@ -50438,6 +50438,66 @@ } } }, + "preferences.about.duckduckgo-tagline" : { + "comment" : "About screen", + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Dein Schutz, unsere Priorität." + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Your protection, our priority." + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Tu protección, nuestra prioridad." + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Votre protection, notre priorité." + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "La tua protezione, la nostra priorità." + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Jouw bescherming, onze prioriteit." + } + }, + "pl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Twoje bezpieczeństwo jest naszym priorytetem." + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "A tua proteção, a nossa prioridade." + } + }, + "ru" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ваша защита — наш приоритет." + } + } + } + }, "preferences.about.more-at" : { "comment" : "Link to the about page", "extractionState" : "extracted_with_value", @@ -50560,7 +50620,7 @@ }, "preferences.about.privacy-simplified" : { "comment" : "About screen", - "extractionState" : "extracted_with_value", + "extractionState" : "stale", "localizations" : { "de" : { "stringUnit" : { diff --git a/DuckDuckGo/Preferences/View/PreferencesAboutView.swift b/DuckDuckGo/Preferences/View/PreferencesAboutView.swift index ecf966ac2d..e76daee578 100644 --- a/DuckDuckGo/Preferences/View/PreferencesAboutView.swift +++ b/DuckDuckGo/Preferences/View/PreferencesAboutView.swift @@ -108,7 +108,7 @@ extension Preferences { #if APPSTORE Text(UserText.duckDuckGoForMacAppStore).font(.companyName) - Text(UserText.privacySimplified).font(.privacySimplified) + Text(UserText.duckduckgoTagline).font(.privacySimplified) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.leading) @@ -121,7 +121,7 @@ extension Preferences { #else Text(UserText.duckDuckGo).font(.companyName) - Text(UserText.privacySimplified).font(.privacySimplified) + Text(UserText.duckduckgoTagline).font(.privacySimplified) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.leading) diff --git a/SyncE2EUITests/CriticalPathsTests.swift b/SyncE2EUITests/CriticalPathsTests.swift index 51c2d5c557..32562cbd1b 100644 --- a/SyncE2EUITests/CriticalPathsTests.swift +++ b/SyncE2EUITests/CriticalPathsTests.swift @@ -374,7 +374,7 @@ final class CriticalPathsTests: XCTestCase { } let duckduckgoBookmark = bookmarksWindow.staticTexts["www.duckduckgo.com"] let stackOverflow = bookmarksWindow.staticTexts["Stack Overflow - Where Developers Learn, Share, & Build Careers"] - let privacySimplified = bookmarksWindow.staticTexts["DuckDuckGo — Privacy, simplified."] + let privacySimplified = bookmarksWindow.staticTexts["DuckDuckGo — Your protection, our priority."] let wolfram = bookmarksWindow.staticTexts["Wolfram|Alpha: Computational Intelligence"] let news = bookmarksWindow.staticTexts["news"] let codes = bookmarksWindow.staticTexts["code"] diff --git a/UITests/OnboardingUITests.swift b/UITests/OnboardingUITests.swift index d83b751520..06b73047fc 100644 --- a/UITests/OnboardingUITests.swift +++ b/UITests/OnboardingUITests.swift @@ -110,8 +110,8 @@ final class OnboardingUITests: XCTestCase { startBrowsingButton.click() // AfterOnboarding - let duckduckgoPrivacySimplifiedWindow = app.windows["DuckDuckGo — Privacy, simplified."] - XCTAssertTrue(duckduckgoPrivacySimplifiedWindow.webViews["DuckDuckGo — Privacy, simplified."].waitForExistence(timeout: UITests.Timeouts.elementExistence)) + let duckduckgoPrivacySimplifiedWindow = app.windows["DuckDuckGo — Your protection, our priority."] + XCTAssertTrue(duckduckgoPrivacySimplifiedWindow.webViews["DuckDuckGo — Your protection, our priority."].waitForExistence(timeout: UITests.Timeouts.elementExistence)) XCTAssertTrue(duckduckgoPrivacySimplifiedWindow.buttons["NavigationBarViewController.optionsButton"].isEnabled) } diff --git a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_brave.html b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_brave.html index 7ba22d7cdd..d6c224a11b 100644 --- a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_brave.html +++ b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_brave.html @@ -47,7 +47,7 @@

Bookmarks

The Wall Street Journal - Breaking News, Business, Financial & Economic News, World News and Video

-

DuckDuckGo — Privacy, simplified. +
DuckDuckGo — Your protection, our priority.

DupeFolderNameContents

MacRumors: Apple News and Rumors diff --git a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_chrome.html b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_chrome.html index 08fca4e9b7..54f9bdb6ae 100644 --- a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_chrome.html +++ b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_chrome.html @@ -48,7 +48,7 @@

Bookmarks

The Wall Street Journal - Breaking News, Business, Financial & Economic News, World News and Video

-

DuckDuckGo — Privacy, simplified. +
DuckDuckGo — Your protection, our priority.

DupeFolderNameContents

MacRumors: Apple News and Rumors diff --git a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_android.html b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_android.html index 8a87fa9f41..1e7cb6bf92 100644 --- a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_android.html +++ b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_android.html @@ -47,7 +47,7 @@

Bookmarks

The Wall Street Journal - Breaking News, Business, Financial & Economic News, World News and Video

-

DuckDuckGo — Privacy, simplified. +
DuckDuckGo — Your protection, our priority.

DupeFolderNameContents

MacRumors: Apple News and Rumors diff --git a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_ios.html b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_ios.html index 9d592f0a73..5897360127 100644 --- a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_ios.html +++ b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_ios.html @@ -13,7 +13,7 @@

Bookmarks

FolderA-2

-

DuckDuckGo — Privacy, simplified. +
DuckDuckGo — Your protection, our priority.

FolderB

@@ -22,4 +22,4 @@

Bookmarks

Wikipedia

- \ No newline at end of file + diff --git a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_macos.html b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_macos.html index 9965f7d234..d3027ccc37 100644 --- a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_macos.html +++ b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_ddg_macos.html @@ -42,7 +42,7 @@

Bookmarks

The Wall Street Journal - Breaking News, Business, Financial & Economic News, World News and Video

-

DuckDuckGo — Privacy, simplified. +
DuckDuckGo — Your protection, our priority.

DupeFolderNameContents

MacRumors: Apple News and Rumors diff --git a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_firefox.html b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_firefox.html index 92c60fcd13..24f2804799 100644 --- a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_firefox.html +++ b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_firefox.html @@ -55,7 +55,7 @@

Bookmarks Menu

The Wall Street Journal - Breaking News, Business, Financial & Economic News, World News and Video

-

DuckDuckGo — Privacy, simplified. +
DuckDuckGo — Your protection, our priority.

DupeFolderNameContents

MacRumors: Apple News and Rumors diff --git a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_safari.html b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_safari.html index 560cbf6533..cf1e87b8be 100644 --- a/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_safari.html +++ b/UnitTests/DataImport/DataImportResources/TestBookmarksData/bookmarks_safari.html @@ -53,7 +53,7 @@

Bookmarks

The Wall Street Journal - Breaking News, Business, Financial & Economic News, World News and Video

-

DuckDuckGo — Privacy, simplified. +
DuckDuckGo — Your protection, our priority.

DupeFolderNameContents

MacRumors: Apple News and Rumors diff --git a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_brave.json b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_brave.json index 80fbf50a09..9df45fa8de 100644 --- a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_brave.json +++ b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_brave.json @@ -109,7 +109,7 @@ "type" : "folder" }, { - "name" : "DuckDuckGo — Privacy, simplified.", + "name" : "DuckDuckGo — Your protection, our priority.", "type" : "bookmark", "url" : "https:\/\/duckduckgo.com\/" }, @@ -147,4 +147,4 @@ "type" : "folder" } } -} \ No newline at end of file +} diff --git a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_chrome.json b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_chrome.json index cbcd35b844..df8fe70282 100644 --- a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_chrome.json +++ b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_chrome.json @@ -116,7 +116,7 @@ "type" : "folder" }, { - "name" : "DuckDuckGo — Privacy, simplified.", + "name" : "DuckDuckGo — Your protection, our priority.", "type" : "bookmark", "url" : "https:\/\/duckduckgo.com\/" }, @@ -147,4 +147,4 @@ "type" : "folder" } } -} \ No newline at end of file +} diff --git a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_android.json b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_android.json index cfd7ed9645..0f4a613be1 100644 --- a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_android.json +++ b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_android.json @@ -109,7 +109,7 @@ "type" : "folder" }, { - "name" : "DuckDuckGo — Privacy, simplified.", + "name" : "DuckDuckGo — Your protection, our priority.", "type" : "bookmark", "url" : "https:\/\/duckduckgo.com\/" }, @@ -157,4 +157,4 @@ "type" : "folder" } } -} \ No newline at end of file +} diff --git a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_ios.json b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_ios.json index 51dd407681..c05da58d91 100644 --- a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_ios.json +++ b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_ios.json @@ -39,7 +39,7 @@ { "children" : [ { - "name" : "DuckDuckGo — Privacy, simplified.", + "name" : "DuckDuckGo — Your protection, our priority.", "type" : "bookmark", "url" : "https:\/\/duckduckgo.com" } @@ -72,4 +72,4 @@ "type" : "folder" } } -} \ No newline at end of file +} diff --git a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_macos.json b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_macos.json index 390cac5521..ded70e8049 100644 --- a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_macos.json +++ b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_ddg_macos.json @@ -116,7 +116,7 @@ "type" : "folder" }, { - "name" : "DuckDuckGo — Privacy, simplified.", + "name" : "DuckDuckGo — Your protection, our priority.", "type" : "bookmark", "url" : "https:\/\/duckduckgo.com\/" }, @@ -152,4 +152,4 @@ "type" : "folder" } } -} \ No newline at end of file +} diff --git a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_firefox.json b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_firefox.json index d3428b67b2..ced9ae497c 100644 --- a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_firefox.json +++ b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_firefox.json @@ -135,7 +135,7 @@ "type" : "folder" }, { - "name" : "DuckDuckGo — Privacy, simplified.", + "name" : "DuckDuckGo — Your protection, our priority.", "type" : "bookmark", "url" : "https:\/\/duckduckgo.com\/" }, @@ -177,4 +177,4 @@ "type" : "folder" } } -} \ No newline at end of file +} diff --git a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_safari.json b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_safari.json index 9431af6f7b..0a0faacdd4 100644 --- a/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_safari.json +++ b/UnitTests/DataImport/__Snapshots__/BookmarksHTMLReaderTests/snapshot.bookmarks_safari.json @@ -138,7 +138,7 @@ "type" : "folder" }, { - "name" : "DuckDuckGo — Privacy, simplified.", + "name" : "DuckDuckGo — Your protection, our priority.", "type" : "bookmark", "url" : "https:\/\/duckduckgo.com\/" }, @@ -169,4 +169,4 @@ "type" : "folder" } } -} \ No newline at end of file +}