Skip to content

Commit

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

Gutenberg: update to v1.20.0
  • Loading branch information
Tug authored Jan 10, 2020
2 parents fba0283 + 1294de9 commit 69cfe28
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
3 changes: 3 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
14.0
-----
* Block Editor: Fix displaying placeholder for images
* Block Editor: Fix crash on undo
* Block Editor: Fix styling on navigation UI

13.9
-----
Expand Down
11 changes: 8 additions & 3 deletions WordPress/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources xmlns:tools="http://schemas.android.com/tools">

<string name="app_name" translatable="false">WordPress</string>
Expand Down Expand Up @@ -2636,6 +2636,8 @@


<!--Autogenerated:Gutenberg Native-->
<!-- translators: accessibility text. Inform about current value. %1$s: Control label %2$s: Current value. -->
<string name="gutenberg_native_1_s_current_value_is_2_s" tools:ignore="UnusedResources">%1$s. Current value is %2$s</string>
<string name="gutenberg_native_add_a_description" tools:ignore="UnusedResources">Add a description</string>
<string name="gutenberg_native_add_annotation" tools:ignore="UnusedResources">Add annotation</string>
<string name="gutenberg_native_add_block_here" tools:ignore="UnusedResources">ADD BLOCK HERE</string>
Expand Down Expand Up @@ -2669,6 +2671,8 @@
<string name="gutenberg_native_double_tap_to_undo_last_change" tools:ignore="UnusedResources">Double tap to undo last change</string>
<string name="gutenberg_native_empty" tools:ignore="UnusedResources">Empty</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>
<!-- translators: accessibility text. %s: gallery caption. -->
<string name="gutenberg_native_gallery_caption_s" tools:ignore="UnusedResources">Gallery caption. %s</string>
<string name="gutenberg_native_help_icon" tools:ignore="UnusedResources">Help icon</string>
<string name="gutenberg_native_here_is_the_panel_content" tools:ignore="UnusedResources">Here is the panel content!</string>
<string name="gutenberg_native_hide_keyboard" tools:ignore="UnusedResources">Hide keyboard</string>
Expand All @@ -2686,6 +2690,8 @@
<string name="gutenberg_native_move_block_up" tools:ignore="UnusedResources">Move block up</string>
<!-- translators: accessibility text. %1: current block position (number). %2: next block position (number) -->
<string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s" tools:ignore="UnusedResources">Move block up from row %1$s to row %2$s</string>
<string name="gutenberg_native_move_image_backward" tools:ignore="UnusedResources">Move Image Backward</string>
<string name="gutenberg_native_move_image_forward" tools:ignore="UnusedResources">Move Image Forward</string>
<string name="gutenberg_native_my_document_setting_panel" tools:ignore="UnusedResources">My Document Setting Panel</string>
<string name="gutenberg_native_my_post_publish_panel" tools:ignore="UnusedResources">My post publish panel</string>
<string name="gutenberg_native_my_post_status_info" tools:ignore="UnusedResources">My post status info</string>
Expand All @@ -2705,7 +2711,7 @@
<string name="gutenberg_native_remove_annotations" tools:ignore="UnusedResources">Remove annotations</string>
<!-- translators: accessibility text. %s: current block position (number). -->
<string name="gutenberg_native_remove_block_at_row_s" tools:ignore="UnusedResources">Remove block at row %s</string>
<string name="gutenberg_native_reset" tools:ignore="UnusedResources">RESET</string>
<string name="gutenberg_native_remove_image" tools:ignore="UnusedResources">Remove Image</string>
<string name="gutenberg_native_reset_block" tools:ignore="UnusedResources">Reset Block</string>
<string name="gutenberg_native_row_d" tools:ignore="UnusedResources">Row %d.</string>
<!-- translators: accessibility text. %s: block name. -->
Expand All @@ -2730,7 +2736,6 @@
<string name="gutenberg_native_title" tools:ignore="UnusedResources">Title:</string>
<string name="gutenberg_native_translate" tools:ignore="UnusedResources">Translate</string>
<string name="gutenberg_native_ungroup" tools:ignore="UnusedResources">Ungroup</string>
<string name="gutenberg_native_unsupported" tools:ignore="UnusedResources">Unsupported</string>
<string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release_in_the_m" tools:ignore="UnusedResources">We are working hard to add more blocks with each release. In the meantime, you can also edit this post on the web.</string>
<string name="gutenberg_native_wordpress_media_library" tools:ignore="UnusedResources">WordPress Media Library</string>
<!--/Autogenerated:Gutenberg Native-->
Expand Down

0 comments on commit 69cfe28

Please sign in to comment.