Skip to content

Commit ad8903a

Browse files
mokagiomokagio
authored
Merge beta 21.5.0.1 (#19928)
2 parents 7436af2 + 2fac74b commit ad8903a

File tree

28 files changed

+91
-80
lines changed

28 files changed

+91
-80
lines changed

‎Podfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ workspace 'WordPress.xcworkspace'
2020
## ===================================
2121
##
2222
def wordpress_shared
23-
pod 'WordPressShared', '~> 2.0.0'
24-
# pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :tag => ''
25-
# pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => 'delete-cocoalumberjack'
26-
# pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit => ''
27-
# pod 'WordPressShared', :path => '../WordPress-iOS-Shared'
23+
pod 'WordPressShared', '~> 2.0.1-beta.1'
24+
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', tag: ''
25+
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: ''
26+
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: ''
27+
# pod 'WordPressShared', path: '../WordPress-iOS-Shared'
2828
end
2929

3030
def aztec

‎Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ PODS:
516516
- UIDeviceIdentifier (~> 2.0)
517517
- WordPressShared (~> 2.0-beta)
518518
- wpxmlrpc (~> 0.9)
519-
- WordPressShared (2.0.0)
519+
- WordPressShared (2.0.1-beta.1)
520520
- WordPressUI (1.12.5)
521521
- WPMediaPicker (1.8.7)
522522
- wpxmlrpc (0.10.0)
@@ -611,7 +611,7 @@ DEPENDENCIES:
611611
- WordPress-Editor-iOS (~> 1.19.8)
612612
- WordPressAuthenticator (~> 5.0)
613613
- WordPressKit (~> 5.0)
614-
- WordPressShared (~> 2.0.0)
614+
- WordPressShared (~> 2.0.1-beta.1)
615615
- WordPressUI (~> 1.12.5)
616616
- WPMediaPicker (~> 1.8.7)
617617
- Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.87.1/third-party-podspecs/Yoga.podspec.json`)
@@ -878,7 +878,7 @@ SPEC CHECKSUMS:
878878
WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
879879
WordPressAuthenticator: 0cdf1bff75bd3f58fe733d6457221f27bbbdc9f4
880880
WordPressKit: 202f529323b079a344f7bc1493b7ebebfd9ed4b5
881-
WordPressShared: 35d41bdf0927e714af1fc85fa9cb692f934473be
881+
WordPressShared: 5ba89467f7ba468c023c441045bb70b4933ff6d4
882882
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
883883
WPMediaPicker: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
884884
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
@@ -892,6 +892,6 @@ SPEC CHECKSUMS:
892892
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
893893
ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
894894

895-
PODFILE CHECKSUM: e5a8b86bfb7d34f670dd53ebc44c2c3f05058543
895+
PODFILE CHECKSUM: 42b08cc7024f28711cc5eecbb6ec28f3219c4020
896896

897897
COCOAPODS: 1.11.2

‎WordPress/Resources/ar.lproj/Localizable.strings‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10129,9 +10129,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1012910129
/* Secondary button title in the migration notifications screen. */
1013010130
"migration.notifications.actions.secondary.title" = "التقرير لاحقًا";
1013110131

10132-
/* Footer for the migration notifications screen. */
10133-
"migration.notifications.footer" = "عندما يظهر التنبيه، انقر على السماح للاستمرار في تلقي كل تنبيهات ووردبريس الخاصة بك.";
10134-
1013510132
/* Highlighted text in the footer of the migration notifications screen. */
1013610133
"migration.notifications.footer.highlighted" = "السماح";
1013710134

‎WordPress/Resources/cs.lproj/Localizable.strings‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2023-01-10 09:20:08+0000 */
1+
/* Translation-Revision-Date: 2023-01-13 09:23:51+0000 */
22
/* Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2); */
33
/* Generator: GlotPress/4.0.0-alpha.3 */
44
/* Language: cs_CZ */
@@ -2120,6 +2120,9 @@ translators: Block name. %s: The localized block name */
21202120
/* Displayed in the Notifications Tab as a button title, when the Unread Filter shows no notifications */
21212121
"Create a Post" = "Vytvořit příspěvek";
21222122

2123+
/* Navigates to a new flow for site creation. */
2124+
"Create a Site" = "Vytvořit web";
2125+
21232126
/* Title of the button in the placeholder for an empty list of blog tags. */
21242127
"Create a Tag" = "Vytvořit štítek";
21252128

@@ -9761,6 +9764,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
97619764
/* Register Domain - Address information field Country Code placeholder */
97629765
"eg. 44" = "eg. 44";
97639766

9767+
/* Accessibility label for more button in dashboard quick start card. */
9768+
"ellipsisButton.AccessibilityLabel" = "Více";
9769+
97649770
/* Placeholder for the site url textfield.
97659771
Provides a sample of what a domain name looks like.
97669772
Site Address placeholder */
@@ -9898,9 +9904,24 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
98989904
/* This text is required by Apple to be part of the translations but is not shown to the users. You can use the English version verbatim without translation for this entry. */
98999905
"ios-widget.tVvJ9c" = "Vyberte záměr webu";
99009906

9907+
/* Title of a badge indicating when a feature in plural form will be removed. First argument is the feature name. Second argument is the number of days/weeks it will be removed in. Ex: Notifications are moving in 2 weeks */
9908+
"jetpack.branding.badge_banner.moving_in.plural" = "%1$@ se přesunou za %2$@";
9909+
9910+
/* Title of a badge indicating when a feature in singular form will be removed. First argument is the feature name. Second argument is the number of days/weeks it will be removed in. Ex: Reader is moving in 2 weeks */
9911+
"jetpack.branding.badge_banner.moving_in.singular" = "%1$@ se přesune za %2$@";
9912+
9913+
/* Title of a badge indicating that a feature in plural form will be removed soon. First argument is the feature name. Ex: Notifications are moving soon */
9914+
"jetpack.branding.badge_banner.moving_soon.plural" = "%@ se brzy přesunou";
9915+
9916+
/* Title of a badge indicating that a feature in singular form will be removed soon. First argument is the feature name. Ex: Reader is moving soon */
9917+
"jetpack.branding.badge_banner.moving_soon.singular" = "%@ se brzy přesune";
9918+
99019919
/* Title of the Jetpack powered badge. */
99029920
"jetpack.branding.badge_banner.title" = "Poháněno Jetpackem";
99039921

9922+
/* Title of the Jetpack powered badge. */
9923+
"jetpack.branding.badge_banner.title.phase2" = "Získejte aplikaci Jetpack";
9924+
99049925
/* Button title of the Jetpack powered overlay. */
99059926
"jetpack.branding.overlay.button.title" = "Vyzkoušejte novou aplikaci Jetpack";
99069927

@@ -9922,6 +9943,15 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
99229943
/* Title of a button that dismisses an overlay and displays the Notifications screen. */
99239944
"jetpack.fullscreen.overlay.notifications.continue.title" = "Pokračujte do oznámení";
99249945

9946+
/* Title of a button that dismisses an overlay that prompts the user to switch the Jetpack app. */
9947+
"jetpack.fullscreen.overlay.phaseFour.general.continue.title" = "Odložit na později";
9948+
9949+
/* Title of a screen that prompts the user to switch the Jetpack app. */
9950+
"jetpack.fullscreen.overlay.phaseFour.subtitle" = "Statistiky, čtečka, upozornění a další funkce poháněné Jetpack byly z aplikace WordPress odstraněny.";
9951+
9952+
/* Title of a screen that prompts the user to switch the Jetpack app. */
9953+
"jetpack.fullscreen.overlay.phaseFour.title" = "Funkce Jetpacku se přesunuly";
9954+
99259955
/* Subtitle of a screen displayed when the user accesses the Notifications screen from the WordPress app. The screen showcases the Jetpack app. */
99269956
"jetpack.fullscreen.overlay.phaseOne.notifications.subtitle" = "Přepněte na aplikaci Jetpack, abyste do svého zařízení i nadále dostávali upozornění v reálném čase.";
99279957

@@ -9946,6 +9976,12 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
99469976
/* A footnote in a screen displayed when the user accesses a Jetpack powered feature from the WordPress app. The screen showcases the Jetpack app. */
99479977
"jetpack.fullscreen.overlay.phaseThree.footnote" = "Přepínání je zdarma a trvá jen minutu.";
99489978

9979+
/* Title of a button that dismisses an overlay that showcases the Jetpack app. */
9980+
"jetpack.fullscreen.overlay.phaseThree.general.continue.title" = "Pokračovat bez Jetpacku";
9981+
9982+
/* Title of a screen that showcases the Jetpack app. */
9983+
"jetpack.fullscreen.overlay.phaseThree.general.title" = "Funkce jetpacku se brzy přesunou.";
9984+
99499985
/* Subtitle of a screen displayed when the user trys creating a new site from the WordPress app. The screen showcases the Jetpack app. */
99509986
"jetpack.fullscreen.overlay.phaseTwo.siteCreation.subtitle" = "Jetpack poskytuje statistiky, upozornění a další, které vám pomohou vytvořit a rozšířit web WordPress vašich snů.\n\nAplikace WordPress již nepodporuje vytváření nového webu.";
99519987

@@ -9979,6 +10015,21 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
997910015
/* Title of a button that dismisses an overlay and displays the Stats screen. */
998010016
"jetpack.fullscreen.overlay.stats.continue.title" = "Pokračujte na statistiky";
998110017

10018+
/* Description inside a menu card communicating that features are moving to the Jetpack app. */
10019+
"jetpack.menuCard.description" = "Statistiky, čtečka, upozornění a další funkce se brzy přesunou do mobilní aplikace Jetpack.";
10020+
10021+
/* Menu item title to hide the card. */
10022+
"jetpack.menuCard.hide" = "Skrýt";
10023+
10024+
/* Title of a button that displays a blog post in a web view. */
10025+
"jetpack.menuCard.learnMore" = "Zjistit více";
10026+
10027+
/* Title of a button prompting users to switch to the Jetpack app. */
10028+
"jetpack.menuCard.phaseFour.title" = "Přejděte na Jetpack";
10029+
10030+
/* Menu item title to hide the card for now and show it later. */
10031+
"jetpack.menuCard.remindLater" = "Připomenout později";
10032+
998210033
/* Add an author prompt for the jetpack prologue */
998310034
"jetpack.prologue.prompt.addAuthor" = "Přidejte autora";
998410035

@@ -10069,15 +10120,15 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1006910120
/* The secondary button title in the Load WordPress screen */
1007010121
"migration.loadWordpress.secondaryButton" = "Ne, děkuji";
1007110122

10123+
/* The secondary description in the Load WordPress screen */
10124+
"migration.loadWordpress.secondaryDescription" = "Chcete přenést svá data z aplikace WordPress a přihlásit se automaticky?";
10125+
1007210126
/* The title in the Load WordPress screen */
1007310127
"migration.loadWordpress.title" = "Vítejte v Jetpacku!";
1007410128

1007510129
/* Secondary button title in the migration notifications screen. */
1007610130
"migration.notifications.actions.secondary.title" = "Vybrat později";
1007710131

10078-
/* Footer for the migration notifications screen. */
10079-
"migration.notifications.footer" = "Když se zobrazí upozornění, klepněte na Povolit, abyste i nadále dostávali všechna vaše oznámení WordPress.";
10080-
1008110132
/* Highlighted text in the footer of the migration notifications screen. */
1008210133
"migration.notifications.footer.highlighted" = "Povolit";
1008310134

‎WordPress/Resources/de.lproj/Localizable.strings‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10129,9 +10129,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1012910129
/* Secondary button title in the migration notifications screen. */
1013010130
"migration.notifications.actions.secondary.title" = "Später entscheiden";
1013110131

10132-
/* Footer for the migration notifications screen. */
10133-
"migration.notifications.footer" = "Tippe auf „Zulassen“, wenn der Hinweis angezeigt wird, um weiterhin alle WordPress-Benachrichtigungen zu erhalten.";
10134-
1013510132
/* Highlighted text in the footer of the migration notifications screen. */
1013610133
"migration.notifications.footer.highlighted" = "Zulassen";
1013710134

‎WordPress/Resources/en-GB.lproj/Localizable.strings‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10129,9 +10129,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1012910129
/* Secondary button title in the migration notifications screen. */
1013010130
"migration.notifications.actions.secondary.title" = "Decide later";
1013110131

10132-
/* Footer for the migration notifications screen. */
10133-
"migration.notifications.footer" = "When the alert apears tap Allow to continue receiving all your WordPress notifications.";
10134-
1013510132
/* Highlighted text in the footer of the migration notifications screen. */
1013610133
"migration.notifications.footer.highlighted" = "Allow";
1013710134

‎WordPress/Resources/es.lproj/Localizable.strings‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2023-01-12 13:54:08+0000 */
1+
/* Translation-Revision-Date: 2023-01-16 18:44:43+0000 */
22
/* Plural-Forms: nplurals=2; plural=n != 1; */
33
/* Generator: GlotPress/4.0.0-alpha.3 */
44
/* Language: es */
@@ -10130,7 +10130,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1013010130
"migration.notifications.actions.secondary.title" = "Decidir más tarde";
1013110131

1013210132
/* Footer for the migration notifications screen. */
10133-
"migration.notifications.footer" = "Cuando aparezca la alerta, toca Permitir para continuar recibiendo todas tus notificaciones de WordPress.";
10133+
"migration.notifications.footer" = "Cuando aparezca la alerta, toca «Permitir» para continuar recibiendo todos tus avisos de WordPress.";
1013410134

1013510135
/* Highlighted text in the footer of the migration notifications screen. */
1013610136
"migration.notifications.footer.highlighted" = "Permitir";

‎WordPress/Resources/fr.lproj/Localizable.strings‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10129,9 +10129,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1012910129
/* Secondary button title in the migration notifications screen. */
1013010130
"migration.notifications.actions.secondary.title" = "Décider ultérieurement";
1013110131

10132-
/* Footer for the migration notifications screen. */
10133-
"migration.notifications.footer" = "Lorsque l’alerte s’affiche à l’écran, sélectionnez Autoriser pour continuer de recevoir l’ensemble de vos notifications WordPress.";
10134-
1013510132
/* Highlighted text in the footer of the migration notifications screen. */
1013610133
"migration.notifications.footer.highlighted" = "Autoriser";
1013710134

‎WordPress/Resources/he.lproj/Localizable.strings‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10129,9 +10129,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1012910129
/* Secondary button title in the migration notifications screen. */
1013010130
"migration.notifications.actions.secondary.title" = "אני אחליט מאוחר יותר";
1013110131

10132-
/* Footer for the migration notifications screen. */
10133-
"migration.notifications.footer" = "כאשר ההתראה מופיעה, יש להקיש על 'להרשות' כדי להמשיך לקבל את כל ההודעות מ-WordPress.";
10134-
1013510132
/* Highlighted text in the footer of the migration notifications screen. */
1013610133
"migration.notifications.footer.highlighted" = "להרשות";
1013710134

‎WordPress/Resources/id.lproj/Localizable.strings‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10129,9 +10129,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1012910129
/* Secondary button title in the migration notifications screen. */
1013010130
"migration.notifications.actions.secondary.title" = "Tentukan nanti";
1013110131

10132-
/* Footer for the migration notifications screen. */
10133-
"migration.notifications.footer" = "Saat peringatan muncul, tekan Izinkan agar dapat tetap menerima semua pemberitahuan WordPress.";
10134-
1013510132
/* Highlighted text in the footer of the migration notifications screen. */
1013610133
"migration.notifications.footer.highlighted" = "Izinkan";
1013710134

0 commit comments

Comments
 (0)