Merge beta 19.7.0.2 into trunk

[mokagio]

Includes:

• Fix Site Name screen layout on smaller iPhones by @Gio2018
• Mobile Gutenberg 1.74.1 by @geriux – Notice that this is an Android-only hotfix, which was integrated in here for consistency only
• A non-user facing release tooling update by @AliSoftware

---

Got a conflicts in WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift because:

• 0caf937 changed it on trunk
• 3be617f changed in on release/19.7

The commit on trunk was older (by one day) but the code it results with seems better to me because it doesn't use arbitrary emojis as delimiters for the selected site name.

I ensured the app built, but did not run the tests locally or manually verified the how the screen where SiteNameView is used renders.

The conflict was:

diff --cc WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift
index 28af882df1,85375f6e2b..0000000000
--- a/WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift
+++ b/WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift
@@@ -144,15 -142,11 +144,23 @@@ private extension SiteNameView

      /// Highlghts the site name in blue
      func setupTitleColors() {
++<<<<<<< HEAD
 +        // enclose the vertical name between two characters that are not in the title
 +        // (and reasonably never will..) to distinguish it from any substring in the title
 +        let selectedVerticalName = "😎" + siteVerticalName + "🙃"
 +        let fullTitle = String(format: TextContent.title, selectedVerticalName)
 +        var attributedTitle = NSMutableAttributedString(string: fullTitle)
 +        // Use default title if the vertical name is empty or too long
 +        guard let range = fullTitle.nsRange(of: selectedVerticalName),
 +              !siteVerticalName.isEmpty,
 +              siteVerticalName.count <= Metrics.verticalNameDisplayLimit else {
++=======
+         // find the index where the vertical name goes, so that it won't be confused
+         // with any word in the title
+         let replacementIndex = NSString(string: TextContent.title).range(of: "%@")
+
+         guard !siteVerticalName.isEmpty, replacementIndex.length > 0 else {
++>>>>>>> origin/trunk
              titleLabel.setText(TextContent.defaultTitle)
              return
          }

@Gio2018 can you take a look at my conflicts resolution and validate it was correct? Thanks!

---

Update: While waiting for feedback, this PR got conflicts with trunk. 0fe4b03 resolves them. They were the usual Gutenberg hotfix vs stable conflicts. Please refer to the commit message for more details.

[peril-wordpress-mobile]

	Messages
📖	This PR has the 'Releases' label: some checks will be skipped.

Generated by 🚫 dangerJS

[wpmobilebot]

You can test the changes in Jetpack from this Pull Request by:

• Clicking here or scanning the QR code below to access App Center
• Then installing the build number pr18463-0fe4b03 on your iPhone

If you need access to App Center, please ask a maintainer to add you.

[wpmobilebot]

You can test the changes in WordPress from this Pull Request by:

• Clicking here or scanning the QR code below to access App Center
• Then installing the build number pr18463-0fe4b03 on your iPhone

If you need access to App Center, please ask a maintainer to add you.

[mokagio]

This pair of removed and added key is a result of the change from this commit. Same for all the other locales.

[mokagio]

The previous version had the wrong % character which wouldn't have worked in String(format:).

[AliSoftware]

Properly flagged by the linter, I presume?

[mokagio]

• Updates to the localization files (.strings and Fastlane metadata) automatically pulled for the new translations that have already been approved in GlotPress
• Version update in .xcconfig
• Diffs from the PRs that made it into this beta

[AliSoftware]

On the release management side of things (.strings updates, version bump in xcconfig etc) all looks good 👍

But I'll leave the honor of approving (or not) to @Gio2018 so he can double check and validate the conflict resolution is correct

[twstokes]

👋 @mokagio your conflict resolution looks good to me as it matches the comment here that initiated it. 👍

[mokagio]

I'm going to consider @twstokes and @AliSoftware 's comments a combined approval and admin-merge this PR ask for someone else to approve because I can't admin-merge onto trunk.