From ae81ecaa21e162471a99f1eafef5cfcf3f887e88 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Sun, 4 Feb 2024 23:08:18 +0000 Subject: [PATCH 01/10] Bump version number --- config/Version.internal.xcconfig | 4 ++-- config/Version.public.xcconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/Version.internal.xcconfig b/config/Version.internal.xcconfig index a4cb02074ad7..f48257a3dd29 100644 --- a/config/Version.internal.xcconfig +++ b/config/Version.internal.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 24.1.0.20240201 -VERSION_SHORT = 24.1 +VERSION_LONG = 24.2.0.20240204 +VERSION_SHORT = 24.2 diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig index b7d7f6a4f15f..e9c25971bcc2 100644 --- a/config/Version.public.xcconfig +++ b/config/Version.public.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 24.1.0.3 -VERSION_SHORT = 24.1 +VERSION_LONG = 24.2.0.0 +VERSION_SHORT = 24.2 From 136cdb99e205625ea81abde207ea28d60a758e9c Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Sun, 4 Feb 2024 23:08:18 +0000 Subject: [PATCH 02/10] Update draft release notes for 24.2. --- WordPress/Resources/release_notes.txt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/WordPress/Resources/release_notes.txt b/WordPress/Resources/release_notes.txt index 82d5f86580ee..bfa61dcac8a7 100644 --- a/WordPress/Resources/release_notes.txt +++ b/WordPress/Resources/release_notes.txt @@ -1,14 +1,5 @@ -You’ll now see a notification when you’re working offline. Media uploads to image blocks will also pause when your internet connection cuts out, then resume when you reconnect. -As an added bonus, when you manually retry a failed media upload, the app will retry all other failed media uploads in your post. Now that’s efficient. +* [**] Prevent images from temporarily disappearing when uploading media [https://github.com/WordPress/gutenberg/pull/57869] +* [**] Fix crash occurring on large post on Android [https://github.com/WordPress/gutenberg/pull/58266] +* [*] [Jetpack-only] Site Monitoring: Add Metrics, PHP Logs, and Web Server Logs under Site Monitoring [#22475, #22499, #22504, #22500] +* [***] [Jetpack-only] Reader: introduced new UI/UX for content navigation and filtering [#22536] -When you select a custom gradient in the block editor, there’s now an indicator to show your chosen color. - -Scrolling through your images on the Site Media details screen will make them load ahead of time for a faster experience. Or maybe they were there all along. - -We added support for higher-resolution thumbnails, GIF and video playback, documents, and other file previews. (homer-simpson-woohoo.gif) - -We switched up the publishing flow to give you clearer instructions. Users with the “Contributor” role will see the “Submit for Review” action instead of “Publish.” You can also trash draft posts and deleted posts without having to confirm. - -There’s now a “Share” action in the site context menu so you can share your site with others. - -Finally, because we live for the applause, we improved the in-app rating prompt. You’ll be asked to leave a review if you’re happy with the app, or given a feedback form if you feel the app needs work. Feedback is how we get better, so feel free to share yours! From 8af46caefa83b3b9bc2e0df72aec8345fa46c322 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Sun, 4 Feb 2024 23:08:18 +0000 Subject: [PATCH 03/10] Update draft release notes for 24.2. --- WordPress/Jetpack/Resources/release_notes.txt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/WordPress/Jetpack/Resources/release_notes.txt b/WordPress/Jetpack/Resources/release_notes.txt index 82d5f86580ee..bfa61dcac8a7 100644 --- a/WordPress/Jetpack/Resources/release_notes.txt +++ b/WordPress/Jetpack/Resources/release_notes.txt @@ -1,14 +1,5 @@ -You’ll now see a notification when you’re working offline. Media uploads to image blocks will also pause when your internet connection cuts out, then resume when you reconnect. -As an added bonus, when you manually retry a failed media upload, the app will retry all other failed media uploads in your post. Now that’s efficient. +* [**] Prevent images from temporarily disappearing when uploading media [https://github.com/WordPress/gutenberg/pull/57869] +* [**] Fix crash occurring on large post on Android [https://github.com/WordPress/gutenberg/pull/58266] +* [*] [Jetpack-only] Site Monitoring: Add Metrics, PHP Logs, and Web Server Logs under Site Monitoring [#22475, #22499, #22504, #22500] +* [***] [Jetpack-only] Reader: introduced new UI/UX for content navigation and filtering [#22536] -When you select a custom gradient in the block editor, there’s now an indicator to show your chosen color. - -Scrolling through your images on the Site Media details screen will make them load ahead of time for a faster experience. Or maybe they were there all along. - -We added support for higher-resolution thumbnails, GIF and video playback, documents, and other file previews. (homer-simpson-woohoo.gif) - -We switched up the publishing flow to give you clearer instructions. Users with the “Contributor” role will see the “Submit for Review” action instead of “Publish.” You can also trash draft posts and deleted posts without having to confirm. - -There’s now a “Share” action in the site context menu so you can share your site with others. - -Finally, because we live for the applause, we improved the in-app rating prompt. You’ll be asked to leave a review if you’re happy with the app, or given a feedback form if you feel the app needs work. Feedback is how we get better, so feel free to share yours! From 09111403980bb5e210f97f412ef473935905c2e4 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Sun, 4 Feb 2024 23:08:18 +0000 Subject: [PATCH 04/10] Release Notes: add new section for next version (24.3) --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 4e3755bc8a97..c22c67bb3096 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,3 +1,7 @@ +24.3 +----- + + 24.2 ----- * [**] Prevent images from temporarily disappearing when uploading media [https://github.com/WordPress/gutenberg/pull/57869] From 6e2911334cb2bb5502ac2d0c6c2108b739b783f9 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 5 Feb 2024 11:04:09 +1100 Subject: [PATCH 05/10] Remove Jetpack-only entries from WordPress 24.2 raw release notes --- WordPress/Resources/release_notes.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/WordPress/Resources/release_notes.txt b/WordPress/Resources/release_notes.txt index bfa61dcac8a7..69e0beef6eb3 100644 --- a/WordPress/Resources/release_notes.txt +++ b/WordPress/Resources/release_notes.txt @@ -1,5 +1 @@ * [**] Prevent images from temporarily disappearing when uploading media [https://github.com/WordPress/gutenberg/pull/57869] -* [**] Fix crash occurring on large post on Android [https://github.com/WordPress/gutenberg/pull/58266] -* [*] [Jetpack-only] Site Monitoring: Add Metrics, PHP Logs, and Web Server Logs under Site Monitoring [#22475, #22499, #22504, #22500] -* [***] [Jetpack-only] Reader: introduced new UI/UX for content navigation and filtering [#22536] - From 2b1bb07e11de5497d62033fa46f5714019c313ba Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 5 Feb 2024 11:04:32 +1100 Subject: [PATCH 06/10] Remove Jetpack-only labels from Jetpack 24.2 raw release notes --- WordPress/Jetpack/Resources/release_notes.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/WordPress/Jetpack/Resources/release_notes.txt b/WordPress/Jetpack/Resources/release_notes.txt index bfa61dcac8a7..50d70d42670e 100644 --- a/WordPress/Jetpack/Resources/release_notes.txt +++ b/WordPress/Jetpack/Resources/release_notes.txt @@ -1,5 +1,3 @@ * [**] Prevent images from temporarily disappearing when uploading media [https://github.com/WordPress/gutenberg/pull/57869] -* [**] Fix crash occurring on large post on Android [https://github.com/WordPress/gutenberg/pull/58266] -* [*] [Jetpack-only] Site Monitoring: Add Metrics, PHP Logs, and Web Server Logs under Site Monitoring [#22475, #22499, #22504, #22500] -* [***] [Jetpack-only] Reader: introduced new UI/UX for content navigation and filtering [#22536] - +* [*] Site Monitoring: Add Metrics, PHP Logs, and Web Server Logs under Site Monitoring [#22475, #22499, #22504, #22500] +* [***] Reader: introduced new UI/UX for content navigation and filtering [#22536] From ade7dc78e28c7faa114c8e596f225d3337a22291 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 5 Feb 2024 11:59:30 +1100 Subject: [PATCH 07/10] Use latest stable versions of internal pods for release 24.2 --- Podfile | 8 ++++---- Podfile.lock | 30 ++++++++++-------------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/Podfile b/Podfile index ba5d84a60782..661eafcc3d82 100644 --- a/Podfile +++ b/Podfile @@ -50,8 +50,8 @@ def wordpress_ui end def wordpress_kit - # pod 'WordPressKit', '~> 12.0' - pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: 'ce6b99a' + pod 'WordPressKit', '~> 13.0' + # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: '' # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: '' # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: '' # pod 'WordPressKit', path: '../WordPressKit-iOS' @@ -140,8 +140,8 @@ abstract_target 'Apps' do pod 'NSURL+IDN', '~> 0.4' - # pod 'WordPressAuthenticator', '~> 9.0' - pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: '2eb1d76a86435401e4c741c23e6accf8608ea' + pod 'WordPressAuthenticator', '~> 9.0' + # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: '' # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: '' # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS' diff --git a/Podfile.lock b/Podfile.lock index aa9734fce907..39473f7a36f7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -63,14 +63,14 @@ PODS: - WordPress-Aztec-iOS (1.19.9) - WordPress-Editor-iOS (1.19.9): - WordPress-Aztec-iOS (= 1.19.9) - - WordPressAuthenticator (9.0.0): + - WordPressAuthenticator (9.0.1): - Gridicons (~> 1.0) - "NSURL+IDN (= 0.4)" - SVProgressHUD (~> 2.2.5) - - WordPressKit (~> 12.0) + - WordPressKit (~> 13.0) - WordPressShared (~> 2.1-beta) - WordPressUI (~> 1.7-beta) - - WordPressKit (12.0.0): + - WordPressKit (13.0.0): - Alamofire (~> 4.8.0) - NSObject-SafeExpectations (~> 0.0.4) - UIDeviceIdentifier (~> 2.0) @@ -119,8 +119,8 @@ DEPENDENCIES: - SVProgressHUD (= 2.2.5) - SwiftLint (~> 0.50) - WordPress-Editor-iOS (~> 1.19.9) - - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `2eb1d76a86435401e4c741c23e6accf8608ea`) - - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `ce6b99a`) + - WordPressAuthenticator (~> 9.0) + - WordPressKit (~> 13.0) - WordPressShared (~> 2.3) - WordPressUI (~> 1.15) - ZendeskSupportSDK (= 5.3.0) @@ -128,6 +128,8 @@ DEPENDENCIES: SPEC REPOS: https://github.com/wordpress-mobile/cocoapods-specs.git: + - WordPressAuthenticator + - WordPressKit - WordPressShared trunk: - Alamofire @@ -174,23 +176,11 @@ EXTERNAL SOURCES: :tag: 0.2.0 Gutenberg: :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0.podspec - WordPressAuthenticator: - :commit: 2eb1d76a86435401e4c741c23e6accf8608ea - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - WordPressKit: - :commit: ce6b99a - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git CHECKOUT OPTIONS: FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 - WordPressAuthenticator: - :commit: 2eb1d76a86435401e4c741c23e6accf8608ea - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - WordPressKit: - :commit: ce6b99a - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git SPEC CHECKSUMS: Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3 @@ -222,8 +212,8 @@ SPEC CHECKSUMS: UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17 WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef - WordPressAuthenticator: ce9688b78d71e296ea54159c4eef3a1ea5cc1838 - WordPressKit: 25452ae322f6fcb605f816caec2ff8ac707c7d9d + WordPressAuthenticator: 0891ba77c788044d32fe67a4d0435fdd598cecbd + WordPressKit: 5eb7d27d27f84e875266a72281d0a4b80c825b74 WordPressShared: cad7777b283d3ce2752f283df587342a581cd49b WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06 wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd @@ -236,6 +226,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced -PODFILE CHECKSUM: 0605bcba67cd378ea72a187ece8495fed6186712 +PODFILE CHECKSUM: c868f21bd823e9a921d4cdc9b5f883500f77405e COCOAPODS: 1.14.2 From 7e2986cb5204b7df14922bd9b629229d729f3674 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 5 Feb 2024 12:00:33 +1100 Subject: [PATCH 08/10] Routine release-toolkit update. From 9.3.0 to 9.4.0 --- Gemfile.lock | 92 +++++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 41 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f708300062d7..c7ba2b33afad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,10 +16,15 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.8) + activesupport (7.1.3) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) @@ -30,22 +35,24 @@ GEM ast (2.4.2) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.865.0) - aws-sdk-core (3.190.0) + aws-partitions (1.887.0) + aws-sdk-core (3.191.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.74.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-kms (1.77.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.141.0) - aws-sdk-core (~> 3, >= 3.189.0) + aws-sdk-s3 (1.143.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.2.0) + bigdecimal (3.1.6) buildkit (1.5.0) sawyer (>= 0.6) chroma (0.2.0) @@ -96,7 +103,8 @@ GEM commander (4.6.0) highline (~> 2.0.0) commonmarker (0.23.7) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) cork (0.3.0) colored2 (~> 3.1) danger (9.3.2) @@ -131,13 +139,15 @@ GEM diffy (3.4.2) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.6.20231109) + domain_name (0.6.20240107) dotenv (2.8.1) + drb (2.2.0) + ruby2_keywords emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.105.0) + excon (0.109.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -168,8 +178,8 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.7) - fastlane (2.217.0) + fastimage (2.3.0) + fastlane (2.218.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -196,7 +206,7 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (~> 0.1.1) + optparse (>= 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) @@ -212,7 +222,7 @@ GEM fastlane-plugin-appcenter (2.1.1) fastlane-plugin-sentry (1.15.0) os (~> 1.1, >= 1.1.4) - fastlane-plugin-wpmreleasetoolkit (9.3.0) + fastlane-plugin-wpmreleasetoolkit (9.4.0) activesupport (>= 6.1.7.1) buildkit (~> 1.5) chroma (= 0.2.0) @@ -233,41 +243,41 @@ GEM fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - git (1.18.0) + git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.53.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.2) + google-apis-androidpublisher_v3 (0.56.0) + google-apis-core (>= 0.12.0, < 2.a) + google-apis-core (0.13.0) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) + googleauth (~> 1.9) httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - webrick - google-apis-iamcredentials_v1 (0.17.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-playcustomapp_v1 (0.13.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.29.0) - google-apis-core (>= 0.11.0, < 2.a) + google-apis-iamcredentials_v1 (0.18.0) + google-apis-core (>= 0.12.0, < 2.a) + google-apis-playcustomapp_v1 (0.14.0) + google-apis-core (>= 0.12.0, < 2.a) + google-apis-storage_v1 (0.33.0) + google-apis-core (>= 0.12.0, < 2.a) google-cloud-core (1.6.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.1.0) + google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.1) - google-cloud-storage (1.45.0) + google-cloud-storage (1.48.1) addressable (~> 2.8) digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.29.0) + google-apis-core (~> 0.13) + google-apis-iamcredentials_v1 (~> 0.18) + google-apis-storage_v1 (~> 0.33) google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) + googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.9.1) + googleauth (1.9.2) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) @@ -292,10 +302,11 @@ GEM mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.5) - minitest (5.20.0) + minitest (5.21.2) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.3.0) + mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) naturally (2.2.1) @@ -309,22 +320,22 @@ GEM sawyer (~> 0.9) open4 (1.3.4) options (2.3.2) - optparse (0.1.1) + optparse (0.4.0) os (1.1.4) ox (2.14.17) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc - plist (3.7.0) + plist (3.7.1) progress_bar (1.3.3) highline (>= 1.6, < 3) options (~> 2.3.0) public_suffix (4.0.7) - racc (1.7.1) + racc (1.7.3) rainbow (3.1.1) rake (13.1.0) - rake-compiler (1.2.5) + rake-compiler (1.2.7) rake rchardet (1.8.0) regexp_parser (2.8.0) @@ -373,7 +384,7 @@ GEM thor (0.20.3) trailblazer-option (0.1.2) tty-cursor (0.7.1) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) typhoeus (1.4.0) @@ -382,9 +393,8 @@ GEM concurrent-ruby (~> 1.0) uber (0.1.0) unicode-display_width (2.5.0) - webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.23.0) + xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) From 396a7afe53405e6115f59a1ad1d16245a925bde0 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Sun, 4 Feb 2024 17:03:57 -0800 Subject: [PATCH 09/10] Update strings for localization --- .../Resources/en.lproj/Localizable.strings | 563 +++++++++++------- 1 file changed, 364 insertions(+), 199 deletions(-) diff --git a/WordPress/Resources/en.lproj/Localizable.strings b/WordPress/Resources/en.lproj/Localizable.strings index ed2fff8817ab..1c0faf07cc91 100644 --- a/WordPress/Resources/en.lproj/Localizable.strings +++ b/WordPress/Resources/en.lproj/Localizable.strings @@ -78,9 +78,6 @@ /* Number of days after which comments should autoclose */ "%@ days" = "%@ days"; -/* The number of followers of a site. The '%@' is a placeholder for the numeric value. Example: `1000 followers` */ -"%@ followers" = "%@ followers"; - /* Comments Threading Levels Number of Threading Levels */ "%@ levels" = "%@ levels"; @@ -506,24 +503,12 @@ /* No comment provided by engineer. */ "Add a shortcode…" = "Add a shortcode…"; -/* No Tags View Button Label */ -"Add a site" = "Add a site"; - -/* Title of a feature to add a new topic to the topics subscribed by the user. */ -"Add a Topic" = "Add a Topic"; - -/* No Topics View Button Label */ -"Add a topic" = "Add a topic"; - /* Accessibility description for adding an image to a new user account. Tapping this initiates that flow. */ "Add account image." = "Add account image."; /* No comment provided by engineer. */ "Add alt text" = "Add alt text"; -/* Placeholder text. A call to action for the user to type any topic to which they would like to subscribe. */ -"Add any topic" = "Add any topic"; - /* No comment provided by engineer. */ "Add audio" = "Add audio"; @@ -618,9 +603,6 @@ /* No comment provided by engineer. */ "Add To End" = "Add To End"; -/* Button Title. Tapping subscribes the user to a new topic. */ -"Add Topic" = "Add Topic"; - /* No comment provided by engineer. */ "Add URL" = "Add URL"; @@ -1271,15 +1253,9 @@ /* No comment provided by engineer. */ "Block settings" = "Block settings"; -/* The title of a button that triggers blocking a site from the user's reader. */ -"Block this site" = "Block this site"; - /* translators: displayed right after the block is ungrouped. */ "Block ungrouped" = "Block ungrouped"; -/* Notice title when blocking a site succeeds. */ -"Blocked site" = "Blocked site"; - /* Notice title when blocking a user succeeds. */ "Blocked user" = "Blocked user"; @@ -1739,9 +1715,6 @@ Note that the word 'go' here should have a closer meaning to 'start' rather than /* No comment provided by engineer. */ "Choose video" = "Choose video"; -/* Reader select interests subtitle label text */ -"Choose your topics" = "Choose your topics"; - /* Register Domain - Address information field City */ "City" = "City"; @@ -2148,9 +2121,6 @@ Example: Reply to Pamela Nguyen */ /* The app failed to enable notifications for the subscription */ "Could not enable notifications" = "Could not enable notifications"; -/* Title of a prompt. */ -"Could not follow site" = "Could not follow site"; - /* Error message informing the user that there was a problem subscribing to a site or feed. */ "Could not follow the site at the address specified." = "Could not follow the site at the address specified."; @@ -2184,9 +2154,6 @@ Example: Reply to Pamela Nguyen */ /* An error description explaining that Seen could not be toggled due to a missing postID. */ "Could not toggle Seen: missing postID." = "Could not toggle Seen: missing postID."; -/* Title of a prompt. */ -"Could not unfollow site" = "Could not unfollow site"; - /* Error message informing the user that there was a problem unsubscribing to a site or feed. */ "Could not unfollow the site at the address specified." = "Could not unfollow the site at the address specified."; @@ -2554,6 +2521,12 @@ Example: Reply to Pamela Nguyen */ /* Debug menu item title */ "debugMenu.analytics" = "Analytics"; +/* Boolean User Defaults debug menu item */ +"debugMenu.booleanUserDefaults" = "Boolean User Defaults"; + +/* Boolean User Defaults Debug Menu screen title */ +"debugMenu.booleanUserDefaults.title" = "Boolean User Defaults"; + /* Feature flags menu item */ "debugMenu.featureFlags" = "Feature Flags"; @@ -2747,12 +2720,6 @@ Example: Reply to Pamela Nguyen */ /* Description of a Quick Start Tour */ "Discover and follow sites that inspire you." = "Discover and follow sites that inspire you."; -/* Button title. Tapping shows the Follow Topics screen. */ -"Discover more topics" = "Discover more topics"; - -/* Title for button on the no followed sites result screen */ -"Discover Sites" = "Discover Sites"; - /* Label for selecting the Blog Discussion Settings section Title for the Discussion Settings Screen */ "Discussion" = "Discussion"; @@ -2933,7 +2900,8 @@ Example: Reply to Pamela Nguyen */ /* Label for button to log in using your site address. The underscores _..._ denote underline */ "Don't have an account? _Sign up_" = "Don't have an account? _Sign up_"; -/* Accessibility label for the Done button in the Me screen. +/* A done button + Accessibility label for the Done button in the Me screen. Button text on site creation epilogue page to proceed to My Sites. Done button title Done editing an image @@ -3272,9 +3240,6 @@ Example: Reply to Pamela Nguyen */ /* Title of a row displayed on the debug screen used in debug builds of the app */ "Enable Quick Start for New Site" = "Enable Quick Start for New Site"; -/* Message prompting user to enable site notifications. */ -"Enable site notifications?" = "Enable site notifications?"; - /* Title for the button that will enable the site stats module. */ "Enable Site Stats" = "Enable Site Stats"; @@ -3313,9 +3278,6 @@ Example: Reply to Pamela Nguyen */ /* Instructional text shown when requesting the user's password for login. */ "Enter the password for your WordPress.com account." = "Enter the password for your WordPress.com account."; -/* Placeholder text prompting the user to type the name of the URL they would like to follow. */ -"Enter the URL of a site to follow" = "Enter the URL of a site to follow"; - /* (placeholder) Help enter WordPress username */ "Enter username" = "Enter username"; @@ -3587,9 +3549,7 @@ Example: Reply to Pamela Nguyen */ /* A brief prompt shown when the reader is empty, letting the user know the app is currently fetching new posts. */ "Fetching posts..." = "Fetching posts..."; -/* A brief prompt when the user is searching for sites in the Reader. - A short message to inform the user data for their followed sites is being fetched.. - A short message to inform the user data for their sites are being fetched. */ +/* A short message to inform the user data for their sites are being fetched. */ "Fetching sites..." = "Fetching sites..."; /* Text displayed while fetching themes */ @@ -3619,9 +3579,6 @@ Example: Reply to Pamela Nguyen */ /* Film & Television site intent topic */ "Film & Television" = "Film & Television"; -/* Title of the filter button in the Reader */ -"Filter" = "Filter"; - /* Title of a screen that shows activity types so the user can filter using them (eg.: posts, images, users) */ "Filter by activity type" = "Filter by activity type"; @@ -3664,8 +3621,7 @@ Example: Reply to Pamela Nguyen */ "follow" = "follow"; /* Button title. Follow the comments on a post. - Prompt to follow a blog. - Verb. Button title. Follow a new blog. */ + Prompt to follow a blog. */ "Follow" = "Follow"; /* Button title. Follow the comments on a post. */ @@ -3674,9 +3630,6 @@ Example: Reply to Pamela Nguyen */ /* Verb. Button title. Follow the comments on a post. */ "Follow conversation" = "Follow conversation"; -/* Verb. An option to follow a site. */ -"Follow site" = "Follow site"; - /* Screen title. Reader select interests title label text. */ "Follow topics" = "Follow topics"; @@ -3686,17 +3639,10 @@ Example: Reply to Pamela Nguyen */ /* Caption displayed in promotional screens shown during the login flow. */ "Follow your favorite sites and discover new blogs." = "Follow your favorite sites and discover new blogs."; -/* User followed a site. */ -"Followed site" = "Followed site"; - /* Displayed in the Notification Settings View - Followed Sites Title Section title for sites the user has followed. */ "Followed Sites" = "Followed Sites"; -/* Followed Topics Title */ -"Followed Topics" = "Followed Topics"; - /* Label for list of followers. User role badge */ "Follower" = "Follower"; @@ -3706,14 +3652,9 @@ Example: Reply to Pamela Nguyen */ Label for number of followers. */ "Followers" = "Followers"; -/* Title of the Following Reader tab - User is following the blog. - Verb. Button title. The user is following a blog. */ +/* User is following the blog. */ "Following" = "Following"; -/* Notice title when following a site succeeds. %1$@ is a placeholder for the site name. */ -"Following %1$@" = "Following %1$@"; - /* Label displayed to the user while loading their selected interests */ "Following new topics..." = "Following new topics..."; @@ -3726,9 +3667,6 @@ Example: Reply to Pamela Nguyen */ /* VoiceOver accessibility hint, informing the user the button can be used to follow a blog. */ "Follows the blog." = "Follows the blog."; -/* VoiceOver accessibility hint, informing the user the button can be used to follow a tag. */ -"Follows the tag." = "Follows the tag."; - /* No comment provided by engineer. */ "Font Size" = "Font Size"; @@ -3904,9 +3842,6 @@ Example: Reply to Pamela Nguyen */ /* Option to select the Gmail app when logging in with magic links */ "Gmail" = "Gmail"; -/* Button title. Tapping lets the user view the sites they follow. */ -"Go to Following" = "Go to Following"; - /* Button label for going to settings to approve push notifications Opens WPiOS Settings.app Section */ "Go to iOS Settings" = "Go to iOS Settings"; @@ -4943,7 +4878,6 @@ Please install the %3$@ to use the app with this site."; Label for Period Overview likes Label for post likes count. Text for the 'like' button. Tapping removes the 'liked' status from a post. - Title of the Likes Reader tab Today's Stats 'Likes' label */ "Likes" = "Likes"; @@ -4956,9 +4890,6 @@ Please install the %3$@ to use the app with this site."; /* VoiceOver accessibility hint, informing the user the button can be used to like a comment */ "Likes the Comment." = "Likes the Comment."; -/* Message to show when a request for a WP.com API endpoint is throttled */ -"Limit reached. You can try again in 1 minute. Trying again before that will only increase the time you have to wait before the ban is lifted. If you think this is in error, contact support." = "Limit reached. You can try again in 1 minute. Trying again before that will only increase the time you have to wait before the ban is lifted. If you think this is in error, contact support."; - /* This description is used to set the accessibility label for the Insights chart, with Views selected. */ "Line Chart depicting Views for insights." = "Line Chart depicting Views for insights."; @@ -5182,9 +5113,6 @@ Please install the %3$@ to use the app with this site."; /* Return to blog screen action when theme activation succeeds */ "Manage site" = "Manage site"; -/* Button title. Tapping lets the user manage the sites they follow. */ -"Manage Sites" = "Manage Sites"; - /* No comment provided by engineer. */ "Manual" = "Manual"; @@ -5588,9 +5516,6 @@ Please install the %3$@ to use the app with this site."; /* No comment provided by engineer. */ "More support options" = "More support options"; -/* Insights 'Most Popular Time' header */ -"Most Popular Time" = "Most Popular Time"; - /* Screen reader text for button that will move the menu item. Argument is menu item's name. */ "Move %@" = "Move %@"; @@ -5703,6 +5628,9 @@ Please install the %3$@ to use the app with this site."; /* Section title for the maintenance table section in the blog details screen */ "my-site.menu.maintenance.section.title" = "Maintenance"; +/* Title for the site monitoring row in the blog details screen */ +"my-site.menu.site-monitoring.row.title" = "Site Monitoring"; + /* Title for the social row in the blog details screen */ "my-site.menu.social.row.title" = "Social"; @@ -5915,9 +5843,6 @@ Please install the %3$@ to use the app with this site."; /* A short message that informs the user no sites could be loaded in the share extension. */ "No available sites" = "No available sites"; -/* A short message that informs the user no WordPress.com sites could be found. */ -"No available WordPress.com sites" = "No available WordPress.com sites"; - /* No comment provided by engineer. */ "No blocks found" = "No blocks found"; @@ -5962,9 +5887,6 @@ Please install the %3$@ to use the app with this site."; /* Title for the view when there aren't any fixed threats to display */ "No fixed threats" = "No fixed threats"; -/* Title for the no followed sites result screen */ -"No followed sites" = "No followed sites"; - /* Displayed in the Notifications Tab as a title, when the Follow Filter shows no notifications */ "No followers yet" = "No followers yet"; @@ -6021,9 +5943,6 @@ Please install the %3$@ to use the app with this site."; /* A hint to users about restoring their site. */ "No need to wait around. We'll notify you when your site has been fully restored." = "No need to wait around. We'll notify you when your site has been fully restored."; -/* Message shown when there are no new topics to follow. */ -"No new topics to follow" = "No new topics to follow"; - /* Displayed in the Notifications Tab as a title, when there are no notifications */ "No notifications yet" = "No notifications yet"; @@ -6069,12 +5988,6 @@ Please install the %3$@ to use the app with this site."; /* Message displayed in Reader Saved Posts view if a user hasn't yet saved any posts. */ "No saved posts" = "No saved posts"; -/* A message title */ -"No sites found" = "No sites found"; - -/* Message shown when the reader finds no sites for the specified search phrase. The %@ is a placeholder for the search phrase. */ -"No sites found matching %@ in your language." = "No sites found matching %@ in your language."; - /* Displayed when the user is searching site tags and there are no matches. */ "No tags matching your search" = "No tags matching your search"; @@ -6094,6 +6007,15 @@ Please install the %3$@ to use the app with this site."; /* No comment provided by engineer. */ "No title" = "No title"; +/* A no results message displayed on the atomic logs screen. */ +"noLogs.empty" = "No log entries within this time range"; + +/* A generic error message displayed on the atomic logs screen. */ +"noLogs.error" = "An error occurred"; + +/* Button title for the retry button on the atomic logs screen. */ +"noLogs.retry" = "Retry"; + /* Disabled No alignment for an image (default). Should be the same as in core WP. No comment will be autoapproved @@ -6264,9 +6186,6 @@ Please install the %3$@ to use the app with this site."; /* No comment provided by engineer. */ "Once you become familiar with the names of different blocks, you can add a block by typing a forward slash followed by the block name — for example, /image or /heading." = "Once you become familiar with the names of different blocks, you can add a block by typing a forward slash followed by the block name — for example, /image or /heading."; -/* A subtitle with more detailed info for the user when no WordPress.com sites could be found. */ -"Once you create a WordPress.com site, you can reblog content that you like to your own site." = "Once you create a WordPress.com site, you can reblog content that you like to your own site."; - /* No comment provided by engineer. */ "One" = "One"; @@ -6619,6 +6538,27 @@ Please install the %3$@ to use the app with this site."; /* Photography site intent topic */ "Photography" = "Photography"; +/* A title for the filter on the PHP logs screen */ +"phpLogs.filterEndDate" = "End Date"; + +/* A title for the filter on the PHP logs screen */ +"phpLogs.filterSeverity" = "Severity"; + +/* A title for the filter on the PHP logs screen */ +"phpLogs.filterStartDate" = "Start Date"; + +/* A title for the log severity level */ +"phpLogs.severityDeprecated" = "Deprecated"; + +/* A title for the log severity level */ +"phpLogs.severityFatalError" = "Fatal Error"; + +/* A title for the log severity level */ +"phpLogs.severityUser" = "User"; + +/* A title for the log severity level */ +"phpLogs.severityWarning" = "Warning"; + /* Title for selecting a new username in the site creation flow. */ "Pick username" = "Pick username"; @@ -7177,9 +7117,6 @@ Tapping on this row allows the user to edit the sharing message. */ /* Error message title informing the user that reader content could not be loaded. */ "Problem loading content" = "Problem loading content"; -/* Error message title informing the user that a search for sites in the Reader could not be loaded. */ -"Problem loading sites" = "Problem loading sites"; - /* No comment provided by engineer. */ "Problem opening the audio" = "Problem opening the audio"; @@ -7305,6 +7242,30 @@ Tapping on this row allows the user to edit the sharing message. */ Title of the 'Reader' tab - used for spotlight indexing on iOS. */ "Reader" = "Reader"; +/* Message expliaining that the specified blog will no longer appear in the user's reader. The '%@' characters are a placeholder for the title of the blog. */ +"reader.blocked.blog.message" = "The blog %@ will no longer appear in your reader. Tap to undo."; + +/* The formatted number of posts and followers for a site. '%1$@' is a placeholder for the blog post count. '%2$@' is a placeholder for the blog subscriber count. Example: `5,000 posts • 10M subscribers` */ +"reader.blog.header.values" = "%1$@ posts • %2$@ subscribers"; + +/* Accessibility hint for the blog name and URL button on Reader's Post Details. */ +"reader.blog.name.accessibility.hint" = "Shows the blog's posts."; + +/* Error message title informing the user that a search for sites in the Reader could not be loaded. */ +"reader.blog.search.loading.error" = "Problem loading blogs"; + +/* A brief prompt when the user is searching for blogs in the Reader. */ +"reader.blog.search.loading.title" = "Fetching blogs..."; + +/* Message shown when the reader finds no blogs for the specified search phrase. The %@ is a placeholder for the search phrase. */ +"reader.blog.search.no.results.message.format" = "No blogs found matching %@ in your language."; + +/* A message title */ +"reader.blog.search.no.results.title" = "No blogs found"; + +/* The number of followers of a site. The '%@' is a placeholder for the numeric value. Example: `1000 followers` */ +"reader.blog.stream.subscribers" = "%@ subscribers"; + /* Accessibility hint to inform that the author section can be tapped to see posts from the site. */ "reader.detail.header.authorInfo.a11y.hint" = "Views posts from the site"; @@ -7342,15 +7303,173 @@ but tapping on this button will remove their like from the post. */ /* Accessibility label for the 'Save Post' button when a post has been saved. */ "reader.detail.toolbar.saved.button.a11y.label" = "Saved Post"; +/* Error message informing the user that they are already following a blog in their reader. */ +"reader.error.already.subscribed.message" = "You are already subscribed to this blog."; + +/* Title for a button that allows user to edit their subscribed list from the filter sheet */ +"reader.filterSheet.button.edit" = "Edit"; + +/* Title for a filter sheet on the Reader to filter the stream by blog */ +"reader.filterSheet.byBlog.title" = "Filter by blog"; + +/* Title for a filter sheet on the Reader to filter the stream by tag */ +"reader.filterSheet.byTag.title" = "Filter by tag"; + +/* Body text for an empty filter sheet on the Reader for blogs */ +"reader.filterSheet.empty.blogs.body" = "Subscribe to blogs in Discover and you’ll see their latest posts here. Or search for a blog that you like already."; + +/* Search blogs button text for an empty filter sheet on the Reader */ +"reader.filterSheet.empty.blogs.search" = "Search for a blog"; + +/* Title for an empty filter sheet on the Reader for blogs */ +"reader.filterSheet.empty.blogs.title" = "No blog subscriptions"; + +/* Body text for an empty filter sheet on the Reader for tags */ +"reader.filterSheet.empty.tags.body" = "Subscribe to a tag and you’ll be able to see the best posts from it here."; + +/* Subscribe to a tag button text for an empty filter sheet on the Reader */ +"reader.filterSheet.empty.tags.subscribe" = "Subscribe to a tag"; + +/* Suggested tags button text for an empty filter sheet on the Reader */ +"reader.filterSheet.empty.tags.suggested" = "Suggested tags"; + +/* Title for an empty filter sheet on the Reader for tags */ +"reader.filterSheet.empty.tags.title" = "No tags"; + +/* Label displayed to the user while loading their selected interests */ +"reader.filterSheet.select.tags.loading" = "Subscribing to new tags..."; + +/* Screen title. Reader select interests title label text. */ +"reader.filterSheet.select.tags.title" = "Suggested tags"; + +/* A short message to inform the user data for their followed sites is being fetched.. */ +"reader.followed.blogs.loading" = "Fetching blogs..."; + +/* Manage blogs tab title */ +"reader.manage.tab.blogs" = "Blogs"; + +/* Manage tags tab title */ +"reader.manage.tab.tags" = "Tags"; + +/* Plural button title to filter the Reader stream by blog. +%1$d is a placeholder for the number of blogs. + Plural button title to filter the Reader stream by tag. +%1$d is a placeholder for the number of tags. */ +"reader.navigation.filter.blog.plural" = "%1$d Blogs"; + +/* Singular button title to filter the Reader stream by blog. +%1$d is a placeholder for the number of blogs. */ +"reader.navigation.filter.blog.singular" = "%1$d Blog"; + +/* Button title to filter the Reader stream by blog. +This is displayed when we don't know the number of blogs yet. */ +"reader.navigation.filter.blog.unnumbered" = "Tags"; + +/* Singular button title to filter the Reader stream by tag. +%1$d is a placeholder for the number of tags. */ +"reader.navigation.filter.tag.singular" = "%1$d Tag"; + +/* Button title to filter the Reader stream by tag. +This is displayed when we don't know the number of tags yet. */ +"reader.navigation.filter.tag.unnumbered" = "Tags"; + +/* Reader navigation menu item for the Liked filter */ +"reader.navigation.menu.liked" = "Liked"; + +/* Reader navigation menu item for the lists menu group */ +"reader.navigation.menu.lists" = "Lists"; + +/* Reader navigation menu item for the Saved filter */ +"reader.navigation.menu.saved" = "Saved"; + +/* Reader navigation menu item for the Subscriptions filter */ +"reader.navigation.menu.subscriptions" = "Subscriptions"; + /* Reader search button accessibility label. */ "reader.navigation.search.button.label" = "Search"; /* Reader settings button accessibility label. */ "reader.navigation.settings.button.label" = "Reader Settings"; +/* Title for button on the no followed blogs result screen */ +"reader.no.blogs.button" = "Discover Blogs"; + +/* Subtitle for the no followed blogs result screen */ +"reader.no.blogs.subtitle" = "Subscribe to blogs in Discover and you’ll see their latest posts here. Or search for a blog that you like already."; + +/* Title for the no followed blogs result screen */ +"reader.no.blogs.title" = "No blog subscriptions"; + +/* Message shown when the reader finds no posts for the chosen blog */ +"reader.no.results.blog.response.message" = "This blog has not posted anything yet. Try back later."; + +/* Message shown when the reader finds no posts for the chosen list */ +"reader.no.results.list.response.message" = "The blogs in this list have not posted anything recently."; + +/* Button title. Tapping lets the user manage the blogs they follow. */ +"reader.no.results.manage.blogs" = "Manage Blogs"; + +/* A message explaining the Following topic in the reader */ +"reader.no.results.response.message" = "Recent posts from blogs and sites you subscribe to will appear here."; + +/* Button title. Tapping lets the user view the blogs they're subscribed to. */ +"reader.no.results.subscriptions.button" = "Go to Subscriptions"; + +/* No Sites View Label + No Topics View Label */ +"reader.no.tags.action" = "You can subscribe to posts on a specific blog by subscribing to it."; + +/* No Tags View Button Label */ +"reader.no.tags.title" = "Add a blog"; + +/* Notice title when blocking a blog fails. */ +"reader.notice.blog.blocked.failure" = "Unable to block blog"; + +/* Notice title when blocking a site succeeds. */ +"reader.notice.blog.blocked.success" = "Blocked blog"; + +/* User subscribed to a blog. */ +"reader.notice.blog.subscribe.success" = "Subscribed to blog"; + +/* Title of a prompt. */ +"reader.notice.blog.unsubscribe.error" = "Could not unsubscribe from blog"; + +/* Title of a prompt. */ +"reader.notice.blog.unsubscribed.error" = "Could not unsubscribe from blog"; + +/* User unsubscribed from a blog. */ +"reader.notice.blog.unsubscribed.success" = "Unsubscribed from blog"; + +/* Notice title when turning blog notifications off fails. */ +"reader.notice.disable.notification.failure" = "Unable to turn off blog notifications"; + +/* Notice title when turning blog notifications off succeeds. */ +"reader.notice.disable.notification.success" = "Turned off blog notifications"; + +/* Notice title when turning blog notifications on fails. */ +"reader.notice.enable.notification.failure" = "Unable to turn on blog notifications"; + +/* Message prompting user to enable blog notifications. */ +"reader.notice.enable.notification.prompt" = "Enable blog notifications?"; + +/* Notice title when turning blog notifications on succeeds. */ +"reader.notice.enable.notification.success" = "Turned on blog notifications"; + /* A default value used to fill in the site name when the followed site somehow has missing site name or URL. -Example: given a notice format "Following %@" and empty site name, this will be "Following this site". */ -"reader.notice.follow.site.unknown" = "this site"; +Example: given a notice format "Following %@" and empty site name, this will be "Following this blog". */ +"reader.notice.subscribe.blog.unknown" = "this blog"; + +/* Notice title when subscribing to a blog fails. */ +"reader.notice.subscribe.failure" = "Unable to subscribe to blog"; + +/* Notice title when following a blog succeeds. %1$@ is a placeholder for the site name. */ +"reader.notice.subscribe.success" = "Subscribed to %1$@"; + +/* Notice title when unsubscribing to a blog fails. */ +"reader.notice.unsubscribe.failure" = "Unable to unsubscribe from blog"; + +/* Notice title when unfollowing a blog succeeds. */ +"reader.notice.unsubscribe.success" = "Unsubscribed from blog"; /* Notice title when blocking a user fails. */ "reader.notice.user.blocked" = "reader.notice.user.block.failed"; @@ -7388,9 +7507,18 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Accessibility hint for the site header on the reader post card cell */ "reader.post.header.accessibility.hint" = "Opens the site details for the post."; +/* The title of a button that triggers blocking a blog from the user's reader. */ +"reader.post.menu.block.blog" = "Block this blog"; + /* The title of a button that triggers blocking a user from the user's reader. */ "reader.post.menu.block.user" = "Block this user"; +/* Verb. An option to switch off site notifications. */ +"reader.post.menu.notifications.off" = "Turn off blog notifications"; + +/* Verb. An option to switch on blog notifications. */ +"reader.post.menu.notifications.on" = "Turn on blog notifications"; + /* The title of a button that removes a saved post. */ "reader.post.menu.remove.post" = "Remove Saved Post"; @@ -7400,8 +7528,74 @@ Example: given a notice format "Following %@" and empty site name, this will be /* The title of a button that saves a post. */ "reader.post.menu.save.post" = "Save"; -/* The formatted number of posts and followers for a site. '%1$@' is a placeholder for the site post count. '%2$@' is a placeholder for the site follower count. Example: `5,000 posts • 10M followers` */ -"reader.site.header.counts" = "%1$@ posts • %2$@ followers"; +/* Verb. An option to subscribe to a blog. */ +"reader.post.menu.subscribe.blog" = "Subscribe to blog"; + +/* Verb. An option to unsubscribe from a blog. */ +"reader.post.menu.unsubscribe.blog" = "Unsubscribe from blog"; + +/* Button title. Tapping lets the user manage the blogs they follow. */ +"reader.reblog.manage.blogs" = "Manage Blogs"; + +/* A subtitle with more detailed info for the user when no WordPress.com blogs could be found. */ +"reader.reblog.no.blogs.subtitle" = "Once you create a WordPress.com blog, you can reblog content that you like to your own blog."; + +/* A short message that informs the user no WordPress.com blogs could be found. */ +"reader.reblog.no.blogs.title" = "No available WordPress.com blogs"; + +/* Title of a Reader tab showing Sites matching a user's search query */ +"reader.search.tab.blogs" = "Blogs"; + +/* Label displayed to the user while loading their selected interests */ +"reader.select.interests.loading" = "Subscribing to new tags..."; + +/* Screen title. Reader select interests title label text. */ +"reader.select.interests.title" = "Subscribe to tags"; + +/* Message shown when there are no new topics to follow. */ +"reader.select.tags.no.results.title" = "No new tags to subscribe to"; + +/* Reader select interests subtitle label text */ +"reader.select.tags.subtitle" = "Choose your tags"; + +/* VoiceOver accessibility hint, informing the user the button can be used to follow a tag. */ +"reader.subscribe.button.accessibility.hint" = "Subscribes to the tag."; + +/* Verb. Button title. Subscribes to a new blog. */ +"reader.subscribe.button.title" = "Subscribe"; + +/* The accessibility label for the followed blogs search field */ +"reader.subscribed.blogs.search.accessibility.label" = "Blog URL"; + +/* Placeholder text prompting the user to type the name of the URL they would like to follow. */ +"reader.subscribed.blogs.search.placeholder" = "Enter the URL of a blog to subscribe to"; + +/* Verb. Button title. The user is subscribed to a blog. */ +"reader.subscribed.button.title" = "Subscribed"; + +/* A suggestion of topics the user might want to subscribe to */ +"reader.suggested.blogs.title" = "Blogs to subscribe to"; + +/* Title of a feature to add a new tag to the tags subscribed by the user. */ +"reader.tags.add.tag" = "Add a Tag"; + +/* Button Title. Tapping subscribes the user to a new tag. */ +"reader.tags.add.tag.action" = "Add Tag"; + +/* Placeholder text. A call to action for the user to type any tag to which they would like to subscribe. */ +"reader.tags.add.tag.placeholder" = "Add any tag"; + +/* Title of a feature to add a new tag to the tags subscribed by the user. */ +"reader.tags.add.tag.title" = "Add a Tag"; + +/* Button title. Tapping shows the Subscribe to Tags screen. */ +"reader.tags.discover.more.tags" = "Discover more tags"; + +/* Accessibility label for unsubscribing from a tag */ +"reader.tags.unsubscribe.accessibility.label" = "Unsubscribe from %@"; + +/* Label of the table view cell's delete button, when unsubscribing from a blog. */ +"reader.unsubscribe.button" = "Unsubscribe"; /* Spoken accessibility label */ "readerDetail.backButton.accessibilityLabel" = "Back"; @@ -7460,9 +7654,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Settings: Receiving Pingbacks */ "Receive Pingbacks" = "Receive Pingbacks"; -/* A message explaining the Following topic in the reader */ -"Recent posts from blogs and sites you follow will appear here." = "Recent posts from blogs and sites you follow will appear here."; - /* Post Stats recent weeks header. */ "Recent Weeks" = "Recent Weeks"; @@ -7721,9 +7912,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Accessibility label for the reset date range button */ "Reset Date Range filter" = "Reset Date Range filter"; -/* Accessibility label for the reset filter button in the reader. */ -"Reset filter" = "Reset filter"; - /* The button title for a secondary call-to-action button. When the user can't remember their password. */ "Reset your password" = "Reset your password"; @@ -8346,9 +8534,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Accessibility hint for the Reader Cell */ "Shows the post content" = "Shows the post content"; -/* Accessibility hint for the site name and URL button on Reader's Post Details. */ -"Shows the site's posts." = "Shows the site's posts."; - /* Button title. Takes the user the Enter site credentials screen. */ "Sign in with site credentials" = "Sign in with site credentials"; @@ -8433,8 +8618,7 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Title of the navigation bar, shown when the large title is hidden. */ "Site Topic" = "Site Topic"; -/* The accessibility label for the followed sites search field - The item to select during a guided tour. */ +/* The item to select during a guided tour. */ "Site URL" = "Site URL"; /* Template site address for the search bar. */ @@ -8515,15 +8699,51 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Media screen navigation title */ "siteMediaPicker.title" = "Media"; -/* Sites Filter Tab Title - Title of a Reader tab showing Sites matching a user's search query */ -"Sites" = "Sites"; +/* Site Monitoring log entry details navigation title */ +"siteMonitoring.entryDetailsTitle" = "Log Entry"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyCached" = "Cached"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyFile" = "File"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyHTTPHost" = "HTTP Host"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyKind" = "Kind"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyLine" = "Line"; -/* Sites Filter Tab Title with Count */ -"Sites (%lu)" = "Sites (%lu)"; +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyName" = "Name"; -/* A suggestion of topics the user might */ -"Sites to follow" = "Sites to follow"; +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyReferrer" = "Referrer"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyRequestTime" = "Request Time"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyRequestURL" = "Request URL"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyResponseBodySize" = "Response Size"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyStatus" = "Status"; + +/* Site Monitoring details screen metadata key */ +"siteMonitoring.metadataKeyTimestamp" = "Timestamp"; + +/* Title for metrics screen. + Title for web server log screen. */ +"siteMonitoring.metrics" = "Metrics"; + +/* Title for PHP logs screen. */ +"siteMonitoring.phpLogs" = "PHP Logs"; /* Title for screen to select the privacy options for a blog */ "siteSettings.privacy.title" = "Privacy"; @@ -9412,9 +9632,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* No comment provided by engineer. */ "The server returned an empty response. This usually means you need to increase the memory limit for your site." = "The server returned an empty response. This usually means you need to increase the memory limit for your site."; -/* Message expliaining that the specified site will no longer appear in the user's reader. The '%@' characters are a placeholder for the title of the site. */ -"The site %@ will no longer appear in your reader. Tap to undo." = "The site %@ will no longer appear in your reader. Tap to undo."; - /* No comment provided by engineer. */ "The site address must be shorter than 64 characters." = "The site address must be shorter than 64 characters."; @@ -9437,9 +9654,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Description of the purpose of a site's title. */ "The Site Title is displayed in the title bar of a web browser and is displayed in the header for most themes." = "The Site Title is displayed in the title bar of a web browser and is displayed in the header for most themes."; -/* Message shown when the reader finds no posts for the chosen list */ -"The sites in this list have not posted anything recently." = "The sites in this list have not posted anything recently."; - /* Should be the same as the text displayed if the user clicks the (i) in Slug in Calypso. */ "The slug is the URL-friendly version of the post title." = "The slug is the URL-friendly version of the post title."; @@ -9658,9 +9872,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Post is not in my likes. Accessibility label */ "This post is not in My Likes" = "This post is not in My Likes"; -/* Message shown when the reader finds no posts for the chosen site */ -"This site has not posted anything yet. Try back later." = "This site has not posted anything yet. Try back later."; - /* Error message displayed when unable to close user account due to unresolved chargebacks. */ "This user account cannot be closed if there are unresolved chargebacks." = "This user account cannot be closed if there are unresolved chargebacks."; @@ -9812,12 +10023,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Used when a Reader Topic is not found for a specific id */ "Topic not found for id:" = "Topic not found for id:"; -/* Topics Filter Tab Title */ -"Topics" = "Topics"; - -/* Topics Filter Tab Title with Count */ -"Topics (%lu)" = "Topics (%lu)"; - /* Label for total followers */ "Total" = "Total"; @@ -9918,24 +10123,12 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Destructive menu title to remove the prompt card from the dashboard. */ "Turn off prompts" = "Turn off prompts"; -/* Verb. An option to switch off site notifications. */ -"Turn off site notifications" = "Turn off site notifications"; - /* Title for a button which takes the user to the WordPress app's settings in the system Settings app. */ "Turn on notifications" = "Turn on notifications"; /* Title of the screen in the Blogging Reminders flow which prompts users to enable push notifications. */ "Turn on push notifications" = "Turn on push notifications"; -/* Verb. An option to switch on site notifications. */ -"Turn on site notifications" = "Turn on site notifications"; - -/* Notice title when turning site notifications off succeeds. */ -"Turned off site notifications" = "Turned off site notifications"; - -/* Notice title when turning site notifications on succeeds. */ -"Turned on site notifications" = "Turned on site notifications"; - /* Notification Settings switch for the app. */ "Turning the switch off will disable all notifications from this app, regardless of type." = "Turning the switch off will disable all notifications from this app, regardless of type."; @@ -9963,9 +10156,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* No comment provided by engineer. */ "Type a URL" = "Type a URL"; -/* Notice title when blocking a site fails. */ -"Unable to block site" = "Unable to block site"; - /* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */ "Unable To Connect" = "Unable To Connect"; @@ -9990,9 +10180,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* The app failed to subscribe to the comments for the post */ "Unable to follow conversation" = "Unable to follow conversation"; -/* Notice title when following a site fails. */ -"Unable to follow site" = "Unable to follow site"; - /* Title for No results full page screen displayedfrom pages list when there is no connection */ "Unable to load pages right now." = "Unable to load pages right now."; @@ -10044,15 +10231,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Title of error prompt shown when a sync the user initiated fails. */ "Unable to Sync" = "Unable to Sync"; -/* Notice title when turning site notifications off fails. */ -"Unable to turn off site notifications" = "Unable to turn off site notifications"; - -/* Notice title when turning site notifications on fails. */ -"Unable to turn on site notifications" = "Unable to turn on site notifications"; - -/* Notice title when unfollowing a site fails. */ -"Unable to unfollow site" = "Unable to unfollow site"; - /* Error informing the user that their homepage settings could not be updated */ "Unable to update homepage settings" = "Unable to update homepage settings"; @@ -10110,25 +10288,12 @@ Example: given a notice format "Following %@" and empty site name, this will be Undo action */ "Undo" = "Undo"; -/* Label of the table view cell's delete button, when unfollowing a site. */ -"Unfollow" = "Unfollow"; - -/* Accessibility label for unfollowing a tag */ -"Unfollow %@" = "Unfollow %@"; - /* Title for a button that unsubscribes the user from the post. */ "Unfollow Conversation" = "Unfollow Conversation"; /* Verb. Button title. The user is following the comments on a post. */ "Unfollow conversation" = "Unfollow conversation"; -/* Verb. An option to unfollow a site. */ -"Unfollow site" = "Unfollow site"; - -/* Notice title when unfollowing a site succeeds. - User unfollowed a site. */ -"Unfollowed site" = "Unfollowed site"; - /* VoiceOver accessibility hint, informing the user the button can be used to unfollow a blog. */ "Unfollows the blog." = "Unfollows the blog."; @@ -10762,6 +10927,18 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Verb. Dismiss the web view screen. */ "webKit.button.dismiss" = "Dismiss"; +/* A title for the filter on the PHP logs screen */ +"webServerLogs.filterEndDate" = "End Date"; + +/* A title for the filter on the PHP logs screen */ +"webServerLogs.filterRequestType" = "Request type"; + +/* A title for the filter on the PHP logs screen */ +"webServerLogs.filterStartDate" = "Start Date"; + +/* A title for the filter on the PHP logs screen */ +"webServerLogs.filterStatus" = "Status"; + /* Title of a button. A call to action to view more stats for this week */ "Week" = "Week"; @@ -10781,9 +10958,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Post Signup Interstitial Title Text for Jetpack iOS */ "Welcome to Jetpack" = "Welcome to Jetpack"; -/* Welcome message shown under Discover in the Reader just the 1st time the user sees it */ -"Welcome to Reader. Discover millions of blogs at your fingertips." = "Welcome to Reader. Discover millions of blogs at your fingertips."; - /* A message title */ "Welcome to the Reader" = "Welcome to the Reader"; @@ -10866,9 +11040,6 @@ Example: given a notice format "Following %@" and empty site name, this will be /* Text rendered at the bottom of the Discussion Blocklist Keys editor */ "When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress\"." = "When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress\"."; -/* Subtitle for the no followed sites result screen */ -"When you follow sites, you’ll see their content here." = "When you follow sites, you’ll see their content here."; - /* Displayed when a call is made to load the history but there's no result or an error. */ "When you make changes in the editor you'll be able to see the history here" = "When you make changes in the editor you'll be able to see the history here"; @@ -11134,6 +11305,9 @@ Example: given a notice format "Following %@" and empty site name, this will be "wordpress.prologue.splash.caption" = "Write, edit, and publish from anywhere."; +/* Message to show when a request for a WP.com API endpoint is throttled */ +"wordpresskit.api.message.endpoint_throttled" = "Limit reached. You can try again in 1 minute. Trying again before that will only increase the time you have to wait before the ban is lifted. If you think this is in error, contact support."; + /* Title of button that displays the Automattic Work With Us web page */ "Work With Us" = "Work With Us"; @@ -11219,9 +11393,6 @@ from anywhere."; /* Paragraph displayed in the tableview header. The placholders are for the current username, highlight text and the current display name. */ "You are about to change your username, which is currently %@. %@" = "You are about to change your username, which is currently %1$@. %2$@"; -/* Error message informing the user that they are already following a site in their reader. */ -"You are already following this site." = "You are already following this site."; - /* Alert message. */ "You are changing your username to %@. Changing your username will also affect your Gravatar profile and IntenseDebate profile addresses. \nConfirm your new username to continue." = "You are changing your username to %@. Changing your username will also affect your Gravatar profile and IntenseDebate profile addresses. \nConfirm your new username to continue."; @@ -11246,12 +11417,6 @@ from anywhere."; /* No comment provided by engineer. */ "You can edit this block using the web version of the editor." = "You can edit this block using the web version of the editor."; -/* No Sites View Label */ -"You can follow posts on a specific site by following it." = "You can follow posts on a specific site by following it."; - -/* No Topics View Label */ -"You can follow posts on a specific subject by adding a topic." = "You can follow posts on a specific subject by adding a topic."; - /* Discussion Settings: Footer Text */ "You can override these settings for individual posts." = "You can override these settings for individual posts."; From 1bfe5e4686c2a9cde948b1b88102a290e5e971ee Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 5 Feb 2024 12:19:04 +1100 Subject: [PATCH 10/10] Update Fastlane to version 2.219.0 to fetch a `match` bug fix See https://github.com/fastlane/fastlane/issues/21762 and the CI failure we got for the first 24.2.0.0 deployment attempt. --- Gemfile | 5 +++-- Gemfile.lock | 43 +++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Gemfile b/Gemfile index 71c8783fabab..fc43b6a06dd4 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,9 @@ gem 'cocoapods', '~> 1.14' gem 'commonmarker' gem 'danger-dangermattic', git: 'https://github.com/Automattic/dangermattic' gem 'dotenv' -# 2.217.0 includes a fix for Xcode 15 test results parsing in CI -gem 'fastlane', '~> 2.217' +# 2.219.0 includes a fix for a bug introduced in 2.218.0 +# See https://github.com/fastlane/fastlane/issues/21762#issuecomment-1875208663 +gem 'fastlane', '~> 2.219' gem 'fastlane-plugin-appcenter', '~> 2.1' gem 'fastlane-plugin-sentry' # This comment avoids typing to switch to a development version for testing. diff --git a/Gemfile.lock b/Gemfile.lock index c7ba2b33afad..65b02aec30be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.3.0) - fastlane (2.218.0) + fastlane (2.219.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -198,6 +198,7 @@ GEM gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) google-cloud-storage (~> 1.31) highline (~> 2.0) http-cookie (~> 1.0.5) @@ -246,40 +247,38 @@ GEM git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.56.0) - google-apis-core (>= 0.12.0, < 2.a) - google-apis-core (0.13.0) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 1.9) + googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - google-apis-iamcredentials_v1 (0.18.0) - google-apis-core (>= 0.12.0, < 2.a) - google-apis-playcustomapp_v1 (0.14.0) - google-apis-core (>= 0.12.0, < 2.a) - google-apis-storage_v1 (0.33.0) - google-apis-core (>= 0.12.0, < 2.a) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) google-cloud-core (1.6.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.1.1) - faraday (>= 1.0, < 3.a) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-cloud-storage (1.48.1) + google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) - google-apis-core (~> 0.13) - google-apis-iamcredentials_v1 (~> 0.18) - google-apis-storage_v1 (~> 0.33) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) google-cloud-core (~> 1.6) - googleauth (~> 1.9) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.9.2) - faraday (>= 1.0, < 3.a) - google-cloud-env (~> 2.1) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -415,7 +414,7 @@ DEPENDENCIES commonmarker danger-dangermattic! dotenv - fastlane (~> 2.217) + fastlane (~> 2.219) fastlane-plugin-appcenter (~> 2.1) fastlane-plugin-sentry fastlane-plugin-wpmreleasetoolkit (~> 9.3)