Skip to content

Commit 49311b9

Browse files
mokagiomokagio
authored
Merge finalized release 21.6 with conflicts resolution (#20062)
2 parents 55b43d9 + 7418ddb commit 49311b9

File tree

71 files changed

+1975
-50
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1975
-50
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ class InsightsManagementViewController: UITableViewController {
192192
}
193193

194194
private func promptToSave(from viewController: UIViewController?) {
195-
let alert = UIAlertController(title: nil, message: TextContent.savePromptMessage, preferredStyle: .actionSheet)
195+
let alertStyle: UIAlertController.Style = UIDevice.current.userInterfaceIdiom == .pad ? .alert : .actionSheet
196+
let alert = UIAlertController(title: nil, message: TextContent.savePromptMessage, preferredStyle: alertStyle)
196197
alert.addAction(UIAlertAction(title: TextContent.savePromptSaveButton, style: .default, handler: { _ in
197198
self.saveTapped()
198199
}))

‎WordPress/JetpackDraftActionExtension/ar.lproj/InfoPlist.strings‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<!--Warning: Auto-generated file, do not edit.-->
44
<plist version="1.0">
5-
<dict/>
5+
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>حفظ كمسودة</string>
8+
<key>CFBundleName</key>
9+
<string>حفظ كمسودة</string>
10+
</dict>
611
</plist>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<!--Warning: Auto-generated file, do not edit.-->
44
<plist version="1.0">
5-
<dict/>
5+
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>Save as Draft</string>
8+
<key>CFBundleName</key>
9+
<string>Save as Draft</string>
10+
</dict>
611
</plist>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<!--Warning: Auto-generated file, do not edit.-->
44
<plist version="1.0">
5-
<dict/>
5+
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>Save as Draft</string>
8+
<key>CFBundleName</key>
9+
<string>Save as Draft</string>
10+
</dict>
611
</plist>

‎WordPress/JetpackDraftActionExtension/fr.lproj/InfoPlist.strings‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<!--Warning: Auto-generated file, do not edit.-->
44
<plist version="1.0">
5-
<dict/>
5+
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>Enregistrer comme brouillon</string>
8+
<key>CFBundleName</key>
9+
<string>Enregistrer comme brouillon</string>
10+
</dict>
611
</plist>

‎WordPress/JetpackDraftActionExtension/he.lproj/InfoPlist.strings‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<!--Warning: Auto-generated file, do not edit.-->
44
<plist version="1.0">
5-
<dict/>
5+
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>לשמור כטיוטה</string>
8+
<key>CFBundleName</key>
9+
<string>לשמור כטיוטה</string>
10+
</dict>
611
</plist>

‎WordPress/JetpackDraftActionExtension/id.lproj/InfoPlist.strings‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<!--Warning: Auto-generated file, do not edit.-->
44
<plist version="1.0">
5-
<dict/>
5+
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>Simpan sebagai Konsep</string>
8+
<key>CFBundleName</key>
9+
<string>Simpan sebagai Konsep</string>
10+
</dict>
611
</plist>

‎WordPress/JetpackDraftActionExtension/it.lproj/InfoPlist.strings‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<!--Warning: Auto-generated file, do not edit.-->
44
<plist version="1.0">
5-
<dict/>
5+
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>Salva come Bozza</string>
8+
<key>CFBundleName</key>
9+
<string>Salva come Bozza</string>
10+
</dict>
611
</plist>

‎WordPress/JetpackDraftActionExtension/ja.lproj/InfoPlist.strings‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<!--Warning: Auto-generated file, do not edit.-->
44
<plist version="1.0">
5-
<dict/>
5+
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>下書きとして保存</string>
8+
<key>CFBundleName</key>
9+
<string>下書きとして保存</string>
10+
</dict>
611
</plist>

‎WordPress/JetpackDraftActionExtension/ko.lproj/InfoPlist.strings‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<!--Warning: Auto-generated file, do not edit.-->
44
<plist version="1.0">
5-
<dict/>
5+
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>임시글로 저장</string>
8+
<key>CFBundleName</key>
9+
<string>임시글로 저장</string>
10+
</dict>
611
</plist>

0 commit comments

Comments
 (0)