Skip to content

Commit

Permalink
Merge pull request #13452 from wordpress-mobile/gutenberg/integrate_r…
Browse files Browse the repository at this point in the history
…elease_1.42.0

Integrate gutenberg-mobile release 1.42.0
  • Loading branch information
cameronvoell authored Nov 27, 2020
2 parents fe8f36f + fbfbc2e commit c968771
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
3 changes: 3 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
-----
* [***] Site Creation: Adds an option to pick a home page design when creating a WordPress.com site.
* [*] Posts Settings: removed deprecated location setting [https://github.com/wordpress-mobile/WordPress-Android/pull/13404]
* [**] Block Editor: Button block - Add link picker to the block settings [https://github.com/WordPress/gutenberg/pull/26206]
* [***] Block Editor: Adding support for selecting different unit of value in Cover and Columns blocks [https://github.com/WordPress/gutenberg/pull/26161]
* [*] Block Editor: Fix theme colors syncing with the editor [https://github.com/WordPress/gutenberg/pull/26821]
* [***] Stories: New feature for WordPress.com and Jetpack sites: Use photos and videos to create engaging and tappable fullscreen slideshows. [https://github.com/wordpress-mobile/WordPress-Android/pull/13459]

16.2
Expand Down
8 changes: 7 additions & 1 deletion WordPress/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3071,6 +3071,7 @@
<string name="gutenberg_native_block_settings" tools:ignore="UnusedResources">Block settings</string>
<!-- translators: title for "Blog" page template -->
<string name="gutenberg_native_blog" tools:ignore="UnusedResources">Blog</string>
<string name="gutenberg_native_choose_a_file" tools:ignore="UnusedResources">CHOOSE A FILE</string>
<string name="gutenberg_native_choose_from_device" tools:ignore="UnusedResources">Choose from device</string>
<string name="gutenberg_native_choose_image" tools:ignore="UnusedResources">Choose image</string>
<string name="gutenberg_native_choose_image_or_video" tools:ignore="UnusedResources">Choose image or video</string>
Expand All @@ -3081,6 +3082,7 @@
<string name="gutenberg_native_content" tools:ignore="UnusedResources">Content…</string>
<string name="gutenberg_native_copied_block" tools:ignore="UnusedResources">Copied block</string>
<string name="gutenberg_native_copy_block" tools:ignore="UnusedResources">Copy block</string>
<string name="gutenberg_native_copy_file_url" tools:ignore="UnusedResources">Copy file URL</string>
<!-- translators: %s: current cell value. -->
<string name="gutenberg_native_current_value_is_s" tools:ignore="UnusedResources">Current value is %s</string>
<string name="gutenberg_native_customize" tools:ignore="UnusedResources">CUSTOMIZE</string>
Expand Down Expand Up @@ -3115,12 +3117,17 @@
<!-- translators: sample content for "About" page template -->
<string name="gutenberg_native_dr_seuss" tools:ignore="UnusedResources">Dr. Seuss</string>
<string name="gutenberg_native_duplicate_block" tools:ignore="UnusedResources">Duplicate block</string>
<string name="gutenberg_native_edit_file" tools:ignore="UnusedResources">Edit file</string>
<string name="gutenberg_native_edit_using_web_editor" tools:ignore="UnusedResources">Edit using web editor</string>
<string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
<!-- translators: sample content for "Team" page template -->
<string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a" tools:ignore="UnusedResources">Email me: &lt;a href=\"mailto:[email protected]\"&gt;[email protected]&lt;/a&gt;</string>
<string name="gutenberg_native_excerpt_length_words" tools:ignore="UnusedResources">Excerpt length (words)</string>
<string name="gutenberg_native_failed_to_insert_media_please_tap_for_options" tools:ignore="UnusedResources">Failed to insert media.\nPlease tap for options.</string>
<string name="gutenberg_native_failed_to_save_files_please_tap_for_options" tools:ignore="UnusedResources">Failed to save files.\nPlease tap for options.</string>
<string name="gutenberg_native_failed_to_upload_files_please_tap_for_options" tools:ignore="UnusedResources">Failed to upload files.\nPlease tap for options.</string>
<string name="gutenberg_native_file_block_settings" tools:ignore="UnusedResources">File block settings</string>
<string name="gutenberg_native_file_name" tools:ignore="UnusedResources">File name</string>
<!-- translators: accessibility text. %s: gallery caption. -->
<string name="gutenberg_native_gallery_caption_s" tools:ignore="UnusedResources">Gallery caption. %s</string>
<!-- translators: sample content for "About" page template
Expand All @@ -3136,7 +3143,6 @@ translators: sample content for "Team" page template -->
<string name="gutenberg_native_hide_keyboard" tools:ignore="UnusedResources">Hide keyboard</string>
<!-- translators: accessibility text. %s: image caption. -->
<string name="gutenberg_native_image_caption_s" tools:ignore="UnusedResources">Image caption. %s</string>
<string name="gutenberg_native_insert_mention" tools:ignore="UnusedResources">Insert mention</string>
<!-- translators: sample content for "Services" page template -->
<string name="gutenberg_native_inspiration" tools:ignore="UnusedResources">Inspiration</string>
<!-- translators: sample content for "About" page template -->
Expand Down

0 comments on commit c968771

Please sign in to comment.