From 545994789c5d1c38030fee9c57f4fdb68b8e7c1c Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Thu, 28 Oct 2021 18:07:16 -0700
Subject: [PATCH 1/4] Rename Logins to Logins+ in the PWM view controller.

---
 DuckDuckGo/SecureVault/View/PasswordManager.storyboard | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/DuckDuckGo/SecureVault/View/PasswordManager.storyboard b/DuckDuckGo/SecureVault/View/PasswordManager.storyboard
index 5e92e4d70b..dfd385a134 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManager.storyboard
+++ b/DuckDuckGo/SecureVault/View/PasswordManager.storyboard
@@ -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>
@@ -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"/>

From 6bdb84723ffcca9776cd3114d0a969b02496890c Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Thu, 28 Oct 2021 18:07:53 -0700
Subject: [PATCH 2/4] Fireproof Websites becomes Fireproof Sites.

---
 DuckDuckGo/Preferences/View/Preferences.storyboard | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DuckDuckGo/Preferences/View/Preferences.storyboard b/DuckDuckGo/Preferences/View/Preferences.storyboard
index 2673aa137c..2785856c0a 100644
--- a/DuckDuckGo/Preferences/View/Preferences.storyboard
+++ b/DuckDuckGo/Preferences/View/Preferences.storyboard
@@ -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"/>

From ec541ff7300cef485f597832ce27661c77bf05ae Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Thu, 28 Oct 2021 18:08:24 -0700
Subject: [PATCH 3/4] Fix the capitalization on "Bookmark This Page".

---
 DuckDuckGo/Common/Localizables/UserText.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
index b2adc9a229..b6c4ba7015 100644
--- a/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -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")
 

From 8081cbb7f17a34051932238303db639df725feab Mon Sep 17 00:00:00 2001
From: Alexey Martemyanov <mallexxx@gmail.com>
Date: Fri, 29 Oct 2021 17:38:31 +0700
Subject: [PATCH 4/4] More ellipsis and apostrophe replacements (#290)

---
 DuckDuckGo/Bookmarks/Services/ContextualMenu.swift            | 2 +-
 DuckDuckGo/BrowserTab/View/Base.lproj/BrowserTab.storyboard   | 2 +-
 DuckDuckGo/Crash Reports/View/CrashReports.storyboard         | 2 +-
 DuckDuckGo/Data Import/View/DataImport.storyboard             | 4 ++--
 DuckDuckGo/Fire/View/Fire.storyboard                          | 2 +-
 DuckDuckGo/Homepage/View/DefaultBrowserPromptView.xib         | 2 +-
 DuckDuckGo/Preferences/View/DefaultBrowserTableCellView.xib   | 2 +-
 .../Preferences/View/DownloadPreferencesTableCellView.xib     | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift b/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
index 93ca2f67ec..e355c22e2b 100644
--- a/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
+++ b/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
@@ -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)
     }
 
diff --git a/DuckDuckGo/BrowserTab/View/Base.lproj/BrowserTab.storyboard b/DuckDuckGo/BrowserTab/View/Base.lproj/BrowserTab.storyboard
index 37b44a24c5..6d0e1c4595 100644
--- a/DuckDuckGo/BrowserTab/View/Base.lproj/BrowserTab.storyboard
+++ b/DuckDuckGo/BrowserTab/View/Base.lproj/BrowserTab.storyboard
@@ -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"/>
diff --git a/DuckDuckGo/Crash Reports/View/CrashReports.storyboard b/DuckDuckGo/Crash Reports/View/CrashReports.storyboard
index 5e591d4edd..7402237e95 100644
--- a/DuckDuckGo/Crash Reports/View/CrashReports.storyboard	
+++ b/DuckDuckGo/Crash Reports/View/CrashReports.storyboard	
@@ -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>
diff --git a/DuckDuckGo/Data Import/View/DataImport.storyboard b/DuckDuckGo/Data Import/View/DataImport.storyboard
index b78f788843..44ca796499 100644
--- a/DuckDuckGo/Data Import/View/DataImport.storyboard	
+++ b/DuckDuckGo/Data Import/View/DataImport.storyboard	
@@ -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>
@@ -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>
diff --git a/DuckDuckGo/Fire/View/Fire.storyboard b/DuckDuckGo/Fire/View/Fire.storyboard
index bcf1eaff2a..079729ed8d 100644
--- a/DuckDuckGo/Fire/View/Fire.storyboard
+++ b/DuckDuckGo/Fire/View/Fire.storyboard
@@ -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"/>
diff --git a/DuckDuckGo/Homepage/View/DefaultBrowserPromptView.xib b/DuckDuckGo/Homepage/View/DefaultBrowserPromptView.xib
index 150601e45d..e4d7b6485b 100644
--- a/DuckDuckGo/Homepage/View/DefaultBrowserPromptView.xib
+++ b/DuckDuckGo/Homepage/View/DefaultBrowserPromptView.xib
@@ -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>
diff --git a/DuckDuckGo/Preferences/View/DefaultBrowserTableCellView.xib b/DuckDuckGo/Preferences/View/DefaultBrowserTableCellView.xib
index aeb6b9ae06..f3a36371d6 100644
--- a/DuckDuckGo/Preferences/View/DefaultBrowserTableCellView.xib
+++ b/DuckDuckGo/Preferences/View/DefaultBrowserTableCellView.xib
@@ -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>
diff --git a/DuckDuckGo/Preferences/View/DownloadPreferencesTableCellView.xib b/DuckDuckGo/Preferences/View/DownloadPreferencesTableCellView.xib
index 33b3b7b84d..177b3de96a 100644
--- a/DuckDuckGo/Preferences/View/DownloadPreferencesTableCellView.xib
+++ b/DuckDuckGo/Preferences/View/DownloadPreferencesTableCellView.xib
@@ -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>