Merge beta 26.1.0.2 into trunk with conflicts resolution

Podfile

@@ -91,7 +91,7 @@ def shared_style_pods
 end
 
 def gutenberg_pods
-  gutenberg tag: 'v1.87.2'
+  gutenberg tag: 'v1.87.3'
 end
 
 def gutenberg(options)

WordPress/Classes/ViewRelated/Stats/Insights/Insights Management/InsightsManagementViewController.swift

@@ -192,7 +192,8 @@ class InsightsManagementViewController: UITableViewController {
     }
 
     private func promptToSave(from viewController: UIViewController?) {
-        let alert = UIAlertController(title: nil, message: TextContent.savePromptMessage, preferredStyle: .actionSheet)
+        let alertStyle: UIAlertController.Style = UIDevice.current.userInterfaceIdiom == .pad ? .alert : .actionSheet
+        let alert = UIAlertController(title: nil, message: TextContent.savePromptMessage, preferredStyle: alertStyle)
         alert.addAction(UIAlertAction(title: TextContent.savePromptSaveButton, style: .default, handler: { _ in
             self.saveTapped()
         }))

WordPress/JetpackDraftActionExtension/ar.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>حفظ كمسودة</string>
+    <key>CFBundleName</key>
+    <string>حفظ كمسودة</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/en-CA.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Save as Draft</string>
+    <key>CFBundleName</key>
+    <string>Save as Draft</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/en-GB.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Save as Draft</string>
+    <key>CFBundleName</key>
+    <string>Save as Draft</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/fr.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Enregistrer comme brouillon</string>
+    <key>CFBundleName</key>
+    <string>Enregistrer comme brouillon</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/he.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>לשמור כטיוטה</string>
+    <key>CFBundleName</key>
+    <string>לשמור כטיוטה</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/id.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Simpan sebagai Konsep</string>
+    <key>CFBundleName</key>
+    <string>Simpan sebagai Konsep</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/it.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Salva come Bozza</string>
+    <key>CFBundleName</key>
+    <string>Salva come Bozza</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/ja.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>下書きとして保存</string>
+    <key>CFBundleName</key>
+    <string>下書きとして保存</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/ko.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>임시글로 저장</string>
+    <key>CFBundleName</key>
+    <string>임시글로 저장</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/pl.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Zapisz jako szkic</string>
+    <key>CFBundleName</key>
+    <string>Zapisz jako szkic</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/zh-Hans.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>保存为草稿</string>
+    <key>CFBundleName</key>
+    <string>保存为草稿</string>
+  </dict>
 </plist>

WordPress/JetpackDraftActionExtension/zh-Hant.lproj/InfoPlist.strings

@@ -2,5 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--Warning: Auto-generated file, do not edit.-->
 <plist version="1.0">
-  <dict/>
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>儲存為草稿</string>
+    <key>CFBundleName</key>
+    <string>儲存為草稿</string>
+  </dict>
 </plist>

WordPress/Resources/ar.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2023-01-19 14:54:08+0000 */
+/* Translation-Revision-Date: 2023-01-31 21:54:25+0000 */
 /* Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5)))); */
 /* Generator: GlotPress/4.0.0-alpha.3 */
 /* Language: ar */
@@ -7035,6 +7035,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
    Title for the Skip button in the Site Name Screen. */
 "Skip" = "تخطي";
 
+/* Menu title to skip today's prompt. */
+"Skip for today" = "التخطي لهذا اليوم";
+
 /* translators: Slash inserter autocomplete results */
 "Slash inserter results" = "نتائج أداة إدراج الشرطة المائلة";
 
@@ -9702,6 +9705,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Customize Insights button title */
 "customizeInsightsCell.tryItButton.title" = "تجربة ذلك الآن";
 
+/* Search text that we fill when users taps the answers button on Daily Prompts Card to see answers from other people */
+"dailyprompts" = "المطالبات اليومية";
+
 /* No comment provided by engineer. */
 "double-tap to change unit" = "أنقر نقرًا مزدوجًا لتغيير الوحدة";
 
@@ -9821,6 +9827,12 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Footer text for Invite Links section of the Invite People screen. */
 "invite_people_invite_link_footer" = "استخدم هذا الرابط لضم أعضاء فريقك من دون دعوتهم واحدًا تلو الآخر. سيتمكن أي شخص يزور عنوان URL هذا من التسجيل في مؤسستك، حتى إذا تلقى الرابط من شخص آخر، لذا تأكَّد من مشاركته مع أشخاص موثوق بهم.";
 
+/* Name of the "Save as Draft" action as it should appear in the iOS Share Sheet when sharing content from other apps to Jetpack */
+"ios-jetpack-sharesheet.CFBundleDisplayName" = "حفظ كمسودة";
+
+/* Name of the "Save as Draft" action as it should appear in the iOS Share Sheet when sharing content from other apps to Jetpack. Must be less than 16 characters long. Typically the same text as CFBundleDisplayName, but could be shorter if needed. */
+"ios-jetpack-sharesheet.CFBundleName" = "حفظ كمسودة";
+
 /* Name of the "Save as Draft" action as it should appear in the iOS Share Sheet when sharing content from other apps to WordPress */
 "ios-sharesheet.CFBundleDisplayName" = "حفظ كمسودة";
 
@@ -9881,6 +9893,20 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Title of a button that displays a blog post in a web view. */
 "jetpack.fullscreen.overlay.learnMore" = "معرفة المزيد على jetpack.com";
 
+/* Description of the Notifications feature.
+   Description of the Reader feature.
+   Description of the Statistics feature. */
+"jetpack.fullscreen.overlay.newUsers.stats.subtitle" = "راقب الزيادة في حركة المرور لديك من خلال الرؤى المفيدة والإحصاءات الشاملة.";
+
+/* Name of the Statistics feature. */
+"jetpack.fullscreen.overlay.newUsers.stats.title" = "الإحصاءات والرؤى";
+
+/* Title of a screen that prompts the user to switch the Jetpack app. */
+"jetpack.fullscreen.overlay.newUsers.subtitle" = "يتيح لك Jetpack القيام بالمزيد من خلال موقع ووردبريس الخاص بك. التبديل مجاني، ولا يستغرق سوى بضع دقائق.";
+
+/* Title of a screen that prompts the user to switch the Jetpack app. */
+"jetpack.fullscreen.overlay.newUsers.title" = "تعزيز ووردبريس من خلال Jetpack";
+
 /* Title of a button that dismisses an overlay and displays the Notifications screen. */
 "jetpack.fullscreen.overlay.notifications.continue.title" = "المتابعة إلى التنبيهات";
 
@@ -9944,6 +9970,12 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Title of a button that dismisses an overlay and displays the Reader screen. */
 "jetpack.fullscreen.overlay.reader.continue.title" = "المتابعة إلى القارئ";
 
+/* Title of a screen that prompts the user to switch the Jetpack app. */
+"jetpack.fullscreen.overlay.selfHosted.subtitle" = "تم تصميم تطبيق Jetpack للهاتف المحمول للعمل إلى جانب إضافة Jetpack. قم بالتبديل الآن لكي تحظى بإمكانية الوصول إلى ميزات الإحصاءات والقارئ والتنبيهات والمزيد.";
+
+/* Title of a screen that prompts the user to switch the Jetpack app. */
+"jetpack.fullscreen.overlay.selfHosted.title" = "يتضمن موقعك إضافة Jetpack";
+
 /* Title of a button that navigates the user to the Jetpack app if installed, or to the app store. */
 "jetpack.fullscreen.overlay.siteCreation.continue.title" = "الاستمرار من دون Jetpack";
 
@@ -9965,6 +9997,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Title of a button that displays a blog post in a web view. */
 "jetpack.menuCard.learnMore" = "معرفة المزيد";
 
+/* Description inside a menu card prompting users to switch to the Jetpack app. */
+"jetpack.menuCard.newUsers.title" = "افتح إمكانات موقعك بالكامل. احصل على ميزات الإحصاءات والقارئ والتنبيهات والمزيد من خلال Jetpack.";
+
 /* Title of a button prompting users to switch to the Jetpack app. */
 "jetpack.menuCard.phaseFour.title" = "التبديل إلى Jetpack";
 
@@ -10190,6 +10225,45 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Share extension error dialog title. */
 "shareModularViewController.retryAlert.title" = "خطأ في المشاركة";
 
+/* Accessibility label used for distinguishing Views and Visitors in the Stats → Insights Views Visitors Line chart. */
+"stats.insights.accessibility.label.viewsVisitorsLastDays" = "آخر 7 أيام";
+
+/* Accessibility label used for distinguishing Views and Visitors in the Stats → Insights Views Visitors Line chart. */
+"stats.insights.accessibility.label.viewsVisitorsPreviousDays" = "الأيام الـ 7 السابقة";
+
+/* Label shown on some metrics in the Stats Insights section, such as Comments count. The placeholders will be populated with a change and a percentage – e.g. '+17 (40%) higher than the previous 7-days'. The *s mark the numerical values, which will be highlighted differently from the rest of the text. */
+"stats.insights.label.totalLikes.higher" = "*%1$@%2$@ (%3$@%%)* أعلى من الأيام الـ 7 السابقة";
+
+/* Label shown on some metrics in the Stats Insights section, such as Comments count. The placeholders will be populated with a change and a percentage – e.g. '-17 (40%) lower than the previous 7-days'. The *s mark the numerical values, which will be highlighted differently from the rest of the text. */
+"stats.insights.label.totalLikes.lower" = "*%1$@%2$@ (%3$@%%)* أقل من الأيام الـ 7 السابقة";
+
+/* Label shown in Stats Insights when a metric is showing the same level as the previous 7 days */
+"stats.insights.label.totalLikes.same" = "مثل الأيام الـ 7 السابقة";
+
+/* Stats insights views higher than previous 7 days */
+"stats.insights.label.views.sevenDays.higher" = "إن عروضك في آخر 7 أيام أعلى بنسبة %@ من الأيام الـ 7 السابقة.\n";
+
+/* Stats insights views lower than previous 7 days */
+"stats.insights.label.views.sevenDays.lower" = "إن عروضك في آخر 7 أيام أقل بنسبة %@ من الأيام الـ 7 السابقة.\n";
+
+/* Stats insights label shown when the user's view count is the same as the previous 7 days. */
+"stats.insights.label.views.sevenDays.same" = "إن عروضك في آخر 7 أيام هي نفسها في الأيام الـ 7 السابقة.\n";
+
+/* Last 7-days legend label */
+"stats.insights.label.viewsVisitorsLastDays" = "آخر 7 أيام";
+
+/* Previous 7-days legend label */
+"stats.insights.label.viewsVisitorsPreviousDays" = "الأيام الـ 7 السابقة";
+
+/* Stats insights visitors higher than previous 7 days */
+"stats.insights.label.visitors.sevenDays.higher" = "إن زائريك في آخر 7 أيام أعلى بنسبة %@ من الأيام الـ 7 السابقة.\n";
+
+/* Stats insights visitors lower than previous 7 days */
+"stats.insights.label.visitors.sevenDays.lower" = "إن زائريك في آخر 7 أيام أقل بنسبة %@ من الأيام الـ 7 السابقة.\n";
+
+/* Stats insights label shown when the user's visitor count is the same as the previous 7 days. */
+"stats.insights.label.visitors.sevenDays.same" = "إن زائريك في آخر 7 أيام نفس الزائرين في الأيام الـ 7 السابقة.\n";
+
 /* Title for Comments count in Latest Post Summary stats card. */
 "stats.insights.latestPostSummary.comments" = "التعليقات";