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

Copy Changes, Part 2 #287

Merged
merged 4 commits into from
Oct 29, 2021
Merged

Copy Changes, Part 2 #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5459947
Rename Logins to Logins+ in the PWM view controller.
samsymons Oct 29, 2021
6bdb847
Fireproof Websites becomes Fireproof Sites.
samsymons Oct 29, 2021
ec541ff
Fix the capitalization on "Bookmark This Page".
samsymons Oct 29, 2021
8081cbb
More ellipsis and apostrophe replacements (#290)
mallexxx Oct 29, 2021
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
2 changes: 1 addition & 1 deletion DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ struct ContextualMenu {
}

static func editBookmarkMenuItem(bookmark: Bookmark) -> NSMenuItem {
let title = NSLocalizedString("Edit...", comment: "Command")
let title = NSLocalizedString("Edit…", comment: "Command")
return menuItem(title, #selector(BookmarkMenuItemSelectors.editBookmark(_:)), bookmark)
}

Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/BrowserTab/View/Base.lproj/BrowserTab.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RNn-86-Wkx">
<rect key="frame" x="140" y="253" width="232" height="17"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="DuckDuckGo can't load this page." id="W60-yd-bv3">
<textFieldCell key="cell" lineBreakMode="clipping" title="DuckDuckGo can’t load this page." id="W60-yd-bv3">
<font key="font" metaFont="systemSemibold" size="14"/>
<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/Common/Localizables/UserText.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ struct UserText {
static let editFavorite = NSLocalizedString("edit.favorite", value: "Edit Favorite", comment: "Header of the view that edits a favorite bookmark")
static let editFolder = NSLocalizedString("edit.folder", value: "Edit Folder", comment: "Header of the view that edits a bookmark folder")
static let removeFromFavorites = NSLocalizedString("remove.from.favorites", value: "Remove from Favorites", comment: "Button for removing bookmarks from favorites")
static let bookmarkThisPage = NSLocalizedString("bookmark.this.page", value: "Bookmark this Page…", comment: "Menu item for bookmarking current page")
static let bookmarkThisPage = NSLocalizedString("bookmark.this.page", value: "Bookmark This Page…", comment: "Menu item for bookmarking current page")

static let zoom = NSLocalizedString("zoom", value: "Zoom", comment: "Menu with Zooming commands")

Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/Crash Reports/View/CrashReports.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ DQ
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CAq-Gi-cda">
<rect key="frame" x="273" y="13" width="102" height="32"/>
<buttonCell key="cell" type="push" title="Don't Send" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="BUX-UX-TAr">
<buttonCell key="cell" type="push" title="Don’t Send" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="BUX-UX-TAr">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/Data Import/View/DataImport.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ Gw
</textField>
<button horizontalHuggingPriority="1000" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="A1C-Th-KJZ">
<rect key="frame" x="-7" y="87" width="138" height="32"/>
<buttonCell key="cell" type="push" title="Select CSV File..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="L8K-VD-A0V">
<buttonCell key="cell" type="push" title="Select CSV File…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="L8K-VD-A0V">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down Expand Up @@ -668,7 +668,7 @@ Gw
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="E8r-SL-GMt">
<rect key="frame" x="13" y="-5" width="179" height="32"/>
<buttonCell key="cell" type="push" title="Select Bookmarks File..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Tu7-Uq-DiB">
<buttonCell key="cell" type="push" title="Select Bookmarks File…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Tu7-Uq-DiB">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/Fire/View/Fire.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1tt-F5-h1d">
<rect key="frame" x="82" y="59" width="135" height="14"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Deleting browsing data..." id="MnK-PN-hYp">
<textFieldCell key="cell" lineBreakMode="clipping" title="Deleting browsing data…" id="MnK-PN-hYp">
<font key="font" metaFont="smallSystem"/>
<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/Homepage/View/DefaultBrowserPromptView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UqG-2t-H4B" userLabel="Set Default Button">
<rect key="frame" x="506" y="16" width="113" height="32"/>
<buttonCell key="cell" type="push" title="Set Default..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ZuY-JA-v1u">
<buttonCell key="cell" type="push" title="Set Default…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ZuY-JA-v1u">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/Preferences/View/DefaultBrowserTableCellView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Atx-oK-RIE">
<rect key="frame" x="270" y="13" width="113" height="32"/>
<buttonCell key="cell" type="push" title="Set Default..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="23K-EG-jIK">
<buttonCell key="cell" type="push" title="Set Default…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="23K-EG-jIK">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/Preferences/View/DownloadPreferencesTableCellView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</pathControl>
<button verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="pt9-Dk-ki9">
<rect key="frame" x="219" y="38" width="92" height="32"/>
<buttonCell key="cell" type="push" title="Change..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="NKP-DN-lrL">
<buttonCell key="cell" type="push" title="Change…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="NKP-DN-lrL">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/Preferences/View/Preferences.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,8 @@
</scroller>
</scrollView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aur-0h-QzR">
<rect key="frame" x="18" y="271" width="122" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Fireproof Websites" id="s7t-C5-auR">
<rect key="frame" x="18" y="271" width="95" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Fireproof Sites" id="s7t-C5-auR">
<font key="font" metaFont="systemMedium" size="13"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand Down
8 changes: 4 additions & 4 deletions DuckDuckGo/SecureVault/View/PasswordManager.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -29,8 +29,8 @@
<rect key="frame" x="0.0" y="437" width="527" height="5"/>
</box>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rbb-3S-qEY">
<rect key="frame" x="18" y="451" width="55" height="20"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Logins" id="S3u-aq-6OE">
<rect key="frame" x="18" y="451" width="65" height="20"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Logins+" id="S3u-aq-6OE">
<font key="font" size="17" name="SFProDisplay-Semibold"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand Down