From eb7860eeb9e0f51a981eb9ae77ad333bc90a71b8 Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuart.breckenridge@icloud.com>
Date: Sun, 23 May 2021 18:24:27 +0800
Subject: [PATCH 01/13] Adds new Tweetbot share extension identifier.

Fixes #3123 on iOS.
---
 iOS/TitleActivityItemSource.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iOS/TitleActivityItemSource.swift b/iOS/TitleActivityItemSource.swift
index 428b75f04..fff0609aa 100644
--- a/iOS/TitleActivityItemSource.swift
+++ b/iOS/TitleActivityItemSource.swift
@@ -30,6 +30,7 @@ class TitleActivityItemSource: NSObject, UIActivityItemSource {
 		case "com.omnigroup.OmniFocus3.iOS.QuickEntry",
 			 "com.culturedcode.ThingsiPhone.ShareExtension",
 			 "com.tapbots.Tweetbot4.shareextension",
+			 "com.tapbots.Tweetbot6.shareextension",
 			 "com.buffer.buffer.Buffer":
 			return title
 		default:

From 9ab8a5061398cc8999c8c24d84ce667569166748 Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuart.breckenridge@icloud.com>
Date: Sun, 23 May 2021 18:40:12 +0800
Subject: [PATCH 02/13] iOS multiplatform updated

---
 Multiplatform/iOS/Article/TitleActivityItemSource.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Multiplatform/iOS/Article/TitleActivityItemSource.swift b/Multiplatform/iOS/Article/TitleActivityItemSource.swift
index 2c90d2dc4..6eaf1f520 100644
--- a/Multiplatform/iOS/Article/TitleActivityItemSource.swift
+++ b/Multiplatform/iOS/Article/TitleActivityItemSource.swift
@@ -30,6 +30,7 @@ class TitleActivityItemSource: NSObject, UIActivityItemSource {
 		case "com.omnigroup.OmniFocus3.iOS.QuickEntry",
 			 "com.culturedcode.ThingsiPhone.ShareExtension",
 			 "com.tapbots.Tweetbot4.shareextension",
+			 "com.tapbots.Tweetbot6.shareextension",
 			 "com.buffer.buffer.Buffer":
 			return title
 		default:

From 04ba650bc8b0235646a3c835bff9a47467bc813d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kiel=20Gillard=20=F0=9F=A4=AA?= <kgillard@deputy.com>
Date: Mon, 31 May 2021 09:12:39 +1000
Subject: [PATCH 03/13] Preserve custom feed names with Feedly when moving them
 between folders. Fixes #3109

---
 .../Account/Feedly/FeedlyAccountDelegate.swift    | 15 ++++++++-------
 .../FeedlyAddExistingFeedOperation.swift          |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift b/Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift
index 0f9de2e5b..3108082fc 100644
--- a/Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift
+++ b/Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift
@@ -382,13 +382,14 @@ final class FeedlyAccountDelegate: AccountDelegate {
 			}
 			
 			let resource = FeedlyFeedResourceId(id: feed.webFeedID)
-			let addExistingFeed = try FeedlyAddExistingFeedOperation(account: account,
-																	 credentials: credentials,
-																	 resource: resource,
-																	 service: caller,
-																	 container: container,
-																	 progress: refreshProgress,
-																	 log: log)
+            let addExistingFeed = try FeedlyAddExistingFeedOperation(account: account,
+                                                                     credentials: credentials,
+                                                                     resource: resource,
+                                                                     service: caller,
+                                                                     container: container,
+                                                                     progress: refreshProgress,
+                                                                     log: log,
+                                                                     customFeedName: feed.editedName)
 			
 			
 			addExistingFeed.addCompletionHandler = { result in
diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyAddExistingFeedOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyAddExistingFeedOperation.swift
index 07dc4c8ca..ed0824663 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlyAddExistingFeedOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlyAddExistingFeedOperation.swift
@@ -17,7 +17,7 @@ class FeedlyAddExistingFeedOperation: FeedlyOperation, FeedlyOperationDelegate,
 	private let operationQueue = MainThreadOperationQueue()
 	var addCompletionHandler: ((Result<Void, Error>) -> ())?
 
-	init(account: Account, credentials: Credentials, resource: FeedlyFeedResourceId, service: FeedlyAddFeedToCollectionService, container: Container, progress: DownloadProgress, log: OSLog) throws {
+    init(account: Account, credentials: Credentials, resource: FeedlyFeedResourceId, service: FeedlyAddFeedToCollectionService, container: Container, progress: DownloadProgress, log: OSLog, customFeedName: String? = nil) throws {
 		
 		let validator = FeedlyFeedContainerValidator(container: container)
 		let (folder, collectionId) = try validator.getValidContainer()
@@ -28,7 +28,7 @@ class FeedlyAddExistingFeedOperation: FeedlyOperation, FeedlyOperationDelegate,
 		
 		self.downloadProgress = progress
 		
-		let addRequest = FeedlyAddFeedToCollectionOperation(account: account, folder: folder, feedResource: resource, feedName: nil, collectionId: collectionId, service: service)
+		let addRequest = FeedlyAddFeedToCollectionOperation(account: account, folder: folder, feedResource: resource, feedName: customFeedName, collectionId: collectionId, service: service)
 		addRequest.delegate = self
 		addRequest.downloadProgress = progress
 		self.operationQueue.add(addRequest)

From ae63d0feb7cf016bb6374d643ba042ebc17456e5 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Mon, 31 May 2021 15:52:56 -0700
Subject: [PATCH 04/13] =?UTF-8?q?Add=20a=20warning=20about=20iCloud=20sync?=
 =?UTF-8?q?=20being=20slow=20sometimes.=20Also:=20in=20user-facing=20text,?=
 =?UTF-8?q?=20change=20=E2=80=9Csubscriptions=E2=80=9D=20to=20=E2=80=9Cfee?=
 =?UTF-8?q?ds.=E2=80=9D=20We=20want=20to=20use=20the=20word=20=E2=80=9Cfee?=
 =?UTF-8?q?d=E2=80=9D=20=E2=80=94=20a=20=E2=80=9Csubscription=E2=80=9D=20m?=
 =?UTF-8?q?akes=20people=20think=20of=20IAP.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Accounts/AccountsAddCloudKit.xib          | 20 +++----
 .../Accounts/AddAccountsView.swift            |  8 +--
 .../AddFeedWranglerAccountView.swift          |  2 +-
 .../AddFeedbinAccountView.swift               |  2 +-
 .../AddFeedlyAccountView.swift                |  2 +-
 .../AddLocalAccountView.swift                 |  2 +-
 .../AddNewsBlurAccountView.swift              |  2 +-
 .../AddReaderAPIAccountView.swift             |  2 +-
 .../Add Account/AddAccountView.swift          |  8 +--
 iOS/Account/Account.storyboard                | 54 +++++++++----------
 .../CloudKitAccountViewController.swift       |  2 +-
 .../FeedWranglerAccountViewController.swift   |  2 +-
 .../FeedbinAccountViewController.swift        |  2 +-
 iOS/Account/LocalAccountViewController.swift  |  2 +-
 .../NewsBlurAccountViewController.swift       |  2 +-
 .../ReaderAPIAccountViewController.swift      |  8 +--
 iOS/Settings/AddAccountViewController.swift   |  8 +--
 17 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/Mac/Preferences/Accounts/AccountsAddCloudKit.xib b/Mac/Preferences/Accounts/AccountsAddCloudKit.xib
index 0e286f444..e8a4a1b5d 100644
--- a/Mac/Preferences/Accounts/AccountsAddCloudKit.xib
+++ b/Mac/Preferences/Accounts/AccountsAddCloudKit.xib
@@ -18,16 +18,16 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="398" height="135"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1536" height="935"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="398" height="135"/>
+                <rect key="frame" x="0.0" y="0.0" width="398" height="136"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <stackView distribution="fill" orientation="horizontal" alignment="bottom" spacing="19" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" ambiguous="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uDK-ji-zlT">
                         <rect key="frame" x="199" y="59" width="0.0" height="16"/>
                     </stackView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xqo-gP-MPl">
-                        <rect key="frame" x="285" y="13" width="100" height="32"/>
+                        <rect key="frame" x="278" y="13" width="106" height="32"/>
                         <buttonCell key="cell" type="push" title="Use iCloud" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oih-6c-KbS">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -40,7 +40,7 @@ DQ
                         </connections>
                     </button>
                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ySx-qg-WbT">
-                        <rect key="frame" x="20" y="71" width="50" height="50"/>
+                        <rect key="frame" x="20" y="72" width="50" height="50"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="50" id="LlV-kM-gHE"/>
                             <constraint firstAttribute="height" constant="50" id="MjL-TR-9ey"/>
@@ -48,26 +48,26 @@ DQ
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="accountCloudKit" id="9RZ-J3-ioX"/>
                     </imageView>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="80D-3X-rL2">
-                        <rect key="frame" x="76" y="99" width="304" height="16"/>
+                        <rect key="frame" x="76" y="100" width="304" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Use your iCloud account." id="1d2-Mx-TKe">
-                            <font key="font" textStyle="headline" name=".SFNS-Bold"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Kj-Cl-FJQ">
-                        <rect key="frame" x="76" y="59" width="304" height="32"/>
+                        <rect key="frame" x="76" y="60" width="304" height="32"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="32" id="ZJN-cn-p1x"/>
                         </constraints>
-                        <textFieldCell key="cell" selectable="YES" allowsUndo="NO" title="NetNewsWire will use your iCloud account to sync your subscriptions across your Mac and iOS devices." id="wfr-Dv-UIF">
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                        <textFieldCell key="cell" selectable="YES" allowsUndo="NO" title="NetNewsWire will use your iCloud account to sync your feeds across your Mac and iOS devices." id="wfr-Dv-UIF">
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9eG-vV-s8c">
-                        <rect key="frame" x="187" y="13" width="100" height="32"/>
+                        <rect key="frame" x="172" y="13" width="106" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iVd-bO-4LN">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
diff --git a/Mac/Preferences/Accounts/AddAccountsView.swift b/Mac/Preferences/Accounts/AddAccountsView.swift
index 1eefa3d4b..ff88edfd6 100644
--- a/Mac/Preferences/Accounts/AddAccountsView.swift
+++ b/Mac/Preferences/Accounts/AddAccountsView.swift
@@ -34,13 +34,13 @@ enum AddAccountSections: Int, CaseIterable {
 	var sectionFooter: String {
 		switch self {
 		case .local:
-			return NSLocalizedString("Local accounts do not sync subscriptions across devices.", comment: "Local Account")
+			return NSLocalizedString("Local accounts do not sync feeds across devices", comment: "Local Account")
 		case .icloud:
-			return NSLocalizedString("Use your iCloud account to sync your subscriptions across your iOS and macOS devices.", comment: "iCloud Account")
+			return NSLocalizedString("Your iCloud account syncs your feeds across your Mac and iOS devices", comment: "iCloud Account")
 		case .web:
-			return NSLocalizedString("Web accounts sync your subscriptions across all your devices.", comment: "Web Account")
+			return NSLocalizedString("Web accounts sync your feeds across all your devices", comment: "Web Account")
 		case .selfhosted:
-			return NSLocalizedString("Self-hosted accounts sync your subscriptions across all your devices.", comment: "Self hosted Account")
+			return NSLocalizedString("Self-hosted accounts sync your feeds across all your devices", comment: "Self hosted Account")
 		case .allOrdered:
 			return ""
 		}
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift
index 4e21a994a..bc8788e79 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift	
@@ -191,7 +191,7 @@ struct AddFeedWranglerAccountView: View {
 		HStack {
 			Spacer()
 			VStack(spacing: 8) {
-				Text("Sign in to your Feed Wrangler account and sync your subscriptions across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
+				Text("Sign in to your Feed Wrangler account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
 				Text("Don't have a Feed Wrangler account?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(.feedWrangler)
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift
index 032898816..3832d5a41 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift	
@@ -188,7 +188,7 @@ struct AddFeedbinAccountView: View {
 		HStack {
 			Spacer()
 			VStack(spacing: 8) {
-				Text("Sign in to your Feedbin account and sync your subscriptions across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
+				Text("Sign in to your Feedbin account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
 				Text("Don't have a Feedbin account?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(.feedbin)
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift
index 0fc0f7e90..2b27b77ab 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift	
@@ -126,7 +126,7 @@ struct AddFeedlyAccountView: View {
 		HStack {
 			Spacer()
 			VStack(spacing: 8) {
-				Text("Sign in to your Feedly account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an Feedly account?").foregroundColor(.secondary)
+				Text("Sign in to your Feedly account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an Feedly account?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(.feedly)
 				}, label: {
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddLocalAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddLocalAccountView.swift
index 034ca07d3..e24923273 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddLocalAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddLocalAccountView.swift	
@@ -122,7 +122,7 @@ struct AddLocalAccountView: View {
 		HStack {
 			Spacer()
 			VStack(spacing: 8) {
-				Text("Local accounts do not sync your subscriptions across devices.").foregroundColor(.secondary)
+				Text("Local accounts do not sync your feeds across devices.").foregroundColor(.secondary)
 			}
 			.multilineTextAlignment(.center)
 			.font(.caption)
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift
index dc6783589..76c3b9dfc 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift	
@@ -188,7 +188,7 @@ struct AddNewsBlurAccountView: View {
 		HStack {
 			Spacer()
 			VStack(spacing: 8) {
-				Text("Sign in to your NewsBlur account and sync your subscriptions across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
+				Text("Sign in to your NewsBlur account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
 				Text("Don't have a NewsBlur account?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(.newsBlur)
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift
index 53359633a..4cd2a7690 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift	
@@ -221,7 +221,7 @@ struct AddReaderAPIAccountView: View {
 		HStack {
 			Spacer()
 			VStack(spacing: 8) {
-				Text("Sign in to your \(accountType.localizedAccountName()) account and sync your subscriptions across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
+				Text("Sign in to your \(accountType.localizedAccountName()) account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
 				Text("Don't have a \(accountType.localizedAccountName()) instance?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(accountType)
diff --git a/Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/AddAccountView.swift b/Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/AddAccountView.swift
index 3a95b9f83..4f1001451 100644
--- a/Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/AddAccountView.swift	
+++ b/Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/AddAccountView.swift	
@@ -34,13 +34,13 @@ enum AddAccountSections: Int, CaseIterable {
 	var sectionFooter: String {
 		switch self {
 		case .local:
-			return NSLocalizedString("Local accounts do not sync subscriptions across devices.", comment: "Local Account")
+			return NSLocalizedString("Local accounts do not sync feeds across devices.", comment: "Local Account")
 		case .icloud:
-			return NSLocalizedString("Use your iCloud account to sync your subscriptions across your iOS and macOS devices.", comment: "iCloud Account")
+			return NSLocalizedString("Your iCloud account syncs your feeds across your Mac and iOS devices.", comment: "iCloud Account")
 		case .web:
-			return NSLocalizedString("Web accounts sync your subscriptions across all your devices.", comment: "Web Account")
+			return NSLocalizedString("Web accounts sync your feeds across all your devices.", comment: "Web Account")
 		case .selfhosted:
-			return NSLocalizedString("Self-hosted accounts sync your subscriptions across all your devices.", comment: "Self hosted Account")
+			return NSLocalizedString("Self-hosted accounts sync your feeds across all your devices.", comment: "Self hosted Account")
 		case .allOrdered:
 			return ""
 		}
diff --git a/iOS/Account/Account.storyboard b/iOS/Account/Account.storyboard
index 7cc00d957..cf932ae56 100644
--- a/iOS/Account/Account.storyboard
+++ b/iOS/Account/Account.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -54,7 +54,7 @@
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Ik-WC-e74">
                                     <rect key="frame" x="20" y="8" width="373" height="78.5"/>
-                                    <string key="text">Sign in to your Feed Wranger account to sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.
+                                    <string key="text">Sign in to your Feed Wranger account to sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.
 
 Don't have a Feed Wrangler account?</string>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
@@ -90,7 +90,7 @@ Don't have a Feed Wrangler account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="o06-fe-i3S">
-                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="520" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -110,12 +110,12 @@ Don't have a Feed Wrangler account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Z6i-nX-CwJ">
-                                                    <rect key="frame" x="20" y="11.5" width="284" height="21"/>
+                                                    <rect key="frame" x="20" y="11.5" width="470" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lBg-Pn-8ao">
-                                                    <rect key="frame" x="312" y="5.5" width="42" height="33"/>
+                                                    <rect key="frame" x="498" y="5.5" width="42" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
                                                     <connections>
@@ -233,7 +233,7 @@ Don't have a Feed Wrangler account?</string>
                             <rect key="frame" x="0.0" y="159" width="414" height="150"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Local accounts do not sync your subscriptions across devices." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5ce-ZL-glQ">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Local accounts do not sync your feeds across devices." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5ce-ZL-glQ">
                                     <rect key="frame" x="20" y="8" width="373" height="14.5"/>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                     <color key="textColor" systemColor="secondaryLabelColor"/>
@@ -258,7 +258,7 @@ Don't have a Feed Wrangler account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Name" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yl1-R6-xZi">
-                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="520" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocapitalizationType="words"/>
                                                 </textField>
@@ -339,7 +339,7 @@ Don't have a Feed Wrangler account?</string>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sgL-0C-JZa">
                                     <rect key="frame" x="20" y="8" width="373" height="78.5"/>
-                                    <string key="text">Sign in to your Feedbin account to sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.
+                                    <string key="text">Sign in to your Feedbin account to sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.
 
 Don't have a Feedbin account?</string>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
@@ -375,7 +375,7 @@ Don't have a Feedbin account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vJa-NN-yjR">
-                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="520" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -395,12 +395,12 @@ Don't have a Feedbin account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="YC2-RH-QoV">
-                                                    <rect key="frame" x="20" y="11.5" width="284" height="21"/>
+                                                    <rect key="frame" x="20" y="11.5" width="470" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TfW-wf-V06">
-                                                    <rect key="frame" x="312" y="5.5" width="42" height="33"/>
+                                                    <rect key="frame" x="498" y="5.5" width="42" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
                                                     <connections>
@@ -520,7 +520,7 @@ Don't have a Feedbin account?</string>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fal-e8-3BB">
                                     <rect key="frame" x="20" y="8" width="373" height="78.5"/>
-                                    <string key="text">Sign in to your NewsBlur account to sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.
+                                    <string key="text">Sign in to your NewsBlur account to sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.
 
 Don't have a NewsBlur account?</string>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
@@ -556,7 +556,7 @@ Don't have a NewsBlur account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Username or Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="S4v-fs-DIO">
-                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="520" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -576,12 +576,12 @@ Don't have a NewsBlur account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fct-XR-fEa">
-                                                    <rect key="frame" x="20" y="11.5" width="284" height="21"/>
+                                                    <rect key="frame" x="20" y="11.5" width="470" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GY9-nr-jFb">
-                                                    <rect key="frame" x="312" y="5.5" width="42" height="33"/>
+                                                    <rect key="frame" x="498" y="5.5" width="42" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
                                                     <connections>
@@ -684,8 +684,8 @@ Don't have a NewsBlur account?</string>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Jj-p8-lYw">
-                                    <rect key="frame" x="20" y="8" width="373" height="62.5"/>
-                                    <string key="text">Use your Reader account to sync your subscriptions across your devices.
+                                    <rect key="frame" x="20" y="8" width="373" height="46.5"/>
+                                    <string key="text">Use your Reader account to sync your feeds across your devices.
 
 Don't have a Reader account?</string>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
@@ -693,7 +693,7 @@ Don't have a Reader account?</string>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Fq-U4-PS5">
-                                    <rect key="frame" x="169.5" y="69" width="75" height="27"/>
+                                    <rect key="frame" x="169.5" y="53" width="75" height="27"/>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                     <state key="normal" title="Sign Up Here"/>
                                     <connections>
@@ -721,7 +721,7 @@ Don't have a Reader account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Username or Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="CZg-x8-936">
-                                                    <rect key="frame" x="14" y="11" width="347" height="22"/>
+                                                    <rect key="frame" x="14" y="11" width="533" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -741,12 +741,12 @@ Don't have a Reader account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KgN-kQ-Cyc">
-                                                    <rect key="frame" x="14" y="11.5" width="294" height="21"/>
+                                                    <rect key="frame" x="14" y="11.5" width="480" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cFF-qt-WLs">
-                                                    <rect key="frame" x="316" y="5.5" width="42" height="33"/>
+                                                    <rect key="frame" x="502" y="5.5" width="42" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
                                                     <connections>
@@ -772,7 +772,7 @@ Don't have a Reader account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="API URL" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iPv-M2-U8Q">
-                                                    <rect key="frame" x="14" y="11" width="340" height="22"/>
+                                                    <rect key="frame" x="14" y="11" width="530" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no" textContentType="url"/>
                                                 </textField>
@@ -796,7 +796,7 @@ Don't have a Reader account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7L9-X7-1Oc">
-                                                    <rect key="frame" x="0.0" y="-0.5" width="374" height="44.5"/>
+                                                    <rect key="frame" x="10" y="-0.5" width="540" height="44.5"/>
                                                     <state key="normal" title="Action"/>
                                                     <connections>
                                                         <action selector="action:" destination="MzG-hS-TpF" eventType="touchUpInside" id="d10-4f-ZUn"/>
@@ -882,9 +882,9 @@ Don't have a Reader account?</string>
                             <rect key="frame" x="0.0" y="79.5" width="414" height="150"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Use your iCloud account to sync your subscriptions across your iOS and macOS devices." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aFS-Y0-2MH">
-                                    <rect key="frame" x="20" y="8" width="373" height="30.5"/>
-                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your iCloud account syncs your feeds across your Mac and iOS devices" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aFS-Y0-2MH">
+                                    <rect key="frame" x="20" y="8" width="373" height="42.5"/>
+                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                     <color key="textColor" systemColor="secondaryLabelColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
diff --git a/iOS/Account/CloudKitAccountViewController.swift b/iOS/Account/CloudKitAccountViewController.swift
index 1cf5b3ad6..1819653af 100644
--- a/iOS/Account/CloudKitAccountViewController.swift
+++ b/iOS/Account/CloudKitAccountViewController.swift
@@ -22,7 +22,7 @@ class CloudKitAccountViewController: UITableViewController {
 	}
 	
 	private func setupFooter() {
-		footerLabel.text = NSLocalizedString("NetNewsWire will use your iCloud account to sync your subscriptions across your Mac and iOS devices.", comment: "iCloud")
+		footerLabel.text = NSLocalizedString("Feeds in your iCloud account will be synced across your Mac and iOS devices.\n\nImportant note: while NetNewsWire itself is very fast, iCloud syncing is sometimes very slow. This can happen after adding a number of feeds and when setting it up on a new device.\n\nIf that happens to you, it may appear stuck. But don’t worry — it’s not. Just let it run.", comment: "iCloud")
 	}
 
 	@IBAction func cancel(_ sender: Any) {
diff --git a/iOS/Account/FeedWranglerAccountViewController.swift b/iOS/Account/FeedWranglerAccountViewController.swift
index 120945ec1..f33beabf5 100644
--- a/iOS/Account/FeedWranglerAccountViewController.swift
+++ b/iOS/Account/FeedWranglerAccountViewController.swift
@@ -48,7 +48,7 @@ class FeedWranglerAccountViewController: UITableViewController {
 	}
 	
 	private func setupFooter() {
-		footerLabel.text = NSLocalizedString("Sign in to your Feed Wrangler account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a Feed Wrangler account?", comment: "Feed Wrangler")
+		footerLabel.text = NSLocalizedString("Sign in to your Feed Wrangler account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a Feed Wrangler account?", comment: "Feed Wrangler")
 	}
 
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
diff --git a/iOS/Account/FeedbinAccountViewController.swift b/iOS/Account/FeedbinAccountViewController.swift
index ac8836734..30589390c 100644
--- a/iOS/Account/FeedbinAccountViewController.swift
+++ b/iOS/Account/FeedbinAccountViewController.swift
@@ -49,7 +49,7 @@ class FeedbinAccountViewController: UITableViewController {
 	}
 	
 	private func setupFooter() {
-		footerLabel.text = NSLocalizedString("Sign in to your Feedbin account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a Feedbin account?", comment: "Feedbin")
+		footerLabel.text = NSLocalizedString("Sign in to your Feedbin account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a Feedbin account?", comment: "Feedbin")
 	}
 
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
diff --git a/iOS/Account/LocalAccountViewController.swift b/iOS/Account/LocalAccountViewController.swift
index d692dc5fa..31c415d8b 100644
--- a/iOS/Account/LocalAccountViewController.swift
+++ b/iOS/Account/LocalAccountViewController.swift
@@ -25,7 +25,7 @@ class LocalAccountViewController: UITableViewController {
 	}
 	
 	private func setupFooter() {
-		footerLabel.text = NSLocalizedString("Local accounts do not sync your subscriptions across devices.", comment: "Local")
+		footerLabel.text = NSLocalizedString("Local accounts do not sync your feeds across devices.", comment: "Local")
 	}
 
 	@IBAction func cancel(_ sender: Any) {
diff --git a/iOS/Account/NewsBlurAccountViewController.swift b/iOS/Account/NewsBlurAccountViewController.swift
index cabd73951..c0da15a3f 100644
--- a/iOS/Account/NewsBlurAccountViewController.swift
+++ b/iOS/Account/NewsBlurAccountViewController.swift
@@ -48,7 +48,7 @@ class NewsBlurAccountViewController: UITableViewController {
 	}
 	
 	private func setupFooter() {
-		footerLabel.text = NSLocalizedString("Sign in to your NewsBlur account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a NewsBlur account?", comment: "NewsBlur")
+		footerLabel.text = NSLocalizedString("Sign in to your NewsBlur account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a NewsBlur account?", comment: "NewsBlur")
 	}
 
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
diff --git a/iOS/Account/ReaderAPIAccountViewController.swift b/iOS/Account/ReaderAPIAccountViewController.swift
index 16432a797..b4789836b 100644
--- a/iOS/Account/ReaderAPIAccountViewController.swift
+++ b/iOS/Account/ReaderAPIAccountViewController.swift
@@ -72,16 +72,16 @@ class ReaderAPIAccountViewController: UITableViewController {
 	private func setupFooter() {
 		switch accountType {
 			case .bazQux:
-				footerLabel.text = NSLocalizedString("Sign in to your BazQux account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a BazQux account?", comment: "BazQux")
+				footerLabel.text = NSLocalizedString("Sign in to your BazQux account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a BazQux account?", comment: "BazQux")
 				signUpButton.setTitle(NSLocalizedString("Sign Up Here", comment: "BazQux SignUp"), for: .normal)
 			case .inoreader:
-				footerLabel.text = NSLocalizedString("Sign in to your InoReader account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an InoReader account?", comment: "InoReader")
+				footerLabel.text = NSLocalizedString("Sign in to your InoReader account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an InoReader account?", comment: "InoReader")
 				signUpButton.setTitle(NSLocalizedString("Sign Up Here", comment: "InoReader SignUp"), for: .normal)
 			case .theOldReader:
-				footerLabel.text = NSLocalizedString("Sign in to your The Old Reader account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a The Old Reader account?", comment: "TOR")
+				footerLabel.text = NSLocalizedString("Sign in to your The Old Reader account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a The Old Reader account?", comment: "TOR")
 				signUpButton.setTitle(NSLocalizedString("Sign Up Here", comment: "TOR SignUp"), for: .normal)
 			case .freshRSS:
-				footerLabel.text = NSLocalizedString("Sign in to your FreshRSS instance and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an FreshRSS instance?", comment: "FreshRSS")
+				footerLabel.text = NSLocalizedString("Sign in to your FreshRSS instance and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an FreshRSS instance?", comment: "FreshRSS")
 				signUpButton.setTitle(NSLocalizedString("Find Out More", comment: "FreshRSS SignUp"), for: .normal)
 			default:
 				return
diff --git a/iOS/Settings/AddAccountViewController.swift b/iOS/Settings/AddAccountViewController.swift
index 62588cad1..5b24a3ff9 100644
--- a/iOS/Settings/AddAccountViewController.swift
+++ b/iOS/Settings/AddAccountViewController.swift
@@ -38,13 +38,13 @@ class AddAccountViewController: UITableViewController, AddAccountDismissDelegate
 		var sectionFooter: String {
 			switch self {
 			case .local:
-				return NSLocalizedString("Local accounts do not sync your subscriptions across devices.", comment: "Local Account")
+				return NSLocalizedString("Local accounts do not sync your feeds across devices", comment: "Local Account")
 			case .icloud:
-				return NSLocalizedString("Use your iCloud account to sync your subscriptions across your iOS and macOS devices.", comment: "iCloud Account")
+				return NSLocalizedString("Your iCloud account syncs your feeds across your Mac and iOS devices", comment: "iCloud Account")
 			case .web:
-				return NSLocalizedString("Web accounts sync your subscriptions across all your devices.", comment: "Web Account")
+				return NSLocalizedString("Web accounts sync your feeds across all your devices", comment: "Web Account")
 			case .selfhosted:
-				return NSLocalizedString("Self-hosted accounts sync your subscriptions across all your devices.", comment: "Self hosted Account")
+				return NSLocalizedString("Self-hosted accounts sync your feeds across all your devices", comment: "Self hosted Account")
 			}
 		}
 		

From 0d0f1e4908c5a728992181ed41c6691cc4687bb0 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Mon, 31 May 2021 16:01:01 -0700
Subject: [PATCH 05/13] =?UTF-8?q?Replace=20=E2=80=9Cdon't=E2=80=9D=20with?=
 =?UTF-8?q?=20=E2=80=9Cdon=E2=80=99t=E2=80=9D=20everywhere.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Accounts/AccountsFeedWrangler.xib         | 30 +++++++--------
 Mac/Preferences/Accounts/AccountsFeedbin.xib  | 30 +++++++--------
 Mac/Preferences/Accounts/AccountsNewsBlur.xib | 30 +++++++--------
 .../Accounts/AccountsReaderAPI.xib            | 26 ++++++-------
 .../AccountsReaderAPIWindowController.swift   |  8 ++--
 .../AddFeedWranglerAccountView.swift          |  4 +-
 .../AddFeedbinAccountView.swift               |  4 +-
 .../AddFeedlyAccountView.swift                |  4 +-
 .../AddNewsBlurAccountView.swift              |  4 +-
 .../AddReaderAPIAccountView.swift             |  6 +--
 .../Advanced/AdvancedPreferencesView.swift    |  2 +-
 iOS/Account/Account.storyboard                | 38 +++++++++----------
 .../FeedWranglerAccountViewController.swift   |  2 +-
 .../FeedbinAccountViewController.swift        |  2 +-
 .../NewsBlurAccountViewController.swift       |  2 +-
 .../ReaderAPIAccountViewController.swift      |  8 ++--
 16 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/Mac/Preferences/Accounts/AccountsFeedWrangler.xib b/Mac/Preferences/Accounts/AccountsFeedWrangler.xib
index 603927549..e07cd2ef6 100644
--- a/Mac/Preferences/Accounts/AccountsFeedWrangler.xib
+++ b/Mac/Preferences/Accounts/AccountsFeedWrangler.xib
@@ -26,7 +26,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="433" height="249"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1536" height="935"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="433" height="249"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -35,7 +35,7 @@
                         <rect key="frame" x="217" y="229" width="0.0" height="0.0"/>
                     </stackView>
                     <gridView xPlacement="trailing" yPlacement="center" rowAlignment="none" rowSpacing="7" columnSpacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="zBB-JH-huI">
-                        <rect key="frame" x="80" y="127" width="270" height="49"/>
+                        <rect key="frame" x="80" y="126" width="270" height="49"/>
                         <rows>
                             <gridRow id="DRl-lC-vUc"/>
                             <gridRow id="eW8-uH-txq"/>
@@ -97,7 +97,7 @@
                         </gridCells>
                     </gridView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9mz-D9-krh">
-                        <rect key="frame" x="344" y="13" width="76" height="32"/>
+                        <rect key="frame" x="345" y="13" width="74" height="32"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="62" id="KMy-Qk-maN"/>
                         </constraints>
@@ -113,7 +113,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XAM-Hb-0Hw">
-                        <rect key="frame" x="270" y="13" width="76" height="32"/>
+                        <rect key="frame" x="263" y="13" width="82" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ufs-ar-BAY">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -136,27 +136,27 @@ Gw
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lti-yM-8LV">
                         <rect key="frame" x="78" y="213" width="337" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Sign in to your Feed Wrangler account." id="ras-dj-nP8">
-                            <font key="font" textStyle="headline" name=".SFNS-Bold"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xEl-Ae-5r8">
-                        <rect key="frame" x="78" y="193" width="216" height="15"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Don't have a Feed Wrangler account?" id="DFR-20-sjO">
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                        <rect key="frame" x="78" y="192" width="231" height="16"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Don’t have a Feed Wrangler account?" id="DFR-20-sjO">
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pPT-Cj-3vI">
-                        <rect key="frame" x="293" y="193" width="105" height="15"/>
+                        <rect key="frame" x="308" y="192" width="105" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="105" id="Ez2-gz-Wqf"/>
                         </constraints>
                         <buttonCell key="cell" type="roundRect" title="Create one here." bezelStyle="roundedRect" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="tlF-nc-ZOr">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                         </buttonCell>
                         <color key="contentTintColor" name="AccentColor"/>
                         <connections>
@@ -164,28 +164,28 @@ Gw
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Uzn-QS-o4p">
-                        <rect key="frame" x="78" y="73" width="337" height="39"/>
+                        <rect key="frame" x="78" y="72" width="337" height="39"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="39" id="99q-po-zLV"/>
                             <constraint firstAttribute="width" constant="333" id="oSi-jz-DZ8"/>
                         </constraints>
                         <textFieldCell key="cell" title="Your username and password will be encrypted and stored in Keychain. " id="83j-VH-GgC">
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <progressIndicator hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="B0W-bh-Evv">
-                        <rect key="frame" x="253" y="22" width="16" height="16"/>
+                        <rect key="frame" x="245" y="22" width="16" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="16" id="ggl-Gq-PUV"/>
                             <constraint firstAttribute="height" constant="16" id="m1z-4y-g41"/>
                         </constraints>
                     </progressIndicator>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zwG-Ag-z8o">
-                        <rect key="frame" x="78" y="60" width="337" height="14"/>
+                        <rect key="frame" x="78" y="57" width="337" height="16"/>
                         <textFieldCell key="cell" id="b2G-2g-1KR">
-                            <font key="font" textStyle="subheadline" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Mac/Preferences/Accounts/AccountsFeedbin.xib b/Mac/Preferences/Accounts/AccountsFeedbin.xib
index 4feda6662..3f748de28 100644
--- a/Mac/Preferences/Accounts/AccountsFeedbin.xib
+++ b/Mac/Preferences/Accounts/AccountsFeedbin.xib
@@ -26,7 +26,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="433" height="249"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1536" height="935"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="433" height="249"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -35,7 +35,7 @@
                         <rect key="frame" x="233" y="229" width="0.0" height="0.0"/>
                     </stackView>
                     <gridView xPlacement="trailing" yPlacement="center" rowAlignment="none" rowSpacing="7" columnSpacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="zBB-JH-huI">
-                        <rect key="frame" x="80" y="127" width="270" height="49"/>
+                        <rect key="frame" x="80" y="126" width="270" height="49"/>
                         <rows>
                             <gridRow id="DRl-lC-vUc"/>
                             <gridRow id="eW8-uH-txq"/>
@@ -97,7 +97,7 @@
                         </gridCells>
                     </gridView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9mz-D9-krh">
-                        <rect key="frame" x="344" y="13" width="76" height="32"/>
+                        <rect key="frame" x="345" y="13" width="74" height="32"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="62" id="hU1-wc-ebZ"/>
                         </constraints>
@@ -113,7 +113,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XAM-Hb-0Hw">
-                        <rect key="frame" x="270" y="13" width="76" height="32"/>
+                        <rect key="frame" x="271" y="13" width="74" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ufs-ar-BAY">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -136,39 +136,39 @@ Gw
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lti-yM-8LV">
                         <rect key="frame" x="78" y="213" width="337" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Sign in to your Feedbin account." id="ras-dj-nP8">
-                            <font key="font" textStyle="headline" name=".SFNS-Bold"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gEK-TH-URn">
-                        <rect key="frame" x="78" y="193" width="179" height="15"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Don't have a Feedbin account?" id="QF5-gl-fjb">
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                        <rect key="frame" x="78" y="192" width="191" height="16"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Don’t have a Feedbin account?" id="QF5-gl-fjb">
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X1Z-v1-T5L">
-                        <rect key="frame" x="78" y="82" width="337" height="30"/>
+                        <rect key="frame" x="78" y="81" width="337" height="30"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="30" id="NRl-GS-cHS"/>
                             <constraint firstAttribute="width" constant="333" id="cNd-Nt-bdB"/>
                         </constraints>
                         <textFieldCell key="cell" title="Your username and password will be encrypted and stored in Keychain. " id="HuQ-TS-tS3">
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MlB-jN-Ybe">
-                        <rect key="frame" x="254" y="193" width="105" height="15"/>
+                        <rect key="frame" x="266" y="192" width="105" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="105" id="fHd-fN-n8G"/>
                         </constraints>
                         <buttonCell key="cell" type="roundRect" title="Create one here." bezelStyle="roundedRect" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="fx3-Uk-NVw">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                         </buttonCell>
                         <color key="contentTintColor" name="AccentColor"/>
                         <connections>
@@ -176,16 +176,16 @@ Gw
                         </connections>
                     </button>
                     <progressIndicator hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="B0W-bh-Evv">
-                        <rect key="frame" x="253" y="22" width="16" height="16"/>
+                        <rect key="frame" x="253" y="23" width="16" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="16" id="Tcz-vj-cLr"/>
                             <constraint firstAttribute="height" constant="16" id="slt-7y-Jw0"/>
                         </constraints>
                     </progressIndicator>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sPC-hi-ewD">
-                        <rect key="frame" x="78" y="60" width="337" height="14"/>
+                        <rect key="frame" x="78" y="57" width="337" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" id="sl9-fG-jwg">
-                            <font key="font" textStyle="subheadline" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Mac/Preferences/Accounts/AccountsNewsBlur.xib b/Mac/Preferences/Accounts/AccountsNewsBlur.xib
index c098cffc3..63e11c430 100644
--- a/Mac/Preferences/Accounts/AccountsNewsBlur.xib
+++ b/Mac/Preferences/Accounts/AccountsNewsBlur.xib
@@ -26,7 +26,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="433" height="249"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1536" height="935"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="433" height="249"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -35,7 +35,7 @@
                         <rect key="frame" x="217" y="229" width="0.0" height="0.0"/>
                     </stackView>
                     <gridView xPlacement="trailing" yPlacement="center" rowAlignment="none" rowSpacing="7" columnSpacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="zBB-JH-huI">
-                        <rect key="frame" x="80" y="127" width="326" height="49"/>
+                        <rect key="frame" x="80" y="126" width="326" height="49"/>
                         <rows>
                             <gridRow id="DRl-lC-vUc"/>
                             <gridRow id="eW8-uH-txq"/>
@@ -97,7 +97,7 @@
                         </gridCells>
                     </gridView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9mz-D9-krh">
-                        <rect key="frame" x="347" y="13" width="76" height="32"/>
+                        <rect key="frame" x="348" y="13" width="74" height="32"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="62" id="stL-0v-emB"/>
                         </constraints>
@@ -113,7 +113,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XAM-Hb-0Hw">
-                        <rect key="frame" x="273" y="13" width="76" height="32"/>
+                        <rect key="frame" x="274" y="13" width="74" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ufs-ar-BAY">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -126,7 +126,7 @@ Gw
                         </connections>
                     </button>
                     <progressIndicator hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="B0W-bh-Evv">
-                        <rect key="frame" x="256" y="22" width="16" height="16"/>
+                        <rect key="frame" x="256" y="23" width="16" height="16"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="16" id="Cew-Vp-UKw"/>
                             <constraint firstAttribute="width" constant="16" id="P6W-hb-FGm"/>
@@ -143,21 +143,21 @@ Gw
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lti-yM-8LV">
                         <rect key="frame" x="78" y="213" width="330" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Sign in to your NewsBlur account." id="ras-dj-nP8">
-                            <font key="font" textStyle="headline" name=".SFNS-Bold"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yqn-od-aLJ">
-                        <rect key="frame" x="78" y="193" width="187" height="15"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Don't have a NewsBlur account?" id="fPs-Sh-GEf">
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                        <rect key="frame" x="78" y="192" width="200" height="16"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Don’t have a NewsBlur account?" id="fPs-Sh-GEf">
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9oE-Gq-qp7">
-                        <rect key="frame" x="264" y="193" width="105" height="15"/>
+                        <rect key="frame" x="277" y="193" width="105" height="15"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="105" id="Z91-fh-Mw5"/>
                         </constraints>
@@ -171,21 +171,21 @@ Gw
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OMB-u7-kzz">
-                        <rect key="frame" x="78" y="73" width="337" height="39"/>
+                        <rect key="frame" x="78" y="72" width="337" height="39"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="333" id="9Bx-xl-Lf4"/>
                             <constraint firstAttribute="height" constant="39" id="dYs-8A-ml0"/>
                         </constraints>
                         <textFieldCell key="cell" title="Your username and password will be encrypted and stored in Keychain. " id="VWI-0W-Duk">
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tFv-QN-zMA">
-                        <rect key="frame" x="78" y="60" width="337" height="14"/>
+                        <rect key="frame" x="78" y="57" width="337" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" id="yQ5-2h-Y9i">
-                            <font key="font" textStyle="subheadline" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -225,7 +225,7 @@ Gw
         </window>
     </objects>
     <resources>
-        <image name="accountNewsBlur" width="50" height="50"/>
+        <image name="accountNewsBlur" width="25" height="25"/>
         <namedColor name="AccentColor">
             <color red="0.030999999493360519" green="0.41600000858306885" blue="0.93300002813339233" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
diff --git a/Mac/Preferences/Accounts/AccountsReaderAPI.xib b/Mac/Preferences/Accounts/AccountsReaderAPI.xib
index 46b81d5b3..f9bc2ee3c 100644
--- a/Mac/Preferences/Accounts/AccountsReaderAPI.xib
+++ b/Mac/Preferences/Accounts/AccountsReaderAPI.xib
@@ -30,7 +30,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="433" height="275"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1536" height="935"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="433" height="275"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -39,7 +39,7 @@
                         <rect key="frame" x="217" y="255" width="0.0" height="0.0"/>
                     </stackView>
                     <gridView xPlacement="trailing" yPlacement="center" rowAlignment="none" rowSpacing="7" columnSpacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="zBB-JH-huI">
-                        <rect key="frame" x="80" y="125" width="270" height="77"/>
+                        <rect key="frame" x="80" y="124" width="270" height="77"/>
                         <rows>
                             <gridRow id="DRl-lC-vUc"/>
                             <gridRow id="eW8-uH-txq"/>
@@ -125,7 +125,7 @@
                         </gridCells>
                     </gridView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9mz-D9-krh">
-                        <rect key="frame" x="347" y="13" width="76" height="32"/>
+                        <rect key="frame" x="348" y="13" width="74" height="32"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="62" id="afy-Zh-DIy"/>
                         </constraints>
@@ -141,7 +141,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XAM-Hb-0Hw">
-                        <rect key="frame" x="273" y="13" width="76" height="32"/>
+                        <rect key="frame" x="274" y="13" width="74" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ufs-ar-BAY">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -171,21 +171,21 @@ Gw
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lti-yM-8LV">
                         <rect key="frame" x="78" y="239" width="337" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Sign in to a Reader API account." id="ras-dj-nP8">
-                            <font key="font" textStyle="headline" name=".SFNS-Bold"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="R8e-67-Bwh">
-                        <rect key="frame" x="78" y="219" width="174" height="15"/>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Don't have a Reader account?" id="ker-hu-FEc">
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                        <rect key="frame" x="78" y="218" width="186" height="16"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Don’t have a Reader account?" id="ker-hu-FEc">
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kUQ-aj-Iu6">
-                        <rect key="frame" x="251" y="220" width="99" height="13"/>
+                        <rect key="frame" x="263" y="220" width="99" height="13"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="13" id="NOr-5b-kRd"/>
                         </constraints>
@@ -199,21 +199,21 @@ Gw
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q5z-LG-0Fm">
-                        <rect key="frame" x="78" y="71" width="337" height="39"/>
+                        <rect key="frame" x="78" y="70" width="337" height="39"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="39" id="Zv4-mj-po0"/>
                             <constraint firstAttribute="width" constant="333" id="xsi-I6-XNM"/>
                         </constraints>
                         <textFieldCell key="cell" title="Your username and password will be encrypted and stored in Keychain. " id="Ec9-bB-tQz">
-                            <font key="font" textStyle="callout" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Gyz-Mz-v08">
-                        <rect key="frame" x="78" y="55" width="337" height="14"/>
+                        <rect key="frame" x="78" y="52" width="337" height="16"/>
                         <textFieldCell key="cell" id="AGV-EV-VmY">
-                            <font key="font" textStyle="subheadline" name=".SFNS-Regular"/>
+                            <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
index 85e79cb7e..bcbe8bfcc 100644
--- a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
+++ b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
@@ -41,23 +41,23 @@ class AccountsReaderAPIWindowController: NSWindowController {
 			case .freshRSS:
 				titleImageView.image = AppAssets.accountFreshRSS
 				titleLabel.stringValue = NSLocalizedString("Sign in to your FreshRSS account.", comment: "FreshRSS")
-				noAccountTextField.stringValue = NSLocalizedString("Don't have a FreshRSS instance?", comment: "No FreshRSS")
+				noAccountTextField.stringValue = NSLocalizedString("Don’t have a FreshRSS instance?", comment: "No FreshRSS")
 				createAccountButton.title = NSLocalizedString("Find out more", comment: "No FreshRSS Button")
 			case .inoreader:
 				titleImageView.image = AppAssets.accountInoreader
 				titleLabel.stringValue = NSLocalizedString("Sign in to your InoReader account.", comment: "InoReader")
 				gridView.row(at: 2).isHidden = true
-				noAccountTextField.stringValue = NSLocalizedString("Don't have an InoReader account?", comment: "No InoReader")
+				noAccountTextField.stringValue = NSLocalizedString("Don’t have an InoReader account?", comment: "No InoReader")
 			case .bazQux:
 				titleImageView.image = AppAssets.accountBazQux
 				titleLabel.stringValue = NSLocalizedString("Sign in to your BazQux account.", comment: "BazQux")
 				gridView.row(at: 2).isHidden = true
-				noAccountTextField.stringValue = NSLocalizedString("Don't have a BazQux account?", comment: "No BazQux")
+				noAccountTextField.stringValue = NSLocalizedString("Don’t have a BazQux account?", comment: "No BazQux")
 			case .theOldReader:
 				titleImageView.image = AppAssets.accountTheOldReader
 				titleLabel.stringValue = NSLocalizedString("Sign in to your The Old Reader account.", comment: "The Old Reader")
 				gridView.row(at: 2).isHidden = true
-				noAccountTextField.stringValue = NSLocalizedString("Don't have a The Old Reader account?", comment: "No OldReader")
+				noAccountTextField.stringValue = NSLocalizedString("Don’t have a The Old Reader account?", comment: "No OldReader")
 			default:
 				break
 			}
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift
index bc8788e79..5fe5d27c7 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift	
@@ -110,7 +110,7 @@ struct AddFeedWranglerAccountView: View {
 					Text("Sign in to your Feed Wrangler account.")
 						.font(.headline)
 					HStack {
-						Text("Don't have a Feed Wrangler account?")
+						Text("Don’t have a Feed Wrangler account?")
 							.font(.callout)
 						Button(action: {
 							model.presentSignUpOption(.feedWrangler)
@@ -192,7 +192,7 @@ struct AddFeedWranglerAccountView: View {
 			Spacer()
 			VStack(spacing: 8) {
 				Text("Sign in to your Feed Wrangler account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
-				Text("Don't have a Feed Wrangler account?").foregroundColor(.secondary)
+				Text("Don’t have a Feed Wrangler account?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(.feedWrangler)
 				}, label: {
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift
index 3832d5a41..dd33b6434 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift	
@@ -107,7 +107,7 @@ struct AddFeedbinAccountView: View {
 					Text("Sign in to your Feedbin account.")
 						.font(.headline)
 					HStack {
-						Text("Don't have a Feedbin account?")
+						Text("Don’t have a Feedbin account?")
 							.font(.callout)
 						Button(action: {
 							model.presentSignUpOption(.feedbin)
@@ -189,7 +189,7 @@ struct AddFeedbinAccountView: View {
 			Spacer()
 			VStack(spacing: 8) {
 				Text("Sign in to your Feedbin account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
-				Text("Don't have a Feedbin account?").foregroundColor(.secondary)
+				Text("Don’t have a Feedbin account?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(.feedbin)
 				}, label: {
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift
index 2b27b77ab..32f14553a 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift	
@@ -70,7 +70,7 @@ struct AddFeedlyAccountView: View {
 					Text("Sign in to your Feedly account.")
 						.font(.headline)
 					HStack {
-						Text("Don't have a Feedly account?")
+						Text("Don’t have a Feedly account?")
 							.font(.callout)
 						Button(action: {
 							model.presentSignUpOption(.feedly)
@@ -126,7 +126,7 @@ struct AddFeedlyAccountView: View {
 		HStack {
 			Spacer()
 			VStack(spacing: 8) {
-				Text("Sign in to your Feedly account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an Feedly account?").foregroundColor(.secondary)
+				Text("Sign in to your Feedly account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have an Feedly account?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(.feedly)
 				}, label: {
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift
index 76c3b9dfc..8f6c35b1c 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift	
@@ -107,7 +107,7 @@ struct AddNewsBlurAccountView: View {
 					Text("Sign in to your NewsBlur account.")
 						.font(.headline)
 					HStack {
-						Text("Don't have a NewsBlur account?")
+						Text("Don’t have a NewsBlur account?")
 							.font(.callout)
 						Button(action: {
 							model.presentSignUpOption(.newsBlur)
@@ -189,7 +189,7 @@ struct AddNewsBlurAccountView: View {
 			Spacer()
 			VStack(spacing: 8) {
 				Text("Sign in to your NewsBlur account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
-				Text("Don't have a NewsBlur account?").foregroundColor(.secondary)
+				Text("Don’t have a NewsBlur account?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(.newsBlur)
 				}, label: {
diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift
index 4cd2a7690..0d2f70c75 100644
--- a/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift	
+++ b/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift	
@@ -113,10 +113,10 @@ struct AddReaderAPIAccountView: View {
 						.font(.headline)
 					HStack {
 						if accountType == .freshRSS {
-							Text("Don't have a \(accountType.localizedAccountName()) instance?")
+							Text("Don’t have a \(accountType.localizedAccountName()) instance?")
 								.font(.callout)
 						} else {
-							Text("Don't have an \(accountType.localizedAccountName()) account?")
+							Text("Don’t have an \(accountType.localizedAccountName()) account?")
 								.font(.callout)
 						}
 						Button(action: {
@@ -222,7 +222,7 @@ struct AddReaderAPIAccountView: View {
 			Spacer()
 			VStack(spacing: 8) {
 				Text("Sign in to your \(accountType.localizedAccountName()) account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
-				Text("Don't have a \(accountType.localizedAccountName()) instance?").foregroundColor(.secondary)
+				Text("Don’t have a \(accountType.localizedAccountName()) instance?").foregroundColor(.secondary)
 				Button(action: {
 					model.presentSignUpOption(accountType)
 				}, label: {
diff --git a/Multiplatform/macOS/Preferences/Preference Panes/Advanced/AdvancedPreferencesView.swift b/Multiplatform/macOS/Preferences/Preference Panes/Advanced/AdvancedPreferencesView.swift
index abcecfaed..f065eeefb 100644
--- a/Multiplatform/macOS/Preferences/Preference Panes/Advanced/AdvancedPreferencesView.swift	
+++ b/Multiplatform/macOS/Preferences/Preference Panes/Advanced/AdvancedPreferencesView.swift	
@@ -16,7 +16,7 @@ struct AdvancedPreferencesView: View {
             Form {
                 Toggle("Check for app updates automatically", isOn: $preferences.checkForUpdatesAutomatically)
                 Toggle("Download Test Builds", isOn: $preferences.downloadTestBuilds)
-				Text("If you’re not sure, don't enable test builds. Test builds may have bugs, which may include crashing bugs and data loss.")
+				Text("If you’re not sure, don’t enable test builds. Test builds may have bugs, which may include crashing bugs and data loss.")
 					.foregroundColor(.secondary)
                 HStack {
                     Spacer()
diff --git a/iOS/Account/Account.storyboard b/iOS/Account/Account.storyboard
index cf932ae56..9f9b4def0 100644
--- a/iOS/Account/Account.storyboard
+++ b/iOS/Account/Account.storyboard
@@ -56,7 +56,7 @@
                                     <rect key="frame" x="20" y="8" width="373" height="78.5"/>
                                     <string key="text">Sign in to your Feed Wranger account to sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.
 
-Don't have a Feed Wrangler account?</string>
+Don’t have a Feed Wrangler account?</string>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                     <color key="textColor" systemColor="secondaryLabelColor"/>
                                     <nil key="highlightedColor"/>
@@ -90,7 +90,7 @@ Don't have a Feed Wrangler account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="o06-fe-i3S">
-                                                    <rect key="frame" x="20" y="11" width="520" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -110,12 +110,12 @@ Don't have a Feed Wrangler account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Z6i-nX-CwJ">
-                                                    <rect key="frame" x="20" y="11.5" width="470" height="21"/>
+                                                    <rect key="frame" x="20" y="11.5" width="284" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lBg-Pn-8ao">
-                                                    <rect key="frame" x="498" y="5.5" width="42" height="33"/>
+                                                    <rect key="frame" x="312" y="5.5" width="42" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
                                                     <connections>
@@ -258,7 +258,7 @@ Don't have a Feed Wrangler account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Name" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yl1-R6-xZi">
-                                                    <rect key="frame" x="20" y="11" width="520" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocapitalizationType="words"/>
                                                 </textField>
@@ -341,7 +341,7 @@ Don't have a Feed Wrangler account?</string>
                                     <rect key="frame" x="20" y="8" width="373" height="78.5"/>
                                     <string key="text">Sign in to your Feedbin account to sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.
 
-Don't have a Feedbin account?</string>
+Don’t have a Feedbin account?</string>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                     <color key="textColor" systemColor="secondaryLabelColor"/>
                                     <nil key="highlightedColor"/>
@@ -375,7 +375,7 @@ Don't have a Feedbin account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vJa-NN-yjR">
-                                                    <rect key="frame" x="20" y="11" width="520" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -395,12 +395,12 @@ Don't have a Feedbin account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="YC2-RH-QoV">
-                                                    <rect key="frame" x="20" y="11.5" width="470" height="21"/>
+                                                    <rect key="frame" x="20" y="11.5" width="284" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TfW-wf-V06">
-                                                    <rect key="frame" x="498" y="5.5" width="42" height="33"/>
+                                                    <rect key="frame" x="312" y="5.5" width="42" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
                                                     <connections>
@@ -522,7 +522,7 @@ Don't have a Feedbin account?</string>
                                     <rect key="frame" x="20" y="8" width="373" height="78.5"/>
                                     <string key="text">Sign in to your NewsBlur account to sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.
 
-Don't have a NewsBlur account?</string>
+Don’t have a NewsBlur account?</string>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                     <color key="textColor" systemColor="secondaryLabelColor"/>
                                     <nil key="highlightedColor"/>
@@ -556,7 +556,7 @@ Don't have a NewsBlur account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Username or Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="S4v-fs-DIO">
-                                                    <rect key="frame" x="20" y="11" width="520" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -576,12 +576,12 @@ Don't have a NewsBlur account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fct-XR-fEa">
-                                                    <rect key="frame" x="20" y="11.5" width="470" height="21"/>
+                                                    <rect key="frame" x="20" y="11.5" width="284" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GY9-nr-jFb">
-                                                    <rect key="frame" x="498" y="5.5" width="42" height="33"/>
+                                                    <rect key="frame" x="312" y="5.5" width="42" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
                                                     <connections>
@@ -687,7 +687,7 @@ Don't have a NewsBlur account?</string>
                                     <rect key="frame" x="20" y="8" width="373" height="46.5"/>
                                     <string key="text">Use your Reader account to sync your feeds across your devices.
 
-Don't have a Reader account?</string>
+Don’t have a Reader account?</string>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                     <color key="textColor" systemColor="secondaryLabelColor"/>
                                     <nil key="highlightedColor"/>
@@ -721,7 +721,7 @@ Don't have a Reader account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Username or Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="CZg-x8-936">
-                                                    <rect key="frame" x="14" y="11" width="533" height="22"/>
+                                                    <rect key="frame" x="14" y="11" width="347" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -741,12 +741,12 @@ Don't have a Reader account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KgN-kQ-Cyc">
-                                                    <rect key="frame" x="14" y="11.5" width="480" height="21"/>
+                                                    <rect key="frame" x="14" y="11.5" width="294" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cFF-qt-WLs">
-                                                    <rect key="frame" x="502" y="5.5" width="42" height="33"/>
+                                                    <rect key="frame" x="316" y="5.5" width="42" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
                                                     <connections>
@@ -772,7 +772,7 @@ Don't have a Reader account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="API URL" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iPv-M2-U8Q">
-                                                    <rect key="frame" x="14" y="11" width="530" height="22"/>
+                                                    <rect key="frame" x="14" y="11" width="340" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no" textContentType="url"/>
                                                 </textField>
@@ -796,7 +796,7 @@ Don't have a Reader account?</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7L9-X7-1Oc">
-                                                    <rect key="frame" x="10" y="-0.5" width="540" height="44.5"/>
+                                                    <rect key="frame" x="0.0" y="-0.5" width="374" height="44.5"/>
                                                     <state key="normal" title="Action"/>
                                                     <connections>
                                                         <action selector="action:" destination="MzG-hS-TpF" eventType="touchUpInside" id="d10-4f-ZUn"/>
diff --git a/iOS/Account/FeedWranglerAccountViewController.swift b/iOS/Account/FeedWranglerAccountViewController.swift
index f33beabf5..87595e431 100644
--- a/iOS/Account/FeedWranglerAccountViewController.swift
+++ b/iOS/Account/FeedWranglerAccountViewController.swift
@@ -48,7 +48,7 @@ class FeedWranglerAccountViewController: UITableViewController {
 	}
 	
 	private func setupFooter() {
-		footerLabel.text = NSLocalizedString("Sign in to your Feed Wrangler account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a Feed Wrangler account?", comment: "Feed Wrangler")
+		footerLabel.text = NSLocalizedString("Sign in to your Feed Wrangler account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have a Feed Wrangler account?", comment: "Feed Wrangler")
 	}
 
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
diff --git a/iOS/Account/FeedbinAccountViewController.swift b/iOS/Account/FeedbinAccountViewController.swift
index 30589390c..fbf0d6541 100644
--- a/iOS/Account/FeedbinAccountViewController.swift
+++ b/iOS/Account/FeedbinAccountViewController.swift
@@ -49,7 +49,7 @@ class FeedbinAccountViewController: UITableViewController {
 	}
 	
 	private func setupFooter() {
-		footerLabel.text = NSLocalizedString("Sign in to your Feedbin account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a Feedbin account?", comment: "Feedbin")
+		footerLabel.text = NSLocalizedString("Sign in to your Feedbin account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have a Feedbin account?", comment: "Feedbin")
 	}
 
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
diff --git a/iOS/Account/NewsBlurAccountViewController.swift b/iOS/Account/NewsBlurAccountViewController.swift
index c0da15a3f..e7ebf6e72 100644
--- a/iOS/Account/NewsBlurAccountViewController.swift
+++ b/iOS/Account/NewsBlurAccountViewController.swift
@@ -48,7 +48,7 @@ class NewsBlurAccountViewController: UITableViewController {
 	}
 	
 	private func setupFooter() {
-		footerLabel.text = NSLocalizedString("Sign in to your NewsBlur account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a NewsBlur account?", comment: "NewsBlur")
+		footerLabel.text = NSLocalizedString("Sign in to your NewsBlur account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have a NewsBlur account?", comment: "NewsBlur")
 	}
 
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
diff --git a/iOS/Account/ReaderAPIAccountViewController.swift b/iOS/Account/ReaderAPIAccountViewController.swift
index b4789836b..79d603b7e 100644
--- a/iOS/Account/ReaderAPIAccountViewController.swift
+++ b/iOS/Account/ReaderAPIAccountViewController.swift
@@ -72,16 +72,16 @@ class ReaderAPIAccountViewController: UITableViewController {
 	private func setupFooter() {
 		switch accountType {
 			case .bazQux:
-				footerLabel.text = NSLocalizedString("Sign in to your BazQux account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a BazQux account?", comment: "BazQux")
+				footerLabel.text = NSLocalizedString("Sign in to your BazQux account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have a BazQux account?", comment: "BazQux")
 				signUpButton.setTitle(NSLocalizedString("Sign Up Here", comment: "BazQux SignUp"), for: .normal)
 			case .inoreader:
-				footerLabel.text = NSLocalizedString("Sign in to your InoReader account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an InoReader account?", comment: "InoReader")
+				footerLabel.text = NSLocalizedString("Sign in to your InoReader account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have an InoReader account?", comment: "InoReader")
 				signUpButton.setTitle(NSLocalizedString("Sign Up Here", comment: "InoReader SignUp"), for: .normal)
 			case .theOldReader:
-				footerLabel.text = NSLocalizedString("Sign in to your The Old Reader account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a The Old Reader account?", comment: "TOR")
+				footerLabel.text = NSLocalizedString("Sign in to your The Old Reader account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have a The Old Reader account?", comment: "TOR")
 				signUpButton.setTitle(NSLocalizedString("Sign Up Here", comment: "TOR SignUp"), for: .normal)
 			case .freshRSS:
-				footerLabel.text = NSLocalizedString("Sign in to your FreshRSS instance and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an FreshRSS instance?", comment: "FreshRSS")
+				footerLabel.text = NSLocalizedString("Sign in to your FreshRSS instance and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have an FreshRSS instance?", comment: "FreshRSS")
 				signUpButton.setTitle(NSLocalizedString("Find Out More", comment: "FreshRSS SignUp"), for: .normal)
 			default:
 				return

From fdcffc4b740833a94ca6cb9c2fe7d2b0808ba073 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Mon, 31 May 2021 17:04:19 -0700
Subject: [PATCH 06/13] Bump version to 604. Add release notes.

---
 .../xcshareddata/swiftpm/Package.resolved             |  4 ++--
 Technotes/ReleaseNotes-iOS.markdown                   | 11 ++++++++++-
 .../common/NetNewsWire_ios_target_common.xcconfig     |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index d98ef98fd..67e8ddc2f 100644
--- a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/Ranchero-Software/RSParser.git",
         "state": {
           "branch": null,
-          "revision": "a4467cb6ab32d67fa8b09fcef8b234c7f96b7f9c",
-          "version": "2.0.0"
+          "revision": "7de3940c67a5fd128c8088eaa218617f2d3cc3ee",
+          "version": "2.0.2"
         }
       },
       {
diff --git a/Technotes/ReleaseNotes-iOS.markdown b/Technotes/ReleaseNotes-iOS.markdown
index 0054166eb..8102b5fd3 100644
--- a/Technotes/ReleaseNotes-iOS.markdown
+++ b/Technotes/ReleaseNotes-iOS.markdown
@@ -1,10 +1,19 @@
 # iOS Release Notes
 
+### 6.0 TestFlight build 604 - 31 May 2021
+
+This is a final candidate
+Updated about NetNewsWire section
+Fixed bug where Tweetbot share sheet could be empty
+Feedly: fixed bug where your custom name could get lost after moving a feed to a different folder
+Twitter: fixed bug handling tweets containing characters made up of multiple scalars
+iCloud: added explanation about when sync may be slow
+
 ### 6.0 TestFlight build 603 - 16 May 2021
 
 Feedly: handle Feedly API change with return value on deleting a folder
 NewsBlur: sync no longer includes items marked as hidden on NewsBlur
-FreshRSS: form for adding account now suggests endpoing URL
+FreshRSS: form for adding account now suggests endpoint URL
 FreshRSS: improved the error message for when the API URL can’t be found
 iCloud: retain existing feeds moved to a folder that doesn’t exist yet (sync ordering issue)
 Renamed a Delete Account button to Remove Account
diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
index e643a8230..bd062ed50 100644
--- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
+++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
@@ -1,7 +1,7 @@
 
 // High Level Settings common to both the iOS application and any extensions we bundle with it
 MARKETING_VERSION = 6.0
-CURRENT_PROJECT_VERSION = 603
+CURRENT_PROJECT_VERSION = 604
 
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon

From e4b837b614259510221f97ab84ff7324723d2f12 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 8 Jun 2021 12:04:14 -0500
Subject: [PATCH 07/13] Update to the latest RSCore. Fixes #3143

---
 .../xcshareddata/swiftpm/Package.resolved                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 67e8ddc2f..d1b0d534c 100644
--- a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/OAuthSwift/OAuthSwift.git",
         "state": {
           "branch": null,
-          "revision": "fde77955e6983fbfaabd491709d52b8a82fda4d0",
-          "version": "2.1.2"
+          "revision": "d85964b96dbce94df961f28b996187c835089903",
+          "version": "2.2.0"
         }
       },
       {
@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/Ranchero-Software/RSCore.git",
         "state": {
           "branch": null,
-          "revision": "665319af9428455e45c1d043156db85548b73f31",
-          "version": "1.0.5"
+          "revision": "2a13519b4d91843faa6aff4245b0e387dc64eafe",
+          "version": "1.0.6"
         }
       },
       {

From b27be9c8ea7eb7f9f79e872271f2f871ed7913d7 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 15 Jun 2021 16:35:29 -0500
Subject: [PATCH 08/13] Don't animate the Feeds rebuild when responding to the
 initial unread count initialization. Fixes #2985

---
 iOS/SceneCoordinator.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift
index edb8f31e3..7bc4b4037 100644
--- a/iOS/SceneCoordinator.swift
+++ b/iOS/SceneCoordinator.swift
@@ -436,7 +436,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 		guard notification.object is AccountManager else {
 			return
 		}
-		rebuildBackingStores()
+		rebuildBackingStores(initialLoad: true)
 		treeControllerDelegate.resetFilterExceptions()
 	}
 

From 29458fb03b5e72c91ab48fb10be05926925a815c Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 15 Jun 2021 21:33:23 -0500
Subject: [PATCH 09/13] Change to use destructive style on delete button. Fixes
 #3159

---
 iOS/MasterFeed/MasterFeedViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift
index 0e9a327b0..6233bf2b6 100644
--- a/iOS/MasterFeed/MasterFeedViewController.swift
+++ b/iOS/MasterFeed/MasterFeedViewController.swift
@@ -1318,7 +1318,7 @@ private extension MasterFeedViewController {
 		alertController.addAction(UIAlertAction(title: cancelTitle, style: .cancel))
 		
 		let deleteTitle = NSLocalizedString("Delete", comment: "Delete")
-		let deleteAction = UIAlertAction(title: deleteTitle, style: .default) { [weak self] action in
+		let deleteAction = UIAlertAction(title: deleteTitle, style: .destructive) { [weak self] action in
 			self?.delete(indexPath: indexPath, feedID: feedID)
 		}
 		alertController.addAction(deleteAction)

From 6a71da093801aed402ab0567b1e3eff65361159a Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 15 Jun 2021 21:12:19 -0700
Subject: [PATCH 10/13] Bump version to 605.

---
 xcconfig/common/NetNewsWire_ios_target_common.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
index bd062ed50..436d16bc0 100644
--- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
+++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
@@ -1,7 +1,7 @@
 
 // High Level Settings common to both the iOS application and any extensions we bundle with it
 MARKETING_VERSION = 6.0
-CURRENT_PROJECT_VERSION = 604
+CURRENT_PROJECT_VERSION = 605
 
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon

From 767f76892f9adaa5a8c54784944ca6360c063d45 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 17 Jun 2021 14:32:00 -0500
Subject: [PATCH 11/13] Fix the OAuthSwift package since the 2.2 version has
 trouble looking up credentials.

---
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 Secrets/Package.swift                                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index d1b0d534c..b58a85312 100644
--- a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/OAuthSwift/OAuthSwift.git",
         "state": {
           "branch": null,
-          "revision": "d85964b96dbce94df961f28b996187c835089903",
-          "version": "2.2.0"
+          "revision": "fde77955e6983fbfaabd491709d52b8a82fda4d0",
+          "version": "2.1.2"
         }
       },
       {
diff --git a/Secrets/Package.swift b/Secrets/Package.swift
index 2e30c6a8a..fdd6bc08a 100644
--- a/Secrets/Package.swift
+++ b/Secrets/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
             targets: ["Secrets"]),
     ],
     dependencies: [
-		.package(url: "https://github.com/OAuthSwift/OAuthSwift.git", .upToNextMajor(from: "2.1.2")),
+		.package(url: "https://github.com/OAuthSwift/OAuthSwift.git", .exact("2.1.2")),
     ],
     targets: [
         .target(

From 8be9bf6861f90ce439a1b0b8b0b1aeda92dcb8eb Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 20 Jun 2021 16:03:54 -0700
Subject: [PATCH 12/13] Update Help book URL.

---
 iOS/Settings/SettingsViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift
index 62ad0dda3..7cfc36d15 100644
--- a/iOS/Settings/SettingsViewController.swift
+++ b/iOS/Settings/SettingsViewController.swift
@@ -226,7 +226,7 @@ class SettingsViewController: UITableViewController {
 		case 7:
 			switch indexPath.row {
 			case 0:
-				openURL("https://netnewswire.com/help/ios/5.0/en/")
+				openURL("https://netnewswire.com/help/ios/6.0/en/")
 				tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
 			case 1:
 				openURL("https://netnewswire.com/")

From c18dbaa250bbc2d356d62c247f36815e38664bf3 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 20 Jun 2021 16:04:37 -0700
Subject: [PATCH 13/13] Update build number.

---
 xcconfig/common/NetNewsWire_ios_target_common.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
index bd062ed50..ef5675d42 100644
--- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
+++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
@@ -1,7 +1,7 @@
 
 // High Level Settings common to both the iOS application and any extensions we bundle with it
 MARKETING_VERSION = 6.0
-CURRENT_PROJECT_VERSION = 604
+CURRENT_PROJECT_VERSION = 606
 
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon