Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 21.4.0.3 into trunk #19848

Merged
merged 4 commits into from
Jan 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions WordPress/Jetpack/Classes/Utility/DataMigrator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ private extension DataMigrator {
for (key, value) in temporaryDictionary {
localDefaults.set(value, forKey: key)
}
AppAppearance.overrideAppearance()
sharedDefaults.removeObject(forKey: DefaultsWrapper.dictKey)
return true
}
Expand Down
17 changes: 16 additions & 1 deletion WordPress/Resources/cs.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2023-01-02 15:52:08+0000 */
/* Translation-Revision-Date: 2023-01-04 09:12:59+0000 */
/* Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2); */
/* Generator: GlotPress/4.0.0-alpha.3 */
/* Language: cs_CZ */
Expand Down Expand Up @@ -250,6 +250,9 @@ translators: Block name. %s: The localized block name */
/* translators: accessibility text for blocks with invalid content. %d: localized block title */
"%s block. This block has invalid content" = "%s blok. Tento blok má neplatný obsah";

/* translators: %s: name of the reusable block */
"%s converted to regular block" = "%s převedeno na běžný blok";

/* translators: %s: name of the reusable block */
"%s converted to regular blocks" = "%s převeden na běžné bloky";

Expand Down Expand Up @@ -733,6 +736,9 @@ translators: Block name. %s: The localized block name */
/* No comment provided by engineer. */
"Alternatively, you can detach and edit these blocks separately by tapping “Convert to regular blocks”." = "Alternativně můžete tyto bloky oddělit a upravit samostatně klepnutím na „Převést na běžné bloky“.";

/* No comment provided by engineer. */
"Alternatively, you can detach and edit this block separately by tapping “Convert to regular block”." = "Případně můžete tento blok odpojit a upravit samostatně klepnutím na „Převést na běžný blok“.";

/* Instruction text to explain to help users type their password instead of using magic link login option. */
"Alternatively, you may enter the password for this account." = "Případně můžete zadat heslo pro tento účet.";

Expand Down Expand Up @@ -9897,6 +9903,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
/* Title of a button that navigates the user to the Jetpack app if installed, or to the app store. */
"jetpack.fullscreen.overlay.early.switch.title" = "Přepněte na novou aplikaci Jetpack";

/* Title of a button that navigates the user to the Jetpack app if installed, or to the app store. */
"jetpack.fullscreen.overlay.late.switch.title" = "Přepněte do aplikace Jetpack";

/* Title of a button that displays a blog post in a web view. */
"jetpack.fullscreen.overlay.learnMore" = "Více se dozvíte na jetpack.com";

Expand Down Expand Up @@ -9924,9 +9933,15 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
/* Title of a screen displayed when the user accesses the Stats screen from the WordPress app. The screen showcases the Jetpack app. */
"jetpack.fullscreen.overlay.phaseOne.stats.title" = "Získejte své statistiky pomocí nové aplikace Jetpack";

/* A footnote in a screen displayed when the user accesses a Jetpack powered feature from the WordPress app. The screen showcases the Jetpack app. */
"jetpack.fullscreen.overlay.phaseThree.footnote" = "Přepínání je zdarma a trvá jen minutu.";

/* Subtitle of a screen displayed when the user trys creating a new site from the WordPress app. The screen showcases the Jetpack app. */
"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.";

/* Subtitle of a screen displayed when the user accesses a Jetpack-powered feature from the WordPress app. */
"jetpack.fullscreen.overlay.phaseTwoAndThree.fallbackSubtitle" = "Statistiky, čtečka, upozornění a další funkce poháněné Jetpack budou z aplikace WordPress brzy odstraněny.";

/* Title of a screen displayed when the user accesses the Notifications screen from the WordPress app. The screen showcases the Jetpack app. */
"jetpack.fullscreen.overlay.phaseTwoAndThree.notifications.title" = "Oznámení se přesouvají do Jetpacku";

Expand Down
4 changes: 2 additions & 2 deletions WordPress/Resources/tr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2022-11-30 12:54:11+0000 */
/* Translation-Revision-Date: 2023-01-04 13:36:05+0000 */
/* Plural-Forms: nplurals=2; plural=n > 1; */
/* Generator: GlotPress/4.0.0-alpha.3 */
/* Language: tr */
Expand Down Expand Up @@ -4380,7 +4380,7 @@ translators: Block name. %s: The localized block name */
"Looking for stats?" = "İstatistiklere mi ihtiyacınız var?";

/* Message asking the user to sign into Jetpack with WordPress.com credentials */
"Looks like you have Jetpack set up on your site. Congrats! Log in with your WordPress.com credentials to enable Stats and Notifications." = "Görünen o ki sitenize JetPack kurmuşsunuz. Tebrikler!\nİstatistikleri ve bildirimleri etkinleştirmek için WordPress.com hesabınızla giriş yapın.";
"Looks like you have Jetpack set up on your site. Congrats! Log in with your WordPress.com credentials to enable Stats and Notifications." = "Görünen o ki sitenize Jetpack kurmuşsunuz. Tebrikler! İstatistikleri ve bildirimleri etkinleştirmek için WordPress.com hesabınızla giriş yapın.";

/* Title of a button. */
"Lost your password?" = "Parolanızı mı unuttunuz?";
Expand Down
2 changes: 1 addition & 1 deletion config/Version.internal.xcconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_SHORT=21.4

// Internal long version example: VERSION_LONG=9.9.0.20180423
VERSION_LONG=21.4.0.20230103
VERSION_LONG=21.4.0.20230104
2 changes: 1 addition & 1 deletion config/Version.public.xcconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_SHORT=21.4

// Public long version example: VERSION_LONG=9.9.0.0
VERSION_LONG=21.4.0.2
VERSION_LONG=21.4.0.3