Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pre-beta copy updates #472

Merged
merged 11 commits into from
Mar 17, 2022
Merged

Pre-beta copy updates #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dcac0f0
Update Default Browser preferences copy
samsymons Mar 16, 2022
d3e7de5
Update Cookie Consent preferences copy
samsymons Mar 16, 2022
929334b
Update Duck Address copy
samsymons Mar 16, 2022
b581fbc
Update permissions copy
samsymons Mar 16, 2022
91f2d2c
Update Fire Button copy
samsymons Mar 16, 2022
54450cd
Update another Fire button string.
samsymons Mar 16, 2022
37ae30d
Update cookie consent copy to match the additional copy task.
samsymons Mar 17, 2022
395cdb0
Lowercase the permission type.
samsymons Mar 17, 2022
983b926
Reset permissions copy changes.
samsymons Mar 17, 2022
c483357
Revert remaining permissions copy changes.
samsymons Mar 17, 2022
1df87b5
Remove a commented out line.
samsymons Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions DuckDuckGo/Common/Localizables/UserText.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,14 @@ struct UserText {
static let newWindowMenuItem = NSLocalizedString("new.window.menu.item", value: "New Window", comment: "Menu item title")

static let fireDialogFireproofSites = NSLocalizedString("fire.dialog.fireproof.sites", value: "Fireproof Sites", comment: "Category of domains in fire button dialog")
static let fireDialogClearSites = NSLocalizedString("fire.dialog.clear.sites", value: "Clear These Sites", comment: "Category of domains in fire button dialog")
static let allData = NSLocalizedString("fire.all-data", value: "All Data", comment: "Configuration option for fire button")
static let currentTab = NSLocalizedString("fire.currentTab", value: "Current Tab", comment: "Configuration option for fire button")
static let currentWindow = NSLocalizedString("fire.currentWindow", value: "Current Window", comment: "Configuration option for fire button")
static let fireDialogClearSites = NSLocalizedString("fire.dialog.clear.sites", value: "Clear data for the following sites", comment: "Category of domains in fire button dialog")
static let allData = NSLocalizedString("fire.all-data", value: "All data", comment: "Configuration option for fire button")
static let currentTab = NSLocalizedString("fire.currentTab", value: "Current tab", comment: "Configuration option for fire button")
static let currentWindow = NSLocalizedString("fire.currentWindow", value: "Current window", comment: "Configuration option for fire button")
static let allDataDescription = NSLocalizedString("fire.all-data.description", value: "Clear all tabs and related site data", comment: "Description of the 'All Data' configuration option for the fire button")
static let currentTabDescription = NSLocalizedString("fire.current-tab.description", value: "Close current tab and clear related site data", comment: "Description of the 'Current Tab' configuration option for the fire button")
static let currentWindowDescription = NSLocalizedString("fire.current-window.description", value: "Clear current window and related site data", comment: "Description of the 'Current Window' configuration option for the fire button")
static let selectedDomainsDescription = NSLocalizedString("fire.selected-domains.description", value: "Clear selected domains and related site data", comment: "Description of the 'Current Window' configuration option for the fire button")
static let fireDialogNothingToBurn = NSLocalizedString("fire.dialog.nothing-to-burn", value: "Nothing to burn", comment: "Information label to inform there is no domain for burning")
static let fireDialogNothingToBurn = NSLocalizedString("fire.dialog.nothing-to-burn", value: "No data to clear", comment: "Information label to inform there is no domain for burning")
static let fireDialogDetails = NSLocalizedString("fire.dialog.details", value: "Details", comment: "Button to show more details")
static let fireproofSite = NSLocalizedString("options.menu.fireproof-site", value: "Fireproof This Site", comment: "Context menu item")
static let removeFireproofing = NSLocalizedString("options.menu.remove-fireproofing", value: "Remove Fireproofing", comment: "Context menu item")
Expand Down Expand Up @@ -145,7 +144,7 @@ struct UserText {
static let zoom = NSLocalizedString("zoom", value: "Zoom", comment: "Menu with Zooming commands")

static let emailOptionsMenuItem = NSLocalizedString("email.optionsMenu", value: "Email Protection", comment: "Menu item email feature")
static let emailOptionsMenuCreateAddressSubItem = NSLocalizedString("email.optionsMenu.createAddress", value: "Create a Duck Address", comment: "Create an email alias sub menu item")
static let emailOptionsMenuCreateAddressSubItem = NSLocalizedString("email.optionsMenu.createAddress", value: "Generate Private Duck Address", comment: "Create an email alias sub menu item")
static let emailOptionsMenuTurnOffSubItem = NSLocalizedString("email.optionsMenu.turnOff", value: "Disable Email Protection", comment: "Disable email sub menu item")
static let emailOptionsMenuTurnOnSubItem = NSLocalizedString("email.optionsMenu.turnOn", value: "Enable Email Protection", comment: "Enable email sub menu item")
static let privateEmailCopiedToClipboard = NSLocalizedString("email.copied", value: "New address copied to your clipboard", comment: "Private email address was copied to clipboard message")
Expand Down Expand Up @@ -433,7 +432,7 @@ struct UserText {
static let autoconsentPopoverMessage = NSLocalizedString("Cookie consent pop-up managed", comment: "Popover message")
static let autoconsentPopupTitle = NSLocalizedString("Let DuckDuckGo try to manage cookie consent pop-ups?", comment: "messageText")
static let autoconsentPopupDescription = NSLocalizedString("On some sites, we can automatically set preferences to minimize cookies 🍪 and maximize privacy, then close the pop-up.", comment: "informativeText")
static let autoconsentPopupEnableButton = NSLocalizedString("Manage Cookie Pop-ups", comment: "")
static let autoconsentPopupEnableButton = NSLocalizedString("Manage Them for Me", comment: "")
static let autoconsentPopupLaterButton = NSLocalizedString("Not Now", comment: "")
static let autoconsentPopupNeverButton = NSLocalizedString("Don't Ask Again", comment: "")

Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/Fire/View/Fire.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bir-wk-iOW">
<rect key="frame" x="20" y="0.0" width="280" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="square" title=" Also clears these sites in other open tabs" bezelStyle="shadowlessSquare" image="WarningTriangle" imagePosition="leading" alignment="left" inset="2" id="6NW-yL-FoB">
<buttonCell key="cell" type="square" title=" All tabs open to these sites will close" bezelStyle="shadowlessSquare" image="WarningTriangle" imagePosition="leading" alignment="left" inset="2" id="6NW-yL-FoB">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
Expand Down Expand Up @@ -523,7 +523,7 @@ DQ
<constraints>
<constraint firstAttribute="width" constant="280" id="YS3-eh-JOs"/>
</constraints>
<textFieldCell key="cell" alignment="center" title="Use the Fire Button to clear your tabs and windows and to delete your browsing history and cookies." id="ciA-Pp-IT3">
<textFieldCell key="cell" alignment="center" title="Data, browsing history, and cookies can build up in your browser over time. Use the Fire Button to clear it all away." id="ciA-Pp-IT3">
<font key="font" metaFont="system"/>
<color key="textColor" name="GreyTextColor"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand Down
6 changes: 1 addition & 5 deletions DuckDuckGo/Fire/View/FirePopoverViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,7 @@ final class FirePopoverViewController: NSViewController {
return
}

switch firePopoverViewModel.clearingOption {
case .currentTab: closeDetailsButton.title = " \(UserText.currentTabDescription)"
case .currentWindow: closeDetailsButton.title = " \(UserText.currentWindowDescription)"
case .allData: closeDetailsButton.title = " \(UserText.allDataDescription)"
}
closeDetailsButton.title = " \(UserText.fireDialogDetails)"
}

private func updateWarningWrapperView() {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/Preferences/View/DefaultBrowserTableCellView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="W0Z-t7-7IU">
<rect key="frame" x="-2" y="70" width="195" height="21"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Set as Default Browser" id="huk-b6-6M3">
<rect key="frame" x="-2" y="70" width="139" height="21"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Default Browser" id="huk-b6-6M3">
<font key="font" metaFont="systemSemibold" size="18"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/Preferences/View/PrivacySecurityPreferencesTableCellView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<rect key="frame" x="-2" y="177" width="467" height="48"/>
<textFieldCell key="cell" selectable="YES" id="jGL-ur-LHs">
<font key="font" metaFont="system"/>
<string key="title">When DuckDuckGo detects cookie consent pop-ups on sites you visit, we'll automatically set your cookie preferences to minimize cookies and maximize privacy, then close the pop-ups.</string>
<string key="title">On some sites, we can detect cookie consent pop-ups and automatically set your cookie preferences to minimize cookies and maximize privacy, then close the pop-ups.</string>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
Expand Down