Update terminology to Subscribers from Followers

WordPress/Classes/Models/Notifications/Actions/Follow.swift

@@ -1,9 +1,9 @@
 /// Encapsulates logic to follow a blog
 final class Follow: DefaultNotificationActionCommand {
-    static let title = NSLocalizedString("Follow", comment: "Prompt to follow a blog.")
-    static let hint = NSLocalizedString("Follows the blog.", comment: "VoiceOver accessibility hint, informing the user the button can be used to follow a blog.")
-    static let selectedTitle = NSLocalizedString("Following", comment: "User is following the blog.")
-    static let selectedHint = NSLocalizedString("Unfollows the blog.", comment: "VoiceOver accessibility hint, informing the user the button can be used to unfollow a blog.")
+    static let title = NSLocalizedString("notifications.action.subscribe.title", value: "Subscribe", comment: "Prompt to subscribe to a blog.")
+    static let hint = NSLocalizedString("notifications.action.subscribe.hint", value: "Subscribe to the blog.", comment: "VoiceOver accessibility hint, informing the user the button can be used to subscribe to a blog.")
+    static let selectedTitle = NSLocalizedString("notifications.action.subscribe.selectedTitle", value: "Subscribed", comment: "User is subscribed to the blog.")
+    static let selectedHint = NSLocalizedString("notifications.action.subscribe.selectedHint", value: "Unsubscribe from the blog.", comment: "VoiceOver accessibility hint, informing the user the button can be used to unsubscribe from a blog.")
 
     override var actionTitle: String {
         return Follow.title

WordPress/Classes/Models/Notifications/NotificationSettings.swift

@@ -173,8 +173,9 @@ open class NotificationSettings {
                                             comment: "Setting: indicates if Comment Likes will be notified"),
             postLiked: NSLocalizedString("Likes on my posts",
                                          comment: "Setting: indicates if Replies to your comments will be notified"),
-            follower: NSLocalizedString("Site follows",
-                                        comment: "Setting: indicates if New Follows will be notified"),
+            follower: NSLocalizedString("notification.settings.description.subscriber",
+                                        value: "Site subscriptions",
+                                        comment: "Setting: indicates if New Subscriptions will be notified"),
             achievement: NSLocalizedString("Site achievements",
                                            comment: "Setting: indicates if Achievements will be notified"),
             mention: NSLocalizedString("Username mentions",

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayGeneralViewModel.swift

@@ -395,7 +395,7 @@ private extension JetpackFullscreenOverlayGeneralViewModel {
 
             enum Reader {
                 static let title = NSLocalizedString("jetpack.fullscreen.overlay.phaseOne.reader.title",
-                                                     value: "Follow any site with the Jetpack app",
+                                                     value: "Subscribe to any site with the Jetpack app",
                                                      comment: "Title of a screen displayed when the user accesses the Reader screen from the WordPress app. The screen showcases the Jetpack app.")
                 static let subtitle = NSLocalizedString("jetpack.fullscreen.overlay.phaseOne.reader.subtitle",
                                                      value: "Switch to the Jetpack app to find, follow, and like all your favorite sites and posts with Reader.",

WordPress/Classes/ViewRelated/NUX/UnifiedProloguePages.swift

@@ -19,7 +19,7 @@ enum UnifiedProloguePageType: CaseIterable {
         case .analytics:
             return NSLocalizedString("Watch your audience grow with in-depth analytics.", comment: "Caption displayed in promotional screens shown during the login flow.")
         case .reader:
-            return NSLocalizedString("Follow your favorite sites and discover new blogs.", comment: "Caption displayed in promotional screens shown during the login flow.")
+            return NSLocalizedString("prologue.title.reader", value: "Subscribe to your favorite sites and discover new blogs.", comment: "Caption displayed in promotional screens shown during the login flow.")
         }
     }
 }

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationSettingsViewController.swift

@@ -467,7 +467,7 @@ private extension NotificationSettingsViewController {
             case .blog:
                 return NSLocalizedString("Your Sites", comment: "Displayed in the Notification Settings View")
             case .followedSites:
-                return NSLocalizedString("Followed Sites", comment: "Displayed in the Notification Settings View")
+                return NSLocalizedString("notification.settings.header.subscribedSites", value: "Subscribed Sites", comment: "Displayed in the Notification Settings View")
             case .other:
                 return NSLocalizedString("Other", comment: "Displayed in the Notification Settings View")
             case .wordPressCom:
@@ -483,8 +483,8 @@ private extension NotificationSettingsViewController {
                 return NSLocalizedString("Customize your site settings for Likes, Comments, Follows, and more.",
                                          comment: "Notification Settings for your own blogs")
             case .followedSites:
-                return NSLocalizedString("Customize your followed site settings for New Posts and Comments",
-                                         comment: "Notification Settings for your followed sites")
+                return NSLocalizedString("notification.settings.footer.subscribedSites", value: "Customize your subscribed site settings for New Posts and Comments",
+                                         comment: "Notification Settings for your subscribed sites")
             case .other:
                 return nil
             case .wordPressCom:

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController/NotificationsViewController.swift

@@ -1835,7 +1835,7 @@ private extension NotificationsViewController {
             case .none:     return NSLocalizedString("All", comment: "Displays all of the Notifications, unfiltered")
             case .unread:   return NSLocalizedString("Unread", comment: "Filters Unread Notifications")
             case .comment:  return NSLocalizedString("Comments", comment: "Filters Comments Notifications")
-            case .follow:   return NSLocalizedString("Follows", comment: "Filters Follows Notifications")
+            case .follow:   return NSLocalizedString("notifications.filter.subscribers.title", value: "Subscribers", comment: "Filters Subscribers Notifications")
             case .like:     return NSLocalizedString("Likes", comment: "Filters Likes Notifications")
             }
         }
@@ -1855,7 +1855,7 @@ private extension NotificationsViewController {
             case .none:     return ""
             case .unread:   return NSLocalizedString("unread", comment: "Displayed in the confirmation alert when marking unread notifications as read.")
             case .comment:  return NSLocalizedString("comment", comment: "Displayed in the confirmation alert when marking comment notifications as read.")
-            case .follow:   return NSLocalizedString("follow", comment: "Displayed in the confirmation alert when marking follow notifications as read.")
+            case .follow:   return NSLocalizedString("notifications.filter.subscriptions.confirmationMessageTitle", value: "subscribe", comment: "Displayed in the confirmation alert when marking follow notifications as read.")
             case .like:     return NSLocalizedString("like", comment: "Displayed in the confirmation alert when marking like notifications as read.")
             }
         }
@@ -1868,8 +1868,8 @@ private extension NotificationsViewController {
                                                      comment: "Displayed in the Notifications Tab as a title, when the Unread Filter shows no unread notifications as a title")
             case .comment:  return NSLocalizedString("No comments yet",
                                                      comment: "Displayed in the Notifications Tab as a title, when the Comments Filter shows no notifications")
-            case .follow:   return NSLocalizedString("No followers yet",
-                                                     comment: "Displayed in the Notifications Tab as a title, when the Follow Filter shows no notifications")
+            case .follow:   return NSLocalizedString("notifications.noresults.subscribers", value: "No subscribers yet",
+                                                     comment: "Displayed in the Notifications Tab as a title, when the Subscriber Filter shows no notifications")
             case .like:     return NSLocalizedString("No likes yet",
                                                      comment: "Displayed in the Notifications Tab as a title, when the Likes Filter shows no notifications")
             }

WordPress/Classes/ViewRelated/Notifications/Style/WPStyleGuide+Notifications.swift

@@ -250,16 +250,16 @@ extension WPStyleGuide {
             button.contentEdgeInsets = UIEdgeInsets(top: 0, left: 4, bottom: 0, right: 0)
 
             // Strings
-            let normalText = NSLocalizedString("Follow", comment: "Prompt to follow a blog.")
-            let selectedText = NSLocalizedString("Following", comment: "User is following the blog.")
+            let normalText = NSLocalizedString("notifications.button.subscribe", value: "Subscribe", comment: "Prompt to subscribe to a blog.")
+            let selectedText = NSLocalizedString("notifications.button.subscribed", value: "Subscribed", comment: "User is subscribed to the blog.")
 
             button.setTitle(normalText, for: .normal)
             button.setTitle(selectedText, for: .selected)
             button.setTitle(selectedText, for: .highlighted)
 
             // Default accessibility label and hint.
             button.accessibilityLabel = normalText
-            button.accessibilityHint = NSLocalizedString("Follows the blog.", comment: "VoiceOver accessibility hint, informing the user the button can be used to follow a blog.")
+            button.accessibilityHint = NSLocalizedString("notifications.button.subscribedHint", value: "Subscribes to the blog.", comment: "VoiceOver accessibility hint, informing the user the button can be used to subscribe to a blog.")
         }
 
         // MARK: - Constants

WordPress/Classes/ViewRelated/Reader/ReaderFollowedSitesViewController.swift

@@ -455,7 +455,7 @@ extension ReaderFollowedSitesViewController: WPTableViewHandlerDelegate {
 
         let count = tableViewHandler.resultsController?.fetchedObjects?.count ?? 0
         if count > 0 {
-            return NSLocalizedString("Followed Sites", comment: "Section title for sites the user has followed.")
+            return NSLocalizedString("reader.followedSites.empty", value: "Subscribed Sites", comment: "Section title for sites the user has subscribed to.")
         }
         return nil
     }

WordPress/Classes/ViewRelated/Stats/Shared Views/GrowAudienceCell.swift

@@ -239,14 +239,14 @@ class GrowAudienceCell: UITableViewCell, NibLoadable {
         enum ReaderDiscover {
             static let detailsTitle = NSLocalizedString(
                 "growAudienceCell.readerDiscover.details",
-                value: "Connect with other bloggers by following, liking and commenting on their posts.",
+                value: "Connect with other bloggers by subscribing, liking and commenting on their posts.",
                 comment: "A detailed message to users about growing the audience for their site through reader discover."
             )
 
             static let actionButtonTitle = NSLocalizedString(
                 "growAudienceCell.readerDiscover.actionButton",
-                value: "Discover blogs to follow",
-                comment: "Title for button that will open up the follow topics screen."
+                value: "Discover blogs to subscribe",
+                comment: "Title for button that will open up the subscribe topics screen."
             )
 
             static let completedTipTitle = NSLocalizedString(