Harmful terminology removed (#3020)

Task/Issue URL: https://app.asana.com/0/72649045549333/1207886347657336/f CC: **Description**: Removal of harmful terminology
duckduckgo · Jul 26, 2024 · 1dbd61e · 1dbd61e
1 parent 44399ac
commit 1dbd61e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/DuckDuckGo/DataImport/Model/DataImportViewModel.swift b/DuckDuckGo/DataImport/Model/DataImportViewModel.swift
@@ -44,7 +44,7 @@ struct DataImportViewModel {
     /// Factory for a DataImporter for importSource
     private let dataImporterFactory: DataImporterFactory
 
-    /// Show a master password input dialog callback
+    /// Show a main password input dialog callback
     private let requestPrimaryPasswordCallback: @MainActor (Source) -> String?
 
     /// Show Open Panel to choose CSV/HTML file
@@ -298,7 +298,7 @@ struct DataImportViewModel {
                 // stay on the same screen
                 return true
 
-            // firefox passwords db is master-password protected: request password
+            // firefox passwords db is main-password protected: request password
             case let error as FirefoxLoginReader.ImportError where error.type == .requiresPrimaryPassword:
 
                 log("primary password required")

diff --git a/DuckDuckGo/DataImport/View/FileImportView.swift b/DuckDuckGo/DataImport/View/FileImportView.swift
@@ -362,7 +362,7 @@ func fileImportInstructionsBuilder(source: DataImport.Source, dataType: DataImpo
         %d Open and unlock **%s**
         %d Select the vault you want to export (you can only export one vault at a time)
         %d Select **File → Export → All Items** from the Menu Bar
-        %d Enter your 1Password master or account password
+        %d Enter your 1Password main or account password
         %d Select the File Format: **iCloud Keychain (.csv)**
         %d Save the passwords file someplace you can find it (e.g., Desktop)
         %d %@
@@ -380,7 +380,7 @@ func fileImportInstructionsBuilder(source: DataImport.Source, dataType: DataImpo
         %d Open and unlock **%s**
         %d Select **File → Export vault** from the Menu Bar
         %d Select the File Format: **.csv**
-        %d Enter your Bitwarden master password
+        %d Enter your Bitwarden main password
         %d Click %@ and save the file someplace you can find it (e.g., Desktop)
         %d %@
         """, comment: """
@@ -396,10 +396,10 @@ func fileImportInstructionsBuilder(source: DataImport.Source, dataType: DataImpo
 
     case (.lastPass, .passwords):
         NSLocalizedString("import.csv.instructions.lastpass", value: """
-        %d Click on the **%s** icon in your browser and enter your master password
+        %d Click on the **%s** icon in your browser and enter your main password
         %d Select **Open My Vault**
         %d From the sidebar select **Advanced Options → Export**
-        %d Enter your LastPass master password
+        %d Enter your LastPass main password
         %d Select the File Format: **Comma Delimited Text (.csv)**
         %d %@
         """, comment: """

diff --git a/...kages/DataBrokerProtection/Sources/DataBrokerProtection/Services/RedeemCodeServices.swift b/...kages/DataBrokerProtection/Sources/DataBrokerProtection/Services/RedeemCodeServices.swift
@@ -88,7 +88,7 @@ public final class KeychainAuthenticationData: AuthenticationRepository {
         case waitlistTimestamp = "databrokerprotection.timestamp"
     }
 
-    /// Hack to stop the bleeding on https://app.asana.com/0/1203581873609357/1206097441142301/f
+    /// Hack to prevent further damage on https://app.asana.com/0/1203581873609357/1206097441142301/f
     lazy var keychainPrefix: String = {
         let originalString = Bundle.main.bundleIdentifier ?? "com.duckduckgo"
         let replacedString = originalString.replacingOccurrences(of: "DBP.backgroundAgent", with: "browser")