Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3ab095e
Update gutenberg submodule hash to 8b70472d143cf6d890c22e67063c23f419…
wpmobilebot Apr 28, 2022
cc2ef9f
Update gutenberg submodule hash to 43d780baefd9505bd189d689f7cc29b3fe…
wpmobilebot Apr 28, 2022
ebed270
Update gutenberg submodule hash to 39c887049b1b93c19194611ee210addc50…
wpmobilebot Apr 28, 2022
bb0fb11
Update gutenberg submodule hash to f38d259f2b8aca91ebeb94b2f217b0e566…
wpmobilebot Apr 28, 2022
db071dd
Update gutenberg submodule hash to bd2eea43ea1396db0e06942f64786f578d…
wpmobilebot Apr 29, 2022
ba802cf
Update gutenberg submodule hash to 4cf9f9eccc65d3e811c3dec9b6b259747c…
wpmobilebot Apr 29, 2022
dfbd233
Update gutenberg submodule hash to a6bfbf71653dceb5e289f22d1958910c95…
wpmobilebot Apr 29, 2022
70618ef
Merge branch 'trunk' into version-toolkit/gutenberg/rnmobile/heading-…
jostnes Apr 29, 2022
6c78d31
Update gutenberg submodule hash to a6bfbf71653dceb5e289f22d1958910c95…
wpmobilebot Apr 29, 2022
1074b59
Merge branch 'trunk' into version-toolkit/gutenberg/rnmobile/heading-…
jostnes May 9, 2022
dc62d64
Merge branch 'version-toolkit/gutenberg/rnmobile/heading-list-blocks-…
jostnes May 9, 2022
2430392
fix conflicts
jostnes May 9, 2022
3cacbad
Update gutenberg submodule hash to a6bfbf71653dceb5e289f22d1958910c95…
wpmobilebot May 9, 2022
ce8d8e5
Update gutenberg submodule hash to 6a9dae269c924409694c01400f825c1cad…
wpmobilebot May 10, 2022
e871f3c
Update gutenberg submodule hash to e3bc3935a6f404a47bf5cf3c773bac172d…
wpmobilebot May 10, 2022
0fce4c4
Update gutenberg submodule hash to 4f6917ea29be33315f89b96ea811278408…
wpmobilebot May 10, 2022
d2424e4
Update gutenberg submodule hash to 85c407c286fc18e226f98fbcfa440237f9…
wpmobilebot May 10, 2022
a92b3d2
Update gutenberg submodule hash to d1af9076afc1a54787e003dd167aa1d17e…
wpmobilebot May 10, 2022
c8dd14c
Update gutenberg submodule hash to 4c7f918067fae2ce113d893ff775898753…
wpmobilebot May 11, 2022
53f5f46
Merge branch 'trunk' into version-toolkit/gutenberg/rnmobile/heading-…
jostnes May 11, 2022
5ab011a
Update gutenberg submodule hash to 4c7f918067fae2ce113d893ff775898753…
wpmobilebot May 11, 2022
6b4f7c4
Update gutenberg submodule hash to 0da6fc5cc49e4dae6347c63d93b47bbf94…
wpmobilebot May 12, 2022
916c3a4
Update gutenberg submodule hash to 58d9e906c23fdbc26197a0ccaa9f3aad5a…
wpmobilebot May 12, 2022
8ffb2aa
Update gutenberg submodule hash to 92ffc5eeff491355eb8f8677b8e6d3de38…
wpmobilebot May 12, 2022
0990126
Merge branch 'trunk' into version-toolkit/gutenberg/rnmobile/heading-…
jostnes May 13, 2022
15323d4
Update gutenberg submodule hash to 92ffc5eeff491355eb8f8677b8e6d3de38…
wpmobilebot May 13, 2022
3504f1d
Merge branch 'trunk' into version-toolkit/gutenberg/rnmobile/heading-…
jostnes May 16, 2022
f7f095a
Update gutenberg submodule hash to 92ffc5eeff491355eb8f8677b8e6d3de38…
wpmobilebot May 16, 2022
7c4b917
update gutenberg ref
jostnes May 16, 2022
399375d
Merge branch 'version-toolkit/gutenberg/rnmobile/heading-list-blocks-…
jostnes May 16, 2022
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
Prev Previous commit
Next Next commit
Merge branch 'trunk' into version-toolkit/gutenberg/rnmobile/heading-…
…list-blocks-test-update
  • Loading branch information
jostnes committed May 16, 2022
commit 3504f1d4052b223f1f3b495a52302f3849e5f997
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Unreleased
---
* [*] [a11y] Improve text read by screen readers for BottomSheetSelectControl [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4854]

## 1.76.0
---
Expand Down
2 changes: 2 additions & 0 deletions bundle/android/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<string name="gutenberg_native_1_s_2_s" tools:ignore="UnusedResources">%1$s (%2$s)</string>
<!-- translators: accessibility text. Inform about current value. %1$s: Control label %2$s: setting label (example: width), %3$s: Current value. %4$s: value measurement unit (example: pixels) -->
<string name="gutenberg_native_1_s_2_s_is_3_s_4_s" tools:ignore="UnusedResources">%1$s. %2$s is %3$s %4$s.</string>
<!-- translators: %1$s: Select control button label e.g. "Button width". %2$s: Select control option value e.g: "Auto, 25%". -->
<string name="gutenberg_native_1_s_currently_selected_2_s" tools:ignore="UnusedResources">%1$s. Currently selected: %2$s</string>
<!-- translators: 1: From block title, e.g. Paragraph. 2: To block title, e.g. Header. -->
<string name="gutenberg_native_1_s_transformed_to_2_s" tools:ignore="UnusedResources">%1$s transformed to %2$s</string>
<string name="gutenberg_native_add_a_new_block_at_any_time_by_tapping_on_the_icon_in_the_toolbar" tools:ignore="UnusedResources">Add a new block at any time by tapping on the + icon in the toolbar on the bottom left.</string>
Expand Down
124 changes: 62 additions & 62 deletions bundle/ios/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions bundle/ios/GutenbergNativeTranslations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ private func dummy() {
_ = NSLocalizedString("%1$s (%2$s)", comment: "translators: %1$s: Select control font size name e.g. Small, %2$s: Select control font size e.g. 12px")
_ = NSLocalizedString("%1$s transformed to %2$s", comment: "translators: 1: From block title, e.g. Paragraph. 2: To block title, e.g. Header.")
_ = NSLocalizedString("%1$s. %2$s is %3$s %4$s.", comment: "translators: accessibility text. Inform about current value. %1$s: Control label %2$s: setting label (example: width), %3$s: Current value. %4$s: value measurement unit (example: pixels)")
_ = NSLocalizedString("%1$s. Currently selected: %2$s", comment: "translators: %1$s: Select control button label e.g. \"Button width\". %2$s: Select control option value e.g: \"Auto, 25%\".")
_ = NSLocalizedString("%s block", comment: "translators: %s: Block name e.g. \"Image block\"\ntranslators: Block name. %s: The localized block name")
_ = NSLocalizedString("%s block options", comment: "translators: %s: block title e.g: \"Paragraph\".")
_ = NSLocalizedString("%s block, newly available", comment: "translators: Newly available block name. %s: The localized block name")
Expand Down
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 712 files
You are viewing a condensed version of this merge commit. You can view the full changes here.